gentoo resync : 07.08.2021

6414 files changed, 66563 insertions, 44248 deletions

diff --git a/Manifest b/Manifest
index 68b5b4cb5935..716064c78ce0 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29281 BLAKE2B d4fe22ac46d8ecf0f9200437544fa8c170899a8d923db41f0353013a414bdf6c4f7f5bb20331f92d376447f3865bd290d4ab8e99711d850408c0ab1dc46e5d73 SHA512 3d7474ba7213abeee898e22a4e083ce34d28090ed3c902d447e8060ec07c8b7bea5e993f33b55611f30580a52680140e9d5c26f779b7b1b1adb65ebc7a022e8b
-TIMESTAMP 2021-08-01T20:39:00Z
+MANIFEST Manifest.files.gz 29316 BLAKE2B 2abc030a394670d2cbf0b200fe041bf354982631f4156d9ca0340eef2867d3cdf05c81f5f713383ea314fab4bdf6e7526fde109f3e593f224ffc02453ae24570 SHA512 bf4fc66d2276a88920923903e4895bd1059211c48ea36d4307b8fa4cf6453495ad913ea48bbd956f9eb151a43bfee60e03d880e39619021afd620d01fe81f796
+TIMESTAMP 2021-08-06T22:39:10Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEHBmRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmENug5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCLzQ/9EC8AAMCKkMdApl36SpSfzCzrWvyRBY4KYovbL+JL3drBGLdpVNYpODVt
-s7RT6tuBD7qoiTjYJf5qScOLTd70ZCbwmWCBZrGGBUu0vNHmESS5DVnZwCj+toIh
-SmULvuI2sZlYbH+BXNcbXDZZLCZwLskznglLNn+Y7t7siAjOFlwfu4huQGiB75ww
-wmLjuVdXkIiHdwxyxtYTiP0Pq4ivrK70nx8vtOfUWij+ZPqoyOyeDVuXWN/4sW7u
-K5br/oiTjSC3j22kWgRFHAForec6H5FoLyrlZkalWsQGa6F/IGJMEv0PtUrjjIKQ
-DJVZ8rQNrzX055ZYWcJXEZwV4oKDca4uGIvBb53N+HDaSDDLbXzYhMAFpRD0g1s7
-U1C4d4Y9nQZYKF5vgiREdXMeHEgzEfRLZTMoiTUagOfSn4sDkiP1fRSGphVWwzLm
-1fx6AtP78evxQPhRWnmmMUa277Y5e/BKncPsQf1oUiBNWjmxhmhcNv7kOcgsNQ9j
-jdKZBMwWPKda8/Ry04NejWISdkS0hQh1vFu9iBx+KTipYjlT7ISGgs2O3sl6sinG
-vP9KvjevPm1C6SSETRcRoLDv0Xz0e4EpZkDvO1H++dCZJ159K48K4n2vIwPXnAFP
-vMwfjuZoSS4nP1qtwvdRt3mM47h6Lf4+72BtmlS3KRpE55qCyC4=
-=cT4r
+klCf+Q/+LqVDghPmUnP4VQdb1TexT5rxCWC9X1Psvk8tEZD5EbRKEFxvwP+ky3Ex
+K4JnMmNnDW+9T16x/z7p+Mq7Rrs1lCLvxggfwogZ4b9h8fsl6iLj3ziOGtSiIi/7
+pV0V/Gv7QiPKvQKdsbOaih1rASLkvKkRU2fCYLDlfLuDfgD3414UoM9wYB3EtuKL
+9H5DnYQ2VTiCBjnfCtK37Z9fxCcV7+yesLQOGTcsAFLVeAKcoZSfPRvwLWbXUDLH
+nTFIqTfo+oj/7mQF6+cgi0F+IXO65kabaKLscolzNNKAkOpBNOQoqwhvbKrrdQjA
+clAQwbAEhIFbnnjZ83pTZRGaKZ/HJzBl1IxOl8c9nZec4LLXLf3+vJ3tILj+uI/y
+K5H4OMOMrgPNUXIQ2imbFvrWFAHjqyyPHitJdOvVrvCucGoW+KOcyzBv/ZUoZcfF
+Bos4b04Tsxy+ycNIqy+xfqCEexGXp2fnfHXkj73gDfH237qMee/A5vBmOCyewIK5
+1GXzDvqQnhICxRk+F5UQ2Qk6t/bY73u03fGflhAy/Dq2MUHNFCTcpYTKaU8M/4Gr
+b+8DUe9jN5xDhOaw6hCQxBtth8gDXdE40JdX+rfheDht7y6mXRVQRnn4RlTgWQJ5
+IzvMHnpEJmb6b7PJhKctwv8Af2XPntcO4Bo9QJR5dgoqACR4INo=
+=xRLk
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d67d2a6e7a4f..d033e1b4f522 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 4d445109711b..b8363fefaa8f 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/drone/Manifest b/acct-user/drone/Manifest
index 40d80a247958..30c537913955 100644
--- a/acct-user/drone/Manifest
+++ b/acct-user/drone/Manifest
@@ -1,2 +1,2 @@
-EBUILD drone-0.ebuild 247 BLAKE2B e2dc6849156749759e53954150c0ac6fe0dd10584b662a152108cc05132e2c754308f9b61136b46dce8cc69993a8a40a08aa1d09a076f546d969597abcbf0d2f SHA512 342f8e543ac9afb3ce33b315e20f86fbc96f3b1bfdd586b863c62f6e9c5150aa182bdfe072d951b04e0b884f224f5d00c64f4f9d8ecc0f40626c813953b45967
+EBUILD drone-0.ebuild 267 BLAKE2B f6502e1a43cf2216342f496ff2911458ae0d331b66ad0902fa608d556492a5441aa5e953ae534c95697019ec069831ace05e6ec85fc644cc79a7cb6c18823212 SHA512 46413482c49640d350f86929da0eb549cecd30ad39672704d84b49cb6d3c5ed8aa3a91d818040c46dae6fe1dd5a6e091c53ac72b34f44dab4607a65b3231bb5f
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-user/drone/drone-0.ebuild b/acct-user/drone/drone-0.ebuild
index 0d5a3103cec9..3f0bfb9afded 100644
--- a/acct-user/drone/drone-0.ebuild
+++ b/acct-user/drone/drone-0.ebuild
@@ -10,3 +10,5 @@ DESCRIPTION="A user for dev-util/drone"
 ACCT_USER_ID=112
 ACCT_USER_GROUPS=( drone )
 ACCT_USER_HOME=/var/lib/drone
+
+acct-user_add_deps
diff --git a/acct-user/karma/Manifest b/acct-user/karma/Manifest
new file mode 100644
index 000000000000..0e046c87e47c
--- /dev/null
+++ b/acct-user/karma/Manifest
@@ -0,0 +1,2 @@
+EBUILD karma-0.ebuild 241 BLAKE2B e9e584e0a67b45f038070b5a926edcbe8471f3e2635fd35e663a3b2da5e444b42840bafab15f592891c6ff1dafca36d9cc075d27f05a4fe81fb408e99af7e9f5 SHA512 9dac2ef74f844bfab49775c078efd4556b1bde9ca32bf7197119555efb3ea8147732adcd8b434c7bd163c9b99240585d7fbe15f048f7ec81d60e7413683bf842
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-user/karma/karma-0.ebuild b/acct-user/karma/karma-0.ebuild
new file mode 100644
index 000000000000..e125361d1e72
--- /dev/null
+++ b/acct-user/karma/karma-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/karma-bin"
+
+ACCT_USER_ID=118
+ACCT_USER_GROUPS=( karma )
+
+acct-user_add_deps
diff --git a/acct-user/karma/metadata.xml b/acct-user/karma/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/karma/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/trickster/Manifest b/acct-user/trickster/Manifest
new file mode 100644
index 000000000000..f6210af1dd38
--- /dev/null
+++ b/acct-user/trickster/Manifest
@@ -0,0 +1,2 @@
+EBUILD trickster-0.ebuild 245 BLAKE2B 35122cc50a9d56ad75bd9aacd73dc01381a354675764839e5752409bfaa27a8f46cfc96110c30cf38915e71840806b0e221bff62c7a0b25975aace609af80e2f SHA512 7c7337889b692472d75abed90c3e867008bf19e0a35f9b65318fc3609ee7b2e8430734041eafa9deb0d688d92d63f223d73b40b38fb2c16ceeed8c4fa84adb72
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-user/trickster/metadata.xml b/acct-user/trickster/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/trickster/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/trickster/trickster-0.ebuild b/acct-user/trickster/trickster-0.ebuild
new file mode 100644
index 000000000000..fa378b29a456
--- /dev/null
+++ b/acct-user/trickster/trickster-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-apps/trickster"
+
+ACCT_USER_ID=119
+ACCT_USER_GROUPS=( trickster )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 4d477e917195..3e49da672ece 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest
index ed9c2ab11975..4966cf7ed4da 100644
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@@ -1,5 +1,5 @@
 DIST kontrast-20.12.3.tar.xz 122468 BLAKE2B 4e29c034ba87781ffef03a37ecc7219eed488585bc47b0b3420950cdfe8fa92e9f4fd2a35dea76ac296318cb8c8be38fcf92061bca105fcfafa9dc9121afbabe SHA512 d6a4b60416f43bc1e9ba2539b13f33233c988417c7e8f05dd295d7e4946301943db9493123a07c48b0844c7aa55a22a3f1b898c3a00cccc6f6aae295d89d90c8
 DIST kontrast-21.04.3.tar.xz 123764 BLAKE2B 8788b3b0e479b39a2065be61ae2e4fdc34c393a12be6547b596be1dd60fce8d3c8a98b2d7bb8ac7626c75570c92b52cd13cbfec1c61470c09abba931e5c7d7ab SHA512 fc966e28e790d49e2c87d45c506a7cf5170115f6528821f8634ab2e767ba725b9c6934cdfec5a308c751ff1b83fc59bea31dc50a462a81d71f47652a8b974e2a
 EBUILD kontrast-20.12.3.ebuild 816 BLAKE2B c014e86a0d6d9f93398ff8ad565e09e698c6a7bee12d7abe9d3fc1c88986e5f74f029ee960b11b81b146aace044758ab4f3c75a1cefbe085670cd6bced016604 SHA512 d5431072659281f8c691b3d4fbe004d64d2cdd97fe7f7a7add7e9d3dccf01603c4b959ee351f2d773f201ae1c61512ac0cc696d7c2acad5d0d3e822acbf100c7
-EBUILD kontrast-21.04.3.ebuild 808 BLAKE2B 495bd0b2cc247bbf03c2738c3a276ecafd52b81780578060b445774c78adc2ce6599954426082f7cf1d9b7c4a1cf74f921052605a523fa73e88a0062877d4c2a SHA512 cd09249358eab250e7bc17078b7b6fafb4a26432bec06f355cdb7ea2dd08447ce1c7904944d412328682abafc1b6258ee65e561b68f9556f079111cb15399ffa
+EBUILD kontrast-21.04.3.ebuild 806 BLAKE2B 9706d62d04e26a1c75873f91bb31857f1eb10e5b8f03ef9e51cf8a89b319b6638aa1fc9f405f1937c1285aa03cd6bae75e9413419608be4f77200845a324f299 SHA512 1db8812774d39298a6a6679f1288454a44aba10314d509a7daaff7cfeacbd52beb5fe400e8e949d39dce6bda06f414205ed3c0413f77b741ecef7d8d4c7542a5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-accessibility/kontrast/kontrast-21.04.3.ebuild b/app-accessibility/kontrast/kontrast-21.04.3.ebuild
index 88b97cc55cc8..fab3238d9db7 100644
--- a/app-accessibility/kontrast/kontrast-21.04.3.ebuild
+++ b/app-accessibility/kontrast/kontrast-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kontrast/"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2ed8515029e5..9af12dcdf2f6 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index ea57a78b2f8b..bb743dd1b9f3 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -5,6 +5,10 @@ DIST awscli-1.20.0.tar.gz 2028152 BLAKE2B d746335fc3414e773fbf3cb60b68ea1242162c
 DIST awscli-1.20.1.tar.gz 2028927 BLAKE2B bd535f1eba64987c8389c8003b90a1361e95db00a62f13138b35d0f4b6a5130b2e52e38663f4560bf58fe6b86e668ee142a0228001d8cde583d096ce81612264 SHA512 b704ff3f482dd2ccfdf78d01ccff214c9cb9f7b12b1af0a7c615b9567a931a8bc47a444dd8f136a958346750a60fb03a084993a7deb0c234448a9889918c97e6
 DIST awscli-1.20.10.tar.gz 2047053 BLAKE2B 1ad45d2703e82c2be1a2847c2312d7199ef55aa7df33568be890c6ce72e03e05cddafeb1cce5c76a5f363bd397f744f1c229fbd5ea518fc53d24f2711e628207 SHA512 9c56ccc0191b319aa7035bce72da9cf1f9e97c9600a202e706244a5eaff419f305c7d68dbcbc96bb622b219efcd56ad6691b149fbf3daf036ebf627987b306f5
 DIST awscli-1.20.11.tar.gz 2047295 BLAKE2B d27c2fa2c1f665fe8f691e6d7ddd19a52b0f28e3d648f96f78e5b7f8c58f06252c99e49e739f45e8e70b126d5d3fbcf7f08fb54f837c47c2d3708152496435ec SHA512 d4ae3becbc9fdd863396504c43e4c683827706a7016e73fbd5e412cb8654ec5a3c0e10ee2c4d90455dd5427cfd73fe183d723f43030e4e35916389313dad06d8
+DIST awscli-1.20.12.tar.gz 2047696 BLAKE2B d65157579f088e00b7fcb08fd73a5ab9e3ea2bcd7fe4e80734865a4185cb7f7299d9d74f6f59d8bc41e9f4aa71c0f1eda73282fc5e1804c2eb3dcee7f0fcb1a9 SHA512 1d5584586a0fa8c47aaf3ee7bff5af320138e7c25ba605fd4b4a4de498ae795ad822ba3079c68ea2ed0cc57f6fbe696f55110ff979c347b2a5e14f8bb9fca4b7
+DIST awscli-1.20.13.tar.gz 2048380 BLAKE2B 5c469b2b41f7e7aa55f98e4d566f2659cb4a68b18d0e2acba3485ef4622b5763cbe324b1c2e6ef679f7968c2b8ca43aa29d8619fba612bba69cf7f9e7229ee6e SHA512 3e569d14fb34d9ee833c7bfbd83a303b8f95d4b84a1ff8e503063ecc3f434bc5a5e59c6bbfca5134be1c76f06796fde4a9e9647af881bc5f02268c8c90971289
+DIST awscli-1.20.14.tar.gz 2049156 BLAKE2B 2eed59fbbd11918451d64c76c58838c9d599eee042450211ed88bd25210a32337cd0766dfa1173bc2ae6e1f88f6cbe4995c54ca979b0b068b3b1dd312236de5a SHA512 f12aa5805fcdf5e958c4bb0c1320c412656711255932ff6cbf9ab7c14b85792f04a02bbb1911346fed0508ddfd3e7b5e3b731317921e3545e0e14bfe9b9c7ce7
+DIST awscli-1.20.15.tar.gz 2048948 BLAKE2B e7d378c9cb1752f4b7e014578d07fdc5f7bd9c14dc5fa33328a29c8fb9c9fab27f404dbfeea5952c243aeb35b0800c7840303d5f1339512d74cee2e4a5d590a1 SHA512 34c482067c3534737956520e5f6f0b3d30296f6de06969fe3ab43146a3190e36b432ea3642917c91e82659d5e79337add973f3f79216214f6b03b5cd15b363f2
 DIST awscli-1.20.2.tar.gz 2029411 BLAKE2B dad47f749af3c1e7bbeb291eb92889c7dc9bdc9e81ddb1fd3769897f94ba549123589a2ef8a34b88d8370cc6bb5ad45cc7b9fa06ec474620303a78ec3d64100e SHA512 6384a02a7bd3a8ea38cf46725daa25e7656e12c1f3f6465043efc223a82c605dbc916a26debc214ff6d364e81013e729acac424ccccc535785e8a3b68cfce2f6
 DIST awscli-1.20.3.tar.gz 2029411 BLAKE2B 6d8573709072ea3955696de0c65a32610446737a216f6c5dd4ecae4cffcb48ecac531cfc598517c037066d066cf0de01510c0740949450ad3a5925af79bd8c16 SHA512 2324800964de8b1af4ae39dcee15e8fc2bd5e11a239c245590a86fac6574d80b290fb9d967df82d6fdd412cd8b783fd209780e5e58846a16302fa13c6f3b93fb
 DIST awscli-1.20.4.tar.gz 2043470 BLAKE2B 58722fe4277a7950665913e8b9ae99de8017cfe8c4974a3524f917533499e830d2eea2ac0994022796b979869468b5f3a767727b4384f78e325e423ed003b1b3 SHA512 3066438ac58eb2afb83ae6fef516e09965ceea1e97897e4f5b5760046f28a2f822b16b90c0a9ee6a58c6cdabbfb2f0ce044caf41396093188290e2a7c1e8c4f3
@@ -19,6 +23,10 @@ EBUILD awscli-1.20.0.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b9408
 EBUILD awscli-1.20.1.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.10.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.11.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.12.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.13.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.14.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.15.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.2.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.3.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 EBUILD awscli-1.20.4.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
diff --git a/app-admin/awscli/awscli-1.20.12.ebuild b/app-admin/awscli/awscli-1.20.12.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.12.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.20.13.ebuild b/app-admin/awscli/awscli-1.20.13.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.13.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.20.14.ebuild b/app-admin/awscli/awscli-1.20.14.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.14.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.20.15.ebuild b/app-admin/awscli/awscli-1.20.15.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.15.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 60c2b4c466e5..0742b2d3093f 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.37.0.tar.gz 5232994 BLAKE2B 9d6a965a8c08e7a2fe1f2854c0af3e61fc880e01b1567c30a032742363b83a2a30f0f2ef5db0f4d6fbd96b4bb99feb3106894c86f084155e5dcb6b8eb1185517 SHA512 133cfc85289c13f849cc3e8987b209fd402363e4d413c8f36850b20177a4cbf74c23241a8a7473f1fa62e86d4c977f0787fa5eae2a2d52f829802e41918a9a86
-EBUILD exo-1.37.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
+DIST exo-1.38.0.tar.gz 5233640 BLAKE2B 11a0500690a5d9efe35d34b9f562265fb8ecee2d4d8e15c37ec4c2b99f1a5665120bffd5a8359e61c0763db530a3d3141deb08083b8289785e834861ba728b04 SHA512 f509eeacf1266893c8a3e4e09556987e33a533c1ebc64b6d39d7bd801fa5e11a6d8875c4111e760309ac6be0a6dbdcbcc227d0b4804c8f04e9d094c44ee9d0dd
+EBUILD exo-1.38.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.37.0.ebuild b/app-admin/exo/exo-1.38.0.ebuild
index 49b1772f318b..49b1772f318b 100644
--- a/app-admin/exo/exo-1.37.0.ebuild
+++ b/app-admin/exo/exo-1.38.0.ebuild
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index a845e807153a..ff844e1fb890 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,5 @@
-DIST hcloud-1.22.1.tar.xz 910672 BLAKE2B 51e18c530964677bd0cef8232c68031f3186b83fe0da91e8c6572b95130df32e5b00de6e734fb6cce56a51b6fca6136bb306d33ad4a6c728aac3d0afe634c738 SHA512 365823e779f526ae9cbbb50ecaed557c5a838b6614208e4d03e7eadb9569a2e2156e05e019aea2623a811defda707b8822d0eb09a4bfd7006262bd6a19e09aae
 DIST hcloud-1.25.1.tar.xz 1164932 BLAKE2B 21d3a0def3684a25c0cb629320f5617c93090d33cc95e66c42355c01afaf3189f8da858028220350bc1f1f53992b289ea75b56196d94ae41323602c4e8fee1a8 SHA512 aba79869553b19f6a117dc4d9f31935582e9ad89d12d9fd8f70087064383b76324483c78890ddb5965f98f2ca783ca46a17dee97b21716a1ff916647c1267a67
-EBUILD hcloud-1.22.1.ebuild 712 BLAKE2B 720832d21c95224d42bc4511184428280c532f7edd91acfa6ead5b71fe0f3d0243285bf07b196b8cf86d1cbd9e5bbcc3d5bae99d71fa3ac739d5306584ae61b1 SHA512 879162a964a3bf1b13a74a5ef4e916153aed3ef7096d481e2c2428e27b812f6f1c4e181fa42c591140949a57b538150dedfac3e9452676c9446114c2cb861a27
-EBUILD hcloud-1.25.1.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24
+DIST hcloud-1.26.1.tar.xz 1165416 BLAKE2B 256ff20e071a907fe314f1139673315f79239828d07797a482d5f34e328ae0ad16c627d481fb120e7eda880b6bf24b2e79cead3de8f41eca7b7c684c4cc62a16 SHA512 c875e1040c59ae82053d37f565e033098fc45eb356367e21de2359b4d569595fef87bceac14698a8afcaf87e38f335d0ac6f79950478f545e31101dbe756a203
+EBUILD hcloud-1.25.1.ebuild 712 BLAKE2B 720832d21c95224d42bc4511184428280c532f7edd91acfa6ead5b71fe0f3d0243285bf07b196b8cf86d1cbd9e5bbcc3d5bae99d71fa3ac739d5306584ae61b1 SHA512 879162a964a3bf1b13a74a5ef4e916153aed3ef7096d481e2c2428e27b812f6f1c4e181fa42c591140949a57b538150dedfac3e9452676c9446114c2cb861a27
+EBUILD hcloud-1.26.1.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24
 MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a
diff --git a/app-admin/hcloud/hcloud-1.22.1.ebuild b/app-admin/hcloud/hcloud-1.22.1.ebuild
deleted file mode 100644
index 358299f65bac..000000000000
--- a/app-admin/hcloud/hcloud-1.22.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/hcloud/hcloud-1.25.1.ebuild b/app-admin/hcloud/hcloud-1.25.1.ebuild
index 77d54006fe99..358299f65bac 100644
--- a/app-admin/hcloud/hcloud-1.25.1.ebuild
+++ b/app-admin/hcloud/hcloud-1.25.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE=""
 DEPEND="dev-lang/go:="
diff --git a/app-admin/hcloud/hcloud-1.26.1.ebuild b/app-admin/hcloud/hcloud-1.26.1.ebuild
new file mode 100644
index 000000000000..77d54006fe99
--- /dev/null
+++ b/app-admin/hcloud/hcloud-1.26.1.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/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index f67019579469..7e80a0b766d3 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -10,5 +10,5 @@ AUX update-hddtemp.db 819 BLAKE2B 2322abe8bc4c4f49a4c16267783d9d7ee46666e1e11b70
 DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd05007f4b4b8d74eb378ba810ea9aad96951b7a9b3b0f872130677fca1f294d86f855327dcfa5a263c9f3c7d58fbbba502e SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d
 DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
 DIST hddtemp_0.3-beta15-53.diff.gz 52845 BLAKE2B ae4ef1f98ff39a39bdb49b2752f6f442c6ebe8ea6b0e8e743cc3ab9ef39d07abe8970648b841b3974cd814fdef72bc59cfe93c4b4d1cf2a85de1a0d94c4409b9 SHA512 1006ffa92f9973eb1da6444f8e8eed681e641efd17a52954b0e6c5041ecae13108af4ed89534ec4f2799685f96191769d3b168dbbb96085dc801150c7c547511
-EBUILD hddtemp-0.3_beta15-r29.ebuild 2715 BLAKE2B 92e47499ee6e07415d61d03c9d0b5b40783c5e5c87890ab24c6fc6f562f9880e5a1655a78eb161049bc9bbff52b81f39b3d4049fe45879d61b8e8b8355634400 SHA512 4fd0c90a3b8f4c599e447d4de13f6b3ae6e31aaf78f79bb04ba937025115f4e796d84ce87ce6617e9286734f5aa90cb9ed5586a12845d1c2cf46fec09e340c8d
+EBUILD hddtemp-0.3_beta15-r29.ebuild 2714 BLAKE2B 81070724086181329790f2438be03a576ea308f2a88df6b63631f51ee24e7874cee8d463f5fe29e2faf5f7496a2b75b6ee42fa2c137aa3b46bf572a0b6a90a01 SHA512 7b368d0895c8903c053c657727a5fede22208e3575cc085dbb7800c99bb21fa03266f1157792e516345aadcdc07b22b5fd0d07809a0f372922f8c6a13dbdc438
 MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild
index aea00a74fb35..b2b589ab5190 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r29.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
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
 IUSE="network-cron nls selinux"
 
 DEPEND=""
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index af04c8d91c2f..9da67b91678f 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -4,5 +4,5 @@ DIST puppet-agent_7.8.0-1focal_amd64.deb 20931500 BLAKE2B 3c521631fb96440e51ad82
 DIST puppet-agent_7.9.0-1focal_amd64.deb 20934808 BLAKE2B 4b5c529e1a5cb5877a753b09a477fc08e7ca7a93c3b1dae5062864d2887adea584075f4ca6b963e01cb5121ce06008182cfc39124b9e22559899beb03855240f SHA512 b6c94b65febd6b76f1ab7af5f4f5238fb314b2abb226dd5828f09ca46fdf4cd22641f765ea338b3aeb7ccf6e0fe37d5682586fbef7dc27b51a654ded6f774495
 EBUILD puppet-agent-6.19.1-r1.ebuild 2112 BLAKE2B cb5c39b4053e2e7f9476d36571ef2d7ffb232dc61c01517d1cd1fd0dee6d093b9b07e95962d8bd3c7c8db47bd9fe70fadf49446dc0f0702271b01d7c40e59d80 SHA512 552fa439fcdac6b76218401a2a60c042261e27fafa2cda93e5b2bb52b7708488292f167e5102e1dcff42913abe779f5202d69fc241e38ecb140a11d8f2ba9901
 EBUILD puppet-agent-7.8.0.ebuild 1965 BLAKE2B 9524398bc6ddab603236762a151940c3a0c0ea55cdc686516904c0a1282248f6f9d1546ac1b792b22a4d3ad2d0998056c3c2485c6801fe5bf0e2be93b62c5967 SHA512 1f77777cee4cb41c8f53ba79784631f4549c1233aeb4896d870787fc4b3c7f5d98702d3bf5186b18f8b58b1c9c4f13dfc2f00826b3d57e2e11876f3c6aed8b02
-EBUILD puppet-agent-7.9.0-r2.ebuild 1961 BLAKE2B ec28bcc16844f62f7fa11488b356e8fa4800e2b251e6475e75551c9308ce6e18fdede9c0161b516bef87503ea528694da7c3b9de1dedb2ccf8b45ef6ba276df3 SHA512 d141479cf12efe11e187fdbc72e05d8b2308163610bca209df1edd41d0f5fac3f0dbaf608202e7ba145d6695dcf26ed0b20cf33e1b756850ac795d1f2673a5db
+EBUILD puppet-agent-7.9.0-r3.ebuild 1965 BLAKE2B bc57deeb3288dbc8fb4d33037ef62b12a0cf2369046b82f8479c6b221feeef52e892e31ffbd5a1c54aa25325952eeb186c6976e3dc73e8cf79f2ae3b4c28c0d4 SHA512 e33f11ad7c5db62c045e754bba406e4409b149527f9b1de4d1247cb6675fcb2059362aef912be490657aede0c270f466b6a3d3ebe7ada328d993bd9a3e988520
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-7.9.0-r2.ebuild b/app-admin/puppet-agent/puppet-agent-7.9.0-r2.ebuild
deleted file mode 100644
index 3b7141fcc4b4..000000000000
--- a/app-admin/puppet-agent/puppet-agent-7.9.0-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit 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[compat]
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	keepdir var/log/puppetlabs/puppet/
-	chmod 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd2" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../../../lib/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
-
-pkg_postinst() {
-	tmpfiles_process puppet-agent.conf
-}
diff --git a/app-admin/puppet-agent/puppet-agent-7.9.0-r3.ebuild b/app-admin/puppet-agent/puppet-agent-7.9.0-r3.ebuild
new file mode 100644
index 000000000000..c24ff0f353a2
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-7.9.0-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd unpacker tmpfiles
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+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[compat]
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	keepdir var/log/puppetlabs/puppet/
+	chmod 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd2" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../../../usr/lib/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet-agent.conf
+}
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 7efbe802cf20..e26ab4a33d5a 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -2,8 +2,6 @@ AUX ras-mc-ctl.openrc-r1 419 BLAKE2B 50239d64b95c1759a2fb88107b78875b9f6227c256c
 AUX rasdaemon.confd 109 BLAKE2B 20f78ff36701aa718e5dcb36b79949ea5f887ddc65219c335dddabc3440007d91bc5b53ffc499aa6ca018dd8108a2ea841b8ae111b10877be2005cc8c1aca299 SHA512 9e240c3a4c2dd741d2a77a0a9458e960da5480c40cd9b829546e5189d222b643b52c15252a6dc78aab8661d6e3c13b8d2288176c25cd8873b93b874b8d3c6c49
 AUX rasdaemon.openrc-r2 424 BLAKE2B d3be2b06631ec3dc60e464b5fb38a4778e92a93fc284455f53f6b7c43a05d182b79f478362ed93a706b421ca99f6a21afdd2cbd53d125711bbf1d0f267304ace SHA512 2e30602222443e519cefc1f138dc537f5e22109fde2f8ebb0f8962abd926721389defc46cfa8db667db8618d4dc4257d36e9855367c3c8f2b7d28cb8684a4adf
 AUX sysconfig-fix-0.6.7.patch 1226 BLAKE2B 58c30284cb2d7fbf65a6f9233a9fc934f7d48b184cb3364aede9d4080dfab398c41e9f91b9c1728a3bab584ea0881d67857e9e04ba4c1c5e9dedf3c6e119a91a SHA512 3923737c47b04edc80eb5cb3b0cc5fca597fa4dfdbe42ffc262e7cedaf5debc73996befadf3fae65c1244857eabded5844c067ec0f5f3fe9468b24c5f4b780c2
-DIST rasdaemon-0.6.6.tar.bz2 404681 BLAKE2B 4314cd064b255df1cb1a148914c856d074fda1fc2d63e0554cbf0b78799c4252afdd4e827390729e191ff2ed9f719f6610487e85dd52af2b02694fb17740df05 SHA512 481ecd624ab5521d60ee7c613ee05d1d19b85e914b92eae84d18cb2e6dc788981213d49a6316cf575517b6e180f46c66c65804e4feb518bdd84bc21cd2970e08
 DIST rasdaemon-0.6.7.tar.bz2 422473 BLAKE2B 32a95ed9ca217fb69b197f88fa296bf0d3b4230a1ae11c60582911ff84abbe8b9a67b318774b8c4b765dbedbd4458eb220ca3b8ff4c9d065eb893a9a6a9916c5 SHA512 15beae5d4964c49b7b7f9e731948b5def9622fba5d7d17ce52a282d7834d256366cdf3cf427b82b2a6a8fd0c99f202f545000bdb06064fbae7ae0296aef0946c
-EBUILD rasdaemon-0.6.6.ebuild 1216 BLAKE2B 65a8184eb5eb79ebce498d73cc6bdda0088174d5a7a6ff9aab4a70b4e400c1bda67ad5421c9f63e40511160d83185f40398751e9d89fbd42efc486f45e23c73c SHA512 47c4aa0af953a609ca7f178b8a4348ac7e46c879815b56bf1831019618272f05a4e26f94742335b0088cc741ae70e0ade7255780f89745a4429487887b432ab0
 EBUILD rasdaemon-0.6.7.ebuild 1268 BLAKE2B 34f2d2bb59ffb2a35c990980f1ff669712ef4a3d14e4e3270b0874b122a5323ca089ebf9df0558cac4ff88330b5b5c9ebdc9c1fac600f0b5147d2b3ab8843e45 SHA512 e7223ec552f72bc1c73b7a9831448a97b278f8654ca19449d08121fd93b3e80b541e4a34c6dbcc53ff887be3739866d0c9799357654089c65c3be9db59b3e010
 MISC metadata.xml 871 BLAKE2B c9b484c2fd3019681f9c335fc046c7718c35bcafd9fa46f59328c68fb4404571818b861cb938bcb00fa08a164688a58735d7db27e73120597cd114a3a39acaba SHA512 1815bc3a92340071b40de8129441bbf55fee7edbec94f5337d6a9b42311cc3c1d898598d0756b60b56d804629700a2c0109362933acf5442a74097e752b24935
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.6.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.6.ebuild
deleted file mode 100644
index 65a479d775e3..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.6.6.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
-
-inherit linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
-SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sqlite"
-
-DEPEND=""
-RDEPEND="
-	${DEPEND}
-	sys-devel/gettext
-	sys-apps/dmidecode
-	sqlite? (
-		dev-db/sqlite
-		dev-perl/DBD-SQLite
-	)
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	local CONFIG_CHECK="~ACPI_EXTLOG"
-	check_extra_config
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable sqlite sqlite3)
-		--enable-abrt-report
-		--enable-aer
-		--enable-arm
-		--enable-extlog
-		--enable-hisi-ns-decode
-		--enable-mce
-		--enable-non-standard
-		--enable-devlink
-		--enable-diskerror
-		--enable-memory-ce-pfa
-		--includedir="/usr/include/${PN}"
-		--localstatedir=/var
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir "/var/lib/${PN}"
-
-	systemd_dounit misc/*.service
-
-	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
-	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
-	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
-}
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index f351259a69b1..c4f2860cbf20 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -4,6 +4,6 @@ AUX sshguard.initd-r2 389 BLAKE2B b4098e0baf82e1c1f1978d6b3916fe9f2e67891d02b7b8
 DIST sshguard-2.4.1.tar.gz 723940 BLAKE2B 04e72b9959ef3ead418d2a6fe8029b0806a4d91c91f7cd36c236c7203cca1afc67305b21de0b1dee1594b188564f201ff2770d54d4c57c54b4d23db15e0298a0 SHA512 bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8
 DIST sshguard-2.4.2.tar.gz 835431 BLAKE2B f76cbe41ced4d23448ba09750d073a47dae263616c34ec2e2efd7d6367339d352925958b5d9d711a3c4a8c2da10fae2474384a3de14434c0dff19bd645325058 SHA512 f2fe35180af8698d4b2053e9ffbf17df9f033b0c2fcc045caa085467d14174e17aa266d2ef3ce9536037e54f7d3ea42de9e32e7faee65612894294793082862a
 EBUILD sshguard-2.4.1-r1.ebuild 1093 BLAKE2B 25f612896845751aa576aac877f1fae43e81fffe2830de361eb8f597034d1b60e5429d2e37ac87f29ea6f416a8710b2c7227827af71e8394b7a97da7ffd14fde SHA512 1a32abb81945b0fa36e8a8828dd95d328ce11df7d2d8d975daf523f5bd1af44f7e4b62c30f41e10a925cb0cc72e39590ff0cfc73b66d1d2b3cf4480113d5d90e
-EBUILD sshguard-2.4.2.ebuild 1095 BLAKE2B c5d6d6d4450f4d98fe6f4486f05b93105ed46297068f960f82ca7df8410c15e8a731f7570f9afa7657b085f52df7fdf2c3796e83915c435967b9a00df44d1fec SHA512 3f3b35389987a9bd004425b3fe15a3ace3abdc6370341ae2af66cd7688b90106810e0e6da349179140c02b5a36f3a44246cd40f62c5596a23b8c711df95d77b9
+EBUILD sshguard-2.4.2.ebuild 1102 BLAKE2B a0876a7bc5d376349e75991d336ac4a4c36f9fa59b8bcf6de1d64882a4732aaa5fade62c5fa252ea1741fd2b3d871d7dfd539bee7cf4ace21c20b03b723c5df7 SHA512 a0313a3a0b8d32a76823bb81db6d56d0224993055604b55ca4ccb52facb6781c3d3e420c8efef92002b5ba1b8b05b42bbc8fa4b25f885391d4792dc9fe873479
 EBUILD sshguard-99999.ebuild 1095 BLAKE2B c5d6d6d4450f4d98fe6f4486f05b93105ed46297068f960f82ca7df8410c15e8a731f7570f9afa7657b085f52df7fdf2c3796e83915c435967b9a00df44d1fec SHA512 3f3b35389987a9bd004425b3fe15a3ace3abdc6370341ae2af66cd7688b90106810e0e6da349179140c02b5a36f3a44246cd40f62c5596a23b8c711df95d77b9
 MISC metadata.xml 459 BLAKE2B 52a25ead1bb594b1929641a855e1ced3b2e9f8323892ff4f387f3f27cf329bfd6b89fe2ec567b9a4da3daf1792440421c466c95bdc206ac0d6a5e53339454fde SHA512 1389c2bbcfe412dcc96cb62f3e5a61aafa782adbef69e9861a380fc845f3f81d9412c6a1c3e8ac927fefd1e1959e4991dff450e4802cdff2c2924f1e350ae12c
diff --git a/app-admin/sshguard/sshguard-2.4.2.ebuild b/app-admin/sshguard/sshguard-2.4.2.ebuild
index ee4653a215e3..f85c4011fd60 100644
--- a/app-admin/sshguard/sshguard-2.4.2.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.2.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == 99999 ]] ; then
 	EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 028c55a318d1..a1264ea179ef 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 0821dd477b5a..3f27a036a57f 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,7 +1,7 @@
 AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649de9bfe9cbf445216d4e9d6a6e34dc065008d0129892240c98bcb6e7beb5443d4c459a1bb77eff664f7245 SHA512 04d5505074e042eca46a8dfd9d9a3a2c9af901d9bf7d98c219e8e1f8c9b9071bccbddfa3e17e86800de2606a10b26dc05d69948cd84ddd3075d6c1c51991bcc2
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
-EBUILD brotli-1.0.9-r1.ebuild 1764 BLAKE2B 8b90b73dacd0a643ed34441378026d5e20a5c50797e8dcac32f9627db5b7aebaa65cff74cf30ab6cb4c6cd6c1a5fc529c73fb0d7d2859e486e9a1406b274a0fd SHA512 6becec9055b96298bd5ce44c5af713901febe38db8160a2499bb63e41adb9386dd3b16160f5852e4df4d36bb26aa014dfb59fcc9d0ad37f85c5ac0a77def0c9f
-EBUILD brotli-1.0.9-r2.ebuild 1844 BLAKE2B 5f893ab9ac890c2cbc99cc1ca32f7f70025c6c1ba19b446707dc02e39705122174d8ef0c427ae8c7868d62068351ad3fabd98454884955239fb292f8133dde89 SHA512 df465b7696180a308755d6b093b178bb3c2569cd88eb46bbdfafd616305be36c6a7113dc8bd790b736fea36a4b5ec2ae5c640564423acbe0dd1c652cd0a9214f
-EBUILD brotli-1.0.9-r3.ebuild 1833 BLAKE2B 50aff721004c8e3774c5b0c6aa260868a85112f26a9f3a802b67873a5afffecd6a0ddb1a9901eab42ef3f86724442c8a9dc1c20787b53813cfb0547372cf72d7 SHA512 c284694401fd59898446730faaf190d29fce3c335a742aa83a5afa951f65fc009dbf5860d1714eb94d54335e47869ca9d85232f15ae0dfec336c0d840a808616
+EBUILD brotli-1.0.9-r1.ebuild 1770 BLAKE2B 3e1589455d366aacf95ac7cf48c7fb76c844460b726ec041102335205b25097284b4ce4c204aefdaaadeaef57bb6e9fe6063338e31a5dbaedb13273a40e13ea1 SHA512 cd9d7cb565277e28c162856eeed8a2ab014cb195843e4ae29ceec8831a13fab8648f7042343bca9a5373677ebe81596243688da56464981e1a68c78be964bd08
+EBUILD brotli-1.0.9-r2.ebuild 1850 BLAKE2B 9cba3ae4a4e4cbea4b9354a62f233dd5ac74db8a5c2771cbab9c40efefc91ff14442791d4970e4267870866910785651098ed4ead03c6e1b8eca4dfbb234d63a SHA512 eec7e10851552abb5404716918b454cc5d6204703c694b354eacd9e68781444fab5c7e5dbfed0d47b12e3f48cdeb773f2b801c8a08690c5a242270793527184f
+EBUILD brotli-1.0.9-r3.ebuild 1839 BLAKE2B 001cd9b021aabdd878faa08bc69533855f883782f862a01d8ffdfbe29bbde155eae07306aabcaa4ebdd4d4a793a72f06b5be38f44e3a8ae120b860fce1330498 SHA512 d2a229b37783e1acb5a1f265b6bd9659b2df89b670a96c6428e4f080ed5c1e126d3a18c22375f54a55d03fd6daf50d3deb7a253e94a19f66d8409e9932b51f51
 EBUILD brotli-9999.ebuild 1719 BLAKE2B f507433812da5169b8e3464b60d626d8f1c632fce3166004d79e55e16af0aa71d33bb35c3fa42094166d4fa0f6b88b99225a2caa4b36db567d83c629f9ffbb4d SHA512 b30a75fe48c06310ecefa3e857d9278ea4a7a96ba69af19be330d8b8cd899c5ea1b78ccaaba49bfc9297fbba3aab83809bba9b2d176053f1613f38baebe48015
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.9-r1.ebuild b/app-arch/brotli/brotli-1.0.9-r1.ebuild
index 0c769173704b..d03b1d78ade1 100644
--- a/app-arch/brotli/brotli-1.0.9-r1.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 
diff --git a/app-arch/brotli/brotli-1.0.9-r2.ebuild b/app-arch/brotli/brotli-1.0.9-r2.ebuild
index d46e4e435add..ccdea45cc777 100644
--- a/app-arch/brotli/brotli-1.0.9-r2.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 
diff --git a/app-arch/brotli/brotli-1.0.9-r3.ebuild b/app-arch/brotli/brotli-1.0.9-r3.ebuild
index c7fb22d4ea72..5fbf7996e366 100644
--- a/app-arch/brotli/brotli-1.0.9-r3.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_IN_SOURCE_BUILD="1"
 CMAKE_ECLASS=cmake
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 3bd601768eb9..f983d574efcb 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,3 +1,3 @@
 DIST gcab-1.4.tar.xz 78240 BLAKE2B 8b857c116fab636db93463cee7d6b809c3c7b2bdf3896b7b5b5b66ebf270b284b356710933ec17584143bcef5c1f5c555811dd05ea98399f327047476a33fc16 SHA512 66a2e0d0a5888c555153356ce808f602053e71b76af19794db7e3bbf9516fe791805068838b4e208698cd645ada7a08610ac95f846fa81e00a9b955016306299
-EBUILD gcab-1.4.ebuild 1116 BLAKE2B 51072f0a075a8819345b64222721fb359ca4e0595816e82e87bb8ac38cb38a74ac371718d0f896f25d6ac431dda7b2790c5877d8d4c9a4c86618b9338f45894a SHA512 b09333d9808ecf4412b18ff4316febe0ff1968b1f05f08ae32b73ec431d198cdc5b017887a60716656109ed6c2b521a93ac7fc1f30d43496867e42855d7e3bfc
+EBUILD gcab-1.4.ebuild 1123 BLAKE2B b8169f5333b10bb26ec27ce57bb3f471c96fa9678bd7ed58db34a18a938054373e07ad8d8e2e9f2b585c2acd054f337219cce083eda6d4516267dbf136767023 SHA512 70ad8b8ec248aebb03e3806e50db1b370a7040ebec8e16e481fd343591fe20f84a160b1a476acc185c9acd70f8c3de7e993d307a3f14cd793691651c49249ebd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-1.4.ebuild b/app-arch/gcab/gcab-1.4.ebuild
index 38e48924bd1d..8b4a5c52d717 100644
--- a/app-arch/gcab/gcab-1.4.ebuild
+++ b/app-arch/gcab/gcab-1.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index 7bf7c7ef4bd4..2442c738a43e 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -2,5 +2,5 @@ AUX pbzip2-1.1.10-makefile.patch 263 BLAKE2B 32043c1a47504a2e901d9c4cb4360f295d3
 DIST pbzip2-1.1.12.tar.gz 47826 BLAKE2B 62b1e47b7b67f2a27f31032654506552c33e68121dd50d3496dc746a405cf783807c4966058feb1aebda2080ae1d1d22e944d057ea3a0dba2f9247ea46b23eb0 SHA512 bb68e87867295b89ee6fb76a8b72834daebf0ca6c16b2f10bce67fe7386716a728acd28bf46a9732087202ca0cc774f02c741b0b58801184bb7550f6fd119cd6
 DIST pbzip2-1.1.13.tar.gz 48015 BLAKE2B 1bb410acadc728963c3a04d2665fb1b1f0c206a893ed90352a9c16512e9bd5f82c3f5f3b383b382134bbe904735a1c8a81615a8bc54de8c6bc91633d9ce72c57 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8
 EBUILD pbzip2-1.1.12.ebuild 1065 BLAKE2B 24d74afc0b0f91da9de6775bdefef2ca1e9447b48e2a921ca3ccfde4338d6f744597a41e8b0e9c9b340d8214ab626aa0914e8961c43c005e2d707f60cd5846cb SHA512 2c77819b5770e25e8a1f6257fb16d2129658d7fdbfa3d33ed3e685e305919b6d489306b2c3b656531b35e46054a31a67e824b244e9cc0d2cde83acbd56d1f169
-EBUILD pbzip2-1.1.13.ebuild 1171 BLAKE2B 974f7ce95fb7acc396592de66ab149945cab1cc50e90cbc62b2902d274458a1020a478709e0ee7ed5a8fb9dc964f4dfe0684cd89d826962d73bf9acaec213600 SHA512 2c049258df99ad8537f204f83ca337068f74d59caeff71fe462d3bd6e28c5416fb214167f9aeaac9a31439c10319d1a4b6f97cf3e5d8655d262f19dff79be145
+EBUILD pbzip2-1.1.13.ebuild 1164 BLAKE2B fce0e3e829bedd2ce3848f8aaeae60496a52aea9f73a97b434628885960a5c33a091178d6fa4eca62e6629faaea189a4ceb05a10a79be1ab79a46cbb081dde76 SHA512 cdb613064e9bdf38c4f7fb4829eac18df46bb8dab4e049b63f50e9e7c6e7268b4627a4020636c050b312805072fe816e25e104284a06ec1346635c91a49e0d98
 MISC metadata.xml 443 BLAKE2B 3a25a8281989265bb3339d4b46442e5c73920567ff19bd12e57a6aa41d40534428e409ca9dc548318d2487288e12e2c6bb305809c7585c3d6742c8709a649d9e SHA512 fbac33ec453bfd5c9cec5ca30ce938281a9d1d280e8936977d77e3fe23e802345814e343d9824cef18164aa3ad2b2aab421239593bfe36f100dcd787739761d0
diff --git a/app-arch/pbzip2/pbzip2-1.1.13.ebuild b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
index 6304e2335b93..2cf98bba0e39 100644
--- a/app-arch/pbzip2/pbzip2-1.1.13.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static symlink"
 
 LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index a0df0129f485..a520e6dd37a5 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,5 +1,5 @@
 DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
 DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
 EBUILD zstd-1.4.9.ebuild 1670 BLAKE2B 4ecc7d03f5dd84ea8d21325d79e605e0240a97b437aa89f086b29f70236c91122021e793e02c96481e6ff44b2aedca24d56fbc5bcac016f54016e3a65afa1c3f SHA512 f5556bfc7c0118b6a757b464d905e59cdbbf8de0739f1816b17fcff7c12eee6576c834f78408a3c9253615bcf5e967f8a9d4bf6183399a9d24549df64bfc6f96
-EBUILD zstd-1.5.0.ebuild 1671 BLAKE2B 4f1fd55fddfbcf5349978f30b17965e4f26af2b868f9c448f6dc10ade08ca7a2ed236c2ddf7cea592ba917fce5f7f6c35790a4568385753bd0533f75ef57a304 SHA512 0868d7d30c752e2f9bd84bbe14c06b9240ceb0c9e1f829e948ce090a3638ef66f4f42e1463673bbafbc4fe1c412075adafd316f0b986a4d71c89825a7daf4ee4
+EBUILD zstd-1.5.0.ebuild 1670 BLAKE2B 4ecc7d03f5dd84ea8d21325d79e605e0240a97b437aa89f086b29f70236c91122021e793e02c96481e6ff44b2aedca24d56fbc5bcac016f54016e3a65afa1c3f SHA512 f5556bfc7c0118b6a757b464d905e59cdbbf8de0739f1816b17fcff7c12eee6576c834f78408a3c9253615bcf5e967f8a9d4bf6183399a9d24549df64bfc6f96
 MISC metadata.xml 409 BLAKE2B c955efa52a6bb0508c7a648281351c4eb37c8d0381b71317948fb33fcf49acd837ebaa86a66d46c561ec86b97a914f64795ea424ee2f9fc06ae13a5e00343ac8 SHA512 d3a660c20edfc5f404dd02df9819178e7501483db8a548b434cd6f19d9634352b80a6118d5bb5bd27496f0d1a7d5e1aa9adbbc21f1604bfa3f78aa99a252d1b6
diff --git a/app-arch/zstd/zstd-1.5.0.ebuild b/app-arch/zstd/zstd-1.5.0.ebuild
index e4916f5f0bc5..da3fe8961c8c 100644
--- a/app-arch/zstd/zstd-1.5.0.ebuild
+++ b/app-arch/zstd/zstd-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs +threads"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 22d64f59d0ca..62f533ac92af 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index c69e0ec561c6..bde9783df0b1 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,7 +1,7 @@
-AUX duplicity-0.8.17-fix-docs-cmd.patch 868 BLAKE2B 15d7843d53fe56142c582fbf4531406795f8c30abd1ae1afbf8e4ab702f6a34689f120519e6c0eb49fdbe0824b96b249f94a151185fb69d879959e428a760a8c SHA512 1eed49dd38d1af1001356fc8c3114c3d0fff4c96eb1f697b588efc94641b51c4a45e5265bf8a03007f44622536eb4505ee9cd227cdb7292964fc629102df9eb9
 AUX duplicity-0.8.19-fix-docs-cmd.patch 628 BLAKE2B 6acf30fd8881a14003a158e76a23b81af0e049c090c671adbf147c7a77b5ed57e75b9c9b169e38a06fdceb310bdc4f74bacb543a66e5820d3d1ab9951dca997d SHA512 6b2e401d6ce8c2ee41dd1ea8ffaed7602b8167fbf0cf465c214ddf8d1ef8af8b74a1a6c93741c6b34705b53b2caad438736a6ee7c6c3483b11d8ede029758348
-DIST duplicity-0.8.17.tar.gz 1351433 BLAKE2B 39c87c421bb8a4bf27e60c16b6dde559ed4468a1062f02623d8e37deb62e63101b6fb5524e5a991139d39422cab2803b89007bf1ca5819817ab3b53d5318b88c SHA512 6f9f6b45953d2bc7ed403d68bdc419f384e07f831c783af720f15f88b100f5becb3f83f65cfc715b02686c24d18c5ec8f80c27789d1ec01cdc8efefa7590c211
+AUX duplicity-0.8.20-fix-docs-cmd.patch 628 BLAKE2B 6dbcc6b64b870f798b4bc62730b05b1753688163fd7629326324d7b68d8360b72604380416d53db0042017672d08875cd3c75e8d36554b72b99b52a6bc88c4d3 SHA512 bf9c51a3409ca7b234e3ca83552e378322668ca12c5f3682d796aba765007e86572beab310d0050411894beda85e753e3d6385a1a0bed2cae28212c4d28750dc
 DIST duplicity-0.8.19.tar.gz 1372739 BLAKE2B 6a5a642597529eea37c7224cbfdd115db42c16f6391e553454f8f82cea86240bbd68a62513129496a1f978411fdeec50c3d918bb99b470fa1444fd77e7e6c9b7 SHA512 c1a1f5894f8b94ac61bd98270f138c58ef5a68f3624e7e88224b15539ca6e08874df9cebb36b10167d133b1af6a93b29e7bf4084c348b9cd7914ff24415be57c
-EBUILD duplicity-0.8.17.ebuild 1192 BLAKE2B 80d739f5f1233b296fdf055c5dfbc2560c235bb68cd5ab422e9cf1a3d4a977702741c9f8ebc8c4797a2ab3c0874fc71c0e33e3c27f244786a88fc5773b54ab01 SHA512 716293085d14335e2d67f6bab2cbad7a78bd1c60441b587f2cbd21a902b25054bf175ff876c62ec39e176575cef2d57d8ddf07ed608b646f0fb9c2754eec7ef3
+DIST duplicity-0.8.20.tar.gz 1376671 BLAKE2B af3fd95b699cd9b3c6bbe259e0dd898fc058461efcb2d1d51c8c2d539df7e32fe70fb6af4b314cd6fce219345f23eb0ab342d0c7f28b05ec1ee4333c02d93415 SHA512 ac43473a18031fa33cee0b7a3dc6b33c830ba9d19a0129c065a226824af8aacf00230ae05bf2e0d7614ad4ce9724e40e9b8305114175af63d8a8a8642ffdce67
 EBUILD duplicity-0.8.19.ebuild 1202 BLAKE2B b2ec8a0ef183bd7b20d018c44eca71dc7440ae910d2d97d5f0ba9185cd9982d091bc79400cecd1bcae86efb46178973aae9c467b7749db976bbd7cff9b622437 SHA512 6cdfb73228e6327fad27f28725d48353b9e1c933470c51fd73d5aec98623916878a69964cea9fb0dfd812fcd1abd99f3ef7846b9b1b816db5117e68929615f43
+EBUILD duplicity-0.8.20.ebuild 1204 BLAKE2B e3174011303a8557ff6419cfc083e96b74137076a60806ddc8fab2e7ff89816fa7d29ba873cc80efe17f8dc39c86670ef2474f75b035001f9571062943c959ef SHA512 eee4782590317211f959fd1ac24013e4c1dd0e237ad174bea6415e3af4e13a72abbf89451375506cb7b8824cc6bef57f0539cfa5f2e4f5c75907b7ad18ecb259
 MISC metadata.xml 454 BLAKE2B 08e99a3d0e80e38e1ec062be7e4a1a4cc5b8d9e579381142a7c274c27cf585b7c3fd62fa14b1b2b486ec26d8aec4f7dcbc91fa7d8400b36fe609e240c67d6552 SHA512 a4c895eaf690f40fc197acf26501b2da386a3af716b4dda87d84e2d459ef9642e19e1e5ebca8a6ae156c272321d82279e573eaaf1ad3e19e7d5dd35e9f9e69ea
diff --git a/app-backup/duplicity/duplicity-0.8.17.ebuild b/app-backup/duplicity/duplicity-0.8.17.ebuild
deleted file mode 100644
index 8f7cf391d022..000000000000
--- a/app-backup/duplicity/duplicity-0.8.17.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="https://www.nongnu.org/duplicity/"
-SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		app-arch/par2cmdline
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs-cmd.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "Duplicity has many optional dependencies to support various backends."
-	elog "Currently it's up to you to install them as necessary."
-}
diff --git a/app-backup/duplicity/duplicity-0.8.20.ebuild b/app-backup/duplicity/duplicity-0.8.20.ebuild
new file mode 100644
index 000000000000..4b901f06dcdb
--- /dev/null
+++ b/app-backup/duplicity/duplicity-0.8.20.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 python3_8 python3_9 )
+
+inherit distutils-r1
+
+DESCRIPTION="Secure backup system using gnupg to encrypt data"
+HOMEPAGE="https://www.nongnu.org/duplicity/"
+SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="s3 test"
+
+CDEPEND="
+	net-libs/librsync
+	app-crypt/gnupg
+	dev-python/fasteners[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		app-arch/par2cmdline
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-docs-cmd.patch"
+)
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	elog "Duplicity has many optional dependencies to support various backends."
+	elog "Currently it's up to you to install them as necessary."
+}
diff --git a/app-backup/duplicity/files/duplicity-0.8.17-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.17-fix-docs-cmd.patch
deleted file mode 100644
index a0fce6b2c5d8..000000000000
--- a/app-backup/duplicity/files/duplicity-0.8.17-fix-docs-cmd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- duplicity-0.8.17/setup.py	2020-11-24 19:32:40.089024404 -0500
-+++ duplicity-0.8.17/setup.py	2020-11-24 19:33:32.326309755 -0500
-@@ -93,17 +93,6 @@
-                 u'bin/rdiffdir.1'
-                 ]
-             ),
--            (u'share/doc/duplicity-%s' % Version,
--                [
--                u'AUTHORS',
--                u'CHANGELOG.md',
--                u'COPYING',
--                u'README.md',
--                u'README-LOG.md',
--                u'README-REPO.md',
--                u'README-TESTING.md',
--                ],
--            ),
-         ]
- 
-     if not os.environ.get(u'READTHEDOCS') == u'True':
-@@ -339,7 +328,6 @@
-         ],
-     test_suite=u"testing",
-     cmdclass={
--        u"build_scripts": BuildScriptsCommand,
-         u"install": InstallCommand,
-         u"install_data": InstallDataCommand,
-         u"sdist": SdistCommand,
diff --git a/app-backup/duplicity/files/duplicity-0.8.20-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.20-fix-docs-cmd.patch
new file mode 100644
index 000000000000..6ce5860e1959
--- /dev/null
+++ b/app-backup/duplicity/files/duplicity-0.8.20-fix-docs-cmd.patch
@@ -0,0 +1,20 @@
+--- duplicity-0.8.20/setup.py	2021-08-05 09:14:41.483669131 -0400
++++ duplicity-0.8.20/setup.py	2021-08-05 09:15:35.086895059 -0400
+@@ -94,17 +94,6 @@
+                 u'bin/rdiffdir.1'
+                 ]
+             ),
+-            (u'share/doc/duplicity-%s' % Version,
+-                [
+-                u'AUTHORS',
+-                u'CHANGELOG.md',
+-                u'COPYING',
+-                u'README.md',
+-                u'README-LOG.md',
+-                u'README-REPO.md',
+-                u'README-TESTING.md',
+-                ],
+-            ),
+         ]
+ 
+     if not os.environ.get(u'READTHEDOCS') == u'True':
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 306ae5f552e6..d26cd023d9d0 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest
index b2ac61511900..bac7efd10e94 100644
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@@ -2,5 +2,5 @@ AUX dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch 1626 BL
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
 DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 EBUILD dolphin-plugins-mountiso-20.12.3-r1.ebuild 1617 BLAKE2B d1a164b89a1b104202b93fd2fbea195afae867108bc55be65e04911e4a5cf137fdda16120be33a237bd7775acbde9428300e111df3270b2178649242beca76a5 SHA512 9b5b7e4637ffdcf1ebfbcce3a8e388c41c76b0add4cdbbeeed3672cbedb1cced8bde480c0b97f8edf8f0366073b768cfd92e76508459cadacf41015bd220fdb4
-EBUILD dolphin-plugins-mountiso-21.04.3.ebuild 1523 BLAKE2B 1127b12d30d2085ccf7fa8a250b85c4c09bca675fa9ba1ed03b03ce8b915f266a9435d4eefa004883ac4a0bd8a46836bd50e67b83cf31e070a87406a498de53f SHA512 b416ed8a83721ef91876c20d5af0d04fee27739ba1999c2a622d8909ce8ce965d5ca7057b2aab00dd33330e0bf8d62be1b2573cab56358d756e45df3a3ad1810
+EBUILD dolphin-plugins-mountiso-21.04.3.ebuild 1521 BLAKE2B 0d96777251ee500daa965783227825f48cece4f3a4b310432e1c61c9cefe4020dc5240cb316a7da4ea8c52243cdfad6ef78c7e51a7c16c3fd02b5a0e1bdf4840 SHA512 705ecd6cdca1169393d7f70e9044bca021d7ce7c0742838366d324817b9ea634c994c2ed8fbea0dc67784847071a546efa5abc87087d5be5753ded328db78838
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.04.3.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.04.3.ebuild
index d0900ab81df2..c3170080a746 100644
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.04.3.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.04.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index e95ebcb3cde1..32ebc97fcdb6 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 187d718ce6b0..41c9c1d178b0 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
 DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
+DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 EBUILD acme-1.16.0.ebuild 1679 BLAKE2B ff4806292419911de014008dc51d250464f90368325db9a0cd73b6ba2881c6f60563fd7831d999ffba75772cbfa24af517d9fa52556f260f13c5855400d635bf SHA512 fbdc63af62a50e9ca6f98ed17b1b1be58a0a206b4e0940557b592f715a3d8bb81c6432132623e497e94806d595d4e71f0a660512c8ee23bd15b84088a62821cf
 EBUILD acme-1.17.0.ebuild 1681 BLAKE2B b3ede9a67c5e6462e623921bc02190a909c2b22d712c527a9de590af5892fc4770d9d3bd1174a0f0f1fcb054a93fdb88862b315260b74aae3755f666d1d91cfa SHA512 61652a5c834a08bcfe9aa806a985c25c9845022db1d458b7e8d77629a483269e41e583cfff536097bde43ad02a021be3652c5a73eda0f4661aa206aaff800eda
+EBUILD acme-1.18.0.ebuild 1721 BLAKE2B e5af881b9c3167def1a77e33ee8352e379bc584d1782eb3d927926368745781fa4efed3ec6cc40b7f72ccf47b13eb8b00552500f745507afe8115230208564e0 SHA512 577b685bdbf2e5593f6dda84ca809ac440737991d7fe9f304a8a9a19d8b231752d8e3f77cb130b3a51ac27e574dfc677bb9b6b911905d13cc907b0bd58b1af3d
 EBUILD acme-9999.ebuild 1681 BLAKE2B b3ede9a67c5e6462e623921bc02190a909c2b22d712c527a9de590af5892fc4770d9d3bd1174a0f0f1fcb054a93fdb88862b315260b74aae3755f666d1d91cfa SHA512 61652a5c834a08bcfe9aa806a985c25c9845022db1d458b7e8d77629a483269e41e583cfff536097bde43ad02a021be3652c5a73eda0f4661aa206aaff800eda
 MISC metadata.xml 400 BLAKE2B a09af005ab6b00b9eb6e9252814273c932609e4dd6020c2289f5dafc8aa3e6bcb9696dc887767f29271af4a93fae73116f688937613ff9a340d5747a801097e5 SHA512 92c877fdfd16f55997573f2719eed9a9609fe34baff4c8b09bdb500c9eaf3e2bd3536e60127f171a92c4a1b8d9446e00208856754758c21779a8bbd137c3fab7
diff --git a/app-crypt/acme/acme-1.18.0.ebuild b/app-crypt/acme/acme-1.18.0.ebuild
new file mode 100644
index 000000000000..2addb06332fc
--- /dev/null
+++ b/app-crypt/acme/acme-1.18.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+	distutils-r1_src_compile
+	if use doc ; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests -w ${PN} || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index f2b9fc95cba4..169961276d26 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
 DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
+DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 EBUILD certbot-apache-1.16.0.ebuild 915 BLAKE2B e6cfa64a1bfad2719088c2ff8355040b8a607833f3372deb7236a0660788a4a4f7957df10aea8c7d9fa82ffe47ccc2c68542b1724f07f9495299166b87a4cb51 SHA512 91c65759d818a7c8c279de035f8280dda7408d46108139e689038906e212628d4a69b7a427448fb36a726090e0aa0805043da8a78764f6e3b925f44e94a657ae
 EBUILD certbot-apache-1.17.0.ebuild 917 BLAKE2B 6664a0470bc7631d492a7aa9b0b04cf0c86d6a60aa8056acae86f2a3bdcf137aae5290a320b18c323d0d6ab6178b304c2d9d2e1bdc4ae21237e7afa6fb4874ed SHA512 4047b9448fc589864019c87d08885480905c3da411f3b86774be9ac806b70db72ee60c01407eaec43f40d44fceaab23accc53d0bb4dec65a201d374d7457f5e3
+EBUILD certbot-apache-1.18.0.ebuild 917 BLAKE2B 6664a0470bc7631d492a7aa9b0b04cf0c86d6a60aa8056acae86f2a3bdcf137aae5290a320b18c323d0d6ab6178b304c2d9d2e1bdc4ae21237e7afa6fb4874ed SHA512 4047b9448fc589864019c87d08885480905c3da411f3b86774be9ac806b70db72ee60c01407eaec43f40d44fceaab23accc53d0bb4dec65a201d374d7457f5e3
 EBUILD certbot-apache-9999.ebuild 917 BLAKE2B 6664a0470bc7631d492a7aa9b0b04cf0c86d6a60aa8056acae86f2a3bdcf137aae5290a320b18c323d0d6ab6178b304c2d9d2e1bdc4ae21237e7afa6fb4874ed SHA512 4047b9448fc589864019c87d08885480905c3da411f3b86774be9ac806b70db72ee60c01407eaec43f40d44fceaab23accc53d0bb4dec65a201d374d7457f5e3
 MISC metadata.xml 358 BLAKE2B c94560461dda9d2d671208dd9a7e25586f86fe262bb06303a2a5e7f6f717d6936abe8c16dc6c7308aed4f8d11d4d5ae69969367b14d5bcfe838f60fc8b583642 SHA512 04670ec371be696e3da0328059ac4a336995a230823b10b6e5073fdb780ad1b873d510f31ec6c324b82562c0cfc86bfd3cbd797ef577fba7dccfe50c496627f7
diff --git a/app-crypt/certbot-apache/certbot-apache-1.18.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.18.0.ebuild
new file mode 100644
index 000000000000..7f0e325d33df
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.18.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=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 0c09353d03e3..255b46d8009a 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
 DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
+DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 EBUILD certbot-nginx-1.16.0.ebuild 933 BLAKE2B 019025bd57899cca498bc2011e4d4822a0aafe94b974cc785eb8c770b6a7b00c19f9891f5ed890046467d6ebb31fd1f9b1452b63c2e2c6eb7cd09db318a282f4 SHA512 57f1466ad320578076f5ab974d92791fed4c2469df0c91ca21b649ea86ed0dc6ab9caf5c0db7d669944e893e40f2fbef33eb42a1addf7d11cac310616cabd2c2
 EBUILD certbot-nginx-1.17.0.ebuild 935 BLAKE2B c658bd5e5c2aae786e6e41cf77fc840c61e2fd1b7470706bb4cd573edf2117344ab29173fb24ab370e9ee3a5f28c644d4cb12a4bafc5cedb72ad4282627939ca SHA512 c3c33b250a0e830d4498a5864643b117d0b2c29b4130795aafb135d7b369754836a65704cdc437828a5f8991368c2b03bc5b11963328e5c6cf826c92d42c5f80
+EBUILD certbot-nginx-1.18.0.ebuild 935 BLAKE2B c658bd5e5c2aae786e6e41cf77fc840c61e2fd1b7470706bb4cd573edf2117344ab29173fb24ab370e9ee3a5f28c644d4cb12a4bafc5cedb72ad4282627939ca SHA512 c3c33b250a0e830d4498a5864643b117d0b2c29b4130795aafb135d7b369754836a65704cdc437828a5f8991368c2b03bc5b11963328e5c6cf826c92d42c5f80
 EBUILD certbot-nginx-9999.ebuild 935 BLAKE2B c658bd5e5c2aae786e6e41cf77fc840c61e2fd1b7470706bb4cd573edf2117344ab29173fb24ab370e9ee3a5f28c644d4cb12a4bafc5cedb72ad4282627939ca SHA512 c3c33b250a0e830d4498a5864643b117d0b2c29b4130795aafb135d7b369754836a65704cdc437828a5f8991368c2b03bc5b11963328e5c6cf826c92d42c5f80
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.18.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.18.0.ebuild
new file mode 100644
index 000000000000..b4f61386b477
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.18.0.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=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index a1b24059bc3b..cf572427c293 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
 DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
+DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 EBUILD certbot-1.16.0.ebuild 1150 BLAKE2B 3d12f9623927d69800604d841f3159d131160be4d80bd1ff44242164c813600a117778c22f6bad056ff22412897a7449444d6cd685123ab390afb7b75d2787b5 SHA512 4fae07647cb002f625e7fff6dae5d6a15bcaa9dbdf3de847c1f8dc8cb6e4b5e2f64369967f0955ab10451921e0c200504478956fd7903ed32fbb04978bc4ba2e
 EBUILD certbot-1.17.0.ebuild 1152 BLAKE2B d30a158dbe17a5706583ce7de83f152e5627d5481318b82a0ef2fd9dc5b99c0109a65c819878dc86fbc715d42d707e9a6556fd7ab9a599264209aeae7f7823f2 SHA512 15f463ff5a385e639ab8abe14f064e1c8da5ad14255200cf21ea90083eeaccb75dde1e054be2b193452e81af25f6ccb9f4933343cb5071a3d920390af9073de1
+EBUILD certbot-1.18.0.ebuild 1152 BLAKE2B d30a158dbe17a5706583ce7de83f152e5627d5481318b82a0ef2fd9dc5b99c0109a65c819878dc86fbc715d42d707e9a6556fd7ab9a599264209aeae7f7823f2 SHA512 15f463ff5a385e639ab8abe14f064e1c8da5ad14255200cf21ea90083eeaccb75dde1e054be2b193452e81af25f6ccb9f4933343cb5071a3d920390af9073de1
 EBUILD certbot-9999.ebuild 1152 BLAKE2B d30a158dbe17a5706583ce7de83f152e5627d5481318b82a0ef2fd9dc5b99c0109a65c819878dc86fbc715d42d707e9a6556fd7ab9a599264209aeae7f7823f2 SHA512 15f463ff5a385e639ab8abe14f064e1c8da5ad14255200cf21ea90083eeaccb75dde1e054be2b193452e81af25f6ccb9f4933343cb5071a3d920390af9073de1
 MISC metadata.xml 358 BLAKE2B c94560461dda9d2d671208dd9a7e25586f86fe262bb06303a2a5e7f6f717d6936abe8c16dc6c7308aed4f8d11d4d5ae69969367b14d5bcfe838f60fc8b583642 SHA512 04670ec371be696e3da0328059ac4a336995a230823b10b6e5073fdb780ad1b873d510f31ec6c324b82562c0cfc86bfd3cbd797ef577fba7dccfe50c496627f7
diff --git a/app-crypt/certbot/certbot-1.18.0.ebuild b/app-crypt/certbot/certbot-1.18.0.ebuild
new file mode 100644
index 000000000000..bf9117a89b96
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.18.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index a35f7d6fc322..3725309e79c6 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,5 +1,5 @@
 DIST gpgme-1.15.1.tar.bz2 1699349 BLAKE2B d3a6ccaa35360ed3fc79364dfcc3f2fdcb70e5e41ac72ef011373a39d5def9be9ce1be45843ab65a87630d3fc570d29db5f40b9a273aa8e281464c9d1d3477de SHA512 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2
 DIST gpgme-1.16.0.tar.bz2 1718913 BLAKE2B da55e695b148e949a1c0770d0298d7a8c9f87d7a1f9e45d380f8c13c472bd44cb4266adb9a113e2b1dcc2596291744f48fdf998ff2de876059d89d184dc87f3a SHA512 69487be69612e9bf0221ff56ae687248bd13635db1b7087130e93c1670e38f3c810bbca17723555c04fe207976c35871bbc3da005179ce099504321cf33636e4
-EBUILD gpgme-1.15.1.ebuild 2670 BLAKE2B 7007356262efc1db39dd9f024934e33f9851c5b120297472043e090ebf779aefe246c92cdb7c62c67fa97f78d44bd2a5a185cfef0e3d65dd8e1ec18368cafced SHA512 f7ebc23ff194ff6e652f5d1768b90299a642ffa30b6f6281d698fa0c26da32aca864fa1d68ccced41ca2db3e4b6de36dfdbb9f6563f68fbd1cda1fd4069bb678
-EBUILD gpgme-1.16.0.ebuild 2678 BLAKE2B a8c126d2fb79b1425069b6e174e2bc3f4da6c0fb82d08e11d1b6945e0bdf6e0f0131b3e21e6b5347fc6956864acd751aecbd959fdc9b166fff5800542dcda64f SHA512 25d734d2544950b307748c40370ca072f76a156f685a9b8f594bba4f5ae1efab0d566dbd0f226d487ccd4940b8617092e08707b2c6f7e0768ffc93a1cefb980d
+EBUILD gpgme-1.15.1.ebuild 2671 BLAKE2B 259c3eebdcb359d6e6636dba2b9588f14f2bba426511b2d8b560192c31917dac28d85952443dbeed12e8a8ddbf61aa4eee3ec68add965503bfc8fc9e1a473c0b SHA512 ef99b8044daa6e1f3371f4958dd9acda2c1cbd9594970c9f06dcd70e45f6c83e78ec4792a3228d5c29f6689693b93c529fceded96f255df23539452c8b9bd105
+EBUILD gpgme-1.16.0.ebuild 2679 BLAKE2B a3305bfcea8a042705442d99c9068f1e3e0a4006f5ddeab18d99a688e5d5e9ec37bedebf057f7067306722fbe4da4529e3676e037ac8fcc9f407c477884cde3b SHA512 1f55f97a2714189bd608c116795cb76afff6cc79dbb5473e7dec837f5054f4e09e51331dcd48707d3f2dfe6ec3f5ceb54609e582d50e2978ed7c681d7a6da0d6
 MISC metadata.xml 326 BLAKE2B 982fe6e2ae0b6ce81980b477a39341c363c867202d646ff4acc9fb361785026919cc0de914e0deee67b79441115cea8a8b36f095d4719442f527f1a0d3ba06b8 SHA512 1223f3cdd325623e524c5bf46bea592b6930bdcc2ba40f9ebf27e568c6a527f59c8315194e4ffd70c29b778d25a2e2b8f57282d5e788814d3fbbcb1de4cf6334
diff --git a/app-crypt/gpgme/gpgme-1.15.1.ebuild b/app-crypt/gpgme/gpgme-1.15.1.ebuild
index 3e89833a85e6..49640c40ae8c 100644
--- a/app-crypt/gpgme/gpgme-1.15.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.15.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
diff --git a/app-crypt/gpgme/gpgme-1.16.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild
index 9b99df979f9f..ed3dab0482a4 100644
--- a/app-crypt/gpgme/gpgme-1.16.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.16.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
diff --git a/app-crypt/md5deep/Manifest b/app-crypt/md5deep/Manifest
index e798d5e6e3ff..54dbeaa6c600 100644
--- a/app-crypt/md5deep/Manifest
+++ b/app-crypt/md5deep/Manifest
@@ -1,3 +1,4 @@
+AUX md5deep-4.4-pointer-comparison.patch 262 BLAKE2B 56d183659e8ab2f1c88649ec152c3a60ed0d066c776355091b7d4594a84a5afc56e0d6a59b5539f90973821baed5846fdec68eecc42799eb18a9895e8242ea31 SHA512 a7cb5309c334bb541d06ebfa3d4eae38dd2c99209d6780bb1c8461f8b0d38e83a01b96c60aa5c97b7ab09c2f28a0fd882029fc90889a79d69575cbec3f8c7ed3
 DIST md5deep-4.4.tar.gz 4534687 BLAKE2B a2fc72e6e032945b6e3820d23a9d19b40438c00b7af870d00bed08f753decc5ac4e18c00dea447aa227f8706949f75712aa05d14f87ee76f62223b1fad0f7f1a SHA512 c37ec85ed04d4452f9038f43434c02e064cf9e17c4eaa233867dba0236443922a14ccb8ec76c68820087751c2ca3db014d3f17dd8fcd2c2bde84d620aae50de1
-EBUILD md5deep-4.4.ebuild 613 BLAKE2B 3973c367b74d5cdb5d6c9c3eddbc43e6a91da04d57cbaf3d005fec9e86edd0c4f424632f629dd0b8acb51e93bd1e59b4186d8f193443fd1dae56c4db6a709d89 SHA512 533089889193cdb74ffcab2912da13fa3f7edc1905a372f7c742af047709cb5017217388ccbab058fdc695e4875e61e81b1d8574904e670b3bc79fbf07d72e5c
+EBUILD md5deep-4.4.ebuild 650 BLAKE2B c78f1c2b6e810efc01377723de3986ce1a1d2270dad737ab58771097974e1e822c9787228563bdcc702ec40568dd95fc193e5a7d7e6880524ca27377e59d1e3f SHA512 7d2226ef709fe3a15bef59a15035373441fe52040f2cd95838fa92ee0fc825c77b36c80af600f204f20092d944b2099fbe5ca02f216cc3b7930d506ea4bbae6d
 MISC metadata.xml 396 BLAKE2B a1a6c4916e6e59e84cb6b095d8c0eda9584ad727014e934ad792bab88a3f6323fd1c31b6dbf84a10440daa9ec8afc494e31045bb20ec6a92d5705cf739fc61fa SHA512 2d4907761039f21088a1644f5da3b764ab55d37513195f0b04c8110a80f638f62f1322ecaf58bb3c506f69449b56e8f430130dcb3906738f0893a5cf83ae4e30
diff --git a/app-crypt/md5deep/files/md5deep-4.4-pointer-comparison.patch b/app-crypt/md5deep/files/md5deep-4.4-pointer-comparison.patch
new file mode 100644
index 000000000000..dbd6e74519d6
--- /dev/null
+++ b/app-crypt/md5deep/files/md5deep-4.4-pointer-comparison.patch
@@ -0,0 +1,11 @@
+--- a/src/hash.cpp
++++ b/src/hash.cpp
+@@ -279,7 +279,7 @@
+ 		MAP_FILE|
+ #endif
+ 		MAP_SHARED,fd,0);
+-	    if(fdht->base>0){		
++	    if(fdht->base){		
+ 		/* mmap is successful, so set the bounds.
+ 		 * if it is not successful, we default to reading the fd
+ 		 */
diff --git a/app-crypt/md5deep/md5deep-4.4.ebuild b/app-crypt/md5deep/md5deep-4.4.ebuild
index a7637a6fdfde..281022555627 100644
--- a/app-crypt/md5deep/md5deep-4.4.ebuild
+++ b/app-crypt/md5deep/md5deep-4.4.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Expanded md5sum program with recursive and comparison options"
 HOMEPAGE="http://md5deep.sourceforge.net/"
-SRC_URI="https://github.com/jessek/hashdeep/archive/release-${PV}.tar.gz
-	-> ${P}.tar.gz"
+SRC_URI="https://github.com/jessek/hashdeep/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/hashdeep-release-${PV}"
 
 LICENSE="public-domain GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-S=${WORKDIR}/hashdeep-release-${PV}
-
-DOCS=( AUTHORS ChangeLog FILEFORMAT NEWS README.md TODO )
+PATCHES=( "${FILESDIR}"/${PN}-4.4-pointer-comparison.patch )
 
 src_prepare() {
-	eapply_user
+	default
 	eautoreconf
 }
+
+src_install() {
+	default
+	dodoc FILEFORMAT
+}
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index c3d5d8053fe7..7d53bfc2fe7b 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,10 +1,7 @@
-AUX CVE-2020-28196.patch 3128 BLAKE2B 52674cb21a589b1f72b2ba110657952cd2946d08df58417eb86f75663e5ded48a49bb4e6bed87598b74209ae03ff3dca2f80fe9305f7e44070806f02c8ecafcc SHA512 98fa20ad32610dfa9fd6b9e1657e8c6d7e8905d266ef8953e4d6fdb344f0005ee356a9cca7d5aaa1c5333073b7e464c26201302138e0bf8f1f696c818024ba9d
 AUX kpropd.xinetd 194 BLAKE2B cfc40af2e75b0ce5a71e0dfdcfe076d13d996b25d2cb50d4282bc88d7b33b317a202d57df0bb4a2b47113f0d38cb508614e122e4a3bb7dfd2397e2daa3178396 SHA512 c9bbd13f2fadfd2a925bfae834ba61f227cd4386b4c4466b5227d93c792f4549778ef4d6e08353372df99804459277c71f61b41ec71f3afcc600d73c5705f72f
 AUX mit-krb5-1.12_warn_cflags.patch 448 BLAKE2B cd9793866173b394bab3497d19653ca3296924cc49aaf540499b149254265af1d995b4d7493b76185ce35d123e70827cb5fcb221efc6499b86a346cfad7478ab SHA512 42364d9cd8c0a6fd28ae661eeac4d0dd3f2001fe290bf9731ee99c2c786a6488805fc93057d59e201e2cef1e5280af4c170187aa5603f4cf542906abc0fccc2b
-AUX mit-krb5-1.18.2-autoconf-2.70.patch 986 BLAKE2B e5d542be9618a37c4efd87bc82bedb59d04595dc33584e1df842db64ce5de2ab8daea72d1a101347f6f0ec72d213fe10e9f90f4fc911cb30bf9571d353ee9543 SHA512 2fc8aa3c9cb0c3ccbeeb853ced2ed27e2b16191518f1fb5764ef0c1ec0a1a5fa47e60a0086ced58c240f6ebf1264d25f55cf048068e6d8cbea1a11ef8d4d9191
 AUX mit-krb5-1.18.2-krb5-config.patch 409 BLAKE2B 90290aa717c929d97d38f542753fba7fd4a85aa5d960b1bf8acf9898dfaa16fa9433d2ec5cc985757ae6bfc356cf46fabbb1632f5005f8a93a2ed22699ccaad0 SHA512 2faf5a39b9d7c8bca71d23d0226c2fa8fd9759366c9c2385b8479481b4fcf546d506ee3a4bc1caaf855e8cdfe1abb1b11536bdf9bd06e3c5d9b776bd7926a104
 AUX mit-krb5-config_LDFLAGS-r1.patch 458 BLAKE2B adf95690d6bb698dbdb6bf9c4220f3498a332186b059986c5a699aeec81b3342931ca664244fbcb76a61f9a5177972f0e47535035dbf88c949691d5d80d58084 SHA512 4c7ff3f63c9615dae1dbbf03795fede34d54d043acfd91f77f7fef7534253ea308a59657fa93d09f99d1d5ff5d21b58eb6b86bfbe6d65aa82ca1fa187b65d1dc
-AUX mit-krb5_dont_create_run.patch 369 BLAKE2B cf4883eb5af298b586774c41de53c5dfa3c10dd4297a499e9e036cec9df627776ca370ca905404bd2e94c4ff65e4b52b2516db9cac8629ac5723732c797f4f71 SHA512 0201954234551144e94644c61d19e5729c2f1d11636b39fc387ac8e8c05e3305c7af3378f431bb09ad3d9227fbb44f172508f41e28e8305a6cf2f70e12757734
 AUX mit-krb5_dont_create_rundir.patch 373 BLAKE2B 0306d4089f4163bba703e1cd209a0233a0a0c9e63babca6ff060131e191f814548db276ff5c8d8a73b10d2a301d6b4aa4b416be88287e1e719a2ebaebbc427cd SHA512 450b0dfff536ea76ddb45de5bb38237ad4c5ffb12a21d26cf0971ff9b2221868a4d2d3a9144561a7d967f49f80e3ddb91c8caa24d1a3523fa578820572c9096f
 AUX mit-krb5kadmind.confd 76 BLAKE2B ca69357a77ddaf67e2f9c104b17d49af5da9891b13bd855f8b04d54bfb6ccf07ae8c5cb694f65a47646675c844c8f8c7224e8487081df678c73c554498259516 SHA512 dbf968800959f0463899031e823f003e9ece90132f452ebf03df08caf0e6a6e6ca2cfdee91491d269cfa24bef19e72dd33c7d818a4bb13ef85edfb6f0e8299f3
 AUX mit-krb5kadmind.initd-r2 612 BLAKE2B ba2a70a7c123d63b9c58f4ec31c3c2366949e6971ff4f203cb38e1efb5a69991533291e118066e680d880c5221168c8eb5b047ec70dac857888330978d1e5a9b SHA512 3791af603380277a9d2632a01a86f96f68c9eb38a2c9574cca462fe9a01bef60f24785051d0215a8d71dd5022f1404e281929278e2bfd31603a0415dd9df6a98
@@ -17,12 +14,6 @@ AUX mit-krb5kpropd.initd-r2 608 BLAKE2B 9737f5ff711b8e30444c14ca871e01f2c45e9aec
 AUX mit-krb5kpropd.service 128 BLAKE2B 31d002c16987bd6fc42e22e64dd9bd1f9db36655dd5170a4f9f16c6a889a4303a4dc276aca09b3a213a1de3e6ab759c66790141708ec95c4393bbbe79e8fb16f SHA512 b7419d1c728eda86fbab2fbf83794ae754e3cdaec7dcdc12c2105e3a75f9903c25fe8fee48f57acf6f0a8c62d27f7934fae81c0cbd67b997541aef7060a4de46
 AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad2a60beebe83bd766d42261bd44c712df14608a1e5e922715780a6c4aa8ad294c34ba4e8fc336a24d038fd3 SHA512 4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
-DIST krb5-1.18.2.tar.gz 8713927 BLAKE2B f0eb34e67adcb86f347c59ec6ef74970a57530cc56336a84909f852cd6135079ea89828e77c906a272f54e0faf6a4a0497f2b648446eb9d048d1c51e4ec513af SHA512 7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c
-DIST krb5-1.18.3.tar.gz 8715312 BLAKE2B 4f6ad4a529e7578e83d82b43c2cada33bce1dca5081ec826ee06a713f82520b783f72ec56d2ce289e10d1ddcfaa079491e43f21c035b214d244bb80e6b2a1c9f SHA512 cf0bf6cf8f622fa085954e6da998d952cf64dc7ccc319972ed81ea0542089cabf2d0e8243df84da01ad6f40584768ca2f02d108630c6741fa7b3d7d98c887c01
-DIST krb5-1.19.1.tar.gz 8738142 BLAKE2B 902dd08fe4b81b1cb0ec2bf1b95eeece0f8a87b87bae865272c7bf5dd028c01997ec4c5d24df605328db85e7cbfe9a38dd804b363b651aefa7b4eaec958a280c SHA512 36bf33802119ada4650a8f69f1daca95aaf882dc96bfa7061f0340a5decd588c31fc10108ddadf1042934e0e2c3bbd975deec565b0a7f0fc2baf8b8cc6d97491
 DIST krb5-1.19.2.tar.gz 8741053 BLAKE2B 963722721201e75381c91a2af6e982f569a5b1602beb2d1ded83d35f6f914235a6ed91e5d54f56c97e94921a32ed27c49aded258327966ee13d39485208c38d8 SHA512 b90d6ed0e1e8a87eb5cb2c36d88b823a6a6caabf85e5d419adb8a930f7eea09a5f8491464e7e454cca7ba88be09d19415962fe0036ad2e31fc584f9fc0bbd470
-EBUILD mit-krb5-1.18.2-r4.ebuild 4278 BLAKE2B 0ab115db127541d2c5ff6bf7f1f6b06ab115cc7cca8c9f31fd481b5c6f7c2f6e2c17ac2863115d90cfbd22f039528cbde306305daf29d9c30426f6fb9e509b9b SHA512 c4f03936e89d98ec08a85800b990a4c208d5ec5e8fb3233d22e26f95c5bd49e2aa4e8bd6b3ea77ca0c5aa247fbeb559c333159e9dbcb502fc9aa2bce28e593c0
-EBUILD mit-krb5-1.18.3-r2.ebuild 4202 BLAKE2B 64787c272f51fbc4e8895c545f75abacce388e4bd2c14a47c9099be57d533f09f5d375aac167477b78fa1796ba45b681c8d7d126afc6cab9cfc647bced571864 SHA512 d5e8a4f4156d56c7954a12680ca068d9c439b7134575358ca41a20a5e601adef900ad163ef1b78d9eb2c9ec49b97e896295deafb6c8bc289e1b41a25d82dac77
-EBUILD mit-krb5-1.19.1-r1.ebuild 4204 BLAKE2B 0339c60eb9ef017cc2a5f2b0774d03189ecd426a6a391de50383aed685ee99f06a1ffeeac036690553f7b0cce0e6adccc5bacf2fc82c09b1ff34bb2210881855 SHA512 43cd1b051aa279cb33230b6016929bf94e5564d700e8db900c411cb4cc5d61f8de8d1f54ca7f8a73304394c729b9f4fb0b23f87a357eb74399587bf55fc70551
 EBUILD mit-krb5-1.19.2.ebuild 4196 BLAKE2B 67ae2e7fd5af51186600006cf79a1f9e9d75d661820ec817a1be62d172351a6610e6e0c614af9d3af8f4fb96587fc4de075b9e32cc6fcb531189e409c3919a9f SHA512 84faee6c0222604533a521293caf75439af0c4618f130d57bd3f069b89c0129d2d8ede569612bbc477c473a42efe796f8a5ecde70bf4bc16590a737eeeea5e0b
 MISC metadata.xml 823 BLAKE2B b1e312e7d7d1dde62a6260572d68c5c9df90a00c9ca7d43939df0ce7c6e528ac8dfcf839827938f783c241c19255660e1e7806210aaf407a6e86cbaeef24295a SHA512 844715444284f5c7f1a73ed15c0ebe0b5dd8c96c3aa7e6450f465e2a2086509c04d637f139ede5e427972d4b1bb298255388f50978b41de875b47ee40251451e
diff --git a/app-crypt/mit-krb5/files/CVE-2020-28196.patch b/app-crypt/mit-krb5/files/CVE-2020-28196.patch
deleted file mode 100644
index 486078437e89..000000000000
--- a/app-crypt/mit-krb5/files/CVE-2020-28196.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/src/lib/krb5/asn.1/asn1_encode.c b/src/lib/krb5/asn.1/asn1_encode.c
-index a160cf4fe8..cd6b879f77 100644
---- a/lib/krb5/asn.1/asn1_encode.c
-+++ b/lib/krb5/asn.1/asn1_encode.c
-@@ -356,7 +356,7 @@ make_tag(asn1buf *buf, const taginfo *t, size_t len)
- static krb5_error_code
- get_tag(const uint8_t *asn1, size_t len, taginfo *tag_out,
-         const uint8_t **contents_out, size_t *clen_out,
--        const uint8_t **remainder_out, size_t *rlen_out)
-+        const uint8_t **remainder_out, size_t *rlen_out, int recursion)
- {
-     krb5_error_code ret;
-     uint8_t o;
-@@ -394,9 +394,11 @@ get_tag(const uint8_t *asn1, size_t len, taginfo *tag_out,
-         /* Indefinite form (should not be present in DER, but we accept it). */
-         if (tag_out->construction != CONSTRUCTED)
-             return ASN1_MISMATCH_INDEF;
-+        if (recursion >= 32)
-+            return ASN1_OVERFLOW;
-         p = asn1;
-         while (!(len >= 2 && p[0] == 0 && p[1] == 0)) {
--            ret = get_tag(p, len, &t, &c, &clen, &p, &len);
-+            ret = get_tag(p, len, &t, &c, &clen, &p, &len, recursion + 1);
-             if (ret)
-                 return ret;
-         }
-@@ -613,7 +615,7 @@ split_der(asn1buf *buf, uint8_t *const *der, size_t len, taginfo *tag_out)
-     const uint8_t *contents, *remainder;
-     size_t clen, rlen;
- 
--    ret = get_tag(*der, len, tag_out, &contents, &clen, &remainder, &rlen);
-+    ret = get_tag(*der, len, tag_out, &contents, &clen, &remainder, &rlen, 0);
-     if (ret)
-         return ret;
-     if (rlen != 0)
-@@ -1199,7 +1201,7 @@ decode_atype(const taginfo *t, const uint8_t *asn1, size_t len,
-         const uint8_t *rem;
-         size_t rlen;
-         if (!tag->implicit) {
--            ret = get_tag(asn1, len, &inner_tag, &asn1, &len, &rem, &rlen);
-+            ret = get_tag(asn1, len, &inner_tag, &asn1, &len, &rem, &rlen, 0);
-             if (ret)
-                 return ret;
-             /* Note: we don't check rlen (it should be 0). */
-@@ -1420,7 +1422,7 @@ decode_sequence(const uint8_t *asn1, size_t len, const struct seq_info *seq,
-     for (i = 0; i < seq->n_fields; i++) {
-         if (len == 0)
-             break;
--        ret = get_tag(asn1, len, &t, &contents, &clen, &asn1, &len);
-+        ret = get_tag(asn1, len, &t, &contents, &clen, &asn1, &len, 0);
-         if (ret)
-             goto error;
-         /*
-@@ -1478,7 +1480,7 @@ decode_sequence_of(const uint8_t *asn1, size_t len,
-     *seq_out = NULL;
-     *count_out = 0;
-     while (len > 0) {
--        ret = get_tag(asn1, len, &t, &contents, &clen, &asn1, &len);
-+        ret = get_tag(asn1, len, &t, &contents, &clen, &asn1, &len, 0);
-         if (ret)
-             goto error;
-         if (!check_atype_tag(elemtype, &t)) {
-@@ -1584,7 +1586,7 @@ k5_asn1_full_decode(const krb5_data *code, const struct atype_info *a,
- 
-     *retrep = NULL;
-     ret = get_tag((uint8_t *)code->data, code->length, &t, &contents,
--                  &clen, &remainder, &rlen);
-+                  &clen, &remainder, &rlen, 0);
-     if (ret)
-         return ret;
-     /* rlen should be 0, but we don't check it (and due to padding in
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.18.2-autoconf-2.70.patch b/app-crypt/mit-krb5/files/mit-krb5-1.18.2-autoconf-2.70.patch
deleted file mode 100644
index 6741c47e0d13..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.18.2-autoconf-2.70.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/778167
-
-From f78edbe30816f049e1360cb6e203fabfdf7b98df Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Fri, 6 Nov 2020 08:14:57 +0000
-Subject: [PATCH] Fix compatibility with upcoming autoconf 2.70
-
-Mainline autoconf generates no shell code for AC_CONFIG_AUX_DIR().
-Call it unconditionally to avoid a syntax error.
-
-[ghudson@mit.edu: rewrote commit message]
-
-ticket: 8960 (new)
-tags: pullup
-target_version: 1.18-next
-target_version: 1.17-next
----
- src/aclocal.m4 | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
---- src/aclocal.m4
-+++ src/aclocal.m4
-@@ -13,11 +13,7 @@ fi
- ac_topdir=$srcdir/$ac_reltopdir
- ac_config_fragdir=$ac_reltopdir/config
- # echo "Looking for $srcdir/$ac_config_fragdir"
--if test -d "$srcdir/$ac_config_fragdir"; then
--  AC_CONFIG_AUX_DIR(K5_TOPDIR/config)
--else
--  AC_MSG_ERROR([can not find config/ directory in $ac_reltopdir])
--fi
-+AC_CONFIG_AUX_DIR(K5_TOPDIR/config)
- ])dnl
- dnl
- dnl Version info.
diff --git a/app-crypt/mit-krb5/files/mit-krb5_dont_create_run.patch b/app-crypt/mit-krb5/files/mit-krb5_dont_create_run.patch
deleted file mode 100644
index d68e13b0675c..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5_dont_create_run.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in	2019-12-12 10:15:51.674552983 +0300
-+++ src/Makefile.in	2019-12-12 10:16:33.205543490 +0300
-@@ -71,7 +71,6 @@
- 		$(KRB5_AD_MODULE_DIR) \
- 		$(KRB5_LIBKRB5_MODULE_DIR) $(KRB5_TLS_MODULE_DIR) \
- 		@localstatedir@ @localstatedir@/krb5kdc \
--		@runstatedir@ @runstatedir@/krb5kdc \
- 		$(KRB5_INCSUBDIRS) $(datadir) $(EXAMPLEDIR) \
- 		$(PKGCONFIG_DIR)
- 
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.2-r4.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.2-r4.ebuild
deleted file mode 100644
index 228d7891ac6e..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.18.2-r4.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
-
-# Test suite requires network access
-RESTRICT="test"
-
-DEPEND="
-	!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
-	lmdb? ( dev-db/lmdb )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	pkinit? (
-		>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-	)
-	xinetd? ( sys-apps/xinetd )
-	"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/yacc
-	cpu_flags_x86_aes? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	)
-	doc? ( virtual/latex-base )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/tcl:0
-		dev-util/dejagnu
-		dev-util/cmocka
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
-	"${FILESDIR}/${PN}_dont_create_run.patch"
-	"${FILESDIR}/CVE-2020-28196.patch"
-	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
-	"${FILESDIR}/${PN}-1.18.2-autoconf-2.70.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	default
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		$(use_with lmdb) \
-		$(use_with keyutils) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath \
-		\
-		AR="$(tc-getAR)"
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.3-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.3-r2.ebuild
deleted file mode 100644
index c987ff85d930..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.18.3-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
-
-# Test suite requires network access
-RESTRICT="test"
-
-DEPEND="
-	!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
-	lmdb? ( dev-db/lmdb )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	pkinit? (
-		>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-	)
-	xinetd? ( sys-apps/xinetd )
-	"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/yacc
-	cpu_flags_x86_aes? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	)
-	doc? ( virtual/latex-base )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/tcl:0
-		dev-util/dejagnu
-		dev-util/cmocka
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
-	"${FILESDIR}/${PN}_dont_create_run.patch"
-	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	default
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		$(use_with lmdb) \
-		$(use_with keyutils) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath \
-		\
-		AR="$(tc-getAR)"
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.19.1-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.19.1-r1.ebuild
deleted file mode 100644
index 1353909124ff..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.19.1-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
-
-# Test suite requires network access
-RESTRICT="test"
-
-DEPEND="
-	!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
-	lmdb? ( dev-db/lmdb )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/yacc
-	cpu_flags_x86_aes? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	)
-	doc? ( virtual/latex-base )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/tcl:0
-		dev-util/dejagnu
-		dev-util/cmocka
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
-	"${FILESDIR}/${PN}_dont_create_rundir.patch"
-	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	default
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	AR="$(tc-getAR)" \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		$(use_with lmdb) \
-		$(use_with keyutils) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 75b3681a9140..8ff8e3e0589f 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -4,5 +4,5 @@ AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c512
 DIST qca-2.3.2.tar.xz 735500 BLAKE2B 559b27c48c756f2b4f4f206d2157c90ae4856610f1539b4162a2bffe7fffe19b5c768d3d3f9d0486d2098fb403eb64372515815f49fd428d22dfc0405d99e435 SHA512 da6415a097c99b878f45730c1dd1e0bfc7f96858ad7018918ac7c2ae2eca830cb73e131173b1018ee4caa6c3a504b80c8ad28f8f9448c2fd1593161c2ac8aad4
 DIST qca-2.3.3.tar.xz 736456 BLAKE2B f0812fd33bd19293c8034e48bcf214d2d70dc1397860779c2c145fe841365384a8eb6bad9859520d32104010acb0cefb97e3a974b9852a37ca8039d52d9dbd03 SHA512 9a262350502daa1dd10802a7a24f0e4712d87d4ddcf752452a51caa8694a30835672f54f8e600aa8dc4afdac9ef073641deed52a24423e304d18ad2b83deeca6
 EBUILD qca-2.3.2.ebuild 1995 BLAKE2B f054015be5f10231bd5c491412d2abb0b9ad1c94158e88cfd8bd6db6ef6128428822c03af21c189f1df04cfa8833d331a8174fa9804c1b0b560d3d0b6e77d92d SHA512 ae7417c07673b4755651236964ceea2d5bc4ef69ad1ff78affbeaabb357caaafb0f4400ea41ed428de380111760ab46e0611e852e883406862cd878fb77c3f10
-EBUILD qca-2.3.3.ebuild 1841 BLAKE2B f7a05fe8034c4a51a21d8807e30a8648af7f6bb40c3e861a949f30bc149ca3b64c81ba209e9d16888d0e3f8a812a3838dfe41197863bb6dda40ea97bc4c4cf60 SHA512 8a945d877abda91ca1b9594b4288cfaf452ed57ae79bf812ec3dd658f6bee47a07dd9ab39ea436326a10f12386f8c34b3ce7b9fe7cf8da21a2a7b80396ce0bec
+EBUILD qca-2.3.3.ebuild 1840 BLAKE2B 0db025caefd777c276cb84c99221bcd7776ba56ba89d3a4659c09cba0190ed08c9b44f5196c87974ad7f0a7b9af208d7c057d37f54f1a12a00f7cf5d6e9f02d8 SHA512 e7c8d0f0fa6d15ef7823be6297024481f50c19f71342dafb4eafb38a55f66fbe7c9ee22baf1791391be672e5faa6b951017315b6d4c3c683a3ad44e71162d473
 MISC metadata.xml 745 BLAKE2B ff8e25b082d3c642fce099df1a218a4936bdc862a96fd237303d040c477544cf6368d23cc5de414d95f021e9c6ec475879225ab201f7c6d6711c04153ac53140 SHA512 6b82494b8dfe0d36da9818a6dcf775252dbb7051430232ccc2519c449cc2877da6478ca98f5b7a982a7660a869a0b8ae7a814fb18108ff42fed9712a9253e867
diff --git a/app-crypt/qca/qca-2.3.3.ebuild b/app-crypt/qca/qca-2.3.3.ebuild
index c1805f95d270..e3cfcab697ec 100644
--- a/app-crypt/qca/qca-2.3.3.ebuild
+++ b/app-crypt/qca/qca-2.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 415b55738542..0fd149453353 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -9,5 +9,5 @@ AUX trousers-0.3.14-tcsd-fixes.patch 2203 BLAKE2B 8085cfd36817e35d54d39a01203794
 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
 DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb
 EBUILD trousers-0.3.14-r3.ebuild 1580 BLAKE2B 7dcebd1140aee67cc63e4665afd2bb030bc44339ada7dcc6f9f5dbc2bd1f010c3eef573ae3ca35e8fbcf1450ce6e2a3539bc13479c3f5dbffcd81f96f774e107 SHA512 c62b0f19be4be398c94220be992c933595ed4c6182bf135458d8090695ed831be1f219ec778edf524dae7383e0b83f731bd829b57c7007f0535e0cba273fd827
-EBUILD trousers-0.3.15.ebuild 1511 BLAKE2B bf584f3cb397808e08ae64a7624cc5c8e5a621ab40e4a8f27259011d77a5cd5e791d580b3def68b51fff1a3f32c3cbfd628a66f0e81858d06c2e45d787d1545b SHA512 a9f1c5bccb73a3948134081e32a961b76906a70834e3a022774e8c007875f894cae02457d59afdcfd7c85cd6a78f72e330ef1e0105a308fb7b92e2517c3147ae
+EBUILD trousers-0.3.15.ebuild 1506 BLAKE2B 12fdc774facfc1060ca3e9b3a4eb969e099c20bb5d78557d0e4198e3655f3bcc34d1c759aebe9f59a1c9a5f1938dc4990b566b099e662874b734702853f19901 SHA512 7bea49dd5974fa79fc5b8f0bebed1e7f5add0a1ea223dc24f94b6f94c4a24cd8017d47e529c9b1602402a4354d381105950cbdf07294985c28f77f6c79ea48e0
 MISC metadata.xml 541 BLAKE2B 11de571e9140dcd8c4b9c8778415d17c3c71a12f36ec96d74fa3f562d8d4f189a02e138a8ea9146d8df02e1e539237bf22a042f97c1b83e231f0302833d532e7 SHA512 4befaa1a46b211424a26034a22b068fc6443c66fd7ccc1dcef6657b86710cfbfc4533f5fd0f88484e463dc2f0d9f154248e07329455216a76c0f72b45e53d373
diff --git a/app-crypt/trousers/trousers-0.3.15.ebuild b/app-crypt/trousers/trousers-0.3.15.ebuild
index b3c97e1ae902..b3b23fa8f5c2 100644
--- a/app-crypt/trousers/trousers-0.3.15.ebuild
+++ b/app-crypt/trousers/trousers-0.3.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~riscv ~s390 x86"
 IUSE="doc selinux" # gtk
 
 # gtk support presently does NOT compile.
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 7847d5769ed8..5e3b4650c697 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,4 +1,4 @@
 AUX veracrypt.init 384 BLAKE2B 0325852e3bb9d8427298c46b0e7caefb1f62d957a158c8a6f898c6609c0363449ef5f48c9cd5a1092efbd9d2e1077a6218bdbebacebde936afc40ec3bfd0b3eb SHA512 574b18b7cbc5f4ea71bb35ec3343af5bdcc7848801decf3b93157bc4fde44ca5daec01847e3ff9f3a638b297f33023ea46a0ada5cc64bab0d14cbe12b93b66ed
 DIST veracrypt-1.24_p8.tar.gz 25116825 BLAKE2B fccab3e7de7637f6f3a7f448a9dcc6671198ea6155e8f6741844c5bd844819c639f968e4cc6e13c274c90f2ba8e540a020b98cb12617a109d5911ce8dd9cb991 SHA512 16139d055e2b2dda6c38ecf156cf5d15cd4788253fe0c85e42050eafd8afbd5c5908e590e53a7b5220767ebbb3b9e81d0049a910b322e42f1c29d2c131bd29d0
-EBUILD veracrypt-1.24_p8.ebuild 2503 BLAKE2B a7e3e78ae75f87ded54194c4d07d3f91859904e58b820a0dc8b5f97bc7f64edc4005b280edba8389b5767f1d60459221a9e8dc13bdaac39e43659452b557d1a1 SHA512 9b591469c2ff16e69a6326c64e692ddee34695fe8baff955594cf155faf5de10896885b48df5cd67950213d0726605ce153c79024b06b2cfe68653c094e6ed98
+EBUILD veracrypt-1.24_p8.ebuild 2633 BLAKE2B 9cbbde75cc90c56405c49235eecb9e2b997cfa60bd0048c56d849734c49a9c2059d804d7bad217a3b2603e4e49f15dc66c391d1a739884c606ee35ef80f85a9b SHA512 e67824eb329231342c1b0b932736305de87adeb107290e1cdcea7080b347f9e813a0188c69716e2318609597ace85b330469313f77aa4b07c1d45a8ab0b85ad7
 MISC metadata.xml 399 BLAKE2B a7d22abada8009869e82b80f8b2274e1acc2fb1488d584c9d730f231057519404445a0d048ad70a47f7d946bc987f836fdfd87da296537a307e234175e521acc SHA512 ac0676510d8d2ac2430dd244ed5e4d18de1cbb7050563fcdd46fc8511c9813dc3609565a6c071f75d9cd26e73c1f453cc8cf9b9b47e0822bd93548a8baaf62ca
diff --git a/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
index e4a53800c6df..513ddf482560 100644
--- a/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
+++ b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-inherit desktop linux-info pax-utils toolchain-funcs wxwidgets
+inherit desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets
 
 MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)_MacOSX"
 
@@ -38,6 +38,10 @@ CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
 
 src_configure() {
 	setup-wxwidgets
+
+	# https://bugs.gentoo.org/786741
+	# std::byte clashes with src/Common/Tcdefs.h typedef
+	append-cxxflags -std=c++14
 }
 
 src_compile() {
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 21c28f519c7e..2f21969c4a12 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/selflinux/Manifest b/app-doc/selflinux/Manifest
index 11746072790d..e02c2ff85c49 100644
--- a/app-doc/selflinux/Manifest
+++ b/app-doc/selflinux/Manifest
@@ -1,4 +1,3 @@
 DIST SelfLinux-0.13.0-html.tar.gz 7379682 BLAKE2B 5baf00233fd69c3d115adef28c0644d0d4e563014c82649d7e4c906189a36543bd30528ea901f8b2b7c849721b220eeccc3787f67b016ca7161515e23fa8871c SHA512 bb7f16006863f958dd24c8f82db5e4538f00fc66f1b2efe7c52ed28d241fdcfdd366e973c91b730118ff485c2343f5a0fac293f080f0d6e86d24fca4beaaab72
 EBUILD selflinux-0.13.0-r1.ebuild 626 BLAKE2B 2543e52dfd35ded333453f1a6240b447c24b0d32a38cf051874cdf361441cfd0f2b8763b84d1943b1aa299f8ec8b9a11862966d8704492aab1d930be4af04f64 SHA512 7015ea61444fbb1b4d7b1812d4caf36806d1d4c26617db8c248ad5e9a198de0c4768745c46ced90775594ede5f99cc7e22c7aba503cf28f0a58bcc644c5691aa
-EBUILD selflinux-0.13.0.ebuild 417 BLAKE2B bb6cde83ebdfc3792083e5ecea696e429cddacdf46e52ebbc96d9f10373d6fce175c4eceb1c2104620c2baf7a70d13efc74f8521a4997c2f91dfcc7c1494e9c5 SHA512 bb9091b568dafce84f17abcb47ae4866f834b63d6b42c7ac717a68b6387c95129ffba1c9414f715158b2c161bf2ef7a9e70ee6c83747b5e512514aca0e3773d9
 MISC metadata.xml 270 BLAKE2B 9948dbd05e664315ac11842827c04e5b53bd4a1b773f119a1a9ce99aaf0d9be1795b064b10ef28bf6e5d3ecc2615fb8768e06aae866025e673fe326ea72ae624 SHA512 bb6ff3e49ce5fff927116af4f4676901362fba263d12bfeb04533a209ed743720feac7942fbe4f3ab367c7c07d6142a238cae7e16dbc8722ffbf126cf5fd169f
diff --git a/app-doc/selflinux/selflinux-0.13.0.ebuild b/app-doc/selflinux/selflinux-0.13.0.ebuild
deleted file mode 100644
index b6bbc84edad4..000000000000
--- a/app-doc/selflinux/selflinux-0.13.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="SelfLinux-${PV}"
-
-DESCRIPTION="german-language hypertext tutorial about Linux"
-HOMEPAGE="http://selflinux.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-html.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_install() {
-	dohtml * -r
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 22ca774a3547..edd6afa7123a 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest
index 4f29ace5a09f..23e57aa0a053 100644
--- a/app-editors/juffed/Manifest
+++ b/app-editors/juffed/Manifest
@@ -1,7 +1,4 @@
 AUX FindQtSingleApplication.cmake 4004 BLAKE2B e6c047be5112811430258e527a6d0ac5217838c9acbdbf6edf49909f3858c6fedb1c3da0471d4301cb918683b6194207650f9c4d06735e62993da3720b263356 SHA512 5ba7845f12a0e425fdeda180faab8b6e53ed3ae0ae291e5a33878a5f955f9295ea7058f1cce43ee4292fd00a6b8ddc45c71d050210ed4b26e1d3f4472df04f9e
-AUX juffed-0.10_p20160323-qscintilla-2.10.3.patch 2030 BLAKE2B 1946d32e43bb091b96f844955d65dfc956fccd6aabe1238d65cf962382312bb3246966d2ee8701da66e41922c3669e70e76bb8ca7cf9f745c1f066ecfa4e4071 SHA512 2a5a39674b38ab44db1f7eee7e1488b2004b050dc42db2e954442612ff63505c2b4abb831d0e1b711e4dcaacb1bc7943fe05112f6fc8bcf2ce52a0caf4e1d3b1
-AUX juffed-0.10_p20160323-qscintilla-2.10.patch 565 BLAKE2B 92ee287c1dd3321ba706ea01656037e87a27a5cb6f43695a043481a0c4231b5753d9b4af74f82f9d37f2b2c137871f52d37a310fa9f75188955e761a46279762 SHA512 6b3f70930a3f7f5a59687b8484d5356804cff478da63732e5af261de12ced6e93f71bc53b93b3e286bf54e0cae61090729ccc54b42b37e2f97ee5a9640c18bd3
-AUX juffed-0.10_p20160323-qt-5.11.patch 719 BLAKE2B d9790a4a6a515a41a988949f8a0d1f52a0b19b53578138acd9d5ce141898317ab1776373f688a5c6fec059e67f14dfb5842c6367f9596df581a673a22e38567b SHA512 04174f544f040ba0cb4f28e1aed8e593d18fd4d7f53f94a6c99c5246a4603a234285959a887ffa155b72ce17f056eadd5dd31a041541c463630dd33d2a2a8952
-DIST juffed-0.10_p20160323.tar.gz 1617451 BLAKE2B 497a117d587fb1d6eb819bdc1cc403a660b808fa07d03fbfa74362c195aafc98733653fa5d7e28803df2bd4d8acb34a3c0d979395c1a6122631cee40d37e2239 SHA512 a49837b199db35c5e7a7580aa4025a2c056b55cef6e98e22f239fc9e455cde3a451d6a0971fb02697c63f3f156d85aaf8021ea13ea3a9e6867ae419f772484b5
-EBUILD juffed-0.10_p20160323-r1.ebuild 1273 BLAKE2B 188811be9a80b210ed9d24e4eeca1dc327dc148a90a2cf8ada892be8331f20686754cd8f7457fec5200181570c8602b03c7cf7dc9362648ab038118a37fdcf7c SHA512 eb278d169660b5c3f76fe6c6bfcf1c8de24b0ea53b4e6f40a536500c92cc8d3e77c13388501ada64be7b51364835ff55ce0d5ae7ee768ecc3928d9a5d2dcde2f
-MISC metadata.xml 323 BLAKE2B d45bb12a8240e1b12594d50a1284b69b365e15f7a857b34b0ee12f4c9af0d7681ba22bbc959e7133780f682f6ae6dad53f6ecb2eb7db65cf1b6f4a64c742cdb3 SHA512 43f71ede8fa11b874c187d61b6f1c3949c10bd632e5a98f4094463f785be8f719a2d2205f3f0b7645047398e026fe71b1ef79366d762ff12f257d0a239e84a4d
+DIST juffed-0.10_p20200103.tar.gz 1628731 BLAKE2B d49e6d8a9eab1edf8b4a74ec0dc9b2e4a4c7e99180c8faf1fdb73d406ee2055626623a72bf00e90f7af7e7380540f625bd9b5c53a662f5334edbebe298e40626 SHA512 6672dc68eb7e40d258dececc9b7389e8417709cad1346e1abb7cf97cf7f59394586c93bc40bb15096c2e5175256385595522dac8714ad5f37946e0bb7a3eb258
+EBUILD juffed-0.10_p20200103.ebuild 1253 BLAKE2B 39f4682dffbb014f6f511ccc8fcd36df38da72106e2d662759e08b1a05bb22e8b756347226d48b0ca774e706a477d887188598698c1a324deac43de815564b4d SHA512 4b5619bd01a7445ae2ddf98ada490d280b837960ab34e7f0e6ca9008a8c5f3d99c5ee42b477ba95f92ffb38e9dd7a3ccea709665f886ae5c9a92ce1e556e6df2
+MISC metadata.xml 378 BLAKE2B 8778271fc6002b4657c082f469f8e799310f25c69682a2121bc17dd19868df9cc069ac91e20e36fe94225987505d08fb4aca11c5f409e7f71c85eecc93594b72 SHA512 5426a1e8f652ef0f938e04c8d68416030b25d8b4e097c6f539c26632bdaabd6553c2a2a23ca16c857a3207a298036d8fd4d6cf9851cfbcb9773a16ba203d5b0c
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch
deleted file mode 100644
index f4a22957480d..000000000000
--- a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 49b6982336ad127b2b780d2ae7c1be1104d9dae5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 10 Apr 2018 20:31:38 +0200
-Subject: [PATCH] Fix build with QScintilla-2.10.3
-
----
- src/app/qsci/lexers/qscilexerada.h     | 3 ---
- src/app/qsci/lexers/qscilexerhaskell.h | 3 ---
- src/app/qsci/lexers/qscilexerlisp.h    | 3 ---
- src/app/qsci/lexers/qscilexernsis.h    | 3 ---
- 4 files changed, 12 deletions(-)
-
-diff --git a/src/app/qsci/lexers/qscilexerada.h b/src/app/qsci/lexers/qscilexerada.h
-index 984f97e..30c6646 100644
---- a/src/app/qsci/lexers/qscilexerada.h
-+++ b/src/app/qsci/lexers/qscilexerada.h
-@@ -3,9 +3,6 @@
- 

- #include <Qsci/qscilexer.h>

- 

--// located in SciLexer.h

--#define SCLEX_ADA 20

--

- #define SCE_ADA_DEFAULT 0

- #define SCE_ADA_WORD 1

- #define SCE_ADA_IDENTIFIER 2

-diff --git a/src/app/qsci/lexers/qscilexerhaskell.h b/src/app/qsci/lexers/qscilexerhaskell.h
-index 78c8978..56a3614 100644
---- a/src/app/qsci/lexers/qscilexerhaskell.h
-+++ b/src/app/qsci/lexers/qscilexerhaskell.h
-@@ -3,9 +3,6 @@
- 

- #include <Qsci/qscilexer.h>

- 

--// located in SciLexer.h

--#define SCLEX_HASKELL 68

--

- #define SCE_HA_DEFAULT 0

- #define SCE_HA_IDENTIFIER 1

- #define SCE_HA_KEYWORD 2

-diff --git a/src/app/qsci/lexers/qscilexerlisp.h b/src/app/qsci/lexers/qscilexerlisp.h
-index 5b43d74..6e5dc32 100644
---- a/src/app/qsci/lexers/qscilexerlisp.h
-+++ b/src/app/qsci/lexers/qscilexerlisp.h
-@@ -3,9 +3,6 @@
- 

- #include <Qsci/qscilexer.h>

- 

--// located in SciLexer.h

--#define SCLEX_LISP 21

--

- #define SCE_LISP_DEFAULT 0

- #define SCE_LISP_COMMENT 1

- #define SCE_LISP_NUMBER 2

-diff --git a/src/app/qsci/lexers/qscilexernsis.h b/src/app/qsci/lexers/qscilexernsis.h
-index 8b009ec..06efc40 100644
---- a/src/app/qsci/lexers/qscilexernsis.h
-+++ b/src/app/qsci/lexers/qscilexernsis.h
-@@ -3,9 +3,6 @@
- 

- #include <Qsci/qscilexer.h>

- 

--// located in SciLexer.h

--#define SCLEX_NSIS 43

--

- #define SCE_NSIS_DEFAULT 0

- #define SCE_NSIS_COMMENT 1

- #define SCE_NSIS_STRINGDQ 2

--- 
-2.17.0
-
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch
deleted file mode 100644
index fcfab7f4072f..000000000000
--- a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/FindQScintilla2.cmake	2016-03-23 20:43:22.000000000 +0100
-+++ b/cmake/FindQScintilla2.cmake	2017-10-08 17:25:06.984464985 +0200
-@@ -52,7 +52,7 @@
-         ENDIF()
-     ENDFOREACH()
- 
--    SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qt5scintilla2 libqt5scintilla2 libqscintilla2-qt5 qscintilla2-qt5)
-+    SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 libqscintilla2_qt5 qscintilla2_qt5)
-     GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION)
-     GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH)
- 
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch
deleted file mode 100644
index 4dfa7fae31f7..000000000000
--- a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From cb10c88a091c62c29054138a2da69d05cbf1e406 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 10 Apr 2018 19:43:17 +0200
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- plugins/keybindings/KeysPage.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/keybindings/KeysPage.cpp b/plugins/keybindings/KeysPage.cpp
-index 6579e3e..e68b039 100644
---- a/plugins/keybindings/KeysPage.cpp
-+++ b/plugins/keybindings/KeysPage.cpp
-@@ -1,9 +1,10 @@
- #include "KeysPage.h"
- 
--#include <QPushButton>
-+#include <QAction>
- #include <QHeaderView>
- #include <QKeyEvent>
- #include <QMessageBox>
-+#include <QPushButton>
- 
- #include "KeySettings.h"
- #include "Log.h"
--- 
-2.17.0
-
diff --git a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
deleted file mode 100644
index 955c950bbf9e..000000000000
--- a/app-editors/juffed/juffed-0.10_p20160323-r1.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
-
-COMMIT=5ba17f90ec173e773470bc80ea26bca9a3f093fd
-inherit cmake xdg
-
-DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting"
-HOMEPAGE="http://juffed.com/en/"
-SRC_URI="https://github.com/Mezomish/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	app-i18n/enca
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog README )
-
-S="${WORKDIR}/Mezomish-${PN}-5ba17f9"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qscintilla-2.10.patch"
-	"${FILESDIR}/${P}-qt-5.11.patch"
-	"${FILESDIR}/${P}-qscintilla-2.10.3.patch"
-)
-
-src_prepare() {
-	# Upstream version outdated/dysfunctional and CRLF terminated
-	cp "${FILESDIR}"/FindQtSingleApplication.cmake cmake/ || die
-
-	cmake_src_prepare
-
-	sed -i -e '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DUSE_ENCA=ON
-		-DUSE_QT5=ON
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-		-DLIB_SUFFIX=${libdir/lib/}
-	)
-	cmake_src_configure
-}
diff --git a/app-editors/juffed/juffed-0.10_p20200103.ebuild b/app-editors/juffed/juffed-0.10_p20200103.ebuild
new file mode 100644
index 000000000000..a53f1c7ee35d
--- /dev/null
+++ b/app-editors/juffed/juffed-0.10_p20200103.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=74ab7236a30be17351edc5b83eb3579affd96913
+inherit cmake xdg
+
+DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting"
+HOMEPAGE="http://juffed.com/en/ https://github.com/Mezomish/juffed"
+SRC_URI="https://github.com/Mezomish/juffed/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	app-i18n/enca
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[X]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	x11-libs/qscintilla
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+DOCS=( ChangeLog README )
+
+src_prepare() {
+	# Upstream version outdated/dysfunctional and CRLF terminated
+	cp "${FILESDIR}"/FindQtSingleApplication.cmake cmake/ || die
+
+	cmake_src_prepare
+
+	sed -i -e '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DUSE_ENCA=ON
+		-DUSE_QT5=ON
+		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+		-DLIB_SUFFIX=${libdir/lib/}
+		-DQSCINTILLA_NAMES="qscintilla2;libqscintilla2;qscintilla2_qt5;qscintilla2_qt5"
+	)
+	cmake_src_configure
+}
diff --git a/app-editors/juffed/metadata.xml b/app-editors/juffed/metadata.xml
index 5d63c46383a4..f3d0db0262bf 100644
--- a/app-editors/juffed/metadata.xml
+++ b/app-editors/juffed/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">juffed</remote-id>
+		<remote-id type="github">Mezomish/juffed</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 21d89bec8367..bcebe3936e91 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,5 +1,5 @@
 DIST pluma-1.24.1.tar.xz 3679636 BLAKE2B e792433b93862c8b0c47145255311c3a3386c1b99ec1ac87ed91608d839ece4430205f83fcc3c0f5145f986105d4c5d8803393035fcaaea08155197bbcf15d03 SHA512 0cfd6a035fc95993dce3e556c49641e799888f20159b29f2c0712c54ee772aa6df1ce755f329414c94efdb2cb3819ce633b92e6559b0c8cb064dab3c74729ab3
 DIST pluma-1.24.2.tar.xz 3745160 BLAKE2B ed855b19f1ab80cb6ef9bc175eea3c2af386b1e45123bc0e3ad93d1964efb4822fe1b3d7490308357fcff96557bb6189f081a467f41a6907e76a1961de8f23d3 SHA512 588640744f8a0bec08d0c51c0309380a57cb6319c98124885e30d05e7dd8488ba7bd5acec1bf21fb0d6832626ae8925b24cd241202265af1a631a91313cdad2b
-EBUILD pluma-1.24.1.ebuild 1794 BLAKE2B 5bc6c48c82c0f2305597a7cbb3c494757fb489988c6bade269f5d8daf3b5da52b108f705be83a7616daecc143fa5b305334990e16dc6825ea30c7cbbeaafd959 SHA512 8415629459f251aeb93ebb511415160f2126212768aca7d506da193e6fffda0690b9e0cd75268e6147295a73a1575a3167d792e5c4f0d3e2a8ff820346f8a914
-EBUILD pluma-1.24.2.ebuild 1786 BLAKE2B 94b895d698fd208b9687614b43d64c45c5d6fa438e8fd7534d18c43b93afc2f90c0fac61105ababcac79f606a5f49fb267849b6ee11115eeb979d339a7d5d650 SHA512 167031df22d481c7fecb361e3f16d155cf45e95c38ec537aa527e7c74f197bc9a9b31f75b411b706d4fe41850d59623b6c26ca51320d6c35d10389af602c4aca
+EBUILD pluma-1.24.1.ebuild 1799 BLAKE2B a4f909e45cb6a62bda87feecf27d5115043e56bb2d2ae04ffa64ede7d40b82d06e6f8433547272671325c883d98853f64cfc38cfe02a3b0a718897b44f71483c SHA512 c481ac142c14ec80430080e4f54a25e30b1745da4e0f2d3dddbf819beb9a39a4fa83ddd68cfff9b6d561a5248c84ad5681bb962e039aed24596354397272eaf7
+EBUILD pluma-1.24.2.ebuild 1800 BLAKE2B f294a7b0b70aa8fcbc2f168563fff9161718ff50bf8dcafd19953d968d7f3d27f039ecbf76a9feb7dbbb20001ba70a6c5cbf55ec6ae435c5055becef753677fd SHA512 2626cc64b51042222cbbee391153b7df6200781a4f7fbb0cc6a642d8e0b8d434f758d97a39496c37a1bc4911e12eb5dc3a39051eb269d914aa397cb87106066c
 MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
diff --git a/app-editors/pluma/pluma-1.24.1.ebuild b/app-editors/pluma/pluma-1.24.1.ebuild
index a325cf16ed24..0757d29b3b3c 100644
--- a/app-editors/pluma/pluma-1.24.1.ebuild
+++ b/app-editors/pluma/pluma-1.24.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 MATE_LA_PUNT="yes"
 
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
 
 inherit mate python-single-r1 virtualx
 
diff --git a/app-editors/pluma/pluma-1.24.2.ebuild b/app-editors/pluma/pluma-1.24.2.ebuild
index 061436117e9e..849ab407ba6e 100644
--- a/app-editors/pluma/pluma-1.24.2.ebuild
+++ b/app-editors/pluma/pluma-1.24.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 MATE_LA_PUNT="yes"
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9,3_10} )
 
 inherit mate python-single-r1 virtualx
 
@@ -73,7 +73,7 @@ src_configure() {
 
 src_test() {
 	# FIXME: This should be handled at eclass level.
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	"${EPREFIX%/}/${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
 
 	unset DBUS_SESSION_BUS_ADDRESS
 
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 8b1950b72a35..61b2ae227f03 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest
index 31f2f5269497..4662550579d3 100644
--- a/app-emacs/dash/Manifest
+++ b/app-emacs/dash/Manifest
@@ -2,7 +2,9 @@ AUX 50dash-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b5695
 DIST dash-2.16.0.tar.gz 148151 BLAKE2B 1c51d926a6dd4ecdbc2ad132347af7bbd27e604d6e2c61a6cfe548802b08a57678ca26aba69f8ae27ca7cdeca84cd469bd9a7849bf28c2abae44f7172ad2659d SHA512 a0196327c8e81d1b343bb56de00a3c2f59b1d3f86dc4e923cf350658590fa106aa0be933aa0f51ff3c02d9aff8450c5e055d169ae8fb876be068bf15a52af216
 DIST dash-2.17.0.tar.gz 149379 BLAKE2B d88106b08d1454b483f08db59e641680e7361b4572b47e238b096977ba308eb4c2810621c99e98126a94e4afdba9faf966e3c56cb6f4ad1292ef05fe7cc0546f SHA512 e53fa1bb9e854b446931d943caac719646218c96160f7c50615b5e95866f4db9dffa6e752596e9c223bcd5b39a80c0c75748b0e0564d72ce5825715a29b80d01
 DIST dash-2.18.1.tar.gz 150343 BLAKE2B 5bd0db651830d828c3c51739ab90fb34c1a70b9e72eb434d9dafca0b6e5c6f57bd121eca45fc01a20ce32f20d0c3b49a34bb4a214bacb19712a931e8a587a40b SHA512 f9f0eea41cbf589e2024955f43ec7cd00c37947d07cfd68fe267e541baec1f0c86066c39ad2fb4e467c1cc579c2369a0d75496d176775122e7e48dd24954640c
+DIST dash-2.19.0.tar.gz 155484 BLAKE2B 88ec15c5b566787191ef0b64ef1f6abeb191825ea61bd31358dcc019042c39ba5e4375648e78cf9d1b0d459104ca521d39ebf0d71781ab82c7778869030446bb SHA512 fafb080d3b55184c7304cd6b317b9aaf281427083b7925e233009451449dc4f59077618017b0ddaa91bc87c48dde5f981c6e0f51a19063a35b2ccc1b9ea49b2a
 EBUILD dash-2.16.0.ebuild 561 BLAKE2B 6b6f0318611b3b57e47b16225e2e0998c3f3020a6aa4195e65cd5954ff01518c2b026fb181f22cd5131ffc42d39eabf48fb54bee1188ae51a5556c1d1f396ea2 SHA512 34266ac3d94e0ba59061f8c7ef9946a55449621baeef3a72293486a9f9e7575b40fc78ffd3d2f37893f2c824c4caa4e987f18245fac6e04c47a7ea2351afc8bd
 EBUILD dash-2.17.0.ebuild 564 BLAKE2B 949c330e199f88ca957a348373db0a3208628762269cc832f3c5b308e5b4a5a6b9232de8180a52b8a583d36380dbb20f8c68bee9b26f2301e654a6b0a15e9004 SHA512 30cfd972903a1d4be4c1f68d71715703bd7ef00b6b4c6b554bde5b0d634fd9b07085ae13afaeb592ef73968b6e2bc4fdd553a6ade65853a70d87a005a1e4877e
 EBUILD dash-2.18.1.ebuild 525 BLAKE2B 05a3f145a89433220f90a50ed1bb52d24e0671704b00f52c31e9f16a16c44f5a05ab3cbe2b6c495d8c5f9c4b0b5d3a1c2c5bff4e1fe71519c2de7107974d3a73 SHA512 75255e9396bfe95b1a65f5300b766275d6a1e3cb316768b6b7ff63ef37ecc58632e253303b69ff2f8d3aca87a9f7085384dd119d307ea93f366eb824218d838d
+EBUILD dash-2.19.0.ebuild 525 BLAKE2B 56bbc542ab3da296acd8a3448e2c198c9b22b6474db9e64dbe41c92deaa7d9fbe273d08be3df8cc89086dd7c1720b29187b2df48c5ef6090704db8a068cf11f9 SHA512 8345d8bdf25e1a9c0a254990e7955d19936e92910991c18da13d533bda3c3805513af8a7d60dedfb5785679d925f8393688bba21b7f730a491fec977e10a9ad8
 MISC metadata.xml 360 BLAKE2B e70caec7e3633788a79217f8d41bd69056ed620396e4d22ecd0d80ad82f7dbe2e9ac3872c55cd94682cd16960e682b1f648863373cc941559b40045612188f8c SHA512 8de7334410a02599aff54733234d7b3333c4a61cd2ffc846f3f69df3b43a53c510b2235100fab79274e0727393ecec24e051b42aa36b878d6b45130b5b2e3ff3
diff --git a/app-emacs/dash/dash-2.19.0.ebuild b/app-emacs/dash/dash-2.19.0.ebuild
new file mode 100644
index 000000000000..fc2e95a1f688
--- /dev/null
+++ b/app-emacs/dash/dash-2.19.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A modern list library for Emacs"
+HOMEPAGE="https://github.com/magnars/dash.el"
+SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="sys-apps/texinfo"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="dash.texi"
+DOCS="README.md"
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 78cb0c516379..f5feef848079 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -3,8 +3,10 @@ DIST magit-2.13.1.tar.gz 520271 BLAKE2B fdffa561dccaafc2be56bf285e286859145e00f5
 DIST magit-2.90.1.tar.gz 544968 BLAKE2B d3a38cf8c4d8c15529463028c4f6718d65bff044f91f58f2027c62d584202835d17229ec1db93d2990b5bb59403eabf7f12e7e91e2de519149ad40c274da5f25 SHA512 57a81fc72276907009fd3d05abbaed930d089d3e4621d539abb6ce2b24fd594950533f47d60682e25f0bd1c9f1ab3a16ba6b2698d79c6980f250ffd335be7789
 DIST magit-3.0.0.tar.gz 610528 BLAKE2B b667a6f12020f37303fa5d5c8bc71cb8f66bd25acbed704f3b3ba666b95b656da8c1b979d592e58171dd7bbaa4896b8fa144f52ec65e28976a88f42917df9323 SHA512 f1bb0d96906d327bb929cc45e2496a214513b1da4fd68e78a3db188f19dd69bd253c83e6b7881713989ee2a70d2f2cfdc9414263e0ee09be34cd72eb7fcb198d
 DIST magit-3.1.0.tar.gz 613295 BLAKE2B b2ab1e56d1dcab7476fcfd22563452c0b6977a90f9d614911f13fb9eb591b75197d3ba7f74a1acab9eee464d4ab8d3c63e2019e7b974b3895d4a9851e37887e7 SHA512 b4e884aea1d6b0cbf7861016b7fbc8214911ea84afd349320c929368a245da31105555e644d4e2e9f5aa6787202c9c30c24e62f64f5671cc036273c22ab65bfc
+DIST magit-3.2.0.tar.gz 618602 BLAKE2B c96226669bc5160460d24a1b9b36784d6764234e2e2690f059c362176e9a56fc742b961a0d4103049b33d958e44c092f4bbb75de3b3437ac178dae89e34028e0 SHA512 3b4bd5a13592814c0c638a26ba09c6e01a15db6af3555db41bc0adc53e8c08eaa2e7c58d8a105101fb46a8a04be0e09a0f2c86d365391430b42adee83df382f6
 EBUILD magit-2.13.1.ebuild 835 BLAKE2B 786b7e8ac034d16b1baef4620c1eca7b436dc3c13b75d97e246970d80a96575c5111d12edd3c34e792126706b1cc87ac295e8292361a917948f9988949730869 SHA512 78e0c514ebe0eeaaeb69c66980794886e8584e52dc1a695ff8a333eb91be08ca8ee6b8cfae902633aa7572d123b609a82d4e3ed96ff59e27c4f4f410a3004df8
 EBUILD magit-2.90.1.ebuild 828 BLAKE2B f2ddb437ef786073f6a9f7f5561cbc9452bfa274c3b1e31a49ae9f5984f5ca63d54468e51023e1990da073bc162808b38f12c9b1ee9a51509ea5d2fbf3de525c SHA512 a85ae33cef7625b40c7d8dd1794075adb4dbe0eae2b99a08395ab91bdd0ff590cec877298d5e20c1868322e6eba2dc1ee08ec9306b60be8c65a13cd15de0091d
 EBUILD magit-3.0.0.ebuild 823 BLAKE2B eead5e1ea1d1ba7e2969cf81358cc9089c1e7b7d5df257d93133033430e7ea5342cef6cd4aa3b74b1cf8615205f6e438ed1dc52704330bb8d0e5cf7a41fab80c SHA512 fcc54d58483dc52229468ea2e90150be80d3efce32e4cab7fdf8d12956c9a8a51143da6b99151f402934d777eaf6d0134bbf8f5381a696cd10fd489ebab8666e
 EBUILD magit-3.1.0.ebuild 823 BLAKE2B d7b1760ed5f5d5c95204933f5346eff2a40824b7fe6a44a689dd37afcc9b57ab53a9550ec89819074fd3d7c56ea399fee97b34a846690c2ba2c5acef3145bcbb SHA512 c319209ba031fd875f8838ee848d275682032de23f912aa763bfb7f6dbc2d6c76a04a5906bb173763cf3036357d2d88bfbf5c96ab787c7ab5d8f6ef674ecc6e1
+EBUILD magit-3.2.0.ebuild 823 BLAKE2B 0bd97294709e7cc31744117cf8cc92c00a1f7b3aac89a2085c1652510da6269ce9738302079f5828a909434fae9382387bf2d5ab1099cfe5dbab03e4d78cf680 SHA512 bfa883e5a9567aae7be3999536735fdc97707925095520a2307ddd01151052b70bd68d7991abfd3c50926793cdf673c277d0a7cf6b492775d3014606cb317e64
 MISC metadata.xml 811 BLAKE2B aa2a5aaf1024e2a75c24cad4d01622884ffde259c3a2d9869df9629741d4a19da87c5933efd2aa58a9fc0256150e8bf5e68bef99595993154cf06027f2de4b83 SHA512 ec3ade59fbba30a15b3b728f293884c9f5cf532a8ca92c984c7978b73061cbd5a7b4b1fc68af15d28990d13f50cad688d7cc8229e9e38988bdbdbcf2fbe2a900
diff --git a/app-emacs/magit/magit-3.2.0.ebuild b/app-emacs/magit/magit-3.2.0.ebuild
new file mode 100644
index 000000000000..fc3d6da779de
--- /dev/null
+++ b/app-emacs/magit/magit-3.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="A Git porcelain inside Emacs"
+HOMEPAGE="https://magit.vc/"
+SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${P}/lisp"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="../Documentation/*.texi"
+DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/*"
+
+DEPEND="
+	>=app-emacs/dash-2.18.1
+	app-emacs/libegit2
+	>=app-emacs/transient-0.3.6
+	>=app-emacs/with-editor-3.0.4
+"
+RDEPEND="${DEPEND} >=dev-vcs/git-2.0.0"
+DEPEND="${DEPEND} sys-apps/texinfo"
+
+src_prepare() {
+	default
+	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
+}
diff --git a/app-emacs/vterm/Manifest b/app-emacs/vterm/Manifest
index 84e39c133802..1a0c790e669e 100644
--- a/app-emacs/vterm/Manifest
+++ b/app-emacs/vterm/Manifest
@@ -4,5 +4,5 @@ AUX vterm-0.0.1_pre20210618-dont-compile.patch 772 BLAKE2B 235f1050ccf434663da28
 DIST vterm-0.0.1_pre20200713.tar.gz 48160 BLAKE2B 96c45ddb139d19f3020d7a8eebc1ee31a7dc098f47c16cfffc7bf3327261a4366763744a8158d3c8a066ec94be4966a5ef78804db95c9025eee06fb8c9e4aa76 SHA512 17726ad0957daeab2a87b398bfa24dbe3c4c48dfba932138a71cd8c992bf20bd2925a7118a89247bbd674dbecd7fda8663c564a278168bb207034efb03e50cd0
 DIST vterm-0.0.1_pre20210618.tar.gz 58389 BLAKE2B 71221d470e01d647093e3a3af0c57b416ef23e81ff4d783d032613e19f1d467752fea0d242ea0f72092e3cdabbdb88ba15a840d9e4116cf5aa95d54a020efe0d SHA512 9e23eff1c9c5d2cc8e970bb4d9910b3e0258987d09b765ece188641ff5e2696e30d59a409f45253f243162b8e71c0ea301049ff37c93ffec1e1c25206ca9c5d2
 EBUILD vterm-0.0.1_pre20200713.ebuild 972 BLAKE2B 13876ff1c427de41c5c0e529f7793fabc5850cec6a07551777815ca3d985d442c72cd8b429546397d073ab1987493e8bdffc0308290e99df285883b90af19db9 SHA512 01598b7b2515e3a082bc56676b5f448ce20f978e63c5896475b683715fd8a53a6b63b238c870ae0e3c92218c3049e93b2ec7da3074e04f88cd5739252bfa5773
-EBUILD vterm-0.0.1_pre20210618.ebuild 987 BLAKE2B c91417b70e7290b2b2d4b7de1b878ac0ad496012931a5296ae7196053cbebd1d095dce0cf7bee2a7b215bc3284d0c0922fcc67fa6dd9c51d4212270fafe59e3b SHA512 152f372fd98ab2ead4c4084b3312421483c3e97ac3a88aeb70e5b46c8e99ab5b96a786488997426c708619eced9a257fd8e90abdce88de18c7202f9f8293f536
+EBUILD vterm-0.0.1_pre20210618.ebuild 1242 BLAKE2B 9ccf5d930934d0b3fe78ef29c21ec51e2785ae9077b6d6f81d0f887b4c1eec87019ae1701b4c84021436bb6feea19b211574242ae7dddb5015a25449127e5637 SHA512 2a2c915c097b7f5eb2c4691dedfcf976dfbfd94d9540aeba5829db3c2f10852aa39f36550e84e825cb05e657e592fc19394a073d49a4ce5d7031b6ca41840d64
 MISC metadata.xml 633 BLAKE2B 60cd4ca523fa42307493cccbbf5fc240dd658f2c7368e761c94e384e9d363ae8359d0b6e0520be3767b6df38a4d94d9f1ebc3e8983c40d07ffc990428cb863fc SHA512 1ae5bd4bff830550c81d14e8312faf9aa0270ea7bf3e73ad347c20de0fb0d8fbbfe0d1fc807d41c0629e4c3170d9a512abdd5213f200671e63c80afc814fe85b
diff --git a/app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild b/app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild
index 77ce01cdc80f..921cdf52715f 100644
--- a/app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild
+++ b/app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild
@@ -26,6 +26,13 @@ SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md"
 
 src_prepare() {
+	if [[ -e ${ESYSROOT}/usr/include/emacs-module.h ]]; then
+		# Use system header file instead of bundled one
+		rm emacs-module.h || die
+	else
+		ewarn "${ESYSROOT}/usr/include/emacs-module.h does not exist"
+		ewarn "Falling back to bundled header file"
+	fi
 	cmake_src_prepare
 }
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 15f2612fa68f..3834667b2a50 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index a63584b84d00..714f4ad0c0f9 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -1,3 +1,5 @@
 DIST install-crossover-20.0.4.bin 221436226 BLAKE2B 486494455759d92f8e7e5d35968a603e41a0674cb0752e7d5ba4893d33e77b3e31fea2ebe75d471e2478e7f3cce9be2f712840f1f50bfe790fec5ec936b804a5 SHA512 78252d29f8a72a8742d57a65a60d09a81a70a98517b67468dac96af94ee8af7a313f164af6717f9a9c657095e66466809e08584c7a0fde3bd58c27ff00f41067
+DIST install-crossover-21.0.0.bin 312441596 BLAKE2B 4431f545e6a8c8bbc1ab5cf0f46d019242b48c61a2edfc7a762e38718d6543ce384ad55b40f3470f11893adcb6801323db5dba846cc0b544d6dab5e5bfb24e2b SHA512 c5567eef346d93af22f996be2a5a0237bc299c54cba3aa9a1345854b0cf601ffd26975536d18175735c170411b572a59d5dadb39674bfe158ca9944595e4deed
 EBUILD crossover-bin-20.0.4-r1.ebuild 7651 BLAKE2B b30aa79900d12cf469a5a12c854c7a3158f7671b6cc83adba9a39bcbc996708b5ade8b34e79631702390bf0de91c29ac85293185bb04fc9e27224e9a4f82e40d SHA512 5dd675da9398c20bba21d077d48a19ccb4dea3f5888f402120b4574ec324fa559cad8930d0b649dd75d4cf284f6890ca95033d227ae0c0af22fc28cc4bd1bdb1
-MISC metadata.xml 495 BLAKE2B 09ff077822c1862d7f7d20bee57ebf1dcc48831a9539b280e8b09344e278bdc35d122debdca7cdab10d10cd546eb005a157e896670eba3206af2281dc7228f90 SHA512 da97a48eb9e984ee10581e455be37ac9adb2ab897d837f9ed91e5b368ce1800ff3468a5290fff53b3d93e7c56d6c5cb56936d0d09168c10f19356fa5729dcf0d
+EBUILD crossover-bin-21.0.0.ebuild 7552 BLAKE2B 116a19b0cef631ad98225895e46694bdd61efd2c0b1120ab5ee48e20f3c35d566703bddc10280d381982062435cd3c3c939a40cc11fd3132fdf47c34e39953cf SHA512 d0c47414d959e3af22ce118d9b10f754351bd5e21c14c197f38183defac55043e5b65b039a6715c5ae2f40303d45babc79ba6eb52f835c9f4a22b544ab3b9af6
+MISC metadata.xml 567 BLAKE2B d0ae14d461fe896694458100941e606ad77db6493e1f0b8ac39723ce7fad4970859c3cc38cdf0bd8c621ffbc98ba4104ad7a253e1fd4c1a54a623c65ac5c25c3 SHA512 cf88f42103f16e182d6bdb5017278b1a1925c5ac2c7557ca043741ccc4a3e1a7825217e5a8c2785fc44151e972ff156b05037aab16e4245adfe55a838604f724
diff --git a/app-emulation/crossover-bin/crossover-bin-21.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-21.0.0.ebuild
new file mode 100644
index 000000000000..b6892fa15c0b
--- /dev/null
+++ b/app-emulation/crossover-bin/crossover-bin-21.0.0.ebuild
@@ -0,0 +1,224 @@
+# 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 unpacker
+
+DESCRIPTION="Commercial version of app-emulation/wine with paid support"
+HOMEPAGE="https://www.codeweavers.com/products/"
+SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
+
+LICENSE="CROSSOVER-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="bindist test"
+
+QA_FLAGS_IGNORED="opt/cxoffice/.*"
+QA_PRESTRIPPED="
+	opt/cxoffice/lib/.*
+	opt/cxoffice/lib64/.*
+	opt/cxoffice/bin/cabextract
+	opt/cxoffice/bin/cxburner
+	opt/cxoffice/bin/cxntlm_auth
+	opt/cxoffice/bin/wineserver
+	opt/cxoffice/bin/wineserver32
+	opt/cxoffice/bin/wineserver64
+	opt/cxoffice/bin/wine64-preloader
+	opt/cxoffice/bin/unrar
+	opt/cxoffice/bin/wine-preloader
+	opt/cxoffice/bin/cxdiag
+	opt/cxoffice/bin/cxdiag64
+	opt/cxoffice/bin/cxgettext
+	opt/cxoffice/bin/vkd3d-compiler
+	opt/cxoffice/bin/wineloader
+	opt/cxoffice/bin/wineloader64
+"
+QA_TEXTRELS="
+	opt/cxoffice/bin/wineserver32
+	opt/cxoffice/lib/wine/*
+	opt/cxoffice/lib/libwine.so*
+"
+
+S="${WORKDIR}"
+
+DEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	app-arch/cpio
+	app-arch/unzip
+	dev-lang/perl
+	dev-util/bbe
+"
+
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	!prefix? ( sys-libs/glibc )
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
+	capi? ( net-libs/libcapi[abi_x86_32(-)] )
+	cups? ( net-print/cups[abi_x86_32(-)] )
+	gsm? ( media-sound/gsm[abi_x86_32(-)] )
+	jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
+	lcms? ( media-libs/lcms:2 )
+	ldap? ( net-nds/openldap[abi_x86_32(-)] )
+	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[abi_x86_32(-)]
+		jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] )
+		media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)]
+	)
+	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
+	nls? ( sys-devel/gettext[abi_x86_32(-)] )
+	openal? ( media-libs/openal[abi_x86_32(-)] )
+	opencl? ( virtual/opencl[abi_x86_32(-)] )
+	opengl? (
+		virtual/glu[abi_x86_32(-)]
+		virtual/opengl[abi_x86_32(-)]
+	)
+	pcap? ( net-libs/libpcap[abi_x86_32(-)] )
+	png? ( media-libs/libpng:0[abi_x86_32(-)] )
+	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
+	ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] )
+	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
+	vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	dev-libs/openssl
+	dev-util/desktop-file-utils
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/freetype:2[abi_x86_32(-)]
+	media-libs/mesa[abi_x86_32(-),osmesa?]
+	media-libs/tiff:0[abi_x86_32(-)]
+	sys-auth/nss-mdns[abi_x86_32(-)]
+	sys-apps/util-linux[abi_x86_32(-)]
+	sys-libs/libunwind[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXcursor[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libxcb[abi_x86_32(-)]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-libs/vte:2.91[introspection]
+	|| (
+		sys-libs/glibc[crypt(+)]
+		sys-libs/libxcrypt[compat]
+	)
+"
+
+pkg_nofetch() {
+	einfo "Please visit ${HOMEPAGE}"
+	einfo "and place ${A} into your DISTDIR directory"
+}
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:xdg_install_icons(:&\"${ED}\".:" \
+		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
+		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
+		"${S}/lib/perl/CXMenuXDG.pm"
+
+	# Remove unnecessary files, license.txt file kept as it's used by
+	# multiple files (apart of the menu to show the license)
+	rm -r guis/ || die "Could not remove files"
+	use doc || rm -r doc/ || die "Could not remove files"
+}
+
+src_install() {
+	# Install crossover symlink, bug #476314
+	dosym ../cxoffice/bin/crossover /opt/bin/crossover
+
+	# Install documentation
+	dodoc README changelog.txt
+	rm README changelog.txt || die "Could not remove README and changelog.txt"
+
+	# Install files
+	dodir /opt/cxoffice
+	#cp -r ./* "${ED}/opt/cxoffice" \
+	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
+		|| die "Could not install into ${ED}/opt/cxoffice"
+
+	# Disable auto-update
+	sed -i -e 's/;;\"AutoUpdate\" = \"1\"/\"AutoUpdate\" = \"0\"/g' share/crossover/data/cxoffice.conf || die
+	# Install configuration file
+	insinto /opt/cxoffice/etc
+	doins share/crossover/data/cxoffice.conf
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die
+
+	# Konqueror in its infinite wisdom decides to try opening things for
+	# writing, which are sandbox violations. This breaks the install process if
+	# it is installed, so we ninja edit it to false so it so doesn't run.
+	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	# Install menus
+	# XXX: locate_gui.sh automatically detects *-application-merged directories
+	# This means what we install will vary depending on the contents of
+	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
+	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
+		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
+		|| die "Could not install menus"
+
+	# Revert ninja edit
+	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	rm "${ED}/usr/share/applications/"*"Uninstall"* \
+		|| die "Could not remove uninstall menus"
+	sed -i \
+		-e "s:\"${ED}\".::" \
+		-e "s:${ED}::" \
+		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
+		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
+	sed -i -e "s:${ED}:/:" \
+		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
+		|| die "Could not fix paths of *.desktop files"
+
+	# Workaround missing libs
+	# https://www.codeweavers.com/support/forums/general/?t=26;mhl=198658;msg=198658
+	if use gphoto2; then
+		bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" >tmp || die
+		mv tmp "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" || die
+		bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/bin/cxdiag" >tmp || die
+		mv tmp "${ED}/opt/cxoffice/bin/cxdiag" || die
+		fperms a+x "/opt/cxoffice/bin/cxdiag"
+	fi
+	# It tries to load libpcap as packaged in Debian, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657900
+	# https://bugs.gentoo.org/721108
+	if use pcap; then
+		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" >tmp || die
+		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" >tmp64 || die
+		mv tmp "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" || die
+		mv tmp64 "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" || die
+	fi
+
+	# Remove libs that link to openldap
+	if ! use ldap; then
+		rm "${ED}"/opt/cxoffice/lib*/wine/wldap32.dll.so || die
+	fi
+}
diff --git a/app-emulation/crossover-bin/metadata.xml b/app-emulation/crossover-bin/metadata.xml
index 5c532a244c89..65e715693e51 100644
--- a/app-emulation/crossover-bin/metadata.xml
+++ b/app-emulation/crossover-bin/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>pacho@gentoo.org</email>
+	<name>Pacho Ramos</name>
+</maintainer>
 	<use>
 		<flag name="capi">Enable ISDN support via CAPI</flag>
 		<flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag>
diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest
index 70212b3d5402..07304e3fb5f7 100644
--- a/app-emulation/crun/Manifest
+++ b/app-emulation/crun/Manifest
@@ -1,5 +1,4 @@
-DIST crun-0.18.tar.gz 1394857 BLAKE2B db4f0407aaf5e4c5b9069ad5ae6a76308665d91559d92bf370b964e0914f337a84af896f1c1e00184ef4b0625bd1c0f1e2fc3295074c7f5524c5359ce54ba6b4 SHA512 94610d9d4ef95a9be708c6cf8cc38587c9c3b847d9da5cf9dfa4a2eddddb7e6724e39ffb222ed5d6c61bad8374ae50dc9e92d95b6d03ce0b185d5123afeeca46
+AUX libcrun-linkage.patch 1155 BLAKE2B b815ada4c90e61ac36e878ba0072f2dc3944e8f82d827e47cc8907fce0931e2134af690261cf75e193fbcb47b4822955d26f3e9950b674c5fafde85f25700032 SHA512 2a1936f3ac3a45cc2fcef61d097c86c78e94ee71ff15dc68d6037bf6be174a6bff725c04ccefff805c9059db3e4db1285c785658b7f6cf4b610739f11e82cfed
 DIST crun-0.19.1.tar.gz 1870594 BLAKE2B 1780a2936ff39ec80836c4c9ae072e2fc30703a31a79786337290c62dd433b5a35dcfa953be370703d1baab3de93fdb376c99ab76dff1470883c61726c313144 SHA512 f93f79d1d63d6749bcf92d48542d9555f3ad47657c959c7c06701861d7a5a4171969f00f6dff3878286970a48aba3314c25e35c005463e606533b0ff7843d994
-EBUILD crun-0.18.ebuild 1393 BLAKE2B 202766c3cd321d12f35214d28cb7dde3c7bd5ba916106ec7523923e54d5f6070d66a7486e198f137a2808684ee9ad2f3acc2c25434ed445a4255519ff04adebf SHA512 db0ffd3ae2a3b9a725c25694095b6c5ee6cc7f96eaff1324f3209dd6d5fdf3e200c0072531bc537a063a5dddcfb1cdb6bcfdc9ef5e58c74204de2f624b4d7113
-EBUILD crun-0.19.1.ebuild 1391 BLAKE2B 12467ff7c6a8537132ed36cdb5113258c51c60242cb575429725d51759724b6eb3c4ab8915e21ae85e77aa2371c8897763087915c7906fa85719b377796394e2 SHA512 201aee36f5243014988103b8ae3f29e600cd10fdd68f413aa4b1eba371cd30646d73367de1a23e7a9ead4b41b3e1facc44a2f62f730489582c02a79b6cbdae51
+EBUILD crun-0.19.1-r1.ebuild 1511 BLAKE2B 56dc3607cfccf765c0be5357df9d51f43ad397359f82ce600eeefd39ee03cae12f96a44bcaf22c5f41a538991e577e2f1ff8cc44adf5e711ae869f5cd47e8fc5 SHA512 314589e661a047094b5eac396ec5c982d6b9f2bc25d63fb43e53a6420a4ccc2568fffc476d1a8777dca6bbf2511de16e37e52c28d29b67e9171381db74710857
 MISC metadata.xml 1299 BLAKE2B cfa5ced999f15c2aabb6633865fb8bc2f2dc7c2d2b4fa61780de40f975c8a00ad87d7c1251517f7a50b01c3413d2afbe8bca2114ce9eb74d0437285ee6d19d91 SHA512 0f2109b828550df8807736022598f3fa36128ff5224aa61cbb4001689c344b670c124bb85805cdedf8b2e7173b4cc6bc29d7d46ef95f7c9f03c4a9b6e1c93493
diff --git a/app-emulation/crun/crun-0.18.ebuild b/app-emulation/crun/crun-0.18.ebuild
deleted file mode 100644
index bc97b2bddb13..000000000000
--- a/app-emulation/crun/crun-0.18.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
-HOMEPAGE="https://github.com/containers/crun"
-SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="+bpf +caps criu +seccomp systemd static-libs"
-
-DEPEND="
-	sys-kernel/linux-headers
-	>=dev-libs/yajl-2.0.0
-	caps? ( sys-libs/libcap )
-	criu? ( >=sys-process/criu-3.15 )
-	seccomp? ( sys-libs/libseccomp )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-"
-
-# the crun test suite is comprehensive to the extent that tests will fail
-# within a sandbox environment, due to the nature of the privileges
-# required to create linux "containers".
-RESTRICT="test"
-
-DOCS=( README.md )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable bpf)
-		$(use_enable caps)
-		$(use_enable criu)
-		$(use_enable seccomp)
-		$(use_enable systemd)
-		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake -C libocispec
-	emake crun
-}
-
-src_install() {
-	emake "DESTDIR=${D}" install-exec
-	doman crun.1
-	einstalldocs
-}
diff --git a/app-emulation/crun/crun-0.19.1-r1.ebuild b/app-emulation/crun/crun-0.19.1-r1.ebuild
new file mode 100644
index 000000000000..0590fee263af
--- /dev/null
+++ b/app-emulation/crun/crun-0.19.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools python-any-r1
+
+DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
+HOMEPAGE="https://github.com/containers/crun"
+SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64"
+IUSE="+bpf +caps criu +seccomp systemd static-libs"
+
+DEPEND="
+	sys-kernel/linux-headers
+	>=dev-libs/yajl-2.0.0
+	caps? ( sys-libs/libcap )
+	criu? ( >=sys-process/criu-3.15 )
+	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+"
+
+# the crun test suite is comprehensive to the extent that tests will fail
+# within a sandbox environment, due to the nature of the privileges
+# required to create linux "containers".
+RESTRICT="test"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}/libcrun-linkage.patch" )
+
+src_prepare() {
+	default
+
+	# for libcrun-linkage.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable bpf)
+		$(use_enable caps)
+		$(use_enable criu)
+		$(use_enable seccomp)
+		$(use_enable systemd)
+		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake -C libocispec
+	emake crun
+}
+
+src_install() {
+	emake "DESTDIR=${D}" install-exec
+	doman crun.1
+	einstalldocs
+}
diff --git a/app-emulation/crun/crun-0.19.1.ebuild b/app-emulation/crun/crun-0.19.1.ebuild
deleted file mode 100644
index 36091c997004..000000000000
--- a/app-emulation/crun/crun-0.19.1.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
-HOMEPAGE="https://github.com/containers/crun"
-SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64"
-IUSE="+bpf +caps criu +seccomp systemd static-libs"
-
-DEPEND="
-	sys-kernel/linux-headers
-	>=dev-libs/yajl-2.0.0
-	caps? ( sys-libs/libcap )
-	criu? ( >=sys-process/criu-3.15 )
-	seccomp? ( sys-libs/libseccomp )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-"
-
-# the crun test suite is comprehensive to the extent that tests will fail
-# within a sandbox environment, due to the nature of the privileges
-# required to create linux "containers".
-RESTRICT="test"
-
-DOCS=( README.md )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable bpf)
-		$(use_enable caps)
-		$(use_enable criu)
-		$(use_enable seccomp)
-		$(use_enable systemd)
-		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake -C libocispec
-	emake crun
-}
-
-src_install() {
-	emake "DESTDIR=${D}" install-exec
-	doman crun.1
-	einstalldocs
-}
diff --git a/app-emulation/crun/files/libcrun-linkage.patch b/app-emulation/crun/files/libcrun-linkage.patch
new file mode 100644
index 000000000000..72156ac931c8
--- /dev/null
+++ b/app-emulation/crun/files/libcrun-linkage.patch
@@ -0,0 +1,29 @@
+From 7cfdf094071fcff038bab573c1eeee599fa17b16 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Mon, 2 Aug 2021 03:53:25 -0700
+Subject: [PATCH] Makefile.am: link libcrun to $(FOUND_LIBS)
+
+otherwise libcrun consumers fail at runtime with
+symbol lookup errors
+
+Closes: https://github.com/containers/crun/issues/711
+Issue: https://github.com/containers/crun/issues/340
+Downstream-bug: https://bugs.gentoo.org/717750
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 150e933a..7e5a4406 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -46,7 +46,7 @@ libocispec/libocispec.la:
+ 
+ libcrun_la_SOURCES = $(libcrun_SOURCES)
+ libcrun_la_CFLAGS = -I $(abs_top_builddir)/libocispec/src -I $(abs_top_srcdir)/libocispec/src -fvisibility=hidden
+-libcrun_la_LIBADD = libocispec/libocispec.la $(maybe_libyajl.la)
++libcrun_la_LIBADD = libocispec/libocispec.la $(FOUND_LIBS) $(maybe_libyajl.la)
+ libcrun_la_LDFLAGS = -Wl,--version-script=$(abs_top_srcdir)/libcrun.lds
+ 
+ # build a version with all the symbols visible for testing
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index a9f9841fe0d1..d3d7be4cc8e5 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,7 +1,5 @@
-DIST diskimage-builder-3.11.0.tar.gz 475123 BLAKE2B 2d286193c99077b943ddc2342871878d78380c27b247cca895d14e9ca1ca69c3d260fe0061e9f09a80156cee327234ce0a8c129f2008422d0db1bd736175f490 SHA512 083a3dff0ec32cd35cb5a95f25b115778aa4b74ab47796c13ac007fa6af5940140117eb4c2b5f44674316f65b0c0b53b6e077787e8018f6d7735906d333d2da0
 DIST diskimage-builder-3.12.0.tar.gz 477540 BLAKE2B 9facf1d6ef9a38b960b7bcc8ee035d8f7ae6c5189d1de25e335d68a6e8389be0ab0f3b787e5d5112ee7ef508b583d1df612ca75149659f78685a2fdf6dee21a7 SHA512 edec229023673c48a3176b315c9d84067b4e7b4a30843839722a7ce300f898d92ee5f5146b6d92f2eda692bada4370b32f1b19f3b929a379b3e604b6e7ce29d6
 DIST diskimage-builder-3.13.0.tar.gz 494027 BLAKE2B 27a88118d688018a5f842e0d483e3128b0715cdc21f33308de61ea5077ad1b824738363ae066463e84e7e3821a36085afc9985fde74883ab040c67a25073e5c0 SHA512 7b099811021f199ed0680e2dc4db6302b05dc6adf95ac96e890501cf92727dc319fbf96f9c68a8b9bca26ba54d7ff5e6a67f036a9d86a3ad1752d5cc4a8edbaf
-EBUILD diskimage-builder-3.11.0.ebuild 1123 BLAKE2B e08d7364d05eb37576d34f950030e90fa5b8e4e7ad4e2d485e57e1399567af9e065f5f998b27fedae1d84a51f6df2aba33f33baea467871988cd197852a4db7a SHA512 e1f2646722a8b253408c28fe55693cf0a77e6cb1a46b846f655b68384d4761ce3c3d4c669201fae482bd012340f0b7f4896a2c7140b400bb29cfc9436cf1018d
 EBUILD diskimage-builder-3.12.0.ebuild 1123 BLAKE2B e08d7364d05eb37576d34f950030e90fa5b8e4e7ad4e2d485e57e1399567af9e065f5f998b27fedae1d84a51f6df2aba33f33baea467871988cd197852a4db7a SHA512 e1f2646722a8b253408c28fe55693cf0a77e6cb1a46b846f655b68384d4761ce3c3d4c669201fae482bd012340f0b7f4896a2c7140b400bb29cfc9436cf1018d
 EBUILD diskimage-builder-3.13.0.ebuild 1125 BLAKE2B 2e91c98564bf0c4ffff2e97d5900feb0b6c74aceba0880d0d51d0fafc26a89f9de5c16b7484e223b9f190106a72e541d658ca483e0bf36e098baf250f0d39dbc SHA512 652e697141503582b7e648efe2d4448118525798ebe3db86ddd1964a741ffd3e0c68c3d42b91aa2f0df63e6903a9a922e7d0b1d6ff68c5abd1c124931ab93f92
 EBUILD diskimage-builder-9999.ebuild 1125 BLAKE2B 2e91c98564bf0c4ffff2e97d5900feb0b6c74aceba0880d0d51d0fafc26a89f9de5c16b7484e223b9f190106a72e541d658ca483e0bf36e098baf250f0d39dbc SHA512 652e697141503582b7e648efe2d4448118525798ebe3db86ddd1964a741ffd3e0c68c3d42b91aa2f0df63e6903a9a922e7d0b1d6ff68c5abd1c124931ab93f92
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.11.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.11.0.ebuild
deleted file mode 100644
index 7a9c76c9cccd..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-3.11.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder."
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools
-	sys-fs/dosfstools
-	sys-apps/gptfdisk
-	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/docker-cli/Manifest b/app-emulation/docker-cli/Manifest
index e1458ddcb309..3147e49cb229 100644
--- a/app-emulation/docker-cli/Manifest
+++ b/app-emulation/docker-cli/Manifest
@@ -1,3 +1,5 @@
 DIST docker-cli-20.10.7.tar.gz 7523515 BLAKE2B 36ae46a28ca943e75419014b8b8453dbdd36bf240b9c36aed245447241dd07635da0319fd9b6ea409ecbe4c419eec8650d94d2a296e45a9c3b02a9a47a314888 SHA512 4523ae70cb27d848da119070171af2eb84e974ac39d70be4feee105e37c949487c7f72a9bc30c32ce71bffb0787e27b7b9194ce5a8aeae57bdfeb3f2d730010f
+DIST docker-cli-20.10.8.tar.gz 7526374 BLAKE2B 65b7733c9a71c7f266e83b7014ecdca998915e71352a1bbbb346be6a3a65f1ed6644b321b62d0592f2dbf308ff51d3d4ad0d9828831f5f90b451c6ff23452faa SHA512 60e9e623180d3cafd8bd6458d02574274871f94e88a0fa461e2200520717e837371a1b5d7fab6c9c4591e64807ab6f560e0756a9cfb1c1c8c9624b1f653346d0
 EBUILD docker-cli-20.10.7.ebuild 1846 BLAKE2B a05d7129af51396d5da5017c9bc15a4229ebe3f56aa1afc8d92ee58c8e00b22d4e9baf42274b8e268dc00a3e417fd5435e3aac6da46a5b1e37a4909b4c736da6 SHA512 592eecad2f2e76c1bb9283e22a146983035e14ab481b867388c0ff2a0c0692592d88186f5007dd01c7c35e0bceb93143b54369bacce39f73fa40417345da1057
+EBUILD docker-cli-20.10.8.ebuild 1843 BLAKE2B c4a0dc3207b689759c37bcbd1acc4fc12fecda6a5fb46f09d04ec9a52188e038554a574467f86151644d67521798cebf2879c89414aa0e9ef4c06e8e753ce238 SHA512 2da1842e1e74794bfc7abdd5e46331395c87fd0ca1c2911c71c0ea32a21530e92a878656bf1ddfe913799d8f2704e78d8512512c5dbf1d5314c30ebef9e44e41
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/docker-cli/docker-cli-20.10.8.ebuild b/app-emulation/docker-cli/docker-cli-20.10.8.ebuild
new file mode 100644
index 000000000000..d298b0daa2c0
--- /dev/null
+++ b/app-emulation/docker-cli/docker-cli-20.10.8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GIT_COMMIT=3967b7d28e
+EGO_PN="github.com/docker/cli"
+MY_PV=${PV/_/-}
+inherit bash-completion-r1  golang-vcs-snapshot
+
+DESCRIPTION="the command line binary for docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="hardened"
+
+RDEPEND="!<app-emulation/docker-20.10.1"
+BDEPEND="
+	>=dev-lang/go-1.16.6
+	dev-go/go-md2man"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
+}
+
+src_compile() {
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	export GOPATH="${WORKDIR}/${P}"
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+		emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat VERSION)" \
+		GITCOMMIT="${GIT_COMMIT}" \
+		dynbinary
+
+	# build man pages
+	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+	mkdir -p ./man/man1 || die "mkdir failed"
+	go build -o "${T}"/gen-manpages ./man ||
+		die 'build gen-manpages failed'
+	"${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
+		die 'gen-manpages failed'
+	./man/md2man-all.sh -q ||
+		die 'md2man-all.sh failed'
+}
+
+src_install() {
+	dobin build/docker
+	doman man/man*/*
+	dobashcomp contrib/completion/bash/*
+	bashcomp_alias docker dockerd
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+}
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 177188d6afee..aed31a5df7d5 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -16,5 +16,5 @@ EBUILD docker-compose-1.28.5.ebuild 2106 BLAKE2B 1ba83fc6311c7f57b5f73a19236d0be
 EBUILD docker-compose-1.28.6.ebuild 2106 BLAKE2B 4c0b6b20bb8c738885b904338b555fc3d48de10cb850113da2c3c8b79deb14f3c951242100ab12b6edf8b006b346c10d4a0b70c2026acdcb708473ec328bcc56 SHA512 c41c7543b214c369bc11b23bfcbbf84f7a3d5f263b16d02036148f191e8ea8a36fd05c243c84ec4478ac985edc8e2e0381dcb8d154c94f6cdc37928f947593cd
 EBUILD docker-compose-1.29.0.ebuild 2102 BLAKE2B e7608f2ac6c52f6760b8c859f901afca0fe63570782952b73a6be92eb4431786d87382f84468c55ea876fe60cfc9defbc9b3a486a56e1b18dbd70b8e59e2e449 SHA512 fbbe8cd918dd181605bd8e12e0ec1f5facc9779294ca40a67c405304280943feffbe73d199a0c41cfeb46ffc62c248bc6ed2b3f9a5790449dfe2a2af02175f96
 EBUILD docker-compose-1.29.1.ebuild 2102 BLAKE2B e7608f2ac6c52f6760b8c859f901afca0fe63570782952b73a6be92eb4431786d87382f84468c55ea876fe60cfc9defbc9b3a486a56e1b18dbd70b8e59e2e449 SHA512 fbbe8cd918dd181605bd8e12e0ec1f5facc9779294ca40a67c405304280943feffbe73d199a0c41cfeb46ffc62c248bc6ed2b3f9a5790449dfe2a2af02175f96
-EBUILD docker-compose-1.29.2.ebuild 2101 BLAKE2B 321441c284627fb092af9b0d75c3a9faf34f4fb368afdbd90b3735603798acb25f9e664d5e28a7bce84ea27c38adf456ae1b53d067d39007caa4978a4c346b6c SHA512 2fcc39f7d27a0b06d3d7c97ba1b20e519d89014bb891b3634e2023c3efa54b0db633d7131f5c9d4a5c863d4dfdd074d6cd3209b56f76cd9a7b0a96eefd83d265
+EBUILD docker-compose-1.29.2.ebuild 2100 BLAKE2B 001ac61eb752613830383b163de93a6e0aa46cbfee4246e0cee2466f34a9afc92cf875269beea32da75fe642fcb3685c855b6d6618dcf6cb5e32f4e1c1ac14ff SHA512 18609cbce12c59bedcbb8b3039a64cd6ebfe7bc63e2f55a56f493ceedf5590a262b2170e521a51fe387a7e236c80b45d1c0b729fa1fedbb016babdd7f89d8888
 MISC metadata.xml 380 BLAKE2B 00c5a74fedd97fdd6dd3274523d134991e50dfb8dcf798027c00049d52cb431c8d06237dd06e48b4793cd14c879eb7a22a95dff01d9ad285cfa4d75e45a19e99 SHA512 04599c73f5b724749979b44f2eb3bcfdc071dc56d06a37c22eedfe7e9b85fee511bc5a0ad5553b96b0e86c054579dab538f2a519bcc21e96b8dbe79b27b95d0e
diff --git a/app-emulation/docker-compose/docker-compose-1.29.2.ebuild b/app-emulation/docker-compose/docker-compose-1.29.2.ebuild
index 8e60fe4c7510..cec99a23828b 100644
--- a/app-emulation/docker-compose/docker-compose-1.29.2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.29.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index bd59e45544ef..ea74743992f3 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,5 +1,7 @@
 AUX etcd-F_OFD_GETLK-fix.patch 868 BLAKE2B 478be67388bc9001c90031c47e001c8bcc0435433df44b42ea4c15cdb595d2169c0b2d05a4e774d20f7f971e64c08e132b736e8847cf0966c65bf1816f6a958c SHA512 4caf8a8a1f4363545d02695fed4a06ce96fdad181d5773188ae8c2ef95e4f4fbfee6d7906ece6bf0d85dd57e159f2a3774aa228f0e6e1da0cdfef63ced62a434
 AUX ppc64-buildmode.patch 916 BLAKE2B c28a2fcfed4812f44b664dc9b24e87f3999fcb9b79b7f47c6fd5a6b024529c49ef71817d4c379c7a95832a44b9c2f45c9f7707cb580b31be18dff4ee9a110e44 SHA512 bc87464d9f3351b2791e6f86bc7f2101e652c25b99cdcc02e46e4ff18f4bfb7ffc35d338370656bde6ad09ed98805e045065012dc6a264967d26272f7de099ff
 DIST docker-20.10.7.tar.gz 11077660 BLAKE2B 081b36668ead0fd727ebdabc0d07fdf1992f64e3ab1e7c09933130b37f9ad60876c36d1fcda5619ba1bffac7fadafe63d7fc647868c3c6ba30429487c2ebc31b SHA512 2341faa3ebb903d74fa434712fce45e7acf0423710b97cdca11e3999db2819c4385d9a7fb3850925592f20f02c6261edbade6c9d6a2fefbc32f05a6b44ec3073
+DIST docker-20.10.8.tar.gz 11080739 BLAKE2B 1e5c14e23c4e9c8b0568cf19c98cb4cdbedc43742357bed61201f0188d5e3f4949d5e2a2231fd89635290c8784678005dff707a4e00ececfb82d88c69d31d235 SHA512 17c0519c8938227c578e5fe37689dd5a362b9673fabe06f98145b6fd5ae99e099a304c5706a84df30a2810855987fd694ac9cae7574023710fd1d99b0ca1aaf8
 EBUILD docker-20.10.7.ebuild 7898 BLAKE2B c70fd9e392d62c80a69783170a9d48ff0f17b817a5897b86c4bbf26e5e624b6cc62205ceecef1036400cce494c4ea46ced8b7107e1466d41b6295eaf6bce8a2a SHA512 683ceab1c02cb2a2db344a0574baae9673dfb414af2a10a6ea31b8221ed48b36540a510258a1ef8adcb811e093e88e7f948550ee6db2e6c0ae3a98f34dc6f34e
+EBUILD docker-20.10.8.ebuild 7900 BLAKE2B 1816d1f86f17064391e484415dcc35a901e205b96b492f5c24f77f18887c9c82b24229bc131815cc2faa070b635adf16bf38c1746adabc89bca717423956bf6a SHA512 35103eef847ac33c0f98e237dceb324b4fec0c65c4b844bd307ac5aae8a567464f2998fd2a4c6d815b21d2eb3f24c9f4123fcf9f36b8827e31e1c68f549d98f2
 MISC metadata.xml 1730 BLAKE2B 119ca97015c54afc8ea75d64e41d550afbcad5a3a6951f059d005e9a5086b467b26b348f6d29a7af4ff86016ecd8978fd20c9cacad41eb85a18756fc395d8a1b SHA512 c204ff1a267cbf386fa35d08b6a3ed91dae745d6bcadcad6e4cb085a510c53c37bda488ec077cfb9cbe57f2387e52a0fd00c153b7ef8d88225dd3c7d4b26f7e3
diff --git a/app-emulation/docker/docker-20.10.8.ebuild b/app-emulation/docker/docker-20.10.8.ebuild
new file mode 100644
index 000000000000..827d5a2ed3fa
--- /dev/null
+++ b/app-emulation/docker/docker-20.10.8.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/docker/docker
+MY_PV=${PV/_/-}
+GIT_COMMIT=75249d88bc
+inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp"
+
+DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+"
+
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
+# https://github.com/moby/moby/tree/master//hack/dockerfile/install
+# make sure docker-proxy is pinned to exact version from ^,
+# for appropriate branchch/version of course
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	>=app-emulation/containerd-1.4.9[apparmor?,btrfs?,device-mapper?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20210525
+	cli? ( app-emulation/docker-cli )
+	container-init? ( >=sys-process/tini-0.19.0[static] )
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+	>=dev-lang/go-1.16.6
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+# tests require running dockerd as root and downloading containers
+RESTRICT="installsources strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
+PATCHES=(
+	"${FILESDIR}/etcd-F_OFD_GETLK-fix.patch"
+	"${FILESDIR}/ppc64-buildmode.patch"
+)
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~CGROUP_NET_PRIO
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MARK
+	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+
+	~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR
+	~EXT4_FS_SECURITY
+	~EXT4_FS_POSIX_ACL
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is lt 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+			~IOSCHED_CFQ
+			~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	if kernel_is lt 5 2; then
+		CONFIG_CHECK+="
+			~NF_NAT_NEEDED
+		"
+	fi
+
+	if kernel_is lt 5 8; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP_ENABLED
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
+	export GOPATH="${WORKDIR}/${P}"
+	export VERSION=${PV}
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+	newbin bundles/dynbinary-daemon/dockerd dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot:"
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "  systemctl enable docker.service"
+	else
+		elog "  rc-update add docker default"
+	fi
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog '  usermod -aG docker <youruser>'
+	elog
+
+	if use device-mapper; then
+		elog " Devicemapper storage driver has been deprecated"
+		elog " It will be removed in a future release"
+		elog
+	fi
+
+	if use overlay; then
+		elog " Overlay storage driver/USEflag has been deprecated"
+		elog " in favor of overlay2 (enabled unconditionally)"
+		elog
+	fi
+
+	if has_version sys-fs/zfs; then
+		elog " ZFS storage driver is available"
+		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
+		elog
+	fi
+
+	if use cli; then
+		ewarn "Starting with docker 20.10.2, docker has been split into"
+		ewarn "two packages upstream, so Gentoo has followed suit."
+		ewarn
+		ewarn "app-emulation/docker contains the daemon and"
+		ewarn "app-emulation/docker-cli contains the docker command."
+		ewarn
+		ewarn "docker currently installs docker-cli using the cli use flag."
+		ewarn
+		ewarn "This use flag is temporary, so you need to take the"
+		ewarn "following actions:"
+		ewarn
+		ewarn "First, disable the cli use flag for app-emulation/docker"
+		ewarn
+		ewarn "Then, if you need docker-cli and docker on the same machine,"
+		ewarn "run the following command:"
+		ewarn
+		ewarn "# emerge --noreplace docker-cli"
+		ewarn
+	fi
+}
diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
index 250ce86ec17d..ebb49617f33e 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 1506 BLAKE2B 90836a677e69fb8ebf30da8e387f48b440999de416f2924e4e11d0db2a3b36f55b1050a67bf04b3ab86319664cfe8b0493328907debf72c45254ed990d959b53 SHA512 e9c9f64fb7230421a12a910ee4d46e9defe4ee6a9ef85fa8fe47bc9f7a6afa91bc2eb387736639682848b1e01be433f079a08c822c687a30ccd5a5fa66468892
-MISC metadata.xml 445 BLAKE2B 9ed57ae50b2327c0fc3bf69bf2ced1dfa2b069abda5da550bd82d04cdf834fe9e5f2a5089a9e5788c45bdc4312127654d482a9b6edc7a39adb05844705e36099 SHA512 6e91887d446a1d2fec5ab934df8d3cbd629bd905541db8300751f624d19061f8d78ccc632d4d36a8505f2f4e29137a20fb2feb0aad061379ea6e39783bdbef58
+MISC metadata.xml 361 BLAKE2B 386e93e896be1df1f69ac25e6c4c9645166a758dee9b7197afe489b58e27e8545e2d179e0905d61045d4abe61628961da7a46e88323fbeaafc3cfda5194b0e5c SHA512 fcfafc44cbae7ee592da6a5daa5019866eddd3e6b62746614a430e6d2143a4aa5eec294718571654edff52166c9b0d33a5988a262a2167601b92d69e61f9de02
diff --git a/app-emulation/ski/metadata.xml b/app-emulation/ski/metadata.xml
index bdbbdb76bcb8..c50e01e3f45e 100644
--- a/app-emulation/ski/metadata.xml
+++ b/app-emulation/ski/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="debug">enable extra binary emulation debugging via <pkg>sys-libs/binutils-libs</pkg></flag>
 	</use>
diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest
index 5096edcf5c7c..ba953fa79c18 100644
--- a/app-emulation/virt-what/Manifest
+++ b/app-emulation/virt-what/Manifest
@@ -1,9 +1,3 @@
-DIST virt-what-1.18.tar.gz 173703 BLAKE2B c1ab6f331ca370572cedef06fd3eb9177ca8ef4302446eb46c737446a001e77a0825ec8771aade903e6194af3f4f745c3f35f1d9dbbb8a0550b493296878ade3 SHA512 8085a38111d5664f411f5bb9d2ee221bc22e5b0f2d993e8d518718b3f63b16ba73e052b1623c090493cf8fef52fd237ba823377503a32b4b7d03cc5380d5c613
-DIST virt-what-1.19.tar.gz 183594 BLAKE2B 36b58cbe41f195cf81e0b0cf35ab881c3746ac352c57f470e1fe0005d65534f38886d7688ee9393837e667fd1c8bf41af013f3a12748db5f8615b9b5c944f7a9 SHA512 7b6e6c00e3f35cea236cc5f5fdf28d13e9e38143f280dfcbf083ebf0dca2cb677752b8daec5b2956a08405d1fe5368f9f633ce11a854928c31121a35ee4c6820
-DIST virt-what-1.20.tar.gz 459243 BLAKE2B c51bfc4366ba90e32548a5d1e0779fcc1835dae7a6bb2b6f67b4371c2d2e949339aa0ff67d64485cdb03592713a3ae04a6779e4dac0babf08bb268ce6403066f SHA512 edf74903122bfb422c7a5ecba711bb64d6ef668828f208dfc0571ef14f2643456c14bc9a77dfea209df3d93869ac0a2c9fd039779922eddc6ebd9d988585dea4
 DIST virt-what-1.21.tar.gz 478767 BLAKE2B 7c48b84d9f1fe5f734921f68848b84beee2e5687a6ebfbc422a1349063e6a83c932a89cb2936239da6be033b72e6010694314cf106486cd6c54cd02652bc61a6 SHA512 14ace184c4aee5a09b855c1f5acaa619057aed1b9bf03c91ed1003e6a39ea69162c9fe452ea8162c7fe29825e0e2202cfc7d76e82f0cecea3e32405e5eb9f717
-EBUILD virt-what-1.18.ebuild 610 BLAKE2B 8e8cacd1b74212ef1aada2102323f86b74ae8c15da54be191757f57182042f2a98c380ed4dd956ecfb61e97c7798570ecf0aa5b83ac4831e3f8a8cdffe18c545 SHA512 b47766c54839bce195ab5e19ff653e2d50d0c920710939fb6fac807a28ad3469ea9da6b9e89ec686106b40ab13317eb53923ed2e1c2c6088a7d03f390f87fd70
-EBUILD virt-what-1.19.ebuild 613 BLAKE2B 7ca204c642e7d587100829db36311d0c1711dcfcca0304c889eb21c2b6ff5049e6865cea646903659240c8689a23ae734d1e0021f817db4505502aa867b05905 SHA512 81f456788def5e4b3b5792b22f2e217aeb2c1cdf43bb3613d38e7df7a96e53e90fa3005e948a8023d90bf8a7a036cdfb1f00afb34d5c06e8e4b16b2a709ad3a9
-EBUILD virt-what-1.20.ebuild 613 BLAKE2B dc561d0ac5a889d5884afc8d2e31793f7571cdd2f26395327e0390bbd3db277c880ae96fe5cc9cf99ea0d86292a9ba77cfb0cc7b7126eee316314156caca63d0 SHA512 8c64ded91856ef2c1246ea3e160f84f822e871c08a09c8e8242c654058bc644bc33225774abe536b264be0c386a615379c16cf91d6f2f89bb7ba072f04ac2619
 EBUILD virt-what-1.21.ebuild 607 BLAKE2B c1b875e443bb23ab8496320f5513ee0b0591dda4b33978ffcf0a8a70524c0ec11e8be248d937b11e82e80f44aba547ad4026550231dd5c465196fc543c88855d SHA512 22befae978503d1a5a2dce707de283e8dd95f189bd6fd5af9b644e7063bd1039284ba1543c6f17ed1be2dd3d657c5c89975042f98111d141fe17091c44a8e8c9
 MISC metadata.xml 463 BLAKE2B d2aeb047a6f3595cf1f064685fedb75876854c2361c084a909813d07fe7495882f9f6d400a896b3c67f578bae02fe89ec3cf8971478b15200a5486392e13b9d2 SHA512 85f83ce93888eb68982ce585aac6c29cfec62df4a5d76ac483d8946b0efe9dcabba271c7391aaa3c37247b228d06d21cb023efbcbd84cd48cf9733b918991b28
diff --git a/app-emulation/virt-what/virt-what-1.18.ebuild b/app-emulation/virt-what/virt-what-1.18.ebuild
deleted file mode 100644
index 8001d3e820a0..000000000000
--- a/app-emulation/virt-what/virt-what-1.18.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
-
-DESCRIPTION="Detects if the current machine is running in a virtual machine"
-HOMEPAGE="https://people.redhat.com/~rjones/virt-what/"
-SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86"
-IUSE="dmi"
-
-DEPEND="dev-lang/perl"
-RDEPEND="app-shells/bash
-	dmi? ( sys-apps/dmidecode )"
-
-src_prepare() {
-	default
-
-	# Pretends to be POSIX sh while it is not
-	sed -e 's:/bin/sh:/bin/bash:' -i virt-what.in || die
-}
diff --git a/app-emulation/virt-what/virt-what-1.19.ebuild b/app-emulation/virt-what/virt-what-1.19.ebuild
deleted file mode 100644
index bbc7f8023ffc..000000000000
--- a/app-emulation/virt-what/virt-what-1.19.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Detects if the current machine is running in a virtual machine"
-HOMEPAGE="https://people.redhat.com/~rjones/virt-what/"
-SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dmi"
-
-DEPEND="dev-lang/perl"
-RDEPEND="app-shells/bash
-	dmi? ( sys-apps/dmidecode )"
-
-src_prepare() {
-	default
-
-	# Pretends to be POSIX sh while it is not
-	sed -e 's:/bin/sh:/bin/bash:' -i virt-what.in || die
-}
diff --git a/app-emulation/virt-what/virt-what-1.20.ebuild b/app-emulation/virt-what/virt-what-1.20.ebuild
deleted file mode 100644
index 9c1c37709d81..000000000000
--- a/app-emulation/virt-what/virt-what-1.20.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="Detects if the current machine is running in a virtual machine"
-HOMEPAGE="https://people.redhat.com/~rjones/virt-what/"
-SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dmi"
-
-DEPEND="dev-lang/perl"
-RDEPEND="app-shells/bash
-	dmi? ( sys-apps/dmidecode )"
-
-src_prepare() {
-	default
-
-	# Pretends to be POSIX sh while it is not
-	sed -e 's:/bin/sh:/bin/bash:' -i virt-what.in || die
-}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 0b26b950f7cd..6e770fd8238c 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -5,6 +5,7 @@ AUX vboxwebsrv-initd 646 BLAKE2B d71673a3afea56aea69ab1d795d8b265bb5fc62296e35d6
 AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d877602156d97a4dcc6260dd8e446509173742988fa40346e62b1fe9368ff3fc9a97e3316cb919962d9a03340d52 SHA512 5455b70b8ac6f25365bae776b78c3ef5710ae2d5a9e939c7013d72c35f65f178268966ebd291a42666913e45f43c7196f8953331be0b0cc88eba66df39205b08
 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b
 AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16
+AUX virtualbox-6.1.26-configure-include-qt5-path.patch 717 BLAKE2B d6d9f1b0d30602e18b245e25bf1c5e2f4a33e308956fa946f913cf054173aa337708923ef92355f171f5b53a1b1ed58089f1a5146d8cd40a049fdfef874c5194 SHA512 bd07544302db16c291c21ef548455590079307fac2e11c3508019a6fb38a47db6a130c4ba265f9f47dead82d1684226542f21ff2da889ece51cba4b0744d109c
 AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf0810bdd1ee358dd4250359d501803c2213782310788b2c54a3c57f5195455b89331f02d35be0c5f4713a235b54 SHA512 e7e1e161fa8030234973e18d9d033238ded1f0b511323b642d8102dc062a16e69b6fa63729e88dcf1ef16fa02befd1f36e7242e23db12fa838b25d83f19810ea
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-6.1.22.tar.bz2 165560989 BLAKE2B 871c2189827174561a2abce4d52056db892e596bcff76274770b43157cca93d2be9a3458ad3d41cca81d73d95f1db37e2d15fdbc192f4d5a59e3cc9b6365d3f6 SHA512 ab0fc7cea455f74598d5da18528404405221e9c96a34f0355a39187524240596db4b54e1b1af5f152d5329b8e7977218819c0605f0d0ba0d83a1fb8f8487548d
@@ -13,5 +14,5 @@ DIST VirtualBox-6.1.26.tar.bz2 165690074 BLAKE2B c522889191ca2ae2749978853463dd7
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-6.1.22.ebuild 14342 BLAKE2B 8f7472f3cb2b25c9aa9079bc6732ba65c33a67fc166cc28d3dcea83886739cae019f6f5572301b7bde8c1b2c825677b610ba571462a187b3bb1f53cd84dd1bd9 SHA512 cebb5863ef8538ca1d503cd85605f279afb0d46d62f6b1ba343a4af422aceffdbac15e51ee20428f11dbc4361aeef91a59c77c489c08a90dae8709fd39076b3a
 EBUILD virtualbox-6.1.24.ebuild 14343 BLAKE2B ce8b34283b04367d1bf2c22af58bb0fbae9b513bd82cad3826f989633a40988cc5e57f5360ad02d452f789e8a7c118338ad0deb874cf350c03f397e405b6fe24 SHA512 791567627577a0025fd95c0aad0667e9b4ff6ea3636f709a7ef5010dee157d16bd5d42edc192ef73e2da13e918a4d38c7a535d3af1f7c46362b29196933dea31
-EBUILD virtualbox-6.1.26.ebuild 14338 BLAKE2B b30000a66c4bf1b34587ba2b3383c1ec52fa8690f5b54ded5423f124d8d9983b43968bbc33d4f24187db87cc92b6cf783e417fc76a0ff52ee69cdd81a7d5aae0 SHA512 7c8dd48f616b88613e896e2c7756b99b7a9fc9bcc7e77011f6756a223a1556c4e715d4fb9a01ade69abad6ac4a66c685256441cbda927c0a7f3a5dd085fa05d8
+EBUILD virtualbox-6.1.26.ebuild 14407 BLAKE2B d702060fb9488b7af42cb6510ddcd4aa233b784e6f42437007cde1fc3f5f0de704fbbde02c4cdee9df1f40e2e5939ad777d6ac00e385893e9966df090802d792 SHA512 b46b702c8bd2dae587cb3f8aea746ec132e46dfbdfe24d7e0ff4f38bf5ce197c7984bbcbe94174d8ff4e0a7a7b36db86de0c78678b567c20e814d4377101c82d
 MISC metadata.xml 773 BLAKE2B 52e55a63efff63886bedad4ac72e8b31088834ee55f3ac257f874afd77cf7763c5343ebce6defa399c55f8045dd1b17bfbd3ca3669adbfbe51585a59aa62bf0b SHA512 212e94588bc598d27ab46c3955b1e9963c38a7fee58502b13ce56bb14f241fe37961cd2f57150f96943f893314c2668a67afbb5b3b7e7db4354436965b7c66e3
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.26-configure-include-qt5-path.patch b/app-emulation/virtualbox/files/virtualbox-6.1.26-configure-include-qt5-path.patch
new file mode 100644
index 000000000000..57752c4bbd85
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.1.26-configure-include-qt5-path.patch
@@ -0,0 +1,15 @@
+https://www.virtualbox.org/changeset/90377/vbox
+https://bugs.gentoo.org/805350
+https://bugs.gentoo.org/805365
+
+--- VirtualBox-6.1.26/configure
++++ VirtualBox-6.1.26/configure
+@@ -1624,6 +1624,8 @@ EOF
+         else
+           # Strip .../QtCore as we add components ourself:
+           INCQT5=`echo "$INCQT5"|$KBUILD_SED 's|\([^ ]*\)/QtCore|\1|g; s| $||g'`
++          # Strip .../QtGui as we add components ourself:
++          INCQT5=`echo "$INCQT5"|$KBUILD_SED 's|\([^ ]*\)/QtGui|\1|g; s| $||g'`
+           # store only the first path, remove all other paths
+           # most likely pkg-config gave us -I/usr/include/qt5 -I/usr/include/qt5/QtCore
+           INCQT5=`echo "$INCQT5"|$KBUILD_SED 's|\([^ ]*\) .*|\1|'`
diff --git a/app-emulation/virtualbox/virtualbox-6.1.26.ebuild b/app-emulation/virtualbox/virtualbox-6.1.26.ebuild
index d7cbd13be91a..ee270bbcc26f 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.26.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.26.ebuild
@@ -211,6 +211,8 @@ src_prepare() {
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 
+	eapply "${FILESDIR}/${P}-configure-include-qt5-path.patch" #805365
+
 	eapply "${WORKDIR}/patches"
 
 	default
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 0bcaf20895e2..6b0e27f50db4 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -6,7 +6,7 @@ DIST wine-6.11.tar.xz 24599644 BLAKE2B 47b8eefadd59e649ac331ee236b90dfffd86ea812
 DIST wine-6.12.tar.xz 24666960 BLAKE2B d8f33ac0d15977c1e0c206662c370feac351c7399c91cf5669fce50e60684ad85b40244925b4d304b540f5a78edc19b4ee32fe362250f8c390347d71320a09d8 SHA512 6d5646c44e656a88eb25174ce16038a8b0e1495c3deed8e959825cb26059fdda6e6519afeaeb28e4070fc5e05d7a3e1e5812ef09c31875f14f9233ba6a52f14c
 DIST wine-6.13.tar.xz 24704408 BLAKE2B abd79fd0d2a364fd6b7c2713924ad9883cf62e0febd7653984ce7520f41eaad71c06e0874ff46343ac7c253abb7d5e026b878dcf40235918f075e2bf7da0b8da SHA512 7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee
 DIST wine-6.14.tar.xz 24721316 BLAKE2B 3965d4071006a54f595baf329c1b238c4faa506d60597cfb5f8ccb127b9881d34d66e89cbdeff0d05a5e4a203a541edea8953565e2edf464ce4d2bfbf5e7a437 SHA512 261858dcf11604a6078b39faf64bd05288194647f8397efe03abcda1934ec5452e18f85dbb269e728ef532ac8ad39af5bbf5d8603f3598a20e2ef16f60405581
-EBUILD wine-vanilla-6.0.1.ebuild 18930 BLAKE2B 93bb18a7e02a46a2cdb448a5b6ea97dbd3353361730f9e6a571d93129b0f084133a4d29fe4686c9ff3219147779a018c6efebc13c25c04c3e13d5969ec8a1e6f SHA512 adf6b9fbe94882bd43656124bc7d670c7a2030aa63d9124bcd7a3a349da5897e548b9ad5072299e5eee640b8ed33890074b9605580959847f04c9ceecff3ac51
+EBUILD wine-vanilla-6.0.1.ebuild 18929 BLAKE2B 18385f9f90c7b1bfe05c2a497438cdf972a20cf1c4cd0ac13d38bada90cb6edd0ccaca9474e0ec70ca330afef3774165d0f6e9444e54275921503820bb6798fb SHA512 a252c8d5ae1d26924194ca75ae154be97aab1cf4dab4600c7d4992766ec4a2a98e5a403d8c9b55e7d0b91f9fa24e34729e8b5ce7859d3dbf9ca3eca58c7bdaa3
 EBUILD wine-vanilla-6.0.ebuild 18930 BLAKE2B 8aae443e03983edc1f972805d62af4e131fec25163f478851587bbf106d366cd6b64f8b789cc3c12d66d74072b70a38706f1a2045c8dcf526f63e16473af944c SHA512 f155ff81b2a51bc570f6d126b7052b862284463e375346b787a580e663319598424d33e48fd7ab5ac7116675e09a30fa96ae6976ced7890c01fefbf114830239
 EBUILD wine-vanilla-6.11.ebuild 18899 BLAKE2B 18e25525d7ac893717e1107ce765369795d1a0afec1e479c498255d9980ae7b5455efe192e695a3f44fbcd2e14a0afa76ab40e6cb2b7af6b48053cee8883f4aa SHA512 c82e0f327ab194444b3487574eb17a5e398cb7d272054317095949a2b3935fb99d2255ad9b2ef9def11c3ff1dd5656588b66bf4101013e1b641183ce2a2e8b2c
 EBUILD wine-vanilla-6.12.ebuild 18966 BLAKE2B ff96fc3b65e63a4435dfdc855660196374491bff091da0cdb953ebf050c5fa50e1056537d87b40f0c75ee9680f8ceaabbd74d29d87a0187cf03e368ba85ca82b SHA512 17b6509df64baaad62fc917cc2191ef0a65345eadf62fc813e09a121de2ca19751f454ac1e90d88d3b3d3f3409423097f30f3a7ed9b4f45ded386b5fbd147e85
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild
index 2cc3f397034b..f233885c99eb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="-* ~amd64 x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 6f32987654bb..204d3aa835fa 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-ctags/Manifest b/app-eselect/eselect-ctags/Manifest
index b26bd01777a0..bb5c3436fa4d 100644
--- a/app-eselect/eselect-ctags/Manifest
+++ b/app-eselect/eselect-ctags/Manifest
@@ -1,3 +1,5 @@
 DIST eselect-emacs-1.18.tar.xz 8964 BLAKE2B 218a9cb043bb00b853e3c51230632f9cdd28a0d2f0ca96bfb9f6840615059993edadd1ea3447d3c6b6411a6a4edda6c1ff34428659f3fa09ab306e53b5501885 SHA512 9e346dc2331e577716945360de199848606d6b67776c1e7875d1437ff7e03796ac64cd0a3656109be87c0578b45bee1175f0ba4af2be96d0e27442d51bf182aa
+DIST eselect-emacs-1.19.tar.xz 9072 BLAKE2B 6921200085df464bac84510bea414a3c68ef978999d9f49cef9d059e0391d237506bdb35c3379a810307dbc188bba1062ff08c9136d2b331c4aa299cca91befd SHA512 269c7ab5402f2507255c36c62f036a9daddaaf9ee399e2566ecd819c8bec234177a274ebcf397414050f9adfd2c61fde64e22bab0f6dc7e03f7b8a54e38564b0
 EBUILD eselect-ctags-1.18.ebuild 706 BLAKE2B d0cbb65b9de87833e506e5548ca62d72494e980619130b848e7310631b7edf9231a856cbe029eb6444b79295b48a0e4c4b92681ef79bb29642090cfa0fe035f3 SHA512 ed35b328ade145cf45a1083ca05b6887ae15700e42b6b7b42eb7f56dc933259d14a4e1c2fea25b2de5069fd96fdea153c6cd03b3bcb4c0f410f1b9e6c9049087
+EBUILD eselect-ctags-1.19.ebuild 714 BLAKE2B 4b056a8e70278975d26fbe1bc4718b6d25b94c0df7f65aa14402712a6b16743a1f85ad20386ec6b8eebbe76bcaa3ea32811d4ba4654d8d1d6dd130d8229d3119 SHA512 a5b07b5af5cf954d7374e6d631ca036f37a7219392e005b18776fa156f8f13c7e8b4ddbfd4462ba00791c9bb420882282cfe19be2547f0b8aaabf65b3f322108
 MISC metadata.xml 274 BLAKE2B 0479233cbfe07bfd76f3c32823b32f1ad64475493953c4b031b1ace2d6c37abf5724419dfc16d3b8d46abfb427ac97d1644e16db360c47478ccc99ae4ac85c52 SHA512 12dd98956a96447d194ed521858ff1df2fa88d7f6b4373ddffed97c91bee3358889651d3f7120b364a4a329b76f75453459d7f1e027f65eb5fa2c7d7cb809f30
diff --git a/app-eselect/eselect-ctags/eselect-ctags-1.19.ebuild b/app-eselect/eselect-ctags/eselect-ctags-1.19.ebuild
new file mode 100644
index 000000000000..8fb2bab57824
--- /dev/null
+++ b/app-eselect/eselect-ctags/eselect-ctags-1.19.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="eselect-emacs-${PV}"
+DESCRIPTION="Manages ctags implementations"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins {ctags,etags}.eselect
+	doman {ctags,etags}.eselect.5
+}
diff --git a/app-eselect/eselect-emacs/Manifest b/app-eselect/eselect-emacs/Manifest
index fe28aef18e5b..68a4a37fe9a8 100644
--- a/app-eselect/eselect-emacs/Manifest
+++ b/app-eselect/eselect-emacs/Manifest
@@ -1,3 +1,5 @@
 DIST eselect-emacs-1.18.tar.xz 8964 BLAKE2B 218a9cb043bb00b853e3c51230632f9cdd28a0d2f0ca96bfb9f6840615059993edadd1ea3447d3c6b6411a6a4edda6c1ff34428659f3fa09ab306e53b5501885 SHA512 9e346dc2331e577716945360de199848606d6b67776c1e7875d1437ff7e03796ac64cd0a3656109be87c0578b45bee1175f0ba4af2be96d0e27442d51bf182aa
+DIST eselect-emacs-1.19.tar.xz 9072 BLAKE2B 6921200085df464bac84510bea414a3c68ef978999d9f49cef9d059e0391d237506bdb35c3379a810307dbc188bba1062ff08c9136d2b331c4aa299cca91befd SHA512 269c7ab5402f2507255c36c62f036a9daddaaf9ee399e2566ecd819c8bec234177a274ebcf397414050f9adfd2c61fde64e22bab0f6dc7e03f7b8a54e38564b0
 EBUILD eselect-emacs-1.18.ebuild 700 BLAKE2B b82cace988ece04d91a0e5fb05669f28cf0a485de21db8ec61ba72c63cbd20d526fb82ce8b834592042b155a6d652d9d5e503382214a06eab37d524ef221d5d9 SHA512 57b67beb30e6dd42fb2b93cf872ce4901fb3c916309ee0a0e77d4838dcf82d814c2e1fe9faa2217d6919d01d62480d3896db0316425ef95dc4f0e69d46d89e0a
+EBUILD eselect-emacs-1.19.ebuild 993 BLAKE2B 8844984cb7640196f70793b4034832f38370f9e043557ed1397a3511146bd69deeedaed1601ba17b6dffc9659ebf2ee4aec649400ef56d02dbc6ec4ea05b9b09 SHA512 f40e15c226a34fdce85e69de0ea316e0410df60e2733dcfd4699b8a03c746f1bb0eb4691cd40731c1c503e8c9d309137e43fbbf56406df902c0a62ec9120e754
 MISC metadata.xml 274 BLAKE2B 0479233cbfe07bfd76f3c32823b32f1ad64475493953c4b031b1ace2d6c37abf5724419dfc16d3b8d46abfb427ac97d1644e16db360c47478ccc99ae4ac85c52 SHA512 12dd98956a96447d194ed521858ff1df2fa88d7f6b4373ddffed97c91bee3358889651d3f7120b364a4a329b76f75453459d7f1e027f65eb5fa2c7d7cb809f30
diff --git a/app-eselect/eselect-emacs/eselect-emacs-1.19.ebuild b/app-eselect/eselect-emacs/eselect-emacs-1.19.ebuild
new file mode 100644
index 000000000000..4fa6b121b320
--- /dev/null
+++ b/app-eselect/eselect-emacs/eselect-emacs-1.19.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Manage multiple Emacs versions on one system"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND=">=app-admin/eselect-1.2.6
+	~app-eselect/eselect-ctags-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins {emacs,gnuclient}.eselect
+	doman {emacs,gnuclient}.eselect.5
+	dodoc ChangeLog
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test "${v}" -ge 1.19 && continue
+		# Refresh, 1.19 introduced a symlink in /usr/include
+		local target=$(eselect --brief emacs show)
+		[[ ${target// } == emacs* ]] && eselect emacs set "${target// }"
+		break
+	done
+}
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index e25c2ccaa93a..a932137e6e85 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/aflplusplus/Manifest b/app-forensics/aflplusplus/Manifest
index f9b82e0a4fa9..a774768c1632 100644
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@@ -5,6 +5,6 @@ DIST aflplusplus-3.12c.tar.gz 2065569 BLAKE2B ff7a87eb02f7731b5ce8e1a3016239c6fd
 DIST aflplusplus-3.13c.tar.gz 2128787 BLAKE2B 40fa65654468dc1de7f6e1b63d2266915a40d145b7cb91b8b95488bc975804f70887bc1c3718fbd12c76872a0126f3bcc36134eb55ef729060b5efcf93dad424 SHA512 916a714deaf67969c9ac6e90bd2d8015a1e5188c8a8122f4d5d64ce4b841822de65458e469a47d4244358fab5e31ef4e52b8ec1432dcbd60d29aedf15e4c36fe
 DIST aflplusplus-3.14c.tar.gz 2162934 BLAKE2B 0830b320cea65b9bdd048a08a388c7145164f6b7f4dc140a2f4268a3aa22dc608a771169c830e2196e7a0d543e6f3da49f39736f3b2514c559b986ce929d43c4 SHA512 318607cff40b5f2fc94938747e2ac6b8f400767138eb39edf4daf320afbdab417d0d97a80a1c9db8bb557ad4b7b62f887ae6e692c376f5d5673a493bd23bb811
 EBUILD aflplusplus-3.12c-r3.ebuild 2139 BLAKE2B 34c4f1e336fccd6ba6d6e91b679043430fa50bace3be3e7e7d6fed9ee3444aa0769997ffc535dad7d6246560912ffab03344d38c8e88726b667b23554e612dea SHA512 b937af8dd761839bbeda049f4b5d8000a50658232a57a4eef2e601e0ed5748e7e5367eccf29c6daa74b259419d6144ed1dd6186a18492be503693683f6e6e472
-EBUILD aflplusplus-3.13c-r1.ebuild 2139 BLAKE2B 8045bb4aec74858a6786a1129c9b7774590b1a26040ac3cd1a3f2de166df17fa32540018ec46bcf9b7c31602b7c4e21729d29cf18242a2a087cfc713ad36a63d SHA512 9bc0ecf56b00cdb23ed87c655844e089c5ba1ee1c12efbc0b07b7cfb7f9aef45b0665581807420ff1e9d2d201d1ab32c90229a9b566acc560cbc7614d2115f4a
+EBUILD aflplusplus-3.13c-r1.ebuild 2138 BLAKE2B c761276b940a79c6455920fcf6bb3b4967a91edb353932e34b4368bdcd0d343c4d0d8051295dc0f2ea3116916487c6bc5bc643b3936b4cc4c183196182913ce9 SHA512 f7e349849606c584cd409a62f417c27297f039f08d18f81a23c7629d5071b942924ab10a1e8ae7a0e9d8ba32fcfcb6cf761db857a27b64e96806055fe2c99ac6
 EBUILD aflplusplus-3.14c-r1.ebuild 2162 BLAKE2B 11113de7c3f6d4c5107ccaf1895d0699f290bc86c388dadeb0d0dc383d082658b012006b04a2529d749a0c5fd64174a345dc79df43b4d93db4abb1c53f1fb5c9 SHA512 c59d194efa1910f8d1b7bef62cc565d8360b41c5480fe9f4e1fd384eb250dc6b16deb5a45239dfb3f2e359d89fdaacd7cf5d1a9ddbcb143d5b425f3fb9c426e6
 MISC metadata.xml 327 BLAKE2B 25fff77dada492976b7c412879dadd7df2a78a05cfa2be3ef00557f84c3f6679dd2977c8ea11573ffda864b0c88da327ea912a358a2b44b4186c71c6ed7086e8 SHA512 b2c58af252bae6ba27785f059c67edbd7c05469965e67c5e6f053bd385463b5f02b2ee65df3174fda85dfcf741add66bbc33836b3d8edb76acec91727f008746
diff --git a/app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild b/app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild
index fb2fb3450833..3ea62e6bb749 100644
--- a/app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/AFLplusplus-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 794575dbe7ef..559428cca063 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/man-pages-l10n/Manifest b/app-i18n/man-pages-l10n/Manifest
index 332cfb9fd3cb..b834358fee3b 100644
--- a/app-i18n/man-pages-l10n/Manifest
+++ b/app-i18n/man-pages-l10n/Manifest
@@ -1,5 +1,5 @@
 DIST manpages-l10n-v4.10.0.tar.bz2 64760050 BLAKE2B b70d8b0a48050538f7af90c248f3132dadd69e9eca0e3f438aeb6b8086aed8f70ee4d54af3608c602910fcfac68d1283971a9a1869b3854d1802794c56837b58 SHA512 59f5daa7acf29252af2c733d7084bfe9bccbbec19f5e8cf1855df420835fd934e072479149d679a90ae4e52330763599a20fbb5bc8459b8a44e5bcc1628ab501
 DIST manpages-l10n-v4.2.0.tar.bz2 51747352 BLAKE2B 97c3e3fdb11b47753c9c179751fb001af0a9f79324d594d297981735f82b3917bd31fc5c100462d6093e621a98773f23543548efb957113ade39e9c315cd4d72 SHA512 b2de542fdb97868b5fa96f24947c7a37216dc6a6a5ee66142023dd1036017f7128ca26ac8367b0edbd76cfa049174892749efafef9dbf4221e90dd9166b82652
-EBUILD man-pages-l10n-4.10.0.ebuild 1793 BLAKE2B 2397c7a74d5e7c3ccfbe1876b6f7481bbd30a13e0b588ba512867f6c22e92ddb7e3f6ede9b48cb2833ad64654677b5bbca2f3445c12675b91c7f83dc5e43c203 SHA512 244c0416dd0ba943041c40856c850b69e0dfd584b37ecc01db8efebe4847227237ee8aac909c0cb5edfeece389b29a151673f26d7d29c8439055b7310b4ad643
+EBUILD man-pages-l10n-4.10.0.ebuild 1785 BLAKE2B 0fff329ea0592760be916eca6661d6d666f1736664eed9e61e7f8c0ea1d6ce2c26ebfb2bf9e4ac5d2dd36790d83e9bef90dbe06fef1cbcaed013b4c5d1585bca SHA512 f8b954cb2b73debec106a8917a662c6992449393e4be5cd38c1c2c301db02a5cf7d6fb387cf10b0ce095275da0b21f96c180dc41b70efe3a7a8cbac18e669c04
 EBUILD man-pages-l10n-4.2.0-r1.ebuild 1799 BLAKE2B 16720e493e97ef1144b96919c70f965a3ee52a2d45cfcfff02677a44ae842ad464119ea89f0b820676481a6248f327c06570e3015a4300caf74400664fb4b814 SHA512 654b3e9ab65b6a3dd8c500066833e4ed33dc6ccc908b8ae4895e5922d35e758ed8a3b3ac8951c0cf3af6baf8d43a2516dc5a614a21f57b6dde09a9b9672cab28
 MISC metadata.xml 235 BLAKE2B a6e10699959bdc64d99b8c0b00f46388bdf0c1e125a9351c63e61aae65c6bd9f70ab55a9497f6a6dcf10b161022abdd23c50443193563ba83744c09d1d4cd9c6 SHA512 fdebae10dcd9eddfe7d9546337826902e38d3d0e7b7e6e140038bcb293c98ca81b096d203b5709f42948bfa8868fe2d68d1385fae6664505e14d9ac1541898f9
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild
index cc7410ba4530..2875b1dc8a51 100644
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 MY_L10N=(de es fr it nl pl pt-BR ro)
 IUSE="${MY_L10N[@]/#/l10n_}"
 REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d7368ff14e93..673c4264844e 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bb/Manifest b/app-misc/bb/Manifest
index 95023b3be78c..ca25769db489 100644
--- a/app-misc/bb/Manifest
+++ b/app-misc/bb/Manifest
@@ -8,4 +8,4 @@ AUX bb-1.3.0_rc1-protos.patch 183 BLAKE2B 61112802cba379eda21b293270b2bf61e6be89
 AUX bb-1.3.0_rc1-zbuff-fault.patch 1048 BLAKE2B bf8729e1654bb44bfc32ff9bb857e5aef082d7e2ba40494304696f399fe43bc82540f1f323504a24afc003c408e6b73d8decabb1599dd5ffbfa186cc3a19e89d SHA512 bce66400732270b9b4957cbcfe83d97baa9ff011876517ce292949c1fe23945fb02768542c8b4b59b350403a0a3f8b1dae998800b64d84f34b8c37e5e3ba0cc2
 DIST bb-1.3rc1.tar.gz 1416292 BLAKE2B 342a11002a94f160de23739c5578acf685ff886ae66e182b33cd971b74b258bae6ecd7e9e795f1e6a53a062a4c0ba5296bdbb6f41dd8cca6be4550bb49943023 SHA512 f05eb741f1189038a5a63016437f8eaeb25eb001307561bfe8827701bc246873fec14462e586d5966dcd1c74cddaf346f4670254b712713625e139300817c0a9
 EBUILD bb-1.3.0_rc1-r5.ebuild 1923 BLAKE2B a67e3d5ccaa96037ad26ff61e3a3f88755ba3adb904e516f7bd960a60a59883178eaf107f735793f6aca8fb46f2604db17dd08befd59d3675a0473b47362b2d8 SHA512 05e77175ba12faa69ba4ea05e613ff83b8411397c12d1fd40e75dc9a8605e75c2440d3d574cb9ef7f49958e03f381917c062ef803f9daf44f8cf3119e39c1a0a
-MISC metadata.xml 331 BLAKE2B cc3fc6a0098a1ff90cc8805de2c65f68e003a2f707f88567962821295a7a0be3d9e970ea1271f931a46107b034e5dcbd46f254d816525d79f3bac8ee22855082 SHA512 12b5d682065c1178989edc16c08b82bd57833e161e647fa81dfee06a55c2147b5229093196b2157bc8ca421c9fd459ce015fb5dac2de1e35e1ad908d2120e0ed
+MISC metadata.xml 247 BLAKE2B 9c67b96216e97a3d390be535be3413d5e2bd33da0eb9e01fdbb833229e0bab66ba778eaa25bdc619e26fe19a8ecaaea3b67abc71f0d501a5b1b08eb55919f020 SHA512 d7d7537685c629036276c9f773a8ea695aa3078d52679431a4843492ebb185b9ee5160fb8acc5fa815d1b46646a22fec711dff7361bdeba58ae6fcf28aa39e8a
diff --git a/app-misc/bb/metadata.xml b/app-misc/bb/metadata.xml
index 401e82106a05..212f39e4a8bc 100644
--- a/app-misc/bb/metadata.xml
+++ b/app-misc/bb/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">aa-project</remote-id>
 	</upstream>
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index f6e97893befc..be16fb01a9d1 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -22,6 +22,7 @@ DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST broot-1.6.1.tar.gz 8710957 BLAKE2B e2fc170ef09ae4207a83412f7b51141e08fc815a9cf9199768f79ce81befe2cc39fa1e5e698d42c38fc8125ca347cced5520eb08d7d0d4bef34783d03e1dbf62 SHA512 0a4df51c13455e13ac4b13e97d02016a70da7d2c37635ef8f5cf964b3cbaa9cbe40eb73380587e15749042bb480be5e3b1b67c54eaabf52d1b0fb9671ab13ce9
 DIST broot-1.6.2.tar.gz 8712669 BLAKE2B f69c5baad6b6c61a18007035aaa527db798c155c02ce39994a1784d9d4cd28d6ac35d72e29e360ee0f471f544b1f54f9f531869b9388b0437c9086cc98006cf2 SHA512 8200cf386b89cdc8ed20d9130ecd578fbf60dd5641bf5b27020fd5f5c8e882e837b488a785f44bb43dd67e3629acc2214b4a62dd35f8615e5984b6baa73ca954
+DIST broot-1.6.3.tar.gz 8712118 BLAKE2B 01d8332864c1a8ef92190d99ce701d4ceba5be0fceeb3cc5eb1fae65857b825c9ee68da137b28fa3320d8eb94d8d90d10ccd29717e1716cd02de72a620d484fc SHA512 6daf9b10eaa82a960da03b5295cd5147447bb462e67be22bd3ab134b30b26fa3e17ced2c1a1ca46a1a059cc32a1376ab82d0e60ce6c143aa2bd1d265c93937ce
 DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
 DIST bytemuck-1.7.0.crate 27057 BLAKE2B 8ee0782cc080cae2c76738931be7076c0ab3529c07b1e03e2924e5e2940210ada4129731376016bafdceeff42984a5a3e5f9db7789071ef11d4e3902edac2857 SHA512 1512e461d17d65f9f462ea12151ebce82a84924a83422d213e690c68f41a024f99d825131a6f5de19994c5610f264c42ef8e09eca8378f5a99e325eecb2bdb00
 DIST bytemuck-1.7.2.crate 27489 BLAKE2B 2541a7561eb34351f58266451a020858d8ac1ad30ecb95b97d576e72532cae37ef0b747e2259aaf6052b65f951586425044f824a00dfabf54bba9462edf94c2a SHA512 fae361f5abe67215a7591d421a0b713b77b437123c56e21dd00421e95ab86d9dd9b0bf1daa6623b833ea65681fbeeb58f6feab9d323964304a3250f24df1ace2
@@ -40,6 +41,7 @@ DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c
 DIST crossbeam-0.8.1.crate 10429 BLAKE2B 4f915d623533a226370eeceefa5c196438b1b332a8b5eb6223853e416385ac4e1a207bf1989646478b219f7a68c8ca0656a808e87db58361f1d77a5554cc2a76 SHA512 564f5623d1a4da7b0253f14946f2e71d14ac9195d80ab3b0ad8e2ba6fc7229745c8c70c2899852d48fc93cef009109d7d7cf2dc9c875273cb8ce9223b92b0beb
 DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
 DIST crossbeam-deque-0.8.0.crate 20756 BLAKE2B 6bb602547cb0ca65552a9b981502221f1d3570422d22c867f654ba677e5c95aa5f81ed0022a498d3408c3f69291e1805b49fcfbfaff0d9a6075b75be3bf926ea SHA512 4efa73dcb9ef40b841039d24ffaf9bd7c63f8c0233bba1e0728fd5558702b4ef0af117543834c527335e99384d3c80d56293e891c9d94440f51f454b1b90c399
+DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
 DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064
 DIST crossbeam-queue-0.3.2.crate 14993 BLAKE2B b22d68d0bebcee8eeb53fe431f54ae2193a837a0ce8dfe7a49c3c1a42c2de895dea1ef1d71b0909abf9e89442efb14c8fde932553ba13dff8af9d155d7e6dab7 SHA512 7e67037b7a7f134a50e34728813b85a4a6e062895b9f482fa4ef7b1e1e9cc15c9c2836b9b5dec2a4ec36eee57065dc2f1066937e1ffc5b77fae253f60cf3f05a
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
@@ -53,6 +55,7 @@ DIST csv2svg-0.1.5.crate 166306 BLAKE2B 09fb46340d24e08838d521b0b86e7819449c8099
 DIST custom_error-1.9.2.crate 10826 BLAKE2B 24186a381d6df9d0262e123208f8bfda21dadded4fada889aea627c07e9812f8b16ce383dcd4ffed87f8a71a06bd92ea2ef12a0f835c67a82a436f9078c53f6b SHA512 6e91d3b1f82f7bcc5d4f3d22aa1f3cef150be130bf6f7785eee7511b8f6581384d82f532049570aed76278486ecee17d9896e1da9d3fce18d54b189fcb0a3984
 DIST deflate-0.8.6.crate 62365 BLAKE2B 05b1f81e4c423f9fdd823bc33352d8421f2ca0c26d43cf0c5990db12f5e31c46ff7769f1baa3b971166b4146eb448ed0bd3ffe68f7c4aff5885b47826f77d847 SHA512 7e2e23205c56cc4c834ade2a6a22b056253c32e29346907558117714a18d8433882a712711413addb15da79f9f59e089a06dfd680b756ab2725b500a49dc16b2
 DIST deser-hjson-1.0.1.crate 15602 BLAKE2B d9abbb6d53c20c7f7a6a536c06335be83c4e5eacb12444ed3b02bc33c54ed4cbf64abdc67832ae8d68f1c16fb0498d8db48587d121f77214320a27534fc74bf1 SHA512 bf3e2d9bc3caa4e34682e2550e6daa544b6adab1095b9bc5a9337b210bc501756373a2f4164478a700fb772fc6cf503c38eec2744567863bd4297ea0f953a67b
+DIST deser-hjson-1.0.2.crate 15790 BLAKE2B 3769b164a0698dbbfc0f6909d0aa70abd69eb5c5a2b2f980e416a981fd00dbd019f0f6145b95ad5ce1569086d922e301dd8310ec31c2543c1fe4a62512c21384 SHA512 665950696d9c924e72381206cc08ec5edb73feda7f535eab1e27b260741e664e94b33292f4568b16ef1bc795c3c0262f0b7ee44fa968d339f804b842403513c2
 DIST directories-3.0.2.crate 15593 BLAKE2B a4ecfc7968a0eaa1ae34c7cb0a33aaa3dc0b1d972fcc013fe6349a03e21bba1740950c62fc0d096945b4b29c275081ea0d7d1d57fd659acb22004f75a090a230 SHA512 9bccbb99a832d092dbce0ce5ae98c2e1eb58febf0fbbf410152bb0d62324141957ed04284c71809a692fc2d2ba0e9b41854d892e68269893850ea3645a9549f8
 DIST directories-next-2.0.0.crate 15153 BLAKE2B 8bbd996cfa72d75fe7177a9d8be7fb6b96ff3fc456b7e06db61cc463a83290765d68f09da3bf8b9e958553b1940ef35f3a4a45d179918ead92f604dd05512470 SHA512 5a0c094dd2e858c59c93655d5abce1282866ced1e7657397c62f959078adc544bb895dbcd2ed578ad7dd0122d8025deb0bbdad955ab2aaf43d9a0dc7d37162d8
 DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
@@ -168,7 +171,9 @@ DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017a
 DIST secular-1.0.0.crate 183767 BLAKE2B 76d7f862542b1b494c89b2be9801e56147e22872d67580a5c2d9b8dba97682bfe8f79076bf33775ff7dd99e3ee08ea5573227caf8d8bf471cac82578bdfb6c5c SHA512 fd4650aa3ceaf15f701609776a23cb9ad1e726634272df43baa5ddab02e7b09a7afbdc8d4c6decdc7746ea7db05096c2aa3289b5782a723cd18599d07d299b1b
 DIST secular-1.0.1.crate 184234 BLAKE2B 879ed6ecc460ae065dd1033417cb3f72acb82bd27df3d20577005c18f33f782ecf9347bd328ec124b34547202d2b5843cadd4b0f60ef13ec753dbd2d8d2423df SHA512 3b5af4087272bb07f40e1f1309470da29405a60bd0fdadbfaf1969acb5ec626efde4549d12c06c819757ef4e5932a8fcc44b0719bb65ad30db54de0109bd1f2c
 DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
+DIST serde-1.0.127.crate 75162 BLAKE2B 7472c9328b4398bb25bd71febe9483e6255b309d98d2655babe5d16933c5b92a71cb75df8aec3abaff84082bffdc44a549673d30a3cb68888d17157e58b32be0 SHA512 dc2b9c0a71028853bc05b4bdb3db1e9e753dfc588ebcff5dccc42d05252fe250b797e10b4d574f161fe11747c9740e93a47a2eba2b4ffd6ecf1992dfadbdd2ef
 DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
+DIST serde_derive-1.0.127.crate 54201 BLAKE2B 207c20d2e276a173a1ae0326be307f3d77937442838a7890db923fea434d6e134a9591a07139f8eabb9981aee74dd092d6e2c0a98f17aa67f069faa3dccec6c8 SHA512 2c346d45bb96867ea5b4a0ca24aa9b0584d83f26578f5a1ec8a51c514d0158d98c7b76408a0ea64e5718567afb6a0cfc5922d3c5588a89b7e19035b13b1a0416
 DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
 DIST serde_json-1.0.66.crate 115121 BLAKE2B c46c65339ff79138649df206f2ec759945c31ac11bac4807a8d1e76095c1937211b0b4ebf88c69d2d22cbd90ba25643a74cafeb291e815ddeb5c5ca208eec9e6 SHA512 8cbb64a24781a94e9448dd39f9429830fff6fe61be3772c1ca825f7d489ac3c06b189c42730129e281d8f43f7128b3b9cd2308727e625763588bbaf61b54d1d1
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
@@ -186,6 +191,7 @@ DIST svg-0.8.2.crate 16556 BLAKE2B fd95aeb18358349be6367f1c01ba9e1e396a588228f87
 DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
 DIST syn-1.0.74.crate 232974 BLAKE2B fc17dc2645fbe2d1ee409f895732b86cb77dc14837d35d7773e7f9f055e0b56f70be86203f13c549f0b43e1e4e1e777cc5bee2f08a733fe447f907dfaa443da7 SHA512 5aae03a68a4a8c1234d4e9a69cd37b9f6c698e2b635f10a030c0fac22cf00414c2a5e7523e0efe43181bc29c17abe6abc0eab103391259c97ce566713e3349f6
 DIST syntect-4.5.0.crate 752883 BLAKE2B 9c9ff2cc63ea421c0b8928a0578b278883d0a86be7f7c256820120a858f8c02b1d292e2474e5f2b63486e45cf5387e1a8ba4db2a5c9e7a2b0cf4eb687b42ffad SHA512 17653ae9baa4da049c899820f6033b3e7d71b96ab70b9c12e57a1ab305d155b12acec470167be2a0a37ea9c89ec4d19850f72d456e6857a7cf4dee65fc288273
+DIST syntect-4.6.0.crate 750938 BLAKE2B 9c53e142093f6d9fb703f4fe3f56db15c0bb7eba92cba9f31e567e9de2bcb129b7b415cbaf692c1e1021b12184bb3b064ed1996654581aab3d5f09e992c0eb5d SHA512 9e320afaf4c2adf41dd7e20c5d95e3063fe8d2774d8deec7e0df3debab050e96a1a5c85d1732c661ee4022dc5bf1abfed2982f13269689b527f35efb2c82beba
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST termimad-0.10.3.crate 316247 BLAKE2B acda7abe193eeb015c9e144e765b3fe075fda1fcba410a41ecea84f72d3ba455f528267a7300c5e5ee626a1c1f87a9bd7ee7ab336812718c66fe2877f3ff855b SHA512 c25aa79fa0053c1e7ac88405b45742d3e34d58f4293405699e601122451e18ac9532b80413df9032850d983e3abcb1b1656de3428bface46efd2505d2a2137bc
 DIST termimad-0.11.1.crate 316869 BLAKE2B a669f9cf3b4b8ff9179b475f4d5c73282beb8cde520de7fa074feff17274a5597cc5c929525d9996397104131d978d095efc8880f9efab7c5b5ffd6c695c7ce1 SHA512 b930c5b9da286a0754bdf7749cded52aaa4af8c050f88b5aeff2a4f3fd95720ca82ed90d2f4249054ca7f2b1cf31fde8a8808fc5bb1c63649da325c017658433
@@ -231,4 +237,5 @@ DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD broot-1.6.1.ebuild 4004 BLAKE2B 408b4110e0ff1395e0005df4796ad82d7e9ae5decf5fd463d623aa4af73f3af05cccfe0fcdc2a4012eccf3a1df710bcdbaff488d518cb42cb3b92ce64f661430 SHA512 519ceee993b558e09a778b14cd243207d418f85b7c6c1d93166b230f6450e22728436eea0324e124f08a7498b6b8de67dee34bb5a7d3799adf8037e9aeaa904b
 EBUILD broot-1.6.2.ebuild 4135 BLAKE2B 8c39e8ecfaf64768b0bc31cc9bd3133b9ae138f1bf307c0296d474ced6c77239c8b77d9e8f721d032b8c09f403eb2895ceefd117d4333258a762623be7abcbbb SHA512 2caf1be25e7d4750d4ae8cef126bdd735cb604628f13777cee731aeb4ab3eda1c53884bb4a0b8aa14c14f2fdb20d88f778f6f7c5522a6fd739348160052af124
+EBUILD broot-1.6.3.ebuild 4135 BLAKE2B 69eac0ccd1ece65e72fb9cdcca8a6b0a48b8a7952fac86f7f5beb39ab5d4c95195dc08a70c8cdc00e8f3bb35e7a8e95c43791b83d0d30145815c1af147d650df SHA512 99d454972ca9278ddcc8ccb58ea81fdfb8a5b6dbc2cf051f2b534c53243b4cdb0646e1896921d962255f1e2d1d869b7951015b0890b6dffc742ec698f1c9e11c
 MISC metadata.xml 498 BLAKE2B dd706df194ed867320c798e5a48aa01133ebd84f608ffedc3990de9fc50d6469d5026a19988916a8f7388a18968f969178a16bb85838e28cf572949071bd965c SHA512 9dccd0262eb426807aed1b952145ca4f8962da83a3f16b4890634a1896032ba4c03f8b87254cc59fcf1df61c75ee8e2143f40bd79560dcc4dc3deb435c73df7f
diff --git a/app-misc/broot/broot-1.6.3.ebuild b/app-misc/broot/broot-1.6.3.ebuild
new file mode 100644
index 000000000000..d7620b7e306d
--- /dev/null
+++ b/app-misc/broot/broot-1.6.3.ebuild
@@ -0,0 +1,241 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+adler-1.0.2
+adler32-1.2.0
+ahash-0.4.7
+ahash-0.7.4
+aho-corasick-0.7.18
+ansi_colours-1.0.4
+ansi_term-0.11.0
+anyhow-1.0.42
+argh-0.1.5
+argh_derive-0.1.5
+argh_shared-0.1.5
+atty-0.2.14
+autocfg-1.0.1
+base64-0.13.0
+bet-1.0.0
+bincode-1.3.3
+bitflags-1.2.1
+bstr-0.2.16
+bytemuck-1.7.2
+byteorder-1.4.3
+cc-1.0.69
+cfg-if-1.0.0
+char_reader-0.1.0
+chrono-0.4.19
+clap-2.33.3
+cli-log-0.1.0
+cli-log-2.0.0
+clipboard-win-4.2.1
+color_quant-1.1.0
+crc32fast-1.2.1
+crossbeam-0.8.1
+crossbeam-channel-0.5.1
+crossbeam-deque-0.8.1
+crossbeam-epoch-0.9.5
+crossbeam-queue-0.3.2
+crossbeam-utils-0.8.5
+crossterm-0.19.0
+crossterm-0.20.0
+crossterm_winapi-0.7.0
+crossterm_winapi-0.8.0
+csv-1.1.6
+csv-core-0.1.10
+csv2svg-0.1.5
+custom_error-1.9.2
+deflate-0.8.6
+deser-hjson-1.0.2
+directories-3.0.2
+directories-next-2.0.0
+dirs-sys-0.3.6
+dirs-sys-next-0.1.2
+either-1.6.1
+error-code-2.3.0
+fallible-iterator-0.2.0
+fallible-streaming-iterator-0.1.9
+file-size-1.0.3
+flate2-1.0.20
+fnv-1.0.7
+form_urlencoded-1.0.1
+getrandom-0.1.16
+getrandom-0.2.3
+gif-0.11.2
+git2-0.13.20
+glassbench-0.3.0
+glob-0.3.0
+hashbrown-0.9.1
+hashbrown-0.11.2
+hashlink-0.6.0
+heck-0.3.3
+hermit-abi-0.1.19
+id-arena-2.2.1
+idna-0.2.3
+image-0.23.14
+indexmap-1.7.0
+instant-0.1.10
+is_executable-0.1.2
+itoa-0.4.7
+jobserver-0.1.22
+jpeg-decoder-0.1.22
+lazy-regex-2.2.1
+lazy-regex-proc_macros-2.2.1
+lazy_static-1.4.0
+lazycell-1.3.0
+lfs-core-0.4.2
+libc-0.2.98
+libgit2-sys-0.12.21+1.1.0
+libsqlite3-sys-0.20.1
+libz-sys-1.1.3
+line-wrap-0.1.1
+linked-hash-map-0.5.4
+lock_api-0.4.4
+log-0.4.14
+matches-0.1.8
+memchr-2.4.0
+memmap-0.7.0
+memoffset-0.6.4
+minimad-0.7.1
+minimad-0.8.0
+miniz_oxide-0.3.7
+miniz_oxide-0.4.4
+mio-0.7.13
+miow-0.3.7
+ntapi-0.3.6
+num-integer-0.1.44
+num-iter-0.1.42
+num-rational-0.3.2
+num-traits-0.2.14
+num_cpus-1.13.0
+once_cell-1.8.0
+onig-6.2.0
+onig_sys-69.7.0
+open-1.7.1
+parking_lot-0.11.1
+parking_lot_core-0.8.3
+pathdiff-0.2.0
+percent-encoding-2.1.0
+phf-0.8.0
+phf_generator-0.8.0
+phf_macros-0.8.0
+phf_shared-0.8.0
+pkg-config-0.3.19
+plist-1.2.0
+png-0.16.8
+ppv-lite86-0.2.10
+proc-macro-hack-0.5.19
+proc-macro2-1.0.28
+proc-status-0.1.1
+quote-1.0.9
+rand-0.7.3
+rand-0.8.4
+rand_chacha-0.2.2
+rand_chacha-0.3.1
+rand_core-0.5.1
+rand_core-0.6.3
+rand_hc-0.2.0
+rand_hc-0.3.1
+rand_pcg-0.2.1
+rayon-1.5.1
+rayon-core-1.9.1
+redox_syscall-0.2.9
+redox_users-0.4.0
+regex-1.5.4
+regex-automata-0.1.10
+regex-syntax-0.6.25
+remove_dir_all-0.5.3
+rusqlite-0.24.2
+ryu-1.0.5
+safemem-0.3.3
+same-file-1.0.6
+scoped_threadpool-0.1.9
+scopeguard-1.1.0
+secular-1.0.1
+serde-1.0.127
+serde_derive-1.0.127
+serde_json-1.0.66
+signal-hook-0.1.17
+signal-hook-0.3.9
+signal-hook-mio-0.2.1
+signal-hook-registry-1.4.0
+siphasher-0.3.6
+smallvec-1.6.1
+splitty-0.1.0
+str-buf-1.0.5
+strict-0.1.4
+strsim-0.8.0
+svg-0.8.2
+syn-1.0.74
+syntect-4.6.0
+tempfile-3.2.0
+termimad-0.10.3
+termimad-0.14.0
+terminal-clipboard-0.2.1
+termux-clipboard-0.1.0
+textwrap-0.11.0
+thiserror-1.0.26
+thiserror-impl-1.0.26
+tiff-0.6.1
+time-0.1.43
+tinyvec-1.3.1
+tinyvec_macros-0.1.0
+toml-0.5.8
+umask-1.0.0
+unicode-bidi-0.3.5
+unicode-normalization-0.1.19
+unicode-segmentation-1.8.0
+unicode-width-0.1.8
+unicode-xid-0.2.2
+url-2.2.2
+users-0.11.0
+vcpkg-0.2.15
+vec_map-0.8.2
+version_check-0.9.3
+walkdir-2.3.2
+wasi-0.9.0+wasi-snapshot-preview1
+wasi-0.10.2+wasi-snapshot-preview1
+weezl-0.1.5
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+x11-clipboard-0.5.2
+xcb-0.9.0
+xml-rs-0.8.4
+yaml-rust-0.4.5
+"
+
+inherit cargo
+
+DESCRIPTION="A new way to see and navigate directory trees"
+HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
+SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/broot"
+
+src_prepare() {
+	default
+
+	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
+	sed -e "s|#version|${PV}|" \
+		-e "s|#date|${mandate}|" \
+		man/page > "${T}"/${PN}.1 || die
+}
+
+src_install() {
+	cargo_src_install
+
+	doman "${T}"/${PN}.1
+}
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 8de63a17d6c9..6ea71bbe7e85 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,4 +1,4 @@
 AUX golly-4.0-CFLAGS.patch 686 BLAKE2B 1d82b951bee9f336931ad2589bae03bd8e52ac2f982294f18abd5297bc0d5cbd877ece2716736ce8dfcf044c823cb707d6ce8923177b3ab2bbf09a3d0e247b92 SHA512 b883702ed44bd8469255bbc43191bbf91da64ff0048d4cc3c7cc0c5103e01fe49f9017ad1723d041ab080dfa46b68f4bab0b9abd850b74b1803d5bcebb04c36a
 DIST golly-4.0-src.tar.gz 5579026 BLAKE2B fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32 SHA512 3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
 EBUILD golly-4.0.ebuild 1384 BLAKE2B 2957836bae7ffc4c2a17e6f5183dae6b7cd2d3a898a0fa823ad32f22f79e143bf943da5548f0bae315ec1fdb52cf11d9a937db207329eff34149fa6f2d3a358f SHA512 36750dd133c0d2dfbd203b58cc9162e164f773c14af0bc3d0a679bfc13f358fee9f778191fdf8428aa35cb6481087266c1b640c610a5670ce1189c966e91dde8
-MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
+MISC metadata.xml 242 BLAKE2B 5ec2fd32bed39fb6ae883b34c86b2d21b086ef36703105ed434d7736988bc889ffd3af87d4acd442087d20043c072dc6ee7bfa2fcd397009d6d795e604f76dcc SHA512 233c2d041411c842e84e76c5745c82a2bd9aa2b14afb91674b26ae868537df6b70f57cb2717148679d00aa63623618f11e5b47b2b6b966d690e6fc8cb9b92854
diff --git a/app-misc/golly/metadata.xml b/app-misc/golly/metadata.xml
index 5f6d283dd742..c06a9f3be99e 100644
--- a/app-misc/golly/metadata.xml
+++ b/app-misc/golly/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">golly</remote-id>
 	</upstream>
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 309af62c2f83..d2671013456a 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -2,6 +2,6 @@ DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d
 DIST pax-utils-1.3.2.tar.xz 725916 BLAKE2B ff792288b22c185501123d3e152ebae891585d5fbbbb1957f62c68fca3b342b8ca986d53611677aff4566ad4483afb3c69f40738be4cf5d653ca469e72b5661a SHA512 50330a34d9b7b33c67be079eb871e6dafe29c72f2fc42fec0e51aa9a2e0c1eb95e6d27a4dc1affe6647cdf4c9357545336d48c9e27a7e0106d57532a0f53cdcc
 DIST pax-utils-1.3.3.tar.xz 725900 BLAKE2B 17004a4fe57f05e80e0c51a156931975cbaf73e20d96fa50dedf6bd1538ff3f8383591f4b5fd0df926a6a6b75cb083724aaf92b1a4d4ebc67290500520919c29 SHA512 bb0d03371cf8f0cc26a83cbee888a6d91e70416dedc740476cd5549ddaef67048c6802e30e469ab1aced0fd7f63f84e9644744602b2d483ef7af37191505f72e
 EBUILD pax-utils-1.3.1.ebuild 1867 BLAKE2B 327542297176ddfbc3fbc6257f1d5c675ea78851d656f29812f2c153e4abfa8cb01c1b0e359dcfc3e8fe2ec0cb72ae89046fefff705775d220ca244602fcb6cb SHA512 ac2ff5161fbb3f7d6c5283f3f75c5f55ee6aded83b26101c326cf504f8ab8bc547be052eda326079b636441e85c69f0fd047fa8bf931dcad7a9f0016a137a347
-EBUILD pax-utils-1.3.2.ebuild 1828 BLAKE2B 14708eb5d9346150a9a8e3fa444937f38b9060e9633aba13f6928d1cc661bc4ad62767b3e4413e2645c0d039d5fbcd6763a317dc6529ab61437e64f24e144ed7 SHA512 94522d3cc0afde1adbad35d2b0acc3c5c5a30fd51563468a5edd00b6bab89e3021f9ff849b98fc2a92610eeac8862e6ca52ea71d075095fdaac764000b5d7639
+EBUILD pax-utils-1.3.2.ebuild 1827 BLAKE2B 3df55178a78795994f8cf08b2928aee81457ad56f199c695c049982851fbc3fcd82eb6476c857d9416e7dc97be57cdc277ecda02b4e187cb16f92bfd2dcc2d46 SHA512 f0bb756f0ceab0c85b3fd7f1f2a32a08af7b0363abf14b0873ae74b54a78443acdf699290f82e09b549a97a70f730f3ad7147be9e95ed5d145de37d4ffc737f8
 EBUILD pax-utils-1.3.3.ebuild 1835 BLAKE2B aa715968e80f4e6f908a79c0d4223625e23ac386e02a4830b9a586a610d95e4e13a22cfb770ed1dba66acb194cc5286e1f706e0e7bf28872b175a17bcda0f2b4 SHA512 d98639b4eec3f3d5b3464de67317f5bd83fa62a4e8302030d4b86699602bb11ce61c9d4796268bcd26cd0b5fc7c55b718a493f322bf6dbb825300e9a870b162e
 MISC metadata.xml 677 BLAKE2B 22c40493c7f29ed8f77b7d5c00d37c70cdc9713c4873c083483513955ec02e2a1fcea7106354d01a31b961072353d4e735c43f8b9cb5f90870931ed387f8208a SHA512 039c93e2ef3ffbd085a67a90163d36eab812691679a644696ebd856b84e09301505dd726387b1c26b619cbc0f17f9608e62ce8f3c3c80273dfaab64ee29d1818
diff --git a/app-misc/pax-utils/pax-utils-1.3.2.ebuild b/app-misc/pax-utils/pax-utils-1.3.2.ebuild
index 857da2508958..18d015fe0ab6 100644
--- a/app-misc/pax-utils/pax-utils-1.3.2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug kernel_linux python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/remind/Manifest b/app-misc/remind/Manifest
index 2fbb2bd51861..27e593b83da3 100644
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@@ -1,5 +1,3 @@
-DIST remind-03.01.15.tar.gz 363101 BLAKE2B a5e27b83c20428991982c3cae22b32be6cc054bfd51a868ee3515f5ec4a37aa24f8ec476f566860ca0fbb6f29e7c9f3e6ed023714e52091ebca103162936877f SHA512 335f3ca88237f1ae53768b9ecdeb03f0bb1e706a8afd3ba36121ec76048a08fbc0d5ec72b05e552394b4cf2131be335c49533e1212b7e713ef16002a0621fc84
 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 1012 BLAKE2B 1343d44dc6a267054047afb7afc3839d79ddd78cc8380070c3011f8bafa8b46fb7cfe26b0baca84c188830eed7e961ee2bcec2761e0da0c1543f63f99a77a0ef SHA512 b6d1828068313d87a0d2dfbb9f9edee30546b5c1443abb9e612dd2fd42dca301b95b6480dbdf1ac4ca6c062c34b5d7608d75191ed23995af7bd28721c50f9531
 MISC metadata.xml 404 BLAKE2B 2b778bdd15c3d2f49ebe6bceb0269233ade6420e4f14d137b117ef947f8bca031f228210b7a1c5c92a35a00f33d1b082b6dc34959499bd42d29150e4efa4994e SHA512 49df6bda13c6b41a344f10a275a77e258e810858a9d12db036e9361a3a696ac0649b8c1bf060e35496b3f4dd1596196207b57d99cbb40555345984fc68f3695e
diff --git a/app-misc/remind/remind-03.01.15.ebuild b/app-misc/remind/remind-03.01.15.ebuild
deleted file mode 100644
index e15d88ebfec2..000000000000
--- a/app-misc/remind/remind-03.01.15.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Ridiculously functional reminder program"
-HOMEPAGE="http://www.roaringpenguin.com/products/remind"
-SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="tk"
-
-RDEPEND="tk? ( dev-lang/tk dev-tcltk/tcllib )"
-
-DOCS="docs/WHATSNEW examples/defs.rem www/README.*"
-
-src_prepare() {
-	sed -i 's:$(MAKE) install:&-nostripped:' "${S}"/Makefile || die
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		ewarn "Testing fails if run as root. Skipping tests."
-	else
-		emake test
-	fi
-}
-
-src_install() {
-	default
-	dobin www/rem2html
-
-	if ! use tk ; then
-		rm "${D}"/usr/bin/tkremind "${D}"/usr/share/man/man1/tkremind* \
-			"${D}"/usr/bin/cm2rem*  "${D}"/usr/share/man/man1/cm2rem*
-	fi
-
-	rm "${S}"/contrib/rem2ics-*/{Makefile,rem2ics.spec} || die
-	insinto /usr/share/${PN}
-	doins -r contrib/
-}
diff --git a/app-misc/tmate/Manifest b/app-misc/tmate/Manifest
index 8bdc6e8c82e0..2c64da2082d4 100644
--- a/app-misc/tmate/Manifest
+++ b/app-misc/tmate/Manifest
@@ -1,5 +1,3 @@
-DIST tmate-2.3.1.tar.gz 611136 BLAKE2B bbcfb137cb9e712bbe3c36b2d57e6f1ea5a68c884e6e6ccd252315bca689b1bbec7a53cd131f0f36a6bab5b1defd3acb26bb458684894c81d676d2585db4790b SHA512 98531e3a3c1cc4da11894e8298df560fd58f1ede6a81ac8cb5f8cbea86f5c21672a016977dab801ec06e14f6c718a64599a9e32740934fcd4c0a155f92710520
 DIST tmate-2.4.0.tar.gz 614179 BLAKE2B 9864f71255ceafb10cfd622346ef7d2db2a124d13599a7c8ae81e83950ba56216193e02633a9becd90fd430c6ddff66df763fe2733d58f45b02c74c8fb8f7fc4 SHA512 92d2ca354b295678bfc2747ca83a45ebafeaec40ebac94bd94c4926af4f820b3f3a087f365147f41c80d1c8ad032f52c697a2421839c39315d84f98f7eccada6
-EBUILD tmate-2.3.1.ebuild 753 BLAKE2B 2f9f55ec33f42c37142a5134d0ac24a9424cc9f40050d5f0ccedfc4a9b6095643f66b2be250fb7828e0ee22410432584e30a3f6ecb0e7618791f36d34acd9545 SHA512 6376ae3927e0d83d94c5b9a6b45d9b9b4e500d1f1e712ecf26c91515a4ecc2eed1c0f947a3fc4b1f4965da6baad1f797dbed8e63167ecf0e31a324504140d00e
-EBUILD tmate-2.4.0.ebuild 753 BLAKE2B 2f9f55ec33f42c37142a5134d0ac24a9424cc9f40050d5f0ccedfc4a9b6095643f66b2be250fb7828e0ee22410432584e30a3f6ecb0e7618791f36d34acd9545 SHA512 6376ae3927e0d83d94c5b9a6b45d9b9b4e500d1f1e712ecf26c91515a4ecc2eed1c0f947a3fc4b1f4965da6baad1f797dbed8e63167ecf0e31a324504140d00e
+EBUILD tmate-2.4.0.ebuild 760 BLAKE2B a7445d8be75438d589017d1b9783263bb7707ebfca84e3c69a3de5cbcd1a77b125ea47f284a21b0a6921de1da9694182c25c493fdff73429321ac05c924260f6 SHA512 4ac126c69a613364abf9e669cc783e4dc970397a577d9f0aeb42fb0edae11024941db0ef62e55a35ac49082d03d3b8cd614defcf28cb6249df967644d89a8854
 MISC metadata.xml 329 BLAKE2B f5ed7ad5dc2827db367a67a14dfda02644260fd16336e5d342b5e9d9ab7e0d62bc8493b834443fee00337123474ab7a1a9a6614ff9ca98ab3a1b4bc022fc03e7 SHA512 d5595ede15c355e3a54363cce03bdf3ead85d95035687432a2f53e30c61570d33f6f2c7893c8fe21b0bac47bf4a87cee8b1672084410a47f13c46aace2729d60
diff --git a/app-misc/tmate/tmate-2.3.1.ebuild b/app-misc/tmate/tmate-2.3.1.ebuild
deleted file mode 100644
index 7386182a40c9..000000000000
--- a/app-misc/tmate/tmate-2.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Instant terminal sharing"
-HOMEPAGE="https://tmate.io/"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug static-libs"
-
-SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-RDEPEND="
-	sys-libs/zlib[static-libs?]
-	sys-libs/libutempter[static-libs?]
-	dev-libs/libevent[static-libs?]
-	dev-libs/msgpack[static-libs?]
-	>=net-libs/libssh-0.6.0[static-libs?]
-	dev-libs/openssl:0=[static-libs?]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-misc/tmate/tmate-2.4.0.ebuild b/app-misc/tmate/tmate-2.4.0.ebuild
index 7386182a40c9..362ba28cb0f9 100644
--- a/app-misc/tmate/tmate-2.4.0.ebuild
+++ b/app-misc/tmate/tmate-2.4.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tmate.io/"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="debug static-libs"
 
 SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-misc/ttyload/Manifest b/app-misc/ttyload/Manifest
index 17ec603b82da..cdab289bb813 100644
--- a/app-misc/ttyload/Manifest
+++ b/app-misc/ttyload/Manifest
@@ -1,3 +1,5 @@
+AUX ttyload-0.5.3-fix-sigabrt-in-strcpy.patch 414 BLAKE2B 005931b3e1c333f7af68a856650be0388bca7865d503eb1ed090de395c29e7ef52834a7a13c55c55f192c2a74fd4a667e51be792debb0456aef946cc77e8ceef SHA512 ddc6ddc5915878b1392813d7547636af56b60bf28ae030074b767179f60c66c866470af4a448f5c7629e0d0b0781ba35cd46a2a6728c9c4c1c5ba47f58f72a4c
 DIST ttyload-0.5.3.tar.bz2 15039 BLAKE2B 0614b492a86013c524d21de9dcb2c28e357afd8cc811b103b294d60c89c8b7503ca3e47dfe0c2eaa0ff92c76ff7e4453761300ea2fae1d8f5adbbe36d201c93e SHA512 1affc171fd569d4127d7a51dda5764272e554a96db6ad4418ff6120f9b0e573679b33d45797adcb667216d167e9f3ee41349a53d4f7808b3b1c5bed76e3f4bbb
+EBUILD ttyload-0.5.3-r1.ebuild 870 BLAKE2B cf2ea9d6cd90e5cb59326824d8f4b2377d0538988e3f5ab91b189260a5658ecd06fd894fa6ef39e74686210d05cd381ec165a1ccfcf4c6d9d31a011bd3f865e6 SHA512 5034d206c688fa1cf84bb74b2eda9ce149b1744e24adc6fa0d5be5fbdc4f5f74cb3abec6793506530c4d560016a5c1bc77869490b01016af6cec0d428b512ba4
 EBUILD ttyload-0.5.3.ebuild 802 BLAKE2B 4a29f5d4d29d6d4f720dd8fa6362a52cc01c49a49bb4b5d7dec9baff453adbfb62827898fb0c13fc7897d3d9c290e2a2dd5a25b4011b2328f22481ed4c9fe64d SHA512 53be4bbef175cae500e6c8d5480f3cc1d5e8e3c399a7997397911f7caa683701f98f64d7f0f11db097b8a67cff6785076da949a7389e71c5d31e50c846a26693
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-misc/ttyload/files/ttyload-0.5.3-fix-sigabrt-in-strcpy.patch b/app-misc/ttyload/files/ttyload-0.5.3-fix-sigabrt-in-strcpy.patch
new file mode 100644
index 000000000000..70f51f9fa395
--- /dev/null
+++ b/app-misc/ttyload/files/ttyload-0.5.3-fix-sigabrt-in-strcpy.patch
@@ -0,0 +1,16 @@
+Subject: Fix SIGABRT in strcpy() call when running
+From: Ricardo Mones <mones@debian.org>
+Forwarded: https://github.com/lindes/ttyload/issues/8
+Last-Update: 2019-01-13
+
+--- a/ttyload.h
++++ b/ttyload.h
+@@ -34,7 +34,7 @@ typedef struct load_list {
+ /* storage for clock display along the bottom */
+ typedef struct clock_info {
+ 	int	pos;
+-	char	clock[6];
++	char	clock[7];
+         time_t  when;
+     } clock_info;
+ 
diff --git a/app-misc/ttyload/ttyload-0.5.3-r1.ebuild b/app-misc/ttyload/ttyload-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..5a031a28898f
--- /dev/null
+++ b/app-misc/ttyload/ttyload-0.5.3-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="color-coded graph of load averages over time"
+HOMEPAGE="https://www.daveltd.com/src/util/ttyload https://github.com/lindes/ttyload"
+SRC_URI="https://www.daveltd.com/src/util/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="ISC"
+SLOT="0"
+
+DEPEND="sys-libs/ncurses:0="
+
+RESTRICT="test"
+
+DOCS=( BUGS HISTORY LICENSE README.md TODO )
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}/ttyload-0.5.3-fix-sigabrt-in-strcpy.patch"
+
+	sed -i '10i#include <time.h>' "${PN}.h" || die
+
+	sed -e "s#make#$\(MAKE\)#" \
+		-e "s#^CFLAGS.*#CFLAGS=\$(INCLUDES) ${CFLAGS} \$(VERSION)#" \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+	einstalldocs
+}
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 148149fe706e..1a7fb15cac58 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -3,7 +3,7 @@ AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bc
 DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd989687fa8f5a40f160f2912c21d09298bbb9c676af5387d96890a98acf3f21b60e046a9548a735ca10dbc4006 SHA512 a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f
 DIST uptimed-0.4.3.tar.gz 55396 BLAKE2B bebea6559c436d2700df905b63fabd73b1c55463e8633409bc05cd16c7d110d8116f52e00d63879cfb2e0482f648bda04dcb5a1d5ff629699d2758dcc85ba53a SHA512 f9485224dfe7173bab135a87b047d749f9b61d3c29d50523126b585ae77e68837680fdb725a08fd7cad39f0b35b2da7a6923b8540700881f9638286ab5082260
 DIST uptimed-0.4.4.tar.gz 55491 BLAKE2B 8c4d19733e1b8f8ae682ac3238677e6ab24f9a5e8f948a130a2f6e345afe4cbb70e19ea789772fa9ec9c7f89fe1ea72e6a3c549dbb6e95e66c83a0a4a6966db0 SHA512 a39a3fe54dbd9373f1bf081584b16686f3a4ce742e282f8dfde7460ac156c2e189f48976fe32723468316c231ca6a3ea404ce42465460b2b52e96b7dbb92fe48
-EBUILD uptimed-0.4.2.ebuild 1604 BLAKE2B 957c1478d4812c478c44e1f9b94e638681468103bc0e6600f231bae7d975cacff1e3aed5907f5346dd0dddfe845cb5f146d8c99749fe2443e3bfc5e9e98c8a89 SHA512 72978d6e27db7aecd5d8724df5f183e7f23498358705676c1ca40851d0a72138dd8000361425f4fe648a9cdd98e9c0a86876296dcb5611cd0267dcc777b67c00
-EBUILD uptimed-0.4.3.ebuild 1617 BLAKE2B 9fc292ba43d86ba69ee0eefe2b53c93a65b7bc7a3b53c3c0a3e9f4d0c7f3690fac8b21823d5f27f6b43284423cbf2c4126153966ee79ec0270311ff1b934e292 SHA512 f741e02af02fd1b87950ba59ec96c03da3ee94a832ba4e8a9c8e96d957b84d2d9227a296b866da8b7addd09ffeacfcdd26e59a1ce9bd3589cb57f40a98003695
-EBUILD uptimed-0.4.4.ebuild 1490 BLAKE2B 57fbeb864568557bcae900bb43934fd1ceee9833bde3436561b6145bbfa3745bdf30059972f83e20201b4815383c87b046b99ea6106a989b009123a5ec0b880f SHA512 0343f658f21ea9b72d844b87d282e7b73ea5e26faf37c2ba82571656b4b2c9d31378c813a9aadf85003f7c33c5a518d9f31728469e9b8f8845e2e3c50bc4ca6f
+EBUILD uptimed-0.4.2.ebuild 1569 BLAKE2B 56f8fb30e6203406c3c66d64bd62857f4a64407a8c6733fdbaa33a7f0a104ccf25d83d0215ffc73cafb6cf8d9d7ce9d71ecfb201dfb4320155763f6cc4dfd66e SHA512 c54a493c777a05e75afd1f6a8139cc41866ae183fc2b80bb3021fa54de90c325b2d6ca459bd0589383d12ee7075e9eb0129caeaf70476a6c6d8ea750d4f6d595
+EBUILD uptimed-0.4.3.ebuild 1582 BLAKE2B ea46b1de7783486a189514c91bbb11f79cf62f23f6dcda1131f5a16a416c4818b79dbac52b9223b142b5f4e54d2bc30bc26fb39ac0648edc1e10701718621883 SHA512 6b2634410d9c23ae74f8510a9fe5f7b399a3ab32475e5f36d78197fc1c2bfb7f3e47f7d23da36ce2c72163c0cccb91bbcfa88181a501a50d15a535ca41509a99
+EBUILD uptimed-0.4.4.ebuild 1410 BLAKE2B 7015e898cd82e64d546133bd62a2cc28fa4c6d8640230301fc60b090948417d48e009654506cb1a271fb68e3a196c42c17201a154029e39e98a506fcc1fc03f2 SHA512 077996018d3a1b48faddb019ef32a0cfced5c00364be3d556ac0a259e8bb009806027f8020be09dec223a6e7e8626d08fcfa4143a40efa84fa5972e5ab301eef
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.2.ebuild b/app-misc/uptimed/uptimed-0.4.2.ebuild
index 3c37d27f0782..1966f6323e77 100644
--- a/app-misc/uptimed/uptimed-0.4.2.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.2.ebuild
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="static-libs"
 
 RDEPEND="
 	acct-group/uptimed
@@ -29,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
diff --git a/app-misc/uptimed/uptimed-0.4.3.ebuild b/app-misc/uptimed/uptimed-0.4.3.ebuild
index 3ed12722f97d..47b0a188f7a4 100644
--- a/app-misc/uptimed/uptimed-0.4.3.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.3.ebuild
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="static-libs"
 
 RDEPEND="
 	acct-group/uptimed
@@ -29,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
diff --git a/app-misc/uptimed/uptimed-0.4.4.ebuild b/app-misc/uptimed/uptimed-0.4.4.ebuild
index e45cede0338e..5d9a04fa9963 100644
--- a/app-misc/uptimed/uptimed-0.4.4.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.4.ebuild
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="static-libs"
 
 RDEPEND="
 	acct-group/uptimed
@@ -26,10 +25,6 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_install() {
 	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
 	default
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index ceb6e067db1a..b20ad791e1fe 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 5acb8589b55f..27ff21bea757 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,3 @@
-DIST kmymoney-5.1.1.tar.xz 12059768 BLAKE2B 8b41bce8804d757ba9c801c7b1eeb214a8983c4686a9663a4b5255460139593b7f70e29f08294df810a02eab4190dc6de852be091760981fd84ff8191fda82a3 SHA512 2ed3e47b2e65c9d9e5a11b55f0d425192331b21d64f8a4a4f8921fdd67eac219bf3ae1418026071218d823acc9a36905dc5c499cb0ae2af4ced0e32d1720bf59
 DIST kmymoney-5.1.2.tar.xz 12640912 BLAKE2B 72abd190914eef258e6745ca9835de14bdb2060b0d025f8bdb1bc0e12b773fc891b143fe36adb8b7afcc86498601f6e1a7f9485f9a11c875f4c75bfe01d93738 SHA512 38c60998be4e3ffb49091eb2085b293c2d5265f6582e980d2dc60a66a00862b6afd3e2152c752a9fb14a7bf8b6255a0c39b69b65e2f5c976f23d965e3a1cdf46
-EBUILD kmymoney-5.1.1-r1.ebuild 3785 BLAKE2B 2c27db7f0e3904a03446c47b35073f8cb6dccc83098f2d8372b2e9704a81a4ab46863506818f08d80739da9b3f07ea2941fc66d2fa837d652f824ab8e2e15f72 SHA512 22df2e85e40d63ba93df70510257fd0376c8f4766f61606b7031ef64a486d37101bcb007c6fa322ee440a0e1881dd1e5183ee0e7552420572d471d26a9e9228a
-EBUILD kmymoney-5.1.2.ebuild 3867 BLAKE2B cf1d79f2a9879db2da8463ab3fc771c5f8c8251b97f1156d3342ab8f57cde35568fd470c21b9cd817bb32ec328a7b9f5dc939a58ea703a5515c0147f5f1741b9 SHA512 e4d9910fe880a077b744ce6a9baaf45d662b47b5e5d1ee3c4c0a25de492895c2343572db466cc4682ce550b756a4e4b412de2616234d4d1adc6362d84f24fb66
+EBUILD kmymoney-5.1.2.ebuild 3865 BLAKE2B e9bd3badb3fae742a3f599fcf5408fd6c7c0edc1a60d4df444523e5f901b26bdd3e26a8ebdc255e48e84d267d72e83cadfa996f2a5bee14ba8d18ee47ae8b6a1 SHA512 635023f3c1abf7ff3373d9f35d662e7842bde44c58ac4e77dce1822262ba58f8a9f215e373e8b1a5b77fefe7942c12f9b7865ad267968a677d8fecaf0da8e345
 MISC metadata.xml 612 BLAKE2B 693f4ae569b54f8e2bc6c5a3844db95e3791accba94be3174e11eb9dce42f4766334880fff00b5a0a2515b78ec8a6c298cf03efefa8fb49ae95309ea3648f479 SHA512 a580d659890251263b82938adbf80ae3a072d4d00c1f87e5faf76d6f88a80e0bd210bc4e5a40ea9f6662580892b77510644b35c90385438c3ad77bd191a0a398
diff --git a/app-office/kmymoney/kmymoney-5.1.1-r1.ebuild b/app-office/kmymoney/kmymoney-5.1.1-r1.ebuild
deleted file mode 100644
index 3129ca411a0d..000000000000
--- a/app-office/kmymoney/kmymoney-5.1.1-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_BRANCH="5.1"
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Personal finance manager based on KDE Frameworks"
-HOMEPAGE="https://kmymoney.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities addressbook calendar hbci holidays"
-[[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	>=app-crypt/gpgme-1.7.1-r1[cxx]
-	>=app-office/libalkimia-7.0.0:=
-	dev-db/sqlcipher
-	dev-libs/gmp:0=[cxx(+)]
-	dev-libs/kdiagram:5
-	dev-libs/libgpg-error
-	dev-libs/libofx:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	addressbook? (
-		kde-apps/akonadi:5
-		kde-apps/kidentitymanagement:5
-		>=kde-frameworks/kcontacts-${KFMIN}:5
-	)
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-6.0.1
-		>=sys-libs/gwenhywfar-5.1.2:=[qt5]
-	)
-	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-pkg_setup() {
-	ecm_pkg_setup
-
-	if [[ ${KDE_BUILD_TYPE} = live ]] && use experimental; then
-		ewarn "USE experimental set: Building unfinished features."
-		ewarn "This *will* chew up your data. You have been warned."
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OFXIMPORTER=ON
-		-DENABLE_WEBENGINE=ON
-		-DENABLE_WEBOOB=OFF
-		-DUSE_QT_DESIGNER=OFF
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package addressbook KF5Akonadi)
-		$(cmake_use_find_package addressbook KF5Contacts)
-		$(cmake_use_find_package addressbook KF5IdentityManagement)
-		-DENABLE_LIBICAL=$(usex calendar)
-		-DENABLE_KBANKING=$(usex hbci)
-		$(cmake_use_find_package holidays KF5Holidays)
-	)
-	[[ ${KDE_BUILD_TYPE} = live ]] &&
-		mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) )
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 652636; bug 673052: needs kmymoney installed to succeed
-	local myctestargs=(
-		-E "(reports-chart-test|qsqlcipher-test)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "more options for online stock quote retrieval" dev-perl/Finance-Quote
-	fi
-	if has_version "app-office/kmymoney[quotes]"; then
-		elog "Please note: IUSE=quotes flag is gone in ${PN}-5.1.1. ${PN} still"
-		elog "does online stock quote retrieval without it, but dev-perl/Finance-Quote"
-		elog "may provide additional sources. To keep the functionality, run:"
-		elog "  emerge --noreplace dev-perl/Finance-Quote"
-	fi
-	ecm_pkg_postinst
-}
diff --git a/app-office/kmymoney/kmymoney-5.1.2.ebuild b/app-office/kmymoney/kmymoney-5.1.2.ebuild
index e8053a4a0dd7..6ad28d6b1537 100644
--- a/app-office/kmymoney/kmymoney-5.1.2.ebuild
+++ b/app-office/kmymoney/kmymoney-5.1.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kmymoney.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index 2d6df9f1dd6a..0a761488535a 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,6 +1,8 @@
 AUX mdbtools-0.9.2-unixODBC-respect-libdir.patch 1439 BLAKE2B 9afc3b2951947593c029eeff66ebcc93da8ff34ef5d1cf25d08848fb950b2cafa533e08b682cf1a5f11eeec1dcc6e1d0df2f9712d576ac2f63bb207ab6c16b42 SHA512 08df20d8f60a8a1323685571649c7fa0127fa4a29a9fbbf431d51265e06194017f71eb6c7d186a3160679971ebd7cc64b5c1f2e428c939dd7dd79b98952816d7
 DIST mdbtools-0.9.2.tar.gz 214246 BLAKE2B f62ffae2b084e53f7222ab969aa7f57f65735281383f93aeb025cff38b32b9aa22ffffb819532f816cc45a9156f7136bd9de953b17b86817380123451d51170c SHA512 cb2bddca83eb9867b765f6fc57fb289f91ce4e2e09dd953e338c26f6c4bcfe9ddb53368c4eef6d02927e582c2e10312462b82916c2e956fa269f25a765371d8d
 DIST mdbtools-0.9.3.tar.gz 214697 BLAKE2B 59aca58d11b9c513c8d5b8401423b04484657543d742e20e058e7b29e8225a2c2c3b6e5a95a61a2214a1323b1c5d80b08a71c9f9bcdbf2f35b079a7b05919841 SHA512 3ceb9e374fd638a01d087a1f5e8fb357b24f0a85a8f9c65743a78ec1d6a981fed299744610382ae525f3781e73e268de5c4bb2e48eff78e48b197e2add23587e
+DIST mdbtools-0.9.4.tar.gz 215253 BLAKE2B 7538fe36ce63b01a395b39272da3c212d6743bb789b38123d1f951f5678177ba541d64e7a58c08ff5f537d5cda4309c814521a33df5402ad3bc3bacd3d872425 SHA512 4ec5ae66b572970f5d450d94457a5e12a0b376dfbdb10ca8566be2f9d35a8837c0b7381ac6e8b935192b892e7d7c71fef089bb07f4ae789596c1dac07a062e1a
 EBUILD mdbtools-0.9.2.ebuild 1145 BLAKE2B 8f6696b5fefc19c4ae2f3264ef3dd24a9cef1237db97a6ee545b0a928a444e002f9f2353cfa5cb58e8060805b868790412a49d128d636d780bbaac274987a4cb SHA512 a635ffbb5ad30f6be4816d5f76eae97afb908a427c5c768e49b5b6fd9ff8525d593f3eecee5825ecee42aeab8bea2621b6e9549a2dcea37b03cea33b40b15141
 EBUILD mdbtools-0.9.3.ebuild 1110 BLAKE2B 181a84d7e2e87cd3f8a947706221492f4c5471388fddf4351940b95530ad5c51d812d5a4a1e241c202c22b2970f87d4177900da547bcde3ff2587626d5cb63bb SHA512 22209ce4dbdbb12afb2ecfa90a79a45f5d7cdc26fc2d751f8f34dee2df9928b6f985dca292f9b7fb59fc48cf1df41baaf3dce5efa4d57ad082bb0839af2dd4de
+EBUILD mdbtools-0.9.4.ebuild 1115 BLAKE2B 0e0fb9b8193b371b940d133d36c880096a93702cd79be93df0a3831bdaeb6c67b9a334fdcdcd6d6939eec271430d5a21b4db8d455022e8672e22543810c17c45 SHA512 5e876de883b8b25759a9fcb589a04946b1937dc203c3dbe87c5d6255cfeb459d66b626148110424986c66559a01d565c6d8112ef11027c91f4b7667d71cd7718
 MISC metadata.xml 354 BLAKE2B fff9791af58b802e3ac40795a7d3c298d70a09cdf3e394ed265411bb98587802fc29e5b670f96b45ef0a03c001efd5bd6a246f46a9ad9f4e55690efb4f920cfb SHA512 dadf070ffc6e1ffc0b55ebc63147b88c74586b9d357ea60e931c676683607243ae1537e607167bebe84267b095637b0380034f617bd5562e5b5011db09f8a35a
diff --git a/app-office/mdbtools/mdbtools-0.9.4.ebuild b/app-office/mdbtools/mdbtools-0.9.4.ebuild
new file mode 100644
index 000000000000..f23e1aadf9c6
--- /dev/null
+++ b/app-office/mdbtools/mdbtools-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
+
+inherit autotools
+
+DESCRIPTION="Set of libraries and utilities for reading Microsoft Access database (MDB) files"
+HOMEPAGE="https://github.com/mdbtools/mdbtools"
+SRC_URI="https://github.com/brianb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="glib odbc"
+
+BDEPEND="
+	app-text/txt2man
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	virtual/libiconv
+	glib? ( dev-libs/glib:2 )
+	odbc? ( >=dev-db/unixODBC-2.0 )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+src_prepare() {
+	default
+
+	# bug #770019
+	sed -i -e 's/-Werror//' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# TODO: Make iconv optional
+
+	local myeconfargs=(
+		--disable-static
+		$(use_enable glib)
+		$(use odbc && echo "--with-unixodbc=${EPREFIX}/usr")
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index fccba836c958..7303c6ec0d51 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index c664d2c5385a..5543b9199783 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,9 +1,3 @@
-DIST eix-0.34.12.tar.xz 629704 BLAKE2B 22c3a93b47c607467321445704c8b4fe0f8b131081609709ebe5e2bd09d0ac08194938641ab44304e51d9dc4d473615625a9ca0de649767b6552c60d38974b75 SHA512 458a01b8ccb5fe4c7fbf9eb8368dbb0c63ac587e0452de4c3a58fadfc62aa8b404e509d6f24d20956bd6f04c00bfdfc95d6bf59287c5ea9e07091bea67f8c4e2
-DIST eix-0.35.0.tar.xz 636432 BLAKE2B 8a880cde56c0010f193445d9813c533effd59b8ee570132a0c40d62de827968839d99ee16981d152e737b881519e9f73d4ddac5375b6339dd480064deefa6149 SHA512 b9a6e59e666ec6015a612e083839a11a77e1d649262a802a9c8684fe25abbeda7a2c51ea629f1bb85ddc77fccce42b577178284763668bb2d1bcc85df5d68f2e
-DIST eix-0.35.1.tar.xz 635996 BLAKE2B e8afb4d33d8e0525471e396e752859ab5fb165df8b1519cfa9ded1a3ff287059d9c647d744ec095eeec92d01f25330cced3ecefdb3d399ecf513d8aa5f14e9d3 SHA512 2812406f28994c133f9fe3dfe53bc0495f5bb446e2f0ac69f070632d0f357044c1c334e5ed2344a81dd8e3ba100fb427c161201e488ef2581717b55a712f3908
 DIST eix-0.35.2.tar.xz 636616 BLAKE2B 22c9ce54bd612ff7b8a085d91727ee7b472b9c3ba71568f23b4cfc5e2c4d9b0a68e2df377d4c4101c53e193864418c11b0c76830b5b6044588dcf3882b164e3d SHA512 39ff4c4f31be3c40a17a77626c25550a3881d8c405ebd9e7a361252cb729f9c0fc40831bc41e503fdea9f05684ad0eaa1aceabba1c6e4067a33a8581bf5a9625
-EBUILD eix-0.34.12.ebuild 2539 BLAKE2B 9df22e7365f6a7352edf3326d405135fb2e2ef0f2efbed1b90f0ce2e5c834a4868e30f5db1b2ff3219bdbda16ef9b557c616fce63b24d7d9379a128391982f25 SHA512 af74697e0c3da63302d117405b77b3d85cd4c27feceb1af72e3ee7d0bd7fa51e64ede71c9327de7abcdb3e32baeb54cd7c58b265d59554360d08bf378f38bddf
-EBUILD eix-0.35.0.ebuild 2547 BLAKE2B 5e181c69cde90dca9c29816e3cbe630ca70434d09544b48269f7fe5dd743afb093b8259b00f284b7964b80275a1610d129e0d84f7d9f8f152955e0591e3398da SHA512 541beaba3647be36da2847e05e79631b671130fa281462f88e65e41eddf430b5b287de0f62580ee5ea962930ac695ea1c6e2fd7015128b705433bd9d223065d3
-EBUILD eix-0.35.1.ebuild 2547 BLAKE2B 5e181c69cde90dca9c29816e3cbe630ca70434d09544b48269f7fe5dd743afb093b8259b00f284b7964b80275a1610d129e0d84f7d9f8f152955e0591e3398da SHA512 541beaba3647be36da2847e05e79631b671130fa281462f88e65e41eddf430b5b287de0f62580ee5ea962930ac695ea1c6e2fd7015128b705433bd9d223065d3
-EBUILD eix-0.35.2.ebuild 2544 BLAKE2B 5606c141bf654e08bc11629060629b8265b3f1e05819c6433a5ce92f52ec0b2f0b89ad552c9ef13b954d72c391ce4eec4007df8d8b33ac18a41207d7b783f9f6 SHA512 04eccfdb9f1ebe4b16629413c0f505af2cb14577678767bad0a97b7e708b6106997c47f3d25d48a231354d42821ca63a2a79b1fb93a004a587b0863058028f03
+EBUILD eix-0.35.2.ebuild 2539 BLAKE2B 9df22e7365f6a7352edf3326d405135fb2e2ef0f2efbed1b90f0ce2e5c834a4868e30f5db1b2ff3219bdbda16ef9b557c616fce63b24d7d9379a128391982f25 SHA512 af74697e0c3da63302d117405b77b3d85cd4c27feceb1af72e3ee7d0bd7fa51e64ede71c9327de7abcdb3e32baeb54cd7c58b265d59554360d08bf378f38bddf
 MISC metadata.xml 1065 BLAKE2B aba22801b07a7346aab81b420cc8eadc9aabd68f27b5943b9f5be4f98bc435bd4db09fca13356e09ca16b753e7378459001501112e8358ff552e9efc46569626 SHA512 3524a0ca51ca92fcbdb2c7b4c862d8f71da8041fc8c968cf63840266d79c52b7d5632cfc479c4e9171ea4b680e986b10861afb3e49598e1e10327587937690a9
diff --git a/app-portage/eix/eix-0.34.12.ebuild b/app-portage/eix/eix-0.34.12.ebuild
deleted file mode 100644
index 0971f52d7527..000000000000
--- a/app-portage/eix/eix-0.34.12.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-DEPEND="
-	nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${DEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-BDEPEND="
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.35.0.ebuild b/app-portage/eix/eix-0.35.0.ebuild
deleted file mode 100644
index a13024c139e6..000000000000
--- a/app-portage/eix/eix-0.35.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-DEPEND="
-	nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${DEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-BDEPEND="
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.35.1.ebuild b/app-portage/eix/eix-0.35.1.ebuild
deleted file mode 100644
index a13024c139e6..000000000000
--- a/app-portage/eix/eix-0.35.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-DEPEND="
-	nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${DEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-BDEPEND="
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.35.2.ebuild b/app-portage/eix/eix-0.35.2.ebuild
index 80ba61c83ee7..0971f52d7527 100644
--- a/app-portage/eix/eix-0.35.2.ebuild
+++ b/app-portage/eix/eix-0.35.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 DEPEND="
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index d4a27cbb4698..560f3f208c3e 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,8 +1,3 @@
-AUX elogviewer-3.0-segfault.patch 1145 BLAKE2B 0511df907edb047ce89966d68d0bc3191e3545ca6af372485601afe7446b812573429e4d4ef4df79fb4cd3104207b3b6482a9ec196250147982772b5b1c4c30c SHA512 98f47e20c796384a04606976bd551562c152877c8c3e41268b785feeee45f1021df9f5dda90ab148949e44b17cbc6160a014f4a0b8f831cd9128dfd851ab01da
-DIST elogviewer-3.0.tar.gz 28349 BLAKE2B 44f3ca5b28d075bb8349450cc817fd8ccdd1d1dc7eb948a9d65ab3b423191eca04cc479b2d6bec0bf6bc7f1120eccd257fdf61bb736919129ee756c2f4bd4366 SHA512 7eb59849a06632053ee0f7d1d76d9848220dbb8ad48d04c80fea5e64304f86c1a99987f525c6df682c832bd8453e07781a5c95ad2dee0539e954400730f47e36
-DIST elogviewer-3.1.tar.gz 28650 BLAKE2B b15d94095def5fb7fdcf77ad1e7bf1fc35af6bbd999d89b7f90bed8ef9739182c8e4af0033aee92453d6b0731ac5d8c168e3900abe0a4466d584bfd9bc64917a SHA512 b99bc165ab08755273ead73fdd3602c9266a9bb243c46d99805c1f8b07f7e8ea9b0583aedb9b7ab717461f2ed3bd27dcf0a5677f2d908d3fcc03769794a64d5b
 DIST elogviewer-3.2.tar.gz 29046 BLAKE2B a880fde71df3c688572c33abbc163f3ac10a53c672b01b3139d02effa5e59a05f7ae1df35a4505b1a48d7a0cb6166a21b18d1d969e1eaebab03e3620298d4f38 SHA512 2503482f14e21c7b6f69ac0d6305c7c126fa3ac944b68acef7edec0c464d2e45bc2dc348f8d38033dbc276afc132d75863c737e222f66ad5ebe870b30fec2f39
-EBUILD elogviewer-3.0-r2.ebuild 1732 BLAKE2B 4219540079d7b7574d39f07d35c8a37d488cdc9d103f64472d02dec0f3ac77c71442640b6c08af49ab722467eb7273f24bd652dc566dbcd1109c986c2114d49c SHA512 1a079c1c01b836d226c29b44f1cbdecfda2b1f9fd16a80560498f9dd2adea528f32a09e4fc71cc8085f6cb9f4cbebc7b17a6694cf1547d5cb44351c1cb7be238
-EBUILD elogviewer-3.1.ebuild 1730 BLAKE2B 25a3b312f51344adc04f623890229def5e7cd6c5e87bc97df505c311b879871e6cfd46cfb7df946f117b24319a6193a7d90199d2d2a9d91bbd96ffe49debe9b9 SHA512 f19d0c3454b4083f36ec1a1cd05159ae3fc9fd296e4d91ef050aa9ad8488a8d68e8b9cdf03d0e1e1123a5efdca7e046441288abbf3de9a6fd652b7b3ee540641
 EBUILD elogviewer-3.2.ebuild 1671 BLAKE2B a3bc93f16c789f47455dfc7f80212a5bd654bfb9ee295096253fe31cba48d935a7015d2187fb70ca4bb78ef602a3dee4a645df29f184722f819e0bf7c89881e2 SHA512 cef96d1d292283b15fcef0027737794a567aef89349b1670e91671fcb7dc2cf50fe9bca7c3529b280b37348521efec9475ba418bfc674da58dc5c3c0eaa3312a
 MISC metadata.xml 402 BLAKE2B 4cc6503c5c74f4f0883d2c167bb06515878ad1324931d38d9402b463c774b009d14ad2ec5b8d2611ea361e0793ffa3b4d463e88173f2f08dd0b1c0a988bed44a SHA512 77f982c8b1070592bcea3b91ae6e4c2fd815c5be0a63b7160793f7e7fbd1b1e60c3e3a993da1e7d2933b22ca621d6320955f7ac360b7ed09dc04a149ee32d567
diff --git a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
deleted file mode 100644
index a74707ed46aa..000000000000
--- a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_8 )
-
-DISABLE_AUTOFORMATTING=true
-
-inherit desktop python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-PATCHES=( "${FILESDIR}/elogviewer-3.0-segfault.patch"
-)
-
-src_compile() {
-	rm -f Makefile
-}
-
-src_install() {
-	python_newscript elogviewer.py elogviewer
-
-	make_desktop_entry ${PN} ${PN} ${PN} System
-
-	doman elogviewer.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	ewarn "The elogviewer's configuration file is now saved in:"
-	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
-	ewarn "Please migrate any user specific settings to the new config file."
-}
diff --git a/app-portage/elogviewer/elogviewer-3.1.ebuild b/app-portage/elogviewer/elogviewer-3.1.ebuild
deleted file mode 100644
index 3a21c008fa21..000000000000
--- a/app-portage/elogviewer/elogviewer-3.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-DISABLE_AUTOFORMATTING=true
-
-inherit desktop python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://github.com/Synss/elogviewer"
-SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-PATCHES=( "${FILESDIR}/elogviewer-3.0-segfault.patch"
-)
-
-src_compile() {
-	rm -f Makefile
-}
-
-src_install() {
-	python_newscript elogviewer.py elogviewer
-
-	make_desktop_entry ${PN} ${PN} ${PN} System
-
-	doman elogviewer.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	ewarn "The elogviewer's configuration file is now saved in:"
-	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
-	ewarn "Please migrate any user specific settings to the new config file."
-}
diff --git a/app-portage/elogviewer/files/elogviewer-3.0-segfault.patch b/app-portage/elogviewer/files/elogviewer-3.0-segfault.patch
deleted file mode 100644
index cc67a0d6f198..000000000000
--- a/app-portage/elogviewer/files/elogviewer-3.0-segfault.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/elogviewer.py	2020-05-08 20:23:04.419257166 -0700
-+++ b/elogviewer.py	2020-05-08 20:23:30.436359552 -0700
-@@ -255,15 +255,22 @@
-         return "</h2>"
- 
-     def parse(self, line):
--        eclass, stage = line.split(":")
--        self.context.eclass = {
--            "ERROR": EClass.Error,
--            "WARN": EClass.Warning,
--            "LOG": EClass.Log,
--            "INFO": EClass.Info,
--            "QA": EClass.QA,
--        }[eclass]
--        return "{}: {}".format(self.context.eclass.name, stage)
-+        if not line:
-+            return
-+        parts = line.split(":")
-+        if len(parts) == 2:
-+            eclass, stage = parts[0:2]
-+            self.context.eclass = {
-+                "ERROR": EClass.Error,
-+                "WARN": EClass.Warning,
-+                "LOG": EClass.Log,
-+                "INFO": EClass.Info,
-+                "QA": EClass.QA,
-+            }[eclass]
-+            return "{}: {}".format(self.context.eclass.name, stage)
-+        elif len(parts) > 2:
-+            # Return an empty string, eclass and stage are populated anyway
-+            return "" 
- 
- 
- class BodyState(AbstractState):
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 206b26f6d013..294284378d67 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,7 +1,5 @@
 AUX implementations.txt 841 BLAKE2B 39905bcb29eb443bc236cf892693d94fa8e94c5054522f8bdab67943c5596d4d88ab26add84a2625d0856a9868ecb6712f4c2217790c01664eea9da8b1faa596 SHA512 75950abad00292ec125c7e22ea46263c608f0dec35d74dac31a418c3b1a8419132ca981ebebc3b8f2a03d70bfa056c4416d8c2d473281dab2bdb7fccee202425
 DIST gpyutils-0.6.1.tar.gz 23914 BLAKE2B 1e799ce33a949037b68262cb7a6ca5fd99b4ca4ec74c3044bfb31ea08b59906a21f6c96cdf99330f6af16d68be6ee7ab49c3cf05979691899abaacc9d62032eb SHA512 74d984e496ccfa7124cfefd9f8f79d5fab4bb4dbf5e61f4400b39367dd54e23b871f286eef28007a5c255b862533a34948449bbf7aed55cf8fe315e76ac876ea
-DIST gpyutils-0.6.tar.gz 23862 BLAKE2B 6992aa6260dcb495bb6d1ec3615d9acbb60d79bdaa50f2ba29da0ee1ed9f0931726a2e71cce296eb05d37715b94386352137e86072a7ced789c53dd1dc9e9a2c SHA512 1174ed9f645eb0e7b435677c0f8ad19eeae54479f319aa1d192215e2c83642df68ba37d9e0113a505468f9e05f8e6822ae32b5965e8d7601a545f4d0c9387231
-EBUILD gpyutils-0.6.1.ebuild 535 BLAKE2B afdb4107736c57427ecae2cff6185010dec32977f778b35e57d5ba8d806cb08dd3d1d460563e601e533c062851ba192ed3bf3d22cb0d70226727791625e088f6 SHA512 cfac1a11efd3ec7ddf62439d6fc940f6b54ac44c76ac65bea1ba0dcc9a870b0bda2f3ba662e4a67cca72259c5ac1d17b7a06270bdef43eb98a135ecfbab00514
-EBUILD gpyutils-0.6.ebuild 532 BLAKE2B 008b08ed4d228f7845270cf644ff68199d02bbc85d85eeaaaf0fe0de68afed8e041fd605f749dd230d849b4863b124d031ac0d196f1c831c0c2bf5cc02f89d0b SHA512 3dcb448ffb5567b411293d9c28562a599ea7e174464966b05a328b586d757d399355697f1775b1e00e735d60159b7a461d028d096a0c443d7751f91f0b2222d4
+EBUILD gpyutils-0.6.1.ebuild 533 BLAKE2B ea2261a01292c724986700c55c155ee2fa725590b949863a138d1ea30a34d531c176bfd8349a695833fd42d9f6654ec164da8896a3963594b582767e756951aa SHA512 d57486c1ef169e2e15e58d8457e0e1871fc8ce6e9d12a62f74ab252d68e31253bf78e95c57b911950b4acc16bace02b42a2f21855436f8e05d79fa88cf44f81d
 EBUILD gpyutils-9999.ebuild 511 BLAKE2B 02f8c0cf83880a564b6e7e9834bcb08ff64fb0960219dd29915033aa1917cc09ea6b103a12903c5c682ed861877f991d12bcd8d9a0938099ee2c141cb7e07fbb SHA512 3d6b9c811495251f80c29adf0154f5f13f8771f5c1d72833d1d1a28135447cacb413ee7b0b665b1a6ee5ff3704b3a7d20c9d1193b04d9d29dfc9c9baff853bd8
 MISC metadata.xml 552 BLAKE2B 1f0cbee3cc1240b53c9c60122f488628643742b1afc4f68e9780bccbd959f0d45fb612ffbe9a8f9ac0cb8b5b6586af133c3a5d43884d42b09c8f3a8e2d44076a SHA512 f6788974678b69e9f38f9813333b62bd53c0e41beb5aee3f1d962ab6a739e8a2e2d3b2e1e03e6200172641b73df5ae0eb2cd74ee664ad20ea665ed63686ac7d1
diff --git a/app-portage/gpyutils/gpyutils-0.6.1.ebuild b/app-portage/gpyutils/gpyutils-0.6.1.ebuild
index 9960fab01e41..caf527892cce 100644
--- a/app-portage/gpyutils/gpyutils-0.6.1.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.6.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]"
diff --git a/app-portage/gpyutils/gpyutils-0.6.ebuild b/app-portage/gpyutils/gpyutils-0.6.ebuild
deleted file mode 100644
index f00bb9f55f46..000000000000
--- a/app-portage/gpyutils/gpyutils-0.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI="
-	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index b160e7708911..6e24d2e2dedb 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -1,5 +1,5 @@
 DIST ISO-1.tar.gz 2887967 BLAKE2B 0ae9d9c4078974316d6865a8601705f7c69c8305d8401835bfa544d14a90b3688ea6b881a1c07bcb969fe2b15f210d05f114ebaf3af5ba6f1ae3705d395f1603 SHA512 50bd9bcaa3d1900763936beb4801fd9e5cb963e39d51c39c9cc9a8d160469db1b0c6fffae01bbb5d5d5c6d4e42d84a6c499c465bbdd964835c2d190785eed52d
 DIST grs-0.7.tar.gz 36330 BLAKE2B 9e835262656f8a51969810f92a1ae801bc058c4529c01fe1998227fa8b81939c1d7db9f335f5a18f18d9cbd53ec809d289efd80ba7543b3b61a8dee1296bd780 SHA512 b530d66e3402e34f1c4efdff0af0e1d0f0ccf311c440c8d5ee050f8a8ab178d663433f766d507c5b1280ef9056fd97d05915e65e07a1a59bb8a3c80fd4bab4c6
-EBUILD grs-0.7.ebuild 1331 BLAKE2B ddac204bf60d9d5c52f0eef22104c4508ec04c0aa97aaabcd136062a333136bd34b82202a731c6c13504eddcd87d4a7fea7d12dbcc26133f7205f589f07d8a9d SHA512 84af3badafbf04212fdb95086cdc5cd3dfb7ff3ba166bb04cdf312fc436d3f8e8c44b90cbb0c415def64e3629db717a0a6ba057ca9a436efb096d43c0d7591a8
-EBUILD grs-9999.ebuild 1335 BLAKE2B 43d159bdf1b649fbeb2051e3f160bbf01a0dd431aee409e1f7398ae68a45edecbf41618b1eb09da6d95000b5281269b999de4004ae0763699fea3cbe66463d00 SHA512 0cf711b2f4457ff5f274f8a9bdec2845bfb9d3a9373f373058521dcdb93276feec916c45949a5d1b9cfedc4a98258ac335125fd8075becec79bce0922656f41b
+EBUILD grs-0.7.ebuild 1331 BLAKE2B 70e7b17b5a873d601f44963727ccad378099047b5154ae3c326c6743cae3b3896fd1ff8097dbc094756a37403fdef389ee2aab9d5931644049a6ae18ae81c149 SHA512 65628d3bdd8987f003d94003f8bc04d03e400061a80cd704ba7f5ccee6537159b9acd253ce1f9a4ed562f3605a405a0175a2b188607d2dd205642d139da285c4
+EBUILD grs-9999.ebuild 1335 BLAKE2B b9bce06b8d0d5beb927ec68b26fc87b533946ab9ab450cc1feb07cfb5ac2d770f80a6cc9c024ccb4cc30f55bca81a71e2ffdd11c046d56048a8bbfe7d6348e30 SHA512 4839621555a3c3f405ddb3a6855e36760bd218e4ed6af2fe443324a792aaa355c9d858583a39d4e912c46d7dd098f6eba7e475e78b794584bddebb8bbd0f3c52
 MISC metadata.xml 335 BLAKE2B 24dec8cf9113a9a1114ebac569e5f335f82bbd0e89efc87f4897fd79e7da509450e562aa825c01a20e3edfa82523bf443f0d24f8a0964b73f1074975eee821d8 SHA512 e753c37f63f2d42e2745076a5969ef57a87e71a9dc96b6f681d138c6d9c23d8903683208fa1519e91f08856f40e900812cba2b4d53c51c3827e18edd940b8d7b
diff --git a/app-portage/grs/grs-0.7.ebuild b/app-portage/grs/grs-0.7.ebuild
index ab99785d4f64..7d4700a6d76f 100644
--- a/app-portage/grs/grs-0.7.ebuild
+++ b/app-portage/grs/grs-0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit distutils-r1 linux-info
 
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index c98149f22b02..33f52c59b465 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit distutils-r1 linux-info
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 90b7ef2eaeb1..01183e43677f 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 513fc13e9a08..27d6449fa16d 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,5 +1,3 @@
-DIST ansifilter-2.17.tar.bz2 436116 BLAKE2B 94a1788cffa66343643f48a18748d5359b090803cde723a02bc38f908c262631f1cd2eb150b6a743d66caa04983ea444ba150cf34ce07bdb456979e19631582f SHA512 ab9d590189482f2a27affd62b456c96b947b04d8c8b1214f1ea967971c8ed7df8a7c15d1079f957164d01916d144dcd5dc4b0ac05b452f9f4b8095273d3d3162
 DIST ansifilter-2.18.tar.bz2 436432 BLAKE2B 43c592e83a967ee86404332a464d57d202a73651b2e29da2d1d21163d295b6efba96ecb5861dacfa89b8f567c0367f7a32b8e658f8cefad82c5982f2f2bf70bb SHA512 ef7febed1fc31f5c7503648e4fc0a7aefc3da8e30ea649bd6f03eac2904667fb779049106ccb77ad16fbf655e979f6651b25b84ab126c940c66bedee115a28e2
-EBUILD ansifilter-2.17.ebuild 1124 BLAKE2B 89f6293eac8b6e77fdd676cb218f5d8858957ab61845b90f164a104510fdacc4e0a832f54a30a0c7f0f2d7a48fddd8f8654c4c3aafac5dbcaff820b371d64831 SHA512 e3607267879b723f3cd989e78fcf352c91cddf0e8a0b75756d3e54bc3b672e2c1d2ad14c8f8b59afad44b14fb5dbafaf49caf575f3d3a9ce32f89aae4e33ede7
-EBUILD ansifilter-2.18.ebuild 1125 BLAKE2B ac340670ae0bfe164cc88d09be22a362c9fdd9ec3316bddb1a7b373f1c9c9e4dd80ae5de6ce35c90e6128e49860a73cef9480393764466ab4b7b0c43c4a96701 SHA512 37f8c6d4b2e9db1587fe5301f081b381e436868bc529a0fc58c749a4e8db3d33ff199e61e8756a8283a109895b94ac7670dfab7e6531b124bff86bb74539878e
+EBUILD ansifilter-2.18.ebuild 1124 BLAKE2B 89f6293eac8b6e77fdd676cb218f5d8858957ab61845b90f164a104510fdacc4e0a832f54a30a0c7f0f2d7a48fddd8f8654c4c3aafac5dbcaff820b371d64831 SHA512 e3607267879b723f3cd989e78fcf352c91cddf0e8a0b75756d3e54bc3b672e2c1d2ad14c8f8b59afad44b14fb5dbafaf49caf575f3d3a9ce32f89aae4e33ede7
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.17.ebuild b/app-text/ansifilter/ansifilter-2.17.ebuild
deleted file mode 100644
index f016eddcddc3..000000000000
--- a/app-text/ansifilter/ansifilter-2.17.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 toolchain-funcs qmake-utils
-
-DESCRIPTION="Handles text files containing ANSI terminal escape codes"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="qt5"
-
-RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog.adoc README.adoc  )
-
-src_prepare() {
-	default
-
-	# bug 431452
-	rm src/qt-gui/moc_mydialog.cpp || die
-
-	sed -e "s/-O2//" -i src/makefile || die
-}
-
-src_configure() {
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		eqmake5
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	emake -f makefile CXX="$(tc-getCXX)"
-
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	dobin src/${PN}
-	if use qt5 ; then
-		dobin src/qt-gui/${PN}-gui
-		insinto /usr/share/applications
-		doins ${PN}.desktop
-	fi
-
-	doman man/${PN}.1
-	einstalldocs
-}
diff --git a/app-text/ansifilter/ansifilter-2.18.ebuild b/app-text/ansifilter/ansifilter-2.18.ebuild
index 611446988b28..f016eddcddc3 100644
--- a/app-text/ansifilter/ansifilter-2.18.ebuild
+++ b/app-text/ansifilter/ansifilter-2.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index e83515883f77..ad2ca688def7 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,3 +1,5 @@
+DIST bibletime-3.0.1.tar.xz 1630180 BLAKE2B fe03cc8396f44ba0d68e27d50f60435c9d9501b620278c5d7565bea50c18f711675ac1020c6738790eb8452380ed974cba1a41bfb6f87778224d814c63e10aa3 SHA512 217e45c034d8fd8de4b7ef936f340a613fd7046b4700f828edd6d6f32f4bad4ecda2ec2c4425461af39c6926170fe080406238780e3c63bdbe0273679e0aef94
 DIST bibletime-3.0.tar.xz 1568732 BLAKE2B f1e9cb23d64d566d8b0934cfbdffabb52193f240523ad3ba79bbf0e3cd3ff516354791bf0b057354820cd3303c01d3ec50aa61f2e7843b1083c74d442d915a89 SHA512 85afc2781807345ea8fdefea6d179955fa76085c0a9c97e47321ea37ef9ea05367678c54bacfc10cf1d6085d46ba6fbd1c7d448044ffdfe3c96007ee8d7e5c00
+EBUILD bibletime-3.0.1.ebuild 1170 BLAKE2B 7db7ebfed65551923087980a6a1026120e6cda66eb1ddcd122a26a685fc903f0825d823591bda54309dd3649e19be3e6a37be0dbea6ac9be028004af31711abb SHA512 af58cd2e47d0bfe86266566b354cee6aff21232cc57ae8ed91901030880b4d1ae8b516db56182da834397135e854bf0de2badeccc4e630ed8667212535ccdd23
 EBUILD bibletime-3.0.ebuild 1305 BLAKE2B bd114fabd567e3ed57a8ab3ceaa993bed146bf5243056583ec74e2cbb1368fe546fc905e4686191e45b21017471409e48113794706680045bd191dd96650ee66 SHA512 adaccb36fd3709860ad17ef107dea9ac1255a36e2dcb83210cd3bcddfc1b209924b8c53a11630e44abf1cba930dd9fdc1334a9da7b09d6aa9abda1998efa55cb
 MISC metadata.xml 656 BLAKE2B 2402db72930eebc4448e4f0e48ae2e0494a20b9f52ba82a4bf61ea446aa476c917ce0af0229bb3c935ee5648aa69ea82943dd3ef98649aa6ae58af85f475eb53 SHA512 4e72b972bdbbb02fd7297414ba11fcf1680f640a05a4d47e45a4765441923f5c3fea4c2e5c758355fec60b809d94897151a30a8c09675c9466201db62940bf83
diff --git a/app-text/bibletime/bibletime-3.0.1.ebuild b/app-text/bibletime/bibletime-3.0.1.ebuild
new file mode 100644
index 000000000000..1e4d38ca16f3
--- /dev/null
+++ b/app-text/bibletime/bibletime-3.0.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt Bible-study application using the SWORD library"
+HOMEPAGE="https://bibletime.info/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=app-text/sword-1.8.1
+	dev-cpp/clucene
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/icu:=
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	net-misc/curl
+	sys-libs/zlib"
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
+		-i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HANDBOOK_HTML=no
+		-DBUILD_HANDBOOK_PDF=no
+		-DBUILD_HOWTO_HTML=no
+		-DBUILD_HOWTO_PDF=no
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index b84c064b46a8..8324e7bbadb3 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -2,5 +2,5 @@ AUX 40.0-internal-synctex.patch 921 BLAKE2B d970afe7dd3ac16d7f285baeb157bba0271a
 DIST evince-40.2.tar.xz 2928072 BLAKE2B 86051e8568044ec484a7a3c036a523ee44d22e46bdf5e75c6052d3302f92a27d48cb26e2408b176cfee3fafd3879a8771f4bf29a51f6b8085c31fa28f4885660 SHA512 f3ee19053a0bc6989a50fc790d1d54747d7aac5cbf0cd1e0eaea6cb743c0ebbbdf2565e88ea995fbba31c7f97e4279f9c0fa44c386bcf635a500033f6105ca9f
 DIST evince-40.4.tar.xz 2928100 BLAKE2B 491b2333e21093b032ec9c4f24c61cdaa31e4a46ee058b0f109b0998fb7216ada2c933e6202eae1d6193caad0cfa94a77434ef042555bab7cf4aeed959be759b SHA512 dbec3828f1e8f0b9b48dd90ce605ce83312e53cbeb8f8e7358c1318f1701680a69a9bcd26b7cf1da4b53679ae11e334ce514f5df4c5bbcc976581441e0d654cd
 EBUILD evince-40.2.ebuild 3114 BLAKE2B 212af71efdef680ec92b16edfb8e3e7663f456f66aa33d87f9c6a3f3238ed3d47c560c73a5067290969c88a28e215ad96dcfde4c6e341807f071521de0972c0e SHA512 0868af950d265c5f12ab93a29eb547285cdb7e9ce07a6f82b3067fdaa507c47188f619d53dc3f987a6820a0518690cbac93fe9592df048e22b417194581ee917
-EBUILD evince-40.4.ebuild 3116 BLAKE2B fcb217f0a151a12b9a527a35386ef5b3c8b268465d72fce8ba0e60eb69897a93541c45d56dd840bc54f2179963aa5f12cb4a5a5fad4828795c08b5db0dafe644 SHA512 c0c3964ed4d4e6d23ed15fb427a56882f10ce8ebb00d078332ec0f1eaff1363b7f7910c6690d66363788e97a703d35278809bf83924b495aa025ab7f07ca5212
+EBUILD evince-40.4.ebuild 3147 BLAKE2B 248a2c2d71d17cc483a1956cf0314d507cd05c0757e0f2b145482c419c8c42ae4ad69f883970091a50f8942bd09387ede3860d11663d9530b84f52a4d8701cca SHA512 de2b40bea62e4cdd2274f1e1100cda0e9d730f093a5d647403a1e573750718226d93f64286917ebb7820e4de93131fdd7b4f9f74496cbc197a8578aa48a7dd1a
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-40.4.ebuild b/app-text/evince/evince-40.4.ebuild
index f3d4f7e417e1..c63d4e42db3f 100644
--- a/app-text/evince/evince-40.4.ebuild
+++ b/app-text/evince/evince-40.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome.org meson systemd xdg
+inherit gnome.org gnome2-utils meson systemd xdg
 
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
@@ -70,7 +70,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	default
+	xdg_src_prepare
 
 	# Do not depend on adwaita-icon-theme, bug #326855, #391859
 	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
@@ -114,14 +114,12 @@ src_configure() {
 	meson_src_configure
 }
 
-src_compile() {
-	meson_src_compile
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
 }
 
-src_test() {
-	meson_src_test
-}
-
-src_install() {
-	meson_src_install
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
 }
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 9c5fb0fb3f9e..e5daf21e9b84 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,7 +1,10 @@
-AUX 11CVE-2015-5522.patch 1387 BLAKE2B 0a33769a37f78693025a3fb7e2bdcb6d02634df7c7cb417bad760ddc6318a51d1def3dc318a06b4182a916e664a0b47e2e3b8e40dfaff3616745c668b5b81a56 SHA512 d543dcf963fca7eaf644033a6f0252ec16b628984e1acd86fdb6d4657f01a2b3010c4c5f41b48126ce91cd38b5902349289ae4e11376cdc827813aac84b83f2c
-AUX htmltidy-20090325-tidyrc.patch 923 BLAKE2B 1ce5800a8991d37edb48d652c03525ce68cc97488dd0fda0214b4437b6f9bc29e0e29f046328bd1df4eb0143757d7b866df06fd302d2b2c367817e0deec5202a SHA512 2acef36a990196c4c995a4678988f5f4bc51b87c17a01843b1f7cefc4ff1062425d366b29ace0839ea8b6b64a8923c5f56ac4048106825b946059eae8951e326
-AUX htmltidy-5.10.26-strip-O2-flag.patch 370 BLAKE2B 7c2a58a6a8c00460871278f59676d3b8b8077a7cf2fc1f65dc9ae2987e06d760c73177baa37a197eb0f45f3a5c09bc2030f556948cfd2470fabe2bd734527e3d SHA512 671a0ef17388fb39d5623e0dd2b8aa6c55c22d9f3ba8eea093ddea1234a2786ef983cbe9dd7002fe04b2986ae888458f4f44120c47aa34dc145d34d9db2f81d7
+AUX htmltidy-0.99.0-CVE-2015-5522.patch 1387 BLAKE2B 0a33769a37f78693025a3fb7e2bdcb6d02634df7c7cb417bad760ddc6318a51d1def3dc318a06b4182a916e664a0b47e2e3b8e40dfaff3616745c668b5b81a56 SHA512 d543dcf963fca7eaf644033a6f0252ec16b628984e1acd86fdb6d4657f01a2b3010c4c5f41b48126ce91cd38b5902349289ae4e11376cdc827813aac84b83f2c
+AUX htmltidy-0.99.0-strip-O2-flag.patch 370 BLAKE2B 7c2a58a6a8c00460871278f59676d3b8b8077a7cf2fc1f65dc9ae2987e06d760c73177baa37a197eb0f45f3a5c09bc2030f556948cfd2470fabe2bd734527e3d SHA512 671a0ef17388fb39d5623e0dd2b8aa6c55c22d9f3ba8eea093ddea1234a2786ef983cbe9dd7002fe04b2986ae888458f4f44120c47aa34dc145d34d9db2f81d7
+AUX htmltidy-0.99.0-tidyrc.patch 923 BLAKE2B 1ce5800a8991d37edb48d652c03525ce68cc97488dd0fda0214b4437b6f9bc29e0e29f046328bd1df4eb0143757d7b866df06fd302d2b2c367817e0deec5202a SHA512 2acef36a990196c4c995a4678988f5f4bc51b87c17a01843b1f7cefc4ff1062425d366b29ace0839ea8b6b64a8923c5f56ac4048106825b946059eae8951e326
+AUX htmltidy-5.8.0-no_static_lib.patch 1282 BLAKE2B 6c5dd8ce16b0e05ce0cca9ea268b85bffa371f99e20d909f606c20c5fb6d06464f65daf7a297989966656f3eda0d5cc920a8f9e60dbbbba21927aab180567f9b SHA512 8742a0db922098f46d377861d56c6202144ed02c9603e3899817c9d1b5a903bc10e729066c2bc95b0a9c9b63603c6ed42a3b8486264d3560b78255b096b62000
+DIST htmltidy-5.8.0.tar.gz 1015303 BLAKE2B e8e48cfdcfffb7c7ac494f71ba709361e21fcbe5cfbd56c29d9d67ffe11fcdc20aa03aace65e6dc5315988dc0dd1fc148be616549f4f84f37928e662633bd7ec SHA512 f352165bdda5d1fca7bba3365560b64d6f70a4e010821cd246cde43bed5c23cea3408d461d3f889110fd35ec9b68aa2b4e95412b07775eb852b7ee1745007a44
 DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
 DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
-EBUILD htmltidy-20090325-r2.ebuild 1965 BLAKE2B 7e90c59b30fb3888b51fcae2b901c69c364f9b994728dafd7a3125430db13e918c98feca48ce7d862d76da0a4bcdb49ebdffa612fe193d95e4c11304094471f5 SHA512 bd5cd045050d4dc99d982dbc6532cb003cf34b20123e0b782aa1649c3558f6d49c789c56274f6181d1fac7e4868e57f78d6e501ce7ba99af13d367d4492e541b
-MISC metadata.xml 299 BLAKE2B 45af58b9f27f8329d072008a1089edae34741b855b1626cc56eb97efef684b316ce5573308ef1e73d4aa7e1cde74b0c10d5d7becee71707f5b3439f451a433ea SHA512 cd21089fbc56a2608734a5821826da373a5112e1676bf3c3481320236f5583ff1240e118e0021130625826c76cb426ca681e0dec3c6e4d2df22f8967da15321d
+EBUILD htmltidy-0.99.0.ebuild 1970 BLAKE2B 3070aed3a7fd97500449b0a9d15e94310d0fc6e1132031eb780c219341906c9c28d18c17510768a39f7c0abeada96ba536281d4e363cd9a5dee333cf05d80ef5 SHA512 c2daf06a319549320e4510df60f240e9f6a9504657fc230ca3d6af535804b1daf47fae2c6f92bab84fdc31b3968683e30228196249b60e92d480540006c89c2d
+EBUILD htmltidy-5.8.0-r1.ebuild 1673 BLAKE2B ba7ea7bc6a05fc3d21c31bae0d7fc2d57b1382920b4d98acd04283aca7c65fb45096b759d41ed1940f2cd77c64b559964d558f688d5b6488e6c74f519e5133d1 SHA512 79f2fac07b6d4a75a2b128e5834799737270a5c23b864f02d76dcc78ffad3751cf4342c324565b31b3478413c6075d83f440d89ed3fcdf328db02b1e45ce475d
+MISC metadata.xml 495 BLAKE2B db90fdb2d6e42059e23252b6be26e4d010c2bedbb522fb247b18a06b9f4328f8ef64a170e170cd510e7a677da4c046217914637416e37b0b31bb342362915efd SHA512 c83ecc62f8023d8a9d2ff50580e2a43879c0a99e1249e720ecd5bc90cdb9c33f0a86d4c65db580f25f2061f409ca27ba196b0088670367e40d2e29522e1f704a
diff --git a/app-text/htmltidy/files/11CVE-2015-5522.patch b/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch
index b4d6158ea04a..b4d6158ea04a 100644
--- a/app-text/htmltidy/files/11CVE-2015-5522.patch
+++ b/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch
diff --git a/app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch b/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch
index 4c805cf2226f..4c805cf2226f 100644
--- a/app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch
+++ b/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch
diff --git a/app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch b/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch
index 942a61e1464c..942a61e1464c 100644
--- a/app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch
+++ b/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch
diff --git a/app-text/htmltidy/files/htmltidy-5.8.0-no_static_lib.patch b/app-text/htmltidy/files/htmltidy-5.8.0-no_static_lib.patch
new file mode 100644
index 000000000000..476db036730f
--- /dev/null
+++ b/app-text/htmltidy/files/htmltidy-5.8.0-no_static_lib.patch
@@ -0,0 +1,37 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -393,34 +393,7 @@
+ endif ()
+ 
+ 
+-#------------------------------------------------------------------------
+-# Static Library
+-#   The static library always builds.
+-#------------------------------------------------------------------------
+-set(name tidy-static)
+-add_library ( ${name} STATIC ${CFILES} ${HFILES} ${LIBHFILES} )
+-if (WIN32)
+-    set_target_properties( ${name} PROPERTIES 
+-                           OUTPUT_NAME ${LIB_NAME}_static ) 
+-else ()
+-    set_target_properties( ${name} PROPERTIES 
+-                           OUTPUT_NAME ${LIB_NAME} )
+-
+-endif ()
+-if (NOT TIDY_CONSOLE_SHARED) # user wants default static linkage
+-    list ( APPEND add_LIBS ${name} )
+-endif ()    
+-install(TARGETS ${name}
+-        RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+-        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+-        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+-        )
+ install( FILES ${HFILES} DESTINATION ${INCLUDE_INSTALL_DIR} )
+-if(MSVC)
+-    # install(FILES $<TARGET_PDB_FILE:${name}> DESTINATION lib OPTIONAL)
+-    INSTALL(FILES ${PROJECT_BINARY_DIR}/${name}.dir/Debug/${name}.pdb
+-    DESTINATION lib CONFIGURATIONS Debug )
+-endif()
+ 
+ #------------------------------------------------------------------------
+ # Dynamic Library
diff --git a/app-text/htmltidy/htmltidy-0.99.0.ebuild b/app-text/htmltidy/htmltidy-0.99.0.ebuild
new file mode 100644
index 000000000000..8cacda80a2a1
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-0.99.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="tidy"
+MY_PV="20090325"
+MY_P="${MY_PN}-${MY_PV}"
+
+inherit epatch autotools
+
+DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
+HOMEPAGE="http://tidy.sourceforge.net/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-doc.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug doc static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	# Required to setup the source dist for autotools
+	einfo "Setting up autotools for source build"
+	cp -R  ./build/gnuauto/* . || die "could not prepare autotools environment"
+
+	# Stop tidy from appending -O2 to our CFLAGS
+	epatch "${FILESDIR}"/${P}-strip-O2-flag.patch
+
+	# Define /etc/tidyrc for system wide config, bug 154834
+	epatch "${FILESDIR}"/${P}-tidyrc.patch
+
+	# Fix security bug 561452
+	epatch "${FILESDIR}"/${P}-CVE-2015-5522.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		doxygen htmldoc/doxygen.cfg  || die "error making apidocs"
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	# Now the man page is provided as an xsl file, which
+	# we can't use until htmltidy is merged.
+	# I have generated the man page and quickref which is on
+	# the mirrors. (bug #132429)
+	doman "${WORKDIR}"/"${MY_P}"-doc/tidy.1
+
+	# Fix name before installing
+	mv "${WORKDIR}"/"${MY_P}"-doc/quickref-html \
+		"${WORKDIR}"/"${MY_P}"-doc/quickref.html
+
+	cd "${S}"/htmldoc
+	# Install basic html documentation
+	dohtml *.html *.css *.gif "${WORKDIR}"/"${MY_P}"-doc/quickref.html
+
+	# If use 'doc' is set, then we also want to install the
+	# api documentation
+	use doc && dohtml -r api
+}
diff --git a/app-text/htmltidy/htmltidy-20090325-r2.ebuild b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
deleted file mode 100644
index dcca33053d66..000000000000
--- a/app-text/htmltidy/htmltidy-20090325-r2.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
-
-MY_PN="tidy"
-MY_P="${MY_PN}-${PV}"
-
-inherit epatch autotools
-
-DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
-HOMEPAGE="http://tidy.sourceforge.net/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-doc.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	# Required to setup the source dist for autotools
-	einfo "Setting up autotools for source build"
-	cp -R  ./build/gnuauto/* . || die "could not prepare autotools environment"
-
-	# Stop tidy from appending -O2 to our CFLAGS
-	epatch "${FILESDIR}"/htmltidy-5.10.26-strip-O2-flag.patch
-
-	# Define /etc/tidyrc for system wide config, bug 154834
-	epatch "${FILESDIR}"/htmltidy-20090325-tidyrc.patch
-
-	# Fix security bug 561452
-	epatch "${FILESDIR}"/11CVE-2015-5522.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		doxygen htmldoc/doxygen.cfg  || die "error making apidocs"
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	# Now the man page is provided as an xsl file, which
-	# we can't use until htmltidy is merged.
-	# I have generated the man page and quickref which is on
-	# the mirrors. (bug #132429)
-	doman "${WORKDIR}"/"${MY_P}"-doc/tidy.1
-
-	# Fix name before installing
-	mv "${WORKDIR}"/"${MY_P}"-doc/quickref-html \
-		"${WORKDIR}"/"${MY_P}"-doc/quickref.html
-
-	cd "${S}"/htmldoc
-	# Install basic html documentation
-	dohtml *.html *.css *.gif "${WORKDIR}"/"${MY_P}"-doc/quickref.html
-
-	# If use 'doc' is set, then we also want to install the
-	# api documentation
-	use doc && dohtml -r api
-}
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
new file mode 100644
index 000000000000..3ca575025b3c
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+RUBY_OPTIONAL="yes"
+
+inherit cmake ruby-ng
+
+MY_PN="tidy-html5"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
+HOMEPAGE="https://www.html-tidy.org/"
+SRC_URI="https://github.com/htacg/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/58" # subslot is SOVERSION
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="deprecated test"
+
+# TODO: in principle this works but the new dependencies have got WAY fewer
+# keywords at the moment, keep tests restricted until the situation has improved.
+#RESTRICT="!test? ( test )"
+#ruby_add_bdepend "test? ( dev-ruby/thor dev-ruby/tty-editor )"
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8.0-no_static_lib.patch
+)
+
+DOCS=( README.md README/CHANGELOG.md )
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	use test && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	# suppress ruby-ng export
+	default
+}
+
+src_prepare() {
+	# suppress ruby-ng export
+	cmake_src_prepare
+}
+
+src_compile() {
+	# suppress ruby-ng export
+	cmake_src_compile
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTIDY_CONSOLE_SHARED=ON
+	)
+	use deprecated && mycmakeargs+=(
+		-DBUILD_TAB2SPACE=ON
+		-DTIDY_COMPAT_HEADERS=ON
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cd regression_testing || die
+	rm -f Gemfile.lock
+	${RUBY} ./test.rb test -t "${BUILD_DIR}/tidy" || die "Test execution failed"
+}
+
+src_install() {
+	cmake_src_install
+	use deprecated && dobin "${BUILD_DIR}"/tab2space
+}
diff --git a/app-text/htmltidy/metadata.xml b/app-text/htmltidy/metadata.xml
index 295e70001214..d1dfd0869ca2 100644
--- a/app-text/htmltidy/metadata.xml
+++ b/app-text/htmltidy/metadata.xml
@@ -1,9 +1,15 @@
 <?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="cpe">cpe:/a:html-tidy:tidy</remote-id>
-		<remote-id type="sourceforge">tidy</remote-id>
+		<remote-id type="cpe">cpe:/a:htacg:tidy</remote-id>
+		<remote-id type="github">htacg/tidy-html5</remote-id>
 	</upstream>
+	<use>
+		<flag name="deprecated">Install tools and header files which are now considered deprecated</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
new file mode 100644
index 000000000000..5193529d43f1
--- /dev/null
+++ b/app-text/kchmviewer/Manifest
@@ -0,0 +1,6 @@
+AUX kchmviewer-8.0-custom-url-scheme-registration.patch 2583 BLAKE2B fac216716c6ae1592c3a90fa52912845e5599c4339e608cbdb92514f2be060e600072e65f7791786d366ff6a6b2e76373f7b2355f3dce7d7c1d1af8e15db65c6 SHA512 4535cb7d3e407303ba554850ac30daa5357746fb420aa563a5995998cd2df45bd40b271788034c1bf9732d1bd9d6b40b6f21fcb65dfa1b17a7ce030654dd6074
+AUX kchmviewer-8.0-no-qtwebkit.patch 719 BLAKE2B f70114458bae2dad5739d40828c310d0dc29153034d962bb39594a1ba260ca9ba02fc1adfb001d555a3dcbdd8b89f08e2350ddeaa3713d924f040c0636b33ada SHA512 0f264ad713ed455257089fb2d9396353b793b7f2c4c79078ef1225d68df94fe32119399c834ff24d9200e7e34c34b253e910073cf6894a55d3918ca7b284e4f7
+AUX kchmviewer-8.0-underlinking.patch 882 BLAKE2B a20eebc7a2649ffa293e57d9b6e042232754922d69b1702923232c1f01690ddaaa2dfd2381406e81aeda9a44cded48945450bf4a9c8a6df36f1e88781614622f SHA512 493eca26ba6e681f0fb2318d43eb8fb37838a1ac8e18f1c4b3943e81dd2f4e63ba76a07e78a243e7dc294828d51883775f806c9223f29ba445d807a8b38b9103
+DIST kchmviewer-8.0.tar.gz 311899 BLAKE2B f317dcc17fa88f30a4a1867b59b16bdc78457b46f4f3d3b78bd5d9d50745bf2d2329df170568c7814a02814a77b319bbd1d9f8edc3c1da0071a6ce64965b26bf SHA512 28ae8ee8a6f4a9be2e8a9666f6326906e04f34ad80a363697fc7e5bfbc745e6671884add3f57b6a1264f2056428cb0a31504da9c69a0bede0c3b485a08e75048
+EBUILD kchmviewer-8.0.ebuild 1006 BLAKE2B 9303b074646b1ae6feca490b01e287b1f3f4805563cdb276e54fecd9bb98a20de01a02c2a99532f63d46f1003bf3d45299e159cb524f4ed5b7deed04d9016353 SHA512 89c01169d3a60d93702b2e86d0723372fd95e82097ae1df9c4d2d9cc37228455edb36b6c1b9ac33c15676a0fad0467c3e29e70c9603c89512ec57cc3a964b43c
+MISC metadata.xml 332 BLAKE2B ee65532facbaa670c7e703d7c70f7826d17d36902c46b8eb7902e70b1245f27a52efb1a0bbb4501ddb545d12f067ed2c35b37ac914fb8b6ec0186d064d989f02 SHA512 fec62f5d76da354f3eafcc948586f2dd5b88153ce558068dc084eaa62259dac81f0861a75c3ed99a350e495ddc4ca624e53435df80091c0c3fa503ad6d3b3e64
diff --git a/app-text/kchmviewer/files/kchmviewer-8.0-custom-url-scheme-registration.patch b/app-text/kchmviewer/files/kchmviewer-8.0-custom-url-scheme-registration.patch
new file mode 100644
index 000000000000..144d673b2b17
--- /dev/null
+++ b/app-text/kchmviewer/files/kchmviewer-8.0-custom-url-scheme-registration.patch
@@ -0,0 +1,59 @@
+From 9ac73e7ad15de08aab6b1198115be2eb44da7afe Mon Sep 17 00:00:00 2001
+From: George Yunaev <gyunaev@ulduzsoft.com>
+Date: Fri, 21 May 2021 15:57:21 -0700
+Subject: [PATCH] Custom URL scheme registration needs to be applied once per
+ https://doc.qt.io/qt-5/qwebengineurlschemehandler.html
+
+---
+ src/viewwindow_webengine.cpp | 20 +++++++++++++-------
+ src/viewwindow_webengine.h   |  3 ---
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/src/viewwindow_webengine.cpp b/src/viewwindow_webengine.cpp
+index 631d84d..34f3396 100644
+--- a/src/viewwindow_webengine.cpp
++++ b/src/viewwindow_webengine.cpp
+@@ -63,16 +63,22 @@ ViewWindow::ViewWindow( QWidget * parent )
+     m_contextMenuLink = 0;
+     m_storedScrollbarPosition = -1; // see header
+ 
+-    // Use our network emulation layer. I don't know if we transfer the ownership when we install it,
+-    // so we create one per page. May be unnecessary.
+-    m_provider = new DataProvider_QWebEngine( this );
+-
+-    page()->profile()->installUrlSchemeHandler( EBook_CHM::urlScheme(), m_provider );
+-    page()->profile()->installUrlSchemeHandler( EBook_EPUB::urlScheme(), m_provider );
+-
+     // All links are going through us
+     //page()->setLinkDelegationPolicy( QWebPage::DelegateAllLinks );
+ 
++    // This needs to be done only once
++    static bool providerInstalled = false;
++
++    if ( !providerInstalled )
++    {
++        // Use our network emulation layer. We do not transfer the ownership when we install it. See https://doc.qt.io/qt-5/qwebengineurlschemehandler.html
++        DataProvider_QWebEngine * provider = new DataProvider_QWebEngine( 0 );
++
++        QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( EBook_CHM::urlScheme(), provider );
++        QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( EBook_EPUB::urlScheme(), provider );
++        providerInstalled = true;
++    }
++
+     connect( this, SIGNAL( loadFinished(bool)), this, SLOT( onLoadFinished(bool)) );
+ 
+     // Search results highlighter
+diff --git a/src/viewwindow_webengine.h b/src/viewwindow_webengine.h
+index 0adea31..3e96690 100644
+--- a/src/viewwindow_webengine.h
++++ b/src/viewwindow_webengine.h
+@@ -128,9 +128,6 @@ class ViewWindow : public QWebEngineView
+         // It is set to -1 if no scrollbar position has been set and the page is not loaded yet
+         // It is set to 0 if no scrollbar position has been set and the page is loaded already
+         int						m_storedScrollbarPosition;
+-
+-        // Data provider
+-        DataProvider_QWebEngine * m_provider;
+ };
+ 
+ #endif // VIEWWINDOW_WEBENGINE_H
diff --git a/app-text/kchmviewer/files/kchmviewer-8.0-no-qtwebkit.patch b/app-text/kchmviewer/files/kchmviewer-8.0-no-qtwebkit.patch
new file mode 100644
index 000000000000..18360c897821
--- /dev/null
+++ b/app-text/kchmviewer/files/kchmviewer-8.0-no-qtwebkit.patch
@@ -0,0 +1,28 @@
+From a4a3984465cb635822953350c571950ae726b539 Mon Sep 17 00:00:00 2001
+From: George Yunaev <gyunaev@ulduzsoft.com>
+Date: Sun, 23 May 2021 15:01:24 -0700
+Subject: [PATCH] Only add Webkit stuff to QT if we're compiling under 5.6.
+ Thanks to @u-235 for reporting.
+
+---
+ src/src.pro | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index f502259..e75d6a9 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -60,12 +60,7 @@ FORMS += tab_bookmarks.ui \
+     toolbareditor.ui
+ RESOURCES += resources/images.qrc
+ 
+-QT += webkit \
+-	xml \
+-    network \
+-    widgets \
+-    webkitwidgets \
+-    printsupport
++QT += xml network widgets printsupport
+ 
+ linux-g++*:{
+     LIBS += -lX11
diff --git a/app-text/kchmviewer/files/kchmviewer-8.0-underlinking.patch b/app-text/kchmviewer/files/kchmviewer-8.0-underlinking.patch
new file mode 100644
index 000000000000..b4ed3b500c8d
--- /dev/null
+++ b/app-text/kchmviewer/files/kchmviewer-8.0-underlinking.patch
@@ -0,0 +1,30 @@
+From e3b09edbbae17ad19661a7514afe5a9d84ca0ffa Mon Sep 17 00:00:00 2001
+From: George Yunaev <gyunaev@ulduzsoft.com>
+Date: Sun, 23 May 2021 15:03:06 -0700
+Subject: [PATCH] Adding support for old single-pass gcc linker which requires
+ a specific order of libraries. Thanks to @u-235 for reporting and patch.
+
+---
+ src/src.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index e75d6a9..14c31a1 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -40,7 +40,6 @@ SOURCES += config.cpp \
+     textencodings.cpp \
+     treeitem_toc.cpp \
+     treeitem_index.cpp
+-LIBS += -lchm -lzip
+ TARGET = ../bin/kchmviewer
+ CONFIG += threads \
+     warn_on \
+@@ -106,6 +105,7 @@ unix:!macx: {
+     LIBS += ../lib/libebook/libebook.a
+     POST_TARGETDEPS += ../lib/libebook/libebook.a
+ }
++LIBS += -lchm -lzip
+ 
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     # Qt 5
diff --git a/app-text/kchmviewer/kchmviewer-8.0.ebuild b/app-text/kchmviewer/kchmviewer-8.0.ebuild
new file mode 100644
index 000000000000..18bf404abb9d
--- /dev/null
+++ b/app-text/kchmviewer/kchmviewer-8.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="Feature rich chm file viewer, based on Qt"
+HOMEPAGE="https://www.ulduzsoft.com/kchmviewer/"
+SRC_URI="https://github.com/gyunaev/${PN}/archive/refs/tags/RELEASE_${PV/./_}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/kchmviewer-RELEASE_8_0"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/chmlib
+	dev-libs/libzip:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-underlinking.patch"
+	"${FILESDIR}/${P}-custom-url-scheme-registration.patch"
+	"${FILESDIR}/${P}-no-qtwebkit.patch"
+)
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	dodoc ChangeLog DBUS-bindings FAQ README
+	doicon packages/kchmviewer.png
+	dobin bin/kchmviewer
+	domenu packages/kchmviewer.desktop
+}
diff --git a/app-text/kchmviewer/metadata.xml b/app-text/kchmviewer/metadata.xml
new file mode 100644
index 000000000000..18d8646795dd
--- /dev/null
+++ b/app-text/kchmviewer/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gyunaev/kchmviewer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index 87a23652d0a2..2d3f0c02cc2b 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,3 +1,3 @@
 DIST lcdf-typetools-2.108.tar.gz 651350 BLAKE2B c60986672a31bcf47b876fa75d04a976be761442b04b1541f7f9082521d716708542b8708fd3da558f9df6b459cca1043a7e1ee2eb006f94054611dd4ef348d5 SHA512 2c7afe1c6838f432ddd5bbd5fa86a58743242d5a2203220d3cd0153c0c69f23ca734e8d4352ed3c8a6bffc1c61bb93c19d00c6483545a09d6f8363f870bf2fd0
-EBUILD lcdf-typetools-2.108.ebuild 849 BLAKE2B b123f79c383133a1a3ccf816f3c176aaca4965114f6ddced5f8ed2910116b6c8428312a09411e78a44995a2d2a4badbe64ae74c3b48cf12df543686b1a869763 SHA512 24b966c3b3eb789ec29a1e9d3d6ec14f65aa3bc33102da6fc9f91e260ab1ed84c523cbfee5a1d26f07a84a13f23837db951bb89d9bafe0a968c194bcbd3be49d
+EBUILD lcdf-typetools-2.108.ebuild 856 BLAKE2B eaed248a466a61da725672885f7a2cd3f4161f981a4cea0c78e942f57e77b9b6b96908031cda67e9736199bb167947b70a8cd37cc4f9c51f0c0f45a5495547d4 SHA512 20076b57267e515c108eeb7a0e0aa404ac516295d04ee62a675d50956816f3ca124220289f4322dec02a44af83b9007990f5176154d57636c2656504f7303d66
 MISC metadata.xml 794 BLAKE2B c611036ee3c2daf88b72b026f0d8bec0e05595db2f73df051fb37793eda6304e1a32137e7759028ef4eb75bc56426d6ee2649d5384bbcc41c2da56d32a647b8e SHA512 9ae4e29814e34012d731aacc0a8b4a38649c95a988049f3fc10c7f260cb6ebcc57caa0a93d21eb8e66e64207673842ab7ab2fb71792ed3d537b7eca891609cba
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
index dd313076fa41..8d0afc264b77 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://lcdf.org/type/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+kpathsea"
 
 RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 2dcb5c44ab7c..a8eacd5fe48f 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,5 +1,3 @@
-DIST libpaper_1.1.24+nmu5.tar.gz 49032 BLAKE2B 27a684dc02d5d25c84a92161e7178d1f369444d50c316e7303579a2f8ede8590d4a19637b7066fcc8909f7942fa965d8421d468b28e99b8e963f4b2b170f2ab3 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56
 DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
-EBUILD libpaper-1.1.24_p5.ebuild 1199 BLAKE2B ee864bb78ec30f830d0fa66e01f7de3bd31afaf51cb4dbac316997f25f8fc1281cc99217a9fc62b51a7be5dda03a9ab0540d0b944c1ef2fb19b8ce562da3ff96 SHA512 33a26ef7217a5fbc9e9873b18a8f32a5cb13c0bd4c6cc94824a3875fc27f51976a991edee82608f0117a91ae7cb7b4c4abed2dca2b397a8f2f19de9f7236af08
-EBUILD libpaper-1.1.28.ebuild 1142 BLAKE2B ed2674b50afe719886dfec1e284a57a20d32d62c887fdb68c981a6c1d563980e1c0bde075ed753351a0b856599ee7b308c48a03ed591aa98a451b38f434f354e SHA512 7708e7db215a9892bbd6f5c98680f278537f667e742acab9b4c944afd68c906eaaaa1fb004489396b82e3b371f6e528f4eb1afb368c5d9a0e48b1d3f85b767b2
+EBUILD libpaper-1.1.28.ebuild 1141 BLAKE2B 26af8cb53bacedce42e1d990a95ab80c8211aac4a37d4aa9c6ca92b06a90907700eefa6d0b6883d0d3bd0e815385e7ffc8e6c8c1446bdfcf6eaa7b6e156f4c4f SHA512 d86360b2d513e2bdb6d73d9121c574720dbcf95af4d95c636b0517f4508dfb0e7a68a7d1ded118756233f9197dd077ee729364b87644e61570e03c7d7eb12e86
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/libpaper/libpaper-1.1.24_p5.ebuild b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
deleted file mode 100644
index 04b3e1b4c65b..000000000000
--- a/app-text/libpaper/libpaper-1.1.24_p5.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
-
-inherit autotools multilib-minimal
-
-MY_PV=${PV/_p/+nmu}
-DESCRIPTION="Library for handling paper characteristics"
-HOMEPAGE="https://packages.debian.org/unstable/source/libpaper"
-SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS=( README ChangeLog debian/changelog )
-
-src_prepare() {
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-	default
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}"	econf \
-		--disable-static
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	einstalldocs
-
-	dodir /etc
-	(paperconf 2>/dev/null || echo a4) > "${ED}"/etc/papersize \
-		|| die "papersize config failed"
-
-	if ! has_version app-text/libpaper ; then
-		echo
-		elog "run e.g. \"paperconfig -p letter\" as root to use letter-pagesizes"
-		echo
-	fi
-}
diff --git a/app-text/libpaper/libpaper-1.1.28.ebuild b/app-text/libpaper/libpaper-1.1.28.ebuild
index 5e4f7ebebdaa..fb8f9a9d49d3 100644
--- a/app-text/libpaper/libpaper-1.1.28.ebuild
+++ b/app-text/libpaper/libpaper-1.1.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( README ChangeLog debian/changelog )
 
diff --git a/app-text/lv/Manifest b/app-text/lv/Manifest
index cd25c8ccfec5..e916bf39c75d 100644
--- a/app-text/lv/Manifest
+++ b/app-text/lv/Manifest
@@ -5,4 +5,4 @@ AUX lv-xz.patch 1415 BLAKE2B e4a9cbd5bb2ca71eb3c6eea8e132caf2f1bbfda84e8055654ea
 DIST lv451.tar.gz 605082 BLAKE2B cbfdf1c4c90dc746de631e55e3d1e88335f22342991ca7d5bd4b3661803af4efc0c6dcd821ea58be6024fa7ce773ffaa0aa3844350b6f67dd61be09e2475cb70 SHA512 88c05cb06ddc56e7f16f30b38218ec3bf9c8ef6c3c2b08d5a3f950b6870b82417368ada3f14f183b0feb6ed32d144d71901ad8134e5f88ddec11fc7b9520e810
 EBUILD lv-4.51-r4.ebuild 983 BLAKE2B 5b4fed1290923c58644aebe7b148f95acc4c02288c688f7127e1805d088a28533f80efd98fe7a02cf96e1c27f14629b4d835c5e90f81c2c91e8f2b4431f9f0a6 SHA512 5f7829327895e7681c91b35caaf2d42fc748adc1d3788f4363939e205b959b561ae57493416c548621e761716393e86b2dd1df0f2b649c2e43bfce1cdd8d3228
 EBUILD lv-4.51-r5.ebuild 936 BLAKE2B 8cedc9a719f47410963cd8dbe38903f12557626fde3d6712f0f64994b3c1c8e05c6553f1f671fc024b8222a1d0edfa2e6b99761cf6d6bf710673746f076d3c24 SHA512 1e1b922afd22d0ab94e7b2234d81326b5f7a0cba42259b0bafea2a7d49c9977dfba8154fe8c5683cf1ab66a20d13b7082245f2b5c3ca14ad348c5847a5d473ce
-MISC metadata.xml 358 BLAKE2B 56858cc481cec55add44dce0a02d0955fa787248b0a6861914fc450957d9b18ae256a698613d94479aca810cae4c264e0a91bf3ff89b52183c4945ce32a5dec5 SHA512 7b250d5ddc092d7ecd4e6f48175e1f57f1671af4f8529368f368071b777fd773e363e83bcd3cfee3c9352ee93c9c0bc205f940c4cb6601dac3164ad34766e6a1
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-text/lv/metadata.xml b/app-text/lv/metadata.xml
index 44629a6d665c..e1a49f498885 100644
--- a/app-text/lv/metadata.xml
+++ b/app-text/lv/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slyfox@gentoo.org</email>
-    <name>Sergei Trofimovich</name>
-  </maintainer>
   <maintainer type="project">
     <email>cjk@gentoo.org</email>
     <name>Cjk</name>
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index 2f31fa20a77b..943a98a9e459 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,3 +1,3 @@
-DIST master-pdf-editor-5.7.40-qt5.x86_64.tar.gz 15880536 BLAKE2B 0e0c59ca74dfd8532513cbc6cbe96b9ca73cc9d838d9d4c55dc44fdd838d5c7ddb14c6725ef86d6da95c211355a716bee328a5147cce2833b10994b313848d97 SHA512 10962402f26a12eec625e2d366e99490995c5ab5011e05364af72f67504487cd913200a809db83d9b81df18f89318a719167efcb0e8cfa8ee1796698fc79303f
-EBUILD master-pdf-editor-5.7.40.ebuild 1092 BLAKE2B 0d43d8511a262454d533e3961fc1f313de5e17638cab6178cc4357edfa750a80dde9e0e32c32a05c522dfb699738054ad2953fd489e754158558780c6fc697cf SHA512 8870aba2272c522a995fa2cda76530e0847e3ba06102599595e8dcc2d1209b0a2b6588876fd3292e938e9c69c8a5fa3561922a788149cccdea7ccece18901e56
+DIST master-pdf-editor-5.7.90-qt5.x86_64.tar.gz 15962243 BLAKE2B 4331a5d17ed9a0ff7a70c353907a4c0d5e99db447760f6103d412eabe0064b1e4ac59ca85bb0cab2bffc5867c8ccde96f68e7ceee227b7b319d93b70482f233d SHA512 823c7212cd3d469bb972e7da66e6eada31149c0bab2a6c577e537ca203862d0fe862e8c9b0cbb479eca0557da4b69a91a88ae0c9215d3b5f105288a9c6c1f2bf
+EBUILD master-pdf-editor-5.7.90.ebuild 1092 BLAKE2B 0d43d8511a262454d533e3961fc1f313de5e17638cab6178cc4357edfa750a80dde9e0e32c32a05c522dfb699738054ad2953fd489e754158558780c6fc697cf SHA512 8870aba2272c522a995fa2cda76530e0847e3ba06102599595e8dcc2d1209b0a2b6588876fd3292e938e9c69c8a5fa3561922a788149cccdea7ccece18901e56
 MISC metadata.xml 397 BLAKE2B 452d8c61c1042ca4152ef78d105ee9e50453e477628b5bc265fe7069b2ef60f351b31151811becab19615aac793c71a456ecacd0b44d8db767a16698a1c7f6a5 SHA512 319a7177adb83e54195daf3ba392d68540c94c98a57681e4bfc20fd3df76632eee4b2e9c994a387df9878b9d596a1bb74dbbf5f003d1755c6df1fc3f2fc0dc32
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.7.40.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.7.90.ebuild
index 1300656eb4a5..1300656eb4a5 100644
--- a/app-text/master-pdf-editor/master-pdf-editor-5.7.40.ebuild
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.7.90.ebuild
diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest
index bf155520d91b..3e31a73030f7 100644
--- a/app-text/pastebinit/Manifest
+++ b/app-text/pastebinit/Manifest
@@ -1,3 +1,3 @@
 DIST pastebinit_1.5.1.orig.tar.gz 51448 BLAKE2B a5cfa13c770e234d6e08d4f0b662c09398a5f20ac4e3f7c10ab086261923851239a3e6c1bda78ba6ba810f95cd90e6517b74aa41c5b5e3d50bca5b8c100aa594 SHA512 02b7faa54862d240eac3a8edaae2edb895cbb476cbf89dc71514a5a0a42aa2b0d26f07e5485627d1deb61f62e37018459e4d072bd4aacc886f259fced35e352c
-EBUILD pastebinit-1.5.1.ebuild 1365 BLAKE2B 96c27cd94d5773265eb4ee2866d413380882046b5ffe6a5fd07cab769f3947d4d9fbfc238b3b8f37635ccbdc44d476a2a7fd319afee4eab4985f53b0aa5510ec SHA512 c3b70c11c241d6d038a8c172cc7d229b675ec91438084d1b4e5c8fcc54b362e72755ac4bb02410f7af29ba927956a0ccfafd1211cfe33efd208f4ec5c5b1e1fc
+EBUILD pastebinit-1.5.1.ebuild 1372 BLAKE2B 73a7c713ace2c6c7f51351986745ac86db10ef4755bbc28f59d54b2aa97a121f02d16b1d15376a7fb69ac65ee68782d355b84343d275fbaf827e74b906614579 SHA512 c9048c262e4f7a2df4c66946b25bf74656d1d663bfdc81000888269219ed4f7e4e0360e09fb16f56e527a15dc0bbca065dfa017586d3f6a32ba42df2b3f59fed
 MISC metadata.xml 350 BLAKE2B 48e5e06f98f204858522d5d157b7739cc8b4e6d9b22ebadd9318fdded30361594ca8e5ebc8b64dc26135b60de12adac9dece6560a0a68fa7f49876e63c90d1b5 SHA512 19b844196638bcb27fa6dbcd46516e0ca0a1861737fd29f196fddbe0489a077d11bba1efac5f21c395616923dd67b55e3797e508fd3ae48516cc4991afd54bda
diff --git a/app-text/pastebinit/pastebinit-1.5.1.ebuild b/app-text/pastebinit/pastebinit-1.5.1.ebuild
index 7a0e41a109ba..550104a796b0 100644
--- a/app-text/pastebinit/pastebinit-1.5.1.ebuild
+++ b/app-text/pastebinit/pastebinit-1.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://ubuntu/pool/main/p/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="crypt"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index 88b9c763baa0..43bfd39f21a1 100644
--- a/app-text/pdfjam/Manifest
+++ b/app-text/pdfjam/Manifest
@@ -1,3 +1,3 @@
 DIST pdfjam_208.tgz 180725 BLAKE2B 903ce4f0874c9fc9ad23f3db37b882596589d6470dfe9289f65a72fb66ff843bbd49b52086d7b2d2cbbfb1b6406cbbda64d46b933a853d5d681ef88d4033372c SHA512 728c8d304c6d2af773980d20ef4a4be6e0a5dad286ad8cd00be9b1687f5024e00032a750c10c74dcd24431f081368d02b76f03cc5bb1c8725a060cd70be0fd8c
-EBUILD pdfjam-2.08-r1.ebuild 573 BLAKE2B cb7918265c468ed11535d0bf8e13b67410cdb8c1cbae98fd00e63e23b4a0e85342b34d7b1418d058a3d0cc27a85848d7cab39d73cba5e6500b69fb1b162c653b SHA512 8448f3d416835ce8c0c74f9806e2d53b32142f0f599b9407da3d9e5c38e66098411528aeae9e8fd3b5c9ef7c814a681b9f17c7ef548af5b3a85f97b43fa19638
+EBUILD pdfjam-2.08-r1.ebuild 580 BLAKE2B d0367b12ec9ea725c34344861ce30139300ee73e6a188ecbeca277317280fed958251143a499b440d8fc6f72172f44e86d638171cea65df521e34b29af1faf72 SHA512 100bfa41a19e74306c47bbe9adbf1cb9ba4c08640cc3a0ef86581040ccb845ad6416e47339606bf63179c41a236f75f9d582b3b2ca73bce47fb4860771d0123e
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/pdfjam/pdfjam-2.08-r1.ebuild b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
index 69826d88b34c..17672fc01c1e 100644
--- a/app-text/pdfjam/pdfjam-2.08-r1.ebuild
+++ b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 S="${WORKDIR}"/${PN}
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index d557ac1dd0d3..a2c51d7f963a 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,11 +1,7 @@
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
 AUX poppler-21.04.0-respect-cflags.patch 5738 BLAKE2B d09ed8ca5211b89a06b56d8e7f3564ca6b388f36469d174444a5b974ef0403e55061900b79049ad9192a0a5e2baa0bee295904c3ea27a74dfba7eb8813501600 SHA512 f9f915f3343f42f504080320fb1e35164f489abfa55bd7bc0889dffe05db56f49c8a528bc253e315e5616e6baccb413710a562021538ad4fa7f081b673bc688b
-DIST poppler-21.05.0.tar.xz 1700632 BLAKE2B 5e277f3d9d6fafbd39b395d7730182ec028c0ccdbb59e0b9d6ea93e079eb6dc8ff6e46a2b378ec4502055e8748973d353e1f947d734cdee4c5abb9f1bb6dba2c SHA512 428f63a85fc8a227efebcd64ca7e89fec487fea07c93f9dd990fae343532547bcfec29a3288dd9ffce698cf994ccc2ce5055e4fa677ebceb216c1caaa3e0cdae
-DIST poppler-21.06.1.tar.xz 1708344 BLAKE2B 424888e16c72e9ad37fcb0aa3ecc7bef8c6150f3ca51b205407f9db51a5800bf76c703ad7a7e642e5ce60edc0ab3506d29bd18c8424425da7d4270bb2adb3025 SHA512 6e447d09421b7729d83a59a24deaaaea15103240cac0eaf41ddcdd64ac2c8f08a6902b95d56bbbcfd9e229054bd0a4f1769ea05c7e20691bc8f995e3f959f0e9
 DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
-EBUILD poppler-21.05.0.ebuild 3275 BLAKE2B 68c1ae9c653cc9f1ef2ec69f31729ba20d76ab5ee7eac8e19091e38f1eddb9d73714a69c0cda3df1abf9736d4dc1599f5754421da76b2b1adaaf729cb8d619e4 SHA512 e23de4db062620e849b62a511221b7871b0f1e927189c6e7424271f0eac7945a5af929ad12a604ee43fe7e00c2c49d2c99b9e74d955ca8ba64506fbaf473fc65
-EBUILD poppler-21.06.1.ebuild 3361 BLAKE2B cb35da96c00145776278ae7847683e30de056d73700d999ccca7614df7ef61058d0d2dba16cab47fa0c9854642a69303dac5d914700e489876d286ba95e74ef8 SHA512 5f6813eafcb7a90a0c5233d26d7d8803baa658d8c48ad8f6d0119bce04923336619de53c315c18a5822e1536c13967817f88d87a96c4533ea49d280aa1d63755
 EBUILD poppler-21.07.0.ebuild 3339 BLAKE2B fa5a0f1aee4edc405149d5573b917320eb8748054687222ba9dab6c61105af7286022bfc7d7b685aff174966a7d0db1274dddf9464343fd4e35a4dd6d5c53921 SHA512 c0f8caf6a63c76024c668e8f98cdb67ddd5ff3a0798cd54d1276a1aecae54324dcbbd291e308a4e322eefa61ff13a34027fe86bbd9f464a8fc9873da6a41af48
 EBUILD poppler-9999.ebuild 3340 BLAKE2B 916235fb20cb98652c0f5fe4f738b513d8a987e2f9c94965ebdf7a7b284b2f317977f0cd43c2cfb0786db4b5bf90ec659dbd7f7b0ba401a63d139c892a396ec0 SHA512 17b37f071e8136c0b8be0924909e5000ff7f36af97e8917b282ba08536aedd6c1bf32674be101e48585a5e4744e36238565bae7fe73f96c323abeb816f39cb54
 MISC metadata.xml 1077 BLAKE2B c49251ca6f1d793da24746e5161d43b01550c560fb942d64298c19a889c531f4c5fab967cde87f7063ecb4789a6586e40ca519b196633912ccb55ed568a650cf SHA512 c09156d438acc9cf85e77fd1f57262596c28f305559d9635d4a457189f88e56e0689e102ad60d2be998b9e286c36ed45227e95ae5e9ce6a247662331d44f2076
diff --git a/app-text/poppler/poppler-21.05.0.ebuild b/app-text/poppler/poppler-21.05.0.ebuild
deleted file mode 100644
index 845b1a76e59e..000000000000
--- a/app-text/poppler/poppler-21.05.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2005-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/110"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-DEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DBUILD_MANUAL_TESTS=OFF
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-21.06.1.ebuild b/app-text/poppler/poppler-21.06.1.ebuild
deleted file mode 100644
index efd4780f0a17..000000000000
--- a/app-text/poppler/poppler-21.06.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2005-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/111"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-DEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND+="
-	boost? ( dev-libs/boost )
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DBUILD_MANUAL_TESTS=OFF
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/ps2eps/Manifest b/app-text/ps2eps/Manifest
index 7286aa4da88b..fd4e00980713 100644
--- a/app-text/ps2eps/Manifest
+++ b/app-text/ps2eps/Manifest
@@ -1,3 +1,3 @@
 DIST ps2eps-1.68.tar.gz 97304 BLAKE2B 594b894b2d81f64c8c6a7461d1df96d7b6e3ce3ef8f7eaf58161eb6a05ebca7b2d304a531be954898f1a9ad53cccd84536b64127b080afbc3902265d2e4e1108 SHA512 7fc84da5da00d5b1169d6e337b1db232adf80d9d957e48bfdd9272946151adca3e44f712587387ef557488cd15f44210b3fbd8c545488ec0071641d9d25a9c2b
-EBUILD ps2eps-1.68.ebuild 903 BLAKE2B a18dd688b0a97758574595975ff8073d0b00dfda74ca439d3916467062e558d51c7866f999b51ce794dd214f0ac5895c44c45f2b3ff9cd80ead89281b65a43fb SHA512 b0134a6d331fa6603b585ec8230575d07664e14d2dfbe43d40e9e5437b48397d6e0a641913f3d86e3436fdea4983bf53407e0ec48fc5f714ecb51f8cacbe3513
+EBUILD ps2eps-1.68.ebuild 910 BLAKE2B dd28ec4cc59f0c4b1dba392ed1cf8e076452434c91c50639de763082529d3c6b48b1b39f8c05eddc9ca0e76aae097330f9f9e989fed2a8040f91477b5893e33a SHA512 850acf6f71655600f3554ac61215fb41e6e7e6f90968aede0276645ecb767106a22e63024b7f4f8355bf53c27ece385bad022a66d6944fc0515b53f733ac2e14
 MISC metadata.xml 369 BLAKE2B d97022c8448637ff25c9032eb1e9dd31c39876108057d719c8ba34201ba3946493e6b158c43de55c639863d86a1a076456f5ea885f56298a91bd34ac9a0abf2b SHA512 126af017800386430af8e1ae11c6e20b0fd9ac2656e8cd947235ee37faf9e28fd8634e01ada0598915496eb323b24275b268109d7e1a39e7a10832de55b9d1e4
diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild
index bbb3620563bf..a717ead48443 100644
--- a/app-text/ps2eps/ps2eps-1.68.ebuild
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tm.uka.de/~bless/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-text/ghostscript-gpl
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index ec01af4ec507..88d2ff204f35 100644
--- a/app-text/psutils/Manifest
+++ b/app-text/psutils/Manifest
@@ -1,5 +1,5 @@
 AUX psutils-1.17-ldflags.patch 1417 BLAKE2B fa54e0f8cab31336dbe95db96313e345e9cd3a03f2c92855c5bc5fbc4054e89193ade6b346f52edf61f58f20330dacc8d7df32a5ec1769ed7ff62b4eacb36368 SHA512 179b1551516a8acc9f4f9859b4bbe06a6d6e2ba0ddfe20c147a143e6795d61d9cb4f55107866d7a891f0be0dbebaf11d836f4c129205da44ba561a133d69ab08
 AUX psutils-1.17-no-fixmacps.patch 1176 BLAKE2B fdf9653e881e05340445560ba5cb3303bc42e46a1605ee19d675023174aa7bf73d9b4cc37ba3bbafee9b3829974981ff58284acf7079f9b2a3fedbac9d28b2af SHA512 707ebb4594b341044e27cd3fb35402b4d3144eb52f9baffcc633dbde69b53717da148b6c03074411cb95dcf50b48ba87df4ad6c2ec3b24f37b0951c40012efdc
 DIST psutils_1.17.dfsg.orig.tar.gz 40296 BLAKE2B c74cde600e841e876892f3c0cfd20ab5d1ed87135e0bc952b19baf90315b95f89bf177b66deeeb91862fc2c620f688ba49972673bf9f4b4ff250590f0b2fc848 SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3
-EBUILD psutils-1.17-r3.ebuild 961 BLAKE2B 6f6c62273b7b97dbb382103b85cb5cf3c918c781468689b1680a095612c05d8c8edeeea7719bbcc134389e6897e02adb20e3f23d74b2507d4a2a48e823a9216b SHA512 1dfb9e9949d98d9305da4fd28675c104c7476c57d6fd57aea4c30c30b94408fc22e7a0071bb7b37406f826c8b547cb80c1e1090926e0e5da1dc448dcfb3fcaed
+EBUILD psutils-1.17-r3.ebuild 968 BLAKE2B 07b0d7dc6b0ce9198258e14a0fe110b15d440c4f7401dd0ff7c5cbdceb34715b9206687a2c8cce2695df69d312939176ba58dc317cad6d081a0f1f3f717ed0f8 SHA512 c27c9fce996721a5b995e2904adf07e0d6a264f6f69f758148a57dde82ada5798d90f5fc6b6860665c3367e1e78f38b2ce86b6f609ce9f6e3e831425dec56504
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild
index ebf36d5f8f57..a2df5ca8d372 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
 
 LICENSE="psutils"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
index 7a2ebd5498a5..aa46b348ad09 100644
--- a/app-text/pytextile/Manifest
+++ b/app-text/pytextile/Manifest
@@ -1,3 +1,3 @@
 DIST pytextile-4.0.1.tar.gz 49282 BLAKE2B b51220ff33fe43b83d0aefee840b5170747015073fbe88934798c2505c3455e9805eee8815ec8068521c88a44a309bd0eb32e84757d088536f1c12a1f9bc0ca0 SHA512 e299663fd71b935e9c948649baba80584b1339dd3393a3f37b39475fe1d6a4addaaa2adcd16ba57b4c5db43ab9f8de6e9332871915b1fff7b7882ad5e8d64580
-EBUILD pytextile-4.0.1.ebuild 1215 BLAKE2B df2236630c1210a841998c67aae0d95c42f7d48f68a38fc2696a0c5d141e8ecab24dc3e2ad99e31b61111523ab6fa1564d6662dce13da50cb598b2e47c109b60 SHA512 f0d5c43bd329be36fd304fb3f2d1517d7eb1102ae8b456290d4097c46cc90b87247d0f8064e57b514ac81bba01023be50b4ffe7893143e339ffbe7eabed50491
-MISC metadata.xml 554 BLAKE2B 014b0bb6fd9f0405aca39429a804bf9b3c2ff7dfcbcf55aab6678298c1ce37093c2c0005c315467cbec5c19b1f7da020c8eaabc1d912fd7b5d93567f62c94fff SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f
+EBUILD pytextile-4.0.1.ebuild 1008 BLAKE2B 07616901906c397bd0fd24dea136ee5f35ff1109e7a831513532e1f459c5a80af15fb006934e8e55f17cd3ba5135a6c04b3f54c944b33e369316444f98bdf193 SHA512 956ff98bc2e9b1512fda6b504845a82bec1dc82092915e81fe83af4be2a70a315d7db6fab763faa4bfabf8591f1b9798b67ccbfaa75a7240cabf5669eba13c77
+MISC metadata.xml 579 BLAKE2B c30b2a45deff98fe7dd2ff8c9080845767b6369868a07c73ca2a9c4ab0553e0dd7d3d5d895eefb57626d066684e7e196268cf39fc7c4ee4207204a0a9b7dcabd SHA512 a919aefd9ad046bc9615fcc9fe9a11768fe023fdf8fa18b9debd762c3ed74362feebbb458b9dca0880d86bbe753e17c3287bc504030cf79c51b98f501b3d9402
diff --git a/app-text/pytextile/metadata.xml b/app-text/pytextile/metadata.xml
index c752a82be216..08d54e0cbc16 100644
--- a/app-text/pytextile/metadata.xml
+++ b/app-text/pytextile/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <longdescription lang="en">A Python implementation of Textile, Dean Allen's Human Text Generator. 
   Textile simplifies the work of creating (X)HTML.</longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">textile</remote-id>
     <remote-id type="github">textile/python-textile</remote-id>
diff --git a/app-text/pytextile/pytextile-4.0.1.ebuild b/app-text/pytextile/pytextile-4.0.1.ebuild
index ffa9cd0eb2eb..fc7f0aecbd1d 100644
--- a/app-text/pytextile/pytextile-4.0.1.ebuild
+++ b/app-text/pytextile/pytextile-4.0.1.ebuild
@@ -1,14 +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,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
-MY_PN="python-textile"
-MY_P="${MY_PN}-${PV}"
+MY_P="python-textile-${PV}"
 
 DESCRIPTION="A Python port of Textile, A humane web text generator"
 HOMEPAGE="https://github.com/textile/python-textile"
@@ -17,39 +15,30 @@ SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/html5lib[${PYTHON_USEDEP}]
 	dev-python/regex[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
 
 S="${WORKDIR}/${MY_P}"
 
+distutils_enable_tests pytest
+
 src_prepare() {
 	default
 	# remove useless --cov arg injection
 	rm pytest.ini || die
 	# remove useless pytest-runner dep
 	sed -e "s/pytest-runner//g" -i setup.py || die
-
-	# remove tests that need network access
-	local my_drop_tests=(
-		test_getimagesize.py
-		test_imagesize.py
-		test_textile.py
-	)
-	for test in ${my_drop_tests[@]};
-		do rm "tests/$test" || die
-	done
 }
 
 python_test() {
-	pytest || die "Testsuite failed under ${EPYTHON}"
+	local deselect=(
+		# tests that need network access
+		tests/test_getimagesize.py
+		tests/test_imagesize.py
+		tests/test_textile.py
+	)
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index 07a51cd85d48..f244ecaf6b28 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,4 +1,6 @@
 AUX t1utils-1.41-memmem.patch 703 BLAKE2B 3d7801d11e9120701c3229bb495d5cbef8b538a1486bcbe40039b2915af9ed11c444f20914d8e678af4a8beb9db999052c53d7bb04ea912f0c665871ec7848fb SHA512 ab7a8f5273aaf478c4e2fd9aa201d5b081adfa431e147ccd429ca5eaefca1858008e09dbe62d7847ae3fe307d5b1f72a16093d026f7d73f665531abde5f5c60b
 DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
+DIST t1utils-1.42.tar.gz 184666 BLAKE2B 63ebb856b7bd69751242b9858c47562fd720f098bda2dca694a13cf192e6970ae11d43cc2b2c0a1dde0a46d9d1762baf04ab279907a26270cae8ab04f2af02da SHA512 507b3179dad9479948331fc655d8d6d970a77923f55f5bee4ed5ae9c2222e27f410e62d96c4f27ecae9392335ca1df1f8bbb7ba7087a6268aeeee99d40aa42ed
 EBUILD t1utils-1.41-r2.ebuild 647 BLAKE2B af44e224f01fe627267a3b5a5054a4ea6cd22dd602a4d6091db1eac73da73ed8b911609b67a35e6469b7cdd7132ef56eda107a6254cc53f7bcfda22b2faed394 SHA512 49bbd7b7fc14ceb3583d3b4277d0e225a883b0873b69c159e709cea02236c6f5c82a2cb26668d2d92cd76a67ee98640ff3826c4686f1485f00e308cf26f6b4c0
+EBUILD t1utils-1.42.ebuild 549 BLAKE2B d42ce3a0897c058dc98bd9f87273bfb77b6dd1c3001e8bb6a076a885b5a484d2e4d8144b2f37538c612fed05a5ff13e5158bb2cfb23bcde7b49dcf386757a68a SHA512 56cc9ed4d59aa0f8b31e1d7f54770119764dd248a975b666c72196830c64fbe82f4b8acbed1e855bc56ec9b752dcf8d0b83c32db9fd3cddb5547ed262760781b
 MISC metadata.xml 347 BLAKE2B 2f19fa13fe0a6a3f521653e00c787e1e5b61a0d53ef30e06efb6ef104d560e90417512d9e72bed79f51a81bd465494ac469f23246705876cfb91da82fe31cddb SHA512 6a4884011de9218a6c0417b64690cc76c9c5be7a525f4439fb04e70c3ed287080fdb5707004d611107dee69230bb1f892078260bd18dfe7aa824d88e23dffc16
diff --git a/app-text/t1utils/t1utils-1.42.ebuild b/app-text/t1utils/t1utils-1.42.ebuild
new file mode 100644
index 000000000000..896f2c6e4720
--- /dev/null
+++ b/app-text/t1utils/t1utils-1.42.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Type 1 Font utilities"
+SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
+HOMEPAGE="http://www.lcdf.org/type/#t1utils"
+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"
+SLOT="0"
+LICENSE="BSD"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	!<media-libs/freetype-1.4_pre20080316"
+
+DOCS=( NEWS.md README.md )
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 7d77d36f0341..77bdeed7f8e2 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,2 @@
-EBUILD texlive-2021.ebuild 6688 BLAKE2B 906342092da463d8872d87fbeb5d7594bd07c229c5fd5878a1b4e79d59669d1ebfc7ea45d77c816bf5749cbef3709ada8346231567bf129d4549f22f8a0233a1 SHA512 51553e74ad8390f2c21d583698e5e50eadef1fc9b08467e6b6ae29dcfc2b63c21b83249295906946afb5aa0df1049e3dddb031ccfb7b182cac66f2fad1b4c231
+EBUILD texlive-2021.ebuild 6695 BLAKE2B 7c51c81d0a867a1cb1b1f8728517dc126a7cb2e22d8accba9b69630fded11a36c1cd1a766e0d47a2e7f71d8e1092c1c92eb0649290cbc4499724cb13e36b2814 SHA512 356243730d79a5b12140d0cf132e9ec63ab4f6dcc645b58acd344360bdbd3c988c3daa405fd19f376fa1cc3a29ec158728949eef5d9752c40d9307a85f19e549
 MISC metadata.xml 1818 BLAKE2B 7d3478902564515744ecc1431a32f9d2bb6ba42855a43b0b1b96581cca89092e52c4c5ec6ef0337e44177259c5f8cf3661e219a818e91f54fd07ba6741eec56b SHA512 747bc407c68510f4891540212036685f82c525d7f589caf8f9fc2f33bfebaa4f7aec935de7240c7725f099aae7e3b54dd38e5ca48f83da2f1cf8199bbb782791
diff --git a/app-text/texlive/texlive-2021.ebuild b/app-text/texlive/texlive-2021.ebuild
index 8e45ab20cc60..b1eedb0fe042 100644
--- a/app-text/texlive/texlive-2021.ebuild
+++ b/app-text/texlive/texlive-2021.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://tug.org/texlive/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context extra games graphics humanities luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X"
 
 LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index 78af2cd187b1..631326ac0919 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,3 +1,3 @@
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
-EBUILD ttf2pk2-2.0_p20210325.ebuild 1120 BLAKE2B 92b477af86c6b1bb15a24e0cca0d28c85182168fe47f91a5d20b2cfcc0870db239975f43bfc55d2142a9494121e91b82414aceb6974d307e265f93f3452dd40e SHA512 00585ea45690ed0052940d42a4410a39d4ef2239a581b9e62c6494aaaf32a0754b7c6617bd42f807f56ad5489125db7dcf424168a3edec309af0e3810b6a7e37
+EBUILD ttf2pk2-2.0_p20210325.ebuild 1127 BLAKE2B da57d70060b0700bc39f6dd4c67d9814c52598a84c4d60dcada43c9f02a1f6d418b3f3262a8e898fa661a08480e972fc88a2e567a8f4e50d0eb59993002d2c4d SHA512 fafd829b86d364d6cdb997707df15dbe15fd20a57c008edb83d118906ac6a170d32247e4dd657c6255ae543ff732b4b76c94275cf77d08187530a1f649cdc0fb
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
index e722a14b4810..f86a90004523 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/texlive/texlive-${PV#*_p}-source.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index 137bfb030ba8..3c0ea7a1f1e4 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -1,14 +1,8 @@
-AUX vilistextum-2.6.9-blockquote.patch 4541 BLAKE2B 231ea3348a4519c5f24160bd17559f1b899f1de853c8649e035824c7055fe39d470572e3fa2fd1009fbc4f798e623afd2b7b69efdbdfd009616a4d32b6300209 SHA512 e5c13e5a500cc893ffbcdacb98e4433b88bc9bf73866e1acd080c83e8927ef647a83aa207e617838f7f3a3bb6783d5fc76ae74924297df2d3fc5b61c24bd97a3
-AUX vilistextum-2.6.9-darwin11.patch 615 BLAKE2B 0bfefb47961cf1752c8251a484d04b20c55196d2c64c2e98bc50caf6842b02960257ff22d7d6f7b04c4a7e97e5c66a6a2f122db24faaae4c7fe326833e57c7c6 SHA512 35aeec20cb7e6ba1668d97f041bbd5b98712589eaaf0ab70a59d3a7df74e0d2e67abbab3a27c7c5ee5f6fe9d61f11610686df3459f0cb401cca03f3f671309ac
-AUX vilistextum-2.6.9-gentoo.diff 763 BLAKE2B bb145aa629084c370281fdb2bd31e763d0c0106bb8aa5c7fc1ee030e837cc0062b9f46ad9d626b88a199c12e6163acc2ab28978eb5cb236c3a212b341a7ad9b9 SHA512 b4c49ff27598cedeb06058d3237ea8ebc59a4df9031818f98b5fb22225733d94b820b892541dbddc38c28c08a62ff6f52ef8278c016522b1db95352653178b21
-AUX vilistextum-2.6.9-prefix.patch 837 BLAKE2B 65aec718915942919f371453af12cbfa74437f999d7c25a49186ed5c02e975c4c10ebf629bc54a8a6fb69b9acc9723a32d4d82b0ee09c039afdc5f0fa8d9370c SHA512 6f913d283542bfea02d062f872dc2471e7ea2bc4c29ddb8893aecb9abeb36e6cc821c393217a92421e6888f7c25aa072bfc16c56a69a40593ed504245d8cd187
 AUX vilistextum-2.8.0-prefix.patch 784 BLAKE2B 4aeab8e91012cc1302aa7a94337069973c9cea8b179658f30346f3d95bb9d0a351e1430666d6465888432fb74e3454d2eaadedbd8af64e2b57cfe00e9633c65e SHA512 95a92905c68e357c40f64696cf20c9639bed5da3c651c75df803eef4c991bb56424893a40a2a9ca80a9e66a16e1e986d0589dd43d751130146697348c5b0205f
 AUX vilistextum-2.8.0-towlower.patch 274 BLAKE2B b6c043049bf6d928ecb147465aeff6ac959c3320b76ff92c6ebfffb9dda0d8719fe1c1d5dded60e00e6a10a3fab9f177ccbfc053c9daee81b7a95d6ba29044e1 SHA512 3283ebd7694be279f9956df31f6b1e62de3f674f3af0a6d4d5cc139f2cc04c3be322d103faaf1bf0f9845dbcc2f9a12e89d49178df48c90020267fec73f2ecd5
 AUX vilistextum-2.8.0.20200411-blockquote.patch 4500 BLAKE2B 1f1c996181771b20b9570d4f7cc322f773590943470d10021820a84acd9fbfb48e496506b42df2ec2b2c05a214953ab854d70b777289639de9f26346e4b815c8 SHA512 5d280336f9bc3363d35d5136fe6a5cbcdb08cc90ff8826063ce9f594fc241b4f7db94852aba6cf278a34872a9abf55693f04ac01b0f191045792114473857dd8
 AUX vilistextum-2.8.0.20200411-list-alignment.patch 855 BLAKE2B e23391c5e3e33d05fa17403dacf027e066e5fb75cd62a2707ddf10edd45c16c71ed591a99f3d99939258718591e747bce38cfaa1ca8303cb63401828afc52bb4 SHA512 b5674a76b8ca6f63b2dd30f273219767fe3863ee16eb0d63a0c675334ca9f2b99d059c3276f31473efb1576bc0ed8a6546f37d278130902ddd4c1efa0e1e4549
 AUX vilistextum-2.8.0.20200411-static.patch 429 BLAKE2B e5a86f226bd0f272a21ccb1b787d2579ca3ebabfac5e3c35420c9f4db2e3426d87ab554e52a14f3352cbc62fa2d7a97c57eaf726283e1024018aa896d547d808 SHA512 b15a4d067faaaeedde484c1e944f73cb14bf205bb33436e46b3348d278ba3ba199a023ae8f95c2aca5a9fb5752ef3dbdd993108d31ea7268d5c88ece8c2749e8
-DIST vilistextum-2.6.9.tar.bz2 147743 BLAKE2B 1cf6f187cb277271ddd9946984afb4d59336ea0cd446e62df3593070ccc63b3510a107e2b7e7b8dc757c63e4f5caf3790c7d998b6be325f4d22d2a6b9fea3432 SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d
 DIST vilistextum-2.8.0.20200411.tar.gz 219791 BLAKE2B 95b86d17e8dbf29b520aa48c88eb8c9e8abb01a234848ed55bdad0a63a7c0ec8ca9ae7c437fe7f84bbf7f4dad74fc8437a9e3b53493552e9e01b8029b10ef18a SHA512 40a219ebe7bebd61548a3bad794690cf091b67b70e8e6c44548a0c1b9f61077b141a035335e7128b191a8501103707f5324b00326a407e29ec0fee383c4d0917
-EBUILD vilistextum-2.6.9-r1.ebuild 1795 BLAKE2B 49f0673b3c30271e2686da6598c94455d57df7dad4dceed7e039c459d30d3cacf6407234d8d459f13f992be9990e660f00198d2017e829ae4252e58a476e6dcd SHA512 9a58610ef3a53b1179d57c837b9fef01c2a6dd1a0f520582846dd88bbb3124a4935f55e048c2f320aee0042c2acbf987fb0b1bb6b2d6d5a2b201703a9acbc7a4
 EBUILD vilistextum-2.8.0.20200411.ebuild 2056 BLAKE2B 486363551ec0e7b7743d80ccb1988f5fff5732fb62b8bf7dd164a53287f1098551b0c657e45ac1f49a7b09ccecc20a35c1b18429e868627bc6c852ee18368f15 SHA512 8c2844cf54099039873e7d219f8dd686e14620f7f39210a2a6d3422b79338595641d2f52cb6711e5ea96374f6a3b6b873712c62cb995657fe73d0aa2bfc5f8a5
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch b/app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch
deleted file mode 100644
index 395d03a7456f..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Many clients seem to use blockquote tags to flag quotes these days, so
-write them out as quotes, so they remain readable.
-
---- vilistextum-2.6.9/src/html_tag.c
-+++ vilistextum-2.6.9/src/html_tag.c
-@@ -87,8 +87,8 @@
- 
- 		else if CMP("P", str)  { start_p(); }
- 		else if CMP("/P", str) { paragraphen_ende(); }
--		else if CMP("BLOCKQUOTE", str)  { start_p(); }
--		else if CMP("/BLOCKQUOTE", str) { paragraphen_ende(); }
-+		else if CMP("BLOCKQUOTE", str)  { start_p(); quote++; }
-+		else if CMP("/BLOCKQUOTE", str) { paragraphen_ende(); if (quote>0) quote--;}
- 		else if CMP("Q", str)  { wort_plus_ch('"'); }
- 		else if CMP("/Q", str) { wort_plus_ch('"'); }
- 
---- vilistextum-2.6.9/src/multibyte.h
-+++ vilistextum-2.6.9/src/multibyte.h
-@@ -16,6 +16,7 @@
-  #define ATOI(n) wcstoi(n)
- 
-  #define ONESPACE L" "
-+ #define QUOTE L">"
-  #define WORT_PLUS_STRING(str) wort_plus_string(L##str)
- 
-  #define STRSTR(haystack, needle) wcsstr(haystack, L##needle)
-@@ -40,6 +41,7 @@
-  #define ATOI(n) atoi(n)
- 
-  #define ONESPACE " "
-+ #define QUOTE ">"
-  #define WORT_PLUS_STRING(str) wort_plus_string(str)
- 
-  #define STRSTR(haystack, needle) strstr(haystack, needle)
---- vilistextum-2.6.9/src/text.h
-+++ vilistextum-2.6.9/src/text.h
-@@ -26,6 +26,7 @@
- 
- int tab;
- int spaces;  
-+int quote;
- 
- void print_zeile();
- int is_zeile_empty();
---- vilistextum-2.6.9/src/text.c
-+++ vilistextum-2.6.9/src/text.c
-@@ -28,6 +28,7 @@
- int breite=76,
- 	hr_breite=76,
- 	paragraph=0,
-+	quote=0,
- 
- 	tab=4,         /* tabulator */
- 	spaces=0,      /* spaces at beginning of line */
-@@ -325,6 +326,12 @@
-       printf(" z0: zeilen_pos: %d\n",zeilen_pos);
- #endif
-       print_zeile();
-+      if (quote > 0)
-+      {
-+        i=0;
-+        while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
-+        zeile_plus_wort(ONESPACE,1,1);
-+      }
-       i=0;
-       while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
- 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
-@@ -345,6 +352,12 @@
-       printf(" z2: zeilen_len: %d\n",zeilen_len);
-       printf(" z2: zeilen_pos: %d\n",zeilen_pos);
- #endif
-+      if (quote > 0)
-+      {
-+        i=0;
-+        while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
-+        zeile_plus_wort(ONESPACE,1,1);
-+      }
-       i=0;
-       while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
- 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
---- vilistextum-2.6.9/tests/check_utf8
-+++ vilistextum-2.6.9/tests/check_utf8
-@@ -9,5 +9,6 @@
- rm -f utf-8-sampler.output.test
- ../src/vilistextum utf-8-sampler.html utf-8-sampler.output.test
- 
--diff >/dev/null utf-8-sampler.output utf-8-sampler.output.test
-+sed 's/^> //' utf-8-sampler.output.test | \
-+diff >/dev/null utf-8-sampler.output -
- 
---- vilistextum-2.6.9/tests/utf-8-sampler.output
-+++ vilistextum-2.6.9/tests/utf-8-sampler.output
-@@ -100,8 +100,8 @@
- ვეპხის ტყ��ს�ნი შ�თ� რუსთ�ველი
- 
- ღმერთსი შემვედრე, ნუთუ კვლ� დ�მხსნ�ს ს�ფლის� შრ�მ�ს�, ცეცხლს, წყ�ლს� დ�
--მიწ�ს�, ჰ�ერთ� თ�ნ� მრ�მ�ს�; მ�მცნეს ფრთენი დ� �ღვფრინდე, მივჰხვდე მ�ს ჩემს�
--ნდ�მ�ს�, დღისით დ� ღ�მით ვჰხედვიდე მზის� ელვ�თ� კრთ�მ��ს�.
-+მიწ�ს�, ჰ�ერთ� თ�ნ� მრ�მ�ს�; მ�მცნეს ფრთენი დ� �ღვფრინდე, მივჰხვდე მ�ს
-+ჩემს� ნდ�მ�ს�, დღისით დ� ღ�მით ვჰხედვიდე მზის� ელვ�თ� კრთ�მ��ს�.
- 
- Tamil poetry of Cupiramaniya Paarathiyar: ச�ப�ரமணிய பாரதியார� (1882-1921)
- 
-@@ -446,7 +446,8 @@
- д, п, and/or т:
- 
-  Bulgarian:    [ бгдпт ]    [ бгдпт ]     Мога да �м �тъкло и не ме боли.
-- Russian:  [ бгдпт ]    [ бгдпт ]    Я могу е�ть �текло, �то мне не вредит.
-+ Russian:  [ бгдпт ]    [ бгдпт ]    Я могу е�ть �текло, �то мне не
-+вредит.
-  Serbian:  [ бгдпт ]    [ бгдпт ]     Могу је�ти �такло а да ми не шкоди.
- 
-   ------------------------------------------------------------------------
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-darwin11.patch b/app-text/vilistextum/files/vilistextum-2.6.9-darwin11.patch
deleted file mode 100644
index bda9f5d39c3e..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.6.9-darwin11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-OSX Lion has wcscasecmp, but is not GNU
-
---- configure.in
-+++ configure.in
-@@ -67,6 +67,7 @@
- dnl Checks for library functions.
- AC_CHECK_FUNCS(strstr)
- AC_CHECK_FUNCS(strcasecmp)
-+AC_CHECK_FUNCS(wcscasecmp)
- 
- dnl create testsuite
- dnl AC_CONFIG_TESTDIR([tests])
---- src/html.c
-+++ src/html.c
-@@ -40,7 +40,7 @@
- 	link_inline[DEF_STR_LEN]; /* Link of a HTML-Tag */
- 
- /* ------------------------------------------------ */
--#if defined(MULTIBYTE) && ! defined(__GNU_LIBRARY__)
-+#if defined(MULTIBYTE) && ! defined(HAVE_WCSCASECMP)
- #include <wchar.h>
- static int wcscasecmp(const wchar_t *s1, const wchar_t *s2)
- {
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-gentoo.diff b/app-text/vilistextum/files/vilistextum-2.6.9-gentoo.diff
deleted file mode 100644
index 42db519b080a..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.6.9-gentoo.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur vilistextum-2.6.9/src/Makefile.am vilistextum-2.6.9.new/src/Makefile.am
---- vilistextum-2.6.9/src/Makefile.am	2006-10-24 01:48:54.000000000 +0700
-+++ vilistextum-2.6.9.new/src/Makefile.am	2006-11-20 09:51:24.000000000 +0700
-@@ -6,7 +6,7 @@
- 											main.c main.h util.c util.h \
- 											multibyte.h unicode_entities.c unicode_entities.h
- 
--AM_CFLAGS = -Wall -O2 -ansi
-+AM_CFLAGS = -Wall -ansi
- AM_LDFLAGS = $(STATIC)
- 
- EXTRA_DIST = kilistextum.kaptn
-diff -ur vilistextum-2.6.9/tests/Makefile.am vilistextum-2.6.9.new/tests/Makefile.am
---- vilistextum-2.6.9/tests/Makefile.am	2004-07-06 19:06:20.000000000 +0700
-+++ vilistextum-2.6.9.new/tests/Makefile.am	2006-11-20 09:51:05.000000000 +0700
-@@ -16,5 +16,5 @@
- 
- test: check
- 
--all: check
-+all:
- 
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch b/app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch
deleted file mode 100644
index 1ff76250db13..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-* don't look in /usr/local
-* try to hack around not being able to use AM_ICONV
-
---- configure.in.orig	2006-10-23 22:20:19 +0200
-+++ configure.in	2010-03-18 19:32:13 +0100
-@@ -21,10 +21,6 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS(getopt.h) 	
- 
--dnl add /usr/local
--CFLAGS="$CFLAGS -I/usr/local/include"
--LDFLAGS="$LDFLAGS -L/usr/local/lib"
--
- dnl checking for options
- AC_MSG_CHECKING(if --enable-multibyte specified)
- AC_ARG_ENABLE(multibyte,
-@@ -41,7 +37,9 @@
- AC_CHECK_HEADERS(iconv.h,,
- 			AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))
- 
--AC_CHECK_LIB(iconv, iconv,,
-+dnl iconv_open_into is implemented only in GNU libiconv and not in other
-+dnl iconv implementations
-+AC_CHECK_LIB(iconv, libiconv_open_into,,
- 			AC_MSG_WARN([Generic iconv found but not libiconv. See INSTALL for details]))
- 
- dnl setting INTERNAL_LOCALE
diff --git a/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild b/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
deleted file mode 100644
index 378b7e597fb2..000000000000
--- a/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch autotools
-
-DESCRIPTION="HTML to ASCII converter programmed to handle incorrect html"
-HOMEPAGE="https://bhaak.net/vilistextum/"
-SRC_URI="https://bhaak.net/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-#IUSE="unicode kde"
-IUSE="unicode"
-
-DEPEND="virtual/libiconv"
-RDEPEND=""
-# KDE support will be available once a version of kaptain in stable
-#	 kde? ( kde-misc/kaptain )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-gentoo.diff" \
-		"${FILESDIR}/${P}-prefix.patch" \
-		"${FILESDIR}/${P}-darwin11.patch" \
-		"${FILESDIR}/${P}-blockquote.patch"
-	eautoreconf
-}
-
-get_locale() {
-	locale -a | grep -i "$1\.utf.*8\$"
-}
-
-find_locale() {
-	local l t
-
-	# we basically prefer to find en_US.UTF-8, but it may not always be
-	# available, in which case it is better not to hardcode to use it
-	l=$(get_locale en_US)
-	if [[ -z ${l} ]] ; then
-		for t in "en_GB" "en_.*" ".*" ; do
-			l=$(get_locale ${t})
-			if [[ -n ${l} ]] ; then
-				l=${l%%$'\n'*}
-				break;
-			fi
-		done
-	fi
-	[[ -z ${l} ]] && die "Failed to find a unicode locale"
-	echo "${l}"
-}
-
-src_configure() {
-	# need hardwired locale simply because locale -a | grep -i utf-8 | head -n1
-	# isn't always returning the most sensical (and working) locale
-	econf \
-		$(use_enable unicode multibyte) \
-		$(use_with unicode unicode-locale $(find_locale))
-}
-
-src_test() {
-	if $(locale -a | grep -iq "en_US\.utf.*8"); then
-		emake -j1 check
-	else
-		ewarn "If you like to run the test,"
-		ewarn "please make sure en_US.UTF-8 is installed."
-		die "en_US.UTF-8 locale is missing"
-	fi
-}
-
-src_install() {
-	default
-	dohtml doc/*.html
-}
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index d9f04e1fb5c6..fe5f3e8eec00 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,5 +1,5 @@
 AUX xdvik-22.87.03-freetype2-config.patch 1019 BLAKE2B a675a238fb147dcb67eda572b9a3b1e1b1ab630726464eb740240be0815b9a9da5e5f7a8a6d404648f060995c64efb02acbb67fc907dd6139c6817f0bdb5a946 SHA512 be5b7de6957c5bb2ad884e5b3a6a21f074b84b6be08f519b80a24dacd8630b2bc75dc64e225dba388d17a01bfed6784b2862db2e6bab4b73a1f6d4aebf23a9c6
 AUX xdvik.xpm 3125 BLAKE2B 97990fbd5b22e51319c3f55bfe16808b01f215a92185a170620c8c0ef1dc44906e38af48ad056d4fb40a1777f92a88afaa0f80c0b36e7dd770954f7009d261a3 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d
 DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
-EBUILD xdvik-22.87.03-r2.ebuild 2897 BLAKE2B 3a0ef2e1e1eb649e7424087697301555046c7a4509ec306002787760ab0fb800856cca16383c30ee3d19208c21c7fc00c819fa957f18eed381e2ba10fde5e5e9 SHA512 787a29d47bb28175a1c5e9dfaac488cb3174c6f1a1481c11ae4e60ae1029ee50b2f55b4d93cd4dc4bc9e007818ba090be3b6c04e7eb0df0835d4cab0d5d07521
+EBUILD xdvik-22.87.03-r2.ebuild 2904 BLAKE2B 246ce0f4f9ec234423a27478ac9f5497e62707ba92a8a4ef7739180f8cede27feb16067b737e7ba28328ceca7fa5aa9134e2c46ecc09e33556ebae48b97992d1 SHA512 299fd93b027f89e00a6f973f00431fd434b969a8b719a76eeabf2bb971ad5cbf65c0b90072428084a58c7c83659b52898ff0e0a662a21d2fcb5e86c18c610a1c
 MISC metadata.xml 594 BLAKE2B 338b1aedaaf7426ed8bc2b9ae08e03f9fd6170b0714f938fc97a0f4555e8daa385635200bcbea4d0959604fad44db3212bd7436ac70b2e49ba353dd48713e7c6 SHA512 b1563a6578aec4be3df4b47c9914de3ad80a8859e60bce3a9b3e48f1b8bff3c38dd266523c913ab97bafa2c0804ab5003b5a449858582ef934044d80065c5cdd
diff --git a/app-text/xdvik/xdvik-22.87.03-r2.ebuild b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
index 584d1a9aed5a..cf67026a1772 100644
--- a/app-text/xdvik/xdvik-22.87.03-r2.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="DVI previewer for X Window System"
 HOMEPAGE="http://xdvi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index ef7264749f20..03d38100acbc 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,4 +1,4 @@
 DIST zathura-cb-0.1.8.tar.xz 5616 BLAKE2B bfce33d56f7a28ae66f8bbee4bbb164238abba7ae3de0e7d9dd0874516b703a4e841749dd825a618aa09204e06a3fa339832412cd5b1cacf6814c4292634052e SHA512 ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8
-EBUILD zathura-cb-0.1.8.ebuild 760 BLAKE2B 0f1fa2081c06090bc05e7d96813f6af4baf656fc605e69790ff5caf4c1e138ab9c39ca2ebddc75315003342e8649e180e782c50af3e3001b6ded7f9240d5c7db SHA512 3a1095d34359c98490b65ea2181170402b911e65756de930f01a6a0e643f2650e6c26988086c618e69c4196ff6bab01f6e1266b423d5832a855a49f692fce21d
-EBUILD zathura-cb-9999.ebuild 763 BLAKE2B 63ad420d4b577f61506936047fb187ea9e9c98aa7fa0a54cacec778f6f99012af2ab0b8a8dcbb4228fba60bfeb98f20d303a14b2d575ca432c83eb5b23c40824 SHA512 2d4348d3b1841712effd03f7aa65736c09b6ff8f0d8d50a814d71d2fdab0b00c23b8bd16ed35fc14fe24cc993f9ef439105e0792ee0072a36af7adca30b59d73
+EBUILD zathura-cb-0.1.8.ebuild 767 BLAKE2B b1785dfde4b57e9f7a99940234fa67c0e40418046bc9f3d45355f1dc52736730d2b5cdbafc10a7252a1f66dbce70906dcbe43460887c58a48195d087d73a94ad SHA512 df67cd38a18df4049fafad1c49b9cc4bef7a6782ed2433a7977da7adf993f1f9959a9c51db515053aecae6f82b2f7a26a059f61ac8b63752e8199d65aa6508bc
+EBUILD zathura-cb-9999.ebuild 770 BLAKE2B dd875593d24218f77707f8697821e7244ce1d7eb308d8838a687ea894f3a71ad0049755ce446c3b7fd25e581a31ba4d02a9f6fbccbc14150b4b3edd5f1fae2ac SHA512 d669924d225c94c23004cedc300c7a44ced9bad532a25f258b6cc4abf555e5aaff6e4d6e59e38823b49fabdbb5c8cd491a7bc53a5108ca49eba6a8ddd31dda56
 MISC metadata.xml 582 BLAKE2B ed94d37e43b59abd8bf8fbc1da8a6839aceddd5aae31109bf5d35f3996992d96dec619daba1d2c67a7d5c6182a06a413dc5e425ae786c3fe2cdbb68bb25796fb SHA512 88a39e758edddb852dd554a88035a74b0043d37009f97fb2ba45fe94169e17eef02b41ba8666d9f712469ae3af3258f14f7958b4dc70fc8eaea790d31b092fb8
diff --git a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
index 237c58a12477..48ce63a869f5 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 arm x86"
+	KEYWORDS="amd64 arm ~riscv x86"
 	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild
index a5d47c0a1d7a..58014fc992ed 100644
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index 75f377ad8579..903798cbf7fd 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 771 BLAKE2B d7a738105a255609e1ac1e0ab0b47a6a2e1fb52ee0c3d938465934520afdd88876ce9c036f73cebccdf982ca6d7d3e44311fa89af0b774c894d8954da4b465a8 SHA512 d31717e453372402aa0fd477692774dacb77f94b6e9072bc2680a5ab71417316df1ca2112c3e961fdfa3d60f94710bd27f17536544e8d72fb25eaec0a00f71df
-EBUILD zathura-djvu-9999.ebuild 793 BLAKE2B ad18e511919ab77afc1e5c2de562171156aeef6bed4b3f5e1532138ce046f2454adabd620b3bc44fe787006bdc66875715c33a603e6d0969eef9fe1a384f1458 SHA512 05cb70dee85ed810bf50c968ba2b1e979f13861e34dece0506e3cffccbcf3d69c5f2c1225afee64664ea843e2ddd74731b63d7fea1581e7e2863e15b5c218ab7
+EBUILD zathura-djvu-0.2.9.ebuild 778 BLAKE2B 8c64bda4aedcfbb1b6168a8097faa49e11a55ec9288c2ca8532e2362f09cad1aa21a961dc64ae973d781d125e4b4eee7cbb42a659b071d4e558ba884fa3ca060 SHA512 01ca8e5506dbb4d7198d643b108187294493068c4f312781222345fe3f4d6f0b20d5d6592dd6400124020171e135c544363fa17920db4d0a518ad03349bf7918
+EBUILD zathura-djvu-9999.ebuild 800 BLAKE2B cbd99a6266bc4c3ab4dd12c6e5701a00ed166b12f22dea6fe5427bf24236990cf5bc34b4af47c61910ce936188d79d48147f5cde70e24b3923b30dc7c64326da SHA512 2c4aa4192b4dddb5dbe1ecc291760579cc2b5f5871a8365e8403f96ae99e590980755904a820cd7078ac880819c55191c22760620460fb944ef623fcaa1fbd7e
 MISC metadata.xml 592 BLAKE2B f6875d7dd73e13161bce16ad8a2da428a044a4261716b3adf20802e41e40d97c4924c20cd3beda2b39290d3c27bc338c82b754ba862762ceaaf8609cd9d83040 SHA512 ecb7e663dc712e5ea13c801c466511d754ab0ffe67cdc24f783414c85b0584a22ba08f12216a759ae512ed565916602d69ac454ffd637f471244a1840e7539e3
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 6b35a56bea19..c80464b43d7a 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 arm x86"
+	KEYWORDS="amd64 arm ~riscv x86"
 	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura-djvu/zathura-djvu-9999.ebuild b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
index 7262f7ee1caf..903624bd13ce 100644
--- a/app-text/zathura-djvu/zathura-djvu-9999.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index f9b0bf8f78cf..b81ba8c8cdb7 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-pdf-poppler-0.2.9.tar.xz 7456 BLAKE2B f6454ea750597f797f8dee5dda6812245e0f7d158f37d63d4d554ea83c935bd1785cdcb1fcbbf60e4519faaa8e824e5d9d69884ff7dd8bac8e24164aa953d48b SHA512 d363c9051fcd5be73c11ee3a88fff277e9a42b5878ce5a64715d801457380b113891504a01b7343affdf275bbd31cc3c0bf17d5208cb513edf52d6c2f5270cde
 DIST zathura-pdf-poppler-0.3.0.tar.gz 8895 BLAKE2B 42ea3e63901474106af744f8c48ff74f91ada036f0cc9beca49b2ebac3e09dbc8334b150ac313d75c3f05f7be59d1f42873a67b77c58186a40c41f88d4772f15 SHA512 588c1d03fef2b0cbb44af6904ab078ae3686d79ce05b1448a41a62ac807226cade4b54725002f0c4bd9c428b192b607664da4bdc8d83c792fab250ef43622a85
 EBUILD zathura-pdf-poppler-0.2.9.ebuild 742 BLAKE2B e3a1fbaf7947512832385b3b8ffd47a56ca09cba148a5d80af28457a9d041563eb5dfdf7bb89a0cd590f990a9c4265349a8ceb832c77b6ac1b0dd185b730125c SHA512 a8504ef444e936e214b3621ea3111d82a0e86f89f087531f9f82b9ea05e2648c9aa11adc19c923e33b6bee85330bc8fd9bf782ae78801dc303fccf62b0438ed8
-EBUILD zathura-pdf-poppler-0.3.0.ebuild 763 BLAKE2B cdaee47346ca46fb18c9d4003c41195426e0c6af395592e6dc691a099e674af073c8363cb635a0889c20eab75c6234369e70d61ee5e9cb3878a8687af3bab68f SHA512 931475dee0efa3e9a8c6d82e8cca5cfbb1305461f8f576908c4c67e6adbff792c06444f4819a503dad3e2811527b265e20d55886a97b372f4cd57ce1a37dc522
-EBUILD zathura-pdf-poppler-9999.ebuild 745 BLAKE2B 6abb817bbf4c1db7542f2b59e69eaa0785074578d9c32f7a37efc86dbe89b9888b8093061ebf4867727b52b205f941a7e5e453650006d4dd913e1bce851ae5cb SHA512 daac708c3c2b62185d843a8a649149165e028006987c7d0bf57f9959b7e01fbe52006ec3b46af9b0def91ba334bec0bee148d565b4749ca86ed1d1fb66246a73
+EBUILD zathura-pdf-poppler-0.3.0.ebuild 770 BLAKE2B b6db6889df5c3088c88eff744dcb688725b85ffcff86bf4ba5bfa68f0a63516e5f0e3912fa50ecfeb83a61b789eb7554a96f5f9e6591a9613d9096387365d0ee SHA512 a784650b714a0983050ae1b152e11422451a7b4e9d76c70c8004a34e5af32790166f6a502214e71105c0621029cceecefe0ab9ca5774abfdd1fa408eb302c50b
+EBUILD zathura-pdf-poppler-9999.ebuild 752 BLAKE2B 1aa9d28b4eb5af1bbaa3b98351d744766a97e08e2395f2f180e2ff4b076865dbb58359cb1b616079e1bf0a6fd83f3e228eba0ac26631ff684a79018f371e7dfb SHA512 bd09f493abef296daba93fd43f3d68d2a1e2cf5015f189057cd676fd12707246eacb2ff7947fe9e3bb32f769720afd336d3a5d90e87aba6b88e2ecaf0f16e9a6
 MISC metadata.xml 668 BLAKE2B 16ae3e9893db4125367dbb0a40cbfdd0fb661fbcc1fe21569f3d5c817cc21a90bb21dc9a80b1b81b834eed148612af3ba5e207eeaa14110100f62e8bd9a39b87 SHA512 bd4b85747dfed38a64de5a1fb44619b973d8e8c58a54a6db76ddfddb47bec428fc9bcbaaa7f18c09cc44839c08f73e3a249e6618a6328a7762c295f5660d2c43
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild
index 629dcc59d611..efb6d5f25416 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 	SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
index 5b4915a8a871..1d1d57e3ea67 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.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=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index d4b985d26bf4..3c7a24268726 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,4 +1,4 @@
 DIST zathura-ps-0.2.6.tar.xz 4336 BLAKE2B 9129ae5c5b6b7452fbee720ded0a69d4ae735811b81ec49485fffc81833e5e0adf0563b005770082adcc17dc90d4650b5bd309154b64377625c2cef86f0b7978 SHA512 6631f9b1c951b6f91f2a5217c3de47176205102206f15b596fb21285dae8d01fd759cfaca1b8a23bf47166dfbc3f8cf6061ce5a4d7a1c3a2b671a3beef5a07bb
-EBUILD zathura-ps-0.2.6.ebuild 778 BLAKE2B 30a0e94aaaf25ee46f7de992c15e0b19aff13ad68778f1ce4ae8768fea4c5bad50e0a49c5f57ac51c79df66bf58cb6769ec0fed27ff7dc019fe4142ebf9b0adc SHA512 d195be1fbfa49e61885fde466c86f3966300d6f0468489ed36b8e472ad520d8f3b0ad42c7c9dd0487237bc2f1e39203603d0c80569d010639a24ff85be7087d0
-EBUILD zathura-ps-9999.ebuild 781 BLAKE2B 9baac092008549bae90c8a3ffe37dd10db60cd37bd8d963ff7d60f061de883344179b321492ebb34797edeea92a87d0e432ebd6b38f59fa9a1fa08978c269fe6 SHA512 476d15bc2fcbfa3d7943ff6fe0d1b1c262e2215f0ad12e7b5525f243c9fdafde9ac206207943e537c821bc2f07067a8730cd1f672364961614a7cb1cbffa081a
+EBUILD zathura-ps-0.2.6.ebuild 785 BLAKE2B ea456f3cee1a359e4176d2cceca60445224f0c0f2b63e19376ad1875ecc84f579a59f77c3626b11df22a416b41c60fbcbc08119c08d327e4591f151fa53b4166 SHA512 ded381a60d4e220c4f5a71bb89873daafa9a6135763727d41c30a8ae87b90f07a7b2ccd9e2c65bef06651c0d6a2c7705aa72bf9aad5f9b17f78f7d79efe2f618
+EBUILD zathura-ps-9999.ebuild 788 BLAKE2B 5cca1dd318b0b42d25d5256c8a8ac041982ec42aecbad33f74fb41ec1ee9304725913c93d29ff6fa7dce1a7c120eaa1bb546c7c84c1acf38153650738146197b SHA512 87db8d6a258a48923eed12296c924e253cec2201780c24f169b7a22118818b394e9c1ac674a748377a49de4b39f02257c469b0fd4ad0cb81d9287ab8d7fd0b47
 MISC metadata.xml 582 BLAKE2B ed94d37e43b59abd8bf8fbc1da8a6839aceddd5aae31109bf5d35f3996992d96dec619daba1d2c67a7d5c6182a06a413dc5e425ae786c3fe2cdbb68bb25796fb SHA512 88a39e758edddb852dd554a88035a74b0043d37009f97fb2ba45fe94169e17eef02b41ba8666d9f712469ae3af3258f14f7958b4dc70fc8eaea790d31b092fb8
diff --git a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
index e115907ec1e6..023f84490bc9 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild
index 1029752194f6..01488806de7c 100644
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 2937c33d91d7..e04cf797122b 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -5,6 +5,6 @@ DIST zathura-0.4.7.tar.gz 199857 BLAKE2B c4fd99049ed81c7965cc474f0c543ebd1aef55f
 EBUILD zathura-0.4.3.ebuild 1334 BLAKE2B b8887cbbf8b755c44d79bf4c517ea4c6669566b5576584cf5f6b20fd918ef53ca36ec8918608070548556978a776fa80873716c108e32be0e252f9acc350ea1b SHA512 c9a38f2029607e41eac29b14446028eb6969317360039add7b3d7d8fa9add0c3fbba40d900053db498c7d0e6e83af67f6aec774259a2bb7613f6901631b7bb39
 EBUILD zathura-0.4.4.ebuild 1347 BLAKE2B 48da5928fb897cb42e2d76dfe24b4d6b55aefd8fd336d41af466b00a01dd75d59566f0b1d9a57d982ed94d543f8862f8205979e2bb2c084b162c77219b9dbe2e SHA512 58a2e7db42b483c922412a74bd47e938355ce828b9aa172c1a2bfd4a10690892101641fada3ff080cbdd0ca9dc8e491768ac114ab36a7cb560061b830b393d2a
 EBUILD zathura-0.4.5.ebuild 1350 BLAKE2B 8f4d976a62b7ab8ec19e300a85742aa270c965ab2dcdcb3a43aa81b2db3faceaf7cee4a5dc41870edd96b6180487026f965743e4fcc2cdc2b0221be1e33241e9 SHA512 195dcff04cd249ab9860f0468e9df0f3470256d52a03bd37d982f1469ad6a6fdf2539bce2afa47996fe5316c7f173b851cb343d51e75545333236ad91dd4b281
-EBUILD zathura-0.4.7.ebuild 1351 BLAKE2B 3e72318b62ec7bf5f87d1dbf8082c9bb9388f6558f91f0a4feabd21d187ce834b8a60965859b765ceb91d002d15123aa3d2e8ca980953e63e955a7a76aaa5f44 SHA512 a95763c5be630cb6010b13be822bc75baf49da7df0bacf70026fe4779029af2513185c56c42d1420218833ffd1f87a7948dc3e45067085a3a152366720b15859
-EBUILD zathura-9999.ebuild 1347 BLAKE2B 156ee70df80e96cb4c9a4c06f39600538b4698cd873b2e06894cb877db54698caec7ae6c5cb219fe0fc00252721434ef9fd51476ff10cb828a105f675b00cd40 SHA512 31dd85e424cb33f4ce25d89252fa67c4757bf1280156873d3e94596022cbbb1bd38adb6d2757f2b93e1612120d73416f131ebec3fcd34ad2f3030310a883cfc2
+EBUILD zathura-0.4.7.ebuild 1358 BLAKE2B 7c35176562a0d79c560291b94511b40ac435a39595de2473327d4711caaa1ccee0f84d5a090e508496c9502d22770c2ea27cd153db2b6349f0ff011079eb6b91 SHA512 da770ed67844205850b17eaa8eb4091ce728717b44d868bc0987c33683b8e4892872b60ba79983ddecabf264c342c2f1eed8cd8057eb60895d70f39e79cc95ac
+EBUILD zathura-9999.ebuild 1354 BLAKE2B 348e576e02dcd442ad97f58a0f00998fe171f78865b7a15b4e232ed5fc1874d7bb1f55bb487ade91a638c98cbebdb4da269e4a246d84f593d79f92484b6dc7cc SHA512 69cb2554be7174a20857494068ca036c0dd2e1ed3e35f4a00c3e4d205359bc98b10f648ce99a1d3cfe89d92a0ed3092df461bb7c0e138066bab9f4a4c80bb0d1
 MISC metadata.xml 768 BLAKE2B f7be45d9f58cc3651406dc6f56da51f2544cb7361035e4d1a44a6a7e58010c1950bcd1f636ede8f89567d643d1bc2daf9733a781aa30d8425584f135757ae971 SHA512 c23719aa6fe1834996539157de6d80f56cf48eafa813d05832a8fb938f71e96ecc1d7b77467adce03274d2fccc375cad23bd0b3eb71c6037f9e4cbaf08874004
diff --git a/app-text/zathura/zathura-0.4.7.ebuild b/app-text/zathura/zathura-0.4.7.ebuild
index 4d891afcd064..1be1a7793199 100644
--- a/app-text/zathura/zathura-0.4.7.ebuild
+++ b/app-text/zathura/zathura-0.4.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
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="ZLIB"
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 96647a9ccf49..932897b2939e 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-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
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="ZLIB"
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 7d4a1014448b..3f7657a892c1 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/nginx-syntax/Manifest b/app-vim/nginx-syntax/Manifest
index 55f868c77758..1f815e7cc35a 100644
--- a/app-vim/nginx-syntax/Manifest
+++ b/app-vim/nginx-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST nginx-syntax-0.3.3.tar.bz2 5675 BLAKE2B d642a6f34b10f1f4d32c772a3c434e30cba5a26c03234c76658c15a9216723a12893414699db9c998e31445c658db0d33db0e4967713b2863b73e71a059e09e3 SHA512 0142c9b825b9f9c262145c0d202651f020e5b3f3f3548ecbdd713cf66c5f7098b974e7d16eedfa9d722c2efdfbd9732097bf8b293a610a64c21571ec66a5886d
-EBUILD nginx-syntax-0.3.3.ebuild 334 BLAKE2B 49ef4ddf174005f41128c7355cb63f25c2ff879e9277992510c3d17519005855d5e449007645eba00bb65277b1b6bff6d087e1b2a509e66abb2e9e93a3e73924 SHA512 f74c4e467ff74a09c50ead128a340dd4734570a28ad0b91e08296683cf9729fe46b165466d82b1bab764277b22cb653529b67527ccae3ffa3bfe5ebcb6c6e5a5
+EBUILD nginx-syntax-0.3.3.ebuild 333 BLAKE2B a6562f0330bac2c5f2ad2d93b2ae8778726956f0f952da6b6935797ec4692f56ffffa66612cb5c31c30805f282b09489ffb1fac7a65a519321037c62316c62d2 SHA512 7e9e95cd3112be41d143e1f8311332768428ae6cecdcc3a62798df4ac7bcfdb77fd8736c7d49d4e2c9d481e942955a0ecdb8677d562a9188e2d7a01ae69f37bd
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
index 88de49d32a1d..6f27ff5be5f5 100644
--- a/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
+++ b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
@@ -8,4 +8,4 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Nginx configuration files syntax"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1886"
 LICENSE="vim"
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
diff --git a/app-vim/snipmate/Manifest b/app-vim/snipmate/Manifest
index f3533d6f69af..431b7e7c2e17 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 582 BLAKE2B c294101afc07bf95dd09c568ca72a6a04fa37d29f641825eb9d1bbf549787505fecdce31aa3af86129d13bb47365f8afd6663431fa9bd8cbc771a8391f49fd3b SHA512 e4206e30c999041b4ed5143a2f9ddc1844252ef923261147fa82ec935bf2c1c4cf03c7b5a94e09b97ccf0145e8d505420d2de0f994dcc8239aadf61e55ad49d9
+EBUILD snipmate-0.87-r1.ebuild 589 BLAKE2B 8cca0fce11357e2c4cf8a241370e40c855a2014d227d37aa306ca6a565c7fe072a113fe9d593edc3ebb083d5d75eea06f1f42a8408f76e6bb30bbe15ebb2e7c2 SHA512 98f0c9aecd32ee1551a577ab24e8379a0e669b9c972213204a77f93c3235cfb56a4c46375d4f8af5b236b36a2294251dc16215df1be035dff84e4cd2d1dc5b70
 MISC metadata.xml 333 BLAKE2B fc2e46a12d6b2e9a7016e43d9758cb583842d0260d66f8b6f46370b4c8d865861fe3af4ead82f50d63d66331add3d13428ba1b9c87f48c5ac8f50e50f8f6f44b SHA512 53f06b6a78bd4afcdf806524600b0e608c5ed777d27efe8008dfe881a0f9849f400fbb07442f71113e0477bd1dc468f01c632be4384b82936b6b4f5e23767504
diff --git a/app-vim/snipmate/snipmate-0.87-r1.ebuild b/app-vim/snipmate/snipmate-0.87-r1.ebuild
index c853ab76a324..bd2a9aa4207f 100644
--- a/app-vim/snipmate/snipmate-0.87-r1.ebuild
+++ b/app-vim/snipmate/snipmate-0.87-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="vim plugin: TextMate-style snippets"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2540 https://github.com/garbas/vim-snipmate"
 SRC_URI="https://github.com/garbas/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	app-vim/vim-addon-mw-utils
diff --git a/app-vim/tlib/Manifest b/app-vim/tlib/Manifest
index 89e58e683415..4f9a13a2fb9f 100644
--- a/app-vim/tlib/Manifest
+++ b/app-vim/tlib/Manifest
@@ -1,5 +1,5 @@
 DIST tlib-1.22.tar.gz 119979 BLAKE2B 2fe1231b6a075989c41aa2cf38d0964b6d9ada390d0729ea417aa1c2ef1a105a07d569f80c75ba91a55f7e68f349faab2dcda66741b0b1da59f76d68a5467e24 SHA512 b7fc7e3741876c92bbccc116d4e170663e3d178aa8fb546f969475723cd82e07d9470af37574f8f97cfd23b8ca8f5dd5daa2e7bef50e2f62beec0015a2355908
 DIST tlib-1.23.tar.gz 120827 BLAKE2B 7b86a1b0e22e499390239e5898d81c90ac1b3b989b929e3bde3ea516d05419fc8af19e72d5313df36ce856a4c7ee2cddbdbecbace835f24adefb1883d4e76e46 SHA512 5fd5d6e6ccd36117abcfca35173d28602a73b0773e5fc77cb8c1c8660f13dd7882c8a8de9b4335927b807c7d643c480f1371926b4ffb1758e53948132dee1d75
 EBUILD tlib-1.22.ebuild 585 BLAKE2B b5d087fe5ea43d086e303462e0ed22b813799288b63ce97c6839a59f834ff769f45f2344144fb858125e28f4065c7596a7be881eb5fd2874b4990e9b6a82911f SHA512 71ed5d14775b3b39dd858c91f18c75e23bbc2f22f2b5f2fde18ef8a10d20a38890c02e15d0a8044a5c4e779e40012ef7ce43937c22a06f16ba486a7545cba733
-EBUILD tlib-1.23.ebuild 587 BLAKE2B 28fe7da5517913c02278838dc82ca36ea559ea6fa760117ef26828560b3958bbc951ce7d733580d2d6e260121badc95d3fc20e74ca95e0c28837e2d0cebcd842 SHA512 5c8137b5aaf72625b5b9b7b739b46c88c73ecdfad3c881adc3edd7a9146c21a53f5ec2a8ccc2b768588110089d79c887990da0d1743d07f46079b2551f72795c
+EBUILD tlib-1.23.ebuild 594 BLAKE2B b7b0952a34889833f147814fd3797c1666be3489d87d29cc3872f5c41dd0b246229987dd7cd176047fdfce747b6804d7485080c17f934986377b5ddc12cc3884 SHA512 8e9591d02a2cbc93e0a85cea2fef1903996d809d872dd7488450bab03b4d16cfdf045d67fb5516f9609bc71bdae55cc188b7f7a169919106ccb89182c844199c
 MISC metadata.xml 329 BLAKE2B 87b2296cdcd56f61cb2ce3f9da6b8bcf557a4f380e827ee96c91f9c2cf5a42f102251edfa6bbe0549ec883bf6e24883cd16b8392e436354e08ec299d6950a819 SHA512 ba015f91508e2c9d3cf1a7a202cdff6b8f543651c8807984bc82422747f8f9b532b9b6133db4ccf425eee399b064e01822d06cd6dcf46619b17b716c2d9cfc10
diff --git a/app-vim/tlib/tlib-1.23.ebuild b/app-vim/tlib/tlib-1.23.ebuild
index 20b0bde9ce8f..debbec9d3ea2 100644
--- a/app-vim/tlib/tlib-1.23.ebuild
+++ b/app-vim/tlib/tlib-1.23.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="vim plugin: a library of utility functions"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim"
 SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/vim-addon-mw-utils/Manifest b/app-vim/vim-addon-mw-utils/Manifest
index 154b270acabf..53d5372a2b3b 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 367 BLAKE2B 84b4b7f0017f253c7bee5a97abecdf0a5ed3a259ce7410c720d1cabdcf698c325d833c0b97f95c13772a11bd76e466e4b85ed5dd6d1e3db1020912ec09084228 SHA512 32d786226c46e28ce4a23849688b70a2c9b96912ed7068a38f60d3166eac3b0b648a26739e1adedaa519af13aa207a5108ba8c1f01ecc8e8854d186f15f56d9d
+EBUILD vim-addon-mw-utils-20121105.ebuild 374 BLAKE2B 724032aee682d868977935cfc50e3ec76af4976798c2095fdae26d3b65b71592464e68a8bcb28b1f92af81aa63bb1d5ad076e4b3567e8ff9343a33518cb929be SHA512 9abbb2025dec0e2f76b38928768bf22f7754cd54f0c33c0d0160d28c15dedb24d84933d44faf167d0bffa6be4bce8a0479c0dcf48818744611ddb26e7fa460d9
 MISC metadata.xml 342 BLAKE2B 8307dcbf56c00fe82cab6ac2468d9fa7c2a204bd95a58f1717e1b1405c4c6b617ee34cb2b7aa915692246917d7ca343202c0a50cfa7d0a03b319b8fd30ae25ff SHA512 d15a0c56c92c227efd086cdbd8d42fd3fcdd69194a7aec00db5f0e32917eab9a664590ee609c056f7128e4519b40016f25c97be994eaa78809c1bccd7b9f7a68
diff --git a/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild b/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild
index 509880fb0643..92a865360cd0 100644
--- a/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild
+++ b/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild
@@ -8,4 +8,4 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: interpret a file by function and cache file automatically"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2940 https://github.com/MarcWeber/vim-addon-mw-utils"
 LICENSE="GPL-3"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
diff --git a/app-vim/vim-latex/Manifest b/app-vim/vim-latex/Manifest
index 971e332f10c7..8c2f1db60d28 100644
--- a/app-vim/vim-latex/Manifest
+++ b/app-vim/vim-latex/Manifest
@@ -1,3 +1,3 @@
 DIST vim-latex-1.10.0.tar.gz 260820 BLAKE2B 2314ad5ded3bea51def3172e8f2b7a7483839b58804f9d8c1cc1c8f1139c1da731f91525691d47dba57d07a7db85c371e87c5ce0d3d22a004a9402df7e7cad3a SHA512 1d22b675c124e402a280dcc3a675b49a92fb9f4d42efdda0ea97be26379cd6c023589a35e165f4231524d853380e22411901bfbcc98f171c938ba800821a1213
-EBUILD vim-latex-1.10.0-r2.ebuild 1497 BLAKE2B 61baba11619b3492d401284bd6feca6ece3e33c316d96df5629041e2085337f608bb3274f9712d29cfb0db250883e96cd6bce871f005bf8dc009f6def653c74b SHA512 944a514d273a6f289a38ec09a9c721b6b29a9277edf300370e43118057772487b987bcf40513872e91b236aa373ef88cce763267178af93e67190cc800b8705e
+EBUILD vim-latex-1.10.0-r2.ebuild 1504 BLAKE2B 37f558342d9f2bf797567359fac3fcbb5d20d4bf86b6969a0e48ab61499eaa14185dc801c0757bc6088372ce14f1768f751ce19abe51635ab6eb77ea4d2cb847 SHA512 f4ba9c39317c54eb2cae1728f236849f6483661f64552f5db06f8d9d07c1ea95fb657e1b7f6661413daa44621382975c5c083f6f9f5141125cd0220f2741767c
 MISC metadata.xml 328 BLAKE2B bcf4c9979e43da6c141669c218e852e7a0c062d900c35790709e393f6cabc56f646f7a84e8057d9dbafa0a73e5786135a7cfe3ef825af867500bcd502f03a61f SHA512 e14b88742b6d8143cb578ddac61dbc0ac5e84c90659e8d9b5c40882ebdf35dc001b1ffae26eb90617434b2c8a898055c838738bf7cf18a45cd2a2ce66a30bdce
diff --git a/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild b/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild
index 375ef8e5228c..d029f5625a5d 100644
--- a/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild
+++ b/app-vim/vim-latex/vim-latex-1.10.0-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://vim-latex.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="vim"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-vim/vimtex/Manifest b/app-vim/vimtex/Manifest
index 86565f0ea493..c94742a3d637 100644
--- a/app-vim/vimtex/Manifest
+++ b/app-vim/vimtex/Manifest
@@ -1,4 +1,4 @@
 DIST vimtex-1.5.tar.gz 1666938 BLAKE2B 7d203f25b1f5c653bb270fb4cb5463d2851fe63d52dde9b99d8ca4e2c7936f7291c649e5a71d25c01329a2caf3aa4258f302d2585c6b7e67991e5f91dd785526 SHA512 9009a830e117c8d1d6b00f97cb1382704c77120e05810ad40d1ec191cb547e5045101d2901b88d85b42d17ba51cdd5f5a00b2f80aa2424e2529bb19c7f651f00
-EBUILD vimtex-1.5.ebuild 533 BLAKE2B e81024022440bfe6d893af82e1c384c7c3556b5d49b61fd4797af79154a579c96e03ab67cffa18e7f19aab67ebefbedd50eb5fc1a125dcac2e4b8b4eb5d0aa56 SHA512 6e248105a83df12fcfd1355d45bf790abedad40c653f615a6086e879cae9d4a6b4589510c539a8f00132fc120bae39f5c20c0566532b4efb42f08e59cb116c5a
-EBUILD vimtex-99999999.ebuild 730 BLAKE2B ae9ef2bc3fc3015e688fe6160ab77c131b5797da737b9e17e3b6bf21d421e17f5b67c2b49655a9217f86eddb7b9a6cdd7f4b0dc9766409139e76fdec620db80a SHA512 c05c3abb3084cc2a97373da5932e027ec6895f56cb78aadc15da3df0f1731ddd886d3bb251460638d5c68f031e869200d24368aec8bb3af4f6b319dd0680e40c
+EBUILD vimtex-1.5.ebuild 540 BLAKE2B 4a03b7b850d52d3e6739f0d6c09397472e40db8e60825f333278a6edb6a5942e6334857478720635cf6d6a9ef25932588c4e0b3498908940a88fb881ba76d2a7 SHA512 9450b1d918a2547708c5d1ed6ff940ba730f6f52f6301048d1cf756b246ce0ee04ddd0f1215e81c665820bdd43ad63d8fcb92be85537722dcc33fb8b8c7d6bfd
+EBUILD vimtex-99999999.ebuild 737 BLAKE2B 465cfbe53936dc071553c82cab669f4ac1a6242121971c1bed1267bc130d2d72145184280963e98cebe0cf859441e30b6e47e44c86e2a31f38648dd66a8cc57e SHA512 10f4dfe026b4e15129a663ed73c7a4513133bccdb96531cccb218e84131abedfacb05d978eb22d087e1cc36483803b66bd98ffa243581bdfc28605899a15ed16
 MISC metadata.xml 337 BLAKE2B 7cdee52f7b90fb4f600900bf2766b17b00992c1f947bb590a95d17a83ea6d3a9d48d7da4dfef2de1b2101118729ea95298fab28798dee7ec77977fdb659a3e27 SHA512 d2be801e0e552815e32e818ed13172288ebaa4505d6074dcabfaac760fab3227d019e4ddb8610062ceb5680e8b0cd543bd169333eefc80cefc6f5bf790801a0f
diff --git a/app-vim/vimtex/vimtex-1.5.ebuild b/app-vim/vimtex/vimtex-1.5.ebuild
index 569741da84e0..bc71b2da1a54 100644
--- a/app-vim/vimtex/vimtex-1.5.ebuild
+++ b/app-vim/vimtex/vimtex-1.5.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: a modern vim plugin for editing LaTeX files"
 HOMEPAGE="https://github.com/lervag/vimtex"
 SRC_URI="https://github.com/lervag/vimtex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 LICENSE="MIT"
 
 VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/vimtex/vimtex-99999999.ebuild b/app-vim/vimtex/vimtex-99999999.ebuild
index db4521995634..57d396e62229 100644
--- a/app-vim/vimtex/vimtex-99999999.ebuild
+++ b/app-vim/vimtex/vimtex-99999999.ebuild
@@ -12,7 +12,7 @@ else
 	inherit vcs-snapshot
 	COMMIT_HASH="17d809706edcb277f1ee7fa5e33aff3619926fe4"
 	SRC_URI="https://github.com/lervag/vimtex/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 DESCRIPTION="vim plugin: a modern vim plugin for editing LaTeX files"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index a4384a6a5585..d87c9dbd7dca 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/gstreamermm/Manifest b/dev-cpp/gstreamermm/Manifest
index b239f1457553..c43bfee7955b 100644
--- a/dev-cpp/gstreamermm/Manifest
+++ b/dev-cpp/gstreamermm/Manifest
@@ -1,3 +1,4 @@
+AUX gstreamermm-1.10.0-no-volatile.patch 856 BLAKE2B 40e2735424873d2dedda0a8ee2fcac848362741a08acb291ffe532e3b6a1d9af8967345f535148692b7322ecc74fb94a244c0841a57f571e6d6a37eda095c1fe SHA512 6babe0b607646c77850512df029be989256403e86010bcc198f782a04f357fbb3580c1015924b46af0ec2f3b9bb3c5b2f96b8a21befba8ee24c877dc32f59660
 DIST gstreamermm-1.10.0.tar.xz 3529640 BLAKE2B 29b99928cd1b21fd295683b4a1ad0a1b0f8ae959237fcbfef7d5a9296a70a140a04fa390fbbcb8d3151d28239f281e72feb30a0466478e38dfb4e172beaf21f1 SHA512 34eeb9eec5958c96acf7c7791eef80138e5d55fea6ddf1bf9ace6b1ec7f052da2abf04d87089e4c9ead51c631ef7afceaf9fceb946ec3d105da522187c69e429
-EBUILD gstreamermm-1.10.0.ebuild 1459 BLAKE2B a3863c41352bac5560958f6077dcbf86824f5fd82c60f022598a05dcfcfd2042d74f37acfb8a0a827e47853a53b598dc94cc267f5122f7004293717d4d288f6f SHA512 2f6e6f1c1554d4d46358e35d3ed6ae69413c70d82212e4674f5c97e8b8464dfe0fb1ab23ea988f09cce485c2fbbe9f9d5df390d764c7036ce4c264cd85228c5e
+EBUILD gstreamermm-1.10.0.ebuild 1510 BLAKE2B 6c6e75c2c7653ede07d0b169fbfe2e55adb638dc446a08d5b5aae35f5c18d7bb622da2ff95ce931e75434e2b2c7dc46e9ccdf9cb646d6859105ad702e3b33533 SHA512 c47f97f245c78b7a9660c44dbc7bf0e6109765439ed332b951d94e1500d1ba596d96784a7be5454f93cb1036412ad30280bc7f095e80f7cfa7ad17ba416ee698
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-cpp/gstreamermm/files/gstreamermm-1.10.0-no-volatile.patch b/dev-cpp/gstreamermm/files/gstreamermm-1.10.0-no-volatile.patch
new file mode 100644
index 000000000000..ede9f910ae14
--- /dev/null
+++ b/dev-cpp/gstreamermm/files/gstreamermm-1.10.0-no-volatile.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/786444
+
+g_once_init_enter(void*) should NOT be passed a volatile argument:
+https://developer.gnome.org/glib/stable/glib-Threads.html#g-once-init-enter
+"While location has a volatile qualifier, this is a historical
+artifact and the pointer passed to it should not be volatile."
+--- gstreamermm-1.10.0/gstreamer/gstreamermm/register.h.orig	2017-10-20 12:26:46.000000000 +0300
++++ gstreamermm-1.10.0/gstreamer/gstreamermm/register.h	2021-05-25 17:52:13.031337753 +0300
+@@ -110,7 +110,7 @@
+     /* The typedef for GType may be gulong or gsize, depending on the
+      * system and whether the compiler is c++ or not. The g_once_init_*
+      * functions always take a gsize * though ... */
+-    static volatile gsize gonce_data = 0;
++    static gsize gonce_data = 0;
+     if (g_once_init_enter (&gonce_data)) {
+         GTypeInfo info;
+ 
diff --git a/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild b/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild
index 6fdef7109be2..fced073bba0a 100644
--- a/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild
+++ b/dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
 # Installs reference docs into /usr/share/doc/gstreamermm-1.0/
 # but that's okay, because the rest of dev-cpp/*mm stuff does the same
 
+PATCHES=(
+	"${FILESDIR}"/${P}-no-volatile.patch
+)
+
 src_prepare() {
 	if ! use examples; then
 		# don't waste time building examples
diff --git a/dev-cpp/robin-hood-hashing/Manifest b/dev-cpp/robin-hood-hashing/Manifest
index a111cd72a9c4..59e6e400eb9c 100644
--- a/dev-cpp/robin-hood-hashing/Manifest
+++ b/dev-cpp/robin-hood-hashing/Manifest
@@ -1,3 +1,3 @@
 DIST robin-hood-hashing-3.11.2.tar.gz 170488 BLAKE2B 5fb688f5e21f989456e139b64447393816593ad2a1c3537d067d8ea1717aceaa879e27616657354f62e1466ca491f9d302448a73cddb53c7156a623eb375016b SHA512 5d55f054e29ae34d410eb0103f9f0aa1faf47e313b9f089c73b9c26fd9bedf132f6bb13b4bcd2664309c32fe7e859e346d0a6e7ab7f46b294f9b8db207577795
-EBUILD robin-hood-hashing-3.11.2.ebuild 498 BLAKE2B 7d0f434430a99db4409d5293b1d72a733b50079a99cd2c87ecddafec5713cc41214ee3f71cb1ae03c4f9f25a2112f824527fdaee1d80c880e5970dfc3e6d5fae SHA512 5ce4a95bcb3f6823f83a5900502cfaed705ba84bc8137946e64e8d31d54934ed7aa79676765b588f951c266b784a0e2f62cac11ef7d291fddf9a435c0d084074
+EBUILD robin-hood-hashing-3.11.2.ebuild 492 BLAKE2B 18958ad16e59d345e69cdd24f4fa2c31a870b90a16241ae252dd9b8973f668b0db46e139ebcaff5be559b524a504267a99b3ea1e202d80c9fc8f99e036b70bd4 SHA512 54c7c9921bb594cfb46c4b5bb7b5233ede6438f0734678f753236faf98e040d3a1a68e4e87c0da2f1ad473d975195f0efefeb34c4d17c24112cc4c67051723bd
 MISC metadata.xml 431 BLAKE2B 301a6f1026a18fd6d6322f95833f515247111fb9bb88d915724c263e167ea93bbc7f72a734c1aa4fffb5e2068a43f42a104446e7dddaf56334c73eb29541481a SHA512 80aac4cd60e6768675f5cf8619b99d7e4d95b3c691dd4cd7400040610abfdc5f9182e166f5b1c301a14380a3216fca87613dd7e4098fe2e1e2330e49f0660654
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
index 40abc80f6978..1a32ac192607 100644
--- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
diff --git a/dev-cpp/websocketpp/Manifest b/dev-cpp/websocketpp/Manifest
index 2aad5b407296..6732f7ea6805 100644
--- a/dev-cpp/websocketpp/Manifest
+++ b/dev-cpp/websocketpp/Manifest
@@ -1,6 +1,10 @@
 AUX websocketpp-0.7.0-cmake-install.patch 970 BLAKE2B 2099c37b65d3f685f8b9745d92b481bb6a0434e6305e974c6f613ae44e70e1fa9d7bd577f875ef12228e506361409666099ce024578c5c524cc8fc5fbdef4b70 SHA512 c8b34b80890d8dc828d64e391e9541f7ebd6a18c79d3a5b91c72835745a11bafff110d04e8d75a2df2dba8b65ca1856050009a4eab3871cc2470066f9ad82f44
 AUX websocketpp-0.8.1-boost-1.70.patch 5976 BLAKE2B f3bccde47637c8938b1a0acf95d855692256434be130fafc34311bbbb337c655022b77a301f4524029dc2841e2a47d9975f7fbed3ed004b9bd1ba65d87c6bf30 SHA512 34df3fc78415e0fac8d73a2afb2faa2e1e2bfd6e2ae6458e48a89354dfaeb7f3a8d95c5e5e0ffa2f8d096508e5a9636184b403def95501d027f2c68f5e096052
 AUX websocketpp-0.8.1-disable-test_transport-test_transport_asio_timers.patch 1227 BLAKE2B 26ac496842e4e23d254ba908679399ff8907253434430c887290cbd3b3beb14aaf69834cfc0b8f326f13c0f63ec7da535f0c8b438d20d7c1d2d4b5d5d2afb5cc SHA512 1ef7f2b71dcbeb386cd27bbf97f599f0c056b014423090ceb28e336c0f1527c6f8d6b04931144823c1d1deb14781508a0a6e869f69a9a232978851634f35fa0c
+AUX websocketpp-0.8.2-fix-boost_find_component.patch 950 BLAKE2B 16e80dcdf6a0af95fb7ac8b1c52fd9205379da13787dbd3d023a79a2c6e611ca093f49acc4618d7db0c2397126e4e6ec2cb1633116be658347f2403faee16d7f SHA512 192fd716040e91a6912407778a1c7a208a29ceaaa48aacb0fefddcd622d2ecde68093aff837b0cf4c3d8dc40cd9a5f4714040aa2264a1f8a01190b174a2a12b1
+AUX websocketpp-0.8.2-fix-clang.patch 1042 BLAKE2B 8d453efb82fea72a0a4b2ed5ab7ec44975ee963cbb99cf0c69bcd3ef2eb4482334981c711e9f0780c1f59353b74cf8543528d9889d2cac51ad746a59eae28ab1 SHA512 7c7fdbe70627cd39a4936fb0118a3d347753a1c6150c8801544b753ba4b5cd8c653043035fa164e31f2a41d09662d4abb4429140c14e42e2a195094e06574766
 DIST websocketpp-0.8.1.tar.gz 699468 BLAKE2B e5769229b400d2f42e69541b07cfba17dcc82cdad20685a52ac1130c2fc4e94764a38d2e4f7c36101b11705e10c67eb149ba2c30750e7a6f63696d52c272fed2 SHA512 35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c
-EBUILD websocketpp-0.8.1-r1.ebuild 1048 BLAKE2B bab31dca0ca2553b82e8065de7058cded1f4a218c11f839dab3f63a0ea7e97e16796c35382658bc4423234b8a0064c05b98d92bcd882d9e1fc319d2a67c7aa25 SHA512 86802c3b45293d8618e879346153328dac604f7c253d080f1188d1242f2180275fadb4c8781101c8440215f9c4cfb08265c51ba04ced011c8ee31c795213cca3
+DIST websocketpp-0.8.2.tar.gz 701364 BLAKE2B dacee33832f493d465afe208f9edea1393414a22c8db8f8c86b8f913521d0d8d68b95673a2e82b7479acfbab1ac541eda2d713a55d5de387b3879461d5884df7 SHA512 b2afc63edb69ce81a3a6c06b3d857b3e8820f0e22300ac32bb20ab30ff07bd58bd5ada3e526ed8ab52de934e0e3a26cad2118b0e68ecf3e5e9e8d7101348fd06
+EBUILD websocketpp-0.8.1-r1.ebuild 1329 BLAKE2B 919d70e8449abeb707221c044f05b05a3bbd8d233e6b04af34c9739a088edc766db533d5ad8b391303f5e5f8ffa26f7523709ac80cec4b3b566715160cc19937 SHA512 786aeaa8da44e43d286ae5cb11aab13e338818568aa20a3fb3a3fade51f4e69b1b88355e7e9a05f13100724efa44d3eee975fdfc0089ae0924be6af226784613
+EBUILD websocketpp-0.8.2.ebuild 1271 BLAKE2B 1f7411b49bf296e3c67e336d94c3f0be5abc4b78a3efbedc19e8fb4551926d0865c9d9339819fd19d7dbaaef2293274e7be843a611209322d6824b4f674bbba0 SHA512 f783b260c9c592bce423117ae53821d6d565f531c00a3154bd021c4aea8797baf14e41f2e90ea66dd58013d82f816ffdf91909f447998baa37d4afece6d98e49
 MISC metadata.xml 329 BLAKE2B bec1c49134f4f6cfd9c8487c0e607d609ed376853bd4022c3dbbee3f3932fb1925af6ec89c9ced2bafba9e3c2db67d3659e12e072e831ea0d3c95c5ae4ae621d SHA512 1cf8076fec3d5f414bc22c1eb74a1ebdb1f5c1711fd0b103c9da5cc8fc8f8fa30367c737d4b97bf22419cda1e327858817ef4b7109d703264ff6df3dd30a843c
diff --git a/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-boost_find_component.patch b/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-boost_find_component.patch
new file mode 100644
index 000000000000..28f4361f35c1
--- /dev/null
+++ b/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-boost_find_component.patch
@@ -0,0 +1,24 @@
+From 36b73da8958927f975b3d01a062aa6c0e149d97f Mon Sep 17 00:00:00 2001
+From: Peter Thorson <git@zaphoyd.com>
+Date: Mon, 27 Apr 2020 10:34:06 -0500
+Subject: [PATCH] [cmake] Remove quotes that was making it hard for cmake to
+ find newer boost versions. fixes #855
+
+---
+ CMakeLists.txt | 2 +-
+ changelog.md   | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3e9c80e84..ffcd8583b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -215,7 +215,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
+     set (Boost_USE_MULTITHREADED TRUE)
+     set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these!
+ 
+-    find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}")
++    find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS})
+ 
+     if (Boost_FOUND)
+         # Boost is a project wide global dependency.
diff --git a/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-clang.patch b/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-clang.patch
new file mode 100644
index 000000000000..2937ba71aced
--- /dev/null
+++ b/dev-cpp/websocketpp/files/websocketpp-0.8.2-fix-clang.patch
@@ -0,0 +1,25 @@
+From 2c355d9ef0f3ed73fa96d0c6c31293086df36d74 Mon Sep 17 00:00:00 2001
+From: Peter Thorson <git@zaphoyd.com>
+Date: Sun, 19 Apr 2020 22:33:24 -0500
+Subject: [PATCH] Fix typo in CMakeLists.txt that caused CXX_FLAGS to be
+ improperly quoted. Removed unnecessary hardcoded dependency on libc++ for
+ clang. fixes #859
+
+---
+ CMakeLists.txt | 2 +-
+ changelog.md   | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dcf90d1c8..3e9c80e84 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -152,7 +152,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
+         endif()
+         set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
+         set (WEBSOCKETPP_BOOST_LIBS system thread)
+-        set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here?
++        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+         if (NOT APPLE)
+             add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these?
+         endif ()
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
index 051e22e7eeb3..df98a5ee6164 100644
--- a/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
+++ b/dev-cpp/websocketpp/websocketpp-0.8.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
@@ -24,6 +24,10 @@ PATCHES=(
 	# disable tests that are timing sensitive
 	# https://bugzilla.redhat.com/show_bug.cgi?id=1461069
 	"${FILESDIR}"/${PN}-0.8.1-disable-test_transport-test_transport_asio_timers.patch
+	# https://github.com/zaphoyd/websocketpp/commit/36b73da8958927f975b3d01a062aa6c0e149d97f
+	"${FILESDIR}"/${PN}-0.8.2-fix-boost_find_component.patch
+	# https://github.com/zaphoyd/websocketpp/commit/2c355d9ef0f3ed73fa96d0c6c31293086df36d74
+	"${FILESDIR}"/${PN}-0.8.2-fix-clang.patch
 )
 
 src_configure() {
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild
new file mode 100644
index 000000000000..3e9339f27dba
--- /dev/null
+++ b/dev-cpp/websocketpp/websocketpp-0.8.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C++/Boost Asio based websocket client/server library"
+HOMEPAGE="https://www.zaphoyd.com/websocketpp"
+SRC_URI="https://github.com/zaphoyd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost )"
+RDEPEND="dev-libs/boost"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-cmake-install.patch
+	# disable tests that are timing sensitive
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1461069
+	"${FILESDIR}"/${PN}-0.8.1-disable-test_transport-test_transport_asio_timers.patch
+	# https://github.com/zaphoyd/websocketpp/commit/36b73da8958927f975b3d01a062aa6c0e149d97f
+	"${FILESDIR}"/${P}-fix-boost_find_component.patch
+	# https://github.com/zaphoyd/websocketpp/commit/2c355d9ef0f3ed73fa96d0c6c31293086df36d74
+	"${FILESDIR}"/${P}-fix-clang.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CPP11=ON
+		-DBUILD_TESTS="$(usex test)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 7628954f99eb..f92585a2db2f 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index cca4b597ac47..422a1d6a905b 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -8,5 +8,5 @@ DIST libiodbc-3.52.14.tar.gz 800285 BLAKE2B 6d6c52ae6eb133c5d844a9106079878290a3
 DIST libiodbc-3.52.15.tar.gz 658200 BLAKE2B 856855f424e31629e3c3fb11f31e189d22daee877e989622a4f5c2a9c7145697a639fd79bd7bdc17be03176b0ee34a3bc02afe958c278531de0f9b9685947988 SHA512 843a938c961c77e12b6c5571fa7c5528e547c028e213195e72224166cebb49acb746e2e1e636c37991686d9e476dfd64ee42bb113013f01b4201d6d9cf99c3bd
 EBUILD libiodbc-3.52.12-r1.ebuild 1643 BLAKE2B dea967ae40cab28a3d998d093ba65ea4e0d2d9f8dc47c947385b75472bf77103a19e9bed748f6801217d7ebabb36c4e9cffc6aba737b7359440acb8b203901f8 SHA512 7d77fe762ff7c2fc04dfa34eec505494fab7516942e8093b64d8b518e97235b216e9ed3d198a202f587ef0934ebbbdf74da9a3d2f4443d05badb6d5341e58071
 EBUILD libiodbc-3.52.14.ebuild 1590 BLAKE2B 9cf5ef322d0d9d12419256f9e48db9fe04c91a94732e985f8bde1a7c649ec4b189f1a05ae3ee9cd53d7310da167d6b14b48eb0a4f492538c75f0289ee214d4e8 SHA512 793e1aab33388fda664e23b33f65dd41b89752fda3986a1bd4d8638e5bad9eb8f62708fa62ce44ea005885f8f1a64477c8cef82f840b6885dbc8da0ad92c2129
-EBUILD libiodbc-3.52.15.ebuild 1591 BLAKE2B 77dcd48c9cd5ef1e5cf2ad5ead395f5559ba844b8de7b026e1c085861f36ed5a7d334d52729616c5033330caf4529074d5c0e8463f2036a7e7cf2fc5682e13a3 SHA512 7e85a80693881cae2ed30cd1473440d8137476409cdff4b21407554dbd45b25155fc940aafbf8f7c15938b27adb94fe5f757d4399d4217cd596db5df61052ef1
+EBUILD libiodbc-3.52.15.ebuild 1590 BLAKE2B 9cf5ef322d0d9d12419256f9e48db9fe04c91a94732e985f8bde1a7c649ec4b189f1a05ae3ee9cd53d7310da167d6b14b48eb0a4f492538c75f0289ee214d4e8 SHA512 793e1aab33388fda664e23b33f65dd41b89752fda3986a1bd4d8638e5bad9eb8f62708fa62ce44ea005885f8f1a64477c8cef82f840b6885dbc8da0ad92c2129
 MISC metadata.xml 251 BLAKE2B de1fe040cd23515516e31a81c78089f5fb4b9240f43a659d0e6981665bec427ebfe5f68bbea534b92dd4352f42e366c2070d3ef3e7fc0d3beee880445d973bef SHA512 ec0eb5cbc30d0a7ad8c74612255d84a473c370d977f9be4c95904eb5281060bbe3c23d97fb9537e844bbaf90c2f6dd1fae891d44628bbca29fbecb0fe0cb8bbd
diff --git a/dev-db/libiodbc/libiodbc-3.52.15.ebuild b/dev-db/libiodbc/libiodbc-3.52.15.ebuild
index bfc9387465e1..7510d0d83058 100644
--- a/dev-db/libiodbc/libiodbc-3.52.15.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.52.15.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="|| ( LGPL-2 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )"
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index f0f7adf3886f..81b4451ae17e 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -15,12 +15,16 @@ DIST mariadb-10.2.37-patches-03.tar.xz 6404 BLAKE2B c814ae967beac459810d1ecf4b5b
 DIST mariadb-10.2.37.tar.gz 74041747 BLAKE2B 81ed5ada9f27c7dadf2daa88c52e1e40c834e8f243eb416a4a1e486d7e756d2bcb86f545b013fb1bb83987eef19239b2e8c3312a50be10eb13fee1a9c824095f SHA512 e4214d5f013917fff2606aa0b827373c228c06ba72ceaddee01459105ba08316f360ad930bd36e71bcc98d371162a0894560a7a36d2b242629cc970798660854
 DIST mariadb-10.2.38-patches-01.tar.xz 5796 BLAKE2B 51a574eab28c16394e3e953654d31f9d6fe88f55292ccaea35b0463d122a749ed52cb8d5e19f14b0d630bf22381ee0bddcf1e1b80c1445a82b931dd9461339ac SHA512 48fcfdb685bac516ee3388fc05adce5b53bbb42bee7b3681a887c76c63cb71b671d4089721a9b16f281496be9e9a87a556d44e4a6834c96345c6ada900dc9fe8
 DIST mariadb-10.2.38.tar.gz 74250852 BLAKE2B 5d75a38d7d892d93c5971713a4ab47c2803c03934ba301ea239b0a7565692272339ca0c3360a7bd533adcfef1af392c906b8f0136c18a25f5a1dd6127c8a6902 SHA512 4918a04877e16a0d33baca61b7c207b21b646df3be5e9ac125cb65404c0c6d6706b054106f437acfeef402238b35018a3cd764ceb31144a98791137c44e273a9
+DIST mariadb-10.2.39-patches-01.tar.xz 5804 BLAKE2B 08d763d87f877870737a972748d15dceca920f341e004aa8ed401864db4208eee4b0896cea413bc27990f0405b202eba2d2e49849a574bcec1f8618962b09c67 SHA512 2e26f3dbd504672c1504a4313581ecf05383bb62e2cc23d51109b5b8bb02ba5cf951541617b26581806994769587ed5978e42e8e6b4daf271045df66148f53c7
+DIST mariadb-10.2.39.tar.gz 74253393 BLAKE2B 15a8f23817cf6a22fc0c2caa81865349c2dd93e3c7ffeaace58746cee376940db453cbec02a6bf65d344c18dfd342604e6f54de255cff10fe7d4a5bc5f7e1f9b SHA512 4ccdbf9bcedd3205834be963f00eb85e318aeba97765574674f60f8356a83591e7904685d72a2ad34111dd7a705ee6c4d5f0b2be4fea7a008a36907ff645da49
 DIST mariadb-10.3.27-patches-01.tar.xz 5516 BLAKE2B e78cc8514a3597b6ab38f00142a82c81e7482f1fd9afbcfd6f10ee92803a131f483f32361aebf288f9912e58140caeee1c536086e3f733c3a8dfe9c5afc5a590 SHA512 d1744bd83e099b67faa3c5385803c4eac58200c1a2ca30b5723e401c72e434d752be26c80da3b036431024c6a7d1ee889bde34a3143a43a9851984697d43e362
 DIST mariadb-10.3.27.tar.gz 72870472 BLAKE2B 46d203ba018ba00ffee2e5e9bec7f0a9a4d27f0aa30b26651215c7b3fca803dae1080d075bb4938a403c1f78a46ec4fec4bd59736c0eb9a0b84763445efe097b SHA512 96507307cf95d319898e23cb46a5f46937907592e421eb4a4373f47ca54291623010d18414e58bdba88a78255b1996984b14b41fb8f32e3593a3b02ed852aac5
 DIST mariadb-10.3.28-patches-03.tar.xz 5896 BLAKE2B bd9d7c3b32f17e0ce8c2149e5c2981dbb09647d56295eb9a2585a2c79f7e3aef46267e55a30a3440e57b1dbebe98a5a72d08aacb9a4b2fc3f30bb1f83d3b38c3 SHA512 0f8e8f9a50bbcb037bd22116ec826d01b15937f934d91fee11a37da0d4f91944762bfe3560c8edc4e5b9cdd9443fcce9b0e02373c4bfd97ed8570ff944d0b803
 DIST mariadb-10.3.28.tar.gz 73040177 BLAKE2B 4fff746e7c04b239055c8528bcfd31e4911e6daae3427dc8a6e2e0e21c2888d2145b5383c6b0876b307949f122c2645d42fc7efaeec594bae1f02aff4037e676 SHA512 f6941bcc818f9b3640e4b5fdbdd3a32b45c62c04087e583f1f0e1c0258b09a21c7639abd1c902e183c057838308ad5eedc00ffee76d44a02043e8e349015fb20
 DIST mariadb-10.3.29-patches-01.tar.xz 5280 BLAKE2B 262c8f89508d915a13c3c309c885af68ff044ba28b4c3d631a5be90b709c882fa3cf521380c9d2a2f7695477d7bcd364ccb98d90750e524deb0aa0daddb94bde SHA512 95d04edf54b722ed7022bd2b915d722ae4153eb2c12a3d6c499469be0de4d03582226ef525be9e9af265674ef31ce2376442a09c583222c64ad9994ddc51c8b7
 DIST mariadb-10.3.29.tar.gz 73261682 BLAKE2B 81ac5c7d1ad343c7d1c6788dafe07c45ec096d975a3197c6a6940da60a4a73383dff18e15d1940f1248dc34f290603629e95fbeca31c0749c5b0ae2b3de92b8f SHA512 fe868cde5ac3536ff5bbf34f235253c79e897e61bb34f7fdaca8fa8fcdb83e4a19c615beab27d3fdb5daee64ac0c8f36ec7e8089a9422c8540f7e92b1999a769
+DIST mariadb-10.3.30-patches-01.tar.xz 5300 BLAKE2B 14a0110477a5b3ade80ba05cfc038cfa0761b06e8a58f4ff69d39a9c1d59ec3fd323d7401fc7bd76a99dfcd4c8369d04d5eb1313d5ce20d2f57b10d2e0f6ff5d SHA512 a546908147f664189053d201d3d3d3dcaf81956bcd7348b1385bb1046636ec189a95f7bbe80839eba7a09b378475af6971af6d9e6bc72fad7d01ea139119ba42
+DIST mariadb-10.3.30.tar.gz 73266479 BLAKE2B 4f2911fed8f470e60f98f3aff044bb7979e32ec86a13d8ed8ca36cd8f3e1b45b541412de0f1b53bda252dfa2c4e3d2dd2a718a94d44b632a1f3e569be4f37753 SHA512 742c30b3ebc0b6d36b98d4e7a7fb511098142e72d8f42cbfa73a0bdea2059be17e790fbda4732329bbd99e4b50b13cf18e8122964a473e0b62170ab869eca8fc
 DIST mariadb-10.4.13-patches-03.tar.xz 5520 BLAKE2B 949b7f6ee5a9a6077424264e53d2b7af8ceb56cb38b204800e1c3ec93fc929d57b201e075f8ed735364b5421a3b922ba45fc94ba006f1e6d94494efa17b521ef SHA512 042c3ca8a75ebbb1c2baa508603d4248a178f87b7126b439ef6894eaab979f01c47cd8fbea3c106cce2a951e9308c76e72b4e444dcbee09a991cb524f2b9fac8
 DIST mariadb-10.4.13.tar.gz 80608459 BLAKE2B e9ada14da6ec7492311068549a5b6e5a66e1177312013b25472c084a21fbace543ec43b47f2e12190d45432648d508f311198521f42359561f8d75ea60f98205 SHA512 68919ceffb3d4afdd0d94daa77439a954c82ce4e08fbe06044fc397940eeb88a39ec75932cbd08ff26ef3cf7636fdb779947cda5b2764aa1fd888be19c44b566
 DIST mariadb-10.4.14-patches-01.tar.xz 5512 BLAKE2B f32e1d383ffd99de431bc34c36101c71c5e631344527e96b80ca6bd0a68015b45a4c33d6f0518cb4aa2bcfd493b64b6607671450ca045243404c0d65ebbc66fd SHA512 201fe82cbcca705dba52b32405d463b5569d97a5ffd9fd2967ec7fc3c3ff305011b3d2c3c0e9f7c19aaac57b26661bd361f3b6da6f3812f25934ec18856c7051
@@ -33,8 +37,12 @@ DIST mariadb-10.4.18-patches-03.tar.xz 5896 BLAKE2B e7d16fb0177a468b190ed0a3fd1c
 DIST mariadb-10.4.18.tar.gz 81733656 BLAKE2B 6eb0a9bff586dab3efc4edb4e9d1a7e2f5ceb1341de08ffc4d63787a83b8eece18b96fcfae48e68262350e71dd28e2e4d328746fadcb006cd9d5e1bfb63187a3 SHA512 085c2468484d997facb021ea7cba4895729b6c5769d715e30cf1dfd62c3a291e5025774420ed278f9470de20be8d3537f03c7d1cc5482d957bc91eb072cd9c12
 DIST mariadb-10.4.19-patches-01.tar.xz 5288 BLAKE2B b97a8b2c55ad2b78b4f27dbab3893c777e15ef237fc66a9ef62d391772caaada3e23949a63ae170aa72e4b07f9bf34f32da72614756bdbe0712efe6c39f0da59 SHA512 e26b12230b965fe0facfd447a815a88fe8edaaeb8e209cc53df2d76c580dacdab59afb09c09ef471fb0b46c0cde8eeed84f3eff851751316eb12f06de235d52f
 DIST mariadb-10.4.19.tar.gz 82042449 BLAKE2B 6137c84852b6b770efa908b49f03ca52726a537bda410b324ed388a82667bf0e3ff37cbb62d6a541ca39ce4841efa861553c7cead11030dc9deacdeb7cdb0d5f SHA512 837bd4e46e2033d0e996c33125c50b98e141e4c31cf4753a4bd1a7bd1e6a25ebe2a0ea7c8061d29f3c635e24d8e4bf2bbca62ea3b0089bde6576c39ffc6f5e28
+DIST mariadb-10.4.20-patches-01.tar.xz 5308 BLAKE2B 0f725743d78c3bcc8ca86a365b84ff797e17454adadb14e122bf94e04bd1a433e63c6f41eba21cb705ec7e9e64333e9ee597cff7001d5b8248f826093618f37c SHA512 2050e0bc3acbb9026c0a2cb8a5b00ff618f12ee7b6474bf0ed918d4d018c624eb4c40894172bbf31b135a73059d2e27efcda742a23010303a54aadf76fa26af5
+DIST mariadb-10.4.20.tar.gz 82043644 BLAKE2B e116be643f7243cf5c09611c79c60cb109dd2b69b4c1f06d7f2492858afdc3bf55e4568a7ed212a6458a3cf5a092d4e0d87e0a2ff6e71af9923e4b33c843a79f SHA512 ce8e0691981b39de380276cea5d553a9968d9f6ef19f54395128f01d611499f3fc203651b8d7cb56697c6ee55f5f515c960d7700738cdc50f228df7443505112
 DIST mariadb-10.5.10-patches-01.tar.xz 5944 BLAKE2B ce374e58b7730d45a8dbca4cccd459c1660182d6aed4ac54f06139e28ec254d4993b2135b2774e08eee740099803398a25b28ce9d227702bffab1867f1725fc2 SHA512 9d41b7796c5e43d037e75eb8d6c9b570a9b3d72166f832d3d0831646b2ec8c838fe94eb8eab8c6e427e96640287d58f7eca2c653a3c503bf01240c9f7c60a8c5
 DIST mariadb-10.5.10.tar.gz 99019617 BLAKE2B 85b5c43ae9eeb1dbf9ff7935d4cf4bddbd18cadeffb79a3bff172b4522e196c7ac8916c63a6750d0b3b910c6f0f933213b3b4f6c7bf0d43bbb07714ed9337750 SHA512 93dd1405f8b31989e130dee5b7d4a0b447aa0e017fb9ee02c792c52142d84d1103e8fd591101d72deda1ac65b10c48053582f6e61bd1757e6aa92e42d98c56cd
+DIST mariadb-10.5.11-patches-01.tar.xz 5960 BLAKE2B a198083d6dd9d16723dc40a0c6fea9c900c766ef22f59b1c7b6b65f6cbf441cda08da7701b89625bcab3022fa00226b84deb215aede41c05195ce9cb9b218530 SHA512 d7c642f64ee013006e4880ed50b6d2b7d00c53f3d3bd29eb939689a4f78e05dce82e3258e80fc22b9e266c5beb09df2323dee94b994d2a913e8f8b6a675ac7bb
+DIST mariadb-10.5.11.tar.gz 99037098 BLAKE2B 7eb5b91e34f3098df7a801becd614a99b2124d3e0b3cee28533a7197293317cba28d88ad112ce5f2d6e8d971ac7fdbca1e120e3e1746f2e6a57c359fe7c68457 SHA512 5ccb3f3d7cedf5ff79dd8d9304f0b7f3eb99a5558b446d1baf24cabe20c709360e2c99a737024793918fd6c23fc5a9bb83ffddfb5549310774d07294a3bbddf4
 DIST mariadb-10.5.9-patches-05.tar.xz 17120 BLAKE2B a6ea7c3ba3718e9667510db9fdfcedb3fa4a6a2da89f1c49f9a419c84191af9bf6148815afa836e31f47d752cafdaefdd98b530c29c849fa86af4ff0be9732ea SHA512 e39393505d5c5d45b3352d15b9e10a02a1057d5eb381335953c5dfca312791976be9e0e3b2adb6536a2f5cc6f00f01b9379a17806a029a9b73eb674a2a1fb583
 DIST mariadb-10.5.9.tar.gz 88639930 BLAKE2B 512c3fb0541bbeb19878979104f7858ce18ce67187507c8395798cfc9ffe92bd83e39bd47251419363600348a85716406286bd27b3c28662ea63e8ec761a4e01 SHA512 d23d5bf8510b3c36a6521fb3244cf323ef0f5d100ba379ed7b5bbc2acae1765a5b46c17bd929f0b27b28923eb1b5975314abdf7ffb96905cf7a93a5c8837294e
 EBUILD mariadb-10.2.32-r4.ebuild 33638 BLAKE2B 5907316f055b988a60530c46d48bbca657ec169626692424050fb8640c1f223b850bec46cf2d421f93a7f414195808e3c01d1b80d035840a92bfd30b65bd1da2 SHA512 f335437a2fdbc23be722b9327b3b774f27cb27e711286c25262800f1c50f7112ffaccb238fdd45e5fb5ecbb11faf2170670d21f1b89f77784c5c3737724c33d8
@@ -43,15 +51,19 @@ EBUILD mariadb-10.2.35-r1.ebuild 33827 BLAKE2B adae13f4088dc225309d397515c8ee988
 EBUILD mariadb-10.2.36-r1.ebuild 33822 BLAKE2B b40a7f91ada12281e719d2104a6664df00cdf7a00dfa6ddfc06e2e3bd019242e608e80bdde4068d7d13200bd5ff4459a7a1bde65fedd4285b7437bf032950bc4 SHA512 141c66d81dbcb04e677d4124bafc86bd9f5bb04d4b51580d3172ebb6323f7f58f95410bf72a0033290b2cd6094a86395555c19a7e4cf57afacb9b5e55a95fa59
 EBUILD mariadb-10.2.37-r4.ebuild 41525 BLAKE2B de4885bfb27431c1d23c9496bf498a5be11d3bd398047ed6541379c0e422a6759859d6895eb27932cb40502c472b86d766c3cbd3a390a116cb6ee1060bd6831e SHA512 f44c81f92c49fc883586d988d2a0930ee0b06497cd136dc2992b041adea8b09ec2694ea57d340ebbe31a4e67888ce05f0eb2b61d366500a0d68a896397af306f
 EBUILD mariadb-10.2.38-r1.ebuild 41754 BLAKE2B f22455e75b197c6c1d1cd79ad8a4f10beac00d0e3c20c2f62ccb69f3651fd25b4a5523d222e1074ca01922a2fab84191a834ee8182591e695b7758f599227c19 SHA512 f9f9f81a9f9954dceb6fa26d4f9a4efaead59b587f8fbd19807da79c35e4ade3c7f434ee53b97e3ca239e3d1d3bc706318c2a466951aa62d7407a592a171828e
+EBUILD mariadb-10.2.39.ebuild 41759 BLAKE2B 594346d108b915c11611c88a71b616eae5efbdf59364115732a45a7362187f119ace0aadb5f29641527e9ddcbff9b3ff46ee34161ec9a3b26083536b8826570d SHA512 2885f568212f15cb126a7888cea5219e00ace11ac65e24dc5992e143a06a98565043f8461d1a9b7c64432ca3bad31345e62d49b5e13be1835a78d4c33423f08f
 EBUILD mariadb-10.3.27-r1.ebuild 33335 BLAKE2B da048552e021b826491eda064a6ca2deb9e7bb1a072c7742d83c48a487416989839d151278f62d05482d45003074bd5a6101424e6691c3a48fcfffdf0f3dde87 SHA512 7614cd9cb76f9ae92d5c1cf5862d6d7e40421e686f97654d3b2c68e0a666a14504445ff6648262a18a94af4a1b83f002f8db88d917e677c5e0bc6ee8d09a0da8
 EBUILD mariadb-10.3.28-r4.ebuild 41057 BLAKE2B e3cebad5a639a16ae3db81a52ee0ca5403a9513de2812b4bc8bd78f691912249da43a40fd4a048f0f793037e81a22ae2b4f8bc87bda68dcbcc5176efe9aec14b SHA512 7984168020200cf847ff397cbd4a4f8e9744d2506af10bcc16f3982c00a576dad9fe8870e487dd8998fa6320555eba8f7de62cf3959c0958a56321defaeb05a5
 EBUILD mariadb-10.3.29-r1.ebuild 41310 BLAKE2B e3f1b9afa0e8b600d0a24cf2f0dc631eb5add48c6188274cff680ec127faf72d7e76a5f52c56efd77ffd5e31d7083d0fb87b9deca0b8ab18d3e57229bd8522c5 SHA512 851f9d72480344188915a3b8d4ec082308578803fd109c3a253a764d95b2a334d45be47532157d9bfcf604de50e248e8599409956876b9126d02600ee4bbc56f
+EBUILD mariadb-10.3.30.ebuild 41315 BLAKE2B a5b0802511adcd771754823ec47814c25c4b54092cb147de28e27a83a44d76cbd51a60188590731ccf4cd7f3624e90a3fcc94d15b676517b14ea3aff2cafba2b SHA512 e63447b8948bdbe3685b7916caf8d57c255db0453154ebb1295a86892c0c99f7dad990721aede738f108440a5ad3768f530c0ef815f7fb9ced1074add030da6e
 EBUILD mariadb-10.4.13-r4.ebuild 33955 BLAKE2B f06a7288dc01c7d11380f75a118dec8649d5f03d3bc376be44842c911effcec144b863b37500ff828f0d88a0cac041c29d4ba2b19f74e8f30e8277e255a57a26 SHA512 c65c25a7cd4dcbe57ce7245ff05968761a29e5d1c7ef69736268cc28bead8013fc70181e0322bce3ecb5e0a14d3c794c6fc06db06eb5c38cda0ec886ba3dc95f
 EBUILD mariadb-10.4.15-r1.ebuild 33986 BLAKE2B 07c94a20a76c3bd354ba6905acdfb24020ac1b82b7838bc3f78cb35eb308d9943ce60aa84253696337271f1733d1ce9aba3d08f59f41472cc3aa09f6b13e83bd SHA512 264df0c6bfa2bbe8f424b794e83c450cb7a59845fdeb286ea9d9fd9694e28b3e7bd3667925f4f9c07edb55dae7089cd0379d78e437598a9c9570e7167c242eea
 EBUILD mariadb-10.4.16-r1.ebuild 34119 BLAKE2B a2e9a0ca1a8d5be628eb2205a0f7b30a3e8f44e96f11bc92a8d69ee1208a3146b91b67a76ef215f221d0f31335d54925f5805de8b9476ae0220d3d15ea2bbf86 SHA512 5565d8ead2d1817a14fc46915f30b36b72e1760290582b2d9f9035769280db63197c1e7f0271ba6396fa99dec7cd8c2b6c9b331d9daa35935c2221ca3bb0b533
 EBUILD mariadb-10.4.17-r1.ebuild 34114 BLAKE2B 878cee3ab2d1b836ca6abdae13ba22e449a558ae6b429dbc5cf991ab41dd6fadd54c4141f7943ed6bfc467fbb2aaef737eafaf7e5fe3f2f92d6e0c9e23a75194 SHA512 659d7550bdd1eb580e28a710f3267f9673ee37ed0b8479cce9dbc2e3c9642018edaf2453dbd4e07680d76f867a298e28e2a0eb2f759a6ae55898335a4236fae5
 EBUILD mariadb-10.4.18-r4.ebuild 41614 BLAKE2B 0dcc328990ba19513e8e3930ebcd186c28c9ef52c0644db7298fb7a47981147a866117ddfc99136dfc2ccee8d3687ba0fd792d4fc061e584068a14e365f7d0ae SHA512 fc39145a63140ce0496d8b6cb003019de68eb24063d13baa0c1f27f97e803b5c4fb45a7ff4091b10add05a7fd19cf5177350837a7640d2c72c17f972ae15d51e
 EBUILD mariadb-10.4.19-r1.ebuild 42022 BLAKE2B 1965cc832edb0cd426598ac24404ffc844b902cb9e9f56789524317ee77358c10d6a696d99f381172dd9fa74918656c2f0ad767520dbd840144c35d4ab00bdb6 SHA512 aa97eb90c9b28a0fb35889c43595d69e7d47938a96748db207366507dff457768a6d1428478f19c1c661231d2692b809b76efeba3fb8932b08b426f812413bdc
+EBUILD mariadb-10.4.20.ebuild 42027 BLAKE2B dde0b8ccd73fabaf7e75010e1c4abc4e2aacab2f573581b9c0f78a44f4220196e5fb9378a45e7daab53b4dcb92b9c0ab1ad36c093c5b07339996ac70f11f6c65 SHA512 55cacdd496d37d263acf7689275af8ec9bfb823eda8f88df411a1bbd7ee13ddf2697b8cee4f959635ec2b8ceba7bb9bcadc1338863586f8bee14bb5733987a0f
 EBUILD mariadb-10.5.10-r1.ebuild 41446 BLAKE2B 71fae3cbb88c3b5f99ec9c96695b02f4b27f702090c49f15c8873b640f55435f8de00a70817484a54820d9cd3c8234c61f8d0df8dd83179c514c96130b258339 SHA512 821d3b09025475f023feff22c28a2f3eb6ea7ebe65e6a25a369a223a0e35b7e767b8684dcd4c0729f81090e76a58a2707fb0ad918329c38c0874597269642539
+EBUILD mariadb-10.5.11.ebuild 41451 BLAKE2B 2d82b1c527172f0cdb096fa2546e6690e512c19105ffd9e2fca26908b405137bf8149b1a72ed7629feff288324a4b20786f93b69e48658418a98de76c1ee02b1 SHA512 09967218f401c5c10502db3b43f8bd42783305d7499f14b33bcc0e441a94d514d49cf3b5d6d37b1939bc2019cb667c781fbaa6c65b7b4b75b320d52f864c0f03
 EBUILD mariadb-10.5.9-r6.ebuild 41112 BLAKE2B ddf6ef3f0176acf4d2a5ed9933a1246dcccbe4cbec4930f3fc435f1725d1932938b2cc37abf0f1428aa35e914cc594b7ad5a4a4d3b78286a2a7c88a2a84231b4 SHA512 57f3140ec63bf88e12b2ae9c1bff7bd585baefd0849a99f585d3df63729818caf02b562b63dfc8266f29664f704af19782296722f12bd2230e517c601deb3fb7
 MISC metadata.xml 2625 BLAKE2B 649e3bfdce49ed2352d31849a7d4547e0eeee23fab8ee58705fab62f8e1dee1874885027897bcb2895def5dcfeeea66caa69f83161ac1cfd19154a8712bdf573 SHA512 edbbfc7be64f124c0969f7de67337ba0b579292837d10e18da56b7e4e1cca88a36ac304e7c2625d9ae2bcf625d632a707f9813a0382242fc3d59d384b5b7bd54
diff --git a/dev-db/mariadb/mariadb-10.2.39.ebuild b/dev-db/mariadb/mariadb-10.2.39.ebuild
new file mode 100644
index 000000000000..10a592c455ba
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.2.39.ebuild
@@ -0,0 +1,1290 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+	multiprocessing java-pkg-opt-2 cmake
+
+# Patch version
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.2.39-patches-01.tar.xz"
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
+	${PATCH_SET}"
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="10.2/${SUBSLOT:-0}"
+IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
+	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+	sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
+	test tokudb xml yassl"
+
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+	server? ( tokudb? ( jemalloc !tcmalloc ) )
+	?? ( tcmalloc jemalloc )
+	static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	>=sys-libs/zlib-1.2.3:0=
+	kerberos? ( virtual/krb5 )
+	yassl? ( net-libs/gnutls:0= )
+	!yassl? (
+		>=dev-libs/openssl-1.0.0:0=
+	)
+	sys-libs/ncurses:0=
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	server? (
+		backup? ( app-arch/libarchive:0= )
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+		numa? ( sys-process/numactl )
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( sys-libs/pam:0= )
+		systemd? ( sys-apps/systemd:= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.41-r1:3=
+	virtual/libcrypt:=
+"
+BDEPEND="virtual/yacc
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+"
+DEPEND="static? ( sys-libs/ncurses[static-libs] )
+	server? (
+		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
+		test? ( acct-group/mysql acct-user/mysql )
+	)
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	!dev-db/mariadb:0
+	!dev-db/mariadb:5.5
+	!dev-db/mariadb:10.1
+	!dev-db/mariadb:10.3
+	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
+	!dev-db/mariadb:10.6
+	!<virtual/mysql-5.6-r11
+	${COMMON_DEPEND}
+	server? (
+		galera? (
+			sys-apps/iproute2
+			=sys-cluster/galera-25*
+			sst-rsync? ( sys-process/lsof )
+			sst-mariabackup? ( net-misc/socat[ssl] )
+			sst-xtrabackup? ( net-misc/socat[ssl] )
+		)
+		!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
+		extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
+	)
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
+	server? (
+		galera? (
+			sst-xtrabackup? (
+				|| ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup )
+			)
+		)
+	)"
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1)
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+
+		if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+
+		if has test ${FEATURES} ; then
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/mariadb-patches
+
+	eapply_user
+
+	_disable_plugin() {
+		echo > "${S}/plugin/${1}/CMakeLists.txt" || die
+	}
+	_disable_engine() {
+		echo > "${S}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	elif use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	# Don't build bundled xz-utils for tokudb
+	echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+	sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+	sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+	local plugin
+	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+				locale_info qc_info server_audit sql_errlog auth_ed25519 )
+	local test_plugins=( audit_null auth_examples daemon_example fulltext
+				debug_key_management example_key_management )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+		_disable_engine test_sql_discovery
+	fi
+
+	_disable_engine example
+
+	if ! use oqgraph ; then # avoids extra library checks
+		_disable_engine oqgraph
+	fi
+
+	if use mroonga ; then
+		# Remove the bundled groonga
+		# There is no CMake flag, it simply checks for existance
+		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+	else
+		_disable_engine mroonga
+	fi
+
+	# Fix galera_recovery.sh script
+	sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+		scripts/galera_recovery.sh || die
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mariadb
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+		-DINSTALL_SCRIPTDIR=bin
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+		-DCONC_WITH_EXTERNAL_ZLIB=YES
+		-DWITH_EXTERNAL_ZLIB=YES
+		-DSUFFIX_INSTALL_DIR=""
+		-DWITH_UNITTEST=OFF
+		-DWITHOUT_CLIENTLIBS=YES
+		-DCLIENT_PLUGIN_DIALOG=OFF
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+		-DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	mycmakeargs+=(
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+
+	if use server ; then
+		# Connect and Federated{,X} must be treated special
+		# otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DPLUGIN_CONNECT=NO
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO
+			)
+		fi
+
+		mycmakeargs+=(
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+			-DWITH_PCRE=system
+			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			# Build failure and autodep wrt bug 639144
+			-DCONNECT_WITH_MONGO=OFF
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+			-DINSTALL_SQLBENCHDIR=share/mariadb
+			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+			# systemd is only linked to for server notification
+			-DWITH_SYSTEMD=$(usex systemd yes no)
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		# Workaround for MDEV-14524
+		use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
+
+		if use test ; then
+			# This is needed for the new client lib which tests a real, open server
+			mycmakeargs+=( -DSKIP_TESTS=ON )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DMYSQL_USER=mysql
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DWITH_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		if use jemalloc || use tcmalloc ; then
+			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	_disable_test() {
+		local rawtestname bug reason
+		rawtestname="${1}" ; shift
+		bug="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	if [[ -z "${MTR_PARALLEL}" ]] ; then
+		local -x MTR_PARALLEL=$(makeopts_jobs)
+
+		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+			# Running multiple tests in parallel usually require higher ulimit
+			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
+			# are known to hit timeout when system is busy.
+			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+			# using "auto".
+			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+			einfo "${info_msg}"
+			unset info_msg
+			MTR_PARALLEL=4
+		fi
+	else
+		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
+
+	local -a disabled_tests
+	disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+	disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
+	disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
+	disabled_tests+=( "main.grant;0;Sporadically failing test" )
+	disabled_tests+=( "main.join_cache;0;Sporadically failing test" )
+	disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
+	disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+	disabled_tests+=( "mariabackup.*;0;Broken test suite" )
+	disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
+	disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
+	disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
+	disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+
+	if ! use latin1 ; then
+		disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
+		disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+		disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
+		disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+	fi
+
+	local test_infos_str test_infos_arr
+	for test_infos_str in "${disabled_tests[@]}" ; do
+		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+			die "Invalid test data set, not matching format: ${test_infos_str}"
+		fi
+
+		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+	done
+	unset test_infos_str test_infos_arr
+
+	# run mysql-test tests
+	pushd "${TESTDIR}" &>/dev/null || die
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+		# Manually install supporting files that conflict with other packages
+		# but are needed for galera and initial installation
+		exeinto /usr/libexec/mariadb
+		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+	fi
+
+	# Remove bundled mytop in favor of dev-db/mytop
+	local mytop_file
+	for mytop_file in \
+		"${ED}/usr/bin/mytop" \
+		"${ED}/usr/share/man/man1/mytop.1" \
+	; do
+		if [[ -e "${mytop_file}" ]] ; then
+			rm -v "${mytop_file}" || die
+		fi
+	done
+
+	# Fix a dangling symlink when galera is not built
+	if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+		rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+	fi
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+
+	# Here we need to see if the implementation switched client libraries
+	# We check if this is a new instance of the package and a client library already exists
+	local SHOW_ABI_MESSAGE libpath
+	if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}/usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+		libpath=$(readlink "${EROOT}/usr/$(get_libdir)/libmysqlclient.so")
+		elog "Due to ABI changes when switching between different client libraries,"
+		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+		elog "Please run: revdep-rebuild --library ${libpath}"
+		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+	fi
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
+
+	if use server ; then
+		if use pam; then
+			einfo
+			elog "This install includes the PAM authentication plugin."
+			elog "To activate and configure the PAM plugin, please read:"
+			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+			einfo
+		fi
+
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		if use galera ; then
+			einfo
+			elog "Be sure to edit the my.cnf file to activate your cluster settings."
+			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+			elog "The first time the cluster is activated, you should add"
+			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+			elog "This option should then be removed for subsequent starts."
+			einfo
+			if use sst-xtrabackup ; then
+				ewarn "As per https://mariadb.com/kb/en/meta/xtrabackup_warning/, XtraBackup"
+				ewarn "as an SST is broken by default beginning with 10.2.19 with the setting"
+				ewarn "innodb_safe_truncate=ON.  Please migrate to sst-mariabackup instead."
+				ewarn "sst-xtrabackup is being removed in 10.3 and higher."
+			fi
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/${PN}.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="${1}"
+		local flag="--${2}="
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+		if [[ ${#results[@]} -gt 0 ]] ; then
+			# When option is set multiple times only return last value
+			echo "${results[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+	if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+		die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+	[[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+	# Limit access
+	chmod 0770 "${SETUP_TMPDIR}" || die
+	chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+	local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+	local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	echo
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="${SETUP_TMPDIR}/tz.sql"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	local cmd=(
+		"${mysql_install_db_binary}"
+		"${mysqld_options[@]}"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--rpm"
+		"--cross-bootstrap"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	local x=${RANDOM}
+	local socket="${PID_DIR}/mysqld.${x}.sock"
+	[[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+	local pidfile="${PID_DIR}/mysqld.${x}.pid"
+	[[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	rm -r "${SETUP_TMPDIR}" || die
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/mariadb/mariadb-10.3.30.ebuild b/dev-db/mariadb/mariadb-10.3.30.ebuild
new file mode 100644
index 000000000000..e6044a19f37c
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.3.30.ebuild
@@ -0,0 +1,1282 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+	multiprocessing java-pkg-opt-2 cmake
+
+# Patch version
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.3.30-patches-01.tar.xz"
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
+	${PATCH_SET}"
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="10.3/${SUBSLOT:-0}"
+IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
+	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+	test tokudb xml yassl"
+
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+	server? ( tokudb? ( jemalloc !tcmalloc ) )
+	?? ( tcmalloc jemalloc )
+	static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	>=sys-libs/zlib-1.2.3:0=
+	kerberos? ( virtual/krb5 )
+	yassl? ( net-libs/gnutls:0= )
+	!yassl? (
+		>=dev-libs/openssl-1.0.0:0=
+	)
+	sys-libs/ncurses:0=
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	server? (
+		backup? ( app-arch/libarchive:0= )
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+		numa? ( sys-process/numactl )
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( sys-libs/pam:0= )
+		systemd? ( sys-apps/systemd:= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.41-r1:3=
+	virtual/libcrypt:=
+"
+BDEPEND="virtual/yacc
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+"
+DEPEND="static? ( sys-libs/ncurses[static-libs] )
+	server? (
+		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
+		test? ( acct-group/mysql acct-user/mysql )
+	)
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	!dev-db/mariadb:0
+	!dev-db/mariadb:5.5
+	!dev-db/mariadb:10.1
+	!dev-db/mariadb:10.2
+	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.5
+	!dev-db/mariadb:10.6
+	!<virtual/mysql-5.6-r11
+	${COMMON_DEPEND}
+	server? (
+		galera? (
+			sys-apps/iproute2
+			=sys-cluster/galera-25*
+			sst-rsync? ( sys-process/lsof )
+			sst-mariabackup? ( net-misc/socat[ssl] )
+		)
+		!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
+		extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
+	)
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1)
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+
+		if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+
+		if has test ${FEATURES} ; then
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/mariadb-patches
+
+	eapply_user
+
+	_disable_plugin() {
+		echo > "${S}/plugin/${1}/CMakeLists.txt" || die
+	}
+	_disable_engine() {
+		echo > "${S}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	elif use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	# Don't build bundled xz-utils for tokudb
+	echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+	sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+	sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+	local plugin
+	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+				locale_info qc_info server_audit sql_errlog auth_ed25519 )
+	local test_plugins=( audit_null auth_examples daemon_example fulltext
+				debug_key_management example_key_management versioning )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+		_disable_engine test_sql_discovery
+	fi
+
+	_disable_engine example
+
+	if ! use oqgraph ; then # avoids extra library checks
+		_disable_engine oqgraph
+	fi
+
+	if use mroonga ; then
+		# Remove the bundled groonga
+		# There is no CMake flag, it simply checks for existance
+		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+	else
+		_disable_engine mroonga
+	fi
+
+	# Fix galera_recovery.sh script
+	sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+		scripts/galera_recovery.sh || die
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mariadb
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+		-DINSTALL_SCRIPTDIR=bin
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+		-DCONC_WITH_EXTERNAL_ZLIB=YES
+		-DWITH_EXTERNAL_ZLIB=YES
+		-DSUFFIX_INSTALL_DIR=""
+		-DWITH_UNITTEST=OFF
+		-DWITHOUT_CLIENTLIBS=YES
+		-DCLIENT_PLUGIN_DIALOG=OFF
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+		-DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	mycmakeargs+=(
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+
+	if use server ; then
+		# Connect and Federated{,X} must be treated special
+		# otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DPLUGIN_CONNECT=NO
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO
+			)
+		fi
+
+		mycmakeargs+=(
+			-DWITH_PCRE=system
+			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			# Build failure and autodep wrt bug 639144
+			-DCONNECT_WITH_MONGO=OFF
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+			-DINSTALL_SQLBENCHDIR=""
+			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+			# systemd is only linked to for server notification
+			-DWITH_SYSTEMD=$(usex systemd yes no)
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		# Workaround for MDEV-14524
+		use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
+
+		if use test ; then
+			# This is needed for the new client lib which tests a real, open server
+			mycmakeargs+=( -DSKIP_TESTS=ON )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DMYSQL_USER=mysql
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DWITH_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		if use jemalloc || use tcmalloc ; then
+			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	_disable_test() {
+		local rawtestname bug reason
+		rawtestname="${1}" ; shift
+		bug="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	if [[ -z "${MTR_PARALLEL}" ]] ; then
+		local -x MTR_PARALLEL=$(makeopts_jobs)
+
+		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+			# Running multiple tests in parallel usually require higher ulimit
+			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
+			# are known to hit timeout when system is busy.
+			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+			# using "auto".
+			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+			einfo "${info_msg}"
+			unset info_msg
+			MTR_PARALLEL=4
+		fi
+	else
+		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
+
+	local -a disabled_tests
+	disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+	disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
+	disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
+	disabled_tests+=( "main.grant;0;Sporadically failing test" )
+	disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
+	disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+	disabled_tests+=( "mariabackup.*;0;Broken test suite" )
+	disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
+	disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
+	disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
+	disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+
+	if ! use latin1 ; then
+		disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
+		disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+		disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
+		disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+	fi
+
+	local test_infos_str test_infos_arr
+	for test_infos_str in "${disabled_tests[@]}" ; do
+		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+			die "Invalid test data set, not matching format: ${test_infos_str}"
+		fi
+
+		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+	done
+	unset test_infos_str test_infos_arr
+
+	# run mysql-test tests
+	pushd "${TESTDIR}" &>/dev/null || die
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+		# Manually install supporting files that conflict with other packages
+		# but are needed for galera and initial installation
+		exeinto /usr/libexec/mariadb
+		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+	fi
+
+	# Remove bundled mytop in favor of dev-db/mytop
+	local mytop_file
+	for mytop_file in \
+		"${ED}/usr/bin/mytop" \
+		"${ED}/usr/share/man/man1/mytop.1" \
+	; do
+		if [[ -e "${mytop_file}" ]] ; then
+			rm -v "${mytop_file}" || die
+		fi
+	done
+
+	# Fix a dangling symlink when galera is not built
+	if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+		rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+	fi
+
+	# Remove broken SST scripts that are incompatible
+	local scriptremove
+	for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+		if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+			rm "${ED}/usr/bin/${scriptremove}" || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+
+	# Here we need to see if the implementation switched client libraries
+	# We check if this is a new instance of the package and a client library already exists
+	local SHOW_ABI_MESSAGE libpath
+	if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}/usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+		libpath=$(readlink "${EROOT}/usr/$(get_libdir)/libmysqlclient.so")
+		elog "Due to ABI changes when switching between different client libraries,"
+		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+		elog "Please run: revdep-rebuild --library ${libpath}"
+		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+	fi
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
+
+	if use server ; then
+		if use pam; then
+			einfo
+			elog "This install includes the PAM authentication plugin."
+			elog "To activate and configure the PAM plugin, please read:"
+			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+			einfo
+		fi
+
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		if use galera ; then
+			einfo
+			elog "Be sure to edit the my.cnf file to activate your cluster settings."
+			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+			elog "The first time the cluster is activated, you should add"
+			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+			elog "This option should then be removed for subsequent starts."
+			einfo
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/${PN}.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="${1}"
+		local flag="--${2}="
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+		if [[ ${#results[@]} -gt 0 ]] ; then
+			# When option is set multiple times only return last value
+			echo "${results[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+	if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+		die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+	[[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+	# Limit access
+	chmod 0770 "${SETUP_TMPDIR}" || die
+	chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+	local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+	local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	echo
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="${SETUP_TMPDIR}/tz.sql"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	local cmd=(
+		"${mysql_install_db_binary}"
+		"${mysqld_options[@]}"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--rpm"
+		"--cross-bootstrap"
+		"--skip-test-db"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	local x=${RANDOM}
+	local socket="${PID_DIR}/mysqld.${x}.sock"
+	[[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+	local pidfile="${PID_DIR}/mysqld.${x}.pid"
+	[[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	rm -r "${SETUP_TMPDIR}" || die
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/mariadb/mariadb-10.4.20.ebuild b/dev-db/mariadb/mariadb-10.4.20.ebuild
new file mode 100644
index 000000000000..28f1165bf5b9
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.4.20.ebuild
@@ -0,0 +1,1303 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+	multiprocessing java-pkg-opt-2 cmake
+
+# Patch version
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.4.20-patches-01.tar.xz"
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
+	${PATCH_SET}"
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="10.4/${SUBSLOT:-0}"
+IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
+	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+	sst-rsync sst-mariabackup static systemd systemtap tcmalloc
+	test tokudb xml yassl"
+
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+	server? ( tokudb? ( jemalloc !tcmalloc ) )
+	?? ( tcmalloc jemalloc )
+	static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	jemalloc? ( dev-libs/jemalloc:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	>=sys-libs/zlib-1.2.3:0=
+	kerberos? ( virtual/krb5 )
+	yassl? ( net-libs/gnutls:0= )
+	!yassl? (
+		>=dev-libs/openssl-1.0.0:0=
+	)
+	sys-libs/ncurses:0=
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	server? (
+		backup? ( app-arch/libarchive:0= )
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+		numa? ( sys-process/numactl )
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( sys-libs/pam:0= )
+		systemd? ( sys-apps/systemd:= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.41-r1:3=
+	virtual/libcrypt:=
+"
+BDEPEND="virtual/yacc
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+"
+DEPEND="static? ( sys-libs/ncurses[static-libs] )
+	server? (
+		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
+		test? ( acct-group/mysql acct-user/mysql )
+	)
+	${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	!dev-db/mariadb:0
+	!dev-db/mariadb:5.5
+	!dev-db/mariadb:10.1
+	!dev-db/mariadb:10.2
+	!dev-db/mariadb:10.3
+	!dev-db/mariadb:10.5
+	!dev-db/mariadb:10.6
+	!<virtual/mysql-5.6-r11
+	!<virtual/libmysqlclient-18-r1
+	${COMMON_DEPEND}
+	server? (
+		galera? (
+			sys-apps/iproute2
+			=sys-cluster/galera-26*
+			sst-rsync? ( sys-process/lsof )
+			sst-mariabackup? ( net-misc/socat[ssl] )
+		)
+		!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
+		extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
+	)
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1)
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+
+		if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} with tokudb needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+
+		if has test ${FEATURES} ; then
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/mariadb-patches
+
+	eapply_user
+
+	_disable_plugin() {
+		echo > "${S}/plugin/${1}/CMakeLists.txt" || die
+	}
+	_disable_engine() {
+		echo > "${S}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	elif use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mysqld LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	# Don't build bundled xz-utils for tokudb
+	echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+	sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+	sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+
+	local plugin
+	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+				locale_info qc_info server_audit sql_errlog auth_ed25519 )
+	local test_plugins=( audit_null auth_examples daemon_example fulltext
+				debug_key_management example_key_management versioning )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+		_disable_engine test_sql_discovery
+		echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die
+	fi
+
+	_disable_engine example
+
+	if ! use oqgraph ; then # avoids extra library checks
+		_disable_engine oqgraph
+	fi
+
+	if use mroonga ; then
+		# Remove the bundled groonga
+		# There is no CMake flag, it simply checks for existance
+		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+	else
+		_disable_engine mroonga
+	fi
+
+	# Fix static bindings in galera replication
+	sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 STATIC~' \
+		"${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
+	sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
+		"${S}"/wsrep-lib/src/CMakeLists.txt || die
+
+	# Fix galera_recovery.sh script
+	sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+		scripts/galera_recovery.sh || die
+
+	sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
+		"${S}"/scripts/mysql_install_db.sh || die
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mariadb
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+		-DINSTALL_SCRIPTDIR=bin
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+		-DCONC_WITH_EXTERNAL_ZLIB=YES
+		-DWITH_EXTERNAL_ZLIB=YES
+		-DSUFFIX_INSTALL_DIR=""
+		-DWITH_UNITTEST=OFF
+		-DWITHOUT_CLIENTLIBS=YES
+		-DCLIENT_PLUGIN_DIALOG=OFF
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+		-DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	mycmakeargs+=(
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+
+	if use server ; then
+		# Connect and Federated{,X} must be treated special
+		# otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DPLUGIN_CONNECT=NO
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO
+			)
+		fi
+
+		mycmakeargs+=(
+			-DWITH_PCRE=system
+			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			# Build failure and autodep wrt bug 639144
+			-DCONNECT_WITH_MONGO=OFF
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+			-DINSTALL_SQLBENCHDIR=""
+			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+			# systemd is only linked to for server notification
+			-DWITH_SYSTEMD=$(usex systemd yes no)
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		# Workaround for MDEV-14524
+		use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
+
+		if use test ; then
+			# This is needed for the new client lib which tests a real, open server
+			mycmakeargs+=( -DSKIP_TESTS=ON )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DMYSQL_USER=mysql
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DWITH_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		if use jemalloc || use tcmalloc ; then
+			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	_disable_test() {
+		local rawtestname bug reason
+		rawtestname="${1}" ; shift
+		bug="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	if [[ -z "${MTR_PARALLEL}" ]] ; then
+		local -x MTR_PARALLEL=$(makeopts_jobs)
+
+		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+			# Running multiple tests in parallel usually require higher ulimit
+			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
+			# are known to hit timeout when system is busy.
+			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+			# using "auto".
+			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+			einfo "${info_msg}"
+			unset info_msg
+			MTR_PARALLEL=4
+		fi
+	else
+		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
+
+	local -a disabled_tests
+	disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+	disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
+	disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
+	disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
+	disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+	disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
+	disabled_tests+=( "mariabackup.*;0;Broken test suite" )
+	disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
+	disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
+	disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
+	disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
+	disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+	disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
+
+	if ! use latin1 ; then
+		disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
+		disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+		disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
+		disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+		disabled_tests+=( "main.upgrade_MDEV-19650;24178;Requires USE=latin1" )
+	fi
+
+	local test_infos_str test_infos_arr
+	for test_infos_str in "${disabled_tests[@]}" ; do
+		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+			die "Invalid test data set, not matching format: ${test_infos_str}"
+		fi
+
+		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+	done
+	unset test_infos_str test_infos_arr
+
+	# run mysql-test tests
+	pushd "${TESTDIR}" &>/dev/null || die
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+		# Manually install supporting files that conflict with other packages
+		# but are needed for galera and initial installation
+		exeinto /usr/libexec/mariadb
+		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+
+		if use pam ; then
+			keepdir /usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir
+		fi
+	fi
+
+	# Remove bundled mytop in favor of dev-db/mytop
+	local mytop_file
+	for mytop_file in \
+		"${ED}/usr/bin/mytop" \
+		"${ED}/usr/share/man/man1/mytop.1" \
+	; do
+		if [[ -e "${mytop_file}" ]] ; then
+			rm -v "${mytop_file}" || die
+		fi
+	done
+
+	# Fix a dangling symlink when galera is not built
+	if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+		rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+	fi
+
+	# Remove broken SST scripts that are incompatible
+	local scriptremove
+	for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+		if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+			rm "${ED}/usr/bin/${scriptremove}" || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
+
+	if use server ; then
+		if use pam; then
+			einfo
+			elog "This install includes the PAM authentication plugin."
+			elog "To activate and configure the PAM plugin, please read:"
+			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+			einfo
+			chown mysql:mysql "${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die
+		fi
+
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		if use galera ; then
+			einfo
+			elog "Be sure to edit the my.cnf file to activate your cluster settings."
+			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+			elog "The first time the cluster is activated, you should add"
+			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+			elog "This option should then be removed for subsequent starts."
+			einfo
+			if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+				local rver
+				for rver in ${REPLACING_VERSIONS} ; do
+					if ver_test "${rver}" -lt "10.4.0" ; then
+						ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster."
+						ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"
+						ewarn "for more information"
+					fi
+				done
+			fi
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/${PN}.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="${1}"
+		local flag="--${2}="
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+		if [[ ${#results[@]} -gt 0 ]] ; then
+			# When option is set multiple times only return last value
+			echo "${results[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+	if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+		die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+	[[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+	# Limit access
+	chmod 0770 "${SETUP_TMPDIR}" || die
+	chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+	local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+	local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	echo
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="${SETUP_TMPDIR}/tz.sql"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	local cmd=(
+		"${mysql_install_db_binary}"
+		"${mysqld_options[@]}"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--rpm"
+		"--cross-bootstrap"
+		"--skip-test-db"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	local x=${RANDOM}
+	local socket="${PID_DIR}/mysqld.${x}.sock"
+	[[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+	local pidfile="${PID_DIR}/mysqld.${x}.pid"
+	[[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	rm -r "${SETUP_TMPDIR}" || die
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/mariadb/mariadb-10.5.11.ebuild b/dev-db/mariadb/mariadb-10.5.11.ebuild
new file mode 100644
index 000000000000..de709aee3001
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.5.11.ebuild
@@ -0,0 +1,1297 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+	multiprocessing java-pkg-opt-2 cmake
+
+# Patch version
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.5.11-patches-01.tar.xz"
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
+	${PATCH_SET}"
+
+HOMEPAGE="https://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="10.5/${SUBSLOT:-0}"
+IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+	innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
+	numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+	sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
+	test xml yassl"
+
+RESTRICT="!bindist? ( bindist ) !test? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+	?? ( tcmalloc jemalloc )
+	static? ( yassl !pam )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	>=dev-libs/libpcre2-10.34:=
+	>=sys-apps/sed-4
+	>=sys-apps/texinfo-4.7-r1
+	sys-libs/ncurses:0=
+	>=sys-libs/zlib-1.2.3:0=
+	virtual/libcrypt:=
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	jemalloc? ( dev-libs/jemalloc:0= )
+	kerberos? ( virtual/krb5 )
+	kernel_linux? (
+		sys-process/procps:0=
+		dev-libs/libaio:0=
+	)
+	server? (
+		app-arch/bzip2
+		app-arch/xz-utils
+		backup? ( app-arch/libarchive:0= )
+		columnstore? (
+			app-arch/snappy
+			dev-libs/boost:0=
+			dev-libs/libxml2:2=
+		)
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 )
+		numa? ( sys-process/numactl )
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( sys-libs/pam:0= )
+		s3? ( net-misc/curl )
+		systemd? ( sys-apps/systemd:= )
+	)
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+	yassl? ( net-libs/gnutls:0= )
+	!yassl? (
+		>=dev-libs/openssl-1.0.0:0=
+	)
+"
+BDEPEND="virtual/yacc
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	server? (
+		extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) )
+		test? ( acct-group/mysql acct-user/mysql )
+	)
+	static? ( sys-libs/ncurses[static-libs] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	!dev-db/mariadb:0
+	!dev-db/mariadb:5.5
+	!dev-db/mariadb:10.1
+	!dev-db/mariadb:10.2
+	!dev-db/mariadb:10.3
+	!dev-db/mariadb:10.4
+	!dev-db/mariadb:10.6
+	!<virtual/mysql-5.6-r11
+	!<virtual/libmysqlclient-18-r1
+	selinux? ( sec-policy/selinux-mysql )
+	server? (
+		columnstore? ( dev-db/mariadb-connector-c )
+		extraengine? ( jdbc? ( >=virtual/jre-1.8 ) )
+		galera? (
+			sys-apps/iproute2
+			=sys-cluster/galera-26*
+			sst-rsync? ( sys-process/lsof )
+			sst-mariabackup? ( net-misc/socat[ssl] )
+		)
+		!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql )
+	)
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		MY_DATADIR=""
+		if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+			MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+			if [[ -z "${MY_DATADIR}" ]] ; then
+				MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
+				| sed -e 's/.*=\s*//' \
+				| tail -n1)
+			fi
+		fi
+		if [[ -z "${MY_DATADIR}" ]] ; then
+			MY_DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default MY_DATADIR"
+		fi
+		elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+		if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+			if [[ -e "${MY_DATADIR}" ]] ; then
+				# If you get this and you're wondering about it, see bug #207636
+				elog "MySQL datadir found in ${MY_DATADIR}"
+				elog "A new one will not be created."
+				PREVIOUS_DATADIR="yes"
+			else
+				PREVIOUS_DATADIR="no"
+			fi
+			export PREVIOUS_DATADIR
+		fi
+	else
+		if [[ ${EBUILD_PHASE} == "config" ]]; then
+			local new_MY_DATADIR
+			new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
+				| sed -ne '/datadir/s|^--datadir=||p' \
+				| tail -n1)
+
+			if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+				ewarn "MySQL MY_DATADIR has changed"
+				ewarn "from ${MY_DATADIR}"
+				ewarn "to ${new_MY_DATADIR}"
+				MY_DATADIR="${new_MY_DATADIR}"
+			fi
+		fi
+	fi
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		local GCC_MAJOR_SET=$(gcc-major-version)
+		local GCC_MINOR_SET=$(gcc-minor-version)
+
+		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
+		# non x86{,_64} arches
+		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.7 or later."
+			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			die
+		fi
+
+		if has test ${FEATURES} ; then
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${P/_rc/}" "${S}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/mariadb-patches
+
+	eapply_user
+
+	_disable_plugin() {
+		echo > "${S}/plugin/${1}/CMakeLists.txt" || die
+	}
+	_disable_engine() {
+		echo > "${S}/storage/${1}/CMakeLists.txt" || die
+	}
+
+	if use jemalloc; then
+		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC jemalloc)" >> "${S}/sql/CMakeLists.txt"
+	elif use tcmalloc; then
+		echo "TARGET_LINK_LIBRARIES(mariadbd LINK_PUBLIC tcmalloc)" >> "${S}/sql/CMakeLists.txt"
+	fi
+
+	local plugin
+	local server_plugins=( handler_socket auth_socket feedback metadata_lock_info
+				locale_info qc_info server_audit sql_errlog auth_ed25519 )
+	local test_plugins=( audit_null auth_examples daemon_example fulltext
+				debug_key_management example_key_management versioning )
+	if ! use server; then # These plugins are for the server
+		for plugin in "${server_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+	fi
+
+	if ! use test; then # These plugins are only used during testing
+		for plugin in "${test_plugins[@]}" ; do
+			_disable_plugin "${plugin}"
+		done
+		_disable_engine test_sql_discovery
+		echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die
+	fi
+
+	_disable_engine example
+
+	if ! use oqgraph ; then # avoids extra library checks
+		_disable_engine oqgraph
+	fi
+
+	if use mroonga ; then
+		# Remove the bundled groonga
+		# There is no CMake flag, it simply checks for existance
+		rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove packaged groonga"
+	else
+		_disable_engine mroonga
+	fi
+
+	# Fix static bindings in galera replication
+	sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 STATIC~' \
+		"${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
+	sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
+		"${S}"/wsrep-lib/src/CMakeLists.txt || die
+
+	# Fix galera_recovery.sh script
+	sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \
+		scripts/galera_recovery.sh || die
+
+	sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
+		"${S}"/scripts/mysql_install_db.sh || die
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	append-cxxflags -felide-constructors
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mariadb
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+		-DINSTALL_SCRIPTDIR=bin
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+		-DWITH_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_LIBEDIT=0
+		-DWITH_ZLIB=system
+		-DWITHOUT_LIBWRAP=1
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+		# The build forces this to be defined when cross-compiling.  We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+		-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+		-DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+		-DCONC_WITH_EXTERNAL_ZLIB=YES
+		-DWITH_EXTERNAL_ZLIB=YES
+		-DSUFFIX_INSTALL_DIR=""
+		-DWITH_UNITTEST=OFF
+		-DWITHOUT_CLIENTLIBS=YES
+		-DCLIENT_PLUGIN_DIALOG=OFF
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+		-DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use yassl ; then
+		mycmakeargs+=( -DWITH_SSL=system -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+	else
+		mycmakeargs+=( -DWITH_SSL=bundled )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	mycmakeargs+=(
+		-DWITH_READLINE=$(usex bindist 1 0)
+		-DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+		-DENABLE_DTRACE=$(usex systemtap)
+	)
+
+	if use server ; then
+		# Connect and Federated{,X} must be treated special
+		# otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			mycmakeargs+=(
+				-DPLUGIN_CONNECT=NO
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO
+			)
+		fi
+
+		mycmakeargs+=(
+			-DWITH_PCRE=system
+			-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_AWS_KEY_MANAGEMENT=NO
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DPLUGIN_S3=$(usex s3 YES NO)
+			-DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			# Build failure and autodep wrt bug 639144
+			-DCONNECT_WITH_MONGO=OFF
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+			-DINSTALL_SQLBENCHDIR=""
+			-DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+			# systemd is only linked to for server notification
+			-DWITH_SYSTEMD=$(usex systemd yes no)
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		if use test ; then
+			# This is needed for the new client lib which tests a real, open server
+			mycmakeargs+=( -DSKIP_TESTS=ON )
+		fi
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DMYSQL_USER=mysql
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DWITH_PROFILING=$(usex profiling)
+		)
+
+		if use static; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		if use jemalloc || use tcmalloc ; then
+			mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+			-DINSTALL_SQLBENCHDIR=
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+# Official test instructions:
+# USE='extraengine perl server' \
+# FEATURES='test userpriv' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	_disable_test() {
+		local rawtestname bug reason
+		rawtestname="${1}" ; shift
+		bug="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+		echo "${rawtestname} : BUG#${bug} ${reason}" >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	if [[ -z "${MTR_PARALLEL}" ]] ; then
+		local -x MTR_PARALLEL=$(makeopts_jobs)
+
+		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+			# Running multiple tests in parallel usually require higher ulimit
+			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
+			# are known to hit timeout when system is busy.
+			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+			# using "auto".
+			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+			einfo "${info_msg}"
+			unset info_msg
+			MTR_PARALLEL=4
+		fi
+	else
+		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
+
+	local -a disabled_tests
+	disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which Gentoo disables" )
+	disabled_tests+=( "innodb_gis.1;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "innodb_gis.gis;25095;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" )
+	disabled_tests+=( "main.func_time;0;Dependent on time test was written" )
+	disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
+	disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
+	disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" )
+	disabled_tests+=( "main.upgrade_MDEV-19650;25096;Known to be broken" )
+	disabled_tests+=( "mariabackup.*;0;Broken test suite" )
+	disabled_tests+=( "perfschema.nesting;23458;Known to be broken" )
+	disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" )
+	disabled_tests+=( "plugins.cracklib_password_check;0;False positive due to varying policies" )
+	disabled_tests+=( "plugins.two_password_validations;0;False positive due to varying policies" )
+	disabled_tests+=( "roles.acl_statistics;0;False positive due to a user count mismatch caused by previous test" )
+	disabled_tests+=( "sys_vars.wsrep_on_without_provider;25625;Known to be broken" )
+
+	if ! use latin1 ; then
+		disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires USE=latin1" )
+		disabled_tests+=( "main.information_schema;0;Requires USE=latin1" )
+		disabled_tests+=( "main.sp2;24177;Requires USE=latin1" )
+		disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+		disabled_tests+=( "main.upgrade_MDEV-19650;24178;Requires USE=latin1" )
+	fi
+
+	local test_infos_str test_infos_arr
+	for test_infos_str in "${disabled_tests[@]}" ; do
+		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+			die "Invalid test data set, not matching format: ${test_infos_str}"
+		fi
+
+		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+	done
+	unset test_infos_str test_infos_arr
+
+	# run mysql-test tests
+	pushd "${TESTDIR}" &>/dev/null || die
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used
+	if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
+		rm "${ED}/usr/include/mysql/server/private/config.h" || die
+	fi
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+		eprefixify "${TMPDIR}/my.cnf.ok"
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		local script
+		for script in \
+			"${S}"/support-files/magic
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
+		done
+		# Manually install supporting files that conflict with other packages
+		# but are needed for galera and initial installation
+		exeinto /usr/libexec/mariadb
+		doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror"
+
+		if use pam ; then
+			keepdir /usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir
+		fi
+	fi
+
+	# Remove bundled mytop in favor of dev-db/mytop
+	local mytop_file
+	for mytop_file in \
+		"${ED}/usr/bin/mytop" \
+		"${ED}/usr/share/man/man1/mytop.1" \
+	; do
+		if [[ -e "${mytop_file}" ]] ; then
+			rm -v "${mytop_file}" || die
+		fi
+	done
+
+	# Fix a dangling symlink when galera is not built
+	if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+		rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+	fi
+
+	# Remove broken SST scripts that are incompatible
+	local scriptremove
+	for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+		if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+			rm "${ED}/usr/bin/${scriptremove}" || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}/${MY_LOGDIR}"
+
+	if use server ; then
+		if use pam; then
+			einfo
+			elog "This install includes the PAM authentication plugin."
+			elog "To activate and configure the PAM plugin, please read:"
+			elog "https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/"
+			einfo
+			chown mysql:mysql "${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die
+		fi
+
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+
+		if use galera ; then
+			einfo
+			elog "Be sure to edit the my.cnf file to activate your cluster settings."
+			elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\""
+			elog "The first time the cluster is activated, you should add"
+			elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node."
+			elog "This option should then be removed for subsequent starts."
+			einfo
+			if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+				local rver
+				for rver in ${REPLACING_VERSIONS} ; do
+					if ver_test "${rver}" -lt "10.4.0" ; then
+						ewarn "Upgrading galera from a previous version requires admin restart of the entire cluster."
+						ewarn "Please refer to https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4"
+						ewarn "for more information"
+					fi
+				done
+			fi
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of mariadb reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/${PN}.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="${1}"
+		local flag="--${2}="
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+		if [[ ${#results[@]} -gt 0 ]] ; then
+			# When option is set multiple times only return last value
+			echo "${results[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_install_db_binary="${EROOT}/usr/bin/mysql_install_db"
+	if [[ ! -x "${mysql_install_db_binary}" ]] ; then
+		die "'${mysql_install_db_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local SETUP_TMPDIR=$(mktemp -d "/tmp/${PN}-config.XXXXXXXXX" 2>/dev/null)
+	[[ -z "${SETUP_TMPDIR}" ]] && die "Failed to create setup tmpdir"
+
+	# Limit access
+	chmod 0770 "${SETUP_TMPDIR}" || die
+	chown ${MYSQL_USER} "${SETUP_TMPDIR}" || die
+
+	local mysql_install_log="${SETUP_TMPDIR}/install_db.log"
+	local mysqld_logfile="${SETUP_TMPDIR}/mysqld.log"
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	echo
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x${pwd1}" != "x${pwd2}" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="${SETUP_TMPDIR}/tz.sql"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	local cmd=(
+		"${mysql_install_db_binary}"
+		"${mysqld_options[@]}"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--rpm"
+		"--cross-bootstrap"
+		"--skip-test-db"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql/user.frm" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	local x=${RANDOM}
+	local socket="${PID_DIR}/mysqld.${x}.sock"
+	[[ -f "${socket}" ]] && die "Randomness failed; Socket ${socket} already exists!"
+	local pidfile="${PID_DIR}/mysqld.${x}.pid"
+	[[ -f "${pidfile}" ]] && die "Randomness failed; Pidfile ${pidfile} already exists!"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${SETUP_TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	rm -r "${SETUP_TMPDIR}" || die
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 40c1cf1f68b3..cd1a485f6f99 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -5,7 +5,9 @@ AUX odbcinst.ini.m4 118 BLAKE2B 6da835746e063f415ad7d640233cfd96e744cd56e12aaab4
 DIST mysql-connector-odbc-8.0.22-src.tar.gz 3726015 BLAKE2B 055920446767b0c9a30a0ca4773e71d662b398a9849df1a0b7975d71a21cfb23f540d8dda5430c717569f173e63673d3e51b025bb098e51202093d33e19bc142 SHA512 c613ae60346cea2e57bade89d813fd5ac21d0712d3d751e3acbc275421da6ac7593afc3da9fb6d161ee413f60e76e670f0c84876591f331925c980d969db4e8c
 DIST mysql-connector-odbc-8.0.23-src.tar.gz 3726277 BLAKE2B 21b5e6f3f7e77d6107268800441675a230c79071e52db39093fade6e02031c12c96371d165af9459e9739e069e5b4196f0169dff54c0fa300e7a3023e8a82722 SHA512 2f66b5e1796176d638b1209b7d3381c2600a11cc88fa0dfb1f29b16a6c59386926674d5581d4843036d061af09312d58620484730bd7cdad36c0a0dcd45d49a9
 DIST mysql-connector-odbc-8.0.25-src.tar.gz 3736461 BLAKE2B 888219340ed2ea86194b2aeab04719c58f2bdfaedb4364492eab2d8cce4b7617a259ae075fada3f55f2bd475d310b5a98642a791ac1efff22a8ceda31bbdf89c SHA512 b2df4134d89600708f30866ded6d915246d36eea087a5c86c0030ba55a1a96c7ee37f023183a28e2f731851969ee802846012e4435fb86a38f7a0f09571d32ac
+DIST mysql-connector-odbc-8.0.26-src.tar.gz 3760542 BLAKE2B e0da539743335bc70a7b809759121d5186782df27c301dc9bb34a73d5584540906df72f0e2b2bfa8af47587693063286cd3eadd3b69f77398264463e69a20e35 SHA512 caed3db20fb42df5123356a973e4f8cc1b162be0ada1de881981237e9a7b39d95f3f0aa48fceeff23139c3d05fc24115bf900206db7a497f4ed734a2234eb528
 EBUILD myodbc-8.0.22.ebuild 3113 BLAKE2B e27fc21290dfa09309813f047e0c72bad42c2cc5ca6aa54c3698b0456b42007d3c7676c5062838be9ecb8033d8b1e12dae01a7bc213cd7ce3356bdd30dee7a86 SHA512 f34dc7a7aaa9825c42ffca24cb9ffa136a8e0abeb5de0871bb3413f7b28cc8587fb01768d60ca55434787ca818acb29d97b13b6ba3ef9e3791e38c8f7b445652
 EBUILD myodbc-8.0.23.ebuild 3225 BLAKE2B c0cf4254bb89e23bd358454addbc27f2c27ebef6923766433a5a7e0b5071787d41b9eedea1dff3efc9544788f52a23383800dae0376512fa04d56d53a7363f2f SHA512 f1b2950e6f30ef9f623f53ab7634aeff21a533fb6889e8593461a88987e8bbf15a70fdaf9d3ea1608c3fb7d446e71ab366ae2ff07cd1dc7c5d266dea7044eb24
 EBUILD myodbc-8.0.25.ebuild 3405 BLAKE2B c7395baa5a00a1469215ce3b7457d80e180f428843ac943d2e607f2efdba2ab821998fb2b6b67692825ca5f8bbaf4ccbf4df91336b884af5478335e402849fbc SHA512 6c8f7a07558dd81f01c636b4b3293119478e9b1c4ec8d7d72927baa42915768ab3a8f9017e2ec45e993063682bf74bd1e671052d3a79997e48e4f641be233bd4
+EBUILD myodbc-8.0.26.ebuild 3415 BLAKE2B f9df1d9e752db751bae9a5564008e9b252dee975649f319bda446a9a41bf84eec00fcd2887228db67b9a3533349e52cce6c9aef4eabd8383342d80eeeb554abd SHA512 09c17e88f8a06e1987f9cab064d78d4cf43a0dac1f0044edf92d9a1cf9642e73b51087ba4aa7ff0b53c4c44018bf8e8303cedd17d35a293edc1030e8fdcc6486
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/myodbc/myodbc-8.0.26.ebuild b/dev-db/myodbc/myodbc-8.0.26.ebuild
new file mode 100644
index 000000000000..49e7ed8c3c63
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.26.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-db/unixODBC[${MULTILIB_USEDEP}]
+	>=dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+	"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+	"${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
+)
+
+src_prepare() {
+	# Remove Tests
+	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+		"${S}/CMakeLists.txt"
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	mycmakeargs+=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DMYSQLCLIENT_STATIC_LINKING=OFF
+		-DMYSQL_CXX_LINKAGE=YES
+		-DWITH_UNIXODBC=YES
+		-DWITH_DOCUMENTATION_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}
+		-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+		-DMYSQLCLIENT_NO_THREADS=ON
+		-DDISABLE_GUI=ON
+		# Don't build "libmysql_strings.so" and "libmysql_sys.so" which are only
+		# used internally
+		-DBUILD_SHARED_LIBS=OFF
+		# The NUMA and LIBWRAP options are not really used.
+		# They are just copied from the server code
+		-DWITH_NUMA=OFF
+		-DWITH_LIBWRAP=OFF
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	dodir /usr/share/${PN}-${SLOT}
+	for i in odbc.ini odbcinst.ini; do
+		einfo "Building $i"
+			sed \
+			-e "s,__PN__,${DRIVER_NAME},g" \
+			-e "s,__PF__,${MAJOR},g" \
+			-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
+			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
+			<"${FILESDIR}"/${i}.m4 \
+			|| die "Failed to build $i"
+	done
+
+	rm -rf "${ED}/usr/$(get_libdir)/${PN}-${MAJOR}/private" \
+		|| die "failed to remove bundled libs"
+
+	mv "${D}/usr/bin/myodbc-installer" \
+		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
+}
+
+pkg_config() {
+
+	[ "${ROOT}" != "/" ] && \
+		die 'Sorry, non-standard ROOT setting is not supported :-('
+
+	local msg='MySQL ODBC driver'
+	local drivers=$(/usr/bin/odbcinst -q -d)
+
+	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+
+	local sources=$(/usr/bin/odbcinst -q -s)
+	msg='sample MySQL ODBC DSN'
+	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+}
+
+pkg_postinst() {
+	elog "If this is a new install, please run the following command"
+	elog "to configure the MySQL ODBC drivers and sources:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Please note that the driver name used to form the DSN now includes the SLOT."
+	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
+}
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 123f13eaeb24..ab33c1884af5 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -4,6 +4,7 @@ AUX mysql-connector-c++-8.0.19-fix-build.patch 9695 BLAKE2B c3334f74160a9b1148a5
 AUX mysql-connector-c++-8.0.22-fix-build.patch 10143 BLAKE2B c1bafd2ba9ad454bc02d2ebaa581ff735c1f43a557680ee3cd2378cbfc6a5673b9cec976acfc79796fcbcf292383725e1687b6042fc81e16c996d2165e9244ea SHA512 97cb6429fbf2d6df1b8a0f91e21ad9c894cd287aa9c89d2873cd3397fad33a9821d856e68108adaaab713d579b2fb9cf6f783f3b3fc5a96d32c6ba8a63bd1c23
 AUX mysql-connector-c++-8.0.24-gcc11-numeric_limits.patch 348 BLAKE2B 509e869dcfffd58d92512277ff6ea148f430cca4eb9bd9a8b929641b7f876586c012aa324bdc7b475fc61dcf38bbc4edf16ab65bbe1fc0b9b15f6d19acd25743 SHA512 be18797ab0015580e21cf480938025c38c42cdf4e6aaca4c08ecb22d44932d44778c3a51488a3620915d4933b43aa75de737e2a386d449cb0b9d25ae245d5c68
 AUX mysql-connector-c++-8.0.25-fix-mysqlclient-static-binding.patch 9557 BLAKE2B eda1794a808a2bfd43a044fe05abe93d41ddf98b917e4ff22dce7d795fe62c4d53f102bbcecf5b0c2ccdcf92f49ff100f6586c1c2131ba492b0a7095f202967b SHA512 963cb123e813e8eb305210f4804b5c67bfe2ebf670c85bddfbff8d3df7b60825cecf004d2e9b45ec38abe9af9f118c88b1d121d3290cae49557208ccb309da48
+AUX mysql-connector-c++-8.0.26-fix-build.patch 10080 BLAKE2B e14bf201a44c3a0fad775c3c40daf56403a35485f804c6bcac005b40e79fd798cbecc410a189b19bebafb3f6fdcc9bf9b27b5395e5f30f5e7567dc459b5a4e1c SHA512 cd0184d6d52bdd1bb8e22108708fd6489074b5d3d1510a3f38d1505bd4eebc7805327543dddaa429e635464234229e758c75c482133e198bd299e092c9301ea8
 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9 SHA512 d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4
 DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B 82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0 SHA512 5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1edecccc75da15d7bb0bd
 DIST mysql-connector-c++-8.0.20-src.tar.gz 3774428 BLAKE2B a06114432ab21c36fd0b3b91df2382198b2a48871e8e0bfd8c7a94729ed0e29f33599c078c97670fe9d744b13042db52fb89de2294c75eae670a77112d11d251 SHA512 3edb7c3d4ccf218a3f76afcf83a6d233b7accd236c05105ab3f7a6610cfd8809a78c78142c82fb60fb0931d2ae0f0f8fdc3ce9caf5f0cde7ef54067a7e20270b
@@ -12,6 +13,7 @@ DIST mysql-connector-c++-8.0.22-src.tar.gz 3795112 BLAKE2B c5d6f0ebeb4649857f321
 DIST mysql-connector-c++-8.0.23-src.tar.gz 3798295 BLAKE2B 923eebbd7f9cde0252c84de4c70863b40c0dd93ad98a93e2ec14c935b2f3f0b0f251828a8bbbd0f23a5ec03491db06020294e19455901d15181c84fec9fb3d7f SHA512 f8eb8842e199d7373f4b55644720ac63b93eb33be19294c433f57aaf556ce1b5752223154194469fa28af52adebe930f0a7b4e8f62df92cc810b545aa7bab928
 DIST mysql-connector-c++-8.0.24-src.tar.gz 3797356 BLAKE2B e509e04f6c93893948c573401188567bcbda91db0e608d53b1795593abf043117e1a525d3abe5c8396068a2ef750582cde15b64412e556e89762d08032abb602 SHA512 5507bc562e8263ee17efb9d4e2f52e471da75e73a1fc4dd1bc0a2ac1c2a593be889c4b042037cf6d3cbff854ae5cc865a8800251da475aed0f31710229af26f1
 DIST mysql-connector-c++-8.0.25-src.tar.gz 3800065 BLAKE2B 67546b2d7d9de25ccb440c22bd58ee83e6fae78710e6dfa802cb0446bf5be433c56458424f0ee81c9a899bbfd5f464712d2d0b43dceb4205b492c7b1a79f7858 SHA512 44dd7f4296d666801be55642e53cb5181d9b5c3b080306975a48eb6280e555d9b924b42b14b44dffee4c54fab3f662a7b6bb6584d9a1ed710f0026788611c525
+DIST mysql-connector-c++-8.0.26-src.tar.gz 3980027 BLAKE2B 86ce0d94db588ed86ce7b21851f866da26268f7c9059b57697cbe1f5c5d031a3eada2f55042feb7b2888b538277c773215c0d19e8a1968ff70ce363e8f95bd77 SHA512 e3a08551a4245bf886cb7e3775a256fa379bb781b523a84d30e0d0c16cae73c808a3413b08b09998eba9c0ea3ede19e505b6392ed71712a8e9a2df31f07e4c79
 EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1576 BLAKE2B e1835aadf499196ba42dcff6a1671bc32a4224133d68630bea249fb22ef35db6275f448bb1c891e0dcd9934fd66b3a7ebbe9935573f7f85a1d00e2613bab98fb SHA512 983abc70a156b0b0c39bd693c6ac62a149897f3b5bfddd54bc52463a5fa84397692134a16045d640db3d4797d3264803c0563a282495c21f54d4b48390223d39
 EBUILD mysql-connector-c++-8.0.19.ebuild 953 BLAKE2B b5a6d20cf1e7ac2bed882ca26d0ab5c3f83c12c506f61cac9554e0add2b83cae697994f23d289169441bdbecee862da0f4530f40e704f9ff45cda1f84e0fcd9c SHA512 076a5385ed228b5b559f2fe4a4d94498c6ded0389a302d049d6732ccd7b4a78b3e46a7ddfe9689aa624eb09560b8e4ff96414af752d14405c5fb0993e4440da1
 EBUILD mysql-connector-c++-8.0.20.ebuild 957 BLAKE2B cf3c430cbd0454d785eccc3c573d739ed9bd3ed0a6e3047d362ddd738e8abb13f4dcdf9e150ed6130c96a367e34ed260bad22b4b3a301441b69f0ac9c6254e63 SHA512 19bff24bc2d0f5336f705f651f7d9ca834491858d7bee94f7cdd5cde0da12ba1025647d3070f6da55b8442094370a13f1db5b3adb1c92a2a0925c7a931e1a9d8
@@ -20,4 +22,5 @@ EBUILD mysql-connector-c++-8.0.22.ebuild 942 BLAKE2B 479d3ce48c9bdecb155bb28c2b0
 EBUILD mysql-connector-c++-8.0.23.ebuild 943 BLAKE2B 91199b0deb991b1275377ee17c7ba55241265701c260443c845c6c47432c7cf34ba55b3227b65e234550dac37e08aa359fd5d2cd043951a804b8fdb2a9b4b9a6 SHA512 3fb54ed0135bf6727e5bb7f161947de858abce3589f3ca2c80fa402aed790b4e91e28af248a4e6a33cf78b7da684edc2ff1db6554b5c5ba7027eddeb009f87e8
 EBUILD mysql-connector-c++-8.0.24.ebuild 997 BLAKE2B 184b385509ec362bc962357f9c54dc554d6c1d66500154b6c8243ce2b8d2a01bfeb68d0e1c01c0e8dd98f16ef718b587b407e44a68010ae7bcb6f7583b32285d SHA512 df28ab886f014f30a44898b72f8a12e41bae8bc7109952712d7b44fd451de4b32babc0c5aaaf8142d7f90aa8b07a4f80ffe3d0cf34694be003c6234705acf6cc
 EBUILD mysql-connector-c++-8.0.25.ebuild 1063 BLAKE2B 1ce9e11fdcd814c1e464098ffe61027e36136562adbd1efa9a4ba10c252ac04eb5602f47abf5ec94f5514c778c38b3f0d81d82a66a113e647b3f02baf2a4eeb7 SHA512 db6ebd66158eadefa3a355d5add58e015a62587f51b07484fcefa8b59d28c199ee81d468a51f534b7be37a0246331edbf845680181fa3e27ff6ce086397dc940
+EBUILD mysql-connector-c++-8.0.26.ebuild 945 BLAKE2B b25f6d25971355f414cacd22507fa53b3ad056a41555157328137d36b9f269b4c99e2574bf9246ef79527e18a5a8a4556c040ec8fb58362020a19d81a3369ef5 SHA512 de38a9ab31d08db5220a8ed0698377e7fdf135d8ddada619ad026a91b9d2cf132a805e49b7fe5a01236ac860cc4d5ca02083d9c30e3d5de08ea4315d98b4d55d
 MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.26-fix-build.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.26-fix-build.patch
new file mode 100644
index 000000000000..2c80085b6392
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.26-fix-build.patch
@@ -0,0 +1,321 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -467,7 +467,7 @@ set_target_properties(connector PROPERTIES
+ 
+ 
+ install(TARGETS connector
+-  CONFIGURATIONS Release RelWithDebInfo
++  CONFIGURATIONS Release RelWithDebInfo Gentoo
+   ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev
+   RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
+   LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
+--- a/cdk/cmake/DepFindProtobuf.cmake
++++ b/cdk/cmake/DepFindProtobuf.cmake
+@@ -48,244 +48,7 @@ if(TARGET Protobuf::pb)
+   return()
+ endif()
+ 
+-message(STATUS "Setting up Protobuf.")
+-
+-set(PB_SOURCE_DIR "${PROJECT_SOURCE_DIR}/protobuf")
+-set(PB_BINARY_DIR "${PROJECT_BINARY_DIR}/protobuf")
+-set(config_stamp "${PB_BINARY_DIR}/config.stamp")
+-set(build_stamp "${PB_BINARY_DIR}/build.stamp")
+-
+-
+-#
+-# Pick build configuration for the protobuf build. Normally we build using the
+-# same build configuration that is used for building CDK (Release/Debug/etc.).
+-# But we also support building CDK under non-standard build configuration
+-# named 'Static' (this is a dirty trick we use to simplify building our MSIs).
+-# Since protobuf does not know 'Static' build configuration, we build protobuf
+-# under 'Release' configuration in that case.
+-#
+-# We need to handle two cases. For some build systems, like Makefiles,
+-# the build configuration is specified at cmake time using CMAKE_BUILD_TYPE
+-# variable. In that case we also set it during protobuf build configuration.
+-# Another case is a multi-configuration build system like MSVC. In this case
+-# we use generator expression to pick correct  configuration when the build
+-# command is invoked below.
+-#
+-
+-set(build_type)
+-if(CMAKE_BUILD_TYPE)
+-  if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
+-    set(set_build_type -DCMAKE_BUILD_TYPE=Release)
+-  else()
+-    set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+-  endif()
+-endif()
+-
+-set(CONFIG_EXPR
+-  $<$<CONFIG:Static>:Release>$<$<NOT:$<CONFIG:Static>>:$<CONFIG>>
+-)
+-
+-set(set_arch)
+-if(CMAKE_GENERATOR_PLATFORM)
+-  set(set_arch -A ${CMAKE_GENERATOR_PLATFORM})
+-endif()
+-
+-set(set_toolset)
+-if(CMAKE_GENERATOR_TOOLSET)
+-  set(set_toolset -T ${CMAKE_GENERATOR_TOOLSET})
+-endif()
+-
+-set(set_system_name)
+-if(CMAKE_SYSTEM_NAME)
+-  set(set_system_name -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME})
+-  if(CMAKE_SYSTEM_VERSION)
+-    list(APPEND set_system_name -DCMAKE_SYSTEM_VERSION=${CMAKE_SYSTEM_VERSION})
+-  endif()
+-endif()
+-
+-set(set_system_processor)
+-if(CMAKE_SYSTEM_PROCESSOR)
+-  set(set_system_processor -DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR})
+-endif()
+-
+-if(NOT EXISTS "${PB_BINARY_DIR}/exports.cmake")
+-
+-  message("==== Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR} ${set_arch} ${set_toolset} ${set_system_name}")
+-
+-  file(REMOVE "${PB_BINARY_DIR}/CMakeCache.txt")
+-  file(MAKE_DIRECTORY "${PB_BINARY_DIR}")
+-
+-  # Dirty trick to speed up cmake set up time.
+-  #file(
+-  #  COPY "${CMAKE_BINARY_DIR}/CMakeFiles/${CMAKE_VERSION}"
+-  #  DESTINATION "${PB_BINARY_DIR}/CMakeFiles"
+-  #)
+-
+-  execute_process(
+-    COMMAND ${CMAKE_COMMAND}
+-      -G "${CMAKE_GENERATOR}"
+-      ${set_arch}
+-      ${set_toolset}
+-      ${set_build_type}
+-      ${set_system_name}
+-      ${set_system_processor}
+-      -DSTATIC_MSVCRT=${STATIC_MSVCRT}
+-      -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
+-      -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+-      -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+-      -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
+-      -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
+-      -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
+-      -DCMAKE_CXX_FLAGS_MINSIZEREL=${CMAKE_CXX_FLAGS_MINSIZEREL}
+-      -DCMAKE_STATIC_LINKER_FLAGS=${CMAKE_STATIC_LINKER_FLAGS}
+-      ${PB_SOURCE_DIR}
+-    WORKING_DIRECTORY ${PB_BINARY_DIR}
+-    RESULT_VARIABLE protobuf_config
+-  )
+-
+-  if(protobuf_config)
+-    message(FATAL_ERROR "Could not configure Protobuf build: ${protobuf_config}")
+-  endif()
+-
+-  message("==== Protobuf build configured.")
+-
+-endif()
+-
+-
+-include(${PB_BINARY_DIR}/exports.cmake)
+-
+-#
+-# Protobuf library targets imported above (pb_protobuf
+-# and pb_protobuf-lite) are local to the directory from which
+-# they were imported. This is not good if cdk is used as
+-# a sub-project of a parent project, because the parent project
+-# must have access to these targets.
+-#
+-# For that reason below we create global protobuf/protobuf-lite targets
+-# and copy their locations from the imported targets.
+-#
+-# Note: we can't use ALIAS library because it does not work with imported
+-# targets
+-#
+-
+-add_library(Protobuf::pb-full STATIC IMPORTED GLOBAL)
+-add_library(Protobuf::pb-lite STATIC IMPORTED GLOBAL)
+-add_executable(Protobuf::protoc IMPORTED GLOBAL)
+-
+-set(TGT_libprotobuf Protobuf::pb-full)
+-set(TGT_libprotobuf-lite Protobuf::pb-lite)
+-set(TGT_protoc Protobuf::protoc)
+-
+-foreach(tgt libprotobuf libprotobuf-lite protoc)
+-
+-  #message("processing: ${tgt}")
+-
+-  set(loc_list)
+-
+-  foreach(CONF NOCONFIG DEBUG RELEASE MINSIZEREL RELWITHDEBINFO)
+-
+-    #message("- CONF: ${CONF}")
+-
+-    get_target_property(LOC pb_${tgt} IMPORTED_LOCATION_${CONF})
+-
+-    if(LOC)
+-
+-      #message("- setting imported location to: ${LOC}")
+-      list(APPEND loc_list "${LOC}")
+-
+-      set_target_properties(${TGT_${tgt}} PROPERTIES
+-        IMPORTED_LOCATION_${CONF} "${LOC}"
+-      )
+-
+-      set_property(TARGET ${TGT_${tgt}} APPEND PROPERTY
+-        IMPORTED_CONFIGURATIONS ${CONF}
+-      )
+-
+-    endif()
+-
+-  endforeach(CONF)
+-
+-  #
+-  # To support 'Static' build configuration the targets imported from the
+-  # Protobuf project need to have IMPORTED_LOCATION_STATIC defined. We use
+-  # 'Release' locations as Protobuf is built using 'Release' configuration in
+-  # that case.
+-  #
+-
+-  get_target_property(LOC ${TGT_${tgt}} IMPORTED_LOCATION_RELEASE)
+-  set_property(TARGET ${TGT_${tgt}} PROPERTY IMPORTED_LOCATION_STATIC ${LOC})
+-
+-endforeach(tgt)
+-
+-
+-#message("Protobuf include path: ${PROTOBUF_INCLUDE_DIR}")
+-set(PROTOBUF_INCLUDE_DIR ${PROTOBUF_INCLUDE_DIR} CACHE INTERNAL "")
+-
+-set_target_properties(Protobuf::pb-lite PROPERTIES
+-  INTERFACE_INCLUDE_DIRECTORIES "${PROTOBUF_INCLUDE_DIR}"
+-)
+-
+-set_target_properties(Protobuf::pb-full PROPERTIES
+-  INTERFACE_LINK_LIBRARIES Protobuf::pb-lite
+-)
+-
+-# On UNIX Protobuf uses pthread library
+-if(UNIX)
+-  set_property(TARGET Protobuf::pb-lite APPEND PROPERTY
+-    INTERFACE_LINK_LIBRARIES pthread
+-  )
+-endif()
+-
+-#
+-# Note: This is needed to correctly compile headers generated by protobuf
+-# with sunpro compiler.
+-#
+-
+-if(SUNPRO)
+-  set_property(TARGET Protobuf::pb-lite APPEND PROPERTY
+-    INTERFACE_COMPILE_DEFINITIONS SOLARIS_64BIT_ENABLED
+-  )
+-endif()
+-
+-#
+-# Try using parallel builds for protobuf.
+-#
+-
+-include(ProcessorCount)
+-ProcessorCount(N)
+-
+-MESSAGE("Processor Count: ${N}")
+-
+-set(opt_build)
+-set(opt_tool)
+-if(NOT N EQUAL 0)
+-  if(NOT CMAKE_VERSION VERSION_LESS 3.12)
+-    set(opt_build --parallel ${N})
+-  elseif(CMAKE_MAKE_PROGRAM MATCHES "make")
+-    set(opt_tool -j${N})
+-  endif()
+-endif()
+-
+-add_custom_command(OUTPUT "${build_stamp}"
+-  COMMAND ${CMAKE_COMMAND} --build . ${opt_build} --config ${CONFIG_EXPR} -- ${opt_tool}
+-  COMMAND ${CMAKE_COMMAND} -E touch "${build_stamp}"
+-  WORKING_DIRECTORY "${PB_BINARY_DIR}"
+-  COMMENT "Building protobuf"
+-)
+-
+-add_custom_target(build_protobuf
+-  SOURCES "${build_stamp}"
+-)
+-
+-set_target_properties(build_protobuf PROPERTIES FOLDER "Misc")
+-
+-add_dependencies(Protobuf::pb-full build_protobuf)
+-add_dependencies(Protobuf::pb-lite build_protobuf)
+-add_dependencies(Protobuf::protoc  build_protobuf)
+-
+-# TODO: Handle lite/full version
+-
+-
++find_package(Protobuf REQUIRED)
+ 
+ # Standard PROTOBUF_GENERATE_CPP modified to our usage
+ 
+@@ -314,10 +77,11 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS)
+              "${CMAKE_CURRENT_BINARY_DIR}/protobuf/${FIL_WE}.pb.h"
+       COMMAND ${CMAKE_COMMAND}
+             -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/protobuf"
+-      COMMAND Protobuf::protoc
++      COMMAND ${Protobuf_PROTOC_EXECUTABLE}
+       ARGS --cpp_out "${CMAKE_CURRENT_BINARY_DIR}/protobuf"
+            -I ${ABS_PATH} ${ABS_FIL}
+-      DEPENDS ${ABS_FIL} #${PROTOBUF_PROTOC_EXECUTABLE}
++           --proto_path=${Protobuf_INCLUDE_DIR}
++      DEPENDS ${ABS_FIL} #${Protobuf_PROTOC_EXECUTABLE}
+       COMMENT "Running C++ protocol buffer compiler on ${FIL}"
+       VERBATIM
+     )
+--- a/cdk/core/CMakeLists.txt
++++ b/cdk/core/CMakeLists.txt
+@@ -45,7 +45,7 @@ add_library(cdk STATIC ${cdk_sources} ${HEADERS})
+ 
+ target_link_libraries(cdk
+   PUBLIC  cdk_mysqlx cdk_parser
+-  PRIVATE Protobuf::pb-lite  # required by codecc.cc
++  PRIVATE protobuf  # required by codecc.cc
+ )
+ 
+ add_coverage(cdk)
+--- a/cdk/protocol/mysqlx/CMakeLists.txt
++++ b/cdk/protocol/mysqlx/CMakeLists.txt
+@@ -127,11 +127,7 @@ target_include_directories(cdk_proto_mysqlx PRIVATE
+   ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ 
+-if(use_full_protobuf)
+-  target_link_libraries(cdk_proto_mysqlx PRIVATE Protobuf::pb-full)
+-else()
+-  target_link_libraries(cdk_proto_mysqlx PRIVATE Protobuf::pb-lite)
+-endif()
++target_link_libraries(cdk_proto_mysqlx PRIVATE protobuf)
+ 
+ target_link_libraries(cdk_proto_mysqlx PRIVATE cdk_foundation zlib lz4 zstd)
+ 
+--- a/jdbc.cmake
++++ b/jdbc.cmake
+@@ -66,7 +66,7 @@ if(MYSQL_CONFIG_EXECUTABLE)
+   list(APPEND jdbc_cmake_opts -DMYSQL_CONFIG_EXECUTABLE=${MYSQL_CONFIG_EXECUTABLE})
+ endif()
+ 
+-list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON)
++list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=OFF)
+ 
+ if(CMAKE_BUILD_TYPE)
+   if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
+--- a/jdbc/CMakeLists.txt
++++ b/jdbc/CMakeLists.txt
+@@ -299,7 +299,7 @@ endif()
+ 
+ 
+ install(TARGETS connector-jdbc
+-  CONFIGURATIONS Release RelWithDebInfo
++  CONFIGURATIONS Release RelWithDebInfo Gentoo
+   ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT JDBCDev
+   RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT JDBCDll
+   LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT JDBCDll
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.26.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.26.ebuild
new file mode 100644
index 000000000000..c5ac6ef6bc72
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.26.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
+URI_DIR="Connector-C++"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+legacy"
+
+RDEPEND="
+	dev-libs/protobuf:=
+	legacy? (
+		dev-libs/boost:=
+		>=dev-db/mysql-connector-c-6.1.8:=
+	)
+	dev-libs/openssl:0=
+	"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${P}-src"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.26-fix-build.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSL=system
+		-DWITH_JDBC=$(usex legacy ON OFF)
+		$(usex legacy '-DMYSQLCLIENT_STATIC_BINDING=0' '')
+		$(usex legacy '-DMYSQLCLIENT_STATIC_LINKING=0' '')
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 561d069addaa..46e7e0224d0c 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -4,8 +4,10 @@ AUX mysql-connector-c-8.0.25-add-OpenSSL-3.0.0-support.patch 10951 BLAKE2B bf97a
 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
 DIST mysql-boost-8.0.25.tar.gz 290265324 BLAKE2B 5393a2a2525a886d9ece19777deae01e6c0b24b9ff5a0a5ffb9075740ed912d0df59a165b6ec9ceb60c7c28f3062cda5cceb4da3a8280f42549984c846f1ce5c SHA512 af653ccff66a9d87221b46ad4f7bcc629700549f758998b9a7fb22e4573b9495a28624e031f016f9ad8fe0dfcf481b82f1ffe224aa48c2d45531570026b26081
+DIST mysql-boost-8.0.26.tar.gz 291285918 BLAKE2B 6198ca8982a8c9df7e6ee4df5e2c1e0d64d2eb4d83cb7265317b58d55f6787c3240c8e40d196f2326ff3d66926ad7dab0705edd92e5a82881ce6ddb7f0c510b9 SHA512 63d47cb52407a816dc9f4330b99924624dfee46e57e7fdce19eff32909dd9e23251e2439d1807b002a1661b547173222c77465a3ca4dbb312414a84927809cfc
 EBUILD mysql-connector-c-8.0.22.ebuild 2782 BLAKE2B a03af99dd8eb16b78a7b891b9eb6c79a893edef92410b614722f2857ee21d1b519f93f74842d89b56ef50d628abd4873c00b59b4fcc06f1606319c078c2b89f6 SHA512 7dbf5e4d22d5d000e702809b2356bbe842da16b1bb61aa7d8fc3fd62f56449f5d893f377cb9a4b5b4b7019679a05f20aa67fd570caa4d9ccf27dccdc9c549df4
 EBUILD mysql-connector-c-8.0.23-r1.ebuild 2986 BLAKE2B a7f75b2115e7e4f8caf06ba5a81d6227214178d9b70c12007f13615ea55d75c1918b6d38e9e47f5caa4dde3539df10c8a21a9fedf9b325cc82ed2a875a346467 SHA512 b916eaa8cf6a4d3b39e65ae531324b9c13fcc4a65fd69ebe6d9b476f220ffefa542d6e5c7f835a83d283b751119f84c81fef234a6b2d164e4cd91dffecef13c3
 EBUILD mysql-connector-c-8.0.25-r1.ebuild 3138 BLAKE2B ec501d87b6bc3a3d1a68ab741607aff5dc2ff27fc12b537fae7d47f5b65c57880e301006a1363b7d6e4e52d51ed918fedbe0ffda9e77207b048c014c2352f883 SHA512 4840eff53fa2c43762e35ba5d638c5f8702522e2084a1a7c52432a7f340e9f2c44b087b3f029b1c7b61f70c6a6e5ed4d9af84261057be47728140b8dc5a9e2d1
 EBUILD mysql-connector-c-8.0.25.ebuild 3067 BLAKE2B f13a525798256e2677fc2749a5ce460ee0002774a5528a73e281504e0ea632f51431d33251d1d629878a9549dd4bf7080caf5b6693ca1e790d17509c2c15e07a SHA512 1ff8ed515e6720eb9b509ab5fa268f7217bd2fa94b9f9052f8fe28ba78a32dce3270b965afff2e68e87a196d5d5cc861b1595254bc4e0c5655000426aa71ddcd
+EBUILD mysql-connector-c-8.0.26.ebuild 3138 BLAKE2B ec501d87b6bc3a3d1a68ab741607aff5dc2ff27fc12b537fae7d47f5b65c57880e301006a1363b7d6e4e52d51ed918fedbe0ffda9e77207b048c014c2352f883 SHA512 4840eff53fa2c43762e35ba5d638c5f8702522e2084a1a7c52432a7f340e9f2c44b087b3f029b1c7b61f70c6a6e5ed4d9af84261057be47728140b8dc5a9e2d1
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.26.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.26.ebuild
new file mode 100644
index 000000000000..fa385e807a46
--- /dev/null
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.26.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+# wrap the config script
+MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/"
+
+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 ~riscv ~s390 ~sparc ~x86"
+
+	S="${WORKDIR}/mysql-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/21"
+IUSE="ldap static-libs"
+
+RDEPEND="
+	>=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
+	app-arch/zstd:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+# Avoid file collisions, #692580
+RDEPEND+=" !<dev-db/mysql-5.6.45-r1"
+RDEPEND+=" !=dev-db/mysql-5.7.23*"
+RDEPEND+=" !=dev-db/mysql-5.7.24*"
+RDEPEND+=" !=dev-db/mysql-5.7.25*"
+RDEPEND+=" !=dev-db/mysql-5.7.26-r0"
+RDEPEND+=" !=dev-db/mysql-5.7.27-r0"
+RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1"
+
+DOCS=( README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
+	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
+	"${FILESDIR}"/${PN}-8.0.25-add-OpenSSL-3.0.0-support.patch
+)
+
+src_prepare() {
+	sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "scripts/CMakeLists.txt" || die
+
+	# All these are for the server only.
+	# Disable rpm call which would trigger sandbox, #692368
+	sed -i \
+		-e '/MYSQL_CHECK_LIBEVENT/d' \
+		-e '/MYSQL_CHECK_RAPIDJSON/d' \
+		-e '/MYSQL_CHECK_ICU/d' \
+		-e '/MYSQL_CHECK_EDITLINE/d' \
+		-e '/MYSQL_CHECK_CURL/d' \
+		-e '/ADD_SUBDIRECTORY(man)/d' \
+		-e '/ADD_SUBDIRECTORY(share)/d' \
+		-e '/INCLUDE(cmake\/boost/d' \
+		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
+		CMakeLists.txt || die
+
+	# Skip building clients
+	echo > client/CMakeLists.txt || die
+
+	# Forcefully disable auth plugin
+	if ! use ldap ; then
+		sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die
+		echo > libmysql/authentication_ldap/CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# code is not C++17 ready, bug #786402
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DINSTALL_LAYOUT=RPM
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
+		-DENABLED_LOCAL_INFILE=ON
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock"
+		-DWITH_LZ4=system
+		-DWITH_NUMA=OFF
+		-DWITH_SSL=system
+		-DWITH_ZLIB=system
+		-DWITH_ZSTD=system
+		-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
+		-DSHARED_LIB_PATCH_VERSION="0"
+		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
+		-DWITHOUT_SERVER=ON
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	doman \
+		man/my_print_defaults.1 \
+		man/perror.1 \
+		man/zlib_decompress.1
+
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index f2acb192e044..1b97545351de 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -9,12 +9,14 @@ DIST mysql-5.7.32-patches-01.tar.xz 6660 BLAKE2B 5c63158615398bdcc4480a0e1b058f4
 DIST mysql-5.7.33-patches-01.tar.xz 6672 BLAKE2B cfa410f9ba5a4ba7e43923e7b5940c2dc6a9356b49230ebaea24bd7eef8a9639fc746e917c22241e19c830b81252e95f38e2c9d6054494de700bae46011fb2f4 SHA512 b16bb9531c44f1c5ec9c08aee6c1f5f5d2e3fe59a0039a54f6c050660a18f7c78b955e7eea7bef4e7dccfcdaa81464e0d8e47ac7d0e40ecb90187865a8a0412e
 DIST mysql-5.7.34-patches-01.tar.xz 6676 BLAKE2B b925880bfbb991fcba81964ff658a2ecab38da637a6093270a724ab8e405ab092d5fb9684f53f44d001e34287366df234b841d9ebcae62d49becdb93a3c3e324 SHA512 80a89f4b4a7ecc04f3115c6aaa0b0013e38c2813fa6dea095e826ef3944298715a48e0deacb691d23526b1524b207c83176290faea2461d3fcd94edabe3d8943
 DIST mysql-5.7.34-patches-02.tar.xz 6408 BLAKE2B fdb36247832b6282af94ce2f61b5dd77f6b45f9efca4b438ecd5fed8d810d9d51547d0ae3de085e7f5dcc8795b4bc4f1210902495b92859e1d5aec3048256ef3 SHA512 f0513eb7f0c9e415aa972a53af668939934ea4f4fa438f468f32a46ccc2aa3b84ba8edd999e4786256ada34851ad64c81e9dd0e36c2a21da641987dfd18635c3
+DIST mysql-5.7.35-patches-01.tar.xz 6408 BLAKE2B ddead9d6f5570f23433ffaef0188a8e93c0220b3d59ae24b870927e9e5908619f357725c1ab2d16905f39dd9d5f6cd23d3aabf6a1df2abdc865683f603912b8f SHA512 6374536299c691fd12a3f8b7cd27291e6f3b0b6d159284b2866caaed6a7f124439c16e659e6da5aae9e72d613de2a1e1b80066c961e122e90ad644e9a32633cc
 DIST mysql-8.0.20-patches-01.tar.xz 7176 BLAKE2B 2fc51986c0a4da60521d0e64b9f8705caf8ec3869af930c9729359c3710059fc78aae176523fdf17d10173b404431f31f9bb23ee5c82fba7cbbb4cb39881c005 SHA512 bf8211cf3873f8672b9d3d1dc42b68a1c635690ffdc2d3393eafa83f060ada9f2eaa63f859bf8eecc24976a733d8c7c3b9632ac70f28b5facf48eae921c7ceeb
 DIST mysql-8.0.21-patches-01.tar.xz 7212 BLAKE2B 2f1b38b3f84a124e3636cb726f3fcef82d71d933e90429dc78be44afeb4f456a37104359c5fd58ab50f0c03c1698e6c79f9b1e07640f0411c0024f558b4e9595 SHA512 3edcbb529b0623adaed30150d88c9b54d1a3e402faf5c7cff4ed626bbf4e5f50838d8f3c79bd2173439d748ded13412ff7fe37e3742c55879ff28907b9eb5660
 DIST mysql-8.0.22-patches-02.tar.xz 7580 BLAKE2B a50704c3c58b1f67ca86edb233544137927b0ae5fdf302687b48f6fd30fbbd26798e8ef8282662586b25a7240b47278b44f944a8ca59f1a198bc228dd74459c9 SHA512 59f864452e9fdebe4d3990eff8b756e9bbfad58da216b74fa8b7e8391cb0d9d543ca2828591b9ed1ee276c1dec9e1851a8c2683507f0a326c85054e31cc3f950
 DIST mysql-8.0.23-patches-01.tar.xz 7568 BLAKE2B 222120dcb5556457f382eefbb10f66f46fe1673c64730c8c8a5566942031bc98bab1f1182f747e79e23fccfb6b09197d5c2874aa2087104b6f1eaa25ea9fd60c SHA512 54222c420d57c1b206d920f22738746925ed1e0d78683f01c97cac5bd1d3450f70f784a7f603304b8595fb58120e691f94e28fa1d1884a7cc8bea1d7b177470f
 DIST mysql-8.0.25-patches-01.tar.xz 3604 BLAKE2B 09cccab204c30d16bdc374bcd01d4a8e6298955f86f479b8e287aab74fb6bd9857547e360be725dfc66acb56e1bb5665277d340761d0110a8823763ad4d2d1f4 SHA512 6d90a34a20e9cbc7e7a9b5b63a1408f33ac8523f2be6c9ab6d9ad7589c3ded83c87e460d782d4d8c33f11b337151fd8db994099e371260ecf204933e844eb50e
 DIST mysql-8.0.25-patches-02.tar.xz 6456 BLAKE2B c9c1020a505ebcee836f8dc3bbe540ff924a0174daf36c37b852df267a81919d37581d1c9be037d52cdcd34c27c5c34d3f0af6160857b22d8ab4d8ece37798e0 SHA512 3c3726b397f3a6fb1d84396bb571b4903a167c9a47273b9d5996949e1d3febc96d3528bfa8dfaeea073a245051ae10c983f2ad258268babc91649563ce3cfc00
+DIST mysql-8.0.26-patches-01.tar.xz 6980 BLAKE2B 5fc86125b622ac978dc7ec3d6954a1d366315a57b6f56ca8dade9ad4a255b4b793ad33736404b29ab2db12f726897f014aeec9232dc52954087e7533d0f593d2 SHA512 00e6478716cf857b8ab768ec481dc1e7d809db17a9d899a52822f61dcc18797e87c0eecfafb1bb9065895c1b261c03c87fe0593b59dc86fb40853b0c660c9bfb
 DIST mysql-boost-5.7.27.tar.gz 51436383 BLAKE2B 6db64ab5fa659aae9baa3725a0de9465e48c37618ffd69f34809880c06a00ce55dce77f507810c6fa52d86901facfa42d3d1bd8db1914a779fbc88a69be82497 SHA512 573f4555f3d62bcd3dc2228bcfba023518d462bb6689114a3505ccf7c7c3061d2775a8e7a37ec3c8b9dea6e8fbc56ba599610f237abc38cedff58e75799bdc52
 DIST mysql-boost-5.7.29.tar.gz 51417554 BLAKE2B 652ce9f99419387e9bcc37afeb1b46438784752e963c3aa1877f17650c31d8b058b4052da97c3a7e9454e758c259d6c311e0518f9a75909fce9741150b82164c SHA512 38acf7c2a10b20c59230ad05cd2cd6996c4c582233c1be573ead08e5c6684275790da07a036570363f89b4d61547b306589b0b98ed5fca70723a3f2cbc21fe11
 DIST mysql-boost-5.7.30.tar.gz 51363998 BLAKE2B 7897ad74b685c3b30e7ecdf132fdfa72f3416c05e8d0086cb8f7674b6c4f377fff9abc51ed258cc4dfeab50a2cb393af9076d9c1f9a83a26521facbaf223afa1 SHA512 b75d41d0c72d16c6f8d5393dab6e476b7993d296eb5683c12417ce2da3db2052fdab2a152f6e7c545315d21bfa35f26a247cb6cdab83d3418b5d34ed7f5f9560
@@ -22,12 +24,14 @@ DIST mysql-boost-5.7.31.tar.gz 51382559 BLAKE2B 86430ee01b0b066ffbd1c876c7d09afe
 DIST mysql-boost-5.7.32.tar.gz 52882168 BLAKE2B dd112fa1d8bd29d86fba076675b5b7c9c98b6fb876aed45a00e8a25be716102fc9aa688b7170bef07b1c9f9751737277774d8fb2c64c21e181ecae58f89b4a8a SHA512 33a617d040efd065ea1c2ad84be537f851480abd5cc8a6879b7f170bc4e6db9432bd03f2a6bc680b71f17839c508cab0e7ef1a3aba032197da1b7943c916c77a
 DIST mysql-boost-5.7.33.tar.gz 52912380 BLAKE2B bca09314ae73932f6095799faa016998e65655cf5ea74d5596dcdc785e77014fe0b29a6c123e8618771f4a20a19978df00f7b79eea329aeb4b536ae71a4bef94 SHA512 1d1e1e5934fb17ff731fea45b88d4af6a394c2fbf0177a87803b18cb0eb4fb8d4939f82fc22b6cbc2af64022a44e206cd23e2e88ce11cc119c3ea22129d54e7a
 DIST mysql-boost-5.7.34.tar.gz 52891142 BLAKE2B 986fe106d73495ea9acb837f699ef2b1ffd123d9728b61da42f990d670569f1f7c12dc0a8611c3a7b6e3ed7be9fc277e1a977fa6c6d06f7d156a2f492951d9c7 SHA512 4eab7e90477b75643df743d806d5abcfb56572a2aa003a354980287c9148209f4fb7f0158ba969fb0462c32e49fcb4cf2a79f0330ab1bd2b243725dbf6f31d6d
+DIST mysql-boost-5.7.35.tar.gz 52959014 BLAKE2B 02cbc2201176773516479636ab40828a98bbc6bc1e90060e36d36af5c20a84b4b415d6e467328890ecff044834c81458fff8b717fd8942196dcf35e0ae85f298 SHA512 2469c8e13a236aee327bc0828804ba189e3abf78b6e0b3ef65b2343210f9c0cd5313d18b57ae3b76ca1487dc1d70854c8a12e6da61a6fffbce95854dcc792482
 DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4 SHA512 5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01
 DIST mysql-boost-8.0.20.tar.gz 266282970 BLAKE2B 2aeb9d6c575ed9dc2d00d3e51e6391c59ffa39156491d9ed2c07e19bb2efb88a14d5a9d4b537c137d71854e39fa3a7fc2b93618118d4fd062e92ba2d83783c6f SHA512 7a962e9ddec7069008c5ab6ac2801515e2661ca2875afc6141541c03e2f941f4255b3c0d806a4df2fd2f2f1d12323aeb1e456c1d364777a18ccebefad7b22a99
 DIST mysql-boost-8.0.21.tar.gz 278292192 BLAKE2B 9e5a14d1401f58f6f620c8691d2d4d3ada122a79a4e081380050961f0add93bf32b682c60ea2a6e58f50a4fcedbd323d8efe2d5f3e1f2bba5010e201a2df5d44 SHA512 18128edd7d9604ea69bd308f372d6663ef3629503969148e3a2117175c4ef625358b31b96e0e1b8d10a87037719e3cb61d5c71eee1e26ab0e0a1731977a2d7c1
 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
 DIST mysql-boost-8.0.25.tar.gz 290265324 BLAKE2B 5393a2a2525a886d9ece19777deae01e6c0b24b9ff5a0a5ffb9075740ed912d0df59a165b6ec9ceb60c7c28f3062cda5cceb4da3a8280f42549984c846f1ce5c SHA512 af653ccff66a9d87221b46ad4f7bcc629700549f758998b9a7fb22e4573b9495a28624e031f016f9ad8fe0dfcf481b82f1ffe224aa48c2d45531570026b26081
+DIST mysql-boost-8.0.26.tar.gz 291285918 BLAKE2B 6198ca8982a8c9df7e6ee4df5e2c1e0d64d2eb4d83cb7265317b58d55f6787c3240c8e40d196f2326ff3d66926ad7dab0705edd92e5a82881ce6ddb7f0c510b9 SHA512 63d47cb52407a816dc9f4330b99924624dfee46e57e7fdce19eff32909dd9e23251e2439d1807b002a1661b547173222c77465a3ca4dbb312414a84927809cfc
 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
 DIST mysql-extras-20200125-1945Z.tar.bz2 344906 BLAKE2B 0e87875efbc221ded43d6f080dc7dce4277b676b538950120c94b962e51d054093286486e5d83ea3e38e1b2d0b12cf81873df50e1cebbe4cff33b54297e6a17a SHA512 5fcc5d372998db2b8aef32661ff71290791c20c1195a6210ca79c0fda12008906e665f9dc878d3df5a38a95e23ff05b910daa861002c17a1b6de71ef0520bee1
 DIST mysql-extras-20200317-0103Z.tar.bz2 344905 BLAKE2B c4c8bb2acea16663ab32cf291d0a2d52af04448a507ad3a6dc22dfdef4d6ba427582d66e5923d05cd51565286f85c8df5ccabef9a67a4a500574d21e1f708f27 SHA512 d1d34817faf0a1271f906213eea9081c204d745b14f96166f17d5c60a29ec58c05926e7216f135b6e9d5df2ceab373f10fc4e6a652514d99ba34a336571dce1f
@@ -39,6 +43,7 @@ EBUILD mysql-5.7.32.ebuild 37185 BLAKE2B 13be67482bf1e3e7171b9ce7468d51c1f67dc46
 EBUILD mysql-5.7.33.ebuild 37400 BLAKE2B 9245b583265b65125d35d6d52c317c547ded926243c0d7d430e7739c27efc2148e40c968aa55eed964c3064c4f4df82ddeacfc180d47e62e51c5707bc7984311 SHA512 dba99a3536f75fced834e3eb9da03ae5e0f026409165cf805295f216b7e3bc2d153927f7716d1cc52bf4f1f1d88fa834383a25d16ca263e036c01f07db7935f9
 EBUILD mysql-5.7.34-r1.ebuild 37926 BLAKE2B e54221ee692a88622ee14de708a8b6915e094c79e8a5335f21daa31de9faad2239a7bbecf0a0f6a06454181644d4d94fd391a4ad69e1357c46dd8823f0b2bc9e SHA512 487af4a1700925a64f57317094f6dcf77a78012efb2aff8ed56996e635376ba8337c247c089ac2cb68dff229af73978d542134149a9753475656a7f9ea88cdfa
 EBUILD mysql-5.7.34.ebuild 37469 BLAKE2B 3f757205809101de39ab46dc0e87c030596fbe0a716154f59c17b4e185b13763c74a334f2855715e4daeb660aadaa21684489afa68aa3dea0e1188a60e10a6ea SHA512 2dac5cf7e07e177bf7262400a7610d65e524b76bbc6e4a8270fc9a20fbe82f650790df33f0f0aa003dfa16dc6d9e24619270160e039488c5ae9915103d377e5c
+EBUILD mysql-5.7.35.ebuild 38794 BLAKE2B 98fb41f3f809247823e40dcdf1a7a42d1522b22a466aa4e0049d875d7bf09fd1495e785cb637292bfb9084aac082b6cbe7bf3d6e9cf349c034ab8d93d44bcd72 SHA512 3e9ce6308bb4f0310aeed26fdfd576aba1c08380e1844b5a39162a918b29109fa653ab293c2dadd87619bab36c9a7d1077b67c79261ae1b904caceaaaf9f5ff9
 EBUILD mysql-8.0.19-r2.ebuild 37706 BLAKE2B c8c70f4ec09c2c7fbfbdc76aa6362a0c553c1b8ae8b13edd12d2f3a0a52ab12e692c13f706813d7eb9bda5f49fc9b932fc832213056bb985c2821ec86309892a SHA512 13d96f95cdf1df2367272a1c5352501a95779b8e9c411103d55f90e6035e7b4893cf208fb92e60c1cf3df3d1ab8c6ad48a89b1096705d7f126b8462915fc2998
 EBUILD mysql-8.0.20-r1.ebuild 37043 BLAKE2B e05d79b543cda0f4ad5a4f1fe9ed72dcec32382704e41aded18e57b6c8a0f85dbe71f58d30a97a9631919272c443e85d22b269d5adedd5f01a8b004f88cfccbd SHA512 4eb892d96d3177e7aa518f1fd49aa156eab70da90cce58d2e180c1e87c8b79cb45314c5a6e52185e3fa9b5566a4be8054a37d63338c9ff5d730fe81747e45737
 EBUILD mysql-8.0.21-r1.ebuild 37994 BLAKE2B ca5f8588d0acafb0a323d92922e6a98fdaa4e41bc587f9815b6afce50d03915e8e674d243952ddc6d56e93fbb2255679536ee8d982bdfea394880631819c8d1f SHA512 eab92d18be2c4d2c2192480a66ba547b7cb94b6c903c13fc4f697f2d6eae06bbdc194c4bf07beb337aebdbdcbc8e779bfdfeb0e7d8af1721521acb54c3c8129d
@@ -46,4 +51,5 @@ EBUILD mysql-8.0.22.ebuild 37433 BLAKE2B 7d047acfdde052e6745869ae3dc3536cc4f6d17
 EBUILD mysql-8.0.23.ebuild 37575 BLAKE2B 135ee2f924ab3b50a73ee6366ee9b84815cb81944c9be9ae48c3ed643e6f288d7b2541f6feafa3bffefa28e75b81eaead199704b93b6c3e4e02a158cea868b0b SHA512 3f0dbca7e24b4c696d5970657bb7b405878e6330a6fb26815707d5a3bee7117ab0f1434ecc799515790870544f92973a31eb871363926b5d3be4b9617484decd
 EBUILD mysql-8.0.25-r1.ebuild 38788 BLAKE2B 244b3d40e9259afac98fe5fb390dea72c129ae146e084ba96c18f9d66ebc6d18816f9a41dffa9f1d320a3e27a11f88fdbfa2ebe7793c0239b7dc3ce5fd31883d SHA512 7256272c163cee93b11ad6a2d7beb17a639aec3553c7fe8082a759961c3103e3dc1cdd4faa28d3fa8d3ff4f83da08c8915a363f0e38a98d96ec22d5c151fdf69
 EBUILD mysql-8.0.25.ebuild 38045 BLAKE2B 58b11ccbfa68becee5f4c4f9f9a8401a68feaa32614e0490d80f2647a05209610bffed0840b9f823060641db015fd5919ff02e5a649e08733bcaf92c7ede466e SHA512 82819be1bf26aa113b49bad38652969722988829b5e8fd97202258bc7a06a8ddd2d77ca5c4e8cdf7f50700cbb4d26c4515ef62ae8489dd0c650416f0e770d405
+EBUILD mysql-8.0.26.ebuild 40485 BLAKE2B 4c0097a27bf86bf0ab9800123389230cbfb9a5044108d97f541a9e55e7f7a702f694ac3e501fc1fe4499ef2958236b7ac8ab51b4cd2f27e38e8c65e3d032b285 SHA512 4ba9902db02d11ad5bfb7db9935895f7c858a6991b5541172d523df0547d22be93ae81b4d3798aec36dac6461afb4bee9ec4e894024ef6a8815b24ecda3fe80d
 MISC metadata.xml 1360 BLAKE2B abb7dcadad78c58d6bc6a56e34795903309f1b506e49b00b09f06e9ae1cbb9a5d246295b9c351353ecc08f157a64f421072dae9c7b0d43ce93cde21d3917489e SHA512 2f676f17cff8fb79b58ec7baec00bddc9e3247ca0bd8c8202bccb08f3e8ceacd682db742b38bf73d667e84b9671d085deae1682221e684443466218c6a9fb759
diff --git a/dev-db/mysql/mysql-5.7.35.ebuild b/dev-db/mysql/mysql-5.7.35.ebuild
new file mode 100644
index 000000000000..6415ac60efcc
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.35.ebuild
@@ -0,0 +1,1293 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit check-reqs cmake flag-o-matic linux-info \
+	multiprocessing prefix toolchain-funcs multilib-minimal
+
+# Patch version
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${PN}-5.7.35-patches-01.tar.xz"
+
+SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${PV}.tar.gz
+	https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${PV}.tar.gz
+	http://downloads.mysql.com/archives/MySQL-5.7/${PN}-boost-${PV}.tar.gz
+	${PATCH_SET}"
+
+HOMEPAGE="https://www.mysql.com/"
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+LICENSE="GPL-2"
+SLOT="5.7/18"
+IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling
+	selinux +server static static-libs systemtap tcmalloc test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+# MULTILIB_USEDEP only set for libraries used by the client library
+COMMON_DEPEND="
+	sys-libs/ncurses:0=
+	client-libs? (
+		>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
+		>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?]
+	)
+	!client-libs? (
+		dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
+		>=sys-libs/zlib-1.2.3:0=
+		>=dev-libs/openssl-1.0.0:0=
+	)
+	server? (
+		>=app-arch/lz4-0_p131:=
+		cjk? ( app-text/mecab:= )
+		experimental? (
+			dev-libs/libevent:=[ssl]
+			dev-libs/protobuf:=
+			net-libs/libtirpc:=
+		)
+		jemalloc? ( dev-libs/jemalloc:0= )
+		kernel_linux? (
+			dev-libs/libaio:0=
+			sys-process/procps:0=
+		)
+		numa? ( sys-process/numactl )
+	)
+	systemtap? ( >=dev-util/systemtap-1.3:0= )
+	tcmalloc? ( dev-util/google-perftools:0= )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	dev-libs/protobuf
+	virtual/yacc
+	server? (
+		dev-libs/libevent:=[ssl]
+		experimental? ( net-libs/rpcsvc-proto )
+	)
+	static? ( sys-libs/ncurses[static-libs] )
+	test? (
+		acct-group/mysql acct-user/mysql
+		dev-perl/JSON
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	!dev-db/mysql:0
+	!dev-db/mysql:8.0
+	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= )
+	selinux? ( sec-policy/selinux-mysql )
+	server? (
+		!prefix? (
+			acct-group/mysql acct-user/mysql
+			dev-db/mysql-init-scripts
+		)
+	)
+"
+
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+	: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	: ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	: ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+	MY_DATADIR="${MY_LOCALSTATEDIR}"
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use server ; then
+			CHECKREQS_DISK_BUILD="3G"
+
+			if has test $FEATURES ; then
+				CHECKREQS_DISK_BUILD="9G"
+			fi
+
+			check-reqs_pkg_pretend
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		CHECKREQS_DISK_BUILD="3G"
+
+		if has test ${FEATURES} ; then
+			CHECKREQS_DISK_BUILD="9G"
+
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+
+			local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null)
+			[[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] \
+				&& die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!"
+
+			if use latin1 ; then
+				# Upstream only supports tests with default charset
+				die "Testing with USE=latin1 is not supported."
+			fi
+		fi
+
+		if use kernel_linux ; then
+			if use numa ; then
+				linux-info_get_any_version
+
+				local CONFIG_CHECK="~NUMA"
+
+				local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
+				WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
+
+				check_extra_config
+			fi
+		fi
+
+		use server && check-reqs_pkg_setup
+	fi
+}
+
+pkg_preinst() {
+	# Here we need to see if the implementation switched client libraries
+	# We check if this is a new instance of the package and a client library already exists
+	local SHOW_ABI_MESSAGE libpath
+	if use client-libs && [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}/usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+		libpath=$(readlink "${EROOT}/usr/$(get_libdir)/libmysqlclient.so")
+		elog "Due to ABI changes when switching between different client libraries,"
+		elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
+		elog "Please run: revdep-rebuild --library ${libpath}"
+		ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
+	fi
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	if use server ; then
+		if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+			einfo
+			elog "You might want to run:"
+			elog "\"emerge --config =${CATEGORY}/${PF}\""
+			elog "if this is a new install."
+			elog
+			elog "If you are switching server implentations, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		else
+			einfo
+			elog "If you are upgrading major versions, you should run the"
+			elog "mysql_upgrade tool."
+			einfo
+		fi
+	fi
+
+	# Note about configuration change
+	einfo
+	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/mysql.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${P}" "${S}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/mysql-patches
+
+	if use jemalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+
+	if use tcmalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	# Remove bundled libs so we cannot accidentally use them
+	# We keep extra/lz4 directory because we use extra/lz4/xxhash.c via sql/CMakeLists.txt:394
+	rm -rv \
+		"${S}"/extra/protobuf \
+		"${S}"/extra/libevent \
+		"${S}"/zlib \
+		|| die
+
+	# Don't clash with dev-db/mysql-connector-c
+	rm \
+		man/my_print_defaults.1 \
+		man/perror.1 \
+		man/zlib_decompress.1 \
+		|| die
+
+	sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# code is not C++17 ready, bug #786402
+	append-cxxflags -std=c++14
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	if use client-libs ; then
+		multilib-minimal_src_configure
+	else
+		multilib_src_configure
+	fi
+}
+
+multilib_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if ! multilib_is_native_abi && ! use client-libs ; then
+		return
+	fi
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_SCRIPTDIR=share/mysql/scripts
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		### TODO: make this system but issues with UTF-8 prevent it
+		-DWITH_EDITLINE=bundled
+		-DWITH_ZLIB=system
+		-DWITH_SSL=system
+		-DWITH_LIBWRAP=0
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		-DWITH_DEFAULT_FEATURE_SET=0
+		# The build forces this to be defined when cross-compiling. We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DWITH_CURL=system
+		-DWITH_BOOST="${S}/boost"
+	)
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	if ! use client-libs ; then
+		mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
+	fi
+
+	# bfd.h is only used starting with 10.1 and can be controlled by NOT_FOR_DISTRIBUTION
+	# systemtap only works on native ABI, bug 530132
+	if multilib_is_native_abi ; then
+		mycmakeargs+=(
+			-DENABLE_DTRACE=$(usex systemtap)
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_TOOLS=1
+			-DWITH_READLINE=1
+			-DENABLE_DTRACE=0
+		)
+	fi
+
+	if multilib_is_native_abi && use server ; then
+		mycmakeargs+=(
+			-DWITH_LIBEVENT=system
+			-DWITH_LZ4=system
+			-DWITH_PROTOBUF=system
+			-DWITH_MECAB=$(usex cjk system OFF)
+			-DWITH_NUMA=$(usex numa ON OFF)
+			-DWITH_RAPID=$(usex experimental ON OFF)
+		)
+
+		if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]] ; then
+			ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+			ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+			ewarn "You MUST file bugs without these variables set."
+
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+				-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+			)
+		elif ! use latin1 ; then
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=utf8
+				-DDEFAULT_COLLATION=utf8_general_ci
+			)
+		else
+			mycmakeargs+=(
+				-DDEFAULT_CHARSET=latin1
+				-DDEFAULT_COLLATION=latin1_swedish_ci
+			)
+		fi
+
+		mycmakeargs+=(
+			-DEXTRA_CHARSETS=all
+			-DDISABLE_SHARED=$(usex static YES NO)
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_EMBEDDED_SERVER=OFF
+		)
+
+		if use profiling ; then
+			# Setting to OFF doesn't work: Once set, profiling options will be added
+			# to `mysqld --help` output via sql/sys_vars.cc causing
+			# "main.mysqld--help-notwin" test to fail
+			mycmakeargs+=( -DENABLED_PROFILING=ON )
+		fi
+
+		if use static ; then
+			mycmakeargs+=( -DWITH_PIC=1 )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_EXAMPLE_STORAGE_ENGINE=0
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_FEDERATED_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_PARTITION_STORAGE_ENGINE=1
+		)
+
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_EMBEDDED_SERVER=OFF
+			-DEXTRA_CHARSETS=none
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	if use client-libs ; then
+		multilib-minimal_src_compile
+	else
+		multilib_src_compile
+	fi
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+}
+
+# Official test instructions:
+# ulimit -n 16500 && \
+# USE='latin1 perl server' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	if [[ -z "${MTR_PARALLEL}" ]] ; then
+		local -x MTR_PARALLEL=$(makeopts_jobs)
+
+		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+			# Running multiple tests in parallel usually require higher ulimit
+			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
+			# are known to hit timeout when system is busy.
+			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+			# using "auto".
+			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+			einfo "${info_msg}"
+			unset info_msg
+			MTR_PARALLEL=4
+		fi
+	else
+		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+	fi
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	# Run mysql tests
+	pushd "${TESTDIR}" &>/dev/null || die
+
+	touch "${T}/disabled.def"
+	# These are failing in MySQL 5.7 for now and are believed to be
+	# false positives:
+	#
+	local t
+
+	for t in \
+		auth_sec.keyring_udf \
+		innodb.alter_kill \
+		innodb.innodb-multiple-tablespaces \
+		innodb.import_compress_encrypt \
+		perfschema.privilege_table_io \
+	; do
+			_disable_test "$t" "False positives in Gentoo"
+	done
+
+	# Unstable tests
+	# - main.xa_prepared_binlog_off: https://bugs.mysql.com/bug.php?id=83340
+	# - rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch: https://bugs.mysql.com/bug.php?id=89223
+	# - rpl.rpl_non_direct_stm_mixing_engines: MDEV-14489
+	for t in \
+		main.xa_prepared_binlog_off \
+		rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch \
+		rpl.rpl_non_direct_stm_mixing_engines \
+	; do
+		_disable_test "$t" "Unstable test"
+	done
+
+	for t in \
+		gis.geometry_class_attri_prop \
+		gis.geometry_property_function_issimple \
+		gis.gis_bugs_crashes \
+		gis.spatial_op_testingfunc_mix \
+		gis.spatial_analysis_functions_buffer \
+		gis.spatial_analysis_functions_distance \
+		gis.spatial_utility_function_distance_sphere \
+		gis.spatial_utility_function_simplify \
+		gis.spatial_analysis_functions_centroid \
+		main.with_recursive \
+	; do
+		_disable_test "$t" "Known rounding error with latest AMD processors"
+	done
+
+	if ! hash zip 1>/dev/null 2>&1 ; then
+		# no need to force dep app-arch/zip for one test
+		_disable_test "innodb.partition_upgrade_create" "Requires app-arch/zip"
+	fi
+
+	if use numa && use kernel_linux ; then
+		# bug 584880
+		if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then
+			for t in sys_vars.innodb_numa_interleave_basic ; do
+				_disable_test "$t" "Test $t requires system with NUMA support"
+			done
+		fi
+	fi
+
+	if ! use latin1 ; then
+		# The following tests will fail if DEFAULT_CHARSET
+		# isn't set to latin1:
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_xa_prepared_disconnect \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			innodb.innodb_pagesize_max_recordsize \
+			innodb.innodb-system-table-view \
+			innodb.mysqldump_max_recordsize \
+			main.mysql_client_test \
+			main.mysqld--help-notwin \
+			main.mysqldump_bugs \
+			main.type_string \
+			main.information_schema \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+			rpl.rpl_xa_survive_disconnect \
+			rpl.rpl_xa_survive_disconnect_lsu_off \
+			rpl.rpl_xa_survive_disconnect_table \
+		; do
+			_disable_test "$t" "Requires DEFAULT_CHARSET=latin1 but USE=-latin1 is set"
+		done
+	fi
+
+	if has_version ">=dev-libs/openssl-3" ; then
+		# >=dev-libs/openssl-3 defaults to security level 1 which disallow
+		# TLSv1/1.1 but tests will require TLSv1/1.1.
+		einfo "Set OpenSSL configuration for test suite ..."
+		cat > "${T}/openssl_tlsv1.cnf" <<- EOF || die
+		openssl_conf = default_conf
+
+		[ req ]
+		default_bits			= 2048
+		default_keyfile 		= privkey.pem
+		distinguished_name		= req_distinguished_name
+
+		[ req_distinguished_name ]
+		countryName			= Country Name (2 letter code)
+		countryName_default		= AU
+		countryName_min			= 2
+		countryName_max			= 2
+
+		stateOrProvinceName		= State or Province Name (full name)
+		stateOrProvinceName_default	= Some-State
+
+		localityName			= Locality Name (eg, city)
+
+		0.organizationName		= Organization Name (eg, company)
+		0.organizationName_default	= Internet Widgits Pty Ltd
+
+		organizationalUnitName		= Organizational Unit Name (eg, section)
+
+		commonName			= Common Name (e.g. server FQDN or YOUR name)
+		commonName_max			= 64
+
+		emailAddress			= Email Address
+		emailAddress_max		= 64
+
+		[default_conf]
+		ssl_conf = ssl_sect
+
+		[ssl_sect]
+		system_default = system_default_sect
+
+		[system_default_sect]
+		CipherString = DEFAULT@SECLEVEL=0
+		EOF
+
+		local -x OPENSSL_CONF="${T}/openssl_tlsv1.cnf"
+	fi
+
+	if has_version '>=dev-libs/openssl-1.1.1' ; then
+		# Tests are expecting <openssl-1.1.1 default cipher
+		for t in \
+			auth_sec.cert_verify \
+			auth_sec.mysql_ssl_connection \
+			auth_sec.openssl_cert_generation \
+			auth_sec.ssl_auto_detect \
+			auth_sec.ssl_mode \
+			auth_sec.tls \
+			binlog.binlog_grant_alter_user \
+			encryption.innodb_onlinealter_encryption \
+			main.grant_alter_user_qa \
+			main.grant_user_lock_qa \
+			main.mysql_ssl_default \
+			main.openssl_1 \
+			main.plugin_auth_sha256 \
+			main.plugin_auth_sha256_2 \
+			main.plugin_auth_sha256_server_default \
+			main.plugin_auth_sha256_server_default_tls \
+			main.plugin_auth_sha256_tls \
+			main.ssl \
+			main.ssl_8k_key \
+			main.ssl_bug75311 \
+			main.ssl_ca \
+			main.ssl_cipher \
+			main.ssl_compress \
+			main.ssl_crl \
+			main.ssl_ecdh \
+			main.ssl_verify_identity \
+			x.connection_tls_version \
+			x.connection_openssl \
+		; do
+			_disable_test  "$t" "Requires <dev-libs/openssl-1.1.1"
+		done
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	local MULTILIB_WRAPPED_HEADERS
+	local MULTILIB_CHOST_TOOLS
+	if use client-libs ; then
+		# headers with ABI specific data
+		MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/mysql/server/my_config.h
+			/usr/include/mysql/server/mysql_version.h )
+
+		# wrap the config scripts
+		MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+		multilib-minimal_src_install
+	else
+		multilib_src_install
+		multilib_src_install_all
+	fi
+}
+
+# Intentionally override eclass function
+multilib_src_install() {
+	cmake_src_install
+
+	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
+	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
+}
+
+multilib_src_install_all() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
+	cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	if use server ; then
+		mycnf_src="my.cnf.distro-server"
+		sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+			"${FILESDIR}/${mycnf_src}" \
+			> "${TMPDIR}/my.cnf.ok" || die
+
+		if use prefix ; then
+			sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+
+		if use latin1 ; then
+			sed -i \
+				-e "/character-set/s|utf8|latin1|g" \
+				"${TMPDIR}/my.cnf.ok" || die
+		fi
+
+		eprefixify "${TMPDIR}/my.cnf.ok"
+
+		newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+	fi
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="$1"
+		local flag="--${2}="
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+		if [[ ${#results[@]} -gt 0 ]] ; then
+			# When option is set multiple times only return last value
+			echo "${results[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local mysql_install_log="$(_mktemp_dry "${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log")"
+	if [[ -z "${mysql_install_log}" ]] ; then
+		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log' failed!"
+	else
+		# make sure file is writable for MYSQL_USER...
+		touch "${mysql_install_log}" || die
+		chown ${MYSQL_USER} "${mysql_install_log}" || die
+	fi
+
+	local mysqld_logfile="$(_mktemp_dry "${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log")"
+	if [[ -z "${mysqld_logfile}" ]] ; then
+		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log' failed!"
+	else
+		# make sure file is writable for MYSQL_USER...
+		touch "${mysqld_logfile}" || die
+		chown ${MYSQL_USER} "${mysqld_logfile}" || die
+	fi
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="$(_mktemp_dry "${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql")"
+	[[ -z "${tz_sql}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql' failed!"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	# --initialize-insecure will not set root password
+	# --initialize would set a random one in the log which we don't need as we set it ourselves
+	local cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--initialize-insecure"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	rm "${tz_sql}" || die
+
+	local x=${RANDOM}
+	local socket="${EROOT}${PID_DIR}/mysqld${x}.sock"
+	local pidfile="${EROOT}${PID_DIR}/mysqld${x}.pid"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/mysql/mysql-8.0.26.ebuild b/dev-db/mysql/mysql-8.0.26.ebuild
new file mode 100644
index 000000000000..5ed73cab5815
--- /dev/null
+++ b/dev-db/mysql/mysql-8.0.26.ebuild
@@ -0,0 +1,1226 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit check-reqs cmake flag-o-matic linux-info \
+	multiprocessing prefix toolchain-funcs
+
+MY_PV="${PV//_pre*}"
+MY_P="${PN}-${MY_PV}"
+
+# Patch version
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${PN}-8.0.26-patches-01.tar.xz"
+
+SRC_URI="https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-${MY_PV}.tar.gz
+	https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${MY_PV}.tar.gz
+	http://downloads.mysql.com/archives/MySQL-8.0/${PN}-boost-${MY_PV}.tar.gz
+	${PATCH_SET}"
+
+HOMEPAGE="https://www.mysql.com/"
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+LICENSE="GPL-2"
+SLOT="8.0"
+IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling
+	router selinux +server tcmalloc test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )
+	cjk? ( server )
+	jemalloc? ( server )
+	numa? ( server )
+	profiling? ( server )
+	router? ( server )
+	tcmalloc? ( server )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	>=app-arch/lz4-0_p131:=
+	app-arch/zstd:=
+	sys-libs/ncurses:0=
+	>=sys-libs/zlib-1.2.3:0=
+	>=dev-libs/openssl-1.0.0:0=
+	server? (
+		dev-libs/icu:=
+		dev-libs/libevent:=[ssl,threads]
+		>=dev-libs/protobuf-3.8:=
+		net-libs/libtirpc:=
+		cjk? ( app-text/mecab:= )
+		jemalloc? ( dev-libs/jemalloc:0= )
+		kernel_linux? (
+			dev-libs/libaio:0=
+			sys-process/procps:0=
+		)
+		numa? ( sys-process/numactl )
+		tcmalloc? ( dev-util/google-perftools:0= )
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	virtual/yacc
+	server? ( net-libs/rpcsvc-proto )
+	test? (
+		acct-group/mysql acct-user/mysql
+		dev-perl/JSON
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
+	!dev-db/mysql:0
+	!dev-db/mysql:5.7
+	selinux? ( sec-policy/selinux-mysql )
+	!prefix? (
+		acct-group/mysql acct-user/mysql
+		dev-db/mysql-init-scripts
+	)
+"
+
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+	: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	: ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	: ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+	MY_DATADIR="${MY_LOCALSTATEDIR}"
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use server ; then
+			CHECKREQS_DISK_BUILD="2G"
+
+			if has test $FEATURES ; then
+				CHECKREQS_DISK_BUILD="9G"
+			fi
+
+			check-reqs_pkg_pretend
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		CHECKREQS_DISK_BUILD="2G"
+
+		if has test ${FEATURES} ; then
+			CHECKREQS_DISK_BUILD="9G"
+
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+
+			local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null)
+			[[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] \
+				&& die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!"
+
+			if use latin1 ; then
+				# Upstream only supports tests with default charset
+				die "Testing with USE=latin1 is not supported."
+			fi
+		fi
+
+		if use kernel_linux ; then
+			if use numa ; then
+				linux-info_get_any_version
+
+				local CONFIG_CHECK="~NUMA"
+
+				local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
+				WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
+
+				check_extra_config
+			fi
+		fi
+
+		use server && check-reqs_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${MY_P}" "${S}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/mysql-patches
+
+	# Avoid rpm call which would trigger sandbox, #692368
+	sed -i \
+		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
+		CMakeLists.txt || die
+
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	# Remove man pages for client-lib tools we don't install
+	rm \
+		man/my_print_defaults.1 \
+		man/perror.1 \
+		man/zlib_decompress.1 \
+		|| die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# code is not C++17 ready, bug #786402
+	append-cxxflags -std=c++14
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		# Using bundled editline to get CTRL+C working
+		-DWITH_EDITLINE=bundled
+		-DWITH_ZLIB=system
+		-DWITH_SSL=system
+		-DWITH_LIBWRAP=0
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		# The build forces this to be defined when cross-compiling. We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
+		-DWITH_CURL=system
+		-DWITH_BOOST="${S}/boost"
+		-DWITH_ROUTER=$(usex router ON OFF)
+	)
+
+	if is-flagq -fno-lto ; then
+		einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
+		mycmakeargs+=( -DWITH_LTO=OFF )
+	elif is-flagq -flto ; then
+		einfo "LTO forced via {C,CXX,F,FC}FLAGS"
+		myconf+=( -DWITH_LTO=ON )
+	else
+		# Disable automagic
+		myconf+=( -DWITH_LTO=OFF )
+	fi
+
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
+
+	mycmakeargs+=(
+		-DWITH_ICU=system
+		-DWITH_LZ4=system
+		# Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex
+		-DWITH_RAPIDJSON=bundled
+		-DWITH_ZSTD=system
+	)
+
+	if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then
+		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+		ewarn "You MUST file bugs without these variables set."
+		ewarn "Tests will probably fail!"
+
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+		)
+	elif use latin1 ; then
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=latin1
+			-DDEFAULT_COLLATION=latin1_swedish_ci
+		)
+	else
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=utf8mb4
+			-DDEFAULT_COLLATION=utf8mb4_0900_ai_ci
+		)
+	fi
+
+	if use server ; then
+		mycmakeargs+=(
+			-DWITH_EXTRA_CHARSETS=all
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_MECAB=$(usex cjk system OFF)
+			-DWITH_LIBEVENT=system
+			-DWITH_PROTOBUF=system
+			-DWITH_NUMA=$(usex numa ON OFF)
+		)
+
+		if use jemalloc ; then
+			mycmakeargs+=( -DWITH_JEMALLOC=ON )
+		elif use tcmalloc ; then
+			mycmakeargs+=( -DWITH_TCMALLOC=ON )
+		fi
+
+		if use profiling ; then
+			# Setting to OFF doesn't work: Once set, profiling options will be added
+			# to `mysqld --help` output via sql/sys_vars.cc causing
+			# "main.mysqld--help-notwin" test to fail
+			mycmakeargs+=( -DENABLED_PROFILING=ON )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_EXAMPLE_STORAGE_ENGINE=0
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_FEDERATED_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake_src_configure
+}
+
+# Official test instructions:
+# ulimit -n 16500 && \
+# USE='perl server' \
+# FEATURES='test userpriv' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	_disable_test() {
+		local rawtestname bug reason
+		rawtestname="${1}" ; shift
+		bug="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+		echo ${rawtestname} : BUG#${bug} ${reason} >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Run CTest (test-units)
+	cmake_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	if [[ -z "${MTR_PARALLEL}" ]] ; then
+		local -x MTR_PARALLEL=$(makeopts_jobs)
+
+		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+			# Running multiple tests in parallel usually require higher ulimit
+			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
+			# are known to hit timeout when system is busy.
+			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+			# using "auto".
+			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+			einfo "${info_msg}"
+			unset info_msg
+			MTR_PARALLEL=4
+		fi
+	else
+		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+	fi
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	# Run mysql tests
+	pushd "${TESTDIR}" &>/dev/null || die
+
+	touch "${T}/disabled.def"
+
+	local -a disabled_tests
+	disabled_tests+=( "auth_sec.atomic_rename_user;103512;Depends on user running test" )
+	disabled_tests+=( "auth_sec.keyring_file_data_qa;0;Won't work with user privileges" )
+	disabled_tests+=( "gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "innodb.alter_kill;0;Known test failure -- no upstream bug yet" )
+	disabled_tests+=( "main.derived_limit;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.explain_tree;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.gis-precise;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.mysql_load_data_local_dir;0;Known test failure -- no upstream bug yet" )
+	disabled_tests+=( "main.select_icp_mrr;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_bugs;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_dupsweed;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_dupsweed_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_dupsweed_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_firstmatch;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_firstmatch_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_firstmatch_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_mat_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.with_recursive;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "perfschema.statement_digest_query_sample;0;Test will fail on slow hardware")
+	disabled_tests+=( "rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch;0;Unstable test" )
+	disabled_tests+=( "rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure" )
+	disabled_tests+=( "rpl_gtid.rpl_multi_source_mtr_includes;0;Known failure - no upstream bug yet" )
+	disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware")
+	disabled_tests+=( "x.connection;0;Known failure - no upstream bug yet" )
+	disabled_tests+=( "x.message_compressed_payload;0;False positive caused by protobuff-3.11+" )
+	disabled_tests+=( "x.message_protobuf_nested;0;False positive caused by protobuff-3.11+" )
+
+	if ! hash zip 1>/dev/null 2>&1 ; then
+		# no need to force dep app-arch/zip for one test
+		disabled_tests+=( "innodb.discarded_partition_create;0;Requires app-arch/zip" )
+		disabled_tests+=( "innodb.partition_upgrade_create;0;Requires app-arch/zip" )
+	fi
+
+	if has_version ">=dev-libs/openssl-3" ; then
+		# >=dev-libs/openssl-3 defaults to security level 1 which disallow
+		# TLSv1/1.1 but tests will require TLSv1/1.1.
+		einfo "Set OpenSSL configuration for test suite ..."
+		cat > "${T}/openssl_tlsv1.cnf" <<- EOF || die
+		openssl_conf = default_conf
+
+		[ req ]
+		default_bits			= 2048
+		default_keyfile 		= privkey.pem
+		distinguished_name		= req_distinguished_name
+
+		[ req_distinguished_name ]
+		countryName			= Country Name (2 letter code)
+		countryName_default		= AU
+		countryName_min			= 2
+		countryName_max			= 2
+
+		stateOrProvinceName		= State or Province Name (full name)
+		stateOrProvinceName_default	= Some-State
+
+		localityName			= Locality Name (eg, city)
+
+		0.organizationName		= Organization Name (eg, company)
+		0.organizationName_default	= Internet Widgits Pty Ltd
+
+		organizationalUnitName		= Organizational Unit Name (eg, section)
+
+		commonName			= Common Name (e.g. server FQDN or YOUR name)
+		commonName_max			= 64
+
+		emailAddress			= Email Address
+		emailAddress_max		= 64
+
+		[default_conf]
+		ssl_conf = ssl_sect
+
+		[ssl_sect]
+		system_default = system_default_sect
+
+		[system_default_sect]
+		CipherString = DEFAULT@SECLEVEL=0
+		EOF
+
+		local -x OPENSSL_CONF="${T}/openssl_tlsv1.cnf"
+
+		disabled_tests+=( "x.connection_tls_version;0;Not compatible with OpenSSL 3.x error messages" )
+	fi
+
+	local test_infos_str test_infos_arr
+	for test_infos_str in "${disabled_tests[@]}" ; do
+		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+			die "Invalid test data set, not matching format: ${test_infos_str}"
+		fi
+
+		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+	done
+	unset test_infos_str test_infos_arr
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
+	cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	mycnf_src="my.cnf-8.0.distro-server"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR}/${mycnf_src}" \
+		> "${TMPDIR}/my.cnf.ok" || die
+
+	if use prefix ; then
+		sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+			"${TMPDIR}/my.cnf.ok" || die
+	fi
+
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8mb4|latin1|g" \
+			"${TMPDIR}/my.cnf.ok" || die
+	fi
+
+	eprefixify "${TMPDIR}/my.cnf.ok"
+
+	newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+
+	if use router ; then
+		rm -rf \
+			"${ED}/usr/LICENSE.router" \
+			"${ED}/usr/README.router" \
+			"${ED}/usr/run" \
+			"${ED}/usr/var" \
+			|| die
+	fi
+
+	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
+	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	# NOTE: $MY_LOGDIR contains $EPREFIX by default
+	[[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}"
+
+	# Note about configuration change
+	einfo
+	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/mysql.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		einfo
+		elog "You might want to run:"
+		elog "  \"emerge --config =${CATEGORY}/${PF}\""
+		elog "if this is a new install."
+		einfo
+	else
+		einfo
+		elog "Upgrade process for ${PN}-8.x has changed. Please read"
+		elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html"
+		einfo
+	fi
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="$1"
+		local flag="--${2}="
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+		if [[ ${#results[@]} -gt 0 ]] ; then
+			# When option is set multiple times only return last value
+			echo "${results[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local mysql_install_log="$(_mktemp_dry "${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log")"
+	if [[ -z "${mysql_install_log}" ]] ; then
+		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log' failed!"
+	else
+		# make sure file is writable for MYSQL_USER...
+		touch "${mysql_install_log}" || die
+		chown ${MYSQL_USER} "${mysql_install_log}" || die
+	fi
+
+	local mysqld_logfile="$(_mktemp_dry "${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log")"
+	if [[ -z "${mysqld_logfile}" ]] ; then
+		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log' failed!"
+	else
+		# make sure file is writable for MYSQL_USER...
+		touch "${mysqld_logfile}" || die
+		chown ${MYSQL_USER} "${mysqld_logfile}" || die
+	fi
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	local -a config_files
+
+	local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf"
+	if [[ -f "${config_file}" ]] ; then
+		config_files+=( "${config_file}" )
+	else
+		ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..."
+	fi
+
+	config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf"
+	if [[ -f "${config_file}" ]] ; then
+		config_files+=( "${config_file}" )
+	else
+		ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..."
+	fi
+
+	if [[ ${#config_files[@]} -gt 0 ]] ; then
+		if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then
+			local user_answer
+
+			echo
+			einfo "Please select default authentication plugin (enter number or plugin name):"
+			einfo "1) caching_sha2_password [MySQL 8.0 default]"
+			einfo "2) mysql_native_password [MySQL 5.7 default]"
+			einfo
+			einfo "For details see:"
+			einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password"
+			read -p "    >" user_answer
+			echo
+
+			case "${user_answer}" in
+				1|caching_sha2_password)
+					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password
+					;;
+				2|mysql_native_password)
+					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password
+					;;
+				'')
+					die "No authentication plugin selected!"
+					;;
+				*)
+					die "Authentication plugin '${user_answer}' is unknown/unsupported!"
+					;;
+			esac
+
+			echo "Selected authentication plugin: ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" >> "${mysql_install_log}"
+
+			unset user_answer
+		fi
+
+		local cfg_option cfg_option_tabs cfg_section
+		for config_file in "${config_files[@]}" ; do
+			cfg_option="default-authentication-plugin"
+			cfg_section="mysqld"
+			cfg_option_tabs="\t\t"
+			if [[ "${config_file}" == *client.cnf ]] ; then
+				cfg_option="default-auth"
+				cfg_section="client"
+				cfg_option_tabs="\t\t\t\t"
+			fi
+
+			if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then
+				einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
+				sed -i \
+					-e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \
+					"${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!"
+			else
+				einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
+				sed -i \
+					-e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \
+					"${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!"
+			fi
+		done
+		unset cfg_option cfg_option_tabs cfg_section
+	fi
+	unset config_files config_file
+
+	echo
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="$(_mktemp_dry "${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql")"
+	[[ -z "${tz_sql}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql' failed!"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	# --initialize-insecure will not set root password
+	# --initialize would set a random one in the log which we don't need as we set it ourselves
+	local cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--initialize-insecure"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	rm "${tz_sql}" || die
+
+	local x=${RANDOM}
+	local socket="${EROOT}${PID_DIR}/mysqld${x}.sock"
+	local pidfile="${EROOT}${PID_DIR}/mysqld${x}.pid"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-db/opendbx/Manifest b/dev-db/opendbx/Manifest
index 0e320ec792cf..1fdc21a58d70 100644
--- a/dev-db/opendbx/Manifest
+++ b/dev-db/opendbx/Manifest
@@ -3,8 +3,8 @@ AUX opendbx-man-optional.patch 1000 BLAKE2B a8e5dc4e0721b94acd0b379a6d27ea8e349e
 DIST libopendbx-1.5.0.tar.gz 583894 BLAKE2B c427bf8d79df6b83d0ce940d974625bd9b54e49e502f864d244a780185b6321f84a6b779e09b603a71ca26549844001268f0357169e9a74e742b9c2668e4b3ec SHA512 7e4e9b8c62fd981276f6747f8184d7e34d743b866bfd76c8126a16371b50dc682177fd563212333d2dbebe2128d0b1527fc69029833329ba8cc0311308fa9bb5
 DIST opendbx-1.4.5.tar.gz 582915 BLAKE2B 7a11947f73ba3a3d407fecf7600589b64a6a80b82f24720ae613d1dc7044e7efe3af8fe273c0cdb043923af2cee1913766054eff3267243345b89c6977124be6 SHA512 e46289f9a7eb8b6e4084863834f8c4ca080eb3343b5f9d5837c476bab0a39e798a6364c8648f9fb53e52ab60cae57749b9f7e9bd23cb95b8ff21160f1bf4247e
 DIST opendbx-1.4.6.tar.gz 587514 BLAKE2B 0a6c983ac1ebdc3ad9390185938f32e13ba9ff2ced6d41390421e1e3a1e9eb639a85d89da7ce2dd67f05fd2fcaebb2f53146f43678e548511403d8cdc4de88da SHA512 dd6d53d29157057dbf4e273fd82c7694e8bc626d3409d6ab9c25627a0fec96418326550fa8004b5341facdc4cd8aae12516224e8bb84e2562482885780ff0e55
-EBUILD opendbx-1.4.5-r1.ebuild 2228 BLAKE2B 832e135e2c0e9b9d67767f49f75d913e456121d4dfaeeddfc0ce54d94da743c72555710ba220beaf50742eacc2bcfde0ae4fa8af4ce9aabb5c9add3de9d772c2 SHA512 05578fa43e0c395ef539cfea5b1c1e5f2d13275a2980220161836a25607c497eb6f77f3f4d2a3fe6d26cb8199158a5b64b92e93773b44a0ad6cc07cbe3d977a1
-EBUILD opendbx-1.4.6-r2.ebuild 2230 BLAKE2B 82bc09a1a2a2fa313b3c9b98ed65cce5b47bc3f1e914b7dca6950bc7df2afca4f29015ab2c01ae7b29f646e3cb4cb2d965a3199b35ff3cd8f07d1d45e0c350ec SHA512 a01eed48b3b438fbc225783d69cda10f57760996dabbda414c2fb9f4a264b22228a92da8b0283456a70bba5ce60e9c0cbd1d41887b58927b7dc66f4792d188cb
+EBUILD opendbx-1.4.5-r1.ebuild 2272 BLAKE2B c7665d1c127c2e57700b7de8b27a4741598519e1015f771a33b46e0a4096211f10daf3de0561d4b485997ca0cea1c7315c5e5a86ce2f4655169969eb96533cb4 SHA512 d94f9e76079bd543a4efb05f76535c1105675d1cd6408b229186ea389fe9e732874541983e760f0453870d6199dc3e5b811c1505a6ed42da5463da7dbbbab617
+EBUILD opendbx-1.4.6-r2.ebuild 2274 BLAKE2B 66d13dc39c276c946fcd7950d6de2000678f3edb5fbf927b871ba22124776025b5c4b8004d9920c24d1b9eae5b221bd3576aff5d54104e85deb276f64f29cd07 SHA512 9861a4081ef4078bd95b5cf723e86caed76720e98f032116a39a8a23c98f89ae49c80d2c9ac1c304152d2cb916d7da69ad10d453385ae26d32503ab8c312e504
 EBUILD opendbx-1.4.6-r3.ebuild 2428 BLAKE2B c5d092a166a0d8cdcb07c6a20babea8e77770f97a8130aceea7c77b12df3f9e1f677b7b50caccc049839c31ca23f7754ca20351493014c8e53afdcd343f56a52 SHA512 7f0b73d7d80aa3361f665ea1dcbd9977ca27c54f00703cba4790664f04af73531a49a66fb76bbe829c896060e058c72323f1707adab3116e9ce1a359cc4accc0
 EBUILD opendbx-1.5.0-r2.ebuild 2298 BLAKE2B 934f07d98faa671002a3523f7394c8d7c3d6151b315e190a68316b8909eec1a252ddc34f04ab80993ac3f45362c5020789e87456608e9b063fba9fe046d9d772 SHA512 5c14130f10516e2c24186faed421dd130647e7d739dd7261e972b85a1cf428e249aed227e2d322d40047b732687462713528489cfdae1f8cb710336a70e5775d
 MISC metadata.xml 243 BLAKE2B 1d641d0445b6ef43e1ca3ca3f967b0580b0a5ba444509e092a8a51bba18564136091c2dacd69ed723e36cb851b3962176a8aca06d3b2e604cf089c4983dbb7f5 SHA512 2bbd30d145173aa1c10a47ec43bfc1f6b1aeda4b25ec40e534d08a35fc9a63ba9ba7826204cf4d561566ea0678f2d865cb7a947814f5e5e436a839d750f2db2e
diff --git a/dev-db/opendbx/opendbx-1.4.5-r1.ebuild b/dev-db/opendbx/opendbx-1.4.5-r1.ebuild
index 222716f22f73..d62eda3c5e8c 100644
--- a/dev-db/opendbx/opendbx-1.4.5-r1.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.5-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="6"
@@ -60,6 +60,9 @@ src_configure() {
 		append-ldflags -L"${ORACLE_HOME}"
 	fi
 
+	# bug #788304
+	append-cxxflags -std=c++14
+
 	econf --with-backends="${backends}"
 }
 
diff --git a/dev-db/opendbx/opendbx-1.4.6-r2.ebuild b/dev-db/opendbx/opendbx-1.4.6-r2.ebuild
index 5c3009011be6..7ba0179bedaa 100644
--- a/dev-db/opendbx/opendbx-1.4.6-r2.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -60,6 +60,9 @@ src_configure() {
 		append-ldflags -L"${ORACLE_HOME}"
 	fi
 
+	# bug #788304
+	append-cxxflags -std=c++14
+
 	econf --with-backends="${backends}"
 }
 
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 3a3cb5f9f8da..4c90a6db1e05 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -6,6 +6,9 @@ DIST percona-server-8.0.22-13.tar.gz 530806570 BLAKE2B 256e5afa2e3908617c41ffcab
 DIST percona-server-8.0.22.13-patches-02.tar.xz 9620 BLAKE2B c04e97ed422719bec5008b668e2ce3ecd5b848338a9f2f2ecd2fc867307b7fce9bae4cb0efd44f9b950f74d7f31394c06248d1c72784e9c0790378e2ea4d7934 SHA512 2476ee2f4096eaee211017609f82cf8fa9817cda6345336f478257711b64b8c37340b482a02f3d0b19e16e01055cf619cdd1b66d5fbfa0fd1d8edbd529c4096f
 DIST percona-server-8.0.23-14.tar.gz 528227168 BLAKE2B c497e69d3e7f370e6ffd71ef8129fccb35d8814e713bf78da04b7517f56e7d733d0b54543e86a24568587ae270bd7ca7add36646845e8f7dc5c288aebd1db8c7 SHA512 199669fc53b80426be709a2d7026f6aa821f2d98e5763b3311f564550687cc6401def191f56c615ffed69264a09aaec78ca8371d35a6a69386832f24f30df71b
 DIST percona-server-8.0.23.14-patches-01.tar.xz 5908 BLAKE2B 968fbe0f8e3666ada008d81e9e07a5149dc6137908bf955bdf37c6bc6703cdb7a1d9a7395435d6b8772865b08d6d6716690331968069e4c1d3059a38b3c8ca49 SHA512 31983837d7fbd42b5e227f6617e2b59303ce185c613f620a61a9b9d26cd075feaf58969e3d8b415c70ee796bd1e912204cd5780e6d07cf6e2b0dc28ca41b6f70
+DIST percona-server-8.0.25-15.tar.gz 531072362 BLAKE2B aa6867a8ac72325596393723cf8735329f638cfe11f790c7690dc5f45dcf01f99f9f999c551b2ad6b9f287f8763e8b262fef7c9327b82882493b576acd8d7a69 SHA512 500fc4ab5d275d7d1d2b048920d22d725074450d9f356b4ea739a4c276bfe767db76e2b52a358867d77805ef288cfdb80ab6e230bfa77a84b97536bf153c443f
+DIST percona-server-8.0.25.15-patches-01.tar.xz 7624 BLAKE2B b06495859f3df546bc42e69ec77007a335103020313524ed728309764fea8ca2ea6f246938852ab2fb5ea12b4d901af5ebb9abff4d99b7e56d6ffd501d10bd38 SHA512 69b2d478046666d7c5dbffe662f4e000fd1c2c8789bcaeea72b8bb229ad85d8cd54a293c74440f93c56dc07a06143553ff989711787e6cd610a8e23bb353a1df
 EBUILD percona-server-8.0.22.13.ebuild 39889 BLAKE2B 0a5f64db96a74046cf9a100d81b064e8c76215322ccd595f29103654f35b71f9ed60d1e60200f5a2aed105f5ffe72da67d44e76f9b5a3249fd8448478c8b1bab SHA512 b02d0974cfc4fbfeaf017bf0964b0dc34c70252543b5ecd6613bb76e5e3500806408db1ba6b5ebd58b24b2995c4098a0193444948c5daa7b0d71c1c492939d03
 EBUILD percona-server-8.0.23.14.ebuild 40149 BLAKE2B 2a0659552894b3fc1babc40431445331ce75f0e9be289967ab34d5118fbf09f583cf844f37544e6ce53f7d8cd15770d25939e120a0d6f3653163ecffc79ecf21 SHA512 de541d62f38afe7f6b7de73a172c68738e273e4e19daab520e34ea97a160710b38bc7a5659005b4867870b392b3f9b21206338c4286bdc47e88d709fb1726b34
+EBUILD percona-server-8.0.25.15.ebuild 42710 BLAKE2B 456c4f6e1eb913977303fbfef1a2c4c363c19b96f09edf4de4cefa050df0ff4f3b7d16863a9926835cee54d483cb056c7661cd18fdf13519f0e04126ff5001df SHA512 444cf2976786e9ecce46e5f03babb09b439737816f73f30e687af77b7cab3c72082f70a93ded3d64b6b7cbc24a04d12981a4131e2a1dd61fc7b44eff07e25b80
 MISC metadata.xml 1010 BLAKE2B 12a73e124af07d102ab0198d6942515f652dadcf7a62cea9180012e0d0ef5dab146a76439650f408bc9f034646c7e6a3337cc843fe711c0cc347864e553f355d SHA512 6459d89a1b50a1344d1ad558ea684a23691c7b0f9e860c056f136d4ebf82a74ce11bafdcff420b7aa41907b3d31d45272d02990cba40cedd50b1d10545f059f0
diff --git a/dev-db/percona-server/percona-server-8.0.25.15.ebuild b/dev-db/percona-server/percona-server-8.0.25.15.ebuild
new file mode 100644
index 000000000000..f81b726f1351
--- /dev/null
+++ b/dev-db/percona-server/percona-server-8.0.25.15.ebuild
@@ -0,0 +1,1273 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit check-reqs cmake flag-o-matic linux-info \
+	multiprocessing prefix toolchain-funcs
+
+MY_BOOST_VERSION="1.73.0"
+MY_PV=$(ver_rs 3 '-')
+MY_PV="${MY_PV//_pre*}"
+MY_PN="Percona-Server"
+MY_P="${PN}-${MY_PV}"
+MY_MAJOR_PV=$(ver_cut 1-2)
+MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/${MY_MAJOR_PV}/"
+
+# Patch version
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.25.15-patches-01.tar.xz"
+
+SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
+	https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
+	${PATCH_SET}
+"
+
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server https://github.com/percona/percona-server"
+DESCRIPTION="Fully compatible, enhanced and open source drop-in replacement for MySQL"
+LICENSE="GPL-2"
+SLOT="8.0"
+IUSE="cjk cracklib debug jemalloc latin1 ldap numa pam +perl profiling
+	rocksdb router selinux +server tcmalloc test tokudb tokudb-backup-plugin"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )
+	cjk? ( server )
+	jemalloc? ( server )
+	numa? ( server )
+	profiling? ( server )
+	router? ( server )
+	tcmalloc? ( server )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+	>=app-arch/lz4-0_p131:=
+	app-arch/zstd:=
+	sys-libs/ncurses:0=
+	>=sys-libs/zlib-1.2.3:0=
+	>=dev-libs/openssl-1.0.0:0=
+	server? (
+		dev-libs/icu:=
+		dev-libs/libevent:=[ssl,threads]
+		>=dev-libs/protobuf-3.8:=
+		net-libs/libtirpc:=
+		net-misc/curl:=
+		cjk? ( app-text/mecab:= )
+		ldap? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap
+		)
+		jemalloc? ( dev-libs/jemalloc:0= )
+		kernel_linux? (
+			dev-libs/libaio:0=
+			sys-process/procps:0=
+		)
+		numa? ( sys-process/numactl )
+		pam? ( sys-libs/pam:0= )
+		tcmalloc? ( dev-util/google-perftools:0= )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	virtual/yacc
+	server? ( net-libs/rpcsvc-proto )
+	test? (
+		acct-group/mysql acct-user/mysql
+		dev-perl/JSON
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster
+	!dev-db/percona-server:0
+	!dev-db/percona-server:5.7
+	selinux? ( sec-policy/selinux-mysql )
+	!prefix? (
+		acct-group/mysql acct-user/mysql
+		dev-db/mysql-init-scripts
+	)
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+mysql_init_vars() {
+	: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	: ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	: ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+	MY_DATADIR="${MY_LOCALSTATEDIR}"
+
+	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_DATADIR
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use server ; then
+			CHECKREQS_DISK_BUILD="3G"
+
+			if has test $FEATURES ; then
+				CHECKREQS_DISK_BUILD="9G"
+			fi
+
+			check-reqs_pkg_pretend
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		CHECKREQS_DISK_BUILD="3G"
+
+		if has test ${FEATURES} ; then
+			CHECKREQS_DISK_BUILD="9G"
+
+			# Bug #213475 - MySQL _will_ object strenuously if your machine is named
+			# localhost. Also causes weird failures.
+			[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+			if ! has userpriv ${FEATURES} ; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+			fi
+
+			local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null)
+			[[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] \
+				&& die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!"
+
+			if use latin1 ; then
+				# Upstream only supports tests with default charset
+				die "Testing with USE=latin1 is not supported."
+			fi
+		fi
+
+		if use kernel_linux ; then
+			if use numa ; then
+				linux-info_get_any_version
+
+				local CONFIG_CHECK="~NUMA"
+
+				local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
+				WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
+
+				check_extra_config
+			fi
+		fi
+
+		use server && check-reqs_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv -f "${WORKDIR}/${MY_P}" "${S}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}"/mysql-patches
+
+	# Avoid rpm call which would trigger sandbox, #692368
+	sed -i \
+		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
+		CMakeLists.txt || die
+
+	if use jemalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+
+	if use tcmalloc ; then
+		echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
+	fi
+
+	# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
+	if [[ -d "${S}/support-files/SELinux" ]] ; then
+		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
+	fi
+
+	# Remove man pages for client-lib tools we don't install
+	rm \
+		man/my_print_defaults.1 \
+		man/perror.1 \
+		man/zlib_decompress.1 \
+		|| die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Bug #114895, bug #110149
+	filter-flags "-O" "-O[01]"
+
+	append-cxxflags -felide-constructors
+
+	# code is not C++17 ready, bug #786402
+	append-cxxflags -std=c++14
+
+	# bug #283926, with GCC4.4, this is required to get correct behavior.
+	append-flags -fno-strict-aliasing
+
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	# debug hack wrt #497532
+	mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
+		-DINSTALL_BINDIR=bin
+		-DINSTALL_DOCDIR=share/doc/${PF}
+		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
+		-DINSTALL_INCLUDEDIR=include/mysql
+		-DINSTALL_INFODIR=share/info
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_MYSQLSHAREDIR=share/mysql
+		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+		-DINSTALL_SBINDIR=sbin
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		# Using bundled editline to get CTRL+C working
+		-DWITH_EDITLINE=bundled
+		-DWITH_ZLIB=system
+		-DWITH_SSL=system
+		-DWITH_LIBWRAP=0
+		-DENABLED_LOCAL_INFILE=1
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DWITH_DEFAULT_COMPILER_OPTIONS=0
+		# The build forces this to be defined when cross-compiling. We pass it
+		# all the time for simplicity and to make sure it is actually correct.
+		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
+		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
+		-DWITH_CURL=system
+		-DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
+		-DWITH_ROUTER=$(usex router ON OFF)
+	)
+
+	if is-flagq -fno-lto ; then
+		einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
+		mycmakeargs+=( -DWITH_LTO=OFF )
+	elif is-flagq -flto ; then
+		einfo "LTO forced via {C,CXX,F,FC}FLAGS"
+		myconf+=( -DWITH_LTO=ON )
+	else
+		# Disable automagic
+		myconf+=( -DWITH_LTO=OFF )
+	fi
+
+	if use test ; then
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
+	else
+		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+	fi
+
+	mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
+
+	mycmakeargs+=(
+		-DWITH_ICU=system
+		-DWITH_LZ4=system
+		# Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex
+		-DWITH_RAPIDJSON=bundled
+		-DWITH_ZSTD=system
+	)
+
+	if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then
+		ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
+		ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+		ewarn "You MUST file bugs without these variables set."
+		ewarn "Tests will probably fail!"
+
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+			-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+		)
+	elif use latin1 ; then
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=latin1
+			-DDEFAULT_COLLATION=latin1_swedish_ci
+		)
+	else
+		mycmakeargs+=(
+			-DDEFAULT_CHARSET=utf8mb4
+			-DDEFAULT_COLLATION=utf8mb4_0900_ai_ci
+		)
+	fi
+
+	if use server ; then
+		mycmakeargs+=(
+			-DWITH_AUTHENTICATION_LDAP=$(usex ldap system OFF)
+			-DWITH_COREDUMPER=OFF
+			-DWITH_EXTRA_CHARSETS=all
+			-DWITH_DEBUG=$(usex debug)
+			-DWITH_MECAB=$(usex cjk system OFF)
+			-DWITH_LIBEVENT=system
+			-DWITH_PROTOBUF=system
+			-DWITH_NUMA=$(usex numa ON OFF)
+			-DWITH_PAM=$(usex pam)
+		)
+
+		if use profiling ; then
+			# Setting to OFF doesn't work: Once set, profiling options will be added
+			# to `mysqld --help` output via sql/sys_vars.cc causing
+			# "main.mysqld--help-notwin" test to fail
+			mycmakeargs+=( -DENABLED_PROFILING=ON )
+		fi
+
+		# Storage engines
+		mycmakeargs+=(
+			-DWITH_EXAMPLE_STORAGE_ENGINE=0
+			-DWITH_ARCHIVE_STORAGE_ENGINE=1
+			-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+			-DWITH_CSV_STORAGE_ENGINE=1
+			-DWITH_FEDERATED_STORAGE_ENGINE=1
+			-DWITH_HEAP_STORAGE_ENGINE=1
+			-DWITH_INNOBASE_STORAGE_ENGINE=1
+			-DWITH_INNODB_MEMCACHED=0
+			-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+			-DWITH_MYISAM_STORAGE_ENGINE=1
+			-DWITH_ROCKSDB=$(usex rocksdb 1 0)
+			-DWITH_TOKUDB=$(usex tokudb 1 0)
+		)
+	else
+		mycmakeargs+=(
+			-DWITHOUT_SERVER=1
+			-DWITH_SYSTEMD=no
+		)
+	fi
+
+	cmake_src_configure
+}
+
+# Official test instructions:
+# ulimit -n 16500 && \
+# USE='perl server' \
+# FEATURES='test userpriv' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	_disable_test() {
+		local rawtestname bug reason
+		rawtestname="${1}" ; shift
+		bug="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
+		echo ${rawtestname} : BUG#${bug} ${reason} >> "${T}/disabled.def"
+	}
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Run CTest (test-units)
+	cmake_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+
+	if [[ -z "${MTR_PARALLEL}" ]] ; then
+		local -x MTR_PARALLEL=$(makeopts_jobs)
+
+		if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
+			# Running multiple tests in parallel usually require higher ulimit
+			# and fs.aio-max-nr setting. In addition, tests like main.multi_update
+			# are known to hit timeout when system is busy.
+			# To avoid test failure we will limit MTR_PARALLEL to 4 instead of
+			# using "auto".
+			local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})"
+			info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!"
+			einfo "${info_msg}"
+			unset info_msg
+			MTR_PARALLEL=4
+		fi
+	else
+		einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
+	fi
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log} || die
+
+	# Run mysql tests
+	pushd "${TESTDIR}" &>/dev/null || die
+
+	touch "${T}/disabled.def"
+
+	local -a disabled_tests
+	disabled_tests+=( "auth_sec.atomic_rename_user;103512;Depends on user running test" )
+	disabled_tests+=( "auth_sec.keyring_file_data_qa;0;Won't work with user privileges" )
+	disabled_tests+=( "gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)" )
+	disabled_tests+=( "group_replication.gr_ssl_options2;0;Sporadic failing test" )
+	disabled_tests+=( "innodb.alter_kill;0;Known test failure -- no upstream bug yet" )
+	disabled_tests+=( "innodb.percona_changed_page_bmp_flush;6807;False positive on Gentoo (PS)" )
+	disabled_tests+=( "innodb.percona_changed_page_bmp_log_resize;0;Sporadic failing test" )
+	disabled_tests+=( "innodb.percona_log_encrypt_change_mk;6039;False positive on Gentoo (PS)" )
+	disabled_tests+=( "innodb.percona_log_encrypt_change_rk;6805;False positive on Gentoo (PS)" )
+	disabled_tests+=( "innodb.percona_log_encrypt_failure;0;Requires proper keyring setup" )
+	disabled_tests+=( "innodb.upgrade_orphan;0;Sporadic failing test" )
+	disabled_tests+=( "main.coredump;0;Known test failure" )
+	disabled_tests+=( "main.derived_limit;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.explain_tree;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.myisam-blob;0;Sporadic failing test" )
+	disabled_tests+=( "main.mysql_load_data_local_dir;7416;Known test failure" )
+	disabled_tests+=( "main.mysqlpump_basic_lz4;6042;Extra tool output causes false positive" )
+	disabled_tests+=( "main.ssl_bug75311;5996;Known test failure" )
+	disabled_tests+=( "main.ssl_san;6808;False positive on IPv6-enabled hosts" )
+	disabled_tests+=( "main.subquery_bugs;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_dupsweed;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_dupsweed_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_dupsweed_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_firstmatch;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_firstmatch_bka;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_firstmatch_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.subquery_sj_mat_bka_nobnl;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet" )
+	disabled_tests+=( "main.with_recursive;6804;Known rounding error with latest AMD processors" )
+	disabled_tests+=( "rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure" )
+	disabled_tests+=( "rpl_gtid.rpl_multi_source_mtr_includes;0;Know failure - no upstream bug yet" )
+	disabled_tests+=( "sys_vars.innodb_sys_tablespace_encrypt_basic;7415;Known test failure" )
+	disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware" )
+	disabled_tests+=( "x.message_compressed_payload;0;False positive caused by protobuff-3.11+" )
+	disabled_tests+=( "x.message_protobuf_nested;6803;False positive caused by protobuff-3.11+" )
+
+	if ! hash zip 1>/dev/null 2>&1 ; then
+		# no need to force dep app-arch/zip for one test
+		disabled_tests+=( "innodb.discarded_partition_create;0;Requires app-arch/zip" )
+		disabled_tests+=( "innodb.partition_upgrade_create;0;Requires app-arch/zip" )
+	fi
+
+	if has_version ">=dev-libs/openssl-3" ; then
+		# >=dev-libs/openssl-3 defaults to security level 1 which disallow
+		# TLSv1/1.1 but tests will require TLSv1/1.1.
+		einfo "Set OpenSSL configuration for test suite ..."
+		cat > "${T}/openssl_tlsv1.cnf" <<- EOF || die
+		openssl_conf = default_conf
+
+		[ req ]
+		default_bits			= 2048
+		default_keyfile 		= privkey.pem
+		distinguished_name		= req_distinguished_name
+
+		[ req_distinguished_name ]
+		countryName			= Country Name (2 letter code)
+		countryName_default		= AU
+		countryName_min			= 2
+		countryName_max			= 2
+
+		stateOrProvinceName		= State or Province Name (full name)
+		stateOrProvinceName_default	= Some-State
+
+		localityName			= Locality Name (eg, city)
+
+		0.organizationName		= Organization Name (eg, company)
+		0.organizationName_default	= Internet Widgits Pty Ltd
+
+		organizationalUnitName		= Organizational Unit Name (eg, section)
+
+		commonName			= Common Name (e.g. server FQDN or YOUR name)
+		commonName_max			= 64
+
+		emailAddress			= Email Address
+		emailAddress_max		= 64
+
+		[default_conf]
+		ssl_conf = ssl_sect
+
+		[ssl_sect]
+		system_default = system_default_sect
+
+		[system_default_sect]
+		CipherString = DEFAULT@SECLEVEL=0
+		EOF
+
+		local -x OPENSSL_CONF="${T}/openssl_tlsv1.cnf"
+
+		disabled_tests+=( "x.connection_tls_version;0;Not compatible with OpenSSL 3.x error messages" )
+	fi
+
+	local test_infos_str test_infos_arr
+	for test_infos_str in "${disabled_tests[@]}" ; do
+		IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
+
+		if [[ ${#test_infos_arr[@]} != 3 ]] ; then
+			die "Invalid test data set, not matching format: ${test_infos_str}"
+		fi
+
+		_disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}"
+	done
+	unset test_infos_str test_infos_arr
+
+	if [[ -z "${MTR_VAULT_TOKEN}" ]] ; then
+		local impossible_test
+		for impossible_test in \
+			encryption.default_table_encryption_var \
+			keyring_vault.innodb_online_alter_encryption \
+			keyring_vault.innodb_row_log_encryption \
+			keyring_vault.install_keyring_vault \
+			keyring_vault.keyring_udf \
+			keyring_vault.keyring_vault_config \
+			keyring_vault.keyring_vault_config_qa \
+			keyring_vault.keyring_vault_timeout \
+			keyring_vault.key_rotation_qa \
+			keyring_vault.rpl_key_rotation \
+			keyring_vault.table_encrypt_2 \
+			keyring_vault.table_encrypt_2_directory \
+			keyring_vault.table_encrypt_2_keyring \
+			keyring_vault.table_encrypt_5 \
+			keyring_vault.table_encrypt_5_directory \
+			keyring_vault.table_encrypt_kill \
+			keyring_vault.temp_table_encrypt_keyring_vault \
+			main.persisted_variables \
+		; do
+			_disable_test "${impossible_test}" "0" "MTR_VAULT_TOKEN is not set"
+		done
+	fi
+
+	# Try to increase file limits to increase test coverage
+	if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
+		# Upper limit comes from parts.partition_* tests
+		ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager."
+
+		if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
+			# Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)'
+			ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+			if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
+				ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+			else
+				einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)."
+			fi
+		else
+			einfo "Will run test suite with open file limit set to 4162 (medium test coverage)."
+		fi
+	else
+		einfo "Will run test suite with open file limit set to 16500 (best test coverage)."
+	fi
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd &>/dev/null || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || die "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
+
+src_install() {
+	cmake_src_install
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Convenience links
+	einfo "Making Convenience links for mysqlcheck multi-call binary"
+	dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+	dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+	dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+	# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+	if [[ -d "${ED}/usr/data" ]] ; then
+		rm -Rf "${ED}/usr/data" || die
+	fi
+
+	# Unless they explicitly specific USE=test, then do not install the
+	# testsuite. It DOES have a use to be installed, esp. when you want to do a
+	# validation of your database configuration after tuning it.
+	if ! use test ; then
+		rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test"
+	fi
+
+	# Configuration stuff
+	einfo "Building default configuration ..."
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+	[[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
+	cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
+	eprefixify "${TMPDIR}/my.cnf"
+	doins "${TMPDIR}/my.cnf"
+	insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
+	cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
+	eprefixify "${TMPDIR}/50-distro-client.cnf"
+	doins "${TMPDIR}/50-distro-client.cnf"
+
+	mycnf_src="my.cnf-8.0.distro-server"
+	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+		"${FILESDIR}/${mycnf_src}" \
+		> "${TMPDIR}/my.cnf.ok" || die
+
+	if use prefix ; then
+		sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+			"${TMPDIR}/my.cnf.ok" || die
+	fi
+
+	if use latin1 ; then
+		sed -i \
+			-e "/character-set/s|utf8mb4|latin1|g" \
+			"${TMPDIR}/my.cnf.ok" || die
+	fi
+
+	eprefixify "${TMPDIR}/my.cnf.ok"
+
+	newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+
+	#Remove mytop if perl is not selected
+	[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
+
+	if use router ; then
+		rm -rf \
+			"${ED}/usr/LICENSE.router" \
+			"${ED}/usr/README.router" \
+			"${ED}/usr/run" \
+			"${ED}/usr/var" \
+			|| die
+	fi
+
+	# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
+	find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
+}
+
+pkg_postinst() {
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Create log directory securely if it does not exist
+	# NOTE: $MY_LOGDIR contains $EPREFIX by default
+	[[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}"
+
+	# Note about configuration change
+	einfo
+	elog "This version of ${PN} reorganizes the configuration from a single my.cnf"
+	elog "to several files in /etc/mysql/mysql.d."
+	elog "Please backup any changes you made to /etc/mysql/my.cnf"
+	elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension."
+	elog "You may have as many files as needed and they are read alphabetically."
+	elog "Be sure the options have the appropriate section headers, i.e. [mysqld]."
+	einfo
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		einfo
+		elog "You might want to run:"
+		elog "  \"emerge --config =${CATEGORY}/${PF}\""
+		elog "if this is a new install."
+		einfo
+	else
+		einfo
+		elog "Upgrade process for ${PN}-8.x has changed. Please read"
+		elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html"
+		einfo
+	fi
+}
+
+pkg_config() {
+	_getoptval() {
+		local section="$1"
+		local flag="--${2}="
+		local extra_options="${3}"
+		local cmd=(
+			"${my_print_defaults_binary}"
+			"${extra_options}"
+			"${section}"
+		)
+		local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
+
+		if [[ ${#results[@]} -gt 0 ]] ; then
+			# When option is set multiple times only return last value
+			echo "${results[-1]}"
+		fi
+	}
+
+	_mktemp_dry() {
+		# emktemp has no --dry-run option
+		local template="${1}"
+
+		if [[ -z "${template}" ]] ; then
+			if [[ -z "${T}" ]] ; then
+				template="/tmp/XXXXXXX"
+			else
+				template="${T}/XXXXXXX"
+			fi
+		fi
+
+		local template_wo_X=${template//X/}
+		local n_X
+		let n_X=${#template}-${#template_wo_X}
+		if [[ ${n_X} -lt 3 ]] ; then
+			echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2
+			return
+		fi
+
+		local attempts=0
+		local character tmpfile
+		while [[ true ]] ; do
+			let attempts=attempts+1
+
+			new_file=
+			while read -n1 character ; do
+				if [[ "${character}" == "X" ]] ; then
+					tmpfile+="${RANDOM:0:1}"
+				else
+					tmpfile+="${character}"
+				fi
+			done < <(echo -n "${template}")
+
+			if [[ ! -f "${tmpfile}" ]]
+			then
+				echo "${tmpfile}"
+				return
+			fi
+
+			if [[ ${attempts} -ge 100 ]] ; then
+				echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
+				return
+			fi
+		done
+	}
+
+	local mysqld_binary="${EROOT}/usr/sbin/mysqld"
+	if [[ ! -x "${mysqld_binary}" ]] ; then
+		die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local mysql_binary="${EROOT}/usr/bin/mysql"
+	if [[ ! -x "${mysql_binary}" ]] ; then
+		die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!"
+	fi
+
+	local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults"
+	if [[ ! -x "${my_print_defaults_binary}" ]] ; then
+		die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
+	fi
+
+	if [[ -z "${MYSQL_USER}" ]] ; then
+		MYSQL_USER=mysql
+		if use prefix ; then
+			MYSQL_USER=$(id -u -n 2>/dev/null)
+			if [[ -z "${MYSQL_USER}" ]] ; then
+				die "Failed to determine current username!"
+			fi
+		fi
+	fi
+
+	if [[ -z "${MYSQL_GROUP}" ]] ; then
+		MYSQL_GROUP=mysql
+		if use prefix ; then
+			MYSQL_GROUP=$(id -g -n 2>/dev/null)
+			if [[ -z "${MYSQL_GROUP}" ]] ; then
+				die "Failed to determine current user groupname!"
+			fi
+		fi
+	fi
+
+	# my_print_defaults needs to read stuff in $HOME/.my.cnf
+	local -x HOME="${EROOT}/root"
+
+	# Make sure the vars are correctly initialized
+	mysql_init_vars
+
+	# Read currently set data directory
+	MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ -z "${MY_DATADIR}" ]] ; then
+		die "Sorry, unable to find MY_DATADIR!"
+	elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
+		ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
+		ewarn "Please rename or delete its content if you wish to initialize a new data directory."
+		die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
+	fi
+
+	MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_TMPDIR=${MYSQL_TMPDIR%/}
+	# These are dir+prefix
+	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
+	MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
+	MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+
+	# Create missing directories.
+	# Always check if mysql user can write to directory even if we just
+	# created directory because a parent directory might be not
+	# accessible for that user.
+	PID_DIR="${EROOT}/run/mysqld"
+	if [[ ! -d "${PID_DIR}" ]] ; then
+		einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
+		install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
+			|| die "Failed to create PID directory '${PID_DIR}'!"
+	fi
+
+	local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_pid_dir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_pid_dir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
+	else
+		rm "${_pid_dir_testfile}" || die
+		unset _pid_dir_testfile
+	fi
+
+	if [[ ! -d "${MY_DATADIR}" ]] ; then
+		einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
+			|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
+	fi
+
+	local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_datadir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_datadir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
+	else
+		rm "${_my_datadir_testfile}" || die
+		unset _my_datadir_testfile
+	fi
+
+	if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
+		einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
+			|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
+	fi
+
+	if [[ -z "${MYSQL_TMPDIR}" ]] ; then
+		MYSQL_TMPDIR="$(_mktemp_dry "${EROOT}/tmp/mysqld-tmp.XXXXXXXXX")"
+		[[ -z "${MYSQL_TMPDIR}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
+
+		mkdir "${MYSQL_TMPDIR}" || die
+		chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
+	fi
+
+	# Now we need to test MYSQL_TMPDIR...
+	local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
+	[[ -z "${_my_tmpdir_testfile}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+	if use prefix ; then
+		touch "${_my_tmpdir_testfile}" &>/dev/null
+	else
+		su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
+	fi
+
+	if [[ $? -ne 0 ]] ; then
+		die "${MYSQL_USER} user cannot write into tmpdir '${MYSQL_TMPDIR}'!"
+	else
+		rm "${_my_tmpdir_testfile}" || die
+		unset _my_tmpdir_testfile
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
+			|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
+	fi
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_logbin_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_logbin_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
+		else
+			rm "${_my_logbin_testfile}" || die
+			unset _my_logbin_testfile
+		fi
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
+		install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
+			|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
+		[[ -z "${_my_relaylog_testfile}" ]] \
+			&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
+
+		if use prefix ; then
+			touch "${_my_relaylog_testfile}" &>/dev/null
+		else
+			su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
+		fi
+
+		if [[ $? -ne 0 ]] ; then
+			die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
+		else
+			rm "${_my_relaylog_testfile}" || die
+			unset _my_relaylog_testfile
+		fi
+	fi
+
+	local mysql_install_log="$(_mktemp_dry "${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log")"
+	if [[ -z "${mysql_install_log}" ]] ; then
+		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_db.XXXXXXXXX.log' failed!"
+	else
+		# make sure file is writable for MYSQL_USER...
+		touch "${mysql_install_log}" || die
+		chown ${MYSQL_USER} "${mysql_install_log}" || die
+	fi
+
+	local mysqld_logfile="$(_mktemp_dry "${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log")"
+	if [[ -z "${mysqld_logfile}" ]] ; then
+		die "_mktemp_dry() for '${MYSQL_TMPDIR}/install_mysqld.XXXXXXXXX.log' failed!"
+	else
+		# make sure file is writable for MYSQL_USER...
+		touch "${mysqld_logfile}" || die
+		chown ${MYSQL_USER} "${mysqld_logfile}" || die
+	fi
+
+	echo ""
+	einfo "Detected settings:"
+	einfo "=================="
+	einfo "MySQL User:\t\t\t\t${MYSQL_USER}"
+	einfo "MySQL Group:\t\t\t\t${MYSQL_GROUP}"
+	einfo "MySQL DATA directory:\t\t${MY_DATADIR}"
+	einfo "MySQL TMP directory:\t\t\t${MYSQL_TMPDIR}"
+
+	if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
+		einfo "MySQL Binary Log File location:\t${MYSQL_LOG_BIN}"
+	fi
+
+	if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
+		einfo "MySQL Relay Log File location:\t${MYSQL_RELAY_LOG}"
+	fi
+
+	einfo "PID DIR:\t\t\t\t${PID_DIR}"
+	einfo "Install db log:\t\t\t${mysql_install_log}"
+	einfo "Install server log:\t\t\t${mysqld_logfile}"
+
+	local -a config_files
+
+	local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf"
+	if [[ -f "${config_file}" ]] ; then
+		config_files+=( "${config_file}" )
+	else
+		ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..."
+	fi
+
+	config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf"
+	if [[ -f "${config_file}" ]] ; then
+		config_files+=( "${config_file}" )
+	else
+		ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..."
+	fi
+
+	if [[ ${#config_files[@]} -gt 0 ]] ; then
+		if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then
+			local user_answer
+
+			echo
+			einfo "Please select default authentication plugin (enter number or plugin name):"
+			einfo "1) caching_sha2_password [MySQL 8.0 default]"
+			einfo "2) mysql_native_password [MySQL 5.7 default]"
+			einfo
+			einfo "For details see:"
+			einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password"
+			read -p "    >" user_answer
+			echo
+
+			case "${user_answer}" in
+				1|caching_sha2_password)
+					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password
+					;;
+				2|mysql_native_password)
+					MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password
+					;;
+				'')
+					die "No authentication plugin selected!"
+					;;
+				*)
+					die "Authentication plugin '${user_answer}' is unknown/unsupported!"
+					;;
+			esac
+
+			echo "Selected authentication plugin: ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" >> "${mysql_install_log}"
+
+			unset user_answer
+		fi
+
+		local cfg_option cfg_option_tabs cfg_section
+		for config_file in "${config_files[@]}" ; do
+			cfg_option="default-authentication-plugin"
+			cfg_section="mysqld"
+			cfg_option_tabs="\t\t"
+			if [[ "${config_file}" == *client.cnf ]] ; then
+				cfg_option="default-auth"
+				cfg_section="client"
+				cfg_option_tabs="\t\t\t\t"
+			fi
+
+			if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then
+				einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
+				sed -i \
+					-e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \
+					"${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!"
+			else
+				einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..."
+				sed -i \
+					-e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \
+					"${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!"
+			fi
+		done
+		unset cfg_option cfg_option_tabs cfg_section
+	fi
+	unset config_files config_file
+
+	echo
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local tmp_mysqld_password_source=
+
+		for tmp_mysqld_password_source in mysql client ; do
+			einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
+			if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+				if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then
+					ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
+					MYSQL_ROOT_PASSWORD=
+					continue
+				fi
+
+				einfo "Found password in '${tmp_mysqld_password_source}' section!"
+				break
+			fi
+		done
+
+		# Sometimes --show is required to display passwords in some implementations of my_print_defaults
+		if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then
+			MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
+		fi
+
+		unset tmp_mysqld_password_source
+	fi
+
+	if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then
+		local pwd1="a"
+		local pwd2="b"
+
+		echo
+		einfo "No password for mysql 'root' user was specified via environment"
+		einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config"
+		einfo "file like '${HOME}/.my.cnf'."
+		einfo "To continue please provide a password for the mysql 'root' user"
+		einfo "now on console:"
+		ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!"
+		read -rsp "    >" pwd1 ; echo
+
+		einfo "Retype the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same!"
+		fi
+
+		MYSQL_ROOT_PASSWORD="${pwd1}"
+		unset pwd1 pwd2
+
+		echo
+	fi
+
+	local -a mysqld_options
+
+	# Fix bug 446200. Don't reference host my.cnf, needs to come first,
+	# see http://bugs.mysql.com/bug.php?id=31312
+	use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" )
+
+	# Figure out which options we need to disable to do the setup
+	local helpfile="${TMPDIR}/mysqld-help"
+	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+
+	local opt optexp optfull
+	for opt in host-cache name-resolve networking slave-start \
+		federated ssl log-bin relay-log slow-query-log external-locking \
+		log-slave-updates \
+	; do
+		optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+		egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" )
+	done
+
+	# Prepare timezones, see
+	# https://dev.mysql.com/doc/mysql/en/time-zone-support.html
+	local tz_sql="$(_mktemp_dry "${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql")"
+	[[ -z "${tz_sql}" ]] \
+		&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/tz.XXXXXXXXX.sql' failed!"
+
+	echo "USE mysql;" >"${tz_sql}"
+	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null
+	if [[ $? -ne 0 ]] ; then
+		die "mysql_tzinfo_to_sql failed!"
+	fi
+
+	# --initialize-insecure will not set root password
+	# --initialize would set a random one in the log which we don't need as we set it ourselves
+	local cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--initialize-insecure"
+		"--init-file='${tz_sql}'"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		"--log-error='${mysql_install_log}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Initializing ${PN} data directory: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
+
+	if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
+		die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
+	fi
+
+	rm "${tz_sql}" || die
+
+	local x=${RANDOM}
+	local socket="${EROOT}${PID_DIR}/mysqld${x}.sock"
+	local pidfile="${EROOT}${PID_DIR}/mysqld${x}.pid"
+	unset x
+
+	cmd=(
+		"${mysqld_binary}"
+		"${mysqld_options[@]}"
+		"--basedir='${EROOT}/usr'"
+		"--datadir='${MY_DATADIR}'"
+		"--tmpdir='${MYSQL_TMPDIR}'"
+		--max_allowed_packet=8M
+		--net_buffer_length=16K
+		"--socket='${socket}'"
+		"--pid-file='${pidfile}'"
+		"--log-error='${mysqld_logfile}'"
+		"--user=${MYSQL_USER}"
+	)
+
+	einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
+	eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
+
+	echo -n "Waiting for mysqld to accept connections "
+	local maxtry=15
+	while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+		maxtry=$((${maxtry}-1))
+		echo -n "."
+		sleep 1
+	done
+
+	if [[ -S "${socket}" ]] ; then
+		# Even with a socket we don't know if mysqld will abort
+		# start due to an error so just wait a little bit more...
+		maxtry=5
+		while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+	fi
+
+	echo
+
+	if [[ ! -S "${socket}" ]] ; then
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
+		die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
+	fi
+
+	local mysql_logfile="${TMPDIR}/set_root_pw.log"
+	touch "${mysql_logfile}" || die
+
+	ebegin "Setting root password"
+	# Do this from memory, as we don't want clear text passwords in temp files
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'"
+	cmd=(
+		"${mysql_binary}"
+		--no-defaults
+		"--socket='${socket}'"
+		-hlocalhost
+		"-e \"${sql}\""
+	)
+	eval "${cmd[@]}" >"${mysql_logfile}" 2>&1
+	local rc=$?
+	eend ${rc}
+
+	if [[ ${rc} -ne 0 ]] ; then
+		# Poor man's solution which tries to avoid having password
+		# in log.  NOTE: sed can fail if user didn't follow advice
+		# and included character which will require escaping...
+		sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null
+
+		grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}"
+		die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!"
+	fi
+
+	# Stop the server
+	if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+		echo -n "Stopping the server "
+		pkill -F "${pidfile}" &>/dev/null
+
+		maxtry=10
+		while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do
+			maxtry=$((${maxtry}-1))
+			echo -n "."
+			sleep 1
+		done
+
+		echo
+
+		if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then
+			# We somehow failed to stop server.
+			# However, not a fatal error. Just warn the user.
+			ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!"
+		fi
+	fi
+
+	einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
+}
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index b001773ff044..d498e489bdb5 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/freesolid/Manifest b/dev-games/freesolid/Manifest
new file mode 100644
index 000000000000..c4b2ff4e2d7a
--- /dev/null
+++ b/dev-games/freesolid/Manifest
@@ -0,0 +1,3 @@
+DIST FreeSOLID-2.1.2.zip 605512 BLAKE2B f0e616ac58a7b15b74687a27a21a170087d4ea0b7563ddb7f2f144cfb02eb03b1b3979e8e43248a5fb42fa984e7e2757123335aaaa298a9fe8b05cfbd0fff898 SHA512 8139c88e0295fcc4a4f9c050bbf71c89c80cb9fc68fee99c1bda6c77f8f7e47e632d909d46581e65a8b72ca18dbce5b70046ce93ce913374594a981e8dd26556
+EBUILD freesolid-2.1.2.ebuild 696 BLAKE2B 7843a5187656781df57c506e593a564263c8ce823c815f38e4e4137d0583c5f3be7c3c5aae4afa8db16c5ed95ecbd766e3de4d0007fb9d252e7c1edd23653c76 SHA512 390c7271b13aa295d3d05f5186dbce65b962153f46b437acbe829839f68b62072495763fd28c4a789595da9c2152321fe08277cb66fa1aa1b3bbb74e334a6fad
+MISC metadata.xml 332 BLAKE2B 217e15bdf0177138a444e53a3f4c7e0e72f10594902db2079e0c26f5758342df4f383fccdb653c613d75b27635da0cf312d56a49afc8b41c8b34f1399e057f5f SHA512 f62f409db19d73d6135e6f54722f9ca571cd191cc49296500f109133db1193b41ba058088fe202043dd5a6d75d8fbb708153b074009044775a0b7055d07ea58c
diff --git a/dev-games/freesolid/freesolid-2.1.2.ebuild b/dev-games/freesolid/freesolid-2.1.2.ebuild
new file mode 100644
index 000000000000..d3e7d5bb6adb
--- /dev/null
+++ b/dev-games/freesolid/freesolid-2.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P="FreeSOLID-${PV}"
+
+DESCRIPTION="Library for collision detection of three-dimensional objects"
+HOMEPAGE="https://sourceforge.net/projects/freesolid/"
+SRC_URI="mirror://sourceforge/freesolid/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i 's/ \(-ffast-math -msse\|-mfpmath=sse\)//' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_SHARED_LIBS=no )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	doinfo doc/solid2.info
+}
diff --git a/dev-games/freesolid/metadata.xml b/dev-games/freesolid/metadata.xml
new file mode 100644
index 000000000000..cfcf231e95ab
--- /dev/null
+++ b/dev-games/freesolid/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>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freesolid</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 0edf9d64d9d2..50b308b4992d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index 06fc0eb39e6e..e5e8b0fdb058 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -32,5 +32,5 @@ DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0
 DIST openjfx-8.1000-backports.tar.bz2 9142182 BLAKE2B 58ea420ec015c49d2755105a3d11675a92ecab337c7bda5a1ad72e84d0b35f04ed4252cee24da89b1e7b1b5b8b8b9fea7db93364434800246b87827b21970cc3 SHA512 077392368947cb9da1b5c7e14b641d6edcddd9821eb4f16dbea33e8986568211e93799aca29e70b490c8ef2125d69f8372abd1b1ce428a95420f62ff15c414d6
 DIST openjfx-8.1000.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32
 EBUILD openjfx-11.0.9_p0.ebuild 6529 BLAKE2B 66c761d6aedd70903b302a3e41664b0c2a3161ce54b7fd286dd89aa262451ddfd8ce50576d8e6c5b0857586a46f400f3aab6b87ea4d4b115472b00325699cce0 SHA512 681bc70763d33dac6e7cddd39f5bc3b1b2f452336acca5b677fb50af7be686c26e4d76a9481c86f0b1ebd16b660d4bd369a8343a35e007a0442899995aff087b
-EBUILD openjfx-8.1000.ebuild 5593 BLAKE2B 94aa4d3f54e66afb33d0abf7a46c3adfefb8d0bc3cc4150798502f967f69df37a88bdd3c915e1169ad616b188c4a7f6bb59d1c12f0fb61e5347a4281db85ce25 SHA512 ef058af9f7fdc56f8f5d1ea80e11180ec3c8a35403e555143ea3181336946d347d5b307ac77bb66bf3695fb62eece9737e5a552c9c0745269aff6a93744834b4
+EBUILD openjfx-8.1000.ebuild 5591 BLAKE2B e769373bd39e34defe172cc5bec4fd281c44f2837e25a61eaa220565bfae4383a9ff722f911c34f63d39ec97253bbf25f54f34c714fc68f149c8fcde856705e1 SHA512 dc39e618a396b714c47e08b63ae62de8a9e230704e4b716f112348094da0230478b4f9db9dab8114a92a6f7a3afa58af8b41fdba0aba373632a92af9edbae719
 MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d
diff --git a/dev-java/openjfx/openjfx-8.1000.ebuild b/dev-java/openjfx/openjfx-8.1000.ebuild
index 4763fb1c16ee..026a67b5e2eb 100644
--- a/dev-java/openjfx/openjfx-8.1000.ebuild
+++ b/dev-java/openjfx/openjfx-8.1000.ebuild
@@ -130,7 +130,7 @@ src_prepare() {
 	java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-tool.jar antlr-3.1.3.jar
 	java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-runtime.jar antlr-runtime-3.1.3.jar
 	java-pkg_jar-from --build-only --into "${d}" stringtemplate  stringtemplate.jar stringtemplate-3.2.jar
-	sed -i "s#compile name: SWT_FILE_NAME#compile files(\"${swt_file_name#/}\")#" "${S}"/build.gradle || die
+	sed -i "s#compile name: SWT_FILE_NAME#compile files(\"${swt_file_name}\")#" "${S}"/build.gradle || die
 
 	sed -i 's/-rpath/-rpath-link/g' modules/media/src/main/native/jfxmedia/projects/linux/Makefile || die
 }
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index b11ef4314301..54cc940c0a2e 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -4,7 +4,6 @@ AUX stringtemplate-4.0.8-fix-tests.patch 2956 BLAKE2B 698727b248f9ebbeda46f099c3
 DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
 DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3 SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
-EBUILD stringtemplate-3.2.1-r1.ebuild 1476 BLAKE2B 24dbc49a93f0e63d886adbb12c06769b6015554eb1c74756a6f48642e92f3489b06e4524287503c2bdafa7bff4349c419afff66710ace2b425feeec593214fbe SHA512 fd1ff2ae25cbcaf37a1f193f8791415f8605e548a2e3f6fe5e310fad8b8720f19d279935c927589829b5957bceea686076f750d5f8d94d648ae9cd6158aece99
 EBUILD stringtemplate-3.2.1-r2.ebuild 1558 BLAKE2B 1c6e7681fd3393fbbc01b6bac14bb8594324f4de415e1a4d51517b543fc30c0e77ac159bbfb0b9a7612149634784e9744cb7aa4985b1e429dab6c87bc369e673 SHA512 d44ebe7633e4f05560ad626d2540f4350d05443048e76d9f125229ceaf84686ddd4c790e1d9c9c89de8310b755330560965f54869f6bfb0436201ed9da7ebc3c
 EBUILD stringtemplate-4.0.8-r1.ebuild 2227 BLAKE2B 10d792caffab1e99e83eb551fc53603107f9be7f662fab164bc8b1573fbe577c777d509e8dbf1b1ea0e2cc899cf1c1b168f7314a5d98c817a74b019772ae785e SHA512 281ce1c2835412d72dd327dce4fb1df38a5e493ebb2f76ee59ce75945ecf4b4c4a45c6ea2e417e287ca1f422dd319bf693eafe19b4c52e84e04876454dab8b97
 MISC metadata.xml 322 BLAKE2B a9d59ec72b635debef4618887bd9389b4db013017a0a952b28b5f07e7a2caef78976b51de098085b94cc16046fe5642a5b6da9e2a197aa51d39daac6b25f1c19 SHA512 76ac99f8c99d34b533c08ae008a9eb2ac2a3b64589df3d43460c93b78c3c53c45b944837cc7f5514e90afc2117554fb545306e74a2b2bcb5c8339c656998c449
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
deleted file mode 100644
index 9b357c47389c..000000000000
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit epatch java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="https://www.stringtemplate.org/"
-SRC_URI="https://github.com/antlr/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-java/antlr-2.7.7-r7:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? ( >=dev-java/junit-4.11:4 )"
-
-S="${WORKDIR}/${P}"
-JAVA_GENTOO_CLASSPATH="antlr"
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	# https://github.com/antlr/stringtemplate3/pull/3
-	epatch "${FILESDIR}/${PV}-test-fixes.patch"
-
-	java-pkg_clean
-}
-
-src_compile() {
-	local G; for G in action template angle.bracket.template eval group interface; do # from build.xml
-		antlr -o src/org/antlr/stringtemplate/language/{,${G}.g} || die
-	done
-
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc {CHANGES,README}.txt
-}
-
-src_test() {
-	cd test || die
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-
-	local TESTS=$(find * -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 793e6f90d1ca..b816aedc0a48 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,7 +1,6 @@
 AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb
 AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
-DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B b955d3708555c5530ebccaf9c6e8c344a679666bdd45361980d722d2cb48b618a03dc2514f973c182c2c1eaf96852e5a5eadad89575ee1bf524213211191a6a4 SHA512 229e8767b8f53f6b5c0e28f13a1daffd6fb8307a5239ae28ee1522087d881e4c9e3f1a0d39bfc852d5e54166dbb8a0a1577210a325845815c7281c4babc0b100
 DIST apache-tomcat-10.0.7-src.tar.gz 6001147 BLAKE2B f1aee4748d404d02188369603824dcc97765e907cfc3872f54b1859ae950a9475d72862caa2179ac39e4cbdb8c23424f89c4cbbfff8a2e079a842b0054257009 SHA512 395b0280666c6779f6378cb87e9abdb637a823e7f89452b7324329f4c0a1fe0b315275dca5df2f80a38c6f1ef98541bd1ea762df7af9cb15e4466c3b89e4e7a8
 DIST apache-tomcat-10.0.8-src.tar.gz 6010420 BLAKE2B 86390f04147d3082fbc9f15704121cbd6aa8ba756b4bc03e64a49aae3dca96c6b503949da0096f8ddf143bdeb1320b7601008683ce94bdad9ef235e1f73ad948 SHA512 c264be4cb29d87c95918d2723ab20bc7e2cb5149cb366cca348c6cd311b0f38ac500ed6b4756b20245a446ead50e7208f77093d6081563ed76d6691abfcbe14c
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
@@ -10,19 +9,16 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066
 DIST apache-tomcat-8.5.69-src.tar.gz 5916996 BLAKE2B 4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48 SHA512 467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb
-DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1
 DIST apache-tomcat-9.0.48-src.tar.gz 6080015 BLAKE2B 9b2cac8143ca8186857d7d53e8737f2f7d2ec8e0ca03d32447ad25b429cbf37c1c7b39bc6e4b93679c08bd5f4940280d00946a70e9fa82f8c2a596ea18a2a4c6 SHA512 9b762f6d1a1f6c75e10f1bc05c39a647ae2165f3b81c09ff73cc286f3c487b034b9d14c73b808c73b35f55f642848831a0329d9d611c8bbb3928559e552a3ff3
 DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2
-EBUILD tomcat-servlet-api-10.0.6.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43
-EBUILD tomcat-servlet-api-10.0.7.ebuild 3016 BLAKE2B b563cd01c61d47c69bcd01167d6c03fd08c06d57440cab0c4217e43c2238a3c710adfe0ee1af3c0587bb2dd3838f6922b797a33989936849cd49e294c7bda1a5 SHA512 2acb50d16f6527dd1ff4db00191d07128cd8ff37ce2bb701e34978fee9c3d549a7fc663178b203d33b1f6d5c416525b3b41cb2e68c74dce60acab930f381e07c
-EBUILD tomcat-servlet-api-10.0.8.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803
+EBUILD tomcat-servlet-api-10.0.7.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43
+EBUILD tomcat-servlet-api-10.0.8.ebuild 3016 BLAKE2B b563cd01c61d47c69bcd01167d6c03fd08c06d57440cab0c4217e43c2238a3c710adfe0ee1af3c0587bb2dd3838f6922b797a33989936849cd49e294c7bda1a5 SHA512 2acb50d16f6527dd1ff4db00191d07128cd8ff37ce2bb701e34978fee9c3d549a7fc663178b203d33b1f6d5c416525b3b41cb2e68c74dce60acab930f381e07c
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 955 BLAKE2B e7046e9afdfc33a906b44bcc98d092f75d3c6cae4ca7263b5e0605318aa19257edeaf83c2ea7a3639852c0ff140b6b65d16dc04433d94bbccce9db12ad82a9c6 SHA512 3a3d5450df02d079c04406cb3a4b63e986ce4f2d591ab12ee8918d4fecc6337634cf5627539bd277d9fda07ed4b6398c70dd87c322ae598649b61a8fd7cab58a
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.68.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
 EBUILD tomcat-servlet-api-8.5.69.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
-EBUILD tomcat-servlet-api-9.0.46.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
-EBUILD tomcat-servlet-api-9.0.48.ebuild 3010 BLAKE2B f9496cb27b626b16eff3d2e3c0358dce807ae34089cd205ccabe66172632b9555145a4109daa4f1ea9d3b3d951afb3234c534ee0a0f526d25c151e04c86f584b SHA512 739edfe11422094aeea69f57e0c22ac31d05ab1b996d237956a9596d7e4c36db91e1ae8cb558ea0e28f325e9e00fbc0704d57dc8f185d55c0dae525740632386
-EBUILD tomcat-servlet-api-9.0.50.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
+EBUILD tomcat-servlet-api-9.0.48.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
+EBUILD tomcat-servlet-api-9.0.50.ebuild 3010 BLAKE2B f9496cb27b626b16eff3d2e3c0358dce807ae34089cd205ccabe66172632b9555145a4109daa4f1ea9d3b3d951afb3234c534ee0a0f526d25c151e04c86f584b SHA512 739edfe11422094aeea69f57e0c22ac31d05ab1b996d237956a9596d7e4c36db91e1ae8cb558ea0e28f325e9e00fbc0704d57dc8f185d55c0dae525740632386
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.6.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.6.ebuild
deleted file mode 100644
index e360880764ab..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="5.0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.7.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.7.ebuild
index c5339740e594..e360880764ab 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.7.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.8.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.8.ebuild
index fb739b89bf7a..c5339740e594 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.8.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.ebuild
deleted file mode 100644
index 4811db9874c5..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
index b008bbac0cd2..4811db9874c5 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.50.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.50.ebuild
index 4a8d22d12869..b008bbac0cd2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.50.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.50.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 79049ae5abae..ad96689befd4 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index dc08c951cc0c..a515f911c755 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -7,6 +7,6 @@ DIST R-4.0.5.tar.gz 32466444 BLAKE2B 5dbbd289f4fd6347b4109eecaf65b50b5793a83eddd
 DIST R-4.1.0.tar.gz 33714683 BLAKE2B 22ba966b5a29f153f3ce6cbc467e815c397e7c6aade0db62c7d2ae044056d9227da4dcb8fbf33e661548f4f434c328415e297c6b07b3932ef3f47358c2543f42 SHA512 41519bf06a1ebc2bb582e9a7c35d0e82e213312dec8147861a7f9b28ee750cd40dfbf02737602d05698641fcea6182b0da8131e83edacc358e98eca0a393b729
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
 EBUILD R-4.0.4.ebuild 7311 BLAKE2B 63fc04096321ca5d5e3c947816ad02bf1b1fee47ea9e4500006ebc356dbf4aa70aca631497988ac33fb5a1e8ab2999a23f6b1d4519206a73993cefb79d2f9884 SHA512 6bcae68392035fcb25cf55e5e0dda41ad746ab5dcd1868477da801d8d7af82b0e3d0b52fa2d82009b43ea892bd9cf2c5b57c62aca4a7ee36a431e6f55b4cdf44
-EBUILD R-4.0.5-r1.ebuild 7314 BLAKE2B 8b5d585e08797e7990b1e4fb4cb26e111b6e264798a62c06ba826524258e6f76e8c80b16d6a807b7e0b1fc04c04e41965fcf3ac16766364b3066e6220a62c577 SHA512 6280b8f1482fc997b9a4719056a9e404c2114c48d2488c422fa0eedc94ceb0d1b3fd126eb9927ebf4066b49d5bfe32f2ac3098395c4d0afde0bd5e6e68cad805
+EBUILD R-4.0.5-r1.ebuild 7313 BLAKE2B fd84cc2304d72deaf1f723bffed2906cbd810b913d4c636a37c12f4dab6ffa866ee769636bb700e2447a8a771dbed5cad9df3f289d510d9593f08f9c167f0a3f SHA512 50a086dade0562b6494623eb56f7fb2b98982a8d1b3d9f5ec27c35399ccf2de13c3c5a0ac51dc7d46abaac74d9838869aeeb274a7ac5120bfdc87c3a05354747
 EBUILD R-4.1.0-r2.ebuild 7080 BLAKE2B 312412a327e25891d3b4236f648d4958b0d7ffcada36add367baeced3f325af645cb21c5126190643bfd92eba34d169c14a68e2cdfdc3b9c98de7e7254171e3b SHA512 978cf3808415dbcea5fcbf81a3e9877e236317bb89a821b2f812f0673631fee2e4be63a66c9b26ced3f85ef429ddca4482624e7e8d87b9c9172e87707d7325c8
 MISC metadata.xml 1260 BLAKE2B eb0399a7ff9cb5c8a2f26944065ea176fb379bfd509fe2f6115dc0deb625d0c92a6cf62736572024f9c1342865cbd8a6ed43f8c427939a08ded55dd73f5514df SHA512 71c20b8afc3a72627e89bf032db5c19369738bfe35fc6d3a2550f21bf70be1eec1a697ec13690f48a1f2604cd3973140311af6b745719fd724dea595b964e6ae
diff --git a/dev-lang/R/R-4.0.5-r1.ebuild b/dev-lang/R/R-4.0.5-r1.ebuild
index e8bfafd7f0a7..ea1e78006a93 100644
--- a/dev-lang/R/R-4.0.5-r1.ebuild
+++ b/dev-lang/R/R-4.0.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~hppa ~ia64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs test tiff tk X"
 
 # One test required profiling in v4.0.2, check the upstream bug:
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index d4f865f7a16d..3251085fe490 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,22 +1,10 @@
-AUX 5.1.4/01_all_boolean_expression.upstream.patch 1064 BLAKE2B 0b0f1504c57fabdd619187ed209864bc03f3c04fb651425dd4b7a30492c6a1441bab10695280eaf9277da266e883cb3f55ddc7ab496476b0fd1ca447cc611441 SHA512 b8d92c22059a50e7af0bc6fcc5773cda018628929c970650c963e2ad551cf758f503fe97de6542629d3b61ab2779970db811a1c7f7b7a2849a7632a4ec07b566
-AUX 5.1.4/02_all_table.upstream.patch 643 BLAKE2B adb5402472cd200ccbc39c51f484010f20ea2e6e4b99b7c08e1bc5db60f1aaa57c10f45c89a2999b75b620df04312b0c371bc8a09d44a1b8b9da5e8664e4c03d SHA512 fe362cb51516ea010eba28d15946641ef08e49e08d8a98b0fafcb86a4eb45311f8379efb67e82dbdd83533763000b59b438b0339c784c00ecbe85266f610c9e6
-AUX 5.1.4/03_all_debug_getfenv.upstream.patch 232 BLAKE2B 25d10a11a2448547c3b3e340690e42bb6127949382dc60355d94cbc945233b2b91b90fd044f82b63f69a89e3e86baa55ede8ec36fd3989c76fd5c4697001a38a SHA512 226437b7943e914e402ac386bf8d78fe4d1584a581df2911d500a46b445aeb8c9ce5224aff2b063d1e45b56770facabc69548081f11342de212041404e8415b6
-AUX 5.1.4/04_all_gc_performance.upstream.patch 414 BLAKE2B 3225ebf965dd3c040a4cc5c0fefd5fc101f1831cfdebdce921b8ad9b76d70ee56e5315238b72aea920f5a0408565234aa89781447d9861834359cae0f40767e1 SHA512 e706bd69a4c471a105d50a1d97cce8a055aa532b5840cfa76f407d12d8169cac1ef077b77c75a9b9579d0480256c0d3cc6a89eba5a4027fe70494da4b6d546e8
-AUX 5.1.4/05_all_string_format.upstream.patch 651 BLAKE2B f4d0f5f2d10ed478a95e16feefe17533c66787d35f5253d44c8a047d5b043a8c3d2fe35fa2b3da8345c62a3496323cb129bb0676caed207c58f2a7b80a2cdc21 SHA512 4820764c9a832d7707b0710fc3f16a58958d23a3b2bf04875a71973a7aee65426a5c009298cf5f4d6333dc2e722f55a77b926a2cc14687927d777409a8e1ecd7
-AUX 5.1.4/06_all_io_read.upstream.patch 319 BLAKE2B 4b2e1401c7e9a6a7c87519656d0bfd69169b553e85254412f5912adf9f722d77ef95eba2c49329931484c300461bdb40de1d8308c3f2f71bf8212ea5e55eada0 SHA512 0fba978b95c9d0ff65fd8d05ebaabd75a65922360739c4df4c0a2c8412ad60f37d7ac2ad7413ca203b481b2818d7a446495a2b6f2f45c17815c5e0c8108f1a6b
-AUX 5.1.4/07_all_boolean_expression.upstream.patch 679 BLAKE2B 2325e4928886000a0c1cc894cf94b25293538508f50995ad1a4c76d20a0864fd31010dfbaa4a6b79cee1452303c4d9660afff572527df6a5121f27939b27a2e2 SHA512 1175e695cdb4f7e8ba8421a89016d40b28be165bbdb758317b7514fdd89fec51ac00a2b3d6e0a03abd76bbf98634a7ebf5b52cefbf3a3866457b84487e0efcb5
-AUX 5.1.4/08_all_metatable.upstream.patch 379 BLAKE2B 1499679e7f8ef5f55d419dc7527ccd550004ada0fdc97c3bbff3ed33ac6426789e4d759738a77f6bb5107dbc21c6646e653ad3837f1145e782e5264ed469615d SHA512 064d8a6e23cc5a1eb099b15e554ebe24bf29a677cd4a4885977b66d1de19d84a716e348380b784b3ec3ea4cfbd5d90d91936af231f3851dea9965c646be8e792
-AUX 5.1.4/09_all_prototype_collection.upstream.patch 459 BLAKE2B e9e14f79ad69fffad68dd8d7b0ebc577bac2b7c3a0c95ee2519f9d3034bd28d498e812f1bef4fea3f3c8234066aaeefcb345af7e4d478e6fb3398b60da650269 SHA512 4fd573d9346e09dcbe65fc9e3a9147dc586f728db95f62d1b731b39f442b08c21d74562ceafdbd39ecad4091afda2996b582c9e9a758d4e08d1f5f9a330fe47d
 AUX 5.2.0/01_all_memory_hoarding.upstream.patch 1639 BLAKE2B 14ff68362d99e00fa3e5689cb09a84a2303266ba6ce553bd49c3d0be93da976e18dba53efb06f5df1f7e5a0ef021425698b8782923ba6011988045a4562b01ab SHA512 c1e0d0db9899539ade393ddfe7f5b9493576227cc4e29ad6623c869d1e91b0d28061f85e5cf9fc36bb70b5e53aad5d9c8848982ccfbba2cf4a6019fd260eed8f
 AUX 5.2.0/02_all_hex_number_handling.upstream.patch 938 BLAKE2B 4d995b9cc7e90e798a24edaadd5c2db086124cf157aacd1763312c3f813a07a293dcd50e19496bb90a7ef0006f5c7be6181bf330c21ce53cfffecf3e457f49fa SHA512 950c05767fd2fb39cef253323544fe079e88443047f63b495ff7639c980fd410db0f5769fa7a19134db819b1fc0b252e5f34d48fa6c1352874f734586cc2d41e
 AUX configure.in 66 BLAKE2B 60319ac9b6bf60c84941673c4949e590e99c5e77b1309e25df797a8deef85d0d8ad0339e8b4fcfa5fc721545ceee62475f2284ea8f930687682265b1d03e4144 SHA512 b61041151ad4be2bb4a62f6659850fcf4179553103c421694ce739b84a57408fc59d09f5ad3f6dd8513be78ffa472689dc729031e3ef42b99f11ecc8e0053ffc
-AUX lua-5.1-make-r1.patch 2229 BLAKE2B 001317361dc3ffc98ad36f3a80137580503e04b5267b74f79ab25cc355bf93663b6e5a5ba35ea827ef66717a98e33cba3bbf2130ce458ea81b83abca71c00c9a SHA512 cd24e228b0d7f2abcb5afe045fc824811c9db9dc684f9e33f0de0e7215e18e6eae51fd86c5910a338a810679d46727944950fced42636e0484d9c3f08fa07fdd
-AUX lua-5.1-make_static-r1.patch 644 BLAKE2B e1615d2779814f7f5baf8d7257f132d812db56b093dc871b28d69307196b37815d2b1e3051da7fcba21cb3120ef2f3b6a6b869b0b3808084ae67c5f738139ed3 SHA512 8cb1de7281839ebb492979f71b65c9ff6bbbde413c88323be6b77d7b7d26eb2034c541a883fd7cfab0694293732f3ac46dba33620d7df30c45059560b8d6503d
 AUX lua-5.1-module_paths.patch 1078 BLAKE2B c8c6def6f3099f61cc750657df1609a0a26b9201db7ae9d07b792a1eebb50be8a7bbb3a6ef6201ec4927a199c116304edaef0b9c9ab0fc833df4d7e56e92332a SHA512 123b115389d01d383af8698d2ed66c75bb7c3e2d33de57b8539ae56a9478930a0a72fa5657e78cc1c5b6bef00d07ec3a51e19ec0e419647e84eb158fb5c4795a
 AUX lua-5.1-readline.patch 360 BLAKE2B b528a3566aa59fb1cccb22417b01e86ee0cd3b77a3e278a20d5b476949daf47f0a656c7493a137594f1cf3136d327530ac97833cf584956b35b6a88a808535b9 SHA512 a99154258419dc2e582804eae97517687e5b8b5f731dc91722193d1ff470b8522af6ff4e7142c9258afe4734cd52e6987d3c2108ac52b1487a262f1e89f2f332
 AUX lua-5.1.4-deprecated.patch 1417 BLAKE2B 993dd3169ebeaf8abbf5bf34e39f85b5d429c49bb534cbb0351c217705f36d7048d847241e05b3181c0cf0d4e54d449351b27947cea45b7bb880f4f62d8ebaeb SHA512 5b82058ece2cde2a720f9cdae727be0a68895438f90e24f2e37adb1cd79cf637ce20bb283918e44f4f561aa87a9b4f19d3305d71537671f61438962d48970f39
 AUX lua-5.1.4-test.patch 271 BLAKE2B 1b8d2fd524d34fce99315d03232984a3cd1ad74fb23a7794a9886613bc96cdd1d48c82913c5b1ebf0765b3e51d5fcba2dfedd8eb9cf62e63e6998036447319fd SHA512 963bd2c53714eb067a55ee4d84b465ee96b2d3de71498bc83ecb4f8de70d59d6574703b36c621b9969d3f595a2c794095aae0d9c59cc02d5778ce0e7a1da8247
-AUX lua-5.1.5-fix_vararg_calls.patch 470 BLAKE2B fa5863445dbca630dbe00fd03a09f752dc27d0106cb7a5cc8bddf51dc9bd01ae843ad29219ed2ba29dd3088b933bcbf91fc87d5c58a972f4bac99fe112f05aff SHA512 630e8537bd80771fecc4c8216ec96e243654bd0b7bd006b6867baca4effab90bab4a922951661d4fc3ac2700c3bd7c0c40227b9eeee7dd5a87c07a6382055b04
 AUX lua-5.1.5-make.patch 3079 BLAKE2B cf9b72afd8e08ea23256364f321d49427661de8353f7655b9da3de1ef943125ae86cf1a7aab9f1c459e51063031eb1105b7703ad9e1aee90a848497b58addb12 SHA512 92a1c890e40a8bd621dad4a18fc890850027c4a5a239b8259ef3002ad4835a7a11069ca964a62a096cd651a688b60f5f261c1223e4ac7981e7a8bb43788634ff
 AUX lua-5.2.4-make.patch 2418 BLAKE2B 89f3f8d0222041200cee33079686d049800f74dd6d796205a4089f09a44884d0aa111d47203e778f80e5acdde1d56ad3f87c9a00fc832ec0e0f20d7b518e48c7 SHA512 0f9d7bd63ce6e9aeecd5286fc7069421e2a0e9cffd707d8af96dbce1c8c623084032480e3a16b69f28c44019f284a73390faf84a24e738273f556c5998a5d1e6
 AUX lua-5.3.6-make.patch 2830 BLAKE2B 9d3ea717531d93d7f7618335f503528e629aa3582392c49e340b6909860a51e30371530ea06ef1ed81cc4bde4a294e1d6732662703f646a7a3f727159dc83fed SHA512 5d5f0a02f2e11cb7965702ffb2f65c0f19184ae4e27c28e57a100c35e8972e2fba419999af63b65b0f031880dda7851816cef126088ddb105b29d401d03e1132
@@ -30,7 +18,6 @@ DIST lua-5.3.6.tar.gz 303770 BLAKE2B 07c37c56f43095a4f6ca8eb8b3adf19afd53107c02b
 DIST lua-5.4.2-tests.tar.gz 128901 BLAKE2B 10e4f0e8760f9cbd4761fa26665008ae7412539f79a6a7687029808f08f0ae4a24721e787e2e87e5080c16e9dcce8577a7a39ddc6d3e483a3cfe11756139594e SHA512 1516c59deca211c38444bbf97b18e988e939209b03915d3691d756eeed31b52e8d3a1f05b71ac0b561965274c7b6f3afc4244cd2e9069995696e737e2d9dd40b
 DIST lua-5.4.2.tar.gz 353472 BLAKE2B 7e0e642684df635ed1c48db45989e86a2638024e30a170addf700b0c7d32276f1eaef80898539c671039c20cb0bed4861b12c58f4b8211653a17e89bad278d87 SHA512 9454a6ffd973598f2f4a2399834c31c4d5090bd12e716776e3189aa57760319d114ee64a8338bbc2ef5e08150bf0adc2ad94a1b2677f38538a43359969d4d920
 EBUILD lua-5.1.5-r106.ebuild 4028 BLAKE2B 6ed08f3803ff85e1425b536d42610a9a3ff1787aa1ebb3b0c4776655c6b759b25196fa6a12b53c2ffc6538ad24d1c306d202edac32efeba0c2d74093d28c62da SHA512 12d0ff60bf6f35c549e18f6de7c52c11db7d4695bed3ca36e59bf395ca642b6b315f6034071d5daee4a45e614cd7f15e7e70e06846f4d15d05003d632220bf9f
-EBUILD lua-5.1.5-r4.ebuild 3607 BLAKE2B 5039dd79ad6df4bf2111d2cb48b5c0451293f3a0572df89cbda051934be984fce24dfc89f58c7d46ee206e46d165c5204d133e3c1efdc7a393194e0fb3046eb4 SHA512 41dad3c318c22cd624d219d6e0b18bd202cd9240689fbe973c88b86db6dedc8e13b89aa0cd96ffc760649b04d77aeeb64b88426b11d99c3b17dcd00a9826178c
 EBUILD lua-5.2.4-r3.ebuild 5768 BLAKE2B 3afbc7ac9176d1d57ed778a0a42bbe1c8c8cdf60bd2a17c57ae6292320c3d6eade55e84cac52901a878cc0ee8f71e99b6a936e83db139f0df4333c3fb3f67a80 SHA512 3e15e104b0ef21da5b9e7d57c7730ee5e76c24757714f4b430b779914f7017dd902cc22df21e2dfe7684d0df8e51023ffde9fb82f91e834b73b337907adcc31d
 EBUILD lua-5.3.6-r2.ebuild 5752 BLAKE2B 88d746cbe0643295ebacca48b1343acf3c1ddce29b9249df65e498cac970221adb15841b978d7ed16b78a503f107d307f3a6e6b1dec5f2ab7f0a086a65d8054e SHA512 eb9a993fd34799b95ae6fe7d9ee6cc2b05f8298ed0c91546561cd4683a4c57c9c74786ce0950f4b82cd96c4e7d663400bacda9b8734bd440abbc3d312891c428
 EBUILD lua-5.4.2-r1.ebuild 5692 BLAKE2B 285a6414e82dbd823a5d11aa145752dc9fe5f1465f9bc0505c30d2b0101f381c361f2af5b7440f54c9e7bff9de1fa8cb5be2b211acbde021bdb875648c0eb3ff SHA512 85c8cfee83ea7bb515a12bcdba42089c210f70d35a7b1d51ae54b80d97e41377b94cddd3e96f8cd12a3f55d3c80fb84d7972796c73092cbee974ed0df8288f87
diff --git a/dev-lang/lua/files/5.1.4/01_all_boolean_expression.upstream.patch b/dev-lang/lua/files/5.1.4/01_all_boolean_expression.upstream.patch
deleted file mode 100644
index f04eb85075a2..000000000000
--- a/dev-lang/lua/files/5.1.4/01_all_boolean_expression.upstream.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- lua-5.1.4.orig/src/lcode.c	2007/12/28 15:32:23	2.25.1.3
-+++ lua-5.1.4/src/lcode.c	2009/06/15 14:07:34
-@@ -544,15 +544,18 @@
-       pc = NO_JUMP;  /* always true; do nothing */
-       break;
-     }
--    case VFALSE: {
--      pc = luaK_jump(fs);  /* always jump */
--      break;
--    }
-     case VJMP: {
-       invertjump(fs, e);
-       pc = e->u.s.info;
-       break;
-     }
-+    case VFALSE: {
-+      if (!hasjumps(e)) {
-+        pc = luaK_jump(fs);  /* always jump */
-+        break;
-+      }
-+      /* else go through */
-+    }
-     default: {
-       pc = jumponcond(fs, e, 0);
-       break;
-@@ -572,14 +575,17 @@
-       pc = NO_JUMP;  /* always false; do nothing */
-       break;
-     }
--    case VTRUE: {
--      pc = luaK_jump(fs);  /* always jump */
--      break;
--    }
-     case VJMP: {
-       pc = e->u.s.info;
-       break;
-     }
-+    case VTRUE: {
-+      if (!hasjumps(e)) {
-+        pc = luaK_jump(fs);  /* always jump */
-+        break;
-+      }
-+      /* else go through */
-+    }
-     default: {
-       pc = jumponcond(fs, e, 1);
-       break;
-
diff --git a/dev-lang/lua/files/5.1.4/02_all_table.upstream.patch b/dev-lang/lua/files/5.1.4/02_all_table.upstream.patch
deleted file mode 100644
index 9ffc1bb28843..000000000000
--- a/dev-lang/lua/files/5.1.4/02_all_table.upstream.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lua-5.1.4.orig/src/lvm.c	2007/12/28 15:32:23	2.63.1.3
-+++ lua-5.1.4/src/lvm.c	2009/07/01 20:36:59
-@@ -133,6 +133,7 @@
- 
- void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) {
-   int loop;
-+  TValue temp;
-   for (loop = 0; loop < MAXTAGLOOP; loop++) {
-     const TValue *tm;
-     if (ttistable(t)) {  /* `t' is a table? */
-@@ -152,7 +153,9 @@
-       callTM(L, tm, t, key, val);
-       return;
-     }
--    t = tm;  /* else repeat with `tm' */ 
-+    /* else repeat with `tm' */
-+    setobj(L, &temp, tm);  /* avoid pointing inside table (may rehash) */
-+    t = &temp;
-   }
-   luaG_runerror(L, "loop in settable");
- }
-
diff --git a/dev-lang/lua/files/5.1.4/03_all_debug_getfenv.upstream.patch b/dev-lang/lua/files/5.1.4/03_all_debug_getfenv.upstream.patch
deleted file mode 100644
index fce4d47db8f4..000000000000
--- a/dev-lang/lua/files/5.1.4/03_all_debug_getfenv.upstream.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lua-5.1.4.orig/src/ldblib.c	2007/12/28 15:32:23	2.63.1.3
-+++ lua-5.1.4/src/ldblib.c	2010/02/23 12:36:59
-@@ -45,6 +45,7 @@
- 
- 
- static int db_getfenv (lua_State *L) {
-+  luaL_checkany(L, 1);
-   lua_getfenv(L, 1);
-   return 1;
- }
diff --git a/dev-lang/lua/files/5.1.4/04_all_gc_performance.upstream.patch b/dev-lang/lua/files/5.1.4/04_all_gc_performance.upstream.patch
deleted file mode 100644
index 3c78525b0b2f..000000000000
--- a/dev-lang/lua/files/5.1.4/04_all_gc_performance.upstream.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- lua-5.1.4.orig/src/llex.c	2007/12/28 15:32:23	2.63.1.3
-+++ lua-5.1.4/src/llex.c	2010/02/23 12:36:59
-@@ -118,8 +118,10 @@
-   lua_State *L = ls->L;
-   TString *ts = luaS_newlstr(L, str, l);
-   TValue *o = luaH_setstr(L, ls->fs->h, ts);  /* entry for `str' */
--  if (ttisnil(o))
-+  if (ttisnil(o)) {
-     setbvalue(o, 1);  /* make sure `str' will not be collected */
-+    luaC_checkGC(L);
-+  }
-   return ts;
- }
- 
diff --git a/dev-lang/lua/files/5.1.4/05_all_string_format.upstream.patch b/dev-lang/lua/files/5.1.4/05_all_string_format.upstream.patch
deleted file mode 100644
index 5127507df9f6..000000000000
--- a/dev-lang/lua/files/5.1.4/05_all_string_format.upstream.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- lua-5.1.4.orig/src/lstrlib.c	2008/07/11 17:27:21	1.132.1.4
-+++ lua-5.1.4/src/lstrlib.c	2010/05/14 15:12:53
-@@ -754,6 +754,7 @@
- 
- 
- static int str_format (lua_State *L) {
-+  int top = lua_gettop(L);
-   int arg = 1;
-   size_t sfl;
-   const char *strfrmt = luaL_checklstring(L, arg, &sfl);
-@@ -768,7 +769,8 @@
-     else { /* format item */
-       char form[MAX_FORMAT];  /* to store the format (`%...') */
-       char buff[MAX_ITEM];  /* to store the formatted item */
--      arg++;
-+      if (++arg > top)
-+        luaL_argerror(L, arg, "no value");
-       strfrmt = scanformat(L, strfrmt, form);
-       switch (*strfrmt++) {
-         case 'c': {
-
diff --git a/dev-lang/lua/files/5.1.4/06_all_io_read.upstream.patch b/dev-lang/lua/files/5.1.4/06_all_io_read.upstream.patch
deleted file mode 100644
index 94634c591404..000000000000
--- a/dev-lang/lua/files/5.1.4/06_all_io_read.upstream.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- lua-5.1.4.orig/src/liolib.c	2008/01/18 17:47:43	2.73.1.3
-+++ lua-5.1.4/src/liolib.c	2010/05/14 15:29:29
-@@ -276,7 +276,10 @@
-     lua_pushnumber(L, d);
-     return 1;
-   }
--  else return 0;  /* read fails */
-+  else {
-+    lua_pushnil(L);  /* "result" to be removed */
-+    return 0;  /* read fails */
-+  }
- }
- 
- 
-
diff --git a/dev-lang/lua/files/5.1.4/07_all_boolean_expression.upstream.patch b/dev-lang/lua/files/5.1.4/07_all_boolean_expression.upstream.patch
deleted file mode 100644
index 956e966817d4..000000000000
--- a/dev-lang/lua/files/5.1.4/07_all_boolean_expression.upstream.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- lua-5.1.4.orig/src/lcode.c	2007/12/28 15:32:23	2.25.1.3
-+++ lua-5.1.4/src/lcode.c	2009/06/15 14:07:34
-@@ -549,13 +549,6 @@
-       pc = e->u.s.info;
-       break;
-     }
--    case VFALSE: {
--      if (!hasjumps(e)) {
--        pc = luaK_jump(fs);  /* always jump */
--        break;
--      }
--      /* else go through */
--    }
-     default: {
-       pc = jumponcond(fs, e, 0);
-       break;
-@@ -579,13 +572,6 @@
-       pc = e->u.s.info;
-       break;
-     }
--    case VTRUE: {
--      if (!hasjumps(e)) {
--        pc = luaK_jump(fs);  /* always jump */
--        break;
--      }
--      /* else go through */
--    }
-     default: {
-       pc = jumponcond(fs, e, 1);
-       break;
diff --git a/dev-lang/lua/files/5.1.4/08_all_metatable.upstream.patch b/dev-lang/lua/files/5.1.4/08_all_metatable.upstream.patch
deleted file mode 100644
index b74bafbebe41..000000000000
--- a/dev-lang/lua/files/5.1.4/08_all_metatable.upstream.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lua-5.1.4.orig/src/lvm.c	2009/07/01 21:10:33	2.63.1.4
-+++ lua-5.1.4/src/lvm.c	2011/08/17 20:36:28
-@@ -142,6 +142,7 @@
-       if (!ttisnil(oldval) ||  /* result is no nil? */
-           (tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL) { /* or no TM? */
-         setobj2t(L, oldval, val);
-+        h->flags = 0;
-         luaC_barriert(L, h, val);
-         return;
-       }
diff --git a/dev-lang/lua/files/5.1.4/09_all_prototype_collection.upstream.patch b/dev-lang/lua/files/5.1.4/09_all_prototype_collection.upstream.patch
deleted file mode 100644
index 000f78ccc7da..000000000000
--- a/dev-lang/lua/files/5.1.4/09_all_prototype_collection.upstream.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lua-5.1.4.orig/src/lparser.c	2007/12/28 15:32:23	2.42.1.3
-+++ lua-5.1.4/src/lparser.c	2011/10/17 13:10:43
-@@ -374,9 +374,9 @@
-   lua_assert(luaG_checkcode(f));
-   lua_assert(fs->bl == NULL);
-   ls->fs = fs->prev;
--  L->top -= 2;  /* remove table and prototype from the stack */
-   /* last token read was anchored in defunct function; must reanchor it */
-   if (fs) anchor_token(ls);
-+  L->top -= 2;  /* remove table and prototype from the stack */
- }
- 
- 
diff --git a/dev-lang/lua/files/lua-5.1-make-r1.patch b/dev-lang/lua/files/lua-5.1-make-r1.patch
deleted file mode 100644
index 8eecbdd40268..000000000000
--- a/dev-lang/lua/files/lua-5.1-make-r1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- lua-5.1.1.orig/Makefile	2006-06-02 12:53:38.000000000 +0200
-+++ lua-5.1.1/Makefile	2006-11-16 02:16:53.000000000 +0100
-@@ -127,3 +127,21 @@
- .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho newer
- 
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+	cd src; $(MAKE) $@
-+
-+gentoo_test: gentoo_linux
-+	test/lua.static test/hello.lua
-+
-+gentoo_install:
-+	mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+	cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac $(INSTALL_BIN)
-+	cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB)
---- lua-5.1.1.orig/src/Makefile	2006-03-22 01:41:49.000000000 +0100
-+++ lua-5.1.1/src/Makefile	2006-11-16 02:10:27.000000000 +0100
-@@ -54,1 +54,1 @@
--$(LUA_T): $(LUA_O) $(LUA_A)
-+origin$(LUA_T): $(LUA_O) $(LUA_A)
-@@ -57,1 +57,1 @@
--$(LUAC_T): $(LUAC_O) $(LUA_A)
-+origin$(LUAC_T): $(LUAC_O) $(LUA_A)
-@@ -176,3 +176,33 @@
-   ltm.h lzio.h lmem.h lopcodes.h lundump.h
- 
- # (end of Makefile)
-+
-+export LIBTOOL = libtool --quiet --tag=CC
-+export LIB_VERSION = 6:1:1
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+	$(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
-+            -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
-+	$(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+lua_test: $(LUA_O:.o=.lo) $(LIB_NAME)
-+	$(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
-+	$(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
-+
-+gentoo_clean:
-+	$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac
-+
-+gentoo_all: $(LIB_NAME) $(LUA_T) lua_test $(LUAC_T)
diff --git a/dev-lang/lua/files/lua-5.1-make_static-r1.patch b/dev-lang/lua/files/lua-5.1-make_static-r1.patch
deleted file mode 100644
index e5fdc3a6bfa1..000000000000
--- a/dev-lang/lua/files/lua-5.1-make_static-r1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru lua-5.1.1.orig/src/Makefile lua-5.1.1/src/Makefile
---- lua-5.1.1.orig/src/Makefile	2006-11-21 07:19:31 +0000
-+++ lua-5.1.1/src/Makefile	2006-11-21 07:19:52 +0000
-@@ -196,7 +196,7 @@
-             -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
- 
- $(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
--	$(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+	$(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
- 
- $(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
- 	$(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
diff --git a/dev-lang/lua/files/lua-5.1.5-fix_vararg_calls.patch b/dev-lang/lua/files/lua-5.1.5-fix_vararg_calls.patch
deleted file mode 100644
index cec818203360..000000000000
--- a/dev-lang/lua/files/lua-5.1.5-fix_vararg_calls.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr lua-5.1.5.orig/src/ldo.c lua-5.1.5/src/ldo.c
---- lua-5.1.5.orig/src/ldo.c    2016-11-28 20:04:13.177047928 +0100
-+++ lua-5.1.5/src/ldo.c 2016-11-28 20:07:15.170432525 +0100
-@@ -274,7 +274,7 @@
-     CallInfo *ci;
-     StkId st, base;
-     Proto *p = cl->p;
--    luaD_checkstack(L, p->maxstacksize);
-+    luaD_checkstack(L, p->maxstacksize + p->numparams);
-     func = restorestack(L, funcr);
-     if (!p->is_vararg) {  /* no varargs? */
-       base = func + 1;
diff --git a/dev-lang/lua/lua-5.1.5-r4.ebuild b/dev-lang/lua/lua-5.1.5-r4.ebuild
deleted file mode 100644
index 3282707e4adf..000000000000
--- a/dev-lang/lua/lua-5.1.5-r4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch multilib multilib-minimal portability toolchain-funcs versionator
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="http://www.lua.org/"
-SRC_URI="http://www.lua.org/ftp/${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"
-IUSE="+deprecated emacs readline static"
-
-RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-PDEPEND="emacs? ( app-emacs/lua-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/luaconf.h
-)
-
-src_prepare() {
-	local PATCH_PV=$(get_version_component_range 1-2)
-
-	epatch "${FILESDIR}/${P}-fix_vararg_calls.patch"
-
-	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
-	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
-
-	# use glibtool on Darwin (versus Apple libtool)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
-			Makefile src/Makefile || die
-	fi
-
-	#EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
-
-	# correct lua versioning
-	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile || die
-
-	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
-
-	if ! use deprecated ; then
-		# patches from 5.1.4 still apply
-		epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
-		epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
-	fi
-
-	if ! use readline ; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
-	fi
-
-	# Using dynamic linked lua is not recommended for performance
-	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
-	# Mainly, this is of concern if your arch is poor with GPRs, like x86
-	# Note that this only affects the interpreter binary (named lua), not the lua
-	# compiler (built statically) nor the lua libraries (both shared and static
-	# are installed)
-	if use static ; then
-		epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
-	fi
-
-	# custom Makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# We want packages to find our things...
-	sed -i \
-		-e 's:/usr/local:'${EPREFIX}'/usr:' \
-		-e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
-		etc/lua.pc src/luaconf.h || die
-}
-
-multilib_src_compile() {
-	tc-export CC
-	myflags=
-	# what to link to liblua
-	liblibs="-lm"
-	liblibs="${liblibs} $(dlopen_lib)"
-
-	# what to link to the executables
-	mylibs=
-	if use readline; then
-		mylibs="-lreadline"
-	fi
-
-	cd src
-	emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
-			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
-			LUA_LIBS="${mylibs}" \
-			LIB_LIBS="${liblibs}" \
-			V=${PV} \
-			gentoo_all
-
-	mv lua_test ../test/lua.static
-}
-
-multilib_src_install() {
-	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
-			V=${PV} gentoo_install
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins etc/lua.pc
-}
-
-multilib_src_install_all() {
-	dodoc HISTORY README
-	dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
-
-	doicon etc/lua.ico
-
-	doman doc/lua.1 doc/luac.1
-}
-
-multilib_src_test() {
-	local positive="bisect cf echo env factorial fib fibfor hello printf sieve
-	sort trace-calls trace-globals"
-	local negative="readonly"
-	local test
-
-	cd "${BUILD_DIR}" || die
-	for test in ${positive}; do
-		test/lua.static test/${test}.lua || die "test $test failed"
-	done
-
-	for test in ${negative}; do
-		test/lua.static test/${test}.lua && die "test $test failed"
-	done
-}
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index bb6ba14edf69..9653319575ef 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -1,5 +1,5 @@
 AUX 50mozart-gentoo.el 592 BLAKE2B 4bac647ce0e16ef481c3907a183f5559fb2644edddc8c4bd3864fef572c2064b0f4f0d6a66de3995c894fc9b4c6d813f82cc98dd5ccff38fbf8d91dbea0ca8bd SHA512 b8f50633ea7b249aadc096b3533f9dbfc65e4e2ef6d3afe39910b42a2f98ea44b133c55e308d3808f7373df835fa9653c229104035eb3b6ec24ede4968fdd254
-DIST mozart-2.0.1-gentoo-patchset-1.tar.gz 39069 BLAKE2B 7490d13665314b3a998fb21bd8a342f262d92a395c3b0bbfa9a7813c044220c82ac02eb0103409127862c9bb4e4c44765b1228a7bdea2cb247492c94264f4fe0 SHA512 ce3cdb8ffebd95d6065439432905ad68b9cd8b86f58478092ab55df7ae7c72498a3e29bda462f3305aff6c99d010c45d786f905e2e906550ee61656ba122bbc6
+DIST mozart-2.0.1-gentoo-patchset-2.tar.gz 39435 BLAKE2B 18fe6f6e0d81d3b7901c73df567d79b6d8d8564bc49eb10dace2669de1448672a48dc0c509afbb5c506e8af65902ce36cb30f48c7fa26b6aa49cc09988218d42 SHA512 407da6fae39734097ab22fec5bc97ad1beb9103b13484ee0429a40a8f5803f6ed2abd2a64cfb56ccdddf9f82a2d9cd0883fe0a8f8a94bee963590606e1667127
 DIST mozart-2.0.1.tar.gz 2281261 BLAKE2B 7f071e9ec130a0b482b299f4dac15d64f632702d6ecf55b7af0993087064e533b4de80f77520a725f69f68648a9ce763c8c8826bb24e52af49eda8c3ccfba0b5 SHA512 a72a6fa68296d06af72327fd11310b3be152e5ad9a56f1fc4200ac7b89cd177e9a23a38c6721e1885d4f2ed0870065e919fb9fe3c9a2833fcd8e4ac0fd43aeb4
-EBUILD mozart-2.0.1.ebuild 1973 BLAKE2B 1ceb81b2ca9eefc4b3be3ba2e2deba83d684fac4e7c4f799f7c78cdb26361d066f9605beb800d19e278bb7dfe5c69b698fdc9b0dd782cd27d378ff19022b3c81 SHA512 a8c25fecd52f5ae4f7ff5fe70cadd497d000befa0fd06f2261bc7309c9adfd89b651686ff6447727c4e8897d59ef6e7ee8210d04bbf1580666cc9160992c3e21
+EBUILD mozart-2.0.1.ebuild 1973 BLAKE2B 2f3a30371ede8c1f37e16d58cf6fcc0cdabdde91fb763a40800142e586b9a3b2a705daa8bce09ba1a518b5b222a99eebee2245793b623db0f43eee6c5c2fdf41 SHA512 adfe074a230cdd04074eb4ae0f42a06991f116246350b004f853dd8824bbf6b1c7d08138fbd9d1acc07d26bf0d197167473c8a2db99429763e53c22a66c7ca60
 MISC metadata.xml 321 BLAKE2B 66e915ec2aa90d30c791cdf291b101a0559043c45d0ae8379724b5d96da7b10cba94a87dcd1ebba60613bdd96db5b186250b8ab760a525a32e6997053b3fbb21 SHA512 8a4dd517688fd00cac687ce1b89bfc4a0ecb7fff980cc7505db8fa748d729c14622e2bb1909c206e2e226be65ceafc83763db820b22bef16e0e18f91f70a6a90
diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild b/dev-lang/mozart/mozart-2.0.1.ebuild
index 510d6729b40b..d30212468b3b 100644
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake elisp-common java-pkg-2 java-ant-2
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 
 DESCRIPTION="Advanced development platform for intelligent, distributed applications"
 HOMEPAGE="http://mozart2.org/"
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 358623c420f4..fbb629a98ace 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,21 +1,12 @@
 AUX perl-5.26.2-hppa.patch 3231 BLAKE2B d59eab55eea3daceb0d3df39778d43ebaee2c065c052ca048ec17c06fa90049eb7fd5ae40092f11248de25cdf9cff96dc69626e7f3269b24cf618004deeb5859 SHA512 24856ae3c637c58d16d543240f5028e137c33c7aeae7c0c3dfa1a69b621057a84ab4ddf8b12ac6ef251381af4b190c200262bec9bdaa6001199dbd1d15cf4bae
 AUX perl-5.30.3-darwin-macos11.patch 6367 BLAKE2B 5fb6a34bf5e422ba4a5f76d9462328fb81e44e6de7dc363ad595d9315ac622d5eb2973700e3eb209f630bfd2d002adfe33f1a3a10f7c5818ed44fc3a26bd55d5 SHA512 c8d88c2f21b781e777ca19115eedecdf4d8bc0f93b01da6da578be489e0151f3ab7d3204e6b7a28848f9286bad90bcf6f33edc63be82949060e06fc6c739fb7f
 AUX perl-5.34.0-crossfit.patch 388 BLAKE2B dda2f10732422857f1a3977b6aa6ec0536dffaa53658e23378083393a55cf283906ef8f41dde2eb83e0de4e5dfd6dcd06d6b236f0a91c44086172bcaf105396a SHA512 5da4dd913790bd125667851807da9e37dac9cda78cce18ecffb8780f42d30b65f46817633e65027f5438f1a39286139fcf961d4bc98caf70946152200c3e72ee
-DIST perl-5.30.0-patches-1.tar.xz 17352 BLAKE2B 67eb1c4ce6ada27e05962d06fa9c5675ca1d22623b5fd172ce8ceaa17f2e51d61f9451955f9f6acf6d97ea7d71c72b583be1378ccbf9174c88580baec2049a48 SHA512 4fe1f2de5e72e56890858148d20b772df63dce34cb3977ec47d8ed5323c4843929130f660f1558c282c97e65efa1c6d2fdacf9e2dcc0ef1d487a0b69dbb5bbb4
-DIST perl-5.30.3-patches-1.tar.xz 20292 BLAKE2B 34ca8dbdf08650deaaa59bba634c3a40c6da7d91b282365eec217cc421b17678837b1ae02de5d6b0b632858a0251b796ce28ddbdd7a86aca6697f18a527fcb62 SHA512 ba9aafcaff405c931b61ffc917be8ef71e538fd5277a3bcfafbaffc965b53f9c1811670558a0bc75c538586a30f11aba3ce59bd2214982eaad3b5afa64e67999
-DIST perl-5.30.3.tar.xz 12375128 BLAKE2B ff0668c896e46ea35a1b8bd4a7d800c8668d6995185cd8c43fca332da2fa63965bb5276b2d5cf9738c0b7fb735140f6e33f1b4582899017903f86753065f417b SHA512 0ea62cf17532ee99217a218c39aa530472857c7a1982494f3a01693683062b4cdebe383a79f7b64452c713337b554ed5e0fd6eda018ea29e83c3538a13c24f3c
 DIST perl-5.32.0-patches-1.tar.xz 20220 BLAKE2B 46ebca5c74f59aa935ceec2a5807426c0e653ad7ba27de441d26e049e62dc67b17d58dfe5755f31bdd157e349d47fd46a98699207729f8f4f747930ed1064ba2 SHA512 42ed00f5f6be40af59e02691ff439a048cccd96fb970cca0976209faa921af98a773cc4cb1466e164328350d58cb46950ffa8c6f2fddabbeb3e8819349b06849
-DIST perl-5.32.0.tar.xz 12717336 BLAKE2B 4abad9f1ddabaad5f2bbfe8ab6d061aeb8c558e458d4bf1bcf737a8ecc1cf20f7dffaddd0bc867578b457787ec284fa81be3fae1edd7f72d58aeec7b5cd744e5 SHA512 1540247415893bbd94dfeede7b4fba6052688dc0bf27ced817f448246fcdc6e9a6486abc34577dec5b00bf02ed607b2d24ccd4977c3b3c51e8e6edfc0b81c760
 DIST perl-5.32.1.tar.xz 12610988 BLAKE2B 9f89bcf9cffb245a0f2cb0afa17c25f092c84cc2f29bb1c744294c2f0393c72dc3beb9fcbe256cf252677b33bc594b294b3f6a4774ad9e30b771aceed1f4f147 SHA512 3443c75aea91f0fe3712fee576239f1946d2301b8f7390b690e2f5d070fe71af8f9fa7769e42086c2d33d5f84370f80368fa9350b4f10cc0ac3e6c1f6209d8f9
 DIST perl-5.34.0-patches-1.tar.xz 20360 BLAKE2B e60074c49f357d4841708f58b5165a44201783238ff33ee81580bb83ba07d3d2dda447edd30a71ce8c9bafe5e5e0235b68e31a79081c3482bdd589231f0e898e SHA512 909e1fb22cda4ca769b51645b51a64df81b92210cfee388ac57834406bc13e404f0a1e6bad0888fafc73fc34b7fb224801fd02e87fb4c2f9145482ad74374e7b
 DIST perl-5.34.0.tar.xz 12881416 BLAKE2B 4139e77fbb38b2b72671c0b130233cf5ed35112bbba3301b8ed724739c7ff96b041752aa505b938e257ef6ebf98a9b6dad1858e00f756c841a0520688d974e9a SHA512 691b4b31eacec357191fba777612b4e3eae59e946a22998a50766697c0d61db1d42a9b3bc1e41abf0d1ca1893e4a7c06d7bf3290480cf03d7f79befd7a8a3267
-DIST perl-cross-1.3.2.tar.gz 108350 BLAKE2B ddb352fdbec66a04de62425f5cae1aaa3bc7251b9d6f4837b66a0bd79c53c60212fad3997dad4c38055774a2769d45b5b83927bf48b0fb00a130fee429eba702 SHA512 d61d25066a8d87c34aeacc5b9bd86fab964b33c4c65e84a89e4077fe1d8011c0bdf810a304631af44fae32edcffd6c99fc17b0c584ea83d1ce5ce492aaedfea5
 DIST perl-cross-1.3.4.tar.gz 108461 BLAKE2B 28f207d235f51ebf681598cf85f7f16923574aafb593426a59d67578135ee3632efb12b9e1a672759195a79f80e49f5c929ec42b2b4571b1d36f5d8c8dceadc2 SHA512 7e1fc7b2b19d8c2e2fb8615e074e218b2e1a4d276b563ffabccfd0c7398bc8680fca96da89cc61d611993f38a2c67dfbb0201c58658e05437395ad8c00d31874
 DIST perl-cross-1.3.6.tar.gz 110210 BLAKE2B 39074d6f4a526f59de2b1c40432936552e625a5a4e44fbb7ce3c1c3828b12c5298d1ab49b7d34ea92e2a4c8c88f8bbef8cc0c582a3fbbed975cf46d331e89c08 SHA512 d394fbd75d890442aa599eae8893a26540c8b7af966583ad1c3213c3fe0e074415cfed8814de8f397830833fd78267bdc55adc5267168198f269634c2ef3b982
-EBUILD perl-5.30.3-r1.ebuild 20690 BLAKE2B 036c53922ed6247d01828cf6ce7f47be06877c0e9d63158e37a9aba1f35c3e717c3f0cbe6fffadceb513a1d34f2ef300cce7e4a98ec601e359d9414dce882c14 SHA512 17793920606af30aab84d2300dabf07a60147f94865124ccbb7feae94a309768492364ac5b26ca8b0e99d1860856d6be54ab9a0812aa59180c28ffbebbad1d6f
-EBUILD perl-5.30.3-r2.ebuild 26146 BLAKE2B e0756d8250acfd3dbbdeac414f2515270820a091a10dca4d59e1912c85d855b439558d25bf09420dd62e9c3a0dd204a87717fd24fbc4f29858bc15047bdf7a42 SHA512 e7ae782d61a1d841a6dd6138ff56109ba07a9e81ab1a9cbb4e7b4faf4c439766c646ababcc2f726a12cadcd3532c9d09b7f80cb5c95e0b3a1a39674f96edca29
-EBUILD perl-5.30.3.ebuild 20132 BLAKE2B a244f590c7be7a1f078e8117d3b2745c4118c8a7ec264caf950a0e4c051090b38d4fae431187486fa4b527b7a5ba1cf7000134e9cc2a25bc1a8397b72bd882ac SHA512 d32292624e29ad20f41a9c688b663297246c868455bc4c3d079b12ff90f4fd89f88623e3ca270c58e92ffefe1fcdd6a38910da18efee5954fc1d24de0c104a87
-EBUILD perl-5.32.0-r1.ebuild 25913 BLAKE2B a97f41da180ee9e0beeb163ffbbc1c1f944d8dae32954603c9a3a9bf24d9623db6146b8440917dc891ce24ddb41c6c782e04630e4cfa68649f526d7a3e57def3 SHA512 1223ca91df30ccdc247f8a9659376e4407920c1223753b00da91859935117f5361c128b3b1f5d38596f70a4d0ec0e6e6fda58f1b135525c67183fe906bbb2cd4
 EBUILD perl-5.32.1.ebuild 25758 BLAKE2B 581401462e8ea39175e4a2796a70aea34eaf0a7f7f31c49edf00c95b99f42bfd000faf2e12911198d8d48a07a552d0c95cf3574077919bd3e24f6c8fa46baccd SHA512 3c66bc03faf56fc1c812a26ce39839b9a679cdbb3c5a41efe0f5f4b94348956550c576be32dd01e180f34692f11ed963c3497f2e501b8bde0e53290065bf5002
 EBUILD perl-5.34.0-r1.ebuild 25768 BLAKE2B 3421fa96f9d9cb3a8ece75dca3c5c174f739773a2180ba521976b0ba842ed748d4b06ed1320720b9c218ff37accc170f15462084c2e5193427860da5132af1bd SHA512 50e300eb0cf8a2b8212062acbd55f3007a609d0f4dcfdd30a426649e23ead7fe98787acb5e1ca7955f962ee65521cd6db9c2f624eae39cc368410da9897b95d3
 EBUILD perl-5.34.0.ebuild 25645 BLAKE2B 453e460de4ea3ef5a9a3218df8df262d88f7f2d5f92f6ede86329c0c617059d4d96277e43205b690285b96339adb9f145f2bc128e88292c0a1d639ae8e2ff5ad SHA512 5640301ba0e61a9dc181a7aefb07ad74f6f4b0e908d2d90b1cfb02a6b6aa070f93c7bb60236927ce31ee4419a227f4a27b4fed9e4cae58e30ea51489c9d1c23a
diff --git a/dev-lang/perl/perl-5.30.3-r1.ebuild b/dev-lang/perl/perl-5.30.3-r1.ebuild
deleted file mode 100644
index 7dc3e6631a75..000000000000
--- a/dev-lang/perl/perl-5.30.3-r1.ebuild
+++ /dev/null
@@ -1,668 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.3.4
-PATCH_BASE="perl-5.30.0-patches-${PATCH_VER}"
-PATCH_DEV=dilfridge
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN="5.30.0 5.30.1 5.30.2"
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	mirror://gentoo/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads minimal"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	!minimal? (
-		>=app-admin/perl-cleaner-2.5
-		>=virtual/perl-File-Temp-0.230.400-r2
-		>=virtual/perl-Data-Dumper-2.154.0
-		virtual/perl-Test-Harness
-	)
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.320.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.220.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
-	src_remove_dual      perl-core/Encode             3.10.0        enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.340.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.400.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.84.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.20.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.202.6.13.0_rc corelist
-	src_remove_dual      perl-core/Pod-Parser         1.630.0       pod2usage podchecker podselect
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Test-Harness       3.420.0       prove
-	src_remove_dual      perl-core/podlators          4.110.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.110.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-	PRIV_LIB="${PRIV_BASE}/${MY_PV}"
-	ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
-	SITE_LIB="${SITE_BASE}/${MY_PV}"
-	SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
-	VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
-	VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_update_patchlevel_h() {
-	# Copied and modified from debian:
-	# Copyright 2011 Niko Tyni
-	# This program is free software; you can redistribute it and/or modify
-	# it under the same terms as Perl itself.
-	local patchdir="${WORKDIR}/patches"
-	local prefix
-	local patchoutput="patchlevel-gentoo.h"
-
-	[[ -f ${patchdir}/series ]] || return 0
-
-while read patch
-do
-	patchname=$(echo $patch | sed 's/\.diff$//')
-	< $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e '
-
-	# massage the patch headers
-	s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend;
-	s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend;
-	s|^Bug-Gentoo: ||; tprepend;
-	s/^\(Subject\|Description\): //; tappend;
-	s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend;
-
-	# post-process at the end of input
-	$ { x;
-		# include the version number in the patchlevel.h description (if available)
-		s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/;
-
-		# escape any backslashes and double quotes
-		s|\\|\\\\|g; s|"|\\"|g;
-
-		# add a prefix
-		s|^|\t,"'"$prefix$patchname"' - |;
-		# newlines away
-		s/\n/ /g; s/  */ /g;
-		# add a suffix
-		s/ *$/"/; p
-	};
-	# stop all processing
-	d;
-	# label: append to the hold space
-	:append H; d;
-	# label: prepend to the hold space
-	:prepend x; H; d;
-	'
-done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}"
-echo "${patchoutput}" >> "${S}/MANIFEST"
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-src_prepare() {
-	local patch
-	EPATCH_OPTS+=" -p1"
-
-	if use hppa ; then
-		epatch "${FILESDIR}/${PN}-5.26.2-hppa.patch" # bug 634162
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
-	fi
-
-	einfo "Applying patches from ${PATCH_BASE} ..."
-	while read patch ; do
-		EPATCH_SINGLE_MSG="  ${patch} ..."
-		epatch "${WORKDIR}"/patches/${patch}
-	done < "${WORKDIR}"/patches/series
-
-	src_prepare_update_patchlevel_h
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name (soname) not to reference $D
-		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-
-		# Upstreamed, but not in this version.
-		# Need to recognise macOS 11 / 10.16. #757249
-		eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch"
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$(
-			find "${EROOT%/}${PRIV_BASE}" "${EROOT%/}${SITE_BASE}" "${EROOT%/}${VENDOR_BASE}" \
-				   -maxdepth 1 -mindepth 1 -type d -regex '.*/5[.][0-9]+[.][0-9]+$' \
-				   -printf "%f "  2>/dev/null )"
-	fi
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$(
-		echo "${PERL_OLDVERSEN}"           |\
-			tr " " "\n" 				   |\
-			grep -vF "${DIST_VERSION%-RC}" |\
-			sort -u -nr -t'.' -k1,1 -k2,2 -k3,3
-	)"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$(
-				for v in ${PERL_OLDVERSEN};	do
-					has "${v}" ${PERL_BIN_OLDVERSEN} && echo -n "${v}/${myarch}${mythreading} ";
-					echo -n "${v} ";
-				done )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT%/}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT%/}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT%/}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROO%/T}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT%/}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT%/}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		myconf -Dinc_version_list="${inclist}"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__
-
-	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
-	[[ ${CHOST} == sparc-*-solaris* ]] && \
-		myconf -Ud_flock
-
-	# fix unaligned access misdetection
-	# https://rt.perl.org/Public/Bug/Display.html?id=133495
-	# https://rt.perl.org/Public/Bug/Display.html?id=133803
-	# bug #676062, bug #688432
-	use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] || \
-		[[ ${CHOST} == armv5tel* ]] \
-			&& myconf "-Dd_u32align='define'"
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	# setting -Dld= to tc-getLD breaks perl and all perl things
-	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Dar="$(tc-getAR)" \
-		-Dnm="$(tc-getNM)" \
-		-Dcpp="$(tc-getCPP)" \
-		-Dranlib="$(tc-getRANLIB)" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${myconf[@]}" \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ "${ROOT}" = "/" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm() {
-	dual_scripts
-}
diff --git a/dev-lang/perl/perl-5.30.3-r2.ebuild b/dev-lang/perl/perl-5.30.3-r2.ebuild
deleted file mode 100644
index c8e7c2a615b2..000000000000
--- a/dev-lang/perl/perl-5.30.3-r2.ebuild
+++ /dev/null
@@ -1,824 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.3.4
-PATCH_BASE="perl-5.30.3-patches-${PATCH_VER}"
-PATCH_DEV=kentnl
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN="5.30.0 5.30.1 5.30.2"
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-# SOMEWHAT EXPERIMENTAL CODE, DO NOT USE WITHOUT AN ADULT PRESENT, CHECK CHANGELOG
-# FOR DETAILS
-KEYWORDS=""
-# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-PDEPEND="
-	>=app-admin/perl-cleaner-2.5
-	>=virtual/perl-File-Temp-0.230.400-r2
-	>=virtual/perl-Data-Dumper-2.154.0
-	virtual/perl-Test-Harness
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.320.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.220.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
-	src_remove_dual      perl-core/Encode             3.10.0        enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.340.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.400.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.84.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.20.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.202.6.13.0_rc corelist
-	src_remove_dual      perl-core/Pod-Parser         1.630.0       pod2usage podchecker podselect
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Test-Harness       3.420.0       prove
-	src_remove_dual      perl-core/podlators          4.110.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.110.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-
-	# This ENV var tells perl to build with a directory like "5.30"
-	# regardless of its patch version. This is for experts only
-	# at this point.
-	if [[ -z "${PERL_SINGLE_SLOT}" ]]; then
-		PRIV_LIB="${PRIV_BASE}/${MY_PV}"
-		ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
-		SITE_LIB="${SITE_BASE}/${MY_PV}"
-		SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
-		VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
-		VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
-	else
-		PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
-		ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-		SITE_LIB="${SITE_BASE}/${SUBSLOT}"
-		SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-		VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
-		VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	fi
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-# Copy a patch into the patch series
-# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
-# - description is optional, but recommended
-# - all arguments after descriptions are bug URLs
-add_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local src_name dest_name desc
-	src_name="$1"
-	dest_name="$2"
-	desc="$3"
-	shift; shift; shift;
-	einfo "Adding ${dest_name} to patch bundle"
-	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
-	if [[ -n "${desc}" ]]; then
-		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
-	fi
-	if [[ $# -gt 0 ]]; then
-		# Note: when $@ is more than one element, this emits a
-		# line for each element
-		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
-	fi
-}
-# Remove a patch using a glob expr
-# eg:
-#	 rm_patch *-darin-Use-CC*
-#
-rm_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local expr="$1"
-	local patch="$( cd "${patchdir}"; echo $expr )"
-	einfo "Removing $patch ($expr) from patch bundle"
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
-	else
-		ewarn "No ${expr} found in ${patchdir} to remove"
-	fi
-}
-# Yes, this is a reasonable amount of code for something seemingly simple
-# but this is far easier to debug when things go wrong, and things went wrong
-# multiple times while I was getting the exact number of slashes right, which
-# requires circumnavigating both bash and sed escape mechanisms.
-c_escape_string() {
-	local slash dquote
-	slash='\'
-	dquote='"'
-	re_slash="${slash}${slash}"
-	re_dquote="${slash}${dquote}"
-
-	# Convert \ to \\,
-	#         " to \"
-	echo "$1" |\
-		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
-		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
-}
-c_escape_file() {
-	c_escape_string "$(cat "$1")"
-}
-
-apply_patchdir() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local patchoutput="patchlevel-gentoo.h"
-
-	# Inject Patch-Level info into description for patchlevel.h patch
-	# to show in -V
-	local patch_expr="*List-packaged-patches*"
-	local patch="$( cd "${patchdir}"; echo $patch_expr )";
-	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
-
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
-			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
-	else
-		eerror "No $patch_expr found in ${patchdir}"
-	fi
-
-	# Compute patch list to apply
-	# different name other than PATCHES to stop default
-	# reapplying it
-	# Single depth is currently only supported, as artifacts can reside
-	# from the old layout being multiple-directories, as well as it grossly
-	# simplifying the patchlevel_gentoo.h generation.
-	local PERL_PATCHES=($(
-		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
-			grep -E '[.](diff|patch)$' |\
-			sort -n
-	))
-
-	for patch in "${PERL_PATCHES[@]}"; do
-		eapply "${WORKDIR}"/patches/${patch}
-	done
-
-	einfo "Generating $patchoutput"
-
-	# This code creates a header file, each iteration
-	# creates one-or-more-lines for each entry found in PERL_PATCHES
-	# and STDOUT is redirected to the .h file
-	for patch in "${PERL_PATCHES[@]}"; do
-		local desc_f="${infodir}/${patch}.desc"
-		local bugs_f="${infodir}/${patch}.bugs"
-
-		printf ',"%s"\n' "${patch}"
-		if [[ ! -e "${desc_f}" ]]; then
-			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
-		else
-			local desc="$(c_escape_file "${desc_f}")"
-			printf ',"- %s"\n' "${desc}"
-		fi
-		if [[ -e "${bugs_f}" ]]; then
-			while read -d $'\n' -r line; do
-				local esc_line="$(c_escape_string "${line}")"
-				printf ',"- Bug: %s"\n' "${esc_line}"
-			done <"${bugs_f}"
-		fi
-	done > "${S}/${patchoutput}"
-	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
-
-}
-src_prepare() {
-	local patchdir="${WORKDIR}/patches"
-
-	# Prepare Patch dir with additional patches / remove unwanted patches
-	# Inject bug/desc entries for perl -V
-	if use hppa ; then
-		# bug 634162
-		add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
-			"Fix broken miniperl on hppa"\
-			"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
-	fi
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		rm_patch "*-nsl-and-cl*"
-	fi
-
-	apply_patchdir
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name (soname) not to reference $D
-		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-
-		# Upstreamed, but not in this version.
-		# Need to recognise macOS 11 / 10.16. #757249
-		eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch"
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-# Outputs a list of versions which have been seen in any of the
-# primary perl @INC prefix paths, such as:
-#  /usr/lib64/perl5/<NUMBER>
-#  /usr/local/lib64/perl5/<NUMBER>
-#  /usr/lib64/perl5/vendor_perl/<NUMBER>
-#
-# All values of NUMBER must be like "5.x.y", unless PERL_SUPPORT_SINGLE_SLOT
-# is enabled, where it will also allow numbers like "5.x"
-#
-# PERL_SUPPORT_SINGLE_SLOT should only be used to transition *away* from PERL_SINGLE_SLOT
-# if you used that.
-find_candidate_inc_versions() {
-	local regex='.*/5[.][0-9]+[.][0-9]+$';
-	if [[ ! -z "${PERL_SUPPORT_SINGLE_SLOT}" || ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
-	fi
-	local dirs=(
-		"${EROOT}${PRIV_BASE}"
-		"${EROOT}${SITE_BASE}"
-		"${EROOT}${VENDOR_BASE}"
-	)
-	for dir in "${dirs[@]}"; do
-		if [[ ! -e "${dir}" ]]; then
-			continue
-		fi
-		# Without access to readdir() on these dirs, find will not be able
-		# to reveal any @INC directories inside them, and will subsequently prune
-		# them from the built perl's @INC support, breaking our compatiblity options
-		# entirely.
-		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
-			eerror "Bad permissions on ${dir}, this will probably break things"
-			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
-			eerror "Recommended permission is +rx for all"
-			eerror "> chmod o+rx ${dir}"
-		fi
-	done
-	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
-	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
-}
-# Sort versions passed versiony-ly, remove self-version if present
-# dedup. Takes each version as an argument
-sanitize_inc_versions() {
-	local vexclude="${DIST_VERSION%-RC}"
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		vexclude="${SUBSLOT}"
-	fi
-	einfo "Normalizing/Sorting candidate list: $*"
-	einfo " to remove '${vexclude}'"
-	# Note, general numeric sort has to be used
-	# for the last component, or unique will convert
-	#  5.30.0 + 5.30 into just 5.30
-	printf "%s\n" "$@" |\
-		grep -vxF "${vexclude}" |\
-		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
-}
-
-versions_to_inclist() {
-	local oldv="${PERL_BIN_OLDVERSEN}"
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	fi
-	for v;	do
-			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
-			echo -n "${v}/ ";
-	done
-}
-versions_to_gentoolibdirs() {
-	local oldv="${PERL_BIN_OLDVERSEN}"
-	local root
-	local v
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	fi
-	for v;	do
-		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
-			local fullpath="${EROOT}${root}/${v}"
-			if [[ -e "${fullpath}" ]]; then
-				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
-				printf "%s:" "${fullpath}"
-			fi
-		done
-	done
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
-	fi
-
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		# myconf -Dinc_version_list="${inclist}"
-		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__
-
-	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
-	[[ ${CHOST} == sparc-*-solaris* ]] && \
-		myconf -Ud_flock
-
-	# fix unaligned access misdetection
-	# https://rt.perl.org/Public/Bug/Display.html?id=133495
-	# https://rt.perl.org/Public/Bug/Display.html?id=133803
-	# bug #676062, bug #688432
-	use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] || \
-		[[ ${CHOST} == armv5tel* ]] \
-			&& myconf "-Dd_u32align='define'"
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	# setting -Dld= to tc-getLD breaks perl and all perl things
-	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Dar="$(tc-getAR)" \
-		-Dnm="$(tc-getNM)" \
-		-Dcpp="$(tc-getCPP)" \
-		-Dranlib="$(tc-getRANLIB)" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${myconf[@]}" \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ "${ROOT}" = "/" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm() {
-	dual_scripts
-}
diff --git a/dev-lang/perl/perl-5.30.3.ebuild b/dev-lang/perl/perl-5.30.3.ebuild
deleted file mode 100644
index 30310a2fc646..000000000000
--- a/dev-lang/perl/perl-5.30.3.ebuild
+++ /dev/null
@@ -1,651 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.3.2
-PATCH_BASE="perl-5.30.0-patches-${PATCH_VER}"
-PATCH_DEV=dilfridge
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN="5.30.0 5.30.1 5.30.2"
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	mirror://gentoo/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	>=app-admin/perl-cleaner-2.5
-	>=virtual/perl-File-Temp-0.230.400-r2
-	>=virtual/perl-Data-Dumper-2.154.0
-	virtual/perl-Test-Harness
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.320.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.220.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
-	src_remove_dual      perl-core/Encode             3.10.0        enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.340.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.400.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.84.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.20.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.202.6.13.0_rc corelist
-	src_remove_dual      perl-core/Pod-Parser         1.630.0       pod2usage podchecker podselect
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Test-Harness       3.420.0       prove
-	src_remove_dual      perl-core/podlators          4.110.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.110.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-	PRIV_LIB="${PRIV_BASE}/${MY_PV}"
-	ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
-	SITE_LIB="${SITE_BASE}/${MY_PV}"
-	SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
-	VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
-	VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_update_patchlevel_h() {
-	# Copied and modified from debian:
-	# Copyright 2011 Niko Tyni
-	# This program is free software; you can redistribute it and/or modify
-	# it under the same terms as Perl itself.
-	local patchdir="${WORKDIR}/patches"
-	local prefix
-	local patchoutput="patchlevel-gentoo.h"
-
-	[[ -f ${patchdir}/series ]] || return 0
-
-while read patch
-do
-	patchname=$(echo $patch | sed 's/\.diff$//')
-	< $patchdir/$patch sed -e '/^Subject:/ { N; s/\n / / }' | sed -n -e '
-
-	# massage the patch headers
-	s|^Bug: .*https\?://rt\.perl\.org/.*id=\(.*\).*|[perl #\1]|; tprepend;
-	s|^Bug: .*https\?://rt\.cpan\.org/.*id=\(.*\).*|[rt.cpan.org #\1]|; tprepend;
-	s|^Bug-Gentoo: ||; tprepend;
-	s/^\(Subject\|Description\): //; tappend;
-	s|^Origin: .*http://perl5\.git\.perl\.org/perl\.git/commit\(diff\)\?/\(.......\).*|[\2]|; tprepend;
-
-	# post-process at the end of input
-	$ { x;
-		# include the version number in the patchlevel.h description (if available)
-		s/List packaged patches/&'" for ${PF}(#${PATCH_VER})"'/;
-
-		# escape any backslashes and double quotes
-		s|\\|\\\\|g; s|"|\\"|g;
-
-		# add a prefix
-		s|^|\t,"'"$prefix$patchname"' - |;
-		# newlines away
-		s/\n/ /g; s/  */ /g;
-		# add a suffix
-		s/ *$/"/; p
-	};
-	# stop all processing
-	d;
-	# label: append to the hold space
-	:append H; d;
-	# label: prepend to the hold space
-	:prepend x; H; d;
-	'
-done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}"
-echo "${patchoutput}" >> "${S}/MANIFEST"
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-src_prepare() {
-	local patch
-	EPATCH_OPTS+=" -p1"
-
-	if use hppa ; then
-		epatch "${FILESDIR}/${PN}-5.26.2-hppa.patch" # bug 634162
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
-	fi
-
-	einfo "Applying patches from ${PATCH_BASE} ..."
-	while read patch ; do
-		EPATCH_SINGLE_MSG="  ${patch} ..."
-		epatch "${WORKDIR}"/patches/${patch}
-	done < "${WORKDIR}"/patches/series
-
-	src_prepare_update_patchlevel_h
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name (soname) not to reference $D
-		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$(
-			find "${EROOT%/}${PRIV_BASE}" "${EROOT%/}${SITE_BASE}" "${EROOT%/}${VENDOR_BASE}" \
-				   -maxdepth 1 -mindepth 1 -type d -regex '.*/5[.][0-9]+[.][0-9]+$' \
-				   -printf "%f "  2>/dev/null )"
-	fi
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$(
-		echo "${PERL_OLDVERSEN}"           |\
-			tr " " "\n" 				   |\
-			grep -vF "${DIST_VERSION%-RC}" |\
-			sort -u -nr -t'.' -k1,1 -k2,2 -k3,3
-	)"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$(
-				for v in ${PERL_OLDVERSEN};	do
-					has "${v}" ${PERL_BIN_OLDVERSEN} && echo -n "${v}/${myarch}${mythreading} ";
-					echo -n "${v} ";
-				done )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT%/}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT%/}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT%/}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROO%/T}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT%/}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT%/}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		myconf -Dinc_version_list="${inclist}"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__
-
-	# fix unaligned access misdetection
-	# https://rt.perl.org/Public/Bug/Display.html?id=133495
-	# https://rt.perl.org/Public/Bug/Display.html?id=133803
-	# bug #676062, bug #688432
-	use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] || \
-		[[ ${CHOST} == armv5tel* ]] \
-			&& myconf "-Dd_u32align='define'"
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${myconf[@]}" \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ "${ROOT}" = "/" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm() {
-	dual_scripts
-}
diff --git a/dev-lang/perl/perl-5.32.0-r1.ebuild b/dev-lang/perl/perl-5.32.0-r1.ebuild
deleted file mode 100644
index 96cc75c62b77..000000000000
--- a/dev-lang/perl/perl-5.32.0-r1.ebuild
+++ /dev/null
@@ -1,821 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.3.4
-PATCH_BASE="perl-5.32.0-patches-${PATCH_VER}"
-PATCH_DEV=kentnl
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN=""
-
-# Yes we can.
-PERL_SINGLE_SLOT=y
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-# SOMEWHAT EXPERIMENTAL CODE, DO NOT USE WITHOUT AN ADULT PRESENT, CHECK CHANGELOG
-# FOR DETAILS
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads minimal"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-PDEPEND="
-	!minimal? (
-		>=app-admin/perl-cleaner-2.5
-		>=virtual/perl-File-Temp-0.230.400-r2
-		>=virtual/perl-Data-Dumper-2.154.0
-		virtual/perl-Test-Harness
-	)
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.360.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.270.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
-	src_remove_dual      perl-core/Encode             3.60.0        enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.440.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.400.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.93.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.40.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.202.6.20    corelist
-	src_remove_dual      perl-core/Pod-Checker        1.730.0       podchecker
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Pod-Usage          1.690.0       pod2usage
-	src_remove_dual      perl-core/Test-Harness       3.420.0       prove
-	src_remove_dual      perl-core/podlators          4.140.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.140.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-
-	# This ENV var tells perl to build with a directory like "5.30"
-	# regardless of its patch version. This is for experts only
-	# at this point.
-	if [[ -z "${PERL_SINGLE_SLOT}" ]]; then
-		PRIV_LIB="${PRIV_BASE}/${MY_PV}"
-		ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
-		SITE_LIB="${SITE_BASE}/${MY_PV}"
-		SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
-		VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
-		VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
-	else
-		PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
-		ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-		SITE_LIB="${SITE_BASE}/${SUBSLOT}"
-		SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-		VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
-		VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	fi
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-# Copy a patch into the patch series
-# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
-# - description is optional, but recommended
-# - all arguments after descriptions are bug URLs
-add_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local src_name dest_name desc
-	src_name="$1"
-	dest_name="$2"
-	desc="$3"
-	shift; shift; shift;
-	einfo "Adding ${dest_name} to patch bundle"
-	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
-	if [[ -n "${desc}" ]]; then
-		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
-	fi
-	if [[ $# -gt 0 ]]; then
-		# Note: when $@ is more than one element, this emits a
-		# line for each element
-		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
-	fi
-}
-# Remove a patch using a glob expr
-# eg:
-#	 rm_patch *-darin-Use-CC*
-#
-rm_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local expr="$1"
-	local patch="$( cd "${patchdir}"; echo $expr )"
-	einfo "Removing $patch ($expr) from patch bundle"
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
-	else
-		ewarn "No ${expr} found in ${patchdir} to remove"
-	fi
-}
-# Yes, this is a reasonable amount of code for something seemingly simple
-# but this is far easier to debug when things go wrong, and things went wrong
-# multiple times while I was getting the exact number of slashes right, which
-# requires circumnavigating both bash and sed escape mechanisms.
-c_escape_string() {
-	local slash dquote
-	slash='\'
-	dquote='"'
-	re_slash="${slash}${slash}"
-	re_dquote="${slash}${dquote}"
-
-	# Convert \ to \\,
-	#         " to \"
-	echo "$1" |\
-		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
-		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
-}
-c_escape_file() {
-	c_escape_string "$(cat "$1")"
-}
-
-apply_patchdir() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local patchoutput="patchlevel-gentoo.h"
-
-	# Inject Patch-Level info into description for patchlevel.h patch
-	# to show in -V
-	local patch_expr="*List-packaged-patches*"
-	local patch="$( cd "${patchdir}"; echo $patch_expr )";
-	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
-
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
-			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
-	else
-		eerror "No $patch_expr found in ${patchdir}"
-	fi
-
-	# Compute patch list to apply
-	# different name other than PATCHES to stop default
-	# reapplying it
-	# Single depth is currently only supported, as artifacts can reside
-	# from the old layout being multiple-directories, as well as it grossly
-	# simplifying the patchlevel_gentoo.h generation.
-	local PERL_PATCHES=($(
-		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
-			grep -E '[.](diff|patch)$' |\
-			sort -n
-	))
-
-	for patch in "${PERL_PATCHES[@]}"; do
-		eapply "${WORKDIR}"/patches/${patch}
-	done
-
-	einfo "Generating $patchoutput"
-
-	# This code creates a header file, each iteration
-	# creates one-or-more-lines for each entry found in PERL_PATCHES
-	# and STDOUT is redirected to the .h file
-	for patch in "${PERL_PATCHES[@]}"; do
-		local desc_f="${infodir}/${patch}.desc"
-		local bugs_f="${infodir}/${patch}.bugs"
-
-		printf ',"%s"\n' "${patch}"
-		if [[ ! -e "${desc_f}" ]]; then
-			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
-		else
-			local desc="$(c_escape_file "${desc_f}")"
-			printf ',"- %s"\n' "${desc}"
-		fi
-		if [[ -e "${bugs_f}" ]]; then
-			while read -d $'\n' -r line; do
-				local esc_line="$(c_escape_string "${line}")"
-				printf ',"- Bug: %s"\n' "${esc_line}"
-			done <"${bugs_f}"
-		fi
-	done > "${S}/${patchoutput}"
-	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
-
-}
-src_prepare() {
-	local patchdir="${WORKDIR}/patches"
-
-	# Prepare Patch dir with additional patches / remove unwanted patches
-	# Inject bug/desc entries for perl -V
-	if use hppa ; then
-		# bug 634162
-		add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
-			"Fix broken miniperl on hppa"\
-			"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
-	fi
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		rm_patch "*-nsl-and-cl*"
-	fi
-
-	apply_patchdir
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name (soname) not to reference $D
-		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-
-		# Upstreamed, but not in this version.
-		# Need to recognise macOS 11 / 10.16. #757249
-		eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch"
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-# Outputs a list of versions which have been seen in any of the
-# primary perl @INC prefix paths, such as:
-#  /usr/lib64/perl5/<NUMBER>
-#  /usr/local/lib64/perl5/<NUMBER>
-#  /usr/lib64/perl5/vendor_perl/<NUMBER>
-#
-# All values of NUMBER must be like "5.x.y", unless PERL_SUPPORT_SINGLE_SLOT
-# is enabled, where it will also allow numbers like "5.x"
-#
-# PERL_SUPPORT_SINGLE_SLOT should only be used to transition *away* from PERL_SINGLE_SLOT
-# if you used that.
-find_candidate_inc_versions() {
-	local regex='.*/5[.][0-9]+[.][0-9]+$';
-	if [[ ! -z "${PERL_SUPPORT_SINGLE_SLOT}" || ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
-	fi
-	local dirs=(
-		"${EROOT}${PRIV_BASE}"
-		"${EROOT}${SITE_BASE}"
-		"${EROOT}${VENDOR_BASE}"
-	)
-	for dir in "${dirs[@]}"; do
-		if [[ ! -e "${dir}" ]]; then
-			continue
-		fi
-		# Without access to readdir() on these dirs, find will not be able
-		# to reveal any @INC directories inside them, and will subsequently prune
-		# them from the built perl's @INC support, breaking our compatiblity options
-		# entirely.
-		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
-			eerror "Bad permissions on ${dir}, this will probably break things"
-			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
-			eerror "Recommended permission is +rx for all"
-			eerror "> chmod o+rx ${dir}"
-		fi
-	done
-	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
-	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
-}
-# Sort versions passed versiony-ly, remove self-version if present
-# dedup. Takes each version as an argument
-sanitize_inc_versions() {
-	local vexclude="${DIST_VERSION%-RC}"
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		vexclude="${SUBSLOT}"
-	fi
-	einfo "Normalizing/Sorting candidate list: $*"
-	einfo " to remove '${vexclude}'"
-	# Note, general numeric sort has to be used
-	# for the last component, or unique will convert
-	#  5.30.0 + 5.30 into just 5.30
-	printf "%s\n" "$@" |\
-		grep -vxF "${vexclude}" |\
-		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
-}
-
-versions_to_inclist() {
-	local oldv="${PERL_BIN_OLDVERSEN}"
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	fi
-	for v;	do
-			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
-			echo -n "${v}/ ";
-	done
-}
-versions_to_gentoolibdirs() {
-	local oldv="${PERL_BIN_OLDVERSEN}"
-	local root
-	local v
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	fi
-	for v;	do
-		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
-			local fullpath="${EROOT}${root}/${v}"
-			if [[ -e "${fullpath}" ]]; then
-				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
-				printf "%s:" "${fullpath}"
-			fi
-		done
-	done
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
-	fi
-
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		# myconf -Dinc_version_list="${inclist}"
-		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__
-
-	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
-	[[ ${CHOST} == sparc-*-solaris* ]] && \
-		myconf -Ud_flock
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	# setting -Dld= to tc-getLD breaks perl and all perl things
-	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Dar="$(tc-getAR)" \
-		-Dnm="$(tc-getNM)" \
-		-Dcpp="$(tc-getCPP)" \
-		-Dranlib="$(tc-getRANLIB)" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${myconf[@]}" \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ "${ROOT}" = "/" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm() {
-	dual_scripts
-}
diff --git a/dev-lang/polyml/Manifest b/dev-lang/polyml/Manifest
index b722c99b869a..47c04fcf7d14 100644
--- a/dev-lang/polyml/Manifest
+++ b/dev-lang/polyml/Manifest
@@ -2,4 +2,4 @@ AUX polyml-5.6-configure.patch 390 BLAKE2B 7f20e9de1c00a429ed86ab33cd05bd2aed0a4
 AUX polyml-5.6-ffi3.patch 584 BLAKE2B 6c7e38c077968f439f03739a4d95bad6d5f631b4cf4e1a51a58ae6273c40a1ae5dbd1fe3aa6e338215f9cedec950435e846351275be7bccb80fd313965888b78 SHA512 22bb8e13672ddb0a8f7a3ed9908fb652e238c849b553ab3ceb9b33daebc35d6502dbff3f099ab933f4e2639b5eac2294e21d45bfc96dcb1b9c6be0129c57232d
 DIST polyml-5.8.tar.gz 9817105 BLAKE2B 93992c8baa78017bfda6c2151d1f48805829b77c0b7ed9bec87c951fc4a4236459ed59aab1eca88ed4a1d7aa10eb9734f93324583e012b18bb7d8cce84b5a35b SHA512 50baed79b50b14bd87acc637de93fd6d0f05e61fe0f03682a12a1d2c5f382313488d48f84b49ad915b01acc5a3a5769fb05fcaa7b24499c56402ddd3ba393930
 EBUILD polyml-5.8.ebuild 1222 BLAKE2B 303ce107ff8f8131ea957ed8cf871a979529cd1bd51032f4b032a0dc1757535253a4085c8f4bed274a533be6f51b554525267171ea41ad5217e8aeee442ee15e SHA512 6773ac8ab453edc3a2e6dd4091881c7c8719a6806e270f64ef35027527fd362cabe52555c46f692b3d5bf0ef5364ab3c06fe01ab221c5f71fbca11f33ac2e3b0
-MISC metadata.xml 357 BLAKE2B f994f420abc8bb1020fc533a0adf04c861961b8e6cd72626db3d7d2e8ef8558903df895d182266eb419e75f6293524e690b45738902cb74ac79afe04a94f2a99 SHA512 d7f4c4c4f07e7f516fac55a58d83256f54566e0bce940d178e739b05c740abf842f6f343add927dd098546828547f16f3176e874fb8501e84d12ca7ead9fcb32
+MISC metadata.xml 410 BLAKE2B 40595871124d86280ce855df1fcdfb31620828352b68b32c52feed79855bf72352e7ed3c0170683d37dfdd622e6bf2e4c69bd213f934b009a009cc3437712970 SHA512 2e1e9fffeb4895cce395005ea78661174f9959d90b7df35e25413bff30b2ca102fd189b46df080f1307d071b0c13743bf80fc5141f6e3af79f3ff1bacde32c18
diff --git a/dev-lang/polyml/metadata.xml b/dev-lang/polyml/metadata.xml
index d54adc1d520f..f190cff1cfe1 100644
--- a/dev-lang/polyml/metadata.xml
+++ b/dev-lang/polyml/metadata.xml
@@ -6,6 +6,7 @@
 		<flag name="portable">Build the portable interpreter version of Poly/ML instead of native</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">polyml/polyml</remote-id>
 		<remote-id type="sourceforge">polyml</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index b12c16c37296..60cc11d3061f 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -3,5 +3,5 @@ DIST python-exec-2.4.7.tar.bz2 88204 BLAKE2B c370d5f33063bf0dd02d1b5ddad27b32065
 DIST python-exec-2.4.8.tar.bz2 82671 BLAKE2B ac85f3dd6da3d1c535ad56a25edbbcb1d0e75b91e3567b80f27fd01d32a199a713909a8552dffaacbe96c43bca491f31c3f0c7f1a618fb9144814365686715cf SHA512 d6dabab217dc2f1817e2f4d159102a9467f51b26b91f4ae7fb7e4930d30334f74bd8a5f37cc60d58c6e1e61e89a3b4d2e1bd17413493ba86f38fa71250cf5ac1
 EBUILD python-exec-2.4.6-r4.ebuild 1706 BLAKE2B 5a41250c5ea33394a21cf523b48526cc7507441284007e5add7c818246af8637f186878d37bbc826fba987cd07ae1f12701badb478556ebde11d452d28cb88b1 SHA512 3f5935a169181f10b2667b91e35fc42258f9f555ac7e73b5ff08714678f403097901ccfe31a2f1df4f9d37eebf17a3dd3d9961c7a6baf5a0b4739063d21676b0
 EBUILD python-exec-2.4.7.ebuild 1714 BLAKE2B 271d84d7e17f608e30503261c2cb2daad2381a14136ac8465d127f750936d8c33f2e364c2649f47926ebd59230a987c316b2edf1415c15bc6ddbd64703d6942d SHA512 fe43e2d7ba2757c3e1a5e5a7815ba461cd0ea0fd3ee97cc44cb94c54fb80f263245c0545b28647850c26139861f4c00c06e2638171f9a368efcd3d2e6cecdc9a
-EBUILD python-exec-2.4.8.ebuild 1997 BLAKE2B ec9b57756c03db32bdf9065f0e7bcd7c62784f609dc86a65016e9db0afc23e8b8631117d37b4bdf5cc03030f151c139075fc49cce96119c15113770dc9f9d86c SHA512 5b1dcc485120fda6b3ca35ad7516776eb7d534e5526ac9f38923f0d6aefa779d36e49d193c6158b534c4072764e3736d79119e39b60c266f7471198bbc825442
+EBUILD python-exec-2.4.8.ebuild 1996 BLAKE2B 1a82944df5b8a0a548cfdcf960e6c427ca02870333108617aae7c0836cdb71dc50815d736547281c795b3bd87a54e6c420a058394ae2776e02bc885d5a58f22a SHA512 6b12f3ab65e242c770c3c5bf3bd1bb615869ba87a93bc237c6358655fa5e38b39d7d7e8e573cfa98f94e0380bb74310eab1477e286a6ef0cae2e17dbe674f99d
 MISC metadata.xml 791 BLAKE2B 5be47111a2bd77ad817b6c4fe9822b3ab0e859ccc13bbccf7439549e0b2f2ff4734896942aa4324f5c35fe2097b8454828df0b7a1e2c855824fcebe60925431d SHA512 a6782b79df1d7b130cb93cd77fa3292bcbc23fd0b35158ce8231904d1593c9e5659a55d00d158c88bb1326b5c375e7aa8591d9b74e9e12f5e1192a42c037a9ad
diff --git a/dev-lang/python-exec/python-exec-2.4.8.ebuild b/dev-lang/python-exec/python-exec-2.4.8.ebuild
index 225797bdda50..14c9b2bf5b66 100644
--- a/dev-lang/python-exec/python-exec-2.4.8.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Internal Python project hack.  Do not copy it.  Ever.
 IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks test"
 RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index bdbb6ad588f4..f0a0d5a83377 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -2,42 +2,26 @@ AUX pydoc.conf 169 BLAKE2B ce40bb3d5f858bd7a8d9ef5bf215a8ab592568a724f0e08aea219
 AUX pydoc.init 600 BLAKE2B fb8775a6663483e5112ec283627610b746020d88494e772b92bb718a9493a52606e565c6c2fa4917a5cb963f166283d09883bd26903f2f3ced6c240d4e292a7f SHA512 9e71ad53486b6882a8441b24225c602195ee33d29dd1b60df27febbc6b752e79929be356152a489f893dcfb11f9c066b999787bc27a8ac61062c86e67a69e87a
 DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381998256a1a002d316b38288349884d5960de35c49352d03129ed0bae599e641ec2225898158ebce50a7a2fd74d2c SHA512 a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
 DIST Python-2.7.18.tar.xz.asc 833 BLAKE2B 1d98770e46171971fb99994508d238c01d2755281d2f94353314014d9e83e0ec5f0b3e3950ea1fdf5fce9ba6b8f55312355845c2a3fc4291c27ee56fe6215448 SHA512 c2a5f5a52f47dec52460ad3275758d4e5de6e7075c3def4353c988d74d563a39b42cae2d5eb24e2a23a6247cef69100f91620b11a49c2359fbf99b203c9cbda8
-DIST Python-3.10.0b4.tar.xz 18652712 BLAKE2B 227a6e6ce5b8ddec7b3cf39a65e0287cb541185a1b58a4f4ae9dbc83bbd5d7bdceff2992d3e7c2ec4cda7fb492123e54f8cc60b6b259bbe776e1414a8e6753f7 SHA512 deb5ce510c381ce7fcdc7056754b3afccdbc4610cb77b85115859a5e636065584f517e0931a31f77723c09229b2fd751011b1cf16967c075f629018f0a7975a4
-DIST Python-3.10.0b4.tar.xz.asc 833 BLAKE2B 0aaabe7aca916bd3e80dee979cf6466b0fd0f25aa48a2955d1bfe84be8903988ccd2c5030433fdb5165b342a3acdc3ec958827028260b59bb105f41ceb5852b1 SHA512 55ef4265d9217f35e5f1da3b8b560f711c3f118230ff5fb7fe3ab5e189c22c331cecb9783465234ac0df8a1e075887b5fedfbc181cab6e571e5e2f8403d9720d
-DIST Python-3.6.13.tar.xz 17213520 BLAKE2B 7c1938f92616d428d107a70397a9f7fc82377d0e3d26c2da4f5bcb79a54115f71498a5e7b5f601b6cff6f362ec1f689c3ac920eb248956e1e4f6c21602514dd1 SHA512 0482b3e7eea22b0635b61f06753e77c832c9431385c5ea1ecb8f60868262afd2b45c239badb8e906a33f035ffbf347b4a499fe6f0f008f1fa9ecc9de66c63947
-DIST Python-3.6.13.tar.xz.asc 833 BLAKE2B bc1df46c2e460c2d237647ecff84e12c75f6ed24a432d2f9cbefdead8a77d4468e5e4ed9f4debac593c63cf95d27c9f7d0f94dce69af8746cc71f0d0b1810245 SHA512 f6e8936a5e5b45d3ad41184717f5ed75debe29f81138fd1b75b53bc7d2905edff42b42dd7995b11ba6d80233c5c3755521edb19d7ac28d414bfebb2d1dfc0c86
+DIST Python-3.10.0rc1.tar.xz 28197832 BLAKE2B e86f26a299c33b4f0595d3b3dba17cff6e68ffcb82de61f8d8d5e425906dca3523dd06f96737006a85dba73afabc5461814f1691575e2f9679dd89e56327c9e8 SHA512 c92fab7b79a4c8125cd3e9d2ea4f03b8356ba77dc05a46b277a56c861c130e90e87c755f5e00f3d4517d50b453e34592f77e812bc1831d4bab3cc3af2110d8fd
+DIST Python-3.10.0rc1.tar.xz.asc 833 BLAKE2B 6446ea32a7d62686e33476c328d71aeb67675863be10b3e02ffcef376868fc2027a3dd355ad22c046acbf4ff2d6cc20e7cf46215229b8b36e706b77ef993e920 SHA512 e3dcc240b9fecdfc2a90b7845b57ebbc34bda5c85c09c7dae6b5b34f3d355da674ffad28d83a8b281da97c407f11ac5fdc88da09c6cdac41ac93e6e70b5f813c
 DIST Python-3.6.14.tar.xz 17218148 BLAKE2B efe655cb907ffa678ca135f88ba9d867e523969ad82dbc09ffb6d8d383824a4b43c525e156a3c35484a526b4b3ea755109e5ef15d17852d44e3351c307fc5e91 SHA512 15b82b7285db97cb27a6fcd57ce9e258fdf8dbdb2f00e22e4331161b8557c8244342546c4143e84c72730759e0276770396b6ca5bb7cf87310cca8e175423006
 DIST Python-3.6.14.tar.xz.asc 833 BLAKE2B 81c79dca5728b21b8c2badcaa1242836f1cf13984bb755463cfe9e4fd96a02ebf31f1a9239759a937c6d6a04c18bfc682a82cb0ab2e5a473de153423a7248c9c SHA512 600bf504f2c0d3ce7d1e8e953b4f27a7a7c996b7b9cd70efb876178fa5424130bff5414d5ac7deb8b45103ed417fd40d830613db39750d35a0c967c8fdfea50d
-DIST Python-3.7.10.tar.xz 17392580 BLAKE2B b030db731d141b97f1be794a19382cc252c5bbf867661d09c9455640ebcfd3030e8a691f57fe91a2e0c4e5d3bd4f8f3de07fa4bd287a58900d8c6e1fba2f0583 SHA512 5cb61739acbd29f526d25073443398b2ca0eef30d01d134e8236c8bbc7ab0586c44ec00689f5a75e6aedc0170acf4551721ada5e967e4b99a146cfcaad949128
-DIST Python-3.7.10.tar.xz.asc 833 BLAKE2B a528daa1638b52f08fd69d197a2d4f8af59a620939957d450da6f5f8947b8eefbfb48ee50bb6327c8f3a352415dedc6e91ef23075fabbfd38c65575857065c74 SHA512 5d0fdcf60f0f4113b3055dd4097814b8b969d6cba4f2cc4cef6cd013b0e728375549b9d7818e6e94e6f0d4888188e751f4659a18f905e6e4c75783e2f323c4ef
 DIST Python-3.7.11.tar.xz 17393380 BLAKE2B 6394d69935950366da7c4cecd4816d76254170d5313adeb4de9edddae13bda7dea373308517c2abe00cb7eeea8eb428619124feed8df858f9bb904bd423e96d6 SHA512 b8d8c6958444ee9bdd59f0804f7e61d9657c0805c7c58c3352d1c1efb33ba2be8d3485cd2656a2b2b99618a439879687a918f57dfdd125e989af637043600a59
 DIST Python-3.7.11.tar.xz.asc 833 BLAKE2B 8af6b3e58b607a34c91f57af2fbe9c3f3c7cb6fa5e435e963edd7edcf7649e70c3a76bd346ff8ef1b3c890d8a92d3b2fed27ee01b512c579ff8ce80be61274fb SHA512 f19db95e88c9269174a2b4ac4d8c68fa7ed666b6698af26d2da202e30d145686e8679be763eecba9f8a0c34a207639724094463cffce659c3855ed4b133b0a59
-DIST Python-3.8.10.tar.xz 18433456 BLAKE2B 57318da9ca049559594911a8873141f89d40c0326f8f278ef47b64195a0d51400f24f91dc68633d628f99dc0a9e280565ff830df66801afbc8734593d0fc3162 SHA512 0be69705483ff9692e12048a96180e586f9d84c8d53066629f7fb2389585eb75c0f3506bb8182936e322508f58b71f4d8c6dfebbab9049b31b49da11d3b98e80
-DIST Python-3.8.10.tar.xz.asc 833 BLAKE2B ab1ea0d26f51bc3b88ef5130238f7695bd12383193d1f312b000e997e48beb63f75787a3545b7b635ef515e4896e6ec2994cce564126f3b698495a51f5e34038 SHA512 ebc363df372031aba9c547b4929c98e5065ecf53604897a83df134dfbf7c3f3e9e0de1c072bee2e7c2f4db0f90610fa3931ed6d5a5ed877ab15712becd63deaf
 DIST Python-3.8.11.tar.xz 18437648 BLAKE2B 957c553ced3387d19c1d1baf2eea7d41e9abfbf398c4514f475eadae29336dc02dbd2cdf7b90ab5fee1e49c083a366c113dcd73149445b663fcdf81a3b2b04f6 SHA512 c8c17491b05d83a9f8940474019034780a6b1ff4148654cd62c8f708c539718a0312cf0665efa2b8c42ed773f4306080bd105701a211ed56e6cab40837d5b2df
 DIST Python-3.8.11.tar.xz.asc 833 BLAKE2B 52239149331a6529351714db10b5f6b2a37e9a9ce13470e0ab8ae4bf439544878df095995bdc28a534d55039a539c400f532aec8fb7d9b9ce7132167f0e39529 SHA512 40381e83a1bef996333d5044a361ce441c4631725457f8382588e9a86f586a9539ee139b8398aff3d988a317041fa87476f29cf6fcd2b31fe0e9b4cd21ede68a
-DIST Python-3.9.5.tar.xz 19058600 BLAKE2B 0072376ac69728436ee422da58c1680170cd60c76ac7d623d7a29c9001e6acace1a8d75a1805e65c9b11a30c55c9e67ed66712ec22b0b94ee6873995c935141d SHA512 7b581af1b3e73695f124ff6a3a960e22104153a5d920ca930c046f42ea313b1e7ec77e39876db2bf5d5da6d7412cb072ff8ae7814dda12c14f9da6c570fb0995
-DIST Python-3.9.5.tar.xz.asc 833 BLAKE2B d044e2019edc4854db22eebda182528e88a0c4d71cc17b78e603b43191a882f176a9fa46549845ee09ff9aa56ddf69efa008cd7ae3040b24fed7956c52bb11e9 SHA512 cfee8c161447544d6f18c3490b96ce12c8df5e9b143fca09734066f3606abe767cd7b4d05315c691f41c0e565d9585456774c10770ffe2ef7983a911bbcfdb83
 DIST Python-3.9.6.tar.xz 19051972 BLAKE2B 0d8586b2935088eeab7138cf2210c1a74f1bf7359359d25750af5f69de55eb39c92f518b887a8b749c772ed7d33e85b912928ae6d878514eb58d85ef210f54f0 SHA512 01c529e3207738d8771caeb5ed6217e10745c21aa39832fe3185e1c87fdb6aedead97ce38dbb11e02d873654028bd8071c3f345c18452769520723284efe9dc1
 DIST Python-3.9.6.tar.xz.asc 833 BLAKE2B 41901bfb80a901f2f14e86769e6d08ded8f75656d347201345183162e180e61442da871a1067572a54da579551166a19bf5436e51581bb10cb78afc4d28773fc SHA512 0673c8833f302c829bfde97453c52744f6aa99b4a72520f4cc384d4aa9d6ffd28a1407ceafb0a1ec4462b3aa74b656bf39c67872c4e6a131429ea58c47ad0ecc
 DIST python-gentoo-patches-2.7.18_p11.tar.xz 31340 BLAKE2B bdc097b971ab8ec0b60f944002af34f3fff6b681c43515a4fec2fcac1a2c731bf4fcfae2178463103911e2f8cd6bc84d3b56cd0ad61da5c8276278ec9b85a242 SHA512 2a2388c4543267bfb0167f963a22f5141442c9347d9a8806ad6917843e6958d47c8f1933244651c870101b21408c920408fe056efb7a148117c24ab391151d88
-DIST python-gentoo-patches-3.10.0b4.tar.xz 8128 BLAKE2B d6357464f540db255d97e0135676b1a3188ab595b01192c0ba24917a08f24fdda64528de788a942cbff79e8eb8e0e21d509152c18a94dfb629c898ac06f1a408 SHA512 8ee4ced4631335341277b10d38c9c86a53f7098669ca6aacb9fe94d6751df0694f4238068867a951f53740ea1bb4f7fb90aae4f2e1151681b7a215d406eaefd0
-DIST python-gentoo-patches-3.6.13_p5.tar.xz 21940 BLAKE2B f6753f2c4383fbf0de0433040dae812f35bf550c60ac4a042c62afcff158619ebdc47d013dfa62d9b3dd446e8401ad50aaaeb212fb048a884a1c436b73b7afe2 SHA512 260d6abb2c24726fcddbe3ae828e96e315f90b6d486c11868066a25635968214a8c25a89737a9737c32ca110892a28f6b12badbeceb5e4d8d4a2a996b3ce7352
+DIST python-gentoo-patches-3.10.0rc1_p1.tar.xz 8496 BLAKE2B b3b771a8894e5bfeabb3bee10cf60c068dca28341784f0914bb2190f67f10007c2e4e3b18dc31ac7dd791e06314cd3f8cda6776261c6e83da380c492bbc53e89 SHA512 bb22cc121d3b915b98de32244926188dd9717054f32437822a59652be001ac3b6309cb1aba79ce158a486d33e761a31861aed56b5a7976bc83aee18174903248
 DIST python-gentoo-patches-3.6.14.tar.xz 14744 BLAKE2B b9482f9d2b7ada60eff9a5672ed21556c00b473a7cfdb543dce8253fb0ff1539e635a35569478c496012ecde4eef78a257da28f7a80bff99da10249708262229 SHA512 246f83911c8e52ea83a9bf453faa0bc0ea0c29bbf3b666a938e3790c6147f71e617ff9cb27501c5f0b89172eb9e7819e3f2ef0a5bae271cc938d2c0c2b93f7ae
-DIST python-gentoo-patches-3.7.10_p6.tar.xz 23868 BLAKE2B 3b3786030a461d06a96dbe0987d05c35215bb5e7b0b95e1337a05a311ad6f3c6db68cc7082128c56eea3eff4b98f74d213dde1f48517e07791815b73dcdcd5b8 SHA512 b817a9bc1469675c14555ce50bb004e8c1426465997a72a94859ab10df7c2a036b33b332c9e6b9f49df1addd899a37afd28fe60bf6ce90b4b21f4a28a27aca25
 DIST python-gentoo-patches-3.7.11.tar.xz 16708 BLAKE2B 4f74b38f400c20b4112f080447021e7140704b282d6369a1479886740d12a17e7818b52a382a4b115238847bb08df0260b092b6ead491623b869c3d3a56f4cc2 SHA512 b96d7af8c9f7fb4b246a8b66e6440336a7d123678d990dd259d7ffb87d79ce74295ff350e220fee38d1b12f1ca94533899c2d2ce700391b3eac907722a79bba6
-DIST python-gentoo-patches-3.8.10_p2.tar.xz 20288 BLAKE2B 4d9db5c8d5c27673d5a026149e5678c2b4072d6d0326ae015bf4fd5b5065beeff0cd6ee0a061f79ab3258d3d156d555a38cbdca2e5e05b4405038847dcc97c8e SHA512 165a4e3b537538e792a98141a8e4af6b5cde369e6322155731ecb1b55d0e609f06208d88d68dbb1fbe59a5127ae7ac49d76d8fb6505ccf835931b2a802cd85de
 DIST python-gentoo-patches-3.8.11.tar.xz 16932 BLAKE2B aaa1df33997f4077916fb7cca2ec3a2b2ac1c0ead3db7c638a5152a82cfaaf5fc2768a10ac7235c417e25b2b735c53628ec096878f08eef0d211b03f4747103c SHA512 d2639b95c5a32f7145f92e52a94aec7c63f3ed4a66036ff73f052ff6836742d1e1dd7180f8634b65b4a44a10bf336092695bcc2230a7fd8be35bae870ed64b08
-DIST python-gentoo-patches-3.9.5_p2.tar.xz 14728 BLAKE2B b6b0a0c316d99e8282bdbb5e62a90f84880ff89b0b1e236a5bce37fbdd3c3b187f7964873882dbcbc8c9765af107377240e8aac544987452830f0069aff471c0 SHA512 42e4dd48f4b93bd45a70093b447b4862ab286c1b5adc32d22a3e3d08e67db13bfa829bdbcf989fac9b7c8634a4735cfb4a7b16bfc40bdff0c11bc5a768bbeaf8
-DIST python-gentoo-patches-3.9.6.tar.xz 12432 BLAKE2B f63f39b4667eeb214312aa22142c728a1123e88f49c6de09d15e88434e9d630c5e0e588112d77c5cf1f5f25d0224e4fbf0c370488a908e9015f168d9f85e9eb5 SHA512 3e842fcd8574a7f026e401d725febb2815b2b7ac0a89b952a340c7974b911e81286b542d3de56fe5750296f2ab680415b54b8c35f219975af10354cddb1f257a
+DIST python-gentoo-patches-3.9.6_p1.tar.xz 12764 BLAKE2B 927718f1aadb5d5ef67e647a639a10bffdd48474bf01e50bd37ef1242bce57606b7b54c4823c1da3585ee76e737028163e38e9b4e19037585cc53f925e1c5fa7 SHA512 f06fb55786bd942e72e3225ee9ce218724aeee29f301279743588749007e991851a8f29db5b5dfd85435e3d763c00942947909a6fc60581bd0f3e8a6e913bff8
 EBUILD python-2.7.18_p11.ebuild 10249 BLAKE2B 7df44b075fd81c950e2d377d5708486497ccf8eda891ff24b5a67ba57b034e0f358b1c2f17c299b8015f7d1f3fd48e70cd1875fe52f16cb037e4d36b30fd0c6e SHA512 bcf93335ab49c17e215b42d2bad2503ad23f1ad66585a6daad620cdab96b7d603616e1c58e8e57701a5106a7e169c5dcd85de10d6a2ddf7ecdf0174cb17e4f90
-EBUILD python-3.10.0_beta4.ebuild 10024 BLAKE2B 5abda5915292489bc352cfdcad07fbe77d07eb66c5ebacbe39f8d0b7d2dcc7d21e0c7719f35e34cf835ced2096d444c1595c26c5edb06389a99deb109d35eae9 SHA512 71e36dd8d82129a59786841dd03248a121732b12f6213ca8966a9e10b7d4e073814b861c9b89f9f6200ef2d07eb8b73f864da2d0b933e9baf01d34b1aafee7f5
-EBUILD python-3.6.13_p5.ebuild 9835 BLAKE2B 630769c3a0b69c33892b5959240abfbb7ab0cfb56d1ef13c073fd39b058862e6068a65ce77bedd8cc5550d4f266ce3b971642e61091c4e5a348b985f3e53cd18 SHA512 d5c2cbecb3b6089df656df3b366127892477867494b5887c1fe7ba2624a004e827875813a32035d60e309fd36a9bf3f739dead3b08718228b6cf107fc338328b
-EBUILD python-3.6.14.ebuild 9799 BLAKE2B 1076b93046a44e00004e038793a8863fbb0d9fab8f2e1957c26ca01196292aea288ad59148ede333183d3337b5e4f601a003a4a47e333cf81a9e9176e3da33a3 SHA512 5489f0609cae7889af61f84c41af18f54766e94aaab80bbd036b466707924393d8a2ced3dfc42b21840565842278c101b4747905de0adb33b66a4d993778930f
-EBUILD python-3.7.10_p6.ebuild 9648 BLAKE2B 9dde26fda02cfdd64f7fb46ccb9f858917fb41b01533dc383cb9240165e948564925adb09e519fd0bb87d012f6c3b09fd2327c26c1a3e8f5c1040eff258bf5db SHA512 35732acfe75bdfcbc9b2bf42eecf73cb9842f8d0d0e7b888191c674d2cbe57ded060e815980f6f48acad0aba777ff1285729846c0ef535df00563240f6f749fc
-EBUILD python-3.7.11.ebuild 9612 BLAKE2B f5fcd8c1f8fd30e66b6f8f15340933f0c01f46588b9bfed5e4bbcb6e3e715434c9df73eb32ddb961bf1b5a2f9fc1a612103da5600b67e9f3034bdb5224e0e2d3 SHA512 4087956b4c411b51c6619398abf1e9c3cac9aad5b72cc8df1fc6e9431c05b1349b86e8255f96dbf572705f5da4483d926bcea45626362c3034e6988151933614
-EBUILD python-3.8.10_p2.ebuild 9802 BLAKE2B 893e12b251eb4df0493662bc6d2f5fa613660323d67b2191b633bcd8fb9da707bf073ac283843342f59d05c864523f5fce1e01935f15414498430b3727301267 SHA512 5e984dd9ddfc63c23e59e9b881f7135c70f1ee2d4657f809b4e7abc6688cdcfdf20b1d805c0ed781386581c93357547f909148fdd19f1b2efe1640d260ffadc3
-EBUILD python-3.8.11.ebuild 9766 BLAKE2B 395069cd5d4d45cfbf01ecd5e1742a5b13792d9b8d7d6a154c593d30b0c39622732b82220a72cb66f3163c4513f1667edf06d7a9a6bfa2d94db05199eedd2b24 SHA512 48b0566da0472d08f0103f37939a531d21b42f6e92f77e5074898b583a57bdb7fc873a451924ab09e2d9ecb0949661e1064775ed62c3b732cd66a7b919e8f3ea
-EBUILD python-3.9.5_p2.ebuild 9941 BLAKE2B 430a2f50835be59619e6825a9127782f4492a45c3086606e9e0aa179d46a2d830fda58a2716fa339e4c62cc7f6d97a30d839c2c2aa6f496e4d6809ec73f99af2 SHA512 0761ac63773350c8979e0bc5b62e9063ee997536b123c10eef509cbb193d25492ea24e1503b87c512a388bfffc2875c1fdb971c8f4a81f9a5351f7ec95e3e040
-EBUILD python-3.9.6.ebuild 9905 BLAKE2B 983d4cbba0f00b45afb18dcc0fa9911e1befd5ce07627849699628f4bdd9753bec1ab0ff138f286bab820ac4ed6edcdc0dc7aedf798ed50c475545cdf2d26e7b SHA512 0c3b70c9b0db42c7e94f46f316508068bba10e839de2304f9caf35d98114bac1bbb1921392f0e925afe5a9fd2b87930b2ac9e3c332f0c37bb4f30b3625b92d7a
+EBUILD python-3.10.0_rc1_p1.ebuild 10023 BLAKE2B cba56d652815335faec57c8391af8aac7e8817c96994703ae5f82122ffb7c0e5817a57694ceba2e5990ca9e3bf86247d77e560e9e44982b2ac67dee8842c2253 SHA512 a627786f84e10b03b582f1f360f8b55b58594254eb44a4a86432f18a67d2d96f14f873b9b069a49073b283eb6d123ebd3bf3c2bd4ac4ff2debc13564e7645672
+EBUILD python-3.6.14.ebuild 9798 BLAKE2B 52980170cf4415b48d2d13ed630076d79c21a65d950fd883c07660f5014514ad8da96e9d05029fabb165d6e88a8618601d62f961c68a5037d4a0a26c441bd4cb SHA512 44f4ed1f07cc9332ea9699de4789a33d82ec7c2a0c474dbccdd215695fa02f4facb095ee57d151a734031a35380ff79b33042448f98d8a4f8505aab6aa3caf3b
+EBUILD python-3.7.11.ebuild 9611 BLAKE2B ebfa5095f7ef7f5550f5f2c148a9c910f280c634f1096c7b63bc3ffed02d6118abfaf74342f2d2e39449de7982eff911b46c542327090d39e8f97a69cb6edf94 SHA512 f432e100d47346e434acdc3eadbec80fe9e25211bf59dc7c50c8a15b7cce3dac6f41bd3529246e3ca1035f66a2815a9ac8893a2dc3f0535f592f84a25c3fbb3e
+EBUILD python-3.8.11.ebuild 9765 BLAKE2B 95aa5d7f2fb61c4663b9f48746c866cddd28552d78ebbc111ff6f476748c48bcb77a8f1a15775a68c791c805cf239c61c12b97a48bad84cd3c943c2c0b009e63 SHA512 3871776a49c1fb058465903962b4ed1475b513f80e92bd91ab5ac61e591a0e6235b0ff78325e66ea09e5231fd1df37ece847b7605a1fd2edd7e7de0383f37bc9
+EBUILD python-3.9.6_p1.ebuild 9904 BLAKE2B c454574bff806cbee78dcb7442e7742792aba87fb735baf7e9d6a72baa3aa698c78e63278649e083fe1f1b86cabb98a33f722b75344e038505f9f8660d2d50b5 SHA512 f84c7b5c35734b80daced5bf6e103e485271ab257c6d43008019ff68dcbdfe7c8b1898b4c5b6d3d67c5143ba5eab42d5b3c6c45f894d1325b650822f2d65d10e
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-3.10.0_beta4.ebuild b/dev-lang/python/python-3.10.0_beta4.ebuild
deleted file mode 100644
index 78403cbda835..000000000000
--- a/dev-lang/python/python-3.10.0_beta4.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_beta/b}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )
-	!!<sys-apps/sandbox-2.21"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-	verify-sig? ( app-crypt/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		$(use_enable ipv6)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite /usr/lib/python3.10/site-packages
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.10.0_rc1_p1.ebuild b/dev-lang/python/python-3.10.0_rc1_p1.ebuild
new file mode 100644
index 000000000000..7c0200703675
--- /dev/null
+++ b/dev-lang/python/python-3.10.0_rc1_p1.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+	!!<sys-apps/sandbox-2.21"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		$(use_enable ipv6)
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.10/site-packages
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.6.13_p5.ebuild b/dev-lang/python/python-3.6.13_p5.ebuild
deleted file mode 100644
index f7ff5c2120a2..000000000000
--- a/dev-lang/python/python-3.6.13_p5.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_P="Python-${PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test +threads tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( dev-libs/openssl:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-BDEPEND="
-	virtual/pkgconfig
-	verify-sig? ( app-crypt/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-PDEPEND="app-eselect/eselect-python"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		configure.ac \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--with-fpectl
-		--enable-shared
-		$(use_enable ipv6)
-		$(use_with threads)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb faulthandler"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	ln -s "../../../bin/pyvenv-${PYVER}" \
-		"${scriptdir}/pyvenv" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.6.14.ebuild b/dev-lang/python/python-3.6.14.ebuild
index 003f53696d2e..0ef9bffd77f4 100644
--- a/dev-lang/python/python-3.6.14.ebuild
+++ b/dev-lang/python/python-3.6.14.ebuild
@@ -22,7 +22,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.7.10_p6.ebuild b/dev-lang/python/python-3.7.10_p6.ebuild
deleted file mode 100644
index f1e8f4a37678..000000000000
--- a/dev-lang/python/python-3.7.10_p6.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_P="Python-${PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-BDEPEND="
-	virtual/pkgconfig
-	verify-sig? ( app-crypt/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-PDEPEND="app-eselect/eselect-python"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		$(use_enable ipv6)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	ln -s "../../../bin/pyvenv-${PYVER}" \
-		"${scriptdir}/pyvenv" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.7.11.ebuild b/dev-lang/python/python-3.7.11.ebuild
index ba90458f3a76..82cadf93c1bf 100644
--- a/dev-lang/python/python-3.7.11.ebuild
+++ b/dev-lang/python/python-3.7.11.ebuild
@@ -22,7 +22,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.8.10_p2.ebuild b/dev-lang/python/python-3.8.10_p2.ebuild
deleted file mode 100644
index cf9b8b124f3e..000000000000
--- a/dev-lang/python/python-3.8.10_p2.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/autoconf-archive
-	verify-sig? ( app-crypt/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-PDEPEND="app-eselect/eselect-python"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		$(use_enable ipv6)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.8.11.ebuild b/dev-lang/python/python-3.8.11.ebuild
index a8ee2b4b5f82..f078d9d9b5c3 100644
--- a/dev-lang/python/python-3.8.11.ebuild
+++ b/dev-lang/python/python-3.8.11.ebuild
@@ -23,7 +23,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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.9.5_p2.ebuild b/dev-lang/python/python-3.9.5_p2.ebuild
deleted file mode 100644
index 944292f8b1ef..000000000000
--- a/dev-lang/python/python-3.9.5_p2.ebuild
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/autoconf-archive
-	verify-sig? ( app-crypt/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-eselect/eselect-python"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		$(use_enable ipv6)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.9.6.ebuild b/dev-lang/python/python-3.9.6.ebuild
deleted file mode 100644
index 3528143ffde5..000000000000
--- a/dev-lang/python/python-3.9.6.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/autoconf-archive
-	verify-sig? ( app-crypt/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		$(use_enable ipv6)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.9.6_p1.ebuild b/dev-lang/python/python-3.9.6_p1.ebuild
new file mode 100644
index 000000000000..c31c0c1d8955
--- /dev/null
+++ b/dev-lang/python/python-3.9.6_p1.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf-archive
+	verify-sig? ( app-crypt/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		$(use_enable ipv6)
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 755b8d56488d..f269b78e6efb 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -62,6 +62,39 @@ DIST rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz 147158552 BLAKE2B 0e3037221da38
 DIST rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b40e46258e54771b814e07433318eb05e471c8bb65bfe016ad3830b94fe0be5234a1c9821c746cc452714719a78f24c5e0012f1d4c81569b36c6161c50ae034f SHA512 ecea8c4df0b72fa70d3a9a0c4b38812424006f21832c8805c9070ae4ee5255bfe6a7153eb44d453302162c7fc8a1a2dd6bb8574bedeb4e4f7a769d51de2cbde9
 DIST rust-1.53.0-x86_64-unknown-linux-musl.tar.xz 252250024 BLAKE2B e99c7a78d6d6a8b357ac17cdaa9540cc895d138480ddea25866d2f8235b48b6a1670ba7c9256355ddecfade28bed9eeec8b53e85f1c13af5c56c0ba7a12e2371 SHA512 33ee4d82cc1feeb4c478948a05eb44f7daa90f749191bd200a216dabe810420f47a3a258255c680302ddbc83020df4729d5b3ca9569003a89aa7768697e2fb64
 DIST rust-1.53.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 24283ac5457eb84de6a5588f69a22076a78c2ce9e5c3c245608bf963544a5c9f8fa8006e2ae216af65f5083cf5fe21f4d1c5286cf0b491ef4995be5ab8ac7c64 SHA512 fbd6b1477efbfc23da3f4f753c317f714a29495425a52d771d2527a42cfe7ad99b9973538da0978a6afa80f545823c9d0448d9cd29e6ef53559252e328d7deb8
+DIST rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz 231424908 BLAKE2B 6c403acd4b6b27208f95eb3fbfee5c8e7a63f3314f29ea7498dc0a4ae720d77c249c9ebc02a95d50278ac7f07b8d943b1c9c5e1561858f72ad1d8cdb29b779cc SHA512 3e6f638a35ed391f5393be7c92ef2560ed6bb26af1ea6ebf784bfadd3e153d1effd88fe49128eb98f5ec2ced7a65f3f4a596db71b9c4eca90429e50a8f168d11
+DIST rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f655d6f53a580041642871abd10993b771835770bebb6de1ff1dcc9b250ae52f862212feece533a9932c6efb0c3d02769cbbb03114d941c7e8d3117e1e23ce75 SHA512 d9508ae502e26694f83c04bbea3f95aeeee7990e703c8bb8be9ba098e0df86a39272022e1a94f8852ed23b8378ecb338dbd87ef226da444e29ccf7fb1f44e5f6
+DIST rust-1.54.0-aarch64-unknown-linux-musl.tar.xz 231629132 BLAKE2B 339e341eadd2cb0c763eb00b5a6750a1082da26bcae1b3c06459c99c64b4babf4aec5173222187eed7271e3c5847da47b49e6ab75674161b6e28297bb62ec781 SHA512 f0e20c079e4351fac5e8d635a37502e833a56fd216fd015117fb12be8b72e022bce946ec8e1612b320530dd186b1702b4384e74d64a479099db4562bcfc68453
+DIST rust-1.54.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 5aa9872ad96668d392c1aecf7f54c171e7bef6e17f65efc6c3fff7eee8dd7fc3eacee03e6544cdc27c5d34ea946d1a61aca6298c91812e9f35c391211b563506 SHA512 07694566ae33492df31083887fe9b7d43fb9f7c469ccd2fe9c77d3c8d3bd6b58ddc5e185462e982f78d63db39703a60986acaad51f953ea7434bcd9432a96946
+DIST rust-1.54.0-arm-unknown-linux-gnueabi.tar.xz 209386412 BLAKE2B f33b802bdfa3cbafdd86eff2d43e0af99e54777b1a26f1106016a8bdc4c06b5cdac8810ac68785f6da4cbe6a6d7fa74c13a855a5ef9c5703b16a2100ef60f2df SHA512 5f68879abd5da5d37b555b0b6ca5850d68663878bd23b5f6a31efd0a9dd43809c4d413154f8f343688eca23a96adbd08fcb3132831b848690261964d6a24e160
+DIST rust-1.54.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 7b90cdac8d068bcd565b42bed2289deff1490ae51cb65bbf2f0c308f6187e4fcfd98898e8e590ade2c2af7f10080821a417445e5c3046b4e39e0099c32e62624 SHA512 35bc49bc4140207af140e561023826e565751e47bbee6c1fd374bd7a992b6499051f4d84ca12e17101ea552bcafd6b96b111af888cd891f6dc18fceda11c83c8
+DIST rust-1.54.0-arm-unknown-linux-gnueabihf.tar.xz 209102396 BLAKE2B 1190da5c96336a121b4d4f92dba36c52c5f2bb0b26fdd92ca92ae4954256aaa375ea174c9669a285365ff02d4f3cadbf2d2ac92b847b00e10606e3832629a864 SHA512 ca38f1948b02008c1e9355c12f6d1fd3721ae9c06e686a09a7eea48670d889879ac0f81c462d21f467d600fc0972b920219e7378f7ba438e756cbc9b419a5f43
+DIST rust-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 9f01100804d72dc7afb7660277daa5a0f0cd96e478a7dc5a242360d07b25a22c5769727a67a46d63f3283e22e89ef5a6f6f6c48ac46f01075e2d908bf681be5d SHA512 316662676cf52a2e58c6cbeb46152da3919e54b0385c33a8fd1d46c25e71604f7803174278f80d4cb72cae54829ba00e3c4ba58001b43cc1148347f1788fdb02
+DIST rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz 217891252 BLAKE2B 657f366344fe911c5d93585ee0b1063815fb158069136c742512f21d3b47c64e42555d4e52ba305e5ddebbb1fb37fa8ba8ebc36f9a9e5fe5fe7ffdb31472e012 SHA512 0f4f4e075299cd369b4b53a425e9b290cd9cedca6a88878c6a4ae0487fe976b15bea0c8b92e7e376f77dc370552d95d738e99b7fa184a8e2c0e5ab94d65e7595
+DIST rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B c23e12a70df5e58dfca0e9c66432844424dc166cbc7dfeef4f692ba076ba687fd871bbbb5d37ed82ed5662ada170520c56c426f89be4fa07a0c88cfb773fe91b SHA512 14a5674ed5862b6cd3ddcd3efff4ab1298285bc0d5604a869e74e055a319401b9bf48a60d44583ddeb2230dcfab2e5584e5149947fbc40d97c112a6dae51745a
+DIST rust-1.54.0-i686-unknown-linux-gnu.tar.xz 226774108 BLAKE2B c56fb6ef24cda0c89b76403a38893a32382b09be8a8d08b066fbd437ac0a73a7d00af175c59bb7af6e6f5d8a74324e10afed2ea35d830f9f96f5ceaa4ec345d6 SHA512 15bc0c31a306aa1e2b16fec7f97963ca291b2632664c49add4281d3244054b2e2f51b0ade86a9d63db87124071fa25bd7d5e662acf4c30cf3267eb56da4a1f1f
+DIST rust-1.54.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 4d53a7760abd54973ef8ce95c10671db41136d7031a25ea0c0362feb65ce5755223d60a01c3418b69b902feebf75651bc4379ea66f98c862a573a8774a5e99c2 SHA512 e3dcef4d17bea43a1b0858da52e899d7a14db8ee7b9e3f506e9297dd0aba910d3808c25163a3f95698f32d25a3f128bb1759a808c84b8c75404300f60198fbd5
+DIST rust-1.54.0-mips-unknown-linux-gnu.tar.xz 147938432 BLAKE2B 38e7b768773cef9e3cfe707a716ba59ed67e2bbefe59db5531b06489131df219eba6a46eeb5c06bfd6d943fa4453f3d6f4b869725108fd2e069ab6ebbfa3d08b SHA512 aab52c26bd80b058772e0cd815bbd5ca0ab0fb10fa0ba43c07fc6151ec6e99d7ab48613a3e5cbdcb8f00b83108a716bd8b9f5d6f2c8518499b2482aa4d423a91
+DIST rust-1.54.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 05f4c8ee719ff857aa0a53661f6483c450a561905150217f886c25cf5c3e8dc3a36ebe2da38c75f843e3de4274d92c0c274906af40a94a6ecb122a9d38703e7f SHA512 6ba884e92b0ead2049f639405308ab6363268a8b42f827c9ecbfc5b16a0755bd1d345d989243f28662ce8c53611fb5984104001b3edec7b2dc22cc914970a7e5
+DIST rust-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz 157458264 BLAKE2B cd68d03e058922a020665a35765913f3405b0c0d5c7e252da1dc63b4b6af27d31fa5ce7eee562635241baea422c84d7e2a9539a79e6ae152794aeb9636e97a46 SHA512 74a85d869141fc941bf4f9821945ce0efd0169415fc209cc2288015d4e358716380cf91e41342a231cd34ce88321f24c4d20fffec3be702498cec3846a14298b
+DIST rust-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B aaca9b8e5007e0efc459a04ab95e6a3d76ab6cf177964acd4bb148f09ffac4f9c9bfba4ca4834e1ccc9505c259511f45ed1830285307388d79ac66b8dcddbbc5 SHA512 8d5d2a1200af550cdbc85b2dc847e524ada7f16fbc5f4c29d0e9e4e8c0067e04daaa273a99c14e6ad1a7d622e4f9d3da720b41f4ee75ff50cf2153cc190642e5
+DIST rust-1.54.0-mipsel-unknown-linux-gnu.tar.xz 154497208 BLAKE2B 40ab905d6088cb2e4364e2e6a0e4fb257365af05302abab81604d78b62bc255377ff7088884d9222f2997312befbf8efcd7f1821fd4bcf2dbae149c70cfa1224 SHA512 c61abff1df5e787d330abe4b3cbe8c3e67f02974dba3eb0fa4cbfeb0a74a956abb48199301e7f9af915b9be5a0d6ff7771198414458da52af18e9a74cab52620
+DIST rust-1.54.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f525e1849a0c753a077ffadb7dd0b1d67b5fb369c061ec895878fbbd8d377572db2b5bb1fb5e1a24bcef61eb3f80b6f6bbb3d93b611e6b00e535b2e516ae0681 SHA512 d55ac3c329b20bd4e7f095ee2c710bd5c5be825ae517561bf670b96626427db39d362be553c3b92c90710ab8d9b677d2367aa85a397a4568c1146e0dff10cda6
+DIST rust-1.54.0-powerpc-unknown-linux-gnu.tar.xz 164089736 BLAKE2B a4e3c0b6f78444a2f48e842468e828e517d32fb1b62b2ad0c0000bee97ac5730977c8dacdc614ea2182fabf25e23804efed53b493ec611dd5d4d5d8ec237feb4 SHA512 ae8ba40e5843bd3ecc25156521f7e7cc7c869457151896371fd5faa3bc565ff9a6b7d437e3587dd9f1e87e9fa19463259ec18fe03badbd89372c11ddc7b577ee
+DIST rust-1.54.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ac59496efd850b618b4013d0cbe09172f5828e60ae07afd0b233749ff3c1699e524e3a4fa93fea906f79dbc44f1d94ad52bf3952c2a4014d9d2653702d86349f SHA512 daf5da203c079cfca365990b0111d9df16defb49e1bc9c24407e423873992a9920d88fc2a097e1df8d2b03e05d1118bb3786e908d4f46fb282357c62d24df88c
+DIST rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz 178088044 BLAKE2B e059572d2044aa05683d29370c395b714f25d0c7ec820bcb133d29667e9066b82e62e11000a3183a66cbeb87625517284d12263c2ea0eec60dc537ba3c78e6b9 SHA512 543dcaf3bab3343e796b3535a3b4e12d77227006e64e91b885f599fd94ffc9c1cc8d8c5ce3b788df0399c79dc785ff7c8dc375ae20d3b4156d1b16a7dec5a371
+DIST rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 663a3f7027c61f4a7e38bd0a72ffa55b9de2673cc0d48e94bb964e950b8a356b01011e94904efb3525c0ee2cd57e82ce8af50d2360a7e5b200b6eefeb4580927 SHA512 f0d03c2c3da60731cc05b9370df53766d6fc14ea3d49edbe0a7e809e35560a7cf06c4d8291896a604fdaddb665d117c53ec93671a0402dc093442ed3cbf4c596
+DIST rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz 187058704 BLAKE2B bd90f56b50024cfce5bbfb5e84d28c06687b6a5524b1964064b1e53111b49805815d3dec47fd035f9e1d78c426d0b0689ac7c8baa1044cfbb9343da452d77694 SHA512 9d13d53a1ef106b190161096122da1bc9090dc495604c8ddbb9d6b02323e6b7c9b8bec82dfe33ae6cf1820e986811a701f7a4d4c3eb7c297c777fe3563b8e9ee
+DIST rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3cfdbc8958b7025b6b3b76a6aef603820418c3aa2ee63c0a257dcd36004ca90203abb1b60a921310a9aea10545e32a11291a9d9baf3caf3e2b5a27ab4724bd9f SHA512 3ece925a1e3797cc6bf6ce44a3ca4768f57bc9bc3bb1261d6a82905907c635bb20ea7f5eeed062ff02582b035a22508990bfe83640006fe77fde8e699d5d55cc
+DIST rust-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz 180939260 BLAKE2B 856a431c22f286d42069dcd34101cc6e539004024619ba061a39d3bcc48834ce0002e2499466f976b81a7aa7d47f1c3249f2b21c69233df4d7d0940d80f5761c SHA512 5af3bbd68706bff03d51daf76551830810a8e225e8f0a9a394fd29a4fe9f0389bed3e0d94333483e089b4cce375c0320cc6ae360ddc4f08fca0ae80e671ba2a4
+DIST rust-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 366ef8f21801cc510b22217c4d974343ccb9f941faf08fba584b3f068a9d3128e3a15f5dc1400ed3749166afb622bb3aaafcf15381a0f2a5b60767db6ca9d3f2 SHA512 fdafdedb8f667124cb71eb44a6a61b1cef1df0baab385d2f5c674d900cd24139e555aa30df99f9d496b5fb30031bb86a43b118fafa083a24e2be10126e68df67
+DIST rust-1.54.0-s390x-unknown-linux-gnu.tar.xz 186478732 BLAKE2B 3d3ef6c37e0c24a4622814c51bfe1a5093f261e393a3dbb9c5eda023f8d0a63ebf0080cba5d43c8448b79503aecc62f04ccc18f040562db57dcd2ff1cb243124 SHA512 5033e3f61af7de144c3ed441f9fdf9f0c00a837d018ec3c0d4ef67f032e7f808d2dcc586e7b85b733ff9bc2196c2e05fcd104b3daa85698cc0e4e9ab69b870bd
+DIST rust-1.54.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b375bf65d9bef4a54792f93ac52fa408c85407d6aa646b64ee85d9220fdd9d7dda76c1e118def5262f5ab8fd9b7637c5d681d37c50d9e917eb6ba0d5b25e42fc SHA512 3bd16cdc61033d6e38de595ac145f0e7cebf3c3455491325ba89de8067cf6096beac7f00b3e4dc942cf4bf0f5ab59f6233b5d24f0ebf97ab3562260182baae4c
+DIST rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz 136593024 BLAKE2B 2f10b636982f335a200149d11c6cf212adb3e27f7d3eda9069881565a07f29aa6f2010ca786c3746190a3bbb8b8d79d531bee906e21e21f2c132f6c1e4198e17 SHA512 d2aad46556b164dac54be76a2459789fc686781b157f0c7d647464db3b03cbb902c8c4de5c6ef2e0811a94bdbba2973c93698c4f3a7c6ba294c0e652994e3fdc
+DIST rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B cdfb03b6a75cd86e565b0b502cbd72636b67a92f9039fb148ca19fbef3d0775616ff03420cebeffe36db3d1d1db75e7e77ac473841a399dc2a218df09598b2eb SHA512 144ec35e82194d16cbf4e56c34dc25aa83d8ec8021052cc471ec85f169b74bd9394ec52c21c898d3ac0b966fd7463cd567d729eec9152f5fb8307c87eb02877d
+DIST rust-1.54.0-x86_64-unknown-linux-musl.tar.xz 267840732 BLAKE2B 32e50467c4ee88cc502ea7e3e8cda9cbd89bcb6b7fac0c84b1509abf0a5c551d43f6522d148f54e4af65e0738b1dd13bfebaaba7e863909047fd53cac03bbbac SHA512 131f4743e5990c3e1ec2b7a0d1eb107a0e5264e6ce387cf4aa6db9a1693d0fe4a42de5722072708d72d580500d566f7772513974ce5589ea07997374fbdefdb9
+DIST rust-1.54.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 8b9194ce2b172cdd1fecbe064ddaa0047d30ddeafeaa903637e65775b139207c47da7eb17475ed17b1792b7c872ae71058c1f2cb7d59bd2d42a78cc590f9ec03 SHA512 2aaa42cab5272b6ee2ad0d3cd67b7dc648af68c5b9b5fd8f816688c0ebcc2cb0a24ac8c2a23dda5f17f7ba04f544625b3b03b22882c9122852bba680d8155afc
 EBUILD rust-bin-1.52.1.ebuild 5378 BLAKE2B 88912dbecd970882f4a6acdc66f4058b2eca20541b77bf98f799354dc3c4e6c1606592e57bac4c05eb5aa44901b4bbd14577bcb3ded25db730bdcdf6d4eca5f6 SHA512 4d2f865a1431b13fe40d40eac7b8bdff6e3da4af094d2fa125369bc864bc6d9669cacf94401e33703284ff8b955818283f659157176a1283fa299555f0a30f34
 EBUILD rust-bin-1.53.0.ebuild 5379 BLAKE2B 94af16f82122fff5e8c59e77f5f30f42cd32de48fd249293c5da8da33c3d7fed5ee6bab226b81bd7ffb179ac9040ce14d0bbe82a16708c4e9ace78ab7d20d092 SHA512 866950661e91c8872b26d93dd71c204ebdc110e9ee52dc503a315e5a8c1e2fe388661e9459ffc4b431ae406ffc6a71ed42aa7e06be2a32dcb5ce3be6f6bd765b
+EBUILD rust-bin-1.54.0.ebuild 5383 BLAKE2B 7c271e76a052a77c4bbdb72969f33be124c3f5a028e70e3797ef2895e50f5b5a4725deac92f7c3fad64c8fbf1be1d9a1b61e91db4d25453de69abab6980a3cb7 SHA512 147596f07d55953ed795ab2e6b6162505a3cac65526e0acc08db1f37094df9471519e143a709e5a410790b17288b24e9d16ab916855891b15b8cb24af9edeb0d
 MISC metadata.xml 489 BLAKE2B b9c157f91a878ec1196183173bb339e9beb832e9b002cd72ac5b0fc8a64e7d7b27d165f79bf34eb1debfa69c2381b5b9a74a9b52cefc9efdfe41c93ed72ecd9a SHA512 814c53f00547b8a2b12cab136c95222480ab34b1cec307029e66c7d712e1e00eb2a725ccdfe73d7f1b154b362867c7150caef3609daba20f8d4c2496c47f6b09
diff --git a/dev-lang/rust-bin/rust-bin-1.54.0.ebuild b/dev-lang/rust-bin/rust-bin-1.54.0.ebuild
new file mode 100644
index 000000000000..64f7fa3d9544
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.54.0.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rustfmt"
+
+DEPEND=""
+RDEPEND=">=app-eselect/eselect-rust-20190311"
+BDEPEND="
+	prefix? ( dev-util/patchelf )
+	verify-sig? ( app-crypt/openpgp-keys-rust )
+"
+
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+QA_PREBUILT="
+	opt/${P}/bin/.*
+	opt/${P}/lib/.*.so
+	opt/${P}/libexec/.*
+	opt/${P}/lib/rustlib/.*/bin/.*
+	opt/${P}/lib/rustlib/.*/lib/.*
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+	fi
+}
+
+src_unpack() {
+	verify-sig_src_unpack
+	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
+}
+
+patchelf_for_bin() {
+	local filetype=$(file -b ${1})
+	if [[ ${filetype} == *ELF*interpreter* ]]; then
+		einfo "${1}'s interpreter changed"
+		patchelf ${1} --set-interpreter ${2} || die
+	elif [[ ${filetype} == *script* ]]; then
+		hprefixify ${1}
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+
+	# start native abi install
+	pushd "${S}" >/dev/null || die
+	local analysis std
+	analysis="$(grep 'analysis' ./components)"
+	std="$(grep 'std' ./components)"
+	local components="rustc,cargo,${std}"
+	use doc && components="${components},rust-docs"
+	use clippy && components="${components},clippy-preview"
+	use rls && components="${components},rls-preview,${analysis}"
+	use rustfmt && components="${components},rustfmt-preview"
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${ED}/opt/${P}" \
+		--mandir="${ED}/opt/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	if use prefix; then
+		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
+		ebegin "Changing interpreter to ${interpreter} for Gentoo prefix at ${ED}/opt/${P}/bin"
+		find "${ED}/opt/${P}/bin" -type f -print0 | \
+			while IFS=  read -r -d '' filename; do
+				patchelf_for_bin ${filename} ${interpreter} \; || die
+			done
+		eend $?
+	fi
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use rls && symlinks+=( rls )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+
+	einfo "installing eselect-rust symlinks and paths"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /opt/rust-bin-<ver>/bin/rustc-<ver>
+		local ver_i="${i}-bin-${PV}"
+		ln -v "${ED}/opt/${P}/bin/${i}" "${ED}/opt/${P}/bin/${ver_i}"
+		dosym "../../opt/${P}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "../../../opt/${P}/lib" "/usr/lib/rust/lib-bin-${PV}"
+	dosym "../../../opt/${P}/man" "/usr/lib/rust/man-bin-${PV}"
+	dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}"
+	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
+
+	# musl logic can be improved a bit, but fine as is for now
+	cat <<-_EOF_ > "${T}/50${P}"
+	LDPATH="${EPREFIX}/usr/lib/rust/lib"
+	MANPATH="${EPREFIX}/usr/lib/rust/man"
+	$(use amd64 && usex elibc_musl 'CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+	$(use arm64 && usex elibc_musl 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+	_EOF_
+	doenvd "${T}/50${P}"
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+	/usr/bin/cargo
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	/usr/bin/rust-gdbgui
+	/usr/bin/rust-lldb
+	/usr/lib/rustlib
+	/usr/lib/rust/lib
+	/usr/lib/rust/man
+	/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+		echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+	popd >/dev/null || die
+	#end native abi install
+
+	else
+		local rust_target
+		rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
+		dodir "/opt/${P}/lib/rustlib"
+		cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
+			"${ED}/opt/${P}/lib/rustlib" || die
+	fi
+
+	# BUG: installs x86_64 binary on other arches
+	rm -f "${ED}/opt/${P}/lib/rustlib/"*/bin/rust-llvm-dwp || die
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	elog "Rust installs a helper script for calling GDB now,"
+	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}."
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 2cefdd2c58bc..785b93d39278 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -67,10 +67,45 @@ DIST rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz 143053436 BLAKE2B cdbbd529c5d82
 DIST rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ec204ee0968d4114023f40dfdd8654451149b5433dbb4eec192cc68135f45ed28ae7b06eabdab417401529162c11939ee101f7eddce304111fe93e9806347902 SHA512 4ae425def112d8c38e91ded53fdd73a6c7d2043eda22ce955aaa7303ff2cd6e7e8d0cfaa0d596b29195ba449811653f91b9b65c8c96b3cc8136d060609594828
 DIST rust-1.52.0-x86_64-unknown-linux-musl.tar.xz 239422556 BLAKE2B 8bef78b335b384e6bf7a5dd4a47511aa69ce0de6f9d1ab78146cd55f37e01b358a0cb82b95dcd27d25d4a114b707155b923415f9a91e6a75ab83bca9f5f7e0e3 SHA512 30a9f45f591c3beb34deee23611b5afe0f90b7a2a1b7b813498547b3264ecb98ef1d6bdfb77468bd5364f2942d927418037eb4ffe413db520c701fdf79c89bf2
 DIST rust-1.52.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 2d69f81dd47ce7387311b576a7770f2b457beebba8cd1554e5eac501025b7b54e72078b69c7cf8a61bc295298d7f277f39a070ee8d83564942149a1b42089594 SHA512 688e3eaaf2a7e7995a9b36e6856b7922b4deada31fdab198df335b316672d20bc80e5e717cee4e2fc2f51ec8abaf97880dfa5424a7b122e46b02fb7f62836378
+DIST rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz 216240932 BLAKE2B a63eacafe8c9194095cb3ee0856b22c66b210746c208ecbc6495800eca9b480d31d84ebde29ffbb7dc8464dcee164f4da96d7479f73facee6352a74488073c1a SHA512 aed515e60e5eb22478b864f7e9aa74b99b9843afe6d1fcc9d0ad78bfd48a39b0d9c8ee7b785f273c3bf5d3a173c169fd6dcd5c64fa67c49285803ff4598d9f59
+DIST rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 15822fc4762caa2086cb4b4300d1eff2c8401932fe5ca8d12926b7ccd8b950940d4aa43daf288765d55da8a19db781129e4e3f83ea5297fca28f814738826dab SHA512 49e4c27f498faf1e95c5061786771e5008043e4b030fb91b3c1cc406f424a541ddaac435c7065659e27ce379d46ca78cf4f10073c8dc2148be715b621b824981
+DIST rust-1.53.0-aarch64-unknown-linux-musl.tar.xz 213585000 BLAKE2B db26a6d09645b7feded883bdc81d233ff3319a10c42bcf1b4fbc82c499f0099ec83c2de8f175f141daf1d3ea15ac13b835c9e0bdd92edb25fc0e4d91642e96ab SHA512 fc72513ce66784b5f9aa5797bfd6ce35f50e9494d0515371599e94f72bd784fc40357a540d23ef29f08d1733be240ad1c11d68d21550d1ddd55642d2770b06ca
+DIST rust-1.53.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 1468ff2faec1ea7e43371c5717d5db5eca6ab5376dbd3bd5a5785846ca473f14a90b2a7b978a56329a05111d509b860d834be3fe47263eac8de3ffdc57597a2f SHA512 dacce8e3f8b7c20accc2ae5073165ac86d4ab60cc3da772cf672afd080245dbb37ed4367379408cd359bad29d469eab138394ef87c32a39a075b0c0fb8a2e4ef
+DIST rust-1.53.0-arm-unknown-linux-gnueabi.tar.xz 195762312 BLAKE2B 44e8ab86b4970f7312b631d6733a3198756b28286d0e072294d75f59dcce15ebd470e92972d3133e901b6b14d35c6c3cd8afdb185435cc0c8e8c215676f3f8a4 SHA512 64976e51ca98bd57de4a9b17236ac815e5198ea57b018f8cf45a252abb9a681df4c1b11bd647145d5d9fe4570a36e01540cb7c145a11a414d4419611026f2227
+DIST rust-1.53.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B d01f42174bfd33e7c069c4aae68a71768ab33496f3764f3238e3a852e6ed11c02153f4dc40a5afc6f279d696c099093808d1887721c085a946dfab15caab6dc9 SHA512 73b86591c1790a98c59be4cce89472bd80171a0b80b509c0c345cc22de9faaa6d9e74fe50618bc1cf83d19ca8c7de9fdf35071a51ba6f4468001bbf6c72caf22
+DIST rust-1.53.0-arm-unknown-linux-gnueabihf.tar.xz 195620064 BLAKE2B 11e09a7cfecdac13911f47ac66eef6e4f419d83e1bf2cc7a01659219ca1255fb2987fbaee95e8dc5dca14616dcb59f69f4841f9f92250b22dd20be67ec9a2d0b SHA512 37749caf422fdc025101c938f39c0539ea33c4c8f17b76485c34a8ba9017e552bb64ab1d827c118e8047ecff4cc79da6a116df641ccc49d220079c0e6c5effd5
+DIST rust-1.53.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 2bdc454ee8bb482eedba513b86ed7a38d356761e0a8b48c18c3753668250db7bea9b32b7667dde46b7942282ed9ed3a911e478b0dd35ef22fc89e8625a009b6f SHA512 261831baa9a1d02c58677931c3db36b8ba0f9b1ecb533b993f8c62b5f5329ae7c9b366f346879f95c03b7b13e97b5bfad363815392ea0c55bb72b039c5f1e71b
+DIST rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz 201618680 BLAKE2B eb2e7a7f2b32ed9667342df7881c9e411619fa31d0805e54d91a7a4cd9c2b7a4b603adb4f288f20b82e0d8257c3526b92d34586dd3c42e857f9f2c2c68608006 SHA512 a3c5f4f0d19a55e51b3a0fbc7dc9f168cc6eb0b9ccbca34e4e5a83f70e4e22149cfc4fa51bf878ec39e5b2988e198630fed32620bf151ad9359c70db2f9af28a
+DIST rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 91effad238727c142e4617f548101e6b50c49765203919908604e8ab8e4706a7a962561f34823ff3d04e59ba8345496d6c994270367e6c256f214e3e4f1e7879 SHA512 1cf21620aed1752d0e7bf83264b5afa799e5d86a1e1fa49944b956f8626b28afe8d465923ad6126ca4b5cb7e6cbc9e72469685f46001ded78113687001b120ac
+DIST rust-1.53.0-i686-unknown-linux-gnu.tar.xz 220103312 BLAKE2B 9678804edcc7bc5161d704bb28c385c9294496266f653ebc6bd3ed979969d843927593b5f05cfb87a4caf35601da42a7318be4aa9764a8024bc2576cafa8bffd SHA512 404969329b88ce3f3078837e7bd33de28babf0834e366f5663abab79bf810f2c0ddfeea304bb6289415862afc50289d897cb92fc3f0c0ee8a40bcfc8c23b567c
+DIST rust-1.53.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f03d9a9d3ec8e05be28f2d270ba94f7fe7572b3678d7c4ba28f03ea571dfb8a078866a5f3069b9c5086bd354fd870e8ebadaeb08e367d07d90a8fb0992700e0a SHA512 efc69883330307976582f65a2562ffc76e110af7a4eef10ff9234cdeaf50f8971154dccb36608d338259fc02e48825078e12d582d61609bb22026daa3a8d0f50
+DIST rust-1.53.0-mips-unknown-linux-gnu.tar.xz 157896460 BLAKE2B 8fe6a70ba1bb17cd92e58f2e8f6315eafb04870acf99b30cc4311387c5c3e021a7927ba1cd4a9081a833be9ca07032f4f6dc1f1464133b53c49a5719352a31dd SHA512 6b76a2f6a35366336410f8e293f9828ae3d9a23412c52abdf7bbb0055a50ba3a19c6becf7c8cd3a81b1d3c65dbe8c60b8bea6583013d207c49c89052111c373b
+DIST rust-1.53.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B bcb1100430e98969def3de8cad66022c2c7442fbe8315c70dcc6a5f4d7990f11f127db51f5e60c86d0d45d36af2ad87f551146ecce50c81a56a46fa2b7a05823 SHA512 406c493fba40c706019c980777f43b9531112d5c99bd79f5726698d94308fd0121bc30272f2d12667179a32d7bdf9f23bbfe3f133fd99640bb378f0602361aaf
+DIST rust-1.53.0-mips64-unknown-linux-gnuabi64.tar.xz 165679184 BLAKE2B fe7f20759899a7dc3fd6db247fcf4a5360c64d7f03ee8a526b7a025e5dd5360a645da9cd0104e2156b1fbfbe1022d31f222fead7a4df65ff1d40e2dcbcdf32cd SHA512 f8c1fc4ca7a958ace63ca008f70d5b56d12862e1c3c00cc29d62a692c7a282de68c1969f996fb93cc7247c671f09e694dbade9b1f9464c95c809cfccca8fa6a2
+DIST rust-1.53.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B 62f3809e249c8f8d47f1f5356d999b6e051f7c55b21b82bb6fc9403d55462648f348f7e4821d604fbf7d36761b876f2af673c0693134ff9ae2dd7fd574292a10 SHA512 ce00c5e7b8db9506c88edc1160a9c7a3114456873b3fd164f384cdf22b41dcf59c36095180a729d09760ae95e4a7cd7cd5926bd148f0acf03434fc914bb73bfd
+DIST rust-1.53.0-mipsel-unknown-linux-gnu.tar.xz 159577548 BLAKE2B 0742cdbecbe492186ed9ea15f3d8795354a6e63c131cf683f96b2a494c4cad11b2fefced9a7d8be2700677a8aa495bbae05c96fdc0fab0fe69a36e67d5440a94 SHA512 eda7b827b64baf325be7f42fd3fc5d4a487d243ba83d0573e7eb1861c8ed510e8c2fdbe499f6c46ee9aaaf3b0017e235d758222ae5d7f88f8abd76f5eed8bdaf
+DIST rust-1.53.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B fa574a037814d6e15970a6588721d7626dd9fbd5da567770a62b31ff9fb7158cdf4b5bbce42c7be384a647138ce4d1bd8d08e148b429d58f284fb0e9a855aedd SHA512 5dc1097534ca36c9c8867f3c736b34f36006afa6add46a8c1a406414278abc2487f3778dcd162edd21534c0fee81b181caa3c633f3105b93ca759896c268f580
+DIST rust-1.53.0-powerpc-unknown-linux-gnu.tar.xz 173771788 BLAKE2B ac83aaab909151ab1cb3f8d9de696dc692356ad5696208b7879b3a8e2fd8a584b59c921c6259dc913f1faf06bcf073a2e27ee876e01e7d751cbfc39df26849dd SHA512 0fe291660b975f9051b2ef045033577785b0f1d513a351d94efb7f4406fa6a3c59b11c7c7208adc15e3840bca704c4c826c51a2f6f762eab2ee812767bdb4034
+DIST rust-1.53.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 097927a93b86187b8b5520c6d6f0de345956fd4b52ce823611bbbddb71608b032d4be593d42c433a6156296132f98fa23b4a32bbd0423a26806cfcc54f5b2799 SHA512 babd75f4f0850b8fa11171dfeca1185ace1f6ea5ed4a672b598771c28f2eb7568d9696824ae405ae468b58543262d22892c12eb8201b730d73a09ad68f702457
+DIST rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz 184849964 BLAKE2B ac498b1cdb7909c3812bce66359f4197cce3e7c4eee4c7702d251f896c09c1ff388f50fe16a0f6a671c04d9243eb8948e64dc84b1c96ab37dc7d67f9c3c63c16 SHA512 573815b4b93e2484108990814c8c63cc8c783b1909c24ff9c856b3920ec3553016aed66309e459bae5d16319ae925f470c6449aeae653791af4a90384ccb9be8
+DIST rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 1f8cd752429865e448899ad6a7ed337f30a0fc52be0c2674c727b182bac25302f1ecf6e1db199c24ddfbbe62c05957a93999201753f1b8f6f9d54508e78f91c5 SHA512 5e41ce5e6be48b0148f57e686203520d1d7b70516d1a991035f0073a666f896bc964b26c710db7284d87de455a293b8c97d33bbfbca1a63077e8ed0dc197b4bb
+DIST rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz 194345592 BLAKE2B e0758697ae3da0c00f60e93e5e665d8f0d6346c9b0e48d39eda4666d8bc01432263b39798f2e1b4f46267d572518289a6cf1313f7225ef25f38e9ecfbd39d813 SHA512 f418272864889635494553cd1f6216b0487c016c31603532920e45435da85154f6ec275bee6d2a32ef6755fb12f57151ce2d3c7c5d6d97c2eb3d81f7c2842c48
+DIST rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e577b834c6173bc90e671d28fac974eda672cb888c4ce6dcf012687edd3f21fa603e47c27c08c042079b239d1d63915f7db7e0e37dc97f171f4d9d141979c564 SHA512 df255926f1468658ada27e4f9d78af2d204142e205108724cb4ce740cdbb019a34e4b3f1a6c88c05c9b5c2da0b5fd92b46eee1f6fddf3ec3e80a2020a459e4bc
+DIST rust-1.53.0-riscv64gc-unknown-linux-gnu.tar.xz 181354760 BLAKE2B f99fcf4ae35163371e42e10cc61429c53874858311f55dfb480763bf818c64c05148a6487ec7cb5b150e902260f9afb48566ec2712d6fda058808ec1c2bfc517 SHA512 ef06941ff66f9d9a5723352ccb10c3958f4edfdc542f348145d65b4c5d123f750dd3c07b3146a359316c402a9ff032ddf7e48d28a75cbfb668df4d42d7c8aa6d
+DIST rust-1.53.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 03c3c367e79dd056e61cef642e373b62d4d66d54a70ff81e53f2d6c0819da1411563410b8ec0a28e6c310e291cea70edb1299038dd92691590046dc99ef52fe8 SHA512 bc337fca44914408f8a7c4c22b3f9d50887d44483c863560864d94614da235c8a53b272cfd297fd4643bfac5abebc0a84e3af3b81434eacddeca8aa920f2e727
+DIST rust-1.53.0-s390x-unknown-linux-gnu.tar.xz 193691664 BLAKE2B 627431518faafa7bc0ecd07ed1d315d9e73029c47773feaaa6e4f9c27c4e0c730fb51b8017d4f6966d8ccceda2af93592239dea99269a741b7f5ce54e93e29eb SHA512 ca142b436b1396ad978ba1d1a0993a4bba105d9e99bf89a9aea731b7406399a2132a531664fa6fec17af20f99ebd5c0a7ad329d2b143565fb878f4e7290aeb4c
+DIST rust-1.53.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B c0e13c32eb4f8a4eb3dbae03853c38351a608ddee13a22475080d7afe7f1dfa12d894e6701786e3c9841e285266262b8143154ba4d130e6c3e5d7bdf5cd41075 SHA512 eca733edac17aa2d1de8f7f09835826ea31e1d1ec06d9c817370d6508f0bd444378ff530281dc5cab91df0db5ba53a45117baddb94d77a2c050c9f886860a040
+DIST rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz 147158552 BLAKE2B 0e3037221da381ceee360ac005a98bf581dd143357835dcd5f5b39f7337e4de566666b21c62a794d1d20473b31004b8742cf84ca273cffc03b378853a4ebbb84 SHA512 3b1ee4a549917fc514de7dfb99392cfa058cb06fb93266e4864d4df3ff86372eeef9a9d2a459f93462eaab8f223d3eaff1e824d42be7b983c44d18ec1579c6fa
+DIST rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b40e46258e54771b814e07433318eb05e471c8bb65bfe016ad3830b94fe0be5234a1c9821c746cc452714719a78f24c5e0012f1d4c81569b36c6161c50ae034f SHA512 ecea8c4df0b72fa70d3a9a0c4b38812424006f21832c8805c9070ae4ee5255bfe6a7153eb44d453302162c7fc8a1a2dd6bb8574bedeb4e4f7a769d51de2cbde9
+DIST rust-1.53.0-x86_64-unknown-linux-musl.tar.xz 252250024 BLAKE2B e99c7a78d6d6a8b357ac17cdaa9540cc895d138480ddea25866d2f8235b48b6a1670ba7c9256355ddecfade28bed9eeec8b53e85f1c13af5c56c0ba7a12e2371 SHA512 33ee4d82cc1feeb4c478948a05eb44f7daa90f749191bd200a216dabe810420f47a3a258255c680302ddbc83020df4729d5b3ca9569003a89aa7768697e2fb64
+DIST rust-1.53.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 24283ac5457eb84de6a5588f69a22076a78c2ce9e5c3c245608bf963544a5c9f8fa8006e2ae216af65f5083cf5fe21f4d1c5286cf0b491ef4995be5ab8ac7c64 SHA512 fbd6b1477efbfc23da3f4f753c317f714a29495425a52d771d2527a42cfe7ad99b9973538da0978a6afa80f545823c9d0448d9cd29e6ef53559252e328d7deb8
 DIST rustc-1.52.1-src.tar.xz 115109508 BLAKE2B c5d73f5884037d287d88ba9fdaf63a36678b692e1b510920045797ab29f1660f05cda901e19411ff83ec3084c4130034c269976b1056220f3e629cff116d07f0 SHA512 55f5053ce40d4eba4663052817aef6a6275139ca229c89cd1ec44711458b412720203301d8c7975aac5720a91fcaf21847f8184f641cbb0004f722520283c73c
 DIST rustc-1.52.1-src.tar.xz.asc 801 BLAKE2B ea2f89289b4d9cf90a0d10148bf3494805c00e7822cc98addf0b602c35e4635bb1963d79168b395a5f7c7bd024070284fccd19757982daa0d554dcac166fd4d7 SHA512 0d692a085c017b03b8a135a28f7e6f1d7e05642d2e99f0f1fbc397e766bb8fed4b4c6b4c9157b79d9bb0c4229607dbc35711cd463c62a9966a4efb6f197de7d3
 DIST rustc-1.53.0-src.tar.xz 115686332 BLAKE2B fa068f89d42f927fdc79ee31aad1386eaf2aa596a060e059c5a1a73fe48c48d008fc952cd6c7912b743e41d77a94b205639eed0f728b2539b62f18a772cabfe3 SHA512 70485cf7a0f7fc36ee31644e546374079dc387a85b44e5e793707fd0a4d7ca05d311291e78b86db955485d8f21c47ff9e1908acc4da68ba04929287213a40c24
 DIST rustc-1.53.0-src.tar.xz.asc 801 BLAKE2B 75d3aa4122968f10a119f7a04df897f496588c7a1a2ddf1ea2222099c9efb0e320f5677a26c3271f86e7f500120664485f54c6025ae3c6df30d2b0fe758f5826 SHA512 e337579b9ab4febca4594c2c5d42c279b51cfc745c383be9a430204188311a25319c04c73fde34fdb2bb98a88bfd8daaddc67765834330e6c279a6e5a5648247
+DIST rustc-1.54.0-src.tar.xz 116286856 BLAKE2B 5ac47822646a0b6205f09282168b4d4ddcace9f6bc8f242c890327ca4074626f129514f8bcae5c5556015745f718990cce490658076f5cd3526623439540416b SHA512 5162f85b43ca2c5af93fdbfb2597d75df8a838f7fcc025a5298499ce1043db50f1ea2fbba753e47ce5daad3d80d4b612acf6527ef902c34117763e687fdbbcfa
+DIST rustc-1.54.0-src.tar.xz.asc 801 BLAKE2B 5ee9166eaa00e4ffec10fb82b18946d403bc2030c6e04de6449311cbccc2ef1b017044f451a1c19be3a0a9640c4a9a9e4bd22d28e2115509f333ae38eb25e9d4 SHA512 5ad91f43515de14114964db0348cd28c08adc6dc935f110bf339053414b8eab8a40f1074ceffa44ed2df61254f8368d867479400618c44efaa0333642ab49d07
 EBUILD rust-1.52.1.ebuild 20198 BLAKE2B ded64444104b75499de229c06c3d41b2651d3ee590f598f7b93965f9c70d22369a7b6f09d968a5618adb62ab8f8f423292f8766d33086be898d7b5960efa206d SHA512 9b54bcdae2b1584e73f005792d7382d264b057b70d3cdf3c8ac412ae66f8bc134ad0fa5e80d641fa101c8526bb3883a8043be64af611663ff1cb5e643f149373
 EBUILD rust-1.53.0.ebuild 20481 BLAKE2B c3f1df43691caf6b23a6a4da6f6736952ffe6b8aee54c407356b77dec56b439f9c3d856a9d191f77134493f2c90635b9f199dca077218680669f3a1b9440a4ce SHA512 ddbc3e41c47aa4a9eb0f19802ab72d97da76e21271d1c558c2e8227c584e66ac14611e36f4d78fdd9fc302d96fe1457a696b163656fdf402f93112580073befe
+EBUILD rust-1.54.0.ebuild 20396 BLAKE2B fdf2ab084f27444681a3dc1e8a4004830f2bf4b4b71690bbf95d762b681cfeb9ff8fb20c021973d7a297b07785d00c877c8f7ce31dc84bb4726cb3067542094e SHA512 89e4001235a8e5b298ba9653ec81546c0b21d097de91bcec36bf58a812079edccd9a8c983ed9e2e865025a9fbcec3ef652d5cdb0671bd5fe624f4e6941464b3a
 MISC metadata.xml 1083 BLAKE2B 7a7b093c22dcaef58bd67f9c2fd84a000696b234d2bc27315999bf6751cfd2a79441fd22efc284a542ecc84ce1a12ff9ca3495d249eaffa5bc1722b385c6109e SHA512 bfe8c140753e93db67244c92e9a7d193691ceb67de796c30a851966a1262bc5c897ead6e13d728775fa524215b6851609dcbee582022d9d75bb8d1e6fabc4ef4
diff --git a/dev-lang/rust/rust-1.54.0.ebuild b/dev-lang/rust/rust-1.54.0.ebuild
new file mode 100644
index 000000000000..8a51162e0f98
--- /dev/null
+++ b/dev-lang/rust/rust-1.54.0.ebuild
@@ -0,0 +1,678 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing \
+	multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
+else
+	ABI_VER="$(ver_cut 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+
+SRC_URI="
+	https://static.rust-lang.org/dist/${SRC}
+	verify-sig? ( https://static.rust-lang.org/dist/${SRC}.asc )
+	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
+"
+
+# keep in sync with llvm ebuild of the same version as bundled one.
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rls rustfmt system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling more than one slot
+# simultaneously.
+
+# How to use it:
+# List all the working slots in LLVM_VALID_SLOTS, newest first.
+LLVM_VALID_SLOTS=( 12 )
+LLVM_MAX_SLOT="${LLVM_VALID_SLOTS[0]}"
+
+# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
+# (-) usedep needed because we may build with older llvm without that target
+LLVM_DEPEND="|| ( "
+for _s in ${LLVM_VALID_SLOTS[@]}; do
+	LLVM_DEPEND+=" ( "
+	for _x in ${ALL_LLVM_TARGETS[@]}; do
+		LLVM_DEPEND+="
+			${_x}? ( sys-devel/llvm:${_s}[${_x}(-)] )"
+	done
+	LLVM_DEPEND+=" )"
+done
+unset _s _x
+LLVM_DEPEND+=" )
+	<sys-devel/llvm-$(( LLVM_MAX_SLOT + 1 )):=
+	wasm? ( sys-devel/lld )
+"
+
+# to bootstrap we need at least exactly previous version, or same.
+# most of the time previous versions fail to bootstrap with newer
+# for example 1.47.x, requires at least 1.46.x, 1.47.x is ok,
+# but it fails to bootstrap with 1.48.x
+# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.txt
+RUST_DEP_PREV="$(ver_cut 1).$(($(ver_cut 2) - 1))*"
+RUST_DEP_CURR="$(ver_cut 1).$(ver_cut 2)*"
+BOOTSTRAP_DEPEND="||
+	(
+		=dev-lang/rust-"${RUST_DEP_PREV}"
+		=dev-lang/rust-bin-"${RUST_DEP_PREV}"
+		=dev-lang/rust-"${RUST_DEP_CURR}"
+		=dev-lang/rust-bin-"${RUST_DEP_CURR}"
+	)
+"
+
+BDEPEND="${PYTHON_DEPS}
+	app-eselect/eselect-rust
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
+	!system-llvm? (
+		>=dev-util/cmake-3.13.4
+		dev-util/ninja
+	)
+	test? ( sys-devel/gdb )
+	verify-sig? ( app-crypt/openpgp-keys-rust )
+"
+
+DEPEND="
+	>=app-arch/xz-utils-5.2
+	net-misc/curl:=[http2,ssl]
+	sys-libs/zlib:=
+	dev-libs/openssl:0=
+	elibc_musl? ( sys-libs/libunwind:= )
+	system-llvm? ( ${LLVM_DEPEND} )
+"
+
+# we need to block older versions due to layout changes.
+RDEPEND="${DEPEND}
+	app-eselect/eselect-rust
+	!<dev-lang/rust-1.47.0-r1
+	!<dev-lang/rust-bin-1.47.0-r1
+"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+	miri? ( nightly )
+	parallel-compiler? ( nightly )
+	test? ( ${ALL_LLVM_TARGETS[*]} )
+	wasm? ( llvm_targets_WebAssembly )
+	x86? ( cpu_flags_x86_sse2 )
+"
+
+# we don't use cmake.eclass, but can get a warnings
+CMAKE_WARN_UNUSED_CLI=no
+
+QA_FLAGS_IGNORED="
+	usr/lib/${PN}/${PV}/bin/.*
+	usr/lib/${PN}/${PV}/libexec/.*
+	usr/lib/${PN}/${PV}/lib/lib.*.so
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/bin/.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_SONAME="
+	usr/lib/${PN}/${PV}/lib/lib.*.so.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+# causes double bootstrap
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
+
+PATCHES=(
+	"${FILESDIR}"/1.47.0-ignore-broken-and-non-applicable-tests.patch
+	"${FILESDIR}"/1.49.0-gentoo-musl-target-specs.patch
+	"${FILESDIR}"/1.53.0-rustversion-1.0.5.patch # https://github.com/rust-lang/rust/pull/86425
+)
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "${1}" true false
+}
+
+bootstrap_rust_version_check() {
+	# never call from pkg_pretend. eselect-rust may be not installed yet.
+	[[ ${MERGE_TYPE} == binary ]] && return
+	local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
+	local rustc_toonew="$(ver_cut 1).$(($(ver_cut 2) + 1))"
+	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
+	rustc_version=${rustc_version[0]#rust-bin-}
+	rustc_version=${rustc_version#rust-}
+
+	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
+
+	if ver_test "${rustc_version}" -lt "${rustc_wanted}" ; then
+		eerror "Rust >=${rustc_wanted} is required"
+		eerror "please run 'eselect rust' and set correct rust version"
+		die "selected rust version is too old"
+	elif ver_test "${rustc_version}" -ge "${rustc_toonew}" ; then
+		eerror "Rust <${rustc_toonew} is required"
+		eerror "please run 'eselect rust' and set correct rust version"
+		die "selected rust version is too new"
+	else
+		einfo "Using rust ${rustc_version} to build"
+	fi
+}
+
+pre_build_checks() {
+	local M=4096
+	# multiply requirements by 1.5 if we are doing x86-multilib
+	if use amd64; then
+		M=$(( $(usex abi_x86_32 15 10) * ${M} / 10 ))
+	fi
+	M=$(( $(usex clippy 128 0) + ${M} ))
+	M=$(( $(usex miri 128 0) + ${M} ))
+	M=$(( $(usex rls 512 0) + ${M} ))
+	M=$(( $(usex rustfmt 256 0) + ${M} ))
+	# add 2G if we compile llvm and 256M per llvm_target
+	if ! use system-llvm; then
+		M=$(( 2048 + ${M} ))
+		local ltarget
+		for ltarget in ${ALL_LLVM_TARGETS[@]}; do
+			M=$(( $(usex ${ltarget} 256 0) + ${M} ))
+		done
+	fi
+	M=$(( $(usex wasm 256 0) + ${M} ))
+	M=$(( $(usex debug 2 1) * ${M} ))
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		M=$(( 15 * ${M} / 10 ))
+	fi
+	eshopts_pop
+	M=$(( $(usex system-bootstrap 0 1024) + ${M} ))
+	M=$(( $(usex doc 256 0) + ${M} ))
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+llvm_check_deps() {
+	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+	python-any-r1_pkg_setup
+
+	export LIBGIT2_NO_PKG_CONFIG=1 #749381
+
+	use system-bootstrap && bootstrap_rust_version_check
+
+	if use system-llvm; then
+		llvm_pkg_setup
+
+		local llvm_config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+		export LLVM_LINK_SHARED=1
+		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
+	fi
+}
+
+src_prepare() {
+	if ! use system-bootstrap; then
+		local rust_stage0_root="${WORKDIR}"/rust-stage0
+		local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
+
+		"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
+			--without=rust-docs --destdir="${rust_stage0_root}" --prefix=/ || die
+	fi
+
+	default
+}
+
+src_configure() {
+	local rust_target="" rust_targets="" arch_cflags
+
+	# Collect rust target names to compile standard libs for all ABIs.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
+	done
+	if use wasm; then
+		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
+		if use system-llvm; then
+			# un-hardcode rust-lld linker for this target
+			# https://bugs.gentoo.org/715348
+			sed -i '/linker:/ s/rust-lld/wasm-ld/' compiler/rustc_target/src/spec/wasm_base.rs || die
+		fi
+	fi
+	rust_targets="${rust_targets#,}"
+
+	local tools="\"cargo\","
+	if use clippy; then
+		tools="\"clippy\",$tools"
+	fi
+	if use miri; then
+		tools="\"miri\",$tools"
+	fi
+	if use rls; then
+		tools="\"rls\",\"analysis\",\"src\",$tools"
+	fi
+	if use rustfmt; then
+		tools="\"rustfmt\",$tools"
+	fi
+
+	local rust_stage0_root
+	if use system-bootstrap; then
+		local printsysroot
+		printsysroot="$(rustc --print sysroot || die "Can't determine rust's sysroot")"
+		rust_stage0_root="${printsysroot}"
+	else
+		rust_stage0_root="${WORKDIR}"/rust-stage0
+	fi
+	# in case of prefix it will be already prefixed, as --print sysroot returns full path
+	[[ -d ${rust_stage0_root} ]] || die "${rust_stage0_root} is not a directory"
+
+	rust_target="$(rust_abi)"
+
+	cat <<- _EOF_ > "${S}"/config.toml
+		changelog-seen = 2
+		[llvm]
+		download-ci-llvm = false
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		ninja = true
+		targets = "${LLVM_TARGETS// /;}"
+		experimental-targets = ""
+		link-shared = $(toml_usex system-llvm)
+		[build]
+		build-stage = 2
+		test-stage = 2
+		doc-stage = 2
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = [${rust_targets}]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		rustfmt = "${rust_stage0_root}/bin/rustfmt"
+		docs = $(toml_usex doc)
+		compiler-docs = false
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = true
+		tools = [${tools}]
+		verbose = 2
+		sanitizers = false
+		profiler = false
+		cargo-native-static = false
+		[install]
+		prefix = "${EPREFIX}/usr/lib/${PN}/${PV}"
+		sysconfdir = "etc"
+		docdir = "share/doc/rust"
+		bindir = "bin"
+		libdir = "lib"
+		mandir = "share/man"
+		[rust]
+		# https://github.com/rust-lang/rust/issues/54872
+		codegen-units-std = 1
+		optimize = true
+		debug = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		debug-assertions-std = $(toml_usex debug)
+		debuginfo-level = $(usex debug 2 0)
+		debuginfo-level-rustc = $(usex debug 2 0)
+		debuginfo-level-std = $(usex debug 2 0)
+		debuginfo-level-tools = $(usex debug 2 0)
+		debuginfo-level-tests = 0
+		backtrace = true
+		incremental = false
+		default-linker = "$(tc-getCC)"
+		parallel-compiler = $(toml_usex parallel-compiler)
+		channel = "$(usex nightly nightly stable)"
+		description = "gentoo"
+		rpath = false
+		verbose-tests = true
+		optimize-tests = $(toml_usex !debug)
+		codegen-tests = true
+		dist-src = false
+		remap-debuginfo = true
+		lld = $(usex system-llvm false $(toml_usex wasm))
+		# only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it
+		# https://github.com/rust-lang/rust/issues/74976
+		# https://github.com/rust-lang/rust/issues/76526
+		deny-warnings = $(usex wasm $(usex doc false true) true)
+		backtrace-on-ice = true
+		jemalloc = false
+		[dist]
+		src-tarball = false
+		compression-formats = ["gz"]
+	_EOF_
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		cat <<- _EOF_ >> "${S}"/config.env
+			CFLAGS_${rust_target}=${arch_cflags}
+		_EOF_
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${rust_target}]
+			cc = "$(tc-getBUILD_CC)"
+			cxx = "$(tc-getBUILD_CXX)"
+			linker = "$(tc-getCC)"
+			ar = "$(tc-getAR)"
+		_EOF_
+		# librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
+		if use elibc_musl; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				crt-static = false
+			_EOF_
+		fi
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			_EOF_
+		fi
+	done
+	if use wasm; then
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "$(usex system-llvm lld rust-lld)"
+		_EOF_
+	fi
+
+	if [[ -n ${I_KNOW_WHAT_I_AM_DOING_CROSS} ]]; then # whitespace intentionally shifted below
+	# experimental cross support
+	# discussion: https://bugs.gentoo.org/679878
+	# TODO: c*flags, clang, system-llvm, cargo.eclass target support
+	# it would be much better if we could split out stdlib
+	# complilation to separate ebuild and abuse CATEGORY to
+	# just install to /usr/lib/rustlib/<target>
+
+	# extra targets defined as a bash array
+	# spec format:  <LLVM target>:<rust-target>:<CTARGET>
+	# best place would be /etc/portage/env/dev-lang/rust
+	# Example:
+	# RUST_CROSS_TARGETS=(
+	#	"AArch64:aarch64-unknown-linux-gnu:aarch64-unknown-linux-gnu"
+	# )
+	# no extra hand holding is done, no target transformations, all
+	# values are passed as-is with just basic checks, so it's up to user to supply correct values
+	# valid rust targets can be obtained with
+	# 	rustc --print target-list
+	# matching cross toolchain has to be installed
+	# matching LLVM_TARGET has to be enabled for both rust and llvm (if using system one)
+	# only gcc toolchains installed with crossdev are checked for now.
+
+	# BUG: we can't pass host flags to cross compiler, so just filter for now
+	# BUG: this should be more fine-grained.
+	filter-flags '-mcpu=*' '-march=*' '-mtune=*'
+
+	local cross_target_spec
+	for cross_target_spec in "${RUST_CROSS_TARGETS[@]}";do
+		# extracts first element form <LLVM target>:<rust-target>:<CTARGET>
+		local cross_llvm_target="${cross_target_spec%%:*}"
+		# extracts toolchain triples, <rust-target>:<CTARGET>
+		local cross_triples="${cross_target_spec#*:}"
+		# extracts first element after before : separator
+		local cross_rust_target="${cross_triples%%:*}"
+		# extracts last element after : separator
+		local cross_toolchain="${cross_triples##*:}"
+		use llvm_targets_${cross_llvm_target} || die "need llvm_targets_${cross_llvm_target} target enabled"
+		command -v ${cross_toolchain}-gcc > /dev/null 2>&1 || die "need ${cross_toolchain} cross toolchain"
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${cross_rust_target}]
+			cc = "${cross_toolchain}-gcc"
+			cxx = "${cross_toolchain}-g++"
+			linker = "${cross_toolchain}-gcc"
+			ar = "${cross_toolchain}-ar"
+		_EOF_
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			_EOF_
+		fi
+		if [[ "${cross_toolchain}" == *-musl* ]]; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				musl-root = "$(${cross_toolchain}-gcc -print-sysroot)/usr"
+			_EOF_
+		fi
+
+		# append cross target to "normal" target list
+		# example 'target = ["powerpc64le-unknown-linux-gnu"]'
+		# becomes 'target = ["powerpc64le-unknown-linux-gnu","aarch64-unknown-linux-gnu"]'
+
+		rust_targets="${rust_targets},\"${cross_rust_target}\""
+		sed -i "/^target = \[/ s#\[.*\]#\[${rust_targets}\]#" config.toml || die
+
+		ewarn
+		ewarn "Enabled ${cross_rust_target} rust target"
+		ewarn "Using ${cross_toolchain} cross toolchain"
+		ewarn
+		if ! has_version -b 'sys-devel/binutils[multitarget]' ; then
+			ewarn "'sys-devel/binutils[multitarget]' is not installed"
+			ewarn "'strip' will be unable to strip cross libraries"
+			ewarn "cross targets will be installed with full debug information"
+			ewarn "enable 'multitarget' USE flag for binutils to be able to strip object files"
+			ewarn
+			ewarn "Alternatively llvm-strip can be used, it supports stripping any target"
+			ewarn "define STRIP=\"llvm-strip\" to use it (experimental)"
+			ewarn
+		fi
+	done
+	fi # I_KNOW_WHAT_I_AM_DOING_CROSS
+
+	einfo "Rust configured with the following flags:"
+	echo
+	echo RUSTFLAGS="${RUSTFLAGS:-}"
+	echo RUSTFLAGS_BOOTSTRAP="${RUSTFLAGS_BOOTSTRAP:-}"
+	echo RUSTFLAGS_NOT_BOOTSTRAP="${RUSTFLAGS_NOT_BOOTSTRAP:-}"
+	env | grep "CARGO_TARGET_.*_RUSTFLAGS="
+	cat "${S}"/config.env || die
+	echo
+	einfo "config.toml contents:"
+	cat "${S}"/config.toml || die
+	echo
+}
+
+src_compile() {
+	# we need \n IFS to have config.env with spaces loaded properly. #734018
+	(
+	IFS=$'\n'
+	env $(cat "${S}"/config.env) RUST_BACKTRACE=1\
+		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+	)
+}
+
+src_test() {
+	# https://rustc-dev-guide.rust-lang.org/tests/intro.html
+
+	# those are basic and codegen tests.
+	local tests=(
+		codegen
+		codegen-units
+		compile-fail
+		incremental
+		mir-opt
+		pretty
+		run-make
+	)
+
+	# fails if llvm is not built with ALL targets.
+	# and known to fail with system llvm sometimes.
+	use system-llvm || tests+=( assembly )
+
+	# fragile/expensive/less important tests
+	# or tests that require extra builds
+	# TODO: instead of skipping, just make some nonfatal.
+	if [[ ${ERUST_RUN_EXTRA_TESTS:-no} != no ]]; then
+		tests+=(
+			rustdoc
+			rustdoc-js
+			rustdoc-js-std
+			rustdoc-ui
+			run-make-fulldeps
+			ui
+			ui-fulldeps
+		)
+	fi
+
+	local i failed=()
+	einfo "rust_src_test: enabled tests ${tests[@]/#/src/test/}"
+	for i in "${tests[@]}"; do
+		local t="src/test/${i}"
+		einfo "rust_src_test: running ${t}"
+		if ! (
+				IFS=$'\n'
+				env $(cat "${S}"/config.env) RUST_BACKTRACE=1 \
+				"${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \
+				-j$(makeopts_jobs) --no-doc --no-fail-fast "${t}"
+			)
+		then
+				failed+=( "${t}" )
+				eerror "rust_src_test: ${t} failed"
+		fi
+	done
+
+	if [[ ${#failed[@]} -ne 0 ]]; then
+		eerror "rust_src_test: failure summary: ${failed[@]}"
+		die "aborting due to test failures"
+	fi
+}
+
+src_install() {
+	(
+	IFS=$'\n'
+	env $(cat "${S}"/config.env) DESTDIR="${D}" \
+		"${EPYTHON}" ./x.py install	-vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+	)
+
+	# bug #689562, #689160
+	rm -v "${ED}/usr/lib/${PN}/${PV}/etc/bash_completion.d/cargo" || die
+	rmdir -v "${ED}/usr/lib/${PN}/${PV}"/etc{/bash_completion.d,} || die
+	newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use miri && symlinks+=( miri cargo-miri )
+	use rls && symlinks+=( rls )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+
+	einfo "installing eselect-rust symlinks and paths: ${symlinks[@]}"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /usr/lib/rust/<ver>/bin/rustc-<ver>
+		# need to fix eselect-rust to remove this hack.
+		local ver_i="${i}-${PV}"
+		if [[ -f "${ED}/usr/lib/${PN}/${PV}/bin/${i}" ]]; then
+			einfo "Installing ${i} symlink"
+			ln -v "${ED}/usr/lib/${PN}/${PV}/bin/${i}" "${ED}/usr/lib/${PN}/${PV}/bin/${ver_i}" || die
+		else
+			ewarn "${i} symlink requested, but source file not found"
+			ewarn "please report this"
+		fi
+		dosym "../lib/${PN}/${PV}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "${PV}/lib" "/usr/lib/${PN}/lib-${PV}"
+	dosym "${PV}/libexec" "/usr/lib/${PN}/libexec-${PV}"
+	dosym "${PV}/share/man" "/usr/lib/${PN}/man-${PV}"
+	dosym "rust/${PV}/lib/rustlib" "/usr/lib/rustlib-${PV}"
+	dosym "../../lib/${PN}/${PV}/share/doc/rust" "/usr/share/doc/${P}"
+
+	newenvd - "50${P}" <<-_EOF_
+		LDPATH="${EPREFIX}/usr/lib/rust/lib"
+		MANPATH="${EPREFIX}/usr/lib/rust/man"
+		$(use amd64 && usex elibc_musl 'CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+		$(use arm64 && usex elibc_musl 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+	_EOF_
+
+	rm -rf "${ED}/usr/lib/${PN}/${PV}"/*.old || die
+	rm -rf "${ED}/usr/lib/${PN}/${PV}/doc"/*.old || die
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+		/usr/bin/cargo
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-gdbgui
+		/usr/bin/rust-lldb
+		/usr/lib/rustlib
+		/usr/lib/rust/lib
+		/usr/lib/rust/libexec
+		/usr/lib/rust/man
+		/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use miri; then
+		echo /usr/bin/miri >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-miri >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+		echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	if has_version sys-devel/gdb || has_version dev-util/lldb; then
+		elog "Rust installs a helper script for calling GDB and LLDB,"
+		elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+	fi
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index bb0ee48fed87..53d805b0ce47 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -27,5 +27,5 @@ EBUILD spidermonkey-60.5.2_p0-r5.ebuild 4243 BLAKE2B 241ddff023bd60a1541a9e1681c
 EBUILD spidermonkey-68.12.0.ebuild 7310 BLAKE2B 78473b652614a2cd4001c40ff981555358043d9cce58bedde8670e76b1c03d3aaa11da156fc17d20200a2e1e08075d88c6cfca57e5f41f5aed758e6d4a0199b1 SHA512 7a792dd7c6976a56f685eadfc4929ea26045ba4c464aac61b9dcb4e9545306e14e0a8abb3aecdea516611ab2bfbf9c7b0a0b273c89bf58b3d0a24f0ffcee43a6
 EBUILD spidermonkey-78.10.1.ebuild 13020 BLAKE2B 1df644878ca6ced6f09412392dcf44a09226e8d7d436c5ead8e94d332d931aa3dd734565ca2e4c670871cf04c755b3b271640db34bbbcfdeb334187adb0d9e6f SHA512 c95d1e675d3c7822b5df2373c45e5535ea6ab7b0141a855c9a3d593edd9544de4faf975dbdc9bab276b5cdef8d96a736781aa24ac84574414eb08f66d9fab059
 EBUILD spidermonkey-78.11.0.ebuild 13023 BLAKE2B 5c6ac236be68d84fa31d433f425f3298ca114abd206312da92098284478a4e8f40b8358b8298cd3e7f340fb3ce7cc6e7c5609da87a3f2b7f123b2c09a0ac0779 SHA512 7f55e7770c7e3e7bb6ebb7bccf432934e0cdd585b04ed7d0612ddf667eda0bed8c6102dc7d687c9afc5b44cb693c51989766e1c42523e6372471b0001b9719f1
-EBUILD spidermonkey-78.12.0.ebuild 13025 BLAKE2B 6f01d125931f1129e729bdff3d0b30a335aeda470e4d9aca4673b7dea0f6a60d8b7b5c91355a5c3e876c1b7c80be4564417686b2fa9c40c87f520cba596c530f SHA512 69d88341223373d771c38513369bf25d4b017824490d6151a7cb62354c52a80ebd00cfac01a74b60a661e96b167ec550a1dc20f56bb2c09a985abb2b83e71f84
+EBUILD spidermonkey-78.12.0.ebuild 13022 BLAKE2B b52916c8c685c7951dc79268175b2c4820734a60c86f5ff358e2cca327f61a04829de14dd7bb8b08ebc7f47ad3353279f7afe12b86c23f43bac0ee2be2730125 SHA512 f7754f821b9806f012def9890a975651f317436a5510efdd46dc32d0b1c87331c8554b4333165ea878ba4e2dabf729c17d485a2152791cc5a864b75ccda46bee
 MISC metadata.xml 868 BLAKE2B ee529f60bc83af6c54188ab4db2a1e05cbc3fcebf7732580cb5e507afada8560cb8812d4f155ae94c2ec87724bdfafe7312de86b47a95f599655695836c9b806 SHA512 caf3c383cd8109391cbf81baf5e942630bfd84ca6bc2a78430e58e5b0a40428e08b8a3d7c9fadccebaf94fe1aa673df837246fc32d5932b7f60dd43431ee1575
diff --git a/dev-lang/spidermonkey/spidermonkey-78.12.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.12.0.ebuild
index e724b716fe1e..6f88977f5643 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.12.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.12.0.ebuild
@@ -60,7 +60,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
 HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc64 ~riscv ~s390 x86"
 
 SLOT="78"
 LICENSE="MPL-2.0"
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index 0d5cd811e07c..45a36ecd7cee 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -1,7 +1,7 @@
 DIST XSB-4-0-0.tar.gz 15340635 BLAKE2B 4832185a64c6c5786ae78e111c25cd3a5ffc2f80aec9c0c83f030ead482868c77b0d7abbfdf0d113b56fea395eb7e69ca2970a82ea70004fb78c0bf4de258a9d SHA512 fed1e0db4874db2508e0c1e716be20cbfbc4f7ed4c16e0b220750cfb3dfceb78bbdce0f8564b68c400af1bc2b8f9e3b35014e8849bba1705bddfab824f41e816
 DIST XSB38.tar.gz 13830570 BLAKE2B 60a6ab38435348d09e2d08bc65ca62c06b38495b72f40a6f3f10fe8d23949bfed0c580c9be0c8304d8a88a53b227bb695870b558d67f33a47543de6c1529180f SHA512 457c691450afcf3ed4e2fffc28deaef0949ef4bbf6fd69b504acc6507fbb144f2c6e427a25da2b6346b15b82e803c02d1b6962af698d16c1fcb9a3d56160ea30
 DIST xsb-3.8.0-gentoo-patchset-5.tar.gz 7748 BLAKE2B 291beb7a2bf567708119eb200e06fd0d6ac976b5eaea9646d9b5fe9fe67908e01f48b1e55e36fc98f7fe75ee4b654422bc0f9c565e00ac75fe36cccd0439bc2b SHA512 cd3762545bb0b0c5532607741f5946658cacf062c21913c8261988a2162ab848d860ae5a0d11d7a4b8b36994f7fbc91c6e6b4fa607e8cc6ebed434dbf421dec1
-DIST xsb-4.0.0-gentoo-patchset-2.tar.gz 10410 BLAKE2B 672d5fcc24726fb90714adc80a8346101a9f42845cdcb3e5ceba75da1bcd5219f5073d91fadb0e1e01917267f1039970a9a3f340d63e6ce0580b9342bb7ae252 SHA512 5ceea28d746f2e7ccb23768fb6e9fe0e5c89f7c62d1da2964f376f6fe8999e06af69b4c4621ca555e6c553f23bd41b5a7d971e7f6f2d6d4fdd023f874f5e6c1a
+DIST xsb-4.0.0-gentoo-patchset-3.tar.gz 10487 BLAKE2B 37253b8e5bfd36cdf51f231e75215ea31d50f121e3c8b1126adfbc8998622f2a4ebdb976b3c67c13738095fd4b23b35e166a895c4ee038b1cae7ad962684ce86 SHA512 51738e5dd64711f42e5c8d831c955c533dbe900a129cc0e7eb5d393ef13d7b6206e5e9fc0e90b1422adb2d8c00ec870a50164d420a02da23770ba0ad3350b10b
 EBUILD xsb-3.8.0.ebuild 3684 BLAKE2B f3cb8e31a72ba410cbd38ca3da137097bca0fa5bce2799d47b848a12c32dbd4918cbdc440df570833ff377b85c565ff8417d7d244a7421989508df4ae2c837a3 SHA512 bec9a89c10256988a9ab42ebd75ee25fab4acf0eb3cf08614e6644e6dee8c49e3d95c77095fcd31fbd017b3c53a337d30efa418a4129570b8d2c2268704d8250
-EBUILD xsb-4.0.0.ebuild 4170 BLAKE2B 6d578ba65326734ade716f0eee25cbb3f8ccf7399dd7eded1414985caacd2be7e23af2984bcd493795d0f88dffb4c081d38eeddfb9ec97605a6e291a1ec02865 SHA512 62d63b36ce69b6c5144ac9a6a5f38f8af4286f6b4ee84d9580c2def8aea987883067c5e07838de55737124de800e3920b09e0a4dc14d529f87010958dbd04171
+EBUILD xsb-4.0.0.ebuild 4170 BLAKE2B 991b6470ab79637940d0d59d2702f259e890b09dad6dbe95020efb1f915bca1f89ff38482d2d40c062d84910bfd708220eec2b83fa2eddc1e143ec1c3c51e166 SHA512 e8e88687b0996f7ad0ded7ed2e141cb115ba0168b9dcf3b1a922e3df9e2635c438becf6be90c6b57930642a2b397a3fe1537236e2930064384f87ed2120fe7fe
 MISC metadata.xml 406 BLAKE2B 6fe5156e6490f7b53a7fdea57bf5d07d3122be79d0a24bb462b6bdc46bd5206a195526c46bfc7311822988e82df46aa9a328cb2eee289d786120b160800c3dbc SHA512 d5d676b6f4d39acfcc17ac2e3601608566e92ac0cfdc071a1606acd7eafa73024d57a07ef7dc009c2e373825552f659befc84c975502f832e588379748ee287b
diff --git a/dev-lang/xsb/xsb-4.0.0.ebuild b/dev-lang/xsb/xsb-4.0.0.ebuild
index 888bae91f99e..e33f657a813c 100644
--- a/dev-lang/xsb/xsb-4.0.0.ebuild
+++ b/dev-lang/xsb/xsb-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PATCHSET_VER="2"
+PATCHSET_VER="3"
 
 inherit autotools java-pkg-opt-2
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6ba7a259952b..f1255cc348c4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 0b07a6c4b3bf..af81bedde655 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,3 +1,3 @@
 DIST appstream-glib-0.7.18.tar.xz 2309276 BLAKE2B 67f414ae45866cab314ed2b307f2045a2035c262810696246f5bdea2a0bac88d98b561f72a8e87608f90407ad6d577d720213461ecef09d277e919b5330c0bc2 SHA512 2a202eb25d823d524128a8ab164025b6579e069f8b62373cf5447d049a0e3764fca5bf1464296101a45870d1426b094493fc8ead07a6a4bcb514c0f1a91e8ff2
-EBUILD appstream-glib-0.7.18.ebuild 1640 BLAKE2B 101fca7e60896763113d9b7e3362be8d335876ea146b86b200a82cd8948c106090f2ccba69d1252b59c31fefea4294fd547eafc2b0c12c08358ae69a67b7b589 SHA512 01cbf464ca6bdb013671e1abd93e282777636f790999d7cbc9f2f0779b9288ace8b1b2a28ab844e18705d98cc1f22307612ff107692fedb8d022edd09a03b89c
+EBUILD appstream-glib-0.7.18.ebuild 1647 BLAKE2B f00ec568de43f2cc3f886f5615344a0fe4ed833a515ba94980aaa56a4abeb6c2664e904afc23cec08a8da4243e905879e47d6856cb4de800e173774548226e5a SHA512 b61bd81d7532f32c1c3498678b86800459a6609105edbb0af3975d80e94e923a7402e9319674c288ca1a6019bc5cf6bc43c08c257ba18eb7ea37033fab34ca11
 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 b92481c75413..448126df5f48 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 ~riscv ~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 248dfac132d1..e43f5c3d96df 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -2,5 +2,5 @@ AUX appstream-0.14.3-disable-Werror-flags.patch 449 BLAKE2B e6513b3c64b5f99afe8a
 DIST AppStream-0.14.3.tar.xz 2277536 BLAKE2B 99ceae6873c189b289143c8ab59eaacfbadbbe7cf05db96079c00ba09c82aeac63f4436e1b9e54b8d172aa7e9f609583cf2a78d3f44ce880cb1a326034432563 SHA512 b4c41b44375091636cc46e2f7f5e0b86612474faa6d55010caee78cb9c9ac468d093cf261184d900be7aae8513dc72d2821ff9ee17786e123c86a928ce5e9135
 DIST AppStream-0.14.4.tar.xz 2309444 BLAKE2B 0c1fd20a01d0fe59d1b1ff029e4fbddbf9cea833d4665549480744e48dc0b3615b0d507278c75025c99ccda21b97e25e62496ecfc49dbe6527132f5dad5d6ad5 SHA512 86bd98e94f3e730d37030be31c6ea0000ba12b35e13778458c0f50bad75babf8c8e93b62492a2546a42f750f91ae81f3456d04e63ad9a4acb804cf38493440a4
 EBUILD appstream-0.14.3.ebuild 1771 BLAKE2B e54b4904abf50fc210cd18a1462b0d1a0d97df38f81bf94f86a55dccc3ee32b3a0dadde3e5919ec5edea7fd1c4a03f6d0f4da6ff7f3ebd55fb8c3b9db47a5393 SHA512 28f8bea8d0f6899fef3458202bf80d72c9b9425d6f0965b025d3b4cb7635853eea9a71924ebf314b612363cdbdc160ed85ec51caa25700a7d06fc79d1604a1ef
-EBUILD appstream-0.14.4.ebuild 1782 BLAKE2B 50a0666552b3ce2623216fc5609062c9d72da7dae4e03cfd3f4f6ed838c6b49e463c150ec99d981038015487e0b7852e99f92c7e13f1c3a20a6606043db2e9b5 SHA512 7ddc34f548cbee2c423e1743b5d6979649cd86d4c5003a265581f112fd2b40317ac4695178540db20c4ab7e96b51f9cc5026cc2f723d16b04ec172a5d9d47de9
+EBUILD appstream-0.14.4.ebuild 1779 BLAKE2B 440c90fc66368a52d0c0d3b6cb1440831480a5e07dd0fff3445b6a02943642c62a7bc53f343f5b3880008294b1d4e45ed4982ab28d39a5565a134fe55c46e574 SHA512 56d772084c032ad07e1d5e7860a354697e1cb9088c4d4c7378dd49890b6c96725060017fc57b72e00c9ee18e02a65ac05d1e853d3142a16064c84a8cb114b79c
 MISC metadata.xml 399 BLAKE2B 98e37c9ee3555d98672fc5341ef9db517e386c0ff141671c2d668ecdfcde0fab1e156bdd78fa865bb68ee602b6596b55a20a8513e7c6fb1bc6e0c2843ac0f683 SHA512 fd61c504d44edeebec961ecb6f480562d848a747ee94a8fb88c48e7d885df8475d5fe33422d081576b44a6b7e05d6f94fd9a73dbc3d19f6ead0076654f7a7019
diff --git a/dev-libs/appstream/appstream-0.14.4.ebuild b/dev-libs/appstream/appstream-0.14.4.ebuild
index ff3c834181fa..90fcd55bc740 100644
--- a/dev-libs/appstream/appstream-0.14.4.ebuild
+++ b/dev-libs/appstream/appstream-0.14.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
 	S="${WORKDIR}/AppStream-${PV}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
diff --git a/dev-libs/editline/Manifest b/dev-libs/editline/Manifest
index 4ecfae006d0e..da56e6ab05ac 100644
--- a/dev-libs/editline/Manifest
+++ b/dev-libs/editline/Manifest
@@ -1,4 +1,4 @@
 AUX editline-1.16.0-rename-man.patch 466 BLAKE2B 0fa3edfe0733d2a72fe2bed1c03dfb0ff3f14cac9b33d6258a19489cb5db3b97b2fed3d6fd9c2fe3b350db102f287ade6006627ec92a3e956309550e3af218a6 SHA512 2226b4312f13d433248d705d6abf6ba77e71bebdf1774af131909139856541bdcac4e7483a8e2e38b3e9f009016bc6b36838519fcf423ba9562020d97dd6cfcf
 DIST editline-1.17.1.tar.xz 252196 BLAKE2B ae25ebc8efcc5ddf7d68553b6a5d93738e4fbf67c556b4089ace7386cb70058f36137d99df2385e324b36a285aa319b49e1c2eb82059d99d511c43c70f55ce11 SHA512 9b3f5f4a833e9e38c4f99d2e7f8d2716d4db74b6a2d3362e6c513505ff17a79044496405458835d508efd79cbe9046f3c1db602aaad210926312c22057145d35
 EBUILD editline-1.17.1.ebuild 780 BLAKE2B a7b816f883c8ba443177b64420a91c9a8a7eb9cc6f55ce6c4c4fd58e64089f2a07d9e0230eeefe6736446216803df9e9c440ce66e47cb3e974e232406d4f7a05 SHA512 08fbcbab0c74ea648886347e93d311040db80d23f1c237dde4c6c5734540e1a429abc2b2d0dda274db875f129a8ef286f72fd3c2a355c1d9f0fdaa51e7d69e1d
-MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/editline/metadata.xml b/dev-libs/editline/metadata.xml
index 2907abeb0c42..7a38bb900964 100644
--- a/dev-libs/editline/metadata.xml
+++ b/dev-libs/editline/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>slyfox@gentoo.org</email>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index dcff4f566d57..16e4b55a1413 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,8 @@
 DIST ell-0.40.tar.xz 524256 BLAKE2B de7326cfc7d00970fdeb5f19e38b9c68e6443544f5a6397aa031a7dcd0d61c77ab72303ad51d36e8fbc2c34c954631636f7f42bae0c40cd75498882ab78e2c85 SHA512 bc721e300e5b689dc51f794019e731eb252ad74dd199bec7685373ffa32ad42950aae9e36cb74d3b6590016c046589acb3ae8c009c4a14bd89331913392e923e
 DIST ell-0.41.tar.xz 525240 BLAKE2B 80614190c1237fdbb867300418d474d50e163fba7ca15f4c74c3019b4d407da8319b67be5a88886894dd8869620bae1338e91d28993077690e93260ed1dc3cf6 SHA512 bfbc18195126196776a0d00b4ae8bd8358a6cd1d2f8221132fdae1f323172f148a3faad84a951774ca38a3a72e8d96512b9cac84d9ef3a6cddf4b1490b34453e
+DIST ell-0.42.tar.xz 527724 BLAKE2B fee51c2a44afcd5e40ee38f8d0e24fefab6c98ff0b58c842169d7957e1aeaa89bdcb2aecbe14b3558820c3226c5884e6512045e3f1b9bfcf2f77c953d9674936 SHA512 a859cf0b6b2e5e91fcd9718bb0ea8073b819c264d914eca8a2c67b27f170a830df1b2256184df03010d836da3a081020ee1a4fac88d39c0794da88824dc39b71
 EBUILD ell-0.40.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
-EBUILD ell-0.41.ebuild 1252 BLAKE2B 44960407ad1f3acf0353ac71482e877b2dc808c1dd7ba51d8c4a62d13147bd9c7d5b83716b0e9cfd03c98cc809b1e167141dcad8d9442f604bfa30521fdbdab8 SHA512 f466638a205153a25239f30ec17a2f8e33a99655383b12a7fc4502c53af674db47ed4342be4c6a116b509f15daeaaed687785e74644205e6872e80926d43cd14
-EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
+EBUILD ell-0.41.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
+EBUILD ell-0.42.ebuild 1168 BLAKE2B 229eaef8e41979c42c2a5b5a233cda5701be588f5dc093eb8b288ef3ad05c9216b065cb8e29bf4adc4d8f702331032f9904f443f139ac72936fe776434f32b59 SHA512 e9719214985628d7e6f752df9a69f4576efb2c0e418f9bf44968c0c23ed81ede0483fe9f5f79bf9ef32a18fbaded57fc3c38c582f02bd2e5cd0dacfda5532028
+EBUILD ell-9999.ebuild 1168 BLAKE2B 229eaef8e41979c42c2a5b5a233cda5701be588f5dc093eb8b288ef3ad05c9216b065cb8e29bf4adc4d8f702331032f9904f443f139ac72936fe776434f32b59 SHA512 e9719214985628d7e6f752df9a69f4576efb2c0e418f9bf44968c0c23ed81ede0483fe9f5f79bf9ef32a18fbaded57fc3c38c582f02bd2e5cd0dacfda5532028
 MISC metadata.xml 336 BLAKE2B 119f1779bc0632481e1053d02f3fc56df9504ad591e057148c5885d595538d5b3d16fe0b76361a2051433f710228b85af866ea0694f695fe0268f8990dd07c15 SHA512 16de07f5cf33c2a9d44817f75a005e035ad51718af1ae4eff6c31519858294dee82286ec5a80ed87b0487c8deb352d1e46f4f53a0ffb06c5a4f9d3f27e704284
diff --git a/dev-libs/ell/ell-0.41.ebuild b/dev-libs/ell/ell-0.41.ebuild
index 7e8413947af3..8d87287e5656 100644
--- a/dev-libs/ell/ell-0.41.ebuild
+++ b/dev-libs/ell/ell-0.41.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.42.ebuild b/dev-libs/ell/ell-0.42.ebuild
new file mode 100644
index 000000000000..8eeecdb51ced
--- /dev/null
+++ b/dev-libs/ell/ell-0.42.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="pie test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="test? ( sys-apps/dbus )"
+
+CONFIG_CHECK="
+	~TIMERFD
+	~EVENTFD
+	~CRYPTO_USER_API
+	~CRYPTO_USER_API_HASH
+	~CRYPTO_MD5
+	~CRYPTO_SHA1
+	~KEY_DH_OPERATIONS
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/ell/ell-9999.ebuild b/dev-libs/ell/ell-9999.ebuild
index 6c1b04339772..8eeecdb51ced 100644
--- a/dev-libs/ell/ell-9999.ebuild
+++ b/dev-libs/ell/ell-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
@@ -17,16 +17,11 @@ fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-IUSE="glib pie test"
+IUSE="pie test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( sys-apps/dbus )
-"
+RDEPEND=""
+DEPEND="test? ( sys-apps/dbus )"
 
 CONFIG_CHECK="
 	~TIMERFD
@@ -46,7 +41,6 @@ src_prepare() {
 multilib_src_configure() {
 	append-cflags "-fsigned-char" #662694
 	local myeconfargs=(
-		$(use_enable glib)
 		$(use_enable pie)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 2f4a48118b1c..eafda0156d41 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,5 +1,5 @@
 DIST fstrm-0.6.0.tar.gz 135214 BLAKE2B 237b371450ea2e92e466aaeab2d6ebf9ba7c6bbf14d1517431818b01a2609c1765299bb576bb3a4a3a99a9ce7644992c3f5eaf82c01d903a1bad358d49ed47b4 SHA512 8e327f40fb49b36998d8bb9353b30b9924630b85adf1e4462ce4b456daa7eea727892a59f43ddd48de5bf5059a450fef54726b09af6d7f210fa182c4055d65f4
 DIST fstrm-0.6.1.tar.gz 135425 BLAKE2B 607852bd6bd18d2dc4e862c7425882274710674da1edb3a525b409f5eff9cb46748f8e5b7b1e88ab180ddfed7a19ee41aaa9551d70331ac80ff178ffa0b4ca98 SHA512 7bf2728e2d0d1fdbd4e93069ddb03a01dc56909dbac57650ed530c80f761170b257c7191a3d789d4661df1f09c15594f20ec93a4eb5e5deb7ea3a7eabe56806c
 EBUILD fstrm-0.6.0.ebuild 822 BLAKE2B 396271d57a86f3b2fd7352f33b3d481015406002790b3d62e7c069658cb382dd4f6a4c7ea47ee96941d894f8079dcf2c6a25895b15b4ed6c3279475e6e3f5a18 SHA512 5b50e0acf16f422e8b135cff76fce107397e48fce40ebb78a06b7a1fdbd3d641359ad6b1bd41b0c28ec3fb04ad8c926d790eae39d90e18ec119fa1a1d4b15107
-EBUILD fstrm-0.6.1.ebuild 795 BLAKE2B 625b19f47fec6e8730d8814c3b0f0fbc9ef894f9700bbcd869c7099b67bd58d927324e88a0b33be73019ea0dd80302ec7c5a3b536c82eef8ff0e59d3f59397af SHA512 98a7430e1c826b32a930c50ad84d1c65b8ff3f0c6102dc8f2ff389264fbcd795c5291ca3bb70512a8d8640010935242f2f6220d64ddd1952bba7eeea5f28293d
+EBUILD fstrm-0.6.1.ebuild 794 BLAKE2B d06fb048667e139024e4d564a5b13958d1673162c59a20f8c3ad16cce537733db3c0292cd98bae1ed99b649f06b742aae103a58efde40d48ccef8bde414f82a3 SHA512 83beadd40456ddf8a33f2b8ce0ef8412ff0d3dbb54e742fe7bc790c1cf2b68ea1efd3545b9390e065db9442f3ce181c97d663b9dbff318f1851644ccbc6a8c3f
 MISC metadata.xml 321 BLAKE2B 4513b4f120d44149f4419f74664e9f345f365c4f6f3938f9c751021ce00a2bee3c1f655b2c47113eded5f743dbc8c8968f7e3fba76ff71189e4026777700724a SHA512 a2bd9cbe2b311f26fa6bb62aa783fa8577f0e07d6e284370c787386e08b6aaf98d4f5bf655f69283d864b0e7a7fe847c75142ac67ff12dd93596f9ddddcbb065
diff --git a/dev-libs/fstrm/fstrm-0.6.1.ebuild b/dev-libs/fstrm/fstrm-0.6.1.ebuild
index 310b233a8521..44bb45ead798 100644
--- a/dev-libs/fstrm/fstrm-0.6.1.ebuild
+++ b/dev-libs/fstrm/fstrm-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/farsightsec/fstrm/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="utils"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 5308fa6b514e..1ebd4fae05da 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,4 +1,4 @@
 DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84
-EBUILD girara-0.3.5.ebuild 957 BLAKE2B 90c9e5fedc9c3c16282fbc18874fa2a9e24dc51a0ba1f2e3a1adf223b75d367304a9862390fabdace5bfb8ac6c499f4a5c75c8e2fe53b2e8577ed8bb4df42ef2 SHA512 34c0367e79967f0fc8d54a701672a3609ae17e74cd5b0ea708e5183292753624bb47881d0c2c409a90112c3f776f9022aa5d95c7f41e1e143927e9330c49a3b9
-EBUILD girara-9999.ebuild 1095 BLAKE2B 698754899258090e0656a5509610de9b1157ce838dfabd7c03ae6163b0082a12fac3ec53efc14214a583e81ded8285fea701c3f41031859f2d95f050f912ff4e SHA512 893ae83c2331343b541c832fbdf281af219ca2ca6172ed7efaf4b558ca1e4f4d0553a29f03d3b405165b4174460bf2d1f876d39a4477437a8ae3cfeb5d45d3c7
+EBUILD girara-0.3.5.ebuild 964 BLAKE2B 51d28f0e2c7655adcaebc3951b12895ec5adeca8d066ef901c236f93f5ee6b1734d3b98f6e2c85bd7b6aa00bbde60915e3fd15f01530365adfae7a4f1f4b18de SHA512 9540e0664f7c4ebfc3f856df9e78bed86dcf98403fbc43a2971635014a1968b63b1ee8257b35ca2eabdc2c989f0afa9dd76433aa94a09bde4ff3e1aee9500c30
+EBUILD girara-9999.ebuild 1102 BLAKE2B 7d305110e6e6c72090a938d9f4c46f39f58a9cdf6cc5eb704b43c683772e069f9888f2bc4ec59e2ab1a8fefb64d0be165db2d8412383b4b3e0a5d78cc7e02192 SHA512 f0f8a6a60d25c2525b2724fb8143f6dfccfc5cb05cae8c1acf350575ddabf80fd4f1066797f9556a839f824a4a87e0c9ebcbbd5a2169e764232eaeb157cab3f4
 MISC metadata.xml 581 BLAKE2B 25933546f3727c17b48e8bde4136825202d34300d2a3049ceba68afeb7f2b88ea5430240fdbf118229751229c06d31aef3cf28c7e13182d008e56161eff133f2 SHA512 2b6f1590cc60c44d13394afb5c3815c227aff680f94510e5202d2b41614b6854effe32d4ade6ab4b2d36595d36fa636520e88ea514078c23ca881e00d3d7797f
diff --git a/dev-libs/girara/girara-0.3.5.ebuild b/dev-libs/girara/girara-0.3.5.ebuild
index b16354a30a1f..67aab558816f 100644
--- a/dev-libs/girara/girara-0.3.5.ebuild
+++ b/dev-libs/girara/girara-0.3.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86"
+	KEYWORDS="amd64 arm ~riscv x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild
index 773853805306..52f9e4952594 100644
--- a/dev-libs/girara/girara-9999.ebuild
+++ b/dev-libs/girara/girara-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
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 26c60214ad08..ca4a72e2ca3a 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,6 +1,7 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
+AUX glib-2.68.3-glibc-2.34-close_range.patch 1102 BLAKE2B 4f3b747288a531d36b85aa648847892e12744c8e18bd71803531397f175dacfc99f22fdb4a3a8c6ad7563673e789aacd431dd7c5c9a300f34868f2047eacad7c SHA512 737941830ec974d0a18fec69ecc2ebdf6144021984c8f8237cf607cd1417b10f2233747ad470fe9fb14b46e2b3c5081a6d5bb1bd8992030653d940ce0cec6b00
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
 DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f
 EBUILD glib-2.68.2-r1.ebuild 10165 BLAKE2B 70156b306a52ff61a7f0c998849d28bd088b118e560029b73d9f163b180f02e45d63d9093d78eee4632ee34fb899900fa480b2bd456754c8855f221ce430d28e SHA512 33b9630d5ef59b88f39c62fb1f23c571b7ddb04f46417099037e89565a04f981b611e7b81c99075b8c6bc2c6571792d1dce25459484d1577ab7444cc18e2c2f2
-EBUILD glib-2.68.3-r1.ebuild 10156 BLAKE2B 8208bd7df122b064999f881986b197f6735adbc471eae69e75215b1ab6fedbea8d648e0985c233a6db0e4c5d9287fe88890aaece7eb5ba464ecb061f37b55ece SHA512 da8538e163209a2d3c19f1b35b9972ce8812d81d7f985bb03f2e7d670945b6e8f40eb8ba3ddedaea523f26259d86ea7b4961ee91b92b45b5d311690e50f70c5a
+EBUILD glib-2.68.3-r1.ebuild 10213 BLAKE2B 3b1abda925929a3ec3e40d002557371eb55d9fcfc5dc78bcc73cf827f5aaf2d73fccd921e27f181012ee7cb8967fd7c8efc613672101b4c6c7e140e9f0a3c31e SHA512 255330126e7e730b1887226b0fe348aa175c380078aae81320f80991081dea2db3515f148d49749afca538c7e583a2097accc194ba3827bb92ab2ca1f788c766
 MISC metadata.xml 1220 BLAKE2B c3ee6985e9ad87e30da951c79a900c6b0284a84b11bde92d4bd345c679e49b084cb1dac7f1ea4b9f1d0d8170a067565f1758ba5fc51c9e613372f0b72643effe SHA512 541b49b565499a9cbe4062a0270b08d60ee9d9cf36ca53d3339f7ae1d406db825b84c193f363181afeaaea7ab6560d7aa0d62ca85d02e5521bd6c12f14a9ba56
diff --git a/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch b/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch
new file mode 100644
index 000000000000..a84ccaaccbb9
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.68.3-glibc-2.34-close_range.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/803632
+https://gitlab.gnome.org/GNOME/glib/-/commit/63e7864d1a0ddbead3c18872e95116e3843e81be.patch
+
+From 6e59d21b273f026e82adc56fecbec67d1ffa72a4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 8 Jul 2021 17:26:43 -0700
+Subject: [PATCH] correctly use 3 parameters for close_range
+
+libc implementation has 3 parameter e.g.
+https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ glib/gspawn.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib/gspawn.c b/glib/gspawn.c
+index 95f5b868e..a15fb1ca1 100644
+--- a/glib/gspawn.c
++++ b/glib/gspawn.c
+@@ -1494,7 +1494,7 @@ safe_closefrom (int lowfd)
+    *
+    * Handle ENOSYS in case it’s supported in libc but not the kernel; if so,
+    * fall back to safe_fdwalk(). */
+-  if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS)
++  if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS)
+ #endif  /* HAVE_CLOSE_RANGE */
+   (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd));
+ #endif
+-- 
+GitLab
+
diff --git a/dev-libs/glib/glib-2.68.3-r1.ebuild b/dev-libs/glib/glib-2.68.3-r1.ebuild
index 4491252a2ced..ff067ae12a16 100644
--- a/dev-libs/glib/glib-2.68.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.68.3-r1.ebuild
@@ -69,6 +69,7 @@ MULTILIB_CHOST_TOOLS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+	"${FILESDIR}"/${PN}-2.68.3-glibc-2.34-close_range.patch
 )
 
 pkg_setup() {
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index eaf4d764bc4c..8e55476b6eb2 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -1,3 +1,3 @@
 DIST libcbor-0.8.0.tar.gz 267044 BLAKE2B e8548e7351984ebdcbeb5f13a7ca35412c3f3f05e2a44a5438d57b90bdcdc51f5265953163106f90ade911a96af665956ebeba7ed1c48cf207acf6d683af5606 SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc
-EBUILD libcbor-0.8.0.ebuild 1412 BLAKE2B 37fa9e5d256c785c8d93ece1151a40c018fc23b9e5b542499a2608416adc4ff83e0f9dfa34b2d326a19028c5931afbe805e3b6d2b191bf365a293ff7cca0659e SHA512 f8e656cff6deed12c074f3d2de804ba5f0aa08b34a49a3e473e1ad0f58a99ed8a42b310919b3af83073f2adb2635aae1e8bea67c44b3986731d1be81e87ee1f4
+EBUILD libcbor-0.8.0.ebuild 1394 BLAKE2B b810459dfade7062ac825a4c739e0d8565b9b2eaba65cda5aa2b179d03566b1b24929ca4b12d4ea56c5087a8c49708d2363f059db2810ce7c563a58c35e76ea8 SHA512 266b00f0b07165120c248b6ff0fe1e8c67a98292e4001f87adcce3fcbf2c2e2c4d514e2c63ab1879af74775a51d0e3ff01bc66400ef8b92e08cc08d398699104
 MISC metadata.xml 353 BLAKE2B ac88c66fa58046797dba48cfe47fc42a3aaf8d8a256fab563def54d126c7ad903bc2d47095ca7221b84f0fd59bcbb6677ffaef9062c9c662ef95b02bf3563b99 SHA512 56f76a4b80d8cf12f854022c2c7353119b11052bf6d454b5d2f6427a02ab64176d2d7ecfadecabafceac6b7aa5ec066145a62831d33f09a829b37cdb8bec64cf
diff --git a/dev-libs/libcbor/libcbor-0.8.0.ebuild b/dev-libs/libcbor/libcbor-0.8.0.ebuild
index b71a5d850fd2..44f2484795e1 100644
--- a/dev-libs/libcbor/libcbor-0.8.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.8.0.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-inherit python-any-r1 cmake-utils
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python3_{8..9} )
+inherit python-any-r1 cmake
 
 DESCRIPTION="CBOR protocol implementation for C and others"
 HOMEPAGE="https://github.com/pjk/libcbor"
@@ -12,7 +13,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+custom-alloc doc test"
 
 BDEPEND="
@@ -28,8 +29,6 @@ BDEPEND="
 
 RESTRICT="!test? ( test )"
 
-CMAKE_MAKEFILE_GENERATOR="emake"
-
 python_check_deps() {
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
 		has_version "dev-python/breathe[${PYTHON_USEDEP}]"
@@ -46,11 +45,11 @@ src_configure() {
 		-DWITH_TESTS=$(usex test 'ON' 'OFF')
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use doc; then
 		pushd doc >/dev/null || die
@@ -60,7 +59,7 @@ src_compile() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use doc; then
 		dodoc -r doc/build/html
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 88b99e997ef3..21e9b903d5b5 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -2,5 +2,5 @@ AUX libfido2-1.7.0-cmakelists.patch 867 BLAKE2B ce559f70b1bc22731b16ddfd30b4a0be
 DIST libfido2-1.7.0.tar.gz 517426 BLAKE2B c7ad55d1402808ad12dc999b0ec67161a5fe82dfeaeed362c35f4183144af9bd2771c1e3318a731db46fd8fc21ccd0737024b72c8dd3c754e34625118817742f SHA512 f40d394883d909e9e3ea3308b32f7ca31a882c709e11b3b143ed5734d16b0c244d4932effe06965d566776b03d152b1fc280e73cdfeeb81b65d8414042af19fe
 DIST libfido2-1.8.0.tar.gz 535947 BLAKE2B 48ca29fc1b582b4c915ce3dac2b3c24b1c71b144681f77f13059a599eb5e38b263442abecacad495e28a6fea63fc98c142a32939bb49a521b6a6a8d4ad0f1ff0 SHA512 dbea52a80068323e9945ef7a6e93ab1438bc4347390fc91694a94669900d4ce4abe95e1b6df90fe8b6b2dde6b5d28d9dc0c6b022c24ccb661f28c30c33417999
 EBUILD libfido2-1.7.0.ebuild 981 BLAKE2B 492d7d3e41da8cf0102d55c9684f476e734101085ae8b3db2ebd440a0d0f7a4e892e45f2ee632f3dd9192a9df8edbd464f2f601a7f7b65129b7bfd0b8e78755a SHA512 b8156159a0a503a94eb5b80f24baeb7ec94f08d5beb8f60ec09e761f280371743447cb9883de4b36bf14900264d620acf843b2640330ed8d15e832dee3d48860
-EBUILD libfido2-1.8.0.ebuild 988 BLAKE2B 7fa3f17d035bb8a6c68c561b8c53b7d414a39e5649250fc7aa1afc3d724930537bfe8516625283b571b79fd08004f1a0c8f16b17f55ae03b060f1ff65c23442b SHA512 9b34b0926ca1210ac1d62e59894b3dfbd25fdf8bdd882a986bb2adf7cdb72ae04d5fc8a07f0d2081d908b095b1f0a9633c1b01a0091a369fd6b7314a21417fcc
+EBUILD libfido2-1.8.0.ebuild 995 BLAKE2B 2dd5f073376ea1bc3f609833f75a6dc57498b4688d5109806ae8e53cd8e1fb23cd66c81360e814809a25d74c90ac5417d3da06cc148b5caa28d549be5bc17c83 SHA512 85321b216f96c6f05bd8be8ef62e72418394f3cef67f1ebb47463102cb2aa2507a57e50cdf97d55284636f2bc4772064ea8ca584cfd5022e8a37d67af8f4f7ef
 MISC metadata.xml 330 BLAKE2B fe16e7735c17510c8a41691a7dd619d9d62c96f58508979936877acf1c261f402e5219decc02dafb97e7b171047b62981c616abdaafe24a3acad1a6893da3725 SHA512 4eb35ebcdd1831a7fbd6e00336dfbcf6e8697ff95e68b68686032b1251fec090c22d3096666ed48833c5b9a8e9afe10bfbddf592834095a3ee9e95f1ec594c52
diff --git a/dev-libs/libfido2/libfido2-1.8.0.ebuild b/dev-libs/libfido2/libfido2-1.8.0.ebuild
index 21c57df89552..2ae10cc42835 100644
--- a/dev-libs/libfido2/libfido2-1.8.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="nfc +static-libs"
 
 DEPEND="
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 50220c043e57..1999b5cd8243 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,3 +1,3 @@
 DIST libgdata-0.18.1.tar.xz 851584 BLAKE2B 860cc42c4d0bdbdd6ca1a1001ec7ea5acc26dd1339052365554123e6524fddce65704a11614c8a081eb3eef10395fb1b4d2dfd3cf942dd1ae3556507af4c7c52 SHA512 15ff708760ca5023b692fd565c26a7c3acf035073534c0cd3f1f90e46ee0c60d14dedf360d3ac146d37135e200d9c2bc4b657e81468d0efde4821a9219875b98
-EBUILD libgdata-0.18.1.ebuild 1736 BLAKE2B 4bd8940b84241e22878f5d0a2c3e10c13515f86eae5dc0abfed83937d14112c3aa9e8df4f30020678368d9d043ad612013120c112d7638009b53860669676d46 SHA512 dac29b6737f18ee4b93bd6fd0eb3eef6fba0ceb62b7cc65f9e9fcb92b22fbac31daa0fcbc02b084a0bf5e5e38e7030da547e5e4cbeb6b57dd3667fd8e4224bc2
+EBUILD libgdata-0.18.1.ebuild 1743 BLAKE2B 695ed776e9ffcce2f51ed6895d5237b933790245c5fe07ff80437aacefa2290750c2440c812b1767052c149db41db367a1356daa16dddbf638a60e6d99b90761 SHA512 c7b1b2ba9c5383f8c5f8c28f0cd7b95ff47bb7ca2394189abe1cd759795ed2aa02addbf1169f479c6c6727cf4621b8990830b6d6304d89cddc0de079caff5219
 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/libgdata-0.18.1.ebuild b/dev-libs/libgdata/libgdata-0.18.1.ebuild
index 7e95bbe440a6..22e2fce4c0a4 100644
--- a/dev-libs/libgdata/libgdata-0.18.1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.18.1.ebuild
@@ -16,7 +16,7 @@ IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest
index 4c293acf37b7..16acee295722 100644
--- a/dev-libs/libgnt/Manifest
+++ b/dev-libs/libgnt/Manifest
@@ -1,9 +1,7 @@
 AUX libgnt-2.14.0-optional_docs.patch 369 BLAKE2B 445d0c6a1632c3368f72777919ba2096aa1b16804dd141f87d8c7b8ac3350fc8354bc53423e3ca9a677a8de0c2f8710023561f4e230ce74793fc66ea899829f5 SHA512 83f1640729653bc9cee49f667f79e472727d4ba7c3d6fad3ebccc6fe412fe0a43b868582bbe2de8bcca611661cca8ba135330c1c919ea7622135ed7488b524be
 AUX libgnt-2.14.0-tinfo.patch 567 BLAKE2B 7d9b1c0b520a3f2c3d74d6659a503f554c5b7805f3e5f659bb6e0e58475f74633563d44f6667df64048bdb33437e176cf80a547b33e1939565938752e87325ac SHA512 56ce8dab03e74714ecfe0cb7dd274c5fce996d84793fff5e247ee329b1c5bebf2d933b96cc6fe916dafb4f402269d3b1b8cacda07deff4c149869d509ee5c416
-DIST libgnt-2.14.0.tar.xz 102444 BLAKE2B 303dc33e60571ba4b5b9cc8ce477807b9b2ed6b4d1ed14e40c43e146a6d3d156741597befdf3e6c0c6816e9d43955f57f9e1b61e3f1f2d2fc451bf53f7236022 SHA512 0d9c5550374696a0e6ede5246cda3c372d7055d21b9ffaf10be88d6a469bdf18c7dd1113ec612acf4889c0e5686ea87bb0e8348ca8985fd5ff8913afc5813b38
 DIST libgnt-2.14.1.tar.xz 106564 BLAKE2B 19eddef51b44fa82982c705415fee43bf7495bc4692a7371fea782bcc21acdb932f15e1e8de6af962a529eea59f54c0b116d96b87ed3616201e6370760fac5b8 SHA512 434fff31a0946dabeaadbabaf96b4a7cf7f2a7da6d7794b7cf8a75f3f959388d89b32ce5921a20d5d6532ac2fd851ec2f6c18cc7cbc5a0ae97a00ff1ee3f74c3
 DIST libgnt-2.14.2.tar.xz 106128 BLAKE2B d3db0ba3a297c14f32cc49b4e5b3392f47031e9406d862520a2f014f4d4e93c13e2ba5a2d61df81637f9dd7961d64ba69b393ee5b3cfebd7eb2768e3f16f29d0 SHA512 17b39e132b44b23486d7d39fa02761997a28abf53f67bf71bbad86d35124e5deb0363d670b2fb5ac99d47256282b0ef6ad1886e12984c868bb0d13ea7ba7d860
-EBUILD libgnt-2.14.0.ebuild 772 BLAKE2B a116663fc807313145fd230ea8ac48929d3ba4b51d637a8b04df095125dec039860957f40c9c20c9b434a38165d318007941b0d57dabc2bc14c2f5d274692b2d SHA512 50da75b92165b5fa72284f7757dc676376b35ab1ad3b4f878809d8375ee16f01c3f3043c39571dc591e52de35c103514ebcde35f01025c22a20ec58cce5ae098
-EBUILD libgnt-2.14.1.ebuild 774 BLAKE2B d5a53c32b3e0b8c3402b8253482252893fb4faf112d7165752d5c0b3ed5dd936b44087e28dad890ca73e6a3e0dfd0504d75607e000214d7391f4f44e2774207a SHA512 6b18fd90f4d22a5c9962cdeafdac50a70b17be73e2d2f9f7eb8ddd119a6e294b4592f983c102c936420312b5dfa1cce14c5707a6dabd1f3b6e6571f20da26f43
+EBUILD libgnt-2.14.1.ebuild 772 BLAKE2B a116663fc807313145fd230ea8ac48929d3ba4b51d637a8b04df095125dec039860957f40c9c20c9b434a38165d318007941b0d57dabc2bc14c2f5d274692b2d SHA512 50da75b92165b5fa72284f7757dc676376b35ab1ad3b4f878809d8375ee16f01c3f3043c39571dc591e52de35c103514ebcde35f01025c22a20ec58cce5ae098
 EBUILD libgnt-2.14.2.ebuild 779 BLAKE2B 1bb147612f6aa0a8bf813c5d11f18a3b143fb69a6fc457ddd8ebc06f877312ad02c6c9be503acc4a667c8e742e481fb449fe66c94fdf42422d345555254d4d3e SHA512 77e5cc120fe12eeb1c1b083cb979db55e0c129696c3d853fb6622edf45a7d653249f376b48056b5dd8953dc92ad6d899052bf6d4f7690e8701d4062604aad475
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/libgnt/libgnt-2.14.0.ebuild b/dev-libs/libgnt/libgnt-2.14.0.ebuild
deleted file mode 100644
index f0be4f330c90..000000000000
--- a/dev-libs/libgnt/libgnt-2.14.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 meson
-
-DESCRIPTION="Pidgin's GLib Ncurses Toolkit"
-HOMEPAGE="https://keep.imfreedom.org/libgnt/libgnt"
-SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	!<net-im/pidgin-2.14.0
-	dev-libs/glib:2
-	dev-libs/libxml2
-	sys-libs/ncurses:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.14.0-optional_docs.patch"
-	"${FILESDIR}/${PN}-2.14.0-tinfo.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libgnt/libgnt-2.14.1.ebuild b/dev-libs/libgnt/libgnt-2.14.1.ebuild
index b337db668ecd..f0be4f330c90 100644
--- a/dev-libs/libgnt/libgnt-2.14.1.ebuild
+++ b/dev-libs/libgnt/libgnt-2.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 497d4829f28e..562fbe7be4b1 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,6 +1,6 @@
 DIST libgudev-234.tar.xz 273244 BLAKE2B c0556988e37d5a5c48ba906b121d3c7a16c6a8ee4d05eb0e51913b9cde51bdc10966dcf8ceeccf62021dd8e47b004c85ed3412942d9d2bd5176d604931745f50 SHA512 cb01906d532b05cf8f69acdf80a8f05fbd4863fd98e88928b491e3657e60844f7ae6ca903ddd773fbea37268ff85d12719de47fd92a2f18b98fa2dbfe85e8151
 DIST libgudev-236.tar.xz 28428 BLAKE2B cee5098f851183131db88812c8a985a3617fec7a2257f3c05ae0f06e423f15efa89801ef0c75cbb6e5ea9fb7a9db3c4d9215a3689e5d1ddb4832ef17442753cf SHA512 b00c30a7d57de8cca92a22f4c4da878c7cce448b1177858cc9ee0b99c5bc4fd0fbd01d8f4f9a9b9ef073af8f51c26533f2e7896c01ed9fed0a2bcfa6b2cfcbc2
 EBUILD libgudev-234.ebuild 1088 BLAKE2B fe5aab5e9c54d398446439680fbe90c11e1d8a4372effb36351b7b756c770591ac2c7526fe1007fb885dd461e761590c02d6c2ee9742ce1defd980d2ae88d3b2 SHA512 4e471b21732297933f8b6e48b658135a5b13f05d866059d0585c6d1b064c9f4a817c4d1c6429900f3191fb98f8ed192405281784c64b907ae36a825881fc88d8
-EBUILD libgudev-236-r1.ebuild 1327 BLAKE2B cbb66fad3854d66a495a4a1cc8b6565b7b88735a72cdd19fd78fd73250927b9a3e9d7f116c92d78756833422afca265fa183b462137bc65091f674cd652ad226 SHA512 e30d261c3f7e345b251cb518478e9878c5d16059df37201d4dc3774a59d30ca1b7adf595d0f918b73d813bc7c29e2a39b5792218d0c3ac0146f724fada69b8d7
+EBUILD libgudev-236-r1.ebuild 1339 BLAKE2B 00e7fa3b17e4f8c6888bc3e9d58c44a625922908aa2185a0efc3f11c58d5529e6514348a1109797c13913ea7cfcd4bff0d3f87b84691bf605ba46780e9b505ce SHA512 5238067ce14a286f1fc7b347bdc020c40282f40c74ce78fbc04dc094f95665823b61c8fe4391f129c7bba13160bd036d620fdb82aaac9fd5e28f05251dd283b2
 EBUILD libgudev-236.ebuild 1163 BLAKE2B 0ebc090e946fa572c444ec9890155010d417d85027596bda006711dad0cd4afaee9e82bc9737106639ef5f601b1907efa64378538976a2ca58e9fd051ebaa723 SHA512 6830ecc3ef4f78536db37044dd54f8bfe28734fa5fe2f505a0860a52664a8bca87401a6d61e4fc090ee01c0fa36bf29eefd4bf5c2a2b82bbbf611c7cb9bb6778
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-236-r1.ebuild b/dev-libs/libgudev/libgudev-236-r1.ebuild
index fc553df4242b..019106d09d39 100644
--- a/dev-libs/libgudev/libgudev-236-r1.ebuild
+++ b/dev-libs/libgudev/libgudev-236-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~x86"
 IUSE="introspection static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 87a0e15e82e1..aa350ff497b7 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,3 +1,3 @@
 DIST libgusb-0.3.7.tar.xz 41844 BLAKE2B e0829430a7c4c9372ebc061ca8245ecd6b30f0922e4e37ae41f7f65055e7339b5a3a882c5526ea5e5663be3b7c1ad71fee7da5cffb501d63bd1cda2b618fd40d SHA512 65a35be62bff689621f418abf045f62f946c67488dd021d363ab252b9b3a2380898ec763b374f7da50901945eda666fdcae7cbfda7e143544175d7ade3ebc20d
-EBUILD libgusb-0.3.7.ebuild 1503 BLAKE2B 0c54af17979cf21240444e14ae513e5db3d2d2ffbf073f537ebf4092ad08d47dc9ffd91e36326dab5f3503f8ebdc983dbd24e95d6bf5ba6e724f1cc44cc8cd93 SHA512 d74dc92e6dd285ad5b406c721eb9a2f38d81746d8c38b7bf14536127275a4717e7538d159bfd6a7ba87a2d1a635b609a9274c5e5ca218b080389de2fdd1d3b04
+EBUILD libgusb-0.3.7.ebuild 1510 BLAKE2B 1e8783e5c44fd4387692888a39574c8215c4cde0ac99585ea95e6570fd9c7554a8026a8a5572fea0d7b6c273559762cf029e59fb7a136b65b2f4737f68e6610e SHA512 757153b0b1f7356a602b3b5cd47000e620e82c802b95aeec879f6e3470b40957134fe962d8940891a382c69b2ad82d473e9fd5b390bb9436b1afbe7220e29d77
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.7.ebuild b/dev-libs/libgusb/libgusb-0.3.7.ebuild
index 40fc43d65a3d..6c27baebffaa 100644
--- a/dev-libs/libgusb/libgusb-0.3.7.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.7.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk-doc +introspection static-libs test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 42ac03e129b0..00bb718bfd5e 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,3 +1,5 @@
 DIST libinput-1.18.0.tar.xz 616732 BLAKE2B 4f12080b5e3496fdb5ccb1375a073860c26037ba47033a7d2d69a2f817b4ab5791aa89be08b193925cddd566a04144c73399cbb196a4cc9d3e07dcfb806d3eff SHA512 9a834f075d7a1f892416bb6b241eb052f749d3aa883c4b39c0f1c9616c115d6b9a541b587508646fddaf0d3fe57af92fe4629b522d1d51196499e7b523e0aa90
+DIST libinput-1.18.1.tar.xz 618524 BLAKE2B 17c5959b6319838dc65f6df7c532d8e048b0295d20178e636dcb3d7a0418f7c107ffc34f280ac0da66011cc80fb8e9f0881b5edd6a4fb64fb674dff6bb5b4526 SHA512 450e38c0f8245aa0165a8047d25aebee646332f0f2ed442bb2d1bd3e723c2082b6d00d6e3bda308981ece8e29b5cddbd56eab900d2b7497705a45fc27b281828
 EBUILD libinput-1.18.0.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
+EBUILD libinput-1.18.1.ebuild 2244 BLAKE2B 940484eb539ece4d99ffa49c59b26ce1a40b67c69386740ff936bd09aa51f6cd7f16f52cfe94005e771f5049ecf1b8cb11fa4848291ee356cf3ff89729988dc2 SHA512 e908ff161d13981e1e6466e0f10f5829c81aff6d1a3e012973bc1c17ff5d2949f9fe5d5e4f21689317084089381de853b792af8ad2c97d7fa4c273aaf707a812
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.18.1.ebuild b/dev-libs/libinput/libinput-1.18.1.ebuild
new file mode 100644
index 000000000000..7eac9e2a3929
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.18.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+[[ "$(ver_cut 3)" -gt 900 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/check-0.9.10 )"
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed "s@, '-Werror'@@" -i meson.build || die #744250
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		$(meson_use test tests)
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	pkgname="dev-python/python-libevdev"
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
+		einfo "${pkgname} must be installed to use the"
+		einfo "libinput measure and libinput replay tools."
+	fi
+
+	udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 87602073fc0d..19107525253b 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,3 +1,3 @@
 DIST libmanette-0.2.6.tar.xz 43236 BLAKE2B 3b2a6979aa368117fa5d61623c26e6cca61388770ad77e759c3427fcba64d40361b1e1a4f87a2931281edbf5c2943a44c2ee3b0485ef52ddbf183a9e72344892 SHA512 e10a1b3e493a6472b0cf7562e3dfbba839ee69bb878676b2e3521363e9ff7c5df7d379923a4781366797e889f3c8985397080ae606264dc9bd3a4459bce0513c
-EBUILD libmanette-0.2.6.ebuild 994 BLAKE2B d86fcb4795f4e1bf4a8e0b9c3f6c2ffebb18a1e627efe03afe54a8e01378acbe6934d3bc3cc323bb30cf65b0294a1205a38b6b3869d2ccfad5208a0e38feec84 SHA512 16bd545c48523fde818db9256579b876b075fdf01cf08e2a1d8a60e6ad24262c07b063fd30ca4231fcd3c1475e984c7153d971b70d2868762b04597c98766762
+EBUILD libmanette-0.2.6.ebuild 999 BLAKE2B a577bd8cb1162c5e663a0e360ea352f24eb5053383a2b751ea63081e9f7a9d6e8cde3ee745597828b24d5b872ce0c0098da07a92631dcf8be22a1708b2d3a1ff SHA512 dd24cdb7b84347966c4df545ad3b38e46f67d69d41f94b7842ba344e6d4f86ec23c09a8147ee78a790a084d181e11a912823e746e350623de64d01572ab87786
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libmanette/libmanette-0.2.6.ebuild b/dev-libs/libmanette/libmanette-0.2.6.ebuild
index eb69e6e688c6..e87160249bbd 100644
--- a/dev-libs/libmanette/libmanette-0.2.6.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.6.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="gtk-doc +introspection +udev +vala test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index 581764a6e456..ad2ef5a6c4e0 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -1,6 +1,9 @@
-AUX continuum-1.0.18.patch 3086 BLAKE2B 4f5b004d0910be5a8f8bb9c568a2555c2b3f4ab71b52964622d66ef43a0ca2c7ee8e6e0e9128b7863a465bb887ac300a8cfc1f6efcdb740fdd88ed36cd465b75 SHA512 905c5f1dc22b665ef8910b6319b25e1d1e9dd80892c03c6c71de597599d8ce2972b35d92e6976ad8798d2f10927e3e884570246d5d8162e84dc3e1f963959012
-AUX debug-disable-enable-1.0.18.patch 1458 BLAKE2B ce806c34ab5525f8d493030ad870d9a7fb1b27d18159c6626d37c1540f0cb7aec6a9d45d17423dabebfde8fb68fdb6796cc88ff8fa109c9622958a2eef322ede SHA512 f4d731ce227e91324b88d155daaf35f2228a48e61d8e448c93f9d102c9939fa4c3b2a07b96741d442382cc5498358e9ae0471f766373654b21d849a96a42d813
+AUX continuum-1.0.18.patch 2634 BLAKE2B 68b2cb41800b6797537e270a2f58064200d2c87f7fb8da77fc7ee615c69d34b33a2661025ad186bdf2557368da28cc9e8af7ad1aa927bd8c1036bf55ced5ca8e SHA512 ef1b8b8f375b58b73493d1cae0e7ce3f4bd50925fc2e9cad9d8034fb77bd6565c6aac2c3a4d9374f463c569bc47b6ef5d78a88fae544c05700254d4fa10f7f5d
+AUX debug-disable-enable-1.0.18.patch 1345 BLAKE2B 35c2abf1885639593ed2515883ab27cf7aa6a6a78e03133ba5b98a70fb094343f1147714a9b865c659905aec4f3e85cfd83a5ad5fc3190a1d9c5b1f505ba72ec SHA512 b0dd6fc931bd5c1ab58ec8c1b6a40a0c72f2f033ac08e22ca148754ca80312da5e0611a3edb05d378b1d4f771acbf1a9b9b8206f9c8d385d2b513aa47112fd28
+AUX libmemcached-1.0.18-autotools.patch 2362 BLAKE2B 647aa5e79a37471c16ef03b0b9bdc7fb78aca9ef7c4c5be9137f76bc0d547b4ae40e355d3afd040e165e7f25a51b73c2108a64990e723d1c38ac5714a9d51f0c SHA512 c34e6225e644de08c1fd102b3ad206484ce9854aead456fccefd7a9f42ad02cc863380e18c1b6a31b2e8fc89989f1a43cef24f8fa922e40711c7c0a59248bb12
+AUX libmemcached-1.0.18-disable-sphinx.patch 264 BLAKE2B 6b26230f2c79d4f9f0cffcdfc7e8d8a50dbac7061b75e214ae3cf9634be6d3bccf4c849791c153ac285a80a285deab443e919a770c1455f79d8b4bac9bce6ebe SHA512 45de379be62a10d934eabbd7488fcc34c4cde865083cbb06af222fa19aca8aef510564385017e6e9b7d981a17238da0e3a5b2b84fa6f3573adbe16baa975f174
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
 DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
 EBUILD libmemcached-1.0.18-r3.ebuild 1608 BLAKE2B 9f2407ed8d539dcda7af004f743f4e99cccbc20d29d6ef1670a5288c51a9137da8ddffb5ea93d4aacee8acdf64ecbdd1e310cd971fd04dab2645bcfbf3efee79 SHA512 1dce280cc7a5d9b3aa3ec5a6880747f513faf5d6390078c1caef1cd3b7617eb997a5fa205bb4866bd8d803dfc57511a230c948a3e1eb23496519f41dba576f1f
+EBUILD libmemcached-1.0.18-r4.ebuild 1381 BLAKE2B aba5b758b7db8baddbb128e9448d2292346e6cd6b8015976d388f15faeb5c4f93187f4900569d4458fac6b732d5ec041ec8070c1dae1ecf78fbe829ad06b2229 SHA512 523afd3c135bd99f4d9e4dbade920920c9566676e89386ef87e244ba9e04ac7c2dc8ab97efad6ec3a63608398b40a61350cfa5d4671b843f5a8e908fca9f2fe7
 MISC metadata.xml 826 BLAKE2B a77184515934e8eb06a2f7b42a4e4354c998192d617a1a4a3e0e6fdad88a189cdf809779106e3157f4b9f46675a6ae6961ef5280bdefaa1794b7c146b89fdeef SHA512 5bc0caef489fb8a9c6c038aa2a5620cd43d700104ab77407391eb0961f12392ac8535efd5fbe86c1e6be17cb89d766049fe1394461fa652bcdc1abd64afb9962
diff --git a/dev-libs/libmemcached/files/continuum-1.0.18.patch b/dev-libs/libmemcached/files/continuum-1.0.18.patch
index 296978044311..17a8afd7ff98 100644
--- a/dev-libs/libmemcached/files/continuum-1.0.18.patch
+++ b/dev-libs/libmemcached/files/continuum-1.0.18.patch
@@ -1,7 +1,5 @@
-diff --git libmemcached/memcached.cc libmemcached/memcached.cc
-index 337f918..6e88c25 100644
---- libmemcached/memcached.cc
-+++ libmemcached/memcached.cc
+--- a/libmemcached/memcached.cc
++++ b/libmemcached/memcached.cc
 @@ -285,6 +285,8 @@ void memcached_servers_reset(memcached_st *shell)
    {
      libmemcached_free(self, self->ketama.continuum);
@@ -11,10 +9,8 @@ index 337f918..6e88c25 100644
  
      memcached_instance_list_free(memcached_instance_list(self), self->number_of_hosts);
      memcached_instance_set(self, NULL, 0);
-diff --git tests/libmemcached-1.0/all_tests.h tests/libmemcached-1.0/all_tests.h
-index b4abe9d..f89f007 100644
---- tests/libmemcached-1.0/all_tests.h
-+++ tests/libmemcached-1.0/all_tests.h
+--- a/tests/libmemcached-1.0/all_tests.h
++++ b/tests/libmemcached-1.0/all_tests.h
 @@ -452,6 +452,7 @@ collection_st collection[] ={
    {"hsieh_availability", 0, 0, hsieh_availability},
    {"murmur_availability", 0, 0, murmur_availability},
@@ -23,10 +19,8 @@ index b4abe9d..f89f007 100644
    {"memcached_server_add(MEMCACHED_DISTRIBUTION_CONSISTENT)", (test_callback_fn*)memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP, 0, memcached_server_add_TESTS},
    {"memcached_server_add(MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED)", (test_callback_fn*)memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED_SETUP, 0, memcached_server_add_TESTS},
    {"block", 0, 0, tests},
-diff --git tests/libmemcached-1.0/setup_and_teardowns.cc tests/libmemcached-1.0/setup_and_teardowns.cc
-index 4191c38..eb29128 100644
---- tests/libmemcached-1.0/setup_and_teardowns.cc
-+++ tests/libmemcached-1.0/setup_and_teardowns.cc
+--- a/tests/libmemcached-1.0/setup_and_teardowns.cc
++++ b/tests/libmemcached-1.0/setup_and_teardowns.cc
 @@ -177,6 +177,16 @@ test_return_t memcached_servers_reset_SETUP(memcached_st *memc)
    return TEST_SUCCESS;
  }
@@ -44,10 +38,8 @@ index 4191c38..eb29128 100644
  test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP(memcached_st *memc)
  {
    test_compare(TEST_SUCCESS, memcached_servers_reset_SETUP(memc));
-diff --git tests/libmemcached-1.0/setup_and_teardowns.h tests/libmemcached-1.0/setup_and_teardowns.h
-index 7610c5a..59b56f6 100644
---- tests/libmemcached-1.0/setup_and_teardowns.h
-+++ tests/libmemcached-1.0/setup_and_teardowns.h
+--- a/tests/libmemcached-1.0/setup_and_teardowns.h
++++ b/tests/libmemcached-1.0/setup_and_teardowns.h
 @@ -64,3 +64,4 @@ test_return_t pre_buffer(memcached_st*);
  test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP(memcached_st *memc);
  test_return_t memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED_SETUP(memcached_st *memc);
diff --git a/dev-libs/libmemcached/files/debug-disable-enable-1.0.18.patch b/dev-libs/libmemcached/files/debug-disable-enable-1.0.18.patch
index ed87cbd7a1c1..fa483b52dcfb 100644
--- a/dev-libs/libmemcached/files/debug-disable-enable-1.0.18.patch
+++ b/dev-libs/libmemcached/files/debug-disable-enable-1.0.18.patch
@@ -1,7 +1,7 @@
 Fixed a bug that caused configure to disobey the enable/disable debug flag.  The debug flag will default to disabled if not specified.
 diff -ru libmemcached-1.0.18-orig/m4/ax_debug.m4 libmemcached-1.0.18/m4/ax_debug.m4
---- libmemcached-1.0.18-orig/m4/ax_debug.m4	2014-11-05 14:43:53.720284916 -0600
-+++ libmemcached-1.0.18/m4/ax_debug.m4	2014-11-19 14:23:19.512482198 -0600
+--- a/m4/ax_debug.m4
++++ b/m4/ax_debug.m4
 @@ -49,16 +49,18 @@
      [AC_PREREQ([2.63])dnl
      AC_ARG_ENABLE([debug],
diff --git a/dev-libs/libmemcached/files/libmemcached-1.0.18-autotools.patch b/dev-libs/libmemcached/files/libmemcached-1.0.18-autotools.patch
new file mode 100644
index 000000000000..9194539aeb53
--- /dev/null
+++ b/dev-libs/libmemcached/files/libmemcached-1.0.18-autotools.patch
@@ -0,0 +1,61 @@
+* Automake 1.14+ fix for AC_PROG_* instantiation
+* Disable old GCC flags
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,10 +13,6 @@ m4_include([version.m4])
+ AC_PREREQ([2.61])
+ AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
+ 
+-# Setup the compilers early on
+-AC_PROG_CC([cc gcc clang])
+-AC_PROG_CXX([c++ g++ clang++])
+-
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+@@ -61,6 +57,10 @@ LT_LIB_M
+ 
+ AC_SUBST([lt_cv_dlopen_libs])
+ 
++# Setup the compilers early on
++AC_PROG_CC([cc gcc clang])
++AC_PROG_CXX([c++ g++ clang++])
++
+ 
+ AC_PROG_CC_C99
+ AS_IF([test "x${ac_cv_prog_cc_c99}" == "xno"],[AC_MSG_ERROR([No c99 compatible compiler found])])
+--- a/m4/ax_harden_compiler_flags.m4
++++ b/m4/ax_harden_compiler_flags.m4
+@@ -138,7 +138,6 @@
+            _APPEND_COMPILE_FLAGS_ERROR([-H])
+            _APPEND_COMPILE_FLAGS_ERROR([-g])
+            _APPEND_COMPILE_FLAGS_ERROR([-g3])
+-           _APPEND_COMPILE_FLAGS_ERROR([-fmudflapth])
+            _APPEND_COMPILE_FLAGS_ERROR([-fno-eliminate-unused-debug-types])
+            _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
+            ],[
+@@ -213,7 +212,6 @@
+           _APPEND_COMPILE_FLAGS_ERROR([-Wunused-local-typedefs])
+           _APPEND_COMPILE_FLAGS_ERROR([-Wwrite-strings])
+           _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
+-          _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
+           _APPEND_COMPILE_FLAGS_ERROR([-pipe])
+           _APPEND_COMPILE_FLAGS_ERROR([-fPIE -pie])
+           _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
+@@ -247,7 +245,6 @@
+            _APPEND_COMPILE_FLAGS_ERROR([-H])
+            _APPEND_COMPILE_FLAGS_ERROR([-g])
+            _APPEND_COMPILE_FLAGS_ERROR([-g3])
+-           _APPEND_COMPILE_FLAGS_ERROR([-fmudflapth])
+            _APPEND_COMPILE_FLAGS_ERROR([-fno-inline])
+            _APPEND_COMPILE_FLAGS_ERROR([-fno-eliminate-unused-debug-types])
+            _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
+@@ -318,7 +315,6 @@
+           _APPEND_COMPILE_FLAGS_ERROR([-Wwrite-strings])
+           _APPEND_COMPILE_FLAGS_ERROR([-Wformat-security])
+           _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
+-          _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
+           _APPEND_COMPILE_FLAGS_ERROR([-pipe])
+           _APPEND_COMPILE_FLAGS_ERROR([-fPIE -pie])
+           _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
diff --git a/dev-libs/libmemcached/files/libmemcached-1.0.18-disable-sphinx.patch b/dev-libs/libmemcached/files/libmemcached-1.0.18-disable-sphinx.patch
new file mode 100644
index 000000000000..964173c852ba
--- /dev/null
+++ b/dev-libs/libmemcached/files/libmemcached-1.0.18-disable-sphinx.patch
@@ -0,0 +1,13 @@
+Disable invoking sphinx
+https://bugs.gentoo.org/806613
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -57,7 +57,6 @@
+ include libmemcachedutil-1.0/include.am
+ 
+ include clients/include.am
+-include docs/include.am
+ include man/include.am
+ 
+ if BUILD_LIBMEMCACHED_PROTOCOL
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
new file mode 100644
index 000000000000..9033195b21fb
--- /dev/null
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="a C client library to the memcached server"
+HOMEPAGE="https://libmemcached.org/libMemcached.html"
+SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug hsieh +libevent sasl"
+# https://bugs.gentoo.org/498250
+# https://bugs.launchpad.net/gentoo/+bug/1278023
+RESTRICT="test"
+
+RDEPEND="
+	net-misc/memcached
+	sasl? ( dev-libs/cyrus-sasl )
+	libevent? ( dev-libs/libevent )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/debug-disable-enable-1.0.18.patch
+	"${FILESDIR}"/continuum-1.0.18.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-disable-sphinx.patch
+)
+
+src_prepare() {
+	default
+	rm README.win32 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dtrace \
+		$(use_enable sasl sasl) \
+		$(use_enable debug debug) \
+		$(use_enable debug assert) \
+		$(use_enable hsieh hsieh_hash)
+}
+
+src_install() {
+	default
+
+	# https://bugs.gentoo.org/299330
+	# remove manpage to avoid collision
+	rm -f "${ED}"/usr/share/man/man1/memdump.* || die
+	newman man/memdump.1 memcached_memdump.1
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 7be4808768de..17b5c28aab0a 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -2,5 +2,5 @@ AUX libpcre-8.41-fix-stack-size-detection.patch 569 BLAKE2B 68f685ccd9ebe0a256f8
 DIST pcre-8.44.tar.bz2 1577611 BLAKE2B ef8d5737ca1f4c72f12c8726956ce5d3bad13aa8303b7c3b5d25499e3027ddc2edcdb937d9ad2bdd437a8885f1af8757ba194aa0b2f236b6e6a3a18d2ec8f138 SHA512 f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac
 DIST pcre-8.45.tar.bz2 1578809 BLAKE2B 3954e08cf3c67a5e2249bf72f8d4c1a90fe7a098fffa5a0a06d0d665d07899027cfd632eab2757fcf2b1b9b413a43d5c484c8e52d05b7ca113b3bbbc4dd3bb29 SHA512 91bff52eed4a2dfc3f3bfdc9c672b88e7e2ffcf3c4b121540af8a4ae8c1ce05178430aa6b8000658b9bb7b4252239357250890e20ceb84b79cdfcde05154061a
 EBUILD libpcre-8.44.ebuild 2536 BLAKE2B 4816504c3c0aa9c6c4e2acf598483ad24027be06de64ed33f6451457391e4b76b4b1a3c7df2900b4823f0b57befa5f440421a9db67a63ca11ea0909d0a5a8d83 SHA512 76d67bde25ad0c478001d82a6760b63e9834fe478dd326b94ef2e54d7a7a9c45ccb16b663b155b9719fb3a5ea4ba847f7ec3be78d62bc608d5c234af78e893f8
-EBUILD libpcre-8.45.ebuild 2586 BLAKE2B 4e5f6dcb1151c93e6a464746170dd8d5c2a4099b2f91c2b277c71861cc0b46c50b7596e34b1855b0b44736ad6a7f12c5f3c876c54f27a54e5a17eb86951e7ac4 SHA512 79de40a9a26845cf78c30b6acecc036d5ad8e0cb93ce2c4d748568057c712310e8ca181c00dfefbfa26713b7c32bc49d51d7f9bb755ef8b4051611b714e93670
+EBUILD libpcre-8.45.ebuild 2585 BLAKE2B da24c06e5f48336fc1662ced48e3b6bd37a51935906d99461c225a6b5616b439b5d7a79a0648bb804fff038551b4ae396322a3c2b8de7ade9359e02bf7105d22 SHA512 c1e1a2de0e5a425bc600dc2f8535a9303460e7e8aebbf9c523045cfbe4dcafe25ee5b4ea57aaa5b34238c4466828c23c57b2259e6697004aed94c44a6a6b5312
 MISC metadata.xml 1219 BLAKE2B 633af3b60f5cd2d75585f1747b6d0233f5b5c46a182450777c55038a3e0da55b6bd70e471e4287267ba28b18af8bd9c9cd4f44a76415ad1baa2b5738655d5c86 SHA512 f012e32d3a8198b9ecb5b03aa99007c3a9a64652843071c6d106569ba9fdea4d1922c58f2e049a21217b92e0d3b32d264c5a4c41f4a84b0c2320f4f06deffcb1
diff --git a/dev-libs/libpcre/libpcre-8.45.ebuild b/dev-libs/libpcre/libpcre-8.45.ebuild
index dfeaebddecd2..0adbaa5d98d3 100644
--- a/dev-libs/libpcre/libpcre-8.45.ebuild
+++ b/dev-libs/libpcre/libpcre-8.45.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/librevenge/Manifest b/dev-libs/librevenge/Manifest
index cd332b006888..d665969400d7 100644
--- a/dev-libs/librevenge/Manifest
+++ b/dev-libs/librevenge/Manifest
@@ -1,4 +1,4 @@
 DIST librevenge-0.0.4.tar.xz 421604 BLAKE2B 414674e4313f3062dac20a1ad7f1cf1c0a1681bb486f4edef109558fa70aaf8ee407fec8dfa93014db8c8746804e0a2bfec9636d75066b93d84e9bcbdc3f4dc4 SHA512 c4c2c98bac3522c8bd487058f4db19d85ad0d99159c4de4ffde91a10ea3adb7f995ebe8ccf6afcf533d81f50fb654bf265b9cd197508f85b5b68a101ca279712
 EBUILD librevenge-0.0.4-r1.ebuild 1132 BLAKE2B 68a3a33fb35da3887c07b2add3cc5cf6e55318f076530540388cc101032ddf455cda1af9336c043b1d5a1cff2c367f208e7efa2bfda199c3a1382635a0eb3304 SHA512 6eae4014722af847914d570ddb236b020202dc2afa43da1716b246acad760bb1df8bf7949cfd302b0a015c859760dafa2cd91bc3d57a95fa3c56006150adbee2
-EBUILD librevenge-9999.ebuild 1188 BLAKE2B aa0340450c8789d5416155a9225a8b7b10d9322ef32946b36fe8433f69a7be02bc6d78126dab3917fd087b8a0eff80a6109fa94700b3d73b86b18b7bd88a2fd9 SHA512 46f2b70a4b88cb7da3791158f11ed2dd254e6cb2e8ac3545cd811a3b45af384d20c0f56e489b415a6eaef375e8613066bab77934f31a0595e8d7d40c7d765865
+EBUILD librevenge-9999.ebuild 1127 BLAKE2B 785828d5d536485e3fb3e234b557f617b1caaa104ac62e4a5d86b5437baaf9b5497f41c3b15aaad45cbd04af7c52d51a4acd4e57762b95a9d02cd9d751eb5ac5 SHA512 4eacc44eb852b8a988e0664abdb7823fd5c8f5ec7b838d523cbfbaa1f4cfda396ed7e7d9cc27f2b0e3bf6eaf622b6023b3b1c32399881a8e4710f763d9e289fe
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/librevenge/librevenge-9999.ebuild b/dev-libs/librevenge/librevenge-9999.ebuild
index 0974dd13bd95..8c6dc01b3c64 100644
--- a/dev-libs/librevenge/librevenge-9999.ebuild
+++ b/dev-libs/librevenge/librevenge-9999.ebuild
@@ -1,47 +1,41 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic multilib-minimal
 
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/librevenge"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/librevenge"
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
+
 DESCRIPTION="Helper library for REVerse ENGineered formats filters"
 HOMEPAGE="https://sf.net/p/libwpd/librevenge"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0"
 IUSE="doc test"
+
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-"
+RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-libs/boost
 	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
 "
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	default
-	[[ ${PV} = *9999 ]] && eautoreconf
-
-	# bug 651264
-	append-cxxflags -std=c++11
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 multilib_src_configure() {
 	local myeconfargs=(
-		--disable-static
 		--disable-werror
 		$(use_with doc docs)
 		$(use_enable test tests)
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 652fb084d251..1649b3f7fe16 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -9,7 +9,7 @@ DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a
 DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
 DIST libxml2-2.9.12-r2-patchset.tar.bz2 5939 BLAKE2B e518a174385a121ca5545d0a51c2a2b4ddd21b1e7996e2806f368588b27d60e8318ab50ebfb90c3ee57ccece4f1c37e05c1daeed4203a4e9cb5a056ba530ad2b SHA512 06b96ab8426cd560c1147998965b5e718bee08536549a278269f6535ff1460ed97d83067ed0e8a4d834145a5e5a6caa912cf8aa5a33a360e4b1bc9d9135bfb04
 DIST libxml2-2.9.12-r3-patchset.tar.bz2 6281 BLAKE2B b7038f85009afdacc2fcf0b9cf30f915f20a2c8dfbe3749c6e74c637191f97169ee46b26deac5e347230d956f2d5aded218d09f0232f23b39ef4ad5e2fd09f61 SHA512 8170462eb3ecd2f834650309498a4e586fb3edb3114f42b3c95e96dc2ca81181e70ccd1790c440bd7ef4f489a2311b99765dcd12d9fb52207a11fb4394409ae8
-DIST libxml2-2.9.12-r4-patchset.tar.bz2 7006 BLAKE2B 64225a16346bff60f2bf3b6d32dffeec6887c44d308dd816d6de3b92ee7f7dd5599b5dfdae0b6ca9e056897c17b659ff36d170f972e1b6043ca3ec8de9c65050 SHA512 ca0734c894afc264851107c22a606b9094941a4452a946b769d6f7161b3301425da5bd3e26eeceb4e31e9721f76505aacf73eeaffa6699bb7395783915eff111
+DIST libxml2-2.9.12-r5-patchset.tar.bz2 7231 BLAKE2B d9d0d56ebccbfe234a8af04cc5343c1a02d84fbd998c2373fd48be59cf92807a9417db650a6bb6ba309e101994c4ae2b28edda7bf635c7728eb8b8047d0d3391 SHA512 b2db0fe4595c1559d9f8dc836ee6eee469191f6c490fc95d25d9fa99a544e80858894cc35b6e4a6624a38d0309800540badc929e86ef29950c1107caa4656a14
 DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd
 DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
@@ -19,6 +19,6 @@ DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd10
 EBUILD libxml2-2.9.10-r5.ebuild 6644 BLAKE2B ce2df74f087c8f2c44ddfcc7ed98ac916e9441e425d08095dcea55c4cd28e3e8954ae8d700f2668fa942ffda0043d132027c64b736994425a63c5ccb30bfa9d6 SHA512 2219c61e1a9a9ece9e926e40cd924b6a3f8ba53660bee201b0123d439e31ab1190f8de985a1c9f78f56f8fc3d791cdb907a23fab54f0d823581c1e9273de4417
 EBUILD libxml2-2.9.12-r2.ebuild 6952 BLAKE2B 8b347eb9379ba04cb83489e650a92e4f804299e0ca192826883a439c96dfa9a937e03444d1989bc0bf91811138b1d12d2c2d3fc797392af622afcf00d2d299f1 SHA512 8eef89efee52671e92e097cf09355a11cabd85eccbbc85c82e06cf0ccc8d9f7dadcb47463edc9b63a0a4302caceb8751f8abff38ec8e2b461d190945669b7613
 EBUILD libxml2-2.9.12-r3.ebuild 7106 BLAKE2B 18daefbb398537eb56e4f7a206f3969864cb6546407c950f8a96d2ced4f83a8e773d8e19769f5dc4b7822b8e13883aa5c4804ecf93305eb9475bb42c9d467799 SHA512 1372a0ddc39a2c6bf5dd43e0ab4c69c7d7516e8fcd38273ab20cb2ef280cbcb98a11ab3c55f300cb2509e91b27b3daaad7b99bc9813d3523c738f0d0eeb6540a
-EBUILD libxml2-2.9.12-r4.ebuild 7301 BLAKE2B 261bad6fb77dc6bc635bdc3961baf0b70ee65818388d3f5e585986ee5d6cd6158aad3c7e08c0aff2a582753e2deaec6e2489b92f9d0db6c346d6ee61bc7f5d9e SHA512 92cafc498e821fbaa310f068d9b23926a6d099db07855311f3ec586103d80614726ca13d9e219ba490d6a5212e5d438f05aa4ccddbf28eae4b8bff48d8aeff04
+EBUILD libxml2-2.9.12-r5.ebuild 7443 BLAKE2B eb473144223ccd21829a63559cb520acfc2df77a2a4506e82c9a6b391cc195831cb47226fb21ddd430572203741cf040380258d0fd6bbb0006537189a72c724b SHA512 750b2a41406364c788d80988db9638f5586e8e804ba6618611aefd6f77504e02a7fda03da78f96df338120764487812d6c3be39b750453373b87f4e50c1fdc21
 EBUILD libxml2-2.9.12.ebuild 6685 BLAKE2B 1d06e3c9b4223044015ef74bc3a5707fe6f243c5c59f72fb3f9b7caa10ce8f60e43a16a029a2cbdb66d1cfe45cc7efca562137e400c08781642e8cdfdb174292 SHA512 b63076ac9a54870e42094952061641883571d0c35938241b66f2f06fcbd2f72658e47f9d3d2c192a5cb1cc44f3e754cafa9998d3ae8816bffec15fb4533d548a
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild
deleted file mode 100644
index a128eab54832..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Note: Please bump in sync with dev-libs/libxslt
-
-PATCHSET_VERSION="2.9.12-r4-patchset"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc
-inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20130923.tar.gz"
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
-SRC_URI="
-	ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
-	)
-	verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc )
-"
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-LICENSE="MIT"
-SLOT="2"
-# Dropped keywords for now because it's a minor LDFLAGS fix, and it will ease upgrades
-# bug #802210
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	verify-sig? ( app-crypt/openpgp-keys-danielveillard )
-"
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS )
-
-PATCHES=(
-	## Gentoo
-	# Patches needed for prefix support
-	"${WORKDIR}"/${PN}-2.7.1-catalog_path.patch
-
-	# Fix python detection, bug #567066
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
-	"${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-	# Fix python tests when building out of tree #565576
-	"${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch
-
-	# bug #745162
-	"${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
-
-	# Avoid failure on missing fuzz.h when running tests
-	"${WORKDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch
-
-	# Respect LDFLAGS fully
-	"${WORKDIR}"/${PN}-2.9.12-respect-LDFLAGS-as-needed.patch
-
-	## Upstream
-	# Fix lxml compatibility (bug #790737)
-	"${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch
-	# Fix serialising empty HTML documents (bug #794733)
-	"${WORKDIR}"/${PN}-2.9.12-Fix-whitespace-when-serializing-empty-HTML-documents.patch
-)
-
-src_unpack() {
-	local tarname=${P/_rc/-rc}.tar.gz
-
-	if use verify-sig ; then
-		verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc}
-	fi
-
-	# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2
-
-	cd "${S}" || die
-
-	if use test ; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Avoid final linking arguments for python modules
-		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
-		# gcc-apple doesn't grok -Wno-array-bounds
-		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
-	fi
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-	#elibtoolize
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# Notes:
-	# 1) USE zlib support breaks gnome2
-	#    (libgnomeprint for instance fails to compile with
-	#    fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-	#
-	# 2) The meaning of the 'debug' USE flag does not apply to the --with-debug
-	#    switch (enabling the libxml2 debug module). See bug #100898.
-	#
-	# 3) --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		# Ensure python build dirs exist
-		mkdir -p "${BUILD_DIR}" || die
-
-		# Odd build system, also see bug #582130
-		run_in_build_dir libxml2_configure \
-			"--with-python=${EPYTHON}" \
-			"--with-python-install-dir=$(python_get_sitedir)"
-	}
-
-	# Build python bindings separately
-	libxml2_configure --without-python
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl libxml2_py_configure
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-
-	emake "$@"
-
-	popd > /dev/null || die
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python ; then
-		local native_builddir="${BUILD_DIR}"
-
-		python_foreach_impl libxml2_py_emake \
-				top_builddir="${native_builddir}" \
-				all
-	fi
-}
-
-multilib_src_test() {
-	ln -s "${S}"/xmlconf || die
-
-	emake check
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl libxml2_py_emake test
-	fi
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
-		install
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl libxml2_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	rm -rf "${ED}"/usr/share/doc/${P}
-
-	einstalldocs
-
-	if ! use examples ; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ -n "${ROOT}" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# Need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}/etc/xml/catalog"
-
-		# We don't want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e "${CATALOG}" ]]; then
-			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild
new file mode 100644
index 000000000000..6b2fbcf8a878
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PATCHSET_VERSION="2.9.12-r5-patchset"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc
+inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
+SRC_URI="
+	ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)
+	verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc )
+"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+# Dropped keywords for now because it's a minor LDFLAGS fix, and it will ease upgrades
+# bug #802210
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-danielveillard )
+"
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS )
+
+PATCHES=(
+	## Gentoo
+	# Patches needed for prefix support
+	"${WORKDIR}"/${PN}-2.7.1-catalog_path.patch
+
+	# Fix python detection, bug #567066
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
+	"${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+
+	# Fix python tests when building out of tree #565576
+	"${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+
+	# bug #745162
+	"${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
+
+	# Avoid failure on missing fuzz.h when running tests
+	"${WORKDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch
+
+	# Respect LDFLAGS fully (bug #798942)
+	"${WORKDIR}"/${PN}-2.9.12-respect-LDFLAGS-as-needed.patch
+	# ... and don't bother copying Python's libraries (bug #798942 still)
+	"${WORKDIR}"/${PN}-2.9.12-dont-copy-python-ldflags.patch
+
+	## Upstream
+	# Fix lxml compatibility (bug #790737)
+	"${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch
+	# Fix serialising empty HTML documents (bug #794733)
+	"${WORKDIR}"/${PN}-2.9.12-Fix-whitespace-when-serializing-empty-HTML-documents.patch
+)
+
+src_unpack() {
+	local tarname=${P/_rc/-rc}.tar.gz
+
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc}
+	fi
+
+	# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Avoid final linking arguments for python modules
+		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
+		# gcc-apple doesn't grok -Wno-array-bounds
+		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
+	fi
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	# We now need to run eautoreconf at the end to prevent maintainer mode.
+	#elibtoolize
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# 1) USE zlib support breaks gnome2
+	#    (libgnomeprint for instance fails to compile with
+	#    fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+	#
+	# 2) The meaning of the 'debug' USE flag does not apply to the --with-debug
+	#    switch (enabling the libxml2 debug module). See bug #100898.
+	#
+	# 3) --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-subdir=${PF}/html \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable ipv6) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	libxml2_py_configure() {
+		# Ensure python build dirs exist
+		mkdir -p "${BUILD_DIR}" || die
+
+		# Odd build system, also see bug #582130
+		run_in_build_dir libxml2_configure \
+			"--with-python=${EPYTHON}" \
+			"--with-python-install-dir=$(python_get_sitedir)"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_configure
+	fi
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+
+	emake "$@"
+
+	popd > /dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		local native_builddir="${BUILD_DIR}"
+
+		python_foreach_impl libxml2_py_emake \
+				top_builddir="${native_builddir}" \
+				all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake test
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		install
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	rm -rf "${ED}"/usr/share/doc/${P}
+
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 11c1da6d0812..777acbc0095b 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -2,5 +2,5 @@ AUX libzip-1.7.3-missing-header.patch 1273 BLAKE2B d3ac8bb5f4af6a0f9b80bd93b7212
 DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870
 DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
 EBUILD libzip-1.7.3-r1.ebuild 2419 BLAKE2B ae0fba701fa76463781c39055348fad1c565dcc9fdfeaf293cf7594a2418f7e4af5fa79f428c429ad25968085c4feea8ca3e4f58de42d1d87b62fa07120e281a SHA512 a488325463c8ea8c63c9e41b0a109ffc0af1e655572c4cbe7739431f7098d96fdc2434ac74729cd02fbbbe78c3e28b16e016aac0f1d1e5bbf8c3d2984de6842d
-EBUILD libzip-1.8.0.ebuild 2368 BLAKE2B d60c303dbcfa2545e2ba0318c6bd4e49f8d8dfcdfca485ecb6d7651e38c7cde88b3f0cf1c2d636832a63a4a0217ee84792978ef8882de4a0b23f7cb9e03fe077 SHA512 b9b7457bc944f5fb2d112a7662136bfc7c552e11d148a53bf278f8e07ac735239e0e92bd8a691ff1cf5708ce16568fd583a124fd46d31dac4ac74e700c9ad617
+EBUILD libzip-1.8.0.ebuild 2365 BLAKE2B 6c57e62c7250a30c118cb817c93b45909b3a36d2dad391b9ef4eda4dca6675c6d97f613d65e5dad6c316eaaa4474b74d4c3f38bd4ed708da1a746e868b26bdbd SHA512 162f4be08fd32a1f1805d721104a99d3a8a4fccba10132d6184c690b0ef190ac60a60749191450a3022f43f17acefcc22422701b45a3f08f7f60ca18d5291ee6
 MISC metadata.xml 509 BLAKE2B e5012e29cc2157f4cd37b19edbdd2da53377f2671574681aff241dcab50e22d39b8db7bce14b7085cf39e4adbe89c486047f3089a9f91fde3411b02de45c8284 SHA512 bfa09ea8c47388786ec4fa938fbb2df96c4d2bf936f1a2a79765bc178ac34a9d69c19a1be53eef743d49548e32ce110f3e4b9776932248624192d4b92b7525f8
diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild
index 85789584b71f..551feb1e5525 100644
--- a/dev-libs/libzip/libzip-1.8.0.ebuild
+++ b/dev-libs/libzip/libzip-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools"
 REQUIRED_USE="test? ( tools )"
 
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 48f88eb89a73..09309daa87b9 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -1,3 +1,3 @@
 DIST msgpack-3.3.0.tar.gz 508001 BLAKE2B 3017c44689f8afbf078b9c498449e21b4e3b87591c50a37bf9ae73869dab550819f24d6e5179a3600df297aa2c024e5a7fe1defcbab7c0f1aff826870de2ab32 SHA512 ad3e32edc8c6afd70282b3d4b493c2ffe74a697c41bd1f39030c5b4752cccefaa965bc049d4c2e63103a210bf714dc3bddd474691bc067d1475ae017593f55e6
-EBUILD msgpack-3.3.0.ebuild 1761 BLAKE2B 224dfca356b4a9012719919422b9abe375b960cff275795a48837140468e78fe17c1fa4f3cede049ce5b11abf7497df2c2c103c2d35371b6350190d5ec3c2275 SHA512 8e2cebdc9ce702a1dafd429052c8d818d40c722dab0493e2e33b61d41a33fbb5e5e5245993e426351aeac95befed2a4b03b374e54b0e83f0f0d69e5a881fbd46
+EBUILD msgpack-3.3.0.ebuild 1768 BLAKE2B b669aa0000a8b1dfda43f5894af551449b41899b2492072d9a8a72b4fdcc7987515950cbf0848daf9367facdd566b891cb0d7f860ce8b4e9eb5957902f221bdb SHA512 eeff49eccb4e97fa2d6f005b91224f0cf56df9c6decdb8a493914f45306ee95e9e1c440eefdec75d2c9046d7fbce9fa1081c40d50882308697ac6eb613bce8d1
 MISC metadata.xml 409 BLAKE2B 7656515e9cbf76555dd77ba3350bfc3720d685f061aa2a4c9ef793c7d0eb0dcf327bd707f00a01b0d2be706ec79d62778cf7266998457a62f4291ccb1a5de194 SHA512 f56436ccd3ab6d2d5cf453e4eaeb8e3b79cd8d89a73c1c0ff17c2a47b1802641b20e41d75a12ea161f0a47e0236c84425a02cf8bb16e4b9d5b406fba4d2f1ec1
diff --git a/dev-libs/msgpack/msgpack-3.3.0.ebuild b/dev-libs/msgpack/msgpack-3.3.0.ebuild
index 5fcb81a96898..0d604bbbc06e 100644
--- a/dev-libs/msgpack/msgpack-3.3.0.ebuild
+++ b/dev-libs/msgpack/msgpack-3.3.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index 4704d6970d19..6fb7cb25d5bc 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,3 +1,3 @@
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
-EBUILD ptexenc-1.3.9_p20210325.ebuild 1253 BLAKE2B 880c9b6ff562377692f06d55de173bea84d3ad25e23aa15d13c440c3bd3f9508467f5e440e9ea61ec4f303ebe05199d7860e03027d0ec98b01261fdb15ed2ac0 SHA512 473243a90a9374247ab6d3dc53a45991bafd665fda786877a48b1b8624260dadfd0c68fdb60dddb3f6188f965f37176bef1c3dfd1f5a6e0fc37ddc527ab5ca7f
+EBUILD ptexenc-1.3.9_p20210325.ebuild 1205 BLAKE2B 998e1bb4af98c42633ed898b32c06fc72f51da816bee02c434238a31c5e3be9840f3286dee114f0e5d73c749ea499ed6f30c3b7aaff2bb4c303a6596f52bce8b SHA512 4a2ce6738f81b53ed4988b12c5ec1e9226adb02467b92dc87f8150b7b7de11d98996f267c7e52065c275d973cb55476bb4d018d57019fe0de8928cc30b92d5e7
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
index b14b9944d1e6..4226eb4c86a9 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
@@ -8,42 +8,41 @@ inherit libtool
 DESCRIPTION="Library for Japanese pTeX providing a better way of handling character encodings"
 HOMEPAGE="http://tutimura.ath.cx/ptexlive/?ptexenc"
 SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz"
+S="${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="iconv static-libs"
+IUSE="iconv"
 
-DEPEND="iconv? ( virtual/libiconv )
-	dev-libs/kpathsea"
+DEPEND="
+	dev-libs/kpathsea
+	iconv? ( virtual/libiconv )"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
 src_prepare() {
 	default
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=377141
-	sed -i '/^LIBS/s:@LIBS@:@LIBS@ @KPATHSEA_LIBS@:' "${S}"/Makefile.in || die
+	sed -i '/^LIBS/s:@LIBS@:@LIBS@ @KPATHSEA_LIBS@:' Makefile.in || die
 
-	cd "${WORKDIR}/texlive-${PV#*_p}-source"
+	cd "${WORKDIR}/texlive-${PV#*_p}-source" || die
 	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize #sane .so versionning on gfbsd
 }
 
 src_configure() {
 	econf \
+		--disable-static \
 		--with-system-kpathsea \
-		$(use_enable static-libs static) \
 		$(use_enable iconv kanji-iconv)
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
 
 	insinto /usr/include/ptexenc
 	doins ptexenc/unicode-jp.h
 	use iconv && doins ptexenc/kanjicnv.h
 
-	dodoc ChangeLog README
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index a8cfe5f9cb82..445a6f134f34 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1,5 +1,7 @@
 DIST sdformat-9.2.0.tar.bz2 644484 BLAKE2B 2f6382414bd7d47bfafb66c8352e5a90cd236bdfcfc7c3119eab154b8d0bb5fddf2127b16e222bb90326dbf91f95b111643eede17ebe38f27bb164cf31d7f263 SHA512 bc9422207f56d7fd5f53249f856be5fe00f078e168d7e93ab10f5544e4963888cb7c0a1b1f449739e2490b0d5aad3c5a72d8408333dd6ae550b5d66f6bcde42a
 DIST sdformat-9.3.0.tar.bz2 648239 BLAKE2B 3dfedbcb7b52d3c9384f7a4b119b3e664b9e6bd6bd93bc5ad7a5db4228474bd3e6f8d98d1fd761f49386175e45b7083b57cee02cf4a930e19ba8ef78187af71b SHA512 16ff7643baf5738a1a833f1484c79566960c9093c4a3842ae82a14faca14feef34e7293fbc78c0fea78e8a1b1b9710414587ca5260c17562759df245d458b942
+DIST sdformat-9.5.0.tar.bz2 651125 BLAKE2B 08ca0e9df9620345905e5307b555fd72c106a59090b7d2fd8fb9cc32198d07fa31fa64e60a25dc47844ebc279bb6e3ad78e457e6ba563158404a3198222d08e9 SHA512 b96797df2a7f43b4d426673fad7dbc0a5e20a846a66d804c7c3eb01ec008b52f8bc119ae1e6062a4a748240fb7172c909fd1e66ac3b52f3d01bc5a347d734908
 EBUILD sdformat-9.2.0.ebuild 952 BLAKE2B 6f46f1735ee83f84243dfd9332cd394726bea3013373c59511838e83f4125bb488eb27046ee367daea372be35c1e25d30dffbd4a3d0dfe61979290c99fdf48b6 SHA512 1f7e0a34746133bc8faaa549d462b4f2d1027a3fc89773183a9beed1f39c67211e6f6c503408e3b9fea343a364730ad01f47afa8a01547b48badb8ed402800f0
 EBUILD sdformat-9.3.0.ebuild 952 BLAKE2B 6f46f1735ee83f84243dfd9332cd394726bea3013373c59511838e83f4125bb488eb27046ee367daea372be35c1e25d30dffbd4a3d0dfe61979290c99fdf48b6 SHA512 1f7e0a34746133bc8faaa549d462b4f2d1027a3fc89773183a9beed1f39c67211e6f6c503408e3b9fea343a364730ad01f47afa8a01547b48badb8ed402800f0
+EBUILD sdformat-9.5.0.ebuild 952 BLAKE2B 6c79ad8f8f87fa02dd88f32d63477134198f136815a12cf7ee03033b916575a11b8a93e83e270c69a35a0e7b49f7f69a75b673afaf459b746d522d970213bebd SHA512 9d8a6344d42ba5583faa6c78a57929a8c95cc4dc60b075ba56ddb3f332237bfe52854a60d2222dcd3673242217b023c54202e32f9261dabfdc0c522c1f98f9a1
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/dev-libs/sdformat/sdformat-9.5.0.ebuild b/dev-libs/sdformat/sdformat-9.5.0.ebuild
new file mode 100644
index 000000000000..7e9289e7fc28
--- /dev/null
+++ b/dev-libs/sdformat/sdformat-9.5.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 cmake-utils
+
+DESCRIPTION="Simulation Description Format (SDF) parser"
+HOMEPAGE="http://sdformat.org/"
+SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# subslot = libsdformat major
+SLOT="0/9"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/urdfdom-1:=
+	dev-libs/tinyxml
+	dev-libs/boost:=
+	sci-libs/ignition-math:6=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/ruby:*
+	virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_configure() {
+	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
+	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
+	local mycmakeargs=(
+		"-DUSE_INTERNAL_URDF=OFF"
+		"-DUSE_EXTERNAL_TINYXML=ON"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index be4a841faac2..01841f8e0587 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -2,6 +2,8 @@ AUX simdjson-0.8.0-dont-bundle-cxxopts.patch 1555 BLAKE2B 57634524ccd8db73214676
 AUX simdjson-0.9.0-tests.patch 599 BLAKE2B ac05983a3e8b1396554a4c962352afa39fbb46c53aaba95dae6bacd8c0f9b270499be3df7b82464d6f29a872e0bf9253c3d1a47d3d62727adb166388e2944682 SHA512 6e0220083dd6fcc1426a3d0b8250e8249e83868963e55e7e31221e3df2e2469794d73a59e3068722d20fb5bfb33c9d49ba5c9aa18028c8afd8a8d0d066f29a11
 DIST simdjson-0.9.2.tar.gz 7958184 BLAKE2B 7fbb3c85b5dfd2d18a09087f6c6e09437bfb8aec418eb219485b6f558fe117791b28e51a45bb416b677d42ca6d73d8b37381deee1aea4bd49fd132a16312a49e SHA512 6d546f0283b680da581b51bab86f7165abdab0a82d51e9c4a5abcf9a94e24059adfb63c8e4e8ef147fee50fc94f6a0efc4dba34dce499926e1da0dcd1fe63dd6
 DIST simdjson-0.9.6.tar.gz 7956235 BLAKE2B 8d1ffb96a937f859598f45232f1c55a767c4dcb401e1b15b8745df0b3b1907a9ecf3319080b5f7dd6deeac7c97b6b7ee608a98173c2c92794ea5f79ea0083b18 SHA512 bfe565dd00e95e1c5c409fce1ec2a8d88c83fc61d9f46265afc0254f8a37f241fcb5b0729bc5ac58695766e2a6cb05abbf93220fa21fd8fe34872ac4a538140c
+DIST simdjson-0.9.7.tar.gz 7956250 BLAKE2B 2fa04be699eb5573ac17db9b476ded1853cfe45c0993c9303b70bfd0e8e4343b69e4a02f21dac35d2c0255826bfedf41123fd635d36d48a08f74b28b5a6536ce SHA512 6f4ad854adc2b932f9926610cdd28ddda7fc1776b84a224adb5b337f81c92721bd11c8ab180897117891cdefe9c1ef14b9f062c9a1a2ebc5b5582c29cb656bf0
 EBUILD simdjson-0.9.2.ebuild 1185 BLAKE2B a3fb6be762829803a2fe3822452c19ffc93eb1e33711d02f61467d95dfc60fed93c24db58f86f868a0ffd842a8ad6e54e47dca2e1d6a00ebdd20273ce65c2c87 SHA512 cd5d0a75e28a315ffeb03f2c0716e5fe82b3fff11b506b0a45d4b05572a16cad19ed91ace2d78056d2a0ed1572c157ec541c1564b79613bb178fa733e4c95feb
 EBUILD simdjson-0.9.6.ebuild 1186 BLAKE2B 56090f52f079fe5c5a159315f5f8c87da717763f7da747388e8ec179ad46d00eb96ccc74ea960f85ef294d83e0b48d2192fff0ab1dea9d5509dd698d0e6ba6dd SHA512 f79c5daccefcaecec9a1ab7e8307912601b0bac6589172b20af4cf1f0995648bfd96c47971e543ed68af8cea79ca95dd7a11d65bfa22ba8b2ef2095e840ef315
+EBUILD simdjson-0.9.7.ebuild 1186 BLAKE2B 56090f52f079fe5c5a159315f5f8c87da717763f7da747388e8ec179ad46d00eb96ccc74ea960f85ef294d83e0b48d2192fff0ab1dea9d5509dd698d0e6ba6dd SHA512 f79c5daccefcaecec9a1ab7e8307912601b0bac6589172b20af4cf1f0995648bfd96c47971e543ed68af8cea79ca95dd7a11d65bfa22ba8b2ef2095e840ef315
 MISC metadata.xml 335 BLAKE2B cb4ee46df6139081ed8708a3e4c6f999cfd822a5c2c986aa90d54945beb0c09c60c1ce9582b876809032f096921f1b4b79d5a53197e89b765eaf060425fc9279 SHA512 654e393f40c10289bca4d8afae54e4ca987e963a8a5b0f86e7976176d45d5c12c19b9830e7d275de7eabed8dc8d3325b6b581ac9cc694e64e6c39b0762081d32
diff --git a/dev-libs/simdjson/simdjson-0.9.7.ebuild b/dev-libs/simdjson/simdjson-0.9.7.ebuild
new file mode 100644
index 000000000000..ce97a46f1129
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.9.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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 BSD MIT"
+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/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index fd995f4ded79..ea3214e68923 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,3 +1,4 @@
+AUX 3.26.6-plparser-Fix-uninitialized-variable-error.patch 1002 BLAKE2B 20af6936f47b2b1932417caec381df50bf503eff6e5235b1edeb4645dfc248358fdfc528016bcebaeb47f14f0cb99bd6a69519ae0a1a6e82b2629316522922e9 SHA512 65d015cb956c5f0b82bb2436309bbc35535d3decf7d8de4730fa3d41abf4378131756d09b536d3a16b9581c7e76fa18e795976753e90e91edea76428281f9386
 DIST totem-pl-parser-3.26.6.tar.xz 1503888 BLAKE2B b0768f54c77ff902ad20aeaa9162c616e0cc64ccfc2839d2db2e4c9076f82a611baedf127b0b74f84ec8698a5adc25c43fb9245dcb26a221da7024372a61896b SHA512 1a7aa69e147b55c3c9761328604821a7e40bac4e7b82492e5ce1b2405e3b6d5154e3b06687f2446ec923b34bf6ea96eef179ef8410c005a061d448fc6b3e754e
-EBUILD totem-pl-parser-3.26.6.ebuild 1915 BLAKE2B 2b78c72ecc6b92e19341cebd4711652f011d709eb4eadb0776125e91278cb1987934ae456e1c3e819ac02b5757b298d0de662453882bc71891d892d942c616cf SHA512 fb6a300a858e0706970d0040c582275b9e08dfcee727ddcfb95eeb5c0b15b0893f1334aa3937e91df28d9bd952bb728ae019c16305bd326abfebe0f1d83a467f
+EBUILD totem-pl-parser-3.26.6.ebuild 1997 BLAKE2B c55ac333eb56cc12a944432861d0aef8ec3b7985d42ac58359616407d08566e37208b311d287bd7eb9c3b3a43a94c9262e4c772dcc01f3dcebf34af5e83763ea SHA512 5e3008ba45fe4554dfa647dac2a944a2ed725d3c55ef3adbdc16854368c49c3e8e7800a126bd326b806d47fef84bec04d4f6fceaa737098471d7f73b531c9e39
 MISC metadata.xml 526 BLAKE2B 30db37331918665359e8c621d57d4aef8867db09fcbdbdecb67f5a3cb2db6d3044f1c04fb73258b5ac9385ff498f4aaf03fa9084190285306e7a2f05c326be6e SHA512 6d2a0e101a7464cf7089a03bb85d9e38302c55a360a83927ee44865962147197116966db0fa7d19fd169c7a16f852d6bda1fad17efba3541ef0a4c46149254b9
diff --git a/dev-libs/totem-pl-parser/files/3.26.6-plparser-Fix-uninitialized-variable-error.patch b/dev-libs/totem-pl-parser/files/3.26.6-plparser-Fix-uninitialized-variable-error.patch
new file mode 100644
index 000000000000..1666332f3533
--- /dev/null
+++ b/dev-libs/totem-pl-parser/files/3.26.6-plparser-Fix-uninitialized-variable-error.patch
@@ -0,0 +1,30 @@
+From 87fc47f6d992b65d2baaa987bb985bc388457a9b Mon Sep 17 00:00:00 2001
+From: David GUGLIELMI <david.guglielmi@gmail.com>
+Date: Sun, 11 Jul 2021 22:41:42 +0200
+Subject: [PATCH] plparser: Fix uninitialized variable error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Build failed on systems using -Os cflags with:
+ - totem-pl-parser.c:1776:14: error: ‘ret’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+---
+ plparse/totem-pl-parser.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plparse/totem-pl-parser.c b/plparse/totem-pl-parser.c
+index 404deb3..32fd435 100644
+--- a/plparse/totem-pl-parser.c
++++ b/plparse/totem-pl-parser.c
+@@ -1760,7 +1760,7 @@ totem_pl_parser_glob_is_ignored (TotemPlParser *parser,
+ {
+ 	GHashTableIter iter;
+ 	gpointer key;
+-	int ret;
++	int ret = FNM_NOMATCH;
+ 
+ 	g_mutex_lock (&parser->priv->ignore_mutex);
+ 	g_hash_table_iter_init (&iter, parser->priv->ignore_globs);
+-- 
+2.31.1
+
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
index 41eae294ede1..294cf0ed1422 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
@@ -36,6 +36,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-plparser-Fix-uninitialized-variable-error.patch
+)
+
 src_prepare() {
 	# Disable tests requiring network access, bug #346127
 	# 3rd test fails on upgrade, not once installed
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 06d5f394b4b9..174778d767e6 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,3 +1,3 @@
 DIST uriparser-0.9.5.tar.bz2 176501 BLAKE2B 5ec3d993e60c62f2478e4012354cf82f2e4155ea1a69e9a3d6611d1765fe0f3b8ba5382c928852a5fd215f51ebb0688c9d713e9f1208f18f5ce2d8b8f0fb1dca SHA512 44d36a33565b7724d721e2b5e689530227bc87e609ee78f1d23e7353480191313b1b91039c7a046566d14b83eb320c97d75e74c8ef4841e1b9c8559c3feddb34
-EBUILD uriparser-0.9.5.ebuild 1409 BLAKE2B 0e43acbd9931b5e77508787d3783370949ea8c8dfb0291888ae6d77d064d05a0a4a8bfdf2cc3c32ce8a856c34df39bc0f69b52d42499fccf19dde0afff2358a6 SHA512 42e5a7f98eaf9d9ecd831fc0c2c967254840aaf37367635d5e9820bfb7573f2a47517375898c3da634345acefe1e7aed2153b61bdbecd6792b79c5a82d1663a1
+EBUILD uriparser-0.9.5.ebuild 1408 BLAKE2B 3cb84c56f0572692bdab1b579f47ed492d6db3e368fcabf5d128f414a1a9e3c9c32d6e2e6899d9c441ebe7dcd2faa5a03e5e95211b595087f277d3f6903d7e25 SHA512 e6dcd85c451b8ce0e2afe455b121cb8ce09002e7738792d405f6668131a36fdc22de3abab2b75c568c0c14411e9b9bacba86857497703ad3563a2780075c90f1
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.5.ebuild b/dev-libs/uriparser/uriparser-0.9.5.ebuild
index ffb70dceb648..e300d61b8425 100644
--- a/dev-libs/uriparser/uriparser-0.9.5.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
 
 REQUIRED_USE="qt5? ( doc ) test? ( unicode )"
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 5d42cbfb8d62..1864259d7668 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,5 +1,5 @@
 AUX volume_key-0.3.12-find_python3.patch 894 BLAKE2B 7173a00937a78c2b883d554e7c14ced4502088c5dee3af0378f13091aaf4133e4c899df60d4ebafd8c3f629c6020fdb17c0d61afda7e6d87a9c05b15803a4361 SHA512 bdbdf24f9a7e6b0db28cb22e831af898e4faca26b51c386835ab8dd74c0d0d79d261fa47ebd18213fe24424fd0bed54836fec5f3993a908ca88a720168768c7d
 AUX volume_key-0.3.12-support_higher_LUKS_versions.patch 917 BLAKE2B a637ba7d7761032bbbae34378a1cd8da57cd96c762ebeb50fce0ca28b7b154df11bda89af203d18833e7841fbd9181c01ee5fcb11d80d765fd147e82440becca SHA512 e784115d85f782db46dbd67c40c3a6b0864b69ce8d13b6a67d70471d39079e9fc0d9d263bd543556d645d7dc922ef22f641491051dd736128cdaecd63df2ff22
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
-EBUILD volume_key-0.3.12-r3.ebuild 1157 BLAKE2B 45eac95546cc99a8540679aa6595eeb72e83e8c1e4ad5851b254ef64c864ce51b3e58e142e6b97e084c41335e4048fbd2ed70ecbb8589e79b3386c8748a10470 SHA512 e937c489a9b2b3586861280077e7498622ab2944ed89f030482378cf6569a0d8c363666aeb424fc0c6c0d41261fd2b52ae73b3dd781703795e7b9f9ec00fb326
+EBUILD volume_key-0.3.12-r3.ebuild 1164 BLAKE2B e527efaca8d8f5e33d58b3d85cdbd346ad2c8fb39afbbafaca8cb16e96fc95e0eb7b4ba417f448853d2a21c7057e9d39e794a65eadc3d30246f008b5766a043d SHA512 850052e4394f40d9ddda66949f82f89e0b2794975befd8d7a590651bc2f607b8b29cb40059c5863290e6a9feaa40cd51e70648f2ca0520113e0a7c73cab9406e
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
index 48d7d08b27d2..b2489cc3917b 100644
--- a/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools python-single-r1
 
@@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 7b34c54768c7..52aba362c43e 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index df196e6c8d25..47d0bbc82382 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD llvm-ocaml-10.0.1.ebuild 2991 BLAKE2B 8f6847347faf4ba2afd66e3b2f8052b27662a9db05ca3d03e5c1ba44ce77ef9731dca1632e21a5bda21ae963531d85db9633f92c33bb9713e0a4b9fdf19ea775 SHA512 2d43e10b0a15ea9b438f93a15bf32575e2d111eea1954c8c36f7ce949774055ee720d448cfd7e08a7627539ca8095d81c8f65e69de926475b8f40d5dbcc75db0
 EBUILD llvm-ocaml-11.1.0.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
 EBUILD llvm-ocaml-12.0.0.ebuild 3059 BLAKE2B a3a9b1a45127499e7212d30ce699c7a23229895e0e4ac14fe5f9e02d1bd401350b6f419eada422cf66f9301dc180d16ad126e43267a4ef7db797eab184dc7eb5 SHA512 2208b0de0343ae1d33385226eef2e5bef2185a3799a30ea74094c5b004d7b9d7f97f73a97191f46ecc6d3be5b05d647300e0eab5ee5b4649051a98135b2bfa91
 EBUILD llvm-ocaml-12.0.1.ebuild 3060 BLAKE2B ed1223c503df5487c666642a02df41095eb724b46a79c1204f8ce2ff6b9eb650fbb46907d00e721c1ecb5df6648afdefeca6dabca456ab54656fc45871beff80 SHA512 57cdf97cf5a401a5ec33f15f8fb1c83998a7503b4ebcab1c2e35c2b35519d9b30f4b25598ddc2f8e6757f6de42a6a5878ab43e50fd45f1df0db6549a204b1680
 EBUILD llvm-ocaml-13.0.0.9999.ebuild 3049 BLAKE2B b98f105c8171cea5be884b9dcaa58487d659ac0142c9d5e92d5b5cc6f6e338e6e8869a4a4aaa05078b4dc7185c87ecaf2fcaf4c5371974080358707801a422bc SHA512 846c778216f2295fa8ee87552317dd9260a87f39261bbee1e81a1d636d500fe57ac48b650bed6711db80ab936cec6a0a8c689a177ff7bf8227ebdfa048cd041b
+EBUILD llvm-ocaml-13.0.0_rc1.ebuild 3049 BLAKE2B b98f105c8171cea5be884b9dcaa58487d659ac0142c9d5e92d5b5cc6f6e338e6e8869a4a4aaa05078b4dc7185c87ecaf2fcaf4c5371974080358707801a422bc SHA512 846c778216f2295fa8ee87552317dd9260a87f39261bbee1e81a1d636d500fe57ac48b650bed6711db80ab936cec6a0a8c689a177ff7bf8227ebdfa048cd041b
 EBUILD llvm-ocaml-14.0.0.9999.ebuild 3049 BLAKE2B b98f105c8171cea5be884b9dcaa58487d659ac0142c9d5e92d5b5cc6f6e338e6e8869a4a4aaa05078b4dc7185c87ecaf2fcaf4c5371974080358707801a422bc SHA512 846c778216f2295fa8ee87552317dd9260a87f39261bbee1e81a1d636d500fe57ac48b650bed6711db80ab936cec6a0a8c689a177ff7bf8227ebdfa048cd041b
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..d082ba50ed27
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0_rc1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+	test? ( dev-ml/ounit2 )
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
index 4d089065a99c..2bc26cad2719 100644
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@@ -2,6 +2,6 @@ DIST parmap-1.2.1.tar.gz 47069 BLAKE2B 85d67aacff70c9d8b70c73e4673486804a0d0a4cc
 DIST parmap-1.2.3.tar.gz 47481 BLAKE2B 3c65448d244e6079444912ffaaea35982d44123f6259c2d15b7f1618afd10c79972f00f7e2744da270b298f4bca090c34c96e6e36638f2aaabba4ed774af24b5 SHA512 f050492ae1c5fc7c9d0baddaed44ea9920da7d2a5ed6455e93fd427648037a5e00051b6eaaf982174d88ed4de9b0123a1c4eff203f1ba6bef3384b5c7e2952c4
 DIST parmap-1.2.tar.gz 47083 BLAKE2B e790087273fcf749b000c7ad3a2f5b2cafea91c529e3a4687b1d882d203cb43e4069a42675319c27878d8bca3fa0e19af96ab1dfda8df3967dc48d28ec542b91 SHA512 69431e146e8aa01823ae1583c6a5e7753436cecee37c3da3064a836c20cf8c6b9033248412203406d03bd4efdd957b2e118ea5c5866e3bd1f668d8c4fd48777f
 EBUILD parmap-1.2.1.ebuild 608 BLAKE2B 92d88cdfa1a4b8d99d84592c40953d3188669e6b5720d4bb18b5fcf27e35477244085b841968cfdb612668c7447e2e77791a83e877339f8567080738899de8a6 SHA512 ebabf3baff2fa3ebc2776e280bfb6fbead79d5f0f4f4f476fe2de10d38d7e64af6896d315e2eb77488352441a3fc0d87d4267a3cdadbfb38a8047d1899845712
-EBUILD parmap-1.2.3.ebuild 606 BLAKE2B 7e0e4999f2ead10108b27165ad7eb25f14fdcb1072c20112ce08c24bcde764e5725604b21cccd91d4f36dad6585a2bad6039451611d5ec9be19fd209f3937382 SHA512 c6ea3ee713c4a6af92346bf34a31dfa8b6e85eca1bb8f39041fb3e6ab2c19691980b4f4f7f13e7f2b25e60cf15d3f3608357adab4024e9ea5bd92f82bf7eeb26
+EBUILD parmap-1.2.3.ebuild 605 BLAKE2B faa09884e58a0c314c0b2da9db6c0fdac422a91a5188680bcf60a18afda475ed147a11b821f916811d22e1fb9091d2e1ad1f96891704d9733710f4c09cd409ae SHA512 20feb2387a081fccf1f9429f5230da9d651ad48ddff836bd9414564d8b4ede11a7d3d6bd3ed675ac642d778efe5ee6a1125b137c970dec82285f13b0a0cf9b72
 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.2.3.ebuild b/dev-ml/parmap/parmap-1.2.3.ebuild
index f121c81a3f1e..444af768d02f 100644
--- a/dev-ml/parmap/parmap-1.2.3.ebuild
+++ b/dev-ml/parmap/parmap-1.2.3.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/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index f9d93c2cea2d..f045f17000c0 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -3,6 +3,6 @@ DIST ppx_sexp_conv-0.14.1.tar.gz 49857 BLAKE2B ede55963d995917bd0c4a1464b58f8584
 DIST ppx_sexp_conv-0.14.2.tar.gz 49876 BLAKE2B 32109eb6300894156f91721a1c74e94803106cf8a9a9326bf815d3094e166ce34b19f3d28b770d381ca3ce32227a80b15baa61e6f9c2d0082c47b87678c0f239 SHA512 d0121770030da142fd559b5f8d52d4a029d032c5ac9c79bf235190e0aaff58e5cce0a5ca5f198ca8a112e0970ca27ab18d4f201376ca6b799b91d71deb915f25
 DIST ppx_sexp_conv-0.14.3.tar.gz 49886 BLAKE2B 9fda18267995cdd8efb9dafb069df6a51106a800b263f4c94129957a3f23d2bee72f39382623a320cb09ea13c255000ecf9670c19ccf49d55627c02bb0912224 SHA512 7de81d64e7eeb4d6097134606411830dd066f94222ed320a9c32752116961806ccf807f802e07c522c32aa6f7c20bb901804612a0ffc1b14807903c92acb2f44
 EBUILD ppx_sexp_conv-0.14.1.ebuild 722 BLAKE2B 56e8596dd6063a6ff69d82c8ca862357d25034add0beb42c4d5e044b0cc95de73c5cc93ceb4c8999df1a1eb3e0f8c11f434f4d1f1cbce157a476fc4c5491bc7d SHA512 569f6c2990f5197e1298ec369aab259143be88b267a0136b3702497fb36d00bebe761f0c443a528981dfd5b2239332d066d86945c1e29307b65be83466e9087b
-EBUILD ppx_sexp_conv-0.14.2.ebuild 707 BLAKE2B e93cf87a55d8e7e770150d6c07a9251024867b477e21df2c20a0e3d2a8ae0f57cf76957401bbf0a185a667ced27062517c7d1ffbbec463208e8685d70e907a41 SHA512 421055d2101d9fc624b05d027588f9d91c4d21741686bf665b3d70bd60f7057351797da46309f905ca9311a2819630f38258028e01e523c720a448c7a39d94c9
+EBUILD ppx_sexp_conv-0.14.2.ebuild 706 BLAKE2B 15aaae9c03b97fa49f8d8161ae9f524b21d6ecc783688362bf782a8a71d8a4962e1cfa355b1b690fe17818bca9a185c2c2f2c28a247884b8e741cbdb1338164b SHA512 78c833ca8d6c97feea80c236f01efafa9f29224a1db57411182b04b2a1f6109d4c149e32af34bed31cf6e3b3d16431af8c2c4a35f2b8de37e648e402171148b2
 EBUILD ppx_sexp_conv-0.14.3.ebuild 686 BLAKE2B 791c5c21e22e2369d8a2020131e683606edd0fec0e3e37254b2e94cbe69f3c0e344d895d1c0d04ecdf573a429a992af48ff155b0139fa6b23adf530f9904db96 SHA512 74851675ca6d1c0a691588c415a7eb6ec69f7fe9394e283f3d5c98142cb1a4b33f2b493b402ded4353ecb2b18912b797ee61ca6be03e43ec4aa489c85a45871c
 MISC metadata.xml 426 BLAKE2B a3f335ad820fa9f62edfcab410b969c88ce8d17fab45f98700c98eb4314ecec2289681789689865f1b7bdec8317260372b55894213e4054b3ebea6e35d483e37 SHA512 086121552fc62e22d63cd4861b961916b084706c62f40f7d6ea7f6db40a250e026ba072b88a7315fdecc53ffcf380668af4257b96fcd97f9fb28686e46163d78
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild
index 426c7be12542..6f07d06be7e8 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 # Upper bound on ppxlib for bug #769536
diff --git a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild
index e4c142786ede..3b5b482516ee 100644
--- a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild
+++ b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.170.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Install the C libxml2 library on your system"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Alien-Libxml2/Manifest b/dev-perl/Alien-Libxml2/Manifest
index e8800568e6fc..571ea930414f 100644
--- a/dev-perl/Alien-Libxml2/Manifest
+++ b/dev-perl/Alien-Libxml2/Manifest
@@ -1,5 +1,5 @@
 DIST Alien-Libxml2-0.16.tar.gz 19890 BLAKE2B 50ad3fd53b392de730a140fef350a38cfd2dec069354a45406a524ec1daa8a46cdba2398c20cd29ff6c9f8a2c52f7307130d1ad7d477d9a3b18c1c87a072d827 SHA512 54d3f670047b26934140be28bec5ab27c655daa459409bda00655d6f652f5099b07d2e286f59825a36e7dc56bca1e92a0af19c33582fa90f3f26aff4202334ac
 DIST Alien-Libxml2-0.17.tar.gz 20787 BLAKE2B c9ef905cdee44e649612cf54ebfa0875c8eadd278d17584c71db005e7f1eed4a9df00bfa83739067334828203d1159ee97b56461facf40364fab17b90a4c4474 SHA512 89f8034800f03e9e7f87871fec4da54313d0b2557efd9c4bbb2f01793e5679c6c355eb8bfcaf54540b50f9cf69e84d88835fee9b06f8b2f6c7dd7e6c6ed2c097
 EBUILD Alien-Libxml2-0.160.0.ebuild 646 BLAKE2B 8496be5d0c14508c8ec35c0cb936dedde65fcdc952cf1d3e5005ec67f6ba1a442930ef364f36be6e747868dd632d1141878f062f391d9681f9dec1924a628d7b SHA512 725b6855829e122cd28ccc029ef648e008c8e17ee6d224cb5b84a750ac18ec2af032ca7c668cf0cbe91b44b6cbcec20df4115943fcf8f459ff544b36527395b9
-EBUILD Alien-Libxml2-0.170.0.ebuild 651 BLAKE2B 8a9e1d0fc30e0da9cd1f91856291d18170bdc1790ad4afce7c9cebad86f34f100c7bffc649afe151cba09df04662e26f3ceb2f723174bbd4cfff8fa1e3f22cd2 SHA512 35a49dca7bda2df33070f1ade1e606bad9d738d824c92b5aff1c513f0523529bc3cc060a29292929d9c1a10397c2a483cfc6259e373e3036bc57217f36ee6045
+EBUILD Alien-Libxml2-0.170.0.ebuild 646 BLAKE2B cde3aa5dbce771e19a78e1ec481ddbef7d3c757b91bfba5078ff165ec64ccfb9a9b306f09c353faccc31980b0b2834f11aacbcae1de5e7b58ea04f1f906a7b00 SHA512 24dc94a6f5a0612ea3e78e9c98e907cd8a4bfdf9849302beba98e2cc74f261ad472f57e25e12bf6080451cdcced91c4c15423253b102d4e4dc300d7f777cdcc8
 MISC metadata.xml 398 BLAKE2B 573fb504b4eec6a5e7768737ea93806ae4bc6208333e12d20cce0d26ce0388744d8a85f5ccf74665d37698688bbaf3d7c7a02475b54985e07f21f384f895ddd2 SHA512 92051468292aa25af81ada3e1482231921087d51be86df605c843a32de4ecbe42606da3abfca48f86d19111c2b4d486d65e867be8f3dded6b1e8bc764991c787
diff --git a/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.80.0.ebuild b/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.80.0.ebuild
index 6483e836f47f..6922278eef17 100644
--- a/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.80.0.ebuild
+++ b/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.80.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Interface to FITS headers"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Astro-FITS-Header/Manifest b/dev-perl/Astro-FITS-Header/Manifest
index 3aad506f8752..1069a53f2342 100644
--- a/dev-perl/Astro-FITS-Header/Manifest
+++ b/dev-perl/Astro-FITS-Header/Manifest
@@ -1,5 +1,5 @@
 DIST Astro-FITS-Header-3.07.tar.gz 105979 BLAKE2B 0193f6691aae31134e2537c328a0aaef501b1ac4289df2aa825f28e01ade37338d34ae3979f0d71c1d6706e5cd567cc158a5560b4002bdb8baf192109ca64fca SHA512 21b72ca2727fd77c6da01407ab97ac1bc3bfb4f6864d7a4728fa3f9cbad07b64ca20445bc8daf6c34a3523ab16a2b688cf99936157a41f36147b39f05a6c1f90
 DIST Astro-FITS-Header-3.08.tar.gz 116038 BLAKE2B 1b8b96e7a352634083322746970cf60855b81ec811fe82eddfd7b49bd037f660a292d9656bdfffc89b19370424ca1e8f343d7ab4a7c2c0dd8c457b0eab0ccd7b SHA512 c94a9da46212a2db95c1ce32da2609869bc85687c236919791c16b06f1787311ee3ac3323baece790c04d56818754c6f487b15c20487ded9ebe61bf97cc11c29
 EBUILD Astro-FITS-Header-3.70.0-r1.ebuild 453 BLAKE2B 1a1f02ac4777deeaa53e49e9968625b4de91f96f485eb93a6cfe71fa4f2ca6fc88bfc7282eb943e9b720d3cfb54d28e95e0f79c795ab7b4964bdc714dbe4c247 SHA512 331e409d797bb1710fdb11c4e808fc073b26fcf73e4aa0aeeaee3ecf26836c9ece2a751131329dda649e7a889806964cc403b198d94ba2748170c143a3e9fbcd
-EBUILD Astro-FITS-Header-3.80.0.ebuild 427 BLAKE2B a77288a5d014b07a68004e3c7bfe54c17e724655acdf55a81e55cdceffb0c1ee40701dbceed99f7c639762cf010a9bc4059576e4927b0f15b5d849fe65b90fa8 SHA512 5603c4d286694e50715dad0c561766890b90967ab3361002240ff8072fcfd5471e0526fb8bfbcf9f08523e4e8ae61b626666b4c5668ddf644701bd27087cd265
+EBUILD Astro-FITS-Header-3.80.0.ebuild 424 BLAKE2B cc010c122ec56faf90f8246205a0c71524fbabbf21903968476fe33a2fb7420c4e405e17c33f6ec5a08e767616f9ac8ece0060c60dacda5efb93727ec89bf16e SHA512 142b4d22acb26bae8d01eefb85a6f3516e3eb92a53d8561737f1ac425cf97ebcc8821becb9106be366c7e5cf977f3b49034a30345a7efe5038f81cb2e5d9007d
 MISC metadata.xml 843 BLAKE2B 76e91f5ecd3e1b2b2780a3f699552d0b1310859fbac1d695abd8234e6aafb621c8a1cdd5aec3f12e02ba0944801623aed39024355dd536f9303cce52883c68fa SHA512 a13eb0a2f1a21cb627a6f84224422e7fee029004d14c9f8b1bf4a9d4fe3712a16b823fa70dc494770a1397c8827060b1028e52e67356fb276529bfcfce861392
diff --git a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild
index 4a6e504d78d4..8a52c306686a 100644
--- a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild
+++ b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Wrap OP check callbacks"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/B-Hooks-OP-Check/Manifest b/dev-perl/B-Hooks-OP-Check/Manifest
index 96bce23dd90f..62b3befea298 100644
--- a/dev-perl/B-Hooks-OP-Check/Manifest
+++ b/dev-perl/B-Hooks-OP-Check/Manifest
@@ -1,3 +1,3 @@
 DIST B-Hooks-OP-Check-0.22.tar.gz 76535 BLAKE2B bc0c6b7b057fab226ebc44376eecc26efd58b699ca87588dfc25d2f539f955f6e657a4e206430b80fceb5039d3203af75ace76d0e86b85bc734b8befaf0bd9aa SHA512 e68b08a34244afc73d7d3b2b0acdf8fe791b0b1f087b6b0496da0a1e655a9e51552ec8fb0f743c8626a0414fb469a2133d113ff5b4ba9f96217cc87bef877542
-EBUILD B-Hooks-OP-Check-0.220.0-r1.ebuild 747 BLAKE2B 9d7e7d3a0c3e60dfff76fcd34df3fe9bd7ed711de9001ca59ba4b8ede3e971fc37f5906ae52fc527f6484f6de0bf2d4ee961f754a2c3af01431ee7664f4e3c49 SHA512 4ddb3145e124dd503d1cad99b8bf31859e7b149f7708f8c490d5c9d60212f375648faeb60b4f04b7cbbfd3bdbd35b2a561d126fcd2db74a800e35214c05aa117
+EBUILD B-Hooks-OP-Check-0.220.0-r1.ebuild 745 BLAKE2B 8486a1880ed169512abcc3a3d23c688ca1df3facb4d58cb9fb1a26f183418da83ab690203046bc7c3e1f2097448a2d60cd7fba54e4be8ecb4e96200d20238d42 SHA512 74685b9617c0797f62365f901791b481c4df84d81da51bcef7bf8ee283b0dbcd5e0c29b7dc766dcdb58221b4dcfb6daccaf73f934de4f3643595923b785e6880
 MISC metadata.xml 406 BLAKE2B b4956eb9a09808b0d00400a10debd60ebe56f1215212e14528d468144d1b119a0dcf2404aa07317f42222d7b0ab8760fe35759e700cc226076f2de44cc382377 SHA512 568d5590456bf5ea48ec90100403a58a2ced82657bd876d6850571c49fd932b438f882b85bd6df6552a1129c585db8bd8c32b1870da7f44ac3fa211ccd3bc57e
diff --git a/dev-perl/B-Keywords/B-Keywords-1.220.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.220.0.ebuild
index 74169f8025df..b70a8e602d05 100644
--- a/dev-perl/B-Keywords/B-Keywords-1.220.0.ebuild
+++ b/dev-perl/B-Keywords/B-Keywords-1.220.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Lists of reserved barewords and symbol names"
 # GPL-2 - no later clause
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 BDEPEND="virtual/perl-ExtUtils-MakeMaker"
 PERL_RM_FILES=(
diff --git a/dev-perl/B-Keywords/Manifest b/dev-perl/B-Keywords/Manifest
index 3f0763af3479..34c75f1748e9 100644
--- a/dev-perl/B-Keywords/Manifest
+++ b/dev-perl/B-Keywords/Manifest
@@ -1,5 +1,5 @@
 DIST B-Keywords-1.21.tar.gz 12349 BLAKE2B cf88796bcd9a1c9b324649188b61eb1939396b8e7cc9aba7ce62702c642b9f8fab04c6733b377f0914827417e35ff5aa3d7360d70704b8f20476877c8f55b430 SHA512 80965484f35b21478279664aa6d0bf582a8cfe684469b944b3b514edb706bd8d1a4edba37d567badd581ce0a3ee23550fcbb93c1681665a36d02fae1a0cf1d96
 DIST B-Keywords-1.22.tar.gz 12417 BLAKE2B 4cc51674062299a3776e395910f5d1ee279a5bde68b35adf867ea263bb225487ba85e5100e1474207e7fa6ac336d8bc880990749710e72864d344c51097535e3 SHA512 9dd44cafe4502edb519d885d74688183275550c3ad4da61387e805cf7a4789434ebda8f1f71104515c688e0e0358ca38399a1d1bd2ba066c7e1e3de76ae68bb2
 EBUILD B-Keywords-1.210.0.ebuild 550 BLAKE2B 130df41462b59dce8b2fdccc6d31ee49f2360d086a1721b235ab2f6377505bba3579691175028bb5c314934860670943f16a3c4a12814b7fa4ae011abd066d0e SHA512 738b2b1a79caa04e14dda7d410f05b6ecd0b362e6306b8a4778a784ee784d42b9a679918f0897775a62eb776f65c2c8a8fbdf54715f961c621abd9498ab4d0fd
-EBUILD B-Keywords-1.220.0.ebuild 553 BLAKE2B fbe694cf9ab0df09782c3c4ec70a34027356abf25d5da96cf70f1ede0af89402714d2ac6c2bf70784f675b9b422ae513ee50bb193fa2a0eb92a08570e296ab6a SHA512 f444ea6ca33faef103a37ccd564cb927c53750fa1f6c4b04781299cae8cbb10f4e6d6958c564d659df2b6dfe8c8a0e8f023ab59ac87009e2e6effe3dbd62ba5b
+EBUILD B-Keywords-1.220.0.ebuild 552 BLAKE2B c8a92e27df93556b7bc1cd9cc60921818ae4d12a5119e276fc418c1cb4f131c955b912feca6433dad27658b2cf89aedd0596eca979042a31ace4346e66c1747c SHA512 13c91080006f4363ccd4a9e080d9f0a13164ec7c980023003d7b94b6c60ed3d21289b0c9555da0ec5d00cbb5943432f94f73c5a7dc09c9e3922080f5bf75c74c
 MISC metadata.xml 392 BLAKE2B b8d12e7f59af5510b05368c9873c7c3390cd634c859d68e48ece440aa0dcfd953767a20c94b8f6a8223163a68adef750196d1f11dd8761f6341664a727c893b8 SHA512 db120b73badeb1b6de7f1a4d4a7b70a5d4d1f763c784e04a548fd49ccc84620283cd4ecc4d6a0b3a258de07d76dfc264e40234e1e93fe79e10449669ade41073
diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild
index 67062d8ffe62..a5093a5bb058 100644
--- a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.danga.com/memcached/ https://metacpan.org/release/Cache-Mem
 # Bug: https://bugs.gentoo.org/721730
 LICENSE="|| ( Artistic GPL-1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	virtual/perl-Encode
diff --git a/dev-perl/Cache-Memcached/Manifest b/dev-perl/Cache-Memcached/Manifest
index a855157db19b..27871aff9211 100644
--- a/dev-perl/Cache-Memcached/Manifest
+++ b/dev-perl/Cache-Memcached/Manifest
@@ -1,3 +1,3 @@
 DIST Cache-Memcached-1.30.tar.gz 20643 BLAKE2B a9395edd2fe803183af74810a2fbbc4c366d915b012d73269ff7edf21c584e5a04f082eb8bad5738b72b24dfd3960839b605b78351aa605c0255ab762d0dd614 SHA512 050cb8a764e4709fc8b195ca8bdf3012435656e285f45f569a4daaf687734f37d89043b12cf300b0b33d39179df5ccab8246e8ea613b1a41f10705d858c41ff8
-EBUILD Cache-Memcached-1.300.0-r2.ebuild 875 BLAKE2B 14d178c7d03ef88b9d320dc00faaeb1758091284e0d3f73aeba01a8b8c6d19f27c9da928c2e0a31838b3cd46ab760924e86da0e10ef634fae82177a081695b19 SHA512 94b47d5e6710ca7a502e485018fa64c191451664f671bc1f8f2fd6117560566f8475e84912581072c9d46328e8f5c3bb534afe99530f1f4ad47f52274b950dab
+EBUILD Cache-Memcached-1.300.0-r2.ebuild 882 BLAKE2B 19256d0497f5e21cfa7fe5d82e996ecfddd10abfae2a743bd027ff1759b76a1c5b213618bb39ea7b87397e1d5a20e5ae0a5adcbd967ad15ae9827248e3df51dd SHA512 4bdebe893d19550e07c51aaca41f9aac4e9cc21c6f1249dcc96937125be8ff91d39a50201a5250dc5b544d0234285c6f98ae80b16f4cd9227db3c1d7c90a1863
 MISC metadata.xml 476 BLAKE2B 17e960c1b6a4759827c58b04aa81d5ee3e04ff561c4481d955e5de553f862199049624c22cc60c15921c3c554cc09517335ccd02bd655358290b3d5bf1bb8cbd SHA512 59c2b067be38588303650ea92c6a8c457f8dc1c472ca69ee80e39103c98d16317de1788ef0f43c724d7bcf18dfc41532becc9109a13d0c34aaec0c9dbe41c215
diff --git a/dev-perl/Calendar-Simple/Calendar-Simple-2.0.1.ebuild b/dev-perl/Calendar-Simple/Calendar-Simple-2.0.1.ebuild
index e8229fdd518c..6cd06067f6ae 100644
--- a/dev-perl/Calendar-Simple/Calendar-Simple-2.0.1.ebuild
+++ b/dev-perl/Calendar-Simple/Calendar-Simple-2.0.1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension to create simple calendars"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Calendar-Simple/Manifest b/dev-perl/Calendar-Simple/Manifest
index a6f1fe7a861f..e8cd48d74827 100644
--- a/dev-perl/Calendar-Simple/Manifest
+++ b/dev-perl/Calendar-Simple/Manifest
@@ -1,5 +1,5 @@
 DIST Calendar-Simple-v2.0.0.tar.gz 7024 BLAKE2B b86153bd0d50b14e6910bc0bafe5aa8c7343112c2538001714c62de3a2926a1b98e2cfbc05289e7fac702e638c5ad6090929baf611e33366bb309bfb5ae231ea SHA512 2e9e16a27d254cf68e38be2ee1715e1f8d0d3b224ed8fb1a2a5e56ac172a25f67beec08b7a18bf0bf69a66a3ed7d94d058faad46f3a266a24e2b39fa8e2d3efe
 DIST Calendar-Simple-v2.0.1.tar.gz 7079 BLAKE2B bad35402ec02c0a161d4c7e04ea4f01dff1a5120fb1da79550d4eb073142f05de8b2badf3fdcdb899d202ba307c851dcf7c9ef71364409c264fceb97afe34a87 SHA512 158df4171a712a14190ac539c32dd3afd8cfa9873e14295d19dd6f140b19d853574c9452485ac427e1dd803ee5721b2231e3a404f98c50a0441efbc7e983ac64
 EBUILD Calendar-Simple-2.0.0.ebuild 584 BLAKE2B 6deff2e103647591315f002a160051c73f651e6b147d7fcaec2426577b34c2a3b620b038e6e1fdb129de36381085697410a507130dc4fcd0fe3ea3918f8e8816 SHA512 65f958aa2eb66ad086f5bb6ee0790b0cc292c3f7959f8d47843ff148cddc2a6a19c3a1e9e8edc91b1eb9c35b0323f217174708f45bb7ba2e963ab867aafb47d0
-EBUILD Calendar-Simple-2.0.1.ebuild 554 BLAKE2B 1c20eee432f176d89e230853680b91b5a74acbab6f66b0590ca155a0fb6c065676b9ba29aaecbe3bd9abdeffa10fd209c7ac22b26d47305668a66caaf7aeee5c SHA512 27f9e59114b90fb6b547dd073f0745713584a240abb1e553559dc6f3babac1367cb7fbefe94ccf6fa7ba931e497761f649548b7ae005b8575589dd460dabf05e
+EBUILD Calendar-Simple-2.0.1.ebuild 553 BLAKE2B 830e01a8456bc916adb81d7a55478bb8bc2e03a3046a8c2b5bf61971809fa5838ca93511523e64287953869331c892141b40084ea224aae545968b8d85d9e68a SHA512 56a8bea474547ae6b5bb50f8dbe4f09c9c17f2a41b9007b30b983a1a3f55b29445401ff77d445c9db667556c7a3d2125fff0574d49243c505beecd67dfd06fa3
 MISC metadata.xml 402 BLAKE2B e465130f7fe7cb9d112ee98993aef5e231358cb81da41b3b69f0d32f06be9d7789d92322f8c3d42d6f4da3254b3aaac502aade47bc5c3da28754bf07ae803ab8 SHA512 d35e03eecd4213fc034e86a4d8786aeeadfce4e58bc210cdc50e39b89aad8cd407481ee44cc7bd96e510279087b782d5470eb8fcd4f653236c717bcea01e18cd
diff --git a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild
index b6c2c09b39e8..7eb75f721a2d 100644
--- a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild
+++ b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="provides Moose-like method modifiers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Class-Method-Modifiers/Manifest b/dev-perl/Class-Method-Modifiers/Manifest
index a245ef02703d..f91a769a262d 100644
--- a/dev-perl/Class-Method-Modifiers/Manifest
+++ b/dev-perl/Class-Method-Modifiers/Manifest
@@ -1,3 +1,3 @@
 DIST Class-Method-Modifiers-2.13.tar.gz 41385 BLAKE2B a48d22505e58f20c670da89df1507e4ccf589c0004357d3b5f060994217a6aa74c74a5a5d116c0f0ab65eac080ae1c5e28578ff86028c1df85a07b621370ed07 SHA512 379afff763b647b787dd2049d9a8b928ca88be34e50c91c0848c5652efb1e4b40d8cacd2a1d5f6ce7bb254b9e65801b7c1a710f9807458a129af0af470f5ebbe
-EBUILD Class-Method-Modifiers-2.130.0.ebuild 700 BLAKE2B 859b873ced061c866ebd0f78d7315ad7cc4b0368addbbd3555bfd238e1ce7e4bc51d82b2482344054dda995ca7a6a217020614e81b3e671bbd5591ef345255cc SHA512 beaab7e176df2d73d20f79f1c753011cab5a425d78ac11bd5ad22e4c9c436e8b1bc6859c7a2e8712ad0499899be2ba066319fefd0f4b7d5ba874cf13a8323de6
+EBUILD Class-Method-Modifiers-2.130.0.ebuild 698 BLAKE2B 979bdd28c8fc4303b2b223b174cd977622579b3167bf15b696f8e7535319052e974f979b4a10aaeefd36274e8f781b6d7e446b5d91ec5419c169ac34a819151b SHA512 c47383d7ed6255fed011f2a191924ba1922d7e496bc1c6b1c6ccb9836aecbfd349e81b6cb4217645c921821d11da8da2ff70c537c9f3b967fb1e461b8e37641e
 MISC metadata.xml 405 BLAKE2B 4be360e7c8188542a61227c6f94ebbce09bf41f78a0ef3079f29cd1367c765c12f97d0ee957339ea8fa0a8b3e776e88ddf3a6c7ade1217e1b671b56d7615c8b7 SHA512 b62508725a92b4985ea7bca9c1010670e7a6c94e41dc9cd575d8364fad22581f74ce6fcb0de3c574914b5caf2efb7c4065005c4c1b6dbbc992763a316df32ae5
diff --git a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0-r2.ebuild b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0-r2.ebuild
index d9d3ed0803b3..af34251ff188 100644
--- a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0-r2.ebuild
+++ b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Create generic methods for OO Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Class-MethodMaker/Manifest b/dev-perl/Class-MethodMaker/Manifest
index 6f5343f7d796..39b3abfee9e7 100644
--- a/dev-perl/Class-MethodMaker/Manifest
+++ b/dev-perl/Class-MethodMaker/Manifest
@@ -1,3 +1,3 @@
 DIST Class-MethodMaker-2.24.tar.gz 77242 BLAKE2B 741e1e592658637fd001e18d45b27410d3a522146decc61b458561b86e7cd2d866fd2762344224a999ecd661a89b8ad226c3b0383c562a55a3e40157bdc04edb SHA512 d78f89df41d5c566dee74d30ff1b71488e9510639e795dd2f21e95e0516b039d15dd6743342cb28841e0fc698f64b3b3f349b5da788220598dff6ad95225ae0c
-EBUILD Class-MethodMaker-2.240.0-r2.ebuild 549 BLAKE2B 83c297619239a845ba180f8881d4921d96c0a9b4315c10423ebc708859d74d8767fd289880a6df37bec5c40e33e3de83c6a507d147c2c90b9abc8ab086b3c294 SHA512 b7e9cce7383c9959301e9259bd9eaf5a0a44e1184f18f8777fc412e924371abb59802285cff2d0a47dacf9707084f5197d0eec3861624bee7b6329a77a3b97df
+EBUILD Class-MethodMaker-2.240.0-r2.ebuild 548 BLAKE2B 8da60f583cb2f5c4f7a10ece2df3007dc8155517268ca1b755369a9030daa5840e2e12a0847ed373195ed32f69105fe8efbdb472050deb4f39f916bebee9a547 SHA512 b3f57c3f4b8553c262c43aca3bf24147f8bbc4212c7264dcb4825395f384a499ed72608ed40605fc660cd871bbe09cd87c79418c8649f1ad14554c11338a839a
 MISC metadata.xml 758 BLAKE2B d842a86fa76b0f8486dd8c28a164bcc3f9cdb5d892a8100e9e8ea582cd14ecf6017e6e396879a23615593e1c8d5887a51798be40b8c3b1b607cedb2ddb34f14d SHA512 a83c6b380017908016d6ea9367a2fffc746d87529e3f9df6c145afd07e2f45cc48e7900cc02ea443d0ff702381d920922316b07bb0683432352b359d6b8be3ee
diff --git a/dev-perl/Class-Singleton/Class-Singleton-1.600.0.ebuild b/dev-perl/Class-Singleton/Class-Singleton-1.600.0.ebuild
index 422b02e1dc58..14fd0860d2f2 100644
--- a/dev-perl/Class-Singleton/Class-Singleton-1.600.0.ebuild
+++ b/dev-perl/Class-Singleton/Class-Singleton-1.600.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Implementation of a Singleton class"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
diff --git a/dev-perl/Class-Singleton/Manifest b/dev-perl/Class-Singleton/Manifest
index 80684df1886e..b24daa2ea98a 100644
--- a/dev-perl/Class-Singleton/Manifest
+++ b/dev-perl/Class-Singleton/Manifest
@@ -1,5 +1,5 @@
 DIST Class-Singleton-1.5.tar.gz 7785 BLAKE2B 98bc10c6fda65abe6958360c780826bd76597cc597f8d1910cddf309c04eb3228d4ce8f5f03029a3a99a464eb158de69e167e5e9efc0c0f6d4f3c60938be2444 SHA512 f061a8b92d5f65e4fbcd14ef36ff1216f84443f487de34c98f7d08d6d18148f156c0cbd6249e75ac448c17547d1172dbda8b670a8e7573d3581c9c1196eb4804
 DIST Class-Singleton-1.6.tar.gz 16164 BLAKE2B 6b788f00ee703d1c09b1da54e24fd109f223cc825d9e41e8333758935a161ac9cb00e40cd013d3ebbc2c5ac94e29b2c4db1558784d6a5c870bf813647059582c SHA512 68b637ba57d5da70ac8e7a8a5e1874481681d6a217bb0c58a232d4329c582f32d29b5ac4c60a131bc863c8faf2852c5249bced9d286e87fefe4960e95f35b1ec
 EBUILD Class-Singleton-1.500.0-r1.ebuild 469 BLAKE2B 4fc69fab4175b0d880234b9d830937687f1f8708ac2a1e3300bdd7566b986dc370ef80349fa92bc0a63c4f29c40b3717679e15bce9fd92883743e0bc03ae29e1 SHA512 812e46b5b250ab8d591ed53fd991fecd66613e13e7a4191060b0d59b809425b6e8a91d59e5b96a1f4f1968e9ff577baf009aad2ba699e0beb75fd57c1d05b978
-EBUILD Class-Singleton-1.600.0.ebuild 481 BLAKE2B 51852cf89d2e0ccf18a86e8a05d9814e746f17a365490e05cde4fb7105825c3f3a9ee3cc46b6905d162077ca7113e6b26f91889d9e930ac0a81772578299aee3 SHA512 2ddb010d21f933c82fd4ef0a9d8d12cc7deb530dac9f06aa3282e899a574f4fb0644b4e727b06081005c7d8f6753548bbe8bbb3b396f232ef737a9117d6b5406
+EBUILD Class-Singleton-1.600.0.ebuild 480 BLAKE2B 7f27c44b524a61e09e6d5bd32973e0e6b9d14e4836e83ac5ea738ebedf2a7d6b236fad1afb2c523b7f5e7cc41bd6e4b1bfd96ced7284b594218d8de69ffe39de SHA512 256222ac72b9e10e3ba1bd25180fae7396600c22eafd0f7278bf14ac5afdb7fe79215352993bc7ac21e4238f462bd7b2ebbe1414de9f82a2b3f0da4d63397013
 MISC metadata.xml 402 BLAKE2B 448b53179712f0a6f1ca4eab049c9f531b22f178e8a9ae2d9d9ce94cf7c5dc467b51a71a5f1234f0bd7fdd0d6bc480512d5a9e4291c98f7cd82ae395b4143ff9 SHA512 b2baa8b23ef41d09974517a93429563892d0c9b1fa0295253c936066f5256b9ee3fd4abc8a2458e20a2011c05ede9643899a8c9ae876c679f50ead08db33ac54
diff --git a/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild b/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
index 93875d558d5a..b54d0ad68a5c 100644
--- a/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
+++ b/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A module to implement some of AutoConf macros in pure perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Config-AutoConf/Manifest b/dev-perl/Config-AutoConf/Manifest
index 29b363dbb28b..da5eccfe33e3 100644
--- a/dev-perl/Config-AutoConf/Manifest
+++ b/dev-perl/Config-AutoConf/Manifest
@@ -1,5 +1,5 @@
 DIST Config-AutoConf-0.315.tar.gz 49738 BLAKE2B e1fe0be1c113a66583d4db40c81c74bd7f1884155c1f0da180546c2c26a2bb4b496ab4f8fce9f5a5cf4e22a15ace8fae8f2bf51e5a4cb662e8a58d5a9e83a808 SHA512 ab52d4d19ede25b1f7030b461b931f5cd5bc5f0af50a584a015b367ff2085b2e58826f079290a22194f50ef063c2ba8b469ced913e4c306f788ef28efa41f2e1
 DIST Config-AutoConf-0.319.tar.gz 52118 BLAKE2B 8c0596a22d7accab0366f33f4f72315356abb61ccc3c0c816651724fc21a091607c48b4bb69b5441771795c432376e0811ecaa799b3b7b38b05d6cbdae80c29c SHA512 156b40e9728f9b02530cb490b31a0d439414ab5c4b43a216f7f649c23f62462a441923dc02d22735fcd44a70a5314fc8e9465047261f0e61a2013c05ff69a3bd
 EBUILD Config-AutoConf-0.315.0.ebuild 676 BLAKE2B 9eb69c1d3712a637d67637c2bd13b2bc55a34d0f691e543553fd68b5a5125a32fbb58864411a85a9f535a8b0327f8a736648b39a47d328df4bc3039a7f0516bd SHA512 b4232d65d0d2c1715f6c704108f3db2e0201cecff3194b01f62d2e682cf65b294a9a10337ea9802677cfb5f7453bc49fb113cb15b1a0bcce63b7e0a77cdfe114
-EBUILD Config-AutoConf-0.319.0.ebuild 737 BLAKE2B 57904ac8c78476cd2c2ff6152e55f49649160b7e2032b30a8dfb7a44b6edeb886dedc49815b21056b507f4b1a95688199a8092504262ed68a2b349c05562b895 SHA512 805e4c691fed41b7a9448d482c8a64a2aae42fa4b82858160075567932101ec72891117b1937ff58cc289917aa548b94f33392d8511d22bc5d9fb95a9a283189
+EBUILD Config-AutoConf-0.319.0.ebuild 743 BLAKE2B ff5d663fe1f52878fc5f0c5c67e3b91bd24b7d0a929b964541d9ee9d6eb6e473d26e0e9010a5d952847ef6659339f8e1395f7ffb131cf57823920ba7fff5fe96 SHA512 c32f1b6be1f5743438a791f3e8603afb6154838b618b6481a0655791f1d4021b70212af884afff8f2e77372ea7025d00618186d19e63eb517cc1033e948bf417
 MISC metadata.xml 402 BLAKE2B 4cdc91bf4199fc7257fd8e1e24844b3a7e5dc6dc365e9f2e1d62c8928427138f43219dae7d87168c6706d59da3218f6da9668937920fef89942e005e6052eb56 SHA512 89053a14b4b092051ebb66bf194123691701f5a4c85cf31a3d0c4b6f063c93f1bf2211bf38f98318fb1dc2bd5705eedc07ef6c37e83683cbdf9114512cb1a25e
diff --git a/dev-perl/Crypt-CBC/Crypt-CBC-3.30.0.ebuild b/dev-perl/Crypt-CBC/Crypt-CBC-3.30.0.ebuild
index 191bda295ae0..9bcc5b2ddee0 100644
--- a/dev-perl/Crypt-CBC/Crypt-CBC-3.30.0.ebuild
+++ b/dev-perl/Crypt-CBC/Crypt-CBC-3.30.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Encrypt Data with Cipher Block Chaining Mode"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~mips ~ppc64 ~sparc"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~mips ppc64 ~sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-CBC/Manifest b/dev-perl/Crypt-CBC/Manifest
index 09619c18a679..061f2c5c2899 100644
--- a/dev-perl/Crypt-CBC/Manifest
+++ b/dev-perl/Crypt-CBC/Manifest
@@ -2,5 +2,5 @@ DIST Crypt-CBC-2.33.tar.gz 23470 BLAKE2B 476e555df0000fc81c8be9af6133f018bc1daaa
 DIST Crypt-CBC-3.03.tar.gz 40174 BLAKE2B 3a104c630bd355cfd1f4b87836db4460530437dfd21facbe221062c7a7a7142ec7450c79bcc93e797b219251622dc5c4d0c9e7f849fc060f6e197d3a1c66cc54 SHA512 c1c55dd5fae83d45893f47319323f6d0ad8295ec480b8ab034beeb33bb7d16f26bbedaeef6613a3495849f5034e7502b01c88ab75dd4d69234151d3b674929e6
 EBUILD Crypt-CBC-2.330.0-r1.ebuild 656 BLAKE2B 9cb7e3dc011ef7fe45041e375913232c7a7ba1f5e2ac5648217668ade87e943629b241550f9b3ed05f70253f9c6e4ed34a0d40df8cb8d6cccc4a198c9c0fe91f SHA512 d864dddf1e279af769f1688b5228c4f9de8a8343d1c22ec8f1a1ee54f75ebcd656679e3e60de9391ab763ab20a76acbe326e1ae2d6f6cfb8f861cad04d8c9989
 EBUILD Crypt-CBC-2.330.0-r2.ebuild 685 BLAKE2B 686572fa2b5571d8acca686e4a86ca998840ee57d8d3c1ae948f2c8be2af9588421c708162808ab712a209379dda948f54aa7f609f420b4a1e00b991a0e72dbc SHA512 0b0fb6b30341d79feb0087b5186abfe3c91bec0f5aabcfcb4d17f767368b3d9df52f2d704d14b6cf6311484981b9f6a71a740ac3d3cb2b2f92dcbc1777483892
-EBUILD Crypt-CBC-3.30.0.ebuild 669 BLAKE2B d108f247b9080a6e0f6bb694bbaf4155d06df5b9c2e5460f4d12b3d8b25f1ddcc164f9d5f5e1e1ed071ce11c7f1fd8ff622ca80bc36f1fa564ee26c1a94408d4 SHA512 8d9eb63e0347ef494017160a2ed92cf06b89f4e7928976c253a5db1e6e91791c0ae4b2d2ef920b6f63cfe470cdef1f5d5d10a8cbd9852825c8cf4b524e7d25e7
+EBUILD Crypt-CBC-3.30.0.ebuild 668 BLAKE2B 533e09b021c179bbba0b05a430744d42aee2561914bdd30a58dc1649c0b1772bf1158431032ad10115234fee45d53ae00ba14bca7c396802f04f34f0770b5af5 SHA512 a885ba95ab6c6b6dc97086f1540eb3ceca6c5fddd1134db2ffa455c8d4f8f8475ffb6211e3c7f7234287883f6ac92b8dd6f0cd7ce5234f0eca8da25e983a2a86
 MISC metadata.xml 390 BLAKE2B 4e0d374b1d7f5f80ea4a219f50f3f34f72b1adb39f8ea3c0cda62c619e16e1bba4e0aaa0f13b880fa0de208e48c1d92f9501be41a326af48e8baad5d6185edf5 SHA512 a8ba735447bc35f4649e69cc31c71baf84606cdc5dcd70f18b98bac80c239ba21cd46334d08c2a3f4f3277dd113996e7996e587a69e482b27393001840688e76
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.130.0.ebuild b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.130.0.ebuild
index 4f739bdfca49..875ced861386 100644
--- a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.130.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.130.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Guess OpenSSL include path"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Manifest b/dev-perl/Crypt-OpenSSL-Guess/Manifest
index 175845110ca3..db6654ca0702 100644
--- a/dev-perl/Crypt-OpenSSL-Guess/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Guess/Manifest
@@ -1,5 +1,5 @@
 DIST Crypt-OpenSSL-Guess-0.11.tar.gz 11346 BLAKE2B f22d09e23e91c36c722dc9800391b67a1f912f8af6a13ec95c9074e65559585c77e72596a6dae17db28e11f8449813777423a60d9af0147819dfcb91ba489152 SHA512 cdae7f20a15d24842cf117bfba4f3bc0ec7d1066251e0480cbadd8f0aa28c9c9573905726fc1333ea9fbbb3769a67dbf28043de8487dcce27dab5d14a0848b09
 DIST Crypt-OpenSSL-Guess-0.13.tar.gz 11832 BLAKE2B 4857fd301eb4348f8afe17b1b7780a404c5c2567323b37c36e1be9e0c545aabc78a27d06e86c4f0c34940a33ff43c78be006ef0365c346488646ced6f4d9939c SHA512 1b3286d536bcb7545be636e33b5ff37bf334fbb7f3a99f4fcb32cf1166b1bc7cc179e9d39af1c7ac537630a75066353a1d7a0ab97816757a444dc0068029da97
 EBUILD Crypt-OpenSSL-Guess-0.110.0.ebuild 598 BLAKE2B 837a5fbffe0409842c232df5223a45c4c5bf433cd4d3f61fecbd2201067930aefd27b4d235d14eebcb9579b542796b5a6f65576224d95d1f30eefe060b595a20 SHA512 0933a865287f63583dd02c2b156730a144fd6db79085fce435058245e198eddff389ae79aee3594e344f5ec26136b546d1a9dbf82e03f3afcddf90fcc3097af9
-EBUILD Crypt-OpenSSL-Guess-0.130.0.ebuild 599 BLAKE2B 4df1cb21e5ff564444abab9e93d9be7721778b9f20b9b89a688455b6ac04b6fa106bb9e33fbd5cdddf492fc92ad59ed6328ec2ac115c845dd7a99759aa759033 SHA512 fc2902521eba6334cb290e42a8fa3a0528d446ff7684ec2f392a76dbd2e7d47d5c9fd0f137a85a08ede90c29cc5f172e36f39cfb9009b30d6b6d01dddc9eaffb
+EBUILD Crypt-OpenSSL-Guess-0.130.0.ebuild 598 BLAKE2B 8626a25dd7de27ebaf9305e09fbb005f73092c706f21ff543b6cacb1e44b237a7fe73bb3b9de74aa7f1e6fe535981b39100e1b6e2f60dd97b7ab9adda87a9db4 SHA512 ec872248028d6daefacb8bcba16eccc44bfee6a8be87b437667d8d203c179b21f11d53e570174d867b8bb27ff2759f787f23e2b0836f77fa59000de7407dc40d
 MISC metadata.xml 411 BLAKE2B 777372daa18fae2658976904b22a5e17c15e1ce863a3ca026a03131be84cd435a8fa582c162500ae76881c6605abc8a2737ce877448d62f46e5101c1a9776b6a SHA512 da55f9571c2cec8cd96e6fbf95f74cab2b89cca8c74d32bfd217680f60ea0454b60b6cd851b0f8f841ea07ca2e23cb83764f0e28340eea38119ba216a31113f0
diff --git a/dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild b/dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild
index 76728dec3c06..c10643b5432c 100644
--- a/dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild
+++ b/dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The PBKDF2 password hashing algorithm"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc64 ~sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-PBKDF2/Manifest b/dev-perl/Crypt-PBKDF2/Manifest
index a7c54311fed1..00ede4d92b71 100644
--- a/dev-perl/Crypt-PBKDF2/Manifest
+++ b/dev-perl/Crypt-PBKDF2/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-PBKDF2-0.161520.tar.gz 17163 BLAKE2B 0330d6516915acfed6fda4c2a64a067d9d1e2b4d99d1a5e367e9b36f20664c874f7c7f90b0734a5772bd49ca6e7b7ee1739af8be47836619fa3cd4835d962cfc SHA512 0f5dfd6c642fcc3b34bc96f10b6f7344a8f3bac1bda6c610e85099906545bc78953666415240e793deae6db055df6f1007f3a946973ee960921cec4069de3a0a
-EBUILD Crypt-PBKDF2-0.161.520.ebuild 828 BLAKE2B 91fc67efba3478f9bd8a88c31a9b16d92c95cb055a45c83abc3770422f3f7e9d1b35888c811661600b6ab3ee5c84ee57a64fdb08391ed3583b9be07c7fa717b4 SHA512 49a367afacd41ee535a0cb0ff02654496b2fe6546b21f1e5ca1c0c5a97f0403ff17a4f45b9d4a2eb3ebc97b0d62f677d91de59fd9500f527f2d2bc9d1fd55716
+EBUILD Crypt-PBKDF2-0.161.520.ebuild 827 BLAKE2B 0361c75b8a0e5acce86dedc7191ca25c39f776a7682ebca4976f0335a23ba5074a7500dbe0696569d5b3f6dbc701079f3825ef7fd8f286ee07da0ca2b952bbf7 SHA512 da7ecdaae67748aa63e59f796c4d946ed11d472ccf50fcac62b7f9a72332a13cdd26b0088767a760e450fa745fdb831239d5f381d46e15157138b070b89a6775
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r4.ebuild b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r4.ebuild
index 38da1a1e07af..7bdc821a3e70 100644
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r4.ebuild
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="OpenSSL support for LWP"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-SSLeay/Manifest b/dev-perl/Crypt-SSLeay/Manifest
index 96e3dd1e6730..82edbdb67c5c 100644
--- a/dev-perl/Crypt-SSLeay/Manifest
+++ b/dev-perl/Crypt-SSLeay/Manifest
@@ -1,5 +1,5 @@
 AUX Crypt-SSLeay-0.720.0-no-dot-inc.patch 618 BLAKE2B 0574d1e23dda4f6208c4f3c5eb38c6c83395a7bc1b35a18f3b5b8b06969b5d77137bfa5a667fb68198033dbb082525d788457fc08c8e0077edb689fe3cdd9315 SHA512 cce2c63db297df1d7138e267525f95a79c867f51088a793874b5419ca8942ac4725092cfe0bc98de55050c0a45e884ed27606ae5d728630bc06ffba123ed4d3b
 AUX Crypt-SSLeay-0.720.0-no-ssl3.patch 1140 BLAKE2B 96762c07735e29098aea42cb84005c41927deb19b785cf23187fde9b226a31929e6827c89dea52db7e1c95e22c0d44bead2016f30a03d68cc680a93d094351da SHA512 f414553c75f686e662b156cff1aae677ce46d8b38c9669107b2d21c0fd1c2a32db5618e401364ee31d68d155088c4b4834171ad8fa52725512d4f7e7c5f6826b
 DIST Crypt-SSLeay-0.72.tar.gz 129575 BLAKE2B 103e708075d24ac56d47e6ad8795be036cae29dac659c3727ca63950bc3a18e2b6119c32d2040e2bd544fcb3281bf2c5d303a2bb228733588f3450a5e05e916d SHA512 af7a2878df94e116e9aad9a0f028f2e4f89074aaf31672915162f86e55211632d65c1cb00f3ebd25644d77adf8eecdd244dba6a004d93ab90289ab34fe4caaf4
-EBUILD Crypt-SSLeay-0.720.0-r4.ebuild 1014 BLAKE2B af2f7ab7bab5fb5015a04ffe999048cd5096b3e5d732b9a93247ec9b6c30deedb1c1f38894b940e536919c765595f7e2999c6b8b1ef2dabda7679397b1629706 SHA512 5150faf5c10bda1cd46198f451f6f85bda5ac18bde71dd91c05fe7cd3ccdb4862a0d4dfb9b0175b05117a174f88a3fc64e9e8bf8ce0149098cb79da6b3812096
+EBUILD Crypt-SSLeay-0.720.0-r4.ebuild 1013 BLAKE2B fdea7189a6fb1368a82e841a50ead6cb37bb17a39e0e86fe4c42a9963ac36d9ee1ddf6f347955ae02f6401c04f1c1c30bd0e704564130038d73b88da78a18f68 SHA512 68c44ea090ba3af5c464d83341122026878762d8b11623b53847be492b2ce22907a82cae0d91b8f30397d127acafcc2e26303fbf7c52dc69e92822bf35ce9f8e
 MISC metadata.xml 835 BLAKE2B 451d19ac81b5f7cd9fd4c5dcf25ccb95d79520abc2c86f4ab78fa7554bed770c88ed544a1fe0dc9fcab7e9a5aeb5a15aea2e2ef3b7cb63dc85c820a18c5e871d SHA512 6bb1c4a179395aca014afb35db6699deeee3428cf658f93e32e57a57789bd815cf4779a5544c56cd0aaffcf464c5c4d6d587cfa26c7ecc1096f39893c1ac6c9e
diff --git a/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0.ebuild b/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0.ebuild
index e45be01e557a..08416159288b 100644
--- a/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0.ebuild
+++ b/dev-perl/Crypt-Twofish/Crypt-Twofish-2.180.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Twofish Encryption Algorithm"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 src_compile() {
 	mymake=(
diff --git a/dev-perl/Crypt-Twofish/Manifest b/dev-perl/Crypt-Twofish/Manifest
index fa25f166908d..5809543c3997 100644
--- a/dev-perl/Crypt-Twofish/Manifest
+++ b/dev-perl/Crypt-Twofish/Manifest
@@ -2,5 +2,5 @@ AUX no-dot-inc.patch 790 BLAKE2B 71e83b789b58bb0aa3f92db78949f732e45b429b2d4a56b
 DIST Crypt-Twofish-2.17.tar.gz 13851 BLAKE2B 4ab615b6af0996bdc6e3c356f84cc65192cff68ed4f5e00b59efcb20d88374a29b2a44f2cd5c8bce0df6a31f8ec366624e6e429d0d72fdb4cf69bca42732d3aa SHA512 c61d07f2fd3d88bff1e41eaa3008c6717fc21e9acf2e45d45c3a39b15500f71b3bc425a3df988bbbd5b6865085866595240f1574424aa70448d6c8b3f38ee2e2
 DIST Crypt-Twofish-2.18.tar.gz 13904 BLAKE2B a153d4a7292ff11b97f8d53ea84b9c51d09ff1585f6bd5150c5ce047e5d515e14725672a0b637c11d1664b16b87fc950aae709d6be8f0e1f99112d562e8f69ee SHA512 e900b066e73237dbad8a9882c28509fcd8516c16478cdc2703883a1801d9ec387c4e43c38f6e50024c47f9fb2812c44f6096f2a2ce298f9d73303a84833b61a2
 EBUILD Crypt-Twofish-2.170.0-r2.ebuild 433 BLAKE2B 185b72d61d4887c9edc0a936a545bddb58e1589e88743774c604c8f277e2babb867ce119ba4800cd7172ae7b1b86d903632de82151ee0a9b9ef309c173edeac2 SHA512 57e9c9c310681e514e4357ffe36c329c07399468d2082e2f6177f81684b4ebbe1e5d3c4d8045c4309c812dc2b6079efb94aa805b1a554401920903d8288258bf
-EBUILD Crypt-Twofish-2.180.0.ebuild 393 BLAKE2B 93ad1e26110b4481aadc9bb0e59fda14b898aef5b24fbae2666e7977e5512be7c56d3dee189823bf5091f82a6b9603158daec9e9116423d7da78b5e28f00dc3a SHA512 d4db7605f520b2fb29d45ebcdb6631d0de04a4f92b2071c4ca7304bc3b5b03e21ecb4d268b28bf21520dc190dabce4d9b5068b10a52627417ea4affa59cb1c12
+EBUILD Crypt-Twofish-2.180.0.ebuild 391 BLAKE2B 2260cb3655d4adece2528f600e338d0498d609018ce4cc179e61dca3110f615456d2e7f2e341fc4a83eef7a8bc2a04d0f0d949dd3d0753dd907e63af59af19c3 SHA512 086aa38f36cd1bf815357dadee9bd2c0c91cf77ddfa6b1c621c51cb04f4d5d051b889cf4463a6c6acb62474e3aaf656ec60269e5df78a3e59614f57641d545e6
 MISC metadata.xml 398 BLAKE2B fe19aec82d7a6c90b4521dea669d0246610fe2f61039abee47b8c76302d08e410cb0a02f4d88e6bc7b98d54f95ce81d4a7fa4fec828fae148baca9d3d4a53052 SHA512 d827c972e409391c7c822d0b8cc4a79f8a37f3d10a1460d90f00ab51aaed10b431cc36becd7750de74241bfc40d9043e1bdee34d41b535bb557efa0464eecba3
diff --git a/dev-perl/CryptX/CryptX-0.72.0.ebuild b/dev-perl/CryptX/CryptX-0.72.0.ebuild
index 6085f9b3a9ab..2c48931b70e2 100644
--- a/dev-perl/CryptX/CryptX-0.72.0.ebuild
+++ b/dev-perl/CryptX/CryptX-0.72.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Self-contained crypto toolkit"
 LICENSE="|| ( Artistic GPL-1+ ) public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc64 ~sparc x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/CryptX/Manifest b/dev-perl/CryptX/Manifest
index c38bda709139..5daa21d95ebe 100644
--- a/dev-perl/CryptX/Manifest
+++ b/dev-perl/CryptX/Manifest
@@ -3,5 +3,5 @@ DIST CryptX-0.069.tar.gz 1644304 BLAKE2B 59ef37494856d38b00bbb88578160e34f16aaa5
 DIST CryptX-0.072.tar.gz 1643459 BLAKE2B 28bb06ef870287ccd9f46c2ed5d7b434e33563046598cff5c505c74c68d29b5bf58ad0dd3a5d968c6717ccb6cfdbf1b33982b49a87b9e4f7c85af9ab40d617d5 SHA512 9e51181b14c08f8c0769089f8c9a5feefa7c4f1a8dff2501cf1d1d475ae162f8df35c7cceff9d1742552951e13450cac9d70eb1ead8178e0c95cd1abfea5e03c
 EBUILD CryptX-0.64.0.ebuild 656 BLAKE2B f70465610ae8a8178be09aa0a30783705418bb6560b3b1e6b67ba4dbaa539a6efd67064980da24dd8f981b1eb8c0e945aade4d6427c9c12c83f139f8ee262caa SHA512 ea1750f13a4c9fb0c27a8f762da05c6c7794b03a8ef893078a14cac077b534b60765f1aec6e796b6ef39580b93684579c858eaafc5ad22b4e43de03f2d61b8d3
 EBUILD CryptX-0.69.0.ebuild 834 BLAKE2B 0411c3dbe69ffe7e64366786b58ab61f8c5a527025c8112e25f4a197f488cef7f8955378e9c8abda6eee461d3778055faa8eaa81b45a0a3defef90d127ed9636 SHA512 c1a039f41afb66fb8844cfd7f330209573d0106b816db9c66fa65696d9a851f718946e816e68507fd09e0c488d8496d907680304ae2fa620eee6ba7945bb14d3
-EBUILD CryptX-0.72.0.ebuild 1075 BLAKE2B cc9ab0efd5c2c98d6bf8a695c0b919d9447de4ef3bf3d80d49fc748b0af01c327e70c5b8a8d507f8276856d44bc38e81aed9b7316557b1877d9e2badbfcdbc8a SHA512 0b1a8c9378809a5c5522bb4553c89e2ad99eb55be0489acc1dd97c249392bf936c600477f119e06ada579af9e5c6e0d9c6e19fd21cd46bdcdcdc5e3dd9aeba98
+EBUILD CryptX-0.72.0.ebuild 1074 BLAKE2B d55032a9138041711a82f938a48f7e0cc70275a7b9081f31d02356a902ed60294098b82b159ecebcdb67cc963c7909ddc7fc19f1845662c0d34bd4f9d3f7dfcc SHA512 7eb8271eabd6be4c0f0afc5795e8c636e5e66f9ce1ce005fd78ea3635061c17233f32c7593604518a11a6dea8c3b4d17ab05cde78fc7bcec6945e879177f5b9c
 MISC metadata.xml 7623 BLAKE2B be852d80dee011ae96891acce7be2a517f8b1da6a473db0cb55e111c094370e303697658bbdfc11aff69d0d76e0e960f35768d3eb024146a863c16b9ad743fd4 SHA512 15555c7b4e302ad34fcfe4284416480cda88471086f753a5e7eb93d3430e887c7ce1b4da52288ff057dbc108fbdc8764514980cd2d3e2b2bf75fe9280104390a
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild
index cd817006b163..2b055bbeddd3 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="PostgreSQL database driver for the DBI module"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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/DBD-Pg/Manifest b/dev-perl/DBD-Pg/Manifest
index 8c0b9dfd25f2..948ca5935439 100644
--- a/dev-perl/DBD-Pg/Manifest
+++ b/dev-perl/DBD-Pg/Manifest
@@ -3,5 +3,5 @@ DIST DBD-Pg-3.14.2.tar.gz 282024 BLAKE2B a8121a2c97b1e095576c40b9b305f0ac21b3a80
 DIST DBD-Pg-3.15.0.tar.gz 284379 BLAKE2B e3d8d5a2e3339c88f92dc24cca47296b8b2e597dcb81f2645180dd90b27873f209728dc0ac320e493b573c73efb54292e89370a628fc304bf319e237e04b1912 SHA512 67912da5cda42d198cdffa3f5c93267ed9da681c837fd8a9b8c6a13873a461b1123ce0a8e1f4f4398264f57ead35950b4945018e6cead14c903a809a298aecb9
 EBUILD DBD-Pg-3.10.0.ebuild 2717 BLAKE2B 0dc600cd44185a34fe87846101ead421ce894315590bb1503be18c109266d5437976d16164662c06528e137b842c5ee5d3938794d61acb843e385efe109398c4 SHA512 56ab20907456ba3b05ee47cd7d0ea69a00752507cd2aaf21360a535d951f2b473e8b7d8a0c3cafb6f67465e1719fcdbbfc2668d3449e57578b8e69f5d848d35f
 EBUILD DBD-Pg-3.14.2.ebuild 2821 BLAKE2B 4c878c064a58c0ffaf54a76918ffcad6826d127264aa0c8d1a7624ace311e7f85b3e657b0593be4e19112a60a59a8b6bc9c04e076f87694941c1a44d0847050f SHA512 a26cc4c6076efccfa930e54877ee801566e3ff522c15b39248f19f967d161eba68f30c35cf9112c24c0a13c993693f9ab3c3f2abb4434238498b70c1da7cb3d4
-EBUILD DBD-Pg-3.15.0.ebuild 2825 BLAKE2B d176eec9ba611c8cbb004f398a32a962b07722881d8177201034cd3ba4790fef3746d6ad5143508412f7de296737467ad60ca6eb13a036c2c152a3c046303d90 SHA512 3b828eed64b64dc57b9ce2d5c52310e6bd1a89c7a312111f5be59d6a9f00be52c14bf890b130a43e1310209fe31e0f01efb23092dad075e0364151169f7bbf89
+EBUILD DBD-Pg-3.15.0.ebuild 2821 BLAKE2B 4c878c064a58c0ffaf54a76918ffcad6826d127264aa0c8d1a7624ace311e7f85b3e657b0593be4e19112a60a59a8b6bc9c04e076f87694941c1a44d0847050f SHA512 a26cc4c6076efccfa930e54877ee801566e3ff522c15b39248f19f967d161eba68f30c35cf9112c24c0a13c993693f9ab3c3f2abb4434238498b70c1da7cb3d4
 MISC metadata.xml 446 BLAKE2B 428b5b91a84ab6026f482e2e3404f7b43a1557d16f42340453d927b4ea676caa3ab422705ea99439fd6369a43af9f2dcd0d7d3ec6a42f82b9e8df17cd2642a1a SHA512 23e05469a61761595bc52b6798d152dfc82b42a4ce1ed8010cd17b6343557ef92433cd31c00102098ed698ed0fd0260e3d165c926b9ce3de91f52112c9b40684
diff --git a/dev-perl/DBIx-SearchBuilder/DBIx-SearchBuilder-1.690.0.ebuild b/dev-perl/DBIx-SearchBuilder/DBIx-SearchBuilder-1.690.0.ebuild
index e0113ff44814..79aef78e91ae 100644
--- a/dev-perl/DBIx-SearchBuilder/DBIx-SearchBuilder-1.690.0.ebuild
+++ b/dev-perl/DBIx-SearchBuilder/DBIx-SearchBuilder-1.690.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Encapsulate SQL queries and rows in simple Perl objects"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DBIx-SearchBuilder/Manifest b/dev-perl/DBIx-SearchBuilder/Manifest
index 1bfebe2f2805..caecb1d91505 100644
--- a/dev-perl/DBIx-SearchBuilder/Manifest
+++ b/dev-perl/DBIx-SearchBuilder/Manifest
@@ -5,5 +5,5 @@ DIST DBIx-SearchBuilder-1.68.tar.gz 115423 BLAKE2B c7d3b2efb3398d74fa755e3e3a177
 DIST DBIx-SearchBuilder-1.69.tar.gz 118336 BLAKE2B 449bf21a3c2512f1afa08836c7c0d593f56f4ccfd6b2c126336144fb481585a86d1c75821e04a136710bd22be3e8ac93ec532ff60581330b33beac9f47885699 SHA512 3dc779ddda123493c852781cbd5e2ace2100ca8234a77a369ea802e6c041868e004aeaa0ce579b8a3899d371744927dd29a002aa149ba9b8097e429aeab7ac9e
 EBUILD DBIx-SearchBuilder-1.670.0.ebuild 923 BLAKE2B 436ab95b03825b796dc101b3e9c21d731da92d4ae6e50ff604cd0866a183616d3317f20e1e8123734c2ef72c2f5f2a160fb2c2517e0489286600027e9f16ca90 SHA512 11f1507d147f3f1232d47ad67f3d6faea978a1e65fd8eb0acb29d6c74d26e1cfd3eceed013a3fe0b25030a09a9025ee53415b5d70aa1766b7041372f110eed3c
 EBUILD DBIx-SearchBuilder-1.680.0.ebuild 873 BLAKE2B 89e2bbe1ad8f98751554bf57bfd909ef53e4714140e4f8a86029adfb261c2e085d0de513e24207c291509a68bd78ad643a5d8276cce74327e410b6569f43e7b1 SHA512 8ea6ee8d9ac774aa983286f2f6a057e4de0ead7afb2af5dcbe9cd40e2103360af0f03ca03224b85a0d45a6ab05e7193dc33cd9cfcd135e8f65721c62501de020
-EBUILD DBIx-SearchBuilder-1.690.0.ebuild 876 BLAKE2B 182f771b2dd949618f42e503813412713ff6f7a87d5c5380a37790a6fd5b1490c5951ea29a6de9d09f4ca1fa4b0b3f1675134ffbe9aa6b689daa98075449b40d SHA512 8a698b29a8c2d9f9ec499548ab9be582d155fe452d306a7e0075993098af73e737d442a74ab87fe8710faddd6e5506a5143e93e8b51123506e7c19ecd687bd04
+EBUILD DBIx-SearchBuilder-1.690.0.ebuild 874 BLAKE2B 982d04b623b7d7c3559a6c44ae67bef6cc18b11c671afc491196496c24b93a43536c510bbf2c15b1db76585de52cb37297440b82610ea8db28c71b2140e90a70 SHA512 6a84de432fdbf16153cde1817969ab6a4e88daa9a40d026ec64cbe5c095c9d970a59a3837bd45d00de515ec8cbc04927724e49b56d751d56bf8eea42d9c52d75
 MISC metadata.xml 1594 BLAKE2B c56268fbc1ee494196c0763e6c0f795436d3f2104b43034969c94aacebc4c408b818283203e5b097f7cd6400657c6d5d2630dcaad5a034a0d3743506d676b766 SHA512 da30146de1b578e3362a06b951bcf72a1d4917f33aad4cc678360c62a470edda63ff4d40f6f582c22af47257a6e0e1764579ccc518352ce46465f2465f3fa8a2
diff --git a/dev-perl/Data-HexDump/Data-HexDump-0.40.0.ebuild b/dev-perl/Data-HexDump/Data-HexDump-0.40.0.ebuild
index c7e63866d404..96b74a546880 100644
--- a/dev-perl/Data-HexDump/Data-HexDump-0.40.0.ebuild
+++ b/dev-perl/Data-HexDump/Data-HexDump-0.40.0.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="Hexadecial Dumper"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~sparc x86"
diff --git a/dev-perl/Data-HexDump/Manifest b/dev-perl/Data-HexDump/Manifest
index c1e9a03c88b3..31981d741289 100644
--- a/dev-perl/Data-HexDump/Manifest
+++ b/dev-perl/Data-HexDump/Manifest
@@ -4,5 +4,5 @@ AUX Data-HexDump-0.20.0-signed-c.patch 641 BLAKE2B 01b0b688e7a4231941ef742c55fda
 DIST Data-HexDump-0.02.tar.gz 3525 BLAKE2B 8b047f0d69a3720736cf1ca2b29bf419066084e76f689818eb1319d1b40e361708b5d9e30e0706370bf08b8f652099d308663d8ea8d07b93d9ac9d0ba6edf7e8 SHA512 71e787cf679237cbddffd3eca2576812dca38216a8caf9282f7d56af4e268810f36ebd57e3e5c369ec393e7f0e9ae2edbcbe7fd5ffbe49ef4d7e8ba302a28e47
 DIST Data-HexDump-0.04.tar.gz 12434 BLAKE2B 22297d588c312e4719d26eaf2e6b9453f556b9f5924fd4475cb319784bb7c10d23c68b09cb114049675aaf26051c87a6bbbdd207728012a65f4da67811d1b120 SHA512 41f95f0a8ebf23372acd1af737785950663c597d9c76aa2342896967c9b5361a9c29e514c1ef9018461c276978b258649c516c33d3037083a2af0add37589b1f
 EBUILD Data-HexDump-0.20.0.ebuild 386 BLAKE2B 2fffd1b36b314e410733908fb98844e6be1c74b30a80851a4ea0d2e85e24b521e68345ea4abaa3aa6d54d62ce43c82b0e61c688aafcf66923e2dd6268bf1f588 SHA512 a03c55ec6031a7728fdc06dcf08acbd17741475fa7ae0410077336254af9dbba408bf9855a0437cb39590fd3d10e98edcb1b9a9547cbbf9c9f7f06130ac4de04
-EBUILD Data-HexDump-0.40.0.ebuild 269 BLAKE2B c721e50b3b837d17497f51b8554a23a552bb619c7ddd9e8dc972554615f25fe0800c59202696e11d2b07329224f592e611c0bf32be85051e5c33414fb1eda166 SHA512 52180a6c097eed75f76bbf54eab2032d103a514f0dd01947876c5db96c9ddf1464d52e6d60a42657ebb51f39ddabef762cc4ddece2c43d77fa99182d99bc8965
+EBUILD Data-HexDump-0.40.0.ebuild 267 BLAKE2B 5615cdc7dd5f8a184dc080f460a6923ceaa23d35f29535a08ed54101a07cd40b78b73fad21abdae1be19d4620edf0bed5a91e881bfd70f9cbe5e9f7ae8a6a3f1 SHA512 9272f4b3626e59780370ffcef38dc8ba7d53abd0f9e46b585f9880ec11ddeed45b7dbf0ec055cbbf6d4f387462aa01e03fa7328b2ec8a8c70ee5a1f29cb2aa74
 MISC metadata.xml 396 BLAKE2B 5e7925017f6de48e665e838e138ef7c7d32e67bcbec47ffc09a3e6ce1e273bd1284823a8fbb8f820add6f6367dc8aac3bdaacb8088b1c36f27d62740bc708560 SHA512 5126f9c11f1edb366844f8ecc7f09a05fb6f759c08aaea90e2f108440c8472701e491d79e0fed5724254599229bcd9b3ae465841d12466241e601b9540a88c65
diff --git a/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild b/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild
index ff4758a4c1c1..92ec93857a7e 100644
--- a/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild
+++ b/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple, transparent data interface, with caching"
 
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Data-ObjectDriver/Manifest b/dev-perl/Data-ObjectDriver/Manifest
index d2954b001462..1ed89933e618 100644
--- a/dev-perl/Data-ObjectDriver/Manifest
+++ b/dev-perl/Data-ObjectDriver/Manifest
@@ -3,5 +3,5 @@ DIST Data-ObjectDriver-0.20.tar.gz 89960 BLAKE2B 778d0a493e93377dc91e96df1954724
 DIST Data-ObjectDriver-0.21.tar.gz 92070 BLAKE2B a26da0f855ad62d384a0c361d84b290cea3a6a298577827e417aa2f280e353f66347032e65f41f65522355b09f8c9e9634444b223e1719cff14ff552edfbdced SHA512 7ad062b5ded11fa61a0dd3ab1fcdf4e57b3f1c6a60b98f736f57a2ba44a1ca84108b46324c090ed8e4da97e57fbe5b6ef495153564f93f665289bd7918fa1182
 EBUILD Data-ObjectDriver-0.150.0.ebuild 654 BLAKE2B d05a3cfc5ae56c8c0d9b720ae18401be02f09e09fa11bac79c6013d602525e2209bb07d435ae1d9bfd0441147086754418997657d33ccbc34367684ac71a945d SHA512 a34d68f3977a9da426c0408d49549ca43b7a6eb2a0517011709c39b94540af9f65779198b6629d33d8b78557016ae6b10ca08a03ba9a9136447ecb39dec0b657
 EBUILD Data-ObjectDriver-0.200.0.ebuild 691 BLAKE2B 3abc142ec46446f60305e54caf834f65ed0bf975376ea09dc59088326e054015f51440ee78035c7c3628d868266cc3fffce67e322468af524be50c87127652bc SHA512 a240d5c624222260822d36a738be93d4fb2266c99c1b9ac5af23baee7e12751e2b687042740cbfb8b1e5cee7299d36df57ba3774b9e34150db04639d475ba002
-EBUILD Data-ObjectDriver-0.210.0.ebuild 654 BLAKE2B cc9549460f29dc00d97d957d9c065306162901664e7abab68581301818b14e3855a5ca35dd741676965cc0e76eeac5b54728ff3b3196ef0deabad5f1df559abf SHA512 d51f6f4dee893ee00e94fe66db06274f31aa18edd648b81bdb335431ff9b6e656d73ca9a00a011d4ff149b15a14e489641951b4ce31b2f2243fcdd69d99ed552
+EBUILD Data-ObjectDriver-0.210.0.ebuild 652 BLAKE2B ef01f087e26e7ec8cd15f67e0a84c49271970a18c6f89a282abd6a57193ba7ed1276120e43f72d7648142c48231e1f524b6487b6887c6537c78940f322bceef6 SHA512 01f2cf43e572a1673f69f84386ad8f5b04d26fd24f8af17cacb55eb09b866fa06e50ba93505323f3c56a46451e1ba7a04a5cd15926a2fef1329de17c226e8791
 MISC metadata.xml 2459 BLAKE2B a37a718a8a38583c85b14e40dba7534b5d52e6257d5329a5c47145c4cf68e9fbe2a10a444bedd73e27584d356f5a4e81e4921138c9b3582bb619e07dfcaf3843 SHA512 b5b2a3f247c593a840edae73f766e2dba00b6ebf16aa37d009dd22b675a702ac4b4833ee44d82ea98f1f7387b0e23c611b2c93b8ccc31ba37861c3dc4b120f49
diff --git a/dev-perl/Data-Validate-IP/Data-Validate-IP-0.300.0.ebuild b/dev-perl/Data-Validate-IP/Data-Validate-IP-0.300.0.ebuild
index b59791a3e2f3..d2f925007a02 100644
--- a/dev-perl/Data-Validate-IP/Data-Validate-IP-0.300.0.ebuild
+++ b/dev-perl/Data-Validate-IP/Data-Validate-IP-0.300.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="IPv4 and IPv6 validation methods"
 
 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/dev-perl/Data-Validate-IP/Manifest b/dev-perl/Data-Validate-IP/Manifest
index 701d08eb9057..3925ae26379f 100644
--- a/dev-perl/Data-Validate-IP/Manifest
+++ b/dev-perl/Data-Validate-IP/Manifest
@@ -1,5 +1,5 @@
 DIST Data-Validate-IP-0.27.tar.gz 38139 BLAKE2B 5fd260fafc3a283bb14bee0b51aad9f829682353e4802cb570fd9f7ecdbfdfaaf2a7bc77ff704dc64c9866c93e054aac4252ed86fff57135c04849b817b06f52 SHA512 5a93f730d53e7adcac4fe5e227b69a44e58cdc94b0081d79978547263095e97c3690c8c6fc6664fc8e4b230ab4c360beda22e6600a3c7abe5e61129ee70553b8
 DIST Data-Validate-IP-0.30.tar.gz 41761 BLAKE2B f80f67fba5086969db4abe7fcc6ac3104135ee37cedb98e12a160b726231e0f8349f373430deece35ab3d5c53046150602767e6d26feb8ea4d72969377deff2c SHA512 ac556445f1eec0440be17263bcffce46d0c3b719d3c64022bcb3fc6d1191ed9de94c0e4d6b2c3c5c1704dc7945b14a5c87abfcf2b7dc43ec4f10a4cc6629b761
 EBUILD Data-Validate-IP-0.270.0.ebuild 618 BLAKE2B 0d01cd5588331ab67fd9d23deb550d2298263b5ffb17e6cd892e54e867884c4a3341a5354dc1348c663308132ad6b50cfafda5f65b84f285c3812f1352996870 SHA512 b2a7c9857f28835ec0b9dfe1f236376110fd2ed7dde2f6c1a94deef9f6eade330e7924a4888f954c9bac25c2e83ba6ecf70759a1869f9b0904c9c63c10e18e58
-EBUILD Data-Validate-IP-0.300.0.ebuild 612 BLAKE2B 3bd216b29a5656bf7f15ac2d963922206434683d2a473092920d615baa16442c82a8a9a0e94430c9dbb10ab34ef76c63eae3d6af38b54705464f8566195204b6 SHA512 de5996030305e295f7c3146736baf97faa4b7e5891eae7c9575f4488e0205623d0975b5079c378a5aaf4cf48f6746ec64df54d53438cdc885bd28ec3879dff3e
+EBUILD Data-Validate-IP-0.300.0.ebuild 608 BLAKE2B cd76524a1e48d9b45c339404716feedff6e4ba256de20bac78db1681b427050037deea1290bcb1e42a3c91b8843c63e070f78ecc4c487595b63932c03613701c SHA512 425a968610db12d6742aaa79ab854f076476f03a2d2046e24b7786f6403ed55c2b898067e460d3906455fe5a1353cdd3845ff26ae46a69ddfa3c7ce713df78fb
 MISC metadata.xml 405 BLAKE2B c3bfd8adc080f8b9326035f8596138e5fb7b6c2f22c33ca87c555d768d820e266e405a1c7853086258409bbf33dfeb149b59acb06b700f06988ec49287ca258c SHA512 5d39792f857258ebf9a8ea82ea7407b0ea4b05de767d562d026f5cfefddd940cd3d413f142b2e861981a3806b0a8559dc94d8db3ed43f4e5e9df79fba0ff6c31
diff --git a/dev-perl/Date-Manip/Date-Manip-6.850.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.850.0.ebuild
index f8498b46aaa3..f9b29596fe03 100644
--- a/dev-perl/Date-Manip/Date-Manip-6.850.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.850.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl date manipulation routines"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="elibc_musl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Date-Manip/Manifest b/dev-perl/Date-Manip/Manifest
index 562ef54d69c4..04b6cdf8a782 100644
--- a/dev-perl/Date-Manip/Manifest
+++ b/dev-perl/Date-Manip/Manifest
@@ -3,5 +3,5 @@ DIST Date-Manip-6.82.tar.gz 2015204 BLAKE2B 8b5af3a5b813d5c42c4fe444faa299684b57
 DIST Date-Manip-6.85.tar.gz 2022449 BLAKE2B 55dbd9960d1f5e033a8acd7904b74d45149134d72d9bff56275ed266933d98f8194ac1eb1f30a29343d56a66b6d45d4603190e0707a61713b5443e23a781620f SHA512 ac2fd3823d4890677c9231417bd9838c830d16564ba3f5de04f827d30baddb3fc95a7c379c42d00a3f08e60aba0af8b8f5d710f587d4c5908447a707d1104162
 EBUILD Date-Manip-6.600.0.ebuild 867 BLAKE2B 9bb9849a5823f2b4e3ea25540acbd82b885ca0111b5c1625eab03bd8a64cbba5543fadc51eef18089006181255420fdd1889ea928dd6f9f16af8ee76786a4221 SHA512 294e46ff83ac6bed03ac952a236e85d2277344e4c928c2dd13b89b50a2ecf23232333a414444af2a2327c989391232e49b95c5f900cfd65822e6799e08c1e551
 EBUILD Date-Manip-6.820.0.ebuild 897 BLAKE2B 51320b831bbdd464a647f88eff5a4fe723fe2e16c92fc7dd709a35675f2756260d105354691ecfd432605518ff05ae54244db1f3757867bdbffa90697a1d50a8 SHA512 0cf1d2f95a19197f1d2b88815b7d3414638311c6bc8b8a4d3560567e5103202cb3a1af9ee4fe43fec400f2da180d2fea93afb390259b08f1b7da8fda5b67ecfc
-EBUILD Date-Manip-6.850.0.ebuild 857 BLAKE2B c26f352eb71282dd4b9748430ef21b33bdb7dd07ccd02f07e0918f5294ba0942aff8c224f18d252d0a22b005f65a16f040dca28b6471dbc17940a47ca18bcf78 SHA512 889797446be3472a99d8d7470a95cb0249fa3cdcad0b12fb4b81a46d42f7a7e5c6cda61e4501f923d519956eac288e9df21a062783a07ced7dd896565077b5c4
+EBUILD Date-Manip-6.850.0.ebuild 853 BLAKE2B 90b6deed6ca93b0b474de949000f566004aa1d0aca5e8393c664e8211d6ee9cde8ca046969c13fe1bbaa53ee9da366c72ba21df0fe42f39c59667f84180edeb2 SHA512 a4ee4a689e74cb1638976e961d81c4596e6a861d72168511a778d6a805b55e10dede27214bffff4a098db1a60e0e35a2d17d6901705d06edb3d1f80b9c5ed560
 MISC metadata.xml 71063 BLAKE2B f7ffb9fe1d37153b8d40d8e176292bc17b65f60b26fb34df4ea21ed66d9f052be669e3eb5c3de0f233454cb35d2098d76949902163630b421ad34afe3923d777 SHA512 3e0885876687e6adb60ecbd0f538f3f754716150ad593f9c729b2ae85f98f081eb694bc5d209fe1156aee475ef14a1e42d260cb46224c462ef95e4318c387497
diff --git a/dev-perl/DateTime-Calendar-Julian/DateTime-Calendar-Julian-0.104.0.ebuild b/dev-perl/DateTime-Calendar-Julian/DateTime-Calendar-Julian-0.104.0.ebuild
index 40edd239b749..9eff9af0484a 100644
--- a/dev-perl/DateTime-Calendar-Julian/DateTime-Calendar-Julian-0.104.0.ebuild
+++ b/dev-perl/DateTime-Calendar-Julian/DateTime-Calendar-Julian-0.104.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Dates in the Julian calendar"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Calendar-Julian/Manifest b/dev-perl/DateTime-Calendar-Julian/Manifest
index 07e8b476c439..f34a7c439f34 100644
--- a/dev-perl/DateTime-Calendar-Julian/Manifest
+++ b/dev-perl/DateTime-Calendar-Julian/Manifest
@@ -1,5 +1,5 @@
 DIST DateTime-Calendar-Julian-0.102.tar.gz 17643 BLAKE2B b667ae7e9bbc3cfad3bcc721cad78de7525c72483c1b20100c583b57d35a35fca9a9accbcb55e78d383cda599b4d49f881fdf3758257464fa84a5ff276c5a2e2 SHA512 7adb5ab1c6115e9ba62f46a3a925cfd246e4c12ed1688a4fe03930ea3ebf3662886066bc45b25bf9b25095490a47e2d047763fbbdc6454f00a9de67b08fa03cf
 DIST DateTime-Calendar-Julian-0.104.tar.gz 18172 BLAKE2B c4d09c74b9355005ccad71584457f5c3bb586e62a1a7207e39a1ad2fa12107ef16b580aaaa7e782650a97905c47475c74ca15564686858aaf18d5c47b509c67f SHA512 5fa8dd0c2a8e7a3477bee723c3d6870a4c8ba361231b474afabfbb5118cc1d2d55e60035606b789a4700aaa9a35a9a836d0eb2a9bd935eeb23ff93db472e3599
 EBUILD DateTime-Calendar-Julian-0.102.0.ebuild 446 BLAKE2B 6f651b287fb1a0bb0b7ad4a586b93d61a321852a92b31ab79be6d0e892b9841b844a13ac1671f884db7ec12893c47e28deb88e3a7aff350e259328d2d9ec8892 SHA512 535c1bc34dac1f4f2f6842e40dde94b874bccb69ebef2aac28fceaaa349702ff36883f137ec51ffc959e5d7b2fafb207dd3b0bbd882fa4d99c52591645720f3d
-EBUILD DateTime-Calendar-Julian-0.104.0.ebuild 447 BLAKE2B 8f9b9bbf37316e1cbea3b58a68eb417063a9b19ec29c40d8c99bdf0c783b5bf89c738e33a0c37eaf5ccb9f503034243c183ddccfc7e58bb2e3fa3fea8da9b8ed SHA512 10b466eb5d2644b9fafdbe3619b74cc32118b0fa6f17bf0f7926909de797ac95def03b7b5005f6e3bea0a96d6d926e0786ad600755f4b03aab8e8e320c15d9e4
+EBUILD DateTime-Calendar-Julian-0.104.0.ebuild 446 BLAKE2B 66700daca32c61724ef96f7cbd74139d36aaca71a4fc35c932c809945f2c47e8d142adfb3866406d6d00f63ffdcb7485213cbb8df363602387ae779fb3c9651c SHA512 f2cb37e35d401c11c1f2f52cca4b6eeb653cab3ecad23f544c8a80989bcbbd14d199b0cbb643e16f5e008250b7541896ee16fd2ebf81788281ae4143a3194cf1
 MISC metadata.xml 421 BLAKE2B 6aada183f29cb6e2bd0fb7a2b88795192cb75efed7693c7c29d6652747e088adefc04b5a34f958912b309dcca8825ab04a41d815f0d00dcfafc4faf873b24e9d SHA512 19615bf18366bbe8f306a8b04b8660e6c37704eb6f76cbc066dd2682fc5e6c724ed19a04ac53bbb06f11bc2b2fa37ec3c4450b9da24c56e84ca722f008b80513
diff --git a/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.830.0.ebuild b/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.830.0.ebuild
index 752a7e7238a5..42affa3d2477 100644
--- a/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.830.0.ebuild
+++ b/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.830.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Create DateTime parser classes and objects"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-solaris"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-Builder/Manifest b/dev-perl/DateTime-Format-Builder/Manifest
index 9948860b96aa..3225899c9c17 100644
--- a/dev-perl/DateTime-Format-Builder/Manifest
+++ b/dev-perl/DateTime-Format-Builder/Manifest
@@ -1,5 +1,5 @@
 DIST DateTime-Format-Builder-0.81.tar.gz 39933 BLAKE2B a9e692f584e02bf09609c5a666064de2dcef368a86518b77266bf9176a748f0b009687fb07831196e93adeedcf75123539519e1664a7caaa3e05bb5d46431b27 SHA512 617cf72e900d9bb17fd5c3cfbfa1874bf1c34de144514ea4cabd7b66eb682696b9c9501e66db1073da59c5e8278e6878b893876a1a7f11a9c011dbae44ebdd57
 DIST DateTime-Format-Builder-0.83.tar.gz 63355 BLAKE2B 795a7cab7e837b45d4d509c06f99b7192e85f17dbf57988fa8bf07b0ed5af602135baa9c6b131ce81800ff1144ed3ffbc246119364d162fcfa30bf2956d23c07 SHA512 eb0601dce7bc9adb0b4b6df2058b5f126e36738a9fc1e18c6e09ecf2787fbe7cd9b8ae9a5772590d6fa0df271b5a7fde0f3ab6f2be68e182adaac48ca3ae3837
 EBUILD DateTime-Format-Builder-0.810.0-r1.ebuild 724 BLAKE2B 7affc197093f36a7cda9e41ebcec3db491c17e0abd191eb5a036580cfd8594fceedd792240fc872b87fed8b0aeca05ced52501cb8f74610158dd9df84b7be72d SHA512 dc8426602e9395c13c180dd62852994cf19649273f87e8c9018757ed52798ec24fb109d6ef5be5cc36d3adbc33f600a35437a4b131338a0fac250f5c7f997fe5
-EBUILD DateTime-Format-Builder-0.830.0.ebuild 820 BLAKE2B 6bf8dbefe0dcb0a4a041f4d82250a63b83b9f643b345ea72a560b85848b2b693ab32cc2eaf9727dd17157cd7e20566bf0da4827fe04ee8cfa26dee663a83b441 SHA512 98a0386ac9fc2b0953af9b13c4634609ddcb13df2e9b037607c78fd9234589317f2b1fbb57b7af8ea0f66a28f6c2e2d42ff0f1acb9ec4e0ca894713c01e44b0d
+EBUILD DateTime-Format-Builder-0.830.0.ebuild 819 BLAKE2B 26dcfab90d7cd41f1eadbe06eb64dc7cbc1b7cdc086ff2b8c008d1d7d2b913f854181c2a3cda2b419840cd7a0f69eedbe61fe5b12de76509096981e8ce94fa0f SHA512 4adc4b5f9ff65287b35f67d0c802eea200c2be3bd44bb7e0613010be41992573373208bc95998f06e23cf327e98a240d83f00dbb14d8c2d5290a87bd73b8655d
 MISC metadata.xml 942 BLAKE2B 3ec5c9ced23525003fb0780e1de6949fda9a4ddb6df06021e68f0583ce3fadf79a2e0da1c23d78bc3c9bba178e6aad3fd990b0c3dd9ed1e4a8127686a2cfc436 SHA512 2dd2b6b580f610690642a006e5acf19e9e16c68ce9cdbc5c6b7a6cea34b2620a5544b720c79f3ebb89a7798e6c9c407ff931ca37fd28983704506ee76db06606
diff --git a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.140.0.ebuild b/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.140.0.ebuild
index 6e79fbee2cf5..872a405a5e70 100644
--- a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.140.0.ebuild
+++ b/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parses ISO8601 formats"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.160.0.ebuild b/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.160.0.ebuild
index bbe300b49861..b97582538f2a 100644
--- a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.160.0.ebuild
+++ b/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.160.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parses ISO8601 formats"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-ISO8601/Manifest b/dev-perl/DateTime-Format-ISO8601/Manifest
index ba746eeca993..1781521b2c85 100644
--- a/dev-perl/DateTime-Format-ISO8601/Manifest
+++ b/dev-perl/DateTime-Format-ISO8601/Manifest
@@ -1,7 +1,7 @@
 DIST DateTime-Format-ISO8601-0.08.tar.gz 21119 BLAKE2B 7967639c2d7ca169f8bf148a9473f8f7a7866bd127ca095f506090ee49a1bd198892dcd396c8f45c594d7f7df42a4714907541df8fa4b88023dff0b3039f72f6 SHA512 88b9c538bf7566cf9857266505e47ea58b72b0cf447bde0b5ca79e9c19ea66118bdb62d4039284e1ab901a0016044613307de654a642761d91989bfb50735979
 DIST DateTime-Format-ISO8601-0.14.tar.gz 44616 BLAKE2B eb5746a5cabea4194d90ed912186d0c59c7c7c665cedd46aa8a0a700d7a23043d29a2f57f888ac5fbbd0b85033a3e73eacd4a241c7d7d965bb5d8d4f3b2303dc SHA512 a5575df8ed275588eebe383c969d9f7f9182b49415da930cd5c6a30197248006ec53fc80d3d8ecdc6c097e16294b8252af77863dd388ef0d3617ee5657937d7f
 DIST DateTime-Format-ISO8601-0.16.tar.gz 46364 BLAKE2B 616eaaa54dde777987e03b705093a7d0967b79bc9c4df6694936272b50460dba43df08b8f0ed74987ef0ab7e709a7fd094a7088d6aa858c2f8182596bde80b03 SHA512 3a8985d06f3953308cb9ebb8f322b5cbf6c3dfba99a71a4e2005ba5b23d9b2f2d3967f76e2d09991b75833dc70a4aa352829648b601e79054da79304904a07e4
-EBUILD DateTime-Format-ISO8601-0.140.0.ebuild 776 BLAKE2B 2a5e1f692eb3739984f3782bc5e2dd4913bdc7043ecd711558d526ab204d65deeccf39bd8051727f6bda06800f71d7a7d469edb6357759ceb9061a782897078d SHA512 796c01125ebc832ebf9325fde8317a430a1af47b245d10903b54818261de7e7e78ab2452826754aa11f3770e3c31f3c59fc1024b4578fa9c32b3dfa4884c8ec8
-EBUILD DateTime-Format-ISO8601-0.160.0.ebuild 778 BLAKE2B 76a5e6797818b911a7f23f4d9f8296bb1f3358d0ae24e726cfea56dd2e0e2a1ffeb1cf8f05feb806286e7bfcb7a35fd3c3159aeca9eda622d2f5cb6c58391236 SHA512 3bc29e0431fac4700af5b4a7046c1c649fbf0845f46caf499dd600a48ae54dd55b64eee7588453f4e156f175adce4252ac696aee148b95cf1b904bfdea5701d8
+EBUILD DateTime-Format-ISO8601-0.140.0.ebuild 775 BLAKE2B 87e5cfd5dcfe36d043b9fad314f67c23451513de5d2fd2a9159a9c0a5a97b784474a8a2d22e202a67718522a4c0dad1c14f3de6890ebca227960c43972786031 SHA512 eb42ee80f4dce12729a434a3dc67b3649bf0f948e6e24ea14c500179ab3caffc694ef8098cca33ba010971a9f3dbc26ffbeefab4762dcf0e4e95133489d0f85e
+EBUILD DateTime-Format-ISO8601-0.160.0.ebuild 776 BLAKE2B e6de250a89e8be0afe842d5ed4f4a1afe814516fd7f49292d2b5b7dc3a0c588dbc3c915e965018151fb190994e5faf598f0ed2980d272313f625cc3c5324d3dc SHA512 612109a9ef02ed196c47b8786b1a0227e01ce090a821186f898fb134274810182d8ae1c5559917c736e68bd30d77ce091af83cb05998f248ce1e467ec77e5f2c
 EBUILD DateTime-Format-ISO8601-0.80.0-r1.ebuild 594 BLAKE2B 5481af8a86facda1e00ea515cb3a5bf0cf2c297e2e539f64038cf3b08db7673d4b7ac6fb6894f8cde01124a142b4541fe447470cb65f54127f7ff0d4d195f92e SHA512 f970693993208f95c3cb2fc1d94000dd113764826040c357ad9525573ad4116dc402c6d2f5f9d67265212adcc4241c28179c949635a4ce623f5f43836e1094c9
 MISC metadata.xml 498 BLAKE2B 24df83e7918d60f4875899ddd208d86909df5ce816caa1a0e2211839401922fab2729bb66101750c5d350af2649980c3b2b13398f30da63c169aedb449fe7ad7 SHA512 31a5e498e239f5f3d052e7f8f4954efa90a0ee5890b90173033eb5e7ab6169625b9fbee393439b28fe826b817b113d28be5041ef4626c5fcd2b2717321973c97
diff --git a/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.120.0.ebuild b/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.120.0.ebuild
index 32af656096be..12deb3776d14 100644
--- a/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.120.0.ebuild
+++ b/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.120.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse informal natural language date/time strings"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-Natural/Manifest b/dev-perl/DateTime-Format-Natural/Manifest
index 0a7cf6d6dc57..ab7000bdd671 100644
--- a/dev-perl/DateTime-Format-Natural/Manifest
+++ b/dev-perl/DateTime-Format-Natural/Manifest
@@ -1,5 +1,5 @@
 DIST DateTime-Format-Natural-1.11.tar.gz 82424 BLAKE2B 454b6c525f3bdee31ad077ba3445b307e175f023dcee3309b7b9f05eced9d9424bde28700dbf22b210910bd056b21293e026290c3a9bf7b47ac3f73d2ac1ccfb SHA512 1e89fe7ea05eec620f453cde4874bba6ced5d4055944e9e396226041c1d2efaa9b5a4852b88484b7dc00d792d2842a5c74f5eb86e70b220a3a8afbc7e1111c80
 DIST DateTime-Format-Natural-1.12.tar.gz 82853 BLAKE2B 4705b8449bf255d9a2e15bca7dfe862d0c44e9e851808f2879e3452df083e89d97af2ff48a599959102a85bfb4d701b5dd390200c6516eae49cf29bb2e43fa32 SHA512 c2685815e76d7208d2491a01bc93e0c15657325fc1e9b33b85f123085814b9d4554a25b575241605a6c819f1627486b093bf08eeb25bb55531e15a15ddf158c8
 EBUILD DateTime-Format-Natural-1.110.0.ebuild 880 BLAKE2B c49834f3a89c16c84644e09de5b0a896614b90cbc92ba8104513d225ad750c55f539d862a2d6ca27d24b2e008bdef6efd783b0b89bc5c53dff8a8b1ad3596989 SHA512 82454b8151f4505ee486f32c5b3aa67ec0ef6200fd92e0c7f7054cf681b185f327f1f92c034b2a635006bd6f88f4e6c47593095f49d630e69483b0df1e7598a4
-EBUILD DateTime-Format-Natural-1.120.0.ebuild 824 BLAKE2B 611b737016d35e7474fa3eacad1f809c9a0e9890c31c7869c9cd43d802050a3ac8a40e586b0e9c9efcfc5e6ffdfd3d760db8a56f4d5725e15e14218274b1dbe3 SHA512 445c26c8724d6e3947573da903bdaddf6453f01e108bfb579bdb4a8627ef99ce7561dd70763bc5eb7d0dcc7ad14bdd19e1b9ceb011d645644a7d8a9f34768388
+EBUILD DateTime-Format-Natural-1.120.0.ebuild 823 BLAKE2B dafd46dc79b50641e9deb9ad7cb44beae26281e30ce6d8d0b8a7ff53bd38528c1c053675be3647d19012d61835a1903212a69a499456bf50e0cb47a51f28a590 SHA512 a54002f09c8c8a0bd22f16421f12f39f333e07d061252dd8eb81384f8f13a5f921e3d23b0f917e39686878e013758eb0199e6abeeee24ee077303c92ad79dba0
 MISC metadata.xml 1560 BLAKE2B a90cb77b35cfdad349d90f6487ddc79cd3327cac6c087721d49464434708d7fe1496986f4dccb2208e24dd254323898e32221375543cd874d99f1438517a65f2 SHA512 98a1ceb80a0817dbe9754d530d2b01eff6fd66b62c6dea5ff89158fd14bef251b688dee555decf63c3e008301c2a70bed4c7dcad3d68845ee71e39a3152c236d
diff --git a/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0-r1.ebuild b/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0-r1.ebuild
index 3b952a8172b3..27066ecf5691 100644
--- a/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0-r1.ebuild
+++ b/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse and format SQLite dates and times"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-SQLite/Manifest b/dev-perl/DateTime-Format-SQLite/Manifest
index 545d6ab8dff8..a0ec2fe0a566 100644
--- a/dev-perl/DateTime-Format-SQLite/Manifest
+++ b/dev-perl/DateTime-Format-SQLite/Manifest
@@ -1,3 +1,3 @@
 DIST DateTime-Format-SQLite-0.11.tar.gz 13089 BLAKE2B 6922db57ae3a067dd142815dddcfce968c21fd03a4e21cc1db8ae8c484f745d2a673ad67912e643711ce90aa01debe274761e56d41655a4186db22c6bc8ac731 SHA512 061f831c2a8d653706d315c1cff24ad887e3f8c65afdbd2140066735649c097be921f217e6e2761f8f34604066c618f296d40e9c650c3a1bb085cadbdfa7b7b9
-EBUILD DateTime-Format-SQLite-0.110.0-r1.ebuild 545 BLAKE2B 351ab1aa3bb16564284c104ae204d4d08c4384809bd5e848adb29ee8fccccad195eb1fa9771642adfd20f398ab577532e99ee26ab2a7e406bf43bc81d4c90b9e SHA512 7d0c0620733a452762651dc161efcb0119996381e7b0c78a4580048e8e33f4b0d3299a4546c10078fefcc70a8d408bafc3710f96d2a9e64d898c2ac1ebebb220
+EBUILD DateTime-Format-SQLite-0.110.0-r1.ebuild 544 BLAKE2B 62b0f5e1440921e7f5366083c893201bea13e81643befa89463845b8b0faa9c36c90d8de20590190bb84ede20b342077d165f54b02eaeea0ea1dbbc183fe42ae SHA512 4fb73c17334932c79d16366d8b799acdef505d0ef5e8543da849cd2ab6176ceed0b2b36fc1ab5f10e98a890199cf9dd8f8be28e9676036ff75452962add09658
 MISC metadata.xml 417 BLAKE2B 2cd7d6bf3ec6933b1fbb99b1442eacf90b3cb4d2cb30d76eb39271fa69e75f49480a1afd0112784d1a2cdc5d12efe84404105f3d09f21b841b710f6b9e340614 SHA512 6e441e2a22b8333eaf7e71454c0a549c3ca5f68e623dad808ee4cc60cee534224575cdc22a00aef2985c8daaa43d9a5caf151c2c073dec58e1e5bb91e9df1ac8
diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
index 8d89f0408b8b..196c83c01af6 100644
--- a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and Format DateTimes using Strptime"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-Strptime/Manifest b/dev-perl/DateTime-Format-Strptime/Manifest
index f521c2ff25ce..7707b54820a4 100644
--- a/dev-perl/DateTime-Format-Strptime/Manifest
+++ b/dev-perl/DateTime-Format-Strptime/Manifest
@@ -1,7 +1,7 @@
 DIST DateTime-Format-Strptime-1.74.tar.gz 105317 BLAKE2B 997a76591b710f61e003998fc97ec26a8c5ce43dff83e42dd9cab5b13238c21e40f327afe46a0258b9f8e725abfc35d0d9957cf4e89936aa17cf79b1f7d111d9 SHA512 3b2b640f93956e82aff47f068c596018700615414c9b9ccf8d6bf68ad7b626ec86a831ec2b68807d7f137c10d4b8cfa5d2d50a6304252f3dfecbe9ff94e59617
 DIST DateTime-Format-Strptime-1.77.tar.gz 114321 BLAKE2B e942f79b4d54aac70b922f4c4b0649bef65a4b80a1aeb784409186c74a8e9dc3cf878460a9282ae947ce6a354da964a67403c5f0c2dd83e33ec2f36f07555497 SHA512 d6f997831ffe054b6052dc7d9a783fa64fb2dd90babbd97ea2dd11eacc0e6d1a6718c2dc877c444863be502482f6fc856f02f0feae8abb36220b60f417ee87ec
 DIST DateTime-Format-Strptime-1.79.tar.gz 119122 BLAKE2B 8125e095d6bc9c14b26278bbf2d7b04b783533f75f441637b13c5d5a117bf248b4db6db8da3e8c72e4c39aa45acc38a00816eba21ee29ab13e953021b84086b6 SHA512 842da603c4314e2506f12de2a8ce5e7bf29b183d6064b7f40b663934fba3612e26073835c49c5f58accc9727f1c1883d48deb69e11ceec28f9f47e776c4e2d7c
-EBUILD DateTime-Format-Strptime-1.740.0.ebuild 921 BLAKE2B f80a4214958208d8e61c27766c7eab5d133bef9f19a737f129fb11da8073afc4f544b62a2a38cabfb4a56cf3c59d3ea0ff0b58ae32e46fc33bcac7d3965c2a4c SHA512 ab7a774cd136c4727fa286bca8d2adaf5743dcad34a0e45047fa6aad15a5b41200a1dc72d5d249783eccdf0adc4564d4cfa6c023169c6bf8bd18ddb2b739ba93
+EBUILD DateTime-Format-Strptime-1.740.0.ebuild 920 BLAKE2B 2ee15f4f76e84368f3f8ffe3950268cc418e0c1d7b8ef4936ea72f65b163becdefa7911b85ce384a127e53dd0e377ad7d997b0a409dc340ca2724a0bf83b511d SHA512 fa734702329fe9caf2f6aaaa2d6bcfcdabac27630719311c4f14bb450dd9f0614f4fd0e21f305feb6b5a4c1b3220353a53611e52462cab5487ce2d25ee00ddb2
 EBUILD DateTime-Format-Strptime-1.770.0.ebuild 879 BLAKE2B 0a7b394365c8c728f03c3b1efb6823060d24651deeed05e19a5fcd93ca08f084cf52e6047731310326c3bf7d64285d6bb6d993e5c6b5691d0487e336af5383c9 SHA512 67ac48dcb32edf43dfdd77d96e26b44202925811a3d84b8a4ed464c753906cbe8f0b2384293ab6403bf249ea548f1fa7b312f99b14c126b8e60d234df1ba54e0
 EBUILD DateTime-Format-Strptime-1.790.0.ebuild 879 BLAKE2B 8ea29a7cab892e5022bc28d0d5ad7c382e00f459f02251a298e9f464fd814c266cea097068c453029d2ffb094817622c48123157895bfcaa7fbab066454ad14e SHA512 b07a764e1cece1654115c64ba3c3f129f32c15d44766b4d2e38a9c19a16d0025f6acd72418a8f9f9c3e1c2f99ce7b343427f31b720ef3c1ffd8a847bd73cc345
 MISC metadata.xml 501 BLAKE2B 0f79c43ee9cab97c8027a8bceea775c4e2579514e8e6062fb44d95cc04de45d2b60249e62c90c073ff0bd0de5e979d82aea6398e43b35fcd826ae67fe41ea93b SHA512 498bfbf685542fe1e8920f007e004338d06a0d28b88faf8a323370015a3697ba22be57b47b2d77ebcb5620e353dc8079cf6a05b03493c17e28074221895825c5
diff --git a/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0.ebuild b/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0.ebuild
index 1976fb517e63..e707a8de7f5c 100644
--- a/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0.ebuild
+++ b/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.80.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse and format W3CDTF datetime strings"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-W3CDTF/Manifest b/dev-perl/DateTime-Format-W3CDTF/Manifest
index 58e029d4532f..586e204fcf45 100644
--- a/dev-perl/DateTime-Format-W3CDTF/Manifest
+++ b/dev-perl/DateTime-Format-W3CDTF/Manifest
@@ -1,5 +1,5 @@
 DIST DateTime-Format-W3CDTF-0.07.tar.gz 29598 BLAKE2B 11d1281124a59ccc1734bad641b9f0278b3a34d1bcb6ad6dc030fe2e384961fbcdfea7653c62578c9c22d636610a1b0bb4fea327ab0b4674d0a27178fcc81b62 SHA512 f5b8f3437c4e9a7e192900af16e83a567889dbdf1a934d604461c5096c271b497cda9bd4f9359658f536d262232e4521519f92c06bf07712922403baf6429c64
 DIST DateTime-Format-W3CDTF-0.08.tar.gz 32885 BLAKE2B 049c45a757bca3e8bf437665cc1e4383d1efbd283fe613501354c38bf29f728543f1a4496dc30938e9d9cfbfc12118d491292ea0101a701f747ed75c344eddbd SHA512 d7b04870909432a7a98189dc2239ec201f9132e5a5b6db5d3284351a7db31324c1451538880d215073f8fa1e0f909b99a51354e8e87d6c4cf11d90ea184c9b4e
 EBUILD DateTime-Format-W3CDTF-0.70.0.ebuild 623 BLAKE2B 31616f2e6c2348d942b63506660a17933a44ee522c476cde0aaf59c6ef3d8ddff219d1cbe2fd4acc596880596d34bd2b519786a5d6185ebb9499623a31bddd45 SHA512 dcd3be0f60b2bffea3c919bcaaabe1827451a1c8098a6de435072eeef7341fdbd7404ce72cef514ce7b7b33c7a44d37e83684f113a7a3bb54033a8b53757308c
-EBUILD DateTime-Format-W3CDTF-0.80.0.ebuild 631 BLAKE2B 642df1d14fb7888b21961b2f3398005bd083e9f82e673f065e8871e1bb60be7f2daa67bbceedb253f32cf9c18aef6bf8fa2cfc54ece9a0839374207f124aadda SHA512 b7dc0f4042d1856c6585378c61f64897179a1824c35d57913280e709a8d9d8f5ad1fe8c3adfd19ca83f8169caf384413cbb5fab6acb4a87167f672f402a149ea
+EBUILD DateTime-Format-W3CDTF-0.80.0.ebuild 628 BLAKE2B 674047bcbcfdb09defe2fb7f023d434be60513b43468919cbd8fb014d6cec1beb3ba6f4f75f3ba247bc24adfdeebffa1accb14e3e55857f954cf513620a65fac SHA512 76804be4aa91e233ffe6ea16f96c764ecfbdca7e2eeda1a3b21b89031f793b7e086a385fb76bceecb3b87dac5b058b52c40978a7b2b53f208dad56cd416012db
 MISC metadata.xml 417 BLAKE2B 44fa86f9572cfad422ee8f6d33ad91f7930bb405c82bde1c161ff79908c847f8efd908c3c6740033aa11e36fcf552e87c42c7ea7e38750cece3d78d0b8be0e37 SHA512 d7429b4f2d1186d350035ed5a6d7c0f1da3e6ed460cd63e62dfc138744f777e412759e0b8bd7ebdfe851eb207649397d562dc01b92282b29efc8a2d4bdd1b024
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.320.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.320.0.ebuild
index 76b397fe941d..325be4c16629 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.320.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.320.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"
 
 LICENSE="|| ( Artistic GPL-1+ ) unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Locale/Manifest b/dev-perl/DateTime-Locale/Manifest
index 375735cb42c1..112a83d9b8b9 100644
--- a/dev-perl/DateTime-Locale/Manifest
+++ b/dev-perl/DateTime-Locale/Manifest
@@ -3,5 +3,5 @@ DIST DateTime-Locale-1.28.tar.gz 1391000 BLAKE2B ec19047a6d0e55db0235db480e96d49
 DIST DateTime-Locale-1.32.tar.gz 1463023 BLAKE2B 56dabcb6bddb81536cae8c5f8ad1073d9e1519faa97de4bb5de2ecce01f2425a778705c33ae9557ca44ec82c75d16e2320d5dc390b7cd7b82e7d7549b98cf98e SHA512 8563f7121876272b9815f5af36f77501cc89d720e0fe08a855a7c563dee6b6399a6213162c6a6f1257c7c76c30a0f3741f642947d1499876d981225c1f5a878f
 EBUILD DateTime-Locale-1.160.0.ebuild 1125 BLAKE2B ff49c019efcf4b99f9cbde78960594fc53f9c62399b5a64d72106328c2c7c96f4ada71934cf2b0736dd04f294f2037ede7f3c0b5c25ced431679ae7f5801a5ee SHA512 3921d22f8861b3b6b8a8a2c03731b258cb73d34b5e2ce66eb4b2b3f2fab4dcb18e5e1e99c255c32c88f415f6054c02285a2ed9e8dc2a8d9d6389b0d083d3a763
 EBUILD DateTime-Locale-1.280.0.ebuild 1193 BLAKE2B 962386f4b58d52685a673c0092f804a1d8f9d0137a71d9c4463f1c5a722245ee223b7e8bc55fd69c088399e7234a5731902e54c765eaf617b9bc11aafc292a92 SHA512 4ae0c5fa97060223b050ba7328ac1cb8f6af1c7bebe3bc5250008cbdb0efcbc129a739b23665253ccd5e8fa7cd03e5c30ee9d1cfdd5e343da3e40f8c6f1907c2
-EBUILD DateTime-Locale-1.320.0.ebuild 1190 BLAKE2B 43844890a42b594c83f0f18271c65abb14c2713dc4bf13034a51ec9390bba012bb57d12183d3c02c869c0b6254b6258f4183fb64b408781826a79a7b2c119398 SHA512 741d53715049b45ca24489b3124aee4761fec4f87c07bd6b5b9d0506002b25725f45c1e41e0c4f05fe048ecfde0bc313c03d8ed2998d3f7b3c78ccb4065b8a6e
+EBUILD DateTime-Locale-1.320.0.ebuild 1186 BLAKE2B 5b3e9db4624cfe62c3b6c1e0596458bc852d8a7a08b5612151c579db7a35da7bb0edc1d8ef8d98bec12148280659f643778bfac3c4bad9b2d6e3eecbbc1b1e22 SHA512 9567b6abe0b0f984e5a668c009f2a1b760614218e98c9251bb7dd9d906f90fe8f4e2ed99861cef1843b0b9a2c137345329974b8a7471407502d6375662c4d0d5
 MISC metadata.xml 825 BLAKE2B e89d502ee3fe1ba2ff7e95050a8cc9d91960a013d91f49bd7cad3f611fd675ed646a71f44da3875f1396d786b0fceb533f35ea9df5c80b64b2c1a3eb236586de SHA512 75e572955930e34ee22c2ec03d03659883d12f64d3c1b2e55112f42bef46cf8ddaacbb92293a3e1a4fe3989bd962c682fb76fa021c8f88f95a1f921a5f8d3de6
diff --git a/dev-perl/DateTime/DateTime-1.540.0.ebuild b/dev-perl/DateTime/DateTime-1.540.0.ebuild
index 83f090b79fba..8de80e97a957 100644
--- a/dev-perl/DateTime/DateTime-1.540.0.ebuild
+++ b/dev-perl/DateTime/DateTime-1.540.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A date and time object"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime/Manifest b/dev-perl/DateTime/Manifest
index d44271d90869..fbd48cf5d984 100644
--- a/dev-perl/DateTime/Manifest
+++ b/dev-perl/DateTime/Manifest
@@ -3,5 +3,5 @@ DIST DateTime-1.52.tar.gz 269535 BLAKE2B b8da6a8ca968fcceafed77465b7b25acf9a3438
 DIST DateTime-1.54.tar.gz 314605 BLAKE2B 50f0b2a022af9a955485e3dba8065f304d47223cd34855545452db8316451daebca4d75b66e6626c562088f08c2df295ace6738ad2b94f7a1cca62ebdb43771c SHA512 b974bf2191d6d9ac5e674edf05da8bca1b506c953dc6280d16358f09c55601bf47c0158de5ee46f79ee8e56e8e358e0168a70480cf7a24270475914e5278b843
 EBUILD DateTime-1.440.0.ebuild 1131 BLAKE2B d77495bba7e1777897a2bffbea74f77d9f00c26381328df2809f875b7af8833481eb23d3fe60f243de07428156431635fadd41381e778a04f7120bb0713df75a SHA512 1acfde8b481f97319bfab5aa6c4a0d85f9522103d7650c20ae3494f3c99782b06910f2da242541e18b913178a933c55c3ee64b251d2bbc4acf434a4577231baa
 EBUILD DateTime-1.520.0.ebuild 1211 BLAKE2B 9a1f0ce8fbf2a71e43522a7f2506ec64a6bf73400a380769faf813afde98b150ea0824e79ba0dab24b88d36cd4a05ad51289c15dd37c0bd71e156f5c236bd8ed SHA512 73d7251adb101ca08c18d01cbe2f29d61f3f5796c7cfbbd349739d1cc216931559a0744e58ddc3deedea563ce5b71fe6e165f8a4562cba96232a9f712e986127
-EBUILD DateTime-1.540.0.ebuild 1255 BLAKE2B a6b87766791752c433f438e87c3ac83e08ca1ef227f8655ef62fd99966400ef5c1374e1987e69dfe8cdfdea9854df2e850531f9ecec21bc801cf2d28f809b993 SHA512 6c246f12b9c2bdbdad0cfa7bf09a09a34c1348c0e0e5ac626c388042bfb3b281e1209000827621a47cfa7f20cecec137773f2ac9db314b6901755cb0d1da00e4
+EBUILD DateTime-1.540.0.ebuild 1251 BLAKE2B e019956f98e912d5e6c09fb579af6ba0ed9573925a2db387bfc4e769574211c0db6bd93016c3581dcd7abd7e46e80274bceff633e91884b208e11f4e0b3079f8 SHA512 af5e8f22a3af80997b54213cd5283fe9ab8a0c6ab8003b0c70730a7b9c4e17a10ecbee2df258134649cc46d788251f9baf4cb032bc3b2fa0cf6d9b9f03881eff
 MISC metadata.xml 977 BLAKE2B c3034e3b60e1d4071537ea4af9734c061b1985440c00386cd12019af29cc47244c7d18db586d18c1c31041469ad7c3345b3619ff0422df086f75442cb91e3fb5 SHA512 03afecbf9a306c2ccde1c7cf682733d27f6eef0266d703cf51bc2fb946e5cc287bb24cffacb43dd1f3ecb2eacd40bf8182b4db7b0ffba3f64b3efb9fee04e58e
diff --git a/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r1.ebuild b/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r1.ebuild
index 93c5bda13dfc..41974e30af26 100644
--- a/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r1.ebuild
+++ b/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Find memory cycles in objects"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-Cycle/Manifest b/dev-perl/Devel-Cycle/Manifest
index aee398b230ae..bc6f47078b0e 100644
--- a/dev-perl/Devel-Cycle/Manifest
+++ b/dev-perl/Devel-Cycle/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-Cycle-1.12.tar.gz 7276 BLAKE2B 618e5474cdfcd524da340717e0522880ee7e3e6c3e59438188b7eef836c804b9874084a60e31d14104d36d07df26d9ccea733fb8ab99dd19f6d6d8b4e624fa8b SHA512 e2c83829905449d13c86233ad5bfce28e7b4eca61a8ac1e2f73e3c906a2d8580f66ae84d865ef876c38c2d25f0a5a8adeb05f6e94594274d8a5fa1739842d08d
-EBUILD Devel-Cycle-1.120.0-r1.ebuild 589 BLAKE2B dbe9a5e6f0ed4382fbf508ce2201fe5e5c4eb0674c20ea277c5a99ac3d1d7fa5ab488116f641d0ee9fee25bc36e32aa410623b8becb66c8aea40e1dd520f79d5 SHA512 8eb91e5781f0b6ed69b1799f06cda61777750b9456e74d5856501ecee03259b68d224cdeb591d601cdc7e9c7ca0d5c2e23d56fb307e232ce27463fe8d92ac05a
+EBUILD Devel-Cycle-1.120.0-r1.ebuild 588 BLAKE2B 3a04bf7c6db2b3679bab97baba8ef57c295698c8f6f7939c4cbdc36113df467cbc426562157684ac979fa0e70805ade49f5d32c7507abc89f56b25acdf44974e SHA512 e236bf337294b6167d6d2387f50452d587d6ed5718ed7d80863ed06f4b37f2c630c7562cc171ea1b987c4954e0825485132a70852e8304e6eb25de3593b05359
 MISC metadata.xml 394 BLAKE2B 0d2853bee89864942ae6b94f7779bfd4b5fba5dc1fd6780381c3c00a8b4b2a3ecc631e55add51dde9fd7c54571ef8f7a6e4a52f149cd4cfe2024738ba15b1cac SHA512 bb98439368d68502fe828326ec272c8b17537a40fc15ca8cacc190f471925e77bebb9d1276a832f295d783f821cfe744533f91d731e84ebd918c2b957f173737
diff --git a/dev-perl/Devel-Hide/Devel-Hide-0.1.400.ebuild b/dev-perl/Devel-Hide/Devel-Hide-0.1.400.ebuild
index bfb0a5fcb0dc..9e4bc095f888 100644
--- a/dev-perl/Devel-Hide/Devel-Hide-0.1.400.ebuild
+++ b/dev-perl/Devel-Hide/Devel-Hide-0.1.400.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Forces the unavailability of specified Perl modules (for testing)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-Hide/Manifest b/dev-perl/Devel-Hide/Manifest
index 060a6c8a23db..ed5c14e49fa8 100644
--- a/dev-perl/Devel-Hide/Manifest
+++ b/dev-perl/Devel-Hide/Manifest
@@ -3,5 +3,5 @@ DIST Devel-Hide-0.0013.tar.gz 9787 BLAKE2B 2fedd205ea881364127c50dc1d0ab62e38ad6
 DIST Devel-Hide-0.0014.tar.gz 10036 BLAKE2B bf0aa5bd15bf80cd4b26f91843457c72476aa85b9e0a6794b82fa5bf3f05a60a255e773c386eab0aa3ad11d32ca57f94f470f0804f9fb13ed3b17024cfcd2811 SHA512 395d2c9ca4090398f31a50fe4970b6c4349424c11eaac407c5d2860bdf95c7d00844be9333bd62671baa82e668f6589c5bf61e7da7f99a2a03385e2dfc23cd78
 EBUILD Devel-Hide-0.0.900.ebuild 534 BLAKE2B 1b93039c16edad4fef027abe14843927939a61c88b3e1a6920a372a45b0c98c010be4637a4314e39c248959ad45a41bc4f413dae934b7c6d125f552b40623d88 SHA512 2be6c81690ee9715bdcde77323475bd69e42b7b58b606727236251f37d08b6e317587bba85703655876792a20819d3750c69f531925990ed225d4c6bdd4f4bc2
 EBUILD Devel-Hide-0.1.300.ebuild 606 BLAKE2B 3b8dd07d06be6456b30424c24ad300d6894e7f012d1c92875219dadab2a9064baa8de44d50abd0ae7a780ada98bc24bc8c60e5340a72cc24ff8de761eb63b660 SHA512 2f3f0a5a209e1014a91cdf7397038dd40feb1ec0240e653343e1acb292b26664721809f78be5b0488da5a849f1dad2be13e472042813725db608befc574945d1
-EBUILD Devel-Hide-0.1.400.ebuild 622 BLAKE2B 35824cebe63e372eca84c650db4210888bf1f583b479c941d796540e0410e6a149fbbce088e28a2dfa8c68fd011b691537453ce24847daa39e5d325b50077be1 SHA512 f5e1e447fb18ee131a6c25cf68c9ff283364385897d91f1795b7d32fda498dde20fbb9ef15b9c87e896e423358b75d248b49268bb532ee54e0a02848a43d43e1
+EBUILD Devel-Hide-0.1.400.ebuild 617 BLAKE2B c991cdb64dd61a2c415acc77e614e4852d5d59ada9395623c16754ea5d87a3457a301632018140f6ad10a51bc2cc1b23379eba6cba08a6c409c30202539ced3b SHA512 6582ce92afd055c06158390996abfed65adc3f2f9ebbb5e3e4c0802e79db7b5d4f25ecc97668bec212cffa572e0694b85cd6333e6cf6e7a03aa7ae822d0fbad0
 MISC metadata.xml 380 BLAKE2B 53eb46b6e93d496af735d02389e7f4ce6473e2e853845a3d72d89f5ee9c1baa53014cb47877a7a6cb0e8bb299d00fb229631619fad7875d4447a6611fbaaa550 SHA512 b5a6fc648c60c53705e595cb43719b72611ca5c50dc3f9f1dbd37c6a739c2b0727996b7546cca91e88bf9801ebffffaba6de7fd21a69918d46972d6d5502038b
diff --git a/dev-perl/Devel-NYTProf/Devel-NYTProf-6.100.0.ebuild b/dev-perl/Devel-NYTProf/Devel-NYTProf-6.100.0.ebuild
index 2824e06607e1..10da2380b1dc 100644
--- a/dev-perl/Devel-NYTProf/Devel-NYTProf-6.100.0.ebuild
+++ b/dev-perl/Devel-NYTProf/Devel-NYTProf-6.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module toolchain-funcs
 DESCRIPTION="Powerful feature-rich perl source code profiler"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-NYTProf/Manifest b/dev-perl/Devel-NYTProf/Manifest
index d284ed408854..6136acd6fdab 100644
--- a/dev-perl/Devel-NYTProf/Manifest
+++ b/dev-perl/Devel-NYTProf/Manifest
@@ -1,7 +1,7 @@
 AUX Devel-NYTProf-6.06-cpprun.patch 1026 BLAKE2B bd57d3ea5e777345416a3325afd2e8658a831466ebad51ac0035bb834df79226b97d3b2b515ef1646530135bd6b06cf756a80b0275a3c9742203a7f8c6547e58 SHA512 6faca7dc185f0fb1b041ae7d88b42077dfbe9528755fa2e6b8511eba964ddb8f4fb5c7b065729343d2d54051657b4b4bddbe4159ba673e27fcc981a8cc8b0a2d
 DIST Devel-NYTProf-6.06.tar.gz 468188 BLAKE2B bc236838873d1c85263f8e38d499437abf66e92d25ff58c3fc3f522e40c60b469e4b9e9d7ab63229cea84f8e86af7de6873bf76ff06527f72195ff3462344299 SHA512 e1fdab3208646ff9283eb606b856f0c25025479b55eddecadfdb7f9b2a9db144c003713b8abf333d03fb8ba420b7f3fbc885de360cd815d72e73ae3bffc27426
 DIST Devel-NYTProf-6.10.tar.gz 505104 BLAKE2B 5295568b167fffea77106780a749107e44c58171ea4cf963e6c9acfd03ff4ab2af945d167d687994aed84f18ee2bf31a9e58440fd5100318d190669d59e6cbd2 SHA512 e88bbe76637aafcf5fa403dcc5a89a39d4298859da517b91d72c9aa52e3a709de981b64f0fcb1c13f4d0a64ab694a73ff8930a4613b04896b7cf2f383efbbfc5
-EBUILD Devel-NYTProf-6.100.0.ebuild 971 BLAKE2B dd3460ed83ef80f8c386e56ab7c2dae6da65431e361962df03d0742a3a9342fd1745d1070463178c65e93d716b35ffdde44dd127c2c72f3cafe5e430dd24ab9d SHA512 10d7a774108b4ec53e7b2a9e22f5630fb60a8093f9d1f112e9b0fa940742d5ecd2befe6621f869cc10f6929b9f5f1c1ea965593cb0661f6bf6db0f4cd9a2ee63
+EBUILD Devel-NYTProf-6.100.0.ebuild 969 BLAKE2B 3e5a705f6fc5fcce1f2fe19321c1aeebf396af9674c6ee8ceaf2a6bf007db829088ce9572184fc380e32df035aff76106feed7496771be45d761d5bbc6eaa271 SHA512 320eaedd2a64bcf6cdbc95ffad54b6d9e645fc25f52dca4d87a18eca504503df237cfc1f1bdac737a575257d16c69019ed89a2f3db25f18c6cc3c8e09ceb3f0c
 EBUILD Devel-NYTProf-6.60.0-r1.ebuild 990 BLAKE2B 251a7b1344d06f31fcc57ac596b8cab09f218d8e80abb2f9a7488ec2a3de4993ada63ca6d32ce394bc5120b77e2234cc7650aadc88aab532f7f467c2f6548de5 SHA512 6a8eff1e5ef653ae127fc5159be804314764b3a483dec32b580412505e7aa18daac08514bdd058d8b088938124aa365b283109fd69cd7f0d45e4ad0eba95a807
 EBUILD Devel-NYTProf-6.60.0.ebuild 749 BLAKE2B de9e36c368ee661b03d64cdb058b46796d865ad5c2f8732fd3d2eb21e66dd51e855022a1e478a1356f4f535c52d64ad6cbb8bff9da1550f51c69e378a0b29131 SHA512 40f12dec199ae773c251f5a765fd8d4f7aa2ae63991fa2777f5ec0b1b97ca1aaf8b680fa911f0c2a92e0858037e720542753fc1146862783a3003d9dd486a7e1
 MISC metadata.xml 1286 BLAKE2B f5b30bcad00536ca87fcf274a8de9da4db186ccfffecf5d4ef5bdd6cd44403f3dbe9a2ec797e47327c66cabe00557e274ff36f726ecdfc19c3bee4b39cc86382 SHA512 360f3f2cf927cf45d536ce625c4471a73a770269dc67c90f928ba7a61fcba59b91d48af053d9de11cb1686180d5af3d10b28d025017ecdd6541dda11ee86b953
diff --git a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0.ebuild b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0.ebuild
index d727e0281bec..aeba794d3108 100644
--- a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0.ebuild
+++ b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.7.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Introspect overloaded operators"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-OverloadInfo/Manifest b/dev-perl/Devel-OverloadInfo/Manifest
index 772cefb8a03e..78d080850f84 100644
--- a/dev-perl/Devel-OverloadInfo/Manifest
+++ b/dev-perl/Devel-OverloadInfo/Manifest
@@ -3,5 +3,5 @@ DIST Devel-OverloadInfo-0.005.tar.gz 12449 BLAKE2B 457eb477931ad489a887bad178aa5
 DIST Devel-OverloadInfo-0.007.tar.gz 16258 BLAKE2B a4af170936ae4e66a452b05582f22b22c4b39fbe922ca46da9516a86d345696f2fb9132ed7b4f85d3210dbf32503e2b8e96b8f8ab043824c53d7946e387153fa SHA512 4db830d6f9edb467626213ab4d45b3e4b8fa9b3c38fad1349233f7b420d08be42833e57daa9a8076f4127cafba92f4cfc177ca33bd19cf2a582b644ac1ae7d72
 EBUILD Devel-OverloadInfo-0.4.0.ebuild 719 BLAKE2B 54b93582ebdd1789234eb2bf76cb8ea09f3c79d79ddc3474151105b861f93eb9b41f18f3bdbf6862cafcf044f04c0f9e7ebec7511cbd569d036c14a80c5bff75 SHA512 ea57d2b5d44b5fd1fc5500cdd8548c4b9eb90e8da6d7690df8678594b868deb04b985c59dd3280df1502cd85ce37734008e2fa4eb4629e234624d56fd9daa5e7
 EBUILD Devel-OverloadInfo-0.5.0.ebuild 783 BLAKE2B 0fdc945a1fd18266377416562b0e34d9cfd4f4f50e1b488c11e6216044b752eb46d33c544bd1030e318eebed6aaaf077962d9d56b83fb22b255a51f5fa102175 SHA512 b03ec00043dcd5d49cdc1e25ac09393dde94fdd2fd79c5f49f783a32645db6581832a16f9465992db245137ec75f4a712381c8555f848ca6a32adf82d30a1ec0
-EBUILD Devel-OverloadInfo-0.7.0.ebuild 764 BLAKE2B 666506b881aa411a0d14e99ecdef43e005d8c6d1a52fa76c2a5f1a3231cb1befcdfa2c9bd82c8df0cdff0b471a41d2552174b19af27d5c0f8bac2b8426641d73 SHA512 68c525a245ad3ac29d8616f74d59832f605f6a25e35f1a26677c7247f6f1e69bc8f79323c3c70f2ed1efca8c6112e95789e13ed5231eb38e178966b159314843
+EBUILD Devel-OverloadInfo-0.7.0.ebuild 761 BLAKE2B 316a4f36c6ef7ff63dd33b4cf9b7fe762a31de25056dc3a72d6f46b5c2adfdfd9dd56538afc2f69dc2fad28001146e6b251b7401e274e166c9637cb6c7c1fa44 SHA512 15a6384cfc4d3b58d7f2c49fa3b1ee6bd955dc4e260ddcd1e18583d4b35077f636a1c6b8c5d11625b75bd311fe0cd23a61a9fa70265be0183c1c836e7082ac76
 MISC metadata.xml 408 BLAKE2B 6b167314e2c4dab81885a42c49b68eb1e781f8c45d7c945fdb08257ee37ae5e8535447bf076da1f8c980ae1f50227a909e3d56c1923435c56e92fb1229da34ce SHA512 e562e8c4bb0e9d7bc286d2c65ae2a485ca13ffed205240ed396a3bd612a95ce922521ac64ee9c8e4da0352d434766103218e3225c58b461dd8c4c161f572edfe
diff --git a/dev-perl/Digest-CRC/Digest-CRC-0.230.0.ebuild b/dev-perl/Digest-CRC/Digest-CRC-0.230.0.ebuild
index e5708a97d1e9..eb9be57c753a 100644
--- a/dev-perl/Digest-CRC/Digest-CRC-0.230.0.ebuild
+++ b/dev-perl/Digest-CRC/Digest-CRC-0.230.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generic CRC functions"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Digest-CRC/Manifest b/dev-perl/Digest-CRC/Manifest
index bd13cada43f9..cf5609594700 100644
--- a/dev-perl/Digest-CRC/Manifest
+++ b/dev-perl/Digest-CRC/Manifest
@@ -2,5 +2,5 @@ DIST Digest-CRC-0.22.2.tar.gz 8175 BLAKE2B 6133b26782783d2676016697af75e772aa3aa
 DIST Digest-CRC-0.23.tar.gz 8237 BLAKE2B 18a11f704ca2a21b0b33cec871fc2dab76e2ba4e3df219c1daac91723f30d14fb2b02ffb674285f822ef215c4dee92f6e2365a62c550442606d831568acb3a88 SHA512 b92e40bf717882b0e694c6552a88f13ac92a569e4484eedfdfc57b7fe867e29a81e228d00c29e9e4ba120cb9e0ca4d10db12cad5af185893ebcd89b1be87d2c1
 EBUILD Digest-CRC-0.220.0_p2-r1.ebuild 514 BLAKE2B 9943628390157e6a03745b58249bfc6a4974252dbc4eff3616db8030c35411de231b01b7a8f843559f77146e1715bf1bfcfded451ad48bb0051f052922d4172f SHA512 502d1af934ab049880ea21c413f191c8cd1db7c8974e1e14ef23c3a5cc187de1fadd6437f4de9395d6f6821ef74c8510be49c51b0d30bd6878bc6539cec36489
 EBUILD Digest-CRC-0.220.0_p2.ebuild 463 BLAKE2B 1f743b7f697a5ab0c1551ebb8f72b5c5ac6bd9fcb65ae9d248d6f9f7782d633dd74576c5dcc340208be5eedb4ac8cb633549490969c1098d3689932f91cc7992 SHA512 fe9fc0ac0d62cbcc5ff4c32205b98bcb8ceca6b8c39b2dd6ef2b8a9af4f2d389d71f6ef36af1d21feee6275bcb2c205d8b535f7754663c5d616eb132fc80ec27
-EBUILD Digest-CRC-0.230.0.ebuild 439 BLAKE2B 5fef585512ea399c348177fdc3fe1e9b21d5bab741e53b189d1563ef7dea214b4ef131ddc05842398e8ee21e78edd33368f06485a3fb62e9c8d2fa48fd4c0c3c SHA512 e0400bd182239f898f08cd1658463872945e31b61751540b464af83c91e5c3993718c7ce5687bddd0b61d04d16ab2873fb931edd226f2fb875d0636415459606
+EBUILD Digest-CRC-0.230.0.ebuild 436 BLAKE2B 8ec70771d6ebc7c13cadc27fda599dca145efd6b740017a409eb94d60a7d41e61afe29c7013e66d62d606767b606a45d48ecf6c825a3cec75bd69f3110f8768e SHA512 3b72bbd994cf08d2104424ab595bf3eea5ca6ddaaab8746b2f4dc2d2bcddbf887fbb9c680b2cb1b8fa36fc2fe7791e4d2619365e16e63c526342c567da704f01
 MISC metadata.xml 372 BLAKE2B 79470f444e406d18364d0dedd90ade36d09be4714588d92bcbdf17fbcb17e60c846464ba741497fc80c570b793bcdea1f5afdec02f96b5351cec7b4e99addf0c SHA512 8204c8b0f7dca7982125cd9e2367f8bd60f3d77a2ad2e706535d9b47e980769a2bf24c90ec68bff4e7f634b74f81c5d3248d4466a47b6240b6b07e8122e4d8bc
diff --git a/dev-perl/Digest-HMAC/Digest-HMAC-1.40.0.ebuild b/dev-perl/Digest-HMAC/Digest-HMAC-1.40.0.ebuild
index 9a2a0c2e157a..7e3b8fe95ee4 100644
--- a/dev-perl/Digest-HMAC/Digest-HMAC-1.40.0.ebuild
+++ b/dev-perl/Digest-HMAC/Digest-HMAC-1.40.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Keyed Hashing for Message Authentication"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/perl-Digest-MD5-2.0.0
diff --git a/dev-perl/Digest-HMAC/Manifest b/dev-perl/Digest-HMAC/Manifest
index f1b60aa0d594..0bdd65a475d9 100644
--- a/dev-perl/Digest-HMAC/Manifest
+++ b/dev-perl/Digest-HMAC/Manifest
@@ -1,5 +1,5 @@
 DIST Digest-HMAC-1.03.tar.gz 7251 BLAKE2B 4dda8519d63befc278277b03ba00fb8738913e3322b136ca751ef9c1bf9644e1fec957d9f757ae06f4f06a64e88c85227666792cea0b59ed772577a1e8128c18 SHA512 9863547f8bccdc08e0e3d565b9f0fc3c64cbcc366d92692715a9594e3c02474f7927cb833b5aa0183e7bb757b0ad4d74ea52e481480527a5b1dbcf560b4e4b5b
 DIST Digest-HMAC-1.04.tar.gz 14279 BLAKE2B 9cd6fe96f9e3da8d4fc9a8240c794a94c3e8c403fd1120a5f5778d33907f692716299fc2c9893ab8d692fa0cabac8dba0eb410ee3eeeea6b8d8a8e3fa0898355 SHA512 d30b62e60bfa9f6c0f0c058e190938f13a08a70a816771a0641226c24045cb6dbd622756f1f88593fd3690442a45636bdcaf35457e9dfea6de5f8a342a538a6d
 EBUILD Digest-HMAC-1.30.0-r2.ebuild 574 BLAKE2B b03d56beca40c3452d5d2bd23dab8142034c80d143060f18f80a83036614cf992fbdb2f6c3546f9648479f3df2730b858183d668f32ad1b245911124389a9a4d SHA512 cce98558bc7de48fc823f7966ac779d68ffe89f251debd30e90a707614602ad7bdb165fc32efd82f8a3413f7912897d23c2f3def071d9503fc0ce6c609c09670
-EBUILD Digest-HMAC-1.40.0.ebuild 583 BLAKE2B 54d6683f6b590f1a720a4c27378c37838d087375c2726e92869cf0c5afcff020cc5160c285416e47ee5197e6c43597ebab8f76db1f2ce40d5dfd13d043e3cfed SHA512 57ba0d392a174d01e3a5eb78dfff5eaee83744ec9b59c271e095f017a374160ef60f3941299033c61ddb76d5946146ed7cf2d5a5066234c2a6c362b59853981c
+EBUILD Digest-HMAC-1.40.0.ebuild 578 BLAKE2B 2cdc8367b11d135d87fa65f159d171aabc2ed207929e4f28f0ae66cc6b94ac92649d3f33513ca9aba94ecd5a844edd4b11d0b02cea7f78dac21f1bc37e06593d SHA512 f9dfd74fd6c729ea831c6c4f39ad11dede43348cdc3dd2bc78880d6257af1f9e8f6bd0d430484c6bf12bf8322b991c0c9335d582a1c2ca37849ff7eccbb3347c
 MISC metadata.xml 521 BLAKE2B 0a7fb711bfea19b4ae2406252a738fe48fdd2caded2a099dcedfe88936b71fefdb13d2b6c6742df4cd696051efe66ac5bd91c7dcc845d8c4efc8eb6b2ef664a3 SHA512 83fb601dd12089870ee793f8d7b9554dd53f6600540efd905693e8262fe7e54639f81da09d760ab70f2142855a291a0a0603ab4b62495457692d0726ecf51cdc
diff --git a/dev-perl/Digest-SHA3/Digest-SHA3-1.40.0.ebuild b/dev-perl/Digest-SHA3/Digest-SHA3-1.40.0.ebuild
index c148dc0be0f0..a9ba6cf84667 100644
--- a/dev-perl/Digest-SHA3/Digest-SHA3-1.40.0.ebuild
+++ b/dev-perl/Digest-SHA3/Digest-SHA3-1.40.0.ebuild
@@ -9,4 +9,4 @@ inherit perl-module
 
 DESCRIPTION="Perl extension for SHA-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc64 sparc"
diff --git a/dev-perl/Digest-SHA3/Manifest b/dev-perl/Digest-SHA3/Manifest
index 5e6ac9a8fdd8..b453fcb55219 100644
--- a/dev-perl/Digest-SHA3/Manifest
+++ b/dev-perl/Digest-SHA3/Manifest
@@ -1,3 +1,3 @@
 DIST Digest-SHA3-1.04.tar.gz 29660 BLAKE2B c4bf5cf4e78ab13c8c21ce54e1889c2a89cc461955f1d7088457cd920b6f4b3e394a6db6afc9dd084537c5ccb704b7f7970f18581e43742af0b8e5d8ca1130ef SHA512 2737780f2ca6c8bef18477fd9311754e69bb4d00831e7e2cd4bbf170f3e312bdf86cb84ed0693efb3f386dfa6c03d56ef48cb4021d6b02fdc44b3fb8e973ac29
-EBUILD Digest-SHA3-1.40.0.ebuild 283 BLAKE2B 8bd722cf8afc25311a787a6a8d24f6719993e90d9dc7d639a370e5b96aafb49be28a55f5e91b0155845ad3d79bebc2eba25f57e6ec3d988a52913d4d1e9ed9a0 SHA512 7b3ab73172e1974744543c91534cae20a46e61f0ee915b0e4d0dc1d00bb9d99d7ed4d5f2a484d26903fd2557097152e43e5aa4bc07931a2c57eb9ca5a040844f
+EBUILD Digest-SHA3-1.40.0.ebuild 281 BLAKE2B c30a23e354bb4acdd4d2c6ec650af9bf74bcf72426bd54d6c7dc9e83f60ccbf652f83dee24aa7e5e38f0c882f75d99933d66d790673b55070e2ce8e91d718e74 SHA512 6c7854b5ae2c70f8d5582cd025883df8bde3c792d326a5a5e2763adfad5cccbba68bf9454f5cc45f66e8a04d360a4dc14efc0d114802c8c84ca17a3cc65c99d8
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/Email-Find/Email-Find-0.100.0-r2.ebuild b/dev-perl/Email-Find/Email-Find-0.100.0-r2.ebuild
index 188b2289856a..a1a2619297b6 100644
--- a/dev-perl/Email-Find/Email-Find-0.100.0-r2.ebuild
+++ b/dev-perl/Email-Find/Email-Find-0.100.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Find RFC 822 email addresses in plain text"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-Find/Manifest b/dev-perl/Email-Find/Manifest
index e1bde612f4c1..2bde944601d1 100644
--- a/dev-perl/Email-Find/Manifest
+++ b/dev-perl/Email-Find/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Find-0.10.tar.gz 39511 BLAKE2B 846b6bfa5a02284d36b399ba32f944bba25ea07d3a352aeb9dab5f25039d34a988262c16cc043a60d8f611d8d28c7fe4f15ed07778bb79bb09c6375397a8a89f SHA512 0c31a108de7b146a9b1a35dad15d4a8afb6bf036f228b4997247e1406ea15a8a6c0ba6d79ba36c4262be69970211653b71587771d2d0170ca506a7f531265720
-EBUILD Email-Find-0.100.0-r2.ebuild 548 BLAKE2B f2721e3b7d5ccdf6fe5eaaca7f4d95e51920c69ecd5bc4fcf957bf9de25cd78d5eb7d6f04978b1e65792786afb1cb7b8e45b490fd57d2bb19a98db84d888d282 SHA512 92dcf9a38c875ab5dabc93213eb445d8dd56d1f183e792801072f9846d069356c359f2fbffaf1309b8ddd407a5a9847d6fe68cffe51ea69d4ca7b8d59cac9817
+EBUILD Email-Find-0.100.0-r2.ebuild 547 BLAKE2B 43f74626f907211bd9a7cea6764d3ca3830b23a408055a2208d47432bde8b27ef3e72d3a4fe6178a54ab36483835c8eb0019ceeb1aa1ceaa9cd40e5c5c3b0ab0 SHA512 80bcc59fbdd180f2b88b909fa648f53af6625ff9e5658715a853f1eae01a16554a36c118e23d7bd290581d3b91aba9b17b88f9c5d24eb1bf670ee31516fc9986
 MISC metadata.xml 460 BLAKE2B dd55f62ad5512be7087e7bfa93df1daffc3213e6e89f106b8a062a803851700ab267bc7844d37f551fd04242da2f920f373f09e646d6931dec66607b1c5bcd1f SHA512 08ad3fde31149f98de29b5412129285e449859318855efc5c5ad61644d140ceba65543d0ce606b123247c25dfe83c3efdac9ceb9268a16d80136fb8ce151b8e9
diff --git a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
index 025812e9b8f5..46c67aff8eec 100644
--- a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
+++ b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse a MIME Content-Type Header or Content-Disposition Header"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ppc64 ~x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-MIME-ContentType/Manifest b/dev-perl/Email-MIME-ContentType/Manifest
index 69afaddfcd30..960ad1b588a2 100644
--- a/dev-perl/Email-MIME-ContentType/Manifest
+++ b/dev-perl/Email-MIME-ContentType/Manifest
@@ -3,5 +3,5 @@ DIST Email-MIME-ContentType-1.024.tar.gz 22946 BLAKE2B f51464835d5af96a30cbff869
 DIST Email-MIME-ContentType-1.026.tar.gz 23063 BLAKE2B 3a07522f5dee0f4cca5f817a06c51078cd71a9ec58794d1ea9e9d939b2fe1b525fcd5fe8a01bf52f42ea514d27b3245199c4e5f14fe02ced05737ca249a3b422 SHA512 8ede8df5baba4f5e89ab3418580e0e6dbbabffbdbf25e1f5f738fceee929ba4b495cd7e6793cba030412bf7bbe2a524136afda962f6410d6ca169b68b1eeb065
 EBUILD Email-MIME-ContentType-1.22.0.ebuild 623 BLAKE2B 0fedcf9f9777d1c5df974708c5be61a1154d374ace06806f603902228a48001c15c81999a6aa4eccf914dbaa4433f1a28b64cef425659237576a5b03d5ae89b5 SHA512 9bc1dfd973740613ae24b515040e6774ecc704ffc4c258ab414095f4df9d9df4f96e2a634875967f8bc1b2dca5266db6a128ed909697427d67194102b08b01a2
 EBUILD Email-MIME-ContentType-1.24.0.ebuild 649 BLAKE2B f7706674431d0a659031a233948da8ebd521333c55c08c441bafdbfbd6d955a47f0e0e5701e127d97b9b2af008b6e2fd77316d531726da78c1892a2771f34d31 SHA512 37125f6b488f9c06f294233bf59d85e782e5a0e9fa04fb9f066e41daa4dbb3649037a62920c44bffa757108e50af4bae4902e5940067c4aaa06e51d01a58b4ae
-EBUILD Email-MIME-ContentType-1.26.0.ebuild 651 BLAKE2B 8245a73324387f6ed85c6c28e1fc7aee45700ae74e3df7b6ddaa6322089e906ae92cf4b200f63d9a6ee28a3255449ec77780267e4808ddb38f4111c778c4c8ad SHA512 04c47670ca46bbc88326104ea230fee25a2e4c06eb7315162c15e1e10d5e4bcf8671277323a63f2021fc84e431d8f9c55efed8b08cb703daf78648fcfd924c35
+EBUILD Email-MIME-ContentType-1.26.0.ebuild 649 BLAKE2B e705a619b2865bafc941e2daa5febcb9bfceb8048e178119cc5e44889027317c5c3f406c892511bc6ddde9ba54cb73a825d764269c48942e90d74a87804f4bfe SHA512 816879c735a472a7d6f39ad9b4fcf82cc4e18072ebe7fe8a2e48b068828414238d3154b9569c7862d9f58c7d7499d7371264582053db9f535e7b896ba50bfd6f
 MISC metadata.xml 417 BLAKE2B c296523a19ca006af2706e760818e854d4dee15c1f26ea975140a60fac4f600ba33a0c2bd92d4c67685de9f816a4f7375d9946e2775c298eb4171ef378163d19 SHA512 04a555c6d56896fa815dac076c9feb6f51b59bfc659957052543c043be002079ee037890583fbd6f543fe0717c56b4d9f100199191681cd0dfc59207985b9bf6
diff --git a/dev-perl/Email-Sender/Email-Sender-1.300.35.ebuild b/dev-perl/Email-Sender/Email-Sender-1.300.35.ebuild
index 2ddffe35576f..8b7535868052 100644
--- a/dev-perl/Email-Sender/Email-Sender-1.300.35.ebuild
+++ b/dev-perl/Email-Sender/Email-Sender-1.300.35.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A library for sending email"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-Sender/Manifest b/dev-perl/Email-Sender/Manifest
index faf868078055..deedc9d993f0 100644
--- a/dev-perl/Email-Sender/Manifest
+++ b/dev-perl/Email-Sender/Manifest
@@ -3,5 +3,5 @@ DIST Email-Sender-1.300034.tar.gz 52213 BLAKE2B 782a9726f19490ca4d3e9a7e303d8ddb
 DIST Email-Sender-1.300035.tar.gz 52327 BLAKE2B 236e0ba6f0b1429f26b72d0e9a9b3d97c3c79330c95f2160b17eb83669338cafa5c756a8587d746e9db478a51404bf86c154db372a3078e5d0420490a1b942ca SHA512 1592af000d9abd4ecb410b3cb317d5b2b0e6dd938e1b3f3d8a561527845fe27ff53837761fcc47e10246a19e1dba2521422c96831970354ec20bbbe160d35afe
 EBUILD Email-Sender-1.300.31-r1.ebuild 974 BLAKE2B 168db029d1716bd4a358d0b48cd81709bba961ee1b14f6eda8c678b8154f79a8709698d4683f968a0e9bea2a9c796f4d91031894967aeb98cdf2348a51b1f142 SHA512 1b90e1b51f93f652075fa8f64dc77ab6b904dae8f586e221370315c32a749387046c130c1a5003f77f5a1b8a355c89c0ea6ba168febfab11d90184115a1d30ae
 EBUILD Email-Sender-1.300.34.ebuild 1002 BLAKE2B 7daa1dcb95f909d1f3d70e0e34465b491a5bd23ab0cc1761bad355826d39cb64889b7613efa90955be37226f8e9d70840206547b50722f11702d4191ef67a40e SHA512 e3411a38419b988f1c89e35a005f00afccf53aeb633a4400574953345bb9cee9e70673576ec8815776dd85ad75e54a70b76efeb5b57473ce95366b4667134959
-EBUILD Email-Sender-1.300.35.ebuild 1005 BLAKE2B c2fe9afb1a17005e620659a933cda475d89a10f529ab637efc911d58a3753bd4afaf27b8d985d2dbded846289d984002f06d8418f38ab87769969dcf286435be SHA512 528a6849c93caf033d9c07d032e8ab078033051e40988dea7f59b00fa0426c4ff0212e98006308877c366e07ce3079b9c1e5df534c174f06336cacb8d0528eb7
+EBUILD Email-Sender-1.300.35.ebuild 1003 BLAKE2B f6dcd9383bad700d69041068b7ce52a38ad5cdebe3ed42e911bd808eeacbb44578840f409d63106a414ff8e248547d71e6f3e1a137546323951e8a4053fd3613 SHA512 33ed116604c30f582164819b1e3c7f304682d6416924824d455fc4f63ac432173d2f0333eb9e9542c524d425e5d3f47b7a18a8bc12fed9d74b555c6b9dd38b2a
 MISC metadata.xml 2160 BLAKE2B a4808718dee5b4a5a303f4bb0e7db8b9efd63c390d25d9fd9202297d108cb221a155f1babb6e0d20e97dbf241591d4232ae2d2b315a76a0dce91f98f23d21a6e SHA512 daefab802b50b685f569f0d1936f1b8b07c13f032487b03019eed1b177d24fe0ce9f8e7955bf6de874067175881538e0c73c2fb8b63b60cdd4de81abe2f821bb
diff --git a/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild b/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
index 6f629e7633c3..583c8b0d3bbd 100644
--- a/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
+++ b/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check validity of Internet email addresses"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-Valid/Manifest b/dev-perl/Email-Valid/Manifest
index e59e16f64f1d..90d8e95bb7a5 100644
--- a/dev-perl/Email-Valid/Manifest
+++ b/dev-perl/Email-Valid/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Valid-1.202.tar.gz 33891 BLAKE2B 439dd466fb9f28242531de30a1b3e6b90ee4db69c8680739fae3d97974eec8ca11f2c5f88a39e266851392bca221a429cd68b7f8ef628c93eb788d164b7200ac SHA512 16605a0f935cb429f83209e0b67a36339c74ce77aea1aefbb338a00d236f57648672bb179e543dcb28b02603ccdc0a9c6a696176eecb5075cbd119d1de7a114c
-EBUILD Email-Valid-1.202.0.ebuild 775 BLAKE2B d2a4a5ce47629bcfc4091d3d3a821750e8026de76109ccf5d3c51f9605b8f41245d953a4e55e42305be6034d58941184547f3bbb3044d4d14ab163c55e9c8fdd SHA512 422eeaaa5d995aa0228b6476812c2f2003618133115d45c3397534ee547d8931a5681cc9b831e5fb0834a12dcc546115b2c291db2ce1bfd2f327aed2b488d53c
+EBUILD Email-Valid-1.202.0.ebuild 774 BLAKE2B 8d858cb72e5f2b09582097498f2816d95f443cab7d77e70a368a0e22308db6e26c13bfc5c76ae53a35d639a8976ad0932b27bbca7be64100ac2ed5b382c5e483 SHA512 fd1e951a1884877b1313842585789e032341211ae148f24b31acb44e85697f7e0e2f2bdb78accb4b5c33c3648983ce20f4a63d9d78b935f840a0d765cb26ec9a
 MISC metadata.xml 394 BLAKE2B 62ecef1e269014bc28e745ba5c635d9ce69009f5e2a43597225d64b7fc634ed94f52f1696ff06e32272fd96aec16e897f956dee18acb21dfda1316f6c4e04d45 SHA512 45933ff20d285de8387006ef8f07b7979bcdfc052e05c8fdcce68561025c19dd48990fdb3fcc9376ad90109d5ea8f8ffb9e006b078d39e689910ccc57ae493dc
diff --git a/dev-perl/Event/Event-1.280.0.ebuild b/dev-perl/Event/Event-1.280.0.ebuild
index 2af602332890..47c80492e15c 100644
--- a/dev-perl/Event/Event-1.280.0.ebuild
+++ b/dev-perl/Event/Event-1.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Fast, generic event loop"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ppc ppc64 sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Event/Manifest b/dev-perl/Event/Manifest
index 4dc65c3a0452..3e964948d494 100644
--- a/dev-perl/Event/Manifest
+++ b/dev-perl/Event/Manifest
@@ -3,5 +3,5 @@ DIST Event-1.27.tar.gz 256609 BLAKE2B b27eff4243a0a009a6f97331359ec3bd2243c95e64
 DIST Event-1.28.tar.gz 256630 BLAKE2B 488f9f7e6f54d62500aea32689c9c09108d058bf3f16df792bf959a42ebb20e09a2ae112829fd17897cbd5f45862be0f67cc9b8d78789a513951bd3db112e27b SHA512 8c7e676c3f659f85ae53ff3b60142943c72881f101f2c66dfd1a7e47babfade0171b78a2062476b6e061f12370b279b73abbe3ab01b07d7088145fa9508e7d0c
 EBUILD Event-1.260.0.ebuild 465 BLAKE2B 6ea496b5ab0e2e4ed92a26b55f82fe37174463a4d6f52341ebb7da5f1aba33fbf863083e105d39bebe9e7dc5cb093cbe83f85fd5c8641493a99e77ec9d7a4f19 SHA512 421a416ad841ad4c8424eeff07d8e96bd9531d2c434450e68e7f4253382c7157675b6210f0d24b2ad0e9b56d9e5318f5c9a792dc90c54056127ea0cc8aca5cf5
 EBUILD Event-1.270.0.ebuild 555 BLAKE2B 59076dc665d2a7d68104bb14d07b043f99c748ffb002e29caa05a815a4a7e39111ff0960170740851de107316083e8d3f7b2db4ee6c6563a37ab416e5467e2d6 SHA512 87e4be9af795a45270549b3c6fc7aff4c1ebef1c67ce1a91fd81db949d7fa8cf888675a4d7dbc2681b6dc167b9fef741db80a0674ad838c5fd4426d6f19eba52
-EBUILD Event-1.280.0.ebuild 560 BLAKE2B 30e73248d01757bb9d68b6598f7635f3b7be196f5ba41b6aefe1efedcd54081fc8c0c8f54a2e7fcbc8ffa65617b8a8aff030e6deed282c188477fef9023c2699 SHA512 a01d9c59ae38a48c8667b1c9a67af5892443f21c64869a5868772bffaac8d7b7d3bafc5a60ea39cb01cc1a356d9f9493888844d993bbd29d314458a3c454c9e2
+EBUILD Event-1.280.0.ebuild 557 BLAKE2B dd7ffc0954ba53c3104628d1b222fd54c51984b7c0079bf48634e5f84594ed282839a8eb25348f5cbe412ae2ba2dd47711099b0fa67cb8dbc2d3031d74643941 SHA512 a59de2b907e7a914241a20d459b317ff37abb1086b5bceb9ab3df3d4974713b47a8636d73fa894b6a9350cc42527fd45e507562f9b6d27b9e5e290bce3cf8370
 MISC metadata.xml 1240 BLAKE2B 6626da0bc7f415417dd70236a519ce56145bcb2944cf96ecc4faba4504486caddd2dbef83614783d37f1ea74871018e1af09e788716573784cafca04498a35c9 SHA512 f0d7147bad0ab0f1dca51f6c9d31338e4b4cc4a112a4015db7b3098a5840c4e4311168ad0fff3ee1d2ad829e069600fc091ab81d4c4ec87e69ae04a03a203a4e
diff --git a/dev-perl/Exception-Class/Exception-Class-1.450.0.ebuild b/dev-perl/Exception-Class/Exception-Class-1.450.0.ebuild
index 6aa09a2d7fa0..6c91dab9fbfb 100644
--- a/dev-perl/Exception-Class/Exception-Class-1.450.0.ebuild
+++ b/dev-perl/Exception-Class/Exception-Class-1.450.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A module that allows you to declare real exception classes in Perl"
 
 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/Exception-Class/Manifest b/dev-perl/Exception-Class/Manifest
index b77e6c1ef398..001067762a9b 100644
--- a/dev-perl/Exception-Class/Manifest
+++ b/dev-perl/Exception-Class/Manifest
@@ -3,5 +3,5 @@ DIST Exception-Class-1.44.tar.gz 46156 BLAKE2B 569270aab8d8cf21fca6c68d7e8d6ddd9
 DIST Exception-Class-1.45.tar.gz 50933 BLAKE2B cc6df08d97be102542ab23521e3fc8770d9341c93852aa6a886e3799b137eb7541408ef98d163f7b6b91531035e61ee138adb77f9db172b24e5ffbea6a178f74 SHA512 8eff70c85c8f1cc9e1db2c47b5a815ef902fddd4989783b9fb7e84e3ce75776564cafddd3aedd2c86a5a8b9627021c9cfd094b95ec4956a60dd6703bba3eaf4d
 EBUILD Exception-Class-1.430.0.ebuild 772 BLAKE2B fec487d343fb3bf6a7ed16f47fbb1376261fbef2e1d62240d73ab6e2241c73786e2314c783d2a980e5529de8a0d6338780b5e6770f99b4badd7ec86563c293df SHA512 996b6a87e3a61cd13a78dd2fc79687521df24872a4210d6cd3a64e87a903c8afa84068bf73030eef1dfc1dfc9ce65b3c5c368746a9d5aa3215a009c370386a7a
 EBUILD Exception-Class-1.440.0.ebuild 773 BLAKE2B 2ec3f5fa5c6b00149f00c7a9e1133bc8383aad322cc5e9e95474a94a88659cbd906de77e2327e1460ef36893ed12282fc18f3cac0dc069d825ce85d326fadb26 SHA512 16e37a326536fce4baa8c1fd0f43438730d200e81890fab4470b0c4f1ad77f1b8a2ce94877ea6480a1469f83679c8f783922a312150eaaa6d9c7152ee391d69f
-EBUILD Exception-Class-1.450.0.ebuild 778 BLAKE2B c621d7f18bd97d8832b428a30a4d397a6b54ad4db4426333498b817c79916b670acafe12fc82634d625d870ebea8adea08eb3d4514b837e42aace2cff9fe9576 SHA512 1fe1ebf9711941b1314a05786f799bfd9a628bd0d0a2a0c0fd2c7a423da5b5a61100f08d5545c265eb707cfad587ff26875758bb9bb5d9d12c37f8a5b69d0176
+EBUILD Exception-Class-1.450.0.ebuild 773 BLAKE2B 0bdeb6296c211701bf51d75fe3c5b0ee15c0cb71d517fde9791982e7eff56d05510b99a2e28c7f88b320b356d928c05c64f94765a0268d13161387da3bc1982f SHA512 e90d723fcd0d63bf69917db73a48083e7eee5788b20decb6e25d5e6a19b9da5e97076e68021d7ba31eb4f99e494e1c587470b95da6023a30b07d2f34341cc75e
 MISC metadata.xml 471 BLAKE2B 97ae454f0c53b8f3b7f051c157a0f6d89943964f35150850916606b09144c675511399136a637014b265981fb37fe176b76bf9e8f307c07228f54c6d3f85cfad SHA512 45f0b6b80305cdc7c1af3c62b9442e6464a02fee42908455f3e33de7c981046a7421d097320ed9be07e63c8d66f891fa6a4273d23ad025ef978e4ed20f0918e6
diff --git a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
index 3adb90bc0077..5a0ba13b6ae0 100644
--- a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
+++ b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easily build XS extensions that depend on XS extensions"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/ExtUtils-Depends/Manifest b/dev-perl/ExtUtils-Depends/Manifest
index e098717635f6..8e14ea2e12d1 100644
--- a/dev-perl/ExtUtils-Depends/Manifest
+++ b/dev-perl/ExtUtils-Depends/Manifest
@@ -3,5 +3,5 @@ DIST ExtUtils-Depends-0.8000.tar.gz 17923 BLAKE2B 836a12f5de3f7fd520d7a5f1db00e8
 DIST ExtUtils-Depends-0.8001.tar.gz 16708 BLAKE2B 59342f8c638b9dfb60bb84a7abe8baca08d00c40f5da62553d1d7337f3c92f473937de1721302d222cb0567a14428b33f475f3304104030c358fa3d025dc13fa SHA512 80141f90fbde7c62b192a55d40d26ce4e442150287ae6fe200388dc84cedba5f5210ee6cd9a40b1a9cda0cc49815b1ba1ab35e75afaa7440de3c3577d01bb733
 EBUILD ExtUtils-Depends-0.405.0.ebuild 641 BLAKE2B 125c3e83ad66aab372076b50dcc1d849b83932d89f3e2bb37c3ca00402b0536a3edef1ad9ed526e04ebe20560616969d588755696bf9c5aea86798cd8962a4e0 SHA512 d0d4a96dddf6bb9bc036be153051c7e796f79ea9492d53fb9bae2575b6cba2342cecb06c8df37324d691c72161f190921e4ca0358ab803edd1305dc160bd0b92
 EBUILD ExtUtils-Depends-0.800.0.ebuild 650 BLAKE2B 1d0f2082fa537790dad6cdb82c9998c956d985807439a4efb48d5412fe380a0d02971fec99a0db5ddd89a349e5503bb3fc5da092abbdf41130984f25b025156e SHA512 7cc005a1bb687913011cc839db65215ab12e9cd4fec1f1534ae3c7b7438fe58460a1f1ac7a78af072fbad961223f3d74b89d0bdcb5dfca592e53f22f44448901
-EBUILD ExtUtils-Depends-0.800.100.ebuild 664 BLAKE2B 9f3ea1a7278bd553d7fceb2c9711cbfaadff6da6cb6bed72830fa593b0f10b6cbb5ae14a795985019b1d4ba4090af513dea4f8e9146f91c9bf61168696ebe071 SHA512 c5e798cff1798c4b2786ab73dad644cfcf0166a129a202eba63a2c909674992aaa8c9ccda05478985b9d7aa79075096820d589351efb7c97bd3edbb6563648b1
+EBUILD ExtUtils-Depends-0.800.100.ebuild 660 BLAKE2B 22590c905146a400eced5931b8f72a56d0b2a5ed73c2d309e8d809094f53ebd079fdd43fe337467ef25c7e1c5319fd4aca1dda9adb1633b8add37995b1585c69 SHA512 280fda5423730f4b474ba85a462b35e6daa547046f5d0b87352c02140a8637dc860bf52ed90fb6ae798e289d011412c4056b3cd9daa50512769b04ed2c35ce87
 MISC metadata.xml 404 BLAKE2B 93cebeb39d2fe8da303c39e4ca965f8d801581aae1f7c7f53341a5a55f2df8cac89c22845f57355ee187b5c527e848cb9ffa8e41bd98bbc47b2f2e8d9851003e SHA512 a39e7e1c1a4173b6fa2c4df6616a91a52e83fca6bd481be52ff49a4e29076eb38866e27fb62c8eee49d39a0b681ca796eeb65243cc6bd35511e54f4a962adcba
diff --git a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild
index e72321aa2033..b01ca8e378d8 100644
--- a/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild
+++ b/dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module toolchain-funcs
 DESCRIPTION="Simple interface to F77 libs"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-perl/File-Which
diff --git a/dev-perl/ExtUtils-F77/Manifest b/dev-perl/ExtUtils-F77/Manifest
index a2a8f108f326..70e90cbae333 100644
--- a/dev-perl/ExtUtils-F77/Manifest
+++ b/dev-perl/ExtUtils-F77/Manifest
@@ -3,5 +3,5 @@ DIST ExtUtils-F77-1.24.tar.gz 12572 BLAKE2B 86f8099cfdbe8acdfc2db895a9114c866fbf
 DIST ExtUtils-F77-1.26.tar.gz 13141 BLAKE2B 275aa0471efc54d29e27c819c0d8d4717c49987027527f4532bf58d3377733d8b900ccc4a6632b395382909d2b7649f8a6f3383773e6728da4e949b59b1656cc SHA512 ed95922f261f3e4e917c06fc73a4ed2eee3501065d38587414a81a62aba4232a75e9045fd6890a55ece1808a0eb9af51d103ace2478684f3e5e8f017dbb975b0
 EBUILD ExtUtils-F77-1.200.0-r1.ebuild 452 BLAKE2B f8227478e27d8814cec2d5290a5b723448b0e65a75c3de275711e4c0beb271f749ce143e54fb3e5b2899ed409057f346a8df8154265727cef0f2d5fd1d4a0072 SHA512 265b31c8ab212281336f99adbc275d640d636a29f5767b9ac5618f0cc93d8e60ece92179e48f2f8e250dfd3cc3e266161f1cb67d290a494edc92ec96dbed3b3f
 EBUILD ExtUtils-F77-1.240.0.ebuild 789 BLAKE2B 6f8bb44878652d1ee6763a5fb772bf5d5a60463f211a79b0d60595768cb1d1bd8765848052b4ee0d2ebf93b5d3bc270b6ac59ac2a83f19eb313292e2e84994eb SHA512 cafad41756cfa33d4322ef63a1b2eb91c7f05fd32c2956d74f1ad9482c8f0b77fc91083f1afe2a36aea59259684419eda83912f87b40b4692f6e91a062c4fb57
-EBUILD ExtUtils-F77-1.260.0.ebuild 510 BLAKE2B 137cc9a1ef596e2a3c3a0ce922c6627ed0ede93f9b6d00def24e37d8fbccdd4839fc039cbdb0e99ccb55a0bea028cbd2217912a03859852c9fe6c385e08d733a SHA512 d0b3444d20d60b9945361d5c28ee2610ab5fdd1291dfde795f8736f5221096e98098606025e2d56f94498685c4ba52c1135af9fa941b8b04f540620c4bb4cc7a
+EBUILD ExtUtils-F77-1.260.0.ebuild 507 BLAKE2B 32d68acad852a1bca54642feecd114efd712268262c81afb352d28efd370ec834686e422061ea87bc940a3e72bfc5486a4a663e1cf9c8b49a1672c1787c712f3 SHA512 2c887e371291585d5ce2437a2892fb2999135e280972313f1436309b21f37f244a220b527ce1477b6e302108f7d1e8831ecd9d8a0aef0e92558970ea5acdf750
 MISC metadata.xml 396 BLAKE2B 5df2c10b2abcbe658257e6ae1e2fcdf1ca572c9ac4832eadedefeb84bcdff057784e041d97f9972e2dbdad2e998887cd7c8d3e48318d1fc463d6c2f6039c3a92 SHA512 1810bdaff85f127dea27d10e7dc7b03424a9cbfff171f0182d877d581c973fb49d833edd337ba5a1d9ca0d756c259700077edfa21b9ae15f9c6f87e712d0c49e
diff --git a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild
index 7b6714dff1c1..b62331f24417 100644
--- a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild
+++ b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Check that a library is available for FFI"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/FFI-CheckLib/Manifest b/dev-perl/FFI-CheckLib/Manifest
index ef73277932ff..b3edef0256ab 100644
--- a/dev-perl/FFI-CheckLib/Manifest
+++ b/dev-perl/FFI-CheckLib/Manifest
@@ -3,5 +3,5 @@ DIST FFI-CheckLib-0.27.tar.gz 29371 BLAKE2B 194ac6102f32d9107e112d20ea85d82ce8b9
 DIST FFI-CheckLib-0.28.tar.gz 32051 BLAKE2B 5e124ecea4959b910c8fad5de17ef5b3bbcffe680e8db090fe8e9d9fd6b128e4e5ea947def214c65b9a35fa4a8c4468424228b020a112ba0e4cd5aaa42888371 SHA512 9ac42e7153902cd178d9ee7d3db7edb96deb30c8b53cdd6c14706cde200598ecd98031c8e17394fcd1fb2c770a0ec776131e2ff93491d6b307a6e595fd788d5a
 EBUILD FFI-CheckLib-0.250.0.ebuild 588 BLAKE2B 36dea3e6f53d4d8f760888ec4e15c8c1da284b4b0d60dbb5f9e4ad979cb7924cce6f3b00b7f27927bce7359b8f13a1185be86eaf78e14c7b4d9678cb7146650a SHA512 6cf7499433acac1ab364fe531ab5b257b4b5b58b910fede1dfc8ac1be733752e91da04107f28b6e9bc10eeacc5e03ab3d400a455b72a9f6e9655d7104848cc19
 EBUILD FFI-CheckLib-0.270.0.ebuild 580 BLAKE2B aea79afdeaec9241782b2c809b355664027b5b47e4df0c5683b0215fec5d5249a40d1893aaf2ba61e780f9dde945bc2b364a50b9f228e3d37d37212fafb55a29 SHA512 a8e791b068dc4c690e3b6be71a66a33f125295761caedb8aabd0eb7f8a2e4fb27d1c0c848287d9f3956cc3dbb359424c72ff9c0146450b7349e1d85e3682a76e
-EBUILD FFI-CheckLib-0.280.0.ebuild 650 BLAKE2B 5950bfdcd94a8a083a976e472b3679f58a6b4e6b3cba40bf9132c5ecbe0a9b1653d1c0821eed03d6255bde027e910dc1328b4b2ba57e11f42af98dc47fb05988 SHA512 6325aeb3de8b9ffd627ffb582f7b3af0b1914172d24404ded409772c7e1690de20c661886257f235829084bf2cba9e4f70eb59f0c25743b38471a57674d63a95
+EBUILD FFI-CheckLib-0.280.0.ebuild 645 BLAKE2B af45a2ebdd5567f0c2adab449f9110e9441fce299a243e87863c0d42a6928f347fa99033d4a03dac4abd2076c6071e9e93023fd787beb7b994db63564c080de2 SHA512 eeb9bc13dc64d25a6808d65a5eca36896e5439035368299a789a473bfa6b31a33048ac7e093518bcf3d5d36d2d2715cbd57b7ee9080bda2149404215645105da
 MISC metadata.xml 396 BLAKE2B 3a8692f73d6f2cf8012bfc60fa107ebf582b75409735eb8cfc8ed9a5088fa26aba51230353616a2b4ef26d8a80205b3204f7624782ec543752be173350ad6698 SHA512 d1131f6d33aa0053a0b7fb7a6d3beedf924b19a55034c724e5146faaad810ba2381f74a8f14b3ddf670482a54f39c2c8b17a2a13fee6767a734a28c30eb35c1a
diff --git a/dev-perl/File-Listing/File-Listing-6.140.0.ebuild b/dev-perl/File-Listing/File-Listing-6.140.0.ebuild
index 31f0863fbad6..cb84ba479cd2 100644
--- a/dev-perl/File-Listing/File-Listing-6.140.0.ebuild
+++ b/dev-perl/File-Listing/File-Listing-6.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse directory listings"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Listing/Manifest b/dev-perl/File-Listing/Manifest
index 078f02898d46..012a80e42a76 100644
--- a/dev-perl/File-Listing/Manifest
+++ b/dev-perl/File-Listing/Manifest
@@ -1,7 +1,7 @@
 DIST File-Listing-6.04.tar.gz 51536 BLAKE2B 78020016dbe7e8e0ccf3f79f878d732ebd5cc278c597cb5e4ee38b6f632ce960f5c37015db868576ab21d81321af18960fb271aae6f4d116ba97571e6cad0c80 SHA512 a84198bc82003daaf88ed23218e34a7a1552dcd2855a9563e9609ce5df167a8295043501534c31614854fc8dd9c04b4af27b4d7320112c613914f94c86c2eeb2
 DIST File-Listing-6.07.tar.gz 61081 BLAKE2B edd4282dfb134ea5f2ecf4f227596aafd1c5f720d5e0158b1168e6ea93c0cd187f26c88992b08c8721894a3cb2b5ea9922124baf77d279a5eb165226390bf61b SHA512 1d525058e64ed3f3115721df63527752c8f3de2e0b000efea93b48054695e6b8143c613cdc1c652db30178f517f5bc106dfa176d30629553150234e7cd50682f
 DIST File-Listing-6.14.tar.gz 80562 BLAKE2B ab5b0974c9e8077195b2e3a5749228b07e0176bba5419aca35f0b1fddc22d1ff3d4c294ffa12d9d091074003518f805c37e5bb19ac6d82ef6ede4f0848f1a1bf SHA512 858339b15a455db570d15b02e801ab0e0afd47da71685002083cbcc1a0f89783fcad4e840e0381f186046ab2f355dc0f593dc8c9c0a2da0fc6f17a35265924ab
-EBUILD File-Listing-6.140.0.ebuild 703 BLAKE2B 9e12ec6c75f161f9a647d2cdd3bd83de3a097f8b0b6424b8afb24976070981f2d3dd9b44721c746ef361849a707e1de8702d01cb920ff49bd94b6a09a271e800 SHA512 3f74cfdb5f61e8ce9861ff9dc299fa57ce9022e7af7f188997fcec1b75ce339afedbeacc0968026094c45e89345295d83863a94e2c02b14e588f53a8f690b798
+EBUILD File-Listing-6.140.0.ebuild 698 BLAKE2B e2e3c36672858534f7d56537766c83fe497492bc3f36ffd5891758d33009d39b7a81c3eb8db35b56cf90813844722b34809a817154a1544eec3d1b61888a2b10 SHA512 c39232eb7663cfc812c5ba29c5360c0bb4d87f871f92453f7cbc74ef0970b237f59904d5d3b2098570bbc4534831f9fca2bfbcda1081b9cd589b4d79d7044690
 EBUILD File-Listing-6.40.0-r1.ebuild 536 BLAKE2B 3f053c0ac63693abeb95677137e00ad633d2c54da5d0bc52b7cc7536cf057332d40cb361538421b5d77d1bfc5caa0fa7960c8741c74306fffa6c4abc3bd1a58c SHA512 2f74dd12a6ab9c363645e081f72f290b6d7b2c5e944517137fe97bd13d02b0076eddb29096984fb295d5e5b7440f5deeadb6bc3403ff93b6c3059ec497d8aa5d
 EBUILD File-Listing-6.70.0.ebuild 650 BLAKE2B 22826744b93f23eba6cd4c99c447e9fd8b7451142ecaa2e485ea383e076e07608e3f1c2c0eecc81587671f11b215123f868d12b4dff255b8e71c4e88465cc981 SHA512 ebb6c8f77659bdf621de89acdcae4cfa7bbd2b4eeda6a8bd479eb69f584ff60144a882413e59e2b1ae1647a4b2a50c1dff17cbf494787e913c3848eb6b19198b
 MISC metadata.xml 710 BLAKE2B 1c457d9433ee8dbfa2736ae85335aecfad189e75bf11b906ddd77970621b51652d8d12ce2e928aaaa49898445206b73c75941e1fba8c7eba29a153d3ada7dcf1 SHA512 8ddb71e18d85c8811f4cd58b8808434cf609edbe989e5d0d8e5a4ab5b9c1c6c260e6f175adafc22453ddf9fec43fe350597553eb6bdf937508300cb8f6c7f83b
diff --git a/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild b/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild
index 4e5e2eef918f..f46ae1bd01cb 100644
--- a/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild
+++ b/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Read a file backwards by lines"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-solaris"
diff --git a/dev-perl/File-ReadBackwards/Manifest b/dev-perl/File-ReadBackwards/Manifest
index 2a872d4d2b88..028b426abef7 100644
--- a/dev-perl/File-ReadBackwards/Manifest
+++ b/dev-perl/File-ReadBackwards/Manifest
@@ -1,5 +1,5 @@
 DIST File-ReadBackwards-1.05.tar.gz 8943 BLAKE2B f1e8703b04cfc94f69f1d953ee0f979e9d887bad97320b0b3d377f338dc074f8b9dbcd425523f6e3ec72c77c436cf7411098717eeca62bfd3230e603356ee623 SHA512 8e1eeeda0acfdc0b9e1f5234cac37348890fb962e5edd395804d6cf9ab2c221217e2714025303493cafde7ce77721e6c09b2b53825dadb978fafe68f6d7b8c20
 DIST File-ReadBackwards-1.06.tar.gz 9739 BLAKE2B c3252c1618e9b1f767da62ddddb073b7a6e0f4b78f6ba119baebefc9890411921470752e1649513ecf068ec3fba3b163db4957261c467678bf01994ccb4874aa SHA512 43b7ebe58728272fbc0518fe6572b31061ba09665443240558b9035573d075c28b52d6230078f24616110d54e51477ad122c985d4fcdb3c3d288cb24e476fe45
 EBUILD File-ReadBackwards-1.50.0-r2.ebuild 385 BLAKE2B f77ab665736ec7912ebfabc7bc439139ca7d5ea3b55fb3cdb7dbb4d4e7597d7c0dce30f1b6b2a25336afd0e603aa5b54c7be94f52bfa811246f30c85e91c3773 SHA512 5360a141f26fe554c15a71deb1b279b309ff01b25abe32deed514e5f625172be4836732f0f50335454b2efbecabface22895ec79493f0cd58d1d9abf813869ec
-EBUILD File-ReadBackwards-1.60.0.ebuild 300 BLAKE2B 00f2c01b9acf05be9dc99d375250cadb63dbb405ac3daa1a4be726be2c6683d197b1f7747a642d7ef1c4c7f7d589ef7d6b4c0166f3de6cb52406895d18347c09 SHA512 07d1ecc57090777b2f46cf08e94fb1767beefeb6a492e6dcefbf4381d46f16b508a90a61ca5fe67060afc2270f4d0aaf3a73d1f347956e068c4e8b851bdec095
+EBUILD File-ReadBackwards-1.60.0.ebuild 298 BLAKE2B d333737f7ab9f49b24a2721270e6925e8b9258e600a8007ec3483b9e6fd6ef7e812bf33a81c5ce35bcdf3bdcf4d82dfb466c970f67e8905a4d6fa5c2121360e9 SHA512 0f1650bd415df351e0b717d3030362adf3580f72dba553b4dc479aed5abf9a6ca44057b88e3f893ec70c88108ab7c19fa225afd608ae41e5d0aa6e8892326368
 MISC metadata.xml 408 BLAKE2B 72b0ef4b0d7eb4df27861a4cd9f16b3e65c5ddfd33cdc451584bc127a1c2e89b9b7e573844e7211fb0da921dabadc45260b97b66037514fb56170ff79dc4b6d7 SHA512 df086b73fd20f77a8f0b220d689a6a6fbc09dfe6fe5a31bf21724e77e8d59c8965fdae89330b7eca0f01d1e1884322e12e2262254b821dbd3f6d3a31b71fdce8
diff --git a/dev-perl/File-Remove/File-Remove-1.600.0.ebuild b/dev-perl/File-Remove/File-Remove-1.600.0.ebuild
index 77181f6879c6..6af136819cab 100644
--- a/dev-perl/File-Remove/File-Remove-1.600.0.ebuild
+++ b/dev-perl/File-Remove/File-Remove-1.600.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Remove files and directories"
 LICENSE="|| ( Artistic GPL-1+ ) || ( CC0-1.0 public-domain MIT )"
 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Remove/Manifest b/dev-perl/File-Remove/Manifest
index ca0dcf99399b..41cb2169c5af 100644
--- a/dev-perl/File-Remove/Manifest
+++ b/dev-perl/File-Remove/Manifest
@@ -3,5 +3,5 @@ DIST File-Remove-1.58.tar.gz 25575 BLAKE2B 20673b6384817cc93378a1bf7a6b0cae52815
 DIST File-Remove-1.60.tar.gz 25997 BLAKE2B ffb98155d757bae6ec0d4f56dabdb78749fc968845e284797d0f0611fe9068722a007c7e0e890179720745d1451c926575949f36642dceef7071468a2863c7c6 SHA512 7781629896f16f0b34574a879803473002249c32cf03001f4c1c290edd379571d96d5b1049874f9f71bdb8d7881c3f30a86dcdd0d4f42b4e78998cd6a96de750
 EBUILD File-Remove-1.570.0.ebuild 696 BLAKE2B 4087300a325e12c6b1bce6159319ca749fd3618ae4c1f52e8fc4e233ceec860f0d22252b3d93c59cc81cc20afa20b39535947c248ba3e7c7ad309ec203995694 SHA512 f68781624ead53acfaf9b983263d3c8bd3a9145944cdc10c68740147baebd8a1a9ed891c294a3367de7091be6c1f1c83c6ccec2c61d11fb7721aeda7ac60b4b1
 EBUILD File-Remove-1.580.0.ebuild 722 BLAKE2B 6ea759b7afdae9a9de30a2ebd0338ed0241ffb0a8b8a6cf085fa2d54a39c2c224f2ed5378930ee523dd859b80ed6cf920864869e7216e03effdd83ce5f4b8969 SHA512 a5cd7ae4b9fdb16ffb11cc49be49a912abcdde2431c21d09fcc34e4738cb0c798b20ad5a76ce48cdbe49d175b2f1e0a8aac5d8678a8272e43c30e0723237736a
-EBUILD File-Remove-1.600.0.ebuild 704 BLAKE2B 9b7ba7f4e75503485cef3a5f0d4f53a5fa33631fbc245d3e835cd55cd22d64f2a11db01b542b205657fd241f89d734ab609e3691bdb5e8cffc605a3eec6115dd SHA512 e9385b870b75025b15050807ae5037114e01de287dccd8f4c1000492af23ace9c882f2f68aa64dace3bd698183d3c0b86aa4f93a9c3b7a85495ce34439d7c2fe
+EBUILD File-Remove-1.600.0.ebuild 701 BLAKE2B 318e7fec5ad5ceed0b6cd24a2890bd7645af94ac840eedb60528b7b9617d448c217e521023f2596d062b87c79c47d2de0e09d72221f14a545181bd8061e54d07 SHA512 770ebb8418579a9646a25eb80782ae11f299edf83c92f9d3b11a397415922f13106268d080f3fbda100cd77741360582a98b3ac2ab7145992ecbf7a3e81b2a87
 MISC metadata.xml 394 BLAKE2B 12f606d262b6dcc55390f4d23a8aa7624ac0c09704ca261e7698404b20d16d4f31cc09ed6fa6516cccee1f20bf7cf895dbc13af15d7e2fd08008541ddb6c932e SHA512 a7ac4d8ecc1b0e4be8268ce717e2ccd67dc652719497f8906665347e8c33d6c85c53e88e340fd34382b9cc41c62b7e098d491b8a999365ec11f6fd02b363723e
diff --git a/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild b/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild
index 5efdbcc8df20..fbed5682e51b 100644
--- a/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild
+++ b/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Locate per-dist and per-module shared files"
 
 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"
+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="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-ShareDir/Manifest b/dev-perl/File-ShareDir/Manifest
index fb76e4b93212..3ef1af8b1084 100644
--- a/dev-perl/File-ShareDir/Manifest
+++ b/dev-perl/File-ShareDir/Manifest
@@ -3,5 +3,5 @@ DIST File-ShareDir-1.116.tar.gz 27487 BLAKE2B 88b898ea6d139b21bf9f64f183c808192e
 DIST File-ShareDir-1.118.tar.gz 29631 BLAKE2B bdb2c2d786efda84567d56611fdfbf027665e6d0df21a1e4bcd92824dfa32ac9272cf4b2fb0eb2260317957af150df8a6919027bc664c594ac931ad48cec3f0d SHA512 890f33e96333f7b07707d722e59e7da9a287112062814ef294594ac67f2f7349f905c009e6cd70d3af3a4de85335b074ec5a61194f9b0495f3e793d6ca635853
 EBUILD File-ShareDir-1.104.0.ebuild 720 BLAKE2B 9817613cc6cb6efc67ce96f2c86036ed45640c43ebcca8127134f053d6e9e05a3c7dcf8962f070d5e37c73ca03f2a4895566108b188b526366fcf5538fa1fb54 SHA512 97c1ddc784812006ad4c79c23754fd9943fc919662697c855bf439c21ebdef695208b43db1be614d737f1370dbdf7d6ccdff3f52adbaee7a43e4a19e14426939
 EBUILD File-ShareDir-1.116.0.ebuild 1016 BLAKE2B 2046351f19de04add8335bbe60850210adc5f330a7875b0bfaec0c96505acf7008ad86420ab09105b8c8b1cba74e328d6b81deca7c427a4b7a6bcd53d6eed28f SHA512 0e7e6037fa98abde8263ed86fb384eb535af41fbc2bc64becd03e4168bb6c0066a432207cc37af755ceba508072c7b95295e3c705c3aa4c0536c1a6c12ccb8fd
-EBUILD File-ShareDir-1.118.0.ebuild 823 BLAKE2B 1a864202992a4c727fcaac519f4e0d9942fe7dd7b3e91d338b4de2fa5bc48ccca437a2fdc640238370df7306a7b1c4624c29785906611c641b550650b07d7993 SHA512 8c669b9fdf5c8f5c718ad1f4a733cbd332e1c17ee5e375786b7faa5c73450616a412d18dd00e321433d2087521f2b97a76a385dd2011e5d46650c3fd30d49222
+EBUILD File-ShareDir-1.118.0.ebuild 818 BLAKE2B 84c0678e22ddf17063a67f84fa0f30df91b6d44a176292d43812de3e1d454b1e2e6245c18171b6638ed041f73d6b7137448796933a03585adc29602f26812c67 SHA512 1aec792b4e32692c8234aed2c994a0c293196be50a1cddbb5274826ca26e910852a3b311ee7c9a519a802241c8888a10a8470e57b6582f894e15d0aee1e380d3
 MISC metadata.xml 398 BLAKE2B 393f7f6723e23146e3c509b6fe955eaaed1800a4fd5b07bb01e793a4f4fa4045e75bb9e8fa19a7fc3ee424ef4e890465fdfb1d33079fb05771c8ce3b6ea9a185 SHA512 f13082c7aa0e876a02c76e56d91d53fcca5e0bf56b4b32c8219a4f18349287d07ad93f61bd2db22b213a90312534112fbe2d7cf493dbbc91633ef63115bf72f8
diff --git a/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild b/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
index 716e87975295..9ac03cff4ced 100644
--- a/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
+++ b/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A simple, sane and efficient module to slurp a file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~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/File-Slurper/Manifest b/dev-perl/File-Slurper/Manifest
index 9dfe62002400..eb43c8fb7801 100644
--- a/dev-perl/File-Slurper/Manifest
+++ b/dev-perl/File-Slurper/Manifest
@@ -1,3 +1,3 @@
 DIST File-Slurper-0.012.tar.gz 15517 BLAKE2B 07f451e93e5fa8641a4b8156a61b9a9c1a9c9dc36b33c4991e1686e44b37730af3a9541de33396cdec6bac1d08ec1bf9db505e6fa07f3c95187c4901016955a5 SHA512 276b510c85b4e28fff4b8bd77c81031367b073426138743efb5d54fe01fa9825409f86090788779e96625b43207d1f864f348cc11554c51d36868dfed568f2bb
-EBUILD File-Slurper-0.12.0.ebuild 799 BLAKE2B 07dc9ab1fe88125d0bb3276d104b134c6b4d0678bb04dd9e91c91025878118ae02eb684b7b9c087f01d1698db21ed33043d3b0c9b06ab11b758528de59d2162e SHA512 65b50e72d3848690efd2215943c92809e4f55712ddf80275b0173449495077a8573289b7e989ad6574f5eb32b883b7dbdb6c12f90eace784e8e6df5c7daa9e24
+EBUILD File-Slurper-0.12.0.ebuild 805 BLAKE2B d14b95835f5e15816e5ee0cf6056c4e8be259970876ac632c3b2b49131483b2961dfd47520db26a19e5fd4a0879f11ff19072892c252540bf3f516724991125f SHA512 70eaf39507198658b94c1d11dca4bb1b2805862df3010a0a09962bab6777eca2b6fe63d13ba281385c79c7b2c62f80ce54f7c52940b20c4e760080599ac01b3a
 MISC metadata.xml 481 BLAKE2B 2f8f554f6beb1ed6ac889fe379ff15c4bd76fb8ad050ea6a14f400572aebce11a7bf91468d62ec2844c00c1827928809fb48344f326b55b61f3e4913842641cc SHA512 62906c3487d2b3b8ea9bdf5a5d6fd6aaed39500bc41346fb918363771220742c31de061eb825916f3897a229e8b92bbff87a9181551718cc3fde1eccd9b60600
diff --git a/dev-perl/File-Which/File-Which-1.270.0.ebuild b/dev-perl/File-Which/File-Which-1.270.0.ebuild
index 8e84c8577e91..872ed4f6677b 100644
--- a/dev-perl/File-Which/File-Which-1.270.0.ebuild
+++ b/dev-perl/File-Which/File-Which-1.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl implementation of the which utility as an API"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 pwhich"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Which/Manifest b/dev-perl/File-Which/Manifest
index 3f68cef84038..9dcc2b7a5ec6 100644
--- a/dev-perl/File-Which/Manifest
+++ b/dev-perl/File-Which/Manifest
@@ -3,5 +3,5 @@ DIST File-Which-1.23.tar.gz 23293 BLAKE2B 8a02bcdb27c052a344297c70cfea6b944ba004
 DIST File-Which-1.27.tar.gz 25146 BLAKE2B 9252da514e45eac03bc415a0c5eede6731f0cd05df0a7894b975edccdac338e711f7793da75a94419e1ae737034c612f595a312d20a59244b2f6572eda2822cb SHA512 8a6164c4af915e93924b1d62864e492b1c5067856e505c50b9a5cce0600d73bdcda5f7e35a9f37134d9e89949b45bbd0a5426cb56121604aea1a3cfe48d55e5c
 EBUILD File-Which-1.220.0.ebuild 723 BLAKE2B d388d476d9634df5edcd8f6a203ef288c3c83eb0abcf1a99ebfc42ced90fad7a10499f308c39bbe12a010d44916323aa8a024fb1b47f4788af19480e93fa53c4 SHA512 33b2d636ef1440b5887d50037682533c432d84a7414b743b76d35a44aba71d364f5241f01f04380ee71306c2d19648cbc03ede5fdf5b967ad41ea278ce210519
 EBUILD File-Which-1.230.0.ebuild 712 BLAKE2B 7996d5834ff47a97cced0d0fb387b595a054b749c06b0c7b28e8c53b71b72f6217f9ffeb7e19df7c4d98158db1ca9d766347e7745f6639fa84a6a48007c7722a SHA512 93160b91169009a6101c345f8e91e155227c649629a027d1968636e4ffa526a910d2ea2c1209e4f666ba1209603131598f40b81d988d7474c131c0673892d3e1
-EBUILD File-Which-1.270.0.ebuild 725 BLAKE2B de6609a6ba2339364f6ea42938e822739c83c2cbdf4f11e68885b569b578d52f8f465492d0402fb0f89e16f0e9f0e307e6fa5151d871c17f4a908e2c91b4a76e SHA512 0bab804bccae7372f04c4794e066a79a2305c0d17578e6369bda82f680e6e1743672ef3ea146d07eb3e0cb02884034dab25ff5570819cb3243b4d8d25cbfba55
+EBUILD File-Which-1.270.0.ebuild 720 BLAKE2B a1f60e04a9bfa9cf91ed55c47b34998f2ab88dda11d86a3cd6b1c018025646790ba8a5cfd92816899aa4b0b0228a50719a2b3d058ac02ec53b4ec8da43eab51d SHA512 9ea599d4d497c431a1044d26f17361bc3d70bf27578e138da553bdfc92d0765fe6304f9487143382dd38677d2058d74c69d6573e0d6332fb611a5ef7809652fb
 MISC metadata.xml 519 BLAKE2B dad66f597916a87de8fdaac5afab5aac9a4f6aeb21e492a2eb61e15bcd354cd3e4d2dd02934b2463553c8f774ca945859103d4d127ee13c843f5cb8752dc0c95 SHA512 2f7f593061c1a254bdc712c25723fadfbbb70f9d680250cfd5d8077608dfe27f8472edc2bcf1ea50c029a1b36ddeb58cc1af900178275d6ea6720e4242a33a49
diff --git a/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.200.0-r1.ebuild b/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.200.0-r1.ebuild
new file mode 100644
index 000000000000..5d83f1ee0e10
--- /dev/null
+++ b/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.200.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MONSIEURP
+DIST_VERSION=0.200000
+
+inherit perl-module
+
+DESCRIPTION="Tool to merge PRs from the Gentoo Github repository"
+HOMEPAGE="https://github.com/monsieurp/Gentoo-App-Pram"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-vcs/git
+	virtual/perl-Encode
+	dev-perl/File-Which
+	dev-perl/Net-SSLeay
+	dev-perl/IO-Socket-SSL
+	virtual/perl-File-Temp
+	virtual/perl-HTTP-Tiny
+	virtual/perl-Getopt-Long
+	virtual/perl-Term-ANSIColor
+	!app-portage/pram"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		virtual/perl-Test-Simple
+	)"
+
+BDEPEND="
+	${RDEPEND}
+	dev-perl/Module-Build-Tiny"
diff --git a/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.200.0.ebuild b/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.200.0.ebuild
index 1034893687f6..d9b1c167fee4 100644
--- a/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.200.0.ebuild
+++ b/dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.200.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 @@ DIST_VERSION=0.200000
 
 inherit perl-module
 
-DESCRIPTION="Official tool to merge PRs from the Gentoo Github repository"
+DESCRIPTION="Tool to merge PRs from the Gentoo Github repository"
 HOMEPAGE="https://github.com/monsieurp/Gentoo-App-Pram"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
diff --git a/dev-perl/Gentoo-App-Pram/Manifest b/dev-perl/Gentoo-App-Pram/Manifest
index d5d02f564561..f94a85325619 100644
--- a/dev-perl/Gentoo-App-Pram/Manifest
+++ b/dev-perl/Gentoo-App-Pram/Manifest
@@ -1,3 +1,4 @@
 DIST Gentoo-App-Pram-0.200000.tar.gz 13061 BLAKE2B 783c50954f3936bc2dbae4d0db0baf52d5a7ecbdd576ada75e1c183816432a09059e1712b337fd1b7ae79dd774242ac684a0e8bea26a90424458ed35de523209 SHA512 90f82400de8ff6afc56ee6c66394188bb0b9aedd584879588f8ba5555b6ffad60de109e91a2d223593e2c78b21754957110718a7fba0cf76050c79cc823d505a
-EBUILD Gentoo-App-Pram-0.200.0.ebuild 708 BLAKE2B 011d20340224c7c3c19ae4f321518fa68901ee2ec769592aaaaf7e7712468c047df95072c39fb94b9b2af00be2a110a762d41b36485dfd00ca8d19abcd03a7ce SHA512 f544fefc9afb88282d8a54b07ae0c30438bcc0d94805f55e788a6e90868463d358dd1afca4e6cd8c93f0788722cf1c4b5804fe1e9c119ce7035c2308faac72cf
+EBUILD Gentoo-App-Pram-0.200.0-r1.ebuild 725 BLAKE2B 4e819b3ac021af5b046a8cdac7c65ed24951117a37e49a4ba16ed9455a250c2c61ba0e97167ea248e24e3fe4d4e0353bf761f315069b4e4d7a7a75a1ccb1570a SHA512 782e65cbde0a9c60543520431722f085ca5f9c3f9bcc7b157c01f3e5ccc5caf1f0f9a789f5a0b999c4a0d7ec20ce2789ab8ab36b0f07ce56cc79c49e04d3d1c1
+EBUILD Gentoo-App-Pram-0.200.0.ebuild 699 BLAKE2B 1092b78942d54afc75db227aab8879bfd32de8cf737dfbc6f1ead7531bb4d0330d005ac351292eb71d07b741adaf2e824ec86ddc47040ec559e03d8bf2b52592 SHA512 92b33d328ddf7e6f026a579cd00d01d7210e5aff91785cb5dd8244ea322daf78a57503de62db4f13413b7c3a57318f7c3c1a40d9e72e42de38539b4da15938e2
 MISC metadata.xml 588 BLAKE2B 35668e32b10085ab7c76e803855150f34720e3862b49be9e7945a4f83be1fa3bbd324c42fbab63d8e76f71964a86cbfad1eccbf63eeb2c37dab57f896cb8066f SHA512 025fe962b70faee06d6a09532e8ab70b7513572f57d42052c97efa0955eb8f37e944989daed5f9dbe67f7ef155033280f8f2b40cdaaa6b3a8a824383de74a26d
diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
index 5cf3c105b8c6..8100e6813552 100644
--- a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
+++ b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Getopt::Long with usage text"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Getopt-Long-Descriptive/Manifest b/dev-perl/Getopt-Long-Descriptive/Manifest
index 635c96936269..6227933dd910 100644
--- a/dev-perl/Getopt-Long-Descriptive/Manifest
+++ b/dev-perl/Getopt-Long-Descriptive/Manifest
@@ -1,5 +1,5 @@
 DIST Getopt-Long-Descriptive-0.103.tar.gz 32683 BLAKE2B 9e457690d61e8b2330761ffd09174403d7e485c80af84d2cc61b7443762dcbe9832a15c589b729536103e80c75556f60040d5d1d3637a5eb3226bf1cc1d57ce6 SHA512 9229575bde794fa1213871fbb33a12222737d7979cf4c290200fd85c7da9e3227539809b8380a88a85675429ceb61e505bac8cc4e1408ca63ba92b4e1b33149f
 DIST Getopt-Long-Descriptive-0.109.tar.gz 33959 BLAKE2B c936f820654a5a14dfef706f26514334463b119b161643bbeb831802d9b7403c49f1cccd0414da855ef1bed424d88b78a220f037fb2d723ecce8d7ede54840e9 SHA512 9bd3af84119264c9e7e72b470f54782fe0a9e37e6071052a7b43af9529087841f77f06f81a70e4cab05380558216893b0902aabefcfbc970916f65614666969a
 EBUILD Getopt-Long-Descriptive-0.103.0.ebuild 977 BLAKE2B d787db62716b270cb9d482392c0b24d46c8165dd1b3a1f6edb80635dc009143ab300c84d64e0cd1a8197d602d2d47c2ed72a5ebd2404826d4cb6be4f7c7f8689 SHA512 8d1f30fc8ab4f7ecf381f67bc3737912acbc4873472fa9a8a681b2a1ff7a971d3cc19976e7e8920cdd79f559bb5bfcf7b2c2380c2c388cba12ab1e45ea8c131f
-EBUILD Getopt-Long-Descriptive-0.109.0.ebuild 983 BLAKE2B ff42a6a43d078392cd73b7649269150d9a4d5d3710e0f01ff807619e05349e6df339e68265d5d77e8c7a937cd16194be1101a6fec515f6c6ab2fcf3fe8ce680e SHA512 c466291e8a7f18b803db15445af57256c306544998cd6873e178a467763379fcc0f7e015d4febc8612361396c35c4d5a3b9547149076efc2adeddbd212993b1d
+EBUILD Getopt-Long-Descriptive-0.109.0.ebuild 980 BLAKE2B d2470780803512a71965664d322ad0fc5ad87c04f9452a9cfcb34594a600c44d57b8c82757c95febf953af5bec30559e54390003d24cbd1386b9870e3af88a50 SHA512 9dd77600ef47cc459d22505306b579d4bfd4e4af37ae9be7baaea20c2cc6b15980e5ba628ae3d1d79e57b7cb78f72d4ba6c66779a42b255e6abbc4aa73e0f45c
 MISC metadata.xml 576 BLAKE2B 284499ae9040033acd83c3f9ca6f5263c1b0652146333fff6e808587149264f7114d523c116c84f1e133cb558da9095403197da0c90f917777791e869515aef1 SHA512 4a83ea267c2c7d62a81da04c2afd355b6a6d35a1fb6dd8e2fb22b23e59b269b01ce6a91e1a76ca36ae6c621bf33e0fad295c733cc7f84255416c0aa146162bcc
diff --git a/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild b/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild
index 5512348e7a2b..77e03997ae9d 100644
--- a/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild
+++ b/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Dynamically create Perl language bindings"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-perl/glib-perl-1.320.0
diff --git a/dev-perl/Glib-Object-Introspection/Manifest b/dev-perl/Glib-Object-Introspection/Manifest
index a7f987f8af7c..7361fe15717f 100644
--- a/dev-perl/Glib-Object-Introspection/Manifest
+++ b/dev-perl/Glib-Object-Introspection/Manifest
@@ -1,5 +1,5 @@
 DIST Glib-Object-Introspection-0.043.tar.gz 80985 BLAKE2B 2f921b35167c45bc04e8d3505f85978d485d4f1244001cd2de7d1b1d3370731345757a0745852e0a047583e28d7b9ff0b18470714170c1d09b11b1e72a760c11 SHA512 b812ac4faca2f1df1192f7ac2374f5552811c353a363a33b3e6877c568ef68f0b4e1b8181a4738988017150317eb27e43976989cca802e7ba24d2a3cc2fa537e
 DIST Glib-Object-Introspection-0.049.tar.gz 88081 BLAKE2B 4d7d114dfe9b39f19feb4ed9ff40f7058e0c6b0e3851e45f3aa653b8222c1d3b3e68d1e900663435fcbae8fd627e41b44fc06b1775d0910127b32e1eff812a2c SHA512 fa927661dc761bfae9dba87e1e2d519b10c3aac4d6dcea37764972a0413a4f5025a12df640d66928b631c2933d4b0e6d02b559ea2c1eaa38fae6f7a9d98fe322
 EBUILD Glib-Object-Introspection-0.43.0.ebuild 577 BLAKE2B 9394da410e57aaf744450bf04f19e5c42b2a5638c31128aaef70eaa10e3a1e63a86324ee3bb6c9cc91a4652548b6b3fe28892c71464866b2f7b30e73354a85d0 SHA512 4b49f9c694dd7efd1d9955ed529aba3e1d19e8dc5a8fa0c170641883b0cfdb650d3087b8135de6bde8ea48e1700be5181feabed32e9d4622ced24dd7a08f7e53
-EBUILD Glib-Object-Introspection-0.49.0.ebuild 595 BLAKE2B 39c6d30c5732254f20968956c51a11212eb935d3dcd543208888fbcfa0c8fb0a4911e9fda321e16de949ba1ccf65972601a9baf249364d44daabb08044bf8da5 SHA512 f25c2df49086888141d885e7817095d2ad2de783a92f3cca77954373272393880ae2fc9e969641a4daea80c9779befc4e9fc2e06b72262ee97ef714fd50af5fa
+EBUILD Glib-Object-Introspection-0.49.0.ebuild 593 BLAKE2B 58d385296ee089891091c0d9d2067a14d605198473da6851e9630a0a0b8fe2c16c47cf36c45da8d89e4a6b1e1e103b323ed11bcfe18b1c5940e929b0d744d476 SHA512 183f6b4644b49016d9e51e860b5c26f1b13a2d1635f497e71f1f9ed4ce60e2c509d6410f4a2cdaaf56babe1380da2e59c539d13c8b415224a6628bf78af1fde0
 MISC metadata.xml 411 BLAKE2B e0ca06fe4a914e212161185d5563f93c3a958541dcb41d3ae3f863faac466f03b73e8051d94d97378e2a990208d29650367db65fe3a1f724ba6029db668b5e4a SHA512 c8bee7700599fbe4d559b1c1fbe4ff14933ccc01964dc4e40699e931681d667559de418ce301f4404a7aac0ecbedafcc15b4e5c3fab8c91c87c9727254b2a10c
diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-1.20.0.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-1.20.0.ebuild
index e7ab6efaf1ee..7303d744340f 100644
--- a/dev-perl/GnuPG-Interface/GnuPG-Interface-1.20.0.ebuild
+++ b/dev-perl/GnuPG-Interface/GnuPG-Interface-1.20.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl interface to GnuPG"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/GnuPG-Interface/Manifest b/dev-perl/GnuPG-Interface/Manifest
index 1914df0517f8..0001d39b7538 100644
--- a/dev-perl/GnuPG-Interface/Manifest
+++ b/dev-perl/GnuPG-Interface/Manifest
@@ -22,5 +22,5 @@ AUX GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch 1511 BLAKE2B 3eee783efd64848bc0
 DIST GnuPG-Interface-0.52.tar.gz 63733 BLAKE2B ce068177b8467356b57aae95a61e4746e4f690272083e465c877533a5ab0eedaaf271586aaffe7e4f979034d04bd49fc483047654426f23cfb904a98326454c3 SHA512 911f47a3b52249e8b39133d4040b86147793d9dd6a78d2b279674d6bba0cd38de5c919bf12b241b0e977790575502531afab6b1d2c05739d050c16d05d52fc49
 DIST GnuPG-Interface-1.02.tar.gz 75523 BLAKE2B 4b1311bbd930ae6719db9d7d25e247804c1f71f29da52b1896086ff4905cfdf09792d85fa9e90da462e974279cc673bacdcd2b6a32171eca1be861df5f712a98 SHA512 ff4365aa75fbcd2dc77c915ec36c0b578219ae1a2148e936b4769221f91c78a3bc3d371159b5130e7bee36ecf0e169b6a16e3a160d2598811d6f70850119f6e4
 EBUILD GnuPG-Interface-0.520.0-r3.ebuild 2758 BLAKE2B 760a4a62c7d5413bce55f5f48d4068d6744cdf4efc2db42a62c902cf6704204a95b7dbf13fef3626f6c5e7ca5a9ef8f7de8dd8c349d97d1ccccfe587adfac844 SHA512 e90a32bd241a390d2f6ac1f2aed15dbb8e1c7e0bd343af52aa70cfdf36df803490d9a19c16e2666b30c4757d2f1207ed47354fe50fd7df6d7f1f7ad8b0b0c9b9
-EBUILD GnuPG-Interface-1.20.0.ebuild 1025 BLAKE2B 52f953f3fed485f4a78212ef9a76d97fafbd65957273f895423572089f4098d8299dcf4c84efde9d8d076369b7246d7fdc2053c71f60b467bfe7f558502ab580 SHA512 3d73090c93b78e31820551d1dc1ebd5b19a67fde4d3705067bb3baee3df1c2d40d8ab1454e8a4bf4a657f13999a394d6e9fb4db3e6ab62fa9d3f0b1501d369d2
+EBUILD GnuPG-Interface-1.20.0.ebuild 1023 BLAKE2B d44cf5c46e324691f07e94273ae5f00b070305422c9613d82e3fd334640b796af5a2d53d88ae1740ec47dc0f37fe3d80357e0ab16a99c6ddb9a9946000729e74 SHA512 36bb97dd07da8bfe8d6ea8fb4520eb7dcd452f88933218ae8656e954f48d240acb8ca028130c41d14608a79799718fde57c96cfdf5d125ef1192e49de7bcad61
 MISC metadata.xml 1209 BLAKE2B a29e49d03ea5216897ae8d8ca55472c4d41d75a2722133dd2782b504db464740f15b5c017e09efb9a76da76b482f3f33e5b8cd8279402d51e14c201c8840d9b3 SHA512 3589a6d227ccde1efd9a0842e98b7f4c3d4f5434a9e62feba4a6764d1fdc4c0dc7390bba15bb52053520931c4ed4ff05235ec98efbe0239a4a9da12b30092cfb
diff --git a/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.140.0.ebuild b/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.140.0.ebuild
index f30aaabcda43..9a85a2b2c974 100644
--- a/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.140.0.ebuild
+++ b/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="WWW color names and equivalent RGB values"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Graphics-ColorNames-WWW/Manifest b/dev-perl/Graphics-ColorNames-WWW/Manifest
index 35d072be994e..e45c9c7989b1 100644
--- a/dev-perl/Graphics-ColorNames-WWW/Manifest
+++ b/dev-perl/Graphics-ColorNames-WWW/Manifest
@@ -1,5 +1,5 @@
 DIST Graphics-ColorNames-WWW-1.13.tar.gz 18563 BLAKE2B f9b3dd87e714540d057b8e6ef9bf07ef92eab62cc5d8b8cd3564bc2413f4fd3dc4a1ed63c07b0a267ba213eda3b3521df9f429bd1b213eb5afa02befd466e478 SHA512 9f385082de3c97aaa533571c02bba17ef154b7f44b1da2c470cce9cde2d13a4053a16d12b4679bddfa6a8a6628bace3b482258cdd86f3855de9ce5558f6b4d29
 DIST Graphics-ColorNames-WWW-1.14.tar.gz 19837 BLAKE2B 0ab3f566e125549672b7e407c18f1db7408cd60928bc0a4a235a2b05c22966ee778d723194659d74154e17d59344b98b28a370782d45a37544ab753f3bf0c1a5 SHA512 c704906b61ede24591bd25a040eb3412489cbc508004eefcc8b88a3ce6acd6ff6de0c45cbba4929bd5b70ba1e998d050bf93baead9283dd9f91b3f069da13384
 EBUILD Graphics-ColorNames-WWW-1.130.0.ebuild 557 BLAKE2B ec3423ce5478b2e1456a2071971f7574d61f23aed211663d0ec09d6e66a8c97298b5bb4605efd36f5ec9eb1ac221e076cf146ccba31bb21cab983e8c81285bf9 SHA512 bea66f1c83beb89abc84cb074ec2d58e81d63d808ace93dbc9fae0742dc814262b0827a85910d3606f11acd4ce6bf5d2f9165b4f4dc3416a6361979448e86cd3
-EBUILD Graphics-ColorNames-WWW-1.140.0.ebuild 554 BLAKE2B ac341feaf58300a3315b22d55134757483f373b743092b7fcfd4a334a8a160f2ce808f6e127e4b5e928551e44aa9fbdeed0292e5e4b297260a275478780fb986 SHA512 1e6f6b020bece636f9d58496ade127295a77d2e822b07683ac5abc2ad09dcff7eb73e6dfc079279931320bec52bc269851fa322b3ead2411be8dfd5fd131fd0d
+EBUILD Graphics-ColorNames-WWW-1.140.0.ebuild 552 BLAKE2B 83cf8b456519e6b8c55a7ca3fca89e48b35489bdc6e9a19a5814518b5aa0f334cb08e0e700165d6260e37cc2d237fcf142a4095f999465642b4bf9a2ccbcabba SHA512 91db3a2ebb51a82f4b5c8662168415b31570a260e0380afdc96c1f2d529447ec9249c2f81398fb47e5f2702b687f68086c783310caa758641435c10085b2e0df
 MISC metadata.xml 670 BLAKE2B 5026300d015c419e615e7b5dc98bdd4c363229bd2e536db89abbcd55f4b15fb018fd231cdc8c9f57862612af3201900e293da42b32e67a7f701ce52a531a9df5 SHA512 1fb75466a0b2cefc39de2e4af57745e0244aa42c17079c49b41eb0a0e934fd9ff67b150c94e7e0b1cbd801ddb15be081a1a10df5d2b15b6df2e4f5c6530b9097
diff --git a/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild b/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild
index 965552235b88..0bd647f72ce1 100644
--- a/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild
+++ b/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Defines RGB values for common color names"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Graphics-ColorNames/Manifest b/dev-perl/Graphics-ColorNames/Manifest
index 68314b0ed855..e7ddf4789968 100644
--- a/dev-perl/Graphics-ColorNames/Manifest
+++ b/dev-perl/Graphics-ColorNames/Manifest
@@ -1,5 +1,5 @@
 DIST Graphics-ColorNames-2.11.tar.gz 21686 BLAKE2B 2e96f32f166799249aa30986a8426df9e72c60228e4b3a00e4937344a742e89913b32b885192b621f8e13748b447ede6c3a4cba21e0d0ca58e775b2f20dea6b8 SHA512 673baa5bf623011abd84f01644d534867113d40f1142dd87b4c05c62b13f0eb3ac4aa32df01c7fb20788f03d8527effff696b9cfaa9f30d0557ec42354259e93
 DIST Graphics-ColorNames-v3.5.0.tar.gz 33955 BLAKE2B 7cadd3dd0d4d31c497cafd743a49b95da2919ca39739b4a358c6cbc5a1292a86fd308b33e88a696c382a5eb6914477120857393c2ba605bfb256add7342cf0fa SHA512 7577d3a52307eb53dbca0eb6db19accd44cb517b9d5d6d1912c51d537fe3646d88834844487ecb500e988f222bd24848d15c9952039376d159f2286ab6157a1e
 EBUILD Graphics-ColorNames-2.110.0-r1.ebuild 778 BLAKE2B 562a217cc6821c6733fab978bfea7e0614ae3167eb6e8779185245e69c5d678d7af0e3cdfaee3ac6253493cd0fe71e8f245a71c39d34fbc8ca7a18e67628948a SHA512 4251cbd09251412fcb183760f14c053b183ff66cc7aeb98a1ffd5298bb0cd93352d220c98dd7e4bf4ef037d63a4e00233b5be43101ddb9991d6ef3d5196624b4
-EBUILD Graphics-ColorNames-3.5.0.ebuild 697 BLAKE2B 13b3d7befa737b5ba61702a3716250ab44520c026f8fb6d0c836764981ffaadeac3c21a0abb2c8486d12d0b1ddbcc0fcffe0f2742bd54b0ccce2838cc2fdb1d3 SHA512 7753ca51ebafe276d952327b16aad78876c19bf84bf4b23bd5c14230871f08ca8b6e895387755da3ce40e160a8c222ecab827fa3554484b8785ae2adc6cfa88d
+EBUILD Graphics-ColorNames-3.5.0.ebuild 695 BLAKE2B 7e52ea8157a1e0d8823e2231927ca60710182b3b00a02f45c637b5c537254f786748468226c48526beaa1fdcf1de44e65f329fe92c36c1bc34632b28b08e0d59 SHA512 878e02dca276e3b953ef980d92187a4f1b3c315085de01a62798b4d12682158c39ffd967dcc7d42405f688d1613944aee4f767614458711f665a7565aff9621c
 MISC metadata.xml 795 BLAKE2B 66d645bcbc8adee6f96620eab5824598130c3c2489f71482c1341ba2707573ea0a01556c73680b5f8e71c3c36830171c26f2cade29b0628494c118e3168bc5f6 SHA512 4672c2e05ce2b34920a1c26a0c89e1beddbc6fb90aa8948d9d6ba4d7cfac4fd826f06007e6fff252f5775a5a326ca77b5b6fd3fc7a9f5ce9d14369a2276c7057
diff --git a/dev-perl/Gtk2-Unique/Gtk2-Unique-0.70.0.ebuild b/dev-perl/Gtk2-Unique/Gtk2-Unique-0.70.0.ebuild
index e118c73fbd09..a10cc0b99658 100644
--- a/dev-perl/Gtk2-Unique/Gtk2-Unique-0.70.0.ebuild
+++ b/dev-perl/Gtk2-Unique/Gtk2-Unique-0.70.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module virtualx
 DESCRIPTION="Perl binding for C libunique library"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Gtk2-Unique/Manifest b/dev-perl/Gtk2-Unique/Manifest
index f949a3b308ff..ef635f165cc3 100644
--- a/dev-perl/Gtk2-Unique/Manifest
+++ b/dev-perl/Gtk2-Unique/Manifest
@@ -2,5 +2,5 @@ AUX Gtk2-Unique-0.05-implicit-pointer.patch 427 BLAKE2B 2b6964502ae1e4b2cfe04e16
 DIST Gtk2-Unique-0.05.tar.gz 11158 BLAKE2B 657a321687af9be3d3c5024e04589ab87a0f98ec5b11c88e2a388e1d4705154d5af790fc675fc928fcf556f1546b78975112ceb7c9e96f03fedc1f04c552302a SHA512 9ed700de45e6d7e5410ff4b4313869be9127b7933faf862f4f34f4330165dbda4b1d983efddedcd71487d0cdbf10982a7b76af7cf60339ae3359f57271177492
 DIST Gtk2-Unique-0.07.tar.gz 12755 BLAKE2B 2220a736fbe4c2bad95ed5dd28c908d23617f8c374be91718ea05fada3d914641b9f64bab7bebe0d3689a54141e7b8d9d78d6fe755fb4f4a50e213eba2563273 SHA512 62975a16840be7af7d5657c816367572d1b5140585d1275331e2d05dcefe18ebcccf8cb81747da92f12e085a5bef1c0ba2dcf4d2fc886baef97a22317e1e04f6
 EBUILD Gtk2-Unique-0.50.0-r2.ebuild 555 BLAKE2B 751862fc62b84704e1e3f6994fda7113933077a65e82fa981ecd7c6d8bba0628e98c70c6322b85026b82fd0846bcaa5fe0b7e32e770ac25ec648cf1824a7e97f SHA512 df24fc30c7d989dc3ed2051729c4286da94aa267dc622cb4d4f345603f281e7add5639257ff0240521c647eac67238f463c649da462ee2b907ebdf0d519b09ad
-EBUILD Gtk2-Unique-0.70.0.ebuild 575 BLAKE2B f29de4cb3825abc07cad3f81b28c67ed67f801fb5957b4a344550998c19db0e091f55d7248444cd226b3af143c9bef9e87c1b0d131c4b45e135ab27bf41e776c SHA512 2b836fbf6ff11e59c80c01930f5b8cc6d68d8ff12d98e80735ae09b85b4dcbda6980c867801e63ae98cfb62e59b64f14da8f3c9150196bf94b798fda3969e5d8
+EBUILD Gtk2-Unique-0.70.0.ebuild 573 BLAKE2B 4da2d97d2e41f83aa10816b966fc0041543b6d43fc73586cf89b20e890d5d0f7af37d732f2c0f52a628c677158067727ef86bbde7bfc9bbd9ae946086571d8bf SHA512 e505198cff4ac77cc7be08dc20ee9c96791808f9234422725e03f93f21b856c5eee268bc2f936a8eae71fa1df6fd3cb500567e389277d41370249b832d7035f4
 MISC metadata.xml 394 BLAKE2B c0f79421dc3e916830122bbb05f687601a2f944554a9feccf2b00000293330a551143021345433d5495b99bba4c669adf44daadcac15f1d2e4506808ca058bdd SHA512 cae7fbcef063eeec3d909a39d1004def6eb1c13234e12c30a02719d37f5db97a7a53d8119be96a7a996232ae3f6b0bf2839484d7a1a148f3ac93416f963080d7
diff --git a/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.210.0.ebuild b/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.210.0.ebuild
index db09532de5f1..a11e4e7a950f 100644
--- a/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.210.0.ebuild
+++ b/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.210.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A simple interface to GTK+ 3's complex MVC list widget"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Gtk3-SimpleList/Manifest b/dev-perl/Gtk3-SimpleList/Manifest
index 3f1bdafb46d5..2a7d7d67f688 100644
--- a/dev-perl/Gtk3-SimpleList/Manifest
+++ b/dev-perl/Gtk3-SimpleList/Manifest
@@ -1,5 +1,5 @@
 DIST Gtk3-SimpleList-0.17.tar.gz 18817 BLAKE2B 61219e333682549346929022e864d051e26167abf41927f4133effe8d52cd1def0f96d010699142b444fc2edb26f7f8723dda14338d0cb01638c75c80fe9809a SHA512 9103cc46e1627be30a5f912f96939c2e86e1f8e174f300957cb4509a2b2f14fcf89f542dbffc8786ba851cdb9f6dc1aea08e47f6d29072d45528e8046768409a
 DIST Gtk3-SimpleList-0.21.tar.gz 19124 BLAKE2B 3d04013bd70f3514d9aabfda7a9a823be1aa4a69c89c930e29529c49aa92baa9f140c80571aba7b98481104e080d2325a5b5d24e0e1691f52693c557431ae84f SHA512 45f13add5465d586a6888c426c252cf886644dc95d981d697dc78d01fe66e7820c8f866206583c103fa35b63c349ba46c7da58a447e77a8c778c54b57dddc973
 EBUILD Gtk3-SimpleList-0.170.0.ebuild 472 BLAKE2B f544b75978a2cc672e5dc8a62c4cb20a05e3fd8f52e26734eabaf1d9d550cd6c2cee8f31414c345255e6a25848e2796e8a99d51bec132fff1ba39950508dc5bd SHA512 fbf8fb68ee23f9b55cf9f1ac3e6733f966187a863d4f1a9f08911c12d84e6d3b810300cc3a0adc194bc5f8f7dacdce92e4f2174427250a4216a5c37c8e564472
-EBUILD Gtk3-SimpleList-0.210.0.ebuild 475 BLAKE2B eb519c497b5f2d5dd695eab1cb1ceac415552a1e522c4303eb14d6b8acf44c69273b0f37dd5812b1dca0319c8f7db2c1b5f92fbdbbfdb0eb7c50a219745d6ba4 SHA512 cccf1844afe3f4a1d16226f11f265e8aa0069689ea1038a58bf2685dcb3d8cc281b30240b716503553eb1655baed28eca8f8c8f4e3be79c5ff4d2a80ad88b931
+EBUILD Gtk3-SimpleList-0.210.0.ebuild 473 BLAKE2B 387c3993880c0296703cd019fa2acd754047387886922fce08610ce79ea2f43412d5c3884ea56ade84cdfeea8727452bbef850cdaafefe8a1ee66a897f098f71 SHA512 c5d93123474535e6abd0889d8dc8a749d11e98e9ddd80e5d8b45424ac93a4574c47cf75e2afdbf53882e158a938b9d9abfe8ba00faa317a21590b915317893f0
 MISC metadata.xml 547 BLAKE2B ed1ebbab39f94d5d09e18632dac104f090e47e8f613b720b1b80c262bc0c05db0819857ab3765352875e5fd1c7544bee9eaf1db86e7a41624cd31a69d11fbf63 SHA512 0ad403a40e3a704dcb56811883e4dfda7b578027bedeadcb672a7b2bc5d7460ab6e0ab894094640638e86a9047d60fa7e19c47d0712463ab124080c80ef2a65d
diff --git a/dev-perl/Gtk3/Gtk3-0.38.0.ebuild b/dev-perl/Gtk3/Gtk3-0.38.0.ebuild
index fe4650b300c9..0c515a151032 100644
--- a/dev-perl/Gtk3/Gtk3-0.38.0.ebuild
+++ b/dev-perl/Gtk3/Gtk3-0.38.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module virtualx
 DESCRIPTION="Perl interface to the 3.x series of the gtk+ toolkit"
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Gtk3/Manifest b/dev-perl/Gtk3/Manifest
index 6558477d1f5a..b37a997bb766 100644
--- a/dev-perl/Gtk3/Manifest
+++ b/dev-perl/Gtk3/Manifest
@@ -2,5 +2,5 @@ AUX Gtk3-0.34.0-gdk-pixbuf-test.patch 1992 BLAKE2B 3f81159c626971f91ce4272ac7e89
 DIST Gtk3-0.034.tar.gz 56327 BLAKE2B 338e80954d210c79ece7db48cd421bbedab1ea9b005aa70425b42d794e226208349624c4484f0ab943ffb0ab1a1686dd5ae5d7f9c90157a272f4aa92a6c268b3 SHA512 2102a64091d288a7d89bdbfd9cd08b3a9ec5ac2c1276fdf49fb756c182223ba1951152d89bc0f448893d8401ca9f4db57c3d3a2271b3aa82eb1e9ff63cf3cf9e
 DIST Gtk3-0.038.tar.gz 57426 BLAKE2B 76e74320c9bfaa19bd71b58742037d4acb85920466d0af88c3a276f5e4bf2d34c94ee3b278d385914da498794086924de19f4ed1c280b6b0b793d15d5fb3ca27 SHA512 2289184a25deec342b9519028cc5ebb3a66137d7891366485e4b6a1ef52a4a28b5ba8083a317a56664d4ea6eb1bc0619477d1ca169baf79b868467fba27f82bf
 EBUILD Gtk3-0.34.0.ebuild 746 BLAKE2B 2baf1e714b3d7ee042d0391f4c3411c22a630d0beacfe2ec45b4a86433b12262b966e46b92c62dfe06dc5a82dda8ce94f82fa36b20a34e95635ba9661484a982 SHA512 6002a76f2b28417c1c0b0fb25b9aeff4b1b83670a1d9c9f5ee1c86a6acc4f8f7e3ec995d6cdd7fb654558762f4d88e8cc6e4d942bb349e2e3ec5143f2a0bc8a9
-EBUILD Gtk3-0.38.0.ebuild 677 BLAKE2B a1ee2f3cbebc1c53ca47e646e4d8d74f7f88d6c830b7d1b99c003c328c128d0b93f38940758a5eadbbd7dcca01ac8e304b293df1b8b16e983c5dc88651faa75a SHA512 dd153b6ebcbc534b7d6af069873f8381b7883287bff4c80ad1b945a38aff39bcd1ed47bd04cfe12189ff92902172add66b647cce525ed68b1cd6c92de939b1e1
+EBUILD Gtk3-0.38.0.ebuild 675 BLAKE2B f5a71b78b3dffb2d2734726bcd4248f09603722abcca939e60ede007c95368255096a4e47439c4da99d212a8dbe30b8e501cd5626a8130d1913ac1f617475a5f SHA512 cde095b6e37331412bf6d92ebb938d999d1cc986325d0747dd99fa68a174c68a854b20b366ad0f2be9f355e8ec71aabc8ea8823158b7a302f2dd36a6b34e1b77
 MISC metadata.xml 446 BLAKE2B 08890607349229f01a933a55328fde3124c66ccc04048f5eca5aaa2462d19ddff80f847725776fce3d9ea091698036c9b1e3b1417fc30c793b88e06da9b653ba SHA512 167e690fa554eebaa685050ae5200d4be0141c5c387440d4a0d101ca9f89a2257885fe7afed49cff8ce90f5a387b3c8fa441d2c7a4bd17f46ae30335e41469d1
diff --git a/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild b/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild
index fe115e72aca4..061a3c109721 100644
--- a/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild
+++ b/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Cleans up HTML code for web browsers, not humans"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="!<app-text/html-xml-utils-5.3"
diff --git a/dev-perl/HTML-Clean/Manifest b/dev-perl/HTML-Clean/Manifest
index 023c49e6059f..7e3530011041 100644
--- a/dev-perl/HTML-Clean/Manifest
+++ b/dev-perl/HTML-Clean/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-Clean-0.8.tar.gz 48157 BLAKE2B 1618782d270fdb9997bc39617967e0db1bd58191694f098f7fdf43e1090c69e9e52102dce9517eb4cdc4e0bb1beeabde68e4e09a39b15836e719d5fa89fdb9b4 SHA512 5e9fdf49c1fccbb35c769394dac2013972bea070579983c5c2e99105b2f9a4ca6594966ae88770fc6ae1ee6b9388a07d61830d0451d6957197114d35dc5cc1e4
 DIST HTML-Clean-1.4.tar.gz 48598 BLAKE2B eb5001517bf77e24f107aec95244786e7c477330f71ac03d18b26a9f2fe766a832bdbc1a07623b59eaaad3dd84bf82119852841e794d29099d77c947b3dd4800 SHA512 a675b2ae0f7472d4fe44d3402687c4a7d87d33b30894e2c1d9639552fa5f58a89b35b52be17f95058a5ce690a996451c877d1c723b9b6f3919f437da8d458004
 EBUILD HTML-Clean-0.800.0-r2.ebuild 369 BLAKE2B 590adc121b4817690977a5b43518b9d13f5a8f5af9dedd491809a5a7c23768f04094e8309fd45f9fd743e73ee880238d50b0c3185d6faa5c2c626d5a71c52cdd SHA512 d8d278a268f1aaed409b289598bc23b9f8a934916176c996d169713225da4b89182b3649e3561e534902e41f132d361413457ad48f3cc2b6d56f302f3d53aabc
-EBUILD HTML-Clean-1.400.0.ebuild 374 BLAKE2B 6d43f39f6658f006aab0e1dbe4954d6285969fb060467f0401a4e5dd87b585cf2812518435f80c5f68f32895dc1bdf6b44ab484400e0eebf7ec4f1cb86a3cdbe SHA512 fcd2fef341f33f9ef9aa64f73493111897474c3a98c9b795e0b8046d6da2cca30e733d7ddd020a80b9886c392fd00e68df6ef06a4d02c5b781ba607bfa050f38
+EBUILD HTML-Clean-1.400.0.ebuild 372 BLAKE2B bf470cfa4967dfd320d62fe3066b9a02903f660543b5aaa8f4044359a491dff6bbebcbd5d9564c7c58cf02ac7b8e474b66a8750096c6d3b5eea693ad0ef3efe3 SHA512 0dadd92157a90d6adc2827276ef9737de9f59eedb5f828d0b383b3c0530fe2bab8274a47d8a82a0d9d83b9ee39e4398c931c3bc93fef2e7f17e7473b54aaec97
 MISC metadata.xml 392 BLAKE2B c89789fd471d7d9d1a55f9fbeb43ef4feea70b5e17194e01c693bc2611701851c0a9faf0ad0ff8b4af42e6a53a2c526736f5a8612709c8fe2f5e91dd3e67f278 SHA512 38f13304a42607e51a77ea2bd82c238d232c61b4ffe669c879fa71a538aca17d26a77a877269f4130736b2757bafb7cfca6f59298e04d26584ad322f37d626ee
diff --git a/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild b/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild
index 0072cfe9c0a0..b9820521881b 100644
--- a/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild
+++ b/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Class that represents an HTML form element"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-Form/Manifest b/dev-perl/HTML-Form/Manifest
index a2d6f8e9e48f..19ef3a0f3501 100644
--- a/dev-perl/HTML-Form/Manifest
+++ b/dev-perl/HTML-Form/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-Form-6.03.tar.gz 23522 BLAKE2B 61605abce3af5d685b858191e4bfa5b37626522bd63ab817e5260c15479eaa61d86157c8aff3134136f97ba019104bfa33f2c4ee6c04f01a5854682f81c7b20f SHA512 d93644c9f440f1e0289fa708459e461721910d62c825f382cf913cfc4faa9934fb78ccd929385a4a36605cbc9512e50b56776c6562cb90b31cb1519c1abce7a8
 DIST HTML-Form-6.07.tar.gz 41503 BLAKE2B a0f77744a467dd553bc316e4064b6b334abc405017a9e65c4d5063055a5afad13a40b3fbc71e108661369e5f803e2321bb1240915c9cd6f26f957c21a0f8e4a1 SHA512 32aac4bb85609c2c596e771678bd4d36f3e34deaa3de7333f089c8f887045780db949b5a1573254557eb0247713232cca5e90f89a80e0d53049840660ad3017e
 EBUILD HTML-Form-6.30.0-r2.ebuild 586 BLAKE2B a8e2fdece76fed9ba44b16468148dffb9b7f1434e3e132bccc8654e9dc3259bb5d3e9f515a04b52fe1758b60c7c27aa1f4b406c463c9c855b50510c190b1717b SHA512 63af43dfe0aa80f9decb0cd64f227a700958deec9bbc69b1fb7597955496d5d04267e4e065c4fb99c4f47205e3171ee842d6ef7f88f55cabb162e9269e6a3c49
-EBUILD HTML-Form-6.70.0.ebuild 743 BLAKE2B e14b94f1933007dd858f587cff170fd80be8dfb5fda245cb620835badffea12071dd537cff73bc33a426e42a8a069eb733fa5b3f14ae990ea9b58ae8ffdbbeb2 SHA512 b8fa0eaaad685bec6f99a9dac0f07b3560d1cbb12eb3f576acff0b3adc0602a3b09525ca6f83deb043635b2a516b8bbb7d97463677b0e77162b4ac4085165105
+EBUILD HTML-Form-6.70.0.ebuild 741 BLAKE2B 017a1ea912c684fc4c1979ed804ecc14c21def7497631293375b18652374a775c4f465f49b7b714b7f08917cb9888f4fdd296cf90144bf24b963fcea228d3ff7 SHA512 47162945e1086ec295f50708bca1e88f5ea5d25d9a028bcbff8eecf8c018075d78a94eb046f97589eef9bbdc5eceabc6840e819101e7622302122e5b95dcead1
 MISC metadata.xml 909 BLAKE2B b9e1be45fe8fb419e2a0ded97f6eac10b8d77899a3aebc4ae2ac5b81d867fe75d8d6ce8c78bfbdd1da8a621ba17b306fe34480c49a6d9e50933fe54471e43b5e SHA512 a8b0ec2f4a5c1951c8b4feb7502bb9dccc2f75bf2f40c29835993e25ca76640d14947237b6fcf5748b97d1c0051aa5cb68491471a0827cde0e3b3287606d4e14
diff --git a/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild b/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
index a3c95e71a543..40c705fef20a 100644
--- a/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
+++ b/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert plain text to HTML"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-FromText/Manifest b/dev-perl/HTML-FromText/Manifest
index a0008e251da1..3a88138ba19c 100644
--- a/dev-perl/HTML-FromText/Manifest
+++ b/dev-perl/HTML-FromText/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-FromText-2.07.tar.gz 23596 BLAKE2B a76f39aff15e4fe622ca3773e36f1c7cf7a8542dd3f084fd392438d569e4bf1a326d3c1b93b3b0de4aab37ae20529d4f2612255927c5b4c26af5a99784b985ac SHA512 4aacb6be9d1c860c1e758201be40a9c966cb43f1593714e65964bce4bf5d72c86028290ec584321365de36909b6e44e8851f5c2a417b6e38da984ec9c5c30112
-EBUILD HTML-FromText-2.70.0.ebuild 904 BLAKE2B 8d233d76366582cb5501f055dd41ae138bce8e119c1650e89d3816be82e4a91f080cd60156cb87ea6704a157457043e1a9762fd5c546cd830eed5ac31fe4b040 SHA512 48ab2ae87861f08003784cefd5dd06070881f25ae9d9f6e66e7fe78fdaa602ad310f847e7237977694616ac937eb5d2cdd6d78778ae6428cb4b8038e32d4598c
+EBUILD HTML-FromText-2.70.0.ebuild 903 BLAKE2B 043db931f4ab3b0d0600b54697faee064d2c100a1860af9c5c2055d4e0db426f0cd6554065422cdec256fc5790096093645af3418305d1b782bbd66dcb3899d9 SHA512 7591c07724a966bf906169c48320a80f42c94c977fd5abee1d5a5247fdf1e8064b67f0986995dc10faca9accbf783a329857de04230cb68b98de957caa720ec7
 MISC metadata.xml 398 BLAKE2B b3bd218856eec071a94e6ea14213b81fdbfc664a37e31b322d69c2a197cd9a7cba9c9b05e0bb1cdbd29c903c252d4ef1b79672b1e86e6e397cca2e59fee22435 SHA512 34d82e7ad99c3e1aea8182f086c82d7f2254e4845e81ce9df5fa57db567d147224a8eec17c0aff7149a270b53748c3fdbf504e5f3d1ff1952a8888d64bbc682f
diff --git a/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild b/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild
index 0ea09e67bbe5..d3e69c3a36cb 100644
--- a/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild
+++ b/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl interface to the htmldoc program for producing PDF-Files from HTML-Content"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-HTMLDoc/Manifest b/dev-perl/HTML-HTMLDoc/Manifest
index c0a115571cdb..df193c8c1d7f 100644
--- a/dev-perl/HTML-HTMLDoc/Manifest
+++ b/dev-perl/HTML-HTMLDoc/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-HTMLDoc-0.10.tar.gz 15293 BLAKE2B 6a25b7aa56ac3c72ba70b87f4fea6d9b9838ab15fc3e97f3f11a875a80e877b3e79ba7e5267fbfdd054bb181d652d80f8cdc55a0978b8b8f9844bcaf2769314e SHA512 b401d04025dcd27c2f242d4b05819e28159ae19a9fbe5d8922bb615afec17705cf264a147e11c150d100706086d23775c8dab05025fd7fa35a3da75251fed2e5
 DIST HTML-HTMLDoc-0.21.tar.gz 23483 BLAKE2B eb6721ccce415ec1a217f25f2815daa9777af94bd44874a5fedf4be51b95b3e9809e94eea89b877aac6553bf113dc8dab8ed624dabd8b0f70f8a1a78c004a9ed SHA512 3e7b7ac4f4390242bab4c94439ebb37bf46e2aa2aef8670fbf165795dd0ac138d067411b6adfddd183ff8a7ab6e2e245df422d8b10ca7d9c9f1b49ce3abba131
 EBUILD HTML-HTMLDoc-0.100.0-r1.ebuild 397 BLAKE2B ed5a8af97076f8bb2c53d3b7ba6f19f0ef5266d861c564649a6d584fe41f6b52c410e7f25ed6c30feb4171efd985c673a48f50353923242691d138e71857213e SHA512 6bad3608253f086ad381fa312e6f4c18a24d69c7590e1f6eae413a15352acc689d851881606bd06f981b72dfdcac38454ede939003c38a7cbbc565aa2d1b8f40
-EBUILD HTML-HTMLDoc-0.210.0.ebuild 529 BLAKE2B 65f2b2b0a4bbd6f5df80d7b7de3c8d383d787fcbab02c884e3d7cadc135de9a42d29259086477419ebd73d4deb9544a23c1a6dafd6babdf659877d4128da68ae SHA512 f9c7c70a97d3a10aff24b60990346294e76f29f74b47195c44e84eb2fcbd48391f5f3507a1036aaf5c1b2b91652043aa5d9563179f0360a2c832a01987bc6615
+EBUILD HTML-HTMLDoc-0.210.0.ebuild 527 BLAKE2B 750c1987f2421680f23d1e0867bb815e80645c8e95ef7fc79ecaa9d16af364400c607bd9e232638ab2af0602ef7e15c42ccf39b76d40672ba3e36e965c6af19d SHA512 d86295744fe12b525a5a632021d8ece2cf9f61665c29f44c58af76cb6a7b6f97472b30863b5bf42a3c99a15d086ad9eaa763ed6f857ca6133e7693bae8ee0ed9
 MISC metadata.xml 461 BLAKE2B 329cddc278b1424d36a9f9ad70dca3c75efa570d173ece0a04f31e4aa4e160252370a5268d57629444f636b4ee2c87b55068a94a3a5c652fc3d721c07c1ef65d SHA512 04ebf2414faafbdf1eb708fede6c8fadc49a4c2af64391d15e78f8971a91c5ecb76d634cca60af4d795d3378e9d86755d56c04e0f53870fba22774665d156d9b
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.590.0.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.590.0.ebuild
index ffd6451eccea..e3a8c997d4a8 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.590.0.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.590.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A HTML development and delivery Perl Module"
 HOMEPAGE="http://www.masonhq.com/ https://metacpan.org/release/HTML-Mason"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="modperl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-Mason/Manifest b/dev-perl/HTML-Mason/Manifest
index 63a5bd4e9921..0f57cc449359 100644
--- a/dev-perl/HTML-Mason/Manifest
+++ b/dev-perl/HTML-Mason/Manifest
@@ -2,5 +2,5 @@ AUX HTML-Mason-1.560.0-no-dot-inc.patch 802 BLAKE2B 49194d66a45804bf60e459cb12b9
 DIST HTML-Mason-1.56.tar.gz 314167 BLAKE2B 7e449bc566f406f2f6c93459f573327be933bbf50eeb1c712e9d109133448cdf568cfbefbdd28fa403d9ed340334afb5c9d1dd5a1800c624b23634cd54949520 SHA512 3492a37b8289209a2215b42be71db242ca150f4364d8422e46ca4762f2cdbddf96a56f44a3462d1f1eb23ef3bbe1cb36b8322106f4050404b988c6d90a05911c
 DIST HTML-Mason-1.59.tar.gz 323661 BLAKE2B e9061cf4349874572c912faa04e849cdba15b7219f33488af3555f58ee0d9b77e851cf20ecddfcb55ebb6ec1e3525dea986fdd444b6445a8f39b8508cd261b68 SHA512 3a8053d976345c7bd1d04aab659e3b4dd541264ece806e6d3bda605b6ecb16887ecce9a310bf27890aab40a129c81ba2dbad60c2edd80681a53d159becb3eda1
 EBUILD HTML-Mason-1.560.0.ebuild 1517 BLAKE2B 8a25e894e241d72d4492280f4abb2aeb35bf401a2b47c8e546d2cef92a05d5b8a27314f2d8154a59cd409371cd7e221cf010654364d0d6b742d20631e2532cab SHA512 64dac585607f29e526b8237df015457d04f390805c8663c56f25f872e27fc926a1aa3b96da5d4d58bf5cd8d7cbeb603c41d7bd446ded95abf43db61f83ba270a
-EBUILD HTML-Mason-1.590.0.ebuild 1454 BLAKE2B acf5d7f267689cd3296212387d993c4dbbe8afafd61602f6667d226fb737a46cae4f5b6b12fa85aab27bc4ecb768fc7b02035c25160d2489eccec3f103f5e67b SHA512 507c0ca19b2ddfc58f692ea1b6256de552507dbb6ed8469aba93992f4272b7cc33e2614f00d91d08da226b630a9dfc9cb3f725af8f7e0302177698057d4e6976
+EBUILD HTML-Mason-1.590.0.ebuild 1451 BLAKE2B 89296e1c911385d36dfb12b95e9a7fc1e0fd9a8d774b1040bf994e0f5b586720335cd97534e4aaf78fb8ec4d914ca459892a984d93e8a7ef1ee6098b5a2f5a2b SHA512 0e58409a57ad9c24494801dc5c8dbd82a69620cd98f97a136380faad00e48edabcb68bd7d16566261e6303d31586abe94e99c59ce33a8fa29298e302a1fa0437
 MISC metadata.xml 3212 BLAKE2B 87a54f90f83a9b5ecea1153e148dad7c497fd20b7c2385a34af5ab5ee418510153bac3e415ea2e172028cc156f7bb46545477638ca3ba34bee04b41e4f0262d7 SHA512 a24c5efe8884f82d4a925fdba27dbe710709c6a3347bde64313f9ce8e88e8439a96e2703050a2ca24e8cfab20e7fae36a1dda3b82f9cc3596d888ec85920f77f
diff --git a/dev-perl/HTML-Object/HTML-Object-2.30.ebuild b/dev-perl/HTML-Object/HTML-Object-2.30.ebuild
index c5729535e9e5..10e65daf43b6 100644
--- a/dev-perl/HTML-Object/HTML-Object-2.30.ebuild
+++ b/dev-perl/HTML-Object/HTML-Object-2.30.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/htmlobject/${MY_P}.tar.gz"
 HOMEPAGE="http://htmlobject.sourceforge.net"
 
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="dev-perl/Data-FormValidator
diff --git a/dev-perl/HTML-Object/Manifest b/dev-perl/HTML-Object/Manifest
index 552b1ddec27c..9a35649f1433 100644
--- a/dev-perl/HTML-Object/Manifest
+++ b/dev-perl/HTML-Object/Manifest
@@ -1,5 +1,5 @@
 DIST libhtmlobject-perl-2.29.tar.gz 185373 BLAKE2B ae75158d3425079074a88ee37c316540b278012a45f9f00dc8ca6bd8dabd030fa1092ed94e74e083adfbdd5dd16068d30585366476b7054470021c998ec0831c SHA512 d8028d5f54010732d06afdbae472fb44271af749634d7e5a0e86582f831428d6d902e06a8f20169ea7387f7761ad6abff168086b274b01e5efa1f0bf90583e72
 DIST libhtmlobject-perl-2.30.tar.gz 202607 BLAKE2B b25722e47cab9c3415a5aa086c5c855a51d6c3a0ba2b4d81fd2918c0cce4388ca0697abfd2e7e00c1a6b8f87212b0409ca344f4ab9c86f512ecc0d79d2227ad2 SHA512 c0b1cc93810f8cf31d7c2bd9935893cc0534530715bbad0343f620a9bf24ed79c4d1abe2ce7dd4b524f35db1e4dedec98a3441ca0b045e1492296c73b85e3513
 EBUILD HTML-Object-2.29-r2.ebuild 714 BLAKE2B bfd04c0571235480f04b2fd6208f1eb0942aa192105c4b71bde0d2c83f6c9fc9fa9de1c3a316d833a76513c69c4f7e7577fefbe4789ba563107ff6ddee9f0a03 SHA512 888ed844ade50e47b718c222a1303fa535266d75ef63c9ffec7a1808c4f3df43375f55af5d9d671eb3d16e180a79c1afee96ac3ce178e419eabf4d42af27e4e3
-EBUILD HTML-Object-2.30.ebuild 700 BLAKE2B ff12216d6c59f1b0d39e45c0c34736b777bcb8a763791b6f676622fbf588717aa9a28e1b06cf6bdf213b72eefef4ca7882b2da53c2b48cc994342943a971f1dc SHA512 f5e09341c48bf94f1176fc4a361979c858b1c4090d03c4efac2702f8629341b7534159e829007324140f3a212743cab251e85d407e9a9cad32808497a9df4ee4
+EBUILD HTML-Object-2.30.ebuild 698 BLAKE2B b0743a8df55cefb83b9cb7d93a08932a45e649743781ff1ea52468489ab8b5d11eec4ef8c6dc0823528dac93f0df9bf379983ad26b9982daa82f06befd02cffd SHA512 dc28812647ca5e0c17a2db0a3ecd7ee219bdfe98af6fb7be611037426c8ba43b78d749bc5a0a79741b8ca581fab84a1982da0961013182f7ca3516630b675df6
 MISC metadata.xml 331 BLAKE2B ff36c034460544effca3e9c89494fb79647ff7bda5fc93a2ff016f4c28f81e8600d6c63d26fd228fd79e570168121d6b9844b5d04bc9bc203bf0397532cbda63 SHA512 8452ca93c9bb094be75c9c8abc52ce5e4161ba91de9dc69e85a7807da0a56860d3e908345d5e2f45363255087c22febb8ea97565afe2ff6012ffac51180d5835
diff --git a/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild b/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild
index 02882d6578b1..c3821d38af94 100644
--- a/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild
+++ b/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse HTML documents"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-Parser/Manifest b/dev-perl/HTML-Parser/Manifest
index 2113ec00d3e7..29272a28d828 100644
--- a/dev-perl/HTML-Parser/Manifest
+++ b/dev-perl/HTML-Parser/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-Parser-3.72.tar.gz 90680 BLAKE2B aed1c788b4039f82e9968aa8d2ef0067262c9e986dc24ccc5e570bcaa8dfe46c48fe0f795c84df6747cf3b63f338154c7272eb0dd579d0e2bab833fbc05b88b4 SHA512 9fded69219791af085018ffbe6737e74e370c543af52aa221aec174daf52d1b8d3cdd07f025176c0212ae572a924555262f2eefc73781f82cdb7d9cff58ae716
 DIST HTML-Parser-3.76.tar.gz 120473 BLAKE2B 541aa72674d452a4b9e3d5773abe9b78674560d790071cd8ee19cb90e58cbad48c88f628d9d27056839612f9dc9dcdc7fb2cc719474928e843d344c11bf7bd6f SHA512 50f9dc01997afdef33b58b48bfabd596b09cc11086773dcb4707086b7d7f54d2234d508e11a0b17e5d62849bf6acbc16aa8cd53080329ad3dacdbbe877c2c88b
 EBUILD HTML-Parser-3.720.0.ebuild 718 BLAKE2B 1e2045c4d24d6f113ce6013168104fc1904d830e5f3f1b78d363c26bd39ad6016020bed18dbfb891f1075d5939546fb03cc1308567e281b4a494958bd5451b6b SHA512 ce2ae08b5839c0f3ffee22594d856687be10c0a9ddb49becc8a430e683b0561412b8f3e1f1788754660883dc1843c927a0c8bc0299d1e3c7271c109a9a5faabc
-EBUILD HTML-Parser-3.760.0.ebuild 762 BLAKE2B e8e9b74b3ad6e4adfabea92d58eadf610e82b701825a1a3beb90c2be0cdb90d84e4f04a80dd65e418aa87d787b5c12db5598ef4feb7e8e8e95328d4410d450e3 SHA512 36b5633deb899ef14d7a345d75bc19062866bf7d630672f30d59fe2ae2e1e0364c6c18d728bd0365320212f11c56a0e61f6556c51a811ca5a0395d724c102a85
+EBUILD HTML-Parser-3.760.0.ebuild 757 BLAKE2B 67cded65e5f49e938abdd51c43787cee645ed3e60c9086c68e3e18e7cabe1a24a668567a620ccac529cc62716ede5282bcd910cd26f57c5ee3bffb57aeb18d0e SHA512 d15e34ddca1b71f1f309eea9ad871d71ab0c4a826e0115584040d94b6ba6fee07c95a1c3d4829dd0198894878077585f67389606740ccad1a307c511802605fc
 MISC metadata.xml 765 BLAKE2B 95bb8cf9ddbd12a47914cdd78641d929e66d81f101cc1e8a06ee5227ccd7403d268c779580b612e219b72f22714b04a127b3561d9e420a46a94db3a69d4c45e6 SHA512 e8bc92e65b8d41011856abd50a8f37a0a76c5bcc18272a3dcf480ca33cf07232b5c0296d6048b8ea792703c8ca3d656aab7901da23b5f5e0c3867d16d8bab5ea
diff --git a/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild
index 40965b97210f..5fabe5729bd2 100644
--- a/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild
+++ b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for scrubbing/sanitizing html"
 
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-Scrubber/Manifest b/dev-perl/HTML-Scrubber/Manifest
index 4ac56f6f413a..ce62bc6972a2 100644
--- a/dev-perl/HTML-Scrubber/Manifest
+++ b/dev-perl/HTML-Scrubber/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-Scrubber-0.17.tar.gz 37140 BLAKE2B e7c68b6a93f0efb7f63f431f14c4cdf6de3c0b95b6d95b9e5ee09161ee2e0515d7ab8e148df6293b3b2f1c4644e54e465c96372ef42b8682c4f95fb4b78bc57a SHA512 d6e04374d4da390d22cc4d51bfe2910078effc30d6d2ddc36dbc1b94ada12333c2f9c7acb1f444f777f9e268aed90ba8ea15c4c74a8b5ab955fe97ef04469ba7
 DIST HTML-Scrubber-0.19.tar.gz 36418 BLAKE2B 78ca4b5b6ab6b15a41d7d2e260bdf3ee4823cfff0633527b11843a468a6105a5922fbbd82a524b1c98c6f1c3ccd84dc0c070f5cdb634a8b1fdb2f3cc3f576e92 SHA512 6894c58315f38e81d645b999cca180b1e86a64e8ae913df5891a6293c9c4950d99f1d1c5a03b7d584aff381afc49c16fe2e06541203c8dea881479cc981ee262
 EBUILD HTML-Scrubber-0.170.0.ebuild 464 BLAKE2B c20297e966467c896399823dcaecef255b6c7f2eeffb62f7327e907b2ba7411470ced187fe424318e1be68d146a2ccd5fa99e66559aa9d5dda9ae2c75b011554 SHA512 f0bd8ca21c29d16ae55675a05d5b96c838b4966c0f31101e25631feb8fcdb015662654b054ee6dbf593ecc8d0553ab7b4e82bbc4b58a65178b12a0610c17a91a
-EBUILD HTML-Scrubber-0.190.0.ebuild 610 BLAKE2B e345c2ffe1282f61fe1b42515de5972251d8cdf59b9508c9300b4075413d17d0c8d3a341f9629fc1f09ef96a1eae9372eeb58e113775beb1e5850b9cab15fd72 SHA512 118a3e8593eb19c5fefc34b6ef62eeadcb352c503c524fc5d5b256308acdbad259973ad3aa46798f8fd68245cf07d6c22b17b7c3da944333058227651bc4ca8c
+EBUILD HTML-Scrubber-0.190.0.ebuild 608 BLAKE2B 06319d403b240278c9548894fdeb89df9d82a2f2a2dc0be9313447bad03c361248cb4a8db6c33674b34ef996884e4b5a785b37aa2e62213352504a9367ad5203 SHA512 f05515937b643d576298bf0104a8563a9863ab7aee3c8fa49dc8027894655997d389a1144ab40d49285bb92696d43c0b4284e4a56d1a08a72fa3b7204218d485
 MISC metadata.xml 398 BLAKE2B 5c68bd59c5937621592fefcd0b64d705719f8ffbc04f33b931e0e59b25daa452c1f43396ebb0b3881ffc357936382de2edfaca960b4ede0b2c4e1b604721653a SHA512 02bc1e16dc235554a1a12385ab28521e228e11299e55d2ceb71a9cb91f281d9169e5a977692d174073a27d1e2eb94529e3fcf41d3bbf45159921e2a0f09a4e6d
diff --git a/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.304.0.ebuild b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.304.0.ebuild
index 9794639b9ca8..3ea8235ddc92 100644
--- a/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.304.0.ebuild
+++ b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.304.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Do interesting things with the contents of tables"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/HTML-TableContentParser/Manifest b/dev-perl/HTML-TableContentParser/Manifest
index 90681d6ef6a3..fbd5bb662009 100644
--- a/dev-perl/HTML-TableContentParser/Manifest
+++ b/dev-perl/HTML-TableContentParser/Manifest
@@ -2,5 +2,5 @@ AUX 0.13-test.patch 2076 BLAKE2B 4b3e46ada5bc7e3a9c7f6b105bbf804083abcd4d3c1873e
 DIST HTML-TableContentParser-0.13.tar.gz 4664 BLAKE2B 062dc7ac6a78ec75f7d306649710ef470c6b6f750f651cc976d9f44fa40fbf247a89e0847ed8a991cecd929f3ea328bbee69c2cb29627f6d4fb0e23d3a3ab5c5 SHA512 0707a0059a7d885052615ee7badecc8915d5f8c67fd8683a226e23a0690f1872519475c32f51f299333c3208c20ea15380624fd0ebd1dc0b11457febfb3db585
 DIST HTML-TableContentParser-0.304.tar.gz 18437 BLAKE2B 404ba11f9174cd3db019ede6078fca246722ff9ce1d2108cd689cfa3f79aebb178853143faa45022e5785daae5e79d1f21ad519099508c5554828d54da84e369 SHA512 f5b8aee24f777a7e8d6b4a88ac6b88927b6ec51a6b14ff2f48a33248702349f2f3a446bda3679b7c510cf6c9390b6a635721c696be3b49165dc9ca89116b2202
 EBUILD HTML-TableContentParser-0.130.0.ebuild 377 BLAKE2B b1b2a33a0751dc88124ce78bc75c603fcf91de3c21bbbdc74bc209d8a4d1db7cef3f19866fe893b74c7a44ad080923759065a17afbb53ac55e4132ffe9a0885b SHA512 c318fb523b0a654ea8ab89dcb2e9c36bba77365843f6d3b1479397dd9f3e0ec136a36483a3cdb26e2625919ce39fac273d0e674d336d101705e8fe2c41811b9f
-EBUILD HTML-TableContentParser-0.304.0.ebuild 385 BLAKE2B 1d5c3df3dd2fa61b6b6f2e61fc0398428209df3ae1eea2b369813d9ca1b0bc5619ad1894e91d841cbe8a6f3a36fed844c4a52614e91032d9be9d59150387e1a5 SHA512 57de9f08782c0122e6359227578143b1d7b7a486e90d59ca63a8e679c98da9852c238e084d797cc8b29469cc2b6a4084b03e5754989aa07902a40bf9dc7dafd5
+EBUILD HTML-TableContentParser-0.304.0.ebuild 384 BLAKE2B 1cab7f626ee25f51b5f680c63e0dc34defba6d201315f58dedc86d579561b09fd89bb4a2aabc27753d31067e11f15ef2a1a71664382becbfee8ca19f3bf7b6b7 SHA512 f83be083b19e5197bda0fc74b961375a749f18de4f38093d9233992fffd969018a23870748fd413805434a114578306a1c8f7ddf72285a37d7c9be0125f163c4
 MISC metadata.xml 534 BLAKE2B 8407660decf17098cda6bae4fbd878ee6454f09ac54ba47c51fbf853ecee0ad7bd37dda922c771629fe59393bfb76f859b9419372e75b2c9cbe1f46fd47e2424 SHA512 8afdcb73c8dc04924721658d39ec4d853f3a96501d8e5a0998270890ce33db877328bb4520839ed5a354a72793d26e8f944127bd48fa28ba68e290f52f827c99
diff --git a/dev-perl/HTML-TableParser/HTML-TableParser-0.430.0.ebuild b/dev-perl/HTML-TableParser/HTML-TableParser-0.430.0.ebuild
index 17fd9d66464c..d7949253c28d 100644
--- a/dev-perl/HTML-TableParser/HTML-TableParser-0.430.0.ebuild
+++ b/dev-perl/HTML-TableParser/HTML-TableParser-0.430.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Extract data from an HTML table"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-TableParser/Manifest b/dev-perl/HTML-TableParser/Manifest
index 854a577c99e6..6edc410038eb 100644
--- a/dev-perl/HTML-TableParser/Manifest
+++ b/dev-perl/HTML-TableParser/Manifest
@@ -1,5 +1,5 @@
 DIST HTML-TableParser-0.42.tar.gz 73638 BLAKE2B d422069322eada6e72a6742b32418b3c99dda824ebe98c10211b0cf0c4bf7133c6c7fe990148969c8e18cb01c2f2792ebc13ebfc04f8b5032ab48c4febfa6992 SHA512 dddde421a186ebd354c06201fdaa1379378b83acfc86fb0ed9a7959a993dd403c6d40d9aa36e143d1236c9d21ec56c851d82867783e4954f0eeba75ea8400d3d
 DIST HTML-TableParser-0.43.tar.gz 66079 BLAKE2B 5309e8b09fdff9b85b8612e4122a5732b2b85bf8e9382ba8656605d0b7faf4bc88e267226e3c7c4565637e370fa9a8526354d38e4296fa7d359004614275a91c SHA512 1f4fa5d5d91c830b6b0e53f6353af4a6016c08aeb572a9ab9d22f21d694b62cace6e745f6af3f96160b885ac2cd788331f0beb0a8777964fb80ff561c227dbf8
 EBUILD HTML-TableParser-0.420.0.ebuild 494 BLAKE2B d84ed4bdeeda30c26e06a35789f118c64ce2c0031cc9780cb9a39439bdf1cc4a55d8d3aad02ac8eb68b2755997f0a50de6572916671ce1e3b11f4d05cd8d513d SHA512 6882a6ac9b4fdb9aff29208b58732bb3ec300386f9895026e404321e9217e21ea98af7e8818ea7b5bdcc63572199686e7eda66dfc7382cd665c0f28b9d8ae44b
-EBUILD HTML-TableParser-0.430.0.ebuild 510 BLAKE2B d37a60798a6cecf4e3068d904a11c9057421894925c869b9286e3b39ae5f799c433e4922b2c908ab117cbbd6e638fe1f5c727a7557cc6acbf0dcd493a862adf0 SHA512 a1fd76ceb3a95550b2f3e70f71d521bb07c3112537481075ef58fe6fbf65d47679ae90abad970a8403c021665a6a3161d973273efc8b685de0610f90bc7d2a73
+EBUILD HTML-TableParser-0.430.0.ebuild 508 BLAKE2B 504be2182aba8491f7ade95e37875b1ea283cd67f9806082ea8fc2afbe616db1b77c2044aa1fcb1c063acf81a0a2b60773d9642c1f671be08e88e01bf7bcad04 SHA512 8e8dafa3bb1ac7eb2e90f79c51bdb9f241efaa8bf3e15d3c9471bbb70c2bca764e7f7d5a76e715183c5cb3d0b47ff22e89284dbdb8114456b5d5215a00018ca7
 MISC metadata.xml 475 BLAKE2B 200be53db320cb5d919d966b1f4b8a8c58f33927baab43151f1f719df36958ed9f8c4d9568b2153e09753b6838d93f9337933e64dd7c007c1f8b5150dacf4551 SHA512 121f33a9da412a987f2473b9e311dc0e5ba2bcf4e1ff51c84183a015221c3bca600f7424f6bf6c714d5033c1b2b2f8615bdf147e9a1a3e3fad7f5629eb8c6328
diff --git a/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild b/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild
index 78cd75ef5efc..3edd78285834 100644
--- a/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild
+++ b/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A library to manage HTML-Tree in PERL"
 
 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/HTML-Tree/Manifest b/dev-perl/HTML-Tree/Manifest
index 845b5ff80917..8c323f595c24 100644
--- a/dev-perl/HTML-Tree/Manifest
+++ b/dev-perl/HTML-Tree/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Tree-5.07.tar.gz 150477 BLAKE2B ff1cee33e144e8b27b71e26c3fdf4e07b70642533167b8a59feb17729c34c58066f7a5a742de43c879f0101a2adc1302aa84583b536f0e2fa4097f7d240d444e SHA512 a1faaf547d7db323388d5f6b289ab96887de5a80add55aefd380e4b540948514550a86785bdccf0776dfff38085b6bd3e98228f96231264217adcfc2f132c5de
-EBUILD HTML-Tree-5.70.0.ebuild 821 BLAKE2B 4167dd0065ab28daba13bcb93a8f8d78caf93b3c2e9d05b8a537f4e216ae217dca73e3b323c2f9feef3f0abb4d3ebefdf20970c92a6778aa5089f6da343977e4 SHA512 5e43f2fe2dfac697a4655389a5eeb8e113eb4254c34eaa04f5061e025643144e11295cd35205a72fe44d57b65a12b002385c437a3f736a2c08d67959df921638
+EBUILD HTML-Tree-5.70.0.ebuild 820 BLAKE2B d6e11c1ae30c7cb37adb35d93ae4694d283d86042873efbf7c86e87cc9d0a86e771e27503d1662be46b514a534a8dbc580ea7f92ef17d1540a1cff6e19770c8e SHA512 3ed40c8a193f961c0e4ac1b975cbeae57ac1deffdad6b03c1bcfbfe42da5ac1cc7b9b98633f14b12c9e74e5b0d5a9c85624a58a8bd4005f8afe1025e08a9921b
 MISC metadata.xml 701 BLAKE2B f1cd74ba7f7340edbcefcb43c9b1b78830b3606f7e81aa579412a18495f89329907b0758c346348ee65b2eeddb17653398d9a31b5f0f8a14548531a2cdda8431 SHA512 94ec1a09f4a5d8940cb65f2fbb540129907dcfa02bf53b57a455c1f0af93d9931f717c71389f60850a89fe10cbb85a7931cf7be7d43ce601ae52e34aff8464e3
diff --git a/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild
index a741552f86ff..145897d8aa81 100644
--- a/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild
+++ b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Determine Web browser, version, and platform from an HTTP user agent string"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ppc ~x86"
+KEYWORDS="amd64 ~hppa ~mips ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTTP-BrowserDetect/Manifest b/dev-perl/HTTP-BrowserDetect/Manifest
index 58b5718a2a53..3188483c342c 100644
--- a/dev-perl/HTTP-BrowserDetect/Manifest
+++ b/dev-perl/HTTP-BrowserDetect/Manifest
@@ -1,5 +1,5 @@
 DIST HTTP-BrowserDetect-3.14.tar.gz 95445 BLAKE2B 08a90c6e1154f7a7e1c55af2c056e67ba906d187f3ac8b4e82f1039446462ea9a60f1f875e5f26a2229275436c0deb5acbf090f893aef51f7971ae8e0e547c62 SHA512 cf05af60dbda462df81a9d38d5738826b820534c5fde52f41a290f6d3253783154a2e460042117be32e86dd95f7f1e0e6055b4ca549cb7972cd3c156200c09df
 DIST HTTP-BrowserDetect-3.31.tar.gz 121365 BLAKE2B 454f702905b269cf579bf6d192542cb8e4d63430b7107c78b505db65973c759f79f78053cc45e14b8f7c152f4c53fd18b728f04c0a5d8e86393b1c2bcc4c6b9f SHA512 9ea830b244be7b5d0707118f27a212c520a2117679fab75192881c04d244cc50ae71ee6de2d2be7c456c2a0d5f2bfd0c9bf473893a86ba5b13db89a7d4943e8b
 EBUILD HTTP-BrowserDetect-3.140.0.ebuild 663 BLAKE2B c1ffd7489a32e5da4a38c96b23d4b34cc961e91ef95f15cde0b60b9cd5fe9c443504f35fcda68ab6d87e68aed45065b32e6c1fbc26c19bbbcb18e30dbb2cbd0f SHA512 da3c8f4e87a24d965888dac27736f940b6b85ca72e0fcc1993169c9957b38ec9fe4081109148470b433cdf76998fd98c91949ad3aec9726e42e0942d425d4b9b
-EBUILD HTTP-BrowserDetect-3.310.0.ebuild 666 BLAKE2B 931778281e5089cf3974d116e1d9efdfb4115b2206176bc92dfb1703d8cc0db66fe5998f411e025c666a2aa90f963d2a0d1246768052ab269d311ad506a22129 SHA512 575dbbec4d49dde36cea151dab75143651ff1b5be8073b2e64cca20eafd258361e425ff545c45a0e62ea1cbefb5e1bf202d31fc2d3eea1ef2e49a5acbabee2ab
+EBUILD HTTP-BrowserDetect-3.310.0.ebuild 664 BLAKE2B b101d097b772cd857e10085eafd94e8e05906bfb24c5d427f031cc58f0cee5f16af64a20434c726dc960463bb39a99c0dcc2191807588b7907b858e9be6469ac SHA512 b6bf2d714ee37dbcdf531a645945f002e3ea95b31d0ce3a366966845152e7f37cd5f38ea2dc2814d415c40152cefdb86f01fa5f430c0f469041798467863de32
 MISC metadata.xml 408 BLAKE2B eb4647a1dce96723b6208274e3bf32a802fe2965b76b3784a4e1bb414ceedc64b78249d07c347ade36d5ab0c6d3701b26e7430be293b55839e59d10f56556a12 SHA512 39a7d6f17021b4ae4005592694496a84f8320f8d8afd4ba5404d5ccf6ae57e8541443358b109fc703bd22befb2da051cdfd3c1da899ac3b7d9da75940af68900
diff --git a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
index 267894e652c7..5fe11a4e3ea6 100644
--- a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
+++ b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
@@ -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 @@ inherit perl-module
 DESCRIPTION="Cache the result of http get-requests persistently"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTTP-Cache-Transparent/Manifest b/dev-perl/HTTP-Cache-Transparent/Manifest
index c43c064a8bc5..3aa72be7d94d 100644
--- a/dev-perl/HTTP-Cache-Transparent/Manifest
+++ b/dev-perl/HTTP-Cache-Transparent/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Cache-Transparent-1.4.tar.gz 10289 BLAKE2B ccbd8a232cb5ff9ef8354d9613a98546efe4e6bacd5c77b9e36affd3ee8e04dd1f5ffae979e9737cf03f3cdb077158683ca7a310cdb06ac019c661595d7a4b18 SHA512 bd48290de4aeffe64cc4748d2f4b054abef539770dd8679f88fd24d9478819c31d7201918335404ea5ed0251d4c4f7d19926ccdeb6b4da2cecf251d2618589a4
-EBUILD HTTP-Cache-Transparent-1.400.0.ebuild 638 BLAKE2B caa4b1a3cb0123d90ba9a0b2f4953686d86fde5bee51210d655ae3b6c8c5d9fdd71ed3da83c851e4b3a41588644fc45b052895d41cc0205ba357d2261fd2da8a SHA512 1c6b09be0c94f84cd44cdf29faa402e36929836d6666070c9921dff5d0efa0fe89006afd890183bf5af6c0c7d9d7454b728de4a6183897a8cc75137e757d46be
+EBUILD HTTP-Cache-Transparent-1.400.0.ebuild 637 BLAKE2B af2f639c044e4c7738bee2308338e425acfcfd08b64fb08a6e99efd405f47be0c6b0480add5ed632e8469df677d3b9d595d400b784f28cc1ed2f3454b07e9d06 SHA512 47710de6d72189133bcf6ebe08e7d268710eec2b25e754d98086f989830d7a106e8179139b1bf38ac111c9851e1ce930d803c832f0c634c5c20dc398b3e6521d
 MISC metadata.xml 417 BLAKE2B 49052781b68ec3c65ad74d64fea3a8f6a3882bc859767e5ddf3cbde99001682c9ef2cca4387c7405b23c20af7a81390ea3d36e8d21e24ef102355e78ffc251ab SHA512 35a17abe4fa79ee41ec5ded2d9d4290a33b7eaeb0b802de27213c5769d3a8d34ec4017187c9ff31aaeba7d078c7f260222b3801680988092d3da7b513a34fa50
diff --git a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild
index 1dcc4494c3e3..eef8a33909ab 100644
--- a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild
+++ b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Storage of cookies"
 
 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/HTTP-Cookies/Manifest b/dev-perl/HTTP-Cookies/Manifest
index be3fedca53eb..f803a45ed708 100644
--- a/dev-perl/HTTP-Cookies/Manifest
+++ b/dev-perl/HTTP-Cookies/Manifest
@@ -1,5 +1,5 @@
 DIST HTTP-Cookies-6.04.tar.gz 39502 BLAKE2B a6a5de4a992ee246dd0e04594fe47ce635248d7fb004acdd4eb926a84c27a7b69f0b8d5a522460287f1786f3d3f9d8bfd23c933ab7650e8cfaffaf392eecb94e SHA512 e8b24b96e6630f1238e828edfbf7074fb9186a391fd1d129fb65a82748a4cf7d71669fa658c31957560a6faac3e638c8dc7aa3182acaa6fd14f0d56f3968f5e4
 DIST HTTP-Cookies-6.10.tar.gz 42448 BLAKE2B ce261bde7071f34811827099322a0c7282c4f2287ce4baca258d8237dc82ffa5502acbe9ca2a4b76ebe6d8bd0c1facdad5448f1f377390e46c2f4564550bf57e SHA512 c24a986e524ebf5d8b13b4580c3ee6aed018e79c203fd62208bfe970744482832fe9c41bb3195a596af1e11058053ed7615a09a26fbcef4433e270f0f5d38658
-EBUILD HTTP-Cookies-6.100.0.ebuild 724 BLAKE2B c0601613d2918c9edca6649b80b27ba8cbac6273b522bd23b4edb2c137690e75987ec032eb7512996d30763e815befb322665247ea11e51703afe7c215dbef02 SHA512 34c438dec66d842104e42a3be4bf71d096145a403c72c6bb42a7123538805b3b069ccb65a693cb237ff86f1597bf225bde3efe3593b185521621547abd2ab19c
+EBUILD HTTP-Cookies-6.100.0.ebuild 719 BLAKE2B ce9c047a5d39a232b9fbb15820bf8075c602cea4b3b399706d97373a60e6b07a581122e79a74b851368c47b34e8efbb4083fc7d0f40738b2ae4f62014f83a436 SHA512 ae249509c74b73aea495cd107e3e432e397c3d05e8a8baa284bdad822900c3359dbc463f73d0aa1039a761e1e0d722719f37463073906fa8c3f285019782b7b8
 EBUILD HTTP-Cookies-6.40.0.ebuild 718 BLAKE2B 220362b746587ae543c10a9f97e33f9042e0047a3c7fe65723701b6d4bbbeb6f7c9c68193b57fd2bfe85f2b67fff36e1728cc20bb6bd45601195958cbd062691 SHA512 d116eaec72e5d0e002d63ef52cf1ab09258a98c8be1cfcb32615ebff4c534bf7e180d91fb1a82ee4afe3ff5ccf032204c2803b54ae71dd631de122aa52be0910
 MISC metadata.xml 537 BLAKE2B 661efc3e34bd073871e2a424df5e52a5e13763862c73d9ad2fd6f7335b2d9806eaed338e3849df393d19ce2a4f6bfc7d80cb089037a0dc921d507349d5cb6182 SHA512 8bd8c5bffbca00990043526261a737dac89ed22624d171ff6c95f01a466e9ba6234d7cd64a86a091869f9446c5af8112bb532101b449dfac0c4e799cbae57aaf
diff --git a/dev-perl/HTTP-DAV/HTTP-DAV-0.490.0.ebuild b/dev-perl/HTTP-DAV/HTTP-DAV-0.490.0.ebuild
index a3e6e4cca009..897c4d6a7ea0 100644
--- a/dev-perl/HTTP-DAV/HTTP-DAV-0.490.0.ebuild
+++ b/dev-perl/HTTP-DAV/HTTP-DAV-0.490.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A WebDAV client library for Perl5"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	virtual/perl-File-Temp
diff --git a/dev-perl/HTTP-DAV/Manifest b/dev-perl/HTTP-DAV/Manifest
index d49370644a99..2973aad3ef89 100644
--- a/dev-perl/HTTP-DAV/Manifest
+++ b/dev-perl/HTTP-DAV/Manifest
@@ -1,5 +1,5 @@
 DIST HTTP-DAV-0.48.tar.gz 105090 BLAKE2B e0a88e186ae26d3240783aeed91b3da786b1ad21e31f9293c361147c540bd513cfd1f570b9dabc77301c5310ca65128c1574cc342bd5512fcf7e6340c97eabf2 SHA512 2edf92791660b1996eb22b9ea68bd4e417c497afeebb56cb0a2ecf0cf72ea54b6fb8efd4d69dae1dcb946517f917593932a8040bd0ef5cfc83f7fdfd1fe3ccf8
 DIST HTTP-DAV-0.49.tar.gz 107841 BLAKE2B 202a37766a949441417e6e88de02dcb238f811408f16cc86ebb5187f0cd0c8b780e322b3704dbc115225232c1d815cbe9d5fdb8ac7755e222c7eac5357ea0a81 SHA512 01a097f47d95090fd0fd08a44b440d0ed4f2f04e0bedc41f8e2abedf1879e7cfcae6cf5cf7a415ac89dc610cf0cacf4f75078586bbf6a818f8c6dd36ccb451f6
 EBUILD HTTP-DAV-0.480.0.ebuild 372 BLAKE2B 4cb11d906a11e262f2c695a2b1540f018e69e13299917110ba91d0da4455f86a88aae3692fefb85c0ebca3876463d2c496b1c58399bf10274548b8d44ae2556b SHA512 dfafb88a030a4f8ad85e4d187ca1da707c37d37e59a4951f86cd90d420bc91ead8c24356dbf668032849f02df08d77016333aabe718c7893c7d2c68c8561d6a3
-EBUILD HTTP-DAV-0.490.0.ebuild 437 BLAKE2B b43894d3977b57ece97b0018f604b57c2be34cb0dbcad276e15c3ae4e8d0fa60df590a4582b6d8899dae7b7a79750fa25e82864ddeb67b62affbdafb627ba4b4 SHA512 2cf716afa5a4fb41923d54128a65c620fbeffa1b818d41d667e05c2f647599ffd8f49766c37331c3e9277bfaeeebad9ffab6e43e28ba0baebe306f47cb779ddd
+EBUILD HTTP-DAV-0.490.0.ebuild 435 BLAKE2B 2796ef0d74a14e500498c375e3003f364c4737dd85a36b998ee64ae9fe8d87897f4e1f0383b559899f91acaf2b9bf1848317cc3875c7e90875872dd95289033a SHA512 3d14a8e1f2c3d71b57331acd1d9f91c00b787f21e861cfa5c88583a82ed5fb352633a490d1d379d880c0dca76795f27282ef525ba57d8c2adb257a317c18d577
 MISC metadata.xml 910 BLAKE2B e525ecaf594139441e7a37ebabf2ed446f8caaeb75423f7698c3dd26ce2c8477ac59142be20a8e2cb41bb7616feb0f417b328ea9ad5face49e9eb2ff9b672984 SHA512 3413d392e67da6be5ae345e1e31db9f290c2482a5c6830847f0ef51abba6ed9c626c68fa24ee0fa571051e3c17975b4fa4515748ffe781491eb24576e1e62f47
diff --git a/dev-perl/HTTP-Date/HTTP-Date-6.50.0.ebuild b/dev-perl/HTTP-Date/HTTP-Date-6.50.0.ebuild
index 0de3c4112072..2721237423eb 100644
--- a/dev-perl/HTTP-Date/HTTP-Date-6.50.0.ebuild
+++ b/dev-perl/HTTP-Date/HTTP-Date-6.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Date conversion for HTTP date formats"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/HTTP-Date/Manifest b/dev-perl/HTTP-Date/Manifest
index 15a589791da2..380ffa138083 100644
--- a/dev-perl/HTTP-Date/Manifest
+++ b/dev-perl/HTTP-Date/Manifest
@@ -1,5 +1,5 @@
 DIST HTTP-Date-6.02.tar.gz 7319 BLAKE2B c56c349c612d88b90324ec2379beadcd0238e448f83fb2bed7f758dc4fb3d234d4f4cf203c86f3260692ae7db1e1deaf22152c6d7fa9d34a2c835425d0d06d32 SHA512 056d2ff01482922a644757f04cb924d60fa15b86873fdea02e65c78c8af2bbf3f184495852b579eb4fc86bc44f8a5a52f785ab800cc554431ed3e2767e858232
 DIST HTTP-Date-6.05.tar.gz 29673 BLAKE2B 680af1a4ea45160c15a5d086275b5157a091c7816bf5def67c413690c97756946e24d436c50d664e2f8809cd4ac8054e24466d2ef4127b4b09bc681d6b19a404 SHA512 08a427a860161cd0d7a34a4fa3eb6bf6439c2504478a308ff560de0e6620c20df46f004cfcb719e3d19e35fdb650728d6983ffce1423f4d9da06f91d85c7b927
 EBUILD HTTP-Date-6.20.0-r1.ebuild 546 BLAKE2B fa4a1217d43a75679887bbb2071fb3ad04aedc6d02adbaf9ab2f5662f28fdc29379d189d90ea89d49201abe8584faa744db811fbe4ecb3a97a0184dedcdbb705 SHA512 2ad1cc782b4469e711c893b5de98437c3ca3938de445fddbf98e31a2e06f275be13fbc4e61179e11b10e4b9637b33346f85a59bf95b21a51ed4a6db410830803
-EBUILD HTTP-Date-6.50.0.ebuild 616 BLAKE2B 8fb96d13dca5b71caa5a258669e8340a52edd0b9805d32aa00cdb1d72ff6641084f0b61e8346fd9b6070deda4c962ea6f889194b9823f661449481ad8c9d4b77 SHA512 e514fc119748afc9c20b64f16f6105257c05e288be78f3872ff566779d329f99b9ab97e8944c08656394d21fcb525b9b79cc2f7f21c5164ca09c539363d1ddc2
+EBUILD HTTP-Date-6.50.0.ebuild 611 BLAKE2B 6b39afbcce757a842bb783ed82787c3f4501949667a625a611e89afe8c3752e8d0a1376cd2a53ed6c6a1482ae839ec3aec3698b6fc4cab531f9fb404a5f40960 SHA512 bf404763b8936fa1074828d3ce2215d4b48455489024cab4a0dccae057b2d974b25077c7a837aa8a80e358c932e648542c6febf62e24677dcef0adfb64eeb7d1
 MISC metadata.xml 378 BLAKE2B 190f8f2c438585193871ac2fb41f0d90c9514435c6e5f379d8ed4e9c9bc81b92888fa293dc17c19a1baa47880a869ce8b6e19857905e9e85ffb6d0880f60711a SHA512 396b533e29fbb5e7f482506731f83cb8d019aa6cd63009329ffb7e4c4ccbc6e72585f55e235bdda701a174428c3f1b8d27b765703b2dd7a73da61331b232cfb4
diff --git a/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.250.0-r1.ebuild b/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.250.0-r1.ebuild
index 092a03af895c..6eb8893c804f 100644
--- a/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.250.0-r1.ebuild
+++ b/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.250.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="PSGI compliant HTTP Entity Parser"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="+xs"
 
 RDEPEND="
diff --git a/dev-perl/HTTP-Entity-Parser/Manifest b/dev-perl/HTTP-Entity-Parser/Manifest
index e53c4bb43187..ecf9e0bd2f6d 100644
--- a/dev-perl/HTTP-Entity-Parser/Manifest
+++ b/dev-perl/HTTP-Entity-Parser/Manifest
@@ -1,5 +1,5 @@
 DIST HTTP-Entity-Parser-0.20.tar.gz 23662 BLAKE2B d003bf695e32084b524a9e56327b5485ef2d8d4f608d55c776b960372165e2139cddd8a8db609c59f40ef84c979eb42c3af010fc36f3bd52945a6a88417396fc SHA512 c80d9058b8682c51a0fe3669249cc219142e674959237d8ae6bd435afafc16c92a38328329e9b09a25af8a79fec5bf01050145d3c63dd81b15ad9d75946fdfc6
 DIST HTTP-Entity-Parser-0.25.tar.gz 24307 BLAKE2B 6c8e7d6dfef9c023ea9e6270d12c0790711a03bfe783ae7be0550b83859d03ad94515981f3b87887d2174ca45b1d3cbbee427064f1377f28e0a7d09c2942de2c SHA512 760bff3ddd818ecb8eeeaee86c2d2bd895820b4011c306135b2d6eb3c2519322b3bd4e20098c9458c2fec7dd944384dcd33bfdd5b2d368a28270ac14e8dab54b
 EBUILD HTTP-Entity-Parser-0.200.0.ebuild 797 BLAKE2B 1b5a485bd48788be00f5649a545dfd5a5c059f256a9bceb330f3335fc10073031e5aed6d3f7b4d9d3881bbeda75f4135add18cb26ef7a4183ca38ea9b8e35b87 SHA512 75e6cd0a2cf322a13ecf3a9ce41536c3361043565fb76a9b55024ab2a875b5a0f2d8ece882eda07d39f93d877e121310f7f26a839224c4c3509952e5acb69599
-EBUILD HTTP-Entity-Parser-0.250.0-r1.ebuild 768 BLAKE2B df93d22b81586f61c5485ded7fa1e3bd4bb8ee088fb05d8925130b929953667375674fd80610a7aeceabf6baf9bce99649a8dabe63bff81841b220cc81e7dc03 SHA512 fe9c1a019e6a5225769e6253661f02b16aacee47c07c2d8158332601fdc0631bf7ac54d286d11016ab9a23424a62ba972757ca1f7059e5702d0eda92f159e58c
+EBUILD HTTP-Entity-Parser-0.250.0-r1.ebuild 766 BLAKE2B 1fb0f16ebddb7b899739d7687c7da5e919de4a68d6f8253a9a174b68b9b93a5e8a264acedfa037c4dbea50e3eb3400a9974940a2309a708f39ddf03f9300354a SHA512 67b36bdaab97bed1042d88c8ee668de44d6da1f63c4499dade725782b645876527a9e883ef6e03be5310cd6dc28c3b9ccfd121d4a59cbc3b6297ae43ea76e02d
 MISC metadata.xml 814 BLAKE2B 9d07cd2d82956fdadba2ca2b8590c49a482ef88cc9637246960637b98518e0a453bce7e9292bcf176c1f15d605829b86ca3128b25e52703f14067cee391e16f2 SHA512 769ef47e6cfb110eef1f4e09cf49fc03a43352f48604da2466bf1793ef1a378c69cf25437ba3e26ed0a31c53f489d427504b1d71092cb8b82ab06c6672f7eab5
diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.320.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.320.0.ebuild
index 38c6d72276cf..c42f90ebd678 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-6.320.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.320.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base class for Request/Response"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTTP-Message/Manifest b/dev-perl/HTTP-Message/Manifest
index 5edf974c229a..442e4333a4f5 100644
--- a/dev-perl/HTTP-Message/Manifest
+++ b/dev-perl/HTTP-Message/Manifest
@@ -3,5 +3,5 @@ DIST HTTP-Message-6.29.tar.gz 88311 BLAKE2B 372373f5a4103c788f8f951c602627f9965e
 DIST HTTP-Message-6.32.tar.gz 88711 BLAKE2B 765d6ee3053c91448cd3023d87cf3bee23f107ebb10f2ccb77f064b7704c92a81f3268612e23266bb3e28a7e2810238be4da9475e93304a04dab4752ef57e789 SHA512 359a0d51e65d721d8167dea05d7aa9853d07eb4a4093735cf5f45814117070400cce93d60b08dcf92cfe0fbc98e7455e7facaecbfcaff44cc0e619fb621b3288
 EBUILD HTTP-Message-6.130.0.ebuild 1045 BLAKE2B 1a01523d9d08e3c9623bdefee63e60d0038512e5e116463d99797be88e5ab0d9df51b884f14021c512386d6e811f9939c3e383a5151155ea2a79138d4d2ed414 SHA512 2753e6e569ae6d59fb5f7d37aff9077bb0466626047a738a6fe711bbd200ea5eaa1b207751de24434a43416fb0f63cf09ec23e1ad8c6386c7e11be46b83b6654
 EBUILD HTTP-Message-6.290.0.ebuild 1057 BLAKE2B 1f1fd0efb62d19970d5ebb3a61bd885d510dc4d9bd528a025d3a356c32ff700080d33266b2cac2317bda2edc3e1d7c06d5111f57cc1981019c8b7612209d7987 SHA512 fc0da5198de83143943ddbdf52ac9dc1e5d18e5fa80e2fdb4568822e0e3664f5393828cbd021c8bf3821ea74e5239b2d00b0ab52bae0d955645185a220dd5aad
-EBUILD HTTP-Message-6.320.0.ebuild 1086 BLAKE2B 36b21f14e544f2b1352bfacad0d232595b1fc7baba26260affbe210f97bfe3975453b453b876a6cfb192a3e6044a674984a0b66979f5c9d11635c058793229d4 SHA512 639d0f48065e88ed263f22ba08dd1bfa8bf79e5695b64ec0d5781206ac1d68548af7afb84523a919d7c80b0bbca7a3581e61674a0b9a21eaba05b3459e26cfc7
+EBUILD HTTP-Message-6.320.0.ebuild 1081 BLAKE2B f38d71071530731976faf35cfc33ace0545f8cfbbf12d6f2ce490a3d777b86054deaf927dec29b108f97d5cdc96e20a622cdaaa41d1a733fc8d4b7ab8545713b SHA512 8fe992ed0c36beaffcb4c6b64efcda04e5c1ae638ce6681736c2cb6cd8c88776fa987577aaa95ed3b2bc4f9719652d82ce33ec0b0ed32a9b3774f88899481969
 MISC metadata.xml 931 BLAKE2B ba8a44911e5d7ef315af7b6ae5508670ed5a65d4495ccb1eb65eda4eb026923730fe0b3d2b3299a708dab602f8ea0c76201d4b573a5376f0d3acc464911dbd02 SHA512 6e64be79b3ff22d9ac9496bdec50e6d8e6bc93ce47343a0e8d5212288899188177028563beae411c2d1dbfecf8a7c950b8a3f97176c0ca865ea3e94cc1a821c5
diff --git a/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r1.ebuild b/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r1.ebuild
index 19f7d8ed2cc0..b3545fbe35b8 100644
--- a/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r1.ebuild
+++ b/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Lightweight field hash for inside-out objects"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Hash-FieldHash/Manifest b/dev-perl/Hash-FieldHash/Manifest
index 789d0c154d44..5fb534f09ac2 100644
--- a/dev-perl/Hash-FieldHash/Manifest
+++ b/dev-perl/Hash-FieldHash/Manifest
@@ -1,4 +1,4 @@
 AUX Hash-FieldHash-0.15-no-dot-inc.patch 570 BLAKE2B 8ec8f96dc5e4dba0ecec50c6eefbbb11e884f06f0ca91c9da8b569a60473fa3a0d8edbd751bbdf64bcaa8b9d5987c309de94abfdaab513a9db90852afe57cb5b SHA512 d030f593a80a57883672609daced83d2e3f3aa97b76972159ad6078db16dcbb435a7fc2436e2cf3dc169c0941975c0587d89f053d2793fa4ffef3704ab03772f
 DIST Hash-FieldHash-0.15.tar.gz 29082 BLAKE2B 5b8426f3d44e1ba0d10bc24e473b8162189ddad3b378f0863903eae844fe26cff378c73602c4b49085bd0c9e42d5549013111182bd5a09c4f14e523b1c6c7254 SHA512 2f42b0e7efdba03b99c9646882afc47130de1989777eb1ceaf8031769a3a11ebdaa841abedea8288b770aa27c44108846d0765f531a35d707e44a8c1f0f8036e
-EBUILD Hash-FieldHash-0.150.0-r1.ebuild 1112 BLAKE2B ff3ea84b5823bba01dc42209fea53e420775f663a95fedf956d85ca833877fb07255791552126661b7772ac6783267fba662509e61d29beb018cfa307d82e35c SHA512 4a18eb0e62dea581e79785687b97e4e03c7a2a42f817d46689380cb09eb0f471148f878346be6e7562f3552b2e1e9aa0a2113e50106316ef22965b438dea9cb0
+EBUILD Hash-FieldHash-0.150.0-r1.ebuild 1110 BLAKE2B efad34cd96667f5110bc688bd32211e563afc2389358e33f8cb0c8c6f50a957ce41bdcafedc43b942706e55ef8e028dd7276c3a681e9f9e5fbeeb12f993ecf9f SHA512 985bc0cd442f0bfe19067428b60fedfd7ca7a9136705dcac960d30d2ff004dd76d8b06ca8bd802ee269ef65d4b8046ab38084de4fd2a2f6ae682cc8b4aff9ca2
 MISC metadata.xml 400 BLAKE2B 5a93cc38f97d3203f7e32191e8ebc7fc30aaa92272fec85e579f1ed857cba352463ebb8b8d3677c13e4bd592d7fd1776ba5d56e9cf4c0e82604a1eb9d9cbc871 SHA512 01f782c54b4bf4e453848b4e30f21cd4cd08da3ed15bc0f94f52018e5a958c52e2c47d0f845f2719cf79e38678e9966a45859d3b6cf6f80edee1081ea369d30c
diff --git a/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.60.0.ebuild b/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.60.0.ebuild
index aa4a6d507731..7a8deaa07162 100644
--- a/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.60.0.ebuild
+++ b/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.60.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Provide the stuff missing in Hash::Util"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Hash-MoreUtils/Manifest b/dev-perl/Hash-MoreUtils/Manifest
index 5424363e2152..8b79405e76f7 100644
--- a/dev-perl/Hash-MoreUtils/Manifest
+++ b/dev-perl/Hash-MoreUtils/Manifest
@@ -1,5 +1,5 @@
 DIST Hash-MoreUtils-0.05.tar.gz 5809 BLAKE2B d8b5c6aa531556d0f17b8debc2fd82ff8115e3a70cc3618e14ea1df9bf025e8474263307b1fda193d38e47241c7f5da64d1ff4671940d4518bdda95c09872ecc SHA512 7e53dfda0336198b5981be772a0aeb3aa1fdbfa5885bf866032bcd168a73ceb03f92db6de92874d5812f062ab9c03e1fed27732f60a7004944da568c3cb04845
 DIST Hash-MoreUtils-0.06.tar.gz 9208 BLAKE2B f3138710a68ff6db682b8e2b15729b37729b10656c53cb20d7f770fb0a0824d331c934159cf7acfcd2e9bf79d60acdc117bf727eb311f33c596d686ff12bc5f7 SHA512 a824e6132a25f265308691c6bfa077ad78e7db079a9292c3e2d728675b6b60d9b162d2d1ca965c6295f62616bed4d9b9c177c0eacc5f4f8afbd112bc1f3aa6c9
 EBUILD Hash-MoreUtils-0.50.0.ebuild 409 BLAKE2B 4957561c077dc18f03708546585d5a7adbae4e80f747ae610b6c57d0d147e54fdb10d1779d23c87eab03c92fd0ffc610efe06b9c50ea3fccc8bbf1d5d82f3c98 SHA512 b83645aab89b5b5e5d6927ead0746fc69de3a52308a0de3e017cffacd27a98fe6e961db2336eab11c54962774d032c92182fdbd89076079761f3c0751bffc4ee
-EBUILD Hash-MoreUtils-0.60.0.ebuild 379 BLAKE2B b8414a03187989df936086abfa375bc3fad958f1e3b4860875f025437c785a78240ae79659697b2e3df9f53f94c3b91894e84e07646ace36cc8945a687e7426c SHA512 8764a0bcf6cf3ddd6637dee866ec290c13333353b1c49635841bdb7fb455cbbe3f8232ff3162b194446180ab14052a069b90e18f5834445ed960ab32e066b0d0
+EBUILD Hash-MoreUtils-0.60.0.ebuild 377 BLAKE2B 5e3a9254c05494eefd9e459ca586db0de212d9df00a45b2034b60b87538f648e17fef4391ec111aac91804315cb9636b92535b3c5de32408ea7c6db2177abc32 SHA512 85af68779413e521a6e9393821ccbfe9d3ad216e84aff14c62e42da40b9bb7d15da0b77495979d47c9e81071771f0b20d390db15a66aa51f902ec4ccda9d1a64
 MISC metadata.xml 400 BLAKE2B 379ba270c0191ff4a9a66a63b017e10abdec8205d79fe63f598050048c65c520be08263b06dea6e33330946587c376630250198d8132baef3ad3a2fa3fc22d50 SHA512 ed21f6b972e97e066a599650cd29de4975c8626590c4ee66f5374440e498b1a3e905153e4bba09fde9c9a0d33599ebb28deac23f0bf4a7416ab65f383ee6acf4
diff --git a/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild b/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild
index b10a6e24d2e1..cb502aaf0cc4 100644
--- a/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild
+++ b/dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.500.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Capture STDOUT and STDERR from Perl code, subprocesses or XS"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IO-CaptureOutput/Manifest b/dev-perl/IO-CaptureOutput/Manifest
index ff43b95a0a4a..1c3e7a603773 100644
--- a/dev-perl/IO-CaptureOutput/Manifest
+++ b/dev-perl/IO-CaptureOutput/Manifest
@@ -1,5 +1,5 @@
 DIST IO-CaptureOutput-1.1104.tar.gz 27651 BLAKE2B 998153cb491436e1dbca26f216833898f9c14949b42bd30afdf94c042f35126d8df6db8bb13718ac944de8d252e0be90fbbf3e5f8ea0048bab8d61fc30d0c20a SHA512 5694635c91e4dd11279c33fb9d58e2eb27014f4ea0a976e62c23505524e3d37264aab6d6b1cfe5d925e123d6aa240e574dbc4f489c6c1007da09631368af94f5
 DIST IO-CaptureOutput-1.1105.tar.gz 26657 BLAKE2B ff2f00511fe8e4a038fe29aa86ba70031565b11e800f3dccf712d8a46ab5accc18779add4d3cec1cc2da987304f0627c653997005cbf27095874ec1e087a4e11 SHA512 8ca9485982d6bfae08ec322c28efd8f673f2a6705421ac5d680c228c436e7a5c8e18a16ff9712062631c35a91e6d19d9518263135db469c47083ce30814cf064
 EBUILD IO-CaptureOutput-1.110.400-r1.ebuild 736 BLAKE2B d293b349d57b9b3ed4d322c0dfe2c2a446ce562b4d0bf48136d5420ba483c14a7a1ded6592880ee832b13447705ac593adcbc57599ba4a333d62a61a94008755 SHA512 16ce8c16d63ea0ec5ea10bbfa0e7a9349621d849f7b4eb85009a680260a0cfc8da0cb24452e431356a64a8c1df0892f365ce0a881dfc285bcb490fd0c238dad9
-EBUILD IO-CaptureOutput-1.110.500.ebuild 702 BLAKE2B 2297ec6d94f8ab0830ead75c1c1921f3a27e6cc923d2f7db4e067b47fc12554e4b5f07d2af9f9a5a23c06964cc692a2f30a7016b39167a576d24a513727ca24d SHA512 d89a8b2d0681924bd21c3b48a3ddf6fb1c33a9e062c6a75a2f7488ff18098bf2d61e16e4f8fb952471ec005ace36fdc693bbf0e13de35b9daadf37020f4dd6c0
+EBUILD IO-CaptureOutput-1.110.500.ebuild 698 BLAKE2B dc529e260c608f49d6bf02d5497a46fc38236ab0f843b7bb7a45f923c239dba592f67418bba2d0b4a0ba3ab0aa794b3af4ff5dda397297d6a2863818dcef10bc SHA512 e5e68ad7572be317879f5fa033074023935eec5cbfe65affde90aaee9571299979260586c5ac248561700605fbe1a1f0e55bb9928a9fb26b95ad2f73a25eaf68
 MISC metadata.xml 404 BLAKE2B 06521a15fa1b4e1fba429b7c3f1502de955edf51bf75d143125df13995871aa80b503836bf016dd48d12553a53561ea90fd58253cf203d8e94992dce02f15856 SHA512 8f47e8f2ce312ba5b5dd1a168515f2de2dd4c2a1c44713be9e1f85bd5ff265958c553f35812fd67dc9adebbe42e4254a5b71471a304c0da463303e78435f0677
diff --git a/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild b/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild
index 207cfffc8977..db1674fe5ab5 100644
--- a/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild
+++ b/dev-perl/IO-HTML/IO-HTML-1.4.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Open an HTML file with automatic charset detection"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IO-HTML/Manifest b/dev-perl/IO-HTML/Manifest
index d260122084c9..01e0f9e19ebd 100644
--- a/dev-perl/IO-HTML/Manifest
+++ b/dev-perl/IO-HTML/Manifest
@@ -1,5 +1,5 @@
 DIST IO-HTML-1.001.tar.gz 19375 BLAKE2B 252a9d0a0df72fb70e050c9742a13d7365cddee1a24c25dc86611a5eb0e473ee95681767f01e88002d8649018d570f1a97234360085bf9b6c902cc92044f4772 SHA512 fd3780c854e2e4003c80d2399987bbde2ebcc8f110915a74326660036d0860f79123f924c3200bcfa163363d74f53ca742bde973549e5a554e63648ed55dac52
 DIST IO-HTML-1.004.tar.gz 20927 BLAKE2B 633abc5d652bc5fddd8ff6d3b82e5048832bab084e3d8e5dfc3b99fc7221501b5147342bc4ead7b03b8c19a5ca2370deaae52fdafb1b860b7845f27873c629f7 SHA512 564fba7cfb50ef1cc78fa9e2b2200a20e305d098b8ceeb6f8478f0275cc48e4fb069386f5c318bc9deb43a5d590a78a995c04100bd440340f5c990eadc76a70f
 EBUILD IO-HTML-1.1.0.ebuild 799 BLAKE2B fa9fc92f7342ad96d91bee8a5e30e84bae28752f08465fcc8aa92c1a5ec77920148670b33043e3ecac4a81a0d31575a414ecfa16cd35714c6094f5d38936b3af SHA512 ce93f6a26e3dbd29291ec433a1b3a18fef078cabb6879172ea03dee22c5e8449fb4850c82a534e85a1ef4f88e9d4d6ad4d05d33f4aa93d5927af7202a1f55cc6
-EBUILD IO-HTML-1.4.0.ebuild 723 BLAKE2B fa7f0f7ea9e5485e49c505d877ac27152a3ebf901ee7aea3d6e09b2bb3836df595ffc0cfae4a3f8cf9173c0a4b247667bf5fb4d78c56f2bedaec5c83260249d5 SHA512 f410bfac0755e3a6793aaf71c2ec8fed78a0cfa802303efea2267b0c0e91ea3cf74e79bab9307ce23d817f774625103e7b89a805884d7e628ccff767adf27775
+EBUILD IO-HTML-1.4.0.ebuild 718 BLAKE2B dad842c5ada9799a80f5dd01ed04a02fb53e5277f7f359a6a5c74be32f8e8edbb243869ebc3e52d50558378fba315901e07e381c5636bc50e217cc1a2da4769f SHA512 375175e70d00edc8b9357ae1148ad2304cce23c48e7ba983db70bc33193e612b0392c1ad11e96cf0a288032179c49f974b3c5ac4d6cb71bcae88356cb89bc274
 MISC metadata.xml 374 BLAKE2B 003fd7368f4a8ffbc95499710a08eb429361cfe3a3b9031d5285e33a9750bfa2b0e4db20ad24218d0813e3eb89af842cddfe18104b0232b19d473931fb786c72 SHA512 2891190ce95106a568ced3f2d3a39d9ddf337abc296249c1955837165dbaffb2990238e90fb48ca5df39753334d717e1480c8fd1ef6a95ea64a1c259627ee8e9
diff --git a/dev-perl/IO-Handle-Util/IO-Handle-Util-0.20.0.ebuild b/dev-perl/IO-Handle-Util/IO-Handle-Util-0.20.0.ebuild
index f661aee3b32d..02da1b5b6f8c 100644
--- a/dev-perl/IO-Handle-Util/IO-Handle-Util-0.20.0.ebuild
+++ b/dev-perl/IO-Handle-Util/IO-Handle-Util-0.20.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Functions for working with IO::Handle like objects"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-perl/IO-String
diff --git a/dev-perl/IO-Handle-Util/Manifest b/dev-perl/IO-Handle-Util/Manifest
index 47ad1945302c..6811152905ad 100644
--- a/dev-perl/IO-Handle-Util/Manifest
+++ b/dev-perl/IO-Handle-Util/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Handle-Util-0.01.tar.gz 13723 BLAKE2B 67984300349e5adc98679419f2d6a884eff2d361c4439944695ff34370ccccfb1df48cc56af9196f256d35fc5df4bee11f434d2dbaef4127ebeab0c3b6062933 SHA512 45e139d2d287e27bb64b262172a02d2df2f5ca159a9233a51a830a57a21f3a14b802c579aa311dbee878f19eedbeb0049c7881081349356c59e1a31fbed351a9
 DIST IO-Handle-Util-0.02.tar.gz 37457 BLAKE2B 39445bc52f6d4f53365dc5de3af6bb6db63bd9b9691d4f5bb474d56969ee04a273ee23faa817b147fe8f0ffdc15ba7099d2938f67635f94905f47a6661de1475 SHA512 54b8c78f61915953ec8c484f50d0d64c965626ff45bda5ebed9f5e414a0a1011ba4d6aa2aa543991654718c06bb69860de80861dde472da295bde60ac7563b2b
 EBUILD IO-Handle-Util-0.10.0.ebuild 563 BLAKE2B fb4fb6c3fc5abc637438501ce89f36a38c63fdbe11f0871170acff45564ed98697a9c43b28028501bde764491ba3be8435dff59819c285481f6c192059a56127 SHA512 41d71052bf4dca11ab586caf8fad6c25c1644374a6daae162fbeb50e9e88e4bfaf8f467d36d69a0cea4ffef89f92d4d1e760dc01c9ca2801c0527c1ea806269f
-EBUILD IO-Handle-Util-0.20.0.ebuild 554 BLAKE2B 5d5d11e9b3fba2b1af20b3b4d29dee3b6d18bb9bead54fd4bfd044970a9589303028b144f7df5e9180d9083ff1f7b6a3a36a0c68e0f92ccf740002fbf8748885 SHA512 770db9aadaca9814be4694c08324bd45e68bcde786122d3ab511a21b746bc4314460ef934a4b848ee26357d4c516449cb4b6667eb77e6acff62b5ec44bc88aff
+EBUILD IO-Handle-Util-0.20.0.ebuild 553 BLAKE2B b8b1ea9c96825a8c2ec8479f493773260ec19452dab52b751fca956bc28925b39620855cf97899845aa6bcaec8ed1887d8b9121f8d874022baf45f3853996b21 SHA512 32c5781a81c2e12930dca177de46e60a993c3b7d4ed6fed84e416dabb855ddd127a10478c3a4b38f669e7e2ebccf97f4f17f1c2347d94d1d251c5a9e2ec4cb73
 MISC metadata.xml 758 BLAKE2B de9e180ce14878132064742983fcede909c0df6a454f258de059b1b617ffede1ea2f11ad4fb4d6d94728ea008530e7f4fa4f66f67725d918a9d10cc60f8a6242 SHA512 a9e234f48cfe272bd4712624e378baf0dcbae7834ccfeb6c4d7cfda61ea733a8f50fd560c6da873d89a5b5938c8908a9d8e0a91dec5e2a3553438717a41b4eb6
diff --git a/dev-perl/IO-Interactive/IO-Interactive-1.23.0.ebuild b/dev-perl/IO-Interactive/IO-Interactive-1.23.0.ebuild
index 9bf981e7a378..2d7825fcb8af 100644
--- a/dev-perl/IO-Interactive/IO-Interactive-1.23.0.ebuild
+++ b/dev-perl/IO-Interactive/IO-Interactive-1.23.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Utilities for interactive I/O"
 
 SLOT="0"
-KEYWORDS="~amd64 ppc ~riscv ~x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 
 RDEPEND="
 	>=virtual/perl-version-0.780.0
diff --git a/dev-perl/IO-Interactive/Manifest b/dev-perl/IO-Interactive/Manifest
index c3b084e032ce..f79ff209b3c1 100644
--- a/dev-perl/IO-Interactive/Manifest
+++ b/dev-perl/IO-Interactive/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Interactive-1.022.tar.gz 11791 BLAKE2B c001a709531a48d4f4756712caab14ec8b9f2f21478f545fd4f858b3619fc625d75ff9bf744e4c3223a4b9ba39f2b97bb0e38b9eab8297d7d76e5aa0d88b7647 SHA512 159bd97912a848e20df3ac9f3f7b3063788c7bbe2eafd35c6cc9b798027c6e7c12d2488385936c87669877928707603729bc34b2d7b8c108534fa8fd42082074
 DIST IO-Interactive-1.023.tar.gz 12352 BLAKE2B ea0e460dab313c8d203f3e9409cbcdaecbfa23bb6bcf4145905fde5b0540fe326f7d2dbc2123217840c141446e77bc73ee6db871ac06d809f589e5736bbbb6aa SHA512 82899c09adaf3699d5640b78bfbd5201972cf4c47ae90f7c6d6da9fc1f4470abc1bc5898b904c501d567537dc19f781febd7f05d0c06e60f1c193cf33abfb47f
 EBUILD IO-Interactive-1.22.0.ebuild 556 BLAKE2B 12287b73f38528bb427b3649c8d3e03b71b512e7482c57ead80bd432bc57e5a83330d188f0466f8cdc49dd8fb2ab51fa706a5d1f8895662877c32429215ca50d SHA512 32272d0ca33dacd21063bd4689e26409a747f4e1ff643d2a7611d4faa7f4f73c13befe5f999868a8546332dca32c69e4eeff08fc6d1603816327f1d5d87685c4
-EBUILD IO-Interactive-1.23.0.ebuild 485 BLAKE2B c5eadbae611b57be01c794a1ecfc2609870574403edd4a08566d468e202198f596f5a1c56113bbc8c6a6c9969fa520b586166d5df3c5afefb56172227e54da3e SHA512 b864be97977269f8f9877bc10cd2d315e1597e3d921ee8d5805df7b0852dde1d0696a857e44931b2856b74d8ac9172d18dedb041d9586901207a448d3cdf46dd
+EBUILD IO-Interactive-1.23.0.ebuild 483 BLAKE2B e5fad90a532a4a324a3d4cf7ce3da4bc97772c95ae79aedaeba2ea1b076d118b1aad88cc0e2b0755d3c2d340126bc20370b122fa135e900f008ae327aead042c SHA512 b0f4fc4df4a7b5b915cc9854c0995398d6522c9a103e876608b7ac6d98551f697f2956c226604e1c39f20d4d9a1717940ddef258df9daa2ad0aae543ee153bc8
 MISC metadata.xml 388 BLAKE2B dc1672a835764e0e69828043196dfa51abde9432114a289c88e38985b112a03e36fe86b6076b8c21ce5799138035326870c166b9eafd382131c422d1014dd4df SHA512 c3bb9b7804e6dd2c6e958f8e0744959a28cdc632068b7e1d9e039602fc0f98a4397457500c3d90abd4522b482b66d758f6e569640d41235a9b16f43fd73c8dfb
diff --git a/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild b/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild
index a36292c36502..155e8c5d1a32 100644
--- a/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild
+++ b/dev-perl/IO-Pager/IO-Pager-2.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Select a pager, optionally pipe it output if destination is a TTY"
 
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/IO-Pager/Manifest b/dev-perl/IO-Pager/Manifest
index 74f43f1c111f..5a5f7a13ae66 100644
--- a/dev-perl/IO-Pager/Manifest
+++ b/dev-perl/IO-Pager/Manifest
@@ -2,5 +2,5 @@ AUX IO-Pager-0.390.0-no-dot-inc.patch 687 BLAKE2B 1de1e8b93eb02734a04fe533904b3d
 DIST IO-Pager-0.39.tgz 17552 BLAKE2B 8f3bf2b82523fd7d2ae5aa555eea8f709d91f50396397eaf04bc5f9476f753e2b68e8e5ce4c46064096218d2d1b7f91d45d21c112dde938879455f61f5618234 SHA512 165e6c5e93cdcd463eda0a0f0f713790959a788220e29bc77bb10ff59f8e1083d1dc01fc059f150f8cfb4de1d16eef04813430072ea33d9dc6f4acbd3287ce67
 DIST IO-Pager-2.10.tgz 43774 BLAKE2B 981fbed47a001dfbc483bb7db849039a5971b9b7be990486a1d03d7f4dee266363eb6cafb410539848e1debb2196cec1f5e30f85fe9eb584010f6e0c3bdb2537 SHA512 10fc6cc8a14e057918f1b21dd3e5983d49e2d0504bbe8057aa87be27a176983a3d552856106e8e35b834f279c82ec2e72944ccf87534cd4f9f8f138f9957ff2c
 EBUILD IO-Pager-0.390.0.ebuild 663 BLAKE2B 2a7e72772f4015b64c45ae30e47f2ae16a1d37a950e1ef1ecdeca5dac3a742b9e7173cada636ac0ed8cbad3df2bb23b409e0a60e6e3283ba4c3d72a35b226231 SHA512 5a9c96b7641b1c9addb8210c3a26cb4d329c78ed187543d969e50d9f43a3e3235be3ac670c5d0441aeb3740889a3aa106bb3522e376c6ea066e64a9907f07038
-EBUILD IO-Pager-2.100.0.ebuild 611 BLAKE2B 9b7435d633bb15928d090f7137bbe18bfde8edcc163db972fae4dae24d045b64c05b7a99673fa15824bd1193c6e19f6c3de79b88df9484fcf3ddaebba70a5867 SHA512 9e4f9eecb7be2dce37f86c5c607c93ee3190647e7053d3f81ceb65a365e2b29ea539c2615a86dd7065663c12ebaddf57e5af649303686b85a4b230d3fe5c8bf7
+EBUILD IO-Pager-2.100.0.ebuild 609 BLAKE2B 9be7ce40f8c6a1b71082167080bac0cbd96372da68761310a4f2df8993b94134cff5d85134dae5acefe62544c8f9bdb1c7685f382b0955c7e75b02c10b49c830 SHA512 c522febdb479de9ce5499517d0253da2e2cf4d4647c29568916894e77c1188b53a110c52f577cd480772a8414f3ad855196e456d4d9b5ca8be155d395e7e8232
 MISC metadata.xml 584 BLAKE2B 46d2c2594874a2def60db412452bb50f0c5a40b5910fba0f6d3686f3a7842b546becae91656bca06dbf49e7ef6c6cec1d879baa64f320d067ec4d7111ced3bae SHA512 06f4420648c0a977c373dc3a8582185153f6690d946b07acba08de0c159f806ccb9682ff94c7c35c9c52e71fbec7f72048737728d62fc729741de11d7f335358
diff --git a/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild b/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild
index a5067f357dbe..003108173925 100644
--- a/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild
+++ b/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild
@@ -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 @@ inherit perl-module
 DESCRIPTION="Session data support module for SOAP::Lite"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/IO-SessionData/Manifest b/dev-perl/IO-SessionData/Manifest
index df2c04965d56..6df10ed08c67 100644
--- a/dev-perl/IO-SessionData/Manifest
+++ b/dev-perl/IO-SessionData/Manifest
@@ -1,3 +1,3 @@
 DIST IO-SessionData-1.03.tar.gz 5377 BLAKE2B ce17897159e8f0753abbbcf7d4bd19adfb20256f7c81257414db5b8edf1af0cc41636eaa7c8731aab69163210726ba5b2c9ce7c1fbfb64f7aab7a62cf9379cff SHA512 3fe6c9c275c64e4250933f6bc377172ed09d123b5aab3ac981b12b42c571be5638728bdd0d16438f973606da5b6a583aeaf6213008f249ccee7e275383eebd6e
-EBUILD IO-SessionData-1.30.0-r1.ebuild 378 BLAKE2B 1882a9114ac74935e08fac646b83e272820aef774a12f695a2f9062123e3a259821fad0d6b05151915d9f208624f0e7314142d2d135987f6b80c3d7a68c24232 SHA512 9396a2bcd03672baab2fc0a80255c74d531c6e027bb970fca43a582e49524feacf457784ae4fc967feefc1722ff123ad5f270ed92ef9fe744077eaf5d03467fe
+EBUILD IO-SessionData-1.30.0-r1.ebuild 377 BLAKE2B a2d099a869b9cc901783a45944973189ad179d69cab22ee0a51f1b10331d6790d72e4e793ade0a0eee042115f2c148a379a4675f6288310bdf0200b5a3f22b48 SHA512 c69ae53c3a2eaa92a3a1196c2359633affa7f12e46973982e0399b7796053b1fd77d0624c19c76a8d7309f1d92c7da895f72b4c7f5bfb7f45df3ab502d5c0308
 MISC metadata.xml 447 BLAKE2B e3f8378831dcf5f3ab636e85389f02584fec49c7c320e4dfce83c3d2455dcf395fd6fcc1c42e5bab251f5f667bcccbaaaf087b6800e8b2132fa1b52c090673ab SHA512 d27e71d4ad5e1d61afd764feb4f4c9e6cc77d71f11a8707036ae1d981d9af19c50c4e536b148f3f7a552c45b228812109b4013da7a649c7f64f6ad4779a4a1fb
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.71.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.71.0.ebuild
index 10e2bffd0e0b..45f44b4019c8 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.71.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.71.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="idn"
 
 RDEPEND="
diff --git a/dev-perl/IO-Socket-SSL/Manifest b/dev-perl/IO-Socket-SSL/Manifest
index a04020981e47..df1c6774337b 100644
--- a/dev-perl/IO-Socket-SSL/Manifest
+++ b/dev-perl/IO-Socket-SSL/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Socket-SSL-2.066.tar.gz 244730 BLAKE2B 1e197dc7ee4221c7a9bd5bdda54e29d2ea0321ae9a7929e5204917b3c0f3a7e90af5712a0684a6094041d475353777796ba5173fdd48e35abf739b2224fcb590 SHA512 2a15f6d65f276ad4eae33139ae7af4c891d4c9e5f6aa65f45e51bfa02c85e8367a275bd33c73ece1b47b9d18eadc59e65fe1c584f9ccd3c7655948710fb4a57a
 DIST IO-Socket-SSL-2.071.tar.gz 248367 BLAKE2B 4b951d1b0ac14aff4d5c2cd73fa6d6c9ab51a158660e0afa01c9484ce3c7c9cbf6a10f6f75783c38edc7534b0ae2f4696d5720087cf200a13df3adf658ee00fe SHA512 9170df785bbca7519364ec0eedd170661e8ef60028439dc8c836ce8a91d0517d647e43138af74e52a768b6e0374747abb5f41274d76cc38e1319edf82a2e9fdd
 EBUILD IO-Socket-SSL-2.66.0.ebuild 766 BLAKE2B 956f9d6bdfe1ea6c1ea1106a1f459810c5f5d7948292e50973b51c1593d5969f45842c2070fedc4db66178ec496b04e60e3b1d1bfbe7dd2906157577f32ec684 SHA512 d801d503edaf2568b5e539cbaa4c30f8ba994e870756c2caa720404d5033fbe62bcbe725f918cda5bc27344c966604bc63884843b76d54c009ac876a18b8a921
-EBUILD IO-Socket-SSL-2.71.0.ebuild 773 BLAKE2B 1739ed88030cc35ed6439a223e93d3fb3ed6afb863ae793bc9a6a59b9eaffd89fa76bc3e2c79839e60ceaa13801245c70cff467e369006b64af8c445e5f11372 SHA512 add590cb2c4c82137753daf94e741d0888948a7ee8d51e4c3246508d2cf78647da47652a44c6cdcb28e9f39e1ec0e0b44f0c070f30545cef87fcb5732cbaa3c7
+EBUILD IO-Socket-SSL-2.71.0.ebuild 768 BLAKE2B 05c17621d309dc9863494f4e861cf01beab82a892a2fcab00efa55bd3e02a471fe37d2a7ec278e3c700c3d2da4f695a37d5b4833fe510ed50925148b9df519ac SHA512 b52860c48922fc80a95d4d509000ac484f135a44bbcca3bdf244d1312e73b36d860a36f5bf161b788291d06a1d040f837ba71c6875f089ebbd224a1c0d07c209
 MISC metadata.xml 994 BLAKE2B 4a4916d4a8b216f0eb6c82056f70732295918bdc80a2c3715be97568ef8e7d1084a42666db47f4b2bad4045e175aa45674fd4ed2c4ef4c6d38873434a2bc4640 SHA512 c861d564131ef33b1949718f73b16df3b14a801465f544e831b969b52d5c03bd0b4906416e99a92331ef08641d283099d1ab0352c29f90b4b835d46819c20c26
diff --git a/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild b/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild
index 3da7bd756a6d..f4e89a81e4d0 100644
--- a/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild
+++ b/dev-perl/IO-Stty/IO-Stty-0.40.0.ebuild
@@ -9,6 +9,6 @@ inherit perl-module
 
 DESCRIPTION="Change and print terminal line settings"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PERL_RM_FILES=( t/98-pod-coverage.t t/99-pod.t )
diff --git a/dev-perl/IO-Stty/Manifest b/dev-perl/IO-Stty/Manifest
index f8618a79dbec..f9d2832aa957 100644
--- a/dev-perl/IO-Stty/Manifest
+++ b/dev-perl/IO-Stty/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Stty-0.03.tar.gz 10251 BLAKE2B ab36a3a523dbb0d71358a89e774364ccd63c06e88b2b0d1ed6f87f9b2ddd37860230e47d2be0fb823cfef1efe2e268798d8ff0013c8f605b47647e38252538c2 SHA512 0670005929f604c8c2103d3f5e5e03e17413f8ff8a2e93911d5a064f64f268f59eb8855126c86a69649f8a350b70ecd812e60b01584c5d042bd64174d9710e4f
 DIST IO-Stty-0.04.tar.gz 9686 BLAKE2B 0e2234f4a9878a0485ef195adf8e45079c4988253caa03d9056979dc692884e8fabcc01ce4827abcb9d79afa263cdf4d6bfd5d6bca39235b14ce56f029fe6a42 SHA512 1a75adef5376612c87bb7c76eed96f6d67bd70eaae51dedf65e25a31b0d1d592a89dbf58fc669e956460a4d3889c3d5273c78bd1c7d926113b42e5f97064d38f
 EBUILD IO-Stty-0.30.0.ebuild 588 BLAKE2B edacfdf7eef75b4f39be8a6cfdcff02530bdad2ad4b0b3f5f575af73544266f3565ef36b660a2f9531db40fae3d7d3ee65a2e05796ecf67c19f491ef3f6d4ac4 SHA512 d731c6413028bb7c86b03e3a4bcb2ddb5f18378fd9dad3cc2938967093809d55ddefd5077a565f82b6097ff7e803bfd80aea7dbf39aac9bec4ea38049bfe1cd5
-EBUILD IO-Stty-0.40.0.ebuild 396 BLAKE2B 1d851c0dd3dbc70bdae758c3510b502a25aec2206fbcc1e6f0070feb2e83a6f06188bb4c49e15131b2a261a1eac39b390c3d69f1543f37a4e9d504b4ef67634b SHA512 345a5895ec2afcfdf512ec38e618011da016816d95c77c1fa157ededfa982feea23d00914ef13b0d526405e2046f06b3b86c789f55171d9454d111ff18e08886
+EBUILD IO-Stty-0.40.0.ebuild 391 BLAKE2B ea2945f976789b22da39789735062f6bcf8351e318855152b5a9c73067f702d6187ef2ad25a96668a9016ba1b1fea6ced68f511ef45baa48651fcd6a2b0796ce SHA512 724588a72b49b89539194d4470f804700ef270137652c0b489d0e27c60f145fb1d9241fbdeb190ab434dea39f827a9f40f98c58a2f7fe23ae04e99c167c627b8
 MISC metadata.xml 374 BLAKE2B 7586f7c94183d9f455073dfbe8d052215d2c5a7f89eb2c9903bb34018150995ea5df1c1b8640d6061b57c3c04ffee08b56bf5576ea73f0a3445dc0116ddb2b8e SHA512 5d7b2802654078a1cccb1f402b88d0e1d6f79bef01c54b076f707f4a18657d7ccbee54420f39c60cdd298decd096dc459c81c548abaab0c45dd79b1f6fe726e1
diff --git a/dev-perl/IO-Tee/IO-Tee-0.660.0.ebuild b/dev-perl/IO-Tee/IO-Tee-0.660.0.ebuild
index ea63886c8d7b..9aab002108af 100644
--- a/dev-perl/IO-Tee/IO-Tee-0.660.0.ebuild
+++ b/dev-perl/IO-Tee/IO-Tee-0.660.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Multiplex output to multiple output handles"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ppc sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IO-Tee/Manifest b/dev-perl/IO-Tee/Manifest
index 3f4ceb1270f6..6758825652f8 100644
--- a/dev-perl/IO-Tee/Manifest
+++ b/dev-perl/IO-Tee/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Tee-0.65.tar.gz 12842 BLAKE2B 28f48d16281ec761baa06f7db01dce6d36418d1b33ad86cde6f16d5fc8c3f02422a93276157cf976a49b2ad296f11e589bb32fce0bf0dadb098fa68833725c95 SHA512 f0f2f069c9c43098fc8fb343ef3a701e8ea5d6171a7f86b3c296f542435b1305f263085ede07431cfe34ccf02d845c8f3719ddf1eb6fe0d8def0c730f8e97236
 DIST IO-Tee-0.66.tar.gz 12883 BLAKE2B 9b93a5d9266b545d159e7d7de3101f932eb9772a9144e65c081d126bc528822cdc7bde9b26edd749491e725b62a49b00ae71d999be40334c41fd6de7d4f2dd13 SHA512 0f651b043e8a503e5b5933fabbdc00df139bb16b5f4e3f8e135123c53ede78abd2d3df9e824c85e1443f883fc1026fb6ff97a8c511d46076630b890253567c75
 EBUILD IO-Tee-0.650.0.ebuild 400 BLAKE2B 721e852d6fa85422149fe5a842d09ce01a01b5956420976c4ebe64f263369cc61f3ff3d836ca46994c15fad494c27812ac054a1e55cac5e4511fcf7d2cafe4e4 SHA512 515f3fde1b2e19c2dd29c050a30f0ba118a6127dc96ff5588799857ebeef34623d5744a3592c0f5f9eba8e7f2ce3895861d111a845bfba2b404582291c93549b
-EBUILD IO-Tee-0.660.0.ebuild 392 BLAKE2B a2be415b003e41a192546872374935ad7d96772ee070a3cc5a1bcd3835e442d212eab6588c2c0e5e6bacdda05892b557f8aea49cd16b8e22cd54f2ecdb71f4f1 SHA512 b659351053efeca40dc55138efe4f2b495ae8d0d521f96b549b6245b2f71c17569f30c195881d5e59c29f3ea0f75d3dc085f908b3bfd85b0102160faf88ea682
+EBUILD IO-Tee-0.660.0.ebuild 390 BLAKE2B b098b71cca377503b44ae1c1db778dddeeac6f1bdeb42bcafc2a22fe754417ac2fc5e422bd6d1cef2de2e4d855ce35142cd40b1415024d3efc04112907ac6328 SHA512 da7b292d7c927c578a197b2aa6e077af9d863c88b15e92d9b613f54fa926bc9e5d5487ecf30a56ecdde69c4d475e9a93665acead9321d3352c4fa0025928cce4
 MISC metadata.xml 384 BLAKE2B 56d5b9e91b0681950c6b40e434e759c86da2ac642f8f12a4ef50de722b2466e493cf7c5112292eda2e38181886599b40bc53c3e465f624fbec366b14e63a7be4 SHA512 8310984e63b763d5e9481ece74c77f84b1a8d9be8540a42820b6d78c2096d410cc88616d042b8e4679a9a9414d4d494d0deb792012b7f98ddb6291f39196f71a
diff --git a/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild b/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild
index 732fecd4f14a..51fbc9b1ccdf 100644
--- a/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild
+++ b/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="IO::Tty and IO::Pty modules for Perl"
 
 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"
diff --git a/dev-perl/IO-Tty/Manifest b/dev-perl/IO-Tty/Manifest
index f198d8995569..54cab35c9c65 100644
--- a/dev-perl/IO-Tty/Manifest
+++ b/dev-perl/IO-Tty/Manifest
@@ -1,5 +1,5 @@
 DIST IO-Tty-1.12.tar.gz 24564 BLAKE2B da0b252d938b115e8cb7e46866829fcf76a56754c5c3cde8f64dcddda4c9bde9cb77a1b1a022dc8ff94f785d1e1020f76be3ff805c50f276902128d397039244 SHA512 23733e7832a0de370952420df8a781f85d28ff60eb4cd55be22147337bf5587f4e1ec7fcfc190ae3ad1fd9df0f9697f2d647e00739f4a2927b1ac9c81435454d
 DIST IO-Tty-1.16.tar.gz 26765 BLAKE2B 94de85df09ac717e36b2c9e469e6cbd707cc7c9c92eb1be729373856af944a2664fbc913441151e7b417ae6b5c1d62cbda4416e407e4849c1ac34181460efe11 SHA512 a6f28a8796992645c4b2ddab5b3a76f49e61a891442078ef8249088d077108ea63bb4c8000cf39d15d13801b82e1cfcbe6ea0e6542789ab28385d83e03f6a9de
 EBUILD IO-Tty-1.120.0.ebuild 444 BLAKE2B 8b73d78aeede52755740db81028ad3c222cdebd07c18711243c5b4761fc64e5ea166ed7651b343c4e06ff48e9f9e982bcc3766eb498e7185878e44c8d709caca SHA512 2f2dc60c412bdf9109fc57770a3da9dbbf4a2ec34242ccac46325e52a08619878c5d96461ee5ebd5c800e6e5e3ed6f37dfbcd07e7eda191cca2038666eda51b7
-EBUILD IO-Tty-1.160.0.ebuild 424 BLAKE2B 6b9e077532f4e02908fbc24013ac61e567f51ebfde5ff2b563e1ab43fb1003e50dfb6ef63487435d9fe5da58c45fc1adf6c2d2fa1da3f52930895e294ea6b8f6 SHA512 31b7303e28043e5f1e9bd7115c41089811c59a10e169150cb9c9f17ef5b0f78e35161d88e9c3c40a3942e0a8aec27897ded6da1fef0d6114ef651293355c2a39
+EBUILD IO-Tty-1.160.0.ebuild 419 BLAKE2B c6c5cdc4bba304df0b5d293eaaeb57b6948e6d863c94ce73f7f8058bde2a21297391390dc735a4e8fca5e97249d0a99f0a0c5f562b303ed82c6ae657ffa8218e SHA512 f914e4f9d2e1b220d478127793efff10e44b33cbb5beadf7a12f0f4e6f32a9064e5482ba3c30e963f702868209f738e606253efd2aa6287df4a7fabeff522c39
 MISC metadata.xml 438 BLAKE2B 6008db4a5c8b043e0212175dc9401efa1e5e78c24181076645fc322d653f4deb0fa37439fb23cb0b84eddecabf4b1b1db72115d0431ab114a2dbf673741dc0c7 SHA512 6c1792c3eedaa6d8c766d0a2f030b04cf9a19c9dbc80209f57a206bffdeecaaec0d98bf96762107e0918b2129f1d1974694a5ed61869f91c199a87fa68fdcbeb
diff --git a/dev-perl/IPC-Run/IPC-Run-20200505.0.0.ebuild b/dev-perl/IPC-Run/IPC-Run-20200505.0.0.ebuild
index 5435a0b1ccb7..07fa27775d84 100644
--- a/dev-perl/IPC-Run/IPC-Run-20200505.0.0.ebuild
+++ b/dev-perl/IPC-Run/IPC-Run-20200505.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="system() and background procs w/ piping, redirs, ptys"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-perl/IO-Tty-1.80.0
diff --git a/dev-perl/IPC-Run/Manifest b/dev-perl/IPC-Run/Manifest
index 4da62a8ae468..3320c12d140f 100644
--- a/dev-perl/IPC-Run/Manifest
+++ b/dev-perl/IPC-Run/Manifest
@@ -1,5 +1,5 @@
 DIST IPC-Run-0.96.tar.gz 121644 BLAKE2B 83181fc4da8eb2199ac1978e2f593fb4579d2f4b6acff41f36ad2af866e07816c3ddbce8f1fb4e54a905fa00c3398df4ffa25eb10c49f677da23a4e0dc922fc8 SHA512 8a531a2126c15653ab0230813985cc7c83f2c3467c987757fc1f04c3c9952ee0246bcf743dcc4381351c72989f7271ede16962cca24e030404e414ff000c57a8
 DIST IPC-Run-20200505.0.tar.gz 127505 BLAKE2B ed2ab7be9f77a18e6dab7df78e641c77e30d4db27f1129199de14e6a75a412b6154f1a0d2c63edaaf2b5d1316b28d8e66836faaa9823dfe289992b915d421c3a SHA512 6f2e0cdbd66741a5185aa6f79c5d23189f6527e319ead385a033e482abed439a7e7fb1bbb7fa83c91c7b2971b31313a99b2b6510cc6aad3516ae6524a196d57c
 EBUILD IPC-Run-0.960.0.ebuild 722 BLAKE2B c0e476a4401f4561a0ac9c805ae2336b02ba8fa428494658fa4f51ac6adcc1d4cc6a149601ba987ab4cc7b44a486a0c3d0865ba4974f1f14c7519a4296ca76e4 SHA512 72104981c85477069a2baa989104f5a5e076b921415005bf7d53db1b39e78908da9d5c02a3f8705f993fa4fdc676551fd3dd73790958aec734b96ddf5b75a626
-EBUILD IPC-Run-20200505.0.0.ebuild 590 BLAKE2B cd9c33ee944195b4ad9864dd3848a8712bd376cf86c946225eaa53ac27063e6893501a56cf34d170f9c04eedde46f33660e7381e91f630860b8483a1997e286b SHA512 aa5a85becd811b34fc5b40d555ba64e6cce9d1d3862c3d66519b80f578991f1d3d2d017f4d7e3d777d3f953ee9cb2d5aeebb776a18b3c5ebb33d9d22db837ec1
+EBUILD IPC-Run-20200505.0.0.ebuild 587 BLAKE2B b1a281ff94308392e30105944eedfdef31063339dcda38546bfaeeb9ce89500ad7617973d5dcf734f86a84744c9b8e98e757b2823634f4a62758723ffdee86f7 SHA512 f8d6eee5db59e69eed74b5d88995edfb4dcf6a8890c0dbdab77484b98ea22bd04b754df8db863f981f27017f629c8c95b450a6717ad587faf147c6263a955ff4
 MISC metadata.xml 767 BLAKE2B a74f1549a2078c12cccbf9953b34bb77e4dddd5faa234524b7981e00a37feb0d798b3c531dc1dc8d7765b9ebed0eda80c501d1bc4a384681a9c60587002f1e60 SHA512 a07f01e225a9fc724be559d9a268e91c25bab1108f6a960c29fb7ff80d4cab9bb865d3fc646abed08895a1e797a64e8bf5f44da6de62ab59a76fda4d8852dc1a
diff --git a/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild b/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
index 4aa3b8154b01..b09dfd791650 100644
--- a/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
+++ b/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Run commands simply, with detailed diagnostics"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/IPC-System-Simple/Manifest b/dev-perl/IPC-System-Simple/Manifest
index 60c822f4a0d5..b7d59dd70c2d 100644
--- a/dev-perl/IPC-System-Simple/Manifest
+++ b/dev-perl/IPC-System-Simple/Manifest
@@ -1,5 +1,5 @@
 DIST IPC-System-Simple-1.25.tar.gz 29744 BLAKE2B 9e80c0d72d4857b401bc99a24117c23608af5e2bc468dd9bcf5465e71c3011141393214e07667b7552a0079764f7e489e5e1d417d4b4933dc7a485f7c0db40a4 SHA512 fda275786605eb80acaa6062cc51c32aa0e84f150e7ca7afcfe874f088ce7b8f9a97669e91bec24fdb05426db8b0f05552aa8853e44b08996e625281d1892f72
 DIST IPC-System-Simple-1.30.tar.gz 31902 BLAKE2B 2c75046c773afae5b13099050028146aecf276921322d93ff630b28ac5ac660ddb6bae0317ebdab782a4c4056e3fcfc5af0c78c679b6d2b815a969a6cd02d51e SHA512 82937df80ae38a9c21e43e256a21cdac1482d4a069eae282043d676ece06251a7139b752cd2b379a0f69ea9209ddd075607da86c6cb9b25f19cf90d91c28d72f
 EBUILD IPC-System-Simple-1.250.0.ebuild 699 BLAKE2B f38d9c65a4c796f3167ee8b9a2d428d817de75eb1cd94326f685c3ee872dbbdc62e9825cea71d994dd1cc9e385c3fbcbd3a512670251bc0cb1c64f76126dfb4b SHA512 27c990333a73fe786f07acd0327bb67715b8500741f8bf1dc129eb132a60ef7a753d79ff189a478dfa6670271e81b7741c6e168c87569a793c9a5c6067619ea6
-EBUILD IPC-System-Simple-1.300.0.ebuild 584 BLAKE2B e8a8159e5c3891bc61c080ec9eb09e3bf4b12661fde62a47096de81db1fc07eec483d366f0b510ccce2bf9417e91cdfe06b869f34abc872ae2a31a07828c105c SHA512 739ca3c41bd49663c662457f2511e35e8e71351a86bdb52f80a1e4d14328f52d54651d469201f6d1287b09d5795fff0c9d7beb1fce9cc58506ba690f7d9639c8
+EBUILD IPC-System-Simple-1.300.0.ebuild 580 BLAKE2B 326c9ccc4e63cac6efba77ac8bf1fc7cf0928968a6bb4e72b68061a5a510008970cd022d4a226167719da7f84d7fa2383258494a7eb40f0fee46e76b96f23a75 SHA512 f8736d97729fcb8c3164a2e50f771f97b8aae0eef88026ab11e40ba7939916abf0dee614dffc8715120097bc571a38e5da0e1300bcfe800a2866aa066a7dcf5c
 MISC metadata.xml 395 BLAKE2B 85e5ac1bea2549603f246cb86958de6be604eb17684095bb6836f0d880d184566dbd5905ff4d10e64c5ad5c7af3f073e583066955a2c0d9aefc30be309012373 SHA512 b7dea887b8f7f9b9911e9deeaa787dd80cabd1840b08432caadbc88ac685b6f7851678b8d5472eff11f66dc2beecc455d54521d086f6fe1fd73dc51e245f054b
diff --git a/dev-perl/Image-Info/Image-Info-1.420.0.ebuild b/dev-perl/Image-Info/Image-Info-1.420.0.ebuild
index 3c070f841838..ee8298685787 100644
--- a/dev-perl/Image-Info/Image-Info-1.420.0.ebuild
+++ b/dev-perl/Image-Info/Image-Info-1.420.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="The Perl Image-Info Module"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Image-Info/Manifest b/dev-perl/Image-Info/Manifest
index 9104104d6d77..85bd5dd8c72c 100644
--- a/dev-perl/Image-Info/Manifest
+++ b/dev-perl/Image-Info/Manifest
@@ -1,5 +1,5 @@
 DIST Image-Info-1.41.tar.gz 265977 BLAKE2B 1b9390567c9d9f4f924dee8a2fd134fde7eee7a730bc8c30250b978287a90c99c97f6b86ad9f94568857d81185f4beb3a3023f0e9ce7215fe156f43781c7ef5b SHA512 7e3cb103efa004ce728b6e594f5b7518fa5be14a814e6f06d4a3e85563d7896fd283855cfe9e091c22b3728f6126501463f7326d704c0188ad696206f9318824
 DIST Image-Info-1.42.tar.gz 321727 BLAKE2B f0d79ea7c4087ab32332a8a6e252e1f358e0ef0d20d73e8fb501724fe51b91d2965dbfd7396ebd8a4c569653efdadb953d77434a73b07686fa82d7b4b5d19070 SHA512 7b17c3510328e062f93f1882c93a4ed24afb6f636d23e9ff1f478e452c9e1cc532c06b639991446442f200696afc63ddde1259afbe4362c3179b515046286133
 EBUILD Image-Info-1.410.0.ebuild 489 BLAKE2B 0791c5480bb2fe14f5c878ea15286ae342130a5b72c289111edf55ab786f5566fc88c88bbcedaff9cb8071d1ebe1da9b04d34c92a7344649ad87d77be0eb3242 SHA512 754ee5e30eaedb4a73fc56613c38267f842d9a17955f6e4bdefe5572d732a8771e979b948e9a4d4a05c8e82e2e3133004a8f9c363d53da82c98b168f3ec58774
-EBUILD Image-Info-1.420.0.ebuild 459 BLAKE2B 29349b9716f9cf74a21c796edf3b37daba4e1957efd8ce3ee1636a1145c5e63e9eb3486b20d3fc6a5c24822e168b134272e2e3859efbff86e0b7c9d3cc1ae399 SHA512 87f5ca86aefef88a7942314fb3b065505add57f5beb36155b7dd92aa5fe2ab69b6197e11f5a25a63c89eaaf49b859c8d6bd3767146c746fcde4439dbeedd56b4
+EBUILD Image-Info-1.420.0.ebuild 457 BLAKE2B 414257f62bb5fa6e2a114730bf165509ae8e1fcedac4e0468009e0461e81c495109e5c23deb462f30af81f81d9d7b64280d472d8ab9e4964a0b3f3f57c75b710 SHA512 820d2260ca81c0c1cdf3d027afbc9da513613b87c15be906f84aa0e03ac652ddbe5f8eefe861397ec5bec1477de56141e5633c7531586e9efdf658653fe0cf0a
 MISC metadata.xml 1796 BLAKE2B 990976d0129fcef7a09802c2a592d503b9790f58bf0d9fb692d27ff1e796a8d14f5b73239d1d319c77fba8086ac6cea07119a998e274e16c88ac6d886890066c SHA512 cf6efb0c6da4d922208d0519d387b3b8c18d5abfd5a6389606e036fcc5e6c4c0c7afbb57e52a8ea9cbffc844200af47506104decbf690417499bd576d6207d13
diff --git a/dev-perl/Image-Sane/Image-Sane-5.0.0.ebuild b/dev-perl/Image-Sane/Image-Sane-5.0.0.ebuild
index e8c66880875d..7be595a27448 100644
--- a/dev-perl/Image-Sane/Image-Sane-5.0.0.ebuild
+++ b/dev-perl/Image-Sane/Image-Sane-5.0.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Access SANE-compatible scanners from Perl"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Image-Sane/Manifest b/dev-perl/Image-Sane/Manifest
index 58a4ceea0d21..c3f8ccabafee 100644
--- a/dev-perl/Image-Sane/Manifest
+++ b/dev-perl/Image-Sane/Manifest
@@ -1,5 +1,5 @@
 DIST Image-Sane-0.14.tar.gz 47158 BLAKE2B a9dfd5f31f0ab66c3e4608e2126ddf019d9a3090dca45a8dc20d41393f3957d6c6e5eca025c0a1e58ab959ac3e22c491a0a0ed0c0295210138f84529383fcda6 SHA512 d08be5f0d18f367178b7d76d50abe12faaba48525374c782f6a91fdb44d314b1943617bab9f6e7b2bbbf4c95dcc221bfbd92cdf7c80783916aad24daf5b04bea
 DIST Image-Sane-5.tar.gz 47781 BLAKE2B 7d2457a89c061f7f160ddd8321feab4611548e10158fe77bd64406fd1d1bc534d67664be59ff73d872b264d9baa947847ea3ebe47057f700d3b05ec8e9ea36b6 SHA512 b2c9aec6d6ff598284df495c15cb33c9126364b2551d421580c0f2085a1b102bc5758f81f4f857bf6e098eab0a1945d39b8996d22ece23475296362b1f6a640b
 EBUILD Image-Sane-0.140.0.ebuild 606 BLAKE2B 6c15d313120686af0d4f1d7e01a40a0e35490b6ed5cad91e1681bdf079f95219657174aff50240e21ef486d9a5049c884354c9d7b5bff15e8f2336d748a23a91 SHA512 7e176448d57fa36f455c48a2598514d5f5600b7cfdb9e42ec1a944a06d02380824ea5ab60b845d5628454ac03a0fbb3cbc7789f92d532188157dd7a508e4d6d0
-EBUILD Image-Sane-5.0.0.ebuild 629 BLAKE2B ae2372088190b20a8adcf9b93b30832281de7763eaff0300beee62bd7147cefe2ae1b108c224f43f23b89e0791a52bddc4d00515f4581d89ad31b0cad983ffaf SHA512 21a6a2b21f8efa7fa6782fe6888aac288331e1b9a7525c9d48a79d0e85b1d5a6cdc159884ad5b08eddb9fedbcc0ece1f042d516b9494aa357c754987fa84b332
+EBUILD Image-Sane-5.0.0.ebuild 627 BLAKE2B ea4b02accfdbef28ed188236f0eaa36a45e67bcfdb25e706fd80da2cbe9e012c0f86c863cddf11ad8d33d0b58df47869ca3271ed6ae88b8873bc23de47d83cb0 SHA512 c0b1d045ba344fb5e0071cca84a08377b83a5b4ff90c9eaf000024d1ac220e217cd47c9c0346b546c3050a89693cad273521a172574297c4643046e1ed376246
 MISC metadata.xml 458 BLAKE2B 66fce5385e1966f9118e768e5b240f9c6d1a1747503d5d86acdb7142eaf02c036521bde706e5adec8f69d97c34b93f50ff30c18d6b5cd02a1a1767ca90cbdf21 SHA512 d2b1a91ef7ae499f5fd65a0a90cd0acbef04545bfc6ad46bc9c843db6ad788f317bf8e34995915143587fae8e5e7e900afbaca69060f7ba8cc90f75fb1fa7c50
diff --git a/dev-perl/Importer/Importer-0.26.0.ebuild b/dev-perl/Importer/Importer-0.26.0.ebuild
index 6aae0bbb4668..06fe6757e201 100644
--- a/dev-perl/Importer/Importer-0.26.0.ebuild
+++ b/dev-perl/Importer/Importer-0.26.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Alternative interface to modules that export symbols"
 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/Importer/Manifest b/dev-perl/Importer/Manifest
index 6959f907bd27..46239f6e4a67 100644
--- a/dev-perl/Importer/Manifest
+++ b/dev-perl/Importer/Manifest
@@ -1,5 +1,5 @@
 DIST Importer-0.024.tar.gz 41264 BLAKE2B 21a839e1e3a3d5757d17be05ea6275ad8b9e248debfccacee9551b47f27df81715961fb63be8a28a423041365717d65d9a9c75c6e090fbf7c69a84d50fef762f SHA512 f368f19a63fd52b88886b1ba6d51716050db8f475628238d16d2962ab7d6c21d6818205a82c86cc7f254736eb1c261dd6abd606dfcb16ca675e84898d03cab32
 DIST Importer-0.026.tar.gz 41607 BLAKE2B 9f125f2a18d5e791ef3cb891e0f59c8fce54ee0f8958f7a2a15cc4c46a0867adf26ac516697bf1f85dfdcec51e4903a9b62750415a299c42d6d3a439f6ab8302 SHA512 f6726b204ee358af00b5c72120bd2131ed575c100a9946b1772552e42b98f78dd38ffcc0119e2cdf721c39e2d83547bc5778adb61c5f84089caf11949c7ef045
 EBUILD Importer-0.24.0.ebuild 587 BLAKE2B 02de82a140bd7eef7bcfb5929fbca2d7b5d659c0fb43ef0d9fb938636841ea7edc64224ef60823e0b13cb2733916b99f237773e21b0bbcbfc5dc5150b52c936f SHA512 f081e17377523e98b8a64c90a2a2f76adfcef9ea6f4c23a64774c765e4ffcced684bf1713b00da5d0ab08febd10e23730b0f3c3ab29ef68e98d1c357d6741f65
-EBUILD Importer-0.26.0.ebuild 593 BLAKE2B 79f3e34238b23d31c6c3c23004646251096ee13d18057522045ecac139c8003773a0ee52c232c02f95381916a97f6ef9751865d02ba0d24b5355cc78c6b62938 SHA512 c005912bb3deed98889d8f5807077cdec3c235cfcc0f0a0080348dc46638c11a852d862019b0a2d5efe163a173d4258bdb2ad67d71748648f22290215ba31896
+EBUILD Importer-0.26.0.ebuild 588 BLAKE2B 1b084b39a4b03d238fc16c14f43ec52ba1e42772afffe98febd2162a736970b3564719103747e83bda470f7cb89d0fb62ef33d4ba2442884c081c6bb560af398 SHA512 7cbabe8e1f03b900b0efa708ea65e90c09843e99042bebbe61d65d6c29a27566ebb72ba0f431241e3c6526d3b457702afe18f33fc2fd8c894deeab16e40f4527
 MISC metadata.xml 387 BLAKE2B 097a448901783cc8e799dbb2d9ef53e40656d4f54774fc2bf5c740e394a6be4aae57331a17bac1848fa382c09360d4d416f9da4f5e5204012833e6014e8cdc5f SHA512 6716fc7a7311d4119c708230f4cec828655d122e37f6e70e29d60bf75c370564e72382f474acda87f29ad5660f93413653de31c38908cb19157ec35c5a0670af
diff --git a/dev-perl/Inline-Files/Inline-Files-0.710.0.ebuild b/dev-perl/Inline-Files/Inline-Files-0.710.0.ebuild
index a230a660e1c0..c81fe798a287 100644
--- a/dev-perl/Inline-Files/Inline-Files-0.710.0.ebuild
+++ b/dev-perl/Inline-Files/Inline-Files-0.710.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Multiple virtual files in a single file"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~x86"
+KEYWORDS="~alpha amd64 ppc x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND=""
diff --git a/dev-perl/Inline-Files/Manifest b/dev-perl/Inline-Files/Manifest
index bbd25bf95182..7a58b9b2d42a 100644
--- a/dev-perl/Inline-Files/Manifest
+++ b/dev-perl/Inline-Files/Manifest
@@ -1,5 +1,5 @@
 DIST Inline-Files-0.69.tar.gz 14804 BLAKE2B 2f2f49b8832ebb8f8e7ac9567c7fdddfe742297c96095061f6daf2098f35e0ad28fd23a8c84b6f1fed7d7cf9337aca2282e8d614e54145c361e2494e828539fd SHA512 87b3d837a6d30eb344e7c80f866297558d3f1f8275d1e9fac0b9a1adfbee83f8452f686dcd39ce7c48bda50f1442b194822ee194da84464d076d2ac629ff289e
 DIST Inline-Files-0.71.tar.gz 15333 BLAKE2B c2bac14a9bac83d3272818b17d92a45372de79983254b42be3ad1c0417b88f2a6ef24c156659362b3c4eccdfd500515290e4cfef5d8e8e7e65c65f0288d96eac SHA512 19497c6f8d56158fa3165edc791ea6e1203be988687ebc068b235e7e71b9a99f15663d4923ef69854b6954141b53fbb524a02f55b66577c29a2c65a23ea15519
 EBUILD Inline-Files-0.690.0.ebuild 427 BLAKE2B f50445f38db3942bf8cb6dd4a2ab0d725abb4c139652f659725c129e735f15e97b8bba00751582bf836f91f14a5ae4fc893604b24df2c30cf45a9a977d157e50 SHA512 230f63cb3bf8b442a1635eb8525b896aa6ac85d5b2e70f6f268cf4ad08d3cc7c61559ea05e3dee82cfa990f9da7399c5e389464fe0f191347bd4b3691d052a5b
-EBUILD Inline-Files-0.710.0.ebuild 390 BLAKE2B 9b08d897d4d4853f8109847d84adc109a1966d7394dc1d9a41eaf1e8ba815cc3bfd5b23bcbeff31549c1b63deb263a6dfe2b8082ba5cadaca97087eec3d19ecb SHA512 62b300477b395fa00e0c10937c622bf651ffac005364e1e2ffc7c54b24429f13b95c3c5bb65d0dc630daed2c61763ea79bf76d0ea0fb100fbcf162890aaa7af9
+EBUILD Inline-Files-0.710.0.ebuild 388 BLAKE2B df2b8ef756bf2e7bcf879bc4b17bf10998f909dbf8c2faec9612fe4bcf06019bbb8bf83c68be24654b2a78b87bc7b35e23befbfd5562cef39ca15bfb65f76df2 SHA512 11cbc2df32d323fc3cff6581b6d5f60da2aab0eaef74001e18161f4f1fb9568b5603b79778e7d2481c0f2e876dc2cc3a2d63097214ac8902943844b420c7d755
 MISC metadata.xml 531 BLAKE2B 7a3d54b631afc760fbf52fe5c8355dacda6eb53ab82b53a448ed357722bd46a9688ae349c92699be41e96abc66a41633f38b591648f6fe6dfcf2de653cd18720 SHA512 69417ac2e4d5ae19b3ac1c22af65a18b5875b6232ce3e492318f746a3787da3611b04f40bf6a1fc6364da59f8da95a9f9b2fa600c7cf768c6f1ce205227369c8
diff --git a/dev-perl/Inline/Inline-0.860.0.ebuild b/dev-perl/Inline/Inline-0.860.0.ebuild
index 4eed99a9b51a..a1c5974eed60 100644
--- a/dev-perl/Inline/Inline-0.860.0.ebuild
+++ b/dev-perl/Inline/Inline-0.860.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Write Perl subroutines in other languages"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Inline/Manifest b/dev-perl/Inline/Manifest
index 7971d3e91b72..325ca35c752a 100644
--- a/dev-perl/Inline/Manifest
+++ b/dev-perl/Inline/Manifest
@@ -1,5 +1,5 @@
 DIST Inline-0.80.tar.gz 78254 BLAKE2B a2a6ed75fa995a08cabec3f5cf687a59ff9746805cca6a2913edecce10a810992fa866e84684f14d89c32102f611ae5808de3ce992a9a9f4ca9626975e58fe74 SHA512 e64f7752f32fd07c7c7a975429e04730f2987c9588f99b95502d4e5c87d458736a606c03943a68660940c3987cd632ad2f75ec3862342956c1754b1aca86e0bb
 DIST Inline-0.86.tar.gz 87329 BLAKE2B 843a6c041a3c766b9cb9b9c70863ecf2631dca2cd6d1d461d4c0b8a37a30d1707480b57adf2da6a0440da880cde61f7c219982a2cd37226ab01ae0887368d29d SHA512 d7f5a15f66c686c89dbc0b6aa3e2496b939683befeb5033b242b4d5281cc1ed6bb5d7303f51059177e042d6fe8c903e4df535099b60eb16dbef431b50a179ac0
 EBUILD Inline-0.800.0.ebuild 601 BLAKE2B b0ec963658aadc7822f1282dcffa86c12564fb9d59c3875c5f51b469db9692b1b9e97096e692d7ab9ae4f9c56fdcaf8b1fe3df1e6236f4b481065a0056ea9500 SHA512 810074900cb83882320928f47be7813e40ecfcb474ef80a2e914be57f5cde59fffd92f1266a83d1ed54d06cb89323d8ff5c06effd63bbdae096c43c5d0b7d554
-EBUILD Inline-0.860.0.ebuild 590 BLAKE2B 93d6e174fffb0bde939da9e924b0cad9f1658a1e47dcb0970e4f71d22c490601c4d095f125416ba5f23dc14705288ffc6e773d09c428e8fa898b78f21a1a99d9 SHA512 ca621c0372649328d28e514b83a8c403f7bc358e054f128ff0803a272d4f35de19b1f8bcc373764f771ab019afcf12d65a57c447b4f77a6dbc84f2b4faebadcc
+EBUILD Inline-0.860.0.ebuild 589 BLAKE2B 0ac89c74387c6127d7d86ade32887a148438f097e2452384489740b766c2af810dc26f709a2117b8ec00687c0e5dd095d05aa3b9aaf0ebb2436867714df97908 SHA512 15a5773f1b3eba372a1db2c33880bbe3e1c40563fddc7e4c7199f130f899455bdb23e76d69b646f533816b328d179ba8e98346bce87263e329e900d3b9317fea
 MISC metadata.xml 881 BLAKE2B 3ecad519d35675a0b368c39b76471e0d112140286721f45a16da37158868189d5cbeb6bca3fd5c7ca329867538ce4f940ecfbf5881e06bc768e6c482b6831cae SHA512 51dfcb32e9b078bf6a526dd373a23787d7a8b197a46d69e0c6c5f8287743fcfb2664028dde34d315a076079e6b34901a8f4ad55cb6057c17f122da5d8689e7e5
diff --git a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.4.3.ebuild b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.4.3.ebuild
index adc76d9b49f2..c445968b82e3 100644
--- a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.4.3.ebuild
+++ b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.4.3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP"
 
 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="+xs"
 
 # needs Scalar-Util
diff --git a/dev-perl/JSON-MaybeXS/Manifest b/dev-perl/JSON-MaybeXS/Manifest
index 0c2b02900d44..7d7c990e230b 100644
--- a/dev-perl/JSON-MaybeXS/Manifest
+++ b/dev-perl/JSON-MaybeXS/Manifest
@@ -1,5 +1,5 @@
 DIST JSON-MaybeXS-1.003009.tar.gz 11699 BLAKE2B e1d961451908d3872d23006f68fcf94cf01c88e1cbcbbe005cee6deac30fbad26f8121a921d815fb15f135af7f4e15bf78f323ce3c20b0ea0849b7e16ac36eb1 SHA512 a8606ccaac749650004d70bd5d6219fb18f66c4c86f720bbec3daf21a15bacd17d308c2a394fb1c9f6584be4d7c519cbc8653bdf5c7c7fa4129b75261645d8e3
 DIST JSON-MaybeXS-1.004003.tar.gz 22593 BLAKE2B 3eb0631e119db7c3fc8945e52c8d2bc3af771a47672b57719ec4c3e391811022e1404f3258f414b47c74af06b89aceed55fbab4bfc049ed48571b023bc4d3c65 SHA512 4690be671ea59f82ab24cc5c72d0f4a98a21f40d33c0acac853a2b15eac38933f7af3e1212ee6b5479d5e639246ebb5726c25e837996722fcfef7029dd5ed6fe
 EBUILD JSON-MaybeXS-1.3.9.ebuild 892 BLAKE2B 66d764009419a7c04da77d28af63b032fc79f79da81f085c0b4b893e261e570866b91f80f4129d364a3a13d32055dca430de371da7cba4b0c8a5fb96c8fbadc1 SHA512 e9a93cb9ff26bf91412f6867d282321064cb69660569aa9fe42ee01ad68f0fad2d92085de67e407c3a29ea87e71566409064b923a2625af61a2d92787d5cf2a0
-EBUILD JSON-MaybeXS-1.4.3.ebuild 857 BLAKE2B 2b65c4e943016c92894c27f999c569345070ee386645ef9e4febc7fcb3250b152abe9b3a52bbaeb74361b6cd0a0c954e0fd3b84ef2aafb2fc6401d0c073f83b7 SHA512 6ad93502894a1dbdffe4ccb811890fc42711130d5006dcdb45339d8b43e29fd8d0b33cf8c1da0e34433d43efa24d2e03ef91afac8174cad18762d1dc31ad59f7
+EBUILD JSON-MaybeXS-1.4.3.ebuild 856 BLAKE2B 9fbf92135610653e1a789f8b0f499b39df959f8932d6234c0b33ae55346e362b7e2e80bf7ce131cdb13130cacdfe20036cfcc79c022d381608e35a3c536c3580 SHA512 86f91710be49829e69b702f4b3dbb6b11b78732218c575df0624583924fbeadc87d742841bd33fb9036bbe66e6fbaf5da8e40fc5b6b2a9c6b76f99c21b65145b
 MISC metadata.xml 498 BLAKE2B c3debaa67344aa149dba4497a9ed45a96484b63cc6e9a2d029ce87fa6c880f0bba050bbcdf43cd16bd55787a56fd3fd4bc2b35d239eaab54e737219ce1ba6213 SHA512 2db10423cb5558048db54f639e62d4ab05776edb1945089d48c979979fb1e369ae4f447c963d0ceefcbe5cca9ae525f6a0c6e59d29f7d536291b8300f2639fd8
diff --git a/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild b/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild
index 0d02a2220ce0..38350ecb3e21 100644
--- a/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild
+++ b/dev-perl/JSON-XS/JSON-XS-4.30.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="JSON::XS - JSON serialising/deserialising, done correctly and fast"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-perl/Types-Serialiser
diff --git a/dev-perl/JSON-XS/Manifest b/dev-perl/JSON-XS/Manifest
index 54bdd92cd560..c30d78b6d20c 100644
--- a/dev-perl/JSON-XS/Manifest
+++ b/dev-perl/JSON-XS/Manifest
@@ -1,5 +1,5 @@
 DIST JSON-XS-3.04.tar.gz 83424 BLAKE2B 031e3b9d4902b7d9ad704655914fc4ee880874aa3073ded7248e5a842287cdaea47fce8be9d6c2999d19bdd3b5026fa2c0fb963c3183d6ac006387a741e0cdd0 SHA512 69c2e199385b5b5e331d905b64805304de80e1a3b393acaf7dce21c45254b1f23f1a83b246dcd3a80c2cfdadaf8ce3634ee587c469629cb69106f0c2239c73db
 DIST JSON-XS-4.03.tar.gz 86749 BLAKE2B 3907dbdb136964612cb6c324cd7e457fc841cb68c7c6d5e5c386847cea6b0a07ab33bfaf0e3a0c8016929e1093c0ab6fdeda88bfa15c1677f6b417cf5647aab9 SHA512 7d2c20302b0f98bd69e692b61d272b58c13a79741f3e2e44ee0530e21dd239526477f8b02e4afbfe41ee83cb69ab1c5247bf0be355f3f09e9cfe31b2ea4a5155
 EBUILD JSON-XS-3.40.0.ebuild 768 BLAKE2B 204a592c780a16b508429cd073027a8ca68e146af5cae9b138911bbdf134ec723cdb3f35c403cae8dbea6bf11baf39a7874ff37ddd0e5308a3f9e58ae4551885 SHA512 e77f05d42cc99706fb3f207c8113d55f02244512d16e4b063d84591e85d8af41905fae32430cfc02d69c341b06436c277296e96465b03be16ed8f2ca3db9ecc7
-EBUILD JSON-XS-4.30.0.ebuild 736 BLAKE2B 99f2ff7d11470765d8d0743d07bca9d0f5f80bc2f9c6e5f077a12c4023b2ac983727dfb5e3b6504981c5dccd527da99c0275c6f6aea06341a1d4e80a1eeae07b SHA512 4fa1d5fe896a280eb53a6661da460f66f3af0cb7d52894bb5f9e31661b9e4f3325d10371c06053838d7a62f342c305f592dd06dd32eee29a794850e9a7a71347
+EBUILD JSON-XS-4.30.0.ebuild 731 BLAKE2B c6e7d50e34a86cfc12147d4fd737039ec3d92340d24947489e23f0df87b80f00b408cbc43eddfaaaa9e854afca4d07f75f84fab8c78c22a66e41685623c0fcd7 SHA512 1a3a1caa2b137ea2de2fee52aa3cc5b2d9a24688182e8f9871144fa5517a5a018571734f015f3a8db702100c5a2509e47c62a13f1ed334eec2e2c3b896e4da82
 MISC metadata.xml 386 BLAKE2B 954784aa8f5cb4d83e745dfbff8010f054d9bd01fbd020c60a186fd34b1410f94a75d9bd073f634e549a8ccaa754e35dd81d16cbcb229288b6f8eb2c58f58967 SHA512 929eec3831d4f9accf2ea3dda8eddf68f49c905d299f433ad01f854e7ee8a537854c84c22581545f3a0a4a2076322c2eeae485a9ed58789b23382055c752fa30
diff --git a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.140.0.ebuild b/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.140.0.ebuild
index ecb52f355427..b45222e3b257 100644
--- a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.140.0.ebuild
+++ b/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.140.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="XS based JavaScript minifier"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/JavaScript-Minifier-XS/Manifest b/dev-perl/JavaScript-Minifier-XS/Manifest
index 47c9a95875d5..57c3cbcd5b35 100644
--- a/dev-perl/JavaScript-Minifier-XS/Manifest
+++ b/dev-perl/JavaScript-Minifier-XS/Manifest
@@ -1,5 +1,5 @@
 DIST JavaScript-Minifier-XS-0.11.tar.gz 17517 BLAKE2B 9d6ad360311f50a256c8edff87ed01b405b3e5eb50b6ad81b998928f21563bf7f7a1b1e17f1aeece1132d8037b2fab1d7c21565e6de3b67050924ebc84f4a9dc SHA512 736294c898d7806eae509b0d0c14cfcbb783ac335fe6c08bed9c00a52643b3e6d0ade124735d7de8d2203bf404448889e0e84b3097e316d0ef444f1603cbbdef
 DIST JavaScript-Minifier-XS-0.14.tar.gz 25994 BLAKE2B ff4f98fea11ca744897b0b90a4d66e282636a0e19312169e0a87ec375dc18695f42a311909adb32b83e4f601509620e147bbed326f3f7dc20f3a18daec41c36c SHA512 9124ced15a6574b32bfb4357416e04076b688bacb9b88da9b787dfbe1209836a52f5f2ae8554c25f2af100078f089e0b1a5a281c0459c5b048e2c92c33100c66
 EBUILD JavaScript-Minifier-XS-0.110.0-r1.ebuild 344 BLAKE2B cc7ac5128d871c3a2eb0e5bbb1a40dad22158c7680ce179b8a3ee2423caf70f530385dbb6a9cc0b40dc02fed9b12f96f8fc3126713d549ab2ef4177e852ddcb8 SHA512 97721f342bd96639c4710354126051bc56c254859175f9bcf6f9e745451e0f6c9e31c79e3b66b069d3afb727470df82a4bf9add1150f21a3c22446b0ecba9d40
-EBUILD JavaScript-Minifier-XS-0.140.0.ebuild 386 BLAKE2B d42dc3d8740b82968eeae83b8b852345dcad2c4cc8a3d0b58552aa04a2cc50de29457c26d2c846ef977de1602d6503b3e00e37ac98974744ef9274173773949e SHA512 e9dd98c2be7ec7cac5c215e4c909d8de7eb51fe1f334bbc621103bf97167da1a8a9102285bd3fec799c2057e30fed9c4d61484fb9dc8ac3919a12b81a02f5365
+EBUILD JavaScript-Minifier-XS-0.140.0.ebuild 385 BLAKE2B b9decee19bbe6f881c3953ea1fc4c54c8f372ff06a45f4266f7b2a20064f04fff147cfdb3f08a0d609f9e0e6659ec16e825fca835175b6dcf1c963e6c16d61a0 SHA512 4738abb67ad670d117443713b184b34c981745f81f9b2c2b692fa34e5216775fa4cd8c121e90b72398be1922f5638998007b8afab8a881a72e8ba72db4ad32f8
 MISC metadata.xml 417 BLAKE2B ce1764a35339f2902476e519aecc1d9d1757bc52ed22b80cebff118e303927349856b6e691b06d66ff9c043caf681477318082e1f2542b51d4a44d805534432c SHA512 7e7f92f4cd515b0cff21a9fce92ac040e266729c79fcc066fbdd177eed03b96eb43fb9aec24e09ad8c35ecb0360d3ab4b3ad04191524015a992a931de335e1e7
diff --git a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild
index 64084e099944..b54a9cfafc98 100644
--- a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild
+++ b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.40.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Media types and mailcap processing"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
diff --git a/dev-perl/LWP-MediaTypes/Manifest b/dev-perl/LWP-MediaTypes/Manifest
index fd11a6e22a7c..f4d13347183a 100644
--- a/dev-perl/LWP-MediaTypes/Manifest
+++ b/dev-perl/LWP-MediaTypes/Manifest
@@ -1,5 +1,5 @@
 DIST LWP-MediaTypes-6.02.tar.gz 18722 BLAKE2B 08b4c97815867bc233b42f04b61faaae35e9bc63afcf934b17ba243cc12b7782c5ad7c06b0492f5da9bdce3d3f8436640203a3de8b29f34bb46f2f8a50c4b33e SHA512 b2ad33fb2c6dd7afaa9b8dd2ed6a15b2ecc35d13bcdf5297ce1632ea77406def0840a24c5213187707b665f28cc9bbea5774bfd1a4070d1f6192e904f707b94e
 DIST LWP-MediaTypes-6.04.tar.gz 40000 BLAKE2B db96012d5b2668fd669d5c4152675a07a2cc91de0fd99d4516fd754b738aa81df24f59e1100692fd893372fb6401a4ffa3fa008956b3eb6cc5b42a1fff81bddf SHA512 0610627ef3efdfde3c89bad273931c9cbde5c6da0bd782d59ce26dc4445cd538be9041d722f08206d96d69d5e3643b15150ef29b9e92e3968833f2ae1b6dc53f
 EBUILD LWP-MediaTypes-6.20.0-r1.ebuild 518 BLAKE2B ebb5f2cfa84edd29402c5f6a2a3733d3e5d697466cb650dbc77bee1e85cf62242e7921ea380479e4a861ad6e3c9baaedafe32cabd41e4f1ea4e9416c99c94a23 SHA512 9132b8c75cf8d40f00a0ba8e26bfda6ab1e977bde18bddb0aa9678a51b5e85a37a0903bcbe4497cfe5b8337b06da71feae08127adad95b64c1776dad26c5b9ee
-EBUILD LWP-MediaTypes-6.40.0.ebuild 608 BLAKE2B 633e57c47507990f02a3b60b3198b49a70c353fea4f0ff70da305a55befb021d5bc8aa48a105ad3a6390f470a85c9eb70a083083994f461dc477dbe33093603b SHA512 f3335da2accb334e11ac06955323f15d3e257b0eb982100ad3e17f2d844c47da9c177b39ab296236af921924aa423b6b6370bb468bdca59517965e36b98f2de2
+EBUILD LWP-MediaTypes-6.40.0.ebuild 603 BLAKE2B ec087491c41753d977acd2d5b33c8e17f4f9759d755fc8ba03302cdd02b7acf3a8049fd24cf6dfccd3c33e4ce93fceb0db2bfeea5a4c150329c3228f1cd9de35 SHA512 299e364f306fe71429c49aa44a12f2b262de05e7ac9cfae721dbe8824c46ff77462461f144496c48e203c1d798f05d616d410bc4d5f319ade36e95a350468e99
 MISC metadata.xml 388 BLAKE2B a4766a9481c20bc6fdd83be50ce9f01d19f376433e087668aaaea575871d659c9b83af9a74c547932a2f22df6600c264644cbe73156c255aa81faadfbf1ceba5 SHA512 08865a3de8a05014eaf33262b5ec57c170326f7b68f4682b7ab19f58e7f97f8065a5ac2025bcb2220de2301c83aa8442c6e9c2cc22574b4f20aae0a2d02ae866
diff --git a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
index 0f67dd626d84..ee28266aeaa6 100644
--- a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
+++ b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
@@ -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 @@ inherit perl-module
 DESCRIPTION="Does your process have access to the web"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/LWP-Online/Manifest b/dev-perl/LWP-Online/Manifest
index c716bf113710..cef91e51075a 100644
--- a/dev-perl/LWP-Online/Manifest
+++ b/dev-perl/LWP-Online/Manifest
@@ -1,4 +1,4 @@
 AUX 1.08-no-network.patch 1029 BLAKE2B dcd74d51a01bdd61d7ac6ca89f9198c57141168907d51179fe7d4dfb461b3aaa725a0493e25ed807095bab5c7e0cc97b2ec5d49fc6afb01d924dcff1fec57e2f SHA512 1bedc7075021fcf7e8be1fbe972ce26f39af5ac2b46ccad96697ae05ac87f6bb8303e78c4c2b67f096ec22f39265a95ff5d86a64b13f9d364ae608593f0bc0a1
 DIST LWP-Online-1.08.tar.gz 32250 BLAKE2B 4696ef7d50498b5373bd52568afac5876aa7afbe41ca6fed0029274bc0b52e05b005179fa520a63c2e43e9ba78df0dc1e99a2011f4ff13915f2cad829e706064 SHA512 2b255f60ee6521757ce3d49cc0720e3985ff17e3db7b7868ced6a9e1c5444dc067c80b7d34dbe7be9679c134f3de1dbe0e9421a1a20ff388c812aacd1d964497
-EBUILD LWP-Online-1.80.0-r2.ebuild 903 BLAKE2B 50b7de5291efaa92a5dbf0e1382bcf8a8a2b13e98556158e6c5f3eb1feead7006b00871856ede0cbd37509ea64d0fd0b50ea9e319a4c17576f8620d2f79a9bce SHA512 a2fd13d0c60ef4d1df2ff33c98dc88b66725c34bddfb5c22a1fc90e2a133a61710d65b2552f85e8be1fa86c183edbba5769f3ddd00bb20a5e54cd0908625864a
+EBUILD LWP-Online-1.80.0-r2.ebuild 902 BLAKE2B f8f210109833ddfeb2f176937064659ab8aab73df63671843a6a34f274dabf06ee17c9b1513e653aa00767b82b17fdc4a8ba21101cfa065f26b784f100370657 SHA512 18ca53c762ac0e230b79a515c15a71ab1c082e0e54499982a559a8f7cb10707a267752b74ee4e969ddc971e8e3eb66d35af116afea768a267566756370b25bd4
 MISC metadata.xml 392 BLAKE2B 997637dac2ae9b108e80ade1821c02668fa06d9429d4512791e45568c37118b122774054370427a10cf5f5418e670b1e658367456c28b1807ad1dcf4dd184e27 SHA512 6407def5de7428ee7f567a38086658af6e157b8e5d7875fc7ded06ff4d5959e5ec73f3a8c69805984d6633bdad1294bf29328b899b5dee149ddbe0d7bdbe2889
diff --git a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.100.0.ebuild b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.100.0.ebuild
index 0851bccb0ff2..e2fb78efd2d8 100644
--- a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.100.0.ebuild
+++ b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide https support for LWP::UserAgent"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 RDEPEND="
 	app-misc/ca-certificates
diff --git a/dev-perl/LWP-Protocol-https/Manifest b/dev-perl/LWP-Protocol-https/Manifest
index 768cdd1ea76e..ec1dac943bc1 100644
--- a/dev-perl/LWP-Protocol-https/Manifest
+++ b/dev-perl/LWP-Protocol-https/Manifest
@@ -2,6 +2,6 @@ AUX LWP-Protocol-https-6.70.0-CVE-2014-3230.patch 1136 BLAKE2B b6a82d284c8a4bcc6
 AUX LWP-Protocol-https-6.70.0-etcsslcerts.patch 1595 BLAKE2B 1a0d41704506f988405a776d96292e12be53487b3d2ab71259f82282ba95741e647925444d4c4090b242ebeeee49c7e2dc83f93d5aca6480bb4731970c410f98 SHA512 977ae51ffaa8d931e55b1aac278980f0a13fc06f0cbed99b81d983cd98068f5f8e65b388ed97befa6c850d92e9cae785ae3b4f84d5115cf730271bc04a40e18d
 DIST LWP-Protocol-https-6.07.tar.gz 9184 BLAKE2B 0104a51ac8b5cedeedc2f19bf6079a2f22f050db5f9e9030a015b473c63c8c01ea1716551a30e9602323dd420fdd50e304840722d214d38e1ae2a0347c91448a SHA512 4a07cd8a1c44e31781069a632a77f3af43747933420e831b4fd4a12faac7dc04f0c6b10ea773c3e14ecb66209a547b3587c0e3f481a55b9929db65f7b10343aa
 DIST LWP-Protocol-https-6.10.tar.gz 33691 BLAKE2B 9436d81e2049b09bc7d0323f89ae41d7a7e0df6f2a01451a5badcbd3c2bb842935c947c543636415e11fcb5972203bb362de448b6888423cb1130fa3f472c4c4 SHA512 4d3c89dab6fadcb574c176977ca6debba177ee3f817e87319d9cd81e0a0b09214e271c2e97edc456dad2f4a1ebf8c6266a4ae52c3a93144880a5b32db97e7a31
-EBUILD LWP-Protocol-https-6.100.0.ebuild 810 BLAKE2B 7f3d1f4581b08a89d252107b789a89ffe273dee1df60a944795b5e88ecc91e6e47fbfa1340948eab3c7a9445e169c600b0171f6bf9bb3884d7348195559d1298 SHA512 10d87af737608043f9565444495119be1a1b5866b33808546242a6d4018e65b302a8b9b13d298d9ac1a0b9d2275f64021378afd3ecfa3fd985b0a0864454c796
+EBUILD LWP-Protocol-https-6.100.0.ebuild 805 BLAKE2B 36729948f8a1ba518e7ae14e7b35e2bc9a2471fbaef0b48a8b657c7dcb6333c1b6efb6ba53686d48142216e212ad0a47db46bbb71394742223536686238df371 SHA512 f7a97a3369380b65d50e5c017fb5d4080d7bcf000d5519c037c86a5f3cfc8edf10402951f1580ee8026e53ad1bd456155897136bf439fc34158ba63ab55c1164
 EBUILD LWP-Protocol-https-6.70.0.ebuild 843 BLAKE2B 9efbbc250d99c065c3a6b7e45e7998e6ff7b1348c4d85b32fbd40c1317215ded1af065d0c37519f8868be7262d6322d064398000ecfdb054c01fadedfc6cd2a5 SHA512 74faadfb8cbfeb956014b4c6eb9d3a6f72b16640bf144e73cfd5431295bc5f90f68fb52cf048a1853bfbc94e8735c66c636c5a93eae5f359d4debb9fe8889986
 MISC metadata.xml 470 BLAKE2B 3ca8b3351b051c0c140dfd02e57b98551aa5e3015d008ecd4c609aae9067535e9eec71c5c94b7f8f33931a69d6ad5f4a357cf91d070fc7932c8ccd692fc4471e SHA512 53faefb3533b9b8534d5a41f25eb5c77e0d9a5e765ef0c90a18c6bb1bee62bc9ee88ad4e8eed4c85453ef4cfabb240d5ff1e60e6a6651af0476ce0fa1d269bb8
diff --git a/dev-perl/LWP-UserAgent-Cached/LWP-UserAgent-Cached-0.80.0.ebuild b/dev-perl/LWP-UserAgent-Cached/LWP-UserAgent-Cached-0.80.0.ebuild
index 1edca25ca303..a7b9fb2c7ead 100644
--- a/dev-perl/LWP-UserAgent-Cached/LWP-UserAgent-Cached-0.80.0.ebuild
+++ b/dev-perl/LWP-UserAgent-Cached/LWP-UserAgent-Cached-0.80.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="LWP::UserAgent with simple caching mechanism"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-perl/libwww-perl
diff --git a/dev-perl/LWP-UserAgent-Cached/Manifest b/dev-perl/LWP-UserAgent-Cached/Manifest
index f3cbdaeb11fc..3a14d5917aa4 100644
--- a/dev-perl/LWP-UserAgent-Cached/Manifest
+++ b/dev-perl/LWP-UserAgent-Cached/Manifest
@@ -1,5 +1,5 @@
 DIST LWP-UserAgent-Cached-0.06.tar.gz 8248 BLAKE2B 1cd40d9f41181b7c820a9f8e9db1201a1f3572494cf6eac12417381ca5912d30380c2b29996f92ce6a5838eed2c159e238eae16cf23d015cb3b79401c2f97963 SHA512 151d2e145f768fda950c718b0f00aca946797328968c67b689af2dbc48546b66040f108bd03aac52bb12bd7cea569f1332a787e0899ea4c0b91753de2aea996e
 DIST LWP-UserAgent-Cached-0.08.tar.gz 8527 BLAKE2B 7dd12cd28a1f4178bd3d0f0e1426641b1c29d2799610f6d8674b8e02e081dd398afa3531d471139ccf2cf0eee6d30f45af2950350c1d9fa5ec06b4d9ac274582 SHA512 5c1c18d3a54257aac6f266298d63c4cec9e6c6cbdfe6470cbf02676fc327a9c71238158b08036852c4971787fd8b7b67b85eaa4016687bc6c815a68037e15c47
 EBUILD LWP-UserAgent-Cached-0.60.0-r1.ebuild 510 BLAKE2B 962b7c4438e7d3126df5cfcb094e93ecf6f3c9cbfad44f11efe6c4d962f88655f33ef2d9d5eed8e033ad02fad15d916f1ef4d799c40e09c37736a449b456b980 SHA512 56ba507ddd32059123603d7239d4af78f62350635f5ab0902a3bb51a0ba43ecf9bbfc43b26eb2fa5525a200ae1bb9dc71facbe93feebc5092ae901cf9d7e3e50
-EBUILD LWP-UserAgent-Cached-0.80.0.ebuild 477 BLAKE2B 18500cd7a1099aea80a3c5f6f9faefb595a45b73ee5325dab3451137116b4cb46c91892b2a8d2a3cc70055241c91140a4046f21da3fa7d3faf621ded6f3da6ac SHA512 d97f9f7219469ad899f3e38da993b6a63bbdc687d649a5467f9d8fee271fbe7386ab5bd49102c57a0bb57f65ad86bd61c0d287334722cf4ec12e9365ba13aeff
+EBUILD LWP-UserAgent-Cached-0.80.0.ebuild 475 BLAKE2B d002b1fa2bec54b99baece408b0a0e666098240805bd7467fe38e1a11d41d0239f5066ad6b8befc154be38619772c345045af00018af0de41d05e0e585bbd79f SHA512 be446635e62c1012e3adab12ab1e624e2c4253c67a63015d3d5881d21c9f08293fbf0db295985cc50ba8744521b449397f559171d0798cff93ea72aa46b5c22f
 MISC metadata.xml 413 BLAKE2B be2ae6ee9c773b61b9bdaac1510234636a60c08a3225bea696f3e5d075cb81d51d76b2a0cb9abbc7cb330745a2cd40f26dcc39edd3ed3840a8a674cac10aab87 SHA512 7478bf4cc2f309b3c1c6b0256fca677e437e403a984606b93ec2343b4e1a736a2a652d55b83c3f5d54393e823db20247505fff288abc11a185185b8b96f6415e
diff --git a/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild
index 97d7494a2ce4..1d21ebc7f19c 100644
--- a/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild
+++ b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild
@@ -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 @@ inherit perl-module
 DESCRIPTION="A virtual browser that retries errors"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-perl/libwww-perl"
diff --git a/dev-perl/LWP-UserAgent-Determined/Manifest b/dev-perl/LWP-UserAgent-Determined/Manifest
index c7a816272a56..e04930aeab8e 100644
--- a/dev-perl/LWP-UserAgent-Determined/Manifest
+++ b/dev-perl/LWP-UserAgent-Determined/Manifest
@@ -1,3 +1,3 @@
 DIST LWP-UserAgent-Determined-1.07.tar.gz 6822 BLAKE2B cf4afe4b535c82c70fdd30224a826c84ff47d98541181d4e2c299ffb6463917487995f7a98a67548f507ce6058ab6de6949009f5f0952582f1e5a3a76ade5253 SHA512 bed056468366bf86f0711a23c5bdb502a614efa2fd80d632f8d43d33295309d0ee88e439933cb3eda99192ad7d7025d0a7f6f0a53a45e79e70512771bb58ae7d
-EBUILD LWP-UserAgent-Determined-1.70.0.ebuild 400 BLAKE2B f7b64a1a27b05ab11c1946b3b368c19f7c18805450dee84fef3909865618d3a24c8425135587862a6125cc89d2bb2cb687ab7fa9a7131123b390764d52735d73 SHA512 ba9799751643b7cb88084d050d2afbd95581b009c10497199affe729068d5d7488ba81b30eceb6df8398b2390ad2b6965dfae8390eb10b4b1efb39edbeda1e18
+EBUILD LWP-UserAgent-Determined-1.70.0.ebuild 399 BLAKE2B 762a881f459e8b2a1be4564473c902f052dbf68d6f20676eef53eed5346dbbf9e2975d5b27e4c7367621e8021a5f208bba7e19d6abdd0905a1396627dee9462b SHA512 592818d996822bdcc784a0c2dc395782b5c9c6d95d8df08fbe7eca9a0af7c38a627d6c95737f49edd5bdb9477739cecc6cc4497c05a5483b8d4336a0c1ea594a
 MISC metadata.xml 421 BLAKE2B 62866760fb2b27cf79866578e67a1a2501cecf6880160c288649309d11e851bead88593cc0efb6a4d51e42cb08b7f2bc7961d5ea3b7556b67cc60d090f940654 SHA512 72a34aa7761d74c086ea3e8b6f4321b529a6f7cb01053f60ab43b3b08a606fbd25baacd9737cb3e07907996f0c908ed3e157996fd41557ec0a3b15032bb449f2
diff --git a/dev-perl/LaTeX-Driver/LaTeX-Driver-1.2.0.ebuild b/dev-perl/LaTeX-Driver/LaTeX-Driver-1.2.0.ebuild
index b3ac8cc2ee66..126dc216f29e 100644
--- a/dev-perl/LaTeX-Driver/LaTeX-Driver-1.2.0.ebuild
+++ b/dev-perl/LaTeX-Driver/LaTeX-Driver-1.2.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Perl encapsulation of invoking the Latex programs"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-perl/Capture-Tiny
diff --git a/dev-perl/LaTeX-Driver/Manifest b/dev-perl/LaTeX-Driver/Manifest
index 74437ac6499d..6992352244fd 100644
--- a/dev-perl/LaTeX-Driver/Manifest
+++ b/dev-perl/LaTeX-Driver/Manifest
@@ -1,5 +1,5 @@
 DIST LaTeX-Driver-0.300.2.tar.gz 54084 BLAKE2B ea26e2fd065cbd79304116ca10ac5f1cfe77247aa615c2ca635cf5eaa9701276ee94e66be0efccf2bb560c6271cdfee55f56a0a00f7a77086bf5e641cba1c1ff SHA512 09f485071004d151c2d3ced576ac7b5423fd2d014a3950e0bc8bc2bb1e507b4aa6f041a7d54ad085632a0988d48d69ad726439adcabb8d8a81e10fb613e78271
 DIST LaTeX-Driver-1.2.0.tar.gz 55293 BLAKE2B b997150eca6c563e0901507b2f50cca91fe9c93e5facd0b680576d1b68be3055f318459f2b884fe87830be4ac4222e46d71060dcfae0131e02a6cc38f65ec1ad SHA512 013e64f74dc4d0b833c25c545281d7453a0dbdedc74c0e3af54fd1e4cdf6b4389c6c248d19e338cee3ca7af70344ec0ba1a3920c02bb11aed43d03135a1bdc42
 EBUILD LaTeX-Driver-0.300.2.ebuild 1147 BLAKE2B 755dead8f9d413def1b98c560ebd4a2a0dcc1195e007b6a6593324b0f54ff60b79f0b8d43187afaccc8f8d9f8b1be32d5335888597642865f854ac5596f1760d SHA512 2614de103bf2b2d89bee2a9db21dc0899436aafd4567069d4d92e9bf1d48652c2b2a1924f69b7f831a949b43083a3694908238be57ea81146be3bd3a37f2f520
-EBUILD LaTeX-Driver-1.2.0.ebuild 1140 BLAKE2B 2143eb296c5f8546d4a80b94e904b7ce5c6a2d812b7c43de1bb6f19a7017daf910e4e953148fa05f0ecd2f0b836dd30a28e436b195461e58e6a58d8ed5b54e81 SHA512 b62e377aec69d1e022f45af73ceaa0b8b99971d029bedd13e5f7cb68f08578d77db81febab55ec38c4f59bb1ab0e55c49f5029c2e9990f02eabd106cc0fffeb8
+EBUILD LaTeX-Driver-1.2.0.ebuild 1137 BLAKE2B bb9e3d4d47f337871a598c43e524d076e19dcad9ddf4c73e41f22ed313d2a8b161bc9a635c2f765570d1d2b356f6db0d5efcc70b8e3b7a8bdeb833b280eb75e0 SHA512 908f378c4265691ac3208fbc64edc670ba1744ba003d2c59da206c576173b50dd475a4d414f270f4c0b9ea8ac861625aee0346999a60ab3bebad569f353db2ea
 MISC metadata.xml 471 BLAKE2B 0e15a8c8c20685d48b85e2c474cd8f646be44850b144712b85f8cf1b36e5510b3980d3335e0a42d937af61556807f0ba739a096126e573382b540ef72cede42a SHA512 f65e222344ca0d16b7254b7d8dd180a12e898a7fa7e041e442f01273dfefc0b38678f690d8b0ae75948ae8443f0b9158150df473dd164f88faa50e210a4654b8
diff --git a/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild
index 1dd7b2a8dbc3..630e44ceb6a1 100644
--- a/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild
+++ b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Prevent leakage of lexical hints"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Lexical-SealRequireHints/Manifest b/dev-perl/Lexical-SealRequireHints/Manifest
index bae569595c40..2b076074426b 100644
--- a/dev-perl/Lexical-SealRequireHints/Manifest
+++ b/dev-perl/Lexical-SealRequireHints/Manifest
@@ -1,3 +1,3 @@
 DIST Lexical-SealRequireHints-0.011.tar.gz 20649 BLAKE2B b95d6c03c9f85de34b594a09b22713467746e52340ce752c0a4b2ab4268a7b3df057a1e769b38a6562b48eb566389fc162873960a73d28507051e72d28621f1d SHA512 b31d3527e3ea1d28ebcac58cfdb35893643c7c371dba96cf06509cc7b1ce61c38f6cc37f420c2ec93b0a57adfc3d3cd797af97fad9aeb6e1000ef1769e26c31e
-EBUILD Lexical-SealRequireHints-0.11.0.ebuild 776 BLAKE2B 7bedf1a28513f78dc7ac23ab0c17d0b597ffa2698a7b7f683ad884a4cec0ae66499af046403014d10894181d18f0d965e481ec4fa85e14a726b1a5e116c62970 SHA512 d7bb12e451a9d563048f42ccf5231616a3e8205f6bed99fc649dffeefc6dbcf12d6fd816f6e61aafa37882cf675d7089b4ce8e59b969efb4817d9c356f542c69
+EBUILD Lexical-SealRequireHints-0.11.0.ebuild 774 BLAKE2B 74511e8619cfde4e034522d3335ed37bc14c8b112bde95dd80e23f5632b755667d170e93b0c6fb6f4e5f4ef2df533c91f9f435806360bbe0f3c194a61ec80144 SHA512 a9861fbf6e0c1aa3c17f98c5d06173e0a4440434cf2a395d2a723d2890c91c5a0dd0e57850ef6c17ac0b482a8cd20013b123288a342c98b2e19db9e0912a6fb7
 MISC metadata.xml 420 BLAKE2B 64b6e4cf7a687278b3ff304184ef846a2822f46edb06f6489d29ccca791f858f635f3b94320f45acbf2dd29fe9f3c59e770c1c4544033e0f8cdb4008bfd26f43 SHA512 5ac0a4033b8d78fa425532735ce04caad6ab864b44d1d672120f2bf7ad3398f382662e36217265521718e99c4de9810e848cffb9b5579c6cedda2b90c73b3426
diff --git a/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild b/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
index cd1d68ec7841..e187378d5f4b 100644
--- a/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
+++ b/dev-perl/Lingua-EN-Inflect/Lingua-EN-Inflect-1.905.0.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="Perl module to pluralize English words"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-perl/Lingua-EN-Inflect/Manifest b/dev-perl/Lingua-EN-Inflect/Manifest
index d1f966d768a3..f6455cf98c76 100644
--- a/dev-perl/Lingua-EN-Inflect/Manifest
+++ b/dev-perl/Lingua-EN-Inflect/Manifest
@@ -1,5 +1,5 @@
 DIST Lingua-EN-Inflect-1.902.tar.gz 59582 BLAKE2B c5f3b4a21062ad29551bfcfa9979038bc7be4cdc95aecb51b07912e5b30b83cceb350480e7478940fccd07660a6ae1040cda4ad1cc498baada7a32ac812293db SHA512 8fb64f67312ca09fe763a266b196c47e98e5c5f1b4ff76a41bac0d422be3b0405c155f46bc04dd134adcdc3c38a93e2b0cf69fea3acde6d111dbafac0247c39e
 DIST Lingua-EN-Inflect-1.905.tar.gz 59715 BLAKE2B 752d45125630c5df71b94d92575f9dd9e14a22964f2b63ecb7682edb2e71197dc7a8d121dc386db7d1cf29ac12de8401d46d2c14cdfb6d18f3063f6c8148d97e SHA512 394671c4a645edd426d3f8d7b3980aac10345b68f9c7d2558f46ec3b7ffadad86138c5f27d3afd64e2c193c6d20a537f179ff01aa40a84cd1cee718e4afde42b
 EBUILD Lingua-EN-Inflect-1.902.0.ebuild 530 BLAKE2B 6bd094a238148ffac41bafde123e0125cd2b84cbe9ce30c055ddb74810c8d82bb2f60f425982ae4b1837928dcfb6a031d0463d901629024ac0ff1d4164788d68 SHA512 bc63c89cfddd6c2c06b5e44f135187a65d27940c6111545524a426d65aef72cc4e5c0c5da8589b78f5569bd9ae5e6011d8d1b5c36c90b6d18ad654667f5c8b73
-EBUILD Lingua-EN-Inflect-1.905.0.ebuild 412 BLAKE2B c5d34834444eac76f7f04c5a454da94ffb6043b55590ccfe0434075cc22c815a210048a66ec4fb9780107439baa59de0cde5f8f6fdc6207515be02b85708bc13 SHA512 684b6e80ed58e7bb2c3917e41375f6f232750cd70e3bcb97183f2b4763a6d4fc575ebd9d1759750c3778008b91ffc1b76970ce796228ab19a058aed3d62e2ba0
+EBUILD Lingua-EN-Inflect-1.905.0.ebuild 410 BLAKE2B cede2641ea49403cf2d219cff8647c0a1371a15dfc45c560c722d20a0243b58d164cc48a4e1e58355e211f18eecd6bb336c2998fc61fbe2310d48d45f67b8f94 SHA512 297be0297b73d0924491033ad9ab9159077c0c03165b51f88a595f2fc91e30aeba267c05200d0becea9e95aff6dc3dc8d63021202d326a218d80271328d89ddc
 MISC metadata.xml 407 BLAKE2B 549eea27c4ea4d3e07b7f36b7a84dc0404996e9db7ed87384aabe7ceedfc9c2a8a8aeb55468f653a99fa8b1fe498004a882a0ed1a8105d573d52cee6ae1b0eaf SHA512 eedf268959838427e300d82c1d39dec340c8ce73e0563ec75a21c1dc2df42595fcb2d615b0b5f256e1d1c83bad16e845a58fa88eb9a5f57a96e3bc028c78eda9
diff --git a/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild b/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild
index c73657ad9a44..0a0fd54f1897 100644
--- a/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild
+++ b/dev-perl/Lingua-EN-NameParse/Lingua-EN-NameParse-1.380.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Routines for manipulating a person's name"
 
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	>=dev-perl/Parse-RecDescent-1
diff --git a/dev-perl/Lingua-EN-NameParse/Manifest b/dev-perl/Lingua-EN-NameParse/Manifest
index 375d40a65050..ada83da3d0b9 100644
--- a/dev-perl/Lingua-EN-NameParse/Manifest
+++ b/dev-perl/Lingua-EN-NameParse/Manifest
@@ -1,5 +1,5 @@
 DIST Lingua-EN-NameParse-1.36.tar.gz 35648 BLAKE2B bc75b33b889977f1b14c4b68c79397607b8f6752b02d7f6e3e5d55a8e3a42a333d12b9f0ccfa078af35e5c59a88c780428621f8a57d2d78b4bb233b68376b775 SHA512 d82b6d5a7813dae5dafd36e5ae521792b3477757e918cac9ccff985afd0b3018a390c04cab39bf0d4b0cec9307941901d1aaa35febc650c25f85e8c77b03211e
 DIST Lingua-EN-NameParse-1.38.tar.gz 35857 BLAKE2B c1de7d612a4f5b4c34edebcc0ec46f22947ee9eb9e62a676e99a6ee267b8baa3a0f650394168b05a3b116534bd3cb17ab88e39f41bd269b0f0db64344d0874de SHA512 7c2ca5282f6a57d13e9592395290d8f84b77e51e3c96204a4eb0d533cd30383549bbb0e862b6a1aca97e36a17e2c51e599b2bbe2ed673f705505d871d07a5f55
 EBUILD Lingua-EN-NameParse-1.360.0.ebuild 555 BLAKE2B 1e47263814608c1735de8a2c5754087151c5db6d497c303b19a6ae5e686464613eaca517dee9820e2ee3ed0a08963d2d86f9168e3532936c96c9f4bde7df5f57 SHA512 29ac6feb8a3f5e5770b4d4020c33f4a22d06591d82c95935b76f32ecc01cd1ca81ad12c09dcd6883ddb5c5a161cab35690723ebf27240953cf4686a33f684a13
-EBUILD Lingua-EN-NameParse-1.380.0.ebuild 486 BLAKE2B 1858acede476ad8bd405f3cf3894d4a636a13c297a2c74cc317cca628ca128a10e3d6d33a9ec9fb3f7852acdc3440a9002cb267fd73a4a61666d65a0cc48ac0b SHA512 3f6eedc4342a1a1b43d120f761b31f31651ee4ead8e335c2ffbc2b0f05edb68fcfb926b451aaba7a2802f3420d229fb90747177f6aefd20332197de8133c53fc
+EBUILD Lingua-EN-NameParse-1.380.0.ebuild 484 BLAKE2B f867a1d148448c5df566f5baa8113e2e751490a7fbe96425a5c76813f1b8e0bd20ddd420b998004f823e07552409f0d913de90d93b2ebb724dd0bd5cc7d585f6 SHA512 a73c0b083ccecfcd91de4c1006fa0458950dc5d61f7ffb175ee60b5743092ade4a82d5d675584f5416549d15b48d1f23137d8355f6f91c327b7a432c8b5f8e1d
 MISC metadata.xml 488 BLAKE2B 04591281a0616122e6ce9bc337dc2852c3aa3e57699dfc07e3dc97172809fd9b9260b5e11fa0f6179a5205459f99d6f7b9d7f6a39fbcd5e4c08dd85f2d9af563 SHA512 fa69a5c9c46d7b26313868df18d6494765d845b1da4e2b07b47daeb5acad07069ab1902562dffe61fb055bb9c3a32ea41ec78e4320996c2049df982ca15f886d
diff --git a/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild b/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild
index 9ced8cfd0be4..ea46c9931b5f 100644
--- a/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild
+++ b/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert cardinal numbers(3) to ordinal numbers(3rd)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest b/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
index 56aa388a1d60..088cea483ac9 100644
--- a/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
+++ b/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
@@ -1,5 +1,5 @@
 DIST Lingua-EN-Numbers-Ordinate-1.04.tar.gz 12019 BLAKE2B 9f019c096c165cd1417ffd674b1ba92334cc50bda1b789c47909d437c0ae1b1efd2084d81de10ac9400a63f94d85a9465d14601b1c2ca4133b9f670f570adadb SHA512 f8f5cbfc9ae1d7b4e5e134c8fb089f6ec4ecfd90e0168ece874b007ae8b74936e5aecc38344c036c0845ab7a8c192d07c5a2cdad8f96176c71e89e2e4ae1211e
 DIST Lingua-EN-Numbers-Ordinate-1.05.tar.gz 12093 BLAKE2B 64a86f2f86b8f99b2e473c3780a2735f236c738ce4758c09be1f20f316a138abba7f797805bdd3bda0f03c147b7900506bc06ede061cfe1cf680a0ca84ddde30 SHA512 ff9d2b49e933c3975ce4598a2ac4719c52a2c3e07e3ff6bc82cdb43ec05a63e1c2931d49e23e526aee75cb1a3c368e7692459f6d6487f16dc3b6c36ee9a8337e
 EBUILD Lingua-EN-Numbers-Ordinate-1.40.0.ebuild 465 BLAKE2B b04582dc023ca993bb6ce704847670775ac2f9f84e7f17b10a1d3fb168fedc46e75f201bd7b82756d15130c9db1d46b9b357a45199767bad4aef9c1bb582a2f0 SHA512 6e319778a6b33ff5826811321ea07b0349c9dd320e0b31e7e299014ce26c338bd0c47ac0e64f8989d14cc492a4e892797cf1a3f75c5b205557f2fbbc72dbe3c3
-EBUILD Lingua-EN-Numbers-Ordinate-1.50.0.ebuild 429 BLAKE2B 6ec46f641a470e0703564e83dfecf58a4eeac6e53d8cec7f5bc9ef26c982c546859d4238679da584f25e85edc3dc13e8ebd969e1506fbf57e1f716275c696364 SHA512 5f65e20c6a600a1d3f7b49922ddec84f64bff87eb1c16587f52fd6b081857c68e6cc3b5a346b9568e266d000b4853dab050ba67a431f4e5d9733e8a3d6b1837b
+EBUILD Lingua-EN-Numbers-Ordinate-1.50.0.ebuild 427 BLAKE2B 30f8e6a41d6cea2c2f960bc594a73c874204375ed4be8f5ade2a0491fa4bc4e41d4feada98c18341207e07ae7f9185af4695e943af8db5f252ec89e85095e092 SHA512 d1a6593403754f6f02057374b2945420dd8a23c1930fd199aa7260fb1fad85bf5d098cd5db65669a010ae413819f7925c03416726903a764b8a9b9d6e1786111
 MISC metadata.xml 426 BLAKE2B 85a23876c0b7e66b7ff01b00dc0dc983e80a199d34dcfa39b3478d2bef1be4f55e2eb1c0700aa3d00cb367fdc1b161e2ecf8e6294e3811e0f308255715887fd3 SHA512 7cd45e34cf1844c2aebbe3677bd591691edff0770b466b8119a9772b5722ee7c9d6d1f4881dc998eccbf0079a972c61bb020bd715562e2a33f8c79a5542a3ac1
diff --git a/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r2.ebuild b/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r2.ebuild
index 17e4cdca0879..c35d631cd406 100644
--- a/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r2.ebuild
+++ b/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Pick a language based on user's preferences"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2+ )"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-perl/Log-TraceMessages"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Lingua-Preferred/Manifest b/dev-perl/Lingua-Preferred/Manifest
index e35c4f37b73e..3e8a2db6f2e5 100644
--- a/dev-perl/Lingua-Preferred/Manifest
+++ b/dev-perl/Lingua-Preferred/Manifest
@@ -1,3 +1,3 @@
 DIST Lingua-Preferred-0.2.4.tar.gz 6029 BLAKE2B d13dd3fb6dead2943ba15efcabb62fe7b1004b3dde7a5a7e0fe9ff1bed0e9d617b9f365bdc130278e255ba7ce2d774f8f64f7a14f8df6251cd0736728cfe7fcb SHA512 6946b2b8d5978c516688a63bd2126700f8ab0137d51959f0b8c2565c08f25d20dc3fe5f81c6473c3ef5d1faf94a6bd4510959f730cc104b61671bd9436de6353
-EBUILD Lingua-Preferred-0.2.4-r2.ebuild 374 BLAKE2B ed824b6dc7110f4e8c7cf1359b9463060f4704ea2439077c3f246d0c396b4eb2bc1abcf31a3563e4b8ebf4bdc7c9a9bd80c507debd0af13d7831e53221fc6b64 SHA512 a925bdd14c36927af3a1fa1485cae20ece1a97384f5feaa6cb716d59731e73644a696d565e681d74bce640414f0c82bbefac27d91d5aebada8df9b9c56d5ddeb
+EBUILD Lingua-Preferred-0.2.4-r2.ebuild 373 BLAKE2B 4f667f76b88eebcac7cf4097778bc5c1dadb7a6ecaf3bc3f16a13f019b6f8ea90f5c433bc2fd13911bf340cd5a413888fb7c85be3b903d92f4c6c1608b44c6a6 SHA512 9c538dcc96d4ac36454a40ccc8963ab6b1f7bee6c1221387c2008a4382f1f982c7ab558b6492c96947c925ddfb8ab63cedc38bd623ac40937664926f401aca6c
 MISC metadata.xml 404 BLAKE2B 3df8befcb846cfe9223048a3bb21f9ba412d11feff4a30b595aa435f561e1053ee2f23e6f1c3fd74451219db537c2a0b8a265f4674c1e39a4945eb7c60a3bd0b SHA512 a2743b3742db1d9a22697e4afbdb49efb04919aee18ca10110eb7bfb78c1e76e653c425d6876514696f8c57546e628048b952f49cc220dc29a8f6ff6423e5605
diff --git a/dev-perl/Lingua-Stem/Lingua-Stem-2.310.0.ebuild b/dev-perl/Lingua-Stem/Lingua-Stem-2.310.0.ebuild
index 86d2701616ea..1133578dad53 100644
--- a/dev-perl/Lingua-Stem/Lingua-Stem-2.310.0.ebuild
+++ b/dev-perl/Lingua-Stem/Lingua-Stem-2.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Stemming of words"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-perl/Snowball-Norwegian
diff --git a/dev-perl/Lingua-Stem/Manifest b/dev-perl/Lingua-Stem/Manifest
index 9752ecef0ae7..632bb0d0225c 100644
--- a/dev-perl/Lingua-Stem/Manifest
+++ b/dev-perl/Lingua-Stem/Manifest
@@ -1,5 +1,5 @@
 DIST Lingua-Stem-0.84.tar.gz 1358061 BLAKE2B f8eb238a227445ae0eef68a2a380218c81d14bbb6856ddf992744e30236e077499033ec301b5dcc6c4024877604c49b13aabf66b15c9991e40f0a173b265d3f0 SHA512 9806ef6bf9df8f71fa2c7500f5575560f7be733c8e859a34cfedf8eadb7333d549d76989313dc14b6760f79c0ca0e0f61fe69819ee04cedc5d3b58414ce06388
 DIST Lingua-Stem-2.31.tar.gz 1354267 BLAKE2B aae5265d6a43b85f6ab33bbaaff6a5962003a59ae62689912bb10aa0a3b1a040ea088e0d36859c9d298a7de75283205ef29f4ccf313e938e625cd33f8aa3a2ca SHA512 34edbe25e1d48019114b91e2a7f723d73d08431fa0f2f3de51e11d17cfd57bb1da2e557188fd2ef8c88eb27334f2896036d67506848938e49bf6165d33fadbe5
 EBUILD Lingua-Stem-0.840.0-r1.ebuild 571 BLAKE2B 3e5643289b41ad4c7da8a675c5e051f835d9290cbf57559648da3567cb42d03cc8b5f835462b45a9313b6c9cb5e411e6d968ac4c56328cd73eb49f70fe5cf8af SHA512 6f7cbbd48f08d406be0fcfe4bb8dd28323ed0d8140097bcd195e919023ea084e96ad0627634b0a4647d06e7a657aa10a67cfe437be1465f9f70e7b1c0955e0c6
-EBUILD Lingua-Stem-2.310.0.ebuild 521 BLAKE2B 10a1d6e6c04f8cf0311c557a7ab98c560ce1f3dbd4efab5b4eace759757bbd51a756c81bd0f774344fc5c92b0855818ebd35fb3370d5ac00ea73b0dc12848b1b SHA512 284a1d2334f5cae7663f4f616718096a5b94c3b3d7000d2cb96722de8b4115db00503d2471d930579dc16e0e0258a3be3a4f10e9606f3f2523721d8c78b97768
+EBUILD Lingua-Stem-2.310.0.ebuild 519 BLAKE2B 2cf2048569e300407064fcce7dca1b9eee4a84fd93ab6a7b57593194aa301f3a44eaefb24190cd60ffd8f9249b7f3ba8e907684bbffa8060dc296fb9b97c1340 SHA512 4bdda50bcf31c8aca9a4c46c67c5c38971202b29000658c9555ca9dafb7c4d5d5f345cc31eb1ac133b7597369009b4743fa6026bffdaa93d48451fa56b0a520f
 MISC metadata.xml 975 BLAKE2B 4dc7bd2a56336288074d129d8a14a80a49814c6615e3c2b5895379af7fc4bf4b580378b3a935e6c4f9fea87649e54bf47c68d346b8d9be81e0cd6a762b714884 SHA512 aabd3ec41e909ffaf1e9ac0a3e6d16f7f7b90c9c124b0519b50734bfda1ee6b47b096fe42d0c3dd632d2766b4dcbb5113661a1acc59bd7c94335b3aa32d75774
diff --git a/dev-perl/List-AllUtils/List-AllUtils-0.190.0.ebuild b/dev-perl/List-AllUtils/List-AllUtils-0.190.0.ebuild
index 3ad63294fbc9..42115bc1e729 100644
--- a/dev-perl/List-AllUtils/List-AllUtils-0.190.0.ebuild
+++ b/dev-perl/List-AllUtils/List-AllUtils-0.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Combines many List::* utility modules in one bite-sized package"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 LICENSE="Artistic-2"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-perl/List-AllUtils/Manifest b/dev-perl/List-AllUtils/Manifest
index bb876802babf..8b5b533fb7ab 100644
--- a/dev-perl/List-AllUtils/Manifest
+++ b/dev-perl/List-AllUtils/Manifest
@@ -1,5 +1,5 @@
 DIST List-AllUtils-0.14.tar.gz 44358 BLAKE2B ab04a1aee2d2340d9a2a55f911216774d22a762160d008d2c19e63e084d7b212ef27abb3d72a4ca1b9dd96eba66a2c06434be34414d16e1ecb5cc375f5cf903f SHA512 1a9a292cf92cfe24d8aeb5154fb55e399eebca1063393d001bdd3c5dc19d4672012c1e0ccd84be06c12a6f1fc99021e35806ec943e5477cbf87d143b7fc2c17a
 DIST List-AllUtils-0.19.tar.gz 56605 BLAKE2B 673f34e4ddc45598ed469447d537fe8cf9bac8bd21666e0ccbf1e879afe4a655a9e3321b1f4e132716d6bbb5a02970e5076155e4b94376bdc2b0afe2931c1961 SHA512 3f06165a3f416c75f1dd2364cb111479b053eb0a32e3c6a5823e5e8206f79fd3039599e9521526c0080a009541a86f344d921f6679ba4d7eb930d0c1ca2e25f0
 EBUILD List-AllUtils-0.140.0.ebuild 719 BLAKE2B 3ccb51fd1aa780db7d51a1a353fa75e789f8ba857d7bce5408a90ae575e89160afbc1583cbe81c74e5f98dcf4ef3adce6aff2ade5624d6af04e34234a85fd015 SHA512 1fb52af86ed8a0dbff5391b6c558fec9b0b7bcce54d775631eb47fe821d08ff51674cbc9f4923a8f768718bf506409b616d43eaeec2427f0c8b744fc72452ba8
-EBUILD List-AllUtils-0.190.0.ebuild 724 BLAKE2B ecd83c08a24c3b27d7ee1980d5c9a0aab701c0a20e6f06bc5f18b85c6ac73dca6da72135e18d4ab1fda0ba7dedb1270a87d2c5c4780dfa01ac2ec5fc56be2a56 SHA512 1028ba69915709c2d9d1cf83db850614c3d281334d80f45a326e4ac2b7250a406f2f6090fdf84d7473cb09c5e451a8dd7c61c57239a255f68eb7c47861e1a101
+EBUILD List-AllUtils-0.190.0.ebuild 720 BLAKE2B 7702cb8ecb97366757d0ece218faa300ab30fd69cbe633a35aeb0c01c9820c3a35372ea8f451128473b5b9e03c030c92b1796827740c367741cac915e55f06fb SHA512 da0fed3c480f603b791e4ff3838973bd808520f8b2e97eb5b71e7c0ce0f7749feb225d8922f80d2196a0cc7bd35957c3f87f067f8ac1099141192fabe9b53f41
 MISC metadata.xml 398 BLAKE2B fa3e1670ce13031ef5b446e2b5e73bc800df3b0f472822f99346c6ddb7efd4d7262bcdbb33ad4a71e77feea10fcc422261f7a39e22d5e108c3cfb4b7c5aadc59 SHA512 fad0151a2b023636c8a18bd17e12b248bf56f2e509edfb5927d1f7d03ebee1ed21a6d2e91bd716aa77e2185bd32b54b573b812d7dfce6966878c0c4983757c9e
diff --git a/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild b/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
index 675da2b19089..7bc28c58578d 100644
--- a/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
+++ b/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A general logging framework"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # errors out when running in parallel
 DIST_TEST=do
diff --git a/dev-perl/Log-Agent/Manifest b/dev-perl/Log-Agent/Manifest
index 1b598208381f..28d90908ba4c 100644
--- a/dev-perl/Log-Agent/Manifest
+++ b/dev-perl/Log-Agent/Manifest
@@ -2,5 +2,5 @@ AUX Log-Agent-1.1.0-no-dot-inc.patch 4048 BLAKE2B 8e5f2481524d0526f4469c32b16e23
 DIST Log-Agent-1.001.tar.gz 56215 BLAKE2B a73673f718233dc915f6e3cb4ef6a7a8455ad196190ae378abb20db31eb848a8c41069d069ce69fbf25aad75fb3c6ebb47d80694dee5cd97364e64b778be0545 SHA512 b8d3a15e40129add73bb4967ecc5daf37c0fd8a17eb75ed86fe338a9eb228b37ddd56b9bbf9bdef91f8453eb1b53d7fe303a96f68cbb0834820f2354fa37b5e7
 DIST Log-Agent-1.005.tar.gz 57364 BLAKE2B 1c5eb3fa6da20ceaba7d63bee1a79423bbb233662921fce9956a735a34b2994a903c58099cdfafe811130714fcac50e4c87586e8b8b058f591de5d6e8eed6f13 SHA512 9fb1c2377921b4a3036a24f343ef52ea05f569c27600d289f568a1544aff7d1acd4426dfec60b63879424360a27c6f7bff684e9f7b17aa5d49d3673c35bb65f5
 EBUILD Log-Agent-1.1.0.ebuild 629 BLAKE2B 5c5677d47ef5be87788711c0e4c68f640acbd7f13ac0c09cad1c98fa82cda624a7eb8a85e8564b792c2d9ff86517a88b117d125cc19efb3fdd48c4c28443e344 SHA512 544ac46d9eba1b52ecf406c82fb2ea39675982cc422cfe271250ea556e19a7eccf9eb36a65e2fa054b678c2788f4259e472dac6a23886d18b76a93e5d0919f03
-EBUILD Log-Agent-1.5.0.ebuild 482 BLAKE2B 93f32290b74731fba255cdf953e956106c2260c131abb10b095e7f9690e5edc8a45febc3b27390397064ece5005317f6664d98acaf87c508b8c41f58dbb4843d SHA512 7dbe8c001f910c13ce240537c6d30f1eedbbc6acf63d74c9ef651e49aa4dea774a604cb3575df093483aca8d860fb7ca3c92c133a06f3cb5fc400847429b7cf9
+EBUILD Log-Agent-1.5.0.ebuild 481 BLAKE2B bb53c9873c0b2504f86391b6eccfec55ac3d6d0a8d778da460ac0c39cf6538250788672b096d2030adbf1fd05cfc846c66faead5b46a1abebde3d0ced1372ed7 SHA512 83a58e13262f96668abd8e5f6eea7e77369975a2edea18a06abab538dc65fc0693dfee036aa912e8288d54a26d07025985aa784ed9273358fb458bb70b486a6e
 MISC metadata.xml 2136 BLAKE2B b74238e39f7a213eaadd5db4f41768506e31af780d85a7ce1bd3bcd087c043d8fb674b5fb2da6fc96251583420ad61e62c4d3f4781ecec58b9a8eb21fa725421 SHA512 1a707e2e4710a690bbc44ff37f551b8e03e5b88c270d219dc5da5d5604599c93d5d14880956d3ca3df1b83e434ff8fa5264121880e3319dc78b963cc8f8c82b2
diff --git a/dev-perl/Log-Any/Log-Any-1.709.0.ebuild b/dev-perl/Log-Any/Log-Any-1.709.0.ebuild
index e39bcd870462..a2d5b6b9ce2b 100644
--- a/dev-perl/Log-Any/Log-Any-1.709.0.ebuild
+++ b/dev-perl/Log-Any/Log-Any-1.709.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Bringing loggers and listeners together"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 sparc x86"
 IUSE="minimal"
 
 # Test::Builder needed for Log/Any/Adapter/Test.pm
diff --git a/dev-perl/Log-Any/Manifest b/dev-perl/Log-Any/Manifest
index 9aa5003aa572..37e7b4e9d431 100644
--- a/dev-perl/Log-Any/Manifest
+++ b/dev-perl/Log-Any/Manifest
@@ -1,5 +1,5 @@
 DIST Log-Any-1.701.tar.gz 49026 BLAKE2B ff3b791e41f8eccca380aebd2fd10a82e42669d491c22b4c58a8f35137ab909ee5c7c76398a1f25aa506215e51798e3f11ba250732357bedae3b92f8fb6ab1df SHA512 cb66cf36d0bd15fee8e397f3e9f916875cfff485d2177832be9a36fbdf88fda963c658f3317182acd5fcaa88fa14c46b8d5d05d7bd7572b35f81a6eba10dddf3
 DIST Log-Any-1.709.tar.gz 56325 BLAKE2B 4028b549f7898c60ceeaba293eaa91da7bd7a7d387fba74d1804fd83748fc6bf1eb3a578fdd9ce6f9ea36093a1a239c0b0ba12803ba1a37a9733436286f0a22c SHA512 55beff3b56185e80aa4515d9e924356ffa2430fdbfe035f9d33cb6254bd8a23382055931939d4927befcc577486fb62f86b0362725fad60e571fbf0d669775c4
 EBUILD Log-Any-1.701.0.ebuild 715 BLAKE2B 5098d298d2c49d45716e6fe30040a8976c12139311a6569f24b2f67d5d29f62983adc4cd1b0c539b153f7149aa5b34410c20734b18824c9fb3c0c7a3b2bcfcfa SHA512 73e1680f031b67cdde9f2720191c57fa3f7447cf09b3bdf7e7bc5eb63023a3d3d9c8bb485f59ca173edbc4d1efb88c5f982ecd8c351b14766f59b8c507af57b8
-EBUILD Log-Any-1.709.0.ebuild 695 BLAKE2B 8476a3ffd33640cca520e672b3d4a197782747f793db7353204e4ad6e9859abee39951bee00f8f1fe48ac14dd90f54853cfd7999c3b1b71a47afc4dcc6b9986f SHA512 02ad2aadb122222ea68b5211dccb6ccc3c4a58a82a06788f6804c0dfbdd6520e6ea3a3eec9c90944dc0a121f79224d20f838d2a0a64f65416e462de1489988dc
+EBUILD Log-Any-1.709.0.ebuild 694 BLAKE2B 1d002f73aade111246288a18ee5509d325fbc4c6917ca29bb5bc8b70522152c1caea72417443007a2b98d29bac0611068c5b6b98679ae0161368c62cdc5eb225 SHA512 09ac8be6c9a3894accf842f81ddec29936082a7b5de787bfa95183521dbd454a2be77d8c6e711e59d31039e07dfa28d2620e990a0f2e5b152a47235a7ba2c29f
 MISC metadata.xml 1339 BLAKE2B c9ece725c2ff1e2b2ad8ae389de6db8de54af09aff4022339fc2fc32f4e049e446a69b8db7586a48f4f8506d42e35f5c294c19218d6f7abc1f7f175c4d3d522f SHA512 dd3408d5c17d233d6b7a822ab8a2186604174b376823e7cddcbcde484ef42baa7a838d3efaca25a1bc935cb223bb11884e14761b22ad4d99706076eeec0ad047
diff --git a/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild b/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild
index ab9835130f4a..ee303b1b0dd4 100644
--- a/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild
+++ b/dev-perl/Log-Dispatch/Log-Dispatch-2.700.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Dispatches messages to one or more outputs"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 PERL_RM_FILES=( "t/email-exit.t" )
 
diff --git a/dev-perl/Log-Dispatch/Manifest b/dev-perl/Log-Dispatch/Manifest
index 551498d67f7e..7cae1fb770e3 100644
--- a/dev-perl/Log-Dispatch/Manifest
+++ b/dev-perl/Log-Dispatch/Manifest
@@ -1,5 +1,5 @@
 DIST Log-Dispatch-2.67.tar.gz 68022 BLAKE2B 0c2e629dc9cc6ff7e8a4138b4393be95ba85fc20fd57fec9a5fd16f5f69d3a2b448a631780393a1f828f4d26fed48ec1e1fa75d251e09483788a5aeff3b91fcf SHA512 ab03777800fa758a502e69b25669c3e4ae851d9dcf5f2f4d1a21a94cc61aca866ac361d2a5db3d22d19cb4d11da29ecec19935e29fcad40bb831fb27175846d6
 DIST Log-Dispatch-2.70.tar.gz 70808 BLAKE2B 4225f7a9a9d1a200b9b03938f47abc4f4c0f48df70a35042822e7dbe4eb5740194f5f30a59e5229b2bd6eab76c196b8237e888cdc0a888eb7949345fbca4b63b SHA512 c4c8cfb9e74b3176d5f95e3f9fbc86303321caa3e608a7ec318786ecd80d2238fd06a3b74ded65d5d3fab5c3a1297f99c92c62b1136b27d3b5396fd3fca602f6
 EBUILD Log-Dispatch-2.670.0.ebuild 1069 BLAKE2B e6f3eefcab698b3c31cb827d4235b478a696d89aba30a7712aafc08d9c370244e35517105382c78babba970806057dcdda0df0e429fd4b7749cf515d38ae3ab1 SHA512 8d0a883ffe7b12d96f920ca558359747c5c168881d1e5dae2ba26ca0466b7dc6e0d0dd55b5ca1f3dae96349722a97b32b2881eacd4fd4bdc77c04cff55dd5d92
-EBUILD Log-Dispatch-2.700.0.ebuild 1036 BLAKE2B 981853eeeca5f94d165960fc13bae8a4cc578e8efee9bffacf26ffb35f581583c5ef1c60ecfb58c00a41f259ab12e57db4924e8913a1db21b50870e404bb68e8 SHA512 c098717fb8cc875a6a83aa35504f3854cd58c12a7c5df6e8d9ed8a28080bb043289e6ec83fa9b0b93ceb11ff2aceb4fe2480149858c4eb5ca8cd6310c9329c31
+EBUILD Log-Dispatch-2.700.0.ebuild 1031 BLAKE2B c2a11daa9888f37deecad62fd2deb2a0a88e09028e5ae02bd6b4ba568bbf1c9dc85babc317d59851bbd2d48a6ee6c26a81430121a6480727a9a8e74351f15962 SHA512 6ff70da1da0057803cd6fa4befcf590ab20002b40dd87abf3f1aeb0c5b6013ec09f29122bcdbdbb8482c2ddf23aad518d47f0bb9f536359b251f8e93ad597386
 MISC metadata.xml 1591 BLAKE2B af5c0a45644cb82ce81afa41c011fc9247858c3930a57cbd32abb0e15ea19f8ffe5eb7c12bce87c322b18c2478fd9ee9055970ff8ec36a58e844ef0e46d73249 SHA512 9166ca6cce9d81d72ddb471f5cbfbc4226bd8008c5f6d0d0fa862149aadad9d0531534b80a6389f8b9c2752d2231427b2c0be78d886a2161b77ae26665d1a054
diff --git a/dev-perl/Log-Dispatchouli/Log-Dispatchouli-2.23.0.ebuild b/dev-perl/Log-Dispatchouli/Log-Dispatchouli-2.23.0.ebuild
index 21d6e1a1d629..6aa455fa4bac 100644
--- a/dev-perl/Log-Dispatchouli/Log-Dispatchouli-2.23.0.ebuild
+++ b/dev-perl/Log-Dispatchouli/Log-Dispatchouli-2.23.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="a simple wrapper around Log::Dispatch"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="minimal"
 
 # r: Log::Dispatch::File -> Log-Dispatch
diff --git a/dev-perl/Log-Dispatchouli/Manifest b/dev-perl/Log-Dispatchouli/Manifest
index c31d543a3883..778a9031fac1 100644
--- a/dev-perl/Log-Dispatchouli/Manifest
+++ b/dev-perl/Log-Dispatchouli/Manifest
@@ -1,5 +1,5 @@
 DIST Log-Dispatchouli-2.015.tar.gz 30232 BLAKE2B 5fbcf8aa2f29e248c60b39b03084beb842473137aa6b4e214cd69351963d118bc67914b2f420ba2a7eca1584dab2f1c6d461afc49fac3d82e408370094dc1307 SHA512 ccefa751dffab72021a668aca68272ddfe7b2746042515af4b984ea5481d2b4e845a6ca1c2a737ed65a0ff6656ea89b6de78adefa5abcdd9ccb5ea4b82777f9b
 DIST Log-Dispatchouli-2.023.tar.gz 31858 BLAKE2B bab4a211710ff0cf36ec4b6f4dea706cdebc869919801d39388b90434efdd2741a0ae54bb67cdbf2e69dbcd1162eafdf2aedbe9907745aebe24e30c79d91ffb1 SHA512 e9d5a99029e2d9f9ce48b3cfa37875cd3d9394757fbad0ec652ef9e4260041bd06a2273bb26daba88e9f3fec22e0a56b6c9d80ae9d4aa31b596d4aad5bf8a5b2
 EBUILD Log-Dispatchouli-2.15.0.ebuild 1111 BLAKE2B 3f71848bdbaea699afdb8096a95bc59afb8882418e9d50664691ce040199307972a614690f616e8ef4dd45e55174367130f7bca6669fbb0d13c23a4a940ede1b SHA512 a62fc0e121338afdf7cb21a96727584806a42e76c0c7c88c1b116a2a2252be88459cd1a561185a990cb02765d07f58995e65b90c8f02f800f3503504f90055e1
-EBUILD Log-Dispatchouli-2.23.0.ebuild 1082 BLAKE2B bbffa698965871001d196ba058198c9017c88b5b7f4650b737bfd18f8641c409619a2ff5f0993fd589b81301653af37b4e3a92af84ecf2664f8c244c4be30c34 SHA512 9a6a12b4727657a865fd239731fe83671196386816554ea16e95a443db7ceb87465325d1c0e8e7095fcbe96a9ae35573512433a26807da810d5952f9455401e6
+EBUILD Log-Dispatchouli-2.23.0.ebuild 1081 BLAKE2B 8e064f67e43c2ded094d8fb273d3f77394efb35d45dc523842f2b85a2a3fe094578f1c07e29595b5cab1f28fd7610ae152673c52d84fc4aa3c2415a5e2c76da4 SHA512 41fd29b5030532b42dd2eb223beb7786cec85c984d3c233976f6d9e7ca8d3ffe654e8eeec269eecab42227ac128aed7bc7cb82b5a765d1561debb58a657e1e90
 MISC metadata.xml 547 BLAKE2B ec1b63194041b2f20927ed2097f317efdcbf1daba03bbcfbe193e2339336b0cead46481485e96664b0cac1c3d9870c2e2a53f696011e38c3a8b0a7153a888a0d SHA512 d79250481414220fa42409b9b0b210ac09ea3ce521df53a08f79a2832781652bc3216b2bd2bde8a3248edb51b40056e2b8a269d4eae85cbd1a6c0ab9bdf64075
diff --git a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r2.ebuild b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r2.ebuild
index df449072f06c..6ddf25873e34 100644
--- a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r2.ebuild
+++ b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Logging/debugging aid"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-perl/HTML-FromText-1.4.0
diff --git a/dev-perl/Log-TraceMessages/Manifest b/dev-perl/Log-TraceMessages/Manifest
index 8061ccedd3df..a4669658c38c 100644
--- a/dev-perl/Log-TraceMessages/Manifest
+++ b/dev-perl/Log-TraceMessages/Manifest
@@ -1,4 +1,4 @@
 AUX Log-TraceMessages-1.400.0-posix-tmpnam.patch 2424 BLAKE2B 23edfdadd5a9652fd6a3d7abacdc5231fe8c85c2bc9a1b0fc6a7693515785fd37574a1fd4009bc234ae403775365a376ba16b0c0f212f1c26f465977800d9725 SHA512 307c6b54a1717664463c7295ea24d5b25bf3ceea0e83b7f6baf74478f273fb23e39b208257f694f2c0786629c1dc7af616a4db3fc40681c133fd4c9a9a888055
 DIST Log-TraceMessages-1.4.tar.gz 5437 BLAKE2B dcce3d5a80ece9fa24d1110c024a02c14eae99d2c7d596ea4a41355317729d12322d677a567f282c35faf0216f14c0a6154e82bbc97da5539689d5ddab1e203c SHA512 ccd298f7ecc0cb7e478812dbbe20b870baa2f87f19b8adfa003818d70e1118f7a3f59a7f50898ac22751d2dc4b96fe9bd1282b30b72cce7334e645b593a01aae
-EBUILD Log-TraceMessages-1.400.0-r2.ebuild 392 BLAKE2B 651180b82d22c4bd086bd997460fc2675606ad2059547595d6a4f929c2806010cc41802a33a3ffd0259ff69fb02905a389cc26eba8a19f58bad90f7186d2fec6 SHA512 5ee7a2b86eb0caac6f6467f0b1ef7376933bf4dd1a8e897a85d4c78270f2793e5dc9ea45c418de9feba68ab86a138e016188a6006c2d3152b4409e472dabe6e2
+EBUILD Log-TraceMessages-1.400.0-r2.ebuild 391 BLAKE2B cd4c15c6a31d590d65d6a6ba2ffe0ee4b4c32cfd04247b9659ef3b213eb6fe3c1c6ebfabbfed590e1f5d273eab81e74dcdfea6563ca6b961e83492a8401e169c SHA512 324cd239170897b5103d8bb8807da8ff1f730736d7d6f93d1c71d90ad190044ca4547c79ba8815fd669c0fa8bd0a87582648ac86caca6bf64407d45fb350ae11
 MISC metadata.xml 406 BLAKE2B 4e7e3852d23ee6d62f3f8436eadb921136663e3109bb2d870f3597b876f5c2a7e9d28d59c9743103e37c92e54bc4daab69e1e11b76c0e5a04895497ff24fe206 SHA512 4778efe5353db60500a964dbeb8b5c229b76e59953ff8d4e2b82fddc0ccfd20d86dd8110b1d4903dd52070d0d4f20ee047b6bc72dda88ee4d3e828a6c9f202e9
diff --git a/dev-perl/MIME-Lite/MIME-Lite-3.33.0.ebuild b/dev-perl/MIME-Lite/MIME-Lite-3.33.0.ebuild
index 61331ec36a66..58d1c34df543 100644
--- a/dev-perl/MIME-Lite/MIME-Lite-3.33.0.ebuild
+++ b/dev-perl/MIME-Lite/MIME-Lite-3.33.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Low-calorie MIME generator"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="minimal"
 
 PATCHES=( "${FILESDIR}/3.033-makefilepl.patch" )
diff --git a/dev-perl/MIME-Lite/Manifest b/dev-perl/MIME-Lite/Manifest
index 0bdccf3105a9..0eef2d520ea9 100644
--- a/dev-perl/MIME-Lite/Manifest
+++ b/dev-perl/MIME-Lite/Manifest
@@ -3,5 +3,5 @@ AUX 3.033-makefilepl.patch 1568 BLAKE2B fc36b38bc014fa6c6186ad905d4dac317cf2f41a
 DIST MIME-Lite-3.030.tar.gz 81830 BLAKE2B c82fa81140725c0447fecce1f1033ed0677e1b80b6b16be7ed2567d4a71ef14fd341c367fc283242fbc4f480b48fd85859bc1660b2c12256cfe309960caf5c56 SHA512 978cb234d16afcfc9b2fa16c74de04ee74f3a1050b28f7d380d64c8c8688c6d75452d7bc4c7b2575800455a45cdde477e05e8afe2b962ef2527c3ecc265d1158
 DIST MIME-Lite-3.033.tar.gz 82715 BLAKE2B 306f641c62605559f768f45f4ceafc5267326fb475eabf45ce8e344a430117f0b335ff7939bec90343a5c23498832743de99a799d59149f26468516c4b088362 SHA512 315fbe01a432e67953305fb1db70aa337d3c7e1710087196535e108fbb516cf868a277acc693afbbc34ffa135386c6a784ddf4c1de0359fbe6c6339b26aac878
 EBUILD MIME-Lite-3.30.0.ebuild 847 BLAKE2B 56b9b12d3c6bc7902bd630ede245f8ec61f9973d3734f724b541dd7cf3f0db8e0d3c658744654c4c92334b34288358e9c240bd70f1117ac0edb1329c16dd8c8a SHA512 514fdf78f27bddad4ef4799b5dfb11e9224448a511f6f53daf215bd573de27620ee62b6bfc9a9231bbf8dc5a5798f0980d002bdc0822890c15b28e3b036fdf5f
-EBUILD MIME-Lite-3.33.0.ebuild 843 BLAKE2B 787641a678c197e42e1dcb126ad3d9efa54b6281350d7d08c9ecffcc88dd9257bc465c72431154cbc5f5749771f50941f2bb9f90fa91018633840a5c1684f6e6 SHA512 188919dab0997a34d017074ce4938044c624ba4e97ebbd33ef4ac7a372563fbe394cff8097033ec926454ec252284dd211047886e594f18ee542f757386927b9
+EBUILD MIME-Lite-3.33.0.ebuild 842 BLAKE2B 66f4063bf3d26b6347b399613cbf1eb3a1162c5f389c0083ffeff6ecf61c4cba9bd5ae8791507a8128fb2c8404bcc088dc15fd72b0ac62fe4ff458db7bb33576 SHA512 a31e49d1142d7fbb5637148f6c85e064ec765120f871c5cab98339012e2f7c770272ebc51ba6a8ba73686bfa1121ebf78a0837b9dade91931d0730a78d4cfbd5
 MISC metadata.xml 695 BLAKE2B c901be5eeee83ae22dc85cfd0b9fc18d748e2c2962235f5861983bfbd24331cb1fcca9349b157c5631be1e820e8e86257c1dd71df0a6727f04d241a3a5ba9427 SHA512 ef4c8f1f7dda7c43e898587c1666863d37198e7fafa1a735c1df85a4112784ef5124bfcf6ee6fd4d3d0d0ce93ede1e1bcf626d1ab3e83fa2c17a7d4cb86d4efd
diff --git a/dev-perl/MIME-Types/MIME-Types-2.210.0.ebuild b/dev-perl/MIME-Types/MIME-Types-2.210.0.ebuild
index 5e1b2b6241f0..cfeeb5b8a7a2 100644
--- a/dev-perl/MIME-Types/MIME-Types-2.210.0.ebuild
+++ b/dev-perl/MIME-Types/MIME-Types-2.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Definition of MIME types"
 
 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"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/MIME-Types/Manifest b/dev-perl/MIME-Types/Manifest
index 03ce61fb0bf2..87270059e107 100644
--- a/dev-perl/MIME-Types/Manifest
+++ b/dev-perl/MIME-Types/Manifest
@@ -1,5 +1,5 @@
 DIST MIME-Types-2.13.tar.gz 57032 BLAKE2B dd23c4037831c21891c8b0b43d3c08768a45f1d72b973c2bfd282185987ee302f9321b784438cb121f3b31adb915bffda00eb0c7da16cff9e8fa259fd2e038f6 SHA512 675d89faa03e78162a2441d0fd9c986a77e44dbfde1e2f20ee501de8f530deb51cc5705481b0e7450e1e1c0f7f680572be7f661456477c8a34818be89a0acc0a
 DIST MIME-Types-2.21.tar.gz 64535 BLAKE2B cd3a144c541a5f72be0378622f9488f0b4b0f3b71aaa7769285592aae31165afd315f52c0f0060eceedc20ec742fbeeee1ae2bb220f08f45d59911dddbc1e7e0 SHA512 223aacf8f8ea3c8dd3059791bb86d3203684fb632d972639d88d9e176a5fee428c5fd637cbeee65b52f008ad70a92cef3f82f524926fc5fa55ea24ca0448f4ad
 EBUILD MIME-Types-2.130.0.ebuild 565 BLAKE2B 8ec3c91fad84933eebdb26d6c9c640e02e5e75b473660fc6a5926680396f1dce0867d51c53401da6e0ae79ac935da5ba24009b527e8df4ac27040cb0e78f09d1 SHA512 b99f211839aae7a7fcf247ee06443ee5194c4b77a486e0fecdd62f6cac01024110ffa7f411cdfe0353d266eca16e87e60d2d1444dfd7edaec4c05716af865d3d
-EBUILD MIME-Types-2.210.0.ebuild 515 BLAKE2B 770586880c6a399965534e8d47c0ef5711716198706f557c4b9d907678a8a8f28f32262c4d5626a9ab943ed892dd0f26bdd9b96ce275a277a1de2ce1d90f7d6e SHA512 d9ef170877a84ec7905eff45fbdb92fd12bfbc5083266e8ea1935cf0ec21ef7beb5331b84a80b1c8ec60c6bf2122e37b7d5638e67c4d300c57ad38eabeb8af31
+EBUILD MIME-Types-2.210.0.ebuild 514 BLAKE2B 74c807c43a74eb53d38391e49228d3acc0a827d3cbb0e096747677aa392378603962ec3b9dbd34c5c6f162ba52f3c4dd7520a4f1d42cf1fbfd9850a90ac41563 SHA512 b9f3bdc18bbd27ec5eb1adad305e5a8eda455a9f09c94ab99d67bd8fc756c413022762f208fa487df2b99f4b3b85576ab216d4bc99c93e1e55420b377e07bea8
 MISC metadata.xml 435 BLAKE2B a6a8b0df81a8493d0faa108c336d552ce2287b88e97ef975bad8e8ffb64876f4229259a3354a46cf82843a3bdbc26bc370722c037a6540858a0043746316e3bf SHA512 8a130b096581247065aca50c2c51a1704512819c602da41ecb55d873406e668bf94cc2ee49d33e9fc9663d7c650807a58bc8a74ee319fac6ae878c95634b3f3d
diff --git a/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.7.0.ebuild b/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.7.0.ebuild
index d16db66f2749..c382f3835279 100644
--- a/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.7.0.ebuild
+++ b/dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.7.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Mail::Box connector via IMAP4"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND="
 	dev-perl/TimeDate
diff --git a/dev-perl/Mail-Box-IMAP4/Manifest b/dev-perl/Mail-Box-IMAP4/Manifest
index 9bdf8de260a3..66ac9fe28a16 100644
--- a/dev-perl/Mail-Box-IMAP4/Manifest
+++ b/dev-perl/Mail-Box-IMAP4/Manifest
@@ -1,5 +1,5 @@
 DIST Mail-Box-IMAP4-3.002.tar.gz 41874 BLAKE2B 86b57eb0558d42e593c9b8ef44454ea805498229d8f2c75638f3dea399697bde62dc539c48870906eebd3bdd98c28a7efef2055c44a43b514b0950154c6800be SHA512 0d5ef070271ad67492209d479acfd056fb7c3e4d21e2a0ed5986535e3a59d3a330831771914c35223e4819b78a47ab02f350788fd8617ae293cae3dd7887896f
 DIST Mail-Box-IMAP4-3.007.tar.gz 44532 BLAKE2B a49c0d98e07e3fe5dfd3fc212f7c1b5937a915a37edec3b146247d916b423fbdbbc9cb146b2bf295780cc45610ba30d3f3feee8c6bb404068869d08b6b278bfb SHA512 f2cdf0063ec5ba66b9e29aa71c827aa5eb7f14cb25d139ff9dcdbcd111ebf5507763f501d7ca80b4269961cee83a91d8b282191e3beb0711536a505453342faf
 EBUILD Mail-Box-IMAP4-3.2.0.ebuild 666 BLAKE2B 1a2593ffd34e19e252c15b19d51acf7662acb7622659323e9e9896da0beab74f9832905118c95a93f97d0d1c5a9b99dd704a49b9e6c5aa6d9a47a52c06d5cf4b SHA512 b78f0e32de908bd95d2bfb14860725d80a76565554cf6d5c0ffdaafb95b61428b3fa278f52dccd2140d5ddb8317ba0558f95632eec706d9c712c02796b3338f4
-EBUILD Mail-Box-IMAP4-3.7.0.ebuild 629 BLAKE2B 97d8c7a25d750ffce7b7a68b24551cc897a24b1fe292c1aeb4ed2fa08603001a174a7f8b6202eda6fedda1c48180efaac20791e7ec4b27d3bea1f8c49fdfb6c5 SHA512 81aeb6cd8cbbccb1b148c28d4a0539e9b22422ef0b63a712103ac5a08813ba20c20e976c765612a276da4f5a1a1ca27d204af430dcb73b67fbd75501a17c9422
+EBUILD Mail-Box-IMAP4-3.7.0.ebuild 628 BLAKE2B 3af4639947643d4a970567679b9b92b9dd7cb0ed4fb1511130d03e11edb2f4be6c3214b56a84844ac860843348117d2064f59f97f076201bdbae1ee3774df756 SHA512 0c2cb557e1eccb0b764061912511cadef0f0874bcbac70e0d61b4e49026e5bc8fa9f3c327686fb17e91639910016a94d61beb7d30bc660c547a606dede9c4d00
 MISC metadata.xml 968 BLAKE2B 5b44b8e7508f8a23a69be773848a9c2f563e8a4d67355087b56f03e1535e31c44f6b2108c4a953573ec7b4d120428535b5cf3db6f27282b9d6392dcfdd921e83 SHA512 404c9c94711b4b01c84659183ad18696fb85732df7a15f6be38ffe33f345c361a2821f42ef56c05563e610e5eff1983c5d40995c6d3e2929834b9d6e9d250b4f
diff --git a/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.5.0.ebuild b/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.5.0.ebuild
index 16c3f187b8db..8526c502950d 100644
--- a/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.5.0.ebuild
+++ b/dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.5.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Mail::Box connector via POP3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Mail-Box-POP3/Manifest b/dev-perl/Mail-Box-POP3/Manifest
index ca3d4d0ea017..88608b8f429f 100644
--- a/dev-perl/Mail-Box-POP3/Manifest
+++ b/dev-perl/Mail-Box-POP3/Manifest
@@ -1,5 +1,5 @@
 DIST Mail-Box-POP3-3.003.tar.gz 30500 BLAKE2B cfa99af8777bc590eff77fb776a2e161590809da59148dd986fba7409860244dd99eca431e398aea9f00046b73d172a70762b504e79eeacebf57f4e8ca277688 SHA512 be63f85abbf78e1497eb6d6d3f87e80a3fd6d58fa6469f8732435cc740f72c2ffc6da8f5d98907e2dd4b7d0412c15f94abb994fc9274701ee050f4a3e1f50397
 DIST Mail-Box-POP3-3.005.tar.gz 31804 BLAKE2B e0ef2d6ed0b19de2f51497af0268bcc5fd78ab6c3027bbcd134edaf942728e4494f11eab8066151d088c933104011af7015383ef408ae6a8ae45367df03d8131 SHA512 cbcda3c9df08d8cf5d279e1b8308885213b75b0af56a3be7c0a5fc769ff60a6c9e6f2cd5ab4ab19532e388e14ceb6b4b62042dea4bb512c31384823004137079
 EBUILD Mail-Box-POP3-3.3.0.ebuild 663 BLAKE2B 9dc89b77a5d37efd94538243980766b66059d3692d3c6a4353a297ce4a6f57476531b5da76ada7a7b0301317dde2e0200761318384d5179188c01ec6ac3cd1cf SHA512 fdd693425ff77c0a6f9f6c89eed6ecca231b052c9ff28b695bdcaf735042d69b57623adbd9f4f958d90e954ef8ac1863978a8752a0535fde98d2ec686755d9d1
-EBUILD Mail-Box-POP3-3.5.0.ebuild 627 BLAKE2B d1225d7f06fdff3bc6cf23db843a8f204c9cbe2bff090aaf2735b7cd777041c4b4f1ed3dc44bbaebd065dad5deb97c90f838e471fb32e0b937b7a81176298739 SHA512 efb41371863fe68149683fba2af8ad6c287d7818a04afcc77ed17b60d820fe34d28a892b8223977b82bda7f7aaef0bc9627eea348e32ff26c66afe35c4d28ab0
+EBUILD Mail-Box-POP3-3.5.0.ebuild 626 BLAKE2B cbf3c130f544d6bd2edc0523b46bb017fe33758da330d6ac208fb869bdd012678b763c93244a097109d2d92411b04d79fe11a0b646bb0d2af75659d83cc29245 SHA512 9491e07c914319117c7870dab4ee8077f0cab8fb4b503e0527eab93283ab6f317f3943a92fbdfdf8adb72cc83f4297e55a2765e8b05084fe7f839007ef826c83
 MISC metadata.xml 669 BLAKE2B b903688b65901d93a013292fd794854efb53a707bd403d0719357b9f8b0c531243051027adcea2aae3b28849df373b72392ecbd8e9d8fe716ebda7a5d08fce58 SHA512 0be6b17ee52b22b1e88f530ddfd6fd13ff56964b09dda2486bf121818d6b5d39a0acb660623266dc36a357622cad8a0ec4f307242be7eafc8c68e148bff87746
diff --git a/dev-perl/Mail-Box/Mail-Box-3.9.0.ebuild b/dev-perl/Mail-Box/Mail-Box-3.9.0.ebuild
index 31355ef401ff..95a3c2297502 100644
--- a/dev-perl/Mail-Box/Mail-Box-3.9.0.ebuild
+++ b/dev-perl/Mail-Box/Mail-Box-3.9.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Mail folder manager and MUA backend"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc64 x86"
 
 PDEPEND="
 	dev-perl/Mail-Box-IMAP4
diff --git a/dev-perl/Mail-Box/Manifest b/dev-perl/Mail-Box/Manifest
index 31a43b9bb7f0..e986ab757469 100644
--- a/dev-perl/Mail-Box/Manifest
+++ b/dev-perl/Mail-Box/Manifest
@@ -1,5 +1,5 @@
 DIST Mail-Box-3.003.tar.gz 340558 BLAKE2B b6119c6b519ef3fa277dc8af7c53d78ed611351bd3c7e961f4fe96c6a73355761e42448e61e7a071b1e52b15f4c8982964e3405385c7cf762a9772777270b73a SHA512 02a3fec4d7ec99490bb6e1223e606db0b6149479ff047ebf7a9b905e0f299256f58ec27b2335c7f9e309d23d2b32a99544dccd5edde41a5910bd64078dfc6629
 DIST Mail-Box-3.009.tar.gz 296059 BLAKE2B cc76ace8415fef33841fb5e57351e57e314ca5131892e42c00ab32b549ef901ecc28e7b96922a90c4deff9d46b991367ea5bf0e183acf5cc6e637e8c56775e0d SHA512 f9a90915adea21b2275d53df5d218968c120b53562ed397253babb77eda8e09ae90817655ce25dba2c282d6a2ff2053466cecfd53ec8e74f22196032a1c39e7a
 EBUILD Mail-Box-3.3.0.ebuild 877 BLAKE2B fb360f366d88f7ac6cd449f52d5f3ba4450edf04edee091ac1ca221685b83bb57f1e205aea364c66a2a566dd6666f4b2a5793c05f9293365d9aad751f3afb47a SHA512 fbe34880fbadb6006eb6216ae79059b14d8451d22bde3a1bd6b0e3b35b5bd9f481faf68f3f504e1fc1a353b3ad884ad14640de244b2bef283c20b085399e0df5
-EBUILD Mail-Box-3.9.0.ebuild 777 BLAKE2B ef708d4bcfb56ce3ff1678dc3dac838609ada0c81358c196fd418878aa4b9f585a595dfa88f76d1411fd5162fee935ff15c8f8fcc467390defbc9d686229b7b8 SHA512 1c125fe823bb1400a7f5219228bb77ca977cefd392179a275294bcec8cd76de54faa835f7d76175651ba5051bdc093de11c10515f59e37fe1e9b5f914cfe5f7c
+EBUILD Mail-Box-3.9.0.ebuild 774 BLAKE2B 4b31e56f3e630e738f62e73fcbe831d5f84728a1733d95ca4f9197fe9ea28e05f3320a9495f1f2eb12270a6af5a58e817bb04743d08c49792b17387e23400ca5 SHA512 76f987526e2bfa2331cd6d06e4adde48cb9c5f521c8f5b1d0d123af1346fcded4094b47fbb502d6adf30e2f5124c43e30b34f986d94923cfb9589978623cc830
 MISC metadata.xml 3242 BLAKE2B 35677bcd285f30351881878fad44b6eaf7d09d059351ebd6b90e6d980fc313fc4a394700f70e97012c38174be9a4a3476958e36c39d0b1ccffb28cdbcd79fc93 SHA512 34cd19b5f83375f885077ded50a40c53861d1baebd80db03b44e6455ee519ec069aeddfe31927fc092b2f804ebf0cd76cd3b34bbd8ce6d5b9cc456daae1a7139
diff --git a/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.430.0.ebuild b/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.430.0.ebuild
index 7441df47d7ff..c1e016244895 100644
--- a/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.430.0.ebuild
+++ b/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.430.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="IMAP client module for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test ntlm md5 ssl zlib"
 
 PATCHES=(
diff --git a/dev-perl/Mail-IMAPClient/Manifest b/dev-perl/Mail-IMAPClient/Manifest
index 05de04ee2d75..a318c2ce503b 100644
--- a/dev-perl/Mail-IMAPClient/Manifest
+++ b/dev-perl/Mail-IMAPClient/Manifest
@@ -3,5 +3,5 @@ AUX 3.43-makefilepl.patch 2676 BLAKE2B feb527eb527a9d678ce8b14672b5dd1d686221289
 DIST Mail-IMAPClient-3.39.tar.gz 190965 BLAKE2B 43fb640d2282945b21e743ccb8bec037103b7bcff78396f1f72f26d7860d5b5f69bcab837f3e857610426f958c860085f66cef21c8d5115940fc64ae3667f1e3 SHA512 156e5f6682d55f2c112ae5065448f0c502d3e748c4405768152ccccd7d944cf949f7c3fd42f30f40c86337457dea5c037959bf29739e4c413e4b45af2b74c222
 DIST Mail-IMAPClient-3.43.tar.gz 189679 BLAKE2B da28ec4358532dcac59241dca4ffc29c3cf86bc3bba388dd66e27f45ac675c4754d0def00eb7112e4b1ffb1d595b3941b160a3f3e81a8ffccacc8351b4f96a94 SHA512 9e2346238d68ea62c0ad2e5c03ae9a36face8238dbccbbc083bcefd41d82a7f75887e3245c792e4bd2a5999ce66fabdc4e861118904e96cf2781e1ca549a1b09
 EBUILD Mail-IMAPClient-3.390.0.ebuild 1106 BLAKE2B 33c0d3d1b1d942be2e00227ced4c421d404dd6abfc6cb50012683f460ae354837e4163ebda21d38b40389b2ac81213fae39c401839022676075028ba13568813 SHA512 a8e2329509b804fba694ffd3359047314618a7d91d4f0ca245aa3e970ca9735ee5ff3d49604024ee7313773050625637ca7dbecac99e71879cc9892713241c80
-EBUILD Mail-IMAPClient-3.430.0.ebuild 1083 BLAKE2B 5b7ff1af0d5563706dee6474476d8fe6fc7706d58600a83ec3d9eea45042cf53f51805d2eb1ab25c1b41987f1e5012265d56b66445e3a384dbe5f47541e8935c SHA512 2604120f74b530af9f83a559e1b59e2169abb08d77650ee6b161840471ed9005b1c686f557d3435a7ebf2847652fa1bb82fde0c7cf92793a3a029892367e36ea
+EBUILD Mail-IMAPClient-3.430.0.ebuild 1082 BLAKE2B 4b0772131b69ec0d89d352ec9a6a7e3ca9a1e267de3c03b7c4b0a948a318b7dc6ed4bbf6fad69030e102dc21ae4face76199ce281d29adc693cd2182573dfcda SHA512 4b4ed5346432ea8c1e8c3d963c33e7b4099773679361c441bf595dca78ec3eee1c8f1a5285be4ed906e7105b239f8c86c8fe1595cb8e99726354cdfb2b07aff2
 MISC metadata.xml 1479 BLAKE2B c6dd142a9311a0e0d425ef22933e04327f24d53cb41d8428d14de58806be9a55be319382e1f07bf445c8f35d83842d915ad7cacbfc47621f957a8484985369e1 SHA512 9ab467eb24b4805b0b505cc0a4c950206281d65ea4868d2aa759c94457e1bb8a382ee7ac84627392f3e3416056da7e1aa87f0de810c1d9fc63d39628040ecddf
diff --git a/dev-perl/Mail-Message/Mail-Message-3.10.0.ebuild b/dev-perl/Mail-Message/Mail-Message-3.10.0.ebuild
index dae1f7a719a1..1a3f0e50b3c2 100644
--- a/dev-perl/Mail-Message/Mail-Message-3.10.0.ebuild
+++ b/dev-perl/Mail-Message/Mail-Message-3.10.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="General Message Object for MIME Messsage Handling"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND="
 	dev-perl/TimeDate
diff --git a/dev-perl/Mail-Message/Manifest b/dev-perl/Mail-Message/Manifest
index fc274de47c6d..0f0e6bad4887 100644
--- a/dev-perl/Mail-Message/Manifest
+++ b/dev-perl/Mail-Message/Manifest
@@ -1,5 +1,5 @@
 DIST Mail-Message-3.002.tar.gz 256679 BLAKE2B c73796e993b79d0692cb8abba520ef84c48afd04422a6d1802abee6633e1b49e90a63be63ac3d88c0731ec9a81754f423a03c0724015790f6f7755218e6b9e5b SHA512 06aa8903ab9f4275916981c4a49a63741cef15161411e6b56ed58e08d539d1e3572e8eaa0bb77b7140e55beb60b8bfc2b26381295b5fcd82bb277652bd86c09e
 DIST Mail-Message-3.010.tar.gz 258187 BLAKE2B 0827d25d3a7fb637596aac83d16d2b5297ce4d19a1a7235865018e949f48167698bbcd84a32bdb6303017756c4dfd595428a26021d4b24fb60ee3ac8a85c31a6 SHA512 aa2d38968cfe55a5688a1aaa3442fd87bc7b216ab43db40053f65f5d9bc6b397427a56662062c5a17dd6e62d86aa56c217a6394298e78fc64377feeeeef03771
-EBUILD Mail-Message-3.10.0.ebuild 723 BLAKE2B b5ab0c2a964d2c2a42ef2bf2509d64a9d5b48855759aeeb23134703cb77c6fa69c8b3979c70cd1e92091b50f94773a892c347d6f260085a65797f7f8bbc32c1d SHA512 acc18663feaad5aedf0e8756ecaf72fbbb12126f405282cef2d40f5cf41f5162add06ff13fedba6dd9042274fbb3d162d706d495ee1ec6bfbe2ec1c12f2ef8ca
+EBUILD Mail-Message-3.10.0.ebuild 719 BLAKE2B 9e42e2bb680fffb56b14657be2aa6ce1de25acb646636d79b95fe2e248c53c60af750b49305feaa551033ca43508cea075b5597b11d42d7b4df89c49d817bf28 SHA512 1d243dce4728435b76c42e93168071ce0534371502ee74057becf661c74008413775a2c65b485e8bcc577a620f3bc1ccb5c8afa579a8aaac20acfc3ee0bea920
 EBUILD Mail-Message-3.2.0.ebuild 759 BLAKE2B 473a4ad8810ffa32fd3cd73efdaefd229b97491e2fb771abf37f4e5fe0d2ea0e6b3b8b2bb75933a17c2ca872ecb5ccd2e2941be4f48c19c611702d479c6c73d5 SHA512 f9609d3b1a71ebcbc0dbe11760c4300dfc9ad3259068e8b450bbde5bbf46f82a6f69b6dbde6c374cc36939c2694b0bb83058954dbc63b4deae79d209463ce90f
 MISC metadata.xml 4104 BLAKE2B 32c96c4d909d8e304aa5b6441152caf008365c6ace938cac1d4ef06094a98b353a41a3b4e1ba10baae3ccb529f37b69915b9f8b512ee8fc439747106c7147353 SHA512 3efb09e837baf08d42c8835cd015f5791be493c282c9acf41f04a7cb989fe822786535928fbd1b74f9bad069b450e48266762bf56fe5f27d2d44eea49eb8bd01
diff --git a/dev-perl/Mail-Transport/Mail-Transport-3.5.0.ebuild b/dev-perl/Mail-Transport/Mail-Transport-3.5.0.ebuild
index dff0408ba2b3..71684b7fa47c 100644
--- a/dev-perl/Mail-Transport/Mail-Transport-3.5.0.ebuild
+++ b/dev-perl/Mail-Transport/Mail-Transport-3.5.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Base class for Email Message Exchange"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Mail-Transport/Manifest b/dev-perl/Mail-Transport/Manifest
index ec89e819eccd..0f92ccf04898 100644
--- a/dev-perl/Mail-Transport/Manifest
+++ b/dev-perl/Mail-Transport/Manifest
@@ -1,5 +1,5 @@
 DIST Mail-Transport-3.000.tar.gz 14839 BLAKE2B 5213d2b4ce042dba5358c4d70bb638e1c797d88564c7b4935d75e692215a10b2e8715b75d95499edeb2a0b978f03f97f6901447c1844e72f07c4b6705f031a91 SHA512 6a209aac34fd79141ce8559038a3e523e50338301391ff08e6450afc8494058afbe5c8930ac919a9e0c20227d1a3a5a08d7c6dd1a02641e94951923736772d4a
 DIST Mail-Transport-3.005.tar.gz 16470 BLAKE2B ae631369ebfcd2ff8c2b82b0933d8514509ac25b67eebeebab7e2b5a8379234a939eaf06efb1f8d48f15079f77f82f597825055d10fd1d79307d4fa12357fda3 SHA512 58e5b445207707cc259ce189d506423d66bd455c41c933ef3c5eb8a72645dd7f993276345a1be86658d5bab8fbb207eed48faecba6428b65fb48701c72585ad7
 EBUILD Mail-Transport-3.0.0.ebuild 597 BLAKE2B c834c58691eaa833f0d377a4179991d5693e5ba332037722d29b94c00edddce3deac567709fabc6aa1755c170429f1c5876770547ad14f7461e6d89ccdc470bf SHA512 64a79f5a87cdc45620a46ca588dce4828d6a6a140841ad9bdae72248511392067f55c44d564434802162c54bdc970e9fdb57b1f09e4b4d4d36a7be008cc5421e
-EBUILD Mail-Transport-3.5.0.ebuild 560 BLAKE2B 5467f44a28dd4e1063726f87d891f7f1a03bb59d1dc62f08aa362599dfa4ab6d4d6844c9f6a6a99cc3ce932c2a79cfd2fb80a07f9f72d1a47d431358c3c1ef6a SHA512 4a23b28b1c2e3e12b4dbab8c66f53700b05dde615b3cce547c676361f149712b7e859313112620d24e2a54b0484fd5266a1ccbd3348532c2d788fa98b26b667a
+EBUILD Mail-Transport-3.5.0.ebuild 559 BLAKE2B e5660c68f09cd223151ab3e73298617ebc51b5748fc989f59003b0e73d1b5e48e4c48ae575341a3d23e2fe4e1281c6058029573f91e81b7de2ab8079c0b0b01a SHA512 f186faa99a33ab916e01d915692ac32b7162891192d4d75b578baf0527b61ff25e555d174846ff0f5088ddc9a7d565d1543d8166ca21d0903abc1d468ca49594
 MISC metadata.xml 885 BLAKE2B 442e9fa1c9264e5307e061e12156a915f34552bc02f9f989d26b2e6b40a507d03111c969d05787b22538b9540ea8a010810571bcdbb923c78376ea20b1a1b5a5 SHA512 b93e90f114c72ea563182ced57f4240a9b42ca26767453f4577c0c2bc15e25c27374cce9aa9b77841dc88018a3698346cd703447e57823fd7f2bb2980e571404
diff --git a/dev-perl/MailTools/MailTools-2.210.0.ebuild b/dev-perl/MailTools/MailTools-2.210.0.ebuild
index c300eaa6aedc..283ded03f905 100644
--- a/dev-perl/MailTools/MailTools-2.210.0.ebuild
+++ b/dev-perl/MailTools/MailTools-2.210.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manipulation of electronic mail addresses"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-perl/TimeDate
diff --git a/dev-perl/MailTools/Manifest b/dev-perl/MailTools/Manifest
index 42f4280901a2..a11e8da70d0c 100644
--- a/dev-perl/MailTools/Manifest
+++ b/dev-perl/MailTools/Manifest
@@ -1,5 +1,5 @@
 DIST MailTools-2.19.tar.gz 55887 BLAKE2B fedfb8fcf94935746b3678b34ea52dc90722646ce28138990952325d8f94c26204fe8f0d1ae9ea541663b7a4875330a8006987dfa581457f62763fac64ab5d99 SHA512 a4ecba2acba56f2d41294e1b299c08b138d5e4796880635afcea7628adf60e11d5b138fc56001c331f765048bd91fa94da27bd7fdeedc51ff91e4ef5770a068e
 DIST MailTools-2.21.tar.gz 58013 BLAKE2B b3cc88b793c83099b678d90b79a97919ec6ccdc4ed94bb078ad1c8feb0dd164eebfd854bea4c324fe3fc5e431f3405eae2d6deda150045004daf0201e6094e02 SHA512 70c7e5760691a1fc0a2812c48a632896db9bf719d3cb07a63c3a4456c5a365855c7f71c7436c84e5085374628f26ad31fcf13e74b3b7242911da59b7916065a0
 EBUILD MailTools-2.190.0.ebuild 663 BLAKE2B 2cb9706f936707257d4276d9de0ee7aac8f56e123e947e78b4845de0a1cdafe51583a5fa3c4296f3e5968816abb7dabd1ca5a0786d790f19911030c53c6aa726 SHA512 529e54d7b5696b0d199792125032008a0923d903de3adb26322f24703d253c71b37eb376612f1eae74278e9f58a4f5c927478ea4827608ca6f55c4737abfb047
-EBUILD MailTools-2.210.0.ebuild 630 BLAKE2B 44ad1a023544b36c52aee7f1855d58ad341cbe77ccd4590ed7279728645391b8bb24af27946dbac07cd8fe2cf4ee01cb00e37315559583001ef52212a598440d SHA512 ef5c4c0b8e6f627438a2233a7bb3e7694a77e1e9e42c520792cd591913bbf29b8d824558679bcbd5d4babc441fa354f2bc7bbe094f5b193b01d7f6a0cc879f93
+EBUILD MailTools-2.210.0.ebuild 625 BLAKE2B 82cb22742f0e71a84f5ba36ed8c6776229f11bfcaefbb54aa43aa88fba8572c8eaded32a387b7b28f61bf5a1b8fede8dcb030f578cea0bf2955e2f6fcecbe8c0 SHA512 f1eed33fbfa9b6b8801716baf4b811e6443a74bb1cc2aade7d08f2e3bec08d2cb1c85a008eab09cf2a2139cd516020859ca258828a3a6ae192742f4c7cf84ebb
 MISC metadata.xml 1734 BLAKE2B 8f4ec9850270c7af488676002e89bda5cbbeeaa14516f865c2d0603fabacc1b560511a048b109dc823f412a8a84c9b4084a89259879580d881e42d5b9d441e9e SHA512 24fdaa48c4c5a36b7f77ae6d1fce705db6d53cf5e2280136fb10b24acf869f7ac2b006abfa51f8711cfc74b0204c4bfc06d4fd8e4b6cde04dc53e3e018b1cbed
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 0ef4547a8bd6..09587f3ab5ab 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 3ee8b2a50331..d5457aec7ad1 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 822 BLAKE2B a6edbe78c95bf650c524c502218caa56be4b8ffeae3530800a50a53da3bb5fc512bd510ef9d878212a21f9d7eb158cb4997b8a6941335b88f3f2019d6d6e066e SHA512 b5cec9941efc3e0bb4475d569418da70a679cd6854f312d91f21d79d63586f2a256215575dc503fcf9b0669068fa26312f5a887a8758483dc20178efd36a98b2
+EBUILD Math-Int128-0.220.0.ebuild 821 BLAKE2B 0e88b6fde4cc34b7593c3ab96587ae8bc61be3531de7b87e1d2726a36ddb13a6f4fbb2b928dd91addabdd2d39c821b9d0582e375c8d8aa85afbba99471552758 SHA512 512b5f2117282209920dab0b2518479ef96605554562451b93e1576c54e8603cd9f0d55f687c87349f423b63eb1961eded69b05dd660130bf1932b56f229d39f
 MISC metadata.xml 661 BLAKE2B 94d3c827ba28ab9d754456266a93208e374a8c667acc7cb0e9bb98bf5d26481a12c793878cd44dd581733e37f1aa6cb0eada9e5c0d88bf4a9805568f39b3ece3 SHA512 b6989c91f0649a9990a1f6aa226e73f84bd8bb98f6be08762d3f6c53dc09a2b8796da53a3518af8bf83952638e2dd3efa05af787825a06ac2132a1db6c8e3672
diff --git a/dev-perl/Math-Int128/Math-Int128-0.220.0.ebuild b/dev-perl/Math-Int128/Math-Int128-0.220.0.ebuild
index f39b06b1984a..80c11b229742 100644
--- a/dev-perl/Math-Int128/Math-Int128-0.220.0.ebuild
+++ b/dev-perl/Math-Int128/Math-Int128-0.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Manipulate 128 bits integers in Perl"
 SLOT="0"
-KEYWORDS="~alpha amd64 -arm ~arm64 ~ia64 ~mips -ppc ~ppc64 ~sparc -x86"
+KEYWORDS="~alpha amd64 -arm ~arm64 ~ia64 ~mips -ppc ppc64 ~sparc -x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="
diff --git a/dev-perl/Math-Int64/Manifest b/dev-perl/Math-Int64/Manifest
index 46b9cb26645b..7c76a448b86f 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 806 BLAKE2B a19ee73a0d077299f7453b0f598bcde2f09d72b7e722c027885ae23636d3535e46003fa8f9611f59f6bd5ee43a74426e90cecb3b96d45d64f49559f3a82f0c5a SHA512 843dde783c15fb9a9759e217c444bc0372741fd725185864b8fa27d2dcee87a72b913942c067057d33068989f0f7633d7362c4f0917820b24f79fdc220edd198
+EBUILD Math-Int64-0.540.0.ebuild 804 BLAKE2B cc5700ec799783a74371898391c335bed4dea01ed39121d1900008355ae9cb720959edc7772016193a16048f47121bddaa4c952885ce1f29896eb455ca9ecc08 SHA512 3ae27b03b5844dced1546b7887ce5307ff848c98cbb5fb654ed3a5257d38c969a7991b87e06868970b8230743dec8ae0257c360f1d9321208ab1c0505a7c6bec
 MISC metadata.xml 736 BLAKE2B 3255603a1c5ca9e4a8407465fcb6852a87889b36fd63d5f30345349342b8bfc6a2f3fc972ae337d82840df06821843ba87680240f3cb067c149c1c03967836fd SHA512 c2851a2ab205cce07705c67aeb63dcdedd8a548b33d496764cd8213e6898d6390ed3132ca4c0860a58220513d8936e1cc2e1947e5e9d76b7d4638573ee3910d1
diff --git a/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild b/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild
index 15da8d3a4772..d8cdde57beec 100644
--- a/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild
+++ b/dev-perl/Math-Int64/Math-Int64-0.540.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Manipulate 64 bits integers in Perl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc64 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Math-NumSeq/Manifest b/dev-perl/Math-NumSeq/Manifest
index b5243247958f..1039229bc2fc 100644
--- a/dev-perl/Math-NumSeq/Manifest
+++ b/dev-perl/Math-NumSeq/Manifest
@@ -1,5 +1,5 @@
 DIST Math-NumSeq-72.tar.gz 828627 BLAKE2B 20ef40f836ddfe3084c236a7eb9cb618aaa0844edfc4f743d7424cde2df92ab5ed1d919887cc52581baa4f203ab9f3641e8f64dd5e5f700ca8a46b69fad8c0ee SHA512 7ba1c69eced5adeca7cc0d6247885b291d7b96b09d256e652c207ebd034b8ceea477d4016a71f28f4247b8f5ba644dcaacbd9b358144ee06057c30b0bc1f0cbc
 DIST Math-NumSeq-74.tar.gz 839603 BLAKE2B 6d52670375a529050c768fad08e471025dcaa3f9e641f4c8d448b58cdc58d459d096a76ae4a94ed94b244b6b7d11f71a1fa11f1c0fc6c42be7dfd6210a86422b SHA512 2312b7dd5fcdc3e7be4a5575d999bdeff33eaa0e4742ee188298d0c362256c0f02b32d391f734d58c4f101b6590e3bf21c17eb789066d5cf057f1074195e77b7
 EBUILD Math-NumSeq-72.0.0.ebuild 769 BLAKE2B 393723d62a2d956a68c9f4ef0a2b60162fdcb7454a8cbce79d03c10008c276240988bdba23c689f724b345be8ef10abca6a24049f08fbccd6d9f1c00f4d51532 SHA512 50da2bf63651a4687c61c3d22627e1799ee5e69e57c902120a9c838fb510bac63c443ff437ccc6997ab07d651d163c30785a05b2a82d8141641516f111dd3325
-EBUILD Math-NumSeq-74.0.0.ebuild 739 BLAKE2B 16cf5b4d78ba37528a78e26b95dd1a4fbab7d4bfffe736d46efad911078e44e6c289160af8aadc7f68b4878f40129de4a62bb0df072cafa229e795d0a811af18 SHA512 69f71d722655deb9c77d17ae32a3920fc75dd52701e08aa9f86cb2ecf5e442ff68f56eeb1cdb193451b5611c8ff66a54ef758db968bd06cfe2ef7d9c18d240e5
+EBUILD Math-NumSeq-74.0.0.ebuild 738 BLAKE2B d3e22d4c828d6784446ec2f082dc7ab1f15c8d4a59026d3455ef4a0780f691a0b5becb8c475b92ef61ab81c5271bc5aef6c2e3546ad9e9b72f83bb30a1039a2d SHA512 8f580be7bf52e03d6e674a79147070faf64995049a727cb0d7833fcf2e01f54df3cdb1bc7338bc31e80c954221c991d86819863e962174900463f9c6cb264179
 MISC metadata.xml 9715 BLAKE2B 09be23a42f037734edbe3a88760cbeec0473493861dd391eb83c3ae79bc468b2ec6e8aaee94a3ea07b8eb6f02c9da50944dc60eae1cc444d7c4fea25539ed2c6 SHA512 b9f64b588b94112b7061c04f424c4c06f067c8509b924cca71d3e22a3e674095a23bd562448ac4187553417ad0b19e992e391e5493cd6e458c7935a0329109f6
diff --git a/dev-perl/Math-NumSeq/Math-NumSeq-74.0.0.ebuild b/dev-perl/Math-NumSeq/Math-NumSeq-74.0.0.ebuild
index 0b10c7c2872f..c771c2a82b98 100644
--- a/dev-perl/Math-NumSeq/Math-NumSeq-74.0.0.ebuild
+++ b/dev-perl/Math-NumSeq/Math-NumSeq-74.0.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="number sequences (for example from OEIS)"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-perl/Math-PlanePath/Manifest b/dev-perl/Math-PlanePath/Manifest
index 8281820a854d..424ee1df8eb7 100644
--- a/dev-perl/Math-PlanePath/Manifest
+++ b/dev-perl/Math-PlanePath/Manifest
@@ -1,5 +1,5 @@
 DIST Math-PlanePath-124.tar.gz 1308595 BLAKE2B e46b50ff23e52076024211ca2967e2e1449eb36dc946eb2214c2fefd582b7abc72098ca5049dd66d9af02333c21ac8f2246b931fe96e0e3594aa800f348114e7 SHA512 24e347134b64642775a5641b7c17d1ba1e15169504023d3f08463fde21dadb41357edfc1d7d07466160cb3a7cd2542e0b1a52a845132223a9473b73b32e31009
 DIST Math-PlanePath-129.tar.gz 1506859 BLAKE2B 21300bd5036b35f569f6ece8e331e79abca9ce3d1abb8cccad97e79888e858ceb7659edec70b1df99ce27e3b70f750c71e6644608926cd097964c3cf61291c9d SHA512 c5dc58fc9b4fcd6e82ab936b03acfcc65c980672b956cd4232db3d417aff359ef6e7e51859a2e2d548dcc161b8e01920afd9e5e006bd0f803cef8ddb8f780bee
 EBUILD Math-PlanePath-124.0.0.ebuild 688 BLAKE2B 2a8642e532f89ea60fc2d7590cfe897a7fcbd1332664ee6b385a46e4cf9bdc9ec2f346bd8072f312e1467a16f2555c6fe7226f9842da3fde397036ac57dc8370 SHA512 3146ac99a9028affd767c7a23868e22b288815a844fe3680c13fe8cfefd12a330aac050e57afe229812ec78d8385834fdb26a77bef9b735b20b703ac9ce7055b
-EBUILD Math-PlanePath-129.0.0.ebuild 656 BLAKE2B d53e689ec83ffe55c5e2806de8ef83282c9d1273f5ae69f8568636310ac7c7df5122b1377b56e0a1c0b7755bf23bc481ab007881ee6c6a916b3ce8df93c99898 SHA512 edc91f80f35ab86a0a224e974ba7f3780898dcbf07c658f31ce77a65c446d1a95f9193b58e14e860cf44c02a412bb5fa623d41dbe4a2be0aad1a0f1705dce800
+EBUILD Math-PlanePath-129.0.0.ebuild 655 BLAKE2B ac42599b1fea8b3f8faa80c7b240dd6f7ff20af027f3d6c8e08b70a8c216157396695de6a33754de9f7abc12965f7faf28a12bf6ac432c71fe8b80a3ff6d1bcf SHA512 c1c9ba1de500fe942c71c5d9b20709b965bf11f89372eb16ebd7ea0659845bb39247c17523b1ded97b13eaf4af44a3a36d8ad451fdf29274c5b89b60c2968ebf
 MISC metadata.xml 10618 BLAKE2B 190c2f1699b1f0df8b2336c341173eec4209252a0349be806a7d77fdf61a2a939be821ca331b777c4dc599422aac22aaa38766cf4ba2f3323c1afcc51795987c SHA512 4b4d610aae3b1c59bd5faecbd865d0d3a7a5c76f0cda7cc76a1254f0b180d1c89105e7d7f03752ae8005d95265d41430b3a2e0bddf807fc31477cea1ca2b8255
diff --git a/dev-perl/Math-PlanePath/Math-PlanePath-129.0.0.ebuild b/dev-perl/Math-PlanePath/Math-PlanePath-129.0.0.ebuild
index 0e44b738d0ae..f9495143f0d4 100644
--- a/dev-perl/Math-PlanePath/Math-PlanePath-129.0.0.ebuild
+++ b/dev-perl/Math-PlanePath/Math-PlanePath-129.0.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Mathematical paths through the 2-D plane"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="gmp"
 
 RDEPEND="gmp? ( dev-perl/Math-BigInt-GMP )
diff --git a/dev-perl/Module-Build/Manifest b/dev-perl/Module-Build/Manifest
index 0e34194cbe77..dcc6133460f9 100644
--- a/dev-perl/Module-Build/Manifest
+++ b/dev-perl/Module-Build/Manifest
@@ -1,5 +1,5 @@
 DIST Module-Build-0.4224.tar.gz 304181 BLAKE2B 6cb44d1c24f74ebc5c8b0b353b7a7e9ef0d89bd39c45fd610fbac2802ae5630a7dbf61b179719502a419f2afc5e65988fb09f516fc1deb57b751a76aa5275fe8 SHA512 c08e84c542a882aa16a682a81cbb7a4860774a3f6a0ec2e720ba9e9bcea76dab331999fee86bf8b92edc08560d7cef4a7c2dfa4e626ab9b22da965e715af531f
 DIST Module-Build-0.4231.tar.gz 303466 BLAKE2B f35be09072a2facc505b199dd69cdb2605ab32c34376ef393170dca9d67871bc00cbe25b1fa6dcb925e92724a778ad5ddc3157afb33d18a10648ef1133c83991 SHA512 ee1dc18a7df3fe67e7f954d5e1e071aa0a6f5bce6783b768bceb01f071e64ac8be63f410c932c7c16764e5d4f52fc664ce11a12f26f6afc75a26f79883efad70
 EBUILD Module-Build-0.422.400.ebuild 1167 BLAKE2B 0fbe9812f23fa6165e2632abc511466afad2a998f0f796b65a586c023db900d088334daf740fb77b7c7fac5265ad145079cd3cb63b16f0ca8d1711682dcd3e08 SHA512 bedb68e5c3272704b493a24acd2dbeaccdb827918916f0e84dbbe6f79b351715be5345e22296ad637625a559f77a851df530b92db36599e043591ff062a8d45c
-EBUILD Module-Build-0.423.100.ebuild 1140 BLAKE2B cf36286d00d4926d39f80f657b96bf8d1f0c5914fce3af3cf93f3c6561adab4e35828cda2f3d55501c1998f70b6e7791de3a36f3abaf83477770a411a1fe47b2 SHA512 5888021940bf13d24231618d0d7c07e2c4be28b3bed416ec87f9d543d521cc4dd8bbbe86dc1fd6439cc4bf393d395b59bb877accfccdf40fe7df6ea18b2c857f
+EBUILD Module-Build-0.423.100.ebuild 1139 BLAKE2B 9f7d7e15ae7ede4daeb164be8e92df39493d7916e93e3e1d5606ea3985e57fa1f8c7b81aebaa3966a5f19b0493f5ecc7d328487103e440960de28a772f994778 SHA512 d78698b291dcb81d8a969fadefe81293473f0b73b24c3304cfb35a4e3f01d2aaa5ea234d1b69295fbe64079bd8bfb0ffdcf5aa44f3858c2fd5184852db576398
 MISC metadata.xml 2353 BLAKE2B cb008d3f8345013ef6d4e0e1f036213aacb1a181a6416e3cfce3a5052302b2974851279aaae8196ae222af0c540f40f95828bbb9f8c8784f2c2c41a7b54e238a SHA512 e170d86885692146c78d954ec8d6c647ebc8849ca0642b462b4245943e79a25e33415c1a8376e46247e74c48c13af2c288b172aa0c066f592d01c50c00f1f50c
diff --git a/dev-perl/Module-Build/Module-Build-0.423.100.ebuild b/dev-perl/Module-Build/Module-Build-0.423.100.ebuild
index 03f8de7e63f8..6c5e2b0248a9 100644
--- a/dev-perl/Module-Build/Module-Build-0.423.100.ebuild
+++ b/dev-perl/Module-Build/Module-Build-0.423.100.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Build and install Perl modules"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/perl-CPAN-Meta-2.142.60
diff --git a/dev-perl/Module-Compile/Manifest b/dev-perl/Module-Compile/Manifest
index 5619812407ec..e261de29aff6 100644
--- a/dev-perl/Module-Compile/Manifest
+++ b/dev-perl/Module-Compile/Manifest
@@ -1,5 +1,5 @@
 DIST Module-Compile-0.35.tar.gz 34716 BLAKE2B dca3551920f68863191bdb1d255a3fef3421ff14914645077146bf83b22192feb78cedd877092f8904dc09a99aeda8d1ea1597637c36391b345c37d3fbfb8a71 SHA512 4115277ffb0da033c6c7fea6480c7245c8b5eb151378081fefaef35761b92a4218d56e8e1e9a4892ce78a379592336badefa2de56062d9e5b7024cdc35d3e46b
 DIST Module-Compile-0.38.tar.gz 35482 BLAKE2B ef370d091e63f39803b70b548089ea7ca1664be706effb33229b740b154a0d17f891b2c0851f1c69632a79f4079f7c0a205ac0b31e470d9e8567b9c1fc42548c SHA512 50f17cf6e88f9834d69944e64a46b2ca260824220cf09fe962c29dd36a8d0cdd7a2d59c7e0cf360a7fb506252cdea3b13b99437e443735b35c7a713a0bea1f31
 EBUILD Module-Compile-0.350.0.ebuild 405 BLAKE2B 89c5071798447f5cd79811b61315001a7516d357465a782af78fc391662ca5a8784f2208248260b0e5f9074948f20dd62a08c4cb47ee7d9f785b9cc552f140f0 SHA512 5541447d171f694d76f4ba54dc028f1154074ec99d478133b52104559b091644f5650c0de0fcaa5c141e9e6ad49dbfd980e5a60530435cd11709c284d50b60e4
-EBUILD Module-Compile-0.380.0.ebuild 411 BLAKE2B 79ccf2a5e174f4cabc3878951ee71c9861f657c3d174cef0e30f1fb703bb16f353afce80ded7c916c0aaf9825486e5cf9496b1db2ce676a26738db50045849c6 SHA512 2b190518a4bb7bbe8e8b25dadc206bef81cd53891af3ece68e93aaf5367b428a45db798ad0f7923fdea9ef2c08275cf899694638865b519f980da4884bd2e67d
+EBUILD Module-Compile-0.380.0.ebuild 410 BLAKE2B 47373ef4a67997ee37a8ceb2411f9fd65100ea8d24397b8fc33056e08e5460801e4d355051fff17fa8495070dda0ba8f7ae0bc87e0e5b589990ba99aa55f1a32 SHA512 d40f4c7bb1fb634a00d75ea0eb1490c524b28fed7194f3b63dd5fb931329ec1e0ad0c4db586c4fada917e73f1acf19e3ab9b84994fe2ee420fc446b3a88ae4d5
 MISC metadata.xml 514 BLAKE2B ebd658740c0f042965dbf6a38c938d035aa4382a8a54f278b4297c147e00e3a2cb15359424c61e3f7133f2d836148c4731896abaa4636aff788be15c369d7add SHA512 dcd5745ca8bec9375d6cd486e56ea0509b2e36c558b25d95040d8e75f5bdf675b04c4f0035eb529be3c77b409936b7d1120da66b61cc29b5f9663fe2a84a16d9
diff --git a/dev-perl/Module-Compile/Module-Compile-0.380.0.ebuild b/dev-perl/Module-Compile/Module-Compile-0.380.0.ebuild
index 790fcdf797ab..feb4c8896f10 100644
--- a/dev-perl/Module-Compile/Module-Compile-0.380.0.ebuild
+++ b/dev-perl/Module-Compile/Module-Compile-0.380.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl Module Compilation"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ppc ~x86"
 
 RDEPEND="
 	dev-perl/Capture-Tiny
diff --git a/dev-perl/Module-Pluggable/Manifest b/dev-perl/Module-Pluggable/Manifest
index c43570ec420d..07497f51ac4e 100644
--- a/dev-perl/Module-Pluggable/Manifest
+++ b/dev-perl/Module-Pluggable/Manifest
@@ -1,3 +1,3 @@
 DIST Module-Pluggable-5.2.tar.gz 26920 BLAKE2B 061ec1353ec7ea8fd00e503914f8dba283be47ca1c2ecfa237ae985e8c099228dc949f66e2f182729378c578b25417e7c3c798f855b4bf1b5194f62d513a0f66 SHA512 7df8ee6713c8e0d4df756736c43c2033632cb8887c82ed5b9f38476dbf402b5daa3af83d3b2bd1228afb020ce5855831812f86299b63518e04e0929390b0c5f5
-EBUILD Module-Pluggable-5.200.0-r1.ebuild 601 BLAKE2B 2c8962e0010153c91f304c60dbce951964fcfdca3f626bb8da297c16dc35f304ebda8b3fb9b1be33b854e7b98ecc242191dd6662b203113cd2757aa9d659dd22 SHA512 d6dcb5d020e7dfe899c709e2dddaaa77d470c1d4716b362df99b359fbe99503a5e4fb9d2ffbd84191eb353977119a56fa374724c310a438069196ec47ce2b3b8
+EBUILD Module-Pluggable-5.200.0-r1.ebuild 600 BLAKE2B c9557bed45496aa2da18eae3bdc99c07a5e8b6e8e1165293e17343ee7ef07d81f9e1bc2b61f20c83c056b78049191fac37da556cadb85061a764905389d1d00f SHA512 88bf4fbc9af1a6874852ab4d11a1fcd1fc8824e735ac8896e8f6ab32ccba0c9aa138f19a60115ab4ff013c469bf59ee17ab2369c3f3d900705b3e0d5a04b1e5c
 MISC metadata.xml 542 BLAKE2B 0ced543ca277446ae494855819e6c5aa3c6d2d2f99102bbea8d0f0eeb9d0cb61dab3a2cb001d2f898b22d2a9f6af21c1f687b6c4313080bd7933d33688309a2f SHA512 e4c24921dc692f77272596175897da215580e5cf3f2d7bc64bd2f7e3fedc17a3d1b78ca4eb8cff151ecf5c579e47e81e2c654f6d71c201f9e7c7b28e278d3a3d
diff --git a/dev-perl/Module-Pluggable/Module-Pluggable-5.200.0-r1.ebuild b/dev-perl/Module-Pluggable/Module-Pluggable-5.200.0-r1.ebuild
index 21ab867bf6df..455fb4041d2a 100644
--- a/dev-perl/Module-Pluggable/Module-Pluggable-5.200.0-r1.ebuild
+++ b/dev-perl/Module-Pluggable/Module-Pluggable-5.200.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Automatically give your module the ability to have plugins"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/perl-File-Spec-3
diff --git a/dev-perl/Moo/Manifest b/dev-perl/Moo/Manifest
index 7610a55421e7..1e0089298c11 100644
--- a/dev-perl/Moo/Manifest
+++ b/dev-perl/Moo/Manifest
@@ -1,5 +1,5 @@
 DIST Moo-2.003003.tar.gz 97527 BLAKE2B c23975f64aae881e6e17ce899b7a2f393d52e598e0d46cd199633f9ebacde81864899ed5cf1a429ddc7811a06f97f93ae537f82a22683d9409148f084113a49e SHA512 f1b2aa2f3dee8749cd2c772b65b8c48dbf67358e62dff856d980422e87c74751013376f82488bff7e8b8b0a707c54cedce8e0da873904b712138cba2c9a7f1c7
 DIST Moo-2.005004.tar.gz 108339 BLAKE2B 9b61a0a4867e72e277b56f684ec4b723c264cd5b87e7f38018788871870d36fc37b11e112138a762823c6aba68fc2c96d6fd6ead26c8a8f22ac432a06e8e58c4 SHA512 a1335d180cd19dc7189bc1663efd5a05650d579c5e5d049fc4059a382d1eeb882fdd9cd2b107fdd40499e22a5c6196fc47c1334145101def531e5f5fd3cd0edf
-EBUILD Moo-2.3.3.ebuild 836 BLAKE2B 7a513c301a09e0998718236d094b0a241728225d5affed6948067fd0c0d1b967be5e5c3040d19d98e5f0e6e8da8c94a5b2cc14764d8bb4442b5bf2dd7f50feed SHA512 fc298b2fde0056a22aea11f9ae0c54528db2f72ed365b524813a09e811a8ea7a52c5c485024d9f4354576be58810bf08c5c72d6f858c1402548e35aceaf4738c
+EBUILD Moo-2.3.3.ebuild 834 BLAKE2B d13e0f7feb8676b93fc5620f32005bb6975d5e4607f235b58e7f9ac9c87ebbf4ed08520813adfc755f868411c53ccf74f10306434a93a47f1aec520fcb9fdf7f SHA512 c068de896494993d19d6691cdc531c026e5890fdb91617142fb32f5b3a66c39120e7aa9ffc9041a15e6fa656b1b7e84292164c82960f4ab87ddb06ba25ef7189
 EBUILD Moo-2.5.4.ebuild 737 BLAKE2B f39f1ecaae881e8e8cbdf9fa6e690d3f5cf6015acbccf303f92e3d6b69f8b4a95869cdceb127cde2048ea9060a7f2583dad1e746ed98b6d53450d38c8f2df12d SHA512 062acfabcab8ba92261588f8d0a41e86c996002a989d46c010bdb60dea06fc505d261030f474ef753985ea80af9e2b71b03e74940e3b4baaebbc3af01ee5ddcc
 MISC metadata.xml 1197 BLAKE2B 7611199f57b617634c1aaeca3184d66f3f445bb700fae40ca5880aa8e654f7fd1f90f03fcdbef60ec200cd6e3a5da0f6b385628c15a1098219b6bdd9458eadec SHA512 1baccf32ca49e459aa24ad83ccd3206630462181219ad5981787b42f70591254103231e26065848716b52e579c2b09f471b559dd54925750e80adb9494c06a28
diff --git a/dev-perl/Moo/Moo-2.3.3.ebuild b/dev-perl/Moo/Moo-2.3.3.ebuild
index ea145312a52d..884203f5a7d0 100644
--- a/dev-perl/Moo/Moo-2.3.3.ebuild
+++ b/dev-perl/Moo/Moo-2.3.3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Minimalist Object Orientation (with Moose compatiblity)"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Net-Domain-TLD/Manifest b/dev-perl/Net-Domain-TLD/Manifest
index f814127ac4c5..2297a30371b3 100644
--- a/dev-perl/Net-Domain-TLD/Manifest
+++ b/dev-perl/Net-Domain-TLD/Manifest
@@ -1,3 +1,3 @@
 DIST Net-Domain-TLD-1.75.tar.gz 39719 BLAKE2B c6b68374e7d738d4bb73e0a59e291c9adb612b8c1d3ae25db29563e5ff9566757a1fddeaf5a3973cff4f4d890d0038d56f78c267aaf19eb91e6a2e1fde300123 SHA512 88b090f427e7fccd8394059b643f260a83fe9ec3fd6741972ec388325bb8c178d9d89fc8da9b1338441972e6744117c4effe3551c2c3f95d52022496667fa4f1
-EBUILD Net-Domain-TLD-1.750.0-r1.ebuild 541 BLAKE2B 892b0f7226129f105c2b0223d1f35950887c22cf614c710d2df2831384b507a904505678c94e0acbffc4a1ca3c04dbca1a8e2b9afc9b513dfa13da5ab51695d9 SHA512 2c6b1dc46bb69353b26966c54c10d3d6a8e08c0081cbd5ec20945a6b942fc6da6a9643875913ef764c07799507cbbd0bc77909f6f267bdd961ef3fae3801992a
+EBUILD Net-Domain-TLD-1.750.0-r1.ebuild 540 BLAKE2B 9c7980d5393d3256c08d74bf671034a051e6007f550b9c68fc4663248bdd80093b7a9107451a81da3d76e039615385b9725c3a2d041f6791121f948d6aefdd36 SHA512 f47ec4578f9c9fb25c07b32a30f6c9e7dce86be1610001f0eb69b1c68bddeeb20020c66d0a500137110cd9507198a113e88169344d1c4384dd4ecf9d22a175d3
 MISC metadata.xml 401 BLAKE2B c448963ce478f79c767b536e41758ff64db2d0976c0f2384571c2edbc2a697d0d5add70aae603946823eb9f5fcb6fe9436a6dd5c7e08319b29cc93db9047c21a SHA512 2843912ba604beb75b986da3e4c24ce959db67bcbd069cd47dfb535f3aeefe9209d4381b705bbe1996617fcb438c432699cab9f85336ea65436e78b174ae1a6c
diff --git a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0-r1.ebuild b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0-r1.ebuild
index 075a5f7c62ae..3b13c32196d2 100644
--- a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0-r1.ebuild
+++ b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Current top level domain names including new ICANN additions and ccTLDs"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Net-Jabber/Manifest b/dev-perl/Net-Jabber/Manifest
index f8ed5fff7a62..c1dd49494a3b 100644
--- a/dev-perl/Net-Jabber/Manifest
+++ b/dev-perl/Net-Jabber/Manifest
@@ -1,5 +1,5 @@
 AUX Net-Jabber-2.0-hash.patch 680 BLAKE2B 869fabdc2d107a8a64d606d2ba4d712fa334bae08b0a32760263b4ee2be7427e51ee0204b6736b44461c56e2d39932656aa3c5ac2491bf957d1bdcb00690889c SHA512 55500cd592d028f3ae211ec441ebb246265bb25d1a34122afcd14bf5b5aee93aad1d07e5b7a787f4d2a717058d95bd41ad5add930c69e3aa9e4bcc7a3bbcf3ee
 AUX Net-Jabber-2.0-no-dot-inc.patch 18091 BLAKE2B c22754f61e5467d0a1464181d529cf3cb57f28e3f2ffff071b8b3a7b71087204e996dbde35087998f04130744b525463ec67bd436b62302e5c64893e9aabec51 SHA512 8c31a256e6c8d638f7f01d8490a2c3c5ea813d55aece342317b114ceaf0c3b5a27779002483005f3d37efe2c95ade2c59f7fb894d5991bf38cabd660efe290a1
 DIST Net-Jabber-2.0.tar.gz 112416 BLAKE2B c8cd86949a934650464ce8dc4e5eb5c12bdd0323caf18773a73df31f72ee6a185d963e43ade22c15d5f7da73f0c5a52ab2e67da478157d7829ab2aa83610fe47 SHA512 2ad275fdef8a7ed17dc464f692b974e71bc3a5df5239943cceaec9509e6454945023e220ddfb42763e18813124f6b7f2d6d43faf3059e0680b753486961a1b4c
-EBUILD Net-Jabber-2.0.0-r2.ebuild 502 BLAKE2B 334c4161b8e1edf66ad8bf4ec6185640d82b10df2b44331093d538e37275122f5b527c94ecbd5aee85c6173faedd7b5b52d721f7192d0c0a1d72b1f2c8cbed81 SHA512 3024fb4f4b952894c4963881e0b2eb474a9125777bda35938f24115dd036a6c7afd3c5d99d964f2cec41404409b7d72c994729f2d48f7e712a141a0ff1faa174
+EBUILD Net-Jabber-2.0.0-r2.ebuild 501 BLAKE2B e6cd27acc4ad3d83b72cd2342506141b463ea15e9c90113b32be7ec5099bcd7327033c5167a395d4041fdb1b3406e9046aed98fee305a49183693a06aeb62866 SHA512 51462f720ea4c8b3c3d9a70e3fa6e4451a0fc48e79f6422c605832d8be50178e3d1ec72b5e013806c64d5ff3dc73493387c4d54a945109588ac759cab93fddb1
 MISC metadata.xml 1595 BLAKE2B 298932e0ffa8ac325be6fcea585343bd9855292e170e8483d8a1f53965807f21705e452dc64a524c302cecc8088149165e4e99dcd84cee2fa47a0c8ddc66e50f SHA512 9738ba4fca9b95a23888d6936b0837e08e91fae227209e1bf4b73331544ce8b17c5551bc382779a892cbb00df56bcf525a66d1921e99ac43abced1d846deca85
diff --git a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild
index 487c56d1b317..ed15d599fd18 100644
--- a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild
+++ b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Jabber Perl library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Net-XMPP/Manifest b/dev-perl/Net-XMPP/Manifest
index 62e132d39a4b..7b4999c38cdc 100644
--- a/dev-perl/Net-XMPP/Manifest
+++ b/dev-perl/Net-XMPP/Manifest
@@ -1,5 +1,5 @@
 AUX 1.05-no-dot-inc.patch 3578 BLAKE2B 7fea81108b326bc20a3bb804cad1a75dd6d8ae590bf392612f2745c4e95cdfebc73603a5b3178f74846372e5dce8258974548c63a53a3bbd329e8e38e1e0bbce SHA512 01c8572fdef916ff937d36356d308c441cb2512f34fd1a5e2458b02b9f9c79619addea75b108a5030668bb50f8f086c9f4b51faf1e7e16722d535335634ec405
 AUX 1.05-no-network-tests.patch 1569 BLAKE2B 68d736865c0f727c03b64ef1dc8654a903f8098056fb9d7b1975ebdb5f2b4e0c7493d712d2fe35c1bd5533e60cfee475e321b37b24f3d7d773df0134aa7c2a5b SHA512 a51cbbacd06b94a94881b5b36164d596d5ee2d9818fc1ae544ddc7468cb92f0c7041863cc9aad4eb16c9885bf4b946e8bfc9ef7087280417651b8c5d7f79dc56
 DIST Net-XMPP-1.05.tar.gz 103876 BLAKE2B 5ddc98125b26518c59aa4ab39a974b9cbf1575bd59bb66d5329a43e1d5c3d150f34cc93f545f2cd56846e7b4e46142c47aff7da9b279181a02a57bf95ff1757b SHA512 cdd5474fcbdf7ff6c7d1247f9828f5dfb1828c258af366a831bab8e5faab423b73aa16c34228818526ebcc3180ef0ccc52d6e6cb61e2fe689458b87ec7fab699
-EBUILD Net-XMPP-1.50.0-r1.ebuild 774 BLAKE2B 913159af15306aea67db2fcb1075132c43ed597812b547a4fa0fb606f9d9179a9f30aa47f49f99694b7ece2f248d0fcac9685145dffbb0ac5475627b176e8408 SHA512 dfc3f1f51489e455a40f06a0510b5777cb18e6639c9623c99bd18907b62739fb95dc753e2d9d8a78134b15e22a32f538c4bf4d9fdb17b2400e30519696402355
+EBUILD Net-XMPP-1.50.0-r1.ebuild 773 BLAKE2B ca7745f833437a41a6b4bd527fc81f905db19e8ccddaf2a80e4cde49082b7c87d3090ccaef12306f8cdc4975c7e004aed9ac3e6666cfe11c2fd23cf4f4d02d06 SHA512 99ab020ed338b77ce7d24d42916181a1653cfe77de9b1d15a3a04a7f5aa98b9e299ba6fd86119a90f9a7c3e884d11096cf659c427acc8f50e4d77ae3bf324a07
 MISC metadata.xml 1305 BLAKE2B 2ec03661e185b80764b28cce46f08bef4817cd3c1b2244b8222c1f5eb507afd77e143d7605b38cdf221639b8b1f13a959bf42dfce3da0cb0857e3112913f74f8 SHA512 4a016ed35a0d553609a3ce69b71095c00064f39a1960dad6bf53da42d3d9e65ee4fa7256128b5af2ca40779a69b28ea02286b6b0427a9692639fa8575c9068bd
diff --git a/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild b/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild
index 2a739dddb436..adb3752731d7 100644
--- a/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild
+++ b/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="XMPP Perl Library"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-perl/Authen-SASL-2.120.0
diff --git a/dev-perl/OLE-StorageLite/Manifest b/dev-perl/OLE-StorageLite/Manifest
index 775c919d42b2..6cebaff4078f 100644
--- a/dev-perl/OLE-StorageLite/Manifest
+++ b/dev-perl/OLE-StorageLite/Manifest
@@ -1,5 +1,5 @@
 DIST OLE-Storage_Lite-0.19.tar.gz 21952 BLAKE2B eec82ca4dfc28d82d3e709d778ba9dd693632d6008344ca8164ad32856790c8d624e5380cdcff32c9d5d734634d96e42025cbea51aeba7d96ee52397f93e553d SHA512 d59030ccdd519e14d0e84dacdce7a627d71d53c755c8aedbf903a3b78ba769d0b98fe6e813eeb8e6c35e45d5a1c19d519fa5792b183b8b2ec1de8fddccaa534c
 DIST OLE-Storage_Lite-0.20.tar.gz 22586 BLAKE2B 7cbcb9a249a3d7e131e3aecd9821cb57242230f14b3058ebaed0d956d2d4ecc2e7f1d7aa40aeff01ff581016beaca75ac92456923b98dbe7932ec37374ec678a SHA512 bcf89c561e02c850f6d5d27705dd671f0294e4a903cf7863f9dbf536203dfb3148ca4fa88ef91a429b96142bf1ae040989d8850fd171448e0db5dc9ae7fc1877
 EBUILD OLE-StorageLite-0.190.0-r1.ebuild 469 BLAKE2B 93f81fc37ff66a4e4ac5dfc58db0b0caff82d8910e8cf1a057940bbf4b15de65b1be5572c703c6aac2c2f0053f71f525202ff9d895cd003ee75e8bf3523c0923 SHA512 d091ac8005fc10618000037f2ba439fc1a7a7d89a4da5233be1be852cee450af77b208c4f545d0d5e5fb4f27b850badbb4f39db9fd307e74cff97e1799fbdcfb
-EBUILD OLE-StorageLite-0.200.0-r1.ebuild 454 BLAKE2B 919a8635763e0bb5acc6e699a92d87b3aaa4a6707f007f99ee380a8fa4a6ce93504ea4d9df5659c86f5e19808904839743b2b0687686486f428866dc0b356e55 SHA512 5500fc7015a7fe478b921687a19e60916dba8a3982a73949659bcfde744fdf7737718dd4c8c85fa2386894bf33a3b6c447d8d7904f976325e3ae2cc320c89920
+EBUILD OLE-StorageLite-0.200.0-r1.ebuild 453 BLAKE2B f059b19d7ce3037a1e91e74f6484eb8481e80ffd1683797a6e7965bdfe6c76e99019abd97dfa42b9e08ff4187122fad55c14170ff3e5b675f82c5f20fe80a269 SHA512 c50e8ad9c672463e6760c1d68004b9ce8fd4af147422c65e5c99ba17160b598c1391c6d9c9b9d9789664575ea4123f84fe0267399416c186f9dead90e87d3b98
 MISC metadata.xml 697 BLAKE2B 56c4bfc48ec655cc65dd586b208d40a8a35b30c88258337613b8f814b303398225972f66918b28bb288bf460f97ce415a12c5c10caf1aad8a5f4b94faed196a1 SHA512 ba17c8b1852db1f8575304e726d20921b69e42dca2c1bd05a30b7cf5af3e1845ec818e4297f72d6a98d0f40679fb6feec5d9fc7781e0383abea4ad365a0ebf9a
diff --git a/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0-r1.ebuild b/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0-r1.ebuild
index ac7a1e6b04fc..214b4ddcda5a 100644
--- a/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0-r1.ebuild
+++ b/dev-perl/OLE-StorageLite/OLE-StorageLite-0.200.0-r1.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="Simple Class for OLE document interface"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-perl/POE/Manifest b/dev-perl/POE/Manifest
index 559a89cf7db2..e5354945b80c 100644
--- a/dev-perl/POE/Manifest
+++ b/dev-perl/POE/Manifest
@@ -1,5 +1,5 @@
 DIST POE-1.367.tar.gz 381473 BLAKE2B 42e6a99d4cbe94b5474396ade8dd2ea3168ba774d683023b30890b46a395104d304482a605072383b3fe97a3856a396c24b2d909ad75ac2b1167bc1ed59fc3ed SHA512 94a3ece46a7e573018fdb3151110b1ed7604389d030227169685d38afdfa69603ef55fe8493368645a9f6f1be432fb253cb4568c55190eea33652881a0b4a4fb
 DIST POE-1.368.tar.gz 377702 BLAKE2B 5de20891656c5107541964841ae8db9e03de9b8a636911aff2a03d9155194760090e0ec59714564a4f312e2b4aaf6785ff9d547834aa8a4fc098273d37f3f571 SHA512 a8a4e885101372039ea48aaeac3de9fcef2db34e90216b2e63f24ea681cf1d86cd701d4b59e6b000b29f85f600655e29717ab1501d053acaf6248b1cd8f341ad
 EBUILD POE-1.367.ebuild 1303 BLAKE2B 55be9df113f7a5260241f05835cc55257bd77f989ac69fe02742b8d728c222e913ec96c2aa77c7515e636145a739d212b70680eb855e5ed1351a8ebb09436096 SHA512 eccaeb16469fe40faffca257275f8e15fc17ae02bb750e2d8ad7435bedcf2fc40f81e4ec872d7ff1ce92c94597f95e2d9602d7db4323b4b18f02b665828e8ddb
-EBUILD POE-1.368.0.ebuild 1247 BLAKE2B 016683a49f396a688f149817a100c859513df80903cb8a9cd9b2deaed70a61d65eba1e1e9aaf7f2a885e6c5c27420fcee7183c53664e8a80ee2ebdada1b9245e SHA512 a7ff104343e402fe8ede5c723ae714d3c2fd9bfb794b34edc2b35d9e3420d4f092939023bdb90a28b6117be4f74ab0fabb6e887e840287d5ff2b684acebd5922
+EBUILD POE-1.368.0.ebuild 1244 BLAKE2B 67e34e1c742e24bfb5a3a8ea31985722f9a182a4e68d04adfad18f13b598ec9863da957e04e5ecd8b7a3269ef9633361c6e4927a2914240b7e1dee54a08ccdca SHA512 b1880d21034decaed19857edd769696c344b07ba5bdf2aa979db7dc6deacaab4cdae45352aa6829e9a7f5f5101eada8a15f36437b6fa8600d54f2fb0eb8777c7
 MISC metadata.xml 3305 BLAKE2B e516e7b0bac63cf2b82ef50c98a85361619e45b83d4f2a46f1cc97237b491e50d2dce9837f0265f9a2386ca3792f6c7979b295057c124b0850f4689987090818 SHA512 78059683164f2ed7e54e0b8c0581d7f81c1f7fdaa2b34e64cfa1b51720c67f70a3950a52ef0a0bcdb2fb613ce852707c6f508c9148e08d247937d271c392b3b6
diff --git a/dev-perl/POE/POE-1.368.0.ebuild b/dev-perl/POE/POE-1.368.0.ebuild
index e0719a13359e..011259e60a12 100644
--- a/dev-perl/POE/POE-1.368.0.ebuild
+++ b/dev-perl/POE/POE-1.368.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A framework for creating multitasking programs in Perl"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="ipv6 libwww ncurses tk test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/PPI/Manifest b/dev-perl/PPI/Manifest
index 6da78e9ffb3e..6a38db6079bb 100644
--- a/dev-perl/PPI/Manifest
+++ b/dev-perl/PPI/Manifest
@@ -1,5 +1,5 @@
 DIST PPI-1.236.tar.gz 257245 BLAKE2B 7f49ba8baa67b6597b774420d379e832412f666995701e5c6ab56d8ecbdb7a2542e7b2bb18ed76e944ccd47ba8bda970d0fd170683d9236f20991902eb401f86 SHA512 93a7f4059b12156bdcba77958c17841ab43d85cb0045d0c58d087d6e637e09e253a559cfe465d9d8699329098582759cb8381978c121b9661a9a755e919dece1
 DIST PPI-1.270.tar.gz 251100 BLAKE2B 8b31c41c5fedd9593466dc2673de6ab8767f04578af09b2008984f6d76c71c404e506ac4b9fe7adcf996f5cd01803203c9cddb84fd6e99f87799804526a533c4 SHA512 d138db281c69fc8bbf53174df720e97633e7fd35bc77a24ceeb164277a69a5aff2629a66e7d898d62db270333c87f998eaac23a9eab7ede76dcfd43d2c546858
 EBUILD PPI-1.236.0.ebuild 960 BLAKE2B a25101bae33b7d6987b8e60fd797b065312d05bab570d98cf42eb499e255715e400d220542a3b13aabe91aaafd130b66ac13948da67165d214be61295838c556 SHA512 ae5ef91594ec4dfa456c71748a47e792620cf3b5f7bc8a4b28efbe6db26e49b7f1c0c637f5fa42160e18a1a3fe651ef935fb5e28a53656094bc7882d0f7e77e6
-EBUILD PPI-1.270.0-r1.ebuild 983 BLAKE2B 7a881ba2d6f44a7be135b34b3c86ea9661f1333882ddf43ba545e13f12a25e19ac29e94e1d3812131f31463c943b20b874f82ac530cd69665fb66c55b2c67c22 SHA512 2664a76686051955cd44b1a2588d9f4ff5000c42f08d27666fcc0f6275985aa3158ffedbca7c5c62e0f63bc061cc67c45db6e3ca05de3d36c95800b28007b41c
+EBUILD PPI-1.270.0-r1.ebuild 981 BLAKE2B 1337ae6db44583164606d3ea8fd04fff39060af6f87a974b3ee05c3b6b57684a9452740761aa295be027d5fd7aa17e1cc0be5ea9b6f9093886900605f08f6ceb SHA512 125ce2653aeb6bde8d7a7793db51b8b0c2d84a10eb6e62c2c812ad4a7df8a2d6c4dd260b8bda727239050883881c8e84a7113c7202acb2e3266f01412f65de3d
 MISC metadata.xml 6633 BLAKE2B 66b064eed0aab9a099bb6ea9e621e10f4c5c06b052abf393a5edaccdb5ddbf068382ad767a2d9fb6a68e70766234ace27da4ceddbe0b2174167d27e56d705717 SHA512 a6f5d77c3a8a13f3c454185c090d595b400b665a9aa2dc7e7edbc0c643109bc251d6522a330510080c5ce905f84cfd8892ed0783032a6e45dccc710df5569ec2
diff --git a/dev-perl/PPI/PPI-1.270.0-r1.ebuild b/dev-perl/PPI/PPI-1.270.0-r1.ebuild
index 7c9023d4ce56..44749993402e 100644
--- a/dev-perl/PPI/PPI-1.270.0-r1.ebuild
+++ b/dev-perl/PPI/PPI-1.270.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/PPIx-QuoteLike/Manifest b/dev-perl/PPIx-QuoteLike/Manifest
index b9b39286e2a5..4e32e2e6706f 100644
--- a/dev-perl/PPIx-QuoteLike/Manifest
+++ b/dev-perl/PPIx-QuoteLike/Manifest
@@ -1,3 +1,3 @@
 DIST PPIx-QuoteLike-0.017.tar.gz 71431 BLAKE2B a7ff0062dc5d9a1656365fc48633fe100dca75c7ed7990c68f2c2b88d9e54ad054f8a9438e636fc4e4dd22e3a39bc8d2531eb1bc0a371b31812068dda939f3b7 SHA512 ec51e4ee529e18305a5255d9d0d04a5868963481157c31ffbb92e3492c4153117b54b14c1c75b1792fdeb91d68c2a0596b7ace829a25b27a53dc4ec785d48bca
-EBUILD PPIx-QuoteLike-0.17.0.ebuild 640 BLAKE2B 27c4a476a0c9f8bf696cc8bc5fe1323c5486987ca6dbac53181906ac8af526e07dc23aa48a76a632efa1213660bf4d17295df4844512185e5526e86c5c78666d SHA512 ae062627a504bf5b9f9eaf046411cc5d1258e8139ba1d2b0ab23e0b2808606043a1615e9b0d7f660e0cdb9a48b132171ffe87c286589a3137dfced1fc34998d2
+EBUILD PPIx-QuoteLike-0.17.0.ebuild 638 BLAKE2B d60774755526d71c8e7d1ec28c5813aec161cd2bdf0359ae5813c889d68e369e449d2cf80ea4b363823d1f262915488a03d87379946ebf09de89e7d96dd1000a SHA512 8fd0d891d1b5bc9c99df96c650f7fa54aa1f1fd11e8a65e6a2227651798cc75fdc0ad4cc9c5780a1b9ad82fc9a84ad7c8ad66be04c2c551c37136eb13a553784
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/PPIx-QuoteLike/PPIx-QuoteLike-0.17.0.ebuild b/dev-perl/PPIx-QuoteLike/PPIx-QuoteLike-0.17.0.ebuild
index 9d998421cc82..cebf5eaef151 100644
--- a/dev-perl/PPIx-QuoteLike/PPIx-QuoteLike-0.17.0.ebuild
+++ b/dev-perl/PPIx-QuoteLike/PPIx-QuoteLike-0.17.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Parse Perl string literals and string-literal-like things"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ppc ~ppc64 x86"
 IUSE="test examples"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/PPIx-Regexp/Manifest b/dev-perl/PPIx-Regexp/Manifest
index ddb9a16b65d4..11c8184a146b 100644
--- a/dev-perl/PPIx-Regexp/Manifest
+++ b/dev-perl/PPIx-Regexp/Manifest
@@ -1,5 +1,5 @@
 DIST PPIx-Regexp-0.053.tar.gz 204221 BLAKE2B 6bea11c9e906bb94db19bd72e75ebeee6d3c2aa64c78e91c3e536d21e494288cfe95067b1a20ddd438ff8829f5f7b23e408c6440a31a5f70fe0680d14e752d81 SHA512 2f9e913347ad415be47240f48536845d9c1f77211534f2d540f2e1583936a11586c224fe909fc2f7f876398cb1c8048386c001279a724a72f1f71015a43840b7
 DIST PPIx-Regexp-0.080.tar.gz 239081 BLAKE2B 4af40b202b755d85d3092f876b16e7790a79fe623a977cee671def42df5c1704e0bcbcc65fcb518dc1a96ebc964eed00d66f55bb3cf77da78955d572876e1cc7 SHA512 6e4f91b1544d4f87079296e7032114dad55505647523ae21638ac157d3f9b47da644829b0813d35383a7d870149ccc58c77f73f3794a004f5634403c891e6254
 EBUILD PPIx-Regexp-0.53.0.ebuild 615 BLAKE2B 876f9f2be0f755f4d7981d0165f1a671ee3f74af9c053c8c0c70f21ea50b64d33e931701ad970fb6fbde05ff49206096cf263a08c2bffe1505208a3cb19ef38f SHA512 e0c86a9d8dd3afbaa8c8fad1a53cc6c2bf6a3335ca6164e15d63dda10bcf53e62d7e775dfb9570b9a8192c19a858b391844d96a9bb0d46b1d5b885b879b6473f
-EBUILD PPIx-Regexp-0.80.0.ebuild 659 BLAKE2B f6da7342e18c7c84c5da115c62599dede8702d858b7080369d601254168c443f2781a17104adbef19d97ce7de47ced212e56ae12e6f155fbd325566445a254c4 SHA512 7351ad0c1802b36f1a50dcee43088c298fc784b77e7964eca276931635d2e152566500b0ea44d8de6fbb786f0183731cfd9144fe1759b829a983355c4f0791e9
+EBUILD PPIx-Regexp-0.80.0.ebuild 657 BLAKE2B b197cf5d20803e35c7bf75ab7627d7352ac8b983c2d583f811f61a4d815fa52894d38aa95694b7c13ce710b40c6d2d76f324e40ddf9f85f76089f7df810c2c67 SHA512 955581fe24ffb2a31fe89fcd35c10870b08e0426b29dfd3bd180dde8928d80cfb3618e9f47125dccba3aed12dd628a1ec6c994c45f07d8856356cb2e62b87c3a
 MISC metadata.xml 5135 BLAKE2B aa9ba72bf7b9457110960e2f70d1bd4c6447187ffe646daa436029895926e82b6b4dded139cdd954a194211e7cc4ff5ae719543b4d75a14777666cac6706aed4 SHA512 b880daf56051178ecf011e80656c00483e5fa5879d1107103916c6c56c4745f36dc902d06ea6827754bc1baba9ecd1c876470fa96d5fd5c076f7438ccbce3c02
diff --git a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild
index f14244ab44a3..4cf2e367dcf2 100644
--- a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild
+++ b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.80.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Represent a regular expression of some sort"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="test examples"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Path-Class/Manifest b/dev-perl/Path-Class/Manifest
index c781dce20a9f..0510e088528b 100644
--- a/dev-perl/Path-Class/Manifest
+++ b/dev-perl/Path-Class/Manifest
@@ -1,3 +1,3 @@
 DIST Path-Class-0.37.tar.gz 37473 BLAKE2B 1017de1f17cf0d0f27b07b8f59dfaa4a139e573ff67e7b8c37b522a8c164156943d5281daa5b4daaea87e72fa6b2d0229ede6aafe8f7b093ad0aac1d51d8314b SHA512 044d86f85eebff96bdff8fc11e97884eb4e06d56ecd2d3bfdc045135da6f08c40e644e0e5c1a779a8ef5d6c7c04e159e47721b4e637a92fed7d298b5f798ef83
-EBUILD Path-Class-0.370.0-r1.ebuild 866 BLAKE2B 38974e3adc40a6259c0e4bba97a7b0fcac9c4ddfa7151c91cdbcc93006335fc391c9d9bdc62acb0f58242f6d6a4c65d7805cab295509bcb8a905f90b624f5214 SHA512 511e13186d7607f1aac85907703d46608cea9d91934ef21508a540b065eb43511db5071166faca39ad9d0bc896ea2c4db55f2c5f718498bf997418d98d6e4dec
+EBUILD Path-Class-0.370.0-r1.ebuild 865 BLAKE2B 734d6c740a90aaaad497410c5aec9dd61a00c85dd0daa363944d3d2bb08e667afdc4970f66828dfb44d06c8186806d0137d7f2aa55d063fe60b607a959d93e1e SHA512 10b6f3c4e9665231ee2cfe9edacdcb702a4c4e2af4cb59c145a278ccd1b3f8c1dd8392dd16fd488fbf6e2a8d5361d9097860ca6b6d8b7fd80da0c5bcf429f32f
 MISC metadata.xml 585 BLAKE2B bab95c7547e43f88f7600192f911af16c29bf7356a62b64d94058dd4f8d1f44de76ad65490c05db359cf2f21ce86b788e92ea88dd83fe738b0ff795c4b05e5f5 SHA512 305513019b4556f6d88bd4e6948d9def1f95bad924a3c347a9b8b9d4912cfd24dc1d9ea1cfe499e6660d45b7dbccb8cefa66d3f83526556b7f0d1b7ddc5cdb83
diff --git a/dev-perl/Path-Class/Path-Class-0.370.0-r1.ebuild b/dev-perl/Path-Class/Path-Class-0.370.0-r1.ebuild
index 45e0cae0f11b..48a9669b9fef 100644
--- a/dev-perl/Path-Class/Path-Class-0.370.0-r1.ebuild
+++ b/dev-perl/Path-Class/Path-Class-0.370.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Cross-platform path specification manipulation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Pegex/Manifest b/dev-perl/Pegex/Manifest
index 9b4517feb2ba..d73fc06356f3 100644
--- a/dev-perl/Pegex/Manifest
+++ b/dev-perl/Pegex/Manifest
@@ -1,5 +1,5 @@
 DIST Pegex-0.64.tar.gz 152976 BLAKE2B ae9fa7a75d8d8f8499f696439541c8a0708326ed3f0dd765fa3ba8339c12cf7cf4d72efc3bd58e85dfa30575e9b0d16a8297ff4728f3b2dd7b6ed8b4d4f7b8bd SHA512 e717a762405a77b2670e1d9b3ca2ef760db186b3f62a92cfc6e87049e71f3abd5476b44a285d27c622711557540a0d978b90d5c59afae63692986f510d7458ce
 DIST Pegex-0.75.tar.gz 148676 BLAKE2B 7b23a8c751f6272437d240e99f3e37521d4ebc4d76ea1493cd6830b3e12890b6079571db326844de06fef21051286f07f9a026cd57a15eb10e2909f378bdc9d1 SHA512 ff204b21085bc3ce5cf6dac70636443f206272ae9741055e8972eadb720d52a46e542dee5b6559cc308d9fb597d545bb4d148b02499e2f75fa08a6dc689dc30d
 EBUILD Pegex-0.640.0.ebuild 565 BLAKE2B 23e8d0905b36930b4fbb803b88b1605f5d3029f7defabe8fdef4387faf1ed8e167147ea5ad0def5bf45da5f070e980d1607fcb91b6b197409371b0b7ff173715 SHA512 ddc4382a297c1336fac08715316cab9e070c1390a4984470a20ae2a9df53ef26a14a3953b724354f0de13baeef6197cfec8e26fecb14d443560a1d9fabb25c40
-EBUILD Pegex-0.750.0.ebuild 680 BLAKE2B 252cb69bd7196835072ff65dbeb0a5c4f39f04e9dc4eefbb17d317c94e530f42464c5bbf61f3ef29415b1355f875bf3497b84282e9b428000e960cb7eb7821fd SHA512 515a50c15fd4687591da0f157a0395923dbf8301e1322e044a8b011dfb04c9e497cd4533638d4a4b30ffddbf07c7d4c73d95d7eaf61198355f73a9eef808c9aa
+EBUILD Pegex-0.750.0.ebuild 679 BLAKE2B be6ed65284c57496e75213010dac47c75a49edf963c108933847b31b984ab982de2e9bb7d234de894a587df3abf0464fd3535ced55656c86243f3aa2dabe476c SHA512 6f6acb46bc3e8e97a577c4d6917eb7bb8cd776f7f0d1a2697aaf7e2db89a1bacd22067a621b6a5ac8c9351802fbfeab9e01156ea1440efbdd36926eb9bbcf215
 MISC metadata.xml 1440 BLAKE2B ff20746a0706d86325d32ca3b1b64ebdd9fed8955f7fe00c4b58de95d85a3e6ae787e464705bf66439b0ed5b17b297117604be442525efbedea5fd50dd2302ec SHA512 feb5e0cf1c8a13e85b80c013dddeab5a51253dd6e9205815e59c1248e067cd4c0e9000f4ebb729af6800f63af9339e5e88a9c8c269d1f147ad276945fbe01747
diff --git a/dev-perl/Pegex/Pegex-0.750.0.ebuild b/dev-perl/Pegex/Pegex-0.750.0.ebuild
index 4af58c23e851..33dd94cafe74 100644
--- a/dev-perl/Pegex/Pegex-0.750.0.ebuild
+++ b/dev-perl/Pegex/Pegex-0.750.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Acmeist PEG Parser Framework"
 
 SLOT="0"
-KEYWORDS="~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/dev-perl/Perl-Critic/Manifest b/dev-perl/Perl-Critic/Manifest
index 79490d9a6a06..5baa58cd567a 100644
--- a/dev-perl/Perl-Critic/Manifest
+++ b/dev-perl/Perl-Critic/Manifest
@@ -2,5 +2,5 @@ AUX 50Perl-Critic-gentoo.el 435 BLAKE2B 67cd9711566c4f06785a1060202638c7501648a5
 DIST Perl-Critic-1.130.tar.gz 647052 BLAKE2B 2b0905636486531dd8de50af6e490701f1785851744b78a5164539797e6d2549b46c9daef05d3061b53f82005ffc1fa47b7e2dccec613f9a5490c597d61072f4 SHA512 b443ddbb5905a61835061f49d7f10e2e71579e5df96778eb183c3d1e9987342e1536db61196b32e66a192c92916eafd9ebb7b713b0be71ce89c1f93155e89828
 DIST Perl-Critic-1.140.tar.gz 650449 BLAKE2B 648e3605278fbcd9c62437b1c3d587353541db3146829ed2d4aee5d0e240e13d692358146fd860150d1bae79d359ade93b53451a095a36f9c05f49cb0fd93d5c SHA512 46afc8260d2b500edbb29836be993f065270ed9ffa6aa00611a980b294025b794286bc820afeabb94b7d1cdd9bfb4e715e44e466fb0340cb9d938e031b54a6f0
 EBUILD Perl-Critic-1.130.0-r1.ebuild 2069 BLAKE2B 99a024565408fd0b7b077461eb36ed679192daca943930c812fc72ab002aaabb4325801439aab9c7db7697827fcf765bfafb2f5b68425c5e71db99133afb5457 SHA512 7f75de127aa1df7c18dc20565f77db29c6fa9cd64ccdd3052d91504142ef79b8c621953d632226e5402b7214b5411f104122d36d114352a1635c348ecb3bdf85
-EBUILD Perl-Critic-1.140.0-r1.ebuild 1968 BLAKE2B 4cec1903a63aab13584396b70da18d37936da7a44fb486d6a644ebbede8bd8977c6b32015e7cf1a99f4cf20be03a5c801a5fbcd348396476238f886f6010fb3e SHA512 99a711e94fc841c76ba26da08de501c9ac0a7910e6d7f7d0d9a840b9c72c6feb493c142b6213b648ec644b9ed7b215d1e021eeee1c789c8d81115e24207ed9c2
+EBUILD Perl-Critic-1.140.0-r1.ebuild 1966 BLAKE2B 468951a67f8c603629f73b1fd8f8f79bf6726c0d9c494b1be2e12ffe8fdb216bdea02f308458c452d4ec47669d10b9b26c1973aa712eb413fd9e07d394b83ce6 SHA512 90522b3f3fe9d25abc6e6443e8d92d1685e2aadb5629a37ac7d6de75cb2f5e28f2b6f723e1673e6e57d8471dbdcd47c3a3b77063e781929b1229cef37edcae09
 MISC metadata.xml 20125 BLAKE2B 102686a85bf6f17bd0687bd5b05a4701c7b782c93f6b4fe7d3f4b181360067778c28911c85fa101e8cfc4e44174410b7b75bc0138a9b0e20a6ec38b2b956bb42 SHA512 e98d510b1a6d7e95b6558fbabb7857a2b5133958d790c87d51716be4214b60b091360de6e4e81b71aad14d4f94dcf7c3529087d32f052add0736c2fe4f89372f
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.140.0-r1.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.140.0-r1.ebuild
index a9668176229e..4e6c6a05a47d 100644
--- a/dev-perl/Perl-Critic/Perl-Critic-1.140.0-r1.ebuild
+++ b/dev-perl/Perl-Critic/Perl-Critic-1.140.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module elisp-common
 DESCRIPTION="Critique Perl source code for best-practices"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ppc ~ppc64 x86"
 IUSE="minimal examples emacs"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/dev-perl/PerlIO-gzip/Manifest b/dev-perl/PerlIO-gzip/Manifest
index ce988626c7df..405ee9f70196 100644
--- a/dev-perl/PerlIO-gzip/Manifest
+++ b/dev-perl/PerlIO-gzip/Manifest
@@ -1,3 +1,3 @@
 DIST PerlIO-gzip-0.20.tar.gz 19076 BLAKE2B e7ff1dd280bbfe80720c113a26626e222695642bc02730f5271345583784ca3e850d1fbd9958acc43a12dd603ef32cefc786acdc8e86263f9d38fd675df9b7e1 SHA512 b24e8fa99cbcbaf07feabfc09cefc55a10c1dce59b495b59343ff5217536f7108c92f462751e70242e6567be32e69a0cc88a2e66325e926174a64042d4b87966
-EBUILD PerlIO-gzip-0.200.0-r1.ebuild 397 BLAKE2B a2a12620682506e531e7f6ccbbfad4714b9c20a17957fc74a1d6f0ef48b3f17d55bc11c3fccf04b16913f4cb777ea5e97c6ffe15e37576ecaa8bf18a0a9caf62 SHA512 c718e0a40f4b194d00037140a929d7450fc2768b0a7c1bf399a905d922e01ba70d189fbba447c05b5025ac7c234800005687156a7fba323927efe31a3b2b1198
+EBUILD PerlIO-gzip-0.200.0-r1.ebuild 396 BLAKE2B f57f58a9ff6bd29a3e3afcf6f279f67898376e147820a9c294e93ede6f7fefef710286f2323a64af0f27b66094a7bad02008ed477b7fd2097617e6b43742e833 SHA512 223fa9e26da2690c55e13e33f5f2e8a2b3ff49f50ebd364cf8575ddffcb5b6e2c6c4e6bad442b0f8a9259ace1db2b4d8d6cf1c655874b16df9ede11a7eb316f4
 MISC metadata.xml 394 BLAKE2B 012d2ebbc40191cec5ea10b27824381fcdf4266f868c774605129074ee7af724978e9af79096a324d508ce5f19f1ca0716936dcdb83f375752804bc5e6857f9d SHA512 88240f01b3ade41e854f34495e5ccc8b1144b187a2284e604ece72edc68c0f0ceec580f4b5128ca5908ff5fb75af6701f751570853903904a3a30cbc4d7c37e3
diff --git a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild
index de0173840066..17daa08658b8 100644
--- a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild
+++ b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.200.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="PerlIO layer to gzip/gunzip"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}
diff --git a/dev-perl/PerlIO-utf8_strict/Manifest b/dev-perl/PerlIO-utf8_strict/Manifest
index f396b766eb64..844136fe34a7 100644
--- a/dev-perl/PerlIO-utf8_strict/Manifest
+++ b/dev-perl/PerlIO-utf8_strict/Manifest
@@ -1,5 +1,5 @@
 DIST PerlIO-utf8_strict-0.007.tar.gz 67922 BLAKE2B 4d13dc6e6b4cdf7a4bf3cd51ca1e054d82cab4094894f4cee7503201cc11f80ab27951417778f7e179aee03b75b4bbb30e839a498c83d5afd3881db64973d324 SHA512 0d39be9bcbab4cea087f59c67dc1af6773b6258c5e836590ff58cc18bf3392ba6e95c55a0c7ce94236e0be7053802b4b1d6010130355e1a973a3698aaf49af0f
 DIST PerlIO-utf8_strict-0.008.tar.gz 95180 BLAKE2B 5e041d619036e589cf3d9272be20f2eaf50066700d5b401e923fec4745ecc2f74107f2a57a9b2c22a4b4ccee908a595b7618a2c5f74000635393ef9fcbeb8507 SHA512 5a54c379925880abca7f85a2b08c19d54e222a03e06490ff366ee38e68018b5f6a4ab0bb8df15f9581b6265eac550090a35f3a4f52c748c008c9c575af41c911
 EBUILD PerlIO-utf8_strict-0.7.0.ebuild 855 BLAKE2B d96be54a4b06e419987b9e0fc14ff5ac9cc45e5e2471b3431fb49d2f91743324751ee565301f321dd74a47a245c7403b89a69d586d3d1a7e7605a2e39efebc44 SHA512 4c3b7a16ab2c37009a57f41d3eed72133b6f7d6ad8c6eb9f38c96ecada3aa3d66e74568dbcbaf7144a7689b9f4bfdb41a7c3a71e7163a7d8fa1d25dab75c507e
-EBUILD PerlIO-utf8_strict-0.8.0.ebuild 670 BLAKE2B 5574ed7c8e6ebd7e62a9393ccdfd0107b30061cd91aa0a858f74b4cffc2d8174c9f3eb895fa7eb3b0f03f1b13b08c0874d42b2212fccf1a039d337df3f660dcc SHA512 9b4ab1e03e23ef2808843f4f0a558a2974609beeccd89a58000632dae05e6d8420e2f007199c9de0a43b17ecb18429a7b153647c213ed14542ee52d1ed0c1b6f
+EBUILD PerlIO-utf8_strict-0.8.0.ebuild 676 BLAKE2B ba4e1329934df872e77228b84cb8b8c14740ce37d2dc9caa37a15178638ef12924f82b0c12a14479de13fc91a2ac324316f6386aeb8f2d5c564f75494a544302 SHA512 a1d96970eda809bc1bc842cd294aac44b4bb2c5f6d7fac9a521d58d6462444ff57cd5cd9ed3155c177e3bca80b4affeed7e63737fedff0730ca93c75a1a94e01
 MISC metadata.xml 408 BLAKE2B 7c975db4716a114a97f21cfaebc54334634ae0d8f6c8d58bd19edc8853a74583c4f16d0f3729f380bf9cf6cb1d0a668f9484ef58418370e977151877a79c5860 SHA512 bc9d04bc551d13a2712b9e57613d9e423a1649e3cda65436178079dc13cbdadf183f4aea41963d023744d60d638900944ddb60752f054a728d6868594d2f4c55
diff --git a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.8.0.ebuild b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.8.0.ebuild
index 102ba0bf9828..23904b32c07c 100644
--- a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.8.0.ebuild
+++ b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.8.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Fast and correct UTF-8 IO"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-XSLoader
diff --git a/dev-perl/Pod-LaTeX/Manifest b/dev-perl/Pod-LaTeX/Manifest
index c66e66012bcd..ab08a17bb6c7 100644
--- a/dev-perl/Pod-LaTeX/Manifest
+++ b/dev-perl/Pod-LaTeX/Manifest
@@ -1,3 +1,3 @@
 DIST Pod-LaTeX-0.61.tar.gz 32618 BLAKE2B 6fa102c637c3d990247446c09fdf86cdaa9c4a50fd09a5d386c2b2840de0cee7c64116cfd27badd6cc4b08dd17fceb9a4f58eefb4e4b27599baac158bd44ded1 SHA512 c9b5d8b50f630e25e1f913d95d83a1323e71d2c5a3a794a543bdc9962800e5979b3e58595e7a653a96f9aea1f321c1564e2062e9b9d70d8c4d1c6729cb8df498
-EBUILD Pod-LaTeX-0.610.0-r2.ebuild 551 BLAKE2B 4b31447a6d6ddcc8873616b7bdc6ffca83b3edafb8b27f93dda365dc2510b79b30b93cda6254a6fc8cafff29b04cb42e77363e4d09dae0ddd008a806739eccc8 SHA512 ffe28443490a6a385690b3396652de69e519ab7f8ee0b9c6b1dd403dcf443955bf47fc16bea46a7b1e43580712c4c4777a59f71529f0374ec8c41b4955f551b7
+EBUILD Pod-LaTeX-0.610.0-r2.ebuild 558 BLAKE2B 013d2043bcff03067697736c1d771188de97730dadcc3b07b6ac303503e6600bf352f50a344d174aa933daf337bd81ae39ad0932d752722eb1adf5061c96bd53 SHA512 db5e500f552003f171a5cd1ae6f22dd302bc91cbb29f76736c209a945599f5b5152c2c061745e26ae7d88dc96fc03d9b2531d459788fe8fd8565457d445b42fb
 MISC metadata.xml 390 BLAKE2B 4c5f45fedf26c3fec15f84ec9be02cb52bad73ef1ea1440660d4b5be42f2b6b6b90ca0aa5c7791fe38ac9b3848100c4045a350f0407e442140f42bbfa4d3dfa9 SHA512 341aa40bd68ff1f379b3b316a95126bbd491942545992ec62810de8b3f471493960fa1cc51328908488daaa5d1ef4a299f2b6f8b59b78e22b53985300759cecf
diff --git a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r2.ebuild b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r2.ebuild
index 8569cf14b6a3..09ad7a286840 100644
--- a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r2.ebuild
+++ b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert Pod data to formatted LaTeX"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-perl/Pod-Parser
diff --git a/dev-perl/Pod-Markdown-Github/Manifest b/dev-perl/Pod-Markdown-Github/Manifest
index d3bdc6cb471c..9e73566b662f 100644
--- a/dev-perl/Pod-Markdown-Github/Manifest
+++ b/dev-perl/Pod-Markdown-Github/Manifest
@@ -1,3 +1,3 @@
 DIST Pod-Markdown-Github-0.04.tar.gz 13465 BLAKE2B 6235a3f4460b3df44606a7dcd5a1ca09be644c02b59bf1c63a58a27e3d596e88b2ae95035c7bd44ec088cbb71fcdde4a8c9756894a419293eed7b0cf4f180ffc SHA512 cf0b385ddec44d9b21259fa867746c71b0880d85d3b24b9bf8c530eecddd6f899654425ccb29170824fda3cc7f432cacb2d8974ad789952971c16b2ae901ace3
-EBUILD Pod-Markdown-Github-0.40.0.ebuild 594 BLAKE2B df480d84b58aee033e4ca067439b48488229a7bb05a747bd2efa1a71f1ac5019fac6a845e7a6c6ca4066f5e2cd885f11875fbca9f71b654b0d0da33ace191218 SHA512 97c5c0af32bca52283960d7dee999d5ce34ca8b5dbe00e2e444e2129e5d0d1041a9acef17e2d832a4c52a5c61968c547b626b912c4b819f55d4523732543f9ba
+EBUILD Pod-Markdown-Github-0.40.0.ebuild 597 BLAKE2B 212c94dfffc66f00660336c06fd821dad140ed3809884ba22df565b13d550ec00403d9d08e8fa66b3e1631ec48df3aa4de1c4db3ab1da90699db080fc1f952d0 SHA512 ef7ac24ba0c1ba85e682f1a313406237c09d15309b8b1877ca572415713e1e1a975dbb9eebaeb2b772c31df99857016f88f87a2d7cbfd2c3be3889039e2462be
 MISC metadata.xml 411 BLAKE2B 7e2898e1aede1aa843eb1ef39f158bd51abeb040e35adfaf7f22356c259985cb408df8053e6b1ed0a66d3ce6c249082479f0396d67a91ebf56786fbeb692dab9 SHA512 959c763dac53fa9619d49f827543b5ce65a7dd208415aa38efb35f3e04225aceaffca7cf7ec12665c366922fad1b0b384e8caff7f4617aa9c63ed6808fff7ed8
diff --git a/dev-perl/Pod-Markdown-Github/Pod-Markdown-Github-0.40.0.ebuild b/dev-perl/Pod-Markdown-Github/Pod-Markdown-Github-0.40.0.ebuild
index 8016b450ccb6..3435d01b322b 100644
--- a/dev-perl/Pod-Markdown-Github/Pod-Markdown-Github-0.40.0.ebuild
+++ b/dev-perl/Pod-Markdown-Github/Pod-Markdown-Github-0.40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Convert POD to Github's specific markdown"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Pod-Readme/Manifest b/dev-perl/Pod-Readme/Manifest
index 613dabe19826..c610b34db6cb 100644
--- a/dev-perl/Pod-Readme/Manifest
+++ b/dev-perl/Pod-Readme/Manifest
@@ -1,5 +1,5 @@
 DIST Pod-Readme-v1.1.2.tar.gz 47521 BLAKE2B 425bc20581e7a60c89b6df956a2f3ce1bc0ec5e8a64593c12a28d4f8f2f88b8e653cc12457c69c48d8a6f42567ef773a30109ce65ee4bb623e9c3981fe07e45f SHA512 b8d2cb11fa2018d91b4623c471206c057046daf2570500c828f6f8fbe9ef8fe45e4977396352878c1ca5a47ec27be04ca53c1c9240e7dfc09a9405b0af5dcf47
 DIST Pod-Readme-v1.2.3.tar.gz 37001 BLAKE2B 2f981a609dd92b128ae986662a292a44393527cba6665ba11b7a1ee3e1333f767bbc6f4018dbf096711c67350378d78b1e50a2c84b08d3492b94324527a1b852 SHA512 c9518d3fd3082d6c4bb87300e04e29cb14459c08e3573bac6542ab4d4842389eaabb0d37fdc018ddb971e876b30078d14ce007840c867a7a81c0952c77c03a66
 EBUILD Pod-Readme-1.1.2.ebuild 1460 BLAKE2B 02a65ae8465f7bea06b61a91240b64df2852bf5d1c7b7172e67735d05e537c80f3a78a947971ea6d2bbad34198bdb09c13fb9b7f8f42d61726c31cd49ce91a2a SHA512 a6b6a6e9fe8e55ff74b7a4b88170ab6239980bdf3d3e636362d39cbf4a05b2b90c13eb3531ee129a3a1b06cf25484ce2bbdccb7f51f89312fef331f6dfee29ff
-EBUILD Pod-Readme-1.2.3.ebuild 1408 BLAKE2B 2ae953baa11529bcfc0fb36d2aaccdaa7ed071d9d806386f88dfd0f5c363a0eccd7b8116e982773ec2de51a99d6bc74c10c7f12467f2012e243d926e6c67afad SHA512 d18d78404bfa82a5e8190e10fc34050be32b452024d90c7876564a85f9d6fe1dd135f96d336309ff7be8963d3b2c292e36644ca1e43122dd657f096ce81419ba
+EBUILD Pod-Readme-1.2.3.ebuild 1406 BLAKE2B 65d906b39b8bfcebf4a97f3587fb6cae453431f90742fcc729f0c2f9df6c624b147812308c1b2f7a41c755f16287140f626c10384ee1dfdae7134d806f085cc7 SHA512 e72d35933b3c997816ba66deb632991ee26eb5e6af81b4811ae5c0a9246bccc8315606ac22afd0be59631516bc15a0dcc137f20f9857eb21172fe9bb5b3fc0f4
 MISC metadata.xml 815 BLAKE2B 963a276b78e3e034e8183f3c2ba2d67eee99f6346763793a10979c2486c58b6529495e58b91394b221386ac074122546fbfeec21d555a6486d371d674a3d1aaa SHA512 2087152ead39fcb04fcef5fd4b183ebb121ab9992bf726b81285e9586eb499d5d2dc0968c3bb976ab948e1756743769698c5eec18654cbdbecb603917c00af83
diff --git a/dev-perl/Pod-Readme/Pod-Readme-1.2.3.ebuild b/dev-perl/Pod-Readme/Pod-Readme-1.2.3.ebuild
index 5e1a7d070763..3fdd3dec3f33 100644
--- a/dev-perl/Pod-Readme/Pod-Readme-1.2.3.ebuild
+++ b/dev-perl/Pod-Readme/Pod-Readme-1.2.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 @@ inherit perl-module
 DESCRIPTION="Intelligently generate a README file from POD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Quota/Manifest b/dev-perl/Quota/Manifest
index d308378b9ca6..25f74bbdd426 100644
--- a/dev-perl/Quota/Manifest
+++ b/dev-perl/Quota/Manifest
@@ -1,3 +1,5 @@
 DIST Quota-1.7.2.tar.gz 50436 BLAKE2B 6a90e545fcb3739f4f10cbe5caed7ba5a3542c19a8f1b68baeefc12dab77ac27d125e3de083c1cf6d68c29fe126c8e4f2eaddaa1c55c1974de0e0451011f6c7c SHA512 55ea9fbf027676b0e6f7a6f97fd3e75749860ebefe0127791a0d8cd8a427676eb1f6bf1ddf1a3687666752430faef877eedd12ccce39b7b76466fc7bfc628433
+DIST Quota-1.8.1.tar.gz 57058 BLAKE2B 9f34d11896e6a8660f8777b5d6d6405d53619936aef2a17af58cf3e024f936b278fe14e055a685508c6cef9d07b56eab0712f6745e53c9fdb99d6bd97e864435 SHA512 9e27cb03c7cd76a995ff775b9a5a67b8d8deeb814efacb17b4769c567935ebabe03ba2354a6977ae86fffaeb65e8f457906adee60de3e0a86ba78516057c1d72
 EBUILD Quota-1.7.2-r1.ebuild 1022 BLAKE2B 252db8c17f85fa97751555bb3dfc389a5ed25a01e4456128f5368103fd01e70b39ec0fde575d07d13f0e52e5ba7664c3c215329ac9ae64d63a08c56e29fc6444 SHA512 583f6d6a34363f5ede55a3b3a34aba9fe089c281168c74616892c9bac09d67405f34e755f56b457d31235be0bd95bb0d15aa7000cb911a39d6e846e76ee8b32a
+EBUILD Quota-1.8.1.ebuild 1029 BLAKE2B 11af5c24397596be43e35b40d399bf935b93235bff82fa793a93a1f3a9989a1c4c28f187b35483cac3660510a5cdd06e00ebe2dfca72d38b1de36613989fd315 SHA512 336ab6a70cb185d1c41a0ec08a8aaab409956eb44268ae0916cb033c1fec19c5eb01e4db2d92182b23510343eb5f72b122349ce48993efb6af31a57ce7d09793
 MISC metadata.xml 953 BLAKE2B e3b91c3fd76fd19e786c0cf99a1edfa06b0c2524097f68c3351181eaedd282aa6dd13a83409d650a518b58deeb6330de4faba1aa06082fa05e2cfe8d9cac4a07 SHA512 0314f8d15c479af42c3e0015482ed135d978568181869fa2c88908ba8e29d0f187d6e0b8dfd0ce61cf514a4265bb982f51746bd41a32381513595d9a7abf2129
diff --git a/dev-perl/Quota/Quota-1.8.1.ebuild b/dev-perl/Quota/Quota-1.8.1.ebuild
new file mode 100644
index 000000000000..7b2014f2a3ea
--- /dev/null
+++ b/dev-perl/Quota/Quota-1.8.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TOMZO
+inherit perl-module toolchain-funcs flag-o-matic
+
+DESCRIPTION="Perl interface to file system quotas"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	sys-fs/quota[rpc]
+	net-libs/libtirpc
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/pkgconfig
+"
+
+# Tests need real FS access/root permissions and are interactive
+DIST_TEST=skip
+
+src_prepare() {
+	default
+	DIST_MAKE=(
+		"INC=$($(tc-getPKG_CONFIG) --cflags libtirpc)"
+		"OTHERLDFLAGS=$($(tc-getPKG_CONFIG) --libs libtirpc)"
+	)
+
+	# disable AFS completely for now, need somebody who can really test it
+	sed -i -e 's|-d "/afs"|0|' Makefile.PL || die "sed failed"
+}
+
+src_test() {
+	ebegin "Compile testing Quota ${PV}"
+		perl -Mblib="${S}" -M"Quota ${PV} ()" -e1
+	if ! eend $?; then
+		echo
+		eerror "One or more modules failed compile:";
+		eerror "  Quota ${PV}"
+		die "Failing due to module compilation errors";
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/REST-Client/Manifest b/dev-perl/REST-Client/Manifest
index 4c5f9da6597f..2504a7ec858c 100644
--- a/dev-perl/REST-Client/Manifest
+++ b/dev-perl/REST-Client/Manifest
@@ -1,3 +1,3 @@
 DIST REST-Client-273.tar.gz 20405 BLAKE2B e11e061579f2034854e294eac21a23a471afafd430647a2ef6827348c72601074e9c4ff87a5e44f6a15977afa617111b2bf3dca2309f264411365ffc625dff0d SHA512 3e41b0281929f45f3c0c1bc95e772233ab31f54f0cb2f23fe5b884636575ba131fd26eca150bab6f33fae7eddcd4de7043781e27a071306bf46b16469033a57c
-EBUILD REST-Client-273.ebuild 658 BLAKE2B d2c54ce11b6e6335e74f064603c99df371b69df15c8aa70cec4bc505838959e72779f01a0a7f05fa90a2ddea3d89301d5e59528e43e505d73a706820dbd0ac07 SHA512 475dfd2767fd80c15ada865ee5a43ec73b4a12cdd20acd4954aece8ec8bcaf68d828feb7baaca704230e410019f918680714256f5897f0296c54707116d7696a
+EBUILD REST-Client-273-r1.ebuild 653 BLAKE2B 308f9ccfb1db5564edc482c2b082c760a2dff15d87511b8f74692ea7e665a44a96d7ee59bba99fd39b0025a7475b11b00915489a402fb13c99c41244c79288b5 SHA512 9af4973ea81b572c28ffd4d9cffe2b944aa0e23e109bf4bd9e3a9c51bf25cb5f6ff67d99c7d2ed9be52e5dad8038dbc5ba9311531448ebc3cbfcee035baeeaf2
 MISC metadata.xml 506 BLAKE2B 14ea537ec70c541bdd50f19301bce238aa65a0eb5550083410fa2faa99de999e8b9dc61c7f80666364909fbf72ab7cdceaba7750ab6d1424246d56bbeff6e887 SHA512 4e8ca1fe11c3669f0f95ea4ed5df650256429f76af20cbf41e36b9b3cf164da58b254a269c233b6cd08132b9de61a84909150eea9690d92ddfe954cc9cab6c33
diff --git a/dev-perl/REST-Client/REST-Client-273-r1.ebuild b/dev-perl/REST-Client/REST-Client-273-r1.ebuild
new file mode 100644
index 000000000000..a6e1381f75ac
--- /dev/null
+++ b/dev-perl/REST-Client/REST-Client-273-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=KKANE
+inherit perl-module
+
+DESCRIPTION="A simple client for interacting with RESTful http/https resources"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-perl/LWP-Protocol-https
+	dev-perl/libwww-perl
+	dev-perl/URI
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/HTTP-Server-Simple
+		virtual/perl-Test-Simple
+	)
+"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
diff --git a/dev-perl/REST-Client/REST-Client-273.ebuild b/dev-perl/REST-Client/REST-Client-273.ebuild
deleted file mode 100644
index d30e25784482..000000000000
--- a/dev-perl/REST-Client/REST-Client-273.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=KKANE
-inherit perl-module
-
-DESCRIPTION="A simple client for interacting with RESTful http/https resources"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/LWP-Protocol-https
-	dev-perl/libwww-perl
-	dev-perl/URI
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/RPC-XML/Manifest b/dev-perl/RPC-XML/Manifest
index f22f9aa9ffa6..b58c6b0094f9 100644
--- a/dev-perl/RPC-XML/Manifest
+++ b/dev-perl/RPC-XML/Manifest
@@ -3,5 +3,5 @@ DIST RPC-XML-0.80.tar.gz 211223 BLAKE2B e26ba4f667c227e84362ca8e09d17ee01ef45c25
 DIST RPC-XML-0.82.tar.gz 225690 BLAKE2B 4e16730a5bda313d43b00eaa8617e009a157867f286f17afb58693beb881ac2329ebee93d98c44c8742be2608998c1d2e0cc4f323be83ae9c5e9041c5bf90b3c SHA512 e5d1092a2807c2bd423502dd2ed53a72c57384b67bb4709e86a64a6fe37ce8af580998e62fcfa6a48d66d5308d9dc270c74e4293617b9f23a654e379cde4025f
 EBUILD RPC-XML-0.790.0.ebuild 1491 BLAKE2B a6ba810a160b5964cf51ba2ae95a8c142c38f134d37e8c8f3165488cd0252e1c292e3074123acfe62380e506289c414f9b37eda46aa46d8182cfaba867a08273 SHA512 a229dd41353a69a456f5631af14fdc5d4b2b27f3b5e340bca02457244f1b8a0dfd14e168ee2805c32adb2eca9f917a0f38ebd5a042ee4e6caecb379392380a96
 EBUILD RPC-XML-0.800.0.ebuild 1698 BLAKE2B 21759e1ec59a769ddd3be150959a4ac5cd4602ab5399170b99e7e4fad27500260f466e5d57766d69c161e7ce881eb19d27acb82cede77c208a68783ad89c4092 SHA512 62323e1434fb1368cc899363421bbb08c85cec91b8f785c5585bccb02404c3ef2ff2c996960c9f6ba097f9029105f79dd95153e94fe9635c0c40314628cf9f5a
-EBUILD RPC-XML-0.820.0.ebuild 1738 BLAKE2B 98dbffc33d7583f4860043c5a4038542d850d378bff47c2c55fd78fedd49f9e19368be49d773f3b719777d4cb25864f9950c1d108acf98a22da5464df7a683e2 SHA512 4fbf39481f364809a27e41eb6194aaca789d4c2e47a21262f757995465916a7f9094f2cb59b01e6f2c812c71549ca8282a87e3177966a375138efbd847451d5a
+EBUILD RPC-XML-0.820.0.ebuild 1737 BLAKE2B 7eec67eaa5172771d58b7825a26ca55a40bd393168b8941b4b10206c699f47120dba28e4880499bf5ec47757abb1909d1e4528c73a3d374f3561007229c4e365 SHA512 6a9cfe0f4782f7ac808f1de70424c2dd7466a217248f38d3e5d86a0777cd3de1e77fc0eade4084ee58c2be52229a7e88b8aa4b603e3cf0a0b49d9ea063eb613b
 MISC metadata.xml 2132 BLAKE2B d79cf95022d41b771f0fed70a1ac781ea84d7b6624e1e059f5f0f99173acbf86e6acdbaf180f12fbc34c6344ea817e47acf109d1f774dde0abfad403fde17341 SHA512 db4a73a2a59419f3840d86e6306eec5436b51fdb0011e537a61a54247ffd0e72f2570cf49d7831ec0a6f5b5dde3f94761fecece1753bbef8fbd0d199b9ae94f4
diff --git a/dev-perl/RPC-XML/RPC-XML-0.820.0.ebuild b/dev-perl/RPC-XML/RPC-XML-0.820.0.ebuild
index 92371a21c917..da44e8ec845e 100644
--- a/dev-perl/RPC-XML/RPC-XML-0.820.0.ebuild
+++ b/dev-perl/RPC-XML/RPC-XML-0.820.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="An implementation of XML-RPC"
 
 SLOT="0"
 LICENSE="|| ( Artistic-2 LGPL-2.1 )"
-#KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/RTF-Writer/Manifest b/dev-perl/RTF-Writer/Manifest
index ff8a16a1f2d0..1358ca345e48 100644
--- a/dev-perl/RTF-Writer/Manifest
+++ b/dev-perl/RTF-Writer/Manifest
@@ -1,3 +1,3 @@
 DIST RTF-Writer-1.11.tar.gz 57731 BLAKE2B e555f3bee937dd43e7d8302d8695a9e1d90325c3b21d286b55ef2bababf8279b25988d2b3d6da135b301eb0cf5fff368bd86c075b3b5680e6949d3ffdb16d519 SHA512 0533181d0f3a7fafbf5a7738a6649d1ad6c10cf112e654cafaaa47a5a1255b8c94367ac7b5d2b8f708534f01a1fa6243389140d0883163ddcbab4bd4c0bc8c3f
-EBUILD RTF-Writer-1.110.0-r2.ebuild 357 BLAKE2B 5f516cca64e43a2e8b6ed4612554b66a71e9d858ac36827350b96502ccd9425c455fd0b936d09548f0288e0f9f08849fb95d4f27732f50c30dafcf68f7ad70e2 SHA512 22aa2bb1290cf95e23ad885752306f6227396a203c0809b543a8eca8b4c7c5f111c95c67bcd75756ba290cba7fb38521ddc04b0a2e009c77a96911d11699b214
+EBUILD RTF-Writer-1.110.0-r3.ebuild 332 BLAKE2B 232b763657c07fce035973f714b80c1dcd9f0296d7006915e0cfcdc64f54a64049f9d83153c15cdefd765e87f3a6f6e4bd41e18a3fa31b26c952f63211f8ca63 SHA512 96549cc23e6809ecf963f8ad5b1dbf5ed41776714092da0a4f45d32e972fec47a6635157cd53b879991d99e342c9ebcdf6622b764b99f9470dfdb2ce601e9c03
 MISC metadata.xml 464 BLAKE2B bb1d31cfd03244aaa56fa74d96847abba5f3d752252690c42324f1982403db2a2d06dc2725bf8373397063159ab7202dda5f585280a2077782047c0c32268417 SHA512 2974d0440c3a94b0512ab4435bc60bad7fee738d3824cab974dd3db36cc515a59c2f835bfa89c756665c9ee7dfc08bc1a73bea10d6f1181bf80287857963c12f
diff --git a/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r2.ebuild b/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r2.ebuild
deleted file mode 100644
index 7d3ddf9eb582..000000000000
--- a/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SBURKE
-MODULE_VERSION=1.11
-inherit perl-module
-
-DESCRIPTION="RTF::Writer - for generating documents in Rich Text Format"
-
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND="dev-perl/Image-Size"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r3.ebuild b/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r3.ebuild
new file mode 100644
index 000000000000..ec1d5a43b33c
--- /dev/null
+++ b/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SBURKE
+DIST_VERSION=1.11
+inherit perl-module
+
+DESCRIPTION="RTF::Writer - for generating documents in Rich Text Format"
+
+SLOT="0"
+KEYWORDS="~amd64 x86"
+
+RDEPEND="
+	dev-perl/Image-Size
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/Rcs/Manifest b/dev-perl/Rcs/Manifest
index f3365c04b379..9169ebfc30c9 100644
--- a/dev-perl/Rcs/Manifest
+++ b/dev-perl/Rcs/Manifest
@@ -1,3 +1,3 @@
 DIST Rcs-1.05.tar.gz 37033 BLAKE2B 624994b2b51720dfeadea6e782c9e50ff9fcb0e78bcabdeb0c2f07f8de154104ed3c589ef8cb30c12215fe59124c1b9a46857d814333e7321290bc06161f9d5f SHA512 4160d9a85b100f066a8f7606afa2b0807e71c7bb478ca229aabb89ef58a49366d214f4a51de8b77c9770967a0b033484be9221d8b1ae62a76e5a8b1addfa32d6
-EBUILD Rcs-1.50.0-r2.ebuild 341 BLAKE2B 2a91be9dc3a069d5bac7297a73839d26bbcc0f8943e4f95b66be0c7cb9bc2aa5b13933ab1f277c578ec7c34ddbe204e4c96aa67db5b6115c36b8b4e355dd0f49 SHA512 d8f6fa989d2a0db6d216fbec194371b2356e8be6d1658198fa57c078a4ff1e81608e624fc871f8120119bf3e616d67439d667d68e1223c2a4eb447860db1c96c
+EBUILD Rcs-1.50.0-r3.ebuild 351 BLAKE2B 737d4d002598bce8052f6e43b9aed564397a0caa099eb0ae9c1f5d4725ea33abd3f3137d5539858d2edfa49679f63282016c39265e7ce730914b751c268e7cf6 SHA512 5b5b570ed4e46523aad01bc9987f039eb46e1600bf1ca005473fe72b031d589de06625edf81a2dcbad96871a580099c08c2dc5182db5eba00c21c922a03fdb0b
 MISC metadata.xml 489 BLAKE2B 6bc7727cb628f91dcb3349b984db12df09a213bd48f67b3bc6eedfd24ba3cf55460a5bcb6decb3d7e27c131dbebffe3f4441bdf59e2da710a0dc50a76222a1fe SHA512 edb6c663d10ca8ad7a3f33e887c87393ba54885a531dcae540975d142507161385153af8cbd02e7f4bd50f93ce98e53044e832bcd4541c95034b0ba06e6cd956
diff --git a/dev-perl/Rcs/Rcs-1.50.0-r2.ebuild b/dev-perl/Rcs/Rcs-1.50.0-r2.ebuild
deleted file mode 100644
index 142311848496..000000000000
--- a/dev-perl/Rcs/Rcs-1.50.0-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CFRETER
-DIST_VERSION=1.05
-DIST_EXAMPLES=( "examples/*" )
-inherit perl-module
-
-DESCRIPTION="Perl bindings for Revision Control System"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-vcs/rcs"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/Rcs/Rcs-1.50.0-r3.ebuild b/dev-perl/Rcs/Rcs-1.50.0-r3.ebuild
new file mode 100644
index 000000000000..eca14178cca2
--- /dev/null
+++ b/dev-perl/Rcs/Rcs-1.50.0-r3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CFRETER
+DIST_VERSION=1.05
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module
+
+DESCRIPTION="Perl bindings for Revision Control System"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-vcs/rcs"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Readonly-XS/Manifest b/dev-perl/Readonly-XS/Manifest
index 3114d24d910f..f4858f6b7e61 100644
--- a/dev-perl/Readonly-XS/Manifest
+++ b/dev-perl/Readonly-XS/Manifest
@@ -1,3 +1,3 @@
 DIST Readonly-XS-1.05.tar.gz 8849 BLAKE2B d124fc25e1d4a13e6eccdb32467dd8fe4a728f8d8f2d20c4f28ed8c6c2cedc6ccfaa9537a5e86b8a567c507343719756d4c8ca02a675836b0848582bbe323e5d SHA512 0e3a8e55e7776e556b7ce995510d73d8d07b51a98f3d4772c291f4c76134c395b196a0485a6ceca39acd536258da5c91cddfdf3f61ef3309c518c807bb0f4dd4
-EBUILD Readonly-XS-1.50.0-r1.ebuild 410 BLAKE2B a711091af6d3d6a837b4cbb836182833662c6950a1d9e25d5be1e98ed5981cde70404fa381ce5df4f29e378b4d4852e3a4e0d0e70cad20767de8d3c9e1a95b67 SHA512 cf4933584f464f51cca51c4f0fbdb2421a24622592469fe0dc52d20cb74dc469fe17a2ffea63dbc899e986cb864599cb83abf1967ecd484a8b70d4e837a66d59
+EBUILD Readonly-XS-1.50.0-r2.ebuild 390 BLAKE2B 2c385be2674abf249163037d77c6722e3c650c1a8eece1540614f8ecef1954a36d07d5c0b2ded62255bfd7a835574ae63ff069be173d99bbb3c80cb6db65776f SHA512 b4cdad04086abda4d7cb369283f1f0baa4966f7a3053499da75d3229e9530692e55079f5613af6db8b207b1f8e17ced770c159608c6ba0312ab70643af375350
 MISC metadata.xml 394 BLAKE2B 39adfcf3e5c485d763666c182b9f35ce9a6223b787fc2a714ba976a751256d25fe05bbebb42225f183f72fb96b90f0c2cf22f3bc4ee7c1ba4f994267415483fa SHA512 dcfafa5f6aee0e0a303179b3b1e4285ab195fdf5547af85b0e7b98483a1663a13cec6c030df3212e36af66580da8e1820d3e4d11c71c92cbca91792fe770ecad
diff --git a/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r1.ebuild b/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r1.ebuild
deleted file mode 100644
index 2db56fd5798d..000000000000
--- a/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ROODE
-MODULE_VERSION=1.05
-inherit perl-module
-
-DESCRIPTION="Companion module for Readonly.pm, to speed up read-only scalar variables"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-perl/Readonly"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r2.ebuild b/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r2.ebuild
new file mode 100644
index 000000000000..d2d9b2a34a86
--- /dev/null
+++ b/dev-perl/Readonly-XS/Readonly-XS-1.50.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ROODE
+DIST_VERSION=1.05
+inherit perl-module
+
+DESCRIPTION="Companion module for Readonly.pm, to speed up read-only scalar variables"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86"
+
+RDEPEND="
+	dev-perl/Readonly
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/Readonly/Manifest b/dev-perl/Readonly/Manifest
index e06267efd5d9..30c6722bf5dd 100644
--- a/dev-perl/Readonly/Manifest
+++ b/dev-perl/Readonly/Manifest
@@ -1,3 +1,3 @@
 DIST Readonly-2.05.tar.gz 28877 BLAKE2B 7fb072e0057cb125665855eaa058b77b74aeadc3fa4be3ca4e87ed6214b22a52c0ee4fe7df4739b288c49116d16d05cbcc93bd7035e71bc51e55be69002265e0 SHA512 d42406c1985248a352860f80c3b0b1a41476e5a7b4bff71e83122d7c5eb609296a1eb00aa71cf9f899317e31c706d75ff07950815eff84afb6bec40de6de2ace
-EBUILD Readonly-2.50.0.ebuild 551 BLAKE2B 6147e5aaeb381ec6c4368c06227af6cc7312e4ecbaa53d687c5b255062d7b00af7a81cf03c23f6b194ae461b0746637aebf11cb9b8fab76bf2c96191185a6b77 SHA512 9edb578e37a2b40027443ff6c9ea405fceef414a7d8b6f87afe367270ba3267dbef628af35cb1e6458f708d1e4451f3542cdf8dd5ce9a6d1343cf72d82973dae
+EBUILD Readonly-2.50.0-r1.ebuild 511 BLAKE2B 165bc30808041fa64b40c471a2a1eee594d0950e31cbc4657c2f4921b6d4f24d8f0d89bf53597971642e2fa157336f571a98e788d4588e14b0f2d9568335ffbe SHA512 af90c5a2a92200b39ed4a865805a06001d517d82215ed738fb98d9bdebb8392cc6bd5d9d6c2ba3aa109a7b2ec399662cbccbbd862cef6933eb26bf06f9fd7194
 MISC metadata.xml 573 BLAKE2B 71bcb9521e50f5017a6b98c3d6df2a46bd27455b922b6b2ff8a1dc234cb867c0d973dfe6046b7521982656d610d6039b27280492580bf427a54548eca640a890 SHA512 d401187b68959c86290c4588ddea6dac4eddca3d00ad180fbf38c319b7a1399c85aaa0becc3ffc5e010f708d6a0a0eb457f8d54c5fb3f407187271306a610048
diff --git a/dev-perl/Readonly/Readonly-2.50.0-r1.ebuild b/dev-perl/Readonly/Readonly-2.50.0-r1.ebuild
new file mode 100644
index 000000000000..9dedaa721628
--- /dev/null
+++ b/dev-perl/Readonly/Readonly-2.50.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SANKO
+DIST_VERSION=2.05
+inherit perl-module
+
+DESCRIPTION="Facility for creating read-only scalars, arrays, hashes"
+
+SLOT="0"
+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"
+
+BDEPEND="
+	>=dev-perl/Module-Build-Tiny-0.35.0
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Readonly/Readonly-2.50.0.ebuild b/dev-perl/Readonly/Readonly-2.50.0.ebuild
deleted file mode 100644
index 4a63259092cb..000000000000
--- a/dev-perl/Readonly/Readonly-2.50.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SANKO
-DIST_VERSION=2.05
-inherit perl-module
-
-DESCRIPTION="Facility for creating read-only scalars, arrays, hashes"
-
-SLOT="0"
-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="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-perl/Module-Build-Tiny-0.35.0
-	test? ( virtual/perl-Test-Simple )
-"
diff --git a/dev-perl/Redis/Manifest b/dev-perl/Redis/Manifest
index a37db2f51209..d3158ffdd994 100644
--- a/dev-perl/Redis/Manifest
+++ b/dev-perl/Redis/Manifest
@@ -1,5 +1,5 @@
 DIST Redis-1.991.tar.gz 47010 BLAKE2B cd8a0df3bd7781f55fda89bbb70564c5fe0640181f204e0503e1eef657cf4a6fc233677ff145fc903362782f25b17664df01d8768b01ee0a0eca03aa07242ccd SHA512 28e4c5d4c4275a9949cc25f239c1f8bdd3371bd5f5772e72e6d4c063ce1cbfec77d429e6efcf3836a397d76eb9b7351ca98585ee5697f6bfbf359c200ace7819
 DIST Redis-1.998.tar.gz 59660 BLAKE2B a4716462f18eb40585932d8e759cbcf0577c5b1680c5efe88386bcb1aee62a3c73c075e01c622df6ce4b0b04ddd6f06677c2d616b5f9c483d43bd18d16e1d87a SHA512 232f0e602f6165da426ff6ee6a531f81eea3491c0312dae2813bdb15ac34469f6621c7683d5bd6b2be0cdcc09edf3f1f19cc03c848d43d41e630fe1306f62268
 EBUILD Redis-1.991.0.ebuild 1400 BLAKE2B 1cbf84820a1fb4548aac4d448fa1ed0bc12025b59e6d325a86270a081faff93db5da00a7c528ba209ca3fec5a90bbbbb413d0566b43f07e4baddcd2f44012e3d SHA512 f79e699297ea7e986370c46694644944d4d1cc25569407ce38f366da1d139fbfb6a428b07701f83952260f4ca29d1fd3bf328c5527fa1af47882d0ab275034b0
-EBUILD Redis-1.998.0.ebuild 1403 BLAKE2B 84f6c2cf7ae9e006c96e0bd88773861f1c52c958cbc44eea8c67fa763c589719f95b11ebdc202fc9c7d8f7d63c3559bce951efc7b5c04916492a26214c13cfaa SHA512 4887279cba2f72da214f1a8b2b35ae783ee1b7c8e858b20ead7842d9e36445aff117f9c23b4c52849c9270f288427b9807c3fc3f87cf0fdd54b187fd8ef6b12a
+EBUILD Redis-1.998.0.ebuild 1402 BLAKE2B 398f879b4e138d0af635305eca865af53ba51796abcb31b367dcc0532930ab3270a049399abb84ef181ec85d4489846744ff988c7020a051bf894d5bb0a6e1bf SHA512 5c796d6601554f01c1b232853cbe529900fd208b2c1acc824d385d5ee48f491267537c1e7795ada949c1aff7543a76e8493aee19c73db7ba0e55da82c9a1dccc
 MISC metadata.xml 559 BLAKE2B 3fd32e57b03aa49052b0d9f86039e827772af5c2adb628bc192707e941833ace7e477a3eb221b668752dd98598563b285704b6ceb2435bf1d2b5bb3e8848035c SHA512 293d78b79bd69556b709c43017513df22b172e0739c3bef1708a5126f2c9845730bcc9dfaceb4a2e0cd02ab7917268ec875e2ff46a1aaa35d68fc995a029185d
diff --git a/dev-perl/Redis/Redis-1.998.0.ebuild b/dev-perl/Redis/Redis-1.998.0.ebuild
index 0851110e62f5..20fc92002ed4 100644
--- a/dev-perl/Redis/Redis-1.998.0.ebuild
+++ b/dev-perl/Redis/Redis-1.998.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl binding for Redis database"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/RedisDB-Parser/Manifest b/dev-perl/RedisDB-Parser/Manifest
index 9ef25affb0c3..f7b99975416b 100644
--- a/dev-perl/RedisDB-Parser/Manifest
+++ b/dev-perl/RedisDB-Parser/Manifest
@@ -1,4 +1,6 @@
 AUX RedisDB-Parser-2.22-readmepod.patch 984 BLAKE2B 94e96c1c3514745c4b065b2d9b05f979f940e44df6694cea59f835ad0f947c6a2d83f46816b257a78f6380b60ad1fc60b8ffcae074eac8b086243c07309382a2 SHA512 904d6e1db3d28e5f98bf9d16036c4248060b0f61e410157b3c5feac64e2b8972c4a15b19a90d8e4216b9b846f0f6e05ad5fdfa6bdceaf96462d395a365ade9e5
 DIST RedisDB-Parser-2.22.tar.gz 31497 BLAKE2B 583628330b3b23a16966160848acb84fd92b3b767bc9e05f832f688ed0d44b81c0ff691081d0e851e7a193924086a614a07f32bd56d39d12a6fb80bdaa029bf0 SHA512 c8efbb6d7d978940415f066c2d3dfd4c1c1c38cbd5309f667d102b0bcd2f113d36ffb1fc9718b6f1ac739fb8801eb2a09bb690eb373be0561ddad1d3d3de8205
+DIST RedisDB-Parser-2.23.tar.gz 30675 BLAKE2B 3abb39039672055121486ca3cfc4e9a910b47a7fcec96db75f6ede99ef7cb28d9ce0b5fc85631040e8a86f59d427db673cb23cc5819c6bdc8454fe86cf8ccc2b SHA512 b08e2fe26c7c3d49bf9c61f91e26a79e71bcad27de6cd81316724c211808e661a05d3c4151fa4adc96ae6270a4caa0be0e13fc5f55798fcb1554e19a9de6ebb5
 EBUILD RedisDB-Parser-2.220.0.ebuild 622 BLAKE2B 5d7649752b9ad3edc0589c5a8d237df89a5f16049d34fbf54b260b1990c355e48604576fa2cb3b14035ded91a35c0dac5e1c88c898a031938180afae00db8a1b SHA512 353f12923965199ee0d54d11442f79bfc5c9162c5c2a9b4800c8c72352663831b40b70166711863999e1306a287f58b9f6c249ab4be1971fed7c6b1150e495d9
+EBUILD RedisDB-Parser-2.230.0.ebuild 531 BLAKE2B bbcfd507ee7daadc0c2009929c3d734046da4fc995812628be868512abc7c15aaa192af84afce8592d1c530e942415220a49dd5acc2f1c3de3fbb1905debed7f SHA512 f45a665952fd1ddb6f7ff7d3f12e8a3a0b5648b20cf98df3db79783c06269c842132b9c99605d944ee2a2ee8e218261a5c9e1fdc3ae6822010dcd5dbfdd084f1
 MISC metadata.xml 751 BLAKE2B fabdf308aca7e2b7180270f3e1205045debb329f6cc35769f77f197073b7ad574e480465551b9ddfa9c9eb06df10e10b69dd0ca64c11eecaaca5b30880851e38 SHA512 d477f84c02dddff6b25f3303e5573eb819dfd38a9c477a261d0978c17ca372581a6cb0d073c41222a126d985e00be62afe07a560398094c83a28662a01dab799
diff --git a/dev-perl/RedisDB-Parser/RedisDB-Parser-2.230.0.ebuild b/dev-perl/RedisDB-Parser/RedisDB-Parser-2.230.0.ebuild
new file mode 100644
index 000000000000..a241d0cd3f31
--- /dev/null
+++ b/dev-perl/RedisDB-Parser/RedisDB-Parser-2.230.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ZWON
+DIST_VERSION=2.23
+inherit perl-module
+
+DESCRIPTION="Redis protocol parser for RedisDB"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/perl-Encode-2.100.0
+	dev-perl/Try-Tiny
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.200
+	>=virtual/perl-ExtUtils-CBuilder-0.270.0
+	test? (
+		dev-perl/Test-FailWarnings
+		>=dev-perl/Test-Most-0.220.0
+		>=virtual/perl-Test-Simple-0.940.0
+	)
+"
diff --git a/dev-perl/RedisDB/Manifest b/dev-perl/RedisDB/Manifest
index 06bc09d44ffe..5ae0d76d2895 100644
--- a/dev-perl/RedisDB/Manifest
+++ b/dev-perl/RedisDB/Manifest
@@ -1,3 +1,5 @@
 DIST RedisDB-2.54.tar.gz 48368 BLAKE2B 58d699e851b4a4569eb123a577c73610d09baabe9f11c4bb51cceb9ce98bc9e9f31ca255db4ac28f5049cbf0cb65201a6cb48bda9e5e776f71f6f44f157efbb0 SHA512 0fbbf5ca076a92d57f715754d5817a9669deaf08601b3dd1a183e616356500c0c02961dafe0af20ef1d8f6368750a3899dc4fff857ba666b98b5ef4c4c7b4396
+DIST RedisDB-2.57.tar.gz 48581 BLAKE2B 525de6abd068908838156711168c0b05e85aae7e4a6395717f26cfdc79f220acbe24a4d3d1a3b9f55986a83990db99bef010b94590174924fafb082ff6ae2398 SHA512 07a106704aee763012e68d72a779105ee59d3e4b11a5ec8db677c89ec263234ea424183751389328364f32a92348a51e14e0082d6a724dcb762632993a883d54
 EBUILD RedisDB-2.540.0.ebuild 1092 BLAKE2B 396b0739f8c28f76a03f5daf06d8cfb731b32a1bf13a5d02695a714941195953816b47f0cc661e6230627086f2d9091341c9eaf186d9877055abe767122d8998 SHA512 fad5d6fc56161176d2df61ab146ebb6f25ccec3aaf660128ca7fd0257eccd88561a7e56a78aa81a866218cfa3e9c1b16283dd3349ea2c9f424b88bd484e3e3b7
+EBUILD RedisDB-2.570.0.ebuild 1061 BLAKE2B bfcda4a0a60734be0cc8ef79e714a59dde1de8429bc5334b174cea35c0cdda257a5bb31d68476f5ca5860d112f3b9271013f4232bfa5e46462355de2b653e959 SHA512 d2dd741b807bcb7fb2648ba02ac9c091edf207791b4f9c4329f4b9687f2cade8ea1a8f4a227ce4b4978b316700ea499d1100facacbe5801096f8a776d7d6d999
 MISC metadata.xml 911 BLAKE2B 9b825746d274a9c0785fb3326953403790de66bc368a0b2b47558f148af90deddeb9332359244218da6b939312ca3ccc13dcf9381dac8441cd39327feb5b80d2 SHA512 ec308569156721472a07961eb1926c528bb029f24d2db9f780dacabbd7fe1c51de5c0b8670a7db6b2645601f20898261ff23dff02c513f377593546df2c6c653
diff --git a/dev-perl/RedisDB/RedisDB-2.570.0.ebuild b/dev-perl/RedisDB/RedisDB-2.570.0.ebuild
new file mode 100644
index 000000000000..3512a4ec02f8
--- /dev/null
+++ b/dev-perl/RedisDB/RedisDB-2.570.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ZWON
+DIST_VERSION=2.57
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module
+
+DESCRIPTION="Perl extension to access redis database"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+RDEPEND="
+	>=virtual/perl-Encode-2.100.0
+	virtual/perl-IO-Socket-IP
+	>=dev-perl/RedisDB-Parser-2.210.0
+	dev-perl/Try-Tiny
+	dev-perl/URI
+	dev-perl/URI-redis
+	>=dev-perl/Test-TCP-1.170.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-Digest-SHA
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.200
+	test? (
+		!minimal? (
+			dev-db/redis
+		)
+		>=dev-perl/Test-Differences-0.610.0
+		dev-perl/Test-FailWarnings
+		>=dev-perl/Test-Most-0.220.0
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+
+src_test() {
+	if use minimal; then
+		einfo "Disabling active redis-server tests (USE=minimal)"
+		perl_rm_files t/basic_redis.t \
+			t/auth.t \
+			t/redis_commands.t \
+			t/restore_subscriptions.t \
+			t/send_command_cb.t \
+			t/subscribe.t \
+			t/transactions.t \
+			t/utf8.t
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/Ref-Util-XS/Manifest b/dev-perl/Ref-Util-XS/Manifest
index 1531d4775504..41e222e9b8fd 100644
--- a/dev-perl/Ref-Util-XS/Manifest
+++ b/dev-perl/Ref-Util-XS/Manifest
@@ -1,3 +1,5 @@
 DIST Ref-Util-XS-0.116.tar.gz 71099 BLAKE2B b4e19fd4fb8181116eb8cbc1bf11ecb922e89165fe724301d3c78f2eb4188b90d334c1900300012ec4cc55e1dd7b780360b0fd45a221e3d72a0a552ce3d8bde6 SHA512 1fdb0cfcd76cddb3007262b1535cb099e663b2baf86b94956bd0fcd2e86e76fea0b3fff3056cbe0b6096873c94de11e1ca34f9576b2206e2b1225d294de2a621
+DIST Ref-Util-XS-0.117.tar.gz 71565 BLAKE2B 065a8818ff024b64f518ccea215517b7cdbfb5726f00989d8632d68ba3e0201d3ca1f15fd8bc6a6ec2beed981c415b9088f3b08d13b7314caecd9561ffe6c57b SHA512 5ebcd1bfd6c4b94c17f24c890342d4fba74a7a7c09b3d338208cd5d3fe6b6dd2c504c86ab555c27781b5ede2633d012bb7df819029ce89bec6bc269e21d567a0
 EBUILD Ref-Util-XS-0.116.0.ebuild 710 BLAKE2B ccf95a5af3abbb7e6bfe6f6ab910347b370fac2934a809d82d6712def9d77a9123a098911346b49e454209566835ca1e58c08dd88fa305bc5539c939be89804c SHA512 7e009b3122749b7ac4643290e0265593d737245b6ab17441fa16c954f192302d6fca7d9b0cfa38b2948037c9986b87c897f586a78db240a5f8d77183dd3b086a
+EBUILD Ref-Util-XS-0.117.0.ebuild 680 BLAKE2B b358e6827bb3184953441fbc45d86fce04b2ec8c6e87cdf921f0da6e3a09e6283f1030765551092e94e81b42e217648e2f9027863c8786b91244050282045267 SHA512 006f86374f6ab241d10d706b56c57be485403ff05e0b14f306aa80546c36fe2f0555c187447d2d1ac85232f425343a7821ebb064296731dbb2b08e5c03678258
 MISC metadata.xml 395 BLAKE2B 742b2adfc2b98a7ad3711a164cd9a0aad38bca577bcf6d05eb6fc107a8b876c16bb21a45111d51f0d51f395f067a5a0c0490f1bb2ff444d1682aba53420363bb SHA512 436a21012af882634e4e985fd28177a0f6585d6e9e393f0fe393192be5de8b2e492b14c048b452988104cd5b07b5bec4295fb7774967f347e04380c91a54993b
diff --git a/dev-perl/Ref-Util-XS/Ref-Util-XS-0.117.0.ebuild b/dev-perl/Ref-Util-XS/Ref-Util-XS-0.117.0.ebuild
new file mode 100644
index 000000000000..0cf1a0da793b
--- /dev/null
+++ b/dev-perl/Ref-Util-XS/Ref-Util-XS-0.117.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=XSAWYERX
+DIST_VERSION=0.117
+inherit perl-module
+
+DESCRIPTION="XS Implementation for Ref::Util"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+
+RDEPEND="
+	>=virtual/perl-Exporter-5.570.0
+	virtual/perl-XSLoader
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-CPAN-Meta-2.120.900
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Ref-Util/Manifest b/dev-perl/Ref-Util/Manifest
index d4275b925855..b3ff2d51636c 100644
--- a/dev-perl/Ref-Util/Manifest
+++ b/dev-perl/Ref-Util/Manifest
@@ -1,3 +1,5 @@
 DIST Ref-Util-0.203.tar.gz 26937 BLAKE2B 18395f686abd76e90c360b7594ec3decc67288dcaa8c107f35d1666c508126812956d5c955dfd85c42383ffbbc5f9ae91171786a851955a3bb3b70bdc8553011 SHA512 bf0b1cde5adf869377aaee3c6a8fa8f40fc852c70f20dafdb3d7f3b7718eb19738a4d53c243e9809b7cff9e2e49a871f0336b4288b96048e91ae48634d12a392
+DIST Ref-Util-0.204.tar.gz 27509 BLAKE2B 80708bd997925f9cf9518a412dd762ae3357ba303f2f91bcdf7858c963e61c1e68c9da574845679816e326f96df9aa82cee1e570a4ea5036f853bdad81068981 SHA512 12834e13de5578232e40ba308e97786c60fcec4da9dc0b2922506d42645e8b3c3234663cf3b9c1dc374772107de953ed49ba8b52a2bac79183e3860338c0b288
 EBUILD Ref-Util-0.203.0.ebuild 759 BLAKE2B 5cff0e53579dc13f1c97c8a122052a62b48ddd426110e4a06eede27cc329776b4595f39e3a1d3af797b0ec7ea713d65f59b5ff58beac269a96b07476a25f02b6 SHA512 9e73ca53bb65171a3945babf5f32307e3d2d5d3e583b6cd5eeff784f31f6b58f25e8c3c512f8b6ad420c8b2716dd308edac389c3b0b2d66bdf702d2de96c472b
+EBUILD Ref-Util-0.204.0.ebuild 736 BLAKE2B 5046c89564ad6203bb07a9037c64042dc1c6bcabb10284ee7a9ccdfc50626e999a75d2c7864f82120dbddf92382a89f3342e3c5783128462dae78a87dd2571d7 SHA512 e9b3a2a9d60b512bffb7736d04a8cd844708057fcc595a643a95f600da299bb02b70ea4d28d3aa08eb8124f213664b31f62cdd6e0007bc1b63bea3a3d8b244f0
 MISC metadata.xml 568 BLAKE2B 331313258de1b3217cfaa999b4c237d8d2d8c38aa34511713905647cb2a2023cb774f0ba08eaa264d036d75632fc9348be792ae0d200188596dc05b87a9e394b SHA512 8c4bd997ce42b035db6631e9444781ad5bc6907c911c5bdfabb2d434888af88587cae049506263883c133651ad2214335cb747844524c0e9eb0eb2e1e92d92ae
diff --git a/dev-perl/Ref-Util/Ref-Util-0.204.0.ebuild b/dev-perl/Ref-Util/Ref-Util-0.204.0.ebuild
new file mode 100644
index 000000000000..31795007ce95
--- /dev/null
+++ b/dev-perl/Ref-Util/Ref-Util-0.204.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ARC
+DIST_VERSION=0.204
+inherit perl-module
+
+DESCRIPTION="Utility functions for checking references"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+IUSE="+xs"
+
+RDEPEND="
+	xs? (
+		dev-perl/Ref-Util-XS
+	)
+	>=virtual/perl-Exporter-5.570.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Text-ParseWords
+	test? (
+		>=virtual/perl-CPAN-Meta-2.120.900
+		>=virtual/perl-Test-Simple-0.960.0
+		virtual/perl-File-Spec
+	)
+"
diff --git a/dev-perl/Regexp-Common-net-CIDR/Manifest b/dev-perl/Regexp-Common-net-CIDR/Manifest
index 7f7841ed5955..9ec1d4fec9f1 100644
--- a/dev-perl/Regexp-Common-net-CIDR/Manifest
+++ b/dev-perl/Regexp-Common-net-CIDR/Manifest
@@ -1,5 +1,5 @@
 AUX Regexp-Common-net-CIDR-0.03-basic-tests.patch 888 BLAKE2B cf34f07403c6c22557ee02bd2e8d122bd6671f858fd6899aad5085fb19376b372a7693f814b3a41add8284f0cb936d792192929ccaae66248196f520958c4c86 SHA512 b8c8bb5dc5cf3129bd4221f2832c93d039ff051a75d87a0a61bc47a69f886476587a61d93d72e4815e0513f53593166745dbf41f3451addc160d6f25f00af263
 AUX Regexp-Common-net-CIDR-0.03-no-dot-inc.patch 624 BLAKE2B 697293b97d677a5efe35695c524127b4af16e3073e9bf9b20eba23c07774623ea4f6bd69582171ca3e60862ddc9e85beb4655e1341b0854a2227314ad874098e SHA512 1885b7c5a4bd2f6acd78b3081692092bd904e4d9104f0e2b237fca99f8284cd11e07328d646d84de0f9bbbfd1102a3fd0d4a5b131028fb7191cf426037f151f1
 DIST Regexp-Common-net-CIDR-0.03.tar.gz 26311 BLAKE2B 61c7f29962fd64ebefc0bf9f10bf6f7fb19fa3fcfcc963cded5b45e21738998cda610a5a4736ae6deb30e38696c07b06fe5355c73dbda7844e2da1b34bfddb53 SHA512 0ca3d188ea4197af2981c2910e5f5a2d412d760251ee7ad9d688aa6e60f4dfdbf5583d599b1af8698ed7c740c252f0e8bda38de254f03a699122de1c1f598f20
-EBUILD Regexp-Common-net-CIDR-0.30.0.ebuild 524 BLAKE2B c78ad9b89045dd876d0e17cdf1386a45a5582e843d1eb64fc4b28a487b30b7a63abc3e7841fd6611e8fde8687a9c30cdc96235d8213c2c1b400e15f5d303f036 SHA512 260607005e51dcf18e0311e0fca340c8f60a206f2c0f02cd876d0e061ad05d1571a4f1fd30b0acf3f20b45aee32843a5a1363d3fa3161b9123a7262eaa179c23
+EBUILD Regexp-Common-net-CIDR-0.30.0-r1.ebuild 486 BLAKE2B c292b3d85ad6c704db14fca2fc98eab28dfa068d329aa944ac140eccb1170441697d14c7b100927ba580ce18e9c364503d9e1a7180600f8e2ddf22a114bada76 SHA512 aeebb0566cc93b60e24bb20862b30e76b8da05680e5177a336dde8011df297c9628c897cae2504fa75956f6b07a2c6827553c8550ebfeb9670758053dca7b06c
 MISC metadata.xml 418 BLAKE2B e57cb07a3b76781cbdbbd6f15692f20299991ecf6d5ca9974a85c790763010e290139b2d40b6d69f28417bf0b014c9b8083bb38497b66c01c3859bde039da73b SHA512 d7857c2b4c44f8531ab8d5382acb759c4a9b20ecfa7d7d444695cc33042345e1c92cb1a6d85a72672a3bafdcb09bfdf2a70b88263ad569e8851d9875048eca33
diff --git a/dev-perl/Regexp-Common-net-CIDR/Regexp-Common-net-CIDR-0.30.0-r1.ebuild b/dev-perl/Regexp-Common-net-CIDR/Regexp-Common-net-CIDR-0.30.0-r1.ebuild
new file mode 100644
index 000000000000..eaeb975e1c31
--- /dev/null
+++ b/dev-perl/Regexp-Common-net-CIDR/Regexp-Common-net-CIDR-0.30.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=BPS
+DIST_VERSION=0.03
+inherit perl-module
+
+DESCRIPTION="Provides patterns for CIDR blocks"
+
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Regexp-Common
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	test? ( virtual/perl-Test-Simple )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.03-no-dot-inc.patch"
+	"${FILESDIR}/${PN}-0.03-basic-tests.patch"
+)
diff --git a/dev-perl/Regexp-Common-net-CIDR/Regexp-Common-net-CIDR-0.30.0.ebuild b/dev-perl/Regexp-Common-net-CIDR/Regexp-Common-net-CIDR-0.30.0.ebuild
deleted file mode 100644
index 018a6f1f7f14..000000000000
--- a/dev-perl/Regexp-Common-net-CIDR/Regexp-Common-net-CIDR-0.30.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BPS
-DIST_VERSION=0.03
-inherit perl-module
-
-DESCRIPTION="Provides patterns for CIDR blocks"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Regexp-Common
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-	test? ( virtual/perl-Test-Simple )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.03-no-dot-inc.patch"
-	"${FILESDIR}/${PN}-0.03-basic-tests.patch"
-)
diff --git a/dev-perl/Regexp-Common/Manifest b/dev-perl/Regexp-Common/Manifest
index 42d2b0f53f3f..470b907c23ad 100644
--- a/dev-perl/Regexp-Common/Manifest
+++ b/dev-perl/Regexp-Common/Manifest
@@ -1,3 +1,3 @@
 DIST Regexp-Common-2017060201.tar.gz 237881 BLAKE2B c7199552d6d495f7ee9b601f125e601c86b552eb658691f989ab37b25dcf0a60eea0f78735e713853d6a471f6bf0c2db350577e77c60b6272b4170594ed3cd18 SHA512 fd046d775214bdca42f868557559595360b069121a75fc119f45e064091000968d9d84154f8a0f06072ecff169dccecf68be58f99a7196932fcb4ffcbd678608
-EBUILD Regexp-Common-2017060201.0.0.ebuild 534 BLAKE2B ddf56156437e2052c826e4c8c17d2215239db650bff5b4e4105676649d44e38ab2e1f37cf43748d0ebf8cb87a04f406f0006c29cd2cb5e8ce2f0882c2abddc99 SHA512 481f95127cd988e21389e893c3698d404027b6fd1bd8e335b95729fefe10801b5a9574f74ed777ed7c6cbfc0a02c725867bbfec9c1ade33223409d3ea85caa5d
+EBUILD Regexp-Common-2017060201.0.0-r1.ebuild 464 BLAKE2B 65abb74b00e9b11f7da7f66476d0975475529ca2c829afe90b5a41e35de78c4c1661a8ece2e29a681f57158d075621c2a28653754ec52f539651efc726b90ecf SHA512 4581ace85e05a4033b4de646d9013d6cb21f82024b372d1b88eef478c4203ee2e1deeda584526651ed21935d6bffcf11204cf3f7615cc3bd13f43425d1daa23b
 MISC metadata.xml 2809 BLAKE2B 03d37e6b17a5491323e131234076f879f3eca23b159e28e7eae6dffa62581a13ff23631ea4e78621fffffad56712328d90857850acf2a801fa57ff9747fdb97d SHA512 40e6c4784ef1a59367aa1d74b317b0a8f17127a0dd8cd52acf0e122e43f150db39a884b866cb022eb398b4545121a6cb1e2364c3670569f714c9abcfbd752d45
diff --git a/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0-r1.ebuild b/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0-r1.ebuild
new file mode 100644
index 000000000000..a02a7e181100
--- /dev/null
+++ b/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ABIGAIL
+DIST_VERSION=2017060201
+inherit perl-module
+
+DESCRIPTION="Provide commonly requested regular expressions"
+
+LICENSE="|| ( Artistic Artistic-2 MIT BSD )"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( dev-perl/Test-Regexp )
+"
diff --git a/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0.ebuild b/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0.ebuild
deleted file mode 100644
index 8fbbe64b15c0..000000000000
--- a/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DIST_AUTHOR=ABIGAIL
-DIST_VERSION=$(get_major_version)
-
-inherit perl-module
-
-DESCRIPTION="Provide commonly requested regular expressions"
-
-LICENSE="|| ( Artistic Artistic-2 MIT BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( dev-perl/Test-Regexp )
-"
diff --git a/dev-perl/Regexp-IPv6/Manifest b/dev-perl/Regexp-IPv6/Manifest
index fae968bab6e2..c94272c69526 100644
--- a/dev-perl/Regexp-IPv6/Manifest
+++ b/dev-perl/Regexp-IPv6/Manifest
@@ -1,3 +1,3 @@
 DIST Regexp-IPv6-0.03.tar.gz 3291 BLAKE2B d663f456073d79bef1323bda7eb8e6fe1019b82b215013c855707294f2568bc783e9b5a3102766f8c4f8b813d0f9aaecf212b156faa07327253e94acc5e2fdd9 SHA512 e4d226d3f925f01e03bf610dfd397babdb7ef823b4df6189aaf87a84e75c242e32073dd90a96719f8ce8969af42806c59b24e600534c330a983e1e301574d29f
-EBUILD Regexp-IPv6-0.30.0-r1.ebuild 283 BLAKE2B d0ef5cfc4101ddf091556bf53f693d03b246b8a7f0a73ecf535b9226dea620ae819f71a38b61f228e51861df7c8817929208114cb58a71f999c144064fa7a993 SHA512 4b1ede20c15c3358258d01599e4f17f62830a1f92992e5e21fa9afb7d6d0172a225c3e4c1d14c3d6a2600efb27249f28b36dbedc3d1d268a66d2df4c2bd6203b
+EBUILD Regexp-IPv6-0.30.0-r2.ebuild 253 BLAKE2B 1f13f93186b24deacbf966a0ecf81512a82f9c4564cba6eb3537d275c72a7956924f6a9dd7d8f433f922d8d4448f57868f061265d1d87db7f0a350d6da6d73be SHA512 269390eb5cd48415ed30353e0560f7af7edea0ee61fdc0cb921a8e1da01674a6d6fb2972ad48fb1d73419e4d152c8f2536eec613d86ea4136ba26c3b0714cc68
 MISC metadata.xml 394 BLAKE2B 6c4b3118eeb3062ca70310811a01b5885167d91eb5dde9596c1a996152d2f2ea7d9e231dfc997eacd6d9ae9f9e5b99d8b52cea1f0228024eecd85d88d34e5c47 SHA512 b8c4f9060734b56befa840e5b3c4aefc2fdfa11848f9e550724be93eb3ebd6645cc6bc10319b460748f28b7685d2f8c2bdd40c21fc530b8ee090ed70451eb6a7
diff --git a/dev-perl/Regexp-IPv6/Regexp-IPv6-0.30.0-r1.ebuild b/dev-perl/Regexp-IPv6/Regexp-IPv6-0.30.0-r1.ebuild
deleted file mode 100644
index 89835847a445..000000000000
--- a/dev-perl/Regexp-IPv6/Regexp-IPv6-0.30.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SALVA
-MODULE_VERSION=0.03
-inherit perl-module
-
-DESCRIPTION="Regular expression for IPv6 addresses"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Regexp-IPv6/Regexp-IPv6-0.30.0-r2.ebuild b/dev-perl/Regexp-IPv6/Regexp-IPv6-0.30.0-r2.ebuild
new file mode 100644
index 000000000000..b0a2fa6617d2
--- /dev/null
+++ b/dev-perl/Regexp-IPv6/Regexp-IPv6-0.30.0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SALVA
+DIST_VERSION=0.03
+inherit perl-module
+
+DESCRIPTION="Regular expression for IPv6 addresses"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
diff --git a/dev-perl/Regexp-RegGrp/Manifest b/dev-perl/Regexp-RegGrp/Manifest
index fecd26222caa..d030fd0c0d41 100644
--- a/dev-perl/Regexp-RegGrp/Manifest
+++ b/dev-perl/Regexp-RegGrp/Manifest
@@ -1,3 +1,3 @@
 DIST Regexp-RegGrp-2.01.tar.gz 10011 BLAKE2B f6f3135ba7fb5156378fe33866cc8dab8ee2a49c65a5e7bd19e89e758c5db8b957fd28e33b4a88f603d60e1fbe16426707fe578b686eaad499e4bdf165cbcdc9 SHA512 742c9760628d32fd60c28fabb4b7e60691e004ed22ae19d0d847e8c432827c9dd150d9d7d0f900274a270d596322d864e976b11e2bcb1135bfc473e61784c542
-EBUILD Regexp-RegGrp-2.10.0.ebuild 456 BLAKE2B 227adee38cd63b9b1842fee8b9a196dd1ceb53564b6dbeeb3ea147c3cff0c8e9b0f4424ec8dc86406edee0efb6a587a97526422b07b0cc48617c3fb785b29d00 SHA512 ca0bc6dcd05b75c5435b125995b8cf741bce514608cba1569defc4b537e792fbb295c5f2d51425550b985f061a8a748aea0697fb931054d42275f8bcc11142e3
+EBUILD Regexp-RegGrp-2.10.0-r1.ebuild 420 BLAKE2B 3142cae14966f86af3fb5b1db8e2f797a404b6a76eb591f8290f11639682ba870878ffca1ae43a4bfa06f48b1727c838416f8b3d307c0fe4ff91b8cc607d0e3e SHA512 fb7957365ed0b00d89f2f429d4903564025bcf05a096d0412cf86105be49a8020674046c8d2f414cc7c0b7c0a7cd945aad61392c0e9397d23baf55e3148ca311
 MISC metadata.xml 493 BLAKE2B 0a4c6ac7b803c45f41d6f254594f8c0e4e9db0bb812c590141091102a512d6baf236a5541fa1a980b4cf6a23070382b827460873acf6389f011d1aee17f8b4de SHA512 49f4b0d0f55302291ee48c1a9210bdd942a1e75b4c880c89f21847a99d266405ea94d878913dfc942abcb10ee169153b919d69631a2ef1dcdab15095f368e16c
diff --git a/dev-perl/Regexp-RegGrp/Regexp-RegGrp-2.10.0-r1.ebuild b/dev-perl/Regexp-RegGrp/Regexp-RegGrp-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..515debd38391
--- /dev/null
+++ b/dev-perl/Regexp-RegGrp/Regexp-RegGrp-2.10.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=LEEJO
+DIST_VERSION=2.01
+inherit perl-module
+
+DESCRIPTION="Groups a regular expressions collection"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+src_test() {
+	perl_rm_files t/pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Regexp-RegGrp/Regexp-RegGrp-2.10.0.ebuild b/dev-perl/Regexp-RegGrp/Regexp-RegGrp-2.10.0.ebuild
deleted file mode 100644
index 9f3abdfd6cf8..000000000000
--- a/dev-perl/Regexp-RegGrp/Regexp-RegGrp-2.10.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=LEEJO
-DIST_VERSION=2.01
-inherit perl-module
-
-DESCRIPTION="Groups a regular expressions collection"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-src_test() {
-	perl_rm_files t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Regexp-Shellish/Manifest b/dev-perl/Regexp-Shellish/Manifest
index 1e3e5bb8e471..ec1fe0a9f5ad 100644
--- a/dev-perl/Regexp-Shellish/Manifest
+++ b/dev-perl/Regexp-Shellish/Manifest
@@ -1,3 +1,3 @@
 DIST Regexp-Shellish-0.93.tar.gz 3343 BLAKE2B 68a18fdf521b50bf8e591572cb22f62c287bb9de470539c7f6a33abca23bb504faf617865f407995c4adba635736a6509d442f5a816e29014340c3ab100b4738 SHA512 c3ca3654241e567c7d7e8285934c95843a1c2c667c6de2f7269c18e95b0bb96351f523aeae481852fcb0a5723f753f26c85f60876a4754e573cf936ccdee4932
-EBUILD Regexp-Shellish-0.930.0-r1.ebuild 376 BLAKE2B fb27ef54a1b573a4262af2f4efdf86a29e89f6ab2ab9a9d537eae72cbdc05306f8cb3e7ef6e09d5fd022ff3fb2a829bc315b77d0b772938744a1887dfde4f172 SHA512 9392bdc8bc342ad1d744f20d4dc060036e1d20960fcf8a2b81433106c8ffc5057b866a2295909c1fedb968c3da3360b1df23b109155b3be1d4c133de345f550b
+EBUILD Regexp-Shellish-0.930.0-r2.ebuild 349 BLAKE2B bfcbc8c270e4aa9f9f9b439a2a0de9d69dc86a0593b7c0821c76639b931c51cd1350342df29e2db3b91904005cc91f8b45c8963d13bf04ff4ae7f6b30ca815ac SHA512 06d0f09dd16bed1262fdcb18bbfc94344596a5906340b44199d100c996272147e94e1a54bbeb68446197f5fab95a99c5a8439e142fa90750227535c569113b50
 MISC metadata.xml 402 BLAKE2B 54489af6d5f6179353a8252542948b4bcce736cc5cecabaf4fb208df1f0b1e2cf492c6ed2852295b91a023e8a0a72fd87aa25a137ac5c69004c5aaf1371a5897 SHA512 b51c42da6d11e55f5074385a5ef1a13ae5009b8f7e9405540f39cf3bdc9cd2121689c997a6a7daa351602d8595da27589e90969da71c7b2b4e3f0666032b863d
diff --git a/dev-perl/Regexp-Shellish/Regexp-Shellish-0.930.0-r1.ebuild b/dev-perl/Regexp-Shellish/Regexp-Shellish-0.930.0-r1.ebuild
deleted file mode 100644
index 54795c65d896..000000000000
--- a/dev-perl/Regexp-Shellish/Regexp-Shellish-0.930.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RBS
-MODULE_VERSION=0.93
-inherit perl-module
-
-DESCRIPTION="Regexp::Shellish - Shell-like regular expressions"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Regexp-Shellish/Regexp-Shellish-0.930.0-r2.ebuild b/dev-perl/Regexp-Shellish/Regexp-Shellish-0.930.0-r2.ebuild
new file mode 100644
index 000000000000..7f3a4bef0ec7
--- /dev/null
+++ b/dev-perl/Regexp-Shellish/Regexp-Shellish-0.930.0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RBS
+DIST_VERSION=0.93
+inherit perl-module
+
+DESCRIPTION="Regexp::Shellish - Shell-like regular expressions"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
diff --git a/dev-perl/Regexp-Util/Manifest b/dev-perl/Regexp-Util/Manifest
index 34f2e907791c..c062cc519f83 100644
--- a/dev-perl/Regexp-Util/Manifest
+++ b/dev-perl/Regexp-Util/Manifest
@@ -1,3 +1,5 @@
 DIST Regexp-Util-0.003.tar.gz 61890 BLAKE2B 2740b80448deee7aa37dec3e7b1c46eac347cab6f99c82cc0cc019ad03ce899201b08f1cc0d15985becf8bd2bb19b6cac18e128cecfc6730ff662b3e3de5ce40 SHA512 27501c4e7017e2470cd24f2b8bd8b94cc3acd266500851c5ee1f4bbe3af56285be3eeaacee95b45606bee01cead4f0a30eb7c10260d93b3e98bc432d211be2f0
-EBUILD Regexp-Util-0.3.0.ebuild 637 BLAKE2B 3bb490a52550ee1446d12d1f53e2ec41fe8b6a8e63af8de47f5bf13d9b9295c49c8d19bad9467ebf9e4f90940f0157769e67ee7436bf322eb898c8c44681bb47 SHA512 0a4f729506151378ed2636ef663e7c08094fb42a40bd985190b24df621d67de895a87f9e1e9b5d54996b463c04d08cd810810eb9404c99ce1f94710b4a21de20
+DIST Regexp-Util-0.005.tar.gz 61125 BLAKE2B 700649f473e3c3e958567afd380eec543ecbd974456c7a2bf3728864e543923dcc3e587412d50c94fca869a9f0ea215735eaada539d3800bf2f52c59deae9c28 SHA512 83e40a14fa75a4d809af4f39087154332a85cafd144350982b0481f338c598bdccf8c930accf29327246251702239782c58333a54de1a92742999a2b45a19ca1
+EBUILD Regexp-Util-0.3.0.ebuild 635 BLAKE2B 804cb4908add26829c29466b6c323efd63c10f3e78e375dcd0680c3bd11b8c0182d93b14ecffec22613ada8f77150747f754c0e5e311bc7acabbc0e78049bfe3 SHA512 f859012b3eda93c3c9d53982f704766ef4c1a60e03b6660281ae94be7ae5b94b3369d9c6ac3ad9c8c33f9e8337c454d511f1852b6d746811a708b830104db0cc
+EBUILD Regexp-Util-0.5.0.ebuild 595 BLAKE2B 440a5aa7bc076196a32c2ae7ef7b63fd58661a7d04d79d9e4330a895962bfd16dc5908e86cd664528671c9964f50d02eb0a9d1326210175296440c54eee8c5d4 SHA512 27fed30f95764ce2038ad0234af6f2a6a8fb03b9891a45f854906f97f7c7e4cde401e4a58413fb4ad72d3f09e4c7c1d3a383ed90c5750ec4ad53ec9fdb92d650
 MISC metadata.xml 394 BLAKE2B 7cfadf77366c4f4d2569148d8f1676a62228e6be2fae7638a0cad5e638ea4873d206979c380bec70749b67df6b6ed86bdb797ffc8982c4628e45ec6a3badc7a9 SHA512 ce670284899bab2e90668d5d2fa1c041c6fe61482beb0f370bbeb00d1123d8ff9b46d12b57f86076bee9d0de8310ad06cb259922ec7e4c5266aa82badcde6ea1
diff --git a/dev-perl/Regexp-Util/Regexp-Util-0.3.0.ebuild b/dev-perl/Regexp-Util/Regexp-Util-0.3.0.ebuild
index c4925c247256..39b7b7f44321 100644
--- a/dev-perl/Regexp-Util/Regexp-Util-0.3.0.ebuild
+++ b/dev-perl/Regexp-Util/Regexp-Util-0.3.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="General purpose utilities for working with Regular Expressions"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Regexp-Util/Regexp-Util-0.5.0.ebuild b/dev-perl/Regexp-Util/Regexp-Util-0.5.0.ebuild
new file mode 100644
index 000000000000..0fe9728d93dd
--- /dev/null
+++ b/dev-perl/Regexp-Util/Regexp-Util-0.5.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TOBYINK
+DIST_VERSION=0.005
+inherit perl-module
+
+DESCRIPTION="General purpose utilities for working with Regular Expressions"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-perl/Exporter-Tiny
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	test? (
+		>=virtual/perl-Test-Simple-0.920.0
+	)
+"
diff --git a/dev-perl/Return-Value/Manifest b/dev-perl/Return-Value/Manifest
index 19b0de8742c5..d820c5f0b2f4 100644
--- a/dev-perl/Return-Value/Manifest
+++ b/dev-perl/Return-Value/Manifest
@@ -1,3 +1,3 @@
 DIST Return-Value-1.666005.tar.gz 20412 BLAKE2B 9b551d9387338339b02e4cf5d0d9af8b89f3141f8c32bcd883b5e5ac3e24b13f77dbb9d63a02f30bd3a4683b73086547adb1ec750cef417d7ddff013787e293c SHA512 6a2e19a6562fb354a5e5dcaab54629e9b19edfc57206ac5c46cd3428e78d50ec36781685edc7ca28bd8c41cf878334f9e7c1182fd3e82f9a94a21854a5b89797
-EBUILD Return-Value-1.666.5.ebuild 683 BLAKE2B e0cc1fcce877195a91ac4f6e5b07baa94c900ebadc4a229526280f6e0b951621d9fd91eea38a48e3e7e79fcfd5bfd51785abcac95478f352c69b9092eb8b339b SHA512 d38e1d66591dc168c8c3a153136a7c9eb53e544902803b3123dc532141badd6b86af604a5ad8fcb3e71bdcd8de9f5bb0cf0a348c246e9eb1a344fea7cc684748
+EBUILD Return-Value-1.666.5-r1.ebuild 646 BLAKE2B 67e8559bd741545e8e189e99d5b3aac88c57a105a488e9aea80bae5d776d72a75521a71953fa0e97aa60c22c7f990b07e13497b332216a44fd656f74da0c91a3 SHA512 295d1966b2ea27c2f549d5d4d7099bcf8f71f4001adeda1e3691d95bd792032c64be582ebab2c436bf658efe9d0dd1d781774ddf7cebc24ccf727621b41e6a34
 MISC metadata.xml 396 BLAKE2B df4a43e77287d53bf38f65c3e3ad6397e9964baa9132924f9cda9dd4d29f890f89e87977c560416f4f7a292e81ad5c165b808e29eb926255ba43262cf0f25352 SHA512 f6d311cda2c5e59337f961d86202391702103a031311c3aad0228fd966a45eaf28e21c68358d23dba31b734f77e63ef83193ba962cd6f3457c89109f3708b040
diff --git a/dev-perl/Return-Value/Return-Value-1.666.5-r1.ebuild b/dev-perl/Return-Value/Return-Value-1.666.5-r1.ebuild
new file mode 100644
index 000000000000..4a11c90d86ce
--- /dev/null
+++ b/dev-perl/Return-Value/Return-Value-1.666.5-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.666005
+inherit perl-module
+
+DESCRIPTION="Polymorphic Return Values"
+
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=virtual/perl-Exporter-5.570.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-CPAN-Meta-2.120.900
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+
+pkg_postinst() {
+	elog "This package has been marked as deprecated by upstream, and it is advisable you"
+	elog "migrate existing code that needs this."
+}
diff --git a/dev-perl/Return-Value/Return-Value-1.666.5.ebuild b/dev-perl/Return-Value/Return-Value-1.666.5.ebuild
deleted file mode 100644
index 2c0e51c0aded..000000000000
--- a/dev-perl/Return-Value/Return-Value-1.666.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RJBS
-DIST_VERSION=1.666005
-inherit perl-module
-
-DESCRIPTION="Polymorphic Return Values"
-
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=virtual/perl-Exporter-5.570.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-CPAN-Meta-2.120.900
-		virtual/perl-File-Spec
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
-pkg_postinst() {
-	elog "This package has been marked as deprecated by upstream, and it is advisable you"
-	elog "migrate existing code that needs this."
-}
diff --git a/dev-perl/Role-Basic/Manifest b/dev-perl/Role-Basic/Manifest
index fc587af2580b..77b657599f63 100644
--- a/dev-perl/Role-Basic/Manifest
+++ b/dev-perl/Role-Basic/Manifest
@@ -1,3 +1,3 @@
 DIST Role-Basic-0.13.tar.gz 39625 BLAKE2B d5a15f61b8343ad8b896284dae86c6bf360802739b6cb5fcec30ab310573ca867c8f3cd5f4dc3f0a5fb325304760bdf3f76bfe00d3d1b613fc49b209eba9401b SHA512 685f758e1afc4441b3ac507d52e0d18b6f64081f74fa0a768c81c7c9fad7b7ec30497002cff22449a65ab78c27671a4fe7a7213c45d28cc4077bb855fcce1438
-EBUILD Role-Basic-0.130.0.ebuild 415 BLAKE2B 8d1c0f64534da4fc01335a5974711868c606da206f0afbc9a67ecdb7c65813f466c5acc48e170d0ed8725e55c6437555e910770312349e126f00986310e54068 SHA512 cd05421d6f8008019e996c3b444b965757a317026807c647f4a5b082b3aeee96e4a7869f9809ae8b50a98adc4cd51624efdc3f10b3d0647b0f32824c41950a84
+EBUILD Role-Basic-0.130.0-r1.ebuild 349 BLAKE2B 9f754097ef225a3f5d9e01f4827063244a598d3a3db409135a9e97a1136c9b8b0d8ba3ae4d4262163b1f76c0737a35baaaba6c803e4f2e4fa15251f3e835ff95 SHA512 2e89be4d4c2e6cff482169101dd6af2a5580b6acdbe086d7498d000ad2f82ae657bcd70e664858de657699157bf03cad6142ba0836ec098be19dabaac9d5ceb1
 MISC metadata.xml 548 BLAKE2B 9f27f213761135fa01bb8312893878dc3e05424b9a6dedddc23ad1b0de12a16f3eea80b596b87a51808b4f2f76a04f2eceb5a506848fce23d1e218ff061304bc SHA512 adda1c65edc0b602350e01f1eab99ef8bdc57b23fa3d448ecfc788c468d844d380ddff7be35a6fb3e2fb1643190c68dca0962bd24de0140aa4e971e4a673da6f
diff --git a/dev-perl/Role-Basic/Role-Basic-0.130.0-r1.ebuild b/dev-perl/Role-Basic/Role-Basic-0.130.0-r1.ebuild
new file mode 100644
index 000000000000..eb50cb3684c1
--- /dev/null
+++ b/dev-perl/Role-Basic/Role-Basic-0.130.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=OVID
+DIST_VERSION=0.13
+inherit perl-module
+
+DESCRIPTION="Just roles. Nothing else"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="amd64"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Role-Basic/Role-Basic-0.130.0.ebuild b/dev-perl/Role-Basic/Role-Basic-0.130.0.ebuild
deleted file mode 100644
index dfd388132546..000000000000
--- a/dev-perl/Role-Basic/Role-Basic-0.130.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=OVID
-MODULE_VERSION=0.13
-inherit perl-module
-
-DESCRIPTION="Just roles. Nothing else"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Role-HasMessage/Manifest b/dev-perl/Role-HasMessage/Manifest
index 6c9ff41e2e73..3d58900537f0 100644
--- a/dev-perl/Role-HasMessage/Manifest
+++ b/dev-perl/Role-HasMessage/Manifest
@@ -1,3 +1,3 @@
 DIST Role-HasMessage-0.006.tar.gz 13518 BLAKE2B f4c702aaf375b02aa9de749e7769d258931b31c3460431c0cd8c4399b733bf702d12b33c8ee13c314cd23c5acabf6521a4ea76942bdd03292023bb14a6882691 SHA512 2bb8b19fe2c113c0c92a5e16180f53879ad92fbcb63a5b3af4ead167a4c8b3dcd460c9307d3c8e24ab5070e6c58f378d9e6854ed82da0ea231e456d5786b5398
-EBUILD Role-HasMessage-0.6.0.ebuild 645 BLAKE2B 6363b6df3536fdde29d7912695165a3cf7b962cdfd310cb4511d6884cce3f34173b63dcfe5d2d5d90b44ec7be7f84a388e2e7182fa11f0cb458581ca5122db6f SHA512 90227515218f59f42f515c25222db268541246ebf0b84832785ad2a04b3ed51f691f492a78fb521fe253debea11f944bfdeaf29e78a4f96f84be68d8fdbca2dd
+EBUILD Role-HasMessage-0.6.0-r1.ebuild 535 BLAKE2B 3e8fa50228716bb4f3df195c6c756ca1e30ae2538e64c553527dc0d3566065ea9ca3857245e642a7a3400e160f98203e8251043d15c07614a71d7687852bdb67 SHA512 b082337df4073e9ae1b36ac1ab89a0986670b9bdc78f08e28ddb851083b9d682c53b848b8094da2a76d6932f7d373b8743fb23825aae35d07780760ea4629e22
 MISC metadata.xml 471 BLAKE2B 8fb171746328492d111acc977d2146c6bebae81707ae0ccd03954ceae436469b0b5176f791642be4a7677fa36e81a2df3c574aa4a6946a6fbf0c972b931c2297 SHA512 3ad81cd2d4af7eb1bfcec4f9155c454435dc3ad9e7c2cf2383fb59f36e679130719dfd947255ae5d88a343d7291c68ca21908680437ffc00d34f4008bb6a8e3d
diff --git a/dev-perl/Role-HasMessage/Role-HasMessage-0.6.0-r1.ebuild b/dev-perl/Role-HasMessage/Role-HasMessage-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..36b8b5b561a0
--- /dev/null
+++ b/dev-perl/Role-HasMessage/Role-HasMessage-0.6.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.006
+inherit perl-module
+
+DESCRIPTION="a thing with a message method"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Moose
+	dev-perl/MooseX-Role-Parameterized
+	dev-perl/String-Errf
+	dev-perl/Try-Tiny
+	dev-perl/namespace-clean
+"
+BDEPEND="
+	${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Role-HasMessage/Role-HasMessage-0.6.0.ebuild b/dev-perl/Role-HasMessage/Role-HasMessage-0.6.0.ebuild
deleted file mode 100644
index d7d673493432..000000000000
--- a/dev-perl/Role-HasMessage/Role-HasMessage-0.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=RJBS
-DIST_VERSION=0.006
-inherit perl-module
-
-DESCRIPTION="a thing with a message method"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# r: Moose::Role -> Moose
-RDEPEND="
-	dev-perl/Moose
-	dev-perl/MooseX-Role-Parameterized
-	dev-perl/String-Errf
-	dev-perl/Try-Tiny
-	dev-perl/namespace-clean
-"
-# t: IO::Handle -> IO
-# t: IPC::Open3 -> perl
-DEPEND="
-	${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-IO
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
diff --git a/dev-perl/Role-Identifiable/Manifest b/dev-perl/Role-Identifiable/Manifest
index f9e9c1c5ea79..8cf085c1f3d3 100644
--- a/dev-perl/Role-Identifiable/Manifest
+++ b/dev-perl/Role-Identifiable/Manifest
@@ -1,3 +1,3 @@
 DIST Role-Identifiable-0.007.tar.gz 13429 BLAKE2B 181094bf86a12c218c437706b4876ba9043c3808c460048fd911316eb49e0766b69e96559755c1ccc9d2344fe0639a8856c70aa7583e0d23ca0ca6e4e5ce1782 SHA512 811c81e3fbf8499269c4db3a45d60b35ae6ff8a8d5a93308607f37c97c2f52ad4ee6db28d15497d4d1f8cb59c67f03f479632d1a2d440034e8cd711b2a5349df
-EBUILD Role-Identifiable-0.7.0.ebuild 583 BLAKE2B 1b0a713b9eef52d2464ac27294bbfa9e19c1d4f77f5eef3407117217c1501baf22b40e69f8f83db338f9d5249baf602c0ab0a27bdf0efed60cb5b0c9d96adffc SHA512 e7f9ee3927c9840643d3503e8a8b0b4b5ebcd5fe8a3dea48b2205548f77366c3366326d55b0e757349168fdaffc004c2f7d8e0a34612f28169897bc0e9a413dd
+EBUILD Role-Identifiable-0.7.0-r1.ebuild 431 BLAKE2B 087e23c7b1b65b4eda28e53c2805a22abe4a679d5712e3e25c4e16de56a516183c67b90b3dfbaba2ee2bdf3505742d0cac77bedd8146a6f8a187962fa37b79ec SHA512 4b68a4343d78fc84ed49976a2f3976af94f296f1826fb57ce4803908acc28f2f6aca349e62eab07d39f5b2b5f80894d53b4eab0e4c882c03880eefd6bf767f10
 MISC metadata.xml 490 BLAKE2B 13ada2a7ed354b26cc1ded4ade3a9c00bd34eeb2c6793d39ff94fc09aec393b1bcba7f7bd7ee3d7c3ecfbb8ee8e8216e61d794fc6f49f3b5999b24c8ce7f3824 SHA512 f795809c97dfa59ad1d6b63d5678b73602a395afa2440c24bd81b039f3934a349975c194454c24d196d1598b6ba5be8f0b5a939dc64941a34c403264f9bd20ea
diff --git a/dev-perl/Role-Identifiable/Role-Identifiable-0.7.0-r1.ebuild b/dev-perl/Role-Identifiable/Role-Identifiable-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..a28d2e5e8729
--- /dev/null
+++ b/dev-perl/Role-Identifiable/Role-Identifiable-0.7.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.007
+inherit perl-module
+
+DESCRIPTION="a thing with a list of tags"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Moose
+"
+BDEPEND="
+	${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Role-Identifiable/Role-Identifiable-0.7.0.ebuild b/dev-perl/Role-Identifiable/Role-Identifiable-0.7.0.ebuild
deleted file mode 100644
index 4ecd27c1376c..000000000000
--- a/dev-perl/Role-Identifiable/Role-Identifiable-0.7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=RJBS
-DIST_VERSION=0.007
-inherit perl-module
-
-DESCRIPTION="a thing with a list of tags"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# r: Moose::Role -> Moose
-# r: Moose::Util::TypeConstraints -> Moose
-RDEPEND="
-	dev-perl/Moose
-"
-# t: IO::Handle -> IO
-# t: IPC::Open3 -> perl
-DEPEND="
-	${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-IO
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
diff --git a/dev-perl/Role-Tiny/Manifest b/dev-perl/Role-Tiny/Manifest
index bcdac81c8336..33011c71bb91 100644
--- a/dev-perl/Role-Tiny/Manifest
+++ b/dev-perl/Role-Tiny/Manifest
@@ -1,5 +1,5 @@
 DIST Role-Tiny-2.000006.tar.gz 21556 BLAKE2B 5ca2b557dd5976a83a84aba9d7a18e3eb05efed08469b057f9596b685502ec9a2794fbb6b0fdea2cf3f1673825a19735ec878f1e37cc25f5a729f826e5d27d81 SHA512 7640196c4bc1bf7a5437c57f0137f3bbf7c5fb92b9614805f16fec41dfb87a8bf6b7f3348ceade0800bccd72c4e5b72bcd4ab8bf28768ecda9d912c1b4c78047
 DIST Role-Tiny-2.002004.tar.gz 35940 BLAKE2B 078993a8aeafe0dc8a7d9554899fd0816f5101fc0bbed4be417fecbc5a4ffb7a2d9db97a73eaa5bb955392303c432824fa975a0eabff568297bf0095933ffd68 SHA512 f66a799a0cd4e989adc173f6d913967df7aa6b9ffda934c2a80c0a91dcfe4edce606bd27cf1b4d857d52d0aa770224315ae4e915e4e735c6a9483a6cf5ce02f1
 EBUILD Role-Tiny-2.0.6.ebuild 629 BLAKE2B 8f9d42b143925b925d9f4098183a46ace1d66afd3ff3e6c3f236d9c465a171b35fa32839f3a7c90d12bf8808a88cc262f39431ff55218415cb45ff44c0267470 SHA512 108a644cd0f17a20d6114415c27dd296e9c6a1513471331af2f13547664c1d547e742253cc29563d0b6fe2fc2d45962045f78836055b7f78b1780cc5232500fc
-EBUILD Role-Tiny-2.2.4.ebuild 594 BLAKE2B d43880fa5fbbd4bcba574b14998a6801799a9319afc1f09ebdc1d9f160d7b4bb24268ceb65a38fdca6ccb5a5f875073ecf388981534c31e680bee21cb186c07f SHA512 8117601d863a628061f9832b1e187204badd857bfda05b53718c182b597d5b3ed5e3508f68a351878a92b74df176970b714a632e484258726b5ff904cc453639
+EBUILD Role-Tiny-2.2.4.ebuild 588 BLAKE2B dc457867e8705202a4011b4be9d9c7567560b7f1c40bf120906c9bf6da1749df36df0f27fd41556184f9a167c94603c06f17e75f82b8f07a9b242d8c14af4bda SHA512 abbb849facae29f8a3b91539e7b05af5c70f93d318209e1dab8da602e960c19f62d58024656183113aa4e625b0767cd415526df3665f807ae0d4993531240c5f
 MISC metadata.xml 453 BLAKE2B 267ab7409d21834206628add9a2cc0fbdc5d5cd3dc0066711799164339abfe44064cde5b63146645d925069a5abc43c5998b17491c14a2cabe4683585eb3fd9c SHA512 69c8fb110bcc06fbe73114409af76b2123cd645b0342e83ed1a6341c4941f12289b7767c33876856281feb23a792681dac5a78cd742f37c5fe36a982d7f3cd10
diff --git a/dev-perl/Role-Tiny/Role-Tiny-2.2.4.ebuild b/dev-perl/Role-Tiny/Role-Tiny-2.2.4.ebuild
index 1200c366e404..42ed6c23943b 100644
--- a/dev-perl/Role-Tiny/Role-Tiny-2.2.4.ebuild
+++ b/dev-perl/Role-Tiny/Role-Tiny-2.2.4.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Roles: a nouvelle cuisine portion size slice of Moose"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/Roman/Manifest b/dev-perl/Roman/Manifest
index 9cd0e2f8e566..8d04c22bbd37 100644
--- a/dev-perl/Roman/Manifest
+++ b/dev-perl/Roman/Manifest
@@ -1,3 +1,3 @@
 DIST Roman-1.24.tar.gz 4470 BLAKE2B 4ffac6854f454e0783d291faa140dffdad6964a981b54dec188e1d60a0b635ce8043720680f95482ea919d208f52b8f3668c278eca9589195ba3dd3da5325bfb SHA512 82df0d817f55ad6a8fd467e92c97e27c07bd6cb04f0accb65468d6594d3e3ea545383f1c3763215d8c984cc31c808fe979c7d6c74dab1609ec822a9f256709e0
-EBUILD Roman-1.240.0.ebuild 483 BLAKE2B 58e4400bbb040e5b869b2a5d41fbb5d91cbd5a636424156ed44b6e9d0b77da9d9ea3968406ec2bfcdd20f49cd60408d4b0fef2a6d092a20d0a62df358104d414 SHA512 b02b2ba39210f468c9443c33b65fbdaa9336c6ce0de47409330babfd8db1a2bf8adedbda280c92b309b219bd330dbde38e542a1ad10974b3d473523811324f38
+EBUILD Roman-1.240.0-r1.ebuild 414 BLAKE2B f058b09960fd5ff9f0e928c69493e2dadaba1bdd856edf4230d05111d3264d17267c64474a1fd6f97c1c7dbbca0050cbfd1efc5f0614e0482cd436079142ba07 SHA512 6252acc9a61b264f1f7035c13c54c942c413743012c4d8a2d45c0f7fcbfe4eb9c6c93f3cb6b0fbbcb0b0313bd0de9361c0bddc3ac04fe5b17ea3ad5f68fa6d17
 MISC metadata.xml 477 BLAKE2B 9fb8dd6b43deb5bbc098aaa78a2c380d01976eb462451f8d98a8badfdc306893042763ed44d3e533dc900af1d8a7f2ce4a2a20dea92b52eb60c36b7638a9055b SHA512 9d3fea63d5f825668917617f79c1457d229433e7da9be4f3669733e1e42ae8c78cfa5c2c4b6d4802f77b0f30c24f19ce4dfac83f21093eb4ebb7cdb627cd9d0c
diff --git a/dev-perl/Roman/Roman-1.240.0-r1.ebuild b/dev-perl/Roman/Roman-1.240.0-r1.ebuild
new file mode 100644
index 000000000000..928487a4a3a5
--- /dev/null
+++ b/dev-perl/Roman/Roman-1.240.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHORNY
+DIST_VERSION=1.24
+DIST_A_EXT=tar.gz
+
+inherit perl-module
+
+DESCRIPTION="Perl module for conversion between Roman and Arabic numerals"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~s390 x86 ~amd64-linux ~x86-linux"
+
+DEPEND="test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)"
diff --git a/dev-perl/Roman/Roman-1.240.0.ebuild b/dev-perl/Roman/Roman-1.240.0.ebuild
deleted file mode 100644
index 49e4e0140fc1..000000000000
--- a/dev-perl/Roman/Roman-1.240.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=CHORNY
-MODULE_VERSION=1.24
-MODULE_A_EXT=tar.gz
-
-inherit perl-module
-
-DESCRIPTION="Perl module for conversion between Roman and Arabic numerals"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~s390 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Router-Simple/Manifest b/dev-perl/Router-Simple/Manifest
index e8788b8a1546..21ab6785cc51 100644
--- a/dev-perl/Router-Simple/Manifest
+++ b/dev-perl/Router-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST Router-Simple-0.17.tar.gz 19990 BLAKE2B 3a49aa8770aac1a17e5413bf3f43a573cb958d549ced35f7837fac10e4b281b380bb26d66781d379ac2298c4455b22a5efc4fe8ee1e5cc0d0e6c64e8b9bd9fd3 SHA512 4fbc4fb375d873d7c06d18da49855b81336744bc712035c6557914e275099d93aee4ab787bb1e7b3b730a109b716b4f572fc538d1d574ff709968a1b3767a963
-EBUILD Router-Simple-0.170.0.ebuild 492 BLAKE2B 01b034bda64db370142968ca392549d167728e5ef3c7e36accd314e2c1048df528d9ec1d4fbb63af04c4c4b4952f5bae76c51ca84c2c47a5fdfefbc782ad7dac SHA512 5f25dc2b816e745b942c00c0bd034ee1884925b0f279d9daf9a8d9a46d568421e0ffd20e18943e0008786acf7f4b665d683136657ad12c1b4ffae1f509c1c577
+EBUILD Router-Simple-0.170.0-r1.ebuild 454 BLAKE2B cb09ce99467f9d172b91c4f5e07cd3b1c756a2234525d5aeffce8559a02aeddec665b5df1ab2bd3c4405be658980f45b7404e91ddfc4e6b72fe8e6ec00602272 SHA512 44619811511d823801e391d8cb928548c63fb58dbe4146d279d446e7c06c9677df45b2590525c80d0772fe3dac09110bb1e1bf92eb8547e37fd57796f0f78313
 MISC metadata.xml 608 BLAKE2B e941856cc92867a5b88dddd3f9e9b381a575f3064a1e8dcc0f77ca87723fbcc0f1de0bf6abd27ff9d75743e1cbfaadf611bba3d1589701afb0483e5438db16df SHA512 eb25d941b8d0b6b8d916a9bc49419bf36e39d594bdac535114d31dbaaffc411a429c3938414076856a9ac16df0a1cfdc7c18f14e4fe662add21f0cb28a9c7814
diff --git a/dev-perl/Router-Simple/Router-Simple-0.170.0-r1.ebuild b/dev-perl/Router-Simple/Router-Simple-0.170.0-r1.ebuild
new file mode 100644
index 000000000000..7bc43471a1ec
--- /dev/null
+++ b/dev-perl/Router-Simple/Router-Simple-0.170.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TOKUHIROM
+DIST_VERSION=0.17
+inherit perl-module
+
+DESCRIPTION="Simple HTTP router"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+
+RDEPEND="
+	dev-perl/Class-Accessor-Lite
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-parent
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? ( >=virtual/perl-Test-Simple-0.980.0 )
+"
diff --git a/dev-perl/Router-Simple/Router-Simple-0.170.0.ebuild b/dev-perl/Router-Simple/Router-Simple-0.170.0.ebuild
deleted file mode 100644
index e954a3eed5a7..000000000000
--- a/dev-perl/Router-Simple/Router-Simple-0.170.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TOKUHIROM
-DIST_VERSION=0.17
-inherit perl-module
-
-DESCRIPTION="Simple HTTP router"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Class-Accessor-Lite
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? ( >=virtual/perl-Test-Simple-0.980.0 )
-"
diff --git a/dev-perl/SDL/Manifest b/dev-perl/SDL/Manifest
index 1114e57076e8..6b88cc3c01eb 100644
--- a/dev-perl/SDL/Manifest
+++ b/dev-perl/SDL/Manifest
@@ -1,4 +1,6 @@
 AUX SDL-2.546-pointer.patch 671 BLAKE2B 188280d823e6cffea2e7d33ede63ecb172a8a272aea98272df75a75ee2cb848ca11426912bcdf90cc5cbe61ef21bb86f37803b50f7907ee9903f6173b3253094 SHA512 25a03721a4ffe64b85512fd896cef2a08faf3284ffd2f9a93fe578f7df0e96bc40952a85e39f4023f38fbb664cd7435e5d5587a7d861e884a616835e7eaecec0
 DIST SDL-2.546.tar.gz 2487053 BLAKE2B c0856c844fd94338f7fe9cd1a20f7e7889cf73ac0c4018bca55b4fc630555b344cebe5158db5fb369ae6cbdaa5471a6681aadd71b788bee044fb367b0b12f9aa SHA512 7f7015c90a277b91951a2357bcdf7c3f2f930270d211657c903240ed4529f408c200337ca79e4971eb3912da28ebf1e950053ce4d763c2599c701444c618c71a
+DIST SDL-2.548.tar.gz 2487708 BLAKE2B 1d17c5ffc8d966fd06b282632de1f504548df9c67754788e5dcbe2144057aa9d463a88e01b33b0f265a821cfb24847bafc1cb1215cdd6282cc29ff3aacea6c3c SHA512 bafc49dddb7e592861f822920915c73bf0c5eea3a6c567623b48a2332c7644caf1451e457545e6666adea5e314b23bcd85a3f3a52c770abfd498c0e4c0feae85
 EBUILD SDL-2.546.ebuild 978 BLAKE2B 260b56b970984c3131c72f44dc79beb2de2d24f7cf8f1110c16953afcf6a34e952ca849d5672a04bf4bfa35210df5d4e85f4341c1683025d958bcdd22929626a SHA512 cf5f5f8398f34f842311fe3e70eb2f5a2e760c368c42a95c9b2d843720c4bead6fbfc59015721273cc58b0b842e4b2d81563c68c0318c003c5d964c6620e7e37
+EBUILD SDL-2.548.0.ebuild 1030 BLAKE2B bbf041d52fc3cb8d9a471c191f82b301e6d7be02916805f517ef29f2aa6a034396243ebd2ce7eb43f0dd0f2d570d6191ed11752889aa1396392b68eff53b61e7 SHA512 febb10ded5cc8358de933610f5286b662179eb8ccb51c06bdb95911e3a6d94c6c7411e2c21785cc40593d39e74261783d9072246f3162848cd7def6c90ebc0b7
 MISC metadata.xml 5479 BLAKE2B a41e0c2886b7cc50265b5de20e8194f30d2b187ebbacd3c3bceaa22441f973746b11ca871ead26dbbe35ede9c52727ee6d5a1d0a48604d8df7e9452a84065be6 SHA512 a26caa4c5f2685ea3dc2134f66652740622ac54d6b71567ed9425494300caccfcbe9c969e215dcd07033792c7e30e08426c3adbc6091c0ba4354e08db14b2827
diff --git a/dev-perl/SDL/SDL-2.548.0.ebuild b/dev-perl/SDL/SDL-2.548.0.ebuild
new file mode 100644
index 000000000000..0b31240e7f77
--- /dev/null
+++ b/dev-perl/SDL/SDL-2.548.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=FROGGS
+DIST_VERSION=2.548
+inherit perl-module
+
+DESCRIPTION="Simple DirectMedia Layer (SDL) bindings for perl"
+HOMEPAGE="http://sdl.perl.org/ http://search.cpan.org/dist/SDL/ https://github.com/PerlGameDev/SDL"
+
+LICENSE="GPL-2 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+RDEPEND="
+	>=dev-perl/Alien-SDL-1.446
+	dev-perl/Capture-Tiny
+	>=virtual/perl-CPAN-1.920.0
+	>=virtual/perl-ExtUtils-CBuilder-0.260.301
+	>=dev-perl/File-ShareDir-1.0.0
+	>=dev-perl/Module-Build-0.400.0
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Tie-Simple
+	media-libs/libpng:0
+	media-libs/libsdl
+	media-libs/sdl-gfx
+	media-libs/sdl-image
+	media-libs/sdl-mixer
+	media-libs/sdl-pango
+	media-libs/sdl-ttf
+	media-libs/smpeg
+	media-libs/tiff:0
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+"
+BDEPEND="${RDEPEND}
+	test? (
+		>=dev-perl/Test-Most-0.210.0
+	)
+"
+
+mydoc='CHANGELOG README TODO'
+
+PATCHES=( "${FILESDIR}"/${PN}-2.546-pointer.patch )
diff --git a/dev-perl/SOAP-Lite/Manifest b/dev-perl/SOAP-Lite/Manifest
index 83fb3f9e1114..7853489b0c75 100644
--- a/dev-perl/SOAP-Lite/Manifest
+++ b/dev-perl/SOAP-Lite/Manifest
@@ -1,3 +1,3 @@
 DIST SOAP-Lite-1.26.tar.gz 272187 BLAKE2B ec4519c258b2822da74c41e20dc2c0ea3242a7d1936c2e8bf637f6cfa53fc721e4864f0ca0332986f5a1c912babe522c1b409d48dc0c433abd3f85c4aa207cb6 SHA512 b09e320cecbb4859f49dcb144a446af878219f6ba3d2f7999f8656f40989d3ead0707960f561d17a9f800706fcb53020327f9c85313f6dcca34f9699a4c74143
-EBUILD SOAP-Lite-1.260.0.ebuild 1152 BLAKE2B ac29765b176242f091c43545fbf473b588b9fee5434ef87acf78d12dfef3519fc95840fb0c393d9613677d5f46817f569686703ebdbf63627f7aa4acd56afe8b SHA512 20aad5214065766552852b1067e474c130c7847edf3fd4f92f9a57549ca5a0ff94ea098e65d6cdaf9d20fb35432598cb3017e18740860aa6b757ee45dea0f6a8
+EBUILD SOAP-Lite-1.260.0.ebuild 1151 BLAKE2B 09f735a920e97fc96e60ec9c4df35e0cf6e3ae8316b245607104031e5aaa37cc636d8dd77affd67f840337c3ded3c1cf65016645894869e68565575b9596c46f SHA512 f5ced7c7d8d95167f8f681bdf9e69b8ce12f755bd07815d6ebc69ccefe7401b092ff24aef2a565e354e35aede45f2db3ff16ab1f962a5aa8442c76a02a5e8317
 MISC metadata.xml 4474 BLAKE2B ab605ed8948f1f6d511d6493acb0cf22290238b148be02a112964fcd7b44b63a8150ec366ca2b67c4f600c904f16600983deea47987a206a49c27a25cd90ae3c SHA512 8f12dfcd2e448904c05e1cd604ef0b4770764cf77a5fd585a249b9189b18b5d978232fcd8cacc7b8ff8d527bb78ef13e8973cf0aaf3b89c43f0e3f4e801d3ce6
diff --git a/dev-perl/SOAP-Lite/SOAP-Lite-1.260.0.ebuild b/dev-perl/SOAP-Lite/SOAP-Lite-1.260.0.ebuild
index bfb2584361cb..6cabfa455172 100644
--- a/dev-perl/SOAP-Lite/SOAP-Lite-1.260.0.ebuild
+++ b/dev-perl/SOAP-Lite/SOAP-Lite-1.260.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Lightweight interface to the SOAP protocol both on client and serve
 IUSE="ssl test xmpp"
 RESTRICT="!test? ( test )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 myconf="${myconf} --noprompt"
 
diff --git a/dev-perl/Safe-Hole/Manifest b/dev-perl/Safe-Hole/Manifest
index bacb3a986458..a6147ffd2a16 100644
--- a/dev-perl/Safe-Hole/Manifest
+++ b/dev-perl/Safe-Hole/Manifest
@@ -1,3 +1,5 @@
 DIST Safe-Hole-0.13.tar.gz 14269 BLAKE2B 34adf7172a7ec69e680f4223c9d0deaa035bf64bf8c9f5cc97d8f3c10b92086990f52e56a9f6522dba26d189115e55b419def4f73c7f14b805c33caeb753eecf SHA512 3acb362f6a7970c083359351f7e9d1005019d715546b9051c0a317adf1d6378537d6da14b01dd26fba05a802560bb79afa1f14d6530f862a3265e0aa12129c0c
+DIST Safe-Hole-0.14.tar.gz 15901 BLAKE2B 3d0bea12075120c520e001c5163acf7ad04d66c6bf675074a31c72f9bafb1b08a8bcd389d760a2b5a0954353717b67d10be373d429401829d94b18fcf596d734 SHA512 29570c5e6c2bf8709b92b62c36d24c643956535ed0cf3fa73cbe9406543f17c96d4bd37a753c02d1f77f962d76788f423816fd63d31f7f56884acefa873f30e7
 EBUILD Safe-Hole-0.130.0-r1.ebuild 344 BLAKE2B eae7a7b4f11f00f7ccfbecd5ee3db9d0a2cb12d646ceaa97549d63360cd1d6077ef6484af162ab42f291b2b42a998b17429cb133d920f27b81dcf687c3027638 SHA512 3430d356b2dd2cf3fe946abf1c97dc1de5121165be78537059883de378501dc85511c9cb91949e27dc9a10b885840ee29a1144973dbd53be3372857b66f2cb92
+EBUILD Safe-Hole-0.140.0.ebuild 360 BLAKE2B 02b213ee57fc2d0fb6531f85f1bceba6af485dacd98873b7b84f89e30edcc39582eaa2f6442d29119ee24c203c7185d2f8726939abd05565d5590feaa9302066 SHA512 32cf07ccbd13831d09b4b945090e8e0a978633081c278a9b4c604535104339838500f9dd0943c823a6b5bce84a39060bc627ae2e4f6a049273c120e9817642ef
 MISC metadata.xml 390 BLAKE2B 3aad67d379b7266d604acfc6c85c11c84ee3fe0a7f461c1d61af122096501ddb860fd3636fb8291e3f30d4aa297c87fc45e7ee34aa086ff826228a8a08b45755 SHA512 12995b1c62966dbd53971beec587bb6b32de6b70ed0e5e884a8780bece780960e2f43fb010bb2d1d279f4397a12c4e39479f541b4db889166af7e8202ea7e6ea
diff --git a/dev-perl/Safe-Hole/Safe-Hole-0.140.0.ebuild b/dev-perl/Safe-Hole/Safe-Hole-0.140.0.ebuild
new file mode 100644
index 000000000000..c1dde2fe1d5e
--- /dev/null
+++ b/dev-perl/Safe-Hole/Safe-Hole-0.140.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TODDR
+DIST_VERSION=0.14
+inherit perl-module
+
+DESCRIPTION="Exec subs in the original package from Safe"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-CBuilder
+	>=dev-perl/Module-Build-0.420.0
+"
diff --git a/dev-perl/Safe-Isa/Manifest b/dev-perl/Safe-Isa/Manifest
index ad506442342b..6428fc8a3541 100644
--- a/dev-perl/Safe-Isa/Manifest
+++ b/dev-perl/Safe-Isa/Manifest
@@ -1,3 +1,5 @@
 DIST Safe-Isa-1.000008.tar.gz 5994 BLAKE2B 4f1d11f11d8e6b0aec88bc248941f5b1db453dee87230b77ada7b78d76e284bdcf287f81eb2830a6f965f61b776ef76331a3601dab63f35603e128a84e6e579c SHA512 a1dbef2e5e3cf5d154785eb2d9e4ad6652d775f1026144817a54cfeeb3572a2618b01c0b23557080fbaf676878d323c8fec8cd3506f173895ad787efa6c9cf14
+DIST Safe-Isa-1.000010.tar.gz 6546 BLAKE2B 4c68477e569b3327f24c89b86f8d6d8cdeec017a29e7031e02e130b115a1c9d1fd45a066e8aac1d379eb004d5ff1450b42abff2a50771a397fc7e36e75de45da SHA512 121288c7c59d97f4e48c1e50795d835cac0638a1edb1116876813cc2fe955efced9916222f6b16e4c1dbd5149c9d68c19bc77584f999c411e4c22e2f28ea1838
+EBUILD Safe-Isa-1.0.10.ebuild 463 BLAKE2B 27bad8c6bf718cab5633cb57accabdd257e09fd0d405ee5b04625af326f2e8545d5a9dfe2e384271c24ebeabc16c1a9c518e688974f2d9382af24208a3d3336a SHA512 d17ba1dc030a425bf906c6c598df2a9be8830630e28e1680dc97e57b6b2b493dbf09bbe743647786472da05d75b175eb632165111839867fbeab171c80470c71
 EBUILD Safe-Isa-1.0.8.ebuild 500 BLAKE2B 20d02925717fc95213393a3fbf3789269fe464c96ad9ba6ee3264ceaf4f8c516a918a4baa30f9c2a0a1d53dfa9921390532386c837eaa3de9f31a08e152d6681 SHA512 b418e8ba2a60f311de0147425250aec0199051137f51ede1defeefe1666e1222e0c1a565b175b582e9c4b74d119a96e9a2c8108a1e92d920131b5b2ceb677b73
 MISC metadata.xml 388 BLAKE2B d1f324b85e92c8b1c02bbc1169920183720d77d9450e908963cfa8048721c213eacfb92bac10c4439b776179d195baa81aac9929cd9c00d36b453a7253f0437e SHA512 01d325ebb627c69290dba41e16f032093a4682a80b19dc738dba4538b2d9bff8a724958e6d4baa0352fc76b5ce68cfa35433b5022a76715dad2847cdd91c520a
diff --git a/dev-perl/Safe-Isa/Safe-Isa-1.0.10.ebuild b/dev-perl/Safe-Isa/Safe-Isa-1.0.10.ebuild
new file mode 100644
index 000000000000..8871a66d2f9f
--- /dev/null
+++ b/dev-perl/Safe-Isa/Safe-Isa-1.0.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=1.000010
+inherit perl-module
+
+DESCRIPTION="Call isa, can, does and DOES safely on things that may not be objects"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/perl-Exporter-5.570.0
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Scalar-Properties/Manifest b/dev-perl/Scalar-Properties/Manifest
index 0ca263705022..c7a40d3eff06 100644
--- a/dev-perl/Scalar-Properties/Manifest
+++ b/dev-perl/Scalar-Properties/Manifest
@@ -1,3 +1,3 @@
 DIST Scalar-Properties-1.100860.tar.gz 24994 BLAKE2B 7f09a9168bbe516cdf340cb0b0058774f02f50d0f9511d6d2e2918a49c9e28ff287f8307953dacd1412863b531a7d57dbc80d136d503ac6660111bea8d688edc SHA512 97d95f67ca357680f5b36e4552d56c3eca907de8157976494513146048d69e969a858f498616ec4f3e21eb9d7c3406c5702cfa2e93b714b1d6425dd19334ce8e
-EBUILD Scalar-Properties-1.100.860-r1.ebuild 357 BLAKE2B 0a89503897e0f0be79c7eeb134967dd7fff48f7cbd3422665613b00e23509f2947e4745438433f95551b17add9f4cb88e6a3ad028c6e1e3eabf526ea09925558 SHA512 2a70d978a2c492d0980cf9046cf9cc112daccafb4d41368478583eb63ca69d6b46d9fef601d6bf37e945209a006b04a6382abcc1d5938ef0df243bc7efef4275
+EBUILD Scalar-Properties-1.100.860-r2.ebuild 330 BLAKE2B 97302b77c02ff0ca4a3c6132beb8a5ca315211f5a64d989c59a8c121dc88daca6b9c77da6452a89e84f69ed6abe742165f4653c82d25e7352539477e885ee2a0 SHA512 5a9000bc4bd1331a0ecaae7bde8caf88b99569162e3616975562dcb628c1733d42bf9885f196cd020561d277b7719fcce13d0f78ff6d182b7ff0cd79bfa97ed1
 MISC metadata.xml 406 BLAKE2B a5ba8e876ba9eb1504960919a5805e6da2d7ec08c41605175099b02b7e0f9ad9a3bf453be0b36a2a3c98d71d78d9666c97324c426809182b202aa0ba0e841bde SHA512 39ef6dcccbff7c526bf5e4c1fac7b073fba6e41cb510eec8746b7c80b51625139d49079e4f7be02c62b0c6ed96da9236e7b1960b07c58b9bea54b7786daa381d
diff --git a/dev-perl/Scalar-Properties/Scalar-Properties-1.100.860-r1.ebuild b/dev-perl/Scalar-Properties/Scalar-Properties-1.100.860-r1.ebuild
deleted file mode 100644
index cbcdea4fd642..000000000000
--- a/dev-perl/Scalar-Properties/Scalar-Properties-1.100.860-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MARCEL
-MODULE_VERSION=1.100860
-inherit perl-module
-
-DESCRIPTION="run-time properties on scalar variables"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Scalar-Properties/Scalar-Properties-1.100.860-r2.ebuild b/dev-perl/Scalar-Properties/Scalar-Properties-1.100.860-r2.ebuild
new file mode 100644
index 000000000000..8e256fbce1c4
--- /dev/null
+++ b/dev-perl/Scalar-Properties/Scalar-Properties-1.100.860-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MARCEL
+DIST_VERSION=1.100860
+inherit perl-module
+
+DESCRIPTION="run-time properties on scalar variables"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
diff --git a/dev-perl/Schedule-At/Manifest b/dev-perl/Schedule-At/Manifest
index 84b8046f61c2..2da0b00e1d0c 100644
--- a/dev-perl/Schedule-At/Manifest
+++ b/dev-perl/Schedule-At/Manifest
@@ -1,3 +1,3 @@
 DIST Schedule-At-1.15.tar.gz 8174 BLAKE2B 23c1d8529f5d8cfb6a33542e1c6b0f3e09d1b22c49421268768324f0fe555bc80bd93e703289c3ee18b3b8034b4d1366c843b040de685fa827c07aacdc9f431c SHA512 15df903f990d4b72fd921fb838b00d61261c711fd963a03a6dad6a55ce86a3da268e5efa5446d477ba4bfe1e25d74ab703f4121411b79ac1001b55d136e4fd74
-EBUILD Schedule-At-1.150.0-r2.ebuild 325 BLAKE2B 6701b5d7c132af025c333938f982d94cfef673d30815b2e2bca7685888ec54bbffde8f013b230145a8d590fdb6ade91caac3eab4864117aaadc330d25b62d77c SHA512 04e5a8d96090cd03232092feada1379d97cb8d20e4a0353e0162ada23e87b8fdbfdbbc6b155da0bcd0d415f58e98984bf27858be64f6fa0d5f92a6bff5e7ed07
+EBUILD Schedule-At-1.150.0-r3.ebuild 318 BLAKE2B 364d795cc14316ef413e0a583eea94a351dc0f736e7722572a9003d3e9122c5f39f3477c7d4db706977b1e59ca986754c238c651a8a6cee350ccb08620ab45e8 SHA512 03edf094fabaee06c427c1c9c40c8bbd810d819087b4fc894e63736951ab9c1ebc315012bebd95f02c93689cd3de27eb07184562047cebcb341dd3eb8ec91686
 MISC metadata.xml 394 BLAKE2B 5b8da6c24c0570e302dfbed216558c9b2d93d21d5d7524a2ae23de0183851feb61d9bac79abd907e024ecd854c1bc00456a5dcb18ec18c3f97926a438c5d7ee9 SHA512 c8b8771ad6cc6c09de7ae651992c6f5bc54a85facbae875763ebb781c0b85c6dd796461493d290d02ab8c2fdbf6b233f2ff4c2194dcbe726c717e493b91fcd1e
diff --git a/dev-perl/Schedule-At/Schedule-At-1.150.0-r2.ebuild b/dev-perl/Schedule-At/Schedule-At-1.150.0-r2.ebuild
deleted file mode 100644
index ab709fe7cfbd..000000000000
--- a/dev-perl/Schedule-At/Schedule-At-1.150.0-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=JOSERODR
-DIST_VERSION=1.15
-inherit perl-module
-
-DESCRIPTION="OS independent interface to the Unix 'at' command"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-process/at"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/Schedule-At/Schedule-At-1.150.0-r3.ebuild b/dev-perl/Schedule-At/Schedule-At-1.150.0-r3.ebuild
new file mode 100644
index 000000000000..cacda5348871
--- /dev/null
+++ b/dev-perl/Schedule-At/Schedule-At-1.150.0-r3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=JOSERODR
+DIST_VERSION=1.15
+inherit perl-module
+
+DESCRIPTION="OS independent interface to the Unix 'at' command"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	sys-process/at
+"
+BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Schedule-Cron-Events/Manifest b/dev-perl/Schedule-Cron-Events/Manifest
index 0305e19cdcd0..34239d909f01 100644
--- a/dev-perl/Schedule-Cron-Events/Manifest
+++ b/dev-perl/Schedule-Cron-Events/Manifest
@@ -1,3 +1,5 @@
 DIST Schedule-Cron-Events-1.95.tar.gz 11350 BLAKE2B 45d99c95f5872f8c44e95b46e1d91e9a99593147574f9c20f79029766d24550cf5cedfc7ebbfbb6c63b7ee18999d67168d599bbd6f3e970587353fe7242a4e5c SHA512 19717a03112d168f2ae37dd9da6a99cb1b39e17a7af770623bb6fa89f5e82f5bcb54f3840ffc902005ec5c78a1cf37539c537961bd1b080350b95ddedd884dbe
+DIST Schedule-Cron-Events-1.96.tar.gz 25810 BLAKE2B 1c19552b757ab060eb6ed6a21643f517435d8d247bd235e52aeeb3ee45f382f81fe2226a587a94a7ce2f9065ba4972487dc8a9f8aed560e31fdebaddc8931ce5 SHA512 d8aa687da7812f3f6aaf685609965931fc8d41cc0998bd6ea54b81a3d12403806be365fd4ec35f6d447c1baf225c6434f731ccf5c58f8dbb27c0ca4784803a52
 EBUILD Schedule-Cron-Events-1.950.0.ebuild 979 BLAKE2B 4de3d158332dbff3f56f8e07cec7c02ede908fc84a1785e64d975fabba5cdc4e2024c3ad444a1cdf4195d7140061f5d05ad4be0f219cabf4848d075a79d1e463 SHA512 f5e4002e4d4283afc6d61b0fb443144de02684c33c648be8123268cfa6b81442170385a2ae809f671146bbdf309660fe03bc5e0a88d87a9005d83576b496d3e6
+EBUILD Schedule-Cron-Events-1.960.0.ebuild 832 BLAKE2B 9b1b6f62304dd62dda34f008a6ee0031c0dcf75d4822228a4988093752a6449231c9f18ee530663c4de7f513c02694c0a1fa4da50badc2b0942039c16cbabb4e SHA512 4f8169e459f8e7b9b0e7284daf1a8be82d84f0013eaa9c518fa2d1031acf42baf328c8db29f65a747589481c403eb24631a979bc769a07500221c530ac8dddf9
 MISC metadata.xml 413 BLAKE2B 09200945f89df5d691a4c60186a10723c4354f12da19dc84dfef60f39e16b2a7cb717b38b905f60c3a910a8dfdf309c69add4941131a94db403f044d70f3a346 SHA512 7d6c0d3523e38c4b5b84992ffeaeeecb5fe88f19a71e0c2f6c39bf322899f7e7e96d9dde7dd1c81c6688e10c9ee0cbaddc60e6bc0f5349e237e3efa2758a3460
diff --git a/dev-perl/Schedule-Cron-Events/Schedule-Cron-Events-1.960.0.ebuild b/dev-perl/Schedule-Cron-Events/Schedule-Cron-Events-1.960.0.ebuild
new file mode 100644
index 000000000000..3fff382c280e
--- /dev/null
+++ b/dev-perl/Schedule-Cron-Events/Schedule-Cron-Events-1.960.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ATOOMIC
+DIST_VERSION=1.96
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module
+
+DESCRIPTION="Take a line from a crontab and find out when events will occur"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	virtual/perl-Time-Local
+	dev-perl/Set-Crontab
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-Test
+		virtual/perl-Test-Simple
+		dev-perl/Test-Deep
+	)
+"
+
+src_prepare() {
+	perl-module_src_prepare
+	mkdir "${S}"/examples/ || die
+	mv "${S}/cron_event_predict.plx" "${S}/examples/cron_event_predict.plx" || die
+	sed -i 's|^cron_event_predict.plx|examples/cron_event_predict.plx|' "${S}"/MANIFEST || die
+	sed -i "/cron_event_predict.plx/d" Makefile.PL || die
+}
diff --git a/dev-perl/Scope-Guard/Manifest b/dev-perl/Scope-Guard/Manifest
index 37855cf736cd..ed9c0d118935 100644
--- a/dev-perl/Scope-Guard/Manifest
+++ b/dev-perl/Scope-Guard/Manifest
@@ -1,3 +1,3 @@
 DIST Scope-Guard-0.21.tar.gz 4377 BLAKE2B bb9c690b9367a7129555a2b688efabc12e473b9639f0ce4298bc3a6afacb7620438b5514dc7de7532b31125c0b7b9f61dc565e08c4dd7912d0a8ff40f3e7a26b SHA512 65492e08ab79dc323649166e83ffc13c6f1fffaa9c60d581d8854dfe427a54a3c3c5e4d8b90308d4b1a31a1a54c7977b4e1d36fc9005c6e716c2361ce187fc9f
-EBUILD Scope-Guard-0.210.0.ebuild 571 BLAKE2B 76982a495c8a9b4835578dce1ead0acb32ef259d1a9dd8d76379afab17f64f413f802da6b168a09f64cf244dd8c72d14b6db7619fcd26c8c8186815117989a2e SHA512 9f4f3d5f2daed2b7781b5dc4caf3384120bc54c1b629507dbdb71381eb9eeb1a66a1b4365f92d8cf062aacbc75ae335b2fda9226010d2c015b5b02bd79093f22
+EBUILD Scope-Guard-0.210.0-r1.ebuild 429 BLAKE2B 361ed91c8c29d5b26803c26c24d3e06ec78574acadad40710eb0d538547416cc0a5f151ad0cc2516dc78d5e236d8a59fbdd6500102f0160404c282be94bea446 SHA512 541e1f91d3ed806b23787b4ce9b6c8ca527b0cc1d83f9c6adc2112d687a4278b3aa93062c2d753aa235f45f55f40e7887158cd0424e50af85b751d7cee01bf18
 MISC metadata.xml 394 BLAKE2B c11d06eaeccbf286775d255d21a8cae6d5310da65136cefb0cf7c7b4b907fdc398f39d3972aaeafe0e6d84666cea8989745a39b2d9bcef8546a75dc97168dd48 SHA512 03a15e4f4408cbfbf1a441de41033ea67dceacbd915f46f79f28a13a24235b015b41329ef321aee2f033e5da067e7e3a573d2c799dda7260156af33949b88003
diff --git a/dev-perl/Scope-Guard/Scope-Guard-0.210.0-r1.ebuild b/dev-perl/Scope-Guard/Scope-Guard-0.210.0-r1.ebuild
new file mode 100644
index 000000000000..3763e102c707
--- /dev/null
+++ b/dev-perl/Scope-Guard/Scope-Guard-0.210.0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHOCOLATE
+DIST_VERSION=0.21
+inherit perl-module
+
+DESCRIPTION="Lexically scoped resource management"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild b/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
deleted file mode 100644
index becab8e12e81..000000000000
--- a/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CHOCOLATE
-DIST_VERSION=0.21
-inherit perl-module
-
-DESCRIPTION="Lexically scoped resource management"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
diff --git a/dev-perl/Scope-Upper/Manifest b/dev-perl/Scope-Upper/Manifest
index 8df50edfdd55..b53c00539f94 100644
--- a/dev-perl/Scope-Upper/Manifest
+++ b/dev-perl/Scope-Upper/Manifest
@@ -1,3 +1,5 @@
 DIST Scope-Upper-0.30.tar.gz 95297 BLAKE2B 99c8f7f8e01dd841928452b23a31765873c69b5fdf7e0b8549d8fff40f164eca3b67ba8a01fc8dad0eb810467622f8efdcf7cbce41b78a2bf48d7ff99b4d1c81 SHA512 ba766f6f257293d8ec7cca72bfd216a5e3d8b052ebf5a6d74626060c847e3f2d2247056ce96ef83f0a170b2db974a66ac22cf54c8fbb785ec9aba8d984163c0a
+DIST Scope-Upper-0.32.tar.gz 95563 BLAKE2B 4c0044023360f9f27c80fa5075f538b5410774de1e2a3f2027fc3e79ee857629209cfc91ec81cfc8fd7e08e65f0a31dd148aca5a6fa1fd200188f5399abcd58b SHA512 92fbc9b2e49bc1f6c66a4f10519c508ede36ba6266781397f93bd48310ae36b454112c59794f0346b8c915cfe106d2a4f673ecf20e7a2b8f11e504539691bda4
 EBUILD Scope-Upper-0.300.0.ebuild 263 BLAKE2B 11ec67eaa88f9bd40bde8f0f1054af8fab61a338cdf1daca9c0aa30dbc2f988a649e5c0cae85b5ecfd73ed12ac45068a6c44694bc5164c9e5c5e17574f5be641 SHA512 1be5d4ba51fef73c1597f97cb87bc7bd641c6853c215b87c001b0a188c29a9d3682a708147d6d28016d8f2ee5edd6de5dbdc277bc0111a5c95581c14982e63b0
+EBUILD Scope-Upper-0.320.0.ebuild 237 BLAKE2B debf7d15746f553447d11413b86c177f25371c5bcc3c9c7316cb3a265594f7387a26c63480622a6024608c7aee05ce0f963087369bc82b6d3d28d347c525e22d SHA512 bd27ee791c2be40223390c5434037dc499d7e45982990105c13593adbe29aaa2e4079fe40c0fbd5864de2fc35ffbaeed4d8d982b2c337a3611e30fb4aac09e7e
 MISC metadata.xml 394 BLAKE2B b65770576de7a607d99a4a476cddeb331c80e596344cb616de5bc6c4a13919910c831dc33cd723bbcca1b4d4d8d2afc26a9325847c576d39abc0bd23af6be82f SHA512 1b0823cff558102b679c6440d7d1ac89c4a548fa1ae38c436d36d756b7c3cd1f99bc74f99023c16af896b22c0fe47d5b9432f322a756bcd63c5adc940c8c1772
diff --git a/dev-perl/Scope-Upper/Scope-Upper-0.320.0.ebuild b/dev-perl/Scope-Upper/Scope-Upper-0.320.0.ebuild
new file mode 100644
index 000000000000..796c11ba568f
--- /dev/null
+++ b/dev-perl/Scope-Upper/Scope-Upper-0.320.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=VPIT
+DIST_VERSION=0.32
+
+inherit perl-module
+
+DESCRIPTION="Act on upper scopes"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-perl/Search-Xapian/Manifest b/dev-perl/Search-Xapian/Manifest
index 11b9caeb3ed0..dc6d9a9b0a4e 100644
--- a/dev-perl/Search-Xapian/Manifest
+++ b/dev-perl/Search-Xapian/Manifest
@@ -1,7 +1,5 @@
 DIST Search-Xapian-1.2.25.0.tar.gz 72097 BLAKE2B 9e9f54718bf597c7592cc936e23ce4684ba4104f890ee7216e303af9a075eb895459a46d17bd2c32820eb436545a8a9e008b17f83fa586bf3e9160d80813872d SHA512 2bb0bea59ddfd8159df0b3051034ca28478cb74832cfe7a103b8a4dbeddbd41f6223be6ad56eb3dcb8c7a785d2f7d500844c41f35da3997a843b3ba624a4e795
-DIST Search-Xapian-1.2.25.2.tar.gz 72424 BLAKE2B b959e1f111def3660f17669e49dfa9bff95bc421bdde35dac22d5cad4d350057cf7b077f030797158c3ae6c7c292775f44e88381e685b9fb5e8364bef3d03403 SHA512 92b92f28cf50d162905ef230a28956a4e57d3baca81d227751e905756239be0f843b58f38a8dfdb6c8b6ae827e37a60d7df7022cfab43164293223dd430d4d2d
 DIST Search-Xapian-1.2.25.4.tar.gz 75336 BLAKE2B 06e3fe3871f00c173f4c24303b33eb046867dda1274535c1d22b98027804df19b3dc6b80d6213c2090e05362c508d0e41b55cdc165ccedd8a45bfff19d4fe07b SHA512 14d34641583fb3cce3e7cd4b16e5001be9c7808d07e4942b4842196f36906649053d1ff522a5a1b82200ecd714c55afaf7bd653bf7df9a462db91d05cd12cb01
 EBUILD Search-Xapian-1.2.25.0.ebuild 873 BLAKE2B bc226da3bf9c941a86880b6b6a3735cc511725c2de3a7227541f972c93e68289d1b06c9337540da890d4f591e6299af0d4ee165aa4307d034173f21105a703e6 SHA512 22b85448a5981ed6a176428695194da8b2b8bb9e6ade50eebcd7368ee2f974f89b1db72e862894e4ae8f3e33878be8de94c46926e21bcb841697d0a77c431d53
-EBUILD Search-Xapian-1.2.25.2.ebuild 878 BLAKE2B 1de43b9f1c282a8112afc609bf8f6e2203b0a173edcaea8b7088451a07af494aefa2af975b358a2c30a9e5a319aa88b4f3f30a959315f1683219142455f6cac9 SHA512 24bcbbc2e297e5b22d07a6b3b85362097b1bd5ed51db5e3e5cd7de3e60477b87f3e887ae11d4b068178712963e08c615184f56c9c100c5717291403680530af4
 EBUILD Search-Xapian-1.2.25.4.ebuild 877 BLAKE2B eafc6679fd20d22ffeebe3f5193fdc0a31f14b087b53038b7dd70865f3e6b076cc63a40c59ea0e9ae1a59b992732d0940b27702b42ba9e5946aa91ad03633bea SHA512 c9e326bdda7e3b24e7453ac6e0194791de37f9122fbc095bf10695cd6d820f02ac9e085075458085e139634caa737104963f994d01cc877411d3407797132e24
 MISC metadata.xml 3929 BLAKE2B 9b11bf5990a09722eb6a8352791c5df25f6b99c4c877dd381549b875519a5d923c1d55153603a1983941473103d7960b6de4368c99d078a7241302b1e7104594 SHA512 37f1f94a3f429144f0e7e9d801e763d18de8def1b0a066e4acadd168cc9f291103c456b29726b995777554235ebf62f2af20c18db155a13ac9f15955cd6ff077
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.2.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.25.2.ebuild
deleted file mode 100644
index 813d6bce14fd..000000000000
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.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
-
-DIST_AUTHOR=OLLY
-inherit perl-module toolchain-funcs versionator
-
-VERSION=$(get_version_component_range 1-3)
-
-SRC_URI+=" http://oligarchy.co.uk/xapian/${VERSION}/${P}.tar.gz"
-DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/xapian:0/1.2.22
-	!dev-libs/xapian-bindings[perl]"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( dev-perl/Devel-Leak )
-"
-
-DIST_TEST=do
-# parallel fails sometimes...
-
-myconf="CXX=$(tc-getCXX) CXXFLAGS=${CXXFLAGS}"
-
-src_install() {
-	perl-module_src_install
-
-	use examples && {
-		docinto examples
-		dodoc "${S}"/examples/*
-	}
-}
diff --git a/dev-perl/Sereal-Decoder/Manifest b/dev-perl/Sereal-Decoder/Manifest
index f6557c754b98..e130e5a2fdd4 100644
--- a/dev-perl/Sereal-Decoder/Manifest
+++ b/dev-perl/Sereal-Decoder/Manifest
@@ -1,5 +1,3 @@
-DIST Sereal-Decoder-4.004.tar.gz 494146 BLAKE2B e38312bc6fbf3ab2f17836058dd9dd9df51d8b150e4819c8b44fde2f6072250bf75202017575b4506dc075e43a8f2cc3f06bba3e7cc78c6eb8858b2a39720149 SHA512 46ac57e0b0caf35a42b96f250100fe5fad31f3d5b5486d7662bc0331ec8451cdd1e25a3fcb4a50b0d329b1aeb4ec55b929481c98f420ae4880cee0f92cf0a8e5
 DIST Sereal-Decoder-4.018.tar.gz 692820 BLAKE2B 9bafd14f3dab8c7c2c3c9e5eb8463a1681430ada500e1ad8543c77587f5117c564cad6043cd0e00b55d7c80fef1f62f2223f232b803546ead349439b62f25899 SHA512 18e4d54c1930187fbcfc39a39ef8512c1450ac3e5d22bee419e8333cbda1e08bcb1355bc2abfc388f9d45dfae3b8bcc101a19646b7caa670359bae98fccf87a3
-EBUILD Sereal-Decoder-4.18.0.ebuild 762 BLAKE2B 419e0afbf56c3b2b4fa781e6b1cedbee2ab347c70227862231d4f0d6b6567d934256db16ae0c4550984077da771710cb2c5366290755fa97b8a7327185e3d63e SHA512 11783c6dad2cf8372b9124dfa6a009e63567bbc1f497cfecf9d41b5ef03491325d708ccf6df6523a030846c8386650f78051523ac96d6fc8a835ec60add75cd7
-EBUILD Sereal-Decoder-4.4.0.ebuild 731 BLAKE2B 11082d4971a1b694af5e3bb7f4255bdfee0b64bcbfcb96b643707c9b6ad7a29ec1904fb58462256ed913965e669793a792535b2cb789795dd9b4b22dcae95c13 SHA512 d2d976511beb2553ad37dcb6c9e6bd4bf0ad74defe482c2e17c31103d88493db39731d0eb9d6028c3e08d94e0522b71fca94e3e397e4fa46f18488b830831c3b
+EBUILD Sereal-Decoder-4.18.0.ebuild 760 BLAKE2B c54e97e2e2b4c54d5090fed6c1891830f7137959de5c6ca685fd18b3a1f96403a8a58879296963134fac55323a0c1f6b683d7a6d991b596c86c20ad7c5809da6 SHA512 eb71111af01272b38e0cc9280221f3e8861caa1cf5ba431ce3184baff02bcfeff539f6163a3e81b4554a82eac51864f92c6012ba49891e215db27070873146c5
 MISC metadata.xml 539 BLAKE2B 20244df7eb1bcaced8403236d0d4e493070fef5fc75a1e3014ded52368c4cb875a75b489c64493d32f4314fc4c4cd76516af544f87dd96380d8d746ecf6d9794 SHA512 11da63e51e717a8a6074d50533ec666bbc2535574a32881e9bc14a49792aa17bf215ee07d9d8120cfc9cce473fd16fc1c62b514a97190563088bac8b5fa23238
diff --git a/dev-perl/Sereal-Decoder/Sereal-Decoder-4.18.0.ebuild b/dev-perl/Sereal-Decoder/Sereal-Decoder-4.18.0.ebuild
index 3504f0e24571..70f78b018307 100644
--- a/dev-perl/Sereal-Decoder/Sereal-Decoder-4.18.0.ebuild
+++ b/dev-perl/Sereal-Decoder/Sereal-Decoder-4.18.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Fast, compact, powerful binary deserialization"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Sereal-Decoder/Sereal-Decoder-4.4.0.ebuild b/dev-perl/Sereal-Decoder/Sereal-Decoder-4.4.0.ebuild
deleted file mode 100644
index 3b978e3f4069..000000000000
--- a/dev-perl/Sereal-Decoder/Sereal-Decoder-4.4.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=YVES
-DIST_VERSION=4.004
-inherit perl-module
-
-DESCRIPTION="Fast, compact, powerful binary deserialization"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-XSLoader
-	app-arch/zstd:=
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-7.0
-	>=virtual/perl-ExtUtils-ParseXS-2.210.0
-	virtual/perl-File-Path
-	test? (
-		virtual/perl-Data-Dumper
-		virtual/perl-File-Spec
-		virtual/perl-Scalar-List-Utils
-		dev-perl/Test-Deep
-		dev-perl/Test-Differences
-		dev-perl/Test-LongString
-		>=virtual/perl-Test-Simple-0.880.0
-		dev-perl/Test-Warn
-	)
-"
diff --git a/dev-perl/Sereal-Encoder/Manifest b/dev-perl/Sereal-Encoder/Manifest
index ad78c52378dd..d23c0fbc3318 100644
--- a/dev-perl/Sereal-Encoder/Manifest
+++ b/dev-perl/Sereal-Encoder/Manifest
@@ -1,3 +1,5 @@
 DIST Sereal-Encoder-4.004.tar.gz 500922 BLAKE2B da2b6c5961a9b05381957fabb9e02b6ac6cbaa9d44f7da3a4ba7bc07d4b8f38518557e1dbd5c3a85a535ca30a0f6ef96f5ccb32e64c73fad6bd7d3e62ec3bcc1 SHA512 5658348128409cec08c01ed216a22edc1c3cbf8a3eab0574378960211fd38a210dc06160c6fc2836a6d53ae4953b14040c579290cbf43de6d3f68bca13e5c7e2
+DIST Sereal-Encoder-4.018.tar.gz 700306 BLAKE2B 92e2d005b48c9714761dd6abb390de14f31642b05850664ff396e3d92958cb715599e922d7bc5da9912047ebbcae3f7631e585ccb35ff16b15e1e28a15d1fb9a SHA512 021586f02560906fa315cf7eefc877ff029c123550dd2889a90d8e36e2d480bc4c53fa7437728cb73bda6da886af52f1b58661796f78859c7b41f62a2000a070
+EBUILD Sereal-Encoder-4.18.0.ebuild 869 BLAKE2B 5fb064c249687c1ca04edf477b2afd221ba42768e50d68fcd0793fe13f60102453ebc7a416fe7e38c9e7db1ffc2c6cce5b5f3e9e06a6e0ba80205333a6ccc443 SHA512 06ad122c558253657d326cb1a33fb154ca4b1bc7091157d1bde8155490f4eae78c95a9fd1d52863cc8cfff1ae62edfee5b8a7deeeb2accfcc32387c842f6e7db
 EBUILD Sereal-Encoder-4.4.0.ebuild 901 BLAKE2B 61f8eb3381c6247443f002cc1297823bafa425d5403b90d99eb71bd19671c048782bc84fc334bd59d17339c84a25a36b89d28d589bb8c99cc8904260f7d839db SHA512 58e3f56d2b649ca1331c59082642265695b932791e3b751493e6e60e4ace0a5a9df8d215f5bd1925f4e9f2722242289d7b54e859f0b2ae82491b916a51385f65
 MISC metadata.xml 473 BLAKE2B 8d7f1ca28f40bd885af038c5ed2b14a3573e92a8fb4ea922ae8ae4313d245d93e973aac00541471eba5ccf8d5d2a53eb8dcce03e6da92b148f0f1cfc23dc408f SHA512 d51239cbedd31b5492218fddc63ed2a07246b491c73d7709e857f74434b943029d276d98f0d99026e3e7ae13bbae5cb3710cdf927e058a3b24ca77aaf40380da
diff --git a/dev-perl/Sereal-Encoder/Sereal-Encoder-4.18.0.ebuild b/dev-perl/Sereal-Encoder/Sereal-Encoder-4.18.0.ebuild
new file mode 100644
index 000000000000..507c4621c161
--- /dev/null
+++ b/dev-perl/Sereal-Encoder/Sereal-Encoder-4.18.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=YVES
+DIST_VERSION=4.018
+inherit perl-module
+
+DESCRIPTION="Fast, compact, powerful binary serialization"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Note: bundled zstd fails compile
+RDEPEND="
+	virtual/perl-XSLoader
+	app-arch/zstd:=
+"
+
+# Tester note: ideally you want dev-perl/Sereal-Decoder
+# as well, but we can't depend on it because it forms
+# a tight cycle if we do
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-7.0.0
+	>=virtual/perl-ExtUtils-ParseXS-2.210.0
+	virtual/perl-File-Path
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-File-Spec
+		virtual/perl-Scalar-List-Utils
+		dev-perl/Test-Deep
+		dev-perl/Test-Differences
+		dev-perl/Test-LongString
+		>=virtual/perl-Test-Simple-0.880.0
+		dev-perl/Test-Warn
+	)
+"
diff --git a/dev-perl/Sereal/Manifest b/dev-perl/Sereal/Manifest
index c677e4811bae..a661940f17b7 100644
--- a/dev-perl/Sereal/Manifest
+++ b/dev-perl/Sereal/Manifest
@@ -1,3 +1,5 @@
 DIST Sereal-4.004.tar.gz 193361 BLAKE2B 3cd08b0e23b9ec4c0e1ce1a72e528373cde9168c9f6c0130162f4ae7c50dd7bdbedda8330b94c1b87a53882aeb3e6875682c72d85cce7336efd5d65b204c028e SHA512 c4fed38af587a852c294bdbe4bc17fc2b5cc55592d0d63deb5c155c974e45befad141d6e655fdb72bf88a50a26cdeb500e0e717b1cf6d936778de49825664f1e
+DIST Sereal-4.018.tar.gz 196147 BLAKE2B 1415b04f48ab0ef60d425d08107fa08537a5f6050d62d62f3399e5402600c52fa06b97076f0cc5342a9215b04401f4ff33307044d5d39d8c12d0f9b0d4ff1250 SHA512 cfa4796efa2231b1f813fe15080c07cc1aac05a137041a74922e66737311b02859b8fd83d80c4f8f2dd79f13bda648dae8cf3a0f723c320aa09df177ddd77eec
+EBUILD Sereal-4.18.0.ebuild 609 BLAKE2B df2ae54b4a93856aa90747b8eabda7786b210dfe8ad5f28ef3288ad7c4c3f728831a953924afa94eee92e1c8a8e3970904f9829def5cfa31fd46575a95996853 SHA512 7191b5bcc52d6cdb7d70cd4c45b2654277d6030310b051358d99beb66360c536d61a0c2ab76f504a9775f2c9fc9af8521db3ff593496f71f98fd3c1c342adfb9
 EBUILD Sereal-4.4.0.ebuild 640 BLAKE2B 0b7bf769cbabe7fbaba8ac0be42d4c6a300e30a91ed3244c6fa03215d783403a674f1b11d16d0f59448fee6d449a7143c62bafacdd53602e65442087de85b701 SHA512 39aa68ff97dec35619ddd8674552184cf153cff1090f6b8d1fe2e810d57cd3956dd6b9fa4d345da91f0ad30a6ea10ea30b2eede7b8ce226252f8a8fbb30c9629
 MISC metadata.xml 383 BLAKE2B 9468b5aa0d86b9ab00a56b7b2e447f4f3b3f88b7e97e1c803114e4afdeb82441ff5dc7ab2b6ac6fd3ebb64008d3b08e225821aa8279064afa7343778b0d13575 SHA512 f01a19e403385cdda993c32cab0b31f546da5bcee25119472008ffa6b87c31dc3918979cc20b5765a4d631df40c03258c878e04b60be3d3cfeecef32894e54c2
diff --git a/dev-perl/Sereal/Sereal-4.18.0.ebuild b/dev-perl/Sereal/Sereal-4.18.0.ebuild
new file mode 100644
index 000000000000..2e89ad82485c
--- /dev/null
+++ b/dev-perl/Sereal/Sereal-4.18.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=YVES
+DIST_VERSION=4.018
+inherit perl-module
+
+DESCRIPTION="Fast, compact, powerful binary (de-)serialization"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-perl/Sereal-Encoder-4.18.0
+	>=dev-perl/Sereal-Decoder-4.18.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-File-Spec
+		virtual/perl-Scalar-List-Utils
+		dev-perl/Test-LongString
+		>=virtual/perl-Test-Simple-0.880.0
+		dev-perl/Test-Warn
+	)
+"
diff --git a/dev-perl/Server-Starter/Manifest b/dev-perl/Server-Starter/Manifest
index 4d0fa33c563d..57ba7f615493 100644
--- a/dev-perl/Server-Starter/Manifest
+++ b/dev-perl/Server-Starter/Manifest
@@ -1,4 +1,6 @@
 AUX Server-Starter-0.330.0-perl526.patch 338 BLAKE2B e7d213ae195d3f529ab736ba38b4592ca81168efe26d5303891f43442d6ffcb935698a31901fb65983d2d610c5c3cdd819b5bbe3286e32d3ca19edb98da26ec6 SHA512 90ee1bcac4dbbb035d91e0240b46ecf0e56e228725d30f8967929a8aa0ebb7a96d38578b5c23d48c2591422ab2d70e4c746c2463353f4fc0e8dd497f55c36a96
 DIST Server-Starter-0.33.tar.gz 23335 BLAKE2B fc1f715d18d9362930f48410148a4f26b5018d26010c29a0d2822f94d131836bbb1f03c22bcfc7c3d43732cba3b46bcf63461f426d44ef629842ba5189b4cc65 SHA512 1892723ca113cb2c269ce330881dce9010b4ced212f85adefaaa8dfbe90ea6ebcf319c12f0e3384da3a07740a4e2a1d84bb006f44d77fec62d9bc0aeeaa8ccf3
+DIST Server-Starter-0.35.tar.gz 24306 BLAKE2B 0a6a8c8e5b95aeed8dbcaeaae5338b2edc994638d3ce96175b970bd1e8da2333e0eb744307c661c44689f3225abf040d24ec9c4d5cae3fb2180fa3cbcad1dd57 SHA512 d9ba5be08424b1b37ebaa765fbb6318353214cb8d8381227eae2b6445bbd21d853888a72fbcef2ba99dd6ba97bed6217af9e8f44b371bc15ec5d9c97b00c17d2
 EBUILD Server-Starter-0.330.0.ebuild 540 BLAKE2B 5464ce91b87e63deb2a2b3cb736aa3ae1cab873641097afe4554bf0fbf0c9a80647db07846399dc803ea0020c3f8dd596dca79ba80704674be5bc5fa4d1b8885 SHA512 311da4c24473d57c923d7e661bdfd569e9a30814c7ab3b47fa0ec91124d2d48ff2c09d71ec7b0c79832488e48113fc721da06d6708c9c99ac29f164dc9abe5aa
+EBUILD Server-Starter-0.350.0.ebuild 457 BLAKE2B 9741f857c94839c1e9e7cae614104809862826944d4d76da59297d5ec14ef8a0e101590566a89e081bb6ba1d7cdb74e78c203345f5fe6261eae4c59a94642013 SHA512 6881053cb8ec667d8d82f4b4e797a63025accee980f1c3e402e9f7a519a7396c04c26e4a7dee08220aa3f337d856406b3c85d9a856b433a0e6768f3cfc5ed478
 MISC metadata.xml 469 BLAKE2B 3795c2ccbb9b2c08e900bbe31c2dc92e0eebbd187b6748b0457f59876876cd5ab77e9e7f376c8dc06ac495209afe288333dea823824fa51afd6c095d8dcdd35a SHA512 fa7568e3cdc4caf3b6bb0757b9e908a62aba06fc2de4c430f68d2aaf3800396cd27d4da7572135eb0d0356282cc94573e8d7a5e6003504553849a18427d179ff
diff --git a/dev-perl/Server-Starter/Server-Starter-0.350.0.ebuild b/dev-perl/Server-Starter/Server-Starter-0.350.0.ebuild
new file mode 100644
index 000000000000..f3c6f95fbaa8
--- /dev/null
+++ b/dev-perl/Server-Starter/Server-Starter-0.350.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=KAZUHO
+DIST_VERSION=0.35
+inherit perl-module
+
+DESCRIPTION="A superdaemon for hot-deploying server programs"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.400.500
+	test? (
+		virtual/perl-IO-Socket-IP
+		dev-perl/Test-Requires
+		dev-perl/Test-SharedFork
+		>=dev-perl/Test-TCP-2.80.0
+	)
+"
diff --git a/dev-perl/Set-Crontab/Manifest b/dev-perl/Set-Crontab/Manifest
index 3a615f0da007..0e9ff3cd688c 100644
--- a/dev-perl/Set-Crontab/Manifest
+++ b/dev-perl/Set-Crontab/Manifest
@@ -1,3 +1,3 @@
 DIST Set-Crontab-1.03.tar.gz 2887 BLAKE2B 700e78666852885ba071300cfb0353eb72218b6d7be7a56e9fc59d5ee6a684d45051e04544ee059032b8d8d5ccdf170e748decaa54d795af7162999418df953a SHA512 9b4929691aac2f740ecf94cfdd166315c355a93be149ef76bbea06a8d820a9da2b7cf26dc6d66baea7f4b359c2012229376f06da55f3fe0653b6d0cc8c77ef91
-EBUILD Set-Crontab-1.30.0.ebuild 341 BLAKE2B 05eac29641b5b089dce17fc20b3502c149b714f9234b6ec169ea9c80d6b1f41adfbbddd8b0e77dc3213d9a7fbcb3c303c26afa1865e9ece071d1a712d96433a0 SHA512 fa28e33ee9d55771c41ab30018eb6a7278cdbce5fcaf868b1ad2a6ed6b72c5503b5dcdda7d9478d27142690c5a63c416d685580ff5fe0e9e460c69b0f1847d83
+EBUILD Set-Crontab-1.30.0-r1.ebuild 256 BLAKE2B 966228a2d4cf496b0805612be93a586dc447078e8a33142e6b9ef2cbbf13c9cd878684f6a8b7fd63c0b20fe4ce8150d8e90ff0c89c1efb268856b4a83bab2183 SHA512 5f807ca7df483b9775d763effd543130c8ab52bfb61fb6985c2aa86c9e73f13df8f628cccaae1a3aa1843c66b2d0c957eac920ded9724fdb11eb105f0f0fa9bf
 MISC metadata.xml 394 BLAKE2B bf51cd5b31670511d527bdd1e8682787032c592bf29aca9a0387ba8a79004653e2dfb2b5a2302f0ff5a97b3d2a541118adffaa551518c20bd872d8199ff6ec54 SHA512 6859563b5c14b0b9798b7ceb1d6605197d060d7d7940f971cb6c23952ae392d4d5160d62b577183a8fa680666cac0c3cc99faf61fed62f97e651d36edbde6999
diff --git a/dev-perl/Set-Crontab/Set-Crontab-1.30.0-r1.ebuild b/dev-perl/Set-Crontab/Set-Crontab-1.30.0-r1.ebuild
new file mode 100644
index 000000000000..45261e941c7e
--- /dev/null
+++ b/dev-perl/Set-Crontab/Set-Crontab-1.30.0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=AMS
+DIST_VERSION="1.03"
+
+inherit perl-module
+
+DESCRIPTION="Expand crontab(5)-style integer lists"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-perl/Set-Crontab/Set-Crontab-1.30.0.ebuild b/dev-perl/Set-Crontab/Set-Crontab-1.30.0.ebuild
deleted file mode 100644
index 3b8d2bd1ef44..000000000000
--- a/dev-perl/Set-Crontab/Set-Crontab-1.30.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR="AMS"
-MODULE_VERSION="1.03"
-
-inherit perl-module
-
-DESCRIPTION="Expand crontab(5)-style integer lists"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-
-SRC_TEST="do"
diff --git a/dev-perl/Set-Infinite/Manifest b/dev-perl/Set-Infinite/Manifest
index 05cf2060206b..12dbfacbaf81 100644
--- a/dev-perl/Set-Infinite/Manifest
+++ b/dev-perl/Set-Infinite/Manifest
@@ -1,3 +1,3 @@
 DIST Set-Infinite-0.65.tar.gz 50041 BLAKE2B 731e4f663182cbb7758b2cff34191440f2753ba10de823fc22e0d7d10730e61f85bdeead515f69a1fb363fe71348cc35238e51684ef90522bcc38943ed229130 SHA512 7ff4f999270c938f7a6d5c1f77927568e9575284b306cf3b831ca087ce93b904db74656fbe26a282be27ea7f556d54dbaeb73c7b2404efa0429964674be67d4c
-EBUILD Set-Infinite-0.650.0-r1.ebuild 262 BLAKE2B b0c8c9db8a48c9a37d8dba479d8c1e53f7248e60e94dfbca6755ddab5a62dee4fbe535ffd4e6db96dd9ecda0c0abd130259dc0fc558d5ce29272294c59e6f263 SHA512 8add11a979f970976dfc3dea818249f07aa383c151af458aef6d6594ab6ad10facc9b30efab1f89f5fdfc409071352f18b71927cbb9f65c05ea8341e47c1d8f7
+EBUILD Set-Infinite-0.650.0-r2.ebuild 234 BLAKE2B 772d95678cb9b6b601a9915975f9baf68ebb779e101fae4297f7ab2b7999e02d302e26ca08b5ab51811da65217c4522e1939a0cc23588d9abadfc0966e1b7424 SHA512 f998ee11ca0201d7af9180ff72356d7f8cc30899280daaa332aecddd930fcd2ca17fe3f2ebc993b01a38ed2e2d00ddfb689f2c4bf06ee8f9beebdab91bd432fb
 MISC metadata.xml 535 BLAKE2B 07034cc454e72372caa64474716cbb1044169e7ee8e7be5800a728307d7810f898fbe49407962ce2e49cc036fa5a11b5865f71e7d43672db9315b6e8256f35ae SHA512 550037c10ab9c0e6bb77c418cd4d9874f65b49ee33ca87dab7b03185a947b598ad8cd9415984c6cca15c622c1ecdcb6f7805038a398344ff610235911676c15c
diff --git a/dev-perl/Set-Infinite/Set-Infinite-0.650.0-r1.ebuild b/dev-perl/Set-Infinite/Set-Infinite-0.650.0-r1.ebuild
deleted file mode 100644
index 78be9070595e..000000000000
--- a/dev-perl/Set-Infinite/Set-Infinite-0.650.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=FGLOCK
-MODULE_VERSION=0.65
-inherit perl-module
-
-DESCRIPTION="Sets of intervals"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/Set-Infinite/Set-Infinite-0.650.0-r2.ebuild b/dev-perl/Set-Infinite/Set-Infinite-0.650.0-r2.ebuild
new file mode 100644
index 000000000000..0e520b3caf9b
--- /dev/null
+++ b/dev-perl/Set-Infinite/Set-Infinite-0.650.0-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=FGLOCK
+DIST_VERSION=0.65
+inherit perl-module
+
+DESCRIPTION="Sets of intervals"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
diff --git a/dev-perl/String-CRC32/Manifest b/dev-perl/String-CRC32/Manifest
index 45592937ed30..7185de834615 100644
--- a/dev-perl/String-CRC32/Manifest
+++ b/dev-perl/String-CRC32/Manifest
@@ -1,3 +1,3 @@
 DIST String-CRC32-1.6.tar.gz 7713 BLAKE2B 9b976be73e7781beccada0c2c0bf535f5d23ada71840fce82f1915bbf0f2c5ddeb9d4ec50b89e396b9ef373826961fc4f78e9a0e5df38823a482d939bf35e769 SHA512 e8915066edca5407de5c42cf6ec6367cfc8662d3c353ee7b9150e372fccbca136946a8e30ec18f4ccba3a08d4864387f3cad01b3b0117e019927b72c9081fe39
-EBUILD String-CRC32-1.600.0.ebuild 403 BLAKE2B 8f182e7129e935d1da5627756bf9606ceeabdc127f96f5c066ecc6c37698086c9c41d54ae4900e3a37b4245798c820e939d71df556b627c170be6172a982e78d SHA512 176ffe7c1a7345f8af6ffd47e9b4adbfe8f47cf3398b7d2150671db6ff434784ca6a9461aaf370243c467ad430e8acfaa4e0c78638d998538e1f725c47ba7d8e
+EBUILD String-CRC32-1.600.0.ebuild 410 BLAKE2B 718502a596fb2145b7d3c71a63ea61673b675aef11df1e83114d63c6f589c8ed4f5c00c784fac3a8157f4e6d2b564aae9a02709feacaa8f9658f5e3314ad084c SHA512 5f378015a0acb6ec9d7f6b11b4a5302c17336a793b477d28fbc58392e7a5af860b1774ee99143180ffd4f38f786b1949aeb565def8abaaa64943576b3f1af777
 MISC metadata.xml 396 BLAKE2B 658c0776d2718378d8d42440db2e215cda28d5c9a1562b37a4ffdd99866983fcab416088bfd7c536e14795416122e7ccc9d4d1950bab02d4c97b50cc63c1bf56 SHA512 ffbff3086034b3e0d177dc0204fcd5107d8511280878fdbfbe0727b6548ad7f210d5112e1b5ddd108af5450074259a6b7d464005ccd63c51096e869e38e3b61c
diff --git a/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild b/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
index 1738a4b1d3aa..d15024e09a71 100644
--- a/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
+++ b/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=LEEJO
 DIST_VERSION=1.6
@@ -11,5 +11,5 @@ DESCRIPTION="Perl interface for cyclic redundancy check generation"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
diff --git a/dev-perl/String-Format/Manifest b/dev-perl/String-Format/Manifest
index 00fcafea1a0e..efe4a4b4e3b7 100644
--- a/dev-perl/String-Format/Manifest
+++ b/dev-perl/String-Format/Manifest
@@ -1,5 +1,5 @@
 DIST String-Format-1.17.tar.gz 12841 BLAKE2B 3729fdba56eab74ec6da39801aceb7d99e58909a725f2d2a8f66595608ff3efd12d3784a2b65339ce0d588fc5aac0093de202bad567ffc0cf7053a3a50951753 SHA512 9d003483858d1681d6955b8620cbba649fe8b92c318b29c5dd684857d81320cb35fbb50e537545d1dfd1e3abc9f94acf9263b82442759e55fd686bd6e907a9f6
 DIST String-Format-1.18.tar.gz 13676 BLAKE2B 4876364f972d9a6859de661f59cf251f65d6bfacbc294ad40b951ce4ee1a51f8ee1a2f26fe997dab4ba36deb0def9226b9b2f545c1832bbd06782e00d1bac2bc SHA512 34eb3991a9bea931f59ca1683ba72d8b07244ed4c2a9409be0626346526b4eb2ab07acdd5c4eabf44a767867a4991e97d89835eb0e4c3c43b413de75eb3c0d5d
 EBUILD String-Format-1.170.0-r1.ebuild 411 BLAKE2B 3bb86bec25a51c047c63e39f70930e9cdfd3788c9f9a29672326f3179393bc353a0459b15a15901037b2639fc3687652e52239e0427dcb36dff0fc22efdd3171 SHA512 1557fd5a54052941081312b75e07cf34090176b66ef982b1833d61fdbbc4cc4f7f19eb2f8b1ca75abab3015a6b82a32373d3919c6f47043d5653c8c56b764e60
-EBUILD String-Format-1.180.0.ebuild 394 BLAKE2B 65a2b4d084edc6d3d2c98536dd9ac6a6013dbb7f271e6c4d8d9738d67bfac06796317f0716a005dcec3fc38dacd94c9b2b7f0f5d36cfa88386d379c45d6289fe SHA512 413ee25ce6b850c35e9f57aab073798f476de1a1d082462d040ed7dea230e53eea290b23b70d51cb175d134e6251b9d1e15344ff10ea220feae56ba294f119d2
+EBUILD String-Format-1.180.0.ebuild 392 BLAKE2B d9e2cba2b8942fc791dcfc72d0a8b07a6c0bb8eab620dd7b0c5dc33d1e343fc932b7a13a7cfa506d8c3e72d8c260c78471d06fbe0369cbd5a38d04eb5fda3697 SHA512 cf77492639cfa5d018a2da2fa3a9d9ea054df587003b817374535c6eeadeb2fc1139cc4de7a02c1465a17250e6c65668a6c1c81d277ff21a84e2b7945371d442
 MISC metadata.xml 398 BLAKE2B 902d1bb5e644940cd2b63104eb4f4981759e4d1ef07d0725285d966e059f21a8977012457e33bece74d062515bf2eb3bccd3581327509fa9a14a119519de6f67 SHA512 96f7460f62f2cbb9cda85fea1044c7ab419c06a3be0615d53baeeb07ab5ae2cc3e353091a4e3da9e9a53e89bc6637aee3da8e5cc1fa21705433f2eb87fde61ef
diff --git a/dev-perl/String-Format/String-Format-1.180.0.ebuild b/dev-perl/String-Format/String-Format-1.180.0.ebuild
index e7af746e6f98..a4840eb34d4a 100644
--- a/dev-perl/String-Format/String-Format-1.180.0.ebuild
+++ b/dev-perl/String-Format/String-Format-1.180.0.ebuild
@@ -11,5 +11,5 @@ DESCRIPTION="sprintf-like string formatting capabilities with arbitrary format d
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
diff --git a/dev-perl/Sub-Delete/Manifest b/dev-perl/Sub-Delete/Manifest
index 10417c5c5eeb..205530ea62fb 100644
--- a/dev-perl/Sub-Delete/Manifest
+++ b/dev-perl/Sub-Delete/Manifest
@@ -1,3 +1,3 @@
 DIST Sub-Delete-1.00002.tar.gz 31437 BLAKE2B 4c622824c8e41f2c7eea6192799c6300fedc9b73a20ba1a40efe71b91effcb861884c8e38ca5e0001d4bcd5f77d6dca39d1167f1ed4aa18d78edb41486c35fba SHA512 41a926099634e24d805756123be6ed7153568b45acc061fa5b3d91141eea6a1c6109681a725f4351bcbe6ef320210d2f18800b7da7e9631574f535979ff22e06
-EBUILD Sub-Delete-1.0.20.ebuild 381 BLAKE2B 2802a554421576b52a3cfa4a3a59a6989965fa798fee8c57a2520fa8f7739e2f50ead67e72bc190a99c08a9528f185ef0a3b9ecd1a5920ce57b79d10946e2f9c SHA512 7214e6d7b51d38af2a7d0c0461d2bacde913470ea81e73094580efb308dc4236f7c6108504ca2774045875756f4284a69410cacfe7147e42d8e01c52e08a8d52
+EBUILD Sub-Delete-1.0.20.ebuild 384 BLAKE2B 9a2b52590df6c812938b31bfad132bcac68f34e550de5285658592d64c0284ed02c8a3971c612113a32c7b9fe0c9661afa731871a8bdb7f612b889ef7dddf5fc SHA512 0db5c68ddbf5371eb9ce4bf07196e6889a6f6469a98378826bfba1db880d20579089522568edb71e1c04bf05ae3fe408000c50348a561265e21f6b0d112c8955
 MISC metadata.xml 392 BLAKE2B 651fdbb50c16881b92c7be9aced7bfca7b854d48c133d02702e55845be4c9ebb1129d9cc551d1df43f40fd4c651454c88aa2b1b5bdf1721b7d2e1a3eee94c631 SHA512 d39d1a5cb8e8927e67332b62ef210c48627c3161bb479e4a49822ecde4e397ad78aae916c583018c585d0c337adc1e5def689fb9a78991c3a034576a8dd11ebb
diff --git a/dev-perl/Sub-Delete/Sub-Delete-1.0.20.ebuild b/dev-perl/Sub-Delete/Sub-Delete-1.0.20.ebuild
index a3565374005c..28c2437b9994 100644
--- a/dev-perl/Sub-Delete/Sub-Delete-1.0.20.ebuild
+++ b/dev-perl/Sub-Delete/Sub-Delete-1.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl module enabling one to delete subroutines"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~riscv x86 ~x64-macos"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/Sub-Quote/Manifest b/dev-perl/Sub-Quote/Manifest
index 6bd99d2b0524..939ae4ca3ac0 100644
--- a/dev-perl/Sub-Quote/Manifest
+++ b/dev-perl/Sub-Quote/Manifest
@@ -3,5 +3,5 @@ DIST Sub-Quote-2.004000.tar.gz 20363 BLAKE2B 0697f2a0a9aec799161289bee34f991fc86
 DIST Sub-Quote-2.006006.tar.gz 32485 BLAKE2B 517742256d9da1ca839051e6bf75b660740ccdd0ed2809249bf40fc86526b72bc12a338baa34d6f88a0f5411e5331bdd6a769c7a777996bb75775f79a2315d6b SHA512 19cd0504f039f3218d3f47b3b44714f0baed73a13f97c4552eb1816b7b03186b1bbdf48cc70c2cae616eb9ec81721b30217c7f788176d389df694c9b355ead64
 EBUILD Sub-Quote-2.3.1.ebuild 596 BLAKE2B c9d6fd99d2ec09a4bb1258c6cb34d5753ccb3b49d9b7ae76e41645dab76e8e2703fa4a94bb0942447c43fa5ba3fa9296673956bd45821ad57436a75c7ea3c0f4 SHA512 4f0771ca556ec4c7890748e2184a604379b421519a3acf5b67cd0df59245d1a93a770ac655e1e2ab5e992098d4b9bcc7ed099940ce3ecc98be3749e468c10d2c
 EBUILD Sub-Quote-2.4.0.ebuild 735 BLAKE2B b92ff2308882dfa2c3660d791b8a694fb7251be1cd2d73652f7bfbd5c378a6ee05b1a57679315c31648ee0430b2671fc540bbc9f63bc53218c71f65eb3b041c1 SHA512 30e0e2fc6522aecf883a2231828734ebfa39f100f6a8595d219c792d032ab25f1e24f1ecbce6719b6d7b543d9a690a4573ad13f85c4d6b0f321c27862bf3c7a8
-EBUILD Sub-Quote-2.6.6.ebuild 740 BLAKE2B 4412f61f9a553313ebf5c8a8a5e71f52f0bd314462aeaa24e68982dab67d1b122cbd05c58a1b72984864f337d09438dc768e98b7a58ead0e2062beaf5fa2952f SHA512 0ad5e9ad168f0dab49a792d7f485a039baf9571646d00f7256527fe1773909074123a7e63567c633d79ac78095516986042a116b995b5f3b98191f9b7c08138d
+EBUILD Sub-Quote-2.6.6.ebuild 735 BLAKE2B bff24fde6ee34ebbe5c39238ee12fe4aea7117a01a8e04281a1b6142fc65d754c342728af6642f0374124deec731d3aaeee940c1c016645a89e18fd2105b357a SHA512 a6461c1925633dc9df8cb7280d2e424423fa8006030f7a56ee1995b1f62d6236dca6384baefbf7c987faf0a9464e8b16b0ffefee7a42b36bf134f57ac737206a
 MISC metadata.xml 447 BLAKE2B b414878a42aceb8390f1de47f02ff23dd6ca3ed337074f06c252824c968d933023dbba655430ceab71406ede17a30fd2b3d8b376a1159425116c2898b316d182 SHA512 b3147fbe7cfbafec109ef47574f27a5d3f49558f55ac6b9d6ee52c56c2701b26114209f0f675e32de3eb253b375719d2faed0ffdd4087ab49b3e6c9d0cd1237a
diff --git a/dev-perl/Sub-Quote/Sub-Quote-2.6.6.ebuild b/dev-perl/Sub-Quote/Sub-Quote-2.6.6.ebuild
index 4f9fffd4f9d7..795347d62303 100644
--- a/dev-perl/Sub-Quote/Sub-Quote-2.6.6.ebuild
+++ b/dev-perl/Sub-Quote/Sub-Quote-2.6.6.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Efficient generation of subroutines via string eval"
 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 minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Sys-Virt/Manifest b/dev-perl/Sys-Virt/Manifest
index a8bcc084fe93..f4626b89b714 100644
--- a/dev-perl/Sys-Virt/Manifest
+++ b/dev-perl/Sys-Virt/Manifest
@@ -1,5 +1,5 @@
 DIST Sys-Virt-3.9.1.tar.gz 121473 BLAKE2B 8cd9211c4182a296da54a26db8007312ab1ed5e5151ea91bcdd5e104610671c8e81e3e8526c97d9f22b8a83151a167703438341ad73db6e91fd57450fb6f3de4 SHA512 baff550548ca7a477643998fd1da20963acb00a9ac300b63a01c60639e971f55aa4e4616a916373dde3e05956237a122b85e2f32f9ea2fab63a7ec72e45819b2
 DIST Sys-Virt-v7.0.0.tar.gz 165365 BLAKE2B 9cb7aa66ce00c95957171fedad4fefbae5319e17706e2839f8b3e057ab05c52b9d7e5ad222ad6aeecb7437e70bee9447a6a5845d729a93f10df3ffa4bbee0429 SHA512 c0ab179af11526a9dc983374765bd04400821f6f334d22f56b1f6452f54f880fe6882e9e0e121ae36010eb305d0632d574c969febefd8a32c9a731879d8fadb6
 EBUILD Sys-Virt-3.9.1.ebuild 619 BLAKE2B 8901e02684b53afe180a9ec8f20fee8046449155e79c20dd9d58eca86be11689c8d3307db8975ccfc1dd64c0edbba9832695c65f54dfbaed06019e1fdb2ca1a2 SHA512 58b88b01027746bb0b9ca5fd3f826c27011df912ce2a38e8452a0055030d48b1cfac52e3a1547d564c5644e4bdfaf20a6a48581a091bab28223009c1db0c612a
-EBUILD Sys-Virt-7.0.0.ebuild 769 BLAKE2B c9cb6a594a688e4c14ef60f2409f3522fba43096b7a252fd4ffe2abb3e03e0b3f55a8df7c839939c0bc32b9ee53ac3441c257179fed9af645c5571eb9dec65bb SHA512 8522ce5cd609951cef50d9856f90dc3ca53641f2471cbb235f7582ebc62b6a9f70d5438150adf6d9e01ddcc6ea49c096be1eb1456605cbff43754c2859d413ef
+EBUILD Sys-Virt-7.0.0.ebuild 768 BLAKE2B f31a1bd373d8e8608788251c14daef752a07301c427b9040fd0a15d6503656c96349e73f13dbdb79c91386e08d1f348843c90adfc2f382c3c298231047481b0c SHA512 a6adcc8133b5a51b7488c260af22c3b3e34fc64562de98c7929504872bba570052d170ecbcb104cf28dc486b0c4a2a929db21d75716e5fdc34c15aed1a8c7f5c
 MISC metadata.xml 1129 BLAKE2B c076cb8d0e741968e9ea51ba9bab6233649db3a7a437c8899772d5f71fcb903ff93c5f239de31d130f552bba364e9c23ce760d09f9321d714a2f952bcdb1bf02 SHA512 d6079748ca5db55acf867eab9b42930ac9bc07f9f2804cb9fd12695ad849c987531187053537c2632e90b85bfc2b3db1a55917c947066ae5b0e90a68e605434a
diff --git a/dev-perl/Sys-Virt/Sys-Virt-7.0.0.ebuild b/dev-perl/Sys-Virt/Sys-Virt-7.0.0.ebuild
index 2897ba113d9c..7133c0765333 100644
--- a/dev-perl/Sys-Virt/Sys-Virt-7.0.0.ebuild
+++ b/dev-perl/Sys-Virt/Sys-Virt-7.0.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="API for using the libvirt library from Perl"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Term-ProgressBar/Manifest b/dev-perl/Term-ProgressBar/Manifest
index 8597cc5e9dae..29541d93f994 100644
--- a/dev-perl/Term-ProgressBar/Manifest
+++ b/dev-perl/Term-ProgressBar/Manifest
@@ -1,3 +1,3 @@
 DIST Term-ProgressBar-2.21.tar.gz 19309 BLAKE2B 0f5997c581f6f31eb82ed552c396c4c64f1f281724888a1b04e70f7339e155742980886a1c0a58f52e2b1a5f2aa2915332eabb06b4f7f93206c66d5d028d6766 SHA512 0d778b86edffe095c8a320b52b4e9f482937e75ef17d0dcb5b3bd6cba8acc8e0fe26c893fa2b48bb5482ae13d4901d26273a796bc77152839eb5b14165b7d617
-EBUILD Term-ProgressBar-2.210.0.ebuild 688 BLAKE2B dd818ce45a1dd1136a6ca290b6275da073a65d1b117367c6c1d1291ef980792cedb61a11c7275f39718525854ba98422b7545da59b353d1377f480e93d09bb0d SHA512 964502c7875da2a3269ba908fcf99ab9209997944a0aabd925a573b8b5220fe25fdf8bad02eed5e681a8e9d1ecb44cafb96b54073d60de2734407d2e3cf5c434
+EBUILD Term-ProgressBar-2.210.0.ebuild 687 BLAKE2B f7649f05dbb03f6ad7293f59d80fdd12e5c8c967b2d6f3d34ee3b2e6869ce1c1a2b1465762eaffdd51f9e2a4f429f328a1744a05aa9380b8256d26f2a4006f2f SHA512 b04414be9026165a884aec1beea98f7e964d6f4f4e77565d6cbf158a51b6c424f8566dba8c8b8e1a38ebd13e5ec2fcb81685c8995b5ba61b8562b84ea6b78a6a
 MISC metadata.xml 472 BLAKE2B fe115f4604d77dd953364fc902003c38e05bb23c61308b8a23a7c4a8ea63d99de01c81ad8ae617cf59ce2fa02f7064263f632d5d475f7b9725bb21da87239480 SHA512 5bd7a7b5bd2fbd3e59ec03f1b22416a5eb6fa4f1cf9c23db503c5226604d31d241ded2764fd91216d082b3c3386a618de4d0413844728f622bc0f75132852e4b
diff --git a/dev-perl/Term-ProgressBar/Term-ProgressBar-2.210.0.ebuild b/dev-perl/Term-ProgressBar/Term-ProgressBar-2.210.0.ebuild
index 8430eaba6b2e..379f7f4d13ab 100644
--- a/dev-perl/Term-ProgressBar/Term-ProgressBar-2.210.0.ebuild
+++ b/dev-perl/Term-ProgressBar/Term-ProgressBar-2.210.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Provide a progress meter on a standard terminal"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Term-ReadLine-Gnu/Manifest b/dev-perl/Term-ReadLine-Gnu/Manifest
index be97a35c6738..97814a4e8460 100644
--- a/dev-perl/Term-ReadLine-Gnu/Manifest
+++ b/dev-perl/Term-ReadLine-Gnu/Manifest
@@ -1,5 +1,5 @@
 DIST Term-ReadLine-Gnu-1.36.tar.gz 128336 BLAKE2B 03791d1e486bec605c65b88a4549a023b2ca51c8fa96f36dd05d573516a7c776e6a827446a2b0d3907120262cec3dbbba4a770a3e0bd5e3ee27091ae70fb4778 SHA512 be576c45808744b9e6ae703ba170fc19f8cc4a63e6c8d74486159ff44c6763815bded11c7a414a491553e82041da2e4c5f197785e91a461118b4efa7fde240e9
 DIST Term-ReadLine-Gnu-1.42.tar.gz 197745 BLAKE2B 9b824310d81257f097ea9fd7848bf1f49cacb1e5d903d953771704a0ea5882da6a0fd0a293046345b8dd64ccc3d132cbd1db572912e593015b9e2d9f2f740115 SHA512 8f62cb14432f9364b1a3cea708d3d648bc7df2bb7fed2b3ec7af389fa183bfbe1bec3020b184b19a267217d47a3547f52a20d75f17c13ba89684759084f24471
 EBUILD Term-ReadLine-Gnu-1.360.0-r1.ebuild 467 BLAKE2B 371245e5e6139e641ddfa37ec446e0785b6e8e5895ffa41713d0e7bcfd28d7631387d305cb3031e1ffe1fb8e96ff9cbd66e6971f868746a8c40d0da243496862 SHA512 7b37ac9fcf5a4e9d4728adf7bd4b0c3f232170ed0898247035bbde0367d3252d2a8bceb2e9424187b4e6d92ab8ada43262c5c2ad9a44f63106d8ba8bc1bcc6fe
-EBUILD Term-ReadLine-Gnu-1.420.0-r1.ebuild 782 BLAKE2B 5a3092bb202b00a00552999a0f095a3643736dd402b017a994c784cd4773e4bbd7ae829d39b98559e918ac915bff144cde74fe25305f513d4e68ea7967ef800c SHA512 4dc3580a1929210cfb03fd0ecb573f6cdb087b5ad3f8f60113d3d18e23afb49bb62d230a8eca6e649a09392c1e94b60c59b6b98cfce905b0afaea0d39c67daed
+EBUILD Term-ReadLine-Gnu-1.420.0-r1.ebuild 779 BLAKE2B 1bfdc5016b28ae3b03c23d5569b9e3c67befab12bd4a12a610e569ba8da5bbc6b1599b674522a30e6a159199ced865f5f347d9e6db1b01958fdcd59d7b220294 SHA512 f0cb359815f87bb6254154d7d2e96e01a774f2bad659e8cb4662611fe0edfdb6abd27a6561e04eae2be1885c4debd124a3b61bd9d50aa05b162781b1f2abd4e7
 MISC metadata.xml 618 BLAKE2B 1869201a091b8ca507f4c5f14172bec36d6a1afce36a8fb2c40fbfcefb22e5b30dabd389b7197876f4ac4f4149e360e7a2ff6d338ff462f7f23dac3bed617cb5 SHA512 e55aac406591e036f205537227ab63093284c062fbb7b2f82904dbdc592a4329bdbd98ff0de17bb1c3e2a18593246acd8bfc55a9480396a46e2d1335bb9445dc
diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
index ba9d55f636fb..5bf3cacbc7ec 100644
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the GNU Readline/History Library"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Term-Table/Manifest b/dev-perl/Term-Table/Manifest
index ea410807d85c..714600c88acb 100644
--- a/dev-perl/Term-Table/Manifest
+++ b/dev-perl/Term-Table/Manifest
@@ -1,5 +1,5 @@
 DIST Term-Table-0.008.tar.gz 24084 BLAKE2B 96c188b2b5ba76815631ee14348baa48c89a71d14c49f473e5d47f174ec9d3bb2ebf76704bd3d97c4ddf37de121b8872653756c0c64c9e3fec48bab5db7f0ebf SHA512 d741313933c8925ca3451056d05172c440ab4a46f5a4cbaeae3c6d4b82d29314e69643e8c3e60dced42768f2102277461b2d2dc4bf945d982df9265f49339d06
 DIST Term-Table-0.015.tar.gz 28737 BLAKE2B 4cdbb839467989d15e3ee3033efc7eb7081999d24ef7df05dcfce4fe18b03fab644af30cc5b6a28e5a4e8895a95a00f10b547ba98c4570da57ab9531ea04697c SHA512 2f5cbc28d0d0f76a6269892055871c103a65d9fd9836d3a0b7c7320cf1439d27cba596453f1d94bd324bd4d4dffdd0eb672801aa23f9a8609310a28eca15dd87
-EBUILD Term-Table-0.15.0.ebuild 944 BLAKE2B 9c79bce80f02cad5f52b83d9f1dc142e805115072d55f0e9487294fcd19a1c744f065ab7cd379c570ba69c3bf5518e7e6aa25f386f084d10b5c3269afc208e1a SHA512 b702906e2c3d6c46e1522e24f4b161cef6688119fe6ae146acfa7befc8ea9d81f130f827041ec0acd62929197aac08abc41c11ceb30dae81b0324b27516a4283
+EBUILD Term-Table-0.15.0.ebuild 943 BLAKE2B fce14094fb003852bb6228538288f2e1aa57cd77dcda927cb8f8233f80e1d878ba34dab7ee06f9f8688dadc10a96d143a4e5997b02125c9763d4d18f85d69e17 SHA512 5a175a62ac2717968808bd085acd130797d6ac257bda16bb975219ecfb10dcd1b372c16f04b7bddb5935f2b6dd79540c0b414c76b925f8595e960a5f08d1cc29
 EBUILD Term-Table-0.8.0.ebuild 941 BLAKE2B 7b2f30c9323d04a37bf0343dd063f16cf2a8a95559979b86015cc942bd1adf08354a305142e276b7f55ccc493cd209b4978166953e2043ba16e5b43834847e79 SHA512 6caa63708160fb01cdfffdebb4511a8ccf62b0aafafd2c0f6b408ba521c60d54905eb982d8a8b26a6a7933678ea98cc8197b568f4e085724dc2a0674203c7157
 MISC metadata.xml 792 BLAKE2B 410a60a67ce675c88998dc5f40d4afda2a44d2e7481265b6c65a13e64f9a2c32dbb580f65642b0f476ee411840e9d79f86872bb734f5848a01c070f28b9a7f5d SHA512 0f55103bb7dfb35ba7913152c3307fc145539ae184e16a72628737caf670da2a3ab85bcf4a9c9d601d09115c6414ab392bcdf5a9a9b5a043366721f0d6e4191e
diff --git a/dev-perl/Term-Table/Term-Table-0.15.0.ebuild b/dev-perl/Term-Table/Term-Table-0.15.0.ebuild
index 0e1dcfa3722c..7aa1b1aaa214 100644
--- a/dev-perl/Term-Table/Term-Table-0.15.0.ebuild
+++ b/dev-perl/Term-Table/Term-Table-0.15.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module optfeature
 
 DESCRIPTION="Format a header and rows into a table"
 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/Test-DiagINC/Manifest b/dev-perl/Test-DiagINC/Manifest
index 4ac09c031e24..ad1956a29c14 100644
--- a/dev-perl/Test-DiagINC/Manifest
+++ b/dev-perl/Test-DiagINC/Manifest
@@ -1,3 +1,3 @@
 DIST Test-DiagINC-0.008.tar.gz 20088 BLAKE2B 5de71f6711142345a50db9fe445a616912bbdb2ae5ee3acc6f915891cc345fd7bbf80cf294fd1e11f2637a14b9f305b88364b6fedb1e7b83070a2f1c580aa1b8 SHA512 97bb47c931d71257e97ca56a0ce0aaf131f9903c0c139c596e8a1df669801f0269105e2d549cc656d70c797dcf255e5216e55aca94c663960531a09063ab3a61
-EBUILD Test-DiagINC-0.8.0.ebuild 416 BLAKE2B 95acca2bec5a646128fc2fce8fd8c1f55af86fbc75523d36682e98bcb7d89898d93685cc3ed3481cd1dca5b7c2dae0e80979e70c9aed58e644128077c99895e8 SHA512 1d2f084fde9ddb7abcbd9d53161decb028a51217063fc6f5589888ac3f8a6881568f09b2d3f0a2b437426701c7a388c51f16efe331fc78c9d1c3feb8a5ba113b
+EBUILD Test-DiagINC-0.8.0.ebuild 415 BLAKE2B 80ee36a16cd706931a313f176044a666e1e9ca9cdce841a966864eb4b9033d7618e6943919afa9e2b3c7a0c9809b2689cf01a341e943cc6cbf0eb71e6f1a52a6 SHA512 2d0036d0c9adf946739c744b9040825a2263cf0b00e54c565ef2002a96d6116b9e15eedefffd9893cfe128c0aadbc401c111bafdb56bc0e12688171afcd7a233
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/Test-DiagINC/Test-DiagINC-0.8.0.ebuild b/dev-perl/Test-DiagINC/Test-DiagINC-0.8.0.ebuild
index e00332dd17f6..b60d0bed964b 100644
--- a/dev-perl/Test-DiagINC/Test-DiagINC-0.8.0.ebuild
+++ b/dev-perl/Test-DiagINC/Test-DiagINC-0.8.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="List modules and versions loaded if tests fail"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/Test-Kit/Manifest b/dev-perl/Test-Kit/Manifest
index 94f31aaaa7ed..798010d79885 100644
--- a/dev-perl/Test-Kit/Manifest
+++ b/dev-perl/Test-Kit/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Kit-2.15.tar.gz 18087 BLAKE2B d3175b5d9be51feb128ab57321d800caac9ccdba7ad7b5d7457552514143979c936e2cb9f7025ac75d1b01a2f80e34016c1d7fdb3f47d5781b002651e2c2c0d0 SHA512 ef798307e44c214f3b312b1bde3b48a39948c72c683a17b0e0ab7b097cbc991408a6382d06a94bbfa8cd0e6d92a4ba5339245463c249660f987dd8a5aef4691e
-EBUILD Test-Kit-2.150.0.ebuild 783 BLAKE2B 5ce70975ac9dabc809998eb0c72fccbd9f15d77b04fe6af64dfba3a2d00fd6025b9bf43ba179a6a29ea479c57b63be91f4fcec39ba1e1ed31c9f2815ae1224f4 SHA512 e753747dd384a2f97abc66ef6d1e2e1fb94fe2389cf5aa9661f24317ce7a0745aff6319c25275b6ad54b81143a290d1ec9118bc03c4961741cccf7ed8effe532
+EBUILD Test-Kit-2.150.0.ebuild 786 BLAKE2B 83d1318f203a96be9e6c61a3db2221ac09eefb416efabe29493d85365156c815f8e5ec54b472991fc494c0ab30222cd0c7eb0101d6754fd021048a0086261e04 SHA512 eec9049e2631e048dda0e442c19a1ff21db947fc9cd5e120e2e9410f13660e98b15fd10ff6b2569ecb2806fa4092e89b48d2b5dbb5800ecc74bb9cbda4d615b9
 MISC metadata.xml 388 BLAKE2B 82afa5e0509c2bd5b72126264365bcd57aa9a52e70749500ee54f43744b9970739ccf73802ae1813b2e3ac3853a15d4981360a0ae51f921d649b4788c989b04d SHA512 df0e66972a9ac18aa6bf07996bfa41a81e9627e40b1a8a7b0c611a75e9c52ac0757d2cbc35d085d046de48db3d515c0e9eb6c647695bc8d1a8d6398aa3f11693
diff --git a/dev-perl/Test-Kit/Test-Kit-2.150.0.ebuild b/dev-perl/Test-Kit/Test-Kit-2.150.0.ebuild
index eeeb0e1c91b7..f01ea42c7965 100644
--- a/dev-perl/Test-Kit/Test-Kit-2.150.0.ebuild
+++ b/dev-perl/Test-Kit/Test-Kit-2.150.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Build custom test packages with only the features you want"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~riscv x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="
diff --git a/dev-perl/Test-Memory-Cycle/Manifest b/dev-perl/Test-Memory-Cycle/Manifest
index 9907ce74e2af..7ed7243b065b 100644
--- a/dev-perl/Test-Memory-Cycle/Manifest
+++ b/dev-perl/Test-Memory-Cycle/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Memory-Cycle-1.06.tar.gz 8928 BLAKE2B ff221bd6ab6b576ec3f534c3dd3a6a6add53840c9985c67a25c690e24b258406101c8f04e7a30e86a0262a214b61b82d11c72ecb10723580ae6e2d41d9626c4e SHA512 d25ffd0439e47e0b57f136489ae200ca24c8434a19473d23f70d0f8a2c8d18a93fe453e9b1b844b5edbd9c788bfe3c83f5413441389dd9b53c780f734afeb804
-EBUILD Test-Memory-Cycle-1.60.0.ebuild 709 BLAKE2B aba10cbcce7a66e3f93d2c3f55a39d949bd3177c814c2fcc01fd1377977d9c589fceb58a874b18d75d50c138e6630e1fcf0f32aff5a8809e3286a1519ce403ce SHA512 cae85b6d24e500dd6bbfc45461a634ddbb40f4f182dd48a4dbd40f7350b85e6f28c48668d286b6138d82c624e8ff8e42651c940779568042ea59a147f9bb5f62
+EBUILD Test-Memory-Cycle-1.60.0.ebuild 708 BLAKE2B f4c9d615506ce04b144fe7cb37299427276b3cf8509287fa1e7599cb5ccf730747312583081f01d30dfc8b287944775263ddcbf0e61fc1e3d0a0190ee7284317 SHA512 f59b80978c5c08f295cdedcd14fea067854b771c9db149f9159622a3c1e8f194878e67f65086f017adc430b03b294290f2698378acd4b9b4a9dec2a3c50b1653
 MISC metadata.xml 407 BLAKE2B 68fbbfb3550eaf710c582d4336b946eafda44967aebab3caaa4cb6a853931e504fe65810c3c9adba8d92c4d37613046cb519881f4f4d1be22cac5fbfc3ef0a1d SHA512 7dba9988701b3b65260db1dbdfb4045cd2395a01cbd24d970555801761d82683911cd833a471e956ebaf0b9bbf9928451e1da063638581cf9d8b8125b0a1bc4c
diff --git a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild
index 1afc5b0563e8..618030a63257 100644
--- a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild
+++ b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check for memory leaks and circular memory references"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Test-Needs/Manifest b/dev-perl/Test-Needs/Manifest
index 2e45ea244e14..8aa5708f377c 100644
--- a/dev-perl/Test-Needs/Manifest
+++ b/dev-perl/Test-Needs/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Needs-0.002005.tar.gz 8505 BLAKE2B 783130e726a469e850541d1569ffff614ab38defb2a41df564f41a573e641986b9825963c22b8e7979db4fabc6f547adfe95741f83546afb46bce6e5249c2fc8 SHA512 b3023067d1f8726b0ae2162d0b3722193a3b56d12d5c207cf9558f1552ae8ab554773b843d00f1c481857c259fa869b8fdaf5a4838ab0768f38726ddec4130c6
 DIST Test-Needs-0.002009.tar.gz 17052 BLAKE2B e8c51a23b1febe592ee25b0c83741695d07777adfbc2f0e4fa58a81284d0da5d7601b312cc7b33ead19680b728ba481efceb8b4fe042823212f4523f1028a009 SHA512 758f22ca9b024f7d3252ff575ae84453e64f4ef4e18d3233cdaa3b81d9212cf48e41fde529047e7355678d5e53345bd51210a45dd9545c3bf8ffe16f96a9500d
 EBUILD Test-Needs-0.2.5.ebuild 592 BLAKE2B fd6fb90ad4ae03c70ed82c056f7c6b14fbdffe15a588b94503230fcb4918a27de3a17b9f544f9d9baff2f0a9c2ccbbfc872e3ddec7d381fcd87c40d9f6a1c126 SHA512 eb9b2ad5cc8f1a45eb0c1adde92dec1c215b833ec8ffc7c83cc8c29ead8aef925a4c441d52d460798c44f1a721581e1764b6c10a5fa26a1441b05cf07b455f67
-EBUILD Test-Needs-0.2.9.ebuild 513 BLAKE2B 35d2d43c9049edf12826f4e36e21d172c851c5c3d257d4d722cbb346d1f7979db6f34a19cd0a5edf123740ef96137fc8bc5008be9e15b51b86985f677250e8a2 SHA512 1924f0e4611a43849c9959e3351945a5811363ad26ba2d6f29854ecf7301bd4827bfdfbadd6338df42a8f3cd7df1d2613a1294829170fa7cb97853f55a7412d7
+EBUILD Test-Needs-0.2.9.ebuild 508 BLAKE2B db19547f7d414b5bfd97676e7400c23ee2a9513735a1284b863e04eefe9d4d909c7f9bf193fff745e6932638ce3cda9b382af489b9f8a6b3bb596f28a6efde56 SHA512 7e52c3b345591cd88a21ea2d416bbc5113799fb312c2a42d60b344c45033814189afe607d22f8d01dde3c33342dc68963037966c41f36e83f45eaf254dd92882
 MISC metadata.xml 392 BLAKE2B ad442022b213e365a4894d39b8b49e9487e426e09f8ff1614bc17d8231932aa12077cf523305394836a36ffb0f1b1546f14e1c3d1084b8f3a2f1644a97f7dee2 SHA512 e958e6bb79542efe25d44fc5f87610d15342fc397e3be4829d137a6e6fbcbab06c558dc4034ba4de6c7a96b4f10137a57906a0278ecdcd782f60faaa6e3b4fd7
diff --git a/dev-perl/Test-Needs/Test-Needs-0.2.9.ebuild b/dev-perl/Test-Needs/Test-Needs-0.2.9.ebuild
index 324c7281e116..e7be16ca520d 100644
--- a/dev-perl/Test-Needs/Test-Needs-0.2.9.ebuild
+++ b/dev-perl/Test-Needs/Test-Needs-0.2.9.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Skip tests when modules not available"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Test2-Suite/Manifest b/dev-perl/Test2-Suite/Manifest
index 557547559afb..95f8a3226edb 100644
--- a/dev-perl/Test2-Suite/Manifest
+++ b/dev-perl/Test2-Suite/Manifest
@@ -1,5 +1,5 @@
 DIST Test2-Suite-0.000077.tar.gz 144835 BLAKE2B 5a3db61f48f479f8bd00639a538fada5a917ea054abb8dc22b92b5fb2a73ad2da33776f264b1fe7ec53f1a3786af286bdaada7d611772e56a9f883d91139507e SHA512 e9337fee244f572c5b0af54c78a1be47bf590caf905ef6a40928c6e914a183d3fbc5fa3312a0903f697ef5e44341c5425873ade50aeabb63de3f795902bb0f71
 DIST Test2-Suite-0.000140.tar.gz 227561 BLAKE2B 05d3467b65e0669a5cdef590baa21fecf24af0042cb24f70d380a08fc832963674a11abe3f965273592b1b8789066c77b9b561c8c23f0f5403e20ddf5f5f7e9d SHA512 26abec9f0aad7d29f6499d27a107bee915c57632b53147f602f5e3732536aabf6c6f903da989a7ebb7113e5c5c0d22a393ed9dc0438d284c09035b76dee91a91
-EBUILD Test2-Suite-0.0.140.ebuild 861 BLAKE2B b95de06d36a691fd0f72ac7952079cdef0c3eebe494fb3adfdf46dc5b5dff2d83313ff1f495ab227d9b8a05db32e4f2fe2ae0ab9f35c76e5f4661585dc62f6bc SHA512 17989b5b2de4d45059fd3f6ee73276640b58369df1907aa41fae49499b4ed4cec040cd7c805881664dcc2adafb6cdc319c7c01b668da986a3fac740d4312052f
+EBUILD Test2-Suite-0.0.140.ebuild 860 BLAKE2B aca6ac0093627e0944aa1405709f33512fee61e80c94eb6bdd2ba76a4cdb2aeef42b82049c7bd5a7d166128b3ed24bfec721722a711e63615c777cdccd4cb50a SHA512 1f2ac8b738d66cf5bfce30351bf5e306bb294d6e1ea9ecd9e2337aca2ebc2af256522a2c91e4019fac39b428cf9be911e42ad2fb76fe47272e310d67eeef1254
 EBUILD Test2-Suite-0.0.77.ebuild 722 BLAKE2B 6ecc3353b8d36fea7858c67af56ea835301d97f9dabaa81ed05252cf86ac5643f3f7370086225beea8983d032575b48c2e4cccddc86d369d5432915b60d73ea1 SHA512 d66fff90895f5b2eb2332ce675f040e5ac7949ab563bd12c02357a3127c4929a080742c4c6c569504e0684c9cc8326fbca6efb2c1e9e86389706bccd20acd9e4
 MISC metadata.xml 5303 BLAKE2B 7bdfd9b31a45fedd69595fc5da50f93d52865d600c2bf7f480d507f7fece8ebadd02114cd6b000388e2bee479bcd0c243d1a176bb6bf6c911d2499737da9134f SHA512 acc269672170b9427444854bd73769c31e45a5e87ccac7441024b8db93dd1a02b09a9700b6c38f15379981cd34c490a6937cf780c544a245239ac7c1c323de16
diff --git a/dev-perl/Test2-Suite/Test2-Suite-0.0.140.ebuild b/dev-perl/Test2-Suite/Test2-Suite-0.0.140.ebuild
index 7755176082b0..0fba9254d5d0 100644
--- a/dev-perl/Test2-Suite/Test2-Suite-0.0.140.ebuild
+++ b/dev-perl/Test2-Suite/Test2-Suite-0.0.140.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="A rich set of tools built upon the Test2 framework"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Tk-CursorControl/Manifest b/dev-perl/Tk-CursorControl/Manifest
index 8d80ccddf9a1..f3ec888c326c 100644
--- a/dev-perl/Tk-CursorControl/Manifest
+++ b/dev-perl/Tk-CursorControl/Manifest
@@ -1,5 +1,5 @@
 AUX 0.4-demo.patch 397 BLAKE2B 485f3e167d8a8161151ab123149f14b7d13a40a192db8143e4040f68e7ec35db2419edd810cae4e71b7a18b38f8575fba69dd39ad0382b6b39df4c03f3b0aa21 SHA512 da2fb2d67e91476ccbc9fe1807bf85f5bf0aeecb35f363e3067a4b4bf33c559cccebfc05cf862095637217b9034935b8c103a08fab3f51d77128887cfe897f9b
 DIST Tk-CursorControl-0.4.tar.gz 12847 BLAKE2B 819cc96d1a2e3665cf83622959639cc78e9f4c497a87c79608addbbb3c500a9f44a3d632aecfd566c13ee7350fb66f9a22b4339e139c875fe3eb102467353e35 SHA512 9e4f052173211360f9239759259576c4928d8ffff3476005680ef1b0e90056465fe2a20ea4c6f3b949588c4162c2a4a03cf36ef6aef4bbe9ea5a6461248ced5b
 EBUILD Tk-CursorControl-0.400.0-r1.ebuild 479 BLAKE2B c9aeb4d1ec688fb149545e03493f757c94a12bff0f43e778dd05b4a177853f6e8687eb6d50fd3f26c164ae36db1889a2c701eae7a67a7440985c48137a772271 SHA512 1759f934fbd57c908ae336da47e6e4ac879671bc30b6a9ae1d899620b0d2817c64724cab2ef62020e20866d58d849ca049f42bb2be4b3bd47bc99eacff0de88d
-EBUILD Tk-CursorControl-0.400.0-r3.ebuild 529 BLAKE2B 94226a798f5a8738b3a9aa89a04f62fbb648f2b1f1978fce07d4992a9ae598da5d971a6b2a349ce6ca1989bf45be0a204ea5a29b6c3c12cb51f22185be1b399e SHA512 36931e4aaebf55cfb420ab4447af24041e9f89f66b932784ce62d1799dc70a8a38531f8709a0855de4861c954a12546fa48daa92379db818b80bdd50dca0376a
+EBUILD Tk-CursorControl-0.400.0-r3.ebuild 528 BLAKE2B 8a3ae2bae1aad08bfe1f5d7e93e15b03fd2f8d75033887f86edba5dc6019026a813c756dd758eb089e234f069bd51b3c45649f68c885a08a652d87158e6af1a1 SHA512 cb38d21fe79bd96cc37b51c18bf2f25292c8529610655881aa355932befc8ce6aed443d7922fc3e5df365c6395fbd153c334d1a16f35f2e97cb962fbfc8fa858
 MISC metadata.xml 404 BLAKE2B cb9bd81588e661f7082515627a058d7a571eac8cfbf6c4c78d846a59325c59cb2359dc4fe89b7a7db25eecd3ecd4bd2e1f2b4dc40efd3562bae54c56d79b7bf4 SHA512 75c185ea0c9570372a845bc3c46fe2675a33defc87d908db3a554aa7a603666c314bb7b6c83d593ef79e4544b8b50da73b86ec1d25ac3e24d241f08f9d26a56f
diff --git a/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r3.ebuild b/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r3.ebuild
index c6219c141179..bc9b56b19758 100644
--- a/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r3.ebuild
+++ b/dev-perl/Tk-CursorControl/Tk-CursorControl-0.400.0-r3.ebuild
@@ -11,7 +11,7 @@ inherit edos2unix perl-module virtualx
 DESCRIPTION="Manipulate the mouse cursor programmatically"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 sparc ~x86"
+KEYWORDS="amd64 ~ia64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-perl/Tk"
diff --git a/dev-perl/Tk-TableMatrix/Manifest b/dev-perl/Tk-TableMatrix/Manifest
index c4c87d087e92..62ec99591db6 100644
--- a/dev-perl/Tk-TableMatrix/Manifest
+++ b/dev-perl/Tk-TableMatrix/Manifest
@@ -1,6 +1,6 @@
 AUX Tk-TableMatrix-1.23-makemaker.patch 959 BLAKE2B f5d8eaf4abc648868baf553b880d78ec9ffa2306c5780ad43739812f975f598a93e0e8d6513d42e6c76680eaca302ce4f79c871a11cffb13df94cc0cdbb7f77c SHA512 807ad91a5147266674c941bd33dac5a44db2df20b34aaf66df5920700bd9c5a72a8d93347f81e4bb5e3b49a9de2cde4241f4583fc8cb0168b43a34f1fd8b9203
 AUX pTk-1.22.patch 558 BLAKE2B c62d921287899aa542a618168f26ff37f1bdf92373c8d72dd98cc52aed15a8d2741968487fab7d4091817517fb01dc541018c0129d7b781e82c8afea0bd30da7 SHA512 c709c5f6baf326389a794764a4b223c0fc154f0f6157e4696ba2e7af6cc029f1e977558be7a16bcdcd40a3e31cfc30bdd23e319ccd5cb33b227a84a55ab82631
 DIST Tk-TableMatrix-1.23.tar.gz 318954 BLAKE2B 9e6380cf0949aaf15861ad9a9209d7fb2cd69c3e1983f26b364aeaaa28143b00a063fc842da48c7d18ba1f9c69a60973519de07fdf91e39532b2347ddbcdd4fb SHA512 115eb2a71c3725392f2bcf5e468bc84844c8a5ad3db221205876d7de6486833a3fd4e98aa32e21f5dcf038a38f9d98721adeebb1f9cd0990359aec7d07f6f32e
-EBUILD Tk-TableMatrix-1.230.0-r1.ebuild 595 BLAKE2B bf88f9b81acacfddba5805bd4d1e28d8a82855130acb05505e62dc3e986af59b03cb09eeaaed75bb0d5166b59ede9341891160098afb3efa064c4c4c28a148f5 SHA512 a00066d79f454ff984f9fcf8306652a9a84beb8575693b89f8e30a17c406b4640aecde52c4ad3cb1b01cdad16b4240dc49ce9a0c4d663a014ba00bd9a8e49573
+EBUILD Tk-TableMatrix-1.230.0-r1.ebuild 601 BLAKE2B e7d07dcf8b47fdf8e659e055b9cef1d80ea05b8b0c8e65a01d8f04668a154a9b6a9c83833ca014a54de0919ba4a53be451effded3d7b7b2f9bd7f5fae66534a2 SHA512 5fdadbe8ddcdd948f656e89412f0aff711efb770e86959c2324a1599486add1e3eeb1f855ec772887aa966e956e07f69c95b99e1eed7de3be401892c59250110
 EBUILD Tk-TableMatrix-1.230.0-r2.ebuild 686 BLAKE2B 581ac0a5e85d4733a05cb7d6b6cae34bc945d214db909cd347834dcdba9e7680cfc937fc2ce4adf8497c8b6c36de981c99067992d6f9e673f0b49a5b14ca4874 SHA512 cb170338994051b45c6f150016ca11983e24947045c448bb7abe36d899003f999b7de6ecc34557d556ab3fbf1a60d0b86454482be7a4e47e9501ea4b62916ace
 MISC metadata.xml 558 BLAKE2B c5083c2c3ded4e3040fa2fbc2c2c0cc8c186239709ecc1d7cd700fe378a2ae0658f773fb7cff9bdd9c3f0e25756f0205526c154bc7156b270d28dd30e3f552c7 SHA512 1ef50a1d3e76c7885c300e68b39dd13d495a947a17da8ae292ba1996292de5647090cd3892c855e610c3557587f1705568562e7d216d85403556be273b05066b
diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild
index c0979c672780..84626e0b7e3e 100644
--- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild
+++ b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild
@@ -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 @@ DESCRIPTION="Perl module for Tk-TableMatrix"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc sparc x86"
 IUSE=""
 
 DEPEND="dev-perl/Tk"
diff --git a/dev-perl/Type-Tie/Manifest b/dev-perl/Type-Tie/Manifest
index c961957a6185..5a3261cb5ef1 100644
--- a/dev-perl/Type-Tie/Manifest
+++ b/dev-perl/Type-Tie/Manifest
@@ -1,3 +1,3 @@
 DIST Type-Tie-0.009.tar.gz 18579 BLAKE2B dc3d8c6b2fa753f14654dc92d8f662c1fbb242f8989b5ae6e1a32b4145bd7ebdd01fd7fcb11f81b4a966f32dd340deb4de0af72ae008fa4bdb13461c0255b0b2 SHA512 2c416cd22d1d4a7ec902470d0801d479a54f312d456982e51671ba7391d127297471f0f753df5cafef4b6e01c983cd9f8f69c99f03f571aad5c89036c642a6c6
-EBUILD Type-Tie-0.9.0.ebuild 664 BLAKE2B 1876007d9f661eab8987939067d352f7e96741601c57cfa45e697982ccff88d5c926095302ae4df30ac14ec6cb47ab591c4fe3d1dcbde3a5372d80f00180ce4d SHA512 cebc041932462bd4271698fd82160b9324d4b39c2b14b27409662c793f8c32dddaa82df0eda15b1e0b0fa3043573e8f10d082d2505eb53cd607a05ad83ed0714
+EBUILD Type-Tie-0.9.0.ebuild 662 BLAKE2B bbdfcc18033c77a1a2712c7c82d7f92ad26b3de7e73391d3f43e1a12f59d240960a9e211e1420362e3c122560054c10ca1cb359a3279d9f0b8bf4dc8b8c4e9f3 SHA512 6bffdf2e3344ae2bebe7ead5225fbfe3af1335a68e31aa3c230b345527dfb0610abd7df107841cbf5a2cfe5059a988b0d69e7a1556495c9e775a375daa5fe8fa
 MISC metadata.xml 639 BLAKE2B 68f3c1e4d5cf805c2a63c776286b4941d0c1f6f9c27fed141ba9ec3c59c23c80a9acbfebc8b6f29b8bd37336dbdedc9bd8c4c491ab860d4d131518e698796728 SHA512 fc5145e63386ca0c1e574a9bafea2521be48d0b483df1c78a61e7bb677e92455a5a9a0ab6da6d7ec5e5724e86cd6c1ee2c4d3ab4a7baa91410aba98a35bc3004
diff --git a/dev-perl/Type-Tie/Type-Tie-0.9.0.ebuild b/dev-perl/Type-Tie/Type-Tie-0.9.0.ebuild
index 546b963ca960..87687b424284 100644
--- a/dev-perl/Type-Tie/Type-Tie-0.9.0.ebuild
+++ b/dev-perl/Type-Tie/Type-Tie-0.9.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Tie a variable to a type constraint"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Type-Tiny-XS/Manifest b/dev-perl/Type-Tiny-XS/Manifest
index 7cccb4c7636b..c8af89c466a7 100644
--- a/dev-perl/Type-Tiny-XS/Manifest
+++ b/dev-perl/Type-Tiny-XS/Manifest
@@ -1,5 +1,5 @@
 DIST Type-Tiny-XS-0.012.tar.gz 77259 BLAKE2B 6443598a77bcb3d630ff048d649f46659ffd8ecffb968b597d64a245d19dafaea3217c7a63c2bedba551f6d21ff1dbb02c005461dff282955838ca1c4dc75785 SHA512 488925d913872f1f5bf73d8b165b1e04bd8f86bda44d594819120760f79c877d4b1be9f2924712ceabaead8822710bd8851f8ff5bb79f91b07fa253ce9ef7a33
 DIST Type-Tiny-XS-0.022.tar.gz 81002 BLAKE2B c2d2feb551ddb4dd4cf558732692a8026923cc0da184d19b9263bb86a948dea8a7ba521598cedb00a26989ef2bf14340f975ce57bfff09997cb16d55f4bc88ab SHA512 6774980289ceaa7aa8517681cb2d4638a0020b4eb584d6e281d22edcfff829131f2472a4982c1d044e8aa96baf71381bed78d02a096507c7bba3ca137e63dbbc
-EBUILD Type-Tiny-XS-0.12.0.ebuild 608 BLAKE2B 41331be014ca0818e7f6d51443cd9049cc8d090d8234630373e33be9cec4b46a2caec643f3cde839eb17f117c52c079f47db139c763dc6c9c81d70abd1a5bbad SHA512 9dc3b85b915b8894a0689024a893e7c41b5292448ad7619c053ed67b54e2deb86f8eac366defc970cd2a5b3b6cfd667147a9b92d11a98d64abf7b049606cce84
+EBUILD Type-Tiny-XS-0.12.0.ebuild 607 BLAKE2B 53d1b62cfee38675a5355248cc22b22e71750f6796809f7545f2b8551110f9d7aeb0659f094ac7d9b86ab3bc3d6982029c968ba22b6696e52fab1052017e332c SHA512 8f72018ba9553c532dcab77b1e21863d0ca67dde6787496e06aa09d08866ba86a00fca9f61de45c60134406563eec8a52f23de20c2dca2c558dec13bdbb8e7f4
 EBUILD Type-Tiny-XS-0.22.0.ebuild 619 BLAKE2B 221e7acb047dd8a74131b081df9f90b32024c2015024bfe0c23dbf2d77f4842a281ebad3838420aa8fa91e58210bfd3d85f641f5d83c86ee19292e7e6d6e4742 SHA512 ebaea9fffa0649bca6285c5aeb3ce89c11051b8bce57a9f9edc37849e42bc04263b6a87a2354105f6dc0e44f4c47455d579c3a20598fc05afee9a0c19c71ebde
 MISC metadata.xml 450 BLAKE2B b5851e50574255cf3e6d9c25181c511c14770acf1ac669ecf24d6bc8fde7e7926b2621f0f47d01bf2dcfc0bbef01e400725d28bae1a4200e049d7a122187b8c1 SHA512 0f3d348a16193d537d1e693556b5400a9ef9001e435b638beae8a87c4c23ec416cd1310a6fc56378dc0565a9e133a57343260bc5d445097b932868bb92510ac5
diff --git a/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.12.0.ebuild b/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.12.0.ebuild
index a0506fa675fb..834a72e61015 100644
--- a/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.12.0.ebuild
+++ b/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.12.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="provides an XS boost for some of Type::Tiny's built-in type constraints"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Type-Tiny/Manifest b/dev-perl/Type-Tiny/Manifest
index 191901496541..29d2a97d0b2e 100644
--- a/dev-perl/Type-Tiny/Manifest
+++ b/dev-perl/Type-Tiny/Manifest
@@ -1,5 +1,5 @@
 DIST Type-Tiny-1.002001.tar.gz 264950 BLAKE2B 2e5e1303834c6fb3b95855533c219a5a448e711b307532851e24fb9850fd60505ae8bf7a17d5d6630d065004f3bd8e11e7b58f9abad11048058ceb324375779d SHA512 e499c4f113e5a327294012daac9f0cd60a42a6c40b9d0c9c523a229f574a7dd0f672f209d0596d25edcbc39b79cd2ea65791b6a5146345e75fdd1d84ee1cd161
 DIST Type-Tiny-1.012003.tar.gz 464004 BLAKE2B 2fc4f2c9e4be295742309edbc074cd23e9d1a02f7a385808a40f8e7c0885a4b29cee63947b9b008d70d1e66529185ffad56bc7ff4dcf3f617b61ea454733a491 SHA512 d7bd3c416e20a5a951606d05a2fb396a4058cb6f165b401c7662af3d21f416c26ac0df70eaa6d483db3fe2d78e8fb4f02cf5cf71ebc353a744e3195e77f6ea42
 EBUILD Type-Tiny-1.12.3.ebuild 1008 BLAKE2B aebfe5c89a0bd8f8a3bf9804d734e12125f044600bfe9ce47347b94a9d0841c4d20e5c5e9b25378a10a79d1f588a363cd457a3e30de5691225f8d583c944af27 SHA512 fc6568d5bf2437fa1044f5c719369f96eafff05f3eac1e0065789e4688fbdac6d7c32481f232b72bd0c4e0e1e22aeecb405e011ab2825177f819117344feb8fa
-EBUILD Type-Tiny-1.2.1.ebuild 998 BLAKE2B c811a58e56f5487a162b2728ee3021030568d7e628e5e7a9ad4e0321af467b2ecf7ac13944f256c3700809eb117edd08b81afc42c69e7499416b0b3386c3eaae SHA512 e78fa80d855805e2ae4b24753ba9526a2f885d41344ad25bb7afe31b838cded08ef4fe4c91afed91a30fae911563b0c1d0e111bc5f758f1c9daceb523eb998af
+EBUILD Type-Tiny-1.2.1.ebuild 997 BLAKE2B 9994e13a0e3cd7b6c28a530d3c12e295c66bb7046e869afdbea01e9939f924f4dfcec94f8954c311cd7d2583c06e6dcf7130d5ef00dba8118e6facb98184e344 SHA512 a9dbcb3ce35804a62e363551852b74272e923075f028c8d81f2fcbff7df00d26ab7a301a65949fab0ad9269d5956a12fb3d0dab6eff8cd449e82a6892cd46914
 MISC metadata.xml 2672 BLAKE2B d826f6a8e063abb1929df72b1d6d6614858b0b1f8af40796bf0680f21797843bcb0fe3f7c48576126727552dd25738b94cc8f6e52f284634155678875cc4028b SHA512 882cc76f5a8dc488bb254674ecd1a0c7753dbdf7201e5d4f78029d1e1024148bec60b87eff517f36243ba83464c40e9611c9889923f7e9b87883cb05a1bbf66c
diff --git a/dev-perl/Type-Tiny/Type-Tiny-1.2.1.ebuild b/dev-perl/Type-Tiny/Type-Tiny-1.2.1.ebuild
index 188aa6d44117..1446ead53b8b 100644
--- a/dev-perl/Type-Tiny/Type-Tiny-1.2.1.ebuild
+++ b/dev-perl/Type-Tiny/Type-Tiny-1.2.1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="tiny, yet Moo(se)-compatible type constraint"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Unicode-String/Manifest b/dev-perl/Unicode-String/Manifest
index b8cabd2c332c..fb110fb31a16 100644
--- a/dev-perl/Unicode-String/Manifest
+++ b/dev-perl/Unicode-String/Manifest
@@ -1,3 +1,3 @@
 DIST Unicode-String-2.10.tar.gz 121287 BLAKE2B 4d7769b74fd85e197aa1bf8a22a57f3dc519b30bb1c1d47fa1f1de6faeb47e2a0351a580a2c34c158b13a37a43d9e5b7864c2333143d335f129219efb5451857 SHA512 e1fad14dcda301d1e5199c9968efe2f33408fd56ef701d7ede40262a50d4d13a3b78ed7aab5c5319e63f551d40dd48b06dfd74e49f3e434b7b2f8d2f592f0b0e
-EBUILD Unicode-String-2.100.0.ebuild 412 BLAKE2B 37ea4d7c9ed698f66119649231030b865f19befc86f7d179619e3dc6e395de631f93132f9707d7bb7a7e7175f48db86cb72ccad877f60626031bd123247e50cc SHA512 63e43950222a907d7ab98de31e61c02fbf877ae2923cc497e8e4e122ddd7686bd336b3ce3b43c8b864f145d7dd19fb6e09abc6935ad7f0e27b7d1b22e174ad02
+EBUILD Unicode-String-2.100.0.ebuild 411 BLAKE2B 31405be7fd27f4b6ad74a29cfeccf48c903a93562f4b0d9b091212ae4f3550df343f46212851bd096a449616974e243bf3ced3dc7873c31e5058cefe0e197481 SHA512 ed955d06ea967cfe5a59a8f92450ef9859b9cd42277ee38b9dd63ab2b3a0d5a6995c2cedc7e298ec74a7e2f2cb9fe4b27df5718a2629fee01a0f636a3f194931
 MISC metadata.xml 464 BLAKE2B 22020fd1ae466d0855ae2492769090602ad5a88d2084519d46bf58f00e03e337a13738aeb0a2d934f0d9b20b1979b41711db28c5cd0fea07add1d905c905f7be SHA512 f2486ee988a2cfaa196ed080011ed24cbcaf1fb2995080417f94a137958e4ecb5811784dc6008bc51c25f55dee4aa9cf375241c4f36cabb038ad8679e6e1c4c1
diff --git a/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild b/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
index a0e700f1cdbb..88a7a7e3cf01 100644
--- a/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
+++ b/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="String manipulation for Unicode strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND=">=virtual/perl-MIME-Base64-2.11"
diff --git a/dev-perl/User-Identity/Manifest b/dev-perl/User-Identity/Manifest
index 42dd7061e17d..622f931a2642 100644
--- a/dev-perl/User-Identity/Manifest
+++ b/dev-perl/User-Identity/Manifest
@@ -1,5 +1,5 @@
 DIST User-Identity-0.99.tar.gz 28657 BLAKE2B 7374c2ae8be5d81c52bf57d94adbc881c2b07f5d8b11c7dd86d301b95deb93f77a75714831155cfb47fdf085cb271d014203bb3ed917d683faaa7cf0acf0701f SHA512 b0706cb5aed372b384229459c5b1a9e46968cd8d58f713754cd1a65a7caad0931839bf9d1540ce7a849f94a3d37f580120940364eb29684d3a84a009fb702cbb
 DIST User-Identity-1.00.tar.gz 28871 BLAKE2B fda44088fcb156352c79a7092bd41a4c0a86fb00486a9feeda4e7f74d398ac4d3000859b0e9fe4d5b758b60047c29f4b425337896ca6343fc81268e85dc1d31e SHA512 b39315050aed9064f606d6fb167e42fb55bd411f1573215b544c9f2833c0d39f12700a4fec701317e31d614c55825f250b0b5ce7b3355fb63bc953d07d8fc744
 EBUILD User-Identity-0.990.0.ebuild 512 BLAKE2B f12119f999aba372b9252716b4c25482b51a0732a10fa274a69452d514000898448c643bbd40e815fa6ee5088a147f1dafaf9967f3f9fc6576873f15cb4c4f4d SHA512 44075eec3aa83616bd1d0a8921e73122d8352a5054a47e294b664d09efa9f138bfb8c52f47bff782448cab133ac0022600a7b49e1375e65372e2f7d71212dba3
-EBUILD User-Identity-1.0.0.ebuild 476 BLAKE2B 0f83e641591acb126145370756f9c5012049a3ea45c11b9b049d8d8b24f2e2ba49a2fb4ade7cb599a27252f0a5ea0ccdc68dd9fe6e574965cfafce07127551e7 SHA512 ec1c5cca97f8b875b0d239e6843515bc58238ac473d17528f56827b7512b4bdedcfe14c2fdaf612e03a31c0fbd1d81624356306a564d63f378e36de50939f489
+EBUILD User-Identity-1.0.0.ebuild 474 BLAKE2B 4f925ec51e798f08aac945af6cb7883d0affaf3395ad726cd4ad58440127b4ff8f9a2b1da578ef1fdcd03e8c58a774e9394e156b20d976fa86660dca2b755af4 SHA512 c318ac24c8e9cf9280771f3aff813103c088eaca53208cdabbf3b62ba22eb7f86f9d21044105b7ad04adf88e9707256519ca50e529c8ea13d3ecc72b93316297
 MISC metadata.xml 1213 BLAKE2B c39c59b289f194355ffbd9f2f9bd611f69e390a87915ce9d733c5df77b07299b71e168ddd0072f03c67d2b061d1972612d3a01b631be0653cec35317c2618da6 SHA512 2701abcdf1efb1925990b6ee9e943b6f781737469890211b09f3d865fe71891b4842412805e784c19dcb6e6917b4df651a78442b49baacd1017d7bac235a5dd2
diff --git a/dev-perl/User-Identity/User-Identity-1.0.0.ebuild b/dev-perl/User-Identity/User-Identity-1.0.0.ebuild
index efc7c17ba9be..92cb62c654ef 100644
--- a/dev-perl/User-Identity/User-Identity-1.0.0.ebuild
+++ b/dev-perl/User-Identity/User-Identity-1.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Maintains info about a physical person"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND="
 	!<dev-perl/Geography-Countries-1.400.0
diff --git a/dev-perl/XML-LibXSLT/Manifest b/dev-perl/XML-LibXSLT/Manifest
index 424a8dee77cc..0435f9c574eb 100644
--- a/dev-perl/XML-LibXSLT/Manifest
+++ b/dev-perl/XML-LibXSLT/Manifest
@@ -1,4 +1,4 @@
 AUX XML-LibXSLT-1.96-entityexpandtest.patch 791 BLAKE2B 844c61b8fc33a3374de6b2f4066fe301a2122bb2ac5f48ca61a62db4ae5e3371333656a34b73216e12d219c802a6aa5df2db4fed917a1ed02ed2c5afe07c75b7 SHA512 f11d50369bcf0159b58f4ce1c88df02464d1f9c3803b199546b2b276b2f61fa537a4d746d337f80593496bd460b44eee42bbb1cd463224eb969bdb835786187c
 DIST XML-LibXSLT-1.96.tar.gz 114068 BLAKE2B 2225e387e9e877578be51a9a6c8c3612490e79c2cec366dd2fdc64710ce67200f5ab7109742197abcdc311f9a1bf16b42a40c7e7df4d669b638de4ee49782866 SHA512 7b6e22889c538bbd861c6420cd56893d229676d3afc1cf30e17cae48a4714139769a99a48a99f1dff52864f4989e410303007c07941625bf6bd12a24276c35e6
-EBUILD XML-LibXSLT-1.960.0.ebuild 652 BLAKE2B bb3aa00e8e49961190436530a7fb39d90a58740e276601ceca469c4f74faab83b676d477e14e29f1ea57aebbd22109ae07362707555d7c9e0837f961a41d1bfd SHA512 9e962632dcffdb409bffb578c6f8e097127b97c9fcf4084295d9942ecb3489c8d79178095b151ed3355e99dee5c0c45dfabacb049db20c98d45be2c83da3bcc2
+EBUILD XML-LibXSLT-1.960.0.ebuild 651 BLAKE2B 4df8b5a2d695df6f593b6a4102948d06d9f4371256338e73102b80fdac0fc7fe8b238fe68dfffc4f0d89c88e9a3d5ecac15587f8a7218469c5856bb891ebc981 SHA512 125126229a83a6918268220bc545cf2e13293c145f9d205d9d543d1a0cf2600e0ce783fbb639d48e26b815fb9265ea2c9e1aa4749cd8c6ef9976a4c51199ee7d
 MISC metadata.xml 804 BLAKE2B 52f3c7030c5a8eaa8c59cb02db4887c509285c1c1b1d22435523a27cef5627e701983dd6b7d961a3bcaad3187ac4993e91be4fe688cb6b25a7b1d1f39627f1b0 SHA512 8baa00642249d81519d3d21ff2375ac5adbc79db18a225f4bb1f9e7145b8a98b9d258248cbcae9d50cfb5440185e06942e1551ad1d28db8bb7705525d962a6d0
diff --git a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.960.0.ebuild b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.960.0.ebuild
index 4b0b7229b323..2b51d53ae302 100644
--- a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.960.0.ebuild
+++ b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.960.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module to parse XSL Transformational sheets using gnome's libXSLT"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/XML-Parser-Lite/Manifest b/dev-perl/XML-Parser-Lite/Manifest
index 581a03cb4571..b8abc1300cf1 100644
--- a/dev-perl/XML-Parser-Lite/Manifest
+++ b/dev-perl/XML-Parser-Lite/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Parser-Lite-0.721.tar.gz 10303 BLAKE2B 80ee6b8afea85dac7bbfdd796d8e7388b99171a137d68177105a91027e263439932673528b7c163193ec7ca77278289bc28a58e303700dad40a8ec4ffefc8894 SHA512 23c0aa9363e87afc885e40bc92643c355a5e7be85a61b8f1d1e829a970538b2f0a9de6dd652387d4612528274da64e8812faa6328be2283a28675a6da09c707f
-EBUILD XML-Parser-Lite-0.721.0.ebuild 900 BLAKE2B 6e175888bb3376d5abc10a7c88a2bc237bdc04ff5f2b4f31c6d981dbd2b52cb65babee55f386b84fa6bf18d6a6d21fb21a9e4724dd979e8a66bd7bc155dc9844 SHA512 1b9945a1e6a50dd1fc9dc69148c10773584cfa54a8c3efacbb7f830e174fe1359c8e0081a049134dc89e476b5e89f06db3fdd5fe1ee6c1f28c6ac65037f7da7a
+EBUILD XML-Parser-Lite-0.721.0.ebuild 899 BLAKE2B da11b8f49e730748d54263d6d0e93eee2553cb46cd3c664e3d7fd5b6d9dedd90244fa6612f6e568d3c2f3b132198af1bbb282496c482435016fb1f70ea3c34c8 SHA512 066041eead28f73fe442502753bc62f373b73c7892f20144b3398be9884dc29c9c873bdf8897f9fe245b106816923bade7a554252c073d12b5e535fb16a85ff1
 MISC metadata.xml 391 BLAKE2B e13dcbbd8367f121074f7f7b2bf6fba1dc3bda4d0efe06c8fd58196a2cd826f996d31c343a2cd5fdc318444c63c7a2684daaa55c4561c949e6ae38377f055386 SHA512 e5e6d6e1af6047f9b00216cfe035bd7145d7b14bdc11154b9267ad90298a67056272870e68dd572da92bb67015c9b035bf63647b56e880f7bd30f51cfb4be1bc
diff --git a/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild b/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild
index a17dc48cca13..61d63e5b7209 100644
--- a/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild
+++ b/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild
@@ -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 @@ inherit perl-module
 DESCRIPTION="Lightweight regexp-based XML parser"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XML-Parser/Manifest b/dev-perl/XML-Parser/Manifest
index cc945006799d..ad8e17c91935 100644
--- a/dev-perl/XML-Parser/Manifest
+++ b/dev-perl/XML-Parser/Manifest
@@ -1,5 +1,5 @@
 DIST XML-Parser-2.44.tar.gz 237377 BLAKE2B 3d45053b98ef6944122fc4e61a8dd9bf25b3313d635c043ac065387befe2222b52c9963d1f9c5bceb45d7e288f13a6a83a39ccbed8ab2806867d379565199ecf SHA512 4790d20d89478880b18255679727e5b2fb2860bb4de67d5032c805fd44c9f90697a240a612aba51255325192253aa578b346d658b29f631a4e92ad96e7d65b61
 DIST XML-Parser-2.46.tar.gz 254763 BLAKE2B a815c8f517adb609a1690e6127660eb339649eacffb21d77664b4f9ea071fbaeb432f50bc6469cb36a6b9b4b4e037f778dd2289bed6d87f497713d1d8cab9d0e SHA512 c4609495cc5ca34952f61876a690ef76d42eee6689d1bedb8036c9eab918525ec5213f1639c7178c029ee0f8765a2ca5eb0197f6e39b8be6d5dbc3f3c1d0b389
 EBUILD XML-Parser-2.440.0.ebuild 690 BLAKE2B d9c7932ed8564e95209cb8aa822415503ce7a222b3ea9536c33aa82e924fdcf6d3f6962dbfda9fbe658f283c78ad66b5c93527c5171d792a462b6bab31fba95f SHA512 a1a2d52cd8e46b8d7c2ccf75b65562cd6d0a47a290d545d31980c5a17117cb9cc8968408d30cb6c25ffba90eba0b4a05b6de2b1a395404af589b1f74eaa7e1f4
-EBUILD XML-Parser-2.460.0.ebuild 699 BLAKE2B 05797caac050b12b6e386678905e57968ac513ec026045203bd97aa8fbf2c2b60877be9bb30c6c83a3dd0f3d7553d09d7eaa7d9f9dfcdb3a1d8d61069b8bce1b SHA512 0d8e40dcf42774018b9f9fba171948c8384cd69d7501b6dad736acf936b957d7692b00768d60d310253cb929f04ac1e8fe6e057f386a2addfb4cef3f5b9fca4b
+EBUILD XML-Parser-2.460.0.ebuild 697 BLAKE2B e342df524f9b2e67bbb97d474be65e768026cbec9a7670a823bc2b1e32d073261858c254d4452920f926b8242f6bb1cc0c8b9526b8fb7fa757dd0931e6bd51c9 SHA512 a6f6db902e42648ec30941cf7beea3874c67d2d6d0e6bd27393d238c4b7e56998ecb5b069e3ae32f175bf0daa1cf9353c772a6a789925a3f2697ace8819f862a
 MISC metadata.xml 818 BLAKE2B 39f93a2618f148aaf9fb894469d74ec03f41be5c36d36e18e5db3cd98ebf9054eba84d9bd6f201e6d13dcc52b9518a40b50636e80b4e3d0410df8b53b6d018db SHA512 867640878bc02e9ba3b1c85691d7da8d64adafde700342b97886b98c2057c65d8f484c69597ad7ab53d5970117c5d5120634b83b27c6233cfed8d608ecd47d14
diff --git a/dev-perl/XML-Parser/XML-Parser-2.460.0.ebuild b/dev-perl/XML-Parser/XML-Parser-2.460.0.ebuild
index 8e6fd516c914..6d9db5ee58c1 100644
--- a/dev-perl/XML-Parser/XML-Parser-2.460.0.ebuild
+++ b/dev-perl/XML-Parser/XML-Parser-2.460.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module multilib
 DESCRIPTION="A perl module for parsing XML documents"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/XML-Stream/Manifest b/dev-perl/XML-Stream/Manifest
index ecef10b5e704..50ea5465ec01 100644
--- a/dev-perl/XML-Stream/Manifest
+++ b/dev-perl/XML-Stream/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Stream-1.24.tar.gz 80952 BLAKE2B 1cbf8e745ffae9f9b266a37f7c47172e030684d63e6b667a0f3966b6115463566e9f90b05c12b5ee0090d6008fa47836dc083343a30e3537b80ccb64694c673f SHA512 f762e09197fa7f36cee8484e30a6ce972e407d92cbe55bdf96bcc0073187aff34630c5d9dd2555a14cd297e506875dc2ff153b09001c971b020c37340886025d
-EBUILD XML-Stream-1.240.0-r1.ebuild 516 BLAKE2B 6acd091346bc64ce41ab580c3010d895cd6768fb077225e1e07ca22bf6651190d7016fac1d623c6a1dcd06e5c16d4aa51be754861f6daf259f0d30f4ef53fcd0 SHA512 1dc87af8daefd61b11f5aba4a6dd32fcad5f1fa9b744114750686fc53cd03780fd2ee3f275a42af4f167a7018e1fcba57e2598c29ed2990ee2bc52f4a49b7c36
+EBUILD XML-Stream-1.240.0-r1.ebuild 515 BLAKE2B 58813f6e5b690825f9f6118f295761c9db814844ea5f43b33d8a2221fdad8e825464c65f0a3683e183482e1db70f7adad90806fb5338b040133b1bfa39ce5582 SHA512 7b9766e5091bdc60207bd6b9e192ef94b61d787ad9f1f4a1d4a95c3175d421a95f916ced0dac9e830ba442611e13cd2369a16649a7c05274099eab81cd5d9d78
 MISC metadata.xml 1893 BLAKE2B cccb18da4926356a449ed32ea451341c98dcff9dfc1d9fdd92a08518ad81dfbd5cb4561d331bb12d93887dce95e6bdfb73afc8575cd4c73fa4410dde8394421a SHA512 e2defe9b1edff7d849662e3529723c13bd474319f93cdcd840733d6f6fd5bb58a2e418500df7f80be78a937f851a13170af2119f10809eee5289b1f689005591
diff --git a/dev-perl/XML-Stream/XML-Stream-1.240.0-r1.ebuild b/dev-perl/XML-Stream/XML-Stream-1.240.0-r1.ebuild
index 87c6d955c5ed..d66bb10e9e62 100644
--- a/dev-perl/XML-Stream/XML-Stream-1.240.0-r1.ebuild
+++ b/dev-perl/XML-Stream/XML-Stream-1.240.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ DESCRIPTION="Creates and XML Stream connection and parses return data"
 SLOT="0"
 LICENSE="LGPL-2"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="ssl"
 
diff --git a/dev-perl/XML-TreePP/Manifest b/dev-perl/XML-TreePP/Manifest
index 79a41f8dd5cb..b4e1ad53bc8f 100644
--- a/dev-perl/XML-TreePP/Manifest
+++ b/dev-perl/XML-TreePP/Manifest
@@ -1,3 +1,3 @@
 DIST XML-TreePP-0.43.tar.gz 91382 BLAKE2B 2a7d89d6d5e3bcf965b001cf8e18465b1cdfdeb94cd96c77008beb16b559fc072bd24a5c954a12965e2a03d9707c372c779ac7ca1e2938807055e64f9e7ed077 SHA512 4289a0a8100ef15f62f0e303f13094371ac6f1b54d887be1ed7e2ea31d7f1f6fc28d4234cf96458074137f756db3fe452ded170d3ee576f7eb2cfc9996cc31d1
-EBUILD XML-TreePP-0.430.0-r1.ebuild 445 BLAKE2B aff0a3a851b44c2d4983e3ce82e5e5e3d59a242061d7ca6f908ed1bcace4aecf8e57d25e61d707af0cab472806abe59f04597b6164e5c79a6bc1cbe02a520941 SHA512 ea4aa6f8e442eec99b1db427ba69fb5049d784ddc136e0993b534d00aa554128198dec8d7fbf9cdae15f6f3f3da6d6d623c7fdc6278f2beb90126976e4952d15
+EBUILD XML-TreePP-0.430.0-r1.ebuild 444 BLAKE2B 1290999d8eedd20c3021d067982d6c64ff9bba65c4bbe334c9277f64233c07f8ad02366f78aba4a5388a270f30ac0017f54f0c221708a5eefd97fbebd899826d SHA512 c58f59b2b6030c48eb501e18a59448ee9ec1dc17288d8ce290c8c5f94b1c376135924528f3096e2a06e3e507393f595734366fd8f69598c1045fbfd4edf42fe3
 MISC metadata.xml 464 BLAKE2B 08cb87d6a9682641c50be91f1d89cbc7bfb5f114f799bce0aaeff908675a7b3f2f559070597242bf9c2bc58408391be543adcb281999e8d159046312c54a743c SHA512 d5aeaa43384401788f7d1aa589615a31e6ce678a54b6bf960b7fb6740fa548cb0bfa69928ca6ff19c956920a83729409060b2c42dbb576bc7ce58fdc30134350
diff --git a/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild b/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
index 082eaed49092..f1d1d576f8c2 100644
--- a/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
+++ b/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
@@ -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 @@ inherit perl-module
 DESCRIPTION="Pure Perl implementation for parsing/writing XML documents"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/XML-Writer/Manifest b/dev-perl/XML-Writer/Manifest
index eab28a2d8e57..90a86da9a0ca 100644
--- a/dev-perl/XML-Writer/Manifest
+++ b/dev-perl/XML-Writer/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Writer-0.625.tar.gz 28930 BLAKE2B 7d09b728b910003209418da703b9cc1d2bf773033cd0ff57dfe0f0c3b1e5bca6e6d0fb326c6e4da89cfd2ff2b3bd937866a33b76ee8c085088edca5876d71b18 SHA512 30ad348e7f1423ce82dc0709e767d4ae384ad6e76f6444c8a12d97b1dc9c2b39e2c5bec43779bc35891942fa75f852cd26e8831dd6b5cfb9c72bc8512ca55923
-EBUILD XML-Writer-0.625.0.ebuild 555 BLAKE2B 3ca9016726e48820fc31ed0b5f41eedeb770d4b27cd37be6c7c458b3632cf01789f04f5ecdff0a48ab2e411dc667136a36b7532b5df2c1756e7a78cd6785fb76 SHA512 1b34c8dc8f0de9b8c1224a758c7b0d2dc330e21c6d6d95c05835ec14dd5237e0a8d64d28e60bd79fe082e3735ed9f270841ab44bd90fd7914b2bd9d03d7cb902
+EBUILD XML-Writer-0.625.0.ebuild 554 BLAKE2B 29aa6718fb260d31a189906997f8cccaee40f83510c6877d7f903ead8c1d175dad253d660b21d1ee65f12f94d6b16605466d5abd71ecf1c67721e5c38dd4d5e5 SHA512 f624970586d3e477fe5ee7f994ca3a3edc859616eaf412b59e7d99110d6403a15d4e2524288ebcda91c859263ba27e784db9e34040e1b8aba2a170550985117c
 MISC metadata.xml 602 BLAKE2B 6d94c69410c66ccbbbca607a902cb675b0f4d34db0c0b06a70f97da09643fb8fdc30623657240b6eed3c5646eb51da48b4ad9557664aabec0767af67d885d4f8 SHA512 e2b0b47029ac1e95dbe93b2c7fb48ae8629503227c1f236cafe91a9da89a55655bc4359c423410c3f1b34d5e927adec2e47c5e217b214568e278e03a702bc56f
diff --git a/dev-perl/XML-Writer/XML-Writer-0.625.0.ebuild b/dev-perl/XML-Writer/XML-Writer-0.625.0.ebuild
index cd4932c8c7dd..85e56302f5be 100644
--- a/dev-perl/XML-Writer/XML-Writer-0.625.0.ebuild
+++ b/dev-perl/XML-Writer/XML-Writer-0.625.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=5
@@ -11,7 +11,7 @@ DESCRIPTION="XML Writer Perl Module"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XXX/Manifest b/dev-perl/XXX/Manifest
index a8e59dbf173a..074279521a98 100644
--- a/dev-perl/XXX/Manifest
+++ b/dev-perl/XXX/Manifest
@@ -1,3 +1,3 @@
 DIST XXX-0.37.tar.gz 14440 BLAKE2B 1392c3fbcf2c0871845594d0ca7c48102693c186a319e684b7ccc0444fc22afcf1f05f91c83088b29c6df5419a8dc4982c020ca5496bc13b0793445d378406c4 SHA512 5f84c2b0c87152e9a60b224a7e7dea2819b9ebf77ce003e162c06c456029d5629c1401d90f258da078058c59ed0ff32dbe51abaeb6ebde3a403805e458dbabfc
-EBUILD XXX-0.370.0.ebuild 383 BLAKE2B 5aa428ecfcbc71fe6e38b488e7dad7af3103f03f8d85667f6322fe6bd3e61764a64ccd4a044e639b94ac6813e7f1a3106dd0337ebc7ead6732bece82b010eb1b SHA512 c0838948721d9eae313676196d5c4ee0bcc65679141f7bd9a335fa40242842978a92ce0e4d5168999993317b80c801f56a8702d065d2982d2a9710b9b99b74d2
+EBUILD XXX-0.370.0.ebuild 382 BLAKE2B 069d735db6918a5df9e00cc1104fb1716e604cc556f4003c4fc6f0eb38c3547b4e0aa6597d5ce1a5cdb53125a2ec3676b8c51bee744410c38363d1ece4858ccf SHA512 d3f7e0911d877da5007ac19a40c381514643c171ff6c541a00577d62f237aba0349fbf9cefa0ad047fc64b1c7113469a532541989f2dd75f9bc7ede546da9678
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/XXX/XXX-0.370.0.ebuild b/dev-perl/XXX/XXX-0.370.0.ebuild
index a2c2dfcd7282..ee6fc83a3661 100644
--- a/dev-perl/XXX/XXX-0.370.0.ebuild
+++ b/dev-perl/XXX/XXX-0.370.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="See Your Data in the Nude"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-perl/YAML-PP-0.18.0
diff --git a/dev-perl/YAML-PP/Manifest b/dev-perl/YAML-PP/Manifest
index 6bb948081aec..075a2a7e4763 100644
--- a/dev-perl/YAML-PP/Manifest
+++ b/dev-perl/YAML-PP/Manifest
@@ -1,5 +1,5 @@
 DIST YAML-PP-0.018.tar.gz 160231 BLAKE2B 65d332a2f02ed0801f927caeb0b65b0b7a43ac23ab5eac58f2f7fca02fb5e465ef36f35c0cd78cfeaed4ca2b02d6eaf2d923940bdc22cf5f16cc5cc33d371f95 SHA512 08f31f5de1f8846ba16908932cc83362047a53eef175ea3d197e49c0af0b2972ab8166dc28ccb1bf94a3da7ff00f6cf3bf2dfd164d59cbf1aa42f66f9a1db103
 DIST YAML-PP-0.027.tar.gz 191350 BLAKE2B 2978c99c0dcc1dd9ae0da73b3f16b52baceb49fd05361ef586f9b87009436abff31da547972e4171e15c4190a43fc369269ddb3d90386d452d5b0edda11129a2 SHA512 4362fa2079fe253b11242e68d7071800b49dad141255b0c6ca627f710bd8685ed0ba163c7ada3e1be1720eef4be65ff481f02517bbf899f3110355ceddd216aa
 EBUILD YAML-PP-0.18.0-r1.ebuild 842 BLAKE2B 1b2cc4b6ad6d859ef2626ea572886ac0454d326eaf41f601fdc554baa0b43d4a7241bac74f8f736ff2cfb81a35db9e65e41b775c9da235b0acdc425d05accc63 SHA512 d2dca336ac5420c8cf74eeb6cc479514a356a7c878c3b673183cfb50854cd17ee4689a3ab9daa8de688ae95b5b033a9f14368c08356facae8c7a4d0dedd9539f
-EBUILD YAML-PP-0.27.0.ebuild 851 BLAKE2B 1724754f35f998a91321cdce7688eb8686b79625516a13b53eebb1dde970ee745522654b45a717f165a9b3553993876bf820f2ef393eaf091570eb8ab5105e6d SHA512 eed00a5e8738e5cd94f8d3a3bd2cc3f70394ecd40407fadf07c152a029391bbee64627ca5c8c25153371db32ed95eca265811cdf7f3fd35141d9d3b0fbba73ad
+EBUILD YAML-PP-0.27.0.ebuild 850 BLAKE2B d2574f185e41e37015fe36a7da4f2394af891653d7f314e4404142eece527f84b7f604097300a049d75d1f708cd4e5cc7a00812f000c1e876d8422e98dd1a225 SHA512 c1f92d13b2c6ceb9725f9d659df2739d30bb241b82309b553dfd595a8ae375d3d6d4b5f5f8278ac9a9dc71e82fefd5b71afa3c778b64bb6b026edbb0ef848863
 MISC metadata.xml 501 BLAKE2B f674e0ceafae234e97ad01bd59c7a240dcda26cf3a1caf0ff5fc42bba5ccdf1b3318dacf398baeef444c49d8dbbecfdd4f2aab959c35ad53fa19c605615341f8 SHA512 10d8933733ce84fdd6836178e3dfa1fba6d96ba53e7c19b7ffff656057c83446978a59af3b0fb4fbd23da233df51b4f226501014fcaa4ad35d9e902bf1c0ef52
diff --git a/dev-perl/YAML-PP/YAML-PP-0.27.0.ebuild b/dev-perl/YAML-PP/YAML-PP-0.27.0.ebuild
index c8b380c57379..368a995b584f 100644
--- a/dev-perl/YAML-PP/YAML-PP-0.27.0.ebuild
+++ b/dev-perl/YAML-PP/YAML-PP-0.27.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="YAML 1.2 processor in perl"
 SLOT="0"
-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='test'
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/bareword-filehandles/Manifest b/dev-perl/bareword-filehandles/Manifest
index c05007f2553f..7c5c65e3a0a8 100644
--- a/dev-perl/bareword-filehandles/Manifest
+++ b/dev-perl/bareword-filehandles/Manifest
@@ -1,3 +1,3 @@
 DIST bareword-filehandles-0.007.tar.gz 73269 BLAKE2B 7c16a8b68601c09d5d8a1fc616363efccd9c1b6da64de5ad8cca1ae961ec6eaf8c8575ec650b0de2725de1ee9ff02817fc4a2882d3800cdd2b4842ce30a62001 SHA512 e7bd4e2ce32b819086050d1619806a5ffedb08732a25a8786dc70f6c8bea3cb3dab2bcced2d5f02f8248ca816dcccdaa2a20c6c943dc5667f334e9e319dbee6d
-EBUILD bareword-filehandles-0.7.0-r1.ebuild 900 BLAKE2B d9546761a33636257115c57a09276cbb8f93f6443d34b7bd7b2cf35eca795e45fae9a97d90354c12f851a1ac141301fcc007435b7de24ffb5cf72afb1138a7b9 SHA512 6227da688cc4f3b51ffbb1ccceea7bfd5070d08b5401a4fb029e3013b0fab210d794972108a3f73c29ec8eec7cde443b03312d2919f6a52452f32a9d70cf2294
+EBUILD bareword-filehandles-0.7.0-r1.ebuild 898 BLAKE2B b3228263c307cbcff4831ae83a177d02dd549a8f54145d9265f7fab86373fd45f384658ebc74e60c19d5cb16e2fa8dd8625d6a539849c1c3d7b8fbc592173cf2 SHA512 c4e676006ae1722661f949b826f7c28dcfb8bb9b4c05d4bb20d6991a2e3328d99a56caf91111769b98f1dfd3fab4b69035c07019c7e61353659899206becc88b
 MISC metadata.xml 412 BLAKE2B 4f50f77d41ef36a3ff55441a9a39275f5b49543199c268f8b538fa38450a6bc4d651094ae28fd56ca152351822f9dacc79f0f505b3be13c77f6745020ec6816c SHA512 04cc8f3c7bc3ef56bd4876632e5e19c647ead0ddf97da3270866ccae5801e19f95755f3385f7533c57c65a841eff28819e1cad780533415ca9caf0d92ae41253
diff --git a/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild b/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild
index 8296686722bf..8598985f7e16 100644
--- a/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild
+++ b/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Disables bareword filehandles"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/indirect/Manifest b/dev-perl/indirect/Manifest
index 6de4e5a067e4..09ecd00914c7 100644
--- a/dev-perl/indirect/Manifest
+++ b/dev-perl/indirect/Manifest
@@ -1,5 +1,5 @@
 DIST indirect-0.37.tar.gz 54892 BLAKE2B 28ccc890a61eb6c6ad0c164d408580f2959b4b41cdbd2231a34a136ed16b0af33f90d300b1146c68ca0cf14b2b6aa056e1e3a55e9bf1c290b3e5e737a454f668 SHA512 8d46ff62c86b23519b030474155f7d8aa4872a9a4a2bb1e3199ac506aee60343b4c572eae8fa41dc5148c115de3c80bcb7f21900ad30822dc9eb437033defe09
 DIST indirect-0.39.tar.gz 52231 BLAKE2B 8e2f9765ece6c2878e77eec2da0807b6e28c46868de213b99208bc5952443829a18083452abb806b37e4272029c16aa5db371bc757d944edb6b8f7710c06fcb2 SHA512 d3275a2cab2eeceef61756e08947d3072c0ce5cea2e8b70870c5fcbd9c63e56cf70568395002b7d02060cad3482f7f56723b1ad85fcf0a4c4ee2568b5035816c
-EBUILD indirect-0.370.0.ebuild 630 BLAKE2B ee7fea29daf9b2d69001b5a3fbfbc532ccfb8f95bb42a2415b21d1a61fe0ebb1fe2ba10a8f3b8ed76504862b8d94d2a8d1c1391e836e6e9b662a3fd39dad7357 SHA512 cbf06207efb47d3a8165a736278f0fd49ec04489d804cb95c701d91d250ff2c7effc0dc10e44e1510d82fc5fb7b771b1254afb88bc67887dd6d86e8b981e6234
+EBUILD indirect-0.370.0.ebuild 628 BLAKE2B 747a8415bcbe1e5b7b9314aa6c9adee79e07a8eac0e01cfd6ebda0bc6c1baa0fbf7a05aca25405f5c4505336e09279f25d02e3b8ac6a951046efc544f3494685 SHA512 95aaf62ba971bf93de81dad6beb4c07f7e26e938e5b40d67b5cb46885df0f458d93c497d9591302d57f52d3cc2fe1c577ff987b1036fcca0f10cdac1efb2bc22
 EBUILD indirect-0.390.0.ebuild 602 BLAKE2B efc8dcd5fa4b9b266d2e6244b31e124ec82e01ea0698033d32eb84c1c1e275f8588bbee21f69603064f834d4a44fded2db1934f7f922c7cd365886d4e8e06f5b SHA512 81137dd764f82ed44c57cdecd5f1772017b7c30d85decd8b88cb5e3348013c4b8403521e8d9514f07028471ee97c7e9567b1882ba6f52d0cc75346fd0dba955d
 MISC metadata.xml 375 BLAKE2B e64e10776f8d36ac7082e4e29a8366449422117463193cc5308f4832da92f67a43cb91925fa9aae2f287a1aaf81dfa2eda1ec5e3467e467a02af762e0757b08c SHA512 7237dd49000e3cffe04121f726aa9453e0ef709b7f43d1d4c583bcd363c0732415fa79a49ab1e7cb864e35563480a20e750782719ff1f897ab8d57e80644b33d
diff --git a/dev-perl/indirect/indirect-0.370.0.ebuild b/dev-perl/indirect/indirect-0.370.0.ebuild
index fd942153d283..f21a33d59227 100644
--- a/dev-perl/indirect/indirect-0.370.0.ebuild
+++ b/dev-perl/indirect/indirect-0.370.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lexically warn about using the indirect method call syntax"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/libwww-perl/Manifest b/dev-perl/libwww-perl/Manifest
index fbc586c5df45..ac9426df17d7 100644
--- a/dev-perl/libwww-perl/Manifest
+++ b/dev-perl/libwww-perl/Manifest
@@ -2,6 +2,6 @@ DIST libwww-perl-6.27.tar.gz 163020 BLAKE2B a0ad6068e5ef754dedd616b4a2904b2326b1
 DIST libwww-perl-6.53.tar.gz 177561 BLAKE2B 254b9c7c02baf339d9d63c00c4cca229575e161bc1dac9c3bad52f3d230f0af0f95d1510e2ef137101f941a887c5cb325dcba39a0ce052c7fa030135c1e14065 SHA512 d45bba79bf2f3d49cf6b14591a58d04f551e0f6666e6bac32ec31018091590d5efe4313781605287dab22693bafa547dc916b010aafcc677a35a7c3a1154c8ff
 DIST libwww-perl-6.55.tar.gz 177842 BLAKE2B 5952f311024357f8601e0e5583ae4cf9e18167aefc20a9901a090df7dd0b7f61266784fe3ca3a64d317cb089b0f8aa61e5fce61727ba7b43eaec555d131c98d2 SHA512 4a26bbcea343af513cc7d22761b7b9412da864bc7ff5e6d8cc6494978ceb829f001d1e221482a215e363e7f7857002120dbd12fda14b1b5778b1f437a5e338eb
 EBUILD libwww-perl-6.270.0.ebuild 1901 BLAKE2B 5ed99a37fa6b6c57faeb1900a1523d73bfb9caca49ee49a7a79def70506c508fbad373353ab5a6219b5f5bb9a2babe136f898c3720f33a8c8a0e58ce6395cee6 SHA512 31e0f15796ba09815a67b9481d002f33ecd4ce5818d44aaba592f457e21d4477ef70d0a06f518b32bdf0402b96e8efae87521f08062cddac04450370117bd1ed
-EBUILD libwww-perl-6.530.0.ebuild 2018 BLAKE2B 9be792ba07aa74ccdf843bbfacac4baa6b16ded5d7af28d54fcda14d2053552c38e3b8c7c7d91fc2d6b53612e6cb657f7a28597a2ce7142fb51cea50f854d9a5 SHA512 f1eae30d95e81c03677100c11b4692ae279d1826212d16bba09873875a5db54813c8bbc30183d5a4636b0792e4ca673cbecb29146779bf83657246782a32353e
+EBUILD libwww-perl-6.530.0.ebuild 2017 BLAKE2B 942ae8e2018b8d7ecb0a7186833ec364a3304556ee52c9e02000f053262a4c582854dccc2c07cf984f5b39cef7985c1c83edb6823df58f3b4f8076cf4c04437f SHA512 5f12103a313d5fb37c853f353f2a0ee79421482d59223a4eaa174b18753c935aaceac4630221990a0b088608676d905ad013f2487e7bbf5cdbc38b0a96793c1d
 EBUILD libwww-perl-6.550.0.ebuild 1994 BLAKE2B a31f8d278e7aa56c45b0c20325b5ab942ddfc30ad792d054350603b8ddea7cb776205a838c6a7605e40d1386b45cc76a8424668192ee5edc143f2580fbd30248 SHA512 953f8cdc9348d69925db7ab7e35657540b6de3c602c98f8270d64005a32eb697c8466f9a301aaf7198143b1d0edc3fe8db8efc93b4998b00372659408a1a82ed
 MISC metadata.xml 1921 BLAKE2B 22c228aa757f00263a1f331482e24e83acdd93186747ad53aedf289f9a1fa97642a21a43ba97f64a508f023e27dcb0a8e78d2d4ba20ec296e6851e6f7370f5f4 SHA512 77a8184ec9d8248afd05f6cfaf8d69f26f85eff2ab95180cf763f9b2334e7fbb83ffa072cc5c9cdbb99a592db860ac4f7e3b21c29104a460f5e4a2f44e3251ee
diff --git a/dev-perl/libwww-perl/libwww-perl-6.530.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.530.0.ebuild
index a41714d1ee58..db446a41ff6c 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.530.0.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.530.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A collection of Perl Modules for the WWW"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/multidimensional/Manifest b/dev-perl/multidimensional/Manifest
index 09579624f736..5b323bb6e9f9 100644
--- a/dev-perl/multidimensional/Manifest
+++ b/dev-perl/multidimensional/Manifest
@@ -1,5 +1,5 @@
 DIST multidimensional-0.013.tar.gz 67528 BLAKE2B 8167da19e5bc0f28547277580cefa871031b7dc129fc6eae521ecc4e5e5714b38b5c5b32446dc41123b6d79c93fd7399e6cd4f33d244d85e937deaa5831ffa2c SHA512 9abc93efd0060042f16c9e89c37a11a08c781ab2d095964701661a17f4adfeaf7cf3cb134db9c91a366b5ddda482716eda5d3b002fdb38fa4694d7e24dbc76f6
 DIST multidimensional-0.014.tar.gz 66968 BLAKE2B 0496081f7ea4b0c33e5805b85213fa582d58218d7e50614ae0a8660b1d28f823eeed3023f2fd10bb9055e89e38d365f4c1e9741fdaba0d6bc5fe1f67d7a8c461 SHA512 94c9dabb3023165a8dd140ef791e4aab980e3b604eae06ed0e29290aab67a9302f2cde4c8b394de0b4c55c5f78ce4510db902d615d665bf60b12ec409f341043
-EBUILD multidimensional-0.13.0.ebuild 732 BLAKE2B d9b8b0e5b67c3711aa35ce923f2c52fc2d5e8c68ff4de09441c933834b02ab389bbd6b09054e76e26dea06bbc3af5859e7cd9b57ae5c8469c658d9e4bfba84ee SHA512 cc9741664023f14d873b642c2d7e06459b3bfe84b9ec3cfce5932da79250b581972b142838d5bce95970bf3b72beec7d712729a01a859d9479cf80a5efc21e85
+EBUILD multidimensional-0.13.0.ebuild 730 BLAKE2B 29f92908055d710585a73dfd31382168862b349418e4e33f510ba03e9aed6986d6f8bd46399fec26f0c9c61e9788bd6bbd913e76f76a17641cde51956214204e SHA512 fa2f287a452c01dfa14c40bdf09cb2e431cf84a1dfc43bdbc56cf6111b73bc7df7619cbaa14e3ce1b49cbabe54008bca6589aff00f02d3ad0b6ca26da11838df
 EBUILD multidimensional-0.14.0.ebuild 661 BLAKE2B 3eec230d193b0a9e783023dccb7e2a8ae9d4f2e7c7d1afc2a3dedc3a85ba9eabaf0e58f7daba03183d63b7db188b680818431bd27d21b060d8747fe2d48687d2 SHA512 14e8cc40a55b793c3a29271d06c419a47cfc8bd542428605f3c8aa1cdb1db12558c680b8992ed9413c5875cb088bd94d4e5fdadbd835c7680eabc6a02e2f9ffa
 MISC metadata.xml 403 BLAKE2B 870297fd97515f9de1863ee0feff9176340b423acfe8033eab27041d366cbfcef1494bcc15446838693e6c8b61c6815ea62ee6f6c5c949d2d590254e2b92b5b3 SHA512 0e28ef2915fe99d06a068e221fcd34c9cb388ef1afe5f9750e88370f84bda19fe3083523bacbed95204c1cc1a2ac598e38e872c23b07069d42cc2b26998558b8
diff --git a/dev-perl/multidimensional/multidimensional-0.13.0.ebuild b/dev-perl/multidimensional/multidimensional-0.13.0.ebuild
index 26e23fe941e6..1cf0d42d0e8f 100644
--- a/dev-perl/multidimensional/multidimensional-0.13.0.ebuild
+++ b/dev-perl/multidimensional/multidimensional-0.13.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="disables multidimensional array emulation"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/perl-ldap/Manifest b/dev-perl/perl-ldap/Manifest
index ce6d8428c070..d68bf00d4c03 100644
--- a/dev-perl/perl-ldap/Manifest
+++ b/dev-perl/perl-ldap/Manifest
@@ -1,3 +1,5 @@
 DIST perl-ldap-0.65.tar.gz 311145 BLAKE2B 6fe285804a39d6b93aa77b1ece65708e8b79f86667e9ee24bbfcbe12d9f2b3065360e6ca65d2641512226645cdbe4033ba4a20cb400fa44a42245167f83ab8cc SHA512 567de41fc1e659de23b4ae7b6cec5a60df0ad8bc90062158cf83f90d3729ac27a8bacb276b732931fefbf33847fe1baec7a62393aae5978f3c55c6c602f93747
+DIST perl-ldap-0.68.tar.gz 318199 BLAKE2B 1026b50d9c1b0da54205e27b75e76ba34bd89fb173f000784b003f94a6df429ba75105fabbb381f18e2475c0d788834391bbd17fec77ceb6e6c076813e686a40 SHA512 9b6260ac997c3279585745571f7d825aac956f157aef5715f13efb118723379aa9c838fdc123e2932047b28b38ebc2261ebe82ae1ef6a1f383b775d748ff18c6
 EBUILD perl-ldap-0.650.0.ebuild 856 BLAKE2B d4704fc894b6e36178cd7468bbe08a23b9ced2e8505452fd33d3d86f2f61dc1fd7870cbcb4ad6db5d4cc9cd266383ce56a153c89bc9d514cced17bc980c37e89 SHA512 522d78702241198d8950c3162ed97f8efbe61b08c9da20742d5d36a8a329adc147945c70b66fb4a0e4f1fe7cbcef48f65f257cf64c79971db0eb7c8b617d9818
+EBUILD perl-ldap-0.680.0.ebuild 699 BLAKE2B ac5af3a4dda8bd83a757a4d516eb7f07201c4db5f4f4ff7694aff908288d45403b8d0ef80762da34c32e62f70efc586373275b3a5d99ad0ad529f22a2d2cab8d SHA512 3bfcc0ab39decf0f9be58dcb8b1ce97ec6cb238bb2152880947c658c5de82bfb28662c2f554f4c120732ccb231bc1b74b014797dee9b85597fc6961d1a3c2b09
 MISC metadata.xml 3955 BLAKE2B 0c874c37d393262d5a23b3fb20608de1aff973c72836066cfeb4f4a5ade3d6ff028752f230515f60eabbb98bc4c47d1c5125cc708f91bb57c8dbd891ea56f5da SHA512 09f652ef41ff60a52e3603984469e1e53a67c18a9f7b798f76e959586e10e1f9e4d764b466e8f974e09eb66004e419a8faa8a4db8235fa7305b0c5880476f10a
diff --git a/dev-perl/perl-ldap/perl-ldap-0.680.0.ebuild b/dev-perl/perl-ldap/perl-ldap-0.680.0.ebuild
new file mode 100644
index 000000000000..8e2f8f6e92ff
--- /dev/null
+++ b/dev-perl/perl-ldap/perl-ldap-0.680.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MARSCHAP
+DIST_VERSION=0.68
+inherit perl-module
+
+DESCRIPTION="Perl modules which provide an object-oriented interface to LDAP servers"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="sasl xml ssl"
+
+RDEPEND="
+	dev-perl/Authen-SASL
+	dev-perl/Convert-ASN1
+	dev-perl/IO-Socket-INET6
+	dev-perl/URI
+	sasl? (
+		virtual/perl-Digest-MD5
+		dev-perl/Authen-SASL
+	)
+	xml? (
+		dev-perl/XML-Parser
+		dev-perl/XML-SAX
+		dev-perl/XML-SAX-Writer
+	)
+	ssl? (
+		>=dev-perl/IO-Socket-SSL-1.26
+	)"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/perl-mozldap/Manifest b/dev-perl/perl-mozldap/Manifest
index 4828e3228d1c..d5f6264e0f6b 100644
--- a/dev-perl/perl-mozldap/Manifest
+++ b/dev-perl/perl-mozldap/Manifest
@@ -1,3 +1,3 @@
 DIST perl-mozldap-1.5.3.tar.gz 114128 BLAKE2B 70a986efa863e234e3ff9c338c5107db505f817fc121d5d9e99f228faa5e8dfe84abc09135beedf246934f72fad93cbf32a2143086b218b09c9aa7f36ef6fba9 SHA512 41a6913222cde9be4dc85a6406b0a499954500a38e74e5367f150191f0ea186162b5cd66a2655240909a4d5cc9df820e349e37e73c8549f83d084d96f8f74375
-EBUILD perl-mozldap-1.5.3.ebuild 566 BLAKE2B b40e202f3a8ae828a72717592d0faef8799729d3f972eea13969893334ca75c006afce2c043340af0a4a8c2b14d48e690f84ef282670c119ed656f3dbe5f478c SHA512 0f8b712511a34da7bf4ebd0cfcba2f027f81403be106573760afb6e1d480349cc5eef32ca4bab4da2a5b8fe1e0af4fffcfada424c1d9946cb11ce4f6cf3c3b34
+EBUILD perl-mozldap-1.5.3-r1.ebuild 576 BLAKE2B 274e27d98b4580af76aedfa91af1c24eb6049de6887d430d62f23f328719a059ce377cb90d42aa1e8b0732cb82ed19d4da361ba6904f6ab571b56a279a267419 SHA512 436d6fdc7300cf045a9f0c8e13549f837eee95531486af28a2e43bed26664f632ec4b78eb4ea6ba8638f53c7f2ddbabc591b8ce4ab7e7ba01cfb29d5928a1299
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/dev-perl/perl-mozldap/perl-mozldap-1.5.3-r1.ebuild b/dev-perl/perl-mozldap/perl-mozldap-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..88070c180248
--- /dev/null
+++ b/dev-perl/perl-mozldap/perl-mozldap-1.5.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+DESCRIPTION="Mozilla PerLDAP"
+HOMEPAGE="http://www.mozilla.org/directory/perldap.html"
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/directory/perldap/releases/${PV}/src/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-libs/nspr-4.0.1
+	>=dev-libs/nss-3.11.6
+	net-nds/openldap
+"
+DEPEND="${RDEPEND}
+"
+BDEPEND="${RDEPEND}
+	sys-apps/sed
+"
+
+src_configure() {
+	export USE_OPENLDAP=1
+	perl-module_src_configure
+}
diff --git a/dev-perl/perl-mozldap/perl-mozldap-1.5.3.ebuild b/dev-perl/perl-mozldap/perl-mozldap-1.5.3.ebuild
deleted file mode 100644
index 7b0cb2ada492..000000000000
--- a/dev-perl/perl-mozldap/perl-mozldap-1.5.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-module
-
-DESCRIPTION="Mozilla PerLDAP"
-HOMEPAGE="http://www.mozilla.org/directory/perldap.html"
-SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/directory/perldap/releases/${PV}/src/${P}.tar.gz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/nspr-4.0.1
-	>=dev-libs/nss-3.11.6
-	net-nds/openldap"
-
-DEPEND="
-	${RDEPEND}
-	sys-apps/sed"
-
-src_configure() {
-	export USE_OPENLDAP=1
-	perl-module_src_configure
-}
diff --git a/dev-perl/prefork/Manifest b/dev-perl/prefork/Manifest
index 3c712abbf3f2..be1c43c9b1b5 100644
--- a/dev-perl/prefork/Manifest
+++ b/dev-perl/prefork/Manifest
@@ -1,3 +1,5 @@
 DIST prefork-1.04.tar.gz 29059 BLAKE2B ecb9d18c3f06838015209225b6810654b345a5897eaa87cfed4066d17cb227353355926291ba7216d3ee0d27f80e0a7ab838a8461bc9dd8c2035fded3f568679 SHA512 80fd65f9255116cc54421000557369e4d852444d921a1ef4dadf12a7ad4bd06e641787e57df57fc0180be092d3ca546e42e9ec03cf59d0170db1197140613f54
+DIST prefork-1.05.tar.gz 28458 BLAKE2B bb1d7fd7359386ec371c062588f003ff30cd5a042390791ff774ac8f9c7edc1cfc8474679a974de8776a871bba71c73c7f76b2f084fae337624e7c446c331460 SHA512 38185a8ff3016a562b4ef0db8c4d6bb065ca1f2f6f661700aff2727c80b45aaca84b5ab23a8e66ce3b65c9b418e85fb65eec982e27fec847a4d939f4385365c6
 EBUILD prefork-1.40.0-r2.ebuild 776 BLAKE2B c3461a17f7edf611a9f28096972f8336e4cab6515fd8519e649f4fb16207b37a933f0d3ccf300c9ee4149198c04ab0541ac8e52d13dc44838bb9c9803cf37c59 SHA512 31d24f154a03b722d685c8c0d18a1734692c3e28b3b9d81a6de0c9e682395c6b5956fc17628d00756194b0a2c324f9de131fce6ede47c94b1be20465496da04d
+EBUILD prefork-1.50.0.ebuild 547 BLAKE2B b7e3789a67a7b9c5410f8df0cd58039f5570af3af3f27905edddec5d6e3fd0989eb5fb4b39338db3734fcac7c687ddc9b38b8b2dc8c6ccd0c9f2dcfb18d232e0 SHA512 e5ad481e3532bed1f1f8b84de2531e36e5d421eefa98c42567962f044ccc385d2aa6d83cd61aa1f5e5b7a7a771f3e6c2e08c7088cbec90b84d5c5e6eba8d792c
 MISC metadata.xml 385 BLAKE2B da65c7e613f5a3af0698ec6f4d10487b84bb563ecbe3224f312b1550e477e4660d2191100eb4d7492aa29b22d4c7b8f3570854c0972027c039ef6bc24e4e72cf SHA512 e3453d0b5e41174efec75fb92b447c716a7a7b756f031bcbb62b0c5a3d77aa20c2bc041e93c9059a12d704e07bddeafa01cb4aea6f0555fae23a93f4077ecfc3
diff --git a/dev-perl/prefork/prefork-1.50.0.ebuild b/dev-perl/prefork/prefork-1.50.0.ebuild
new file mode 100644
index 000000000000..1c680f3d037d
--- /dev/null
+++ b/dev-perl/prefork/prefork-1.50.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=1.05
+inherit perl-module
+
+DESCRIPTION="Optimized module loading for forking or non-forking processes"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=virtual/perl-Scalar-List-Utils-0.180.0
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/rename/Manifest b/dev-perl/rename/Manifest
index 2493268fd057..6aef754c3b12 100644
--- a/dev-perl/rename/Manifest
+++ b/dev-perl/rename/Manifest
@@ -1,5 +1,3 @@
 DIST rename-1.11.tar.gz 6227 BLAKE2B 91ec4b6ed8c37efcdea27266d45b0b1d17e9eb65d38b966fed8b5188a30c87f0434472e6c7d8479349db15628e51289f666f59c63f5bf89c2d9238a923155c6c SHA512 4e799d57948127b172f64a26d52fb5c513f2aeafeedf68d39271d93ac0fc6dd8f0cb2b0da3c43ce24ec2c04f905602557a4d063ec329672cb93f088e959439ad
-DIST rename-1.9.tar.gz 5942 BLAKE2B d0dbf877d6db754acec6bc119a6245761dc865b193ede0391b8a3d84c0ee354caa7fc39e48f5f2b3a0906c7a6acd2b7f2716e274522b18c5512f98ae44a08898 SHA512 f6977d6b1698d7da6b2b5ef262cd13a4c4739e4f468d164ba6876ecabfd7bc44532eddb9350aa61e9fb154138ef38ea8323e3768c7d3d611ce7ee49b1561c4d0
-EBUILD rename-1.1100.0.ebuild 546 BLAKE2B 14a0634e421d894f206b1f073c157675c1e065289fc56f7f4bbf8d09cd4c9ca341ff68efb32356e7efda7c48a675445e571715413e093068a274c8a55eeb9786 SHA512 5009015f811121115b08c4fe707680c7e8f46c992abaa516266443927c29479cd9e35c1d19e96ac118a94e51f3b709931ed6b2d5923a177dfa397b96b5a075a8
-EBUILD rename-1.900.0.ebuild 491 BLAKE2B 61dd3c654d5d68060487a6323566cbf8e113cf5b3a34799bef44f1e7506ae835a2dee5549f947194b08c9700a09539a200fa55dcee8d12e7135ae2d629b1c112 SHA512 aee4dc7a9fcdc973f1d94c7aa13b40db7147816f5450316f09546bd8068469ec40d7761d1dd263001e1d179c3eb516fb51b8bece179b530990b943805a3617f3
+EBUILD rename-1.1100.0.ebuild 544 BLAKE2B ec771b3815770f45f8522a5a7bf1d224185989517cb3410473a1bfd8223af6c4526883cbe0d543c32474e977dcb697c7e4d8a46da81f643f4d9eb421de7042af SHA512 65f91e5db8248c74f0b976dd8309d757ae92c9369dd0857302f38a4c6bc6a842890ce6cdc7577eb8aa554d4546b8e903aeec88ac22f9f93c3ec2527fe28562ec
 MISC metadata.xml 330 BLAKE2B 845c23dc0d25696874ea9f56f3f004b2fff81ac9003c12fb2193c8f0bb7a4e9489d280967339efa9bf66432c26c7314a89003439b76253024db7457ddb29121e SHA512 a2c36fef3b077bb5d40337d0f88e22dfd06eee8b32f2b7d0aede9287a4abade6397431e658930bde53d2c2a54d57d9a225008713d8129a5277ba42dbd586b45e
diff --git a/dev-perl/rename/rename-1.1100.0.ebuild b/dev-perl/rename/rename-1.1100.0.ebuild
index e5cc39a94ca9..6343fd88ce77 100644
--- a/dev-perl/rename/rename-1.1100.0.ebuild
+++ b/dev-perl/rename/rename-1.1100.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A filename renaming utility based on perl regular expression"
 
 HOMEPAGE="https://metacpan.org/source/PEDERST/rename-1.11"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-perl/rename/rename-1.900.0.ebuild b/dev-perl/rename/rename-1.900.0.ebuild
deleted file mode 100644
index 70a309756314..000000000000
--- a/dev-perl/rename/rename-1.900.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=PEDERST
-MODULE_VERSION=1.9
-inherit perl-module
-
-DESCRIPTION="A filename renaming utility based on perl regular expression"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_install() {
-	perl-module_src_install
-
-	mv -vf "${D}"/usr/bin/rename "${D}"/usr/bin/perl-rename || die
-	mv -vf "${D}"/usr/share/man/man1/rename.1 "${D}"/usr/share/man/man1/perl-rename.1 || die
-}
diff --git a/dev-perl/strictures/Manifest b/dev-perl/strictures/Manifest
index fdc79a970fb0..a54867239e20 100644
--- a/dev-perl/strictures/Manifest
+++ b/dev-perl/strictures/Manifest
@@ -1,3 +1,3 @@
 DIST strictures-2.000003.tar.gz 15319 BLAKE2B 3158e92282de5ca2bea5c7f79de3c6cf4e49d3641fcfde91ffedcfd291f102f7a61918136846bd6923abe557c2484db57b5b0692d93231f6f73c7aeb8854dc00 SHA512 c187a32f70c2be97cbe783e700d54d1e7b7ce7a8ea0b5ce72851b1efbe9b64121fb4b626463c4c62fb384893e4e3102afeaa21cd3e500fefc61c5b4b3924d21b
-EBUILD strictures-2.0.3.ebuild 668 BLAKE2B 6a3d9a0c11072e08101ae01ded49b24297e41bd1c1fdf60f994fc28bcbb6133d066a6e97d0ada022a826221efe4d5d84939a07de6a70c529b8f734fc9f825492 SHA512 abdc836b4b83f515cc0afedc87033dde705b68485667c18fe9313f4cb23192a6b1f48f2ac75f1b82038af377b9b8a006e118f2ad4a40707c054367e8d3848513
+EBUILD strictures-2.0.3.ebuild 666 BLAKE2B 370aa7cb9db7edd0459e911d1e00e0361a78efb6fc12958b17370d1ef61613c0952bc2b1604f0ce50269ff9193f48e527931e6480d3b90599ae05811e73e7710 SHA512 390fb85dda8ebaaa1323c566fc50661c8c09646c361e7056a5958f40771cdd383430d6a1bca23d3172f19c0ef6c0609c9c3f50b97842aea3deb60800ded422fb
 MISC metadata.xml 441 BLAKE2B 3d5493de7f2194d9a1495e56e6a4354590414e05043d89b1255c8cbea12ca057c8df23c686ea5e24598a95bff7889e11b6b85e27ab2df4e404a0116149c2e7dd SHA512 f68001e7c186751fad6041a4d4c6f208d8d72dfd14e2a41ab74ba124a2f0e15e5040dfad8a827b0125373056ca82e427432d2e4eb5f05ffe4901598bab31b80d
diff --git a/dev-perl/strictures/strictures-2.0.3.ebuild b/dev-perl/strictures/strictures-2.0.3.ebuild
index be84cedcb9be..e180625a369c 100644
--- a/dev-perl/strictures/strictures-2.0.3.ebuild
+++ b/dev-perl/strictures/strictures-2.0.3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Turn on strict and make most warnings fatal"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Faker/Faker-8.11.0.ebuild b/dev-python/Faker/Faker-8.11.0.ebuild
new file mode 100644
index 000000000000..ada44c6701ce
--- /dev/null
+++ b/dev-python/Faker/Faker-8.11.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 4f8761d1905d..46b3f1be0db1 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -2,6 +2,7 @@ DIST Faker-8.10.0.tar.gz 1149474 BLAKE2B 2a5304acb1ce88230660a468756ee79abc7ae0b
 DIST Faker-8.10.1.tar.gz 1144158 BLAKE2B 7463566a8bf2f510ab89b7fd67ee3aea80ce65725063f83798a6f7ce959a1e5c4eef82504adc124add6ff028d6e248871123d0992f715d46485daa6d64d4179b SHA512 c5bb3b376757fe025255de67a184dfae959c834e937825515eaae083a2ce931f2c00ed1ade7ccba49adf182570cf533526e583e6a45c4fa08b41e22544139227
 DIST Faker-8.10.2.tar.gz 1150102 BLAKE2B 5ca744d201a7822cbe35791757a73628d3c12f6521ca55bc2d340c974cb6e76362f87395cbc858e4681738440cf676e9f9bf7a8002b908ff564dc6703ef794e0 SHA512 5a148327df7c34623c0d8c154e6181a183a0aa484659e5872013f0b9c510418690278550ebbed6eb984c87cef588fd862b213295a379b5be3433afe312181103
 DIST Faker-8.10.3.tar.gz 1149954 BLAKE2B 665ed95be11f734ed2ae9b593a4e287cc53b041521ab223efc045f061133e983de500ef12a858d7420342a500926297565b7c50674fe5533b985a00816251031 SHA512 a5969f04dd96660b3e62ece20ce4d92de9c781faa1742e45404b0a6f04dc7521c9532c519df06c4b3e9a815dde43837b7ab7628ef25ed3b60bda49c927b8ace7
+DIST Faker-8.11.0.tar.gz 1150354 BLAKE2B 9799163239afef521d352dea601a63f2702536380891182c72f856bf442441ed654412ba035dd4964ea9ca3f2c19e0737e0225a58178a2edffcc52b06047e2f1 SHA512 5a42ea5c843272f9f70edc88e405f0b309f6e6ae5c061d1f1ca7ed01f40688539371a1bce5084a0de3e424f3eb50443430ff1fafd1ef0a035d385d80b16cae2c
 DIST Faker-8.8.2.tar.gz 1148529 BLAKE2B 279984479ad4f790dc7acd74b5ccd1cf5f32689b8b1ccf2152d7dfaa6fc7b4699d9827c16f83bb86e298723b6906a5cc40c2fa7f75439b5af5fc78c1af99a3f6 SHA512 4273008bf9ab693a40da2f93ff1fe40e9e7b102a2d5439f09096b6754b82dc26310666da65723b363f628365c97d44dd290e1e7065b7a9d862130baa292325b7
 DIST Faker-8.9.0.tar.gz 1148829 BLAKE2B b24a7fa87886cb38850808de2ffe1ceafab3c548c694af30d53b1f415d329264fe7e53f33f46b913d16310dd83d95fe591689a308bb7d4c653254e39defaa24b SHA512 d2e26ae140c30ae8069f8e0fd75bb9bf54aa00a7271b327e37dd248520256e137d192082071bc36a584fc864c54c050107ddecb40624288636c6b41caf1ea574
 DIST Faker-8.9.1.tar.gz 1148890 BLAKE2B 2cab6461bf6067d9dfd8872c19c8c11fa25ffef82b61b7e7676ffc187346d228703424a73278678f19263423716c74ecd47cfc1c17bf54d38bba712e456650b8 SHA512 f7016b320c7394b0eccc06e833a80e227cdbad9c0f34eb9f8f4413f56a4743f58bbd7ec5eac3b8c0642e7764c6c5986707d493f0c84daa75575a12061631c9c5
@@ -9,6 +10,7 @@ EBUILD Faker-8.10.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df
 EBUILD Faker-8.10.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.10.2.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.10.3.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
+EBUILD Faker-8.11.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.8.2.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
 EBUILD Faker-8.9.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.9.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index edca4b98f48d..0c1ba5730e77 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 8f2914e38d1e..994a2de0ef4a 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,7 @@
 DIST PyQt5-5.15.2.tar.gz 3265445 BLAKE2B 7712d68aa54cf9e6836863d7aa645151254d79621e115ed314ba63c371d5e24577a0392311b31a73e45af45baa29eca1d7e9a03874beac1fbf043fa703af69f9 SHA512 6d48d2ed907b436131d46b0513d82e1069c76e873d395e4a6c0832ae3a20621b92d3abece046c5fcd14cb818d50ffb369153fca1ce9341f0db1b8c479b94e621
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c SHA512 6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
+DIST PyQt5-5.15.5.dev2107091435.tar.gz 3264477 BLAKE2B 8289bcce9ebef9b8c289992d508ee1d365c86a127b03e175bb14382ad72150aea396d8358d560ce62b9ff33f3b54f3ebb0bbad8ab26a23edc73217c8325d9853 SHA512 5baf434f57c72a0e01753c69f8b40bc37321441efb652e002e3fff330edb8b7b318af3803fc8702897545763a952f99b68a0043a08e364e6fc1feb1e5d8520f5
 EBUILD PyQt5-5.15.2.ebuild 5645 BLAKE2B bcb40684f9eba4b134884b3d73da969e923e7c1fcd788162ebdb2ff2b47633d2ee60cc3571fe673e05c76fb33926d83cbeee66e7d50e8c240cd35bede1b20191 SHA512 24e491d79e9ce3d9fc2190792e2b7c370ec3816f3bf99bf21448123180dfe4747ffa57bb4ad3efbecd1865eb165de47df9744f5d57ba0eb16972d1882df7a09d
-EBUILD PyQt5-5.15.4-r1.ebuild 5433 BLAKE2B d264b8e00d413eb9d2bdeba8645b94f3098360838d91844f8045344d0a0a150c5466dffae48352f3c58b454e134c86a460260f928ac3e3fb59fc28f48e4fa890 SHA512 0f972e0ab1beb7f25c0881e1ff98bc3dfe9d9a9ef8ae4cadd0f940cf96cb01c641a72b4dc16fec3c0e402514705589837719fcb23b842ec6bab7b5747802b018
+EBUILD PyQt5-5.15.4-r1.ebuild 5435 BLAKE2B bb6fb54e130812edb25acfdd71a12c070390bafe3cf25e66639aedc20af2058d1641e088d63507467d50a788ccf0e4bbddd2baec6f87f01731ee4bf43fd49335 SHA512 3706f43c3aa9a0d64ac13566e8c0eb4a69651ac0e2a9ff58b51858d99680fcf301fb905edba8d9ce8fe986075b66d1f9d103d15ad5f8f4ca2e2938b12cd62a1e
+EBUILD PyQt5-5.15.5_pre2107091435.ebuild 5401 BLAKE2B 5feec52e824c809419d0591b97359feea3d099c7ca919f1373674165f1168eadc436d7d4d2f6ee9b09a2107a62eb688031ae3f7391d6f26d02c2ddeb712b2232 SHA512 39a09886fc3bcf4adc8cf9c6f90119c52c3ecb3f15e8d676b1ac4e2aca7859acfed19962f7cdbb0d8693d6ba3af156d0d4a30f1aaa78146d55279ec9f1c6db3a
 MISC metadata.xml 2432 BLAKE2B 56cd4edfd99449ed4d837edec6952e85d0fa13bdca2189451b7c43645b39a7a7a810f4e206f7aba6690d65529a5f629db532d4ab056374952b34834d2d68fbc3 SHA512 acb9f52dbeed59158c5ef83ffef67e51e4362191210b6addfd5c3e4aa1d17f208ab5ce316d7a8d5116dabe3dba5b58d28ac6f197ebaa832f3b33f4a13a881a62
diff --git a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
index 78f0bdd5dd0e..7030695c18fb 100644
--- a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
@@ -85,7 +85,7 @@ RDEPEND="${PYTHON_DEPS}
 	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
 "
 DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.25[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.19.25:0[${PYTHON_USEDEP}]
 	dbus? ( virtual/pkgconfig )
 "
 
diff --git a/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild b/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
new file mode 100644
index 000000000000..7d1bf6e760cb
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.15.5_pre2107091435.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/ https://pypi.org/project/PyQt5/"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# TODO: QtNfc, QtQuick3D, QtRemoteObjects
+IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
+	multimedia network opengl positioning printsupport sensors serialport speech
+	sql svg testlib webchannel websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from the qmake_QT declarations
+# in project.py and from the output of 'grep -r "%Import " ${S}/sip'
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( gui )
+	declarative? ( gui network )
+	designer? ( widgets )
+	help? ( gui widgets )
+	location? ( positioning )
+	multimedia? ( gui network )
+	opengl? ( gui widgets )
+	positioning? ( gui )
+	printsupport? ( gui widgets )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	svg? ( gui widgets )
+	testlib? ( widgets )
+	webchannel? ( network )
+	websockets? ( network )
+	widgets? ( gui )
+	xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.15:5"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	location? ( >=dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl] )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	speech? ( >=dev-qt/qtspeech-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+RDEPEND="${DEPEND}
+	>=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.2.0_pre2106291255[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	dbus? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+	default
+
+	if use gles2-only; then
+		# sip-build doesn't have a command line option for this
+		cat >> pyproject.toml <<-_EOF_ || die
+			[tool.sip.bindings.QtCore]
+			disabled-features = ["PyQt_Desktop_OpenGL"]
+		_EOF_
+	fi
+}
+
+src_configure() {
+	pyqt_use_enable() {
+		use "$1" || return
+
+		if [[ $# -eq 1 ]]; then
+			echo --enable=Qt${1^}
+		else
+			shift
+			echo ${@/#/--enable=}
+		fi
+	}
+
+	configuration() {
+		local myconf=(
+			sip-build
+			--verbose
+			--confirm-license
+			--build-dir="${BUILD_DIR}"
+			--scripts-dir="$(python_get_scriptdir)"
+			--qmake="$(qt5_get_bindir)"/qmake
+			--no-make
+			$(usev debug '--debug --qml-debug --tracing')
+			--enable=Qt
+			$(pyqt_use_enable bluetooth)
+			--enable=QtCore
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-dbus-python)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usev widgets QtQuickWidgets))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable location)
+			$(pyqt_use_enable multimedia QtMultimedia $(usev widgets QtMultimediaWidgets))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable speech QtTextToSpeech)
+			$(pyqt_use_enable sql)
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			--enable=QtXml
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+			--enable=pylupdate
+			--enable=pyrcc
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake to respect toolchain and build flags
+		run_in_build_dir eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+
+		local exe
+		for exe in "${D}$(python_get_scriptdir)"/*; do
+			python_doexe "${exe}"
+		done
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index bc7a49fea4f7..234a3d649da9 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,5 @@
 DIST PyQtWebEngine-5.15.2.tar.gz 48608 BLAKE2B a03f77b0cde0d1031e8f1c4c6b5d13a342c28cf814ebaaf4a2cdb4608ce40cdd8163783932abc76cda583c0fed7191653b537598a9ab65f6509ef88008538e31 SHA512 7e6d95833b1a9e5bb5275eff01e1923419da35d13862fc4cbb231cbf950ed45e628bc7e161b0b6b66c718ee439a1a8e66dd754cee9adcdf69ab1b8ffab58901e
 DIST PyQtWebEngine-5.15.4.tar.gz 49022 BLAKE2B 0ac0b3424f22aabbfd733f2a876e502f133c81f639fbd87a4c7509865635b29d4bd3596ccc151b0919a28eff0015913c4fae1a831dbe774fe2d2aeee732e469b SHA512 25cf8578ffae8adbc1dd8d914921b4edf91f19fcf983c9c83c9c8934b4e918ba27bd34a6b9c8252773ec32e6f1f13a06f22cf7d7326a5aceaa91530ea4ee047e
 EBUILD PyQtWebEngine-5.15.2.ebuild 1665 BLAKE2B 54f976b7e747e2d50aabf99728fc79c1efc49d782d806782677b00c5d32780abc206265760cdb06184ff188c289213c795cb3f65f947f439c69621424192a258 SHA512 3679084254b292ad8b7f51ee80cd9ccbb2e6015965abce43f8c27edcd84ab7e15e83ae40d731404c42805dce598e5dca3a4f665354a3244b86f4e6cd4b573742
-EBUILD PyQtWebEngine-5.15.4.ebuild 1707 BLAKE2B 38c1186a305c4c2e5ecd05a7407a7a535c023a35160853561de4747f1e70406d25f6db94273af8c3817171e7726a200749c57955766c507f477e97a2eecac063 SHA512 b42f7f5dea9802588aba25c7263588afe76127644a0b5d7a5d50d01af5c7019e220c6ecb98ad37ce5402db0bbacb56eb72add4e656da439976fe1b80820e7174
+EBUILD PyQtWebEngine-5.15.4.ebuild 1705 BLAKE2B 61c47b552ce438e3e4429ed7b6230559b3f2143bad5c2daebff9bbc17f179464183157c8e723b4889b20c8e22b8e43af72ee4ce5c9cc854118830a053070714e SHA512 0c331528212847f92712d7e1c3c0a1d41d354fb84827f588f3270d5f2664d39ca974c6cda3b028cb1e0e504951df288ed2fbce5bf106799437e10a3e58ebcd2a
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
index 8aca0d1edee6..fad00a88922c 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro https://pypi.org/project/PyQtWebEngine/"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/ https://pypi.org/project/PyQtWebEngine/"
 
 MY_P=${PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
@@ -28,13 +28,13 @@ REQUIRED_USE="
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.15[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
+	~dev-python/PyQt5-5.15.4[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
 	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
 	dev-qt/qtcore:5
 	dev-qt/qtwebengine:5[widgets]
 "
 DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
 "
 
 src_configure() {
diff --git a/dev-python/agate-dbf/Manifest b/dev-python/agate-dbf/Manifest
index 3ff8613bbe1f..a0a2211b4d38 100644
--- a/dev-python/agate-dbf/Manifest
+++ b/dev-python/agate-dbf/Manifest
@@ -2,5 +2,5 @@ DIST agate-dbf-0.2.2.tar.gz 2863 BLAKE2B 112b03e1a02b70e63f77195a999a60a59b4e02a
 DIST agate-dbf-0.2.2_examples%2Ftest.dbf 1314 BLAKE2B 81d5507b88fe7f7c3866d8666feff12bf3b14451affd653d76239f8785037c908509de248ac4bc8dbebeba4b1a84d69a48bf97b83716fe489ceb39f8ccf0e935 SHA512 460f9a624a6fed58d1fe0484ff6f7fa081d595d8f1a04f4f449ef6de037e334abb9da0403622e5af8c7914e02cda2fa38c4058ef1bb650e59e50584b9ae73b2e
 DIST agate-dbf-0.2.2_examples%2Ftestdbf_converted.csv 896 BLAKE2B fe535d9b784088118fcd61b5378d49d92bac801be61e7900200625f267c8f9c454729376b292d809d3e6a6ee2a093e2a813524ff9199223cbc89a9a461feed40 SHA512 ddba24038d4500b97ff8b11b03a5260927a299f1732aa0a6bcb4746c52e04825f2f3d5d211141576736008ff7f56d0970b21c06f4afad53a4e4e0a873815516b
 DIST agate-dbf-0.2.2_tests%2Ftest_table.py 574 BLAKE2B 22a744ae20491632795a0b654d8ab1e8adc090d43d0a18352b83cfc1687c57d33f1159d96cb379743d293203412dbbbaae8c33be195ae9d868584671ff0ea74d SHA512 131d8a553bc9c7538959e1ae29b62c47cea3e14365afca4e92e4f36cc8dab7e4b00efa462db5e9ca0f51b5e3eda892cf91881d65bd1302fa80bd5b0f66fa4076
-EBUILD agate-dbf-0.2.2.ebuild 1581 BLAKE2B 1334d55687a380582f2898b2014ae51365ddb04fd2d51a54e8e36049fc781430d4a550bf47966c30d72a1a8b88f31463aa12a331c87811be08d8cac838384eb9 SHA512 d408a9f5378260fec7b2ed9ee374e1901fc2e2e0092f09d98ebbac978f092f2eb8bed02e5971c1dccaa14d5a80ee1cea5041a16d8ee70386cb4225085f27bb8d
-MISC metadata.xml 512 BLAKE2B ec17367c2f3f9e56074f83615fd39f5edb146abe932307a4c775456e711d784c0a4636bf6dc8859c62b37cc4132735a728296211c95ebcc3b8f55ae74d10d45a SHA512 e830ccb01745a1d493655184bf1a899bfbd4bccde225fc7fcefe6b3979d28a80adb93783cb0fbb5844de04f31895ecbbc8790e13ea6485f0eb388576f9ff7c33
+EBUILD agate-dbf-0.2.2.ebuild 1519 BLAKE2B 9f5635ba118e86976f9498053c21bc0fafa64e465bf8f108836647db425adfa5a8c04cc5e7e61e6ba4cfcbdff8ca2fbcaed40318c7bb3673b83c65a1d5e81610 SHA512 1be17ff2968e9fdfc0e2c72d65dc2355f2ca6944dd55774c918ca4f11e66604aecf69826fca131c153132a15d3972bb104edc74024b2da389ee2b65e886aa358
+MISC metadata.xml 536 BLAKE2B 5d921e1557dd6aca4383d34d51a1930384e5da044cddfcc74999a79704f60ba53f7c92289ebbde2647c62d20f5a01d0ab88b5b24558fb7dbdaad6d38d281f144 SHA512 510a7dd9bdfcce44548349a750ccf16c9f46992f0027702c5e09023f53dec1e3c1d3a0b8cee9d10591e96af848ba1d3e634f2986952565a0d6ec5f993fe49e74
diff --git a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild b/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
index 772d11bd4f56..04248032f373 100644
--- a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
+++ b/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
@@ -1,20 +1,20 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Adds read support for DBF files to agate."
 HOMEPAGE="https://github.com/wireservice/agate-dbf https://pypi.org/project/agate-dbf/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
+IUSE="+xml"
 
 # Other packages have BDEPEND="test? ( dev-python/agate-dbf[xml] )"
 AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
diff --git a/dev-python/agate-dbf/metadata.xml b/dev-python/agate-dbf/metadata.xml
index 93b393c9134f..5f83acacc3a5 100644
--- a/dev-python/agate-dbf/metadata.xml
+++ b/dev-python/agate-dbf/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/agate-dbf/issues</bugs-to>
 		<changelog>https://github.com/wireservice/agate-dbf/blob/master/CHANGELOG.rst</changelog>
diff --git a/dev-python/agate-excel/Manifest b/dev-python/agate-excel/Manifest
index 84ef1f0d9ed5..c34fb3200aea 100644
--- a/dev-python/agate-excel/Manifest
+++ b/dev-python/agate-excel/Manifest
@@ -1,3 +1,3 @@
 DIST agate-excel-0.2.3.tar.gz 153880 BLAKE2B f090c8bbb75341623545781cbf116b547ebc16249eb0c6814e9fbd51d2688fd2bd0354d187d2f803bde69e563b57836e3d214e287ae62455c59075020588d235 SHA512 3a50bab182391bdadb2e0a82dc28a3cfa1eebbe67744835ab20581a67f7f08f4edb96eebc9a286ac4a6a302996571563ca9e487ea7defdcf07265e9c42436ddf
-EBUILD agate-excel-0.2.3.ebuild 1221 BLAKE2B 3d27b1d2f248306abd7742204e1736ab1f93e3b6235e811dcfae2e37c74809b15f8f19c40e8f625acecfe8998915eaf8d91dc1d9d872539cf4e58af8ba122dcf SHA512 a7e81b85932f0e7b95c5c68f9f2ae513defe74830d9e237bab2c639fb5c9244c74a3be5563ff6f2372d9a697fb560cd2638571890bc3833c94e43d2d9bdcf98b
-MISC metadata.xml 520 BLAKE2B 76548784a8782afa93d38311da98f13f33ac7291f88699dd6c9b2430081803e6a9fbd9d378f060dc641ff6ebc5cea664f60b09d7cc1e58bdb50a2a94bd277843 SHA512 de75458d4d3976f6c54ff41ff14d98b34cee9a2dc3e8830f76362c5c024f8849b8cd27a4999bb9e0cd8adb3e7bf89ace54d5f5eadaeb7975e4145389d635f1ad
+EBUILD agate-excel-0.2.3.ebuild 1025 BLAKE2B cacc20dd57b3412c1f218157d0f63aeef6d50f07c031ad411fd2e20d518603437a933add8775f0e884c1b44e2bd6235c85173ab9d70d1787044cf4f4ef723ffd SHA512 99fd7aee5e08b2245589ce1dfd4a1e96e152651b1c6cf29a572995fff4ea0c189db28812dc91785529b2a1a3d637f5ea54a0e401b4e749ecdfe6044d57950168
+MISC metadata.xml 544 BLAKE2B f41f6f3a5787f6d5a1ff01713cf75c9ba595840505009096b7d91acb8e559cd0014c76eb5ac0ddc00c95cd460bcb52b75f7f044ca90235d9e9a749292ed99945 SHA512 64800c9e5b298eaeaa468890d8e018973c6240bc7251991ccd2af4f163ef0200c03a39252af8146b1590a4118839430f817384b3afa370012f8a4d1cd2b86748
diff --git a/dev-python/agate-excel/agate-excel-0.2.3.ebuild b/dev-python/agate-excel/agate-excel-0.2.3.ebuild
index 0774e1cfcadd..2aa921d5926e 100644
--- a/dev-python/agate-excel/agate-excel-0.2.3.ebuild
+++ b/dev-python/agate-excel/agate-excel-0.2.3.ebuild
@@ -1,22 +1,20 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Adds read support for Excel files (xls and xlsx) to agate."
 HOMEPAGE="https://github.com/wireservice/agate-excel https://pypi.org/project/agate-excel/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-RDEPEND=""
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
+IUSE="+xml"
 
 # Other packages have BDEPEND="test? ( dev-python/agate-excel[xml] )"
 AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
@@ -33,15 +31,8 @@ BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 distutils_enable_tests pytest
 
 python_test() {
-	local pytest_args test_name xfails
-
-	xfails=(
+	local deselect=(
 		tests/test_table_xlsx.py::TestXLSX::test_ambiguous_date
 	)
-
-	for test_name in "${xfails[@]}"; do
-		pytest_args+=(--deselect "${test_name}")
-	done
-
-	epytest "${pytest_args[@]}" || die
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/agate-excel/metadata.xml b/dev-python/agate-excel/metadata.xml
index 8799df8cb528..7ba58d0d86fb 100644
--- a/dev-python/agate-excel/metadata.xml
+++ b/dev-python/agate-excel/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/agate-excel/issues</bugs-to>
 		<changelog>https://github.com/wireservice/agate-excel/blob/master/CHANGELOG.rst</changelog>
diff --git a/dev-python/agate-sql/Manifest b/dev-python/agate-sql/Manifest
index f8763e930369..dc4f343d7ed6 100644
--- a/dev-python/agate-sql/Manifest
+++ b/dev-python/agate-sql/Manifest
@@ -1,5 +1,3 @@
-DIST agate-sql-0.5.6.tar.gz 9091 BLAKE2B 9094a2bfb500422e7fe75d1c83182af698aa92942a305a69301d45d92f01960a7ffc7908f0eb2b66556a856be0f7388e222034428afd269d402488c6c05abd36 SHA512 b4234a86f8bcd5b22bcb1e18d0cec0ba21c8a3521e15f767886241e16285cbd296683f83bd366a82d1e549679b3712663adc080950dedb24a0e6db5b2541050a
 DIST agate-sql-0.5.7.tar.gz 14975 BLAKE2B 7890d5c21d89dd216a7a4c906189e1e44111bd96ef3476f0e6dc4c842dc3f25d537ee398f3c8e720d43e64001fa0ea93940d4a54ee31605eea9e8ae9aa4dec37 SHA512 df7e1d5975d9af0722f4bfa67f1e8679ed46759f8aaa5c76614ed5280c8347f727517568ba377c21dd8eb349f93b7a6d308959ae69bfedd125e6d99bd7bd9dcf
-EBUILD agate-sql-0.5.6.ebuild 1477 BLAKE2B f5a946abb127d8ce24ccd77fc573e6440df8b3c0d1317834e0128d9a8057e1b83f0e054aeb16f2e968c869fd2226d7e5bb1ba1a825d7f91df9dfabb01b80a7f0 SHA512 5e10af0fe07be21b99050734f01e562e0ac2b6fa7d7439eb81e883a601774756fdd32ec244ffdeb2a4ad084c361a0cb8689cdf7ff3f567a33ef5a816db1d02d5
-EBUILD agate-sql-0.5.7.ebuild 1406 BLAKE2B c1b9db47eddbd9cb8a2748b9b6560f0a2c26a0334c60572b01f80826e3766fc52b14aa29747545338ed1ed0ab8b2e4e96ec02ccb7a54ede0003d7f4f2b4a8a2b SHA512 d941e02a642f31f9bf7268a36a6c4cd460fa25d7eedb5761ec571615590cde84b69b3f8b50167a1040dd4e3259aee2a080aac7b432bff66ad428a8dc948d81bc
-MISC metadata.xml 512 BLAKE2B 0709aed8b06df8981ad0b0c2733a1acde06a0753701b6b35ad9662e5c66871529b968a71d39265d0fd72aec90f09f7166848e1155d240815041bff498d4be06a SHA512 f09f6203a8f90abb3646be9e8d2abb4d8b367a857f384a7c43d43862953c99111e05707eb4890a6a3abcfd33aa8717bc65b180771c0cc97e5ff1ed762978f95f
+EBUILD agate-sql-0.5.7.ebuild 1299 BLAKE2B e872f58baf8ee4de3adee73f69d59de678cc0bf18d1fcb85a53872546183c3179bc0ef2d79a7d94694c32071910eb3e63f2930d7b5c44047efdc153e3ea55c0f SHA512 4590164573b2b97d0139ac6e636709c7a9c6fd568b3ae9e29712cebf4c5b827c1853fd8587f8d1af9025b04821eae64fc633468e606f139ba74c326f93e40ab5
+MISC metadata.xml 536 BLAKE2B 12819e737cd063c61f213bd3b093420cf474bde6c4e483ebfc98348e47d99925912f78abd93cb1461dc37a469c06759224e27688d2a1c5b8408ba9fb7a2522ad SHA512 9b0429fe9287edf3a9883fd4d76e70c447d1b03c4e43506d7969650e65e84b184a4da7ec7b949db47c7fb8fe64d351cff974b30ab1735bff70edf34de32234a3
diff --git a/dev-python/agate-sql/agate-sql-0.5.6.ebuild b/dev-python/agate-sql/agate-sql-0.5.6.ebuild
deleted file mode 100644
index 9dbdd4b64698..000000000000
--- a/dev-python/agate-sql/agate-sql-0.5.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Adds SQL read/write support to agate."
-HOMEPAGE="https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
-
-# Other packages have BDEPEND="test? ( dev-python/agate-sql[xml] )"
-AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
-TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.8[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local sed_args=(
-		-e "/crate/d"
-		-e "/nose/d"
-		-e "/geojson/d"
-		-e "/Sphinx/d"
-		-e "/sphinx_rtd_theme/d"
-	)
-
-	sed "${sed_args[@]}" -i setup.py agate_sql.egg-info/requires.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local pytest_args test_name xfails
-
-	xfails=(
-		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
-		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_schema
-	)
-
-	for test_name in "${xfails[@]}"; do
-		pytest_args+=(--deselect "${test_name}")
-	done
-
-	epytest "${pytest_args[@]}" || die
-}
diff --git a/dev-python/agate-sql/agate-sql-0.5.7.ebuild b/dev-python/agate-sql/agate-sql-0.5.7.ebuild
index e58ff6efb206..a5527246e03d 100644
--- a/dev-python/agate-sql/agate-sql-0.5.7.ebuild
+++ b/dev-python/agate-sql/agate-sql-0.5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Adds SQL read/write support to agate."
@@ -42,16 +42,9 @@ python_prepare_all() {
 }
 
 python_test() {
-	local pytest_args test_name xfails
-
-	xfails=(
+	local deselect=(
 		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
 		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_schema
 	)
-
-	for test_name in "${xfails[@]}"; do
-		pytest_args+=(--deselect "${test_name}")
-	done
-
-	epytest "${pytest_args[@]}"
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/agate-sql/metadata.xml b/dev-python/agate-sql/metadata.xml
index a42278954df3..8d445d6d5b34 100644
--- a/dev-python/agate-sql/metadata.xml
+++ b/dev-python/agate-sql/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/agate-sql/issues</bugs-to>
 		<changelog>https://github.com/wireservice/agate-sql/blob/master/CHANGELOG.rst</changelog>
diff --git a/dev-python/agate/Manifest b/dev-python/agate/Manifest
index bd8ecd7c8cc8..62793115785b 100644
--- a/dev-python/agate/Manifest
+++ b/dev-python/agate/Manifest
@@ -1,5 +1,3 @@
-DIST agate-1.6.2.tar.gz 191216 BLAKE2B 63e89f6815a36dea956e8a919aeb926291eaf1f4d5eaac7f96dab97c6958dfee4788e18a4c1325a5b8cebf15df27b32e75409ddeab1289c1e8e548088fdc0ea7 SHA512 34d9e45d162bce69d28ad0ec07f5b410b2cdac831e5bd986ca8cb8902fd0ca1ec67663b2f956f42acaf18b8ca0fa169d5236aa4cee7457765e4e86d837e7794e
 DIST agate-1.6.3.tar.gz 202102 BLAKE2B b1a5624b4744b8f3ed266470da580cef2f2e1cf6159e1b33fcd461e4abd235c5e3fe0da35408a42c92fd4abf14a1f841a1ab9eb6cd31545d826a5223e85b4904 SHA512 e83a03c5a3e4b7fa9997030ce0d33e7b59b397e2ae07ee6a723eb7fb708a7fa8b8c4322dd034f42bf664bf2911d89731fd060e4ff33a237f83114a83312ac5ed
-EBUILD agate-1.6.2-r1.ebuild 2753 BLAKE2B 4c80f6ab093d11f85d96215ee86d929fc788ad7714e61632886f1806bd8909c677e5e65887919ab6514c88d08f6697fd37c0d657876e000f86a56c9b13db3fc3 SHA512 7b2bffbdf6dba030b97a6213e7d47c43a24e0f02d25b3420b313a5bd73d465a74c532680ffc8ec1a5d4cade29c6de6a299df251c4ca8fc3764c24eb129dc61ec
-EBUILD agate-1.6.3.ebuild 1375 BLAKE2B c6409f7f677ea26fa8dc305aa6b7664db636cc26a974ea760d2ea701008a9c8684e408c339ad317a5722e424b7bf48195bfa729a943e70c7176cf7f79b2850b7 SHA512 671f40e651ade42d04571c413df6beefbe7748162fd889b66ec99a41dd7b7699008b0e05735489dc6ce3c818af754da5f78d6dd552ddaff84b31316e86ece01a
-MISC metadata.xml 485 BLAKE2B 32cfa1d6bc9582bfe411d79e541837d48019eb8a3bcb956634f3a72f5c41ec30568cab69348e5c7419210b77263a93dd042bb88a1376706888a0e13b2553f456 SHA512 30edf8ea75b16bd491372ca7d72b953fb9d3d27c88b10829b7d90108e952fb3a8489541958621a34d288d9dfb5378063fe6973a15d71700bc1745d20093f7b87
+EBUILD agate-1.6.3.ebuild 1436 BLAKE2B a0590109876c89e4d2e77857cde82e9899de21b345e3963e3316dda407d444b6891af2c550cf4cc9a18bed7cb71cc62eb5436d33fd8290f8a4b32f03dad63c0d SHA512 ba12184f663eae53b40ed91b55ad14d68a0868c09d1224f12282dad6b59f4265859ed99050fccfe2ad3afcfb9b64f9aab7976e471db6aee813cf686ef1286803
+MISC metadata.xml 509 BLAKE2B 9eced9e92bf3c1e763c03b189e46ad085f147ea46dcdade03d8b27f979a9b1abf83015091b475278ff8dab802e1a84eb7bcad6783bbbba02f500260de1ad56f9 SHA512 69908382d702e5be6c249d0beb5cf5d37e036546d74bfb4340e385219168d5891d7b5ca71e42e17422feabe3c3c7cca863f5073086ab633553e5165ee3283a65
diff --git a/dev-python/agate/agate-1.6.2-r1.ebuild b/dev-python/agate/agate-1.6.2-r1.ebuild
deleted file mode 100644
index 7a908b2f5484..000000000000
--- a/dev-python/agate/agate-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines"
-HOMEPAGE="https://github.com/wireservice/agate https://pypi.org/project/agate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
-
-# Other packages have BDEPEND="test? ( dev-python/agate[xml] )"
-LEATHER_VERSION_DEP=">=dev-python/leather-0.3.3-r2"
-TEST_AGAINST_RDEPEND="xml? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.0[${PYTHON_USEDEP}]
-	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/pyicu-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}]
-	${LEATHER_VERSION_DEP}[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-# @FUNCTION: pytest-expect-to-deselect
-# @USAGE: readarray -t pytest_args < <(pytest-expect-to-deselect <<<PYTEST_EXPECT_CONTENT)
-# @DESCRIPTION:
-# Read a pytest-expect pytest --xfail-file file from stdin and write
-# equivalent pytest --deselect arguments to stdout for consumption by
-# readarray -t. The generated pytest --deselect arguments are appropriate
-# for use as described here:
-# https://dev.gentoo.org/~mgorny/python-guide/pytest.html#skipping-tests-based-on-paths-names
-pytest-expect-to-deselect() {
-	while read -r; do
-		[[ ${REPLY} =~ ^[u]?\'([^\']*) ]] || continue
-		printf -- '%s\n' --deselect "${BASH_REMATCH[1]}" || return
-	done
-}
-
-python_test() {
-	# test_cast_format_locale fails with "locale.Error: unsupported locale setting"
-	# which appears to be triggered by these locale settings in the unit tests:
-	#
-	#   agate-1.6.2/tests/test_data_types.py:257:    def test_cast_format_locale(self):
-	#   agate-1.6.2/tests/test_data_types.py-258-        date_type = Date(date_format='%d-%b-%Y', locale='de_DE')
-	#   agate-1.6.2/tests/test_data_types.py:381:    def test_cast_format_locale(self):
-	#   agate-1.6.2/tests/test_data_types.py-382-        date_type = DateTime(datetime_format='%Y-%m-%d %I:%M %p', locale='ko_KR')
-
-	local -a pytest_args
-	readarray -t pytest_args < <(pytest-expect-to-deselect <<<"
-pytest-expect file v1
-(3, 8, 10, 'final', 0)
-u'tests/test_data_types.py::TestDate::test_cast_format_locale': FAIL
-u'tests/test_data_types.py::TestDateTime::test_cast_format_locale': FAIL
-")
-
-	epytest "${pytest_args[@]}" || die
-}
diff --git a/dev-python/agate/agate-1.6.3.ebuild b/dev-python/agate/agate-1.6.3.ebuild
index 52a588ad921a..92bdd1023bf1 100644
--- a/dev-python/agate/agate-1.6.3.ebuild
+++ b/dev-python/agate/agate-1.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines"
@@ -33,6 +33,8 @@ RDEPEND="
 BDEPEND="test? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
 
 python_test() {
 	local deselect=(
diff --git a/dev-python/agate/metadata.xml b/dev-python/agate/metadata.xml
index 59880222a94e..18785d28a7e6 100644
--- a/dev-python/agate/metadata.xml
+++ b/dev-python/agate/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/agate/issues</bugs-to>
 		<changelog>https://github.com/wireservice/agate/commits/master</changelog>
diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
index effb57668575..a3f2d46dc3f4 100644
--- a/dev-python/aiohttp-jinja2/Manifest
+++ b/dev-python/aiohttp-jinja2/Manifest
@@ -1,5 +1,3 @@
-DIST aiohttp-jinja2-0.15.0.tar.gz 51183 BLAKE2B e19ca813f36ac746a84812ec278a3de43e6e24eaafcf949fd18a32c99f460ded03f4dc97171fe1493174a8e2c51543b8c1afcdec51c4688f4fb0b7781287cc03 SHA512 084714cd2376b93f32cdcebc1971d4aaa704a177524b00f322e0347c15ab8085960a68a3760be056e391410f01b6b637eb59db54fccf54d09ba53a9ea03a01db
 DIST aiohttp-jinja2-1.4.2.tar.gz 54328 BLAKE2B 3d6aaeb03bbb89516a92fa877ee95a2fd27ab83666a03ca12e78f1744b82797faf2547bf55118618cbd979d80779a9571dfcfe9036bc84142563ede55cfbc1a1 SHA512 7bdaee97efe90a0009cd78a4e46dc80cfeb661c2d5561fdb1b1a1ff098abba8667260bb908e3227edd6601c2412812d0311461942568a8aabf07a164ea2f290e
-EBUILD aiohttp-jinja2-0.15.0.ebuild 1080 BLAKE2B 79c5f9ac7a6d1b25fc494a3574c9127f42de3046433c5a3c07bfb1ebbd0b5764d73e30eb87dae1486be98a8cde8e299ba2e28913d832f980fe7327520055e4bf SHA512 dadd8b7326252f151b00440d2bcde8eed37493c9c44283bfaa860a8dd308d9581f8e66a14d181916826ebcdbad1ab87fed70d5fe14b0765ceb99966183ead5a8
-EBUILD aiohttp-jinja2-1.4.2.ebuild 835 BLAKE2B 94a5a9a23474bf9d8b170df4295f7c9529b6ed93b6365c91621616af028f814b402d166bcca0512eec21f165432c20a0bd773300efecffc0d3df39a89be5911e SHA512 ec7546c1cea7828a28369cdffea06d1084c59eb34fd962508aa1cba73b2f56db9283f2090ac826e9af944cf8958ce1e29a4d109467062b57bc345dba8ede3fe0
-MISC metadata.xml 408 BLAKE2B df678e57a82a1c6a818983506af4a0397469497ec15da8a70aa021b77b60b4b4d14f8c37d821c655fb1c92dc75da69bd37ac487d9937d87c14d6338de8bad803 SHA512 bd5b6da5b67af78a148ec4a95378caa391dee95591b6888028d5427000d38411931559332bf0508c201691e04b8b417acbc5dc026858c546e6843d6779607e22
+EBUILD aiohttp-jinja2-1.4.2.ebuild 841 BLAKE2B 25f59019b996241edc0740c400c7ba158c2db205cbbe2a415d7531b0151cb8261e8786321adf84070476c0c4b2d3a45c103180958992d4bd6b7cb1278fa24b7c SHA512 53fd56354bfb1d76fcf8019822f1aa63e10838ec5441c02754696715e74e0a9b76416fec6b6876bfac4eef909ad3ee08080f212bec504da9968535b7783bab86
+MISC metadata.xml 408 BLAKE2B 916a837821dc02a0eda9ed9c5baa16d70426f4d3979a51b68d4516bc1c87cdc9b097528d4c31540513ecefe056031673a75e3ef6a73c27559dc10675d0b19651 SHA512 16235d6f61135b0caeceaf161cf98e700ac13cc136edeb501280b60bc4dfff6734f80523baaab0982cfef3a84c7a34734e4020ac31a028095967953f04291275
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild
deleted file mode 100644
index d06f6beff00b..000000000000
--- a/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.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="6"
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="jinja2 template renderer for aiohttp.web"
-HOMEPAGE="https://github.com/aio-libs/aiohttp-jinja2"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/aiohttp-2.3.9[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/pytest-3.2.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES.txt README.rst )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	pytest -vv tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
index 6afda9ed0652..12b9970dfdaf 100644
--- a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
+++ b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiohttp-jinja2/metadata.xml b/dev-python/aiohttp-jinja2/metadata.xml
index f9d1eb44fbde..008342ee256e 100644
--- a/dev-python/aiohttp-jinja2/metadata.xml
+++ b/dev-python/aiohttp-jinja2/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">aiohttp_jinja2</remote-id>
+		<remote-id type="pypi">aiohttp-jinja2</remote-id>
 		<remote-id type="github">aio-libs/aiohttp-jinja2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index 11f9373cb72c..93112bd12d84 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-socks-0.6.0.tar.gz 19789 BLAKE2B 56a9279f78e2a7a391183e6b68f9b33d878dc9b328d3096ca649b136e321ed372a9f9e8f7a02282c32568ac458639bd76b341f87722eeac46741d68064cc035b SHA512 15a5869d24955cba9548d8bd7cf1ec29b27a024603ca1b1d4abf8f93c70702434542c66ced1d8b28ae851034dad1ae8e2eaa4ed9a3729be35ec1e3c853237811
-EBUILD aiohttp-socks-0.6.0.ebuild 738 BLAKE2B 13b34e46b24cc4dc7c1e4b3cc6d20c3ebeb892c137863c1a3888dc6f8aab647309e75afabcf89be307a3019547bba396ad420ee437519110f18b55abc6ec55ac SHA512 7fe23c40cfbafb740a8a8a1f85b4521c0cc691f30e51e63d793615731d845c4d735e9d026dc719463c8c2bb58e67d977bd78c83042c4d9f92214104a92f146c5
+EBUILD aiohttp-socks-0.6.0.ebuild 788 BLAKE2B 94f8b0582ac5aac373748bc91c389e64d56b9856b696f0d124df76e251ecc7f52611887e4ef5e402493a36c9cc840dd6656559bd7e8859514653984fe09ee4e9 SHA512 13b9e6b3e4abc9022c69aa1af8416bfc4e425ff86f47ec67f62d3641252d8b673381dcae2ecd46c0a018ac3707fc6c172d5685d4ff03444ed83875c120e10db5
 MISC metadata.xml 416 BLAKE2B fd462ceb91bb4032d944cfe0a6f040120e2492a2aab5a34e6d6416ee9dceb51df7fe3b12cf125415989ac7c2be72d609a1955ebc825cb8e9eaa16dc28df89532 SHA512 6712e24058ed1a73dc03eaca9537df0f6ddaace9a5391cfb01453a342bd8ee5d81ba602e582490bf647bce3665567c6cdadcf4d2b92730f77f79654a309fcc20
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.6.0.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.6.0.ebuild
index 1c3af1c08759..43f35326b131 100644
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.6.0.ebuild
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.6.0.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="SOCKS proxy connector for aiohttp"
-HOMEPAGE="https://pypi.org/project/aiohttp-socks/"
+HOMEPAGE="https://pypi.org/project/aiohttp-socks/ https://github.com/romis2012/aiohttp-socks"
 SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 44dc0bf4edbc..9f17d75e0254 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,5 @@
 AUX aiohttp-3.7.4-brotli.patch 3537 BLAKE2B dfb410aabbd24f16bb1cf5fe999e9730417ccaf7ea59cb48d0445abcfe757e0b9d165ea723152df8f54ff039ac092a0a6cc6d6bddfebcad44d8d63f4eb5c3c79 SHA512 6bf8969c57fc649f84dae9eacd79d5f13558bc970e8755dbf22dcc08789d2377d1f04a745becd3c533f3a6ceb459ddb6bab5eb39e1098468650b312c2ecd51c3
 AUX aiohttp-3.7.4-fix-py3.10.patch 2285 BLAKE2B 4d0841adb3e0038b1b361449812975e4f908e0813576dd3adf1f6d841e93adb514803629bb186304d44c92680d0b1529e3a2ca5a861766f856d32cc69edb18d4 SHA512 3cb863431c8175da625d429a6e275a6a3f932f162f9dc9c477f7038af302486698ee0665c3ab69111d277b9bd080d90e7b3e4f7a2c0a797e554c0cdac3f5cef2
 DIST aiohttp-3.7.4.tar.gz 1114533 BLAKE2B dcae3e66e13df8264d731a3ca65b4718feca8d0e6e1baeb6608dcb9bfb4bd4baaed6bd34297ed5ece78d01189bf9a0b9860845cae4e2b93cc2ba463cc35cfb77 SHA512 66fcc837b388020dc998cbaa2db31e48ecec75bcfaa8af9108e2ea265588dafa5684ca96a8fe3ad6759b22e09a4ae6d4efd8653fb76126eccdc826c15cbbe2e6
-EBUILD aiohttp-3.7.4-r1.ebuild 3212 BLAKE2B 662c712aa1811f1d7e603e175ad958d2d87a8075e0fabcf0d157c1efaff634e8a3b7b6f56b2990447072127d2d843af82e44cba711b1fe00160c8ae5849baa1e SHA512 76fdadad383bdd3cb061da3314eda61c9ab325e157990f4469808526a350ee9ac319326237b26f635f565ab6a3ad0c44eba2108ccbdeeee4282a537dde0a750c
+EBUILD aiohttp-3.7.4-r1.ebuild 3383 BLAKE2B 4e172d4405d317b98ebc7c28263c1344e9b75759478650a2650eca248fcb59cfee565b06c57b8bcb2ec3092660c5f2699c6e84dc5644afa894f53d8c8f70d67a SHA512 bd37c51c50ba93b4b4ecb3f989f2d0777f1db3ad1509002b2c81ad3f6210e2af2f81cf2f9d03a3e5a209089063b922b7b6052a8e32a1482611fe3787cac2b6c6
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild
index 4c0cea0a0d1e..1010ecc1021f 100644
--- a/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1 multiprocessing
 
@@ -91,6 +91,11 @@ python_test() {
 		'tests/test_streams.py::TestDataQueue::test_exception_waiter[pyloop]'
 	)
 
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		# fails with a 'runtime warning'
+		tests/test_multipart.py::TestPartReader::test_read_boundary_with_incomplete_chunk
+	)
+
 	pushd "${BUILD_DIR}/lib" >/dev/null || die
 	ln -snf "${S}"/{LICENSE.txt,tests} . || die
 	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" --forked \
diff --git a/dev-python/ament_package/Manifest b/dev-python/ament_package/Manifest
index 7bcc0312afaa..152483a14ada 100644
--- a/dev-python/ament_package/Manifest
+++ b/dev-python/ament_package/Manifest
@@ -1,3 +1,3 @@
-DIST ament_package-0.9.2.tar.gz 19471 BLAKE2B 5a2f4d326fae5976ca452666149f17019ef70005142aaf0ec57369df5ba53a99a0e10d15964843e0ba841a9eee1f268df76e4584ac0c004de091fa5bd773a6e1 SHA512 eb9def5eb0faf159d3082eac436059529886644c38a9f40183a7bef8e66ab7ef4d4fc266fe434128c25f040e369d4a6b9f376b0661cbf959960f3c62280c778d
-EBUILD ament_package-0.9.2.ebuild 685 BLAKE2B 1ed1abee5142b32349dd512822b226deea966d3a685e2e34054d2c50c5f0d69e2a403fd3499e385f902fac4cc141d2a223e73e6696795ab09a5a25c5a92c38bc SHA512 36bd7f7a9071501c1deaae0242eef9fef97a199900dc9734adcd0c378d76d0fda41ef48e6ce58a58aff782f6475e302da45d3c877a22e178dc74c7ccdd639472
+DIST ament_package-0.12.0.tar.gz 20119 BLAKE2B 98f013af8e17b2fcc0a516d90dbb517ae3ad292259665d188da1cf08aa5c863ab5f161f0a0e5d6ecf1bc85c1c5f7e050b9e29ffa65c2d8f9653d6619a5ba9c7c SHA512 d8e2984b7055fb796ddcfe2fad563da98d75e377c8d10ffa57a09e7636dfba92a81dc4580c35564fb8b749d123dc64138ed443561e7bce25b8785d0b980396cb
+EBUILD ament_package-0.12.0.ebuild 689 BLAKE2B deaaccfb13096d168ade85c43ddb370d04c1b36e9c17a00e0b55e659be8c2e42d3468319f10cd5e64485944644b62ea161a48c6632b46078830ed45eaad2b914 SHA512 5097f420fbb4d72d91721f54cb45fa97701e6eff5c5b21d922c89dca7cbf7c2b59249f1b6d57ecc676a81b88e2e21148442c4e58f7019bc520ece19075a388bc
 MISC metadata.xml 333 BLAKE2B 713e60970251a9efef7c6be91de9f139953058b16efa8e2c23aa407cfc395a53f63d319c08c0a4597b22c5fb6d9ee3b57c40ed36f9318509b95786297d9958fc SHA512 87cea6fec8887053fe14091c5b76687797618f1c56bdc18215ecf92176027001fe2da63b6cb7e111bf9ce8b6fb9d1b8c0451594a13623ced562840ccc3a7b32a
diff --git a/dev-python/ament_package/ament_package-0.12.0.ebuild b/dev-python/ament_package/ament_package-0.12.0.ebuild
new file mode 100644
index 000000000000..6027deba39c6
--- /dev/null
+++ b/dev-python/ament_package/ament_package-0.12.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parser for the manifest files in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_package"
+SRC_URI="https://github.com/ament/ament_package/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/ament_package/ament_package-0.9.2.ebuild b/dev-python/ament_package/ament_package-0.9.2.ebuild
deleted file mode 100644
index 630b864aa377..000000000000
--- a/dev-python/ament_package/ament_package-0.9.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parser for the manifest files in the ament buildsystem"
-HOMEPAGE="https://github.com/ament/ament_package"
-SRC_URI="https://github.com/ament/ament_package/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index dfa166836aeb..5a297c959ed6 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -4,5 +4,5 @@ DIST anyio-3.2.0.tar.gz 126210 BLAKE2B cedace636a115ad579ca47b345bb2a9bb32e97fa2
 DIST anyio-3.2.1.tar.gz 126277 BLAKE2B 510980c9251081d5188f7654279753051cd9f8221f2090fb99624612e48b6f5fc1f6d9f1808f1c329c350857f14ceaee0d72615857171de33dc35cc7ba35ab23 SHA512 ef78e5531a917e3a5ddc1106f45ba556ca147e52ab29ed6cb25a3bd287148a15a015942dde6b9535d683fbe5910affed27df6ce5c4049251610f689cd151ee89
 EBUILD anyio-3.1.0.ebuild 1413 BLAKE2B 35471e090dad1e7d2a820c2c1d225e211311f673bf8d4a6d1adf5d0221d293fad3813295b17ddac496f603a1e26737b7bd43135361f4c5cfbfd29b48fd479f21 SHA512 dff8ec2ff5c87f0bea1d083fe62685c4580580e17bcedb14b014396a280e2468cd548b44bb492e5b64b09c61c49a4f86f043dcbd7e4a1bddb58b8bfff5b443de
 EBUILD anyio-3.2.0.ebuild 1418 BLAKE2B 398427069cbee61cf7ae0111c76933c8908760619f4fd6c26622bafbe68e58287af7d916418aea7b06c8c96b928aefc5242bbebfece4ce9e03676b11b1d0510c SHA512 eb3abcab9ad4e5e26dc861508f881e3f96895eb120951be2be685c0727b0efa9a240a57caaf530076bcce8b229514fd1c80fc0f41bdf13a433aaf8ffc97c795d
-EBUILD anyio-3.2.1.ebuild 1056 BLAKE2B f4eb649e62c2af6fbf8c752d79da26cd8cdd29bce6b2820b67cb8b1a3783cc467d02458f6ba521ed6358f1ce733d58524c5fe832731dd92faa3bc8b67c6ce168 SHA512 e0ba07e14cf9bfae1ab38d8dcc1bebf83a8641056bd0828d2077a00a2def8cbb6afc45a7d6e0a4c9327a742f4b1a88bf08ddc63907b405819904b9cedf6c609e
+EBUILD anyio-3.2.1.ebuild 1064 BLAKE2B a5e3670beccff3e35ddff9857e1fdff6fb0d212803dabc70d868c402ee8286e064818d37bbe36c9ed9d17b596b39993185051aed462dedf51afddb5024d4aeea SHA512 f269acbbb42eecf0d3996658c43db8a493fa1add66f2505d897591780f07ae687adfbbad31d2c24147cd2a89b5133db07bfe003ca48de4b4eb78bdc7747feb98
 MISC metadata.xml 1320 BLAKE2B 0687bd9663338d0f39ad5b705f3ba3064ad7a399e31e6b6dfba80124b4ce719bbde82fb39f8b19b4a2fd22a040919163a59bfb57a3db143983d60db78d05811e SHA512 306491b404e5929eb19f61e359741b2961b3e600e3e6190e29215ea571db2d270d469c331956246f3336e05f5379d37d35bbea30931a9bbd8fb79a671d7642ce
diff --git a/dev-python/anyio/anyio-3.2.1.ebuild b/dev-python/anyio/anyio-3.2.1.ebuild
index 67f9a4d6fb2e..492fcd0eb77a 100644
--- a/dev-python/anyio/anyio-3.2.1.ebuild
+++ b/dev-python/anyio/anyio-3.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 8bf826a62bf6..a61a24d417b3 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,7 +1,3 @@
-DIST arrow-1.0.3.tar.gz 102536 BLAKE2B 020b9b12a529f31c8054cfe98b99ee791cd1f2889422e4bb1b0bb6873ff4c1748951b63d20d2526af2bea3ff13b26d809b35eed36984d1063c35c334d76ee416 SHA512 f8da6574758ca1f319ed9d71e4fc6e44d3c3db0a6fe36c8868c3515ab789093660e3d57d6de60813cf2eb57c7a3a8bfe92facbb410a383528cb1fbc37d860b49
-DIST arrow-1.1.0.tar.gz 109692 BLAKE2B da6cf4feb0048db4f808fc8d8863d59b1501c9e5ea8b171aacd36945e7dee874fb088c1bdcf57858e9126b42b312ec24511ee69e8846cb28c5d97b0cb5ece237 SHA512 9ec39458069d9538bd0f05fcbb03f92c6cf613c4bb686037a92ffcf7fa2f6306fa84ca6bcc2b7ffdb84c2fcf4cbe281ad7cb6698d1886da29d9121805140be49
 DIST arrow-1.1.1.tar.gz 113054 BLAKE2B 7f9d205aaba1c8ea4ad433baad03cf2392e5dcb819a95ef8de612f7d6f8cbb8500d224648c61a0f48403878e9b02fa8e90e3e3fb6411fa23eaf1f333205f7c1e SHA512 eaa6cde1083a0ed1204260ae9b9c850ca2dfcc53858e2391def28b2aaefe78671166bfdefa1c725adceb26fa8425885d3a0c3914782203e1c3be593dd9a00349
-EBUILD arrow-1.0.3.ebuild 787 BLAKE2B bc09a63555e5a833d0e1a9dfd645cd37963fc187a664fe0300b9963ec5e11a8aca745c8b35a7ea8b3866f40f93efef8c08dd212c50143aa11748cc58862fc976 SHA512 fcb1145f467ae6d0f66e420c265206b451e6511bc2cc3844214a920efeeb84a6ad7a1848a2816522f8c08b7f438a7716e55619c335d4bd177cd3c6063ecc87c1
-EBUILD arrow-1.1.0.ebuild 788 BLAKE2B ad9deff9436a4461b95ba0326b31be79eedaee00429b80f6a63ff1e8ee6b23c0517f3816e2eca4a79e849eb9789c75349a372e8dbb72e06d0bb2d9956da35c94 SHA512 611ae0a4e3521eaaf6b6a9f93d7dc9e6d6c33c01662f3966b0790af8fe544822584eead130c1381154132413219a7120fbea4497f6657cc2d24daf06a59be260
-EBUILD arrow-1.1.1.ebuild 790 BLAKE2B 08d8611d6f5d20d25f191904722aaaaaf24c16b41675de9d69744a6284917b3d733df153a0ac38087d1b737d1bfe619c6d03b4f0b222fdc768a513d16c24b915 SHA512 0e3c1cc4418bab96965b72394295f92d0d6bfeebe156d9b30e3aeaf44e3445d3817c8b4e604144c5cc4382e39e2636f50c054c3578210651f7cd2642b57668e1
+EBUILD arrow-1.1.1.ebuild 788 BLAKE2B ad9deff9436a4461b95ba0326b31be79eedaee00429b80f6a63ff1e8ee6b23c0517f3816e2eca4a79e849eb9789c75349a372e8dbb72e06d0bb2d9956da35c94 SHA512 611ae0a4e3521eaaf6b6a9f93d7dc9e6d6c33c01662f3966b0790af8fe544822584eead130c1381154132413219a7120fbea4497f6657cc2d24daf06a59be260
 MISC metadata.xml 386 BLAKE2B bc1174a003d7041b7741307be147e5d1e6035982b4174cef130017825d20b6a35835f3decce36e7c8c5fd4cee7d9ea77cb083850bc820f241fee1407665bdb5c SHA512 88ca68a6095f8c900c55d4ca1159d78c4ace39b326b1d5c9086d27177c9f5026d83d32e7c8bed3813a623e2be22243c3fd6a268d79ca528ade6f42bf3fe5a7e7
diff --git a/dev-python/arrow/arrow-1.0.3.ebuild b/dev-python/arrow/arrow-1.0.3.ebuild
deleted file mode 100644
index 85cf54a89d7e..000000000000
--- a/dev-python/arrow/arrow-1.0.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Better dates and times for Python"
-HOMEPAGE="https://github.com/arrow-py/arrow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' tox.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/arrow/arrow-1.1.0.ebuild b/dev-python/arrow/arrow-1.1.0.ebuild
deleted file mode 100644
index 2a7c7c5050b3..000000000000
--- a/dev-python/arrow/arrow-1.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Better dates and times for Python"
-HOMEPAGE="https://github.com/arrow-py/arrow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' tox.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/arrow/arrow-1.1.1.ebuild b/dev-python/arrow/arrow-1.1.1.ebuild
index 5064da91ddf9..2a7c7c5050b3 100644
--- a/dev-python/arrow/arrow-1.1.1.ebuild
+++ b/dev-python/arrow/arrow-1.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 89add28027ca..63d29a574bee 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,7 @@
 DIST astroid-2.6.2.tar.gz 360787 BLAKE2B a2744b9ada601b731989f17ec75aa94d88825693a4ccf349374b8795b0db3879aa5bffe838df68759ff3296cd8af9cd45524e7d894a363f54055f3f1fa01e92e SHA512 776f8f9a12d425b7f048318b632dedb8894b6a3051a0607d1079437084aab4e9593e39cf9c7e01c2dd722364d2396cf13d7d26cc2acf33482d75584c458d4b89
 DIST astroid-2.6.5.tar.gz 364383 BLAKE2B 22da12e30bbb27ad93516ef18ebe64839fc1f7057a46fe82444c189bada942b32e00c314fe47eaecaf7cb2e7e047206152e1df98b4f46a40010bef9392721b9c SHA512 28c6fe2953f10f99c31af611644137d566489188459c9249e5621c4dc1c5fecb59c1ba3cc0bbab95c2609203388d1df299f0cb87a1fc3b3bb8b4ad3ad6b010a4
+DIST astroid-2.6.6.tar.gz 368118 BLAKE2B c5117566579ee6c8ccf973e180b3de3cd3896110221627cfa16d17fbeb049954d4452d3f55ab4161751a9eb7892fbd49090eb8e82c5a90f5985ec13a9f5d1fdd SHA512 a077c291b90f52d353d27b8e6aee2ffca1d69bf0e1e7185c32f3959853d9f2957f411975e5bf66f27d73b66cce6bd1e55529de6b7d0a17dea5399edf3a404825
 EBUILD astroid-2.6.2.ebuild 1196 BLAKE2B 53bbb6e068191e80ffa6d8b71d540e7c56d2d7e9ddb5413392dd3f5a543d3c1c1516e7aac55ea83ca23d17f2a33fda8e2b2045bd598986527b8013185c93a6d1 SHA512 e6aa109be4acba3ded8e4b2096b1248498c5cd224b4da42aa7d5c019c7968c4f68c3c523a71c33a662db57f1d438856c40b6a6ebe2aafb06d2d2087602f6ab98
 EBUILD astroid-2.6.5.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
+EBUILD astroid-2.6.6.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.6.6.ebuild b/dev-python/astroid/astroid-2.6.6.ebuild
new file mode 100644
index 000000000000..cda705df7b1d
--- /dev/null
+++ b/dev-python/astroid/astroid-2.6.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 99f09c149359..0e7feeeddabd 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,4 +1,4 @@
 AUX async_timeout-3.0.1-fix-py3.10.patch 11203 BLAKE2B dab3b3e09832ed11a9c684aaa3c21f2294f0066a740ebda047ae8b550c72caa1624b30520870989ec2cebedb72a8e556a92aeea0652411afc16ffab1ca2d825a SHA512 80249589c7f2f2f7c914bef7bf6fb3f03bc9a7d8dfd3376307baf85df28f3240381ca3a580091d1aa1aa9fa4f360ae5d92a5e1b46c308ac0c7e0d857b9d6648d
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-EBUILD async_timeout-3.0.1.ebuild 968 BLAKE2B 1796e2c00b629edd090b88a3b6cff4e3a20190351d1ae105c0cb16581f0a353e388f3274d6693612cf2df95bf95ab495dd7cfb55088594827fa300cf56c778e0 SHA512 16aa8169ceb211ef74631b180083cc9d900b13016f0a90c363aec91832b00051c25712e610b2aabad7fcc443e4ed566b53a8c663e13b963b856ae6e3e5387b2f
+EBUILD async_timeout-3.0.1.ebuild 974 BLAKE2B 532d3834eda42a0b4ddce694a89a202e2e76ac0d5ca148a8b22b47070524ac27ce2baf9f2633d8d9067f2edc6d492e23eea7aa4ad21ac12bd845f8ec3f5836db SHA512 458d6b58d40909245e9b4601046a7c24e9012d5167a6593877ec0d638ce0deecb90b4beff417376667226b7a479e64d492c9089d7c6a927de67e3c53b0d62157
 MISC metadata.xml 459 BLAKE2B aa3214d8a14324f68b5743f51371cf1902962a5b14bb7065a04944684d33f9639edbc9a899f5cd02ca19068506c5e403db149742d0b1cedf8e35a5927a837901 SHA512 fb0488558b0e1d7b9e0721a7d299bf2d105d66c67f51ea1bdb1b8dc529bb3a964c89d4410ee8640d0b094d1e364e5d59d8a9b7bafb0cdd9f3dde6443c0d46a15
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
index 33755ac4a219..72fa7f086448 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-entry_points_selectable/Manifest b/dev-python/backports-entry_points_selectable/Manifest
index 5bd10ef5d57b..dd7127f0441a 100644
--- a/dev-python/backports-entry_points_selectable/Manifest
+++ b/dev-python/backports-entry_points_selectable/Manifest
@@ -1,3 +1,3 @@
 DIST backports.entry_points_selectable-1.1.0.gh.tar.gz 7689 BLAKE2B e7fb4372838b47e65e50d91acb034afaf326947bd76bbdf14b57834b94c72fb62afa6526931a96cc1e10b43eca9d95dce7fde431c24a4e15a4b2569ddf42faeb SHA512 abf8f5d228b52281160cedfd017f1a4273b8fce01ed29e9f0417f750125abacaf97a3cc6f363849702d1dc6f3c40602461f79bfcc2a36a3dfb962af1112046d2
-EBUILD backports-entry_points_selectable-1.1.0.ebuild 770 BLAKE2B 81d433d898d2a035416bfeb88da464eaccb31fdadb89e787fb0e0f989230189637ca16603b26ecc90fa8d7facb3f05a4e184d818bd80c05d91303d4935fe69dd SHA512 7cd8df37f6fca99d09f35d49a12bf5b3ac0793a8bf84265c5cc160f301d79532a47303e286018798653773aaa07577fb7bc8939d97198cce47a9c43ce0e85013
+EBUILD backports-entry_points_selectable-1.1.0.ebuild 801 BLAKE2B 4c9df7d4818b08cf176aeb88c1dac81e8c0351502f38311659b1d42a0d429711c8c8a82b1af147fd41b7572658dd43460f382e885f0696457bfa50d1089c91e5 SHA512 550c7aa8edb02b2031272473322f469d2a1a3225217f1f79e170c2d4a61e47a586ca9f9b62f99700ed8150cad421626d7a21463dc68c1b48467f10a5f29b4a92
 MISC metadata.xml 394 BLAKE2B a52263e74cb9051e6c7dc696d1f39e87ded29b3894f58a455b25dc469f084dc4e71dc00fa309a5ab7b1ad7c9fd87e6fd2b95e28be17304aee03bc29a6139b4c0 SHA512 79f57eb7cb48175fb0fbe2d6269c1c7fcc7b48dffede2b77d770333b9ed37bd2957e3531d4638ce3dc83f4bdce83d06477a032a683766a664399bcf5afa68949
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
index c2e9776a97cd..369229f33401 100644
--- a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
+++ b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/beniget/Manifest b/dev-python/beniget/Manifest
index 3134b8dc67dc..30dc84c4ef51 100644
--- a/dev-python/beniget/Manifest
+++ b/dev-python/beniget/Manifest
@@ -1,3 +1,5 @@
 DIST beniget-0.4.0.gh.tar.gz 16212 BLAKE2B 881b08b40f69950a0689d10c8832d1fe02f3cbcbac3bb5e341084ed59075cb5ca86a22759753036bf65ab2c253e8455c2663b674759f007d49d2ba014a54e400 SHA512 521df94813a086832fe99420815823fe07803350ce8692bb45b793617cd642d0fb590304fe6bf5899073a7ec1c102abf5688ebca23e37803d4576ad86fcf7a96
+DIST beniget-0.4.1.gh.tar.gz 16353 BLAKE2B ef7de5eb15b59de10c56057b22e718ca7284d251a98ff1f8dbe31bad2e1bc7ca3c22c2794b1cae8b4c5fdf2a4b91ac6f9a3a0bef3c3aef51fbe6a93341333e31 SHA512 bd2b7beda41953be9b4052b539ae9812a370702874602175bfca66deebbc569515b9a59c750dc4898a6cb9f4a1d49f8ff15c1288035aaf72940cdd439eaace43
 EBUILD beniget-0.4.0.ebuild 555 BLAKE2B 7d7700112aa737ab87e4abe7c6ed9f05ce7f0f6f0e8b7dd81c100e3460cfc22f83bdc7564bb21c9e2350fabc626f1945debf6c620b1bb57feb8ceedb7b8d865e SHA512 5f258cc0dbd0293337d7b06064fc198cf0f758fbc562facade99ff839c143143e443f0e51c6e9862d4204f429356a8e486209795b5813014f87b5417bc45a815
+EBUILD beniget-0.4.1.ebuild 555 BLAKE2B 7d7700112aa737ab87e4abe7c6ed9f05ce7f0f6f0e8b7dd81c100e3460cfc22f83bdc7564bb21c9e2350fabc626f1945debf6c620b1bb57feb8ceedb7b8d865e SHA512 5f258cc0dbd0293337d7b06064fc198cf0f758fbc562facade99ff839c143143e443f0e51c6e9862d4204f429356a8e486209795b5813014f87b5417bc45a815
 MISC metadata.xml 353 BLAKE2B 045be9e1628640f0c33d984d45107f67bdc692ab5e9648a7a333e5d933f163c4738fe88c13887254ce6cb87f2cfed401477c9b8727c2264ddf6bbcf99eaf4939 SHA512 40571beac3e14d1455717533e9be0db570f24720ca733fd7b51e93dd3a0d12dc366e361a659167556ac4e447280b808c09ff021efa2f36d6deb15e3434b7c67f
diff --git a/dev-python/beniget/beniget-0.4.1.ebuild b/dev-python/beniget/beniget-0.4.1.ebuild
new file mode 100644
index 000000000000..e1aeadad6a54
--- /dev/null
+++ b/dev-python/beniget/beniget-0.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Extract semantic information about static Python code"
+HOMEPAGE="
+	https://pypi.org/project/beniget/
+	https://github.com/serge-sans-paille/beniget/"
+SRC_URI="
+	https://github.com/serge-sans-paille/beniget/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="=dev-python/gast-0.5*[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index ca8910cf8b7f..c6d7fbdb18b2 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -4,5 +4,5 @@ DIST black-21.6b0.tar.gz 1149421 BLAKE2B a9935d9ef3c9530d127cc2d06e2d64b48e6f2a5
 DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
 EBUILD black-20.8_beta1.ebuild 2242 BLAKE2B cdcf87b20f7d169425bf851b68dc8f393a7fa60837cce59f2ef9445189609291f5e53561c6411587e0b1343075e5bdf84fdda3771db629f856ce94a15adbafc0 SHA512 4a9fd8f011f4d10ef2dd21cb142065d568fd5d3486a00d4932c1f270aec46fe6f9e097667db0356d5c791dc7fad1ff9d88792292d281da69db3ec68dd5b1f14c
 EBUILD black-21.6_beta0.ebuild 1567 BLAKE2B b9ebf689ad0d2cf8a38fa296977ac10afe2626d90cf0cc0a0ceb8b26364a514d1536b34d21983984363af17262e4adfa6fb1d59721dc6a901cc65c7daf6971c5 SHA512 228058c935b77d23dd2dd26d42d3aef199e492255f39898dc57093b7ff81ad45d83020b7d981eb97811a29c3ba826a826858296894c2bcbedfd5c9202055983d
-EBUILD black-21.7_beta0.ebuild 1411 BLAKE2B a19e601c5157e0507bce9734bc6c026fc0c53f7f1e19af177c2863991b52a3dce93b6bf42879f224c5d23ddf3acb3f38bc1e4ff7d0377ba38af32a358cf623cf SHA512 2caf50f452b84c2e53609e0aa92365f2a35b4ae0eeab7a928657f5d0ef4fa6b07ee2c64393270ff00b2940cee805b3c65f16e1cb7cdc9c67e8501adc9198cac7
+EBUILD black-21.7_beta0.ebuild 1417 BLAKE2B fa0e5475a30d04c4927b1ba17c934fb260f154b84a9d93ba659bfcac03a3a505429d8f0393e60d0abb5002b078660ed97e8d94e2c517600a6a3d2b4a49bf30ec SHA512 1b1b43a270a731586983c38f725b1d834d38641ed008dba5ce8c3a568333b301cfc59b1faa566a16951d1a5227e3f608da43fcb91a9db7e3a41ddb3329573f89
 MISC metadata.xml 396 BLAKE2B d65402ff00389ead3359ab2afe53d33e88a5c0a6aedfd83f6a3fe946f4005e1edbd77683b2fc1097a7963383da492bad8889c2f30dd0408a4c8fb9fea6d508f3 SHA512 33aeaaa8cbcfbd0323075ebc06e4ff2dae2988ac88fe067a3fd51eae6b5ebb6ebaf9bc874d7275acc0ab6d36ac5b6ed9cb32d8e10e3e0bc3aaf75c70a5041c8d
diff --git a/dev-python/black/black-21.7_beta0.ebuild b/dev-python/black/black-21.7_beta0.ebuild
index d104c045b58a..25f7747a2881 100644
--- a/dev-python/black/black-21.7_beta0.ebuild
+++ b/dev-python/black/black-21.7_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index bd02d319e3f2..925d04e31c6b 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,6 +1,8 @@
 AUX bleach-3.2.1-py39.patch 1637 BLAKE2B eeb66b15ad738d07db70bbf4599ef393678ca737d122efb7b0c5b5ae6f153b8989b4efc0bf26bdc34c9391af0e81fae5a0f01bc25e2b11db0c5ca76785d6b848 SHA512 5bffd50d9be425a97d6032ad6a55e2d92826ea9e074ea76039a94377c2b4f53599a740cd7fd5c6f90aa2ba87882d46514d014889b0a09f8273fbd31fa98f5b50
 DIST bleach-3.3.0.tar.gz 181274 BLAKE2B 32883ef9a77bf1d0cd208217930474285e55f158dc8d7b9c4049ca896cdc5cfb873674aa5f5181c31d46345be29f954badd29969bf156b1cc10eb200214de367 SHA512 8e408289c5175234a383658552e48379da9f570866e4c248a4e5c0b7bdaa9a2e6be545943dd32968cdb425929d51de282cca0678fdc6dd06b6fc2c2f41b58097
 DIST bleach-3.3.1.tar.gz 183687 BLAKE2B 9ca70ff84919b6b893afdbf7914098efe7dc3c9f0c86a729a92754ba6dacc95752abc44cea96db282483cf53413d6a98421c95f102941d23adf89af00b2a5afd SHA512 bb68275f91a4c724c14594d008f58d31ab0a97b08fd45b6cbe8237a31a1bbfd24a19cea1a835efffb979739ce17a3c065099e677019e498e78d9a4222ff2d66c
+DIST bleach-4.0.0.tar.gz 183459 BLAKE2B 380e94163b353e9436748fc6c1f368fb4d261087c2d6bc6fab1262295d597dbe81a67c34b889a29fd6a5180b8b522b517dc234e78b26556a16845f26f83151c8 SHA512 21f2a2dc5fa5e09cc2e38325191d7dc0bff2606cbe68ade54d866e326e712cb00a80b3a7a44f844ad4967ee6fdf453cca07d02c337bf147e4a12237231bcd99f
 EBUILD bleach-3.3.0.ebuild 977 BLAKE2B e2b92647dd8040bcbda4d045e9decd1253e527c6d4850f5fc6de0608b7f21b65f063561dc59cadb4970487d9b7939c936e026a3eec3e88fbb02abd94d9b4077e SHA512 aa9378ec21b658cbb780fc69f547582d1c20cbe8018c5e13439512793164e7f98dc85d4d4e78dbc3e55ce4560260e6bc901372130d5a70b332bb798a0ea8816d
 EBUILD bleach-3.3.1.ebuild 996 BLAKE2B b371d730c001b943647b70bf6cf8282baacc8bd39cbba1c0b7d8221f71bc8edbcb74b396ef1f8a337c361aecffb681c560dd4616c379fd6cfc39cb10b3dcf044 SHA512 dbf86e3442d46c503571bf6169b542bda8a2cfce28b9a1745a26c9b97f6a97e32a3e21058ff4f1388dc2cfc56a94c1c96bfc932e308329e9f5c0842dd8201b46
+EBUILD bleach-4.0.0.ebuild 1002 BLAKE2B 337fa8a4e0f5f8d252463d6a69bc23a22adeed5baa19d057252e371a682357f34e4669b185d075feb272d3a01ebddffe4b6b9cb48db5ad1020631520ff1b9c13 SHA512 e047f0f2bdd86c5b0a75f7fc7cafe17bff91b1e9d3a0d1b3f7425e08bec2525aa317ec1cfa5c25a05cddd95e808b3cc85ff7c6817fe74e028696825b33d22761
 MISC metadata.xml 400 BLAKE2B 931735ca08509e3a1f8803181a1eca6be10b654fe37244772eb43b918dcac641c1733e535f2504bfc311644e52506712857ea24bf4784cebcb8b6063194d1388 SHA512 b73e3cd77b2378668b4086395f9a268105d94992f7b9d23ca8cfb834d015cc3ca0ed995acadba9060a5e96d29bae128b850a803a11c4b3d993f518180d9b4b5a
diff --git a/dev-python/bleach/bleach-4.0.0.ebuild b/dev-python/bleach/bleach-4.0.0.ebuild
new file mode 100644
index 000000000000..a2c284761436
--- /dev/null
+++ b/dev-python/bleach/bleach-4.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
+HOMEPAGE="
+	https://github.com/mozilla/bleach/
+	https://pypi.org/project/bleach/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/bleach-3.2.1-py39.patch
+)
+
+src_prepare() {
+	# unbundle unpatched broken html5lib
+	rm -r bleach/_vendor || die
+	sed -i -e 's:bleach\._vendor\.::' \
+		bleach/html5lib_shim.py \
+		bleach/sanitizer.py \
+		tests/test_clean.py || die
+	# indirect html5lib deps
+	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 40bb7af24211..6a0c48a176c2 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,6 +4,10 @@ DIST boto3-1.18.0.tar.gz 392345 BLAKE2B 8d464e038892cd77d7b171c27f41eee31c630ebc
 DIST boto3-1.18.1.tar.gz 392759 BLAKE2B bfa0bcfba9a413fbb13b2698f3ef2461cac99a9fddea0fe16d790a0ddab60fcd46b13ac4026536b9f89fb65ff703d61a4f01499423aa54289f17fc0f035ea2d6 SHA512 1aca424ff105fe2049c94aeaff306a683dd4eb9ac9b88303ff4857f53ddb4d3f267ef69119f8cbdb8463ab12331b2d89149fd0b10ccd23c4fde9485e63ba0005
 DIST boto3-1.18.10.tar.gz 398199 BLAKE2B 950b40afd867a8df9f8154e35572f3302c03c686d3299aac100ffd18a82c9e9a6657a4910f89f385dfb742c32e315110fc61bf00d2dc14892c4051eef5c642c8 SHA512 0391faf993faf8f4cc28e309f3267acc1beb38229f633f4c409820d45e968b1a93a7c74798ee84aebcd29b4547c9f301decd451e89b65a34297f796e1f839826
 DIST boto3-1.18.11.tar.gz 398542 BLAKE2B cecccf462510a6deb55308ea4156ae081d2357480e5d8c160797032c62554ac708f37b38e1cbe26a18e2087a268b392a145d0733400a86e4fca19a5416700ad8 SHA512 63cbea62fcd71fee1c53219f6016fe38bd08afdef0c27d918bd078d04803d14ddd4782c0182e304542314df4bcf081d802d1f581b25ccae3327c4df80e40dabe
+DIST boto3-1.18.12.tar.gz 398935 BLAKE2B 87f8627459908e4ff4bfde7ca7d325a355635c8e7c77cee515d30a443bfaba8474e3637e8facd8fd77778c2faab272e6526df92e96c59db4901bd3be44fce24d SHA512 bef678df9f073bb56152e8e56b4341e40aa98120ded26d1794d3e91382a994929150a06eee543d5397f065e66a9dad192b1a30e89f9d430f8a305a6d1e5a99b9
+DIST boto3-1.18.13.tar.gz 399893 BLAKE2B 3c3e79e2a8ea41a6bf88a2e73926d6e61c9844fe0d373126611e3023d98d9e6a64cf7b537726260ae70fd78fea32f19127d59ddac5d48489be231bfb2a51b693 SHA512 14987a472d5dd7eb254fa4fd4e931b43f36afc57b40676c0c2c2400bb24d7a31892d317b2da6d618311b5df91ee4a5c6cd4974ecf90971540c41b4d9632533ff
+DIST boto3-1.18.14.tar.gz 400263 BLAKE2B 827cf91c151ec03c6bca44967b8b94a5a4f93510ddae67b74dfe17fa800d02d2b139f3a0ecf6958ce24350345dd1f6da3c8dd69d7a5b504fbe79a9e8b587a3c2 SHA512 c3c338868ce50976deea02b308d8f9afecfbeac725319b4379391af1f85a6665de2cb59b2cb19a05520f1ff09d5c31bdc06525bd05e5bd2fa499641c4308b240
+DIST boto3-1.18.15.tar.gz 400374 BLAKE2B 2170319480578b9ac7b6c0da9e9a2f256ce907b8e53bc626bf26fd65f3336ec1974d6dd1917f601fe139e859f144fafd198b2578ffb9097508f09dd40cf82313 SHA512 f330d8249c9f5749770ba5809f3a4fb524f23fc0545b24182023a3b74f815608bdb9986b434d972a017aa7786b1319705e8702b041174275f84a0266bdb7b857
 DIST boto3-1.18.2.tar.gz 393528 BLAKE2B 20424f9a8ff013d1d9724f741ad6754747de504fb961688f433eba74ce1d6df7e95d68c45be1e87df1532f99b2fa4d7e8b00671a8ae9a378a4df74764924cdaa SHA512 287a1f24f62fa83fd944632799540257b2f8d6cf3b5d6add57be60e4f49dafd685bb4fcceef37fe907edba00a7f2285d92bd8d381b03e45ac794b22fdcfe8783
 DIST boto3-1.18.3.tar.gz 393645 BLAKE2B 4967ac751e9ff5a86f6f571961df31d82f6012ade28aa19a038399077bf5a1b968dfa1172995423890b79a2ede54e2c6f6c1937e8ccf21010f17a4d96928df62 SHA512 f9c42257f0925fffaeb1a36e4731dc54fee1836c249617444292991d043dbb9b58472f73a806981c9763b569cc7402b378f6e1e0102fe0f995a7754807f19b38
 DIST boto3-1.18.4.tar.gz 394442 BLAKE2B e82726143b353b843e915ea78ea2e033077ee495b1d416866f5c231f8bd864372496736d266b2b848ed8afd3134bd865c507291fd2fbdd5cae00a92ce3c5e76d SHA512 b3ba1328476a1c642c6b813afc3879e904bc14da69e062156df0405b3da6d2a15a4a40602f24d0a067a83cc441ce5a5e353dacb84869b0fe24e9984c0dec719f
@@ -18,6 +22,10 @@ EBUILD boto3-1.18.0.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f0
 EBUILD boto3-1.18.1.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.10.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.11.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.12.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.13.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.14.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.15.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.2.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.3.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.4.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
diff --git a/dev-python/boto3/boto3-1.18.12.ebuild b/dev-python/boto3/boto3-1.18.12.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.12.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.13.ebuild b/dev-python/boto3/boto3-1.18.13.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.13.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.14.ebuild b/dev-python/boto3/boto3-1.18.14.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.14.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.15.ebuild b/dev-python/boto3/boto3-1.18.15.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.15.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 95d181af9509..176d88082861 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,6 +5,10 @@ DIST botocore-1.21.0.tar.gz 7955550 BLAKE2B 7e68375d07d858dc2071538c2382d8693df2
 DIST botocore-1.21.1.tar.gz 7954248 BLAKE2B d6e7a71d6dd90ed0fcf0dbab3182dcdfa4072e65a1f344d44ac30abc829ac6c546a0ebcdee51f61ae65008550acf65052b49530ae3b3a62d81af222e6e8a0929 SHA512 86d4b4159a96426e7ab853b06564604fd9729011199ba691f6204a7e5f52d9927b93511b73cfc03b65bce706563c6d50b577d85d0de0e50fb5d877472d8326dc
 DIST botocore-1.21.10.tar.gz 8001298 BLAKE2B bbc762302462d9eb5e223245c8dd2430e6f190b643502d3a124e3831f531f014e49bb54bde768fc2dc7313e5b6ca7c78076a74511d724396370d1f699366ab44 SHA512 8e3c90d24ce5c6ae76376649c1ec191bdca162adfa8ab1b33903cffa9ccf2d7b306efe36b9d81f53f579170516c91c7c3f47a00d3033f5b691f2495b0ac97b88
 DIST botocore-1.21.11.tar.gz 8003282 BLAKE2B a7ada604bef2d5130169b0905acfb1ed51fbbafbb9df29d2ed3e3cbf89b44ded59b0de1baffe46b27b10e854b190517d95a26022cc22145fbeb42c46cdb780ae SHA512 45f66cdbbc66dc74c5aac003eb67569533088486fbd3443077be7d6ecb4fe9b8ba9a9de04b94b44fe02167f7261fc9675b7cfb8973de95510d4401a237416713
+DIST botocore-1.21.12.tar.gz 8003489 BLAKE2B 39249b2ccbca9cc11b8acaef59064de3f6533a399949eac6c7168feab987f98914e213cfa4e39067c431e65ec04929b68787f971cd3847229668f12c723f8194 SHA512 7332026e1fab6bc36627f5d9de21367d99ec307e8ff4591671713e81ad44b0549ce7d4fc04f992fc120ba55c54ebc8b5095ef5e4888bca19e0d2aeea25dbbc0a
+DIST botocore-1.21.13.tar.gz 8006167 BLAKE2B 7f876b608fa0d24717f010426a553f54aa3c5a661d923b2a11b685f81d14cbf35fb6cef3518992eb00a520b79d79499af39f4fd03086f6caa6c20d256723fc10 SHA512 e2a2a51e74c5cc98ebc28a58a6865030ebc810f8fd56ae1e0baac23f815b65f9f1fdde6d9e0771a847d383796213d453463f89382286eb0c762c11e0c682ffc9
+DIST botocore-1.21.14.tar.gz 8014362 BLAKE2B c201724fd1eae1a9f84e81ff9d23b27eaf7f38d2a2db1bbf3f1ad7aca37183b56ea752478e78825f5eb5762e649b533be49671acfbbc058cae96bc14121bb336 SHA512 eff147209d9526e2b90fae2dfdaf1536ab29714277d8e4ab2e0244cbf1ab3c98aca72e04c5c7659a98464d52a016bcd5601428f860c67737b080e562c36ebb6f
+DIST botocore-1.21.15.tar.gz 8012673 BLAKE2B cdd2b4128e67c85879e85f61265b10c1e5765eebf65333059af56a6a5b1d650a7612c4b569afde2396704015294e74b717c35d49c3e08396b2c603b7d47c632b SHA512 a5916ffa64568b2040d6f76571d9d716d50339fdaaed61f4ff7be92a5dac2c3f967280330fcbd3d6c2e1c1faf7bd6012ce75dd66ff26fde9d830d334a9d7c45a
 DIST botocore-1.21.2.tar.gz 7960118 BLAKE2B 11d2845e1846c03591625a95b21ff6fe1acb1448414a5f09de1d427614e927d974fafe5dd5d4f195aeb2f3b86d60822a8c73f1bc532bb45c85be8421f92eedc3 SHA512 501f059518026bef10fe933d20a3348b4140cff9ef1af38e17552aea8698179135f5271604e988f53c215e3a13158d7784a49a6b56c0d4db591f99dac9c57ca8
 DIST botocore-1.21.3.tar.gz 7959023 BLAKE2B aab15319b9f36c25ee88f2bf0b2efcb6bbffeac1b4e38dcbdfde3a947f702016e77b66c4b125ca2b63614223109fd793da68f9ce1b1d14476cdd6a3fcb10dfce SHA512 5a8ce8f612fd0e1c68a75223dda95673f72159b02a040d1a71920b7e75b3aa9d14589c33a52970182970a353308954e8cd6d5f97d374e0e2ee2cd40e0dce786e
 DIST botocore-1.21.4.tar.gz 7964960 BLAKE2B 71d55b47633aa658a9dc921375c77230a6ebb89460d9de5a9982d730e03247972476400dbcf292da0a885789860117c1abc9bf803c79547049b242feb8755d15 SHA512 4a36e5870d9996973e2258f2e6afeb7381ac94d14075eaa9885f6f89afb87fa5b4461b02ab234b4ecc8e24630434dbb839e8ad30f622de6ffa5402f872f84a97
@@ -19,6 +23,10 @@ EBUILD botocore-1.21.0.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a8
 EBUILD botocore-1.21.1.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.10.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.11.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.12.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.13.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.14.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.15.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.2.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.3.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.4.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
diff --git a/dev-python/botocore/botocore-1.21.12.ebuild b/dev-python/botocore/botocore-1.21.12.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.12.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.13.ebuild b/dev-python/botocore/botocore-1.21.13.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.13.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.14.ebuild b/dev-python/botocore/botocore-1.21.14.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.14.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.15.ebuild b/dev-python/botocore/botocore-1.21.15.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.15.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index c77ac3384bb2..c57792c8f237 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,3 +1,3 @@
 DIST bottleneck-1.3.2.tar.gz 102565 BLAKE2B 4d903bd8ff918a54cdee5b6c6815e8d404c6d3cd1a73e02f81888aab077970a113fcd24acef9da8a35138aa808c211883bf9bd952f83f17df4f94a6172fbe140 SHA512 9b6f812a625c9bb39501e8834ce41ae34ce57038d3ec9528aa8aa80910663c4e3b420d535f0ec8fa9e506faecabaf0151950afcebdc919479ed04787f26dc3ee
-EBUILD bottleneck-1.3.2.ebuild 691 BLAKE2B bb72a9571480e7aa2e448aa594de34833a66d68ea7421e35cad7b7905138436dce7112bf49e643db62e241317b88a97ad02ec61ea2994680b614c9e155afae58 SHA512 c3b1fc381b7e15c572c613de75064a7e61487dbf7a2f4b0eb1ac904c8bda91ab67f2451f31fdedd72bb72a7100b6eacfd431afc98d1d007b8873e4708f62e7c7
+EBUILD bottleneck-1.3.2.ebuild 698 BLAKE2B abb3ccc730aa74873f9f933808214ac7f02239736467a5151592081840a0c998bede062d88d35e0087fa83a1cce2620709a82dc33baab43a2943473e9a70dfdc SHA512 139854648dc314fddfbeb4971b95d2f58f0491b4a9c75da4a9e28b4daf4ab77ff7ae3543c819a90694f2a7f2fedc3a03219204de6c9e8a7fe8a1efe5b24c583f
 MISC metadata.xml 352 BLAKE2B 3ead01da9109e52e74befde776364c4d88aebb02d1d6857654d3ceb3f9c8bc6710de6d89dba16151497055e1a18bb6c6ba012242c1ce7a9f4b3d1f5f943992d0 SHA512 7bfd46f9995d2c167dd572f409900241f09beede06bfd79c4ddf8733e0e762fc2ee86379be9cb0dc57f7b56643ac6be36172dc0966cad2a6736924766bcc5415
diff --git a/dev-python/bottleneck/bottleneck-1.3.2.ebuild b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
index 2bb815468f3f..7220cd5df777 100644
--- a/dev-python/bottleneck/bottleneck-1.3.2.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 85bda1754557..abac0c43f641 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,3 @@
 DIST breathe-4.30.0.tar.gz 190892 BLAKE2B 19723ed2f979eedcab73a9920c37cf6d3f6e02ff08703d601cc38fe55ecbac28b8ef8d319205723fce75b5e679a75fbd8e712dc134358e1ba6c23dfcb999a472 SHA512 fa09ee687a8e67fa480865a0d33affd9aa0ab48b0cb5b685731ec393045d8c9e1ae0622a1315f805449d712e99e6982ed229bb79314c69f69da0c705d075f7f9
-EBUILD breathe-4.30.0.ebuild 812 BLAKE2B 14bff5c389afe107bad563dab70edd042e7b9b7b0284f886fccfa51a221821cb4dcb00287cc27f0f612369f4c788f6372b5f8ca380fe922a5d82b03367b8ef25 SHA512 c7fe00015618bd0cf3756d7df994e25ac5358ff6c00f7da6e9e05dade7b16e13f5ce27f7669ea642d2e674f1f766b763d7dc73eb1ddd8956fae480f3dc69d28b
+EBUILD breathe-4.30.0.ebuild 819 BLAKE2B c62e78d4a3631f0ea7e2358c26523f370eba2973a1a62c901fbd971eb416d6b67911fcdd97a157d3cd8bdfefae419aa7e82eb1549dd401d45616deb4aa3baf89 SHA512 807655cc398fb44f235eb1edc643f9a05b2a5fa7c6988e6452277122c8feba8b26128b8c4d690cabeb5dd94d511e324fd56d2faca471bf66e6fcbfa827bc5a74
 MISC metadata.xml 821 BLAKE2B 5105f5b60fd5fb3852dcc4d9c6acbeeb2f15e561256799162b5db18c1dcd665f2ac94f9e766fbab3c17856da7936694700850f84e7ca3bab196a5d96454b5083 SHA512 15b0904261afeb1e16da06f81bc78ed099268c7119086e04899eb6735656d508f3eb1dcc8bc1d8a0f6ae59943f1b2aea4204382eb78474aadb72b9d2030bf3de
diff --git a/dev-python/breathe/breathe-4.30.0.ebuild b/dev-python/breathe/breathe-4.30.0.ebuild
index ec91bb36a878..e18fad478984 100644
--- a/dev-python/breathe/breathe-4.30.0.ebuild
+++ b/dev-python/breathe/breathe-4.30.0.ebuild
@@ -15,7 +15,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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 955e6d539eba..752718cb7220 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,5 +1,5 @@
 DIST cachelib-0.1.1.tar.gz 10192 BLAKE2B ce1ac03498e331c0df405e99b26f24cf38f21243c60d90ca3b0fab599abce5ac8c59ba8c566216d761fea170d64934c63fd74f9733c50aa3ebe382c54b80bcfa SHA512 865dba727427907227b021ecc5962738c85fb74f898acfe1612e48247ada9eda3eddb72c3c29c700fe4275ed699accc5af9526afbaf0dfbfb3a1a1a6370cc3d6
 DIST cachelib-0.2.0.tar.gz 17735 BLAKE2B 737c5083b719b6330df4eab3e256fa64b9bd2292d46a1c0b82c72c6f69f4f2fae6623fd4bc167533101e0ff01b5273a1042f5c1bdf35080a5241358de642cba3 SHA512 4011d9ead4fe27a54508355eba46e91a924ce30ef3d7cdc5a2049f7e0e48f924b64d65f203aebcf9a8729f956b6edde4160cdb7edfa7e63293e2853b94bd6601
 EBUILD cachelib-0.1.1.ebuild 514 BLAKE2B a3d34faaaaa1a3d7d254093f81f7a65382ce0d39849df1459deaa3cf4b97d9e4f120fb1e3ae7aa73b8c79b78a338052ee614cab160e02bfc8584f228aac1f9b5 SHA512 2b2d4a1adcd50421722d41170dade21d406213479de203912023434ac6c2c8a75bdbf57c9e273ec99ed40930b615bc9ebb32f32401d1ffd34bbb05eedbc0291e
-EBUILD cachelib-0.2.0.ebuild 705 BLAKE2B 88729d4bc99addf86fea36d3eb022258c64cf4296acd170a98a42fec0407a7e34dcbbb7f17b468c69a391ff61174465663a473c34cc449974aa8cb7b11174389 SHA512 b5989476dd4b992ae79c91730a2efee0ed6fc7a6a8902605f959427973596931f5afec3fa9d884526a8c11c65ab537671cb3547272ff8dc07c79e6f06354e5d9
+EBUILD cachelib-0.2.0.ebuild 704 BLAKE2B d985e32bff14ca1310071a1076290148d47be06582e35c0731160c1528df396dfc2bbbd8c3094fd86c8ae36fafec6a1915764fd31470dcb50addeecdbd276741 SHA512 495d2beb71db9782d3407682947330a6ba8301e2f80c3d3d60f9eb18b1f611f613c16dd1592c02cdb3806072bac7876120ffdc0d1efdb710d736c0f75572a4f4
 MISC metadata.xml 473 BLAKE2B fc55238dc8f1e3bbdf2afd875e27bccd93084c0497826cae167ebcc7ae36529628bc6cd4d28fd0b6ce5e09d09ea9895e808f090ebc14d70db00bbe80e3c59db5 SHA512 ea41f45ce1423d8db2a46c098704516964f35086417377c9c24ed726d33229575dcf6563121c74f04584233a2744d11c699e454832082070a3f6b4738ad4d21e
diff --git a/dev-python/cachelib/cachelib-0.2.0.ebuild b/dev-python/cachelib/cachelib-0.2.0.ebuild
index 8f80ff98d460..073c202df7be 100644
--- a/dev-python/cachelib/cachelib-0.2.0.ebuild
+++ b/dev-python/cachelib/cachelib-0.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 2e3532b5db6a..7841b3f0b49f 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,4 +1,4 @@
 AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8bdbb0b7af8e60cf85391c673d86e3eb1218a393c9b454d3d94b88968421ed9f3d798cc1d28ba7510bc75ad3ec261 SHA512 3fc7c2785586f88b17864931528e8c8e25792855107e5e8b76aa79a198303b68bd8cc822a2a5ff7a646c9f11982a3b5992a9eeb3bd651bbde1792d13a1410021
 DIST cairocffi-1.2.0.tar.gz 70393 BLAKE2B b5cc69ec2805524e8f66a6234c4e19502181fad18c754379d91b05c2d2a88c82742f2b2057afcaac93f4d23ee64b41b2e84f029b6cb4ce2e7b3fa81ae0e8a485 SHA512 0f5b58ae85b2cc880bfb8ede6cbfe4905737211dab5b080815eb59f7cdd9c580367b9e00e7216d68ea9cbb84bda3f21ddcbccb2e744b86d6da8b991cffb96caf
-EBUILD cairocffi-1.2.0.ebuild 912 BLAKE2B bc8e0044f413f5e75f5327fd6991b9b75d844e4c9139f9f1a453162e099f472609e6005bfa3a3179608e75b10033ea6d794922016bd828c5d0ffd274205575a2 SHA512 55d351080e390c5d7e265133d19265fa21e2a7d6db0483824367ac43bb798d4f1553173890cf0fcc7070a3979f995d6ad4f7ab1e54a5229cc22c352659f64c5e
+EBUILD cairocffi-1.2.0.ebuild 918 BLAKE2B 7ec9f1699668ad7f7da18e7ae1221ff934151cddabfb331f7ae6c775c4f4427c89c83ea91d05ea18379e49406502e1402c93098898f76f8e63958cc1d0fe9f3e SHA512 3cadbc7d694e74a4059cbd9c8a73b8dcadc303ad10326fe2a6f47b422447bf684afe9867ecf85c59f7fecc4c1c3348def5c276efda9ca6a5af66614202e1d61d
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-1.2.0.ebuild b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
index e58a4d6e25e7..fc6490dba10e 100644
--- a/dev-python/cairocffi/cairocffi-1.2.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 6efdfdc79c66..bd4645b7f410 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -2,7 +2,9 @@ AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f655
 DIST cfn-lint-0.50.0.tar.gz 7061105 BLAKE2B bba39823b729b0a53dcc97341b6408654190bceb86acd7de0e2ee1a4ae34234ca6ddc3a4d374c38115632faa0fbbb51fbf07cf717853dd917a262ef5c1116ac9 SHA512 9dc5c00946a9bb142771a4b63571043056b1f522348f11256d7d3181e750c251cfab805a66df884b496fd7639442da0e72f65c0a43cc2ce2ed35f214031c7b1a
 DIST cfn-lint-0.51.0.tar.gz 7125333 BLAKE2B 5f18c03cba52e8f38eb4998ce3640564b6346cd788bc7ca4eebbeebf709fddb130de3fd0c99f5e1585aa07fb965f97ec05d48154bb6788f961c31301058d9ac7 SHA512 6b0eada5204da1c4efbf1a548b74065008bf55142b666aefbc5c1e9311eaaef96e83fd427157be4d3dec98d2e5377ed7f21266af0662e565fdf2aeb6883bb1e4
 DIST cfn-lint-0.52.0.tar.gz 7221391 BLAKE2B 20422bb191e9537ba6950db8c40894ab07655389a0a81eff3489f5bcd626bd81c6f9749f885b8be4f4939f16abe62fbbde7c741e770e6265c28bd59740144558 SHA512 81274b973ede2e60ef113d5ec4e2052dc11ed0a85b79079dd1b40e8afae3738cbd963b2e703f5016e216b2844df8711a34ff024e5dc4b1b12e774176bbe88489
+DIST cfn-lint-0.53.0.tar.gz 7501025 BLAKE2B 0f979ff74e020aa192c040bcc633df8133ed77559afd2fa637af0b02f190f516dc7b3bd2154b9e5ecf3e2edcbf624879727ccbcaab81493f450305e6e1790002 SHA512 58d63e1b9ee7cd64ff30e938d98992dca6214945464c27d61b6d6c7e0daab27daa1feb7f2631de172e9cbf1b22699894b7fb7becd7a292b5efeeedd402db3374
 EBUILD cfn-python-lint-0.50.0.ebuild 1528 BLAKE2B 41e5dc49f8b17753db6a7b2fad4d84e13d125a640d84628090528889649a85971c871e4b817381dfc27574317b300a0980d20fc263fbe36045ca3d126b031d41 SHA512 d61b521de58bccde229e226dd154c6ec70e09e190a0db95f60adc79c7f5dd48cb195529dcbfd3111cd573402b6085efebeeb1eca156adfa3f0efd7b3b55ccc97
 EBUILD cfn-python-lint-0.51.0.ebuild 1530 BLAKE2B afdac8393d467e2657124bd501160b5b0fe29d8fe164a7ace6dbb55e2960ced5018b8a0f321ce5d733d4c3cf28b4bc29474ca6abb1e376ce3422d5019e019da8 SHA512 31347e3c18d543b6d3bdda35c4dc2ad0cd464c2ec5e59ed7c44273ee171248f4c94e0d5c34a760f4a74e509e6cf582a35ef39be01a37d80fdfd769f79e1d074e
 EBUILD cfn-python-lint-0.52.0.ebuild 1530 BLAKE2B ea2f38064081c789468cd0ec6d6c581975d64c4e64fa384b7b6e0058ecc7c43e5942c8f5ef841865ddb5f353015d72b20dd37f62c504eaba72f6d0f08eac6d0a SHA512 73619dc30dfb1b185aabdd41a22d0877b25b0995cc1951e2c31a411e4bc543f195db822c40e0349c24846a1c671345c64fa8a16f2f39cdf5e6604b3e33d5407f
+EBUILD cfn-python-lint-0.53.0.ebuild 1530 BLAKE2B 13604d1fc51910524144b47041b1f277603b80b53d9717950f714d4e92f22097dceb3d3945fac0aa264e61eaf6a94f2b571b13a4838d8a71c4e6be6784cdfc38 SHA512 c6d59e8822495bf76eda2e78fca11aada9c2b7fae15b056dae585f47240530c66577bd95b047d2abdd5a883dd1efd1b974e6596e68f2dd86c41067d4522f3c60
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.53.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.53.0.ebuild
new file mode 100644
index 000000000000..5c43ac1c42b8
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.53.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+# TODO: pkgmove to cfn-lint
+MY_P=${P/-python}
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.38.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-5.4[${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/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index 6ee545a37e28..fa91ec789571 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,3 +1,3 @@
 DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
-EBUILD charset_normalizer-2.0.3.ebuild 640 BLAKE2B 3f1b34c36268cc935c4899d905d2e412a780285d39e803e6909afa9444354d5adcfc00d8b70a9aaa89fd3b15997aab16ab867de41bc4bd96e189a9d092aa754d SHA512 5025b53c31549ed1936afd7b48c0be04bcea91333156d341be769e590fb242f623632ae961e2705554de48a9fe625ac7cabd81134745b6dd92bb744743b2834a
+EBUILD charset_normalizer-2.0.3.ebuild 650 BLAKE2B da8234be681ce4d1d548c84038a700259e8c7b13a076a5ac450ab0cae819ff2313426c0f66c14a63f7e5c3111d5b6329877724f731e12da4dc3ff67e92911580 SHA512 b98413849a0aac1bdaf0b95e2759faf1a46b2cdf59fa842f9a3c031dd8fac8e30e3ead4ca9ea5bed008dff02cf141ee08e4fec42ad739329def2bba8990f9a80
 MISC metadata.xml 364 BLAKE2B be46c29b2fa986a53e4abf38f4f68a9882e3a01c0d3c524a0935a51a04d3e71d98548401ae96e84155c943dc2baf127f28e0f24d764d9e4cea466e2ba010f432 SHA512 bca4661b93af7b085ba8c71ba91188a984336c30467d4e38a7856c2522f83ae6dee122e3061a9b434a218bcb11e18583fc02b85c7629dca5cfbeb6aecc63bfeb
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
index 89687b00b3cd..f26239f68a02 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest
index ffb496a1a564..2a90fb4168fb 100644
--- a/dev-python/cheetah3/Manifest
+++ b/dev-python/cheetah3/Manifest
@@ -1,3 +1,4 @@
+AUX cheetah3-3.2.6-fix-py3.10-tests.patch 1082 BLAKE2B 5e418f22d9067208c038ddcbd35ef5942c09bc92a14a9a28c7ed996496c419b41b772d1fafd3ac01b524aea0dd70706ea69815db0f6fbb3de26abd95b416c3c4 SHA512 1adcc664bfd580fcd62156591b52375e3f01a5107a995ad6a8c01baf8e604c2114451be7cd13775bdf2bcc2d16998d86fd5d0db38c85d4ff6e52bd314fb3c264
 DIST cheetah3-3.2.6.tar.gz 2481158 BLAKE2B cb8ad192ae9caf0d1284294b323cf4a918cd2fc951bae25867d69a3dd7933728056b76fbf52a22d34f290056a96cce7d9ccbeb2404f2f0bb782f8db8b7453e47 SHA512 abf74def695018a79cb1364f60e402e7e0095a4d2f069decfbddf42501d865b70451ebc7b52abc67aa23e57276d7a3b8c2894a9571876e15db43cd1358f74d31
-EBUILD cheetah3-3.2.6.ebuild 1116 BLAKE2B 39fcd02539cf2a09afd27e91276481bcbe6fea3fa8a31b7b9189e37d195e57797d84ebaff1231a3d8495f54b8649f68c21f538a46824ded381cdee727c934694 SHA512 75794dec4df190a31c2ee9019b66bcd6c9cbbef165e444929b6191edfc0eaa5904c4c9a1f28c9355a5d603add708faa6e5db1c7c5cba499590029363571bbc21
-MISC metadata.xml 662 BLAKE2B 3dfe6898c1c2b60050da8427fd4e51a07ba7870120ce491166b9fd222bbaa49e7df7ba3afafe8b159a7b60f781da67dc0dfdf03f085e813cb3f6d59169ecc526 SHA512 b15fac64b057cc9216aaa21002332ec348e89a618ba4c32dd8b9622afd17d7d8db6ef6c3e7c645ad0a03b306c50b79322f5ad1866db93f1033e69b1c7d6130a1
+EBUILD cheetah3-3.2.6.ebuild 1141 BLAKE2B 32148f9cfe925c3b88dccbec20e7c3f555f150b5628dd98394c6df15c21dba364c5b53dbad36b5e3e5e8ebfa0cbfc4c727de63f2a513926ea015dfedfddddfb9 SHA512 74f937845d14930953a5bf9f3286a637470cb1bdf3fb1b7af9f7f42f8cbef44033ec8da166b9ee1c69dce95921f66b3f68398c8eda51d45df244b5df04dc48bf
+MISC metadata.xml 727 BLAKE2B ccbc87781409c89177a8c5e53e21ecf4ebef72351194cd45686e2ac0275b081bb349450f8f66618526d7fbd3038189919d94dd6ea8fc811fa26b09b0d02335a1 SHA512 5fe5a3f3f22238e7c1b9b0ce54d68266678a6078b34ea1472bd140f7f065a9aa658e5c2605c59b31707e1c275b88ee20481443aaf2970f956d1c0a2d5c472874
diff --git a/dev-python/cheetah3/cheetah3-3.2.6.ebuild b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
index 750ee0a37321..c4cb900671de 100644
--- a/dev-python/cheetah3/cheetah3-3.2.6.ebuild
+++ b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python-powered template engine and code generator"
@@ -22,6 +22,10 @@ BDEPEND="${RDEPEND}"
 
 DOCS=( ANNOUNCE.rst README.rst TODO )
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10-tests.patch"
+)
+
 python_prepare_all() {
 	# Disable broken tests.
 	sed \
diff --git a/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch b/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch
new file mode 100644
index 000000000000..845520fb02ad
--- /dev/null
+++ b/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch
@@ -0,0 +1,27 @@
+From 112dddd8fa5fb9c285fb8ef2818abfef99365070 Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner@python.org>
+Date: Tue, 19 Jan 2021 11:19:15 +0100
+Subject: [PATCH] Skip test_import_bootlocale() on Python 3.10
+
+The _bootlocale module has been removed from Python 3.10:
+https://github.com/python/cpython/commit/b62bdf71ea0cd52041d49691d8ae3dc645bd48e1
+https://bugs.python.org/issue42208
+---
+ Cheetah/Tests/ImportHooks.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Cheetah/Tests/ImportHooks.py b/Cheetah/Tests/ImportHooks.py
+index d7b5f5d..bc0239c 100644
+--- a/Cheetah/Tests/ImportHooks.py
++++ b/Cheetah/Tests/ImportHooks.py
+@@ -87,7 +87,9 @@ def test_import_builtin(self):
+                 return
+         raise self.fail("All builtin modules are imported")
+ 
+-    if not PY2:
++    # _bootlocale was removed in Python 3.10:
++    # https://bugs.python.org/issue42208
++    if not PY2 and sys.version_info < (3, 10):
+         def test_import_bootlocale(self):
+             if '_bootlocale' in sys.modules:
+                 del sys.modules['_bootlocale']
diff --git a/dev-python/cheetah3/metadata.xml b/dev-python/cheetah3/metadata.xml
index 52f8ccc1f81d..c6b648884ee0 100644
--- a/dev-python/cheetah3/metadata.xml
+++ b/dev-python/cheetah3/metadata.xml
@@ -11,5 +11,6 @@ are its principle user group, but it has many potential uses and is also being
 used to generate C++ game code, Java, SQL, form emails, and even Python code.</longdescription>
 	<upstream>
 		<remote-id type="pypi">Cheetah3</remote-id>
+		<remote-id type="github">CheetahTemplate3/cheetah3</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 451d41e69c3a..e8e94d9618c5 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B 6a6b3667dc21ef2b35e45e4f57db9d854e40b0ea7e49c4cb92ff1979987afb31c33d5d8b57730683b6acb682702c4dca69aa200fc162c60586a9d880b3c290b2 SHA512 d6b0916aa0bd83c3529b9c106ac8ad75c4930aa620cdccd4b1e3e0d7a54fdec0f8d5cd430cddd64a0a7389b1ca6f3a5b142d433691eab4356f72d52c40010e44
 EBUILD clang-python-11.1.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-12.0.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
-EBUILD clang-python-12.0.1.ebuild 927 BLAKE2B 1e0d88215cd7bd7a7968fb00e5c91e10b894750a4ec77a4413d5af19bb93e422b59204e2f62b90ceb628846fede7ed534424640974fe9a3e2d881aec0ccca02e SHA512 11d64eab9433584271e4c97f7af0a9e2762126c3eefffe0f19e74ffdfadef6852aea59337c2fb604daad3c8b3495a3ee2e1a015c20e14eef673e2dacc8304fdf
+EBUILD clang-python-12.0.1.ebuild 926 BLAKE2B 83dcb4cee0ad655c5b098c678dc52f5c239c899c231a482bae52b0d8f44da889b63527ecafa0289aa60f678a169d74a9831c2769e6848c4ab53d141c78736b81 SHA512 90fc2f56ec5c6a3cb2f0b1009fbb66ca9c360b5698404af67656a153ba95a00a918dff7b2357430a57e722534395adf39c4a4022f1d911e6e409dd2725b2faff
 EBUILD clang-python-13.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
+EBUILD clang-python-13.0.0_rc1.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 EBUILD clang-python-14.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-12.0.1.ebuild b/dev-python/clang-python/clang-python-12.0.1.ebuild
index 5999d3c28201..2a31d118bb91 100644
--- a/dev-python/clang-python/clang-python-12.0.1.ebuild
+++ b/dev-python/clang-python/clang-python-12.0.1.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/clang-python/clang-python-13.0.0_rc1.ebuild b/dev-python/clang-python/clang-python-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..921f7735340a
--- /dev/null
+++ b/dev-python/clang-python/clang-python-13.0.0_rc1.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..10} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/commentjson/Manifest b/dev-python/commentjson/Manifest
index 7280214c8412..4e08b8d19ffc 100644
--- a/dev-python/commentjson/Manifest
+++ b/dev-python/commentjson/Manifest
@@ -1,3 +1,3 @@
 DIST commentjson-0.9.0.gh.tar.gz 15297 BLAKE2B a857b0fa5551079d3d37bff94fb51a903e998c4fb84e0f62a5de28d6eafe0cb8a38b3215515e72c56de0cddb661f109921c801d15b9ba93771290135adaaa5b1 SHA512 cd3d28adecbc445ed3faed7847c65a23829f408cf8aa3fa85544a0f0cf9fa5544b8aff560725cf51921f249123daf9ce9953069e99ca64a312bb4bff652512fe
-EBUILD commentjson-0.9.0.ebuild 765 BLAKE2B 80e4a795ae4ad812ceb8f7920d7da289c33732b5533eff42849600718c235e9c4e3514f13c70e04f5edc29e53e18ad92e5785991380a56fb96935011d420d3a2 SHA512 b8c9f26d58955bfb288acba4d9373dcfa11263c7793e421fc76ab6b251007d2752e20ec9bf341c3de881f2719f30441b369f816e41d71986f41de0019052f88c
+EBUILD commentjson-0.9.0.ebuild 763 BLAKE2B b30935e60c7653c417fad3530bc87f4c24bdba6df9c6ba64eaa34cc6b1aebd29d5430df078c6200be2c8130281324db8fb118e1364135c971c03b4667ff136fb SHA512 ddba1ae38133fd4d090b33dc25d450e2d8fccb8c8d0dfb0bc91d48a775f683512d50d3b4b1e5307fe0e524a3e0c626f08d61eebd28e73dc272a08e4c13f6421d
 MISC metadata.xml 350 BLAKE2B a14a2adc21600c7f65c10bd0d741c0f81ede15baa200532ad346a74f36e4eed3bfd4af40ae30d208bd6cb1064936b4e7fc5acb0db31890a9e7109210f499b3df SHA512 558f86dfd9c937dec4a41df69e50662a86968cf1884484fc0fbe336d95b4fb4c66c22ced5b086024364d8c02aef6ffac436aa6ba80afc5398dcbf3ac12f5f4d0
diff --git a/dev-python/commentjson/commentjson-0.9.0.ebuild b/dev-python/commentjson/commentjson-0.9.0.ebuild
index 548184a4965d..612c505cf3fa 100644
--- a/dev-python/commentjson/commentjson-0.9.0.ebuild
+++ b/dev-python/commentjson/commentjson-0.9.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	dev-python/lark-parser[${PYTHON_USEDEP}]"
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index 1237158e9562..0cc44cbc936b 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1,4 +1,4 @@
 AUX configobj-5.0.6-fix-py2-tests.patch 1494 BLAKE2B 5c52aca50d606c0fa3fef6d2fb184b3d21bb45ca39c4cb5893aa67b06e46954110b4a2109fb1592931a1947b56b12a80a575baa54ca7dfbeb1981bb1c610137f SHA512 ff87d2b54a47cddb9dd77d43a3028805f98c76e7a0c9529d40fa2d936c8b23ede24931f2066665d0b6ba30db6f62ac4871605c6b89c4842eb93847eb2d6e1e8c
 DIST configobj-5.0.6.gh.tar.gz 143664 BLAKE2B b554d0aec903aecb55387a0164cd6f8d442e9fc1ab231ce7f7123e7a5041e07a86f5f7bf70492ca93fcdc1bd3caa5b855c427f060842e3b4a7524afbcc417a76 SHA512 326eb86e362f281ebf07abcb1cf7616abb270c482eafe842371cda8708245ca5e8262f1644b7164664ecc10e9004ed061c9de18cd233a657d4697dbc3ba3c59d
-EBUILD configobj-5.0.6-r1.ebuild 741 BLAKE2B f51d1638f6a5f5ca7c758fab7c864d1ac2a3c601cb54df301d7d6ed0f88f8097b9f456370dcf133277640d2c88b7ae4b82491feecbc8717bdf5605c19da59137 SHA512 e79cc3aa461eab6a841c9fac0472fe7c0e17394b212e9b5e0f980c438d60c121189a42e560acd8aaa6f198db2bb985d2adde022801f8b16da3de4e4aa278c85a
+EBUILD configobj-5.0.6-r1.ebuild 748 BLAKE2B 33149db3d6b1e2da33bb65d2b1cca20e488f718f08f8e72c4e95f311c076ba3e89e2d8079ccce4808783467e80f4fde3342542b6e858432b0d7545036d3c6f26 SHA512 b7f0956e980fbbbbd22c58d8f5eee4285d18d98f49046c93bb815c073f3dad86638305be3f17a42c49caf659717ea38611758a932ef3705e17acb53e69f22b81
 MISC metadata.xml 688 BLAKE2B d4a4e54b638c6d5011dda8858341b089eaa20b6d92566586d95ed407b7d94d80a4272426fa2904176e084df92b0606c957f16bb6fa4692848f2044d5ba206386 SHA512 653fec16eb0773050fc60e0df5b8be0311801495f4fe109d6346319a24159f78af614b1c587f0521be47e0c608373289e6bb05dec8284ae01cbe55c52c34d780
diff --git a/dev-python/configobj/configobj-5.0.6-r1.ebuild b/dev-python/configobj/configobj-5.0.6-r1.ebuild
index 3bfa05696f65..efc04cccf1b1 100644
--- a/dev-python/configobj/configobj-5.0.6-r1.ebuild
+++ b/dev-python/configobj/configobj-5.0.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/DiffSK/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/csvkit/Manifest b/dev-python/csvkit/Manifest
index 2a074875bd42..d504990bbb9b 100644
--- a/dev-python/csvkit/Manifest
+++ b/dev-python/csvkit/Manifest
@@ -1,5 +1,3 @@
-DIST csvkit-1.0.5.tar.gz 3783495 BLAKE2B 19210c23480cb3068af74c922a3495612f40bbf5c4985f7018c9c185564dd0c101292f165ddd03440220f582bfdc1590e2f75e8e5c92edd71e76e46a73b26547 SHA512 62dc7a5eefeda9c8824b24f8844b6c1ead5449797d9d004111885b03a1989ad89d1f48b3b7d4a69130885b85cc3c1352910737e416fc19f2038525632b1569f6
 DIST csvkit-1.0.6.tar.gz 3784737 BLAKE2B b1e4583443cbfc62f713d3b311bbe313cf4e69b7aa5aa13dc6970375a727a804ba1dbd176b25487027d3bc1a5696f2ce649a460c91ef7c5591c33bb3c6f48c33 SHA512 fb37404405f2f2c0bf803a1df8186aa9e3b11cbf3c4f6e1fe6dc06d53730aa91d462bebcca3917e9a451f1d81df053abd9ceedfaab085ab696f9ba701c873323
-EBUILD csvkit-1.0.5.ebuild 1297 BLAKE2B e00ecf1a78ab98bef348790fc76426f305f598f17893e36588e6d89e0f948f5c7b48b60e6be08d3918ee531696dee592be679759a8054a341130222ad1b733c2 SHA512 7a817661dc9279c841718449a63e218650358cfc8ea9f3bbe70e6b92f33da3156acfeda79be582660841eaa1182eeacc368815a2293cbe1b5fc23b7846755cb7
-EBUILD csvkit-1.0.6.ebuild 1291 BLAKE2B 7f9335b92e6064ac49bd9ba7c144a1837e6e757d21223b8b7862b6f994b7a96a12803b51891456a4316a3cb309563046297c6b40db04fb56b00afd1efe85d32d SHA512 85cb1f7b183a7970ea3b22504d51162791b4b7081648223f4ef9a14b7b4c7700c5764ffbdcc03865b787e2c86c152efdb2bee4856b545683258743f3e69339dc
-MISC metadata.xml 500 BLAKE2B b73dbe5965b76d39d6e97dd46e7de1c0d583fe0b48de00528169068c6d86123c25000a37115d2f9db48eb687a95eb6742975daad252591d4ff18a8ca65b6f4c4 SHA512 daea7035cb0f2e5a852c457e3bdacb15ed5ed618e21dbfc6a42d25d92b8b7f17f46e597783c5fde45a8e71719e035d78cc94ae2c8d76be3e5f36e3f559856b47
+EBUILD csvkit-1.0.6.ebuild 1153 BLAKE2B 951ff2c6dab84db28cf53e5edc0eb7aa761cc965ee9f8a33a64e1ef372d319b2695d4a00ed8db58efb6906b73b1ed8b0f67938683445c5d03ddaeb398c33eb32 SHA512 141018bad52fd5388f515b58e00ab65260e5ba1305525a87e6f400d5c2b00f16e92ae8cda513996792e01ca08e47c0dff8805587691b7a8cd6abd161b8b81aab
+MISC metadata.xml 524 BLAKE2B 47f8e95f0ea809df132b944f148281dabfedbbe91e4fa87a0e5be465f2dcb83eb0173a67f31224013219993ef8eec2a6535e59a73d010b57e17990823917d30b SHA512 5fe2f94011c100fb17f6121ddcd6a2fcee119e2ee90246749833c07e704092dc42c17875eb96921265c071b14dee2be3b7f48a4a08665d1a57540228bc07bf01
diff --git a/dev-python/csvkit/csvkit-1.0.5.ebuild b/dev-python/csvkit/csvkit-1.0.5.ebuild
deleted file mode 100644
index 1430aee3a914..000000000000
--- a/dev-python/csvkit/csvkit-1.0.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A suite of utilities for converting to and working with CSV."
-HOMEPAGE="https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
-
-# Other packages have BDEPEND="test? ( dev-python/csvkit[xml] )"
-AGATE_VERSION_DEP=">=dev-python/agate-1.6.1"
-TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
-	>=dev-python/agate-excel-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/agate-dbf-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/agate-sql-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local pytest_args test_name xfails
-
-	xfails=(
-		tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
-	)
-
-	for test_name in "${xfails[@]}"; do
-		pytest_args+=(--deselect "${test_name}")
-	done
-
-	epytest "${pytest_args[@]}" || die
-}
diff --git a/dev-python/csvkit/csvkit-1.0.6.ebuild b/dev-python/csvkit/csvkit-1.0.6.ebuild
index b703b4a252cb..899bb8fae0d8 100644
--- a/dev-python/csvkit/csvkit-1.0.6.ebuild
+++ b/dev-python/csvkit/csvkit-1.0.6.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -14,8 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
+IUSE="+xml"
 
 # Other packages have BDEPEND="test? ( dev-python/csvkit[xml] )"
 AGATE_VERSION_DEP=">=dev-python/agate-1.6.1"
@@ -34,15 +34,8 @@ BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 distutils_enable_tests pytest
 
 python_test() {
-	local pytest_args test_name xfails
-
-	xfails=(
+	local deselect=(
 		tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
 	)
-
-	for test_name in "${xfails[@]}"; do
-		pytest_args+=(--deselect "${test_name}")
-	done
-
-	epytest "${pytest_args[@]}"
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/csvkit/metadata.xml b/dev-python/csvkit/metadata.xml
index e13598b0ff4a..690a0b7545d6 100644
--- a/dev-python/csvkit/metadata.xml
+++ b/dev-python/csvkit/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/csvkit/issues</bugs-to>
 		<changelog>https://github.com/wireservice/csvkit/blob/master/CHANGELOG.rst</changelog>
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index f5be335d711b..443a6040d9bd 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,3 +1,3 @@
 DIST python-dbusmock-0.23.1.tar.gz 79964 BLAKE2B 60140997f7a9c196d4c38100a975550d6a4745344fde9084ca5a56881035c09cfd56387897a7e409e35aecbc759f01b8f4953b8a5cdda4bfbe70d80cd01b8332 SHA512 933205c770f82aef623e571d9d806b6d639467c977ca326718ff475f41e309ef25e9a8f1cd8439e181edbafeb6513af7b73dfb938b3abfc7d5f63b6b5ffa9fc9
-EBUILD dbusmock-0.23.1.ebuild 885 BLAKE2B a0c5098a9bccda4c78106f33681f86bc06671207e919a0f2ae1ae551ff5a01dde2121f5589f545089583122a38a0418288e60de75ec97f01ada9863a004ac04a SHA512 ec398412aafc00980d35e27c84d0b34071eaa69bc2b2eaa3a7e918bdfe65d94cbd06d6b89a7a503aefc0fe6e41db839d82d4312729e6f998cef57a6e0e2a0db4
+EBUILD dbusmock-0.23.1.ebuild 892 BLAKE2B 247093a69710fd11581695e7e8f8907fea5561a988b70b39dfeecc1e2e8e42e389f0da0f438bec11c3ec9b5054eef1e52c1a60339267fe3178ecaed4fb0572b1 SHA512 526b6b033a168f92f290fa67159d37335634f9e73bf6eecb18e06ad1792eb49f91225cc830a273ea1b0f4bc179ec7b249207a9e5a953c4bf8d72264a79c30234
 MISC metadata.xml 456 BLAKE2B 1255b5eaa7068525c5661663a3d42b052100e7c0c9ad58f4b85ba6113d2b0ebd4a48691ca52bbaf10635d34e5fe8949b6e44f98babe514ca78663462fa88a85c SHA512 ce665cd1934e2307281538e1f306297974cdf50c7c5576ebd2f290066a39b1a18bd1dfbe34bef29d5f332847699699b811754bac9d52364a96c66b030d953362
diff --git a/dev-python/dbusmock/dbusmock-0.23.1.ebuild b/dev-python/dbusmock/dbusmock-0.23.1.ebuild
index 8c09033ec7be..68998ccb55f6 100644
--- a/dev-python/dbusmock/dbusmock-0.23.1.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.23.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index f3a669c0e948..fee2ac342c9b 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -3,5 +3,5 @@ DIST denonavr-0.10.7.tar.gz 148282 BLAKE2B a5168c1b00ce1e8223d619a8e2e7ae663fa91
 DIST denonavr-0.10.8.tar.gz 148387 BLAKE2B 1ad6687655abe70e6f83119c893187efe88143521e5c91987ae6b3d393fe7a327bf34941d87a4ba37107ef415493471be0630a1f3c643f94cfb3e22460c80806 SHA512 fea1b2a03d83d520c837323939db503879ec0c973bbf9409087298977f4d07f8ed8b25c2d287c1529786a4e42cd59b0f0708a8a4b7df3d5f630967110d7fe906
 EBUILD denonavr-0.10.6.ebuild 755 BLAKE2B 19509ed35e79c27f4a6f352ff1cc06a06786e0a57806999bd02df983e41b04f62aa522fa96665c0fd875208ceef9b0121c7e4bc7427d5a10e71d7e3642dbae5b SHA512 3a6cb8ab60f3be41cd01d155e6501decf3ab5311f565392eb9b71d20b017ae9d3ea3e33cebb78b54ab7ff31ceb8fda0c570a7bdceda9015fff1b8c0ff1d1e7e7
 EBUILD denonavr-0.10.7.ebuild 755 BLAKE2B 19509ed35e79c27f4a6f352ff1cc06a06786e0a57806999bd02df983e41b04f62aa522fa96665c0fd875208ceef9b0121c7e4bc7427d5a10e71d7e3642dbae5b SHA512 3a6cb8ab60f3be41cd01d155e6501decf3ab5311f565392eb9b71d20b017ae9d3ea3e33cebb78b54ab7ff31ceb8fda0c570a7bdceda9015fff1b8c0ff1d1e7e7
-EBUILD denonavr-0.10.8.ebuild 755 BLAKE2B 19509ed35e79c27f4a6f352ff1cc06a06786e0a57806999bd02df983e41b04f62aa522fa96665c0fd875208ceef9b0121c7e4bc7427d5a10e71d7e3642dbae5b SHA512 3a6cb8ab60f3be41cd01d155e6501decf3ab5311f565392eb9b71d20b017ae9d3ea3e33cebb78b54ab7ff31ceb8fda0c570a7bdceda9015fff1b8c0ff1d1e7e7
+EBUILD denonavr-0.10.8.ebuild 756 BLAKE2B bc30fa50f582fcf633f22bc340e215d1f697f0abb36332138bc46f9a14b1becf126dc0af75e7d2c5d15b3435ca7d8db52b4e7f3a0ae63f3496554f87ec4764ed SHA512 1619c4703eb419d9d295a5763fafa2fd94f313236cc2b1112b90d4a702e2a1d2a0119af3f699652520d819b7d77ed90b6e345fa45de033dd813c938168d34478
 MISC metadata.xml 549 BLAKE2B 7031b8af81fe98059cf29d386d6f09493af833f33dacfd2be8f4e4e534a6ec1196e85cfc3ddf13ffe4a4333c0be7c95d453916bf6a223065e1520259956ce51f SHA512 01ecd0c14cce4a3479e70c3aea2d3f2e3c582bf9ff7bc8f887f341e19b0e45fd78638a12b6a617db018da4fe98704345e7e27fb9d6d0ed464daa71b2d1ccacf0
diff --git a/dev-python/denonavr/denonavr-0.10.8.ebuild b/dev-python/denonavr/denonavr-0.10.8.ebuild
index 744cc8df1076..774d25fb91ba 100644
--- a/dev-python/denonavr/denonavr-0.10.8.ebuild
+++ b/dev-python/denonavr/denonavr-0.10.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index b5cf8a975aba..2a5f97e56004 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,13 +1,17 @@
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
 AUX django-3.2.3-py310-repr.patch 3827 BLAKE2B 42f68fecf8fba65ffc23d19f95b5232ed020005d347fce1b30bd6a18755e649bc00ebd6aa7235810564e8954726dda4f541c58c599a9433d3ecd539717b97284 SHA512 6cfc9ee5f8c5c9a59bfeb5311e853604a6f77c7c747deb48780122f06e7634ea783f5ae82c4935a2a25f1cac358175cb8cbaa6285bd26da5e6fd35d3e3958e1c
+AUX django-3.2.6-argparse-py310.patch 2001 BLAKE2B 888987392f13643e367a8e0f003ab10e0c143034624dfff7e8ec50b91aa2c3a1569f243a383c533757b55616625a40e3e2569d1b0a5f78ccf7bedcdde7c74c55 SHA512 7070ef00895658d0308ece951a3bb60e325e79d81cd987d9296dc6cc9394ecf9329040b89e35fdb31868aeffb23cba80fa982c9a49495124674361f0d8bf614d
 DIST Django-2.2.24.checksum.txt 2558 BLAKE2B 8a4b1759f0c52f9dfe6eafc2b54d2d6db8c1204be837ef0df362e02afb41faa3fcfef3ee1b5bc10482a200db58c21c3a7a9650b6ed8103c69f196b655af5b239 SHA512 e26d71ed2cded2521837c82ee896b68d765da224a42f34457cb67a0105a72b2b0223655208400baddf7bb70dd51c4902b9ae80d8cb2bc8963c16b23d37bb2d53
 DIST Django-2.2.24.tar.gz 9211396 BLAKE2B 7422019ad8849ae543d7b2ca7f5624b5379c832b5d19511f52df77d95acaa0a45cc61579b0e3a74671c295ffab5e1dfecd1c044e9ec042c46606f888c257e1d0 SHA512 5a3ee79500ad458bfc5220b9b68248bec59bf6d2304d58ca280111854d6a5f7e25784680e949487e8b59c1de0b329a53cf0676d2ee4bb2b88463918c4b0b6085
 DIST Django-3.1.13.checksum.txt 2552 BLAKE2B e82052d952f7dfd15e11b413fe2f106af3d3774073c57538b10f1beeada3128de2cb3d861684599fbf5f337b0ae4eff3a101998da30d8d961f84ac7cb3bb31c5 SHA512 07870c27034f70f335ac35b34317944947f544f63108f21134e81326b4e8f05a7cb3d382d91e7f0a846d51944032efcddca2c3bf980f626627c74c388932e4cf
 DIST Django-3.1.13.tar.gz 9656683 BLAKE2B bb2dd72ba2dfc13c8f487d6b59cd9302160800dca4f63b92e640eddf4aba2e5b1bd67580e56477bced44a5393b5f65a463a9c0c539ba998a20606bffdfafcf74 SHA512 55b1ceb24b6e0ba542a96319f63b138439532cf4b00971a8432baaab4a8ee219cc9fbb31d457ba7da9e932c919df83da9630866d909df4a5d432866b158098d7
 DIST Django-3.2.5.checksum.txt 2543 BLAKE2B 4a07a518bdde4670dc3bf079d8d3cfa32b6580cc06f18306a2127463f3a6a2d8f2a50c4562092439c7c99ccf80dde160b061180826c94d4e1064d5064ff500fe SHA512 b073ff758843f72b6467dae7580941774de9702db02a6fab303cb696cb22c84ca961885792e8ec85545294610f34a4eb52ac3f6521c190d2c339c1957ab4156a
 DIST Django-3.2.5.tar.gz 9806547 BLAKE2B d804d758f95f18aac5c44cba9bd9248efa56cba91bea5db2ac89e8c2202ac1fd088b61d6cc98eb7d6d33a95f85983b801c6cc26a3231986a8cf224a0bbeb8a7c SHA512 03d4eee650a857bed298658c68b916beb74690d16b4b28d649c52a7c2d8a61e92f53136d2de3a77fabe1dd01c0e6b3033befc6842f39c222793fb590b1020c13
+DIST Django-3.2.6.checksum.txt 2551 BLAKE2B 2fae4e3daca01f285f651b76df7402a0c08cdea9a98bdc3be3f9b337732c26b2a3dcb239fc06274b6a30227394047476d454bf34fd7e8b765df047510b08620c SHA512 66b9dff471928be514198e50e62f46d14fbea9c1cfb55e9d82562271795fc3e719e0bb8c43a1f6ff6c903700b648a6a0e19e335ddc50df2a7fa539911b6d44b6
+DIST Django-3.2.6.tar.gz 9821499 BLAKE2B 9f18d308bf15ef16a9fe9d84219bd7ad37833b718ff975344aae5950ef01a7a0e8ef8669936c8908e38e07fb078ce2e2d6392968177400c2357b1d3787e0ce39 SHA512 adf2d2ab3006cc5b389bed8d8e16ee8c98393b20d719c3521068e5cc5d1e679b9f660be90f827ea1cc6a41f975641c32bdb0779ee145e5e31a501ca9e06898a4
 EBUILD django-2.2.24.ebuild 2677 BLAKE2B 51325e634c8aa029d70de52fb128e4b168ca170d5bebee7763d55f3a924b7edf758031a9720ded7ee7e1f1a0f283e183a0cfe6d8bbe83629ba1cc5c1819b3457 SHA512 44812712ca209b8af0c14ee92d3db98d428feda28a8a16be9ec928e6c32c0dc9833a84f058f59d934181f57b658e2a6be2212eabd59f84eff17ee674a9bc19e1
 EBUILD django-3.1.13.ebuild 2772 BLAKE2B fca2574b02e943a7535bfb3ed5e98402a65bc86b5b9ec72a7e814cd7c2da7d0017bcd2127e69e8ed6646ba3905d53deb657818d87435c34747b9296ba662dc0f SHA512 15e9ef76ec559b138f1d49bebdd0c5f2603d2ca48693c4066dfeb0a1e3d2baae598e8c8604e05fceb649f5c6d792ec277599ee257c91248df7db718361a08869
 EBUILD django-3.2.5.ebuild 2993 BLAKE2B 5e5a148dd83c40c8b86bbbec80e574a7fa465ac42d5b6c69e5bae60cda7a808acfea48846fd564999479cd042c3c2e80d32fdcef31ca0ebc6da3a7856a3b7b37 SHA512 04bd0a8108af7b99c1607dc78cc2f893e165ed7a2488bf713cda582e35a4418009d924a7d318bb52dc4e3d4989e315c4ecb0b423d156cf394552e20c2e431604
+EBUILD django-3.2.6.ebuild 2989 BLAKE2B cdb75e93c34daab3ece269324d43a1b2d5a23b035db4354a5d966fd9dd193d3fb6d03a0f1f9246bc95f4c56c61373d00aa8e059f6dd7e810422d46b04b1c0553 SHA512 1719f818add4795baf2787df25d291268955d4b383fead2146284b652a190ab6a824068c3ab54fd46caaa6deca922d9124b0a888b9c9beb492b72c0a5f2d4c77
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-3.2.6.ebuild b/dev-python/django/django-3.2.6.ebuild
new file mode 100644
index 000000000000..49eee54f6d66
--- /dev/null
+++ b/dev-python/django/django-3.2.6.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+	# https://github.com/django/django/pull/14732
+	"${FILESDIR}"/${P}-argparse-py310.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/files/django-3.2.6-argparse-py310.patch b/dev-python/django/files/django-3.2.6-argparse-py310.patch
new file mode 100644
index 000000000000..3702a4c58c72
--- /dev/null
+++ b/dev-python/django/files/django-3.2.6-argparse-py310.patch
@@ -0,0 +1,52 @@
+From dc7d30c03ff72917584952e70b3b25c9a0c59033 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 3 Aug 2021 10:04:22 +0200
+Subject: [PATCH] Refs #32074 -- Update expected argparse error in invalid
+ choice test
+
+Python 3.10.0rc1 changed the error messages issued by argparse on
+invalid choice to include the argument name.  Update the expected test
+output to account for that.
+---
+ django/utils/version.py      | 1 +
+ tests/user_commands/tests.py | 5 +++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/django/utils/version.py b/django/utils/version.py
+index 4b26586b36..54b10e89d7 100644
+--- a/django/utils/version.py
++++ b/django/utils/version.py
+@@ -13,6 +13,7 @@ PY36 = sys.version_info >= (3, 6)
+ PY37 = sys.version_info >= (3, 7)
+ PY38 = sys.version_info >= (3, 8)
+ PY39 = sys.version_info >= (3, 9)
++PY310 = sys.version_info >= (3, 10)
+ 
+ 
+ def get_version(version=None):
+diff --git a/tests/user_commands/tests.py b/tests/user_commands/tests.py
+index 9262e2717a..9da0977c38 100644
+--- a/tests/user_commands/tests.py
++++ b/tests/user_commands/tests.py
+@@ -17,7 +17,7 @@ from django.test import SimpleTestCase, override_settings
+ from django.test.utils import captured_stderr, extend_sys_path, ignore_warnings
+ from django.utils import translation
+ from django.utils.deprecation import RemovedInDjango41Warning
+-from django.utils.version import PY37
++from django.utils.version import PY37, PY310
+ 
+ from .management.commands import dance
+ 
+@@ -334,7 +334,8 @@ class CommandTests(SimpleTestCase):
+         self.assertIn('bar', out.getvalue())
+ 
+     def test_subparser_invalid_option(self):
+-        msg = "Error: invalid choice: 'test' (choose from 'foo')"
++        msg = "Error: %sinvalid choice: 'test' (choose from 'foo')" % (
++            'argument {foo}: ' if PY310 else '')
+         with self.assertRaisesMessage(CommandError, msg):
+             management.call_command('subparser', 'test', 12)
+         if PY37:
+-- 
+2.32.0
+
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 02da9ac56060..3c7cef79afc8 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,5 +1,5 @@
 DIST dulwich-0.20.21.tar.gz 399232 BLAKE2B d2768a4cc83ab2dad3b569c7c97c93ffea0293eb10ce269a7edfc7d5a6dc15d31d7637332d6968d40e67dcd2d76d6f9366f6d2e30527a666bc76fab32c5bab91 SHA512 1dc3042ef7ed0320b8e998d78c98e5d181981f665a708547b715ed5a16869f5c0c76b6228bf1e58cb957923ea9643ae2ae7cfca970056bc5230db18c5a110985
 DIST dulwich-0.20.23.tar.gz 414150 BLAKE2B 0f7bfb237acc6bad874465a5bfed21adc29a2ef23875fbcbb92e7e3ff0ed6a4191a30b3975f90ef20b8320575e42abf31f8ec2199d558382c917d0510c2a8d96 SHA512 8bad3528dc87e70b39b59b2f7218579327db4dbd15937b63db76c9b8e7ba6d22e963eaec45b8d675c92f250516a541c395fdac391db68d0932dc5d8cd7ed9fb9
 EBUILD dulwich-0.20.21.ebuild 1623 BLAKE2B f8973b73c094fe2ef5efb9ccb71f44e2da24c137a9b9bd28b5292217c78e1139ff8725417c422df4feadecbbf74ce0e0edc7b63f43e6761e2b9a203fffae986a SHA512 c43266e408a6a8b236036347694062a60c4c806736a4ec540957d509f5534d2c4e56212f23b8b67b48700b267718181977f01e1c389f33f8c90df98445bfae8c
-EBUILD dulwich-0.20.23.ebuild 1589 BLAKE2B 5e36e2b66e89ff3944862432a6bd08d07f630eeb790cd282bc758d3d3071998d4c81d84890e90d8fb609c8b76aa6fe14e944ed58258765b0590e415fce8017e1 SHA512 eed9337dbddef429caa19c0fa6acf02983adbca2d42371cbf961d8fc294b07e50d99942839c0473feb2bca10052b1af058fbc8b8d235dc1b609c13f26632107b
+EBUILD dulwich-0.20.23.ebuild 1590 BLAKE2B 4a48258dd6bdbe22dd305e294dd78c3f8395fa274219a29d2c2b1c5b069a0dcab775e401e8a83a39c78e5e88cf1384ce9672174fcc870a34768f14c6a7fb536a SHA512 1612af29d05dd0d970d0069c89891375711751ac69e6a79f4b12db25a76bdbe3539a3f268ae6557b0bdbd340ade893bd311a9dc644b4cb0ad1c39f4d85d5c268
 MISC metadata.xml 557 BLAKE2B 17a7d57f6d3a8d0a01808be1f9d5381ea21cec37bbaf193f6f5b28b3f8381fbdf5a00b06cefd89a777ca11f11556ed33b13e295aa5687d4eac76df537dc6fa41 SHA512 6325997c6f1fca6d8bd2fb3987ca8a53ee068847e4d184b36928a7265ff0aca1918dfbea34a8cd93f6d3b68aace8e28133d261766524f7da3639a307ace0e160
diff --git a/dev-python/dulwich/dulwich-0.20.23.ebuild b/dev-python/dulwich/dulwich-0.20.23.ebuild
index 0e8096b83c54..2ce5d808ec46 100644
--- a/dev-python/dulwich/dulwich-0.20.23.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index bc473dc988e7..efefa049d82a 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,7 +1,3 @@
-DIST emoji-0.5.4.tar.gz 43402 BLAKE2B a7d94af22d09159e23b160300f70372c08c095fae3be45e204e5be73a907cd4ffcbad00aeed4c85ec0048ae1a5fdedce52105bcfc1557217d3b53002e1770267 SHA512 20e592247f8bc9bc0a030181904d806b50768b444b728d074afa58896e258ca664b4983de5c51b7624b585edcd93e05a34b8df722f4d0eefb625ce11fbb63d0d
-DIST emoji-1.2.1.tar.gz 158090 BLAKE2B c16ff949611f9453c3c073d466ddde75f31029fb4ec2160ba003dc94d1857c3d6f1de060220869f76fd94ab11539e7ea4bcff81211b7354c1f0e6bedc131e178 SHA512 b654494aab90c3ca4ec17331ba6504e2f16b46226170e170971f5f86553e025027e23d2e02020c899d5251e50bd8b78d4db3ea1a017b4eb371562595e4a9a5a7
 DIST emoji-1.4.2.tar.gz 222120 BLAKE2B 8771c7289a41fc741c54b3096df4ba6099dfdc3bcdc72282c93c565376e8fdb2e5939949a206cb01bfb1f2d663f840cd958e4d762f9da45639c49e52f3410947 SHA512 abf7fcaa922963c990330ebb6fd26c1613ffbdcbd6cabdf44e977b54df4b9c80c30e70e0ed0a9d9311c2fb95423df052e4e9c22d95510eab10eb3754084622ed
-EBUILD emoji-0.5.4.ebuild 373 BLAKE2B 3e20b341efe60379e92339acdd0eabf663b4fa2fe47112a05f53819e97ee81f124f58e44edc31504514667f66b6a4c61a8179d4b9fa168a1cb9dedde22c9feed SHA512 17287f2e2a65e0967a9dbe636c7edda177b8719d462a8fb632f238e9b5e845092b491e198dbda18c11ea2d6aee09419835afc7b8ebcfc1c4ca93cee439bfb167
-EBUILD emoji-1.2.1.ebuild 454 BLAKE2B e5a63d5a5ad79aa68574560dece498bd3d2d2aab19e00d4e46d691c6550eb478d0bdad7c78d72b967aa1de96573b626a8d5bdaa94690d8f0d8323c64123b3356 SHA512 6bd279ae8a9581894a72e4781dc4d8843d5a41dd9899e21dc0fa1d7576f90395913bb026ef18387727ce0fec61a8a1b007777f774bdbe03a877f538e29497c6a
 EBUILD emoji-1.4.2.ebuild 454 BLAKE2B 8783d79b1d000539bd907857843064e1704919ae9b8bbfb3a4d0de5a0bf738170bd86a3c637def670ed22485c6e313dbf2ba0b8176859fbd07da550743198e18 SHA512 f770e6c666137c5fb52040f329d9156670e442c1760c4f49fccf454703361bf1cc9a3f98f73e0d39d0c2a67eb5d6721610d19ae756616a665b7a25e81f3d0083
 MISC metadata.xml 395 BLAKE2B 993d498b8834fcb8d9bc9532a7b4083fefece581175a026ba8a291d4aa95d540ea96fd40e069d11ea1ec35affc9cbe028892d1a2727eb25c1b201c754e6d5276 SHA512 5225011a919d564e2e9f5d3202fc67abaec62c7bc01e8367f6b1595f14eab2f39849e41d407efbf0a31ab8470df46fa71d56816c7a2fee207750fde09c89a70a
diff --git a/dev-python/emoji/emoji-0.5.4.ebuild b/dev-python/emoji/emoji-0.5.4.ebuild
deleted file mode 100644
index 75912bf0e121..000000000000
--- a/dev-python/emoji/emoji-0.5.4.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,8})
-
-inherit distutils-r1
-
-DESCRIPTION="Emoji for Python"
-HOMEPAGE="https://github.com/carpedm20/emoji/"
-LICENSE="BSD"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-BDEPEND=""
-RDEPEND=""
diff --git a/dev-python/emoji/emoji-1.2.1.ebuild b/dev-python/emoji/emoji-1.2.1.ebuild
deleted file mode 100644
index e0c85fabc80d..000000000000
--- a/dev-python/emoji/emoji-1.2.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Emoji for Python"
-HOMEPAGE="https://github.com/carpedm20/emoji/"
-SRC_URI="https://github.com/carpedm20/emoji/archive/refs/tags/v.${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-v.${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/exam/Manifest b/dev-python/exam/Manifest
index 83e6a1dccfc9..498aec7e7157 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
+EBUILD exam-0.10.6.ebuild 427 BLAKE2B 2f3f18667f8393bc8efb53167c9b3ddcbb979bf12bbf71a6de1115e8a7e6e0cf7dd3ddd03f595d3caf19b6d4cb643a6c2b3d7bf5d8f1b7b303daa9c28f962af1 SHA512 e74117f4ebafe4231de4c162dded289cd225d2679f2fbea8ae1a77e96227ca7adea846d1ad15e20fb8fcf5f25e0c1c0736e76a8ed6ad358ffe2ec8956a4822d1
 MISC metadata.xml 1730 BLAKE2B 8b10814eed310f63863f8511e65c5a7534b13f39ca865ba07646b7703b20fd1f84fca088fdb8af13ca2faea5d685132c57c90bf5d2d91517b4a960c3ee098b27 SHA512 0578cf9ac285831447e88a93fdf2717d54392c098a1bfea7726100e6b0b0653b63171c0045afc4068b3b56e71bb798b0c78a71ea8b150adcc05ceb4f38919c78
diff --git a/dev-python/exam/exam-0.10.6.ebuild b/dev-python/exam/exam-0.10.6.ebuild
index ca62934620c0..8fe56f7886f9 100644
--- a/dev-python/exam/exam-0.10.6.ebuild
+++ b/dev-python/exam/exam-0.10.6.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"
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -19,4 +19,4 @@ RDEPEND="
 	dev-python/mock[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests nose
+distutils_enable_tests unittest
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index 7886521b7908..a0a812625073 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,4 +1,4 @@
 DIST eyeD3-0.9.6.tar.gz 250445 BLAKE2B 11f8bef4b17af07f08144e922634e4c6e467bd8856da9d445a70006b5bf32d442a52e234845a3f146129403fcc16047cc759102b93c433a0466bf0afd9576230 SHA512 0c993e9bf0a27ca41a8a2964a3347a6b0ffa472f833b3dada39ae09a5a2b40e0afb6bfd8c0ea5ed71d3dc2bf3cd062c1fb5fe79abe6ad867221b779786247173
 DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
-EBUILD eyeD3-0.9.6.ebuild 1230 BLAKE2B ff2c7191b18d8340f4a24ec5605c588a35c8139dd67ed4441c1a284e131196f5ed81eccb80e38b9b3567b30357d13ad129cad69aea35493676a2791467340cfd SHA512 87d7f38e4a88eddd70c0de8ff6d19607ae0081f1a927b691618f7768e4a30432abfbbed384a23c6c37aefd9b26c4826753855a3192181ddba3c48e6709e7ff60
+EBUILD eyeD3-0.9.6.ebuild 1198 BLAKE2B 268eefd6dcd32e29673dc83266d549efcd652fffbee49f5b9122812d7bd4acc93db18b88601ba11099fccd9539a1334eef5c0a94497ff7f3a9476d72cfbb4818 SHA512 8e67c12f589864602a7b10b2fef58f3205ef8b9ea38219660c92a7bda300be020b22abe14adf926735538c48819b9e715e0a14b6bae334c3d9be89b330e21343
 MISC metadata.xml 498 BLAKE2B 3d978f42129bedd19518980a3b7bc238b256590bc488e6b2d8afdd17ce9a93124861473f0fe7d80fd69cde6a9b53b1789f0dddc7e3de3e606a63751023d385fb SHA512 a4addfbe9bfb257176ba9ea264ac822f299d3ce643fcffc8f8fbedcfb033015ac7fb1832f1a053f1b188d9198d4505a174cf2747829358d612219e9f53d3e718
diff --git a/dev-python/eyeD3/eyeD3-0.9.6.ebuild b/dev-python/eyeD3/eyeD3-0.9.6.ebuild
index cb6fada8d168..34ee27ed6b40 100644
--- a/dev-python/eyeD3/eyeD3-0.9.6.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.9.6.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index 76e5986385d0..1a3323227d7e 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,5 +1,5 @@
 DIST fido2-0.8.1.tar.gz 201198 BLAKE2B 33411dd05d7f513445afa8a6fc4bb90f3989a655fa05d2ba9da411aa7eea3b30ffa253fae6586f76c416115e5bec90f6f120472a49a0acfbd91020d2cba8f74d SHA512 fc0753ea694f2170d529129764cd9f9c5439cd2f467e4f384d7a698266ee8391a5c9c7c6e51d2dc2a99b93fca1c7d5288d5236e302672a87b8ca7704f328c0b5
 DIST fido2-0.9.1.tar.gz 206395 BLAKE2B 9a9b5d0dd808de896c91aa605540a1968aab7ae543336521d4a206f27bcf836c57e88aa6cdd0bacf71db8d16a0f94c2f9c16b16ca415363fd0b5e145a448ec18 SHA512 cde8c247fe0875129a890866ab76d40b2bd6feee86ff1ccb4b9ec5e6dc037e569fc8d969b51a456b5e66c6f7c67e18d14c3917375d5de85bbe7da5af3254f797
 EBUILD fido2-0.8.1.ebuild 1065 BLAKE2B 03714bfe2468a2914760d886b9e9913c6e671510280cbe5e29d6124e6cf08e2894cd91bdb8129ebd28b2f26da62f7f969bdde2a3bf50cf4995a07d06c5ea0791 SHA512 877bcb037b68c29aec4f2ca8312643f3783d2cea4f5eb09adb277a8f9504b7c16f0146ab6fb3a95cc88de7a0b0721228773d3edbbdbe55054de57983a8c3c484
-EBUILD fido2-0.9.1.ebuild 1324 BLAKE2B 8f0115b973f26448680a2a06f1e6623c616684b2f8c1a9e7d83bca8ed7aaf6cca446f22b984c3d09b3bc834900c21336c7b652dbbcabc249626a5ed0e17e45f6 SHA512 9c888534bfee0118cb7f5e98d4e6f94fca85c9bda0d1ddaee7fe59b3d60df307c77786320347309be67356887f18259900d4be61e2b0985dc2ef8b5a652b2647
+EBUILD fido2-0.9.1.ebuild 1331 BLAKE2B d65af450cbb2ccfb13c111c66d76ab42346205223ae47ffdb537617de2b611ea7cf8da0ad4243fc4851b883b555d28c1b34e4f08272f4248ce51cf6d1ed4b1ca SHA512 ad03b13e06e84b730ac5fc0e0c463f7faa7e241fc01185aad50b3f81dc3c8e034386aad20ca062ea90a51f6060ae29a87150cc3b9064163453b11bafd6711e5b
 MISC metadata.xml 825 BLAKE2B c5e9aa7ff7fe2d8c1ad6c7d62fc99252765ef71258fbc6fb3a173b2e586eefb4da24d400c261e5888c3a51eaf5c7ce6fccfb3f01444d4c27778ec5dc098e3457 SHA512 89922697e33c94ad57635fdc4ebf316ed8d1f1eba307ce06f116aefab570613958e84b863e2f806d522fcce0a7c0010bf366c4eaa5777f8bf2d3087966f54622
diff --git a/dev-python/fido2/fido2-0.9.1.ebuild b/dev-python/fido2/fido2-0.9.1.ebuild
index 4d049efb592b..86f0257593d5 100644
--- a/dev-python/fido2/fido2-0.9.1.ebuild
+++ b/dev-python/fido2/fido2-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar
 
 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"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="examples"
 RESTRICT="test" # Tests require <dev-python/mock-4
 
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 53b5dc86f399..0ed3b414c9dc 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-SQLAlchemy-2.5.1.tar.gz 132750 BLAKE2B 6378766e9ae5e697f9a0fe23471f0264e5ac1f4c824657e5197f6c35f9f12eb756528641c1078b1bf470170c557c3201314a80b922b4ab84e4664a0ccaad2a6c SHA512 5d483418204030837e62769d45c16af88c5be6dbafc7c340cc4e67ef1736ea5102f506156119864cd7673cf382b0d3f27050bda64273b93ef4805fce9e1a0f6f
-EBUILD flask-sqlalchemy-2.5.1.ebuild 700 BLAKE2B c39c34211aff8bfc0747a9607cd39f8f4a5411186f5ba5bac91241f041efd6eed66a8b1ef13e3490077c2ae2d96124dff6336fa274d22a9d93739b9472042c6b SHA512 fa023610784c5c381ec973b08c622f3a86ef5399560dbb0f75fa6c27852ae89bcd088715b6fe8fe406875bc9cc88ed64925e5b2d64320e048d1f4cbacbeb9a5c
+EBUILD flask-sqlalchemy-2.5.1.ebuild 700 BLAKE2B 6954278eeb769da8709b4cfe75cc27ff62ee7f855d43346b1cdbfe22fe4663ca03ce377ac72eb6805b5a9600e07b55f16f1757e0d60ce49f438ed8896c10d133 SHA512 c6d54c6043c7f772000cc1f9a0d36f1ddf08d3cba9cdac084b39ba2def6abdca13426ce8f7af7e77c063fc4c0d78be83917cebe420e0783a379ae9abda63f5c1
 MISC metadata.xml 719 BLAKE2B 6d692d63c6b7e9263bd38aa0eb6c9b144c647d6ebc10a367924c9126aa2d305deeb38608627ca160889a575507479065be3bb0c8eb2c16c615dd4b06c000cabf SHA512 22229e104fc82e053e4f98377b5586dd6c9d5d817411c22d3c1eb7de28707823f22608b489c8f3db7ab673b4ffd78462ab9ee312d47398b8b5ea90e20faf5363
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
index cf700a286175..913b8ec45c3f 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+EAPI=8
 
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="Flask-SQLAlchemy"
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 07c3ecf86a7a..f3cfdd57cc28 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,7 +1,7 @@
 DIST Flask-1.1.4.tar.gz 635920 BLAKE2B c1f19e7449177ecf6e901d5932ad25cbe866ff53b9323f717541922b1ea5b10203ff07630fcf3eabaedd9b6a24ef031ad2aaa2e2f759925363bebfa7e5d967da SHA512 6f427a1264921b8560446afacee2757d16de0dc22d6ed249b7bc5d6f50f3af50c89b79ce900d75b41af4befc53910f2b532c2e280de42837e2133acb6b1bd80d
 DIST Flask-2.0.1.tar.gz 626851 BLAKE2B 05273edacd6d66237a552410df7ef7ff367e28c273cc89f654eac5ed2eb3d26f71437169905372b398cc6c5c5067dcbea54aa1cab782e03c6186ac9ae3949f4c SHA512 fefed4971f0542b25ba2867919aa54a83b6e3f47e7cee94586543843e7e00ba209ac15d8fe28a3c53981f587aebcf2f3915a49e1a9cd1b729099dccbed3783c2
 EBUILD flask-1.1.4.ebuild 1330 BLAKE2B ae78a5a449bad145e9ae537f968bab105ce9f4c69a22ed881ea1dbc8cc7cba708da8724731c8009ee23a8c606fbeb32fed970a5237427d51aab13a91baf7bb28 SHA512 1885d47a974863080b2a3c5372fad49765958e2b17e7a70a01afddc7ed87866d9205259da4b2e3891d88594144ed13663a396844aa92e7f430489e2acbc68a42
-EBUILD flask-2.0.1-r1.ebuild 1222 BLAKE2B 5dc98bfddd15251889ca41761d37079dd7a12da64aecdc88749e7e88bee09353b1596eef94ca16baaf76b1a07fb64e7a33522e550a9fa54f359b656d7ab12b02 SHA512 4936b7ef10305903e827faed39c2e35d379d002a5d0ee103f80f09ffa1af9321537b16b6efaa9b51736d665130d51ca9a1a95bac150dc0c86b637c4e6a67b04d
+EBUILD flask-2.0.1-r1.ebuild 1229 BLAKE2B 67a9ac3d79a87f0aa6d6202cca335e7207ddfc0d5d284d92eacfc3329726acf9f004c1d23079f0b270ed95c72ab35da456a191d230e39dd0c0489ed153559711 SHA512 62c9a73ac355dcdfbd2b91c0f5c18a793ca94dfcb38a13b55b9e6e6903352af48cc38fb143e0fc5e5c5b822d75d7ebf998b288e3b2cb3202514720d2f6279c02
 EBUILD flask-2.0.1.ebuild 1161 BLAKE2B 652196afb4a78a8ca1bebc957588150522e6360ce1d524137b449bd4b2123a811ce3e7b08c161f8d20c397d1d85c174d63437f5df0dd2a7f2327539229ef7446 SHA512 03e7fdc43bb1582d20c8620e9f86ebf07a9ce52d63a134751190b68dc17027371a22a17c9dc23bdd97b86871bf1e4843a0684b6e5125d1c505012083127234c8
 EBUILD flask-9999.ebuild 1217 BLAKE2B 57aa06a3fa33b0e8e5fd3e3054e7fba2e263524d2613207582e854643afd6b7c1ab3f41d73318012a9d77982a778cf90c6cdd13d0232447ef94fd2603f5f32e8 SHA512 3c050a9e65cc40a6556d5bace0ec403d043e8c5591814d47fa3c4284f4886d0eeb1c6f29ae0b9e25a001f2ab38f28fc20f34e3de67d2f74c9197b0b94d4a3f05
 MISC metadata.xml 385 BLAKE2B 0aa1fc56ae29e91457344d7ca4f8a26506d46d22b71ac7363fb443ba7fbcad7974f86b898dd7b2e4cc2bbbc5d58fe1a1904a077e5c7b959ba2e1761f1561769f SHA512 223a1a9459b462c6dfbfc2fa0d6932e1f9457e86eb9a70e96c5182a3b4f898a121aa13dc9425811b8fcabc6dca8ba1d715e5aa221453e235a5b5ee2c25cc02fc
diff --git a/dev-python/flask/flask-2.0.1-r1.ebuild b/dev-python/flask/flask-2.0.1-r1.ebuild
index ad0a2c7da03d..555b29c6025c 100644
--- a/dev-python/flask/flask-2.0.1-r1.ebuild
+++ b/dev-python/flask/flask-2.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/fleep/Manifest b/dev-python/fleep/Manifest
index 235b131ab6a7..a898770507fb 100644
--- a/dev-python/fleep/Manifest
+++ b/dev-python/fleep/Manifest
@@ -1,4 +1,4 @@
-DIST fleep-1.0.1.tar.gz 6547 BLAKE2B 75ede77464e32404b3e1229adc9484d1d44b33323ed18f4be5275ffd1c8f63863459f46ff9cbf4f90d0e1387c0e5c967cce13ac8f6ce65710709dd227c04df89 SHA512 ba56f3a6c99f4c793e9f5c4ec04f7a96effabeadd92b18aeb7689a75d8504ccfca086db635d33e358ea9f67887e904c141e259ce2e9b9f3ea77f9e24c1b0eb27
-EBUILD fleep-1.0.1.ebuild 502 BLAKE2B 15f704e4051596dcc441201f887f8365398e8cdd6743f2cedac4e8033b8508ab93cab0b9db3c89f044a581f76bf876ad289fd334c598128c87ef2b6a09ddd12a SHA512 b27cdf484c729e24654e5956f4fd30bbc09a94a28da86988ae1e5f65dac69d85a0d0be46ddec74cea05b9a9d67de79c85e78185d4237a025417e0baa259e39ec
-EBUILD fleep-9999.ebuild 502 BLAKE2B 15f704e4051596dcc441201f887f8365398e8cdd6743f2cedac4e8033b8508ab93cab0b9db3c89f044a581f76bf876ad289fd334c598128c87ef2b6a09ddd12a SHA512 b27cdf484c729e24654e5956f4fd30bbc09a94a28da86988ae1e5f65dac69d85a0d0be46ddec74cea05b9a9d67de79c85e78185d4237a025417e0baa259e39ec
-MISC metadata.xml 394 BLAKE2B b7e3b83459800ddcbd5853411afa08493933b4acf4f9795935fb34e42285d60b75caef1eb6860c15306f9a24421f516da6578518de94d0e4e7c7f3fc0529fc87 SHA512 98e150c1ce256678540131c057c1ce822cbed783a81ac09b7c0230a25f3cb214d2a7f44dd1497d2cef312f000e5114d5171105792807cb789a49d72386c40841
+DIST fleep-1.0.1.gh.tar.gz 197438 BLAKE2B cf099a941d63443a9ee314727966ae95e143acc2f33f7760fe34772d4a2d371af534c029ad207b7727d34e7472c9396b3fc1e9c82066d98ae248dd4f7bd430d7 SHA512 ea287b9cec0f88f378b6c2f248938417e7e51b004a03bb4421611f9cbdae7b97cf1c02b5096c491df934922d906812daadab02d46ae49e64dc2a2a880ab4d87e
+EBUILD fleep-1.0.1-r1.ebuild 863 BLAKE2B 9fe0f5c4a539c0f579d9e4f9bf5b38c449410c22a4c529efc63781463fc3023c31e4e594454fc03de2eba795e23d076c86800fb096a2562e96080b7f24f267cd SHA512 6e0aff23476bfa2fbee81b0c5143d8870fe5aa3cde02139b176caa8a25b88a636924819820d86324145ed2985d021b51b93bdbee3b604cdf0ee0506699c47e57
+EBUILD fleep-9999.ebuild 780 BLAKE2B 43fe8b1004891760053221129190333bdc524c89f21248cbf16b2352103ce82a32bf1d7123fcdfbf0427797ac477944c7fba957771aab151975e7b87ed31e7be SHA512 02e6655ef370e0d76672a46168d34cc04dfd70c7b0dd4743b8009698137bedeb86f0069489590a82bb32d686aca940b7046126592fc3ba1c7fc34416627cf215
+MISC metadata.xml 477 BLAKE2B 04c9a6a91ba95aafd79daeb25d1cf2931576b2cf7a2ead6db1f8607ce54b106cb088f6c2d3974bda6ddc4a3986eb2efb85f90d60c3f32bfa41a1aaed817ecae8 SHA512 72185704ef938ac7d469e8c4766f5b32dd8ecb694601acdd81f853439aee98732f6932359bc1ee69ed4c1cbf16359aa7b7c608309fd2e9685ebddd08bd218e81
diff --git a/dev-python/fleep/fleep-1.0.1-r1.ebuild b/dev-python/fleep/fleep-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..cce82c31af2c
--- /dev/null
+++ b/dev-python/fleep/fleep-1.0.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/floyernick/fleep-py.git"
+	inherit git-r3
+else
+	# upstream aren't tagging the releases, just as commit title
+	COMMIT="994bc2c274482d80ab13d89d8f7343eb316d3e44"
+	# Note: On next bump, remove gh suffix from SRC_URI - was added just for tests
+	SRC_URI="https://github.com/floyernick/fleep-py/archive/${COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz"
+	S="${WORKDIR}/fleep-py-${COMMIT}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="File format determination library for Python"
+HOMEPAGE="https://github.com/floyernick/fleep-py"
+
+LICENSE="MIT"
+SLOT="0"
+
+python_test() {
+	cd tests || die
+	"${EPYTHON}" maintest.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/fleep/fleep-1.0.1.ebuild b/dev-python/fleep/fleep-1.0.1.ebuild
deleted file mode 100644
index 0171f1ef7528..000000000000
--- a/dev-python/fleep/fleep-1.0.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="File format determination library for Python"
-HOMEPAGE="https://github.com/floyernick/fleep-py"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/floyernick/fleep-py.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
diff --git a/dev-python/fleep/fleep-9999.ebuild b/dev-python/fleep/fleep-9999.ebuild
index 0171f1ef7528..68f31790d687 100644
--- a/dev-python/fleep/fleep-9999.ebuild
+++ b/dev-python/fleep/fleep-9999.ebuild
@@ -1,23 +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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
-DESCRIPTION="File format determination library for Python"
-HOMEPAGE="https://github.com/floyernick/fleep-py"
-
-if [ "${PV}" = "9999" ]; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/floyernick/fleep-py.git"
 	inherit git-r3
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	# upstream aren't tagging the releases, just as commit title
+	COMMIT="994bc2c274482d80ab13d89d8f7343eb316d3e44"
+	SRC_URI="https://github.com/floyernick/fleep-py/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/fleep-py-${COMMIT}"
+
 	KEYWORDS="~amd64 ~x86"
 fi
 
+DESCRIPTION="File format determination library for Python"
+HOMEPAGE="https://github.com/floyernick/fleep-py"
+
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
+
+python_test() {
+	cd tests || die
+	"${EPYTHON}" maintest.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/fleep/metadata.xml b/dev-python/fleep/metadata.xml
index 9e666fde3716..e0bb47d33be4 100644
--- a/dev-python/fleep/metadata.xml
+++ b/dev-python/fleep/metadata.xml
@@ -8,7 +8,9 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">fleep</remote-id>
+		<remote-id type="github">floyernick/fleep-py</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 115c04cd14ab..69bb6203e251 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -2,8 +2,10 @@ DIST fonttools-4.24.4.tar.gz 2556059 BLAKE2B c415ae5214b6df7171a5f8a7ea179b1a4ad
 DIST fonttools-4.25.0.tar.gz 2576777 BLAKE2B 802236b120ae78e2721d734875fba794fb9eafc125fbfea6b70c68d6a18a8b3c1ce685da18c83ee3364ff38f72707e42ed0ae25bc62d362c6271fff90da56d0c SHA512 c8f7512053ce611fa07bbc1fe844ee9d50cf09e19a2a27bed7df9d37d362b7daa910fbb651147f3690a03ec4d8adc8d96e8f0310eda24bb40208240182dc9b54
 DIST fonttools-4.25.1.tar.gz 2577170 BLAKE2B 8cb03ef1f9cf4e61d5e6d4963bb5c43ec48838e0453cc293de1c763a29b34d69701b87430d8a85085f06c26671e00a91c89e4c50ba8d2fad4a9cc72b1f17d0e9 SHA512 ca3732bcc5e2b373983d34bd72e0ea36488f24aa442d25d0d16f6a473ef35323547f900b1ae87c42e64c451afe4f760291095738a4442c11c5566c9efd0aa944
 DIST fonttools-4.25.2.tar.gz 2577630 BLAKE2B ba03dcc25672008722bb7f5ad4238e9216988f5ed1d545297937e771bf076ae516172cd90bd450ded04ca28fe158c83247bd6b6aaaf4687a5893c0980630210b SHA512 b5c94e76a09aeb92061cf792f53eccc0ab369c5458aeac103f865f6110b2764677ad7c63d1367fb027c891a11d7eb158469748ec495c3a7aa6b86029e7c95223
+DIST fonttools-4.26.1.tar.gz 2579211 BLAKE2B 886a803f6214658423c98bd347db6e2cc0baea5e2619ce18ba2a96589785a1b93228f5b35dd7f6c819b81ca471d6ea1a09d12ad6de04c75388ab6cb5003f5bf5 SHA512 226338cd1c3f71662080c69b0786a6a945b5a75d3a4b7ee6fcf6d7e2e089407d11b4a43950c7aebdaeccad1819e5c6e0b947938fbfbaa3caa9747b7b4a1bd5f6
 EBUILD fonttools-4.24.4-r1.ebuild 1295 BLAKE2B da50602b72774fa7dd8ea45e5a8decc1410637898075d60445a6949b1a38c826f9834dd60e0452d8b1f864a44d0fc620f1166ae32181ae8b01279630aeda390a SHA512 02668aa827368428afe0fe2633b7cdbab70590796a822a1eb15fea29d51428534e2ca53c1b66d574f2e7d10b3cfb1af0e99fa8c3c04e072844232081b29dcb95
 EBUILD fonttools-4.25.0.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
 EBUILD fonttools-4.25.1.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
 EBUILD fonttools-4.25.2.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
+EBUILD fonttools-4.26.1.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
 MISC metadata.xml 371 BLAKE2B 68c245e8fa48ff65af06976274a7352964e39e13147683e266688f953d82d67e0548dacfe675bbd2e6807945c2e367bf08de4d18f75d53f44b28ecdcc8e7f188 SHA512 489bf8cc57a5bd577fa8949ae0ea9ec8be9a77bd6853e549c830f60ba6a152bc7dd25b2f3426974ea6448120113808ff627f9179e5e1e70105003057008aa86c
diff --git a/dev-python/fonttools/fonttools-4.26.1.ebuild b/dev-python/fonttools/fonttools-4.26.1.ebuild
new file mode 100644
index 000000000000..e40813acd252
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.26.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index 68fa1ee5ba78..4708c3ce6288 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,5 +1,7 @@
 DIST gast-0.5.0.tar.gz 14933 BLAKE2B 5d70d832d69185227e574a4bf88752e1dff43ef0e3e78a1de8ac7ab96218530d37a6dd0a3e6e4bf1fe8e11afe98b8d87722bfc2d6c8b68d8ac4905f335c2b85a SHA512 31c204587b3abcde61ce7343bef8439fab7e36c46de17eb2e02138e3d709f8f70e24c2c5d045044ef06e42119a50566c881d293c1c815743655354e72304701d
 DIST gast-0.5.1.tar.gz 14094 BLAKE2B e58e989198991fac1036363f7d1f7aa831263f0a9e5e616470fb6b7732b2bd39b9ce71cfd97b990bc29c3b9a978c56b90e375ec3d4a9b3c6692f44fd36d9309b SHA512 955154d273e97bdb80528bf17bc060e6266c524218d81469ed99e09d099cfa320af5c8384f8cc51d22be254578221e068d7a2e2bd3f0279cb65d40a4eead7766
+DIST gast-0.5.2.tar.gz 14222 BLAKE2B b251f9aa54d8bdba318f0c8aa7fe97221615a22b7dec8da99b15078ce0f482ac8ec931b9c0acba3a405f2ab3c820a1c578ab93583f9f84740571dd85a3fcb45d SHA512 2a06245ba93f2c0715f662e32e0865732828deb672bc70c3d70a4969c8a2e4c518354a4a63760eddeba53932d4f8bf0ae0ffab64f1a1ad3b20d5b2d18285cd6a
 EBUILD gast-0.5.0.ebuild 494 BLAKE2B a305be1db62fc33ab224764831b5613c72f15f2193bd8975deda5ca72d049d171d1eb1f1077177ff96f4ae532a71d1a4cd1b148b4524aa17c402ee5ce1964113 SHA512 1d85abd88a29dc52c1a13de328ce715e07835921db1db0012bff3c1c08453a3b24d141b8002ac6704d8fd211d5959412f96fbe047ba88d8589355688804e5be4
 EBUILD gast-0.5.1.ebuild 496 BLAKE2B fcca9acd62ce1a452e95747793b48e9fc6e865020bf8a6dfbf43ca1583ee061b7e1700cf1ec9cb2ac965d74348d28fe95330235608cf91451261a8b8d260ec14 SHA512 c8e208f3b930305a07b0cd7a55f38bb3e60a21b7bf47358e3895bed93489305122982091eb1c75d125a619e9c63374b340d1cab15841b3bca0af9bed5838b476
+EBUILD gast-0.5.2.ebuild 496 BLAKE2B fcca9acd62ce1a452e95747793b48e9fc6e865020bf8a6dfbf43ca1583ee061b7e1700cf1ec9cb2ac965d74348d28fe95330235608cf91451261a8b8d260ec14 SHA512 c8e208f3b930305a07b0cd7a55f38bb3e60a21b7bf47358e3895bed93489305122982091eb1c75d125a619e9c63374b340d1cab15841b3bca0af9bed5838b476
 MISC metadata.xml 652 BLAKE2B 487de5ab8f3b93f2a1546f307429cf547162f59ac6f8d35da73b9a116517c53e3c365717746f4f0369a44a4863bb2e423119b775ef3c18e4ba61aa79966c099e SHA512 e9b2688651207c7a7384e099b2ddb7d083fb5419681446ed56a6cbe18ec302a689e71dd7e795f934b0cddab96a0d46b2f1c0aefe90132c22fa2ec4700ef1945a
diff --git a/dev-python/gast/gast-0.5.2.ebuild b/dev-python/gast/gast-0.5.2.ebuild
new file mode 100644
index 000000000000..f25219967d31
--- /dev/null
+++ b/dev-python/gast/gast-0.5.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
+HOMEPAGE="https://pypi.org/project/gast/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/astunparse[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index deb30a80f52c..facca50871f8 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 2160 BLAKE2B a789bb1d3879cb3f17fad0e55e34a3ec7e16a9415d6b5b545ce40feeab8739250b30b0e489ed26524ccbce1a1ef97202d3ebef14ffb67bad01f86ff06feacb86 SHA512 220d4da55997a4a6944d55fa56f610a281cef3eb559892dc5bc3e66facf0edce7f7c127685f724721891b3c199ee4a217679c450274e314cdef1b81fd2b082f8
-MISC metadata.xml 374 BLAKE2B 80be57b8b296d0c79707bf576e666c9b418ef4a575342675ef50eef354d38cabb77ac2f645c08751060ed8d5cd9996c5285265d56b2018b3e8a72a342c9f3903 SHA512 c4ef41632b92cc273287883b966a262e675ddedd67e32953b94bd329152cc0d667138ab0fca50b9525f514fe73c1ccf0cd4ea2d3257178402b101b4ffda2db32
+EBUILD gevent-21.1.2.ebuild 2271 BLAKE2B 3d96ee912aa7b79f935987dfe9dae52567222a33b82eec9df5fba45a607bbb9981dc0d77ec91184a06b3cbf94d2d5f61fd9ea1cbc88aa6cd0d06c113f8f400b5 SHA512 b2fe8541bb779b288e36e67da2f4e9f969233164ae9f70359babf77564493702b31822dfb297ceb7ac84161fea9973a48d01350e20a3a59a773a1aafe1386b04
+MISC metadata.xml 628 BLAKE2B 9e9d9af03576525b40c1ca717cb5728bcdcb5a9891b25f4d1f513261aa6039e7c2161a5cf55b0e72b4e79507bb8e42a7d3de6c943099b51a99b4192f054728d2 SHA512 1e9a89cb8a72a230aab3b8ac367c7121de09e15ce25c9d4805709e3f8a6d5258166a78c66c297b7b8b19b5ebb2fd7505a69696950579355a9df6fc09fde9fe1a
diff --git a/dev-python/gevent/gevent-21.1.2.ebuild b/dev-python/gevent/gevent-21.1.2.ebuild
index 61c3d717cbf5..1568ccd6675d 100644
--- a/dev-python/gevent/gevent-21.1.2.ebuild
+++ b/dev-python/gevent/gevent-21.1.2.ebuild
@@ -16,20 +16,24 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples test"
+IUSE="doc events examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libev-4.31:=
 	dev-libs/libuv:=
 	>=net-dns/c-ares-1.12:=
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]"
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	events? (
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+	)"
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_sphinx doc
diff --git a/dev-python/gevent/metadata.xml b/dev-python/gevent/metadata.xml
index e10bdae3530f..7faa4e9a24e2 100644
--- a/dev-python/gevent/metadata.xml
+++ b/dev-python/gevent/metadata.xml
@@ -5,6 +5,9 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <use>
+    <flag name="events">Enables the gevent events system which is required by libraries that use gevent monkey patching. This adds <pkg>dev-python/zope-event</pkg> and <pkg>dev-python/zope-interface</pkg> as runtime dependencies.</flag>
+  </use>
   <upstream>
     <remote-id type="github">gevent/gevent</remote-id>
     <remote-id type="pypi">gevent</remote-id>
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index f31f2acb9a50..4d8a06df6350 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,9 +1,5 @@
-DIST google-api-core-1.28.0.tar.gz 133640 BLAKE2B 8134e39cc3ff2fbb850d5e774d08589e3e64b83ca5d5209279f5d1b7fc2eb350a523bbe2890fba6d907689149df3872a7e0a11991b1ecc62fc64a4753dce38e4 SHA512 3702d27613e621394209047451729c1308beb88c917033b4340e3fa96bf4a5ec36ad2594c98ed14439c578f69a202d95a96d30472438a30417484cff6e06fe7d
 DIST google-api-core-1.30.0.tar.gz 134595 BLAKE2B 104f52bafb68fd91904c02cbd6d3dd2e32c160a528f58e9af3612fc4f7a9934c522f79895b50982b46ee77947af7eb52557bf304b6f2624b97b5082905511829 SHA512 cc14f9c67bac99290665e2b85a97eacf43cdd2a0e4668ecbc7dd8e7131a7e4e908aca2be6d65797d0838081a02768354703762a1a80fa0b666efb81448b27899
-DIST google-api-core-1.31.0.tar.gz 134806 BLAKE2B 8609dd1260b72bc2c8fe949625c1b592e409bcd34c90f46671ef5c1573775f1957723ab6a03909b55145370e2c06250717b15452a89400ad1b6273a28c5a98a3 SHA512 af5a134ffeb65358d1b8e39bc6b0fe0b5477572dc915d941d63fcfeea72cff46c74d5d85350417484243a298462ab1322f69657694b25472d023db4b5fb27659
 DIST google-api-core-1.31.1.tar.gz 134947 BLAKE2B 112e705f8a2d945a207c10096a3cd8c1c65bf806339e8d688cc5638d234c1de03d168099414dd7314b8d3129d6d0e198208cddf15369b84ad837b9da90e8499c SHA512 29c84b98ae39416dbcb8ba7412237007bddea6e9a3af07c1f7753bfe57576125325a6412b73ab7d58c57257405b4b6aa36e043d0cf2496517828c7594f6698ef
-EBUILD google-api-core-1.28.0.ebuild 1260 BLAKE2B a3b0db659b2af9d38c7abab74c044645a03643f634443a6ff5739b0a58d47def40d86d721215afa7090b092325842dc335f83d8609e1da0cf6059dd355ccdfc7 SHA512 48a322282012623f07f845e3f2e6c626261f354ab4044fd99ce4936de559b8a830fb2b470547267f3dbbfd8c9fe8a68b9821918e08c5e7d199f748d8c5557c06
-EBUILD google-api-core-1.30.0.ebuild 1298 BLAKE2B 12d850962f1f5546eacbf64a502314d224c463cb119d6effaf5a5e6dad9591cc5b1ac5e0c5e50d85bcdb54aee71824ff78340f880c3488c456d6af849923ce30 SHA512 71e9bd2ab53bcbd9bfb0086fe2db395056b37c506f1d8e143c60a3092995ae672c2e87d521eb6d7dbefbd89cea61deffb939b4a5f1ec0066483746be92800e46
-EBUILD google-api-core-1.31.0.ebuild 1298 BLAKE2B aa2d3fc7236e6261111a95174eef4ff90cce0dce3164138c5d5947b1b4804dfc9ed967eaa3635e3ad0fde32f91513a7cbd850edffb308a0ab7111ef8c16ac2c3 SHA512 22b106f4c7deb4136700e16057fd9987ef0b4bd718d0cdcdc489ff1eb94c304b05175a70fcb606714c7f8b922ecef2a3e7d85d91234bd8afd84deb4fd1c8dd52
+EBUILD google-api-core-1.30.0.ebuild 1296 BLAKE2B 674507e4bdaab2810fa3bdb9c3976d25d29482d925f7bb0c33971b54047b675a321e807e413d2f3ac5cc8edbbec01dfc4c7ca32d6819148f4f569c3d63800881 SHA512 7477dc17520481e98797eacf93fdd0a6487e12e3c10b3647796274a12dda5788b3cc704ba1cc32b169ae409dfe96332cbe5b4994d973fc680637dadda3b9e0d5
 EBUILD google-api-core-1.31.1.ebuild 1298 BLAKE2B aa2d3fc7236e6261111a95174eef4ff90cce0dce3164138c5d5947b1b4804dfc9ed967eaa3635e3ad0fde32f91513a7cbd850edffb308a0ab7111ef8c16ac2c3 SHA512 22b106f4c7deb4136700e16057fd9987ef0b4bd718d0cdcdc489ff1eb94c304b05175a70fcb606714c7f8b922ecef2a3e7d85d91234bd8afd84deb4fd1c8dd52
 MISC metadata.xml 452 BLAKE2B 0fcfeaec5750606a31eecf6794110c23bee9e2e56c9aa18201568e9ca8b1b45ef538efb4d0700eef7ddb28729acbc23946daf2c88c1cbe4f4f309d635455080c SHA512 0bb4089469ba140ff630b358150bc7ccb646465da9ae7b83ddbbb980b10347e0d3cb7b7e86cd8d0ab5897aa6a34017f6a921978a8ded784ef7582b00552299ae
diff --git a/dev-python/google-api-core/google-api-core-1.28.0.ebuild b/dev-python/google-api-core/google-api-core-1.28.0.ebuild
deleted file mode 100644
index f12208fdc974..000000000000
--- a/dev-python/google-api-core/google-api-core-1.28.0.ebuild
+++ /dev/null
@@ -1,44 +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.25.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}]
-	dev-python/packaging[${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.30.0.ebuild b/dev-python/google-api-core/google-api-core-1.30.0.ebuild
index 183edfac0b1a..c181080079eb 100644
--- a/dev-python/google-api-core/google-api-core-1.30.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.30.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-api-core/google-api-core-1.31.0.ebuild b/dev-python/google-api-core/google-api-core-1.31.0.ebuild
deleted file mode 100644
index e85bbb95287c..000000000000
--- a/dev-python/google-api-core/google-api-core-1.31.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-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.25.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}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${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-auth/Manifest b/dev-python/google-auth/Manifest
index 9a7d539ef6aa..973d4ab54fa3 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,11 +1,5 @@
-DIST google-auth-1.30.2.tar.gz 169368 BLAKE2B c01191313b4bd7ffdc62fbca20aeadcb01fcb1f26e4c11504f88c2582b9a3dca10046edd5d2fe88c98980fb09e4d68da99bf0b8b5692abcf5271994515f91765 SHA512 f133ef403f8a3c92437055f2fd0e5f607199a0bfd9a76a44075a9be8ec16c4d4822d58d85fa52ade4c448e11cb6822f7e8da03ab72f3dddfb811c8d7a846f841
 DIST google-auth-1.32.1.tar.gz 171621 BLAKE2B e82f4666a38d3dbaa4aa4a4d5192afb711471432c0dcca44b1a1c52fa2171f1de0d7ffd8a7a6d5dc6dbc3a1dec16becabb26306a9ba3b3fd0998584dd1194cc6 SHA512 968c16c7fc5c8c589a94e24139c319ec7f2791b021d6240156d398d4795e6afee8e46591c4aa44457de6f98ca14e8edcb055fb3a02914b43ba5fab74a03d9fc6
-DIST google-auth-1.33.0.tar.gz 178385 BLAKE2B 7d98afcd3a1dfc12a2af48297188c10f9618483ebdeeb8f7e02fca59d6255210a64b4917507a4525a3d6838198035fd827a1276da2a1f06169e83d1ca75fb485 SHA512 19da14b89cac28cf824f258d3dc662cbf40f4227e840594148c7ea3a6640dc00f06653c1b29846a9569d938a0fa307aff1c8425c015ab46d276485210eeb1227
-DIST google-auth-1.33.1.tar.gz 178615 BLAKE2B 1600ca8861a7e75decfda5605414ff45d8f6d7ece40e0bb7a5892fe2289f1adc5bba313eab10c4d0e1f6e7a38634861e28518c2f02522ec924d6ed53805c4207 SHA512 c54356b21af5ddeda88023b886631050e8e4306ed444093ed6589d13d95af402f03928dc5b5f44f9b4c038128ed254aa14de6d852108f44949c42e2d05304062
 DIST google-auth-1.34.0.tar.gz 180860 BLAKE2B d536d689ff5b0c033f787228d643504d1888f0b73a9c6855fe4fae3af20772ef0640feca39c58c39f45681561dce6d5f3ec1d1f7d9699442fff0ec63fd019361 SHA512 7c3b64e8f85056fb660bbfd4f737053813a1e5b8aba52290882a0ddb9d9fd8c5365b767c78dd1e7859ef95caa6e653786d5a8747c8792bbee9c6fad1a5218910
-EBUILD google-auth-1.30.2.ebuild 1444 BLAKE2B 860c43a699cc5f7e52abf7f37cebae31c74cef8c7ac585c09250d9771481916a516ce09f34af774431f0c050b4c266a9617959d48dc183a5d76ba85370381be8 SHA512 c3185dde8203aeb1f1d1b2f82b43cd81d3bbb9a6feaf30343078d893dcdd5dcc3d2be87e2331e095daad0ba4d774f1297bd5c923027016d0f6fddbb4d37c3d4a
-EBUILD google-auth-1.32.1.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
-EBUILD google-auth-1.33.0.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
-EBUILD google-auth-1.33.1.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
+EBUILD google-auth-1.32.1.ebuild 1444 BLAKE2B 3d2e22bfee368499cc5795a300373dd221299165cfd0ffb647d3402ddb2f300276c51f0f148df94a4cde203529633d4dadeb329e36d9eeb328fe9b127f8a5a79 SHA512 a3ced8db4c83ae70017801663ef0cddb3208b21ed87ee353b6e22639b345a32457766122b4d3bd8f93a455c54a920dc032de0c2c1eb50f247747e236b84e481c
 EBUILD google-auth-1.34.0.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
 MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.30.2.ebuild b/dev-python/google-auth/google-auth-1.30.2.ebuild
deleted file mode 100644
index a1b10b9fa2aa..000000000000
--- a/dev-python/google-auth/google-auth-1.30.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.32.1.ebuild b/dev-python/google-auth/google-auth-1.32.1.ebuild
index 2bb9e016a997..8750bd770698 100644
--- a/dev-python/google-auth/google-auth-1.32.1.ebuild
+++ b/dev-python/google-auth/google-auth-1.32.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"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-1.33.0.ebuild b/dev-python/google-auth/google-auth-1.33.0.ebuild
deleted file mode 100644
index 2bb9e016a997..000000000000
--- a/dev-python/google-auth/google-auth-1.33.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.33.1.ebuild b/dev-python/google-auth/google-auth-1.33.1.ebuild
deleted file mode 100644
index 2bb9e016a997..000000000000
--- a/dev-python/google-auth/google-auth-1.33.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index a37c5406915f..46f8ead901c1 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,8 +1,4 @@
-AUX hiredis-1.0.1-api-0.14.patch 1332 BLAKE2B 08d5c2f1e85db8f0eb81e620c08f150c613f34f3e0e96716891dc60100dfbe5f3c74ad3bdd312db909951ceddc44f5516a14fb9719c7e8be7c676c93b5981db6 SHA512 3c32c157a9f86498c42bfad043577d981d611a6396408932595d7f58eef2737e7d9f3879c714e358c2233fdebd36958919875f8ff5da90775b4205625de0adb8
-AUX hiredis-1.0.1-system-libs.patch 519 BLAKE2B 8ba885963970dfa0a32b38f4b03e26b2a295a480a7d2033082317ec3b2d598f02acce32c95a784b439d938402a41716d6885e9450dd642b7240af5c6625cced3 SHA512 fb646b968cc14d06de0ec2cbebd6ad1418e1bc0d7c03b529d5c1febe3db9f09933b23e9cf1aa80c6c382923d4b96ce0100709337eb375cbe08508ebbb842059c
 AUX hiredis-2.0.0-system-libs.patch 390 BLAKE2B bf64bb9ad6ca84c5cdabe505dfed0417e71d9585cd60c0fa2bd9627b2cb90f8502f5224d5854a14213a5b4a9e01814e23d2295dba0acc122102181fab955297c SHA512 04521b844c346f86a44608bca76f706ec5f70a35c6ce2678fd7c4b958e6053d56aac0fca0d301ec8bed6aaa369c883370ffb946930d46d0fc8c0f7f9e52f7bed
-DIST hiredis-1.1.0.tar.gz 54620 BLAKE2B 9991745d277e87efe836c1c8eabb2016ce401e2be52c7e1b3a154350776fae6fd3c49e3096da57231e42c57bf36ba692ce26bc993d0923b5246376d8694ad058 SHA512 ad37868376de91303c15ffe6109dc7fadb4f458efdd44b7ddc0a410937a389b8e062ab7d36b1aec3fe324ecafe6b1e5e6b92f547cbf619251dad22a28e02ee9c
 DIST hiredis-2.0.0.tar.gz 75807 BLAKE2B dc7535f117c8ecfb2c924fe44a1cba2f02271c544588249de6794ce3aec27f66038ecb9f6364ca87b71f66ba13870a3be192eb79c1f360d2eb6dcb6dcae41caa SHA512 b9a313acdd00676dc046713a81bbf4336959f49f09bd2828997c23ca41259935047c657a4b6f81913715141a75fb6bbe7fc4429c7a5b0f4bc3d5de66b9cfa909
-EBUILD hiredis-1.1.0.ebuild 711 BLAKE2B ea29b6b1b3715ad14044459e8afe8876716748b8ebcf38f6ec9d9d16ab6d08108efd5bf4f498101618354707f5afc65957ce38a02e491296d0fde4c2b5897a24 SHA512 414f9b7b60adc607f5fcf4ed4d4898a3513fcf0dcbc99bbad842e26b473b07bfd55cae75b1d737f4227e9911035608d205cabe68a69cdd3fa47d31065ba0e047
-EBUILD hiredis-2.0.0.ebuild 664 BLAKE2B 33feff366f8c7832224a086fa3a741ddf695eae454e4e117134161e61e978323eaa3bcc58199ed43a89d33dfc773d6ea0dd936ffc55fc359fcf0bcfa5d76efec SHA512 60beb20d611ef4f2564284a4eeb77fafa961f42e6aebe882580527f3bbdea1decdc1990cc6544bd8d8524da9e0894c3079f80a6e0ef8986e2c1eb22496341bca
+EBUILD hiredis-2.0.0.ebuild 662 BLAKE2B 19cfc847fb62d26e8a678b5aa1a8fe7b62ed2d306b73b3eb25466642c447f92bc05b9253e728aaf0b1ae817c1f3709d32fa57f7413ac34d9b94f023d7f01eb15 SHA512 c8c4fb4c1310d433691e8a45a3f06a9330473d59e09195535c7c1e1420ab01712bc003e4833abdaab2a5173e5b653b4673cd5d36533f7cfc63c4d139caa03c8f
 MISC metadata.xml 578 BLAKE2B 39cbb3058e829134e69701f8acf4c89995d6ef1553b911b956a38ce2432267b78a7db070713d230dc2895c5df0c8e8295278caa442642fe64378a5cfdf444ac4 SHA512 da2ecff30312f5eed7611b107bf678af6d1fa45d5d87f75474d70412d7a17db4a37dae578a3047c45758e22a8041c123fa349c5f23580fdc98439300335636a7
diff --git a/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch b/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch
deleted file mode 100644
index 16c420228286..000000000000
--- a/dev-python/hiredis/files/hiredis-1.0.1-api-0.14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Nur hiredis-1.0.1.orig/src/reader.c hiredis-1.0.1/src/reader.c
---- hiredis-1.0.1.orig/src/reader.c	2019-11-13 11:38:29.000000000 +0100
-+++ hiredis-1.0.1/src/reader.c	2020-04-01 13:15:19.852085240 +0200
-@@ -167,7 +167,7 @@
- static void Reader_dealloc(hiredis_ReaderObject *self) {
-     // we don't need to free self->encoding as the buffer is managed by Python
-     // https://docs.python.org/3/c-api/arg.html#strings-and-buffers
--    redisReplyReaderFree(self->reader);
-+    redisReaderFree(self->reader);
-     Py_XDECREF(self->protocolErrorClass);
-     Py_XDECREF(self->replyErrorClass);
- 
-@@ -271,7 +271,7 @@
-       goto error;
-     }
- 
--    redisReplyReaderFeed(self->reader, (char *)buf.buf + off, len);
-+    redisReaderFeed(self->reader, (char *)buf.buf + off, len);
-     PyBuffer_Release(&buf);
-     Py_RETURN_NONE;
- 
-@@ -290,8 +290,8 @@
-         return NULL;
-     }
- 
--    if (redisReplyReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
--        errstr = redisReplyReaderGetError(self->reader);
-+    if (redisReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
-+        errstr = redisReaderGetError(self->reader);
-         /* protocolErrorClass might be a callable. call it, then use it's type */
-         err = createError(self->protocolErrorClass, errstr, strlen(errstr));
-         if (err != NULL) {
diff --git a/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch b/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch
deleted file mode 100644
index c11d0baa5639..000000000000
--- a/dev-python/hiredis/files/hiredis-1.0.1-system-libs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur hiredis-1.0.1.orig/setup.py hiredis-1.0.1/setup.py
---- hiredis-1.0.1.orig/setup.py	2019-11-13 11:38:29.000000000 +0100
-+++ hiredis-1.0.1/setup.py	2020-03-19 08:18:53.414214592 +0100
-@@ -11,9 +11,8 @@
-   return module.__version__
- 
- ext = Extension("hiredis.hiredis",
--  sources=sorted(glob.glob("src/*.c") +
--                 ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]),
--  include_dirs=["vendor"])
-+  sources=sorted(glob.glob("src/*.c")),
-+  libraries=["hiredis"])
- 
- setup(
-   name="hiredis",
diff --git a/dev-python/hiredis/hiredis-1.1.0.ebuild b/dev-python/hiredis/hiredis-1.1.0.ebuild
deleted file mode 100644
index 68ec424e3aec..000000000000
--- a/dev-python/hiredis/hiredis-1.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/redis/hiredis-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="system-libs"
-
-DEPEND="system-libs? ( dev-libs/hiredis:0/0.14 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	use system-libs && PATCHES+=(
-		"${FILESDIR}"/${PN}-1.0.1-system-libs.patch
-		"${FILESDIR}"/${PN}-1.0.1-api-0.14.patch
-	)
-	default
-}
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
-}
diff --git a/dev-python/hiredis/hiredis-2.0.0.ebuild b/dev-python/hiredis/hiredis-2.0.0.ebuild
index c2881e5aae37..20a1453d27ce 100644
--- a/dev-python/hiredis/hiredis-2.0.0.ebuild
+++ b/dev-python/hiredis/hiredis-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="system-libs"
 
 DEPEND="system-libs? ( dev-libs/hiredis:0/1.0.0 )"
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index fb5dcc02f806..0e749ce168e3 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -9,5 +9,5 @@ EBUILD httpcore-0.13.0.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be92
 EBUILD httpcore-0.13.1.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.2.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.3.ebuild 2200 BLAKE2B bd8054b48aea11fa7cfa3838bc747860982e903a7d56bd7c4f5cae60c50c618fbaf0afe46a0d5d2876b05a91f35132a5237043d56faac472b5e1c681dd07d101 SHA512 8cd8925a97ada21fe17ba3744e755ca1b231f73955ad4138115c8346d790629f9156dad4e3778f743d483cd8fdca21d044f229d139c90af4944510e440f944f3
-EBUILD httpcore-0.13.6.ebuild 2306 BLAKE2B a31bbbdeea1bde7731632eae255e96101ce0b775a263523586aa4011954746220bd46288ecfc2aa33e4701c6d01a91204a93f6c7d9728ea04250d99dcad71a5d SHA512 ad7495a8ab821825d7ff7c038ad787e7db4b5ae1c0ea6071902df9ccabe5c680e05dc50ef17e962aaa5dcfd3e0ea8032e964ed30249ce5e82e894b983135418c
+EBUILD httpcore-0.13.6.ebuild 2314 BLAKE2B 4d4570069c846005d933bd9ce31282d7742c218d70511db36f8724198087a4c33d110227be51128d012c8cf0531c1b5d16bc083b699c989a8880a5f08832d877 SHA512 e6ccf3784cd33cc557913a5ba17dd34c125142358c7fec8e574ae690ef823dabf0a376c67eb45f817712944abd77447ffeaadf19932ab65fd87bc74ec5e20b7c
 MISC metadata.xml 453 BLAKE2B 9ecaf4c2d0b1da4ef7272fb7fd65dd2ea9bcf0ac036420317c838ed2cdf16119270d1a7ce1673057f6bb2c81b0e0776ac6291eab9830b30ba2954ba0d373ea61 SHA512 c885cf0a5bd4c74962160739702d07c34c834b252d050fbfca9f6fdbf469defba4a27c615c312bead882a4e126eb244982e3fdec6428626c51c6935ca8c004e3
diff --git a/dev-python/httpcore/httpcore-0.13.6.ebuild b/dev-python/httpcore/httpcore-0.13.6.ebuild
index 65b6fd3805fc..c4917dd84414 100644
--- a/dev-python/httpcore/httpcore-0.13.6.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 62c5e9d8ecde..b3927a8e4e58 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,6 @@
+AUX httpx-0.18.2-big-endian.patch 2009 BLAKE2B 889f4636c88029778fc7f56b6635543794de81c60b3ef704e577a62ef8d8a1d3eccd19c80c3f6a9870f6b6aca98f4e3692e5ac31be800c707ad5bf91d73b6ece SHA512 3cc62f6b5a039f1c7c79854a95991e750162419d9c5f21a8fdf4d009f19a0694c711bec4aba7cfcfe17c08d98e8fabbe2ab4531ea58a4f5050867cf4f440c836
 DIST httpx-0.18.1.tar.gz 1663996 BLAKE2B dcbfcb4a452b47b643d5114a535005f7f92170392202dedc6c152546430231d20fd8b94b7ecc1d2abacbc9d76acb14cbfdc268109b171cc40812504e696dcaab SHA512 954b020d117dd1064262f3ac2d3137d01bba344b1a061e5713c3889283334d9ca92d9ed3d23f6ce79d684e31bae2d83fca6993178ef55e5a91353b812ad489e3
 DIST httpx-0.18.2.tar.gz 1666756 BLAKE2B 3d1e25d503ae5306150c157bc83afdac9a475110d042e041b58de448a0dcfd75de3f4c15836b838dc799cd5f8b7e0d646e43bbe107ffad87d51ff016afe585cd SHA512 727974e5d5924fdd653987dd4f528d27bb2653085b01ef5efcdac39dc92ef2ed586f872c202349aa31105ad970cff914de4315c2d79338a6aa18bebb8126f392
 EBUILD httpx-0.18.1.ebuild 1355 BLAKE2B 94a851f649d0dc4f8455fd08544f1a22f3f960df4d880368d63ae0ecb59384df465930c71b7078b7493d0e7dada421230dfb4303b6bc577330076e72418520ae SHA512 903129f1d0120d980981e60a0a185ceded491d6e00cfb457b02a069ef709c513a5c764817a1450ce3406c2f3fd0ef93960eaff1b8e412bcc56f3f2e9f309d036
-EBUILD httpx-0.18.2.ebuild 1593 BLAKE2B 674286b88f5d85114101b08a735a7e5a8c6a6f82b4c98c7ddf6dfa67632b6849573fcdd22e5e785b30b76d826297bbb05c0815d96937f8576eb94d2116acbaa1 SHA512 44960d18587f5444ce07650a233d388c5fe8dba07b49d941bd09f742ff18f0ee398887129efb607685dbfffe983f835f688101612808a7749ef31884fa4d6644
+EBUILD httpx-0.18.2.ebuild 1686 BLAKE2B 5c83b933800521aa1a1adf4a3bff9ec4fde481b84e2996b0f79d56bb44b26e88bd338bd6feb0c4546f0915dc7e484090a3a1fddc4efcf0db1d3b30ed3f573e23 SHA512 2434d6a19f8f7109e6b13af15d93fe06b16bf19e5e3a0ab2a4face3a67d09d4ee96dde5f7e51659a19e91734d5ba7080b0296d2e5268b42f5e678bd803a65609
 MISC metadata.xml 444 BLAKE2B 62369fdf937f8caf46980620f2da0b16512ef94cbea9fecf0c336029a709e0975332d0d4e53ff4f3eeddeb9d231a5003dff9bbdf999846152bf578772b47d9a9 SHA512 bbbc7e622f0aae3b63e19765626ee13adf027d5ed98ca97fe04592b1f0a8da0cd0302b31f9cda90eaacf2bf5dad9c6472ddd795db75f0992ba4f084e4135ea3d
diff --git a/dev-python/httpx/files/httpx-0.18.2-big-endian.patch b/dev-python/httpx/files/httpx-0.18.2-big-endian.patch
new file mode 100644
index 000000000000..794609d86a50
--- /dev/null
+++ b/dev-python/httpx/files/httpx-0.18.2-big-endian.patch
@@ -0,0 +1,40 @@
+From 88a0a85ff795d8c23d5cd2cd113eeac957cc818a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 5 Aug 2021 17:35:54 +0200
+Subject: [PATCH] Fix JSON wrong encoding tests on big endian platforms
+
+Fix test_json_without_specified_encoding_*_error tests on big endian
+platforms.  The tests wrongly assume that data encoded as "utf-32-be"
+can not be decoded as "utf-32".  This is true on little endian platforms
+but on big endian platforms "utf-32" is equivalent to "utf-32-be".
+To avoid the problem, explicitly decode as "utf-32-le", as this should
+trigger the expected exception independently of platform's endianness.
+---
+ tests/models/test_responses.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/models/test_responses.py b/tests/models/test_responses.py
+index f1815dc..b7c2d57 100644
+--- a/tests/models/test_responses.py
++++ b/tests/models/test_responses.py
+@@ -735,7 +735,7 @@ def test_json_without_specified_encoding_decode_error():
+     content = json.dumps(data).encode("utf-32-be")
+     headers = {"Content-Type": "application/json"}
+     # force incorrect guess from `guess_json_utf` to trigger error
+-    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32"):
++    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32-le"):
+         response = httpx.Response(
+             200,
+             content=content,
+@@ -750,7 +750,7 @@ def test_json_without_specified_encoding_value_error():
+     content = json.dumps(data).encode("utf-32-be")
+     headers = {"Content-Type": "application/json"}
+     # force incorrect guess from `guess_json_utf` to trigger error
+-    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32"):
++    with mock.patch("httpx._models.guess_json_utf", return_value="utf-32-le"):
+         response = httpx.Response(200, content=content, headers=headers)
+         with pytest.raises(json.decoder.JSONDecodeError):
+             response.json()
+-- 
+2.32.0
+
diff --git a/dev-python/httpx/httpx-0.18.2.ebuild b/dev-python/httpx/httpx-0.18.2.ebuild
index dc1258768a98..4f44b01f6d45 100644
--- a/dev-python/httpx/httpx-0.18.2.ebuild
+++ b/dev-python/httpx/httpx-0.18.2.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 # DOCS_BUILDER="mkdocs"
 # DOCS_DEPEND="dev-python/mkdocs-material"
 # DOCS_AUTODOC=1
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 # docs
 
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
@@ -40,6 +40,11 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/encode/httpx/pull/1781
+	"${FILESDIR}"/${P}-big-endian.patch
+)
+
 python_prepare_all() {
 	# trio is not currently in the tree
 	sed -i '/^import trio/d' tests/concurrency.py || die
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index ef624c780a5b..9c4c5ebb9426 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,5 +1,7 @@
 DIST humanize-3.10.0.tar.gz 65658 BLAKE2B c60aff8f5e2044c10e997f3546b30e8ac7c040ee57aea5342ccce7ea6341a8695c1b94bdc8cb2acc18c3f421667fd4090b7b110b47aa229cd10d5ac8b42d6dae SHA512 f31929ddc1055fb54294b67e25e3b41883ef4e8ff9b76082cdd4703d64a066d0a368d116a60e26465f07dd3a0df8c87bb459ff1b03153d8843d3eefb06ff6961
+DIST humanize-3.11.0.tar.gz 67034 BLAKE2B 9e10582139578e8e041d1ce60c9c5d7e071c4c093a64cf620df6ff38f0567e8b2f3134f10722cb724d13343373db0fa2a1ae5bd68700ff85fb58ee318feb0fd0 SHA512 7aa3c513c6702de0e099865f787858de4c9c65cfe95af61fd0204ff6df64e7359474b4067b4672546936beae6c8c512dd9c75f555d7075c94819e81143c21ce9
 DIST humanize-3.9.0.tar.gz 64229 BLAKE2B 09aeec6a92c8e2e104032d4c61f054785ff58ce2dda68c4f3acffb17c7fa4e262b28a24b7c06d33671ea18d2eb05c9bcc0a82d5491e60afa161ebc0041945bf2 SHA512 75aa8f9f6b07d4b65e5589c3f337a92ee17769ab8da6608147b0f1ec3965b95788dd90cf0d0cae1b7c9be689b44910029ee72e2eba39a60c9926b67726c74353
 EBUILD humanize-3.10.0.ebuild 549 BLAKE2B bb3562a3052c164aa92488a4b5a4fd76600f0e88c882b45daca1f61007c5083881802fc0467c3a019573671293a570120ab8ccf139501e8d4597c68805ffdde4 SHA512 3d77dfc18318baf0072a39d4cd3eb60797b7157edfb132bb1bd40f77dc36f4c766d46123de3adbd6a28f41e5efbc40420fa28c094372169962a4249e83c9b93e
+EBUILD humanize-3.11.0.ebuild 549 BLAKE2B bb3562a3052c164aa92488a4b5a4fd76600f0e88c882b45daca1f61007c5083881802fc0467c3a019573671293a570120ab8ccf139501e8d4597c68805ffdde4 SHA512 3d77dfc18318baf0072a39d4cd3eb60797b7157edfb132bb1bd40f77dc36f4c766d46123de3adbd6a28f41e5efbc40420fa28c094372169962a4249e83c9b93e
 EBUILD humanize-3.9.0.ebuild 547 BLAKE2B 33dab2c67d880f84972528a538579c0c53d6850575b435dd621d3397e888161d7245af1c1f7627ae09164d75aff2f2a3f36c57aa36dfc13554145361f687d759 SHA512 fd88009835781655dabf1441a30b9124061fe4d55c556b4d228ff58a59e4d9a73e0e59d5cb411e08f7df79a4a00e3dee3d4e885426baeb92da873dca4c10d52c
 MISC metadata.xml 561 BLAKE2B a7919d3646edc6a4e7c2e13d74b1ae4eb18e16c41d33f27adb2841e80ab12e5d85f42bedab668c1096740e7ed1323e5accac1ba45a78290f0979c55e39c9d682 SHA512 b31a4947368fcbfb0edf93b48f843c49d5209820cf9da1a8aeb8666ab4fffebac765ca4aeb3cf2523837fcfc9c21d858cecaed65002ac23bb9d946a8c818f113
diff --git a/dev-python/humanize/humanize-3.11.0.ebuild b/dev-python/humanize/humanize-3.11.0.ebuild
new file mode 100644
index 000000000000..ce3c080a882b
--- /dev/null
+++ b/dev-python/humanize/humanize-3.11.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index db20096ad4c0..1b10ba9ef0b5 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,7 @@
 DIST identify-2.2.10.tar.gz 101073 BLAKE2B 7049424855d23727180a4af137ebd7cbf88d6ca0187901bbe43abfcb820c1db17af8ff89345612909fc869f9ee8503d84e3d1218548535abb6f499eade284def SHA512 a6f9dfc3d969a30f50922cb9ad285d76c39774706b8c0d868bcbf96564a49841e54b6021e4fced56f17cebd25fadc69dd93714d475e4f517a05677bdabada4dc
 DIST identify-2.2.11.tar.gz 101117 BLAKE2B e316bd18a91b3d073b2bb24743ffcf5e6551ce5a9ddf62b1a30aaf937311b2d07de08d9abe01040de48c607d51e4cab121d778385f8336bc911409bedcd5fce3 SHA512 083dd600bc65f61c1aa41f87943b59a4f2edcbbc7a7d07d7a1375d181761edc4b853df87d4a2b2c0f3122f4f27ed10eb784d2dd75078418b50a471b1d5a0ad0f
+DIST identify-2.2.12.tar.gz 101128 BLAKE2B 71f70e211bb64c44fd56cf276c1e474e002931a711e986f933a80b085a4b1c2465d84780d636efc977c6c91283d33b94d7c25fbf16b83d2fbb1cb227c76ebca9 SHA512 cada883c7d5696c0f5c55e901e88e1d63b28d5045f54f2d197151c37d8a96854e020d4112d857fad0402e61fad3c05a5e9ca624a72be0baecdd0fb247b6bef4b
 EBUILD identify-2.2.10.ebuild 505 BLAKE2B adbd3b5737c1bf6d8e809cc0d947f54d51af4d16526eedd4cd8409b773b0f37b9512a428e9febcd699c1491bae98f7c8e344f2b579f8302a26624e84c6016a03 SHA512 e1bee2e6abd986dfeaaf9003cc0febdff77754d6733ff27127e0bf9f497a00b1257683ef51454b66a37ce8c15c9dd839f1047061e25f5dd5fcd3fb5d07f627f5
 EBUILD identify-2.2.11.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
+EBUILD identify-2.2.12.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
 MISC metadata.xml 476 BLAKE2B 396158e97712197ecfbad701cd368433e75aba1d79f81ed47726271c7b3a68675116aa994b8fd5ae2a5ea66cf9e047b23c1f81dd10b1f2812aba19e8a0aa3af4 SHA512 e2fa23ad8c27872eada3063f832eaa1962fee31301bbd36abc19f2e03bc8e984cbc0d9680afeeeecf928c8e2ccf9944c4d56767ec04491ccce31e406d9c0180e
diff --git a/dev-python/identify/identify-2.2.12.ebuild b/dev-python/identify/identify-2.2.12.ebuild
new file mode 100644
index 000000000000..c3b147be85a7
--- /dev/null
+++ b/dev-python/identify/identify-2.2.12.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 7cc075487403..090cb253d798 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,3 +1,5 @@
+AUX immutables-0.15-32bit-hash.patch 2439 BLAKE2B 353f5452dbff85a3b08786174a69068b0a9081ddbc8f88ba03b8c73ba5ab753c2e463cb9ab3af3d61604c23f3b58fe9226efda8119cd1420d3b27871ceb8f1e7 SHA512 add8e68ce6be057889a075c2ba1e58e522ade9e49513118e5e2acfd688b2f1ca20634aee546c0ed5e92181d5c777af4cf312368510c65f8267a465bc90a063b2
 DIST immutables-0.15.tar.gz 81297 BLAKE2B cb58142c3b833d529046f09a468b3e3964e3d36e4eaf0825f88b920e6795cd042e2fc837ea6d72000bbc9cbc2fd1de911e08b4f6d189e692748b49e848dfb3fb SHA512 cd0ee20f6d6218eaf13499e40971b6750009ff01a1aefcb7dd45c77ae841296b9d9184013e6e7fe5bdef93587f85cdb8ff459af29424a0077538666260572b8e
+EBUILD immutables-0.15-r1.ebuild 629 BLAKE2B 8b756b31629365c274c51d19894105ee6011724361c2aca1b89fcf6f421e01420f8c5e5b61d6f34d9ef5dadffc99181c3300e22909a0f59fe0e2e6151be06268 SHA512 546fce12a5f41544d94852281d030557f454d13deec05fd070ceb4a15418a1ff8bcbc7373d634c7b10518e3f26e1dd59c661c70f3f16f9ff71091431a7f8f393
 EBUILD immutables-0.15.ebuild 487 BLAKE2B 6eb8f45620525e4dd42aea5ae122f9c60e4a1ed5c7585967a7866a71d79fde296565b6e6aa7654f7ca6cc1121cc9ad0ae21a96899c80fa7d3ca2b0c9bef29902 SHA512 1b5e71a31832081a6d6537c8e3084ad29e3492cb2b9042000d6ca488a93a4357bd62c1bf7d4b3023786508604d3750c09cfe54148c0663869e5f607297748a22
 MISC metadata.xml 352 BLAKE2B 65ae089f4fcda6735dce5a7772e25b57c69f38e728073213b7c3d1c96382f22cb570fea4890ba1c9086a327b7e24cf1e58514fa6363a1ca595ea9c66cc4a8289 SHA512 96bd2296b24b710cf4a4eecabf3918cc49fb70e859989074d1c07f16b48dca7e2439a4f5f00e5e2283598216fa574621cdb69c78d7a3e7ee9bca144b3955d4d6
diff --git a/dev-python/immutables/files/immutables-0.15-32bit-hash.patch b/dev-python/immutables/files/immutables-0.15-32bit-hash.patch
new file mode 100644
index 000000000000..234dfa028c08
--- /dev/null
+++ b/dev-python/immutables/files/immutables-0.15-32bit-hash.patch
@@ -0,0 +1,76 @@
+From fa355239e70411179c70b16ed4ff7113d8008dad Mon Sep 17 00:00:00 2001
+From: Elvis Pranskevichus <elvis@edgedb.com>
+Date: Wed, 4 Aug 2021 19:25:44 -0700
+Subject: [PATCH] Fix test_none_collisions on 32-bit systems (#69)
+
+There are two issues at play here:
+
+1. Python version of `map_hash` unnecessarily performs hash truncation
+   even if the hash is already 32-bit wide, which potentially converts
+   it from signed int to unsigned long.
+
+2. The `test_none_collisions` test generates a collision node with
+   hash greater than 2^32.
+
+Both of these are problematic on 32-bit systems, where `sizeof(Py_hash_t)`
+is 4, and so anything that doesn't fit into `Py_hash_t` gets bit-mangled,
+breaking the `hash(x) != x` invariance that the test relies upon.
+
+Fixes: #53
+Fixes: #50
+---
+ .github/workflows/tests.yml | 10 +++++++++-
+ immutables/map.py           |  5 ++++-
+ tests/test_none_keys.py     | 14 +++++++++-----
+ 3 files changed, 22 insertions(+), 7 deletions(-)
+
+diff --git a/immutables/map.py b/immutables/map.py
+index 2c1ffa91..0ad28588 100644
+--- a/immutables/map.py
++++ b/immutables/map.py
+@@ -19,7 +19,10 @@
+ 
+ def map_hash(o):
+     x = hash(o)
+-    return (x & 0xffffffff) ^ ((x >> 32) & 0xffffffff)
++    if sys.hash_info.width > 32:
++        return (x & 0xffffffff) ^ ((x >> 32) & 0xffffffff)
++    else:
++        return x
+ 
+ 
+ def map_mask(hash, shift):
+diff --git a/tests/test_none_keys.py b/tests/test_none_keys.py
+index 8c0bb379..26d4220b 100644
+--- a/tests/test_none_keys.py
++++ b/tests/test_none_keys.py
+@@ -1,3 +1,4 @@
++import ctypes
+ import unittest
+ 
+ from immutables.map import map_hash, map_mask, Map as PyMap
+@@ -6,16 +7,19 @@
+ 
+ none_hash = map_hash(None)
+ assert(none_hash != 1)
+-assert((none_hash >> 32) == 0)
++assert(none_hash.bit_length() <= 32)
+ 
+-not_collision = 0xffffffff & (~none_hash)
++none_hash_u = ctypes.c_size_t(none_hash).value
++not_collision = 0xffffffff & (~none_hash_u)
+ 
+ mask = 0x7ffffffff
+-none_collisions = [none_hash & (mask >> shift)
++none_collisions = [none_hash_u & (mask >> shift)
+                    for shift in reversed(range(0, 32, 5))]
+ assert(len(none_collisions) == 7)
+-none_collisions = [h | (not_collision & (mask << shift))
+-                   for shift, h in zip(range(5, 37, 5), none_collisions)]
++none_collisions = [
++    ctypes.c_ssize_t(h | (not_collision & (mask << shift))).value
++    for shift, h in zip(range(5, 37, 5), none_collisions)
++]
+ 
+ 
+ class NoneCollision(HashKey):
diff --git a/dev-python/immutables/immutables-0.15-r1.ebuild b/dev-python/immutables/immutables-0.15-r1.ebuild
new file mode 100644
index 000000000000..f9ccd8404ee2
--- /dev/null
+++ b/dev-python/immutables/immutables-0.15-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A high-performance immutable mapping type for Python"
+HOMEPAGE="https://github.com/MagicStack/immutables"
+SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+	# https://github.com/MagicStack/immutables/commit/fa355239e70411179c70b16ed4ff7113d8008dad
+	"${FILESDIR}"/${P}-32bit-hash.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index b752479553ed..056bf11f9392 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,9 +1,3 @@
-DIST importlib_resources-5.1.4.tar.gz 28783 BLAKE2B e88cbe34dfd9b251fc78f2aba173f3eb657462777cb66454fbc1735575c6cac6a868f5e40206fb8925aa8c7f708d72624693cd772f2335231bc5da4f417d622e SHA512 ede757b0ee4a246a3446a165f4c8e56edf326f90464f01d853b6c04042371ff1edc4e41f388c6ea6973302a183cf1c04ee21335342886747c991ba0b38c7aec3
-DIST importlib_resources-5.2.0.tar.gz 29655 BLAKE2B 570e92750351a72c95653302baee56dadc28a328a8e42af9d3346be9a256c2d43322d75622f78d87b5642ed9503c9b7f1df0b0223414847619efb2ebd5e27f5f SHA512 248de71aec8aae93f14b0c48381e7de4425f1eb0c014a4f4a49859db50e8b0a94c2e1c0a664086c74ac7fe19e526b8e3f4fc82d19d3d722df6625dc0dc708c90
-DIST importlib_resources-5.2.1.tar.gz 29622 BLAKE2B 3ac095355534c1ea35e65d685e36ea715555dbda686e1312851b0ea5ce079053429812da5ba57b00bf02981786037de2c5e91a4bc0eedf03c8463f184180c10b SHA512 e0534c6e0e1cfe8621710e58f43b0ec3e5a6fd9e1eafa58ffa09f9120e05a416b69b45639f3028f7d4d02831429bc5de3cbfa97e141474d268d6c32a5f14c1bd
 DIST importlib_resources-5.2.2.tar.gz 29651 BLAKE2B dde545a3f104c799432d7a2b6dbea6f071b82d0b6e3660384e2e0ab3c36eee8942b9f248a6139c708020c617bf0e0dce7fbbd5e06cb0bd192a0296fac6350b51 SHA512 7af9aceece4dd25ad827310fde100a4b0b5e0aee03dfeba8789db060e4decafc543784046c2e9eee95d8cab61845c50e4bb0543bb20ae7e1e480aaa80c88fa27
-EBUILD importlib_resources-5.1.4.ebuild 830 BLAKE2B 70ae32481116b16bf0abbd7d78571dd465a11f271479231e20d2e63dea8d9736a22e82874b7cb33227bb12287438816b5995528c5b79af6ce2e86db11d6a3014 SHA512 44cb6fb5648ae86d152219043c3bb595fd1410eb93662428dcbe74e4a86b52fa4018a2690bc640e9aa7898494f6c32a6811e64dfbf1a0ff54a995ff6a35833a4
-EBUILD importlib_resources-5.2.0.ebuild 834 BLAKE2B c2e04f2127b99d26a90d8eef22f6f21558f1aea0e340eb08663d17666acc73386fa8ad48af88a3b42d4a2b645342f767dbbfc7e9d1bf3db19bdd280116512e11 SHA512 e1212a34a31d74c9ae5ca56a966dda10508947147830df6dd548510e5b06d77ffb3ec1e1d5b08d355a59e636bad5f752578cb494292755697314786e2a72dc20
-EBUILD importlib_resources-5.2.1.ebuild 823 BLAKE2B cb588b06d1ec26e6820539b5270b94908a56391b3f3a0b90ba08a2fcfc649cac67c464e2d780c41230c2ef0a883b25e064abac8f2684dc397ec36039ffaf5343 SHA512 491a6f4960b9e844bc7bed6ed14d61874f3bed3851a80be06fdd97aecf92f6c72c5c42bdcda4c30ef2f40d9b46827d60ccadd6daafd5eb3f4661a9b30b4ccf0b
-EBUILD importlib_resources-5.2.2.ebuild 823 BLAKE2B cb588b06d1ec26e6820539b5270b94908a56391b3f3a0b90ba08a2fcfc649cac67c464e2d780c41230c2ef0a883b25e064abac8f2684dc397ec36039ffaf5343 SHA512 491a6f4960b9e844bc7bed6ed14d61874f3bed3851a80be06fdd97aecf92f6c72c5c42bdcda4c30ef2f40d9b46827d60ccadd6daafd5eb3f4661a9b30b4ccf0b
+EBUILD importlib_resources-5.2.2.ebuild 815 BLAKE2B f0f037c3fa00210fe040e0e56e6a8acef484668462c04efca30c5294c001ebb024d3991834fd906b270248e8f0d838f3ac9b1603691b94d8f33fed9e5a1d7f5f SHA512 e0719c05e422fce67c1d7194719fb3b6f24a0d86aa64d759016019eb17517bec0768f182100fdbc519e43a351e41cb85494d2ed3ba47985fcbff1f3701f86e5c
 MISC metadata.xml 944 BLAKE2B 7a5aa1dfb947b0115f3e22f9550471b452204daedb386e78374c5dc19b408ec52bf5887d3e645c41be9ebd16f3bd003a2ac1bb3bac539e603d44decd86b92458 SHA512 f17b2ad2e3eedd75db96765537c30d68aa28c60137b12bac3bb47307347431a19ca064a94c8e41e4a3947ab2669605d7183b5b62e55def66631d20ab903e1ea9
diff --git a/dev-python/importlib_resources/importlib_resources-5.1.4.ebuild b/dev-python/importlib_resources/importlib_resources-5.1.4.ebuild
deleted file mode 100644
index 9b672e338d95..000000000000
--- a/dev-python/importlib_resources/importlib_resources-5.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
-	' pypy3 python3_7)
-"
-BDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.0.ebuild
deleted file mode 100644
index 1fb714a82b6c..000000000000
--- a/dev-python/importlib_resources/importlib_resources-5.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
-	' pypy3 python3_7)
-"
-BDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.1.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.1.ebuild
deleted file mode 100644
index e844671db232..000000000000
--- a/dev-python/importlib_resources/importlib_resources-5.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=8
-
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_8 )
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
-	' pypy3)
-"
-BDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild
index e844671db232..acad426f3fd6 100644
--- a/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/intelhex/Manifest b/dev-python/intelhex/Manifest
index a6c5d7116606..2557c328ca9f 100644
--- a/dev-python/intelhex/Manifest
+++ b/dev-python/intelhex/Manifest
@@ -1,3 +1,3 @@
 DIST intelhex-2.3.0.tar.gz 44513 BLAKE2B 935fb6d5c27231c4b09f7fbe624df07adfdb9eecdd99b17cbbb4994dc74e0c7a141546a663229b0598ddd3884b8d17dd7244f770319a594387de074e7591aea8 SHA512 41b50feb7505474d74a2b6293d755d118b6dfd23a5c9b995791e7dcb7a97fc6f39d8f804b72f6372ba8e136684f9c979c7ce9ef2ff9796b6202eefc9d18f4424
-EBUILD intelhex-2.3.0.ebuild 460 BLAKE2B 32cbe1adf6469cdab1d6e933f058567219af5d46c1db062ad019535e70a53ab75eafc1a32a42907e45251bbca360d7ad067da679d9cefb0ddc351867d69b5774 SHA512 c79d33836c54a9c1ed54e4cd8f52ed8ce3ae2a464c892eaf073efffc7e3891b04dda0370902c9559de23d0c733779600f39bcfa4f69f75a76e293b058e49b1bd
+EBUILD intelhex-2.3.0.ebuild 467 BLAKE2B 6420a92abdfea42ef33d3dd516b6fe054a62e2e08567f1828b02694f52e597133d231def4ecdc83c8139df77f1752ae4b077050e80ec8db44a3c38a020018b6d SHA512 369ec24eab6c2eda1e8f91aeace1975af027031ae065d2501219a9fb4f2d3b664bb4cb619a17728c46d602c1eadc4d8e014ab37f4017b51089cf570a8de8b699
 MISC metadata.xml 367 BLAKE2B 7b356120076a1c1d5f9072d78e19d2edf77bdccc200276dd3929fa340bfc4aa6d7b3b89a29674958a8f6a886511e6c50678959b6e82f0e9ba8df95c140e498d5 SHA512 66592e014b2ab9faaaaa895e8c05d7bb96f7a8055e1cd77321e8751f32f0ff6eba141225af292256a88687679f8d5b64807f3c2e9586942039607187ca822040
diff --git a/dev-python/intelhex/intelhex-2.3.0.ebuild b/dev-python/intelhex/intelhex-2.3.0.ebuild
index 744d1d64c7fd..172f601d36f2 100644
--- a/dev-python/intelhex/intelhex-2.3.0.ebuild
+++ b/dev-python/intelhex/intelhex-2.3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/I/IntelHex/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~x86"
+KEYWORDS="amd64 ~arm ~mips ~riscv ~x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index b6139d00bc52..4e471fd0729d 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,7 +1,9 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-7.24.1.tar.gz 5146561 BLAKE2B ae63d024f488f44dbd61eb9f3e14ac5b8ad801b1db195632c184c6106d4c2e6d6143c1524ae6fc5a2f6f631683b73f241c9115c439c0f97a4fe540cc232fb181 SHA512 0ea8843a1f2e7f9357ff9896f2b6da058adb5fcbbad5c3b1fc4138a085eb57034c62c0b50d82dea0e563523649ec112edd4ef0c267a914f6a7d33b44be30b977
 DIST ipython-7.25.0.tar.gz 5147224 BLAKE2B 0a2ae7cd315ba1abde18cdfcb7ed5227e5fc43b9a053f82e7db0146cbec66b0c2a1585158e60c37559523b457ab339ad42ab8fb3fccfc9e5ea7b880593de2e73 SHA512 726d3577bfb05d0c01c55d7111f8ee03fa879427de0750ee25b0a6451365728b5fb8ccf79c42585268f768680b13f628956d292f27b9e622e5dee0b4d368d22b
+DIST ipython-7.26.0.tar.gz 5147847 BLAKE2B c0cb45550387e47bba6ea67656bbb4561a2250bf9c39b4560b26a8a9e380061f79c5fa663f90df166af1fa49811cb59953fb367b2fea5f07d44ba3f9dae3de44 SHA512 142ff8ebddd61640e6ebff01d16b1310b6370643aa8cf4c7fd076872ad342949a1778c5ad74eccbafdc6b4d31a1849e096d75a28eafc555d629948db523b4776
 EBUILD ipython-7.24.1-r1.ebuild 3837 BLAKE2B 0df904cebd3696dc2468b455f22ed1b374f7d5df1c77c3554ccde6356fc8cd1c71e00991ed2c95f6a88ccc20bd3a1a6267178afc8026a942c0335fe294872782 SHA512 b7446d3f4443044d60a4cd86a61f7f9bb18df87779124c10bfbc83865ee46fee9531b792adbe0cacd800924291f89455320aa8ff49e71ed29a6be790fffbf5cd
 EBUILD ipython-7.24.1.ebuild 3838 BLAKE2B 26db4ab35ee3aef7ef4c604c2ef6de13ebc998a6b6cf37fa4793cd7984fda1e406521aa8f11cf6eda87eaf2e840672fe48e6ed08f6490cf57cb474fd3c1bd056 SHA512 d6eb9f9cb7a5b2c537c65cfec76822d24762a42bcbff0a5ebdff6e91a5908986f3732f9e8dfdf03f2cb9ad151fe3fbc615cc63e7943afa2edc1ae08f309489ea
-EBUILD ipython-7.25.0.ebuild 4169 BLAKE2B d0c773f9ed896d53ad512a02433d9d41e9c21603eee90dbb08c85772d35c8a4b1698a0d0b0ce772dbc4b95ca5e692148ea421243c3704aca0426091d8c1a046b SHA512 aba01bf68071fabf6d64ead00b121509c62ce0567a5cde3b337f0b7ab42c51278b4217c568a93da5651916e5c955e4ce655d0a00785d29ea88a69d0f91710b5c
+EBUILD ipython-7.25.0.ebuild 4168 BLAKE2B 1b6d0d041a945b051ab7dfafdc4094498700f4192430f8071c43894a25eda777b3c80d9bb1477a89b362375475815dd8f183a31006534ba9a068dc2758d713f8 SHA512 1045d7aaeba3cfcc5b2aad7a878bc0219141c970a4d761a86f453b74c283b4d0d53ed1359c408c8a7fe4dc511967f22aad1ebd04d8254d1956a803637e64383c
+EBUILD ipython-7.26.0.ebuild 4171 BLAKE2B 69e9ac23537c108dd0c07b3513c8b9324fed108c61a20ec0f908f906a73871ac285990c8baaff46e563c4cc6324f58214cf4b955dced990a8d6754c97c6397a1 SHA512 3e34d75deaf322826cd4a4681e8ee30d4fb566ff71150118df6ae3ebc489633da6dd705b005f7db6a7ba81b6acad0a8da4bf62d982a4b2a81994cb2f3f1c1ee7
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.25.0.ebuild b/dev-python/ipython/ipython-7.25.0.ebuild
index df8b6a4a1de4..d46c1cf5bec0 100644
--- a/dev-python/ipython/ipython-7.25.0.ebuild
+++ b/dev-python/ipython/ipython-7.25.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ipython/ipython-7.26.0.ebuild b/dev-python/ipython/ipython-7.26.0.ebuild
new file mode 100644
index 000000000000..870fbdee1654
--- /dev/null
+++ b/dev-python/ipython/ipython-7.26.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? (
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+	)"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# fails due to changed argparse output
+		IPython/core/tests/test_magic_arguments.py::test_magic_arguments
+		# py3.10 API incompat, doesn't look important
+		IPython/lib/tests/test_pretty.py::test_pprint_heap_allocated_type
+	)
+	virtx epytest ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index c9d218000ebc..99d1896cd4b3 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,4 +1,4 @@
 AUX isodate-0.6.0-py310.patch 3387 BLAKE2B 669a1eb70890aa2be676be24489f4434dcf9b8f56cda20bef91913e8d648ede59b78b5e6697cf5d56461db43e9a0df14d76c2210ee0f434d0e7303a9a7eeee18 SHA512 a9c9662f95c60895eef90278d8f628cc06f56d6ed24780e03b7e45d13acf677dce4114e450876bc47fd47c637c933f48a47eb4bbb2b628ec1da7e4063059b694
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
 EBUILD isodate-0.6.0-r2.ebuild 629 BLAKE2B 74460c2091f1e6634461cae46cbbf576680a6d9d0d172fe67cfdaf7721641b7d6cd306d10d274f6d810a8e8b3092aed7d019e0f4f591b884baf60174da295c47 SHA512 894784c520c8c23b6b524feb89938800b2b6459fd5a752c85dd6339edd9902462d9f7a2189b12cefaf1b66ca2b31fbe09bf3b5a8b70a80d98c6b457671b5e2c4
-MISC metadata.xml 1120 BLAKE2B 9889dda56ccb8afebcf88184839aef3527090675f9a51444185c2d22f2eb89eae009b3138edb3a03c3d024b7a6d0ec586bad08480f869a030303a736c3a00dab SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce
+MISC metadata.xml 1175 BLAKE2B c5c2b7097b9fb22baa38deca60688f3ea7ed425f4fd616b45d8ecead521b2050f01292bfb77d8eab2def7992feef85d9960319b4b266c835e267def63bb9d020 SHA512 894c2ada19b76d1f76c31160055a5f912994e3c001d887728eda305126fa8351ba914a3c6d4055f8eed64ec54ccce4544292727da5a45bef494e8086068fb056
diff --git a/dev-python/isodate/metadata.xml b/dev-python/isodate/metadata.xml
index 40a9ac204fa7..a93f63226d29 100644
--- a/dev-python/isodate/metadata.xml
+++ b/dev-python/isodate/metadata.xml
@@ -20,5 +20,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">isodate</remote-id>
+    <remote-id type="github">gweis/isodate</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 7e9ac227c771..0926715ab61f 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,9 +1,5 @@
-DIST isort-5.8.0.tar.gz 167927 BLAKE2B 59b9ee4e63e231026e25833ef8bc4a782ad7b30622d1f6b61fe177fbf0f8663ca953f68cf168abb407d3cb90fe98e29540ec3a8933a5df2ca7ba3e938ba4282f SHA512 ffeee045b5328fa410673464b2ca22d9cd1ba8dd34eff9a430b93e9ce72033100e32e3373308438bcb82b8eb7deea1f2087091e111b1204e35791958ca6944c4
-DIST isort-5.9.1.gh.tar.gz 727733 BLAKE2B dc207ac24b586eb5c4c2bd546c0f2ab336c901563e3f2c92d917cf81bc94634c23a20dfe787e65c41fd3aec835d3fdc96721ed579c282b4cb0719afa7f50f9a3 SHA512 e48e08835a71271ab01e52e2c44ecef475aa270ab7242aff4f9ce82bcd5bc8354e2d8a717ccf995172102809198f6dfc9786d8c64e33afc9ae9a4e981ac51feb
 DIST isort-5.9.2.gh.tar.gz 728644 BLAKE2B 37fa16884e987569bceabf71d5d51b5dcf3c26a28df22b07eb5adb8f571901f5f2d0b258c09dfe720a0579836e90ffa46b1d087c536532841ff48848dd71f9b0 SHA512 286536ae5e7328085618ba37d8809b6cd46595b269755c20da0e8f5f866b810663909ed557f16d76c3d5e89b85393264aad7b1d7093cbdb33e808118a3fc7d96
 DIST isort-5.9.3.gh.tar.gz 729342 BLAKE2B f40f046c5706ea4fd6daf7dc8eaccaca35e7de3e77bc17fa73681d12c42f7d2a3b19a909384e6b2e2486679a9f9895c2fa944faace4bbc3d0cfd0ec7aff85edd SHA512 96aa9c8bb58c95a41f562d3f0e1cf6e9c0c4158486bca24dfe2293fc86c7c6b74e3e6a84ed755d965b692b1f06d98cdc8ed69080775f8acd9186ac3ae6401570
-EBUILD isort-5.8.0.ebuild 1609 BLAKE2B c248dd41fd9e90985afedf5ef572abfa0fa46775af0162881518aeb1f9b999334063aeab7f2364eabe10108169833e1037bb25e084c61006c3fb866f664d3d3e SHA512 3cce76276c44cf58ad9a6301618fe43f5765df0fb3961634841171ca09764fc4066a1462b2dd46dbab8d54f77ff43cbf893980755a43894ac149175c92e52a40
-EBUILD isort-5.9.1.ebuild 1357 BLAKE2B bd08b427294a1bb15ed5171345b7310ae5570605664733a31c37e8c75922885e910b43432ad254e851934d8e9bb3dc8ffc43108540736c256101d65d4af34904 SHA512 52fc6da287e78bfbc6e952b7a853f753706935b1ba9ddc9cd31724abd8d1146d94d641edafb0c45c2c250217acfb5cc2a487b7f50185f968ff67e8c2751e3e7b
-EBUILD isort-5.9.2.ebuild 1357 BLAKE2B 053b4a6ebbfb850249dc9598f47f11bcc947f61f26a14d234b9d0e3b5b22c53adc9e440ba0eef9974621ed850e1d7d48ac3cbd4b7d9bd201f52414aba26e2e4d SHA512 6bccec33f9b891a2125df3bc6144664581e20da7b5a7353a07c5347b3803d80c7b43ef700fb2608923e47fb37a40f70dbe34ba57605902500e951a42d8191d9e
+EBUILD isort-5.9.2.ebuild 1356 BLAKE2B ad23c12a74419ed0d6d0e886213bf976fb825c21cb063b3959e8e1d1b31af7820f9e743ff4629c5a54689ecf070ca1adf910598ca08e43b0ef410944fe7cc111 SHA512 d80ef7ded1a89f1b6f7fe12ee223e5dd287c2d7470819fb65d1bafaebdba9b9ee0fbacc64bb3a397a691f1ce69233a4820e3a9dce884f8fbf9107d4f54b45322
 EBUILD isort-5.9.3.ebuild 1363 BLAKE2B b5c7ff70356755c517a7870c8a4b195db2d757560a1dd345c209e4b26cea9b2d662a4e7fba5fc7e1d813d90f3cb57df0595f8728697cd6193064d969b0e502e3 SHA512 e0389431685638814eb54c7366d1cd1cfac8ff6764a3e82466dc51271988fd31933c7e69dcd8bd0971021a7e5392f198851a8dc5dc33f386177383954b14f3ed
 MISC metadata.xml 573 BLAKE2B 2c70619aaf4f917f377e17b73d59656d6e0254bb0aa6c4a01159bd46b5e2e24e22b8ca04ab88ad71c9d4979ea3b484f5efec05e6ce3b40093e010108ef2a80d8 SHA512 4c06a138d3d06e1f9dbf570e6c59819de182d8453c46a5dbdabcfed424501aeba89fed659d19a6e329c33c0307790ef5c1b81d2ee5d7475c102c2bd689255259
diff --git a/dev-python/isort/isort-5.8.0.ebuild b/dev-python/isort/isort-5.8.0.ebuild
deleted file mode 100644
index 1b6d1270e71c..000000000000
--- a/dev-python/isort/isort-5.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pylama[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Some tests run the "isort" command
-	distutils_install_for_testing
-
-	local skipped_tests=(
-		# Fails without -s, run it separately to avoid unnecessary output
-		tests/unit/test_importable.py
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-		# Require "example_isort_formatting_plugin", we're not going
-		# to add an example package just to run a few tests
-		tests/unit/test_literal.py::test_value_assignment_list
-		tests/unit/test_ticketed_features.py::test_isort_supports_formatting_plugins_issue_1353
-		tests/unit/test_ticketed_features.py::test_isort_literals_issue_1358
-		# Same here: requires "example_shared_isort_profile"
-		tests/unit/test_ticketed_features.py::test_isort_supports_shared_profiles_issue_970
-	)
-	epytest -s tests/unit/test_importable.py
-	epytest tests/unit ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/isort/isort-5.9.1.ebuild b/dev-python/isort/isort-5.9.1.ebuild
deleted file mode 100644
index 146d772ec4c1..000000000000
--- a/dev-python/isort/isort-5.9.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="
-	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/natsort[${PYTHON_USEDEP}]
-		dev-python/pylama[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unbundle toml
-	sed -i -e 's:from ._vendored ::' isort/settings.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Some tests run the "isort" command
-	distutils_install_for_testing
-	# Install necessary plugins
-	local p
-	for p in example*/; do
-		pushd "${p}" >/dev/null || die
-		distutils_install_for_testing
-		popd >/dev/null || die
-	done
-
-	local deselect=(
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-	)
-	epytest tests/unit ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/isort/isort-5.9.2.ebuild b/dev-python/isort/isort-5.9.2.ebuild
index 8ed12e811b21..3a8b75254a2b 100644
--- a/dev-python/isort/isort-5.9.2.ebuild
+++ b/dev-python/isort/isort-5.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 07638a5614b0..1e07ce881c62 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -3,5 +3,5 @@ DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557
 DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
 EBUILD jedi-0.17.2-r1.ebuild 2080 BLAKE2B d27a1db8dcb1f76a86f25f4023b19047a6931e2d10ecc08e68b35cdbe5cebb1916b26cae097ddbfc2c8dc179a4e5eb793ffbd4906f83446d1f59a842d809b40a SHA512 c661c2af2a2c07f2dbf8e4cc6b0ccddca91e028f7771f4c2059532d4cc75ff2f4d4f879b86454e43a2132e28df8dd190bc901f6a2775df598654cfec7f2d4dae
-EBUILD jedi-0.18.0.ebuild 2113 BLAKE2B 93b22952f6e75c26cbb55bd77891e543e7c095e8bd0486ff2515df8d92db1b418c3001765877e203e5f2f18703536789b33dc9c86d00223e9eb578e17493a9d7 SHA512 9db1e83208d14c770f6083ace7a6ba282347bc7a2940c5a880281af983682d3c63b5ecff1103c33e9cba47f85031d1ed069d8f986eba2034fdeb6db5e9b44bf0
+EBUILD jedi-0.18.0.ebuild 2119 BLAKE2B 15011e91ae4132ed0b82b4a2e1202c1e7051b58030c31586f20c5a2d7893baa0212350cc2f88873fdeb75fd698f38511f95db2458cde1e16c8c540be2e65d2a2 SHA512 d8611876cd968a002ae15e513273f48f32ec9605e9667f7b2234a1d3e18968c42331893efe56413ea970320c099d4755f5cde86fe17d049dbdb3e8a1346308be
 MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
index 95127b3a78cd..b3a377fe8ad3 100644
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ b/dev-python/jedi/jedi-0.18.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="MIT
 	test? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="=dev-python/parso-0.8*[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 65046af44fb9..2c5b6820bc79 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,5 +1,7 @@
 DIST jeepney-0.6.0.tar.gz 49513 BLAKE2B e5f9b5104cf07dbcd2d40c2d22b690dfd56c456ab56daf44f4abee83f0bfe7e1dfbad797348044d51e3dc20fbc6ce68bf8df54f9c1e46d7a86ceb22d3ab30f8d SHA512 140be9dd28ed853d2d41b6a8bbeb2f22c0270ce7bf33b943ec2ac010db17d4f06e253fa8637fbbb3044fe9ffdbfa1e15f0c663eb44bdd538f8c47c2e7dab3ca5
 DIST jeepney-0.7.0.tar.gz 61236 BLAKE2B ec477ed0d96d7d82a256c7f62900eff0282ebec4545e30807fd62cffb419ed763fd8042bdd4d72c6cf43ac09d24af9cd86797b1baec61ad5965e51b3d669175d SHA512 b1fac480da0d8798b28eae30cb22ee97d4f73a11922f7b1bce86eebf938c2980414c2d026ef5a1cdcd95813724873700d348b04ba337aaac0706b2c8b38ea6c2
+DIST jeepney-0.7.1.tar.gz 61833 BLAKE2B 626d4c921d0548ea898197ac5459f20b4c73fd52d3579c5b74f257158c82803011655c1d418d7d10afe8ba803100530bc08dbcce41e12727888de5be5995adb3 SHA512 f0af5a18a669f1a6322925201cad83ee01bc5a1b91577565042fd8a18b506a3650ff67b0ba333c8fb3b179f43ef243d16b07a9a1f7a7e5baec825dda0e6b0571
 EBUILD jeepney-0.6.0.ebuild 1038 BLAKE2B 2c7df2b5380f85a8f19645135db863eac3038e58a031065d2a5f491fd5327651a774e37e7e434f1846bbe49abeeec90229c6874081b6c39a5116b08860f4b1b3 SHA512 f6143bbffb239ff02ee46ef558ae5296b98abb3e0a8387abf49a8776d7acf131ec348ba98ae63bfc83b9bb0cc454e0637eeb8e5bd435533edb9277fbf87de9f7
 EBUILD jeepney-0.7.0.ebuild 1229 BLAKE2B e9f888c7e6ccbd40721c32c5da71726a2a17a3ac60f8737a12dc1b0ff6e71796eab0bf4d79796efe2f1634916206904d7a721fbc1efb8c45530f114758bb45a7 SHA512 55bea6c4be689fa66cda7ad9ebaff5a7d8dfb86232305dceafa8f728c3c7aa22d6234deaa0320e97785dfd2728cbc4b8d329696009c617cf05db348a21a74583
+EBUILD jeepney-0.7.1.ebuild 1274 BLAKE2B fa2ad7db40ff4c3b86623c60cd66429f06007c15d68538911b8873f7173440b2c2c9deee756e5a12c27c37351fecb29477372bb0ee6317b735fe33cb12aee6d7 SHA512 63b2ab553d1dc56ff06f3ca04329b8908a186acfed2e6b55b92e949d28146e3d052c579a62472f7f073610bf43e415d7cd7a214b9283a59836d41717f1e15840
 MISC metadata.xml 456 BLAKE2B e597aacc0128f9cd06d21a03ca156343861a56adba6449e12127025265c6019308ba2e8f360d7a4f43bbca3f95a78789d964bdd3e5bd5fea7d21d7b8eb413c74 SHA512 6cb3b5fae02190cce838221a1d5269bc005f985d5935f77880b066999340818338a747a9e24aa5d39ab71f69c842747068e3b573dcf475c7d552af1bc9af031b
diff --git a/dev-python/jeepney/jeepney-0.7.1.ebuild b/dev-python/jeepney/jeepney-0.7.1.ebuild
new file mode 100644
index 000000000000..e68d7065e154
--- /dev/null
+++ b/dev-python/jeepney/jeepney-0.7.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, pure Python DBus protocol wrapper"
+HOMEPAGE="https://gitlab.com/takluyver/jeepney"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/async_timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+		sys-apps/dbus
+		$(python_gen_cond_dep '
+			dev-python/pytest-trio[${PYTHON_USEDEP}]
+			dev-python/trio[${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+
+python_test() {
+	local ignore=()
+	# keep in sync with python_gen_cond_dep!
+	if ! has "${EPYTHON}" python3.{8..9}; then
+		ignore+=( jeepney/io/tests/test_trio.py )
+	fi
+
+	dbus-run-session pytest -vv -ra -l ${ignore[@]/#/--ignore } ||
+		die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 5c8b8f3fa88e..35a455fb49a9 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,3 +1,5 @@
 DIST jellyfish-0.8.2.tar.gz 134200 BLAKE2B f765047414e4c1de4588d51598583c49767dde07fe2b94cdb40674bf90f4af8b5b3fa59d0ddf1e0bae3793e531426ccc941dde3fbdaa25839dd13da8b19386c4 SHA512 c4cc2b22df37497ed1ee595f03ec10b7ffe6b8441accaea77ca1b6018df07d23bbe9f2ed72d0c3e06792d6e1229b7e56f77f1758396d83120236d018ce2328da
+DIST jellyfish-0.8.4.tar.gz 137001 BLAKE2B 55ffa7b7b931bf5bd0a2bee9a378fac10212d757d0e28492aac989a836c14106d37591a63a048db16b22c11e3964ad08325fe759e9ac2841722ac491a075feea SHA512 301fed3d4ba7228738b85310272970d2c666dd120a92a61b9870918ca3778bfead2b83437aced7933459f60079efcde863425a4a86077e8a0182db7d6d6c92cf
 EBUILD jellyfish-0.8.2.ebuild 691 BLAKE2B cf021985defb5d28ffe5426114e40b9e7adb94c6811ee86fd02adf46ca244e26259a11d5ec24ffc4b84decbf3b6093efb62c81a77f23252930a81eedd7733c75 SHA512 64f9f210ddc1898bdc4c28e454426ef55a3b2aa29504583990f4e75bfcdf1de8da92ce0fd20eeb5f29535a5e84bfe663075032ed125b68efc2306494c6042fe2
+EBUILD jellyfish-0.8.4.ebuild 693 BLAKE2B 697b1970d46a46e328ff5c5f8151d917bc3c4419e0f2dc6a8cfe79a33b58205bfd886f6f94e6011c37d61114ea8b399c2e012572b841d0467338e7be771b256d SHA512 82b5ed0dbf454b537fff0ef268393c844faa03f4d94a035223570fa141ba683ccb2340de9a4319db9d172b9c40266388867b99a20e1fc850c29a0a5e14bced4d
 MISC metadata.xml 503 BLAKE2B 5233c8c8b58779463d926f276a3fac04e25f70ed8992e75aaa4963a259de9d525b3dd4f040e0fd2aca83efc5bbbce73b7eb86d5b59cacb81f9aa1f82c7949850 SHA512 47e552f516be95767e3dfe9b5b43ea36b02369cc426cebc25d66ed6c3e449c1041d6c79351669d80ac13d19a45f699a719a80130073d02d14459c4630c87736a
diff --git a/dev-python/jellyfish/jellyfish-0.8.4.ebuild b/dev-python/jellyfish/jellyfish-0.8.4.ebuild
new file mode 100644
index 000000000000..837b3652da80
--- /dev/null
+++ b/dev-python/jellyfish/jellyfish-0.8.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
+HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/unicodecsv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	cp -r testdata "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	epytest lib/jellyfish/test.py
+}
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index a9096e967707..3dc18964110d 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,3 +1,3 @@
 DIST joblib-1.0.1.tar.gz 347176 BLAKE2B 046ec87d446eb3075d867e41bb87039062531294d9b6c0be8d3cb42ccdf47dd58f1bc46a599ade64fc210e93fcad6e3007af82dbc670e1eaec1c67b425f87712 SHA512 39b1579efad44d6e51db501dbaa8378e7c8a423822ee3264a8bed44b720f59e6d08993a00f995c45beada3dd59b8e4101c47e587c9bf72027b01723838b533ab
-EBUILD joblib-1.0.1.ebuild 1164 BLAKE2B 7d15901db467c24fadd5f2fa9a7b39b467da5a3301a2833049fa8626709631f3b9e35a7bfd08343c3cda3e4b5bc950871a45bf055e730de0f6ff5ccea9b3c92e SHA512 359e2fb992cd3136904a39c4821e7839c535ab78b4025f6b067084cb1d8cf0219214fa042415088f7bfb4fabc8bfa9f6f9d4022bc3d78ad45bb7bab1ab3b58b9
+EBUILD joblib-1.0.1.ebuild 1166 BLAKE2B 500bebb4b54564688c510f116f316e82db5b8e4cd0b83bbe70e9e736ada02d64b97eca2ccb2c3edaf9763204489951aaa81c9cf484b9593ffa01323fff469661 SHA512 a8bd9cd2c11699172b565066dd75a632bf78fba868a748d0a9cd67a08a7df0e8b00031293897c6f2474db9cebd2d21144769aea50d3e774c0151014a982b5b94
 MISC metadata.xml 857 BLAKE2B 54960e79cd772ee043d09577668c6197ddf0c2b6bbd4cc2bddcbf60ec25fdc9ee3c0a89611ec10d20acac23d69d3a0d4fef9bf225406fb5ba845c3fb6970746e SHA512 ba9709dae22587a7d2c17ff432d05c50f68bc51bf2f7b4e96fec9165304d76862889beafee4feb3a7dfbb5a54e9561ff4c804232a3c9a7dd7384bbd3467688f9
diff --git a/dev-python/joblib/joblib-1.0.1.ebuild b/dev-python/joblib/joblib-1.0.1.ebuild
index 6066ffdcf33f..44167c48f02a 100644
--- a/dev-python/joblib/joblib-1.0.1.ebuild
+++ b/dev-python/joblib/joblib-1.0.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index 057f6b207f3d..042c892ff458 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1,5 +1,5 @@
 DIST Js2Py-0.70_p20210218.tar.gz 1969615 BLAKE2B 4702b2e771bfd2a5158a3539c33932335816c74f9dbd132679036aa2b7e53796764dd852e92d72a35ecc31efa34b849776c45d8c81e80f85f59308edf0996f00 SHA512 757c895bc0ba933020336a70473ec4455cb93c17040a39f17d645782011ea72273291448f3448ffd34658b48ada45b77facf3d326133f1c0d63e2e26e2cd7f30
 DIST Js2Py-0.71.tar.gz 1969618 BLAKE2B 293a830f4188e66927b23900e8c376bf1a4bfdfa8726e33aa5aa75dcdf735cde89ce463741c142fc7e487ae89c7c11421e459d2fdd09ba88edfe953e4e087e42 SHA512 75bae61619d4766117f3c163d36427f3019825ecb08b745aee7c3b6f2d33a4ea8507ca180b63c0a8e575a5f9491eb64d6963acbb912edc7b934a676b38814597
 EBUILD js2py-0.70_p20210218.ebuild 1174 BLAKE2B 0c29b1ffa0f9807e5ec7b14779aa7b728e6cbb6d7209a38027324c0cc138e6be53dccc0d72c9e1c2404e5ac033a014b62eadb7e0822f46217b1f5076281d91f9 SHA512 c6edd54f7bf75c81610fd20b749535f9a67801ac68f76e411a88c0a48f63acb91e6c694d2f8d8b71b91dc3dd4fd51bd7fd85646d685d22baef9a270ed5394d43
-EBUILD js2py-0.71.ebuild 1122 BLAKE2B cf06099ea27d986bf47bd277e0cf12a057f22ff9c0b82e62d421f4c01f9cc25623053177e533519ac447560b163fbf5ced22320d063136d6b205c8567bcec9e5 SHA512 cb334c6bfb1c4dbc701fab5345d37c891458a4b90a0299271191be692d1eda6bff5efb796c2c96d02f15e1c89b215687dc925a60487a9525e327f9b6edbc770c
+EBUILD js2py-0.71.ebuild 1120 BLAKE2B 687bd48fb7be674ccd747d9a60d2fa0a0fac8eb236fd76ae088b142c7c38240c0222f9d0f81bf8032ff9be9cb0f60cf676d500fca89e891583681d42d32b430c SHA512 bd692acdd2d0b919508687e80c837192b943d7d177d3f16620be324c5aeb57a3a5012f3018899e930e09e016e2048241d206191263c0a6e9e9cd243529f441a4
 MISC metadata.xml 572 BLAKE2B e7e7fe7278ecadeedc310b4adbb1cc21c7c6a5e6cb522c31695196561e30f7bbfa0fc1e29315f931d3068ef6ede674e153e81207a7e5002d9adbe68c88e2e904 SHA512 c914912aac18c8984d4eb8ceed3d27a175fe89def2ba9bf778c3e3d8c729ad030125ea8f1096487b4c35cb9c1aa1f28a3d7a168b2c8992f6d58fb477bb9ca51c
diff --git a/dev-python/js2py/js2py-0.71.ebuild b/dev-python/js2py/js2py-0.71.ebuild
index ce887d3f5ace..1c6da35eb5a3 100644
--- a/dev-python/js2py/js2py-0.71.ebuild
+++ b/dev-python/js2py/js2py-0.71.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${MY_COMMIT}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index d7303d9590bb..451e67020dea 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,3 +1,5 @@
 DIST jwcrypto-0.9.1.tar.gz 86363 BLAKE2B d5920b9471870855bc131c171dc5515cc23fb9b94c38b33ce4894bcbe6fb5d0fa87e8b88f6470b8d1c1a1bc158d0dd09f51ace50baab03c8a8df59adc6e7e11d SHA512 245221d5e570918c1db9abdad72a0b03fb3fbdbb4db46ece441cbd75d43246b1b35bfd75e20718b8fa125bcaa85088cd776a7c204dd68e51e63818ae438848eb
+DIST jwcrypto-1.0.0.tar.gz 87000 BLAKE2B 6e85d52c26447b07c3d06387ac9e3b7adf585d5dc320c633e80ca2bc1e327f01ac95cec9a0fe2b92f7f8ed7f5650d5ad1a95de500d328b33763d604aaba1bd62 SHA512 12d270219d289041098f875f5b2b0773ffbf9044996a6189b827cafbf3e5dccfc103915275b1a11dce2d50e3510510eea476b024d19cf97fd7c66c25de5b3dbf
 EBUILD jwcrypto-0.9.1.ebuild 819 BLAKE2B e13a6aad1792fd51ffddb6eb4238c2502fdfe8fce1b722cfcfabd4012c3cc122d3757f4bb8e54477142fa2e021908bfdb2a18e44e2403f305a7ec7e1fa22ce84 SHA512 cd8726a1e8950ebc74358c95cc46a4d0b6324e9a38a1758b8afd2da59396c34bb39efea8b0d867e2cde8e58b6fd55665df7feea613df06748f98395927657d42
+EBUILD jwcrypto-1.0.0.ebuild 786 BLAKE2B 520fb7a84c784edb9100c0363ae1cf0c106a670014b7450005982e9d8df70ab6319c8eae5a67c47c0232282c72ed07ebc3f212e7f9ccfc1dcd9e9492c4dc69d3 SHA512 93b4c204ea6e788230ef10f811b752f2542218df6513b21b7dbfadd9cc285acbe6f3ef00a5d9b0f04c60696af6977d16f6bb1ac994e0fcba535ff76cd10e7dda
 MISC metadata.xml 368 BLAKE2B d5656c56c5a851d766c1e6588409d4864688de0c3acd4f28fb00ce22a106e5cf7f3ca8d54a4e448250cfafd04f4a0acced22db2a99879da67eb80c03f141ca74 SHA512 fe3492bfd6ba81846e7ba185468617d19f06eb813d55e87ac8ac9d5c7997d069e2b0f90dbd11ec5508b1da1ddd1d6a291fbd524f0c9dcdbdc8447ca639b78735
diff --git a/dev-python/jwcrypto/jwcrypto-1.0.0.ebuild b/dev-python/jwcrypto/jwcrypto-1.0.0.ebuild
new file mode 100644
index 000000000000..59761ac07cbe
--- /dev/null
+++ b/dev-python/jwcrypto/jwcrypto-1.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
+
+HOMEPAGE="https://github.com/latchset/jwcrypto"
+SRC_URI="
+	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+	dev-python/deprecated[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not install doc in non-standard paths
+	sed -i "\|data_files = \[('share/doc/jwcrypto|d" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/kafka-python/Manifest b/dev-python/kafka-python/Manifest
index 448e20997893..1115cb6c7233 100644
--- a/dev-python/kafka-python/Manifest
+++ b/dev-python/kafka-python/Manifest
@@ -1,3 +1,5 @@
 DIST kafka-python-1.4.7.tar.gz 352844 BLAKE2B 812c185bf19f3398c358722a44feb572693556ec671d07f2d74d63e45473f5b6d35390cc0fa2c95b8c42a15b635237ffa3c3829adde1f60a7611ce4fdf06f587 SHA512 5bbf9f998fba12e8e7c67a48e82b04e745f1ac528684e91b7454e825656e4a68b8c369984308cff575241b7f808f52f16ab02b7effd6d6b4319215f44ae4748e
+DIST kafka-python-2.0.2.tar.gz 327238 BLAKE2B 9d8bdee1cedcc3c7c0bee9d900bb815552b29f50ec45b7db9d1052a26eb772c84d92648ccc0d498189fc44314f5c8c30529fa61cb983481f2e2480e009630f91 SHA512 e193a8fe5852d2134e854749115feba46a0b8ff748336989a27bf56acba1124dbb8a5d841670a67ee26eef030a686d931d03d329f978b2eef7904183e83d2594
 EBUILD kafka-python-1.4.7.ebuild 610 BLAKE2B 82c5eb243dd959e97b0b7efcb3ac8840f7f3c36e5bcff600100979b9b514b1dda3922f34bfa126a02f3204f1f1df776ab3143c676042c2d0fab68882a538251e SHA512 add04f189fa7a36c7361e0668dc015149bf1b15c5f390cc1552ff91789cb2305c88c8c2d665fe1f1affaaa2e8d8d7b62258e3ed1fa74c52a286a08740ffea578
+EBUILD kafka-python-2.0.2.ebuild 1239 BLAKE2B 98db7060b2cafd5bcb26b0314d571353a2a16a20fbee85c1accb98e88b1e859be9f364cff2d6c11542826f3963bbc2929e57aaf73af7ea9606c3f58de2de159e SHA512 9fb90063a8c25736450098eb40db2b67be3844536d9cdda5b78e769515d8a20ed3224ef36e1c0b243bc2af7cf9529851a3917313087068b9036a3e17b8e511c9
 MISC metadata.xml 306 BLAKE2B e3422b476fc8d0d7fb8576c24d0eee0ed47d822963c979fdc1f9fcbfdd99abcd0caf7948aa7fb1142ea4ca174a5e803b0884a0d707418f5ce918a4a99ef61dbb SHA512 52e23be22b6fc6964bef55d737579c013b58d09cf737781212cd1d4c99f9c1257086ebafe5ed5dcc99ae574e3a0a6eb148029958f135508afa0ac069a2169968
diff --git a/dev-python/kafka-python/kafka-python-2.0.2.ebuild b/dev-python/kafka-python/kafka-python-2.0.2.ebuild
new file mode 100644
index 000000000000..d492752a2026
--- /dev/null
+++ b/dev-python/kafka-python/kafka-python-2.0.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Kafka protocol support in Python"
+HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.org/project/kafka-python/"
+SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/xxhash[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/snappy[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# Needs the unpackaged crc32c module
+		test/record/test_util.py::test_crc32c[None]
+		# Needs kafka server running
+		test/test_consumer_integration.py::test_kafka_consumer_offsets_for_time_old
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
+
+pkg_postinst() {
+	optfeature "LZ4 compression/decompression support" dev-python/lz4
+	optfeature "Snappy compression support" dev-python/snappy
+	optfeature "ZSTD compression/decompression support" dev-python/zstandard
+}
diff --git a/dev-python/lark-parser/Manifest b/dev-python/lark-parser/Manifest
index 9853a4e67296..ca134d95c02c 100644
--- a/dev-python/lark-parser/Manifest
+++ b/dev-python/lark-parser/Manifest
@@ -2,6 +2,6 @@ DIST lark-parser-0.11.2.tar.gz 225851 BLAKE2B b4fec8701287237442d8fd3b2519f75f70
 DIST lark-parser-0.11.3.tar.gz 229917 BLAKE2B 14bd76f1faaa4fa0aa3fea300d7a4969e0afd70cecd163304047b34a001c012932f37a170d6727a01c93f69ad4c29da70e0b26cee477d81880fa7f97ebd01598 SHA512 34cb6b53dc782a8de57f1f9a0946e7d1f383fad83aaf85102f7d8ca9e5ecd1f83a7666ee1ed8bf556a0d21e1ac5af23964377619882b81dd1033512f544d51c0
 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.11.3.ebuild 687 BLAKE2B 4dc9cca1dde96561fd2ece339620754dcec5e741f3160657e6dda1d65c58c64a30fd190edab304d6ed80a38f73f01daa04bce77b2dccdb45109501202f0f372f SHA512 2de23d36eb3c178916ca03aa14566309cd5a69c5bf09336a642912c9884b55f02d49e361b28f87b62628de8298954bb2bdc5dd07144627f9bfcea7ba9f60ab7d
+EBUILD lark-parser-0.11.3.ebuild 685 BLAKE2B 59f8fdfdc9becc7cb1b9b8591bd8d344b03279eecc2f45ba35bfa7034938e6a112aee8a15bdb93db24e7c1bbb3262cfca4cde4c357362438204a6ed2e14a0909 SHA512 cae4764668c0eced18ed14bbe0ac93a2d9fb739903ddd84a2c3ce92cf36ad438abd460b982e5fe0605f3e4e35b2a8cfd228d46047ddec135cde247aa00d798a0
 EBUILD lark-parser-0.7.8.ebuild 405 BLAKE2B 5605f1497ae47ea1496f40fafd16eeae8de06af7dc57ed676a9edef923542bb6dd0341adddecd26403d3031b16236298b573bc993c1ead949e1b2327713c5715 SHA512 af78a75077dff7bb32690c6b49959287bbd60e74ea82b8faa811b69501990f4f4b5acea98a6750cc7b3f16ad5af4ebd4a255b7a1b34d6fa191c908c021744a6b
 MISC metadata.xml 634 BLAKE2B 579a43df551ac45d8653d586c6567aae74c77dcb49aa9a4acfc2940ba975629aacda078b1090ae54ffc4dfed6b771b4d9f231970cb999db3367a32c45baa7051 SHA512 f9220665198522f359ddce8a72bbade74346be4e74632fc5764beb0d386965d6e7a88d1366dc968e330394a4a367059ec08c2b3b48839789b1b271657be5c49f
diff --git a/dev-python/lark-parser/lark-parser-0.11.3.ebuild b/dev-python/lark-parser/lark-parser-0.11.3.ebuild
index 7e9086fd46c2..ed00a09f0ce4 100644
--- a/dev-python/lark-parser/lark-parser-0.11.3.ebuild
+++ b/dev-python/lark-parser/lark-parser-0.11.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/leather/Manifest b/dev-python/leather/Manifest
index d927473c3ea9..d3988bd1a750 100644
--- a/dev-python/leather/Manifest
+++ b/dev-python/leather/Manifest
@@ -1,3 +1,4 @@
+AUX leather-0.3.3-fix-py3.10.patch 1235 BLAKE2B b71bb4d6b541ba55ca3cde388a331b69b8f93589d04e5c33c75033c9bfa63d718cfac16e1298df03ba024251618de72a0699687364daab87cfe1c9d5bbb94a42 SHA512 cfffdd293685cc0cd74b94ddef9458bdb5d63dfbfad976c097413111e336ac879c07e67226c27f5fdf4b121fe23005eb38f2de4f59d07a94c3930b01f7163eeb
 DIST leather-0.3.3-src.tar.gz 40522 BLAKE2B 3c7e6a48615751b310b7f066f2a78a2494e00256cae2ebfb4633c9389cca2477c2265fcf8c68f37733568ef729db1a5daf02ddc640bf2a60f2b39127c9a38d91 SHA512 30ea50ac6f97c55ee695b0e175a27e1e64fd17da7b0686ca8595fe0e5067932e19e59368fe6441f8f291ec52be3e597a80f8e04a3fcc0eeae33b3a5b3030e1d6
-EBUILD leather-0.3.3-r2.ebuild 1208 BLAKE2B eb9fa86edff5d7fe5ccc36e5176a385348ea16e95ac9ae42bb6e9632a18052d9d82f0d983f76baaacc804336cbb49baf5b84755f8119f44623a67f0a470e03de SHA512 6ba0a36855f4dc039bfa90be8279e55bf1ac57ae27e8b8c129e953cfd2986ef18b697a6c7231c5aef94362b8509bae2413e1f48097564124b089c78a96ebe856
-MISC metadata.xml 493 BLAKE2B f8962c3c95f53a3b1f019a9f0b175700e2954f53cd79e8422a23bb7bd49bc93f402e1dc23a02466bda8a112e1e78e6a843379077e88937dd89efc47d433dd6f7 SHA512 62620c4b79244ca31054b496eff69208bf94aad7df682ed14436a254fb0f604442cd3242a29ab1e828ad902b8ee9348d7830c73a00985017d2a03acde4a757c5
+EBUILD leather-0.3.3-r2.ebuild 1240 BLAKE2B 387ecca42ff6558fbc3cbaf99b90850cb9565ad67ac937871f883915dcd633ed69e3a49998485b40080c2a9e9dc8a27d585a8eca3ddb93f598965acadd7fff1f SHA512 bf7064a146d7e5f0efacb420bd104a7f408cc1fa6b85f4cd889b873b2b8d657af59e8e2df7e41d563fc697b1c470b840d3db22002f2b93c58b07b4cafba64eeb
+MISC metadata.xml 517 BLAKE2B 77a0715582ef60670b54b95e1e2606d0e87edc1c179ba010b11f2cc2c96255733bd38b4fcdd227e2bf575dc35db537b5213d0b8b922bb1ed504594c2645be8aa SHA512 864b114041b0c2ea2884886d1a1953374c243af680e1042cf8f37a6c98e982a73589276c68d736189361db79142b64149817d60f8607b881d6ae4e1f2891eaa5
diff --git a/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch b/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch
new file mode 100644
index 000000000000..8ec9e1767a4f
--- /dev/null
+++ b/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch
@@ -0,0 +1,40 @@
+From 5dd1d3cc82d426388c66db8e3761ca2bf99a3991 Mon Sep 17 00:00:00 2001
+From: Brian <brian@quantrocket.com>
+Date: Fri, 27 Mar 2020 17:08:50 -0400
+Subject: [PATCH] import from collections.abc to suppress python 3.7 warning
+
+---
+ leather/series/base.py     | 5 ++++-
+ leather/series/category.py | 5 ++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/leather/series/base.py b/leather/series/base.py
+index c5790e5..959e827 100644
+--- a/leather/series/base.py
++++ b/leather/series/base.py
+@@ -1,6 +1,9 @@
+ #!/usr/bin/env python
+ 
+-from collections import Iterable, Sequence, Mapping
++try:
++    from collections.abc import Iterable, Sequence, Mapping
++except ImportError:
++    from collections import Iterable, Sequence, Mapping
+ from functools import partial
+ 
+ import six
+diff --git a/leather/series/category.py b/leather/series/category.py
+index c575308..3678377 100644
+--- a/leather/series/category.py
++++ b/leather/series/category.py
+@@ -1,6 +1,9 @@
+ #!/usr/bin/env python
+ 
+-from collections import Iterable, Sequence, Mapping
++try:
++    from collections.abc import Iterable, Sequence, Mapping
++except ImportError:
++    from collections import Iterable, Sequence, Mapping
+ from functools import partial
+ 
+ import six
diff --git a/dev-python/leather/leather-0.3.3-r2.ebuild b/dev-python/leather/leather-0.3.3-r2.ebuild
index c792bf43f78a..e2397fc3ccf7 100644
--- a/dev-python/leather/leather-0.3.3-r2.ebuild
+++ b/dev-python/leather/leather-0.3.3-r2.ebuild
@@ -1,30 +1,36 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python charting for 80% of humans."
 HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
 SRC_URI="https://github.com/wireservice/leather/archive/refs/tags/${PV}.tar.gz -> ${P}-src.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test +xml"
-RESTRICT="!test? ( test )"
+IUSE="+xml"
 
 # Other packages have BDEPEND="test? ( dev-python/leather[xml] )"
 TEST_AGAINST_RDEPEND="xml? ( dev-python/lxml[${PYTHON_USEDEP}] )"
 RDEPEND="
 	${TEST_AGAINST_RDEPEND}
-	>=dev-python/cssselect-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
 distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
 
 python_prepare_all() {
 	local requirements_files sed_args
diff --git a/dev-python/leather/metadata.xml b/dev-python/leather/metadata.xml
index 2b9e7e0da02b..a4cf6d4537d2 100644
--- a/dev-python/leather/metadata.xml
+++ b/dev-python/leather/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/leather/issues</bugs-to>
 		<changelog>https://github.com/wireservice/leather/commits/master</changelog>
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 8d24fecab63e..997bf9aaf000 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,5 @@
 DIST libarchive-c-2.9.tar.gz 46408 BLAKE2B e24d9ce56919b6c6217da7629ac3c87023f44d2f1470f6632b3e3b478d29e76edb8fed5e4f8d7a75ab5efd160588dba82d23960d0224ce571ea01af9fd7efaec SHA512 b154cfe39247050c156d57f657b9668f3b1add879b7fb5b32cbc127becee63d1898fb1c4bd60e7fe72e814f544ddefa6680d582fec28b0feed90940fae8cc238
+DIST libarchive-c-3.1.tar.gz 11145 BLAKE2B 80d8918423ec23065cfd7dc391f458bdd44ade765c5e16c23f6cd1ff760e750551d1ff16ccd524a409f466512cb4caed9d25716d12021eafc915a9904bfd0f63 SHA512 1863e2981475839aebce50aa649f603dae7d54772fb864a83613e1d94ead48b64e0edfa0046fb91d1fc985a351911dcd13a24cddfefbb5b7403da1107dc3353c
 EBUILD libarchive-c-2.9.ebuild 551 BLAKE2B 899facfbe24c71e3de08272df2a3dc8f0da5bde25ed3d7bf43b8260b11660e11372076e39a56f2e735fb5cbbbe30ccaff7014f32716344f1b263c6eb835c2cc9 SHA512 d77408392d18b46da4b4a5de803c873508beff891cbbcef0bc5c88128f4efb87ef958da63eda6aa63d1cc93e237b950b09d1c49ac7cfd4887988a4d200a0b920
+EBUILD libarchive-c-3.1.ebuild 468 BLAKE2B a84827b391682c1baf4a1e7e55ca3d81fe0d68a893058f832687687b2096709fba396e8db94fd1132757a544474f0e80df142d6a5a99fa79d8ad0e5229c2665d SHA512 f839926103f6482baeb2045a202be350e19f14dd2b40c81cd1e804bc0f5f81059cec40349db63f36c7fcc38558b73b6c8042ee894b63fe7878105d66942a4823
 MISC metadata.xml 561 BLAKE2B b7ed2b26ca60804ca1e6ed5c0d10d8ff4d673c1912cf9f6a7bfa2c02bfe004a9ca2a19d6f165add2d43cfb8e77007480ca168c22036013284d6e3f44f999a118 SHA512 3945224587cefaceaa0959d6b296c680d1a022f23ea07f6c62944aeba9a6fced9ac25738c3067b32f38e759ccfb3bf197d12a73761f9a13da3f57782c1c0d0e0
diff --git a/dev-python/libarchive-c/libarchive-c-3.1.ebuild b/dev-python/libarchive-c/libarchive-c-3.1.ebuild
new file mode 100644
index 000000000000..b8cdc82285f4
--- /dev/null
+++ b/dev-python/libarchive-c/libarchive-c-3.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python interface to libarchive"
+HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="app-arch/libarchive"
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 64b43c4833a3..e30c97727c43 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,3 +1,3 @@
 DIST apache-libcloud-3.3.0.tar.bz2 1811722 BLAKE2B bfdacdda6bb39b3782915d71db6d736caa8a1d57c5120dac9020a1c4923ab08bf8983916fcac15723139b073858efdf178aa797dd592d7534a0b6ff35f8fc5ae SHA512 286ddd79b14633ceb59e1a4b015760a1e525b0282f3039f16c2fa4de940005da5fbde1b8262027103ca91c9653baed22d61dd136ddcc2b6886687ad8b27f3ea8
-EBUILD libcloud-3.3.0.ebuild 1200 BLAKE2B 3c278b434fb196fd1b39dab3962daf133aed125af9b001234795b6257a05c5de665de5c89f7fdbb4e48ecd6fe8abd805be2e02d2ee9ada49b5733f512e5d85a4 SHA512 70461bcc5ba5332259c68e18373736110f111148dc80d6df98b450ff43146ecdf5a9eb7f117b092f705c0535f7d5eaaf9727d3f8b4dc21efec48ac5d1b5bb9bc
+EBUILD libcloud-3.3.0.ebuild 1241 BLAKE2B 870271718b9b120997d01c4b6255fe8070b2e7a8570a122b041ba6db00a3bfca209ea5a9b40124e634210241b3e00bd818289e6dc099bb1e180d5157c8679768 SHA512 62f8b3cc20dd157d58da7a401ec9074955da5ab774d5f9b0794a6c37ed7d05d1f17f2de4a82b524a30a5dfb5fcf519f97a4202d5605e282eaeecd34598c0bc03
 MISC metadata.xml 324 BLAKE2B aa05dc2d968f9550a607cc367c5ab6c3426a41e35cc9a29baaf25050978543fee5bdd676a4606c45fd9104ab6dbe2f2c2bf8f7c45d1b95805503f1cf20668b75 SHA512 809416c2bc54a84624712c77982b57734b6510c66dc731f517574949f13b2aa37b97c9ce4e5ea649262a4731a435187f271d0922e87bc647b2e696bfb40eab0d
diff --git a/dev-python/libcloud/libcloud-3.3.0.ebuild b/dev-python/libcloud/libcloud-3.3.0.ebuild
index eae3be8212e2..0c5711501b8b 100644
--- a/dev-python/libcloud/libcloud-3.3.0.ebuild
+++ b/dev-python/libcloud/libcloud-3.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -18,11 +18,11 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="examples"
 
-RDEPEND=">=dev-python/requests-2.5.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-BDEPEND+="
+RDEPEND="
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
 	test? (
 		>=dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
 		dev-python/lockfile[${PYTHON_USEDEP}]
@@ -31,6 +31,8 @@ BDEPEND+="
 	)
 "
 
+distutils_enable_tests pytest
+
 python_prepare_all() {
 	if use examples; then
 		mkdir examples || die
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index ddea8a0c5fa5..4c2883065115 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD lit-10.0.1.ebuild 893 BLAKE2B eb0a0a0dc7d159d03fc7f791feec613ab9fe2111e010c6ad2a9d805f69990d7d821770d28383cfd3efb740641b8db4b0359f0a9c41723859a419c45e1dd6435c SHA512 803a2e38ff1eb50983f030b5ec38e40b543e1cdc61cfde708f69494dcecd2dace4e00aac6be4342f3950c252769b6a1ef31178ed0337d581b33269d682b95fd5
 EBUILD lit-11.1.0.ebuild 901 BLAKE2B 03656b1026178d703dc2274b8c8e64504d9f84f9946a34efc1e6a03d3b3038f2a6c23e3c16efc6666314f695315a1995d3cbb5a385a17811fb44a372d6caa6bc SHA512 7a09406d817d5110a489686aefb87d85bb0b8b0a958cb2c4a2065b02e2eb6152023a1f06391be934629c27032b73dbca971404bd848a93a9ab602baf7591b838
 EBUILD lit-12.0.0.ebuild 875 BLAKE2B c7eb151f6ea8accdfee67f26f9b65c41a65d61019295681572055c1771556a365f234bea7058491d2e739313b0d77063c3e9028a8f895fe5987604f0f45ab516 SHA512 772d7644cb8d84f53a5275992f2096dc3bb7ea298056da296572deb53cd3bda52c6f523d9484c48e07067dd79f6cd0ab752116b504f60ffc963431b02a4c7d98
-EBUILD lit-12.0.1.ebuild 879 BLAKE2B e1ae6897065f200b1fdbaf5534505138068fde33376ca9414b0929e4dfb0a659b2bcf32e51441dac01752f0036ed8c8276f270ae08274bed9a9e0fa477193342 SHA512 1f0e3b356004ce9b0bf151b6c01e0724e4100cf5c905aa8ba463388dbb308ccda8316190292dfd9db4d601cd144decd7b06154565716d4fba66f6f6a540e0e23
+EBUILD lit-12.0.1.ebuild 878 BLAKE2B 2beebb6866596d6e72008b9a7c0084c4889f088be65f349d0dbe8a17072f37885f3d897a74519c550d1fdcda4e7051c47954aa5ab05c46e2a98c660fa6e70c51 SHA512 8fd4dfaffd4f65f67ec586660bf7658f0f4fb187668f4e0b5716058d0e872c7c10335aae96d326b9bdecd7f518e961d74c1bbb5d3bd5b4d92ef04a831fc3d4c4
 EBUILD lit-13.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
+EBUILD lit-13.0.0_rc1.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 EBUILD lit-14.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 MISC metadata.xml 282 BLAKE2B 36e6403814edc8e79eca456ef9648a7b261f79d4823082a8dce876127b11bf89182dabb02e58b2a42dec3cf9e21fe2f5c474ee4a8416213901f82cfc481ffcda SHA512 fa292059e410ff5e751980c5f5b0145c579b373d77970b797850c3d92641bbcf27b2c18a33d665e76e59553ba7dcc124ae09ec34fcaab4b2caed74248ace0e57
diff --git a/dev-python/lit/lit-12.0.1.ebuild b/dev-python/lit/lit-12.0.1.ebuild
index 0502b9a74a19..c5b84099fa77 100644
--- a/dev-python/lit/lit-12.0.1.ebuild
+++ b/dev-python/lit/lit-12.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-13.0.0_rc1.ebuild b/dev-python/lit/lit-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..37168fbde9bd
--- /dev/null
+++ b/dev-python/lit/lit-13.0.0_rc1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index 106be72bf0e3..03b667074c8d 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -1,3 +1,3 @@
 DIST lockfile-0.12.2.tar.gz 20874 BLAKE2B 8a1e49e8799516b44b219fb28101f3985d75fea842456e69c4357b71eb6a7be21cc56c0f9e885df8da3fb6c584ff4a47c7daad87ba34fc47a8cd40644ece063b SHA512 67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07
-EBUILD lockfile-0.12.2-r2.ebuild 597 BLAKE2B 07d73441271d5f0282f8f9e3b18de6e31e1bce2589ff96bf713d52de2c35937abbc98de998830f10c07ba0888a53cc4640c6d53098b2d5cefb0dc760340ad80c SHA512 78e935a02a9abe72de81b590f7f44da2fe9c03c78c413813b9f9a6d86b3e9c9e3736d762416f4cabb23f6539db4d544d3ca97a481c6b35c1014da45dd69eb603
+EBUILD lockfile-0.12.2-r2.ebuild 597 BLAKE2B 0aa9d7128aaf9004988c8806bf4b9860f1fba87b14cd71bbbb8b6b76d901a2e96d08165be610d0504fa17cc63f7c09ef7f53300c1fc7744df6bcb9696318e83d SHA512 f6499069f6f9c6f9b260255c15bd9f2c0fc18ff802b6165c417d87d08d5ab0c8c6f4f6e076e8ea8020905373a3428180136eb91d1c8fedc658b0c23d40267a73
 MISC metadata.xml 388 BLAKE2B 0fe02708c02d058bc6deab9d0138d9b03cc96f604088a4a50faf869b07e8a6daa8fbb6afe0f24464d5820e32d0a79ee7d882f56862dd7a26236d78a69d127687 SHA512 1c5a2a4f97d31f99a9b802b192505d5594cc6df1ce0aff1cea2bf2520c712608b2642429d68c66d73e21fb07d5cd71ba5bde9de486494ef7a769c7c725650d9e
diff --git a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
index 3d61af935d39..1e2e089dd5cc 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index 94ae98700cb7..2797b0f8a4b8 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,4 +1,5 @@
+AUX loky-2.9.0-fix-py3.10-tests.patch 1554 BLAKE2B de9edaf32d937cf15f38c40b1c35238eb23602aca47014af6eb8418e1acfc141a6baeb4021a48fede6ae12b31cfc6533ce7f0339dd51f7297ad244f1adbdb007 SHA512 2e236f8c9ffbfb24ce1e646bbee4ef62d9af7472b695beecb1926d20fb467e7a67d01f27cb4c6b8e08a91a93195d68a7b3b778ad5258390bb482ba70cfee5d2c
 AUX loky-2.9.0-libc.patch 956 BLAKE2B a03de811cb32e728c22b2637106ffd3c969e9fbbbd45deb180ac83d9c44e81b7b5eb0744816abd4a1083d9d47c817db5c02f5f5f6c448f944365299dbd97a044 SHA512 c2e74f96a8f70ec9817cc517fb13ecb8414d6a9157d882ba15af05a81ec70df0edcdb6a8a02c96e7ecc4731813cb86932832fe61b5e19653164af9f7c68dc25a
 DIST loky-2.9.0.tar.gz 115019 BLAKE2B 2aa2042e32821b67db8b8de12d4b380d22af93d308bb35878271a4859325d6740a3bdab70b464a2c0d0af143903c8af3da81b4b804605cdae88779fefd7971a6 SHA512 d49354b834251f6f05a689ac44464aafa5a7a5b4a8ef84a308ec3bda138e810fc3dc31aa628307984dc69386a210f442d4c202b9499ae3e3864837b47a5b0cd9
-EBUILD loky-2.9.0.ebuild 1021 BLAKE2B 2ea8aee9ab4b527a6e72b4f7a6cc7797f1da8ccb265911fa954bb986d8202981038788cfbe10333948de7887d845a4bbc4aa10b13fbedcfe0b871fd99ae979b2 SHA512 503f67e0cde83f3ee71efd5bf66a03cd9770f418d84babc5c5be4ce3492a803415c60504c45140e6802fc2f4a416c5d7ddf483ac8692ede8c3a59361d29854b4
-MISC metadata.xml 307 BLAKE2B 8b13804536c6ca6c44445e1fb411e7e54e40279ac6ecbe51945a75508ce221c78d11007b6600e6706287db6299b2015b7b9b282cbc05486ecca189983b048a7b SHA512 a78a0767759287a9e4bb5a4fcbc655820d619802db28c72cb84300557fd53f25fe9d5e2fdf2873649bf3bb01a5b5129285a304f111695891287aa012f6f937fe
+EBUILD loky-2.9.0.ebuild 1098 BLAKE2B b185322d31bb11de031b833fb20f2a892afdedd2117953c238a7eaf89ade3d0585780876cf09b876a0656994bd5ff7a5539a73404c141d4dbafd815f16368c38 SHA512 90a31ee5f4232062836ab51f4341fd189dd521946e554c249b5e7f54bac3d1db278482ea8bfb56481c7b376d6fa4ccf622e55629f5c9a45a442d454e4000d8b9
+MISC metadata.xml 382 BLAKE2B 32cbc1465ec3aaef961a70862a458cdf20b7eaeb8b4e266a34eea917b58bdc9132cd59958da7b0d390197ae2d8f332d9c835e616c52570fe9338e7085cf7b664 SHA512 25b107a76c02e82bc2ee28a0f7abb1ac0a736a19f497e27b39911f176cde604cb5e61f447616f1a6115806b17251d94dde0186c2a848fedc2b86956fae7ea834
diff --git a/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch b/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
new file mode 100644
index 000000000000..51cbfb348a51
--- /dev/null
+++ b/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
@@ -0,0 +1,41 @@
+From 0d31dc24ca9688c11d1fe53fa1283728ecc50706 Mon Sep 17 00:00:00 2001
+From: Arthur Zamarin <arthurzam@gmail.com>
+Date: Mon, 2 Aug 2021 18:35:31 +0300
+Subject: [PATCH] Fix no attribute import_module for python 3.10
+
+In python 3.10, the `import_module` has moved from the
+`test.support` module to `test.support.import_helper`.
+
+As fix, try to import the from the new place and if unknown try from
+the old place.
+---
+ tests/_test_process_executor.py | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/tests/_test_process_executor.py b/tests/_test_process_executor.py
+index 65d9a2c9..3bd0b12d 100644
+--- a/tests/_test_process_executor.py
++++ b/tests/_test_process_executor.py
+@@ -1,15 +1,18 @@
+ from __future__ import print_function
+ try:
+-    import test.support
++    try:
++        from test.support.import_helper import import_module
++    except ImportError:
++        from test.support import import_module
+ 
+     # Skip tests if _multiprocessing wasn't built.
+-    test.support.import_module('_multiprocessing')
++    import_module('_multiprocessing')
+     # Skip tests if sem_open implementation is broken.
+-    test.support.import_module('multiprocessing.synchronize')
++    import_module('multiprocessing.synchronize')
+     # import threading after _multiprocessing to raise a more revelant error
+     # message: "No module named _multiprocessing" if multiprocessing is not
+     # compiled without thread support.
+-    test.support.import_module('threading')
++    import_module('threading')
+ except ImportError:
+     pass
+ 
diff --git a/dev-python/loky/loky-2.9.0.ebuild b/dev-python/loky/loky-2.9.0.ebuild
index 6a166599dde5..25edf84e76a1 100644
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ b/dev-python/loky/loky-2.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Robust and reusable Executor for joblib"
@@ -27,6 +27,7 @@ distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/${P}-libc.patch
+	"${FILESDIR}"/${P}-fix-py3.10-tests.patch
 )
 
 python_test() {
@@ -38,6 +39,8 @@ python_test() {
 		# one test that uses a lot of memory, also broken on 32-bit
 		# platforms
 		--skip-high-memory
+		# breaks teardown
+		-p no:xvfb
 	)
 
 	epytest "${args[@]}"
diff --git a/dev-python/loky/metadata.xml b/dev-python/loky/metadata.xml
index def50b74ac1a..aec9cefdf350 100644
--- a/dev-python/loky/metadata.xml
+++ b/dev-python/loky/metadata.xml
@@ -5,7 +5,9 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">loky</remote-id>
+		<remote-id type="github">joblib/loky</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 92b66d179d9d..b933b1488158 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,7 +1,3 @@
-AUX m2crypto-0.37.1-openssl-fixes.patch 3074 BLAKE2B 3daa583d4f7e04840a9c2f15fc583dcf8e4ee996aee93d9c180ccc4920f36cd2f90e2f2591732597b0108f3944cb3b22d0eb202c8dfd500fccb8e805aa74666d SHA512 fd73a98592026b39341200fc378042b71272dad4c43c63e4da3aafabae4f5a8aadeb41738ca99cca87ebeecb5455abadfe96d0c6640702b14f138f8122dc57ee
-AUX m2crypto-0.37.1-py310.patch 3843 BLAKE2B e983077f9eda65ea63e34f73178429aea8da61021c38ed68a4798857f3b6b37cea9cbd3b8886d4b169521cda243b87bda18de651f60dd53560693c8472374f7d SHA512 0fbc6eecd28e52036df5a74d825c7dba9fe7d3573c88a564607d4514f01631441929d0d02d6bbf6269b0f077c5ee4b0090b91cdb5b38808480623a782f274d51
-DIST M2Crypto-0.37.1.tar.gz 1247031 BLAKE2B 3628150b8da15d7356298b6e52e0d8fa7875921a184a0eba3a97eff0588c9e0fee340c92fd486919057d900d6e3b2b711174dde9761fe247848f92ac6434df0a SHA512 9a5e0220704b4897a9ca7efa4b3b57447b9175c52e8039a85bff7bb1a43b709c69f3c8b5903df461f8de39d3f8a20f9bf494df6f5882771846adfe2c03fbea9e
 DIST M2Crypto-0.38.0.tar.gz 1241269 BLAKE2B 95433090e08ff72cd2b0779491dc38b89eca159b26812e763b5b8973e3d27249a96d5a2c983b59f414184f64beb8e455dc26979310378db89dd2081741d4d17d SHA512 b1e24e3101ce0dd9f17be4cabeddc2ec0f1228b270d74ef2fb38bae8807c5025b031d0743185f06370786a3dd5c3f42129720534dcff07ea4de3c727613f8d20
-EBUILD m2crypto-0.37.1-r1.ebuild 1487 BLAKE2B 13825020a0ab5d5203e238bd5d5cadf719d77c02dfa1b4be8fca51a79b1238360bfc52ae06500ff92c0caec2418c51db8c4c7016d77977304c80a5d6db2531b3 SHA512 2100ed3ca111b84ee5dfbe92f83218a1403981d63f906b49a7d80faddf46f8bbbbaca42da5ec03b304b91dec30dfb296622c9340499ad29c2a55e53b08e96ab6
-EBUILD m2crypto-0.38.0.ebuild 1494 BLAKE2B 8d91c7f87e680de0450db4312dbb59984849f5caafea807f77a2797c3265fd08fe37d0913a0b111c41710a162bfa09c77196c9c015d13f66b56aacddbcbd34e4 SHA512 4d64ad186eb92ccf51e96ddff6c6cbe8c79d9a3ea142b6fea782940702ec572ae0a64875b0753308fbffc1e80ba4ef5e2d873165d362039c0429d6c4a0b6262b
+EBUILD m2crypto-0.38.0.ebuild 1493 BLAKE2B fa8dc1b85a20b0bce14c6bad262a7ffbb799b8130342f8ce4da8fb97303b22a7df0de5eb1a3e3f5524d4e20770b150f9652b3f363c939c61d938cb74ee2daf83 SHA512 a985776c3c522c50d076881099079429e4c9d99d010b1edaadba1d8ae9cb4afefe827dcd961593bcca1141ec298615745628d8003c0e84043a353e3e3c5af832
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/files/m2crypto-0.37.1-openssl-fixes.patch b/dev-python/m2crypto/files/m2crypto-0.37.1-openssl-fixes.patch
deleted file mode 100644
index c249f7adbb80..000000000000
--- a/dev-python/m2crypto/files/m2crypto-0.37.1-openssl-fixes.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 73fbd1e646f6bbf202d4418bae80eb9941fbf552 Mon Sep 17 00:00:00 2001
-From: Casey Deccio <casey@deccio.net>
-Date: Fri, 8 Jan 2021 12:43:09 -0700
-Subject: [PATCH] Allow verify_cb_* to be called with ok=True
-
-With https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
-OpenSSL allowed verificaton to continue on UNABLE_TO_VERIFY_LEAF_SIGNATURE
----
- tests/test_ssl.py | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_ssl.py b/tests/test_ssl.py
-index 92b6942..7a3271a 100644
---- a/tests/test_ssl.py
-+++ b/tests/test_ssl.py
-@@ -59,8 +59,13 @@ def allocate_srv_port():
- 
- 
- def verify_cb_new_function(ok, store):
--    assert not ok
-     err = store.get_error()
-+    # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of
-+    # aborting, this callback is called to retrieve additional error
-+    # information.  In this case, ok might not be False.
-+    # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
-+    if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
-+        assert not ok
-     assert err in [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT,
-                    m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
-                    m2.X509_V_ERR_CERT_UNTRUSTED,
-@@ -618,7 +623,12 @@ class MiscSSLClientTestCase(BaseSSLClientTestCase):
- 
-     def verify_cb_old(self, ctx_ptr, x509_ptr, err, depth, ok):
-         try:
--            self.assertFalse(ok)
-+            # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of
-+            # aborting, this callback is called to retrieve additional error
-+            # information.  In this case, ok might not be False.
-+            # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58
-+            if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
-+                self.assertFalse(ok)
-             self.assertIn(err,
-                           [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT,
-                            m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
--- 
-2.31.1
-
-From d06eaa88a5f491827733f32027c46de3557fbd05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
-Date: Fri, 19 Feb 2021 15:53:02 +0100
-Subject: [PATCH] Use of RSA_SSLV23_PADDING has been deprecated.
-
-Fixes #293.
----
- tests/test_rsa.py | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/tests/test_rsa.py b/tests/test_rsa.py
-index 3de5016..7299785 100644
---- a/tests/test_rsa.py
-+++ b/tests/test_rsa.py
-@@ -124,11 +124,6 @@ class RSATestCase(unittest.TestCase):
-             ptxt = priv.private_decrypt(ctxt, p)
-             self.assertEqual(ptxt, self.data)
- 
--        # sslv23_padding
--        ctxt = priv.public_encrypt(self.data, RSA.sslv23_padding)
--        res = priv.private_decrypt(ctxt, RSA.sslv23_padding)
--        self.assertEqual(res, self.data)
--
-         # no_padding
-         with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'):
-             priv.public_encrypt(self.data, RSA.no_padding)
--- 
-2.31.1
-
diff --git a/dev-python/m2crypto/files/m2crypto-0.37.1-py310.patch b/dev-python/m2crypto/files/m2crypto-0.37.1-py310.patch
deleted file mode 100644
index f9be349fc3db..000000000000
--- a/dev-python/m2crypto/files/m2crypto-0.37.1-py310.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/SWIG/_bio.i b/SWIG/_bio.i
-index 84b76b3..6c090a4 100644
---- a/SWIG/_bio.i
-+++ b/SWIG/_bio.i
-@@ -246,8 +246,8 @@ PyObject *bio_set_cipher(BIO *b, EVP_CIPHER *c, PyObject *key, PyObject *iv, int
-     const void *kbuf, *ibuf;
-     Py_ssize_t klen, ilen;
- 
--    if ((PyObject_AsReadBuffer(key, &kbuf, &klen) == -1)
--        || (PyObject_AsReadBuffer(iv, &ibuf, &ilen) == -1))
-+    if ((m2_PyObject_AsReadBuffer(key, &kbuf, &klen) == -1)
-+        || (m2_PyObject_AsReadBuffer(iv, &ibuf, &ilen) == -1))
-         return NULL;
- 
-     BIO_set_cipher(b, (const EVP_CIPHER *)c,
-diff --git a/SWIG/_ec.i b/SWIG/_ec.i
-index f47d593..a492f6f 100644
---- a/SWIG/_ec.i
-+++ b/SWIG/_ec.i
-@@ -466,7 +466,7 @@ EC_KEY* ec_key_from_pubkey_der(PyObject *pubkey) {
-     const unsigned char *tempBuf;
-     EC_KEY *keypair;
- 
--    if (PyObject_AsReadBuffer(pubkey, &keypairbuf, &keypairbuflen) == -1)
-+    if (m2_PyObject_AsReadBuffer(pubkey, &keypairbuf, &keypairbuflen) == -1)
-     {
-         return NULL;
-     }
-@@ -486,7 +486,7 @@ EC_KEY* ec_key_from_pubkey_params(int nid, PyObject *pubkey) {
-     const unsigned char *tempBuf;
-     EC_KEY *keypair;
- 
--    if (PyObject_AsReadBuffer(pubkey, &keypairbuf, &keypairbuflen) == -1)
-+    if (m2_PyObject_AsReadBuffer(pubkey, &keypairbuf, &keypairbuflen) == -1)
-     {
-         return NULL;
-     }
-diff --git a/SWIG/_lib.i b/SWIG/_lib.i
-index 954e99b..351134b 100644
---- a/SWIG/_lib.i
-+++ b/SWIG/_lib.i
-@@ -137,8 +137,8 @@ m2_PyObject_AsReadBuffer(PyObject * obj, const void **buffer,
- 	    len = view.len;
- 	}
-     } else {
--	if ((ret = PyObject_AsReadBuffer(obj, buffer, &len)) != 0)
--	    return ret;
-+    PyErr_SetString(PyExc_TypeError, "expected a readable buffer object");
-+	return -1;
-     }
-     if (len > INT_MAX) {
- 	m2_PyBuffer_Release(obj, &view);
-@@ -171,11 +171,8 @@ static int m2_PyObject_GetBufferInt(PyObject *obj, Py_buffer *view, int flags)
-     if (PyObject_CheckBuffer(obj))
-         ret = PyObject_GetBuffer(obj, view, flags);
-     else {
--        const void *buf;
--
--        ret = PyObject_AsReadBuffer(obj, &buf, &view->len);
--        if (ret == 0)
--            view->buf = (void *)buf;
-+        PyErr_SetString(PyExc_TypeError, "expected a readable buffer object");
-+        return -1;
-     }
-     if (ret)
-         return ret;
-@@ -633,7 +630,7 @@ BIGNUM *hex_to_bn(PyObject *value) {
-         }
-     }
-     else {
--        if (PyObject_AsReadBuffer(value, &vbuf, &vlen) == -1)
-+        if (m2_PyObject_AsReadBuffer(value, &vbuf, &vlen) == -1)
-             return NULL;
-     }
- 
-@@ -665,7 +662,7 @@ BIGNUM *dec_to_bn(PyObject *value) {
-         }
-     }
-     else {
--        if (PyObject_AsReadBuffer(value, &vbuf, &vlen) == -1)
-+        if (m2_PyObject_AsReadBuffer(value, &vbuf, &vlen) == -1)
-             return NULL;
-     }
- 
-diff --git a/SWIG/_rc4.i b/SWIG/_rc4.i
-index eb4747e..6af2dc6 100644
---- a/SWIG/_rc4.i
-+++ b/SWIG/_rc4.i
-@@ -46,7 +46,7 @@ PyObject *rc4_update(RC4_KEY *key, PyObject *in) {
-     Py_ssize_t len;
-     void *out;
- 
--    if (PyObject_AsReadBuffer(in, &buf, &len) == -1)
-+    if (m2_PyObject_AsReadBuffer(in, &buf, &len) == -1)
-         return NULL;
- 
-     if (!(out = PyMem_Malloc(len))) {
-diff --git a/SWIG/_util.i b/SWIG/_util.i
-index bc2ee61..18e446a 100644
---- a/SWIG/_util.i
-+++ b/SWIG/_util.i
-@@ -22,7 +22,7 @@ PyObject *util_hex_to_string(PyObject *blob) {
-     char *ret;
-     Py_ssize_t len;
- 
--    if (PyObject_AsReadBuffer(blob, &buf, &len) == -1)
-+    if (m2_PyObject_AsReadBuffer(blob, &buf, &len) == -1)
-         return NULL;
- 
-     ret = hex_to_string((unsigned char *)buf, len);
-@@ -44,7 +44,7 @@ PyObject *util_string_to_hex(PyObject *blob) {
-     Py_ssize_t len0;
-     long len;
- 
--    if (PyObject_AsReadBuffer(blob, &buf, &len0) == -1)
-+    if (m2_PyObject_AsReadBuffer(blob, &buf, &len0) == -1)
-         return NULL;
- 
-     len = len0;
diff --git a/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild b/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild
deleted file mode 100644
index 86a235286642..000000000000
--- a/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs
-
-MY_PN="M2Crypto"
-DESCRIPTION="A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-lang/swig-2.0.9
-	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openssl-fixes.patch"
-	"${FILESDIR}/${P}-py310.patch"
-)
-
-swig_define() {
-	local x
-	for x; do
-		if tc-cpp-is-true "defined(${x})"; then
-			SWIG_FEATURES+=" -D${x}"
-		fi
-	done
-}
-
-src_prepare() {
-	# TODO
-	sed -e 's:test_server_simple_timeouts:_&:' \
-		-i tests/test_ssl.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	# setup.py looks at platform.machine() to determine swig options.
-	# For exotic ABIs, we need to give swig a hint.
-	local -x SWIG_FEATURES=
-
-	# https://bugs.gentoo.org/617946
-	swig_define __ILP32__
-
-	# https://bugs.gentoo.org/674112
-	swig_define __ARM_PCS_VFP
-
-	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/m2crypto/m2crypto-0.38.0.ebuild b/dev-python/m2crypto/m2crypto-0.38.0.ebuild
index 5cdac9b517cd..b6170a252e6b 100644
--- a/dev-python/m2crypto/m2crypto-0.38.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.38.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/minimock/Manifest b/dev-python/minimock/Manifest
index a95c830bfb0c..fe0c6877ec4c 100644
--- a/dev-python/minimock/Manifest
+++ b/dev-python/minimock/Manifest
@@ -1,3 +1,3 @@
 DIST minimock-1.3.0.tar.gz 13828 BLAKE2B ed60d9725ada7173f88cdd64d76e3674fbeff352f4ead919f2a3a94ec871189051da29da5ee285b4d663eee143da847c95e35286cf33a587abb7fe95e02a4824 SHA512 de7feef7fee044ba45a52d7c83905d082ad2ed2c3d12b294a6995086b377a22317730326946d048b19063758f158a9bee7bbb6a79c9ae0b4ba7a93e4a21ea196
-EBUILD minimock-1.3.0.ebuild 510 BLAKE2B 60461d7024c2eff7cf3ad74c6708127a1cd4a84ab9234890cf721b025ca39f300c6a452297bf9146cc9d7c05a37c24ba110e22c13a771db230aa786dc69c3153 SHA512 571dd5e799b75ebbb401bf89dbdb0908c63b1e43d22fdb56575af548b86b647ee49d9df50e364ee8be8893fa6f11e1eb45c2e8abfbd6e8a7ad7246712acad727
+EBUILD minimock-1.3.0.ebuild 558 BLAKE2B 7916e6d42927acd97a9bd488f22a5dd320651819638808b59acd7f19edecff6c80a7cf90edb78cc67bf850c4ba06ed281c234008d818a15f163dfd58a882e3ea SHA512 755ecccabea68142268eb5ad43ba1e42f29ee0ba92524e2be33f23ac63a15797b603354ddce7d12f1b581f5188f9b3b3fe94ef948599a75eb3bfdf76eb6b6e83
 MISC metadata.xml 389 BLAKE2B 5a2faad0837b39b8b5736820387d577e3c5f97802beae17340221fcc026ef18906f5bf9ed8cb86814fa8989879d84e062a9b542b0b530c9acfbaac80d4158c7e SHA512 907b5500e461c7f3c30d1d006270f06feef7537368c139dcdc791805f266435887162ad6209a7f827a8d9470e7e4d98e41d0027604e36532b90a16abcc60244e
diff --git a/dev-python/minimock/minimock-1.3.0.ebuild b/dev-python/minimock/minimock-1.3.0.ebuild
index 626cb3a2d8b3..dda36847f069 100644
--- a/dev-python/minimock/minimock-1.3.0.ebuild
+++ b/dev-python/minimock/minimock-1.3.0.ebuild
@@ -3,12 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
-MY_PN="MiniMock"
-MY_P="${MY_PN}-${PV}"
+MY_P="MiniMock-${PV}"
 
 DESCRIPTION="The simplest possible mock library"
 HOMEPAGE="https://pypi.org/project/MiniMock/"
@@ -21,3 +20,8 @@ KEYWORDS="amd64 arm ~arm64 ppc x86"
 DOCS=( CHANGELOG.txt README.rst )
 
 distutils_enable_tests nose
+
+src_prepare() {
+	sed -i -e '/cov/d' setup.cfg || die
+	default
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 5b8f1bdf6b49..4d13b835f5e6 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,7 +1,7 @@
 DIST mkdocs-material-7.1.1.tar.gz 6080208 BLAKE2B a67742ce923dc7bbefbb5638156f5a2f703bd54af96e59b1c580264ae3096d0a823df6cd88151f2c446a97b578bc4a620d694323f5a81cc33836181dad203214 SHA512 ab6b9b4b08268c15b42cf9d5d26ea0bc91151efb1b478602b495f603335792fcd1f9058ecc52767cb861969ab1db7aff2681653db35cb739173b56f7f32f9c65
 DIST mkdocs-material-7.1.9.tar.gz 6492415 BLAKE2B 67a86251289126320088dde4611ea1c1e75543e7edcb2f737dfcf21844f53a3457544716cded44f0954c2658cb107e5cae589efa2c71ee07151a39ed0f28401f SHA512 1a4296ff692842e61406b24ac50b1c02550a2581040611c263aa744c98031a54c6f380e6f655aa477f98d7507d2e8649434fc981928e9d27f09df71cccd22ecd
-DIST mkdocs-material-7.2.1.tar.gz 6773988 BLAKE2B 8b57a58b11ecdf9fb9668a766d10869040c8f6e2d2045cae01e4e32243503540ef955c81bdf0b2066886a309c46e724586a912631ffb78a6383ee1736f1b13d1 SHA512 9ce1cd733205ab87e865c8b90e9b78b133b5172acc042f8ee954073885c8380d06607ead2fc80352311502638c02439798515acfe8521c06b9fee707173e7d63
+DIST mkdocs-material-7.2.2.tar.gz 6777834 BLAKE2B 09c5ee5e0e0cef76ca66c8d86941fa044f2650d621a194991f279c09dd64c81c96bdfbe7d37eee5fe0e3837fc6461e7abad3537d92f3fdd178078485665088b5 SHA512 5332246103eb3007df3d2fd7ead4f2f60ce29c0e8a2bef6249db3e14a8e0ce1b2cdaffe4f48f57701d07a1771e275c69a79006ec53cfacff1a885894076188fb
 EBUILD mkdocs-material-7.1.1.ebuild 816 BLAKE2B 6e872ef6c7186551647d37f7a80142f591b393fcea6cb132040809478f92aa1abbada00f92530b12e23cd7712944ac8b0a82db414d0a39c1be1cf28f4189ae5d SHA512 871fc55ae207e78a3c9ef1f50b887ced596d2ba7cd4a4606549f9877f1d4f660857d3f62aeb23d4eabc4d75f7a79406cf78c45d80b645cd145baf45efbd8eb5a
 EBUILD mkdocs-material-7.1.9.ebuild 817 BLAKE2B 7700357d46cf7298e980eaebd60a96823a0c6e31800fd35c260cc00ac4f73757fe7f13adc1003476e4ff4076cc00f59934fd8a11bff95d10cce32d2c75beeafa SHA512 e32d3869be7418b2453432021fd67930c58c6886fff89b805438d71b4b4567a7c3091e96a0201dbad4da7522525d07634eb7f1ceb6fb66e52ca82d62b3b93184
-EBUILD mkdocs-material-7.2.1.ebuild 817 BLAKE2B 924aa54ed7c0c1ecc16497b25b07c7bccffd7dbca5369595d981ace8d2db7e2f118948af863309d69e2a4ff522be107ce7ccc1ebda5e6839c69fb27bee9c72ea SHA512 65a70738804a58fd256516ecbd22ca10f51fe6831a17234e813ebf30da8d34f2e2335f804d2b326bf458743075416e1678784ad8a5cddab8393e5fc2cf7696c0
+EBUILD mkdocs-material-7.2.2.ebuild 817 BLAKE2B 541ba90c73ce9a7a3c7e52664f7f73a569001a6e644c81b5e452c2c041ef745473987580491e1f4fa67e918d0019d22d10824ae9f4ba3738060e5133aa7c6f3e SHA512 2b09409640d0dc8fc45e0336544517f92c3aad66c450f93632b6f57eefa20c7ae446906d707cd01c207be5fa9c36746eafe22a8d8c4f4f795567e629d7713518
 MISC metadata.xml 1036 BLAKE2B d9f342d8f3da5a5b1ce9ee0e68938b0c8f7235ff84e39c59d9da18cec1b4553193aaa7eff85157c92fd014e971f2ac947bd252caad791605b0867cf2d7622ce4 SHA512 31db1dbe3433dbbcb6036ece9803d22913980644f014f8e8db80bb00899e0b98602016a08e887f7fdd5d99627d411ea8cb18fbb091faae0a03f8804e3497b52f
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.2.1.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.2.1.ebuild
deleted file mode 100644
index 2190898a4626..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-7.2.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=8
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.2.2.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.2.2.ebuild
new file mode 100644
index 000000000000..ed35fce29300
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-7.2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index 4d6c6bddfe6d..17bf773c3819 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,7 +1,9 @@
 DIST mysql-connector-python-8.0.22.tar.gz 12081967 BLAKE2B fc6b724ec2eb47a92294f7316093d4a4d2f4925981adeb07b305e946a047dbdaedd96c6ff9a07426fd56185f467cf6473bc84e0896d2e8fde70a188af16e9df2 SHA512 07f380922c18f9ade38f95d8e107fe8f90b8a7901fb9a36bbdfdb2b29f9cb79b0b6387a608e89bf90e9344c635d47184c750a206beacb2c9cc7615d6a7df2c29
 DIST mysql-connector-python-8.0.23.tar.gz 12095843 BLAKE2B e4cc24f045d0e988ad97a9427fa3f6e20eb9d993d97f51033140e12722bc04fc3a2b252b811402daea2fea8f987948ebd8c68623f2af3e0e7e35d2b0d6fa7eda SHA512 66ca61c15573555a3f42ad8a9e9b3a4bc612c4d2b4e54928af87adcf609e131e9afd53b76c3a8da30f181e4f2111245cda5995063109526ff72f4f2062c2e528
 DIST mysql-connector-python-8.0.25.tar.gz 14600643 BLAKE2B e3452aa82dc047cfdec8e64975ceb4f1ba7804aae770956fa52293e185408a4a31b2f563a21dcc6f0c5be0f4a5858d6b58f0d33ab5cf5071543e2c68b2b52b52 SHA512 2a76b879b369e69e0ed6a67d1eab4787c0f9a29c505ad785b03b6b25d7c92b85547082adeae572c75e61b613f39ee01d291fdf54927bdaf25dfcfc85cb8ced7c
+DIST mysql-connector-python-8.0.26.tar.gz 15180658 BLAKE2B e964728d5f39b9ca5abc72ab84780b463708d1a1cf90507330e73be4837cd30befe245ddd70783490660c70da1b7c162803eee743a0e668cfa6b82773bea4fef SHA512 204021e08b21c5efe87c0f59a6ff3b949cc1d01005121dfe5dde7fea12852a3e28c35b68e06e04f2c0ac4f911bfc14893e6509c99d0c5bf2c30fa32d4131c630
 EBUILD mysql-connector-python-8.0.22.ebuild 1523 BLAKE2B 482d37af75f68fcfbf92074f82474a006e66376289a177e49e3421c25895d2a8cbdf40c4d9301a7b8fa17d69737252ef99a2196c969bc65b57cc000819ef86d5 SHA512 5f1eea17a35e9277f09eb8101c3e91d3b47ae9803b6c949afea3206b22757c73144081cb456faa1c46b992c7ca14a4b39997f35a12f79100f823d6dbd7eee970
 EBUILD mysql-connector-python-8.0.23.ebuild 1524 BLAKE2B f97c6f95c11fa80fea43d8ac86d1f7369561f5bee7ae7e8826187e5d9b758d4ff85b6d3f1ffaf096d680fcfb4b8dcd7133e0203d89011dab60ed3b4789f68a42 SHA512 e2a3f26be785e0ec920b828584e7c9bee38ed78bdf336d2d2e02e595c0b5ad6441dd971b67a4e5219999b0ca5b05d31f9733bf200813b8b2cd86b733081a1f98
 EBUILD mysql-connector-python-8.0.25.ebuild 1552 BLAKE2B a07510229e2b661993118ed1c1e18138a0a837aa0a15b38b2c841270534be962e247fecb00b293679998eef9ebc2fff6497bb396bd2116933978a1a774276655 SHA512 e91b8d26a81fc6065cfc516be3a2c9f74c402340e467a98a648f2872cd3fe43fdc6973124fbdaed4e9123fe8b29d9e8a1a456adaf7291de78df4c05743bfe008
+EBUILD mysql-connector-python-8.0.26.ebuild 1555 BLAKE2B 7b2b7890a89ac612be17e73eba571feb5e4dc6d493a905c392dc0d16986a03f5d212cdf07e50ddea8968cc91ecf3a7c30fcabd08ce2bf133b718013b4e2ef81c SHA512 6b35f874775c6b5aecdff32ba64979ee9311fc4e46af3eb9bba79506040b2c579e59f29f0d17dd4b8f2ed82b63216fa63bd5aea4ad41d868dc12711aacd76cdd
 MISC metadata.xml 429 BLAKE2B ecbfe7e88466287141bd923db191969d384118b464659804a4aad33d811a6042b8082c9675a103e3e50b1ccbf74357be609ed714890412d2534bc77388f6b61a SHA512 812597d8918eeb1c0b94b8afb0b605cf98fe6e0f3d4f79b644d90e78f026a13d1233c7c0665022c752818acf07deea7151b988a701c8a5060aefe9264c2a592f
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.26.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.26.ebuild
new file mode 100644
index 000000000000..454f690c682b
--- /dev/null
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.26.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} )
+inherit distutils-r1
+
+DESCRIPTION="Python client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
+SRC_URI="https://github.com/mysql/mysql-connector-python/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples test"
+
+BDEPEND=">=dev-libs/protobuf-3.6.1"
+
+RDEPEND="
+	>=dev-db/mysql-connector-c-8.0
+	>=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
+"
+# tests/mysqld.py does not like MariaDB version strings.
+# See the regex MySQLServerBase._get_version.
+DEPEND="${RDEPEND} test? ( dev-db/mysql[server(+)] )"
+
+# Tests currently fail.
+# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
+RESTRICT="test"
+
+DOCS=( README.txt CHANGES.txt README.rst )
+
+python_test() {
+	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
+}
+
+# Yeah, this is really broken, but the extension will only build this way during "install"
+python_install() {
+	distutils-r1_python_install \
+		--with-mysql-capi="${EPREFIX}/usr" \
+		--with-protobuf-include-dir="${EPREFIX}/usr/include/google/protobuf/" \
+		--with-protobuf-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-protoc="${EPREFIX}/usr/bin/protoc"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples ; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index bb877c4df351..2a5505ab5b6f 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,3 +1,3 @@
 DIST natsort-7.1.1.tar.gz 142749 BLAKE2B dffd5b7b18ac49653d4d65ae1335c85d441748903aa983df092778476988cf0ca59c08526ee0da1761fce1afe4849d4c9a9e2f3e0c5400ebca2478781d0986dc SHA512 1903c933c6203ef0cd194ea444d79276b79ec385728a92b6e73d1698abc8e1351e96ed8ea4ae5f9f413ef6daecfd269a4d0de74c45eedff682fe929d8f977f30
-EBUILD natsort-7.1.1.ebuild 540 BLAKE2B 3ccd6734cc487075ffd12b84e7d28ff97121730c5546b38bbdcb29ff7119d1b77d579aded0aa835e1bb1fe3c80069784307bfc1b4fb26c6799d1e86d4d9f9bee SHA512 a52e4506b46473fc2289232ba9bdd4e135cf427a83efb51cef29a6374df1e145909d1e1919642c6ae12c2c9a4c495516da9a6ac3d6de3d829406080f17d930a7
+EBUILD natsort-7.1.1.ebuild 539 BLAKE2B 5f9ce11469e8ac667cf1c573111fbd4765b14784d7fedfe1f3e1ee291abcfcb1c6a5e5b6b988e5fa7dee60ce64ee04472807506e252dc77c74f638fe0dd76085 SHA512 f15e47699c043461911ab7f92996d8c51e62c5a3ca7c830fc8601fc05bd696fc099fa2dc1f1ce5fa7f4940cec517811f322edefb5170598fe4b67cb8a7b05373
 MISC metadata.xml 406 BLAKE2B 1bd6819234aa6417e45d2e38c65863145930ff04eccd05690ca9d210fc9572394c18ef59e0d2c5adbd6791047fc8090baca5d6ec0c1118aaaa3fa23e2fa9427a SHA512 693524d7b020bdf70374c4ab784d6e230963dde0ba168fb9b5a4c39652a81bf67feecf091720f1fc1c853830705bf7aa4da64f2c3b4e921cf316507c8a79aa17
diff --git a/dev-python/natsort/natsort-7.1.1.ebuild b/dev-python/natsort/natsort-7.1.1.ebuild
index 3bdaff1542b1..bc902c2837f8 100644
--- a/dev-python/natsort/natsort-7.1.1.ebuild
+++ b/dev-python/natsort/natsort-7.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 46412f2a1604..14f384761f6d 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,4 +1,6 @@
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
 DIST notebook-6.4.0.tar.gz 13937270 BLAKE2B 41ba6e3dd22c92b6044199737fe93563aad07117e8c64817566765d643867b582218a1b34099acf2a84df9ac9f8eb2773f6f3e6779b14255867fd97ec443df85 SHA512 8bb57b3efaaddb781ee963a569996e45c563b50b2cb918fb7722805710dd5852d895ff5b5f5575686032a037d7395aa581140b471b529d68dfcb371841607481
+DIST notebook-6.4.1.tar.gz 14139457 BLAKE2B 4be00ba6cd2f66873657f8ad5f79b444bbfbb978eaac7ddb57ef5da39a81c2746e7658004179e44aa98fa5fc5954b022b2e3c0c15dac0cc6da21b95a16225bfd SHA512 aa73e90f8ad1888f469e4cb412b6f17742e3b68ce429b2feaafeaeebbbb9e0cc437f3f73f26204b8de8367620ecb492033786c00b04d641ce0bfb4df75460419
 EBUILD notebook-6.4.0.ebuild 3235 BLAKE2B a83eca348e5db25252af465ca499e16512ca91175b4b051f18196e3e3f60a1a657125b9fd7d1ec2119c096afa9d71f2a42b5edd9710bf248609f8298e75c89bb SHA512 78b4c658232dcf15124860d5fc6d3f394f9c2c9bde8de3cf8a9e05badb73cce17b4f4373fa64f079b12c4dc6a8169b66b89c50a13c992c96cf5a3c275d786bdb
+EBUILD notebook-6.4.1.ebuild 3237 BLAKE2B 840150c7f2f86c75b492df97c4dbd325a1693ba7279847d16aedadd1a79cd80947de345d3ed5fe95d5b5b399d886afbaddc2c61824ea718af56c3e1fa05a35ec SHA512 74033b899159821856d305629dc72c8f430f3c11608937f73ef8d5d08e4d6731150c519e1d07e16f17752420697277da8f281cfbfb114b8d4a2a10249c10ce4d
 MISC metadata.xml 524 BLAKE2B dfca744ea63418ee961bc5f106be6a01acf80af2e4179e0f3446c370a416bdae998887a55e866cd2fe5ede334653b46205f32b5db275e2ec54efefbd10455541 SHA512 a3511781a2086a80a0cc7a02842e1c71490ae1b200ac5263ace00610d37df7cf9ad866f4bfb89441514dbf26a5dfeb6559cbef9e1e6e2fba534c14feb5fcd616
diff --git a/dev-python/notebook/notebook-6.4.1.ebuild b/dev-python/notebook/notebook-6.4.1.ebuild
new file mode 100644
index 000000000000..892d3ca7cd84
--- /dev/null
+++ b/dev-python/notebook/notebook-6.4.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 xdg-utils
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~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-6.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
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# trash doesn't seem to work for us
+		notebook/services/contents/tests/test_contents_api.py::APITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::APITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
+		notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
+		notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
+		# TODO
+		notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
+	)
+
+	# selenium tests require geckodriver
+	epytest --ignore notebook/tests/selenium ${deselect[@]/#/--deselect }
+}
+
+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
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 5ba135f13c6b..90a8184983fb 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -22,5 +22,5 @@ DIST numpy-user-1.21.1.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b175800
 EBUILD numpy-1.20.2-r1.ebuild 3789 BLAKE2B 04b13cd33ea2805716faf5c2d286e3f0928eeda592c0c6217501a1adbea30e614d940732041cb4236a89966db1cebae33b437ab55a309ff6be62e81bb6be5010 SHA512 9a2bb8e998e317e540b7a0fa70979a872db8b0a99cc1e6f72d1fa0ab1c11f26551be22eff1a84b2c25e9d39934246b955ea54fc72c25b2d89badc430bf048f38
 EBUILD numpy-1.20.3-r1.ebuild 3724 BLAKE2B 3d3c2ade82decb593116388cbd00e6c688e0b308b2a4bccb122fa716e7e8826f83f0d9f2fb6edeb43578325007b97c228899be055c5ae90b2740bc5a5dcfc7c4 SHA512 496058416f50bcc39632458bac10017071df0231bb564be2b496c65f693f0bb12c6a01a50df72f70a7f98f872f8258c8030db766fbde2f89a5c8327b1a786dca
 EBUILD numpy-1.21.0.ebuild 3567 BLAKE2B 8bfccf3046fa52a171d97bfe22385688d37a383a772310833fd59ead145d8ef7e1c45567ab664f3462e99595bac7411faddba01863143d553db30017f88f1225 SHA512 77e8d721c372f06aaab330c69d21eaf699cd0b04f91a1466878f9e2e89169a14979f7ec834c906ca0905ce909215f74c0b9c77f0e08b39dbbe34d07f275a83e9
-EBUILD numpy-1.21.1.ebuild 3682 BLAKE2B 753c9e53177bae352f3aec669b07c6367a86b89c0c97e46b43ce3ddaa322f01ad141b5303c98567d8397259c6fbbd78ea953bdbd7e32b66fa2cde2430003e3e1 SHA512 9309099f1e9869cdaf8a3ebf6682075abd6d41decf123fc25e342202e8250dd55a310d220b0f48b8d71da6e8353ca21e36f996c593a9d44731ef6141e436d5fc
+EBUILD numpy-1.21.1.ebuild 3679 BLAKE2B 523d82f2a2dbdfb1cff4886dc78c41d793c5850bf283b95ad3a1a3161e4c34e96542baad5e4c489167d8078cbfd9eab9e3354d5ee87825b52ccaeff3e7ced9f5 SHA512 9e746ac832581cf1d34cdd339cd7511e9e55a96396ca242bb5635f1478d3b3628e27b6e06f820786a3e8b950de26aba20eb45c969ac52ef0dd7843badf20c2dd
 MISC metadata.xml 934 BLAKE2B 948b9a948cddc46d20d672992bf73ddb1e59ba18f470acf805c78f561249e7bce2cec1cb1affe63aad447f2f0ad627147cf05ca04ac3c321781255357de92d63 SHA512 404bc31423a1093c19dd535aa3cd5a6b925f4ef1699f9991ae19b46495c46ac4ab3b0b1995f62ea8bc5de15889b975dfcdc416360978508b837d4d5d518dfeeb
diff --git a/dev-python/numpy/numpy-1.21.1.ebuild b/dev-python/numpy/numpy-1.21.1.ebuild
index 3353915bf361..7950d9f40029 100644
--- a/dev-python/numpy/numpy-1.21.1.ebuild
+++ b/dev-python/numpy/numpy-1.21.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 3dff2404ecec..0c5cff3fcf6b 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,6 +1,8 @@
+AUX parso-0.8.2-flaky-test.patch 947 BLAKE2B b6ece3214328f3121e4de8217395ac108678a37a97bea943e900e13cf44fdbeccf70f2b3bf8dda70df6cf06feb73a55f2bd2d75236898e4cf45c8b22f46b93fb SHA512 b7c5ac93d2f44a897b8d9eb59c470c82b2013f4e3ebf35e81254294f9961e8916a6d590d61ed1d8f3841e50c47cc7902e13d1e28826869afa9168e44e85a98e0
+AUX parso-0.8.2-py310-2.patch 2145 BLAKE2B f0b403c9b9ca5370b1c2ffd52d0a22d995bff03242526a4a649cd58392380c3e38cad4b251b20580b5c22ab859f4829d8ef6ad9c5faaaae3a02b39526d3d585a SHA512 6761d95f4ae0c9a8042abc3fcb42848f323337920306974802f008614c75c7c313aa9a666dd24cfe7e01c7d01f06cbd8e2d370fbc89cc08fdd8b87bcea0aec61
 AUX parso-0.8.2-py310.patch 1128 BLAKE2B f052039f8aef2913cef406c97d55e1afdcd76e46d2a64e2e2f1fd2ac1b7571950ca816213b155602f7b974d01996876a4a7bb0b92f49161d9b29e4ec98950918 SHA512 5aaff0ca295195674006f1435863ff59eac121189c938ef44428eba929a2d76daea9fffb51feebcc75502dbdfb5df7ead18d62c4ee98cb53c35129b81c562810
 DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
 DIST parso-0.8.2.tar.gz 394419 BLAKE2B f4e86ae55140adc9bbfdd34a8044e7fdfbf9d318a6385ac5feedc07127061943c2d690581af144f158846e3bf6f82124046c7e625369a4055ab92a54f9210c49 SHA512 a90810ad89301d804d215392ed77593b015f13bc7ef8512302a8893b314a9e74c15e2aaa77157c8595a134d3481e8115f306f9628835271478837ec6f19e645f
-EBUILD parso-0.7.1-r1.ebuild 866 BLAKE2B 730cdde56ea2935fd3ed22322a423d7fd4025b117ab3775b7f64517ad3735b4bf2eac7ea3de2aafbfdd41139e14b4301d13295e3d6f5313161a465bede10cd65 SHA512 725052f75029489e6eb9d9ee179287fd6b258d0f0f1baa414f76a4a9d5f322283f7a921db11d60bb64525caf76c82563ca8f61790cf5922018b4b1729065a74d
-EBUILD parso-0.8.2.ebuild 911 BLAKE2B 50944234ba8b5a49412bf541d88b342c11c933a45b4246a78e296371016e2153156a513c241f46ee2a5cc928bc7a30e28cdb26c82b4a6cd963a03029b9a5a2d1 SHA512 d37c6834563a2cc62cd6aee457fa943a6678ef416a9de66c8edaae663acf63e76a3b3fba0c35c348199a4c74b07f134a0af7dac31e52a562a7e79eb7bbcf749d
+EBUILD parso-0.7.1-r1.ebuild 872 BLAKE2B ea9cc5082628bf3fa685faea2c6f641ec480980639d9a5a7549f49d0f7afc7ded936bad02086c62b7a6f7e9ef0083c58fa2b37610f206d82647de3956787fcb3 SHA512 3f4a9d3aa0048c8da17c22880b50f9482fb5309ca10828565c6d6a9dada5190edb151d5ccc0999263e24a2afffc94a069a6b08f08e1318c7ade868315a50d6cb
+EBUILD parso-0.8.2.ebuild 922 BLAKE2B 30e7445875016d94268188ecb5f654c8daac9a473bf218190317c8cd15b1f45654ce94e3cfd5e2360b0de5c6ac0a02f6eb4cb786749f45c2d1e83c0a2a38031f SHA512 08a707da0f0e3a69f0c84cf8391f025f911c9a560a2da38d283f721e8053bc8289741837bef1c2e3408f6c6e2d5a7b4c3725608956fc9cdc6ac9595f5c19ddf5
 MISC metadata.xml 402 BLAKE2B 3dbbdbbd15ec82aa4f38d92f52f4342a14b209edff3aa09b5dc1866784533e21f8c5d75146e3b9b535c01bb4dd36cd259abb2deb959382866242d99fb5d8fad3 SHA512 61cca7520333f595582f3e52602afa09d685d8072a211c4b8a2930fccbd98645c8c69ef7f687a25c05e2e2dc7ddda2fee16b7666cc2854b0b5ac6e23a95bac42
diff --git a/dev-python/parso/files/parso-0.8.2-flaky-test.patch b/dev-python/parso/files/parso-0.8.2-flaky-test.patch
new file mode 100644
index 000000000000..729ec409c829
--- /dev/null
+++ b/dev-python/parso/files/parso-0.8.2-flaky-test.patch
@@ -0,0 +1,23 @@
+From 60fed7b9f80cbb3d9cb7a9e42ad8c0f3c513801d Mon Sep 17 00:00:00 2001
+From: Saiyang Gou <gousaiyang@163.com>
+Date: Sat, 29 May 2021 18:17:24 -0700
+Subject: [PATCH] Fix flaky test_cache_last_used_update again (#189)
+
+This is a follow up for #177. On Windows, `assert node_cache_item.last_used < now` may fail as the two time values can be equal.
+---
+ test/test_cache.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_cache.py b/test/test_cache.py
+index f4291c2..5e633fc 100644
+--- a/test/test_cache.py
++++ b/test/test_cache.py
+@@ -137,7 +137,7 @@ def test_cache_last_used_update(diff_cache, use_file_io):
+     parse('somecode', cache=True, path=p)
+     node_cache_item = next(iter(parser_cache.values()))[p]
+     now = time.time()
+-    assert node_cache_item.last_used < now
++    assert node_cache_item.last_used <= now
+ 
+     if use_file_io:
+         f = _FixedTimeFileIO(p, 'code', node_cache_item.last_used - 10)
diff --git a/dev-python/parso/files/parso-0.8.2-py310-2.patch b/dev-python/parso/files/parso-0.8.2-py310-2.patch
new file mode 100644
index 000000000000..7c6b1ad78286
--- /dev/null
+++ b/dev-python/parso/files/parso-0.8.2-py310-2.patch
@@ -0,0 +1,57 @@
+From dc41958947770849c8b3b4d344db434e2c8548cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 5 Aug 2021 09:09:28 +0200
+Subject: [PATCH] Update expected exception line numbers for Python 3.10.0rc1
+
+It seems that upstream has fixed line numbers in some of the expections
+in Python 3.10.0rc1, so update the tests accordingly.  This means that
+test_non_async_in_async() gets the correct line again,
+and test_default_except_error_postition() no longer suffers from
+the apparent off-by-one problem.
+
+This doesn't fix tests entirely with Python 3.10 but it's a step
+forward.
+---
+ test/test_python_errors.py | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/test/test_python_errors.py b/test/test_python_errors.py
+index cda9bd2..e847ebb 100644
+--- a/test/test_python_errors.py
++++ b/test/test_python_errors.py
+@@ -57,10 +57,10 @@ def test_non_async_in_async():
+         error, = errors
+         actual = error.message
+     assert actual in wanted
+-    if sys.version_info[:2] < (3, 8):
++    if sys.version_info[:2] not in ((3, 8), (3,9)):
+         assert line_nr == error.start_pos[0]
+     else:
+-        assert line_nr == 0  # For whatever reason this is zero in Python 3.8+
++        assert line_nr == 0  # For whatever reason this is zero in Python 3.8/3.9
+ 
+ 
+ @pytest.mark.parametrize(
+@@ -140,13 +140,16 @@ def _get_actual_exception(code):
+ 
+ 
+ def test_default_except_error_postition():
+-    # For this error the position seemed to be one line off, but that doesn't
+-    # really matter.
++    # For this error the position seemed to be one line off in Python < 3.10,
++    # but that doesn't really matter.
+     code = 'try: pass\nexcept: pass\nexcept X: pass'
+     wanted, line_nr = _get_actual_exception(code)
+     error, = _get_error_list(code)
+     assert error.message in wanted
+-    assert line_nr != error.start_pos[0]
++    if sys.version_info[:2] >= (3, 10):
++        assert line_nr == error.start_pos[0]
++    else:
++        assert line_nr != error.start_pos[0]
+     # I think this is the better position.
+     assert error.start_pos[0] == 2
+ 
+-- 
+2.32.0
+
diff --git a/dev-python/parso/parso-0.7.1-r1.ebuild b/dev-python/parso/parso-0.7.1-r1.ebuild
index d05ee8925e65..395f094f2437 100644
--- a/dev-python/parso/parso-0.7.1-r1.ebuild
+++ b/dev-python/parso/parso-0.7.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/parso/parso-0.8.2.ebuild b/dev-python/parso/parso-0.8.2.ebuild
index 2aa420a8cb86..42be4262b424 100644
--- a/dev-python/parso/parso-0.8.2.ebuild
+++ b/dev-python/parso/parso-0.8.2.ebuild
@@ -13,13 +13,15 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/${P}-py310.patch
+	"${FILESDIR}"/${P}-py310-2.patch
+	"${FILESDIR}"/${P}-flaky-test.patch
 )
 
 python_test() {
@@ -27,7 +29,6 @@ python_test() {
 	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
 		# py3.10 changed exception messages
 		test/test_python_errors.py::test_python_exception_matches
-		test/test_python_errors.py::test_default_except_error_postition
 	)
 	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/pathtools/Manifest b/dev-python/pathtools/Manifest
index adfce7c33569..8a0fe48eddf5 100644
--- a/dev-python/pathtools/Manifest
+++ b/dev-python/pathtools/Manifest
@@ -1,3 +1,3 @@
 DIST pathtools-0.1.2.tar.gz 11006 BLAKE2B ad257edd9a62477a07343ecd6786c24ad2472da8844e3358980973c9daee9c52f3317976b2971f9afe33bfcd0dba1c1497230b105fd364a45c0d138abec41894 SHA512 e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7
-EBUILD pathtools-0.1.2-r3.ebuild 396 BLAKE2B 64d405d3ac3772162bb51fc4b7ce82a59df9fbe3db989b07dfe4d963eb42f8479224d7dd2eb684130f29c337467543a89b7221375e446bf94341626dcae76041 SHA512 16233d54304794945942e2434eb4ef16d179ca19c9abcc216b100d229aa0ce9cf076bd01f2372ae5c458532dbe9bccfb7c90d16423aa9700cdaa894fafb152be
-MISC metadata.xml 312 BLAKE2B 655db0f4e05f6f22057f5b40c38a0790aa4878190ba1f2eddd703c2a13a1d8010282517cc827bdf2f48597024c9069ddff7be23a4f914899d5c432115d150c57 SHA512 f1187bfa80d1a0e64b04e3d474d8d805fa73f7c23ad412fdde4a51f347268c764d1f808d9c9b1f191c661e777dcfe6aaf0966bf13ce7ea9e8c02f6a8e5249851
+EBUILD pathtools-0.1.2-r3.ebuild 440 BLAKE2B caed609298803d0bdfb4e3ab1a286fbef2d198510720168b41f94d8aa1f92260c9ee4074e83f30f6e9831dd5a175fad29e34ac87ae86bf7578e5fbcc0a3c898a SHA512 a4034860c8afc2d5a94fe690f7cb3bdbcd27a915160b4164edf34204e8f58c8aa4e51154d8c58f9c1ea0180f42e088a4db3df106319dbedeb5a0b3cbad100c5a
+MISC metadata.xml 374 BLAKE2B 96ee367dbe63a299948d92324e124f30e9a9b0524c7d12e7905f639107d83a3ea438897307cd97623809a05926d3a7d904e9a420a14e82f29e9e23e408c2c23b SHA512 14d8a6343d250ae0c0f58022eafef55aab26972166c80e0e564c8fd110d6b14e1a7d0f5422d0a3ac1d4333ebbfa160be8438f4df435aa1e59ab2b9bac1afd491
diff --git a/dev-python/pathtools/metadata.xml b/dev-python/pathtools/metadata.xml
index 599f44315a3e..42abc819ab19 100644
--- a/dev-python/pathtools/metadata.xml
+++ b/dev-python/pathtools/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pathtools</remote-id>
+		<remote-id type="github">gorakhargosh/pathtools</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
index cd695cccc74b..b41eb1d3fb2c 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r3.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=7
 
-PYTHON_COMPAT=( python3_{7..9})
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Pattern matching and various utilities for file systems paths"
-HOMEPAGE="https://pypi.org/project/pathtools/"
+HOMEPAGE="https://pypi.org/project/pathtools/ https://github.com/gorakhargosh/pathtools"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index f9f877614710..e86c04d2d897 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,4 +1,4 @@
 AUX patsy-0.5.1-py310.patch 1159 BLAKE2B 6b734bf60d74f071cae590658b613c36fef694d99362fa30f4e6651a14c4f8063c8a67f93e756447712146d89b8f3371a8d08604a40edfb29f31c60b1e7a24b8 SHA512 843cac6b873114de82f784d3bd1ab4d317c73d4ae125088d303a976d15ca38eb6a0e2598e4758eb06a984c3c3820814b0b66380b3f7138eceef0d4730ca2fb8c
 DIST patsy-0.5.1.tar.gz 397623 BLAKE2B b8861e8c8e223db5df616c378d5b1ce475a1b337d049723c1a4b01432d9e1569c4b6537dc467fbc1ba83dfc7cd999ad188008e387c446f2133f872393c9eb960 SHA512 aeb56411e68713ec75c0b5344890939f721c460d3c7643b9fd57d7c928421d21408b0f2963348edf27a025842989dbae6fd5cfccd3f9d9497d60a1dffe8d7bdc
-EBUILD patsy-0.5.1.ebuild 636 BLAKE2B 6a4494a742b9c9b257fd3b1c5f56b75e94a1bd320dbb4fa9417a3a71a66b514834088e3260e8f82dec117a537f9f289d8b5df264dabf18e4304ba8fc74eb3a3c SHA512 24cc4bc05a433866385b7d6e0cb6834b2c4b0d8ddde0a0046ee4ff18f2c0b6dca86e5adf31fdb4ee0ce40ecce1b5e84d0998b243a982b6910c4e84093bff7cc0
+EBUILD patsy-0.5.1.ebuild 643 BLAKE2B f8fed9e424a614bd15df8460a69e92f7a1a1fa03f1fa2dbf4efc23ea89f1d92199325587c1d9ba64139521293f5e821ddf9bd78578e2e953a1fe722701e14d91 SHA512 6780bdb5c7e742e4f4de039d11057eba6534d8eab9b43d38b7c7d6a4536281fe79e744ae9b4999fda997b48d7b78479c6403f6c467290bea544c33c218a80997
 MISC metadata.xml 568 BLAKE2B 198b70af00599da8c516753e5ec88fb4353a966a279e4e40db5b57a7bab57f0ec360ac70ebe4dc14b194b147520b0a8d6d35d2e73003c9c70bbbcc3c830b91aa SHA512 57957dc18e93d9bc8d53d72bf8c9e601856ffb1511943034ff30aa7d93761f8b986e67daadf8dbcd57ef7714ebf3dda13ccd345df294809954c942cb9bdd1310
diff --git a/dev-python/patsy/patsy-0.5.1.ebuild b/dev-python/patsy/patsy-0.5.1.ebuild
index 78b6a5d4cd69..3b4305a33058 100644
--- a/dev-python/patsy/patsy-0.5.1.ebuild
+++ b/dev-python/patsy/patsy-0.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index e317db6290ac..5975a8e38d96 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,5 +1,7 @@
+AUX pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 3064 BLAKE2B a292df872da96e643545dc3c0b8c27d40466f6b4fb76d0c19316021e103ab6ee3b4e18861f286fee96a004e4f8c1fb3889bd7285f790d31b7f81e49579ab13f1 SHA512 4301b2302648dea77809c3afda896f0f38e4fcde503a9810f8c1706e35b553bee8fc3bc803ff958b0afb0cde0b764854647416efadccab3541f284f3efde15ab
 DIST pipenv-2020.11.15.tar.gz 11603983 BLAKE2B 552c35c942f9ece0f52419b6090b87c7dce0c49dd9dc12f8c5b3eb311058fc770ec9e2b141e960d357064c66c6de7cd0892d2dd19868e5cdaee0f302f98fb0ff SHA512 d312059b3fefc97d4cd79bf2b75d6bde1d117d92c0a299c30181a60ebea662a6c3dff0ca7b92c610dd8eb0c873509dd23c9a891761d0d47d0bba2cab738c830d
 DIST pipenv-2021.5.29.tar.gz 11607230 BLAKE2B 8eef8e79fbdfaf85a949437d06d9f8b48f7eaa6e4769f6d4ed90b01c0ebf70c282fc90581cce5ffcab0aeb6bc9ad770a8b4425f355a06e0fc4cd56fb221386e2 SHA512 4fa018c13d4babe856bf5671cf5d18a95f4af4b6d4fc64c4919825fe04004ed3d8979ca335b851c6e24dad081475f6fb5b925eeff58c6fb5cffc450b967ed1cd
 EBUILD pipenv-2020.11.15.ebuild 1428 BLAKE2B 154c51236e9875df17d635f17093473227102e830fcf639c0b92577cf36f973525b9251841ea02a3bbafade091673aeefd3a964ba26372a1c95b1ae2cf79c06f SHA512 e71bef8c4f72f4f6e2d35c5d2c59d7a8eed220d5718f9e31d94a8e3608b6e55dbcb42af2d63c5375cdcafba22ba55f7cfc6cf51e83820a7e71c7dda1f216ba7a
+EBUILD pipenv-2021.5.29-r1.ebuild 1427 BLAKE2B 62fc045ec96f38ba7adee831a3ea108b36b1f96868703aa04d50bdb88f15e91c8d835195d652e74b102f22919ef6b4f2af7f39197d74d3ac02b435002774f3e9 SHA512 3b45d3c1bd613d3212df52638cf4b20c23c306f14dac1f9e571dbed26dd34173fd3339e0c6056cc62e860abae4d48c98ad610c9df0409c92207234fb31a33eab
 EBUILD pipenv-2021.5.29.ebuild 1428 BLAKE2B 154c51236e9875df17d635f17093473227102e830fcf639c0b92577cf36f973525b9251841ea02a3bbafade091673aeefd3a964ba26372a1c95b1ae2cf79c06f SHA512 e71bef8c4f72f4f6e2d35c5d2c59d7a8eed220d5718f9e31d94a8e3608b6e55dbcb42af2d63c5375cdcafba22ba55f7cfc6cf51e83820a7e71c7dda1f216ba7a
 MISC metadata.xml 642 BLAKE2B a652239b8d21d5c30d7893bb530bb89af62e0642824d4954bdd41719d1f1b8afee5e8ca4cdc7859995adca8fe0ddbca916e4876ed10104fa9e69f76147227f71 SHA512 f9d9c4433c8bdbe9bdb4c62f8da158d59afba2052a899eb14c245c1109cf82f690e513581aa6028b4ceebc836a32df5b8961672fed833a08b8ef2ac8a442a860
diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
new file mode 100644
index 000000000000..3437c2a2f33f
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
@@ -0,0 +1,95 @@
+diff --git a/pipenv/installers.py b/pipenv/installers.py
+index 1e81047d..ccfd639c 100644
+--- a/pipenv/installers.py
++++ b/pipenv/installers.py
+@@ -6,8 +6,11 @@ from abc import ABCMeta, abstractmethod
+ 
+ 
+ from .environments import PIPENV_INSTALL_TIMEOUT
+-from .vendor import attr, delegator
+ from .utils import find_windows_executable
++# future version of pipenv drops this
++# hence, this stays here for a while
++from .vendor import delegator
++import attr
+ 
+ 
+ @attr.s
+diff --git a/pipenv/vendor/passa/models/projects.py b/pipenv/vendor/passa/models/projects.py
+index c7807c05..f6e037d6 100644
+--- a/pipenv/vendor/passa/models/projects.py
++++ b/pipenv/vendor/passa/models/projects.py
+@@ -6,7 +6,7 @@ import collections
+ import io
+ import os
+ 
+-from pipenv.vendor import attr
++import attr
+ import packaging.markers
+ import packaging.utils
+ import plette
+diff --git a/pipenv/vendor/pythonfinder/models/mixins.py b/pipenv/vendor/pythonfinder/models/mixins.py
+index aeba0443..76327115 100644
+--- a/pipenv/vendor/pythonfinder/models/mixins.py
++++ b/pipenv/vendor/pythonfinder/models/mixins.py
+@@ -5,7 +5,7 @@ import abc
+ import operator
+ from collections import defaultdict
+ 
+-from pipenv.vendor import attr
++import attr
+ import six
+ 
+ from ..compat import fs_str
+diff --git a/pipenv/vendor/pythonfinder/models/path.py b/pipenv/vendor/pythonfinder/models/path.py
+index e8c13429..7a197181 100644
+--- a/pipenv/vendor/pythonfinder/models/path.py
++++ b/pipenv/vendor/pythonfinder/models/path.py
+@@ -7,7 +7,7 @@ import sys
+ from collections import defaultdict
+ from itertools import chain
+ 
+-from pipenv.vendor import attr
++import attr
+ import six
+ from cached_property import cached_property
+ from ..compat import Path, fs_str
+diff --git a/pipenv/vendor/pythonfinder/models/python.py b/pipenv/vendor/pythonfinder/models/python.py
+index 4f7e5563..d001a1e5 100644
+--- a/pipenv/vendor/pythonfinder/models/python.py
++++ b/pipenv/vendor/pythonfinder/models/python.py
+@@ -7,7 +7,7 @@ import platform
+ import sys
+ from collections import defaultdict
+ 
+-from pipenv.vendor import attr
++import attr
+ import six
+ from packaging.version import Version
+ 
+diff --git a/pipenv/vendor/pythonfinder/models/windows.py b/pipenv/vendor/pythonfinder/models/windows.py
+index c69b9484..fb36a272 100644
+--- a/pipenv/vendor/pythonfinder/models/windows.py
++++ b/pipenv/vendor/pythonfinder/models/windows.py
+@@ -4,7 +4,7 @@ from __future__ import absolute_import, print_function
+ import operator
+ from collections import defaultdict
+ 
+-from pipenv.vendor import attr
++import attr
+ 
+ from ..environment import MYPY_RUNNING
+ from ..exceptions import InvalidPythonVersion
+diff --git a/pipenv/vendor/pythonfinder/utils.py b/pipenv/vendor/pythonfinder/utils.py
+index bcea7f3e..41d2d59a 100644
+--- a/pipenv/vendor/pythonfinder/utils.py
++++ b/pipenv/vendor/pythonfinder/utils.py
+@@ -10,7 +10,7 @@ from collections import OrderedDict
+ from fnmatch import fnmatch
+ from threading import Timer
+ 
+-from pipenv.vendor import attr
++import attr
+ import six
+ from packaging.version import LegacyVersion, Version
+ 
diff --git a/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
new file mode 100644
index 000000000000..403619ae6073
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES="${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-attr-vendor-import.patch"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# remove vendored version of PyYAML that is backported to Python2
+	rm -vR "${S}/${PN}/patched/yaml2/" || die
+	# remove vendored versions
+	# see https://bugs.gentoo.org/717666
+	rm -vR "${S}/${PN}/vendor/attr/" || die
+	rm -vR "${S}/${PN}/vendor/jinja2/" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die
+}
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 49072a747278..ffff77361f69 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,3 +1,3 @@
 DIST platformdirs-2.0.2.gh.tar.gz 11365 BLAKE2B 53257c69f26dde3a0031c991cd6b5c72b361084342617f5c0590007a11a1d7d6e3c925dd6a8d73d3553cf1cc1d2b9fdf74fd0553d6b8891ef6b21d64bc0e256f SHA512 7cdfbcb4e37f2b4b551f3d685a40780518f9ba9c333cef0664965abaca320a10f6e944f967c0b0ba2d00e80df04b0e1e03426e6d1291e28d8f64128f50ebc1fc
-EBUILD platformdirs-2.0.2.ebuild 620 BLAKE2B 835319eb3a94ab6adc765332197cb95ce33af57488016606dccbacc4b196c65200ddf4729e7759fdfd42aa0fa9f1a2719a2bd0df69dc58cc69dac5ff9d48ed5a SHA512 14af1e4e2f56da676be18c7289ad8ab39752ab610ff3d233366dcee5aa0c9452a01cb020c25c14ab6a4f0c95acc1a275bdc229f75556d8bbbb196440ffef94d3
+EBUILD platformdirs-2.0.2.ebuild 651 BLAKE2B 41b314b1b210128eaa6bb06aef2a26f1fc41cc179155a6c0857e5fb25ba6f4508059d5949fdce52e4ad21f33a4f70bc121da5ae5d6357df43cba20aacba7714a SHA512 41c14115ed346e8d5d5ca1661a616a4d12bce35bc7b292f4de7cc0103b9efef08d7620eafabacaa68db3fe4bcc43833407fefb5c6188f5f2f5bc77473886d338
 MISC metadata.xml 358 BLAKE2B 59aae3db7ff7375600e504797a7fe4dbd4c0119d5b3fa31ef523854d8a8cd54ee60131f9bac4f608dbb5740a1e9dcf27d47cca75c7c83de4850600eb02aae2fd SHA512 09d5618647fdc5104705ac94e3af0a3bac586e27105f95d14c827b10265355a53deaa66483c12567596c2c4e8285c1cc0520f5475a1404aca3b1d677792d7654
diff --git a/dev-python/platformdirs/platformdirs-2.0.2.ebuild b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
index 3aa5e9a22459..a5e2a8f53d42 100644
--- a/dev-python/platformdirs/platformdirs-2.0.2.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="
 	test? ( dev-python/appdirs[${PYTHON_USEDEP}] )"
diff --git a/dev-python/plyvel/Manifest b/dev-python/plyvel/Manifest
index 913f12ca6b8b..4a3186794762 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
+EBUILD plyvel-1.3.0.ebuild 713 BLAKE2B 397c1c4e9b762253a7ac4675af405a6689c8e674f47b875fd60dd8ef1bb388ea811a2a2278f63fcfb79bb507f2a231d79ecaea519b68d0489f6a9d366f809d66 SHA512 01b93baaa9d813babfae8bac99b087c15762309d0b6475800fe3a3b0a4a5946b11c6ad22051700ed329622f09af1cef09baa90d2407fd32f895eec193505340a
 MISC metadata.xml 432 BLAKE2B 104f398c338d136f67c24b43c90896b50fa4ad1a7ff2c7b4aa395aab0d16ccb2686a97f15e6aa090fbfa52ed60fbf4f8bb062439367bce20c36e91af1a3de68a SHA512 850af8f1bbef92f2b496037854be6f2b0c92d1ab1d3314f8bce773b89427d80b89d9121aff4294c1cf1903c2caaa24aeb85246c77434420871ed377603a8259f
diff --git a/dev-python/plyvel/plyvel-1.3.0.ebuild b/dev-python/plyvel/plyvel-1.3.0.ebuild
index ae20d1026cb1..25f0cbdb9e9d 100644
--- a/dev-python/plyvel/plyvel-1.3.0.ebuild
+++ b/dev-python/plyvel/plyvel-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index a7fece769d17..c4431d874475 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,3 +1,3 @@
 DIST pocketlint-0.21.tar.gz 23524 BLAKE2B b5ec01cba8b73356f08720149125abe1427561b499b53409e5eb41dc2e5c6dc894b51fc8d7655eb94a6b7ec43a3cd94067d170e2a7f985e251497f253c57f6a3 SHA512 af5f3d9ebd67102a3c2b793ff550c6626ead48da7043ac86d4129f6746532fb6c8ce34540b255e649c936c5d8d7dadc116ddc03f86b2a85311327eb10af14ad8
-EBUILD pocketlint-0.21.ebuild 479 BLAKE2B 2616aac24d0efd34edc0de7cc8dd0eeb286934674efb43af5068c75b6506621a821b63d930414ad41d6293a2cfcd93a49d2178f1fd8051e81a67093d6419a7a6 SHA512 69db41a584c88296704a4a3b7a9b1097194e89edbabaf0902c7f7fe9a93a8aee461d57bd9c6efa91da290b5ea2b0b543596f27705c2610f0477f75c41d340c98
+EBUILD pocketlint-0.21.ebuild 486 BLAKE2B 14b03199cae1f854f143cd97bd9454d7c482040e8bc40b1e4eb957c9411f94a8ccd607165c745be95981919f910bb6b77e8c1d08352161b39239eb97e5d98ff1 SHA512 149c1bc6d1492123dcf1840f73226afd06f441f28e082f9841ba2c5882af73143818db33166a5fb14094c8ff7f59311b6698e503d22a4646be8470e8d5ac4812
 MISC metadata.xml 386 BLAKE2B 66a4c2f274af0b1f76bcffd9cf7cc3d67cebe52f79e9e08dde88122f0912005941e4ec45aa20c4cef06775c9bc59b8342067af2aefcb1315b340a8682830270a SHA512 4e7958fb1508b4b5d9462b3ecf3a24efe298aa1af63e9d6746f82cd56410a8607e28e0157ffffcca0ec25bb66257e9072529d4760f2d461444496530848b3775
diff --git a/dev-python/pocketlint/pocketlint-0.21.ebuild b/dev-python/pocketlint/pocketlint-0.21.ebuild
index d10e4c4623b7..758d87d84a5a 100644
--- a/dev-python/pocketlint/pocketlint-0.21.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.21.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index 4b11c1aa0099..726d122e98b0 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -1,4 +1,4 @@
 AUX polib-1.0.7-BE-test.patch 545 BLAKE2B 800372796d19d98f47dff73ed593dcbe8a60d55b654258ea5063b702fc3761906754096bc2f4703621378a56ef9589ff5a4c1d7aa6bcef368e293bad9e8b869f SHA512 0b62dadaa7983657901463770a5e7abc41361094c7dba41618881d7328378b989c10b3458c667f15134ad92d0bfebd785f475e1ba040ea11da70352bd8a2cc2c
 DIST polib-1.1.1.tar.gz 154644 BLAKE2B 3dfbaf2fa73d286a60a1fff3e50d8703cf62917b7da0c8b783aaec49b8dcfb927b03b0fe0b411b5f90c2ac89298ea027beb2f0d00ad582a65628d8351397ddab SHA512 38de5fbdbc9ef879a4d55b9fe4f86a3aca3fb90dbb671745bd2b126be443598b8b18fe53afd116c3a4d3efc7a42b5ed05d75569bb5b2ef0bd2ced6e13eda95ad
-EBUILD polib-1.1.1.ebuild 643 BLAKE2B df947685c5296f310eb8869a34e6e89ad2419e29ed810ea1bf3f09a322ece8af76cb2b688e17a06decf218fb476679c6f692c5d0dbb8306f92bc3930c6178d61 SHA512 e87cd22868495ef9302a09b30b0ac87685b947bd8a3f3282ce4098652c1d76d215f7fe6e1d2b334976134a7e049ba3757a4ed9bdfce33a4edeee4502f2e61ff2
+EBUILD polib-1.1.1.ebuild 650 BLAKE2B 2047aea0a6a6481f7b57114865563f95f1fe76ad5799f268d62cf2ee978d09103b9634c52dcd9cad960b2a945ff541768517f179df7af5137c96bced9311bf71 SHA512 089576068a24e92618c437183e8bd60b01f2ea3f0e4037ce1239e47f1bf2790b80dba55a70a80834061c37c4c70d189fb4e2275fecf9f4935a96eab791fb09a5
 MISC metadata.xml 386 BLAKE2B e3f5998d90e39a98ca9e48ad9b3fee30d6e32e143e684a439ebd639aec2aba401a4b858ba27ae33526531c6650f2475c3ef980c067e0a0922138410d46c41425 SHA512 717b7834a63a57242bf1a804dc763160786880beb15cdecafd2a2b393d548cd6445a8ff86a38ef6ce5003468fbd473696d39087683dd04495a4b32e74a835fbe
diff --git a/dev-python/polib/polib-1.1.1.ebuild b/dev-python/polib/polib-1.1.1.ebuild
index 3867ed7a6b9c..166a15e19c9d 100644
--- a/dev-python/polib/polib-1.1.1.ebuild
+++ b/dev-python/polib/polib-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_sphinx docs
 
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index f55c4a4336ec..cf24554e52ae 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -2,5 +2,5 @@ AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a3187
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
 DIST priority-2.0.0.tar.gz 24792 BLAKE2B c230f74aba3153edafba4bf85965a726ac3d3f5e2293d7c496b65fda260722cc44e4582666eee9d715e0d0686695434f8e0cbbd089c105bb45b777bf6eb4d72c SHA512 f90648a3ff1ee4131f30e99ecd8c36110abf484733f507edefcede8fdcb9ec3a618b9278e85724855709f41facee438061e4c5cae201b6e916c22f4a451db575
 EBUILD priority-1.3.0.ebuild 699 BLAKE2B 1c7cceec979ef8c857192b266b7470a5f60eede6da8cc232f6243e21ffb8387a3628f7eaa28fda944239458a59eccc92c8b4bfd9e3edf32f41717a353f7ac423 SHA512 d124b956e3f493146ceaab4b5c80ebaf83d19e94a24b3577bd90cb31fcdbc0e4519f579d8002e5eba21d48326272380f88f3e457bd5a1883cd395960b0f08906
-EBUILD priority-2.0.0.ebuild 641 BLAKE2B f4ea289acc3991e4d3bc8ce6d536da4ffdcdc678f8c56fea1d723c4c6c44c465c3c6c3324131bd74d4e05a780f17f4475e955ae6b829f301c05ce3453ab10e7e SHA512 ac6bb364b934773ccdcfc1f9a8a94bfbe8c1c126cc96efa7cb2042cfa2e6d6dafc5ad651a85f8d4d83e7767a39239cb597706c9008e25a5a6f0631d60fd551b3
+EBUILD priority-2.0.0.ebuild 638 BLAKE2B 69acba21e257270ae15b75d3ed0098282bee0b219a5a314c3295404bc3fd9db6cfce72647727224c8688dd4ad4028c45563be9a50d943320c8be13bf78ea81b3 SHA512 c09ce6829cc1cffd8a578cb1458dec177b44757c6546f8a80db68c4fecaad86ee52b1c175d975188dcf32e15f8b0917df1162331139f11c139be7204f0aa520d
 MISC metadata.xml 839 BLAKE2B 2a922ade07ccabbde2eaaeaac310e1c89206f7a6194ea14cd83f53182270edfd2cca4b1d13072d8a4c81c96563ba3b81251626eb777ced188bc9a22a37dcbffb SHA512 fbd62fe6b97e29566a18a29d155b8b08124d5c1561a21ad7aef7daac1a68b75b48b82d3edc612a27888da0d24ecde73b808cb90dfb7fe78ee97adc5fb507b003
diff --git a/dev-python/priority/priority-2.0.0.ebuild b/dev-python/priority/priority-2.0.0.ebuild
index 21fab37fbf14..775bdafdbea6 100644
--- a/dev-python/priority/priority-2.0.0.ebuild
+++ b/dev-python/priority/priority-2.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index d2eeaef39405..a88d910db457 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,7 +1,3 @@
-DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
 DIST psycopg2-2.9.1.tar.gz 379972 BLAKE2B 89a05f0f3e2f426848641bdf07bee1846a5512dd248d7e4eb4723dbc4f7775b00d142217a5cc59e126eeae8e672173b63de3b1152e3bf14dfaccf5fe7149c88d SHA512 478eaeaad98e4521424a0a48d5f0fdba934bb3b682ba111cc37b833cd3c953ad5fbe2a2071d3a9b95c6a447e95de88887ceda5143b63a08703c388f96dd9b4ad
-DIST psycopg2-2.9.tar.gz 379805 BLAKE2B 4e34b9dc28d0922ae9e9f75dd734b961915a032eba0c4b5ea9c4fe82bff4d5d230b37b0efdb25b8423177fdd7e98e69d0ed6ae0eccd731dca212845966b9c0ac SHA512 9787d0d3bb163815a452139bc3fbde93c767431b3e31c77dd534b6a476d1c09a51e2503b0420ac7a3753ef7fa64c13e2643f4bf4aeaeb60f15ea4eefc3538bfa
-EBUILD psycopg-2.8.6-r1.ebuild 1313 BLAKE2B dbdf3b3a72aa22bdc1d55c9a6b8f67e706a9d13d9e43c0c09bae8a735eb999b19f262d104aaa9196c6189ed5ecebcafbce49f6499e9632d7f56b4d73c48453f3 SHA512 db57102c60158abf196eef91391c3a37a02a92fc6ffb79c57aaeaafa1b771938a1a3b1d048fe6130e9fab326b9a7d46de605090fdca09025baae051bcbd8f7cd
-EBUILD psycopg-2.9.1.ebuild 1314 BLAKE2B bfb0b2322085761cc582386671dbe273daddb7173bd142655dbbdd4ed395b02771ea5e367dce2513f9c32622f2baa7409ef3b5b8898ae1d9b68937301279f099 SHA512 972033aa2d972de28305ee1560f841bd80ca0890f2cb2c823acf91d60148c2d7abd01ac711294835b2efb09631ded33058179f501cd89b49a71d3c320e8d328a
-EBUILD psycopg-2.9.ebuild 1320 BLAKE2B 979571fb982c3f10bc2e372ca057f58dd5853c548b5f0c6f323fc21130bd28a0f63efa73185401b104ef7c7ecab9a02d6b1031cdb21a94d6efa6e77fc3e7b358 SHA512 80df76f557598a869ae34a7f917863de7c93ce1a66dc4202fa76eddf360360019f45e98cdd5e7e7b3029201d41602f5bb8f502c4644825bf5b2f87847e419e92
+EBUILD psycopg-2.9.1.ebuild 1313 BLAKE2B c2bce21b2419eada56725d5c0aa64a6e9de12e1bc917818ccda7e0f8dc908bcc4339d449cb3dd97918be299734f113dfa4167fd9ad934fd8cdc102a8e74adf3e SHA512 aa2303648975b85fc26f388997fbad3111c20a2c3c92ce0ff5aeaec4bba080b3018baf7bf3b2ce7bbbe004a2d884d4e44e966414797ab88bfddb598998a5b499
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
deleted file mode 100644
index f14410ac8a4d..000000000000
--- a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-8.1:*"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )"
-
-python_prepare_all() {
-	if use debug; then
-		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" psycopg2_test || die
-
-	local -x PSYCOPG2_TESTDB_HOST="${T}"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	"${EPYTHON}" -c "
-import tests
-tests.unittest.main(defaultTest='tests.test_suite')
-" --verbose || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/psycopg/psycopg-2.9.1.ebuild b/dev-python/psycopg/psycopg-2.9.1.ebuild
index dd341bac2755..f8f15754549d 100644
--- a/dev-python/psycopg/psycopg-2.9.1.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psycopg/psycopg-2.9.ebuild b/dev-python/psycopg/psycopg-2.9.ebuild
deleted file mode 100644
index 7a7e34f73507..000000000000
--- a/dev-python/psycopg/psycopg-2.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-8.1:*"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )"
-
-python_prepare_all() {
-	if use debug; then
-		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" psycopg2_test || die
-
-	local -x PSYCOPG2_TESTDB_HOST="${T}"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	"${EPYTHON}" -c "
-import tests
-tests.unittest.main(defaultTest='tests.test_suite')
-" --verbose || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index bb47c1e5980c..625b6f8e2fd4 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,7 +1,9 @@
 DIST pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b8931ec669a16efcad5d66ecb265744155e9941b2d618391a36bff1d8c1c2d74a7e0b41de50b26eae689215d4585542fbd4282cc1 SHA512 8730efec82eef8dc09a58ca3e3b28fca45880cef85d32aa5524a8fe64e23d5f6dff4ca1b48b3034a287199bd56f4db4d6806c5358bef66fde84ed0fbf80ec264
 DIST pybind11-2.6.2.tar.gz 647954 BLAKE2B e336d626d314538123a121d48998b15d9d16b80a6a513e85b4ef2b3179f73732ef23b85ab91d815f15c31f7e2c5091192e90b9ff8e727725882963a895367612 SHA512 1eb346ff6b8f827053265340925e2c8038b1e2a89c352fc09f15ebe86128e7ba1f48c4368b193941f034b30bee7f72a94343e05d4841fdbbd0e4d91ed3d32025
 DIST pybind11-2.7.0.tar.gz 666200 BLAKE2B 4f78493ecbea5068dd9ab6771c9b33859baf3e14a82a6a3b361a11620ce6495763f94acca0c0a9512fa92343fa2ff91fa3e2ff7f30731bdda823b2b3fc139302 SHA512 529596c8762f463868f942ca9c4d3e4ed141bc09c734defeeace2b0250234c3359ef1f231997389fbffca849e01ba1feb8d7edc385745b6d964771aa67ced720
+DIST pybind11-2.7.1.tar.gz 668217 BLAKE2B 92d857f14290ee0717bd9f9b871dcecd6c0b36209bb9879f107c8542326fb0cc42c051f3bc12a8be50df892f1e26c26b710f60ed275f0dff206e30149547f2b4 SHA512 f09f46622b394d3990ab82aa7ea15a06e298df109cd2df263ba9d6ac7fb248217df7450e1954a9679a8360335d5bbf662926a34c8b7c61b6e4c396bbdfd88305
 EBUILD pybind11-2.6.1.ebuild 1161 BLAKE2B 7659fbed755e30d43df45a866c38f04aebfb31522b2af3985977eba7a60789fbae631d404165610aa1968f0c276cbfab41e56a158ffdc32a7c47bc360bda2bab SHA512 1484031b362330e62f4f7e7d65ebcc2bc4473aaff5fff1c7e9ebbf67d914982074490295e640625a9cbd198e97334ec6814e5b52977af04285861f94fd41a461
 EBUILD pybind11-2.6.2.ebuild 1090 BLAKE2B d257373dc4744344f2e862ae70e35e620e4af9b0947e53ab16255b5d3018defe9860f48f6b72952ee817c7cfade63b3153120500f0a0558553ed5ff7bd39837c SHA512 7ab5833a1cf3a908a0b20ec135926029738a44681ddc346a4c0a5a220cd9ff850bf7ac2739cf25a996e714cc7e34e5ffb604378c1a76dfe0c8f6057e01d75415
 EBUILD pybind11-2.7.0.ebuild 1093 BLAKE2B 554211e048af6889ba187b6685d374cd1784395c8a5b87c30a04929b967987ea0cf7c2c8fa0dacf218dd5b7621d871ea77e2982b20f21a9142a8de88236e5d3b SHA512 93d2a3fc91065335b4e6165c910a1e5afd553f7e295fe67da427f35fb744447b0cfaac413f58a7be60e2d22be5d3f955a675353fa5c1bed834ec5707d9c8ee68
+EBUILD pybind11-2.7.1.ebuild 1060 BLAKE2B a5cb3518bf63d86385ec59ab367caf7128bdeee31d40c6c67f600593a0360441212971efd04fad0c55f3392b842edcb65f460557c001b8a1c3af534cdc338f17 SHA512 68461a9589597ea080c5d24ded5352d3c8e9632f38a0150af9733563445cf9667716877f0eef85ac4586635665456483a030c4c77cd9a7a4778d89aecf2e474b
 MISC metadata.xml 419 BLAKE2B 4b76037af5a23b231241e9d53f12dd3866cb07811888d1de3e022d3ea812a83a17856107b257f608343aafe763975cfa621061e225c7ecdcc175f3bb0b8a51a8 SHA512 b17fc1d7231812f22077e7feb0400a3c1e9b66f29c125457b5cf568694ef35332d83fdf405d6c849df55e1f0e517a8c25ecd6f24d1d67ca6654cae8522bb10a2
diff --git a/dev-python/pybind11/pybind11-2.7.1.ebuild b/dev-python/pybind11/pybind11-2.7.1.ebuild
new file mode 100644
index 000000000000..903b46f35328
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.7.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..10} )
+inherit cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
+SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	export PYBIND11_USE_CMAKE=1
+
+	cmake_src_prepare
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local mycmakeargs=(
+		# disable forced lto
+		-DPYBIND11_LTO_CXX_FLAGS=
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+}
+
+python_test() {
+	cmake_build check
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index b3caf1b265c8..f568df663d4a 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,5 +1,5 @@
 DIST pyclipper-1.2.1.tar.gz 51862 BLAKE2B be59011d44ba4364e3e0d1d789c10f76635a5bc690dad8030104fa7965cc118e3529bf6505e5c4e743a8ff21e0d24129be716cd91e09b7521baa64359de364ab SHA512 0fc411bd8fa33fc3e5a71ec149b720b5c2f2e9a5e704d5e175b5930e0e073bacfd26b68e19c00802ab68e7a8946bdfcacae858e2d6d81b87d85b3747fa4a316b
 DIST pyclipper-1.3.0.tar.gz 51405 BLAKE2B a7a3e81452c8178d907528b7595fb92521dfb039a6ea116d7f189639ea2975d8058ac1f685a211c98be921c41a694d89f7f431264dfe366e3acc842b25d670f4 SHA512 bee6c5f835e84baa65cbca1d812219bd94272010bbeed365b3835ef3d191042129fdcccdd85ce7841f60f46cbfd52edd270d108ff81d64b0ca712c1369394d40
 EBUILD pyclipper-1.2.1.ebuild 807 BLAKE2B 0f9f25ae0280910804565438dce15dc39369b8533da1652524cc5cd04fdb96ff72577ff8cca71917b88281e473713585536e7b2010cc9943c33408f5699dbd12 SHA512 299b9f3c316d2a029d49e39005a8376f99957b9ca6a41eba380882a932493e94d21a92ec7bcdc26aa1052c629a4ec81a403377f72820e62dfe33e3f805e95df1
-EBUILD pyclipper-1.3.0.ebuild 811 BLAKE2B a8d1d0c90a6997525589c5b136776fe4d956382d045dd3823824865e16026e864eabfc63a9fe2db68ef2ae48e7dc916a62d1b6f86c8d614a583cfe6f533be78e SHA512 4bcbad102d89e991cb47c9ea4016225c7a2355c9a2029f9c8e3987f5e40237721af7e669a961a95181b8daab55f93aa7d2547bec4424a31b8dbdae65f08ff0c8
+EBUILD pyclipper-1.3.0.ebuild 809 BLAKE2B 246d4044e50bbb6b6b61d390a2445dc30444378342f892d45ef376e6dfa157940588ab16e142fbab4b3711e7209b0386b8adc3e34ee277ac9614a256c1098228 SHA512 d6d5db457d009c947fc0adf436236e9d51e00821a567869dc288dfb2ad737017bf12d47a78aa1dd9d7546e1ee43b6c5f3d058fa8a2a5d36cc8ea689fdec9c973
 MISC metadata.xml 315 BLAKE2B dfea428911659d721c46baf73e32549fd98d51aa056ef26b98f305f447292b75a1ddde062602dbe03cf4b7f4e08d0a32a7e085463df1e650ac40f997cd6c0c9d SHA512 15f70085b3bba01136c37bc97ab84749d0d6f99e785c753929c00c3f9de7cec360804f44001954db05d650eae634038791533a1d02e9e1286e8fcdffda3bf597
diff --git a/dev-python/pyclipper/pyclipper-1.3.0.ebuild b/dev-python/pyclipper/pyclipper-1.3.0.ebuild
index 3bbd1db8a19e..21a820a03b7d 100644
--- a/dev-python/pyclipper/pyclipper-1.3.0.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.3.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_p/.post}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index e538eea11372..6a3ea169db2d 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,5 +1,5 @@
 DIST pyenchant-3.2.0.gh.tar.gz 75395 BLAKE2B bff9d4d5038252473fd7673758ecf1304f74f96514d984f5b6cd052042d0b2cf6fe2e149e3675777899107794c9d2fe1c630e87b031f38512ed2499ee1053f34 SHA512 63ca44aea9e7af3fecf554dc6156513c42d278a92170bd6b88b71a737def2e9fe7f7d2ecafd5fea2b860b4d5de55c9e8a6e4b30a58d6f28533bba71cc407850c
 DIST pyenchant-3.2.1.gh.tar.gz 75501 BLAKE2B b70a47484a7f242ff42aa0018f495544f9e7bdab904f835bd52533c93bc28b06ab155132158d2551b9c32eadee83418b6bcb70becee769653196a9bb0d13f130 SHA512 3d1229307b070fa83bd8a287a787b40edfba31e748ca37a94f71caa4b355a9de829f3133db9772a57f0aa922fbd4f32c67c986e86c8905633b3940dd20be32ed
 EBUILD pyenchant-3.2.0.ebuild 632 BLAKE2B 87b17e54a5a4993a3607c153b015b64b081eb4d512f12d0fae660a8b806188c3ca372762f42c71fbcb9d2379e0c84ec67f5aa9f55e1db54e25f1e0d2169d5093 SHA512 8c7a4d1c799f2b7af00cb65e9edf831fd8a4b4a202746113e6325d03a0e76a1f65c9764511d825888846e5807e0478fc581aa885a129e9b77cebe98d474d1d50
-EBUILD pyenchant-3.2.1.ebuild 636 BLAKE2B 4a90ba0d1a547a0877eeecbed4417683a47d0bf52230d5f5fbe92c56678e76636660ff6cf88a0590dedf9cc73d59b6718087f4a071294d5f25af707314b69fc6 SHA512 77eccbcd8775979d47796fcfa8519022aa6f55f8a6f29ba0fa1ad369b17cca4a0ffbfcfa59ab6b716c1759bfbdfb83112d1245b7cfad7918030a66f8f1c2537f
+EBUILD pyenchant-3.2.1.ebuild 633 BLAKE2B 984d03f4c5c964fdd6a539b906f5035872708d408eb6a6734b7937dc96aebb895a077ac5e7fe44b4df23aa684d52be715d1e140efda3c12483e8d980414ee919 SHA512 7351dc87eff6d555552a30c0db798d35cde13a5dff98b6d290dddf4997507721c4f5d6653d99447194fb2b81416e485bfb0677ae1a6b0be36d53b3b65de885cb
 MISC metadata.xml 876 BLAKE2B 4b2b615496f92b395ca4449e8caba7860223101e142d45f3eb703e829d34b27a0e7b3965f7362739ffc16a61d4e5f495754415047b41473303982eb2bf35e528 SHA512 7e69e0da10236e15c70526eb35b2ae8d862109e3aaa81a2613f5a97ba08816eb71e76a845a0656dbe2a6bc92b45a79ab018386110aa7fa0687b3faba18c63129
diff --git a/dev-python/pyenchant/pyenchant-3.2.1.ebuild b/dev-python/pyenchant/pyenchant-3.2.1.ebuild
index 2b5bd2833aa1..e029c11278ae 100644
--- a/dev-python/pyenchant/pyenchant-3.2.1.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="app-text/enchant:*"
 BDEPEND="
diff --git a/dev-python/pyhcl/Manifest b/dev-python/pyhcl/Manifest
index 14e797402b0c..79baf0ed6123 100644
--- a/dev-python/pyhcl/Manifest
+++ b/dev-python/pyhcl/Manifest
@@ -1,3 +1,3 @@
 DIST pyhcl-0.4.4.tar.gz 58400 BLAKE2B 89ce8ba1eff577d9b4c7a86931e305f94ad7633b83c27f44352658ec2a12e48fd0cb05619e4afd97e4f2d78a9f4dba5c082a0d5703060b629880a3d193d9b4ee SHA512 7c5e2b611d1198a0e6c667b8fda868231bdd25da822d634a34c076fea655a7ea2999fc827de8484992efcf52b6b843871713a83e3be7787003c90f05e3e7ddf6
-EBUILD pyhcl-0.4.4.ebuild 806 BLAKE2B 0be078a5df5857c1e7425f9bda2db0a2234bde032a3ee103aaa5563aa949ebaffdfa0e08d0b35b07f2e17ca456267cc1b761d7f2d67499b886926f92c50d5e61 SHA512 a36b63dfcb1f91bdbfc4b7d44d60e2477faf06054c03cb2443ac1aaccd01ea217b661acaef2ab9d61245963561d1ffc78a9162515011879879c0fd0ac65373d7
+EBUILD pyhcl-0.4.4.ebuild 802 BLAKE2B 6c09db1a22a32c78a20341b530ca539f493f0ea6d96e805f10c149f01a7298f289e28efea8ec316c9381dfa362d5975e0e18b379e7e0918d51aa13cf13a72cb3 SHA512 2a33dcfdb7a153d95fa190aac7fd478d51c7b89d9330c57c781ebac570ef13259e81dfc8c880f34e8a702b43fe7704f547357cf21558db1dd6be91c7d229cfd5
 MISC metadata.xml 504 BLAKE2B 829a8f8466ea2164836482d43073fdbcf8eee25aa17999b1f5ddd36971dff10fc9e42cc7c1b4a5c6be72bb6307f46c40bb657afa8760659e9fbad0b38142fb33 SHA512 7ca7aac67d55ac7594e805cbb493285d69bd751a30bb127713f736f0c1b2f1d5b795fa48001b3544c920512e3b791b3bb2303647ce62d94781bfa279afe4dd26
diff --git a/dev-python/pyhcl/pyhcl-0.4.4.ebuild b/dev-python/pyhcl/pyhcl-0.4.4.ebuild
index f3342b15ce58..62857bcba53e 100644
--- a/dev-python/pyhcl/pyhcl-0.4.4.ebuild
+++ b/dev-python/pyhcl/pyhcl-0.4.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # tag:
 # git describe --tags --long
 LONG_VERSION=0.4.4-0-g314cd32
-PYTHON_COMPAT=( python3_8 python3_9 )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="HCL configuration parser for python"
diff --git a/dev-python/pyjsparser/Manifest b/dev-python/pyjsparser/Manifest
index 298ca6712ff8..1e18be698fe0 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 762 BLAKE2B 22a787218dcd7929ec3c80534501e5b3a912f83013ea4348b1633b2b3b043fd722e8244b93e9daaf709de49b5c0afbae6c9257653c30586699726f067fedc22d SHA512 e3cf5eb38cffb1f298e6839a888eb27fd3ef71cc991f1768b96cdd9d3aeb4bde8dad6b88f96d6a23fec97cf61a9a8aad5ef9c2178e7c7d965236b6052db09c8e
+EBUILD pyjsparser-2.7.1_p20190421.ebuild 760 BLAKE2B e646082147b0c45c062364180515ef6666480e5782efbe0706073b18baa862ab5e1f86a19b38d73212b90bc1bf136fc38ad2210b6f5fae30c9612e545902d91b SHA512 115154d9319a6b8f5a20915622d8bfd13818cd185573be145ea3d41ffd2e3e12256576e3431b8ec8c3c0d2660c22b73e62e5b7ad94b433fd9bf1282d17248631
 MISC metadata.xml 582 BLAKE2B 5abbbf08ca42bed861709c7e8df70074112efb8d5270cd628fa26902f9083a242ad9ab63a6aa1f74824a2eab29738c46a3fb0684182fbfe5d692ff35d0c86570 SHA512 ca17ca99b83926f956af099be27eb359f4b2b9be425e68e95abaab8163667fa744b12734f6b8e5f72a7e3e1f9c3d684e4b1c23e3b954495575ecc934f2528c3e
diff --git a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
index 21099184d643..c8bb95c2269e 100644
--- a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
+++ b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/PiotrDabkowski/${PN}/archive/${MY_COMMIT}.tar.gz ->
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 0c47e24dd3ea..c5afe829c9b4 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,5 +1,7 @@
 DIST pyproject2setuppy-17.tar.gz 12191 BLAKE2B 5be19c9e70abf37d776649237581b1cb281331585c6ffa312f63e50bd2fd8104972861b38958272d5eced086b2a60ed370437807d1eeb382e4ad0cde5f03b0db SHA512 0291f9ad1c3059a4ccd366d8f1078ffd57de89cc128e996126f62a92ac4dded9c7da25be1325ca9f660062ba3a65fd01d62d4ffb22084cec7f4aba79e552ae2f
 DIST pyproject2setuppy-18.tar.gz 12566 BLAKE2B 424aac4c89f498cca61b18bc1e8da3dd72324014d04b2a1e0b7d9aad48b445ddf95117902f6f2d80f9c0e1f3ac808d22dc62b31a2bc41f59820765e49de56a48 SHA512 f29f262ea59cccb698e82de630c8de40fae5a758e71b741c5c5e26639813bc45de13d1479b92a92aaee24edc71ea6f66b0484bba765c4d66eb10e0487bdef080
+DIST pyproject2setuppy-19.tar.gz 12531 BLAKE2B c5364f9f31a9cd23252664e69d252ebff579e965585db338587557d7bbf78ff346e6dc9d6cd20abee332ef7675f3246f175c4a1694bfefc434ffe1563c1158e4 SHA512 1f18f39779e4078d9e3fabebfa8cb279cab80b97ce9aa4dfe5a84019b16bf6bb973dfeb0feb360f36fd93f8106d847602e21589859ca3d7837a78ce1572ea6ea
 EBUILD pyproject2setuppy-17.ebuild 781 BLAKE2B 7777a59955f823ae46991f592da9815467690ea129b0c68449e217700f8e5af25de53407c486245367ecb104a1e8ba570237881de37f9e569a7090ebd5e78386 SHA512 35d001fa3ba56ca4ce3748741dcc1c0761385f1416bef7f8d246d62ded57b94b38c5b2c12343d1635198d9dd1114286952f26e93e3a0bf947487750a84cc8f94
 EBUILD pyproject2setuppy-18.ebuild 789 BLAKE2B fe0e00600f65bd19118748c645d47c6bdc820037a301c847ea5070e7d6d73e469130fd9fbabc01facf39bc93dfe3edc7ebcc5c2c9511bda969eed68d03d228e5 SHA512 2e839ed0a1bd1e69ef9d505c0e2ff0236e093d76bb1018908f08207cb9830bb018c2d1ed8f511e6ac78f9525b533c1a86708b74f2e69bb0dcf3f2277a41a9293
+EBUILD pyproject2setuppy-19.ebuild 784 BLAKE2B cc64e9f18ddbafee29ecf10fadcde495ab198a1a26296295a5bd70ce7b2c12cbaf49c8dd94a6ce2dbe21aa06d48988b3880785a65d855d0b282bcde82076f29f SHA512 542d090bd6da15a67c7a443676e83e7f5a631c871279b0fbffab9f50d0787a43965687831e3ae31abc92e5d578daed5ae9826ca0aee2ed9a5b81fe77a1da525a
 MISC metadata.xml 430 BLAKE2B 934e5a791bb16f3717ace5fa869aab4998938109ee14ca1ae0c9c378d67366060b705ff4430f3d267d33c04cf23ffa0b4c1b2654b2a95d586fc22ab4fb43f8f9 SHA512 f52d07edc973dc7665be77367cfdc37d92f27adc730a327c57374b54b60f77802b79ca5f2ebfce2c687090763224e5939274dcf4fa2555834c580cb06c32419d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-19.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-19.ebuild
new file mode 100644
index 000000000000..e769cb4874c8
--- /dev/null
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-19.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
+HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
+SRC_URI="
+	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index 6cae00c4dfe8..538e5e5ba0ab 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,3 @@
 DIST pyscard-2.0.1.tar.gz 149193 BLAKE2B f140e3e62635634de8125d88c69e4ac3657468eef04798b4ce5b20d73905189ced71f041ef7742233a185aff8b28cc0fcda5af175d6dff21afeff84f062afcce SHA512 c9292b9616f150e500b308c47b0d6ed6f869f2022149c99a7789f8fef8c145dec4db84d35b6df30fa31d4007dffff75fcc21c9846693eccd9bd3bc8ec77fce5a
-EBUILD pyscard-2.0.1.ebuild 689 BLAKE2B e43f6bc8cd4bc377adf932b497f4ecfa793d054f7e380b54fa7c43eb5ebdbc222ad4e0aa27a746b0c9e049d591b4b83cc5ca3d0f2cb9596db4559e960283e3c2 SHA512 ff90be9d70d0886b04429ddcf1dfc5a109a8cb380b84fdfaac472b877d5e1e6d5bed76369780591d99e77b532fa69418f988c2f2dcd20a31929eef665b0b2d44
+EBUILD pyscard-2.0.1.ebuild 696 BLAKE2B d562563800900c5c71f3d30a0b4e56e53fec15250a9145485a2f36239b8e8bc59cc2b309511dec66e2f79666e441ce3ef35fe964e47780ecb8c861c5d70e5c49 SHA512 f86ec47198295f5b6b07378de3e14c10ac720a898f3f4d3f9ca9b8b13833cd4ab0454de3fd20b4f983285731b1f0839fec0a4dc47b6f43e5594a21a8f5e6116b
 MISC metadata.xml 425 BLAKE2B d08b4263a97d671761cc9d5ba2084ce7ecef3d10031371ec4bf5deb4d43d840dbc34787d69c353ff0b2acaade7e50c512c15fc41cc7ee6a14d295a7ccc9f3019 SHA512 75d4e0a2023ee036c4b48f3fba331c9b97dafcc53cc9d071196bf08a5bef4e51c254eec6a1d7258b5bf5b14b93860ff5f16262983cef7b7cfbec9e05f6a806dc
diff --git a/dev-python/pyscard/pyscard-2.0.1.ebuild b/dev-python/pyscard/pyscard-2.0.1.ebuild
index cfd7922e7568..7aa7611328f0 100644
--- a/dev-python/pyscard/pyscard-2.0.1.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 
 RDEPEND="sys-apps/pcsc-lite"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index 5d375c427161..4c5ae7c2ba2e 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,3 +1,5 @@
 DIST pysol_cards-0.10.1.tar.gz 20670 BLAKE2B 1183502ec0e7c070686ed5fc2972091a5bf91d55e31170690124e949bd592401daaae44cf25e3ac9b213230e27fbc90ea9e58450d75caa09b9467f0d2ba513cc SHA512 40ef02fe919f961688039667b9073913acb452d163eef1a4ef71648788676c678bf615a26b1f4d562ba072167eb3629c4cc463678edff89bfdc62b0878db062c
-EBUILD pysol_cards-0.10.1.ebuild 549 BLAKE2B d0efad37cad0c2b2487c636a1c056daee49f2b7f4d97972e8816f0e95c20d19a9b6361ac55e8f40720872f9b72d97d0ebc9d0e65edddb4f509c1cf217ca5bdfa SHA512 0b9a1009fb16a1533ebcbc932740b256490cf56d8c13b055684db5b10cfdcd2cd96a03e075463d5a39e84a7aa985b49d7f1a5b8b53f2a2f100d90714e7fbf68f
-MISC metadata.xml 289 BLAKE2B daedbd790704b3663910c8067dbf69dd886eafcac1aad5b2cc18f54a8dc74596a9a4821a945250e2ed997c754151995b675965cbebc64abf5445c1c63db91ba1 SHA512 f48ef730220d3520d2230ebb0caee8e3456c8b8b7255bc978944897c424d1338f7d7a865c37455d279fdca077fb1436233fcf085564b1d1e9802d28e35d7fc1e
+DIST pysol_cards-0.10.2.tar.gz 20776 BLAKE2B b9f3f20e983453196a7db78ac81c17eb35f157e6419a9dd25e6286ab82763bf2a1601177e41abfe0f49367189a4a78ac66e4f77151c52acae006e3198ff8c524 SHA512 df8848c63ad12496c4346fc51fbac803b7a27c274147d458c78f937b70c804cddeeece8c6a980ef2a422bb17771ee1825c9824843e7d1cbc47e3678e506a30c5
+EBUILD pysol_cards-0.10.1.ebuild 581 BLAKE2B ef43c60fbc25caeb2cc59c6128330e8604a27f51c75aa1f2ed92e00ebb1605824adadfd0317817f8114c71037abb931eb4ef1ce5ec4431136c0a2d0a7fac99fc SHA512 e8aae83b09903e958a768c786fcad3ab19979d272f6180ea572f1e697e28a437a1b1f0c2359d42309bbc42cc96a50443581e3664a82ad4427e5cbbc63d8fb39c
+EBUILD pysol_cards-0.10.2.ebuild 584 BLAKE2B 0c99a56bf7e33a5c5cf0637a64faf2718734141da372a289a270f395c9118d3de4faeab70c3fcf0a6f4bed61ee1a61f355e625136a23c557c89e36935e8bffac SHA512 7da62defe664a7621654c8e41995977a535992e0d771c4b41e428e79fe4b20c4b2c061b0b166847ab74feffad283ea8f81cc5517bd5b8aad3d47f92a71eefe98
+MISC metadata.xml 313 BLAKE2B 93d91c2f05938e3698e3ee364bf509571ee4e4deaa3ae27179e9a9b54689936410df4d49f69431ea67e8c6ed780688577d30a80906870c49d4348e72f07a29c4 SHA512 ec49fbd1703c3c27317b42b4d2909596608a52c8193282dba84a81440ff2564e22187c8974915845f01dd0301cb0b6061362352238276084d6e5ce86e9a99b7f
diff --git a/dev-python/pysol_cards/metadata.xml b/dev-python/pysol_cards/metadata.xml
index 1b3bb96f4f8d..c62bba65117b 100644
--- a/dev-python/pysol_cards/metadata.xml
+++ b/dev-python/pysol_cards/metadata.xml
@@ -7,4 +7,5 @@
 	<upstream>
 		<remote-id type="pypi">pysol-cards</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild b/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild
index 1a4f5ba807c9..eea6d82458cd 100644
--- a/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild
+++ b/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit distutils-r1
 
@@ -14,11 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
 KEYWORDS="amd64 arm64 x86"
-IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
 	dev-python/random2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
+BDEPEND="test? ( dev-python/oslotest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pysol_cards/pysol_cards-0.10.2.ebuild b/dev-python/pysol_cards/pysol_cards-0.10.2.ebuild
new file mode 100644
index 000000000000..7e42f93af853
--- /dev/null
+++ b/dev-python/pysol_cards/pysol_cards-0.10.2.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=( python3_{8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Deal PySol FreeCell cards"
+HOMEPAGE="https://pypi.org/project/pysol-cards/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/random2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/oslotest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index a2358ed25347..a507887f2bb4 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -5,5 +5,5 @@ DIST pysvn-1.9.13.tar.gz 666722 BLAKE2B 4ada83f474026976309b8fc7876dd860fb68eb73
 DIST pysvn-1.9.15.tar.gz 667161 BLAKE2B 35e9e0967d5c0b4cebf546e40df17b66c66406d0f8100c32e6e840220f60b0083c0ed3f3af5f54e2264d06905ea90970d6b7cbfad2bab872a14d5d4aea5900df SHA512 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
 EBUILD pysvn-1.9.11.ebuild 1324 BLAKE2B a4ba06214b0f6343ff0c8af7c86857cd9565c10dcf24a70445bd7c1627828b4abf0afa015e58df190b74b6b7aae48b9fd06278b3e657988d5a7f4abeb0a1ec41 SHA512 66fcd0af0e02c94a7338db96a4fe6a29f955be2ce23f7eb580996e695d727f32985b96db1e35a318be54fce628b931e2387ba9d48de8a3155a13a1d236e0f432
 EBUILD pysvn-1.9.13.ebuild 1750 BLAKE2B 13751eb3b69b91a47b3939eb8d793c412955a5d5db88e9fde574cce071583a04b5f8b0fc6b77fd17dbade1039f2afbf59bb5a5c829f6a9d5417783effd7f11f3 SHA512 9a75ae9734ac1028e80ee6f0627b42f44d7551cc1cac15815f0bf0cd70ab2bfc2941427294e17455e3972dad54a874482398908aec822e5c60e3e055a1abe12b
-EBUILD pysvn-1.9.15.ebuild 1332 BLAKE2B 93b4683afa60b180d7a308fb3adfe9e48c8fa69e368a2327a2faded8b60c43436834c9f7f0e504049e7afef0e969b51c576661629680556bd7c7326b2ab0cab3 SHA512 5fef4ee3806cea84f084fdbee01f265202e6d6097970a7967da29abcdd4637a27c4e2015a3921aebf85b19fd6503335a9b36d0ec2964086d905f719350078828
+EBUILD pysvn-1.9.15.ebuild 1275 BLAKE2B f0c87e7da5a2b1f5cdd6f2ac076e410e12781507ae48ad1df83dc2e33aea9d181ba2c3fed0201cf877bff9e4de01ca5a85ba5159b6421c2c3cbafd4af6fcedf6 SHA512 2a0e29dd2e7943dd60ce334b11d9e90748927eaac90c445ce17e1baac66f24fa85b60c2f82c3fb5757f31c50e806d7518ae1999537f8b88a0d2ec59661c0390a
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/pysvn/pysvn-1.9.15.ebuild b/dev-python/pysvn/pysvn-1.9.15.ebuild
index 9e8fecfbe0e4..2944d5593d63 100644
--- a/dev-python/pysvn/pysvn-1.9.15.ebuild
+++ b/dev-python/pysvn/pysvn-1.9.15.ebuild
@@ -31,15 +31,13 @@ python_prepare_all() {
 
 python_configure() {
 	cd Source || die
-	# all config options from 1.7.6 are all already set
-	esetup.py configure
+	CC="$(tc-getCC)" CCC="$(tc-getCXX)" \
+		esetup.py configure
 }
 
 python_compile() {
 	cd Source || die
-	emake \
-		CC="$(tc-getCC)" \
-		CCC="$(tc-getCXX)"
+	emake
 }
 
 python_test() {
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index 041cb176e785..5feb3f37ed69 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,5 +1,5 @@
 AUX pytables-3.6.1-numpy-float.patch 7336 BLAKE2B 7322dea9dcc5d115dd7fe8a92e5547359c2496326f7195d6b14f596ea8eaf69b8b3e583a7de68bb22c9346073de31e46e9bf36babc423eecd1e36772d6a6e094 SHA512 2807aa3ddcb9a9e0cd086e621d9a906c6de9c49ac1668f261ac284b7b28841c36645e42557fbe3b45b21dab9c8551fc022d5496658d8ed267516d54021791ef5
 AUX pytables-3.6.1-py310.patch 1960 BLAKE2B fd0dede7bf5b515e03d7f936b2e512b815053aed8a4e5fad6f68844a3cb99b3d51a44d8c665d6113c79bb44cafd4f85d12142d1a94e70bef454970498b1909b3 SHA512 06d28a86fad569373304167440d364341a32121c6f7fb6d777d7c320c97c6e3903f862f5372dc85b5c6f953b168aa26029d0559004003526730e9b5af3284dda
 DIST tables-3.6.1.tar.gz 4641089 BLAKE2B 4ef44b1263f40babe6719bac911ab191e9cb0c58c377705b755fa83f1fba5af1d0fab10b0b45bd6af619a9dce4842a80afad8d8fbab64c3be4f35a1b3f117ee3 SHA512 7f018b70251095049bce9075be4e19f72efba9d39121a35c4521f634b1dd5b81ab6de47df3bb44ad6b8b2dbdbff4e6d0985ad1a7b2f13b44f920c0935e5830ff
-EBUILD pytables-3.6.1.ebuild 1764 BLAKE2B 89b8f0309c49c54e4c2dc991cf21bd8271616c917f79b9f52ca21da9d755672cd00138741c664b41249b160467d73563cc7db1fb190baf9d56f0fb288d8a5f5b SHA512 bce9783d8f90e6543d6680c866be5fcd7c06d22d3c8011e1d1934926f87c0ba87d05767a09bbd2e0470b818efe431aec61f2986cb2d500bab6224f906fd6f23b
+EBUILD pytables-3.6.1.ebuild 1771 BLAKE2B 30e0e612fe192826e0f682643295c9757f4dac8e5f6dee6eca28375e033738f7c541293552f349743bc2f290d993a1114b23a6965e7459a38e183d1ef1b01b14 SHA512 ae566bab2c87ccd731813cd53bf2d4c193ed6ee2b8539a22e5e17bfe59512da1f8cf24b59795fad142847130fd055868a0bc932ca2be69b95afc14a4e51ca185
 MISC metadata.xml 894 BLAKE2B 279b64a5124a6471b3ea6ed8d2f82b8d62e5d8bc809168fb2ae1c3bfd8cfa07428c2ff7f07deb5042a6ccb5ba7af43bc45d0db82b9cfc79fa5d19c090d0500a3 SHA512 88dd752e6014f6f133b5df7db6c2aafce0b9da8cdbc057493916dbfbe1da4bf52e0ed43d570d68035fc8f12302794a381a54f5b07b9726b52601724163bc672c
diff --git a/dev-python/pytables/pytables-3.6.1.ebuild b/dev-python/pytables/pytables-3.6.1.ebuild
index 67448098a5b3..d8118cbff31e 100644
--- a/dev-python/pytables/pytables-3.6.1.ebuild
+++ b/dev-python/pytables/pytables-3.6.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index be67ee3d7c4b..e89f72dd3b55 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 549 BLAKE2B dc17c2758b294b805084eed6b5b980aad1fee4ea74093aa72ab13b7ebd8e20dec93daa260159a32a2a68cf38129a8a057468d5ddbc9b1c7a334218903160f49e SHA512 72d4833faf068c58e1ecbf0bf619c8436bc4a3e6b35b6a7a5052881a875616c0494a3d0fc62cdda99f26bb596b0274d3fd7f374bc84bfaf207dc03dc47f73756
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 547 BLAKE2B 5c088b47cb2a0a3ca328b6cecc11fab293f2ed3fdbbe2cc5bc8ca799cf0a3ce2d883eeee31b08a77a16f66bcce8549d2fed1dd183426a79db594e437a1fb5b68 SHA512 244e0586f80244ae61d860c521e0c92db70d8297c5e04a58c42f5747d79165b24575b94bc879da5c50cd0894afc50223a9feb5cdc5a34540d7cbe79068684d1d
 MISC metadata.xml 382 BLAKE2B cd3cf0ec70a8506a0a36c6be50dd70b68c1397c9bac788f15e012d10a4b35d5912c53f4de68bc7cfb3b4c03e84efe053d18b6a16bebff26fbcf935ad6d282645 SHA512 ae3b23c6b0741388a625d45f65e5b51e6ba9596eae3cd26378cca840656cfbe61f580705c82766b8a39dd7c603263bb66299c11d4890ed24b2aa6804bf008791
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
index 122c4ebbdb2b..a63fe0646249 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE=""
 
 RDEPEND="
 	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-datadir/Manifest b/dev-python/pytest-datadir/Manifest
index fe154751d134..d27fa6a1e0ce 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 613 BLAKE2B ef60c0fc71c3f11224a31dc2262a7972415f5c1247fc621450234dad26468df1fc5f7857ebe461472c40431bcc5e5d7d5d7d4dfa6b5b95efc2358e21a55860fe SHA512 0766686899a801c07a33e256b46a0be014ccbac82449081f0a978726bbf47651069a7c1f7ebc790feae6fe9026befa548880125790cf3673c25698f40610f11a
+EBUILD pytest-datadir-1.3.1.ebuild 620 BLAKE2B 517bc1aca15d5bbb74de8467e50df39d6209b6f9d386f060f43927f4158fac71b98c2da1ee8a00ffc4d43a77859d7c563ce361fc50f23c2ab8a4143a4662a01d SHA512 a65019a2210170337f87c428c78c08887895bc10bd8731ed05b3c2728171a70e8612c9a3d3ccfe218a2f66efed2cb5afd10dbd1eca75b7bcce779157ac9906f0
 MISC metadata.xml 359 BLAKE2B 41902d1f5543ce1c93f41cfa086f273b440e0f69e59601ab48ec57ef4e5371a45e2a9b3d913b406a46b16eb073b30cff8dc30c09ff66a16b9010dcb5982460b8 SHA512 b0cd9e7e16cafb7051d23fa47f7eb0e6ebffc7cd2334c539dabaa252d5d1bcd3e4db51afab71fcb3e03e933384735bd49d378cb4fe2f8558a8d3da91bc429cb5
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
index 7d375a90f87b..ed1a4f2902a9 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index b5b43b419f90..b09cfe43c3ba 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-httpx-0.12.0.tar.gz 21319 BLAKE2B 59c3678937a7756f13971e3f1f8d312b227f56339b4234ac8e5544f4370622bcff401f76f68c2ee042fdc64deae6a7a9dd05ca8a54b60b14bfb74b2d2d724de4 SHA512 b5866ab0123755020fad679d27d4d113132b2a79da85c52a334904d19aea90ddc71088a6e0f27110498da2731be664c525f3cab256d447a37d9a507f9a508b43
-EBUILD pytest-httpx-0.12.0.ebuild 652 BLAKE2B a6600bd0ee18c71ebfaf847a81d32c1ff24bdbabcd76a12753425f1acbb2e4e36ce51038d078bbe2264393a3a8d89438182a11c48f5de39dab3b92ff174cfd91 SHA512 99450df18c6b3a93794b44f2ab7e3c1a113d6e798e03e0435ebac2a63b90d345c0df0fccba016b70e8948081cc2536be38ff16ed8fcfa53af33253cee349cbda
+EBUILD pytest-httpx-0.12.0.ebuild 653 BLAKE2B 49026b4a4108d22081b0cf24ae5921ce32b54c948b804b1c1ab6daf790f030f727738313862390b9c5b7a9f9761fb34b95a5ab8f6fbb70f0aea563a4aa2a1902 SHA512 fb68de7d314fcaf3e256854a6a882fac594e29ab4b331f25024da8d0092551279bf15a273089ee4174b7a7d29d8b8e8a96f58c21bf7fc919940bb0732671e5ee
 MISC metadata.xml 467 BLAKE2B d13bfcccc41321e84d9e912be5e6106c376d7dd5a8bc596e69e570713fb2d0dee3627e29dc9c35c6638322c7edd328a6f60e6af8dc967fad302508dcfded32be SHA512 a6b6cc298ccbbc4b11c0e91a4402f634ee0f69e5ee53e09648f842771b8d6f3fdebe5114b3f55623b75e6539a794b6b94956a6eaf4e7f91e28eb6d4bcbb5f770
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild
index 49212ed89c34..89a575419478 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index 3ba1c26bb038..ab8454e4b5d8 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 1072 BLAKE2B acc00f997fa2bf940a4174338888ca65404fc0592ebfe3d6a35d6eb95b70cd64091007b4bf5660a088ee1d4e98f820f6c7ad09b3cf588ee7734318835a79dee7 SHA512 508b5ae2b21d610026c60d96343967a9884521e0c8ffa1b080db6233912a46c40752090efe2a470b5b2a0a16c850b2380536cd7551e84f42e8666d37c4f434aa
+EBUILD pytest-regressions-2.2.0.ebuild 1079 BLAKE2B 3f57fd9646d196cd3bbaa33b5ee8e129404eca3249fb2a2f71689fab40e0d2a52b7fdd91c98e3b41ec6381c0b295ea2d6fd5c3b8e7c7025fbcf18b8c48cec89a SHA512 39a2bf85153a1abb4f67699caa23d9897b03cd6da3a9af194e0f850a0b89f665cb50603383b6d90807768a2635250e94aa83f0f780fbd5685a945b4cde6dd8a7
 MISC metadata.xml 464 BLAKE2B df781a65e58ca817930a547d83f754cd1b3ba652ad8aab397bb9a0954b5ec124fa99a9d0c804ec02de1d2ed8f9d67bab2e7655c219b8504a9a1aa0e50de5bf57 SHA512 3156101dfe3b4029b2fef4823563e267139010b0d5273a41b7ce86f739a040a2f31b60afd7d8636dacb3e20391ebbad1195d9c08209d96e0e959f7abab4549f8
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
index 50c202516a7b..eb15745f3a59 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index d9e511d0474c..677d1d96c8cb 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-rerunfailures-10.0.tar.gz 12706 BLAKE2B fb445acd6324a377258ebcd32255bd725dc78f2209990e5807a0553da259ffc101969b7572799efa5041ae68bcc264ab80581cf9d9943ab81d9b158a15dd71d5 SHA512 83270e18cc3f825c0e0184950a149899b99a2b46cfaa6ca1c82b7cf388144265831fc2b8b82ccebb5df57463219cb7e0b41f5beb049feedcba90ae6d48d1e05f
 DIST pytest-rerunfailures-10.1.tar.gz 13644 BLAKE2B 05b654128cbc94be803d15e038cdfcaa3879dbc43eb57dcf5cc3f5e52d0e4848a38b70048b32eb5afc99bcaec614abe6febfa95e4e8f7c7e07f6dc71dcdc3915 SHA512 9aa825c7fb1fb36edb78f1cdfc4a5f705e1688d00be0cd311e5cdf542698a2e03eed15b526235e2a35262000ce24923ea1049f3efa449c9a3723a2a5c1316717
 EBUILD pytest-rerunfailures-10.0.ebuild 598 BLAKE2B a1096ed122bb81fbe9d789d0fd8346d0935fe595bedd7d0efb354be425bd252cff3061399b2dc6d3f9d98f2a9170d09aacbc01ed1533e6483222bcfa2457098f SHA512 861186112fe5ea6d6c9b6fae638db8f78872ea71dc25b06306a23beae86a971327b225fa558d270665cde074eb345c33c69aa68f8b6dece6ab0f1fe204e50ddb
-EBUILD pytest-rerunfailures-10.1.ebuild 605 BLAKE2B 2ca1529e1ec95d66bd0557d30f8e7d81e028ecad3cb260b9cc7c4e1e24d4c63ae62a06a0157776805705a323759d660dfe724249099c2b464923bd9cd6d0ecaf SHA512 e480320d7e98c7b092a92b8555fe842ade51049bddf73d90513e2f758de82422f518befdcb9b8c52d50c3ff243b1cdeb06b56761c6301cbdb499d9347b206c24
+EBUILD pytest-rerunfailures-10.1.ebuild 612 BLAKE2B f64d9c5d34916e43143274472500d62970bd705f5a49d28e0946c6ac45c2cea39a4855d6f699ed527e711db41e6539558007ba88d9475d3c4667e4550875574e SHA512 46180b4605c612580b9820ac2aeb82eb88e4e76e65ffb56167b77620db79433e4e4a927f5422e1c674eed3d6b6ae39cdf0c9b9e93dd86bd1ac48d1187a9f4f88
 MISC metadata.xml 431 BLAKE2B 5a8702f2474240f37ccaec26f689300650c53798e6a5fe0e5fbc910316db3b5796c285419c8531200823ec33c12b2e474825c28990b39234b7d4c915f1504add SHA512 8609709f8477b3df1417ce765896dc27f8da65f8ce8d1d7d10020ed3acde36b00c9e7634e9e9efeb6d0d00ba4e49b774fb4c90670804ed938a6d94562d08a998
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
index 4d06d64d0a62..80cbae2f304a 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 BDEPEND="
 	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
 	test? ( !!dev-python/flaky )
diff --git a/dev-python/pytest-tempdir/Manifest b/dev-python/pytest-tempdir/Manifest
index 71a56719b4b9..42a97a8e027f 100644
--- a/dev-python/pytest-tempdir/Manifest
+++ b/dev-python/pytest-tempdir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-tempdir-2019.10.12.tar.gz 9859 BLAKE2B fe4d32d2de3d577952b90a811c38f1cfa0c16badf9115a1b70faf07f0123e29935c01bfc3c1b9c616a0eeb3e0da9f42a4415687a4862830e0edea505a99dfc04 SHA512 d6f8994423d9be90f4be20878f980ad4604475ccd4b65975cd3cad357c2d6a2a7bb8623e4ccd7441437ad72b7899d8b59ae19ca3a52c35a6c24456e44b7626de
-EBUILD pytest-tempdir-2019.10.12.ebuild 650 BLAKE2B 5ece3b87dcb9fcf28b757198af4f049a5f2c8e458107f109541dc00be6bb9b6dd814f8709f947857526275d2ce5a202bf1be961114ec2ffdf8c94e68ec29b67f SHA512 c5676a39f3aa7b7a123df72481e89142cbe1e373254a4aeea2ce04ddf2bca98449d186005c792ce4cfd3d24429e252dc8be7b7fdf0eb1c973ae5203798fc35be
+EBUILD pytest-tempdir-2019.10.12.ebuild 503 BLAKE2B 44d5b57db6b9363c3cddb58d89acee79e8dc187b03357fe5c42b2daac4e57a8a8cd9e398942fbeb1968b02deb1a3e86f6efc0206c17a513c084a97e7d709c278 SHA512 c06d8895372f04ee94bd850bcc067199a0e75e50869ac57fae7e1155e27c09da8aab264c6b9c189aa83aed782bdaa5cb829f2709b2801ae3b51b0b78bd0d9dd2
 MISC metadata.xml 326 BLAKE2B 9e3ebe5f21ea79c1bcf36480d71363aacbd79499aa6ad5c2189aa08f4383400eed646a05c5f820bb803405fe198b4981cb5cbabe737c89a5f92e723eeac13285 SHA512 a221e01e2f66ab996b06e4dfaf6c8ffca79849e635ecb5f443574190a33e934b8e28839d142571cf8eb1f360ef418ed529b60a60fe5d99c0ba208e37cc0bf784
diff --git a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
index f347e2e070f7..0720ff8875bd 100644
--- a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
+++ b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Pytest plugin to support for a predictable and repeatable temporary directory"
@@ -14,13 +14,4 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 
-BDEPEND="
-	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
+distutils_enable_tests --install pytest
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index bb6661a90b2c..51ae336ab829 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,3 +1,3 @@
 DIST python-caja-1.24.0.tar.xz 312340 BLAKE2B a860cb1cc983221710d93943ac39b9b77761997fa6a52b32dceeeec381ee86d976c56266013d0370a28e7cb26de3601fec42234b4f91c78e5ac54992035e17ee SHA512 9febf7cae1736e30c80218dcfd3cc05b948823b99945ed67c1839ab5149aa3fe05b090d46c598810f0cde8ba66b83426c4642f6ebdbef6067f6b2fbc0798e816
-EBUILD python-caja-1.24.0-r2.ebuild 1218 BLAKE2B f1398f1578bd7246c4878d588ed03569d0f4e1eac555100cb819431fa1f31d546bb75d954ff9ec31ff25bf3cc274d8439081c918df357bf9dd6469349d90870f SHA512 233bff12b4e70fc76758d613391ae7d1e0fa35c62fb95df9040d810e08871380c1e528af48a607bf23b443543ea0ccb2ce05a60fe73bb72a002cde15d65dd1a1
+EBUILD python-caja-1.24.0-r2.ebuild 1233 BLAKE2B 37babcdb3a0b35b8ed48f02a8d0e9b9bc4248d8fb13808968551e5c4e722f6f6dde4284a435e151e2031457aeb98b114257ec8e862e9402bb06e781963f4a73d SHA512 b31f7b1c399441b3e840504e27789a7495cc698811e9d80c8e61e2b459cbe920f5555c925b11cf62bf6a5debbd89656c2cf61f528097cd7715178a4bca2a9aac
 MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
index 2d0ab57971d0..ed1f90bf01b8 100644
--- a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
+++ b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
 
 inherit mate python-single-r1
 
diff --git a/dev-python/python-ctags/Manifest b/dev-python/python-ctags/Manifest
index ad55cd2f56ae..257541ff2ad1 100644
--- a/dev-python/python-ctags/Manifest
+++ b/dev-python/python-ctags/Manifest
@@ -1,3 +1,3 @@
 DIST python-ctags3-1.5.0.tar.gz 59091 BLAKE2B 303b061e7e660c1ed08c52fa76e4a96e288c6359167006a112de2262eff8c6bb564cb5c5ed310e091a3e88c5d5494e883020e7aa3ed900dc9a316cc8a9f597e8 SHA512 a5f1e2ff49abf9cf471a0139c1d2e1c4f836557386f394a96e67692d6153c60717df16fc7dbf832f69182270842fdc550f77194855111534c3b71b81ac94e483
-EBUILD python-ctags-1.5.0.ebuild 509 BLAKE2B 59250c65622796fa0c0d40e2504e5064e32fd36902ea997cc931a247135a7434385b4c344e9683e54ffa3fbc3be35381dd2bf103612cb82ae186d3ed3a45b67e SHA512 e86c5a986718e7ad0f6666d0faa694590dfe3b63b060c85d2776ee170f23b64a0118f7f5ba412d6ca6852844244c1dbe0c2156227e50d39666907cac86369edd
-MISC metadata.xml 455 BLAKE2B af37b4a79a49f4128c7ed43a10ba5a384d5d6d4a33912cf74fb59ddbddd155184f1e47161519649ddac98556ad17cee495913321632f30a629704eabf7fc5d11 SHA512 480ef8e0ccfb6e278348ed31be811e51ec6a845c984c92d9d215d0375305278639dda7e409b66f18860ea980de149656b0dfd8111d26aaf79787e3c7a34ce848
+EBUILD python-ctags-1.5.0.ebuild 515 BLAKE2B 9e5feaefddadddd79f8aab4a24a6da06c10f53f186493f12bc7a1610e6acb644f4266abce26230a7fd5b4d9839fe37af0e88c8e24b8351e0efdddee85396fafc SHA512 44d4c078917582d34db0500ac4fdb69443de8055437c2f7ce9f3cabe7727f5cbba9a7c2a7cb42065ee3b5827e697241ddace66db292ec8a9036dc22cb7e91058
+MISC metadata.xml 467 BLAKE2B c98725373b16862b014fe930fa87d92dd9f3f75cb1b64bb2aa026115409bc5b3c29bd19eb15fbeea9fa4657117c5fedaed3bcabd3d00ab0328b47aa86dd367c9 SHA512 1d6d6796e7532f5ea01ce4169cf500cb26494ca1801e4a2066b16a72b5d45f92949daebb9528d814f94661e95344c0b729feacbf2c59964bbe77b788ac7c3ef5
diff --git a/dev-python/python-ctags/metadata.xml b/dev-python/python-ctags/metadata.xml
index 123026b36366..17a2cc790006 100644
--- a/dev-python/python-ctags/metadata.xml
+++ b/dev-python/python-ctags/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python-ctags3</remote-id>
-		<remote-id type="github">jonashaag/python-ctags3</remote-id>
-		<bugs-to>https://github.com/jonashaag/python-ctags3/issues</bugs-to>
+		<remote-id type="github">universal-ctags/python-ctags3</remote-id>
+		<bugs-to>https://github.com/universal-ctags/python-ctags3/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-ctags/python-ctags-1.5.0.ebuild b/dev-python/python-ctags/python-ctags-1.5.0.ebuild
index e1bae13e2d98..11636912c57f 100644
--- a/dev-python/python-ctags/python-ctags-1.5.0.ebuild
+++ b/dev-python/python-ctags/python-ctags-1.5.0.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=7
 
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
 MY_PN="${PN}3"
 DESCRIPTION="Exuberant Ctags indexing python bindings"
-HOMEPAGE="https://github.com/jonashaag/python-ctags3"
+HOMEPAGE="https://github.com/universal-ctags/python-ctags3"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 71c7bd4931a5..26576907007c 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,19 +1,11 @@
 DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
-DIST python-3.6.13-docs-html.tar.bz2 6016532 BLAKE2B b1aa4fea09f84615146a160ebfc7f2a40481397f25549f8935ea83b5dd5d6db83c0e8ecec94efa9941712186f93b8564fbda7a579550919bfe3ce47adc6c0a84 SHA512 7bdc77767211a652dbbe654cf9675e325a959d1d90eb751fa2f86abd04ddc41301d1035c8cf1a4968a8f23c97f95cf87b06763fd97f7844ac13c365b39dfcd8b
 DIST python-3.6.14-docs-html.tar.bz2 6022374 BLAKE2B 5c747ccc66ca9bf9d22368893d3be488a1e3cae4feff34557f8abe394aeb5b5c0038d8a0b319a903a38ad7cf0fd267486704e5e41d5db056472f03861b4a2a53 SHA512 a35525fd934e7e95a4e242fb7cfaa770ee42acdb4db40cbe8e40d77d73e98bf72ab02554f3733c884a73f7afaf28e079e0b37ba300134814cf9a08bb61dfee45
-DIST python-3.7.10-docs-html.tar.bz2 6289108 BLAKE2B ff751e3b847602f766389a4dc249bbb55776d91c7263a7b51b4699b3c65ab02a055e67c483d28a284c18b686086c21b2689a1b62373209a64dc102418d6fe26c SHA512 c303561ce3b758df1ee017ab8dad862adad116eedf1f2d0ed1180529e0af06526c9293810fe086f8223ec97b2c935cb08ca7e74bc20b9be93dc4e97909f5f561
 DIST python-3.7.11-docs-html.tar.bz2 6294193 BLAKE2B 3fe4794770e81ac92c75d3fe3d717770011d3ee5d98bc0ea67049450427b01924ff10ee41ef04932e4885b08f808bf0e1b8d2b09ead2b28303a25d2a9cc8db56 SHA512 c2e354df460b20cbcf49cde56a93070033dc8364f6678bcab62ffd66dbe9803447d5169c033486331351c2cc1dc7140879297e0ad1ce35c6788c94ad3555b283
-DIST python-3.8.10-docs-html.tar.bz2 6604538 BLAKE2B 270c53edc7917926a1fa065b4cd3cf8cb2e1334e55fbe8f7d1b6e52117b44da1e66d1e5ee240055b5f34320aa45145a38636201bd0ffb9751897e5060f987e90 SHA512 74a94ecbcba83f3392f08e36b0697f4213ff9118c68363706d0151c29c50fa12a0e61fd821bb1c16166833872a996e6b53126ba5c9e1c3aa606a57ade5086eb6
 DIST python-3.8.11-docs-html.tar.bz2 6603016 BLAKE2B 8488fdef3fce83c71140d4fec328a0564993b95a6d00307da3ace1c3c4447b0edf99e514cdb224cb06df14228748a7ba9355525a5c8afcc4bd4e27ba20530210 SHA512 8fb51867d2e0af1b4f6e39d24241ef5b8955f9f8bada31c4ee096e4148b0313d10eecb4dee3b6af4bef6ffb3e4e871465cad8d05b5974719936f110cc96fb792
-DIST python-3.9.5-docs-html.tar.bz2 6839136 BLAKE2B e05d327c858cb674463b8bbbed53cf92a4816a58275bb493b02c670696cc58c07735685f1e9e1ae39e10bae3c1fb4e253b29e096fcddb5f0a592ac9895fadf36 SHA512 74526fd849f8a8e50e9263f7963e4ef14635c994e8abb89ae6a096703a4a1807316dd1ea095ab33f0fde63f195cb6d94b5e1a523b34d35481441b4fd1d2b5701
 DIST python-3.9.6-docs-html.tar.bz2 6848664 BLAKE2B d5e84fc69928e304898120b172629cd724043fff26237908f2adfb13c9ffa11701a87bcd7091eeeee4ef5b2ade12c29781ea26554a7f4fc13fd28efe765b48cf SHA512 b9aa734e9616253278febc5f668ecb6f1d43bc824f84c92e3c13007441388d21e27edd4cb30c463739a271ffcbd8581d6d4573cfe693dca78623762bcdd5bf20
 EBUILD python-docs-2.7.18.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.6.13.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.6.14.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
-EBUILD python-docs-3.7.10.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.7.11.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
-EBUILD python-docs-3.8.10.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.8.11.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
-EBUILD python-docs-3.9.5.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.9.6.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
+EBUILD python-docs-3.6.14.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
+EBUILD python-docs-3.7.11.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
+EBUILD python-docs-3.8.11.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
+EBUILD python-docs-3.9.6.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-3.6.13.ebuild b/dev-python/python-docs/python-docs-3.6.13.ebuild
deleted file mode 100644
index 69cbb66a42be..000000000000
--- a/dev-python/python-docs/python-docs-3.6.13.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.6.14.ebuild b/dev-python/python-docs/python-docs-3.6.14.ebuild
index a957c58aad3d..69cbb66a42be 100644
--- a/dev-python/python-docs/python-docs-3.6.14.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.14.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.7.10.ebuild b/dev-python/python-docs/python-docs-3.7.10.ebuild
deleted file mode 100644
index 69cbb66a42be..000000000000
--- a/dev-python/python-docs/python-docs-3.7.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.7.11.ebuild b/dev-python/python-docs/python-docs-3.7.11.ebuild
index a957c58aad3d..69cbb66a42be 100644
--- a/dev-python/python-docs/python-docs-3.7.11.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.11.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.8.10.ebuild b/dev-python/python-docs/python-docs-3.8.10.ebuild
deleted file mode 100644
index 69cbb66a42be..000000000000
--- a/dev-python/python-docs/python-docs-3.8.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.8.11.ebuild b/dev-python/python-docs/python-docs-3.8.11.ebuild
index a957c58aad3d..69cbb66a42be 100644
--- a/dev-python/python-docs/python-docs-3.8.11.ebuild
+++ b/dev-python/python-docs/python-docs-3.8.11.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.9.5.ebuild b/dev-python/python-docs/python-docs-3.9.5.ebuild
deleted file mode 100644
index 69cbb66a42be..000000000000
--- a/dev-python/python-docs/python-docs-3.9.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.9.6.ebuild b/dev-python/python-docs/python-docs-3.9.6.ebuild
index a957c58aad3d..69cbb66a42be 100644
--- a/dev-python/python-docs/python-docs-3.9.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.9.6.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index 89a859edf624..058f45d772c6 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -3,7 +3,7 @@ DIST python-dotenv-0.17.1.tar.gz 31608 BLAKE2B fdddfa1c39282ceec03fc1569d9a7d038
 DIST python-dotenv-0.18.0.tar.gz 32242 BLAKE2B 6cbef7ea7278a3114b3eaea2ede0c68e2c6dcc3868f655dbcad9596ea6e1ec0b9f5d183a73fda32e53d348ae23c11ca3f9d2e8eadd974eea4dd13903b9f9c845 SHA512 4b120ee45602ce703ee360fb5af07a8854bcb1ecd9084057e00324b152cf230fa6f065b374b6eebbfb7069b32762624ea61dd5d2fa6ac62cb7e3a2bb6ddfc1ed
 DIST python-dotenv-0.19.0.tar.gz 32016 BLAKE2B c9f499abf99b3af8aafe7285347e08e61e770b1a5ca9d9b0cdf9dc306367c3f0492dae814835b637c9fd3c25d81006f78cbcf8d2de18bf7dc917e1bcdb0cb544 SHA512 6207f30e79ce13ccacc00ab1a95a1613317c2cc6bd735060ddca558b498c9d5c1c46ba76d97cdbb282c0f2695aed9346159ecbe08aa8a7c4f143a65708182806
 EBUILD python-dotenv-0.17.1.ebuild 699 BLAKE2B 30991868d0fe6e918e73ac6a627cb310221caf566dc6675086674fae634e0206c883ced4f34e89c8abc19518461ee41ffe880e9a18220f9a7e00a6c1c4171639 SHA512 4bbbfa7542acee21adf7f946904dcd56026186aa8737a5877b15c0d2af47efae1228b1956696fae57ca83c2b6a1fe2d35030ebe58c04164cde781bd824686c61
-EBUILD python-dotenv-0.18.0-r1.ebuild 848 BLAKE2B 3557a336eff3d9c640c3212673f1946ffb833f68e12494a791b241193a248ec2ac5bb2185c1f013677018d63c5d78e55b9045cd66d911077b2a409c555b205cb SHA512 2cc5e8277d3ee49d0b9fed4fa9234882f7b7045d646c069648f961bd52bd0642784c016cb64ff9ef9f33a782e1f14b3bf02f12c2e5e12d0d783b9096af3dcee2
+EBUILD python-dotenv-0.18.0-r1.ebuild 849 BLAKE2B 2bc460d75a0c4ec77be0206bc5aad3f067a6111b4de689a7fcbcd292e9f8e1d64ff8de7c04de5bfa1cbb055fd6ab4a78233ddda5aac74e8f1ff3ed78b000218f SHA512 77b731f7bb0f8d8247a8100c1ccb1251abb996ff486e5d70a835deea36b5a2ae9fcd719588e1732b332a757724aede48792151ab850e4aadad25bd56c6f1067a
 EBUILD python-dotenv-0.18.0.ebuild 667 BLAKE2B afa1384333768d7c865ee8c1410e7b2d54899c185fda2940d4dd05a184c78ef334be98db6c05cf093bfdcaf64293d1b4ae2123e036a78124d2f27d4a69013ac8 SHA512 5409f429cbb14e907cd20df27fffd4fc1b8c9ad7ac3a26fcc5ff6c99160baf5486f89a443ea96c0d062547ef4a8b49c92f86ae015a273b2e15cca581b7ae41de
 EBUILD python-dotenv-0.19.0.ebuild 850 BLAKE2B fc149c8425197954deac6bbaf32d30f146a5c932a22e7c9cbe90dc3f9e78cc05400a32ae449c5eadf83b8649b82063d585147997bca9027723b40f080fdf88b5 SHA512 01d909a7670238234c76f026dcb65ffedf5a5ed47b605aa9f683b48897fd14116c1ee6a007b8685514316de1aad6d50eec65e29c336dbf086b31b3174c22ddb6
 MISC metadata.xml 465 BLAKE2B 9b67c317b80cf8956d86e3482f9bd4b8824013c758e13c53865c4c8b428127a39188b23776176e038b4e58f8eb4e28b6ff7030df75a300bb647f969ef979a551 SHA512 f4bbf11566f50c90aeb7684755651f9112d3ce12dbfc425aa209eeff7c5a2636688a9236bd5227961cc334c07c82f49da0f4f27c3189bb7a0a8f76b517e9036f
diff --git a/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
index 6e5625da2f43..9c19ce5b8174 100644
--- a/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Manage .env files"
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index 60c7725d82ce..237c4acf63c9 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,4 +1,4 @@
 AUX python-efl-1.25-clang-crosscompile.patch 579 BLAKE2B d308bf06950094a00fbbad24f4813b6dd511122071328f01ab2bd774ba1cd79cca7cddffc8dad4d65c8cc83430f99d59a55dfc2a5d4805a54f62ae0ece880a3f SHA512 3da1b63c7d40dc8027db5bcd6ab165789790e4db8c3ad876d55eda9363557cff8a46858a2ca8c23d1bb8e1e43bb7b057ff596aebe7adb2c40f3bb18b37e71225
 DIST python-efl-1.25.0.tar.xz 9543920 BLAKE2B fc2b951ade2fc2b7c32dd78a84800bc9f225499ee9d8431034b378c86e423181d918aba2c4d056974f3aa2df9cfb9c7b3dcf1c366362387048cde182c0b3128a SHA512 23ed29add25cd2639e9eb144f22c5e2809b8634389f7ab5c4b7ebc19302fde4ebb0fe8c41d7b10923e658676c4dfbb8670fda16675682fd376258beecbc3d9c3
-EBUILD python-efl-1.25.0.ebuild 1802 BLAKE2B baed68f8455bb510b5c330e5c74ecf3146d87736cba66eb1fc756d986f16c6b9c27cc89c2697232fbc0fb38059f54f411bd72af960ac927886c9a7d2adbeef54 SHA512 e9711ba46c3c6bc22f862b75a5008dc5cff3584d67044459bf8455689f97434bd267731ecc4d044fa4d08f925a14e9c693218a2946c9a52e484481586dbd7c98
+EBUILD python-efl-1.25.0.ebuild 1809 BLAKE2B 93fce1140f0d41d992725805df87be45324b00f673ba54bc629e1bab6f1aa4908a69f8fe1c6464d5805cee55aff3a9bf8dc3d2faaf1f25c2f13aefeddb73c77f SHA512 a1fa37dc4ac7486f952a7c8b23dcd5689b8c3bc58f23eff1b632eb7d4f2fc764f2a5770313e0742353c62c16e9b005014ad56bc52ff62f1da45a3c9a517865ce
 MISC metadata.xml 643 BLAKE2B 75acbf33cb36cfad418051c1ef0c4afc2906cbcad599ad13e82a38defbfdf50458582229ec3f04fd98bf834b23d20be8fd248b5a2e9853b9509e1e2065af021d SHA512 83cff66b4f08aebd492d61f953847098372c8b4a118fb8e20cb746b4fe0c6113baae569a462362dc7203c9d6fae04cead12ad6970547a951b75a8a10fd53f7d8
diff --git a/dev-python/python-efl/python-efl-1.25.0.ebuild b/dev-python/python-efl/python-efl-1.25.0.ebuild
index a9b38a6c4925..28433bf1957c 100644
--- a/dev-python/python-efl/python-efl-1.25.0.ebuild
+++ b/dev-python/python-efl/python-efl-1.25.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 2b12287d3cbe..8bf41cc03fa9 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -2,8 +2,10 @@ DIST python-engineio-3.12.1.tar.gz 37158 BLAKE2B a3f75b0ec197248029a2a257eee7694
 DIST python-engineio-4.0.1.gh.tar.gz 296000 BLAKE2B dc3b2c3f25ebbfb9d795e3c08e82b2e001fbc785dfb1666f137d8b261b65a90a15af7527917bdd9c636f076f75e01c65b498145ae5051649e1264eb9339d9f7e SHA512 83886ed1a60465127b7eb42a8437196cd68f4c538076237e4f64ff36f6fb02d1e45bd6730d4bb6209c931e05b4c2e10bae60451d1d4644071178ff44a73805e9
 DIST python-engineio-4.1.0.gh.tar.gz 296431 BLAKE2B 5ab267aba4dc6e49d26166b661da5b40961d328efb92dbcb653a405f62956f33b28dbf48cd891d0e74314da998be477f917dd6eabdf154877cd80077e4172c9f SHA512 5dea0ffc24138664216eefd6f917280d6199e4c2661a2e41622bb7f4cf03467d60d555e5c28ba23c35f59ae8b549902d235308242bbc5607ac91fd61580e0c4f
 DIST python-engineio-4.2.0.gh.tar.gz 297410 BLAKE2B 140dd21e779fd89f4d94ee3d191f0b661fa9dab2fac86c1023039afbe83d5136206add52ad412148eff69e79c84b7a8ad1744b3b2c69e02a270373c8c4a38488 SHA512 02eaa5b03045ac1ba73dbcd8c7c7853526234afb61dee6de45ee18bdf3663a2f82f9a5c969fb679e3eb8ccfe5a959434d574c59648b23d3e8e876d22f90e0591
+DIST python-engineio-4.2.1.gh.tar.gz 297657 BLAKE2B 0a634cec9f71a3b8659e5b07cc326fb3d7801c8a834248d6f2ea5a48bcd058f8d0b86c2e43c110ea18ef641e3ace273a2ebd20f350aec9360d38ffe0f32f2778 SHA512 f0ea7cb0a34f49d2e3de58dc1038f41cda099fba0033af7020b9ccacd34fbf44fd1613ef14d4d05013dd99a2d35330769e6c3d2f532556fd39262229e40714f6
 EBUILD python-engineio-3.12.1.ebuild 737 BLAKE2B f8ee47b26152d15b8bee1b25743ac1a4a98e725f7426124f5c7783bd3fb1a67926f099e72823a56c04b846fa994c21a0d6535e08d7a778139d725e00d8c68887 SHA512 8fb54dc01b1df87fc841245f986b8548207329c1d6cbaf74929d1417d4b21db6032d88ddbbf7b6c24c3d01feb6b3c4a8f7699510cd8dd6cc67a6814070a902a7
 EBUILD python-engineio-4.0.1.ebuild 808 BLAKE2B 9b97a4531a5bcb3308f93d6b8a165856a602c210350f6f66d7ae24278bf6e42c1f4df02a611f4f89081992952982b536f48796b7bab1aa1db609ad9848560cb4 SHA512 f57984d627b39e7e5beca8b4256df87d2e4234bff1891c2d34703c36850171de6a0c43be1461f374be0cebd6436f9cc4b3f18075299005337b5612b9d9e320c4
 EBUILD python-engineio-4.1.0.ebuild 807 BLAKE2B 691d02082918708a0ba6528a59e8bdfb568e57d63cb6ffa27258cab98c64a76f55ad1fd6aa512415465ce4c82d378e7e7bf641041c0e7bf4d7963cfcb9f62a81 SHA512 bd636c0c9495e25a2dc88ff154109c406133eca6c1adfd45878a32a821c403312f5c7a26dd26f9dff125e7ccea75476ca5edf473b4769dc44bf1c0ebda8757fc
 EBUILD python-engineio-4.2.0.ebuild 807 BLAKE2B 691d02082918708a0ba6528a59e8bdfb568e57d63cb6ffa27258cab98c64a76f55ad1fd6aa512415465ce4c82d378e7e7bf641041c0e7bf4d7963cfcb9f62a81 SHA512 bd636c0c9495e25a2dc88ff154109c406133eca6c1adfd45878a32a821c403312f5c7a26dd26f9dff125e7ccea75476ca5edf473b4769dc44bf1c0ebda8757fc
+EBUILD python-engineio-4.2.1.ebuild 807 BLAKE2B 212977b70608d0b322fe88498362ca449e47444aa27132658fb177f7b6913827b85d90affce8cd3a08e5b479a6a69012ad0b6bbd02a0fc7a7a57f5e4f2b32579 SHA512 bcd943f8c5e7b098508ee143951ac56f477e6ac256467716f70d125f35b491ce8a9879f0e70dab5884f3d468993c361cb643f24fdec0bf0f1a11495034a6aeff
 MISC metadata.xml 517 BLAKE2B c4eef9b286bd64542def3d6155741d9763f9757c847671448f926666c65e6ce3ced2fb0a5adc75885ad2379b6cf4eabf85bb40c55de7b58e1cf51ca4500609cc SHA512 75fb14f0e068c12ca86262ecccac67ffdcb5bea5f84b6d4b6290ad25a73b7ec0289c478bc5afe4f08123aabd2fb72963e206cdae9fc980fe540dfc8d2ed28b64
diff --git a/dev-python/python-engineio/python-engineio-4.2.1.ebuild b/dev-python/python-engineio/python-engineio-4.2.1.ebuild
new file mode 100644
index 000000000000..3fba6ef7d60a
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server."
+HOMEPAGE="
+	https://python-engineio.readthedocs.io/
+	https://github.com/miguelgrinberg/python-engineio/
+	https://pypi.org/project/python-engineio/"
+SRC_URI="
+	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 2fd5ced8d80f..16583db96dcb 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,6 +1,8 @@
 AUX pyls-fix-test-with-pylint28.patch 9964 BLAKE2B 8f8f4a2a874f0f4a3b146463301b997b82a0b05d662451faf77994ede1057f7be71e2916d74944e0b30fb6d6c0d7b7a9bf5eb651085033b2279974d2005191a2 SHA512 248bfc639c6e534ddaa7775ec09e8c108e1ab8b071b99e2b9fb855c22b9427112a6e46e6f9261150700ecc752206c36a99398973bc8a10b48587f12bc42bed7d
 DIST python-lsp-server-1.0.1.tar.gz 56835 BLAKE2B 430e215b7d65bff2008136783539c262ee201d651bf83750333d41353483882fe7a603208c2725c89530a34cef22e73fe1ef26ec80fe7fb42d2df79eae511528 SHA512 bf116d92bdebea41e4f6647673d390887d84be70d612b92b8c3973aa55db4b151c1188b06fb8e3b6dccb814fd22f938572e998f0b1329bf0b69d0e4750b8f5f6
 DIST python-lsp-server-1.1.0.tar.gz 58194 BLAKE2B bc1d542e90a1295e7bddf68d366a738b371895a453e8fb7de5b0d688c49b45b9c3441d479c1f760291e32eedc6fd42cb5ee0966ed32a10ee7f883dee3559932f SHA512 fd9f1985bd55f93740671e83696b02567b12b9b77db14c495482494d23f0a73b2048d99fce9c1be0b7d7c847f213a681d379c342d128a95cf40bd3ffeca9766f
+DIST python-lsp-server-1.2.1.tar.gz 61448 BLAKE2B 28294bf1f62a4fd0bf7b32b51a34b6206551614523130d7bb11f7f2e0175d4c061decada8c4f7713dc6c775f09f423d2c622d17354307faa557a48f5db2cdad3 SHA512 7a82af96508db943699ae63c90576205fca78e2ff47093934f26d9c5547199753acbc83ac0bdddb00d373761bebb31b5b869a9a02f734a5a4e033e7f024bf2d1
 EBUILD python-lsp-server-1.0.1-r1.ebuild 2785 BLAKE2B fb1f120ef5169cb5dce27b66b8b82581159fc7bd00d2a8154d96052ef92d92027a7cab629c3956d3531da3094daa638bf38c6ddacd98b852d03c0834bd59ffca SHA512 91fa8f63c97b151189e40680996d8e1a1f8e2db9221eae9c9b235a6dcb7734d6f5528f261f15dcaa062fbdcc6a9b4dbbf3f5f30f9a838f404f7bf7c3b7000db9
-EBUILD python-lsp-server-1.1.0-r1.ebuild 2832 BLAKE2B 00d5fb78a80f07885f952864cc14c8e9126de6011f879c4e8caa72c35ffb3075df242c6f4c9f156931f98d41bdde204ad578bb68bf4ef2d56c40a1c853249e83 SHA512 fd81294a4a46fc6a20047b8532cd0ecc538bc0d19ff1ff7fdf989f8016d107d7a2e6719f3b49c87cdd11effc726b5420615be03698502c80c6c85388813a140d
+EBUILD python-lsp-server-1.1.0-r1.ebuild 2830 BLAKE2B 8d17983a23a937269922c0d32935e895719aa6d9c51af09f6f513e4717fa275510147e29c89aca8c2105fd8ed314f6e47bae3189328bb30f658240a6a48ba6a1 SHA512 3e08152aefb7dfa35657cc20f7fbe2b798afddba530d295cda049dc8553917013be5f74906d5cf0a9aa8e2a56fef25a6b5fea9cf5d1671f1b9696824a77c8e20
+EBUILD python-lsp-server-1.2.1.ebuild 2832 BLAKE2B 83583067841de47a542fa5d51de49e8ce69537211519aa055b593b90cf45c3255f13661e3427f1d5a101a1479c9feb0f1ad8e9192bb4a11588f8c5d70c84a3c9 SHA512 e65571aa55a1bb32f9eee8d95d792fe126d61097b8a2136cb6e68aaf80bdb15d8b0b52d30f141d0c155f50c7b762ba936bc673af74ca6450bf05a3314cb2869d
 MISC metadata.xml 541 BLAKE2B 1c86ef694fd93a9fc531d0f76f919e7cea42cf21a5012dbcfdcb543254541bd66a4deac7593441f5efdf0bca3fbc4f51953303e1391f6f812813b6ab9cf69869 SHA512 9dd78ed4f786f574e9fe607a87134af82fd59934ef35a23183444e3309b27e3341a9288819558de194db037bb0fd02effe1411bf9d93d748b546eb07c038395f
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
index a81825d5a49e..648b4fb72439 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 IUSE="all-plugins"
 
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.2.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.2.1.ebuild
new file mode 100644
index 000000000000..4cbf60e4f655
--- /dev/null
+++ b/dev-python/python-lsp-server/python-lsp-server-1.2.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python Language Server for the Language Server Protocol"
+HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="all-plugins"
+
+BDEPEND="
+	test? (
+		dev-python/autopep8[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
+	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	all-plugins? (
+		dev-python/autopep8[${PYTHON_USEDEP}]
+		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e '0,/addopts/I!d' setup.cfg || die
+
+	# This test is continuously breaking
+	sed -i -e 's/test_folding/_&/' test/plugins/test_folding.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
+	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
+	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
+	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
+	optfeature "Python docstring style checker" dev-python/pydocstyle
+	optfeature "Passive checker for Python programs" dev-python/pyflakes
+	optfeature "Python code static checker" dev-python/pylint
+	optfeature "Python refactoring library" dev-python/rope
+	optfeature "A formatter for Python files" dev-python/yapf
+}
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index e8795c903f32..417477df7c22 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,3 +1,3 @@
 DIST python-socks-1.2.4.gh.tar.gz 32192 BLAKE2B fa06f9158348292bef874c81623c11a54556db9c36cd7428d7a835428d152f3a4925d59e14d87518dfaae9e6937324e35db99bb5e1000f29fe9caf11fa2f8318 SHA512 6e70d8d98b2901e97250d30b350002944d979356bb6cd7dd4022af420e166076259a7b1aa4845d771243b18ab3f06ee955f07482c527835bb0135f0622d804be
-EBUILD python-socks-1.2.4.ebuild 860 BLAKE2B 520446e3d15de92ab16829284ae0a2f947fd735cd1a73315ba58eaa019590943e82744e68258929ddf331679971d1e132c1b830ab151902a0abb723681094a33 SHA512 3a5cabde8de4502523a60fb29ec77da0115aef42592c9010364211eea75c80e547396e1f289c1da14725985b0768a6afc37712f6e72afb274db039ccfaa5ae06
+EBUILD python-socks-1.2.4.ebuild 866 BLAKE2B 8b14359c34a4e82c6bd8c55d52073cf0017950fcc068d5629fea9319a59289a3b2a1c3a1b586512d414e376a3eed19732622ca8aac2217df90f55fb507e452ee SHA512 9c71273fc1d164995de5d7ad48f806b7d9f864188e4690b3018e42252dce373bb2d5c728ef79d7aab706c9a2d2f2528fca23ac615af9b6fce2da274100333637
 MISC metadata.xml 379 BLAKE2B 837cc3435249b88e94e6b35aeb9ff95ca1e88160f4f2352acfc353fdb0891e361d376f3278207e9bea3eca1742f634ae3dd165d9c48c3ba4a4c60df7137172a4 SHA512 9d81d94484e23f22cbeff22a0d8f19052b01c60713295d9d3aa40ecb250255dda4096588201fd0f30b2954ce81569e66de1ed0f88e6ea9545c0210259fefe3a0
diff --git a/dev-python/python-socks/python-socks-1.2.4.ebuild b/dev-python/python-socks/python-socks-1.2.4.ebuild
index 63ec12cd3af5..6e9be2bca66f 100644
--- a/dev-python/python-socks/python-socks-1.2.4.ebuild
+++ b/dev-python/python-socks/python-socks-1.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9}  )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
diff --git a/dev-python/python-xmlsec/Manifest b/dev-python/python-xmlsec/Manifest
index b93336acf444..23271fc2799d 100644
--- a/dev-python/python-xmlsec/Manifest
+++ b/dev-python/python-xmlsec/Manifest
@@ -1,5 +1,4 @@
+AUX python-xmlsec-1.3.11-fix-xml-testfail.patch 879 BLAKE2B 3d655b40a67b44a4abd65188c6d719e12063e857942fdb112b47da38977864252e3d250e0bbaf5c86f4688bb7701aae89df444c4fef0e3f0eaffc98fe5b6b856 SHA512 8c8f9af415dc9207e5c0599ee958dff6558618f94a9cb3c583b1c9eb6d1de251d714edf1afdee581cb33c7543f88c54d36af9b6f903fe31994a86f1b602e4c75
 DIST python-xmlsec-1.3.11.tar.gz 75023 BLAKE2B 87fe4b47a9df6bc2fb2f1a459fa20240d9d5c92e0f7fa9bfc466e1fbfc0e3f12d90d01f5c7a6eac1389ea3252b8267a545203edf34c30117573bada9a7f5481a SHA512 fe0144d67edcad366b1d0f4615983f5630afd8f22aa056f46d1e6564f1c3114c0a469675e64a06591540515b0d12b5bf9304845f5138b24e15acaf4e5b861961
-DIST python-xmlsec-1.3.9.tar.gz 75465 BLAKE2B 32aa8bcc2a17e1164fab6ebf37b47ad64bf8164a5d5cc5929571c32715e37d22143f996afc75c8a73a08e0a0a07d74ce1f8e405731260c1bcdb26c7ccb5faf25 SHA512 3c212c409430297a85316e0c4f7f704be112dfda323fd0300b7d70de812d90dd4681c6a5a3cc0314d1937ebc4f8e012fac7f787bccdfb2dc699d5d6f17316b38
-EBUILD python-xmlsec-1.3.11.ebuild 900 BLAKE2B c9349e0e28ed592fe1730ed17602d08b7a5db7dcc65f40836ef92269f724c819b1c1bf8e276e3f37ddf2ce79f078811dce52d8a0e99ef899329352f564da7ece SHA512 1e0cadca1655874b204dda456b54e53b7b6af51462416a687c94ae64e5a0eebfea0ce1aba30f59ffed566ee891a0c1244ea3957c10edf92fa5d622c264fb7e05
-EBUILD python-xmlsec-1.3.9.ebuild 900 BLAKE2B 732c28c6233267dfc04033c300b0b6966c0e69833317e966d47d0fbf8734246389f33c8bbc119e8e9e7f569fa893aac5d5137b7812c2836485ace4f5512c33d3 SHA512 90f29b20a98a541ff3a849fd6cf64339284046e9bff72e1635c9e54057c0d45aebf356fd0fabc610b1f60f06204d53ecb777c57000e83f6d3f7c70680b171c09
-MISC metadata.xml 318 BLAKE2B 1e735a969ef22076ee423f1b4a02cc1fd7207d3ecf99065b970dca3a5e335c261bad5ff081edec59e19f5600f516eb79e9759b8677ffd3204afb688ff43f4d17 SHA512 9eeb6edafad382e54d31fcdd02da868cfd0efcb95aefe7f89e7fa59d9b4031d06895219dc331badc2319dd3fa57764a640ffe9dabbc3b70f6d686901ed391a74
+EBUILD python-xmlsec-1.3.11.ebuild 901 BLAKE2B 77245e435fbb4741bc130aba61316959bbf93fb86c653e5ac2a4fb033110234da53dbd77d82f6daa462895e3f7a8fd4725b56521f2827051ffbba03a647a0c70 SHA512 13491d16a271099ed556ce155e9080d58df08a89bf9be6fbb67180ce479096088db3e5a7a88944f10da7eb5a2d2616a96969121afa19afa7a77d9411af9f2190
+MISC metadata.xml 419 BLAKE2B 1ee41309bea90a61f4b702e42e022c17861d70a309db059a27666514a678ca179770b68a8598589677126ae84950bacdca3d07aac7741b9c96b4ab5a82a27921 SHA512 39dc93ff456cc9e5436ba27035a2c8a296cd2e1235e2ded63a83a3003b0b2d152f6d7f13a12734065326f4b0652934e1138ee6d0a0f4c8b47b397bfab892ee68
diff --git a/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch b/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch
new file mode 100644
index 000000000000..3e7ab8829c2f
--- /dev/null
+++ b/dev-python/python-xmlsec/files/python-xmlsec-1.3.11-fix-xml-testfail.patch
@@ -0,0 +1,23 @@
+Taken from: https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116
+diff --git a/tests/base.py b/tests/base.py
+index b05de1d..5ec356f 100644
+--- a/tests/base.py
++++ b/tests/base.py
+@@ -94,6 +94,7 @@ class TestMemoryLeaks(unittest.TestCase):
+ 
+     def load_xml(self, name, xpath=None):
+         """returns xml.etree"""
++        etree.set_default_parser(parser=etree.XMLParser())
+         root = etree.parse(self.path(name)).getroot()
+         if xpath is None:
+             return root
+diff --git a/tests/test_doc_examples.py b/tests/test_doc_examples.py
+index 2fc490f..53d2377 100644
+--- a/tests/test_doc_examples.py
++++ b/tests/test_doc_examples.py
+@@ -42,3 +42,5 @@ def test_doc_example(example):
+     """
+     with cd(example.parent):
+         runpy.run_path(str(example))
++    from lxml import etree
++    etree.set_default_parser(parser=etree.XMLParser())
diff --git a/dev-python/python-xmlsec/metadata.xml b/dev-python/python-xmlsec/metadata.xml
index e5523976e0c6..23c0e46965f2 100644
--- a/dev-python/python-xmlsec/metadata.xml
+++ b/dev-python/python-xmlsec/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">xmlsec</remote-id>
 	</upstream>
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
index 2cdbbac944bb..a43d02473ec7 100644
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
+++ b/dev-python/python-xmlsec/python-xmlsec-1.3.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the XML Security Library"
@@ -23,11 +23,13 @@ RDEPEND="${DEPEND}
 BDEPEND="${RDEPEND}
 	dev-python/pkgconfig[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
-"
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
 
-# tests fail, has been reported upstream
-# https://github.com/mehcode/python-xmlsec/issues/84
-RESTRICT=test
+PATCHES=(
+	"${FILESDIR}/${P}-fix-xml-testfail.patch"
+)
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.9.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.9.ebuild
deleted file mode 100644
index 0a857cf27929..000000000000
--- a/dev-python/python-xmlsec/python-xmlsec-1.3.9.ebuild
+++ /dev/null
@@ -1,40 +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="Python bindings for the XML Security Library"
-HOMEPAGE="https://github.com/mehcode/python-xmlsec"
-SRC_URI="https://github.com/mehcode/python-xmlsec/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/xmlsec:=
-"
-RDEPEND="${DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-"
-
-# tests fail, has been reported upstream
-# https://github.com/mehcode/python-xmlsec/issues/84
-RESTRICT=test
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s:use_scm_version=.*:version='${PV}',:" \
-		-e "/setup_requires/ d" \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python3-lxc/Manifest b/dev-python/python3-lxc/Manifest
index 59fae50e8fd0..93b89bdf630a 100644
--- a/dev-python/python3-lxc/Manifest
+++ b/dev-python/python3-lxc/Manifest
@@ -1,4 +1,4 @@
 DIST python3-lxc-3.0.4.tar.gz 27278 BLAKE2B f549ffb94c2bc331e0628a344432d4699aed64de466b0d1e9e4338cee8252ca9f5defeb2c940bd29723e20aede23d8a33bd1bdfe57874069e8cc5a61bfe9bf4a SHA512 37660fe97a2171cc3346c31e736ead8a38e328bfcbea621d6b563042fcd1e70c48b97440f6263fb0f6f02a4f1704af2241661bc526921c124a6456c06a497828
 DIST python3-lxc-3.0.4.tar.gz.asc 833 BLAKE2B ed44e595fc7ac3d7c4d64f8a84e78cfe48428299015d7c7c8504301d98511b644ede378feb8e1947e4007f43e97ed4e9aa35b1d1456ae108818b3696e1bdb44a SHA512 5c1faf28545ce26047cf3bd81f90aca48046f63c5d5dd0c18b9a2575cc0735f8a45dea6a78bf4674b9092b82012b26080db727f7afaf1c856edc7ef4dfe5486d
-EBUILD python3-lxc-3.0.4.ebuild 664 BLAKE2B 5a6e133f4733f54aec4315a3e0214259f204b32be520916d27268220a6eda5a99fb1c00add770db7b964504e028bf6fe10a0cc77d3a9ff81c991e86f0ca6ffbf SHA512 f49fae2d5c8496eb6d45e6fe92568cc76de9210670992f8a43473032ab966d15f438600a4e41ce06216b0b8fcc260b8376d0a0db3b5e5fbf3158c70c980e61df
+EBUILD python3-lxc-3.0.4.ebuild 671 BLAKE2B 5fcca2b4e996ba953e85baf54aa51b0584e6d5c0b52bcdd0f4b1929e9ffe7a839dbd77afbb2f985c1e439a5b89aad6e9d02298f50f45227450fce64fca559398 SHA512 8efa1cb91bb7a5b9402c5a97504c4b132fa43460d534bae84e30b8f6880d11c489780a66b23c8fc00ba207a5ea63d58d5c8c0b7e25964f46fe680edf6c58fc40
 MISC metadata.xml 361 BLAKE2B ac875639b7fd2af373b46fa94f9d89755785417ab97ad2b89c3d795aae4d64516fa03c4d65d0872cb1f8b78e320f53dd71995b2a8a97f14420ecc6f8b0feeeb0 SHA512 8930d025f9924645eaf87661d863f6a049aa15fd9f965dc0ed483f77c37354f0fa075d00b19677bdb038bc122311ebb890d321453e0073e106554fa02aa3a589
diff --git a/dev-python/python3-lxc/python3-lxc-3.0.4.ebuild b/dev-python/python3-lxc/python3-lxc-3.0.4.ebuild
index f050740ec7be..0a65749e4421 100644
--- a/dev-python/python3-lxc/python3-lxc-3.0.4.ebuild
+++ b/dev-python/python3-lxc/python3-lxc-3.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
@@ -14,7 +14,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="verify-sig"
 
 RDEPEND="app-emulation/lxc"
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index dc758223a625..9a3474b5ac2a 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,5 +1,4 @@
-AUX 0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch 4179 BLAKE2B 376165750100ca16cc1ce21825b4ada44f90847f0b126d1fb96e9afa8279f3629e89470a2fdec0a12a1a855896aedacdbea64b799f7e929da3fa0bbe3b076630 SHA512 5300db08820cce2584da4a4f5e45ffd7d047d5dd0e5cb9bada7e967bb894e07d86760241db437b16973d1ea47d80bd94bcddd1be2435886b1767a0f19384350c
-DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1400 BLAKE2B 724a95ef3761f1cb510bb042845387325232a4609f9ab7afea8c4a906fecd73845563502d14edfaa4af2b66f984feb184799ab8c36272ab7745f915c0f7bd056 SHA512 928fd86f7c2ebbe729cdd0d72a4fbdf40ff80a89aabe48fea11147db21dd29121a30605eb675cd7e3a4fc962ad005964484fa9e8924abb2373ae23d12c186f3f
-EBUILD python_orocos_kdl-9999.ebuild 1310 BLAKE2B 8e41e13c28d81cc86b6ca77514acc19c58357ad8adc68c14412c84f21ec55234167f3b5bce60abbcb379c0f6b996a70e53edb9cc8475b711ad5d225b79b6275a SHA512 8198ca14839732d79abce5770e13514906c8d6720071fee028d2c9fc6b953a42b8b7101eee7f3db56d115ffa9e2cde6b8c1746915f844add45fc22521e05bcec
+DIST orocos_kinematics_dynamics-1.5.0.tar.gz 251515 BLAKE2B 53c14354b0833867b6fd030cde91c9524b6f0537ea0d0f3977e7aeb8482030edd5723a571030e8b78e4d6d01eba38c6a8e5c49d66c49c4b1b0f2e7a3d8159c74 SHA512 5fc9c336d6ed31ad59a5bdf6ee06444cac29beae090b9026b34f35a3cb4cdf1cd6c33af621205b8d6a5201070e679531c8b5bbdeb8a91cd1d8061153b0e47e49
+EBUILD python_orocos_kdl-1.5.0.ebuild 1399 BLAKE2B f9179d56590c3b0d70f4b120a7da4a708ac14bf8598b5eef1d46cc0cecce8eed7e2f50ade56d6462b98f4b4781ee1ee38dc5073603adfdc3beadc918f8c14278 SHA512 0ca959bd0a395465ef85d3dfc3948b22e6cc142818a35b2a03e7b7d7c59ca8f8ff5ff951cade3a85d363700a8e43fd6921d4779d7373199d7e9a9deea3e197d1
+EBUILD python_orocos_kdl-9999.ebuild 1399 BLAKE2B f9179d56590c3b0d70f4b120a7da4a708ac14bf8598b5eef1d46cc0cecce8eed7e2f50ade56d6462b98f4b4781ee1ee38dc5073603adfdc3beadc918f8c14278 SHA512 0ca959bd0a395465ef85d3dfc3948b22e6cc142818a35b2a03e7b7d7c59ca8f8ff5ff951cade3a85d363700a8e43fd6921d4779d7373199d7e9a9deea3e197d1
 MISC metadata.xml 347 BLAKE2B f798f437c41d07bbcf1918138506db38727087f9437d0abb5082bde5802cc5f7a29173d788fb8b8b8f6c150f5f1c642795dbde30e848512e6d1f9ada39a951d9 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074
diff --git a/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch b/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
deleted file mode 100644
index 6c8d93ed62e7..000000000000
--- a/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-https://bugs.gentoo.org/728618
-
-Backported by Victor Mataré
-
-From 30e5057f01627539dd170a1e831bb14278433deb Mon Sep 17 00:00:00 2001
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Fri, 26 Jun 2020 17:04:12 +0200
-Subject: [PATCH] Declare assignment operator private for SIP (Closes: #260)
-
-Starting with v4.19.23 SIP expects a working operator= or one marked
-private explicitly. All classes in this PR have a reference member
-(&chain) resulting in the compiler deleting the default assignment
-operator. This PR makes this known to SIP as well.
----
- python_orocos_kdl/PyKDL/dynamics.sip |  3 +++
- python_orocos_kdl/PyKDL/kinfam.sip   | 29 ++++++++++++++++++++++++++++
- 2 files changed, 32 insertions(+)
-
-diff --git a/PyKDL/dynamics.sip b/python_orocos_kdl/PyKDL/dynamics.sip
-index e0096dd..36f833c 100644
---- a/PyKDL/dynamics.sip
-+++ b/PyKDL/dynamics.sip
-@@ -72,4 +72,7 @@ public:
-     int JntToCoriolis(const JntArray &q, const JntArray &q_dot, JntArray &coriolis);
- 	int JntToMass(const JntArray &q, JntSpaceInertiaMatrix& H);
- 	int JntToGravity(const JntArray &q,JntArray &gravity);
-+
-+private:
-+    ChainDynParam& operator=(const ChainDynParam&);
- };
-diff --git a/PyKDL/kinfam.sip b/python_orocos_kdl/PyKDL/kinfam.sip
-index d87fd00..e87ceb8 100644
---- a/PyKDL/kinfam.sip
-+++ b/PyKDL/kinfam.sip
-@@ -344,6 +344,9 @@ public:
-     ChainFkSolverPos_recursive(const Chain& chain);
-     virtual int JntToCart(const JntArray& q_in, Frame& p_out,int segmentNr=-1);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainFkSolverPos_recursive& operator=(const ChainFkSolverPos_recursive&);
- };
- 
- class ChainFkSolverVel_recursive : ChainFkSolverVel
-@@ -357,6 +360,9 @@ public:
-     virtual int JntToCart(const JntArrayVel& q_in ,FrameVel& out,int
-     segmentNr=-1 );
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainFkSolverVel_recursive& operator=(const ChainFkSolverVel_recursive&);
- };
- 
- class ChainIkSolverPos : SolverI {
-@@ -392,6 +398,9 @@ public:
-     
-     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainIkSolverPos_NR& operator=(const ChainIkSolverPos_NR&);
- };
- 
- class ChainIkSolverPos_NR_JL : ChainIkSolverPos
-@@ -407,6 +416,9 @@ public:
-     
-     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainIkSolverPos_NR_JL& operator=(const ChainIkSolverPos_NR_JL&);
- };
- 
- class ChainIkSolverVel_pinv : ChainIkSolverVel
-@@ -420,6 +432,9 @@ public:
-         
-     virtual int CartToJnt(const JntArray& q_in, const Twist& v_in, JntArray& qdot_out);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainIkSolverVel_pinv& operator=(const ChainIkSolverVel_pinv&);
- };
- 
- class ChainIkSolverVel_wdls : ChainIkSolverVel
-@@ -506,6 +521,8 @@ public:
- 
-     void setLambda(const double& lambda);
- 
-+private:
-+    ChainIkSolverVel_wdls& operator=(const ChainIkSolverVel_wdls&);
- };
- 
- 
-@@ -520,6 +537,9 @@ public:
- 
-     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainIkSolverPos_LMA& operator=(const ChainIkSolverPos_LMA&);
- };
- 
- 
-@@ -546,6 +566,9 @@ public:
-     const JntArray& getOptPos()const /Factory/;
- 
-     const double& getAlpha()const /Factory/;
-+
-+private:
-+    ChainIkSolverVel_pinv_nso& operator=(const ChainIkSolverVel_pinv_nso&);
- };
- 
- class ChainIkSolverVel_pinv_givens : ChainIkSolverVel
-@@ -559,6 +582,9 @@ public:
-         
-     virtual int CartToJnt(const JntArray& q_in, const Twist& v_in, JntArray& qdot_out);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainIkSolverVel_pinv_givens& operator=(const ChainIkSolverVel_pinv_givens&);
- };
- 
- class ChainJntToJacSolver : SolverI
-@@ -571,4 +597,7 @@ public:
-     ChainJntToJacSolver(const Chain& chain);
-     int JntToJac(const JntArray& q_in,Jacobian& jac);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainJntToJacSolver& operator=(const ChainJntToJacSolver&);
- };
--- 
-2.27.0
-
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
deleted file mode 100644
index 7843700bedee..000000000000
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
-fi
-
-inherit ${SCM} python-r1 cmake
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
-fi
-
-DESCRIPTION="Python bindings for KDL"
-HOMEPAGE="https://www.orocos.org/kdl"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=sci-libs/orocos_kdl-1.4.0:=
-	<dev-python/sip-5[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch" )
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	S=${WORKDIR}/${P}/python_orocos_kdl
-else
-	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
-fi
-
-src_configure() {
-	python_foreach_impl cmake_src_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	python_foreach_impl cmake_src_install
-
-	# Need to have package.xml in our custom gentoo path
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-}
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild
new file mode 100644
index 000000000000..a3114345ba43
--- /dev/null
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.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=( python{3_8,3_9,3_10} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
+fi
+
+inherit ${SCM} python-r1 cmake
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
+fi
+
+DESCRIPTION="Python bindings for KDL"
+HOMEPAGE="https://www.orocos.org/kdl"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=sci-libs/orocos_kdl-1.4.0:=
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	S=${WORKDIR}/${P}/python_orocos_kdl
+else
+	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
+fi
+
+src_prepare() {
+	sed -e 's/find_package(catkin/find_package(NoTcatkin/' \
+		-e 's/add_subdirectory(pybind11/find_package(pybind11/' \
+		-e 's/dist-packages/site-packages/' \
+		-i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	python_foreach_impl cmake_src_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+src_install() {
+	python_foreach_impl cmake_src_install
+}
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 12ffb7c93b4f..a3114345ba43 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -29,7 +29,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=sci-libs/orocos_kdl-1.4.0:=
-	<dev-python/sip-5[${PYTHON_USEDEP}]"
+	dev-python/pybind11[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -38,6 +38,14 @@ else
 	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
 fi
 
+src_prepare() {
+	sed -e 's/find_package(catkin/find_package(NoTcatkin/' \
+		-e 's/add_subdirectory(pybind11/find_package(pybind11/' \
+		-e 's/dist-packages/site-packages/' \
+		-i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	python_foreach_impl cmake_src_configure
 }
@@ -52,8 +60,4 @@ src_test() {
 
 src_install() {
 	python_foreach_impl cmake_src_install
-
-	# Need to have package.xml in our custom gentoo path
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
 }
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
index 137151d837d3..23d0e16a180e 100644
--- a/dev-python/pytidylib/Manifest
+++ b/dev-python/pytidylib/Manifest
@@ -1,3 +1,3 @@
 DIST pytidylib-0.3.2.tar.gz 87669 BLAKE2B 57eee794e3a6ba147b778360a12d2417c21579250620854267a83300d918cac0320c768faacb531517b66eed7fd7afc1679e76f2db626f7d7daa80af1667a06d SHA512 24f755ed2607e300711f5a1aee510df3a0a410cc7d8d8f46e065ec8d93c50e436a492cc2831e9d416ab9837497c603f9dc8705da543102813d3264e6de033ca7
-EBUILD pytidylib-0.3.2-r1.ebuild 585 BLAKE2B e395912c1a49082b6fb1137d4577ec9a9af053461a8fbe1d64a069e879fb16754ac9e289abe679c0562b3b3b46f678b74e795128629aadf39e89f77b6d6d5c37 SHA512 4efe9b1cb28f2102f182e4289ee554cf3a769998ea9b52b4e6c30ff613ae250aead8840650d38c56fa0d81c1e51a15cc9b4c9878144a715e49aedb21bd760d1d
+EBUILD pytidylib-0.3.2-r1.ebuild 592 BLAKE2B 58ce98b89d7c8c0a4a521970de919d6f80e6b197fd004cdff490f7ba2ebc47a49649a8a0850d86bbfdd92b0d3e01edd4db401ec647c8c43931f8f90069eea53e SHA512 17481ab9d1a49385f54ad402b0ddd72d1f75103db7ec86d6570d0afda27469f707803dd373d5bbc1166ca745822b876f154926af4d094c95d5da5f5b800c5186
 MISC metadata.xml 385 BLAKE2B 6c53cf6462d81e85c2a9facf85c0fd7b6c0c870656fdc4cc63bcd67e646d51e14fc9246a7b75a527eccecaf4385677ea63b56dfa04aeab708b41b83c8bc4fcef SHA512 e41d4897a343c45e469fe4cd52a7ce93d525ea208dd570fe0517feda8f445fa9175d971e4c37b8f1941a7cb6931ff6473526ced82384489f02a11c4040fec933
diff --git a/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild b/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
index 2b905c8da95e..af4606a00b43 100644
--- a/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="app-text/htmltidy"
 DEPEND=${RDEPEND}
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 4e2114379b0a..b6ac2b6ec029 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -3,5 +3,5 @@ DIST pyusb-1.2.0.tar.gz 75557 BLAKE2B 3a2d066d4069a8662c981ab1f01237d7c0bc18be82
 DIST pyusb-1.2.1.tar.gz 75292 BLAKE2B c1b99f22919ab4beb8e96d664147dc51001c4a48b3acf9ba3961f7f53a9d13277c622e891481fd00b9d34d2ed8a2a0932b7949c13396ea4d76b36f36fcc4cdb0 SHA512 51d0c1165540afa21d6d0ab7315ac77b08083d1cb8e502173dfb1766bc542173f9d7b0070fd14bc71d147e31c3f0780b277093791a7c82485962a04ec62bf0f1
 EBUILD pyusb-1.1.1.ebuild 685 BLAKE2B aa089665e9e419582529ac05ec110843b081a8250fc789843a2aa5e63cc44e8434299dde0db61aba578d26cd9767bd1faa232d0a189643d0920535a31d171030 SHA512 d617a404d667a5506726a440cc251072374ef56ea5e3e33a710e4f5e8b1d8099d0bd68a946249862700ef589d1fc10f112295926a75b6dad3c5c425eb3200597
 EBUILD pyusb-1.2.0.ebuild 653 BLAKE2B 9f78d406a03a9bca19d4267d9d443d3d83fafa5bbc66d600ae854a95f5f1df7bdc7c0c791de13569e2e2944a7293eb01269b82686715be7d24edcf3e6cffa4d1 SHA512 cd76b832a07c19ee02fb7bc30688cf73c9c3150ebeb1beb60331eb990b14897167c51fcec25ffdec73e65c6859d1c65e8687e695cfdf39638503c11885262012
-EBUILD pyusb-1.2.1.ebuild 653 BLAKE2B 9f78d406a03a9bca19d4267d9d443d3d83fafa5bbc66d600ae854a95f5f1df7bdc7c0c791de13569e2e2944a7293eb01269b82686715be7d24edcf3e6cffa4d1 SHA512 cd76b832a07c19ee02fb7bc30688cf73c9c3150ebeb1beb60331eb990b14897167c51fcec25ffdec73e65c6859d1c65e8687e695cfdf39638503c11885262012
+EBUILD pyusb-1.2.1.ebuild 660 BLAKE2B 7395289ff59e940347c555ef36c94b3a1c67bb695d6b8a511f47eea67f227587d89aa3a6b190642f6473011d6713ed81a98503d99571360aa29aaa41ef7f30f4 SHA512 0b96f8e76914768394f2f39ffa74290b8142fb16d7866942d18a8c3f12594f7ab3d8a9a3bd2d19f5dc6e16644e6b84626bacf4c3517823169b557229ecfa922d
 MISC metadata.xml 359 BLAKE2B 44a04e5fad69cdf343bb324f0367a1b52ce7443d4ef4c6bcd1e7742ac0cb9c6eeb8afc5b250d126c2bf4472c9fca2cce7f9a12a7354372bba8351d0489972e09 SHA512 ac428041984c13af0492c228514fcfabb00d98645b97ff78347c4fee2813df292f52ec9c37dd00392eff6c306a18513bec6d4c883cede2ff31f18c2973bff494
diff --git a/dev-python/pyusb/pyusb-1.2.1.ebuild b/dev-python/pyusb/pyusb-1.2.1.ebuild
index 24e01cf2f163..8966bec8f2e4 100644
--- a/dev-python/pyusb/pyusb-1.2.1.ebuild
+++ b/dev-python/pyusb/pyusb-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 
 ### This version is compatible with both 0.X and 1.X versions of libusb
 DEPEND="virtual/libusb:="
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index d77fac3f409a..5a6240bf13f7 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,5 +1,5 @@
 DIST pyzmq-20.0.0.gh.tar.gz 393041 BLAKE2B 1f22f556f5d0f2755c2e56411fdb9f583bbdfad6315e4e72fbaa1fb18d0ad5436ee0ee8d17497641421cea3f4e1b53b8ff85bf7ced96c8f1c80db0be901ca3d5 SHA512 30359e501e76d6ec14175622d6c970d9ec0f227b372d2b1c6e6650be812dd47017b797a016f5a2da83f72d00536e64d2f005a38003c9a1b4fbb7266f2640782d
 DIST pyzmq-22.1.0.gh.tar.gz 401919 BLAKE2B ec43c62e68633a7e0ac06e7a717b6409e444dbd1347154c2a29a2dfb00916829656308122fa2cf0fc1e3013c82ba6bcc5e11b86582f95d46f43e9e81f6d8ff74 SHA512 aa135279927bff07339b99b4ebbc7d47effbfba7df99d3576088fe0e7d4a3ad44174a928e8b94afdeaf531c6a30cbb7bb88bce7fe19e7e5420b079ffb8e8690e
 EBUILD pyzmq-20.0.0.ebuild 2653 BLAKE2B c0d0fc48eb69fc23c199f66d8171c7b3eb57d752f3b00e8f667eb41a0cce14b967b2d09a4ee98d3d3713532931d7ee154bdf0d1e67b218d24475cdb5dc761b2a SHA512 6841126e1f898b56f784606725d916ecbba38f0a99154a179cdcffb905f574072c66cea39c7f5368c064d2208a571bf63cafac4ea9b5a8af998c4d6e591ac50a
-EBUILD pyzmq-22.1.0.ebuild 1720 BLAKE2B 52284dc19ec17607b781f6c6f70edc542d2a7bb9f81bd5336bfa7e4611be1b7aea723bb814d253d99e83694f5346d4f0ba0fe219210de33472f65ac7bb6ea9fc SHA512 9e0db238744f587f3fe03493c13d607baa1760591ca984cb2654bd21d68589439ad8416306b51eb06913cfcb965c36805f32e06f0eb8c966dcc2eaf2c768b510
+EBUILD pyzmq-22.1.0.ebuild 1727 BLAKE2B a2476b1ef9236a751c4adf97adecdd37c24e9fcc3225de5162d5c9395c91b783b91ca626ac380c93f41987ef2f333a122a110caf3c33acf1ac9f587d835ba10f SHA512 bfa572218c8216b0b3c175360f6e39d4ae37668f32481ebf1b50ff4cbeedc9b7af4a8b6b85cc8b344c23198f5ca9106c2bc24e09ba32ac6be7332394c9ebb404
 MISC metadata.xml 428 BLAKE2B 36d5533b4bcb9fe9aa69847e05599da6400c634c73f1f00321e0a4492b053fbc9e1fcf0f9a22782162b8bbafadb9a343b19da35e732e7898fb3784473564438a SHA512 af1c8716dbd0846be80b90587ffec0c51e0f56f277a659cce15f1114cc0d3889ebe9fd92fdbcdc62b04a9919f48037b44153f7cb5e66d4719ef649aec933ca12
diff --git a/dev-python/pyzmq/pyzmq-22.1.0.ebuild b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
index 4be15e3ad80d..c442a2de75f1 100644
--- a/dev-python/pyzmq/pyzmq-22.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index a2e781c99f2d..c5b627a5e2cb 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -4,6 +4,6 @@ DIST qrcode-7.1.tar.gz 36068 BLAKE2B 93f09da56b6e0cf6875250e46ec6b3cd5fc631c5775
 DIST qrcode-7.2.tar.gz 43032 BLAKE2B dc1ff428dd86485d2e2fe08b0efb367eb925551fbc31b4ab4f7f22a132ccc3fa0f7625a1e54f16df57f69fce3753883be0e46de6df84b13170d82d10c268866e SHA512 2ce72b2f6893168b96e1f6dae03b3250b8a0654afc9c0194075493d8ed93616acec7b61b9b95573f92c853cf227fff467edae7255aed10a9f7730e9ec5215133
 EBUILD qrcode-6.1.ebuild 650 BLAKE2B 6bb326e7847e7706bfdf3392f78c8d1e882c82625822316d9325e60cf187dfb3a7d4b704d4ed60d56b60519a4690b66d88a9a0bb4b60e724b51c28f3cd61601e SHA512 8dd6811383a8c27cfff84c1436928dd94887d1f37d403c2a2659bb998c12bc30ad556a10cb36b65e986c4568a94beae94c85ed4c029c78663c4fbe919b20a185
 EBUILD qrcode-7.0.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
-EBUILD qrcode-7.1.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
+EBUILD qrcode-7.1.ebuild 617 BLAKE2B b6e696e03cf9ded2d1c48333e3abb97869604352c3ab69a82dd1c842e1b62a7a36dfe37621b82d55e647dc84266d3d92b000aba8fa95721c19955d4b08e4b597 SHA512 64dec804ec83f00d006d189b135898af053357cd0d672da894c8a0d8dd31cca9fd966ab8e4b74b0ee815bd12d7415bb3cb045a07b162eddfac9a6a743af235cc
 EBUILD qrcode-7.2.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
 MISC metadata.xml 309 BLAKE2B 1ddae27e1f2ec0dc7c656238d9895afa6034ef205f42bea031b29cc69191b074e29f4049ec8103701cd916e17dae25e26d25d4e61f123d53fc0b0f6321c8d857 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec
diff --git a/dev-python/qrcode/qrcode-7.1.ebuild b/dev-python/qrcode/qrcode-7.1.ebuild
index 0185db078736..e9930ae51fc5 100644
--- a/dev-python/qrcode/qrcode-7.1.ebuild
+++ b/dev-python/qrcode/qrcode-7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 # optional deps:
 # - pillow and lxml for svg backend, set as hard deps
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 9a411f7e9e40..31353313e595 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,5 @@
-DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
-EBUILD qscintilla-python-2.11.5.ebuild 1776 BLAKE2B 5fb12707469657cdc578331fecfe6d249ac7a0931c7317ffa0fa21db6a2ed8ce10be77f0be52dea9b90e22a6f2f161c56e44b2042de9c4e7ebe150f612eb4b6a SHA512 1b50ec0477ebfbdc8d646cace0faa2c965de30f2f67cb22d02a2900d0a19dd4d4fd3ab5230bc7f3ed1c601998338a876fa0d391cbfb603abd230037ae36744c0
-EBUILD qscintilla-python-2.11.6.ebuild 1775 BLAKE2B 66678db25f96256fc2180b0202a2bfdc497871b38ac16a4404e5c41ad9ab76108441d1c30372dfe2f63954c7625fe5bef8e16320a9e9b357874cb763aaf47539 SHA512 a0dbf64b283f52c03c3ed1fa0ea176eb65560fc65adbe06985ac8d4d91ab9b01ba785e39a4e502b911f9194c65e6287128ffb84a0568fff236e13ff42e7510aa
+DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586 SHA512 c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1
+EBUILD qscintilla-python-2.11.6.ebuild 1777 BLAKE2B 99a1c78b5b6bb20e5396450e6c5d3443c881a66a18f62dd8ccaead47896092a55b859ba1ef3a952d342923cc527354a120ce21a38467745e9f39380e2adb2b3f SHA512 34f2ce3ca646d2d55f351987a5f1d88039a112a15aaa0ceb0cf30223141b73129b9f468574e468e7872e35ed71a222db58fd0c303c4b00671e80ecf2834bf97d
+EBUILD qscintilla-python-2.13.0.ebuild 1863 BLAKE2B 6ca7d42d986b0c1849c477678764e0e93c3078880fe88133d72d8dffc162d9b511eb8b47d77cf830e4a5b32d1e10ba0ff91e21e576e2a8fc4a595ab9a5386aa1 SHA512 7874ecbc87db5ec40ce73576eb2957cedc13134a617d6263800cffa41b2ee1d7be8ea3f0aefb33a45a0ca7dd594c39022f2ab837e691b72b900d5c49a7fae25b
 MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
deleted file mode 100644
index 12eb318581e7..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
+++ /dev/null
@@ -1,78 +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 qmake-utils
-
-DESCRIPTION="Python bindings for QScintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-
-MY_PN=QScintilla
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="debug"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	~x11-libs/qscintilla-${PV}:=
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--pyqt=PyQt5
-			--qmake="$(qt5_get_bindir)"/qmake
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
-			${MY_PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${MY_PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
index 0a5d085b95f0..bea10fcea4e0 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QScintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/"
 
 MY_PN=QScintilla
 MY_P=${MY_PN}-${PV/_pre/.dev}
@@ -28,7 +28,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}]
+	<dev-python/PyQt5-5.15.5_pre[gui,printsupport,widgets,${PYTHON_USEDEP}]
 	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -37,7 +37,7 @@ RDEPEND="
 	~x11-libs/qscintilla-${PV}:=
 "
 DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
 "
 
 S=${WORKDIR}/${MY_P}/Python
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild
new file mode 100644
index 000000000000..03cabdd434c2
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.13.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QScintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/ https://pypi.org/project/QScintilla/"
+
+MY_PN=QScintilla
+MY_P=${MY_PN}_src-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}/Python
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-python/PyQt5-5.15.5_pre2107091435[gui,printsupport,widgets,${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	~x11-libs/qscintilla-${PV}:=
+"
+RDEPEND="${DEPEND}
+	>=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.2.0_pre2106291255[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+"
+
+src_prepare() {
+	default
+	mv pyproject{-qt5,}.toml || die
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			sip-build
+			--verbose
+			--build-dir="${BUILD_DIR}"
+			--scripts-dir="$(python_get_scriptdir)"
+			--qmake="$(qt5_get_bindir)"/qmake
+			--no-make
+			$(usev debug '--debug --qml-debug --tracing')
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake to respect toolchain and build flags
+		run_in_build_dir eqmake5 -recursive ${MY_PN}.pro
+	}
+	python_foreach_impl configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 4d78992d3720..99820931f54d 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,5 +1,3 @@
-DIST qtconsole-5.1.0.tar.gz 428856 BLAKE2B 4176c8add4fb949a82ce33fe9df598d2141c42dfa9ce57ae09ea201398df6ea54e00b890ad2b548b51e95f4dc0c7b2793640ced9b39b7adea910e3d2b90ec900 SHA512 50d2f1466d1fd5ebd33da1778f8271c5a328a61551f665e488c5c45326fabb4b431090d89b39c130a064b3c117cd24dc92e160c68c1eecf6647f2b662b01b2db
 DIST qtconsole-5.1.1.tar.gz 428840 BLAKE2B eb5f6dacf576133c07bc45a9f0fcfdfd041f72012d9564e288a40ac060a6843f6438c80836bcf2f35ffa1f575383bdffe347a498930fe96e2d99a1f1fbe3a032 SHA512 dd9f725fc6e55dea3910650c4c5641336ed1ed56e6eeaad91e6567743bc02fbd0ca567295c3c8897bb800df305ec0bf9f2d8caa8ad0099cdfa2d20c7ca96fbdc
-EBUILD qtconsole-5.1.0.ebuild 1270 BLAKE2B 07487143c4fdd5d3f282cf2e755c9a8114240ba31582fbed0c3d18758f341ec21193b3a2dabcf5f18a128dcc1e98c67ada4484292637e856e9dc7661ac3f2e46 SHA512 394de48ee8182970988bdc007ad1333f6772157aa37b9ec25c9ae01115d642238bd075c8b018d4e516c67f2bc46bba0cd4ad0d45a4ba0fe378037f177db86c58
-EBUILD qtconsole-5.1.1.ebuild 1254 BLAKE2B a73005cc8c0aca61aaa29892e50c91361187abf4a356d31e9391a4a0bbaad57e85cc7f7c1e94ce61b320fd6d5d628bdd5a2d497f69a601eda28356621c52de0d SHA512 9ae3d3fc72b61a373732e27884ca0b4abb178f3cbc94f476a15320d060fc170ae30cb9da0193c4b66c762454217f671aba348b1d751908afaf14806b5ddf6823
+EBUILD qtconsole-5.1.1.ebuild 1251 BLAKE2B bbb40ff3932daaeebb68edd12c1d66eb8066aec4425e1f594d899bf8494ab1df84cca58e758a873f561e48c7dcb02b07e27f88b9b5f8ce6dae855c71311d5496 SHA512 ef18174dc4f932b9b65c043037b02b7dbd88097a17ce781f8ae5ddccc41382b54edc5bdd8a1f03c6db3b49511be99350826d8db3c202e9df01c113e8f9c04b5b
 MISC metadata.xml 689 BLAKE2B 65c50141dd002a264402eb90385ad3203ebdec1fc47bfa0d94055a82bd98bbe93cc0cacdd4b0f9cab0cc36ad3ea22f500f53c55398347b6cc1cada2569abdb22 SHA512 40e7ef3f4437946e75f1a2be9373ba06b3c58b4ebae0cef8958e2c101aa855e4c92aa0a426d2a74d8e946d05e176690006324db1d8514598bb574f1071644d81
diff --git a/dev-python/qtconsole/qtconsole-5.1.0.ebuild b/dev-python/qtconsole/qtconsole-5.1.0.ebuild
deleted file mode 100644
index 97125f3772aa..000000000000
--- a/dev-python/qtconsole/qtconsole-5.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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/qtconsole/qtconsole-5.1.1.ebuild b/dev-python/qtconsole/qtconsole-5.1.1.ebuild
index 83475660a39a..4755d1405d43 100644
--- a/dev-python/qtconsole/qtconsole-5.1.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.1.1.ebuild
@@ -13,7 +13,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-python/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/re-assert/Manifest b/dev-python/re-assert/Manifest
index 2d4f4712eb62..c88cc4cff8cb 100644
--- a/dev-python/re-assert/Manifest
+++ b/dev-python/re-assert/Manifest
@@ -1,3 +1,3 @@
 DIST re-assert-1.1.0.gh.tar.gz 5010 BLAKE2B fc65f43b3525d02d877d51f0a1556b6b205dd1126fc205b775f5c0b6c34ee7c3e8d224fc3f46a80e8df4a366674be90221e891e19e12072c87ff82451ca8676c SHA512 fc14267cc68a12ff7350982f0bf54c77107809c9f0379ab3aa73fa1b7cf5ccabb130fcd35ab75bdf183e69c802a041deac707e1f0bab1c3815d4146b4e320c07
-EBUILD re-assert-1.1.0.ebuild 553 BLAKE2B a755035cb0415e2555f269ecda8ccd0ec21dfba2e9f8161ac8295d278341790879976056a58806a670b8ceb96e5d0f74d26836bdf21e76379052b34c28021bc1 SHA512 cd9e2303a7927962fca3fbfbbdfb638c0720c9937f5d13dbcc56a4ac2e0e348f6a0c4dda250ba83e6c45f0c834d43b0a488211015c7dcec6773fa1809bc59fbd
-MISC metadata.xml 336 BLAKE2B 0e8c17f4a0d9ded996c0df12dcb090fdfa554faa05b8e45f32f14326ceb847bea4dcfdb08279e1d5793dba8a745af9f989ee86b6ff055a66771530568beee57f SHA512 793b2d73757f42b3854ee1e80e35982f688993767607518150fb35a67625ab93fa4eb2864d14bd4ecc714b37d5338a8cb5542b84fadff123d0a3abdd58b8383d
+EBUILD re-assert-1.1.0.ebuild 559 BLAKE2B 3d430db049e5ece3c1bf7af986423884edb73987f5235009cf0fe3da3b52a60a9f5db7417658fad11e2f52375e4d03dda7396eafd282682fe4b20bede16655d1 SHA512 417491c5de05f333401a65f1cb33731a267cacd1af5d72141990da7119021c7afe77f940539e356c77b4e2583f7951b6519993f1d9952d78244956ae4c8d4e24
+MISC metadata.xml 394 BLAKE2B 58b3e95dcebdf8cc5f96fc98ee4cd7fcddcfb07357f05fe59631a726c7a7898198d35ce934d023aa0f1e3c3979ab6b8f0ccbc5658e06e74b4081dec47a4e715a SHA512 f18a82cccaf35a8e94bb2aa4d34cf24fd2a05fecaf1b39cc8409efc7d7e91b369518d61cb83715918006a553080059e79743a8ba0db157006099d1ffffec9f0d
diff --git a/dev-python/re-assert/metadata.xml b/dev-python/re-assert/metadata.xml
index f8f52fb13a66..0fa82858848e 100644
--- a/dev-python/re-assert/metadata.xml
+++ b/dev-python/re-assert/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">re-assert</remote-id>
+		<remote-id type="github">asottile/re-assert</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/re-assert/re-assert-1.1.0.ebuild b/dev-python/re-assert/re-assert-1.1.0.ebuild
index 4b7f98bf6787..595f9cfd91b8 100644
--- a/dev-python/re-assert/re-assert-1.1.0.ebuild
+++ b/dev-python/re-assert/re-assert-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Show where your regex match assertion failed"
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index d08929420a92..26447a1cb4a1 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,7 +1,11 @@
+AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fcb99653a40bfbb9a1009519a79244fa3193ca43b9b8b3ef714f066fdac68f32d7f24c275690cb24bd1deca6b30120519b99a3402db7b4d4d48 SHA512 d55643d7ca251f465d14d8cffab60e6f2c8fb18ec6f9032a5318fab17a8b8e5ae5c98d22e0eff28aacd5bb8ec2ff606022921f73f3c9f7e54ee0853de262cfa7
+AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
 DIST regex-2021.4.4.tar.gz 693187 BLAKE2B a13a51a883599f726c20cdbf28d5b0f1a53d8f2eec5f4047da0ede2951694507c5065de5a84152510874db087c342d52f19d920a7b72c034325ddc91f5fb75ac SHA512 2eff9867639f16ad7894997f399262d653a9ef0bb4e8d40bd977e5c55625cf57b4bb593f84504009a0b3cd50b3876d1938c71fd733c0ad1a076de32b6b4b33b9
 DIST regex-2021.7.1.tar.gz 693459 BLAKE2B 484259e14af99d911a20835be73686fea621e501756b02e760128b60a52eb62719efaa0b788ca57026dbdc3dfd55aa321a0feb8e73f6b7435f8711cf465ec2f6 SHA512 7b28e24a829b8ac8f43fdfadf012e833c715b9743d1c9a7cd34eea2789ec54df23d651c8a15aabe8c5d69662402f6302cfdeb23287c49d91b4e9fb3b9452ef73
 DIST regex-2021.7.6.tar.gz 693843 BLAKE2B 9acbca300632ff45744d509e47de56625b003b2046c068f3bf5cae3987bc9bbd51e5cdc442c3e72c6c9c0daeeacd658c56b56754c0f9e83c03816237cc311000 SHA512 0849caaafc669b6dc322dcd4d48962cefbe955c19f9ee3d657b7b8389f77ab2b2e27ec341745dff01a60dd3930904d69015a334ff748de10be2d0b7c421b0967
-EBUILD regex-2021.4.4.ebuild 727 BLAKE2B 8c568d7a6ec94ed2af98176ab5a5fec05f890781b04bf182ddd1a38a7a48e39df0d03873bef012af54a54cbed8648c24cab6206b17ed4356faadc1b8c0720db8 SHA512 965a6e5bfe52cc24b8696ab65e7bd6b499ce1321dd5356ba25653b11f23313ed62616f2e34c2ad037e200a48241399f8809958f5031ed2aa07a09c5c1f638a27
-EBUILD regex-2021.7.1.ebuild 734 BLAKE2B 1010613ac705325563111fe6c89aee0a60b71ed283fa5c64ec5d4e28c2b27539b2d80fd47439a716ad9e400b0dc91c1e3613a921519026f63ab8d0c1f7de711e SHA512 b42991f21d156a5b9cd01268460fa3e7fec12b06cee038bdce6eb9b8bf6bc53d94b708414015c8b5dd3bd63c696d833b50558fe017e45da89bbc6d55063ce2fe
-EBUILD regex-2021.7.6.ebuild 734 BLAKE2B 1010613ac705325563111fe6c89aee0a60b71ed283fa5c64ec5d4e28c2b27539b2d80fd47439a716ad9e400b0dc91c1e3613a921519026f63ab8d0c1f7de711e SHA512 b42991f21d156a5b9cd01268460fa3e7fec12b06cee038bdce6eb9b8bf6bc53d94b708414015c8b5dd3bd63c696d833b50558fe017e45da89bbc6d55063ce2fe
+DIST regex-2021.8.3.tar.gz 693937 BLAKE2B 886dfe1a312bb34d83a3fe9442231215be7e263cbd123da24c454cdceac1055cb4dacfe4a3104699b6b97f86b14e2b723ea1267a13c2395ce2baad4ca367d77e SHA512 3ac33421ca15e47a1d8beeb3841b6e698d492e96965955afe69529dc71cc7d522e5e8236e4f577c934a3fd27036340a8084c84055bcfff0a9572e8fb56ba272b
+EBUILD regex-2021.4.4.ebuild 872 BLAKE2B 2cab2ea84342bb3e2eae49f4d6e4456b507713dcee7ffc5f85ef2f54be4f774f8c3a138f4be7427af0656e50c5b97671f9d535bb3e7bae58be01134934597a03 SHA512 1ad72740d9b239bca774777eb12a685f7230344b6788f8f01eb120184d888cf4e5deeb1158d1d9c0b546993eff91c7d3bc00a34836ae6844fc3f39d76f7f1061
+EBUILD regex-2021.7.1.ebuild 879 BLAKE2B 50834b1ef67a73159b65498cc429e8d9a38b0cd30fd1e0ed994563d240c81c9c0b06a196e1b5fbc7c9ff9137ec7bf176d577e6bf1161686f13103fdba479367f SHA512 e971fcce3414eb203ddd4dab3eeeb964e3e93470e3f3c5a450d5f8ff8e1379d9ea27083b9c3f5e594b43f8cb52265191246a9d4097531aa723bb6c308e5f9d3c
+EBUILD regex-2021.7.6.ebuild 879 BLAKE2B 50834b1ef67a73159b65498cc429e8d9a38b0cd30fd1e0ed994563d240c81c9c0b06a196e1b5fbc7c9ff9137ec7bf176d577e6bf1161686f13103fdba479367f SHA512 e971fcce3414eb203ddd4dab3eeeb964e3e93470e3f3c5a450d5f8ff8e1379d9ea27083b9c3f5e594b43f8cb52265191246a9d4097531aa723bb6c308e5f9d3c
+EBUILD regex-2021.8.3.ebuild 879 BLAKE2B 50834b1ef67a73159b65498cc429e8d9a38b0cd30fd1e0ed994563d240c81c9c0b06a196e1b5fbc7c9ff9137ec7bf176d577e6bf1161686f13103fdba479367f SHA512 e971fcce3414eb203ddd4dab3eeeb964e3e93470e3f3c5a450d5f8ff8e1379d9ea27083b9c3f5e594b43f8cb52265191246a9d4097531aa723bb6c308e5f9d3c
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_empty_array.patch b/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_empty_array.patch
new file mode 100644
index 000000000000..706b41b74688
--- /dev/null
+++ b/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_empty_array.patch
@@ -0,0 +1,35 @@
+From: Arthur Zamarin <arthurzam@gmail.com>
+Date: Fri, 30 Jul 2021 11:13:41 +0300
+[PATCH] PyPy3: fix test_empty_array
+
+As an optimization, PyPy sets empty array.array to use a NULL buffer
+pointer, while CPython uses empty buffer (but not NULL).
+Add a very specially crafted fix for PyPy3
+
+Signed-off-by: Arthur Zamarin <arthurzam@gmail.com>
+---
+ regex_3/_regex.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/regex_3/_regex.c
++++ b/regex_3/_regex.c
+@@ -18062,9 +18062,19 @@ Py_LOCAL_INLINE(BOOL) get_string(PyObject* string, RE_StringInfo* str_info) {
+     }
+ 
+     if (!str_info->view.buf) {
++#if defined(PYPY_VERSION)
++        /* In PyPy3, when the array.array is empty, it's buffer is NULL */
++        str_info->characters = NULL;
++        str_info->length = 0;
++        str_info->charsize = 1;
++        str_info->is_unicode = FALSE;
++        str_info->should_release = FALSE;
++        return TRUE;
++#else
+         PyBuffer_Release(&str_info->view);
+         PyErr_SetString(PyExc_ValueError, "buffer is NULL");
+         return FALSE;
++#endif
+     }
+ 
+     str_info->should_release = TRUE;
diff --git a/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_issue_18468.patch b/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_issue_18468.patch
new file mode 100644
index 000000000000..ae5958021781
--- /dev/null
+++ b/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_issue_18468.patch
@@ -0,0 +1,31 @@
+From: Arthur Zamarin <arthurzam@gmail.com>
+Date: Fri, 30 Jul 2021 11:38:26 +0300
+[PATCH] PyPy3: fix test_issue_18468
+
+When using the small subclass classes to test correctness of split
+results, there are difference between CPython and PyPy3:
+ - CPython returns always the base class (for example str instead
+   of StrSubclass)
+ - PyPy3 returns the same class, so we get an StrSubclass
+
+Based on the test, it looks like the behaviour of PyPy3 is correct,
+but the test works based on CPython.
+
+The fix was to relax the equals type to check that it is a subclass.
+
+Signed-off-by: Arthur Zamarin <arthurzam@gmail.com>
+---
+ regex_3/test_regex.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/regex_3/test_regex.py
++++ b/regex_3/test_regex.py
+@@ -52,7 +52,7 @@ class RegexTests(unittest.TestCase):
+                 for x, y in zip(actual, expect):
+                     recurse(x, y)
+             else:
+-                self.assertIs(type(actual), type(expect), msg)
++                self.assertIsInstance(actual, type(expect), msg)
+ 
+         recurse(actual, expect)
+ 
diff --git a/dev-python/regex/regex-2021.4.4.ebuild b/dev-python/regex/regex-2021.4.4.ebuild
index 80f758e55ed2..738d258d1ab9 100644
--- a/dev-python/regex/regex-2021.4.4.ebuild
+++ b/dev-python/regex/regex-2021.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
@@ -16,6 +16,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
 distutils_enable_tests unittest
 
 python_test() {
diff --git a/dev-python/regex/regex-2021.7.1.ebuild b/dev-python/regex/regex-2021.7.1.ebuild
index 271faa2b4fed..c0a5a26d5c4e 100644
--- a/dev-python/regex/regex-2021.7.1.ebuild
+++ b/dev-python/regex/regex-2021.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Alternative regular expression module to replace re"
@@ -15,6 +15,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="doc"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
 distutils_enable_tests unittest
 
 python_test() {
diff --git a/dev-python/regex/regex-2021.7.6.ebuild b/dev-python/regex/regex-2021.7.6.ebuild
index 271faa2b4fed..c0a5a26d5c4e 100644
--- a/dev-python/regex/regex-2021.7.6.ebuild
+++ b/dev-python/regex/regex-2021.7.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Alternative regular expression module to replace re"
@@ -15,6 +15,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="doc"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
 distutils_enable_tests unittest
 
 python_test() {
diff --git a/dev-python/regex/regex-2021.8.3.ebuild b/dev-python/regex/regex-2021.8.3.ebuild
new file mode 100644
index 000000000000..c0a5a26d5c4e
--- /dev/null
+++ b/dev-python/regex/regex-2021.8.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1 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"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s "${BUILD_DIR}"/lib
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index 505be61cd017..be563bb328d0 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,3 +1,5 @@
 DIST reno-3.3.0.tar.gz 81168 BLAKE2B 46afacfa437c9d5fed49d454edaf92b96ffbd677de02d91c7fd431b5ae98764918e099dd486345907446a19b2c94a1c36ac5cff9cf6d911438b48d41d9585ba1 SHA512 0fb6ff09e71b829cabe452693aac0c3a14d44f75f93e8934ebd0b0861e7dcd749a92b7bf19bc4f46202ecb02840edd6d5e5787c8b8a5b64a6b91fb52fe18287d
+DIST reno-3.4.0.tar.gz 82815 BLAKE2B aab374c48c1dcf25ba7a78d46069c5d659762bf01d25dc05f597f02098ee10e7b8c518a0afad186ecd93602782a7c50294183b7e33075f8bfe57cc0bc3c1d016 SHA512 cbfd5d9b41beb1599438e249b8082175c8bd2b8dca62d8e6fd1ef742bf889adf6490e1ed0fa78d8aca663a0fb6bbe70742815a6512c6d51fb8073745b6860d65
 EBUILD reno-3.3.0.ebuild 1100 BLAKE2B 3590b4a407686db5705f36a966be9a2f4a072c10fc9e6e848c98fc9a6c3409530a9d582eaf6a48bbc49361d04e1db538033363183bb1d9964546375166f4b92f SHA512 6c1bb0c90a6167c207b82d2ce02a513c41acf5cc9e4ff2c6ce8d76abe5166e3be79c458fc391189c117c7716a49bdb6579943c85874cf57db8331bbb7f2d3d75
+EBUILD reno-3.4.0.ebuild 1061 BLAKE2B 0e75de4f03ea4d804d94d75ec19ea8da6d47afcdebc15872627e9e4059f0313625645a85364a3517095a817fab8156e2c3f8df630aa60261f280faeac68d81d0 SHA512 98b222aa591121844aca6fc654c532c47c44e4c069c53384271c019e958f51ed5e0e6213a98c2d506501b7d5eae438f011745cebd204495152128dca995667a4
 MISC metadata.xml 345 BLAKE2B 64bb3d1c4711fd517770e90167d9edcab33908e0f9ba511b8ae1c0e1ad6181bd4c4d2639d6cf802aeeef8cc77e623d749a3522e73e53514ecf39b30b77f8072b SHA512 127fc0515eae674566848c406e6695ca20d7db100d1378713d8900f25b2ec957eb89eb7f075aafc3efb48b3db7b290e88480248c78bf94456f680c528c7e6269
diff --git a/dev-python/reno/reno-3.4.0.ebuild b/dev-python/reno/reno-3.4.0.ebuild
new file mode 100644
index 000000000000..755626baf35b
--- /dev/null
+++ b/dev-python/reno/reno-3.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+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"
+
+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 e131d633ca8f..df00382a33e7 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -2,6 +2,8 @@ AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79cc
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.5.67.tar.gz 2911726 BLAKE2B 8dbd3bb54c2c651616c3b6be905ac7b43b3a8f30f630d2f9b91882416cb4513751affa507870fdd801b5aa53480498ecc9a5fe3902ab38d72288b6f48ce892e9 SHA512 5a0ec58f0ee925079f3756bac309bd5aaf159118a4ed7ec6467721ead23e5db37839014bb49f1804a0dee4532ce21f9c78adec99ec61a4aeffd957184d489a6c
 DIST reportlab-3.5.68.tar.gz 4512985 BLAKE2B b38fea7704fcf08ff25d314286830473b90e75a80bcc65fc7b2cfc4c270347aa7c68f31716e635048428c24bb0ca0afc3d0e22bebedb1d1bc50901c13d278fc4 SHA512 4d41f9d9708d2bd172928985e1e2d22ffcc61d2d6fb21bdf1f3275f9ff576f06e712cd9c9d1707ff364608ad8bed6c30754893a7b142dc3accd6eef8aa19c975
+DIST reportlab-3.6.0.tar.gz 4499377 BLAKE2B d72f1fb8c05f192ca7e9a13cbf3142e1b14b4bdd6c6eee7da6bb3e48a08500f2c1aebc671d06c020e1dab6107b0b52490c0c72faa82cba1ac66c03014a6130c1 SHA512 64ca4cf868d6d68432e933176087323c2bba58afe2bf444593831afad2471e07b4f33dbeff02fbef009ae7211ef781b1499d3881f27d583dc36ce1eb8f004c4f
 EBUILD reportlab-3.5.67.ebuild 1492 BLAKE2B d9b54242e7d90d7ab8df30cdffe52fb2ac3ecfc8b4727f7c631fee7d000f7e231a097dbdc67ea0999bac6360da963c43c05231cf61c20cd8c66e113e1b3e30fb SHA512 5401c2173c88acb054c37ac0acbf894d2c741e391300cf38e042b90115de07418639ce65275ca0edfc11a7139b43371487f58ebb9356f32b53a7edb3013b7dfd
 EBUILD reportlab-3.5.68.ebuild 1506 BLAKE2B ffc03740dc04b43534aae829798c416466017cbb3c637316ce4940e2acfe0a289568559c6fe84f785291850da414e71e5998fcb23da569929147aacab46a9e95 SHA512 b1397f7c24bf43bd987d1a54dc2823572266cf4fb253d055803f6a5d5be13bda416422ab2936e2d794a0e2405838145c5b56a969028f2980ab01eca25209f736
+EBUILD reportlab-3.6.0.ebuild 1505 BLAKE2B beb3a6d0d101289987cf96e11742498d9419e0eda0551841dbf0266cab697add000b16867c064de81bb2b552033e5863b2c642a0fa40f287403f4494b4e84179 SHA512 15ecaaee1f7eb4d249edbacd3cd04164bb58e3ce18c0dbc4fb3c1f09e9a17a6272dc6cd04341728660faf6b506c1160daffa272bad73eb10fda5c259450dcd61
 MISC metadata.xml 1972 BLAKE2B 92f398fa2c71a354bf25e35578038cfe62fc7687dd9f378574d7221d9982fb96f668f63fe8811b8e189eecd9f02edfe44d53cd17471e226cae8e5ee742ad0872 SHA512 363607498faad8268e3e9aea57f52240d8f5e7f0f9fa48436d7383b16138ee6e2eba87bfd54077dd475a37201324dc83f05a0c53d9c8eb5941be4026f3454fbb
diff --git a/dev-python/reportlab/reportlab-3.6.0.ebuild b/dev-python/reportlab/reportlab-3.6.0.ebuild
new file mode 100644
index 000000000000..1088559e78cb
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.6.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests unittest
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+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() {
+	DISTUTILS_ARGS=(
+		--no-download-t1-files
+		--use-system-libart
+	)
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 23c69ae0f153..0b0edcbedb7c 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -2,5 +2,5 @@ AUX requests-2.26.0-test.patch 1328 BLAKE2B 4f9e66505a4acfe7b4bd62c6c95c28fc01eb
 DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
 DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
 EBUILD requests-2.25.1-r2.ebuild 1674 BLAKE2B 6efa6716415cf24e9bfc2b001bf2aab3ef7c10032921fb5e43fde6824a6202856eb5282b6dbda13206e1b19a7ec22e542b0721abb2688671f2a475dff6d33882 SHA512 3632026495ee62d4e17596d18d8f7ab78dcf1cb21646f1c04e2baaaaafc3925515c4018581ef47b86abac87e63ab74277fa43557f15446f12f06d6c79cc988a6
-EBUILD requests-2.26.0.ebuild 1523 BLAKE2B 1b2150526f391c64487ae75b331bf782abc62e61f64610889af526ca42f08a43dc093c1d24a3ac8d077706b511e40ab93061cffa1c12df3c90464bc292acd974 SHA512 e65e67180500105b8e63c4eacf1403594f30c42e29550643f4f5ebebf7a4c14a569878307d7ae512cdca4bd3c247d8d7ecfb104becc049696d334f3ee337649c
+EBUILD requests-2.26.0.ebuild 1533 BLAKE2B abac6a547f05fe3a7ba0f1c515c1fd753d5f095318fd66cd506c4a89771b6e38660126b87e748f99c724de60ab82cdae4491b7805323d76d6b9a8dca032f42be SHA512 253b995b4430f10bad13453ad5bf0f40c55cd7d63b018d877b0255553998275139f3a5a5fccfcdda29e9c7c1532545bf32aca7649837affaf984a936f87637d9
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 88f1f9b8a52d..b7f083336e7e 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="socks5"
 
 RDEPEND="
diff --git a/dev-python/resolvelib/Manifest b/dev-python/resolvelib/Manifest
index d854b5b5dbe8..1c95deb9e17d 100644
--- a/dev-python/resolvelib/Manifest
+++ b/dev-python/resolvelib/Manifest
@@ -5,5 +5,5 @@ DIST resolvelib-0.7.1.gh.tar.gz 764630 BLAKE2B 32c50ef0a16e07716f18994efe4b2bd21
 EBUILD resolvelib-0.5.4.ebuild 511 BLAKE2B 2459023b3fdd4fe6b7b7e4e070d43a9ba2dbddd898b5d78ca1d044d30916609947d6b8f18bc83d0dc0b5f3441374e47946db5da751f21dd4c6e09cafec9b4136 SHA512 1ff656be933084de43506a99ac745fd5079672735dde60a1360e6f93ea01baa7f6d3aec5e26bb86aa67783e188b09d3833351d512380d050cd690e3198af1be1
 EBUILD resolvelib-0.6.0.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
 EBUILD resolvelib-0.7.0.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
-EBUILD resolvelib-0.7.1.ebuild 593 BLAKE2B 206bd7dd4d41822052a7a252b9d3b5f586f2ee4266b9b9bdbda895bea2e9ebb965fc85456fb63cb6dce7c70dc56d829ce22c45e7956adb63babe016809b5b6a3 SHA512 2a925e88f6aa99b6112497f5dc10d0b4d94772ccb8c21a5507efb398f2177140b03fe048eeb7d5a55bb2cff0a1245837e14d391cce6441a963c611e0f6eceb25
+EBUILD resolvelib-0.7.1.ebuild 591 BLAKE2B 17c3acb92a42ea88285c07af12e4a5202a52f535c7bbc43feeca2cd9948e203bf4f49958c8fd1fa64fadd2e80925933abcd76b173b776d4f5818c2b44318d351 SHA512 da1e08c5d81f3d689bb2e6d82699561ed6e8e18d2a2e6201d9887dcdbc4da61bdc40d125853c3d8ba43d0086b9f47842f81c0ec9d7eb7178bb6ecf5886a111f1
 MISC metadata.xml 853 BLAKE2B 6b194c20227de800cc062248107ee5b0726199789af9837807523b335b1e9a63e850270060fb4d306996a4113ab2975102e285bcf52f8dd4177f71038bf65e2f SHA512 a86ffe23f2067369d2794f3cf013fb3e3d4a685273397f6f221f67e251939c17147a8cd30aec92cbcc40fc38e770755ca53507c42f8b84da66a96ad46e24e90a
diff --git a/dev-python/resolvelib/resolvelib-0.7.1.ebuild b/dev-python/resolvelib/resolvelib-0.7.1.ebuild
index ff9b580980e0..a848f30540bd 100644
--- a/dev-python/resolvelib/resolvelib-0.7.1.ebuild
+++ b/dev-python/resolvelib/resolvelib-0.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 6012d9852b0d..652526f7097d 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -2,8 +2,10 @@ DIST rich-10.3.0.tar.gz 16237609 BLAKE2B ddac8f2ed7b3b39e647179cd03cf59994729d7d
 DIST rich-10.4.0.tar.gz 16240850 BLAKE2B 76874e3efd9a8d696ba96579e1c658b1c76e71d353574cf3f9fb5d8a15810879f649d0ebfcbd1d72d9d496ce438cc08099b5d0416b932875704be2d0b4b28d0a SHA512 ecf6234ac862c1e04ab71c39763857d770c20200f5e1903a7d8e90fc1a67b5702a9eb0c67454ca48fb786a7631f60401f0a3299e82d864eca8c7afefedf21e26
 DIST rich-10.5.0.tar.gz 16242786 BLAKE2B d4d612555f9dca24b5150f5502d95bede784d7e6481e15948614de15a914d0cb3c83b64148a02db4ce8693feb1604c3729006fc0ca347eb10313aedcb795feca SHA512 c0471c0f35d3d9e5b5baf5798911073de02820a5bb5dcf42324bef2153a49a3019db44bc96b95247defe3be65f18097fc266a30bdeab153d9dda0ae38d34a79b
 DIST rich-10.6.0.tar.gz 16244447 BLAKE2B 79012a211e8f5510fd4cf0f2580971c51fee17a1e38905abc8227ba07eed1f2d25b7c356ecc907043a9e1898245cb6927cf226218c0ba20344865c1cd0a4a160 SHA512 59b777ef0fe3efe67138a7dbfc0c4e813b0a8c3d46adc6526b07241483919e0f71b478c0a66f3e0c207fcebdc0d639b7acf989ebf914c0e0fb6953029f0c9a16
+DIST rich-10.7.0.tar.gz 16261862 BLAKE2B 41f49bcda95f64b6deb30b32c7b8809ec1fa008d08de08dbb2ed8e718f04de1f446291468d714030db951877eb8a5e95360504c6a396758cb1e8d37fff4fe6be SHA512 23607389370cc2b8203f4505cee1536a57e7c3379d97ebbe3a751e11d578e1f652c0522d151048bc7ee018800d44ac762b7272cd3084f4ee94263e019bc42964
 EBUILD rich-10.3.0.ebuild 823 BLAKE2B 120174e85e952b8c8d177d9da9e66b29067bc76085a4cb33e6883f64254020f46b1cc69a1a1d658905cd840cf7a5dcc357a2818fdd684cfc52c35c56a74300dd SHA512 dbf3d8030491acb2fd93f41b122362d14d93f917863609c0f08fd08eb96a5218433ff4c37a1afd3a6bd906fe496fae49cba7764e963f1feb6783ccb84b36b39e
 EBUILD rich-10.4.0.ebuild 823 BLAKE2B 120174e85e952b8c8d177d9da9e66b29067bc76085a4cb33e6883f64254020f46b1cc69a1a1d658905cd840cf7a5dcc357a2818fdd684cfc52c35c56a74300dd SHA512 dbf3d8030491acb2fd93f41b122362d14d93f917863609c0f08fd08eb96a5218433ff4c37a1afd3a6bd906fe496fae49cba7764e963f1feb6783ccb84b36b39e
 EBUILD rich-10.5.0.ebuild 735 BLAKE2B 2c23538ece26718559c8d0de5d8dfa8dc285efbfe4ac03e2f96b86e693f576fabd0213c57abe42068a2d0c4caf07d4b5df08d63b7eb8c3b500dce2884c352ad6 SHA512 46a0261d511fae0adb555234657eb80c2382528a86e8a7ce06fbcbd83dd682fe4d0855ae2e31e135bbaf4b6caac65a77754397d9ba5ef7c69430157b8ebea895
 EBUILD rich-10.6.0.ebuild 735 BLAKE2B 2c23538ece26718559c8d0de5d8dfa8dc285efbfe4ac03e2f96b86e693f576fabd0213c57abe42068a2d0c4caf07d4b5df08d63b7eb8c3b500dce2884c352ad6 SHA512 46a0261d511fae0adb555234657eb80c2382528a86e8a7ce06fbcbd83dd682fe4d0855ae2e31e135bbaf4b6caac65a77754397d9ba5ef7c69430157b8ebea895
+EBUILD rich-10.7.0.ebuild 735 BLAKE2B 875be51f53984700db70490288f736476aadfa252a9eb3e64dbdb6fda717d278efc752a0b2fad93833fc118240284181a32d4069692f0b53fed7f57495215b93 SHA512 443876cc52c19b83804365142903b887966fe46f68ce1f2e0c117a03efe0633d74ecdc091d284dfabee0c5c1d973b825aa94a5f2377d93b9ebbdc7ee3d993228
 MISC metadata.xml 493 BLAKE2B 3ba69fa824ec59308ce763ccf317a1cb187586e17727e59e6f59f40a5f9d0a23c78ad20e67009a6ec460b317c471fa8c00d68fd8fc152cb5a87077aaa425af21 SHA512 186ecd75daa3aa481ccc5773ea797bb87afbf6f4017224b6e7d54985838f9beb1cc4a2faafef0ec1e24ce6b881ce95d7665d4f5945285032f19f7a86a5a7eb14
diff --git a/dev-python/rich/rich-10.7.0.ebuild b/dev-python/rich/rich-10.7.0.ebuild
new file mode 100644
index 000000000000..b676261d987f
--- /dev/null
+++ b/dev-python/rich/rich-10.7.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index bf907a9be43b..73eb6290b77b 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,6 +1,6 @@
 AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
 AUX yaml_load.patch 2300 BLAKE2B 3d24162a4c2501d7ae431b602244d102e0e26894304c868fafee8bf72a7ebea867280f2a5985b5b9139ba6d0b42379fec598212e7db73067a426c28bd9ae3a98 SHA512 60968ec2250ec450b461ef4c196561fdeedfe5fc28d7af6b6a1971b0e5794d3a028c227b8609d3c541902a3fc498194b33ad2f8698115cc1b3eb99c955ca70ff
-DIST rospkg-1.2.8.tar.gz 91042 BLAKE2B 4c4640d45a06214240a80d2ea15a09799eb892755c7c4410761e2a3505115ee1914a542886385bcd6996ead46e46a3e4d22bf79ffc38a0d2d8f2c7ac295eb0bb SHA512 c4f0c1992597aadf395effd4e6db65c20bf19501a19c569de57a2b9977d9ba794c3c68ba16b2b274ec865caffe6ec98b8fc0e88ad13ea3a9bc744e9ab6adb3a6
-EBUILD rospkg-1.2.8-r1.ebuild 1258 BLAKE2B 6fb0bc582e73293a7b1e54e5babd735ff20f6e6cd88cce1720e9b165c3c676f16e20e8033d46577c8b8117d2c284ef08aa8629c05ff9ba545ae42409bf69dd27 SHA512 4de3342e7ebea7e7210e040763a4c64aa2c241483740f3615de57b81046923b5dd8c86960d10d2e50161e2dd80e817278208297c0f6cb0e79d97d27345d3c0b8
+DIST rospkg-1.3.0.tar.gz 91442 BLAKE2B 9bf217ff103513471b1a2b0812e4b08519d667c0b883c545b23dd42f10216390f4fb618bf67baed0ba2aba71c18c13b0a702445425ca29568394c0cc5b4dff61 SHA512 bfd67eee80e063db45eb98b1b73cf1865d23a14a55d72639890d7ad3d01f4c85f07aa662d9d66e996340798c002f5ee9d1167cee32b20caff900fe527ed50d5b
+EBUILD rospkg-1.3.0.ebuild 1258 BLAKE2B 6fb0bc582e73293a7b1e54e5babd735ff20f6e6cd88cce1720e9b165c3c676f16e20e8033d46577c8b8117d2c284ef08aa8629c05ff9ba545ae42409bf69dd27 SHA512 4de3342e7ebea7e7210e040763a4c64aa2c241483740f3615de57b81046923b5dd8c86960d10d2e50161e2dd80e817278208297c0f6cb0e79d97d27345d3c0b8
 EBUILD rospkg-9999.ebuild 1258 BLAKE2B 6fb0bc582e73293a7b1e54e5babd735ff20f6e6cd88cce1720e9b165c3c676f16e20e8033d46577c8b8117d2c284ef08aa8629c05ff9ba545ae42409bf69dd27 SHA512 4de3342e7ebea7e7210e040763a4c64aa2c241483740f3615de57b81046923b5dd8c86960d10d2e50161e2dd80e817278208297c0f6cb0e79d97d27345d3c0b8
 MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7
diff --git a/dev-python/rospkg/rospkg-1.2.8-r1.ebuild b/dev-python/rospkg/rospkg-1.3.0.ebuild
index 9a43e2fb6d1e..9a43e2fb6d1e 100644
--- a/dev-python/rospkg/rospkg-1.2.8-r1.ebuild
+++ b/dev-python/rospkg/rospkg-1.3.0.ebuild
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 72fd7767730c..d56b3d118b0a 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,5 +1,3 @@
-DIST rq-1.8.1.tar.gz 585211 BLAKE2B 17feb07cb376c5aef88a7aab6d716f58a19f62f19db6c6b0490b4f666981e40304c6a23c88669a0aef9b75a39ce8cb85a9b10a2d42e83e646cdcb6282167d8f9 SHA512 b9df7b4e894a5da693827ff720be3068336d82d2f17928faf5ae6133b042ac2f98a3d673bb2ed86c9351479669e9ef0e4fffcb1dba9b8853f6f793db4a4678f8
 DIST rq-1.9.0.tar.gz 592217 BLAKE2B 831fbc7a3fe23ead59041e2556d37e4aa885a21bffa9aeeb0765382e84b56a2ee6d34a864cb03a9a12274c8ac80b714f10a7752d0bae7a79b8e2e7149be4aea7 SHA512 a2ec7b05fe1dda983cfb30182401c6e5367c54b7649ddcb1d3c6d0f0a5f6583665b39ed7c1cb6bc37d067926f089e3fd80ea7558856233edc1bca8234aa728aa
-EBUILD rq-1.8.1.ebuild 1365 BLAKE2B db42990a90d0a4adb2b1dbc3b458f82e27f18e5887953efffadf720350a4018a68109ae186889bcef92fbdce1191e83ccd49789eab58c5a412c55d0bc773dc8e SHA512 323c05c818ebf27372987852563829c6155045a658711a297577fe1e28dcc93e106375f95b8eee0e9bb67bf90a0abf67ae4701cce4b98b5234058a402dd0a926
-EBUILD rq-1.9.0.ebuild 1369 BLAKE2B ed157155382e0c363f099bdda4c9c63de60be4964bdf1b50b8f95e8207e20eb44352a06da4641f33247e12de51f00c13b8889e3e4f4a63dc4e1894331a97bd6d SHA512 ac88d8c45df017c600560bcd2bed430b591627064c581570f7af3bf4bbf0f9d2a9c37b3f909c2708459adffb5c39d1aa826171ba4e57ad2588c8d1322366d512
+EBUILD rq-1.9.0.ebuild 1365 BLAKE2B 7de1a6f06cbead680e3ac63c3dd2a318a4e539757c4fb09120cdf04b3c7118d5c01686accf23ac4d29b038e637047acd8a5e1f02d4bfd4700c0e587c0262461a SHA512 9f2ea36361e71c986f033df05739836d8653a103131d6839a62b1212d07ef2ad4ded188c63c592d97def8a73b1fec7ae1715f7884e40a792d1a059a5937720e7
 MISC metadata.xml 452 BLAKE2B 61dd85f86606a345d1f3fa4d88f7b4e7c827d61107e0f6ae7c60d24cb3d49f9da5a472310e182a9df36cfcf50b8c3415028958b0559d84db755bf8ba16140a22 SHA512 a70bad859fd51b632427cf5aaecadc36815e4efd14f4aeb02125da4b5c04724abf3d82f42f74c9851efa60b48e2f7722f2a82182e65f90cf2045354b3810c0d7
diff --git a/dev-python/rq/rq-1.8.1.ebuild b/dev-python/rq/rq-1.8.1.ebuild
deleted file mode 100644
index 66850d4a2446..000000000000
--- a/dev-python/rq/rq-1.8.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=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
-SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	elog "Spawning Redis"
-	elog "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/rq/rq-1.9.0.ebuild b/dev-python/rq/rq-1.9.0.ebuild
index ea0095ca05a0..2e4b2930dc94 100644
--- a/dev-python/rq/rq-1.9.0.ebuild
+++ b/dev-python/rq/rq-1.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index b2676c3e1c8f..04761ccde7d7 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -4,5 +4,5 @@ DIST ruamel.yaml.clib-0.2.4.tar.gz 180667 BLAKE2B 01341ac42ecea437faebbc9b30ebe2
 DIST ruamel.yaml.clib-0.2.6.tar.gz 180695 BLAKE2B 54d0e00544c1716971022257bece3a6c8f83c9188b52e15a136381f5fdf00a519fc5b74792c614a2908ffe68f20fb165732cb814458dadb8498660f28ea67939 SHA512 12307a3c3bae09cf65d9672894c9a869a7ed5483ca3afb9ee39d8bcbf1948b012a0dbf570e315cc8b9a8b55184de9e10324953ec4819d214379e01522ee13b20
 EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 712 BLAKE2B 21715932317dbc77cf8ff974a08d5deb490df557dc696596cf712f5d7d0cf174b37984aaf704a2adf8a166243b6eb4f7497d73ab098107a80590f200fca2bf44 SHA512 1d10a165392ef789b683dd3f726eb39f5b79d57429f20056c1cb4e2f1c8b3830ed7eaadbd25ed36ef64f2fb83cf50cff21f2205d21ced9ca4edf7db476d00793
 EBUILD ruamel-yaml-clib-0.2.4.ebuild 657 BLAKE2B 5225bbfd6231d6fe97068f0db8cdee17f81c64f20f4299fe516c7188105ecfea1ab822859aa27f8c170cbe445cde3428d127d57bd6ea154210f3620d9f9e9eb5 SHA512 b6e66aaf6dc00caf379ccd1dee8a9ffbf3f13623d18066e5592bd26f04d5197354e4d5aac239eca00bc567b881bcfecd45ca361d115c6223ab80945eeac2a5e6
-EBUILD ruamel-yaml-clib-0.2.6.ebuild 654 BLAKE2B 8e2c3860252e933656fbd8428c08cefffcaca1c75f8fb2cc979bdc6839683b43aa5ee0f58d34e3dd285045f4bbab7fd38c3ba1b300a6d70ee600bfd3009ff4f5 SHA512 736497ed7d2c1d2f2053541bc378b5413c4482d14e8c16bedf02175d56d0e08442b79b6f05c356ef10d583786b6dce4a525369aa22b9d4af959d02ddb14ab77d
+EBUILD ruamel-yaml-clib-0.2.6.ebuild 651 BLAKE2B 93e5eb72fc94a82d350967df87f8dd23ad34ca1e62c01d43223602e47f4318f3cac1160ef86436e2b18370d79aaddea0db70372284dd8fba0974488961c58b6c SHA512 3c19c89852ae8df750aec74cfb9bc417b93eba4a1b42ed444ca6a48db6c0a8215680452924d86b723a013f1ea3beba2a251deb864b4eb1b69028488bd864d022
 MISC metadata.xml 1183 BLAKE2B 5e9198838214711c9fbb5beb4179300c5465079646c3f4268145a3c893f1913ac9a14811b39afe637aadd183e4351a54c2ed160951e995bc4ce3f869b28bd6e9 SHA512 d6e5a8de5f9fe3e71a91a26be44cd87162863b1fede14301694e0a38135fc2ffb5c3ee25a4aef40d7cdb73812d0b6af72aa6b67ad782004648f54ac5e86cc662
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
index 381abd6f3384..9d7d37dbd335 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 python_install() {
 	distutils-r1_python_install --single-version-externally-managed
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index ca4e0b2ed12e..e2bf2b9211e6 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -5,5 +5,5 @@ DIST scipy-html-1.6.2.zip 23947380 BLAKE2B e4616a157c037b0830fc32d23678fb7e8ebe0
 DIST scipy-ref-1.6.1.pdf 34594740 BLAKE2B 905ddcd7a3d462b09ded688f0818204d7684fa18058d0dac480d0a000e9ea0b7ebcdd33c01adae17234dcdf630d4aef9078174127af46f1db55d5c14b3245346 SHA512 355f4681439c1720f45dca6badfe72d77edfca0962fd9b42df34f1cd8fff7121fa6e7f60570bb638abd3ba9693930fa46b25af862d8fc1568b508c6fdd785479
 DIST scipy-ref-1.6.2.pdf 34599668 BLAKE2B 9ae3221c814eb0d1b1e9191e08000955af503f6448cf8b5841e400fad106c658670339219f4838bd312023601776fe0b0d123ebbd41460c478145da2ac3e9989 SHA512 9aecb7ca760805c470c41121268281c9547aef35ddf078816c5e48f7cf4912a67cf622e267152c6cc823df9d82be1f3a875d97469169d0d91d6219164c130c88
 EBUILD scipy-1.6.2.ebuild 4145 BLAKE2B 5ff8d9071dcea9ab487dc253717939110d1e79a41492b0172a504ba14c1da81126aafdfb16312d88ad54e8f26f73f4e4ad289bf455b3c56d3186bab926f721a0 SHA512 d020e73bd5bf44f2a0aadb1a34e61d93dcaab2d1a68e50cfcc101f88b61ebcd10404efa7e2570d839143f9683b5b8e9bfc9a3645d01c710250d1ef1d1bdd0be0
-EBUILD scipy-1.6.3.ebuild 4155 BLAKE2B 74d58e7152bbec337e6b38aa11318b1885d4fd1c551a90471b4f11d55f2e8ac05ffd1cb3ce125915b5bfe4124db22c9f5bea537dcde60bb87f46e9e0310b4806 SHA512 118a42c6d7971a0e35cb3b7b3a172ee8688ed59aa07fafb3697058ac3898780e5a9dd3528750b27b2cd224750b96a5924caeb9c10d69c4d4f8158b898e64e98f
+EBUILD scipy-1.6.3.ebuild 4162 BLAKE2B ee3da32f74b2b4d878992cf95ec069ad296e248c46770a0bb0464c30afb8a3fd568aaa933b8fc2bf4586242ce5b5e127fd3f55278de4e479d3207a6be5eeb4a1 SHA512 3e43ab96a8c7592088667368a05bd312521cd76d1f2c03ffa2c35f2c7c693035e93d92f14e8884261157bf06b88a82378ac4948f8ee5af42ec7e6bdb0b9571a1
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/dev-python/scipy/scipy-1.6.3.ebuild b/dev-python/scipy/scipy-1.6.3.ebuild
index ecc6f1571bd1..e98e4bd93794 100644
--- a/dev-python/scipy/scipy-1.6.3.ebuild
+++ b/dev-python/scipy/scipy-1.6.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse"
 
 DEPEND="
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index c6a3a912580b..7843ab66078a 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,7 +1,9 @@
+DIST python-gentoo-patches-3.10.0rc1.tar.xz 8112 BLAKE2B d6f9b44c5a231f447ffe3533afbcaffe0f3b8bdd5a6690f1854bd7e1199d036d11a4cf4abfae345a88c42740ccbd4b72e53cbe28aea1a5db39dda1e5bfd47229 SHA512 bba7045f56369ca0354a539f8478a1afed77dc89a9faf548a0cf8959d644360b0afc4f84b95151ebfc2a6553078322c7445073f7a4104e9cd639ccc86ad0f792
 DIST setuptools-57.0.0.tar.gz 2144749 BLAKE2B e1fc99503ee5de425b70bf2733b1c489693e38cd256bf95cb321671bdaf87745eaaf40c43bcd03756a4cefa408dd1414f8c30af274963e3a0ae57f7b95d3f9c0 SHA512 5277d8630367d6b16a49e36ed84d8cc6abfaedf87dac3f795b204626a8f15ca9fd80d158a465d8bcabe9c074c76b87c3378d82a4ba5feee1ac6a5f2c91db061e
 DIST setuptools-57.1.0.tar.gz 2144012 BLAKE2B 148eb7b5e432461f692faeb3fd4eaafb99bb9fcd2c430cbde40fb16b365ed011ce49966a8923337a860b63cdc6d8f3a26efdd138cf4c40c99e72f7d714fce57c SHA512 dfcf75584b3d7ae07e0f58ce8f596d7e9cbe3a0c178411053b066fb4362226bcf6467a79aed0853acd0b9f6a3371c47ddb07d77cbd780fe9782b8c19bce2e5fb
 DIST setuptools-57.4.0.tar.gz 2141309 BLAKE2B 89b386b6d5bbac61df400f60c91a0a9b9ee381aec7d2f65a856c317c7b0b5512c5e9aa8844c0e64f1840a8e954ae22ed542ad97a104d5416b1df2ac02351809b SHA512 7fcc297ea3e6310f2ec8ba5bf0d509e3f4acbce6bde7e5f0fe1b022c147cf88a047471bd4aa278724e86ebc6be800015fb935c7a31dbb6a0801a2d380ddd89f2
 EBUILD setuptools-57.0.0.ebuild 2319 BLAKE2B bde0c2b2c28dca1d79a688e838340404c1c21f4433f1ee104d2fb4df05ee39ff74403cc56bae332c4ccdf1faca4b6d05a58526c6b858e7c7fea04642ecf5c52a SHA512 aa0bbb2debf43915d698a6a94ec8b71441b4aed0cd0b991dd39dc61409ca8edf3245486fc5b5bba4566512181eb193d1811bf34f394592fedc0361dcc3ffe8f8
 EBUILD setuptools-57.1.0.ebuild 2328 BLAKE2B 87a70ef14e6c01d7d28c69eb6bee16a57ee6d228bf002d2614fc67a8e4a7479ac21fcc2234869bada3ed4224f3a22ce2a45bcd3625ddc122f60ddf96ce28e92f SHA512 a1fb816d0e6fe413f6f96129821625a7b8556cdb59ca3d84509e9cf1792e599e7567ac22f62b815dca978644bba1fda0ad10d991cd7bbb113b94b6b7aa1a9e44
+EBUILD setuptools-57.4.0-r1.ebuild 2746 BLAKE2B 3a62da0fe8fcf6ad2ebc214debee1df3429a97dd5a3d1103dce1abfebb0d3946814a349311346c183275dddb46ea65da88e05c5048c7b8baf11b56e23b0f49a0 SHA512 862575f3046cf84224e49eabe7ed24f5dbfca9e08b6528a3b0a768a6ae916a78ed172618d150d63b4932fffa0e8a75ffd075692eae59efbb3bcf2eccf7113cd6
 EBUILD setuptools-57.4.0.ebuild 2328 BLAKE2B a099a65fb32d0c0d8484fb50248bf699b0e4563a882e2282318bab53739f4969c3853f7570275251a5568950662650ffcbebccbb8ad528e9337e2412ce2f45cd SHA512 123817b89c66f61ee6f3ca70185038ac835672e724d8a500707e5ed90f83a8e1624a511e824dc74d87af243954d6feccd80765519388b5efef805c08703b2e26
 MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/setuptools-57.4.0-r1.ebuild b/dev-python/setuptools/setuptools-57.4.0-r1.ebuild
new file mode 100644
index 000000000000..f5f5fae0f1b6
--- /dev/null
+++ b/dev-python/setuptools/setuptools-57.4.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0rc1"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jaraco-envs[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# apply distutils patches to the bundled distutils
+	pushd setuptools/_distutils >/dev/null || die
+	# TODO: distutils C++ patch?
+	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+	popd >/dev/null || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local deselect=(
+		# network
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_distutils_adoption.py
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		setuptools/tests/test_develop.py::TestDevelop::test_2to3_user_mode
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/signature_dispatch/Manifest b/dev-python/signature_dispatch/Manifest
index 799103f1d658..f1e53cc1810f 100644
--- a/dev-python/signature_dispatch/Manifest
+++ b/dev-python/signature_dispatch/Manifest
@@ -1,3 +1,5 @@
 DIST signature_dispatch-0.1.0.tar.gz 8715 BLAKE2B c62f5d0b0b263e50215d588e83bab4b5ca6dff82f856ad6265a0bb2dd64e2a3a8dfd0b8989ec17424828575607bd4dccc5802ef072af271eddb88c2479e6b8e7 SHA512 687a1de540a61d274e93510d2c5a93c736a52587b0215aef91364e34ad8932b880361b53fb84e68f9c2083652fa97c759705b4d61bc74caeba73a4ff37b42785
+DIST signature_dispatch-0.2.0.tar.gz 11422 BLAKE2B 3e3297ef34bb4f7352fe867edd2c804d627d5f8e854b1551c88dcdea2f83a6e2cde9c0f088d263e405f29ccd7114717c9348dc59d60ccd00a4ebb84db800d398 SHA512 e2fedfe3260be641c319364a8f79b2d1444179c824e409fb8304352cc9f73fc2cfb8fbdab6788c14d08e716d4655cda72bc15b406596d43520f959973fc612c5
 EBUILD signature_dispatch-0.1.0.ebuild 505 BLAKE2B fc8de8b0ace0179bb7618f53b02d82f7b82cb8c3467085b43095319bdcaf7fbba7c871c956251693cc48d9b40833567d98953361c626901dca6bd173b6163b4b SHA512 66c425ebbf62950d3d5c1f85534aba0369164f0f72e9f063dc7f9016f960f8096a31cf0157071eab0a8009c1c0b0921a2646c3af7ad09a92c9c7b97ba1cf3d98
+EBUILD signature_dispatch-0.2.0.ebuild 557 BLAKE2B 9a60e0db2cdc6294a7c2eec151edbd74bfce2ead92e3fd5fce7f3baa93dbd9bd0818969213d344546f880f2c436427a7e6a423e1f2fbeaec3b99862fbeb4b53a SHA512 a58c1c204e8f23dbae1111e9e3bdc51e12a6eab4f64605d5e5a6e1038091b6cce9f178bc6011904ca7256a03bb6c7edaf5b9ad0e81d9fc32401c9015ced85cc8
 MISC metadata.xml 393 BLAKE2B b1a6b8868d977b7d8c96a6ac06cf9ee4f34c9dcf162d6eb4f8e5a45c0bf31b692533f7291f8875261fa14a8ea48ff96cab96b9c0a533a75013fc12472ea95940 SHA512 9706906e9ce4d27c9053eb99c54c98301ffca6ead45191a9386ce4bc1f0daaca58b062397b93515fb2d9ecb0a9d4f6f6a26a96ba238069bdcad411eaabb7204e
diff --git a/dev-python/signature_dispatch/signature_dispatch-0.2.0.ebuild b/dev-python/signature_dispatch/signature_dispatch-0.2.0.ebuild
new file mode 100644
index 000000000000..73c2bc0b51b2
--- /dev/null
+++ b/dev-python/signature_dispatch/signature_dispatch-0.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Execute the first function that matches the given arguments"
+HOMEPAGE="
+	https://github.com/kalekundert/signature_dispatch/
+	https://pypi.org/project/signature-dispatch/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+RDEPEND="
+	dev-python/typeguard[${PYTHON_USEDEP}]"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 3d432bd3c3c0..3b5b8a572abb 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,9 +1,9 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
-DIST sip-6.2.0.dev2106291255.tar.gz 1180173 BLAKE2B e5dc12515a692f5cb0e82828cc8a14879a764056b04e15957c3e4eeca3bcaf21bce95397eacf5480a16f3f9c2037596880efc0e6a84599fe232823438b2bdf02 SHA512 35cfa8a9b641bfe2cb7e2454e514ece0cdddc48b7afaf55e65c34b76eff82a9730d05dc6122e4f08cfc2dfbcbca63e99ea11932f778055f532026b3cb2d92873
-EBUILD sip-4.19.25-r1.ebuild 2274 BLAKE2B 6c6b9eda1e03e05a1e92da561a4ab208ebf80b9b546c8bfa0e1a68830d8e6889a1fcd5dfef10c2d184aa8dae55c14b46f1bf281bf5ba87ce80f256f12be6174b SHA512 8fa6edfef0535f920e2fbdc08db3c705d27abdbef4442f72ff7ce796de967190cd7aff0bbc710f3bbf9c481aa984ea44afa7fd6a4131405266dc07200277f3a7
+DIST sip-6.2.0.dev2107131757.tar.gz 1180225 BLAKE2B 456111e610d872c4b7a875f99e151a82ba3ed1ff11f7d93b19558c52f37e710e448387256d0f620a497d260d97c583c53cbcc5a42affd6e7c05e4f557ae97732 SHA512 260d86d676a56440ac78099de9998697114ed5deb1ed15299aaea68b49b8ea829dfb92f990762875abff0a0c653e4998f1a91437895ba8d38cdac5cf4f2c5761
+EBUILD sip-4.19.25-r1.ebuild 2268 BLAKE2B ee2c0d7da7d33f9043e5c368200fdff53d8438f283762595ebf9a873e0e90324eec111d9b47cae8da3f2a8500081f0b64687f7ca20dc27482f2fe6578f31a619 SHA512 c4f50bd111aee5daa0da7b47bb7340c4ab7facd8b7bc71fbeea661178defcc586e42b8f14828848a5b65024edb8607f1636e9592a7ff62ded8deb62f385097a4
 EBUILD sip-4.19.25.ebuild 2266 BLAKE2B 0c407d5662f9b4a52c6609f26f2af147c9f545408d85f4b0ff3607858057f5c8d8e2fdf9b43638037289b1dc7378c77667894b046a37e62d2268e7af635b5ef9 SHA512 ed0d96b98948b38564c61e95d25546306891652fcc2cacfb47fa9d6e535595a4146a82458943cbbc5ed02f58283ebc9ef338c39bd806e3e79114a3e34633bf51
 EBUILD sip-5.5.0-r2.ebuild 866 BLAKE2B 7a712bf5925feeb8758b32a5fe4871172163d2c423a22d4eeed2802901b9a1a3a6ae5e4a46092f5132cb695a2ea10d8c759be08866689794d9460b53313c71ca SHA512 9f3b813efcb8c02d2e9998b1f547bf6238b59e6e9342b5d441a1eebe1ac36b7ac1988ce876081da7ddc432cc8a6a4819f96257e5188a519a2296733d094f4659
-EBUILD sip-6.2.0_pre2106291255.ebuild 899 BLAKE2B f004737c0f47e793bfff550e16b63103ac4290d90421d384b6d1157ef72631edc25ab06fe4910124810e138724d0ef4b2fc81bd29a78062f6fe351a134510dca SHA512 8c12603272fb963edb8afb8145718c0880ca1b43ddef577df1073b31f15e474bf22fa577238d696015e527e3ca5c465fa0d6e4bebe78629713418116a21ce3e3
+EBUILD sip-6.2.0_pre2107131757.ebuild 899 BLAKE2B f004737c0f47e793bfff550e16b63103ac4290d90421d384b6d1157ef72631edc25ab06fe4910124810e138724d0ef4b2fc81bd29a78062f6fe351a134510dca SHA512 8c12603272fb963edb8afb8145718c0880ca1b43ddef577df1073b31f15e474bf22fa577238d696015e527e3ca5c465fa0d6e4bebe78629713418116a21ce3e3
 MISC metadata.xml 638 BLAKE2B fc7e45529b0822365db27d281febae466f128ddf88223eea8fd2dedc2c4107e0a91a2784bdac69e7ecda930a76e25c5ad80cf3c6d8ef326737cc47e12a571ec3 SHA512 a603d5a00a8315fcf19b860a45660c76c3f4b47199983d2a0ac73ef1d1617afc7c56f67e2ff1c60bfe3fe644aad57ddf47e55ea2fc400fd9851c3a010fcb4cee
diff --git a/dev-python/sip/sip-4.19.25-r1.ebuild b/dev-python/sip/sip-4.19.25-r1.ebuild
index 6c1abd79157a..5cccba1a46d2 100644
--- a/dev-python/sip/sip-4.19.25-r1.ebuild
+++ b/dev-python/sip/sip-4.19.25-r1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/sip/sip-6.2.0_pre2106291255.ebuild b/dev-python/sip/sip-6.2.0_pre2107131757.ebuild
index e9cccc902285..e9cccc902285 100644
--- a/dev-python/sip/sip-6.2.0_pre2106291255.ebuild
+++ b/dev-python/sip/sip-6.2.0_pre2107131757.ebuild
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 929c0f1c8e46..d7837fcf8264 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,8 +1,10 @@
 DIST snakeoil-0.9.4.tar.gz 271395 BLAKE2B 6aeaf03e2c2f48a85ce926f1b8e0b86271c608695694358cb6eea56b962c0731b909c16bf37844031e986fc7ebca3a7c4cae5cb94ee55122584bf83981d8c4b6 SHA512 853c3fef517e7161a61ae0622fed82ceffdc110cad4ef7d5e2166728f506228d0802018dd351956f1525f0d27a4150e9885b2cc7c71788950261f72d8d7c4cc9
 DIST snakeoil-0.9.5.tar.gz 266086 BLAKE2B 635d2d821e47a92a668b2e95364d6587f0f74c21438356e708d6b16ed6c027df39a28f73d261d8ae06eb32de471124cd5ba5df0fc899f59dad5f7d2363391e00 SHA512 0762d90932bdf995160b3410e224660dae2cce327cdc30d5093ca9e3d16d3e910f88e409a87d2d7da211b850f7d0b7d9c70f053462dd9a651e4202b8ca018105
 DIST snakeoil-0.9.6.tar.gz 261998 BLAKE2B 1f81e633321b7b1988865092ec2778feb35338edec0eb00c9a5be505a9cf7d4cf27b140c9bc56fc42156dc33a7990e8a269d1a69df7cac92a71b56ce612b65ae SHA512 a900c76ecd5a3519bf5236567e5f9d59bca7c5f7588bdcfbf1bec0d912352486c86dfd4677b0aea19170bc9170109ca782dd60232e365008ae016cdf9ade7217
+DIST snakeoil-0.9.7.tar.gz 261551 BLAKE2B 6739541d1e40b3ac5c4908e6bb92b5b40957f49119307d6046fd17327394ae0406c01dc10396cb568ceb3757ba3367b930441d08079e9be635eeb6f14bd02e3a SHA512 c2626d8050bf24b4ce3f6fed5c6b8993fa9a5ebb40dd664c7008caffe4b26237edeecd3de8fe90f3a1c5756de3d770c3b9e1ef2e95cc052a5f8fcf22058925f6
 EBUILD snakeoil-0.9.4.ebuild 753 BLAKE2B daac420726043bcd5c0c742aba5384325c5206c5b9068fdfad02bed5e625f67ef388d8e5a19a8e83625c8b520370f87966fa26285f01d1236752510b6bc8f36a SHA512 f5abe777e2ef85f45681ca1c2acbbe774b50b036d8b0717076d987f5e5c640dc3f55ac22796327509b4c106757b8db1e249929a2cead7f6fe5f545e59096fe08
 EBUILD snakeoil-0.9.5.ebuild 765 BLAKE2B 675a1df4e4137585c09fa2c7b9223a918a355ec86872c5c93f7719d7f197851d7d3c36c13fd6bd0ae2026258cf5504856786060f98d634edbdf064ed87f7bbaa SHA512 545968751d1fc39240510ae92ab5c909a72b9f0540f24a7eee940dffd9ab6844268e1e03de95ca1abe70c40a49c401d82cd625566bb3dde74384aa6003761712
 EBUILD snakeoil-0.9.6.ebuild 844 BLAKE2B 687712f6ccb8c151953040595fd4a87e75e670c70502200b43f26f64f78d447ab009ae4dc7232b2b7df1353ae310aa0b97b0e4f52adfde0775bdedd077ef3ab9 SHA512 96a7884eb260cb0a0f2c5ede3a5407eabda735c046627ba30b2f0f634bd13c80b43aa4cbb34342f0faa414c2c88a040f52207ae2502785e50e8c0b298c0701ec
-EBUILD snakeoil-9999.ebuild 806 BLAKE2B d74dc5937e3afef85beed58d7c18b7d9744ea94465c96702b3b3926ab94929c0702d168053d9a80479f5d16b6e49dfc17604a209ba8e1da6533f5681347a2bc4 SHA512 d0402ae1d379f9d5710d287fbe9d5828ddecf3e5960f1e9ad603fce72e2b2fd0dd40116c60cf1b6eeaebec8a8bc7f7ecb2bf38d03156af1c0e9ef372fcc2d491
+EBUILD snakeoil-0.9.7.ebuild 820 BLAKE2B 781e02504b5010235d6c8688fc00d2d29999b6c80b62e04cb91eaf8e8309a95c2171d856b64acddc598957dd247a9d65975713394e06c5d460d6faaa114c6647 SHA512 4f10e304fac0f4f4ba1be7304b73d41bb9f78e458ff5214c732d2fc2526e2b7f532565b44f8ff63ad027231b9131de9d37e0e534ff36777ba42d85d6b8981bbf
+EBUILD snakeoil-9999.ebuild 820 BLAKE2B 781e02504b5010235d6c8688fc00d2d29999b6c80b62e04cb91eaf8e8309a95c2171d856b64acddc598957dd247a9d65975713394e06c5d460d6faaa114c6647 SHA512 4f10e304fac0f4f4ba1be7304b73d41bb9f78e458ff5214c732d2fc2526e2b7f532565b44f8ff63ad027231b9131de9d37e0e534ff36777ba42d85d6b8981bbf
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
diff --git a/dev-python/snakeoil/snakeoil-0.9.7.ebuild b/dev-python/snakeoil/snakeoil-0.9.7.ebuild
new file mode 100644
index 000000000000..53cc9eba8f72
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.9.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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}]"
+BDEPEND="
+	test? ( >=dev-python/pytest-6 )"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index b4ffe8974a52..53cc9eba8f72 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
@@ -10,7 +11,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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/sphinx-tabs/Manifest b/dev-python/sphinx-tabs/Manifest
index 46520b76c113..4fefff4186e5 100644
--- a/dev-python/sphinx-tabs/Manifest
+++ b/dev-python/sphinx-tabs/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-tabs-3.1.0.tar.gz 521642 BLAKE2B 10fb138f62ff98316b348437d1fcb0354060a89902b6706919d4439800b79b94d68fb871d37abe3ac5d19a7920c928143251c5d58d5f66979b9e551797d8f9c3 SHA512 4e278e860a763cc03981dc15ed493fb1a9c43f671031eadf7c75412687543e4eaa75c60d527fd6c7f815d4abe79a833cf11ff97b660c47b635fc8b0b3c77bf3f
-EBUILD sphinx-tabs-3.1.0.ebuild 899 BLAKE2B 9af945f9a1c413283c70823ef7ac1a3838ddb9b45d840657964a61c54bae6cc3d5784728f0a4ad0a1c6caae949f70d3412761e9520a95f5592ff6d8982881d6d SHA512 dc70b6e45cbd152e5042efca800d77fba8b5148344ef22737b0e48286137610c5347e31143cda78b7fc04eac093aa6c38751be670d3b64cab62bfbe5673175c1
+EBUILD sphinx-tabs-3.1.0.ebuild 906 BLAKE2B 606210a2d5d8a3df8733598106efc90cb319a98b4a2856708ece4ad261aab517eb069b9aa988b50c0c2b586cdce2db712309f27e01842a9e70456650b589e8bf SHA512 559c5e353b49ea17883be16bc26cd6bd8c07bad2c45f34e58b87562b0fecfbc88dd8ebe262905cbe2829557f77558d5acbdafa33565615ae2c01d69781fa3cf3
 MISC metadata.xml 316 BLAKE2B 375e14399e0e3fcc075546dcb40e4125667d899744136c51827951ff91c721da0e8a3c3a8672a9a66ae5379b46fc30128d108407d95153c39e75567f2b106434 SHA512 09121a2b49771ae98c777720b3cf24840f9e76fa5a300d44f4a5b0fb29375a0995f28f51d6756cfcebcf576a93ba0e5c4ffd28c6ab8e2300e05a4ba5e7d35b35
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
index 66b201c60e34..05fd289b77b2 100644
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 84bf005bad1a..23ad6b643e23 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,11 +1,14 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 AUX sphinx-4.0.2-py310.patch 981 BLAKE2B d4f64e7b0cff10ea4c348735820d6cbb595c15e36185107a25819b11af2d79b7776296f167bcceefd0b2065af0611b5b2d3fb1e8ffc8d1d0ef14cab8f42671ae SHA512 0dee3be88a4dd39d5a34b8e388dd53609b586fb41473560e96ba8c850819b2da41d69e6e97af7f7a154bf4555f3020501409b2a54618605bef0d6628dc2f44e6
+AUX sphinx-4.1.2-py310.patch 2404 BLAKE2B 9768ede1a7272497ec5f266ed676fe114d6b72d54d8369b28c98a2af20094050a04f70c0e5df93580ed7e3655a0bfb81a4ebf79bab1f658b121f97c8d8cf7d71 SHA512 f49567b0acebfd1187db7f9a4fc5d20bfa9a2d250a8a987ff7ac49bc29d1877755fd74d60c8318d82be34c50d4bddf427e764417366509abdbb43ff3d119b82f
 DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
 DIST Sphinx-4.0.3.tar.gz 6164298 BLAKE2B 60726ed4cc4f92910bcfff20dde09beef89e4c171b6f12a327e981df8fa6569a901c0b8e994cd66263b87056548f9f966a2e3049341447ad28797bf120a42a70 SHA512 8dd561b220779efb4cf779f46b342a298f18bfeb7670e0485ba8fcae7a03b2bd30368b441237ed597e1d8f001e35bae13a7d4d44d6921a4fa1b8a7804a5850c7
 DIST Sphinx-4.1.0.tar.gz 6302885 BLAKE2B 7e2eafa236173c0fe7d761d1692ff8bb0c12ad8fae2894e2088fff0415d085a3ea652c59d4efc94788829c4261cbee161d85a5c35d6a282fb1a201f658425bb7 SHA512 482378b85b51e74bc2c841bc5ac7b7d5a0034b28e62d36182972439a1e48ce5faaa82e6c3daa35ff6a3f1b1ed1c4187564c77806e6d1804dae0f2c24262adbe6
 DIST Sphinx-4.1.1.tar.gz 6373009 BLAKE2B dd19089149d626a0a65af4ff1cd8acf5a5ea8d00b6c940d2d7c5e1c459ae37d993d82652114b9144a80971275a6e346942dce9a6a3798220dc77e0f88d8fc2e1 SHA512 6250fa568f9952471f3cb433a1e7a053c779540c0c049d0e0bad4f2b754935f8c9f351a297349bc15f1dcb4b152a550771f2f381b2eee92a68759e034fce23c4
+DIST Sphinx-4.1.2.tar.gz 6373677 BLAKE2B a78df4302520898c8708a75129baf28dd2dcde2dcbb4147d8246a2dd7907ae2af2ed8cf1d259ff1065dbe987fd918a7153831a9f5c16e79834c41f86b6031e41 SHA512 1fe998de7b8fc47989e186835748b7fb5d0b523db95434515b6af29b56d28372f2f92ab917c27cbed51aa0cad13175eda8bf4fc93a8726eb5e93e9bc6995e457
 EBUILD sphinx-3.5.4.ebuild 4147 BLAKE2B 71424a28d134dbd1eb18babe105a5b98bb27c1dd92f64844121c3b0f465ed1c73f10b2cc8e9d49952a49eabc1d58ec748f3c207f60dce9b5ef8b1be71f9718ba SHA512 c83535c4082e426930df4bbbc4eea476ed50e109323b89f3baeaa2a27bd0aa61f48f3f09f9b2030f4335fb65b5ef7256640233d2183db36352e2cbce60044661
 EBUILD sphinx-4.0.3.ebuild 4293 BLAKE2B 70552e6b75fa50af4d5af1aa491e7bc8f1aa3103e609c7cfec110ed466d624ec4d0bc1e291157d59383e25bdd4b7d90f794e0213394713b323a131831fcc4001 SHA512 01192407c223cdc47861631e4f211d526ae4f3c9546b91bd75d7a09d05adf9d8e53c8cb23eadcaf5a8cc7acf90772a0a0624df1e92146f81b17273b4dbffb16b
 EBUILD sphinx-4.1.0.ebuild 4343 BLAKE2B 78d3a74da8b013e5d80b0731ad1a6f5b19ae1e991f96c1a28b03234822f78ccea813275ecef944b75d16f75908d7ebfdc6b7077e291a8b86b4bb7f2d5833569c SHA512 b560de6ba97660341f97b3ad657fc62bd3d2ac56e749ec0576cc967da54698481e365300c95251d257a393209aba97bf13e6ea2b508a4d77f195ba951c8dacd5
 EBUILD sphinx-4.1.1.ebuild 4359 BLAKE2B d274c51e81c11455ac5c7eb17891ef9056b6f8bf26b75413afff72196df610c15ba5b1c9dde354e8e495a9e910bbfcc7f33cd207eea5741a14fc6fbe3aa03356 SHA512 09afc62e84ded1a76f1b967962fd8f33e77a4e2ca2a1e61883e1990e4cad1074405f38c3f9e6c375e1ea37af15acd3498d5254e7a459d264556e455d5f08ed05
+EBUILD sphinx-4.1.2.ebuild 4479 BLAKE2B 7e9b009d093e17f56e43b75a2d88d98643d5f47757a4afeb0a53f8e85bacebaac773015ef4e147c938fd9ad1a2b04a6d9073c93c1ee658ca39e38b39af5bfda3 SHA512 366a40dd4c4106ae2da1c7124370af17d2471c5b89f1a22f05923466293a953405403742ab00c395ead68f6b73b8da1fd4529f4bbf3139db23568e0da9aeb5bc
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/files/sphinx-4.1.2-py310.patch b/dev-python/sphinx/files/sphinx-4.1.2-py310.patch
new file mode 100644
index 000000000000..8c03d1f66721
--- /dev/null
+++ b/dev-python/sphinx/files/sphinx-4.1.2-py310.patch
@@ -0,0 +1,63 @@
+From 1fd5f746539d3e02886032fae8d53af0c2f6ecdd Mon Sep 17 00:00:00 2001
+From: Takeshi KOMIYA <i.tkomiya@gmail.com>
+Date: Fri, 30 Jul 2021 01:27:38 +0900
+Subject: [PATCH] Fix #9512: sphinx-build: crashed with the HEAD of Python 3.10
+
+Recently, `types.Union` was renamed to `types.UnionType` on the HEAD
+of 3.10 (refs: python/cpython#27342). After this change, sphinx-build
+has been crashed because of ImportError.
+---
+ CHANGES               |  2 ++
+ sphinx/util/typing.py | 12 ++++++------
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/CHANGES b/CHANGES
+index a643bfe841..70eb8db93a 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -16,6 +16,8 @@ Features added
+ Bugs fixed
+ ----------
+ 
++* #9512: sphinx-build: crashed with the HEAD of Python 3.10
++
+ Testing
+ --------
+ 
+diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py
+index f1723c035a..012d32e524 100644
+--- a/sphinx/util/typing.py
++++ b/sphinx/util/typing.py
+@@ -33,10 +33,10 @@ def _evaluate(self, globalns: Dict, localns: Dict) -> Any:
+             ref = _ForwardRef(self.arg)
+             return ref._eval_type(globalns, localns)
+ 
+-if sys.version_info > (3, 10):
+-    from types import Union as types_Union
+-else:
+-    types_Union = None
++try:
++    from types import UnionType  # type: ignore  # python 3.10 or above
++except ImportError:
++    UnionType = None
+ 
+ if False:
+     # For type annotation
+@@ -114,7 +114,7 @@ def restify(cls: Optional[Type]) -> str:
+             return ':class:`%s`' % INVALID_BUILTIN_CLASSES[cls]
+         elif inspect.isNewType(cls):
+             return ':class:`%s`' % cls.__name__
+-        elif types_Union and isinstance(cls, types_Union):
++        elif UnionType and isinstance(cls, UnionType):
+             if len(cls.__args__) > 1 and None in cls.__args__:
+                 args = ' | '.join(restify(a) for a in cls.__args__ if a)
+                 return 'Optional[%s]' % args
+@@ -337,7 +337,7 @@ def _stringify_py37(annotation: Any) -> str:
+     elif hasattr(annotation, '__origin__'):
+         # instantiated generic provided by a user
+         qualname = stringify(annotation.__origin__)
+-    elif types_Union and isinstance(annotation, types_Union):  # types.Union (for py3.10+)
++    elif UnionType and isinstance(annotation, UnionType):  # types.Union (for py3.10+)
+         qualname = 'types.Union'
+     else:
+         # we weren't able to extract the base type, appending arguments would
diff --git a/dev-python/sphinx/sphinx-4.1.2.ebuild b/dev-python/sphinx/sphinx-4.1.2.ebuild
new file mode 100644
index 000000000000..3d9abeccb558
--- /dev/null
+++ b/dev-python/sphinx/sphinx-4.1.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+	# https://github.com/sphinx-doc/sphinx/commit/1fd5f746539d3e02886032fae8d53af0c2f6ecdd
+	"${FILESDIR}/${P}-py310.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	# remove unnecessary upper bounds
+	sed -e '/Jinja2/s:,<3.0::' \
+		-e '/MarkupSafe/s:<2.0::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		tests/test_ext_autodoc.py::test_enum_class
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index a5423d730eeb..2acf53845f6f 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,5 +1,7 @@
 DIST spyder-kernels-1.10.2-gh.tar.gz 78924 BLAKE2B 47f0ec284f54590ee9c5a43caeeea61b644fccc6d6222dfbf85187beb9cc141504082dbf50d1d85f5315c8e8e46b9f810253d904b594bb4c52677271b0f7f12d SHA512 4bcbc2646493f384a3f5fad1cc2a42bbe1d06c5225362beb995a73e3c1abe482f3855d844c449b07631b4ffda99492ccbd3cbe69c515ed38d6a98913bea90e2d
 DIST spyder-kernels-2.0.5-gh.tar.gz 81123 BLAKE2B 390c3c5d8ceee787f6699dd41ecc9e015050db86d0e416e32be28ebe0a62b09c611707ac6427e8cc809303f41a77b7d9289f15d71d0b2a8ce17ff87af79ea5ad SHA512 b44702a0964bde69a9035839e3ca052a4ccc60340de83ccb9f1b0e6b93b73da5554e10b5eb61b8965416130d8f658f1a18fb1164c59cd27134298c16d3442dbe
+DIST spyder-kernels-2.1.0-gh.tar.gz 82069 BLAKE2B 04fdf22f887d43a3c9bdb973588af895f07263ee7fed42d1a8f7b1caa25083c8498c28bbe0cd7f8f744082a94bc2906000b34cd6b5b78cb2ea017d0e2950b5ae SHA512 2261f582de5bff4c28463d4bd056cb64edbadabb352cd39b110d21ea004d3118162ca5f715366235789f41c76e6ccbd9064d7f2f7de77663eda89e583368c8d9
 EBUILD spyder-kernels-1.10.2.ebuild 1342 BLAKE2B 0e2ad1fd6d5e3e8ff63487993ee6f49e9becef8cc688558d0b2e6fa4e408752e769b289e317f4a79ff69d282279168258fbb7ce0ed7b81f032551bde250eb8cf SHA512 2e1e25a8db0c3e3da14c684ba80d19225878c4e345be724858bac43218991f537a9515514469d975495c0e9616310081c49b510c4590cc2ce52080d9e6969c4c
 EBUILD spyder-kernels-2.0.5.ebuild 1469 BLAKE2B f865f1bf5562695201d6c0d94053ec5dd308de044c085e2de6084224cd3f3c4327c6dbe3bbe3ed7f2cfe5a0cbc6d7ba9494913e813fca4561dc59ac29f3fabb8 SHA512 25536520288ad3e2e17a42b1b6b5c815c3ebd03ce113671fff457c44721c8a3cf1a76cbce5e06c0c2f5d517e76905b9dbad4fc31a4950b5a2022d35824db65f0
+EBUILD spyder-kernels-2.1.0.ebuild 1469 BLAKE2B f865f1bf5562695201d6c0d94053ec5dd308de044c085e2de6084224cd3f3c4327c6dbe3bbe3ed7f2cfe5a0cbc6d7ba9494913e813fca4561dc59ac29f3fabb8 SHA512 25536520288ad3e2e17a42b1b6b5c815c3ebd03ce113671fff457c44721c8a3cf1a76cbce5e06c0c2f5d517e76905b9dbad4fc31a4950b5a2022d35824db65f0
 MISC metadata.xml 544 BLAKE2B 621ae952ca69bb37d3968b2c4e0eb9d613a6082467229a66f54cb62ac13f11e9a4f849ecc312d02c16d5af45921a9c1c15cc2ad552dfe3d105abfb67effcde6a SHA512 e4c77b881f16c1017fe2c3fb2f4072db36038e8a8aa57cd69233e1a807326398d80381fbcfc156ccee3294fee759df51546af36fc8273ec09955ffd7937ef72d
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.1.0.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.1.0.ebuild
new file mode 100644
index 000000000000..6e20169fd3b2
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-2.1.0.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} )
+
+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/decorator[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-5.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${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/dask[${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}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# we no longer package distributed
+		spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index 3adf7bac25ce..c88ee5a567ce 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1,4 +1,4 @@
 DIST spyder-notebook-0.3.2-spyder-5.patch 38116 BLAKE2B 2f311e179d1e0cbdf458773eb0e8d71f1f7cb9dbeca9f01b3dd12120f12177b2bb84ac6e09d7a17a9b26d667523bd28027f80102ff90889d6c781f7b530f8c95 SHA512 e57bc9d9b85622a64d151931d5b96a0c8d448075535ea9e91dfde5326c5192b3cd2d96c9fc88fef95237d4ec833e47238ddc3a3d12de25b4a8dcbda65c92e57f
 DIST spyder-notebook-0.3.2.tar.gz 3868854 BLAKE2B ca13e905dcc02d6767002481fb68ab8bc119d4d2511a1b881f033b9387d4237a1b2232ba75368f48b4d096998da40a14d862f125c0b01c6b2498165acebf4835 SHA512 dd3b505c8a678a9f49b1fce1d22a8a1a6cf334b65d1ab94852a7ba2120f53e2e38eb2fa0d58343588d7304511d7171d8e0040e10cda905db11ab65cae7f6ce5c
-EBUILD spyder-notebook-0.3.2-r1.ebuild 1292 BLAKE2B 6dbb8cc563c0ebaffa690d47939ff7143b609b67ea3da32caa53cae4cd1b1909d41330e9934a244fff27c0ca4e1cf32b4a87d09e4bd9576a9e23fc624757bba5 SHA512 72938777bf6120052beeb36ba24f4beab7cfe8a207eb02bb9b9f9baf7d4967198e84f23d07bdc34e16c4517026835bbb7e08d0985f8da4bc9c138f5f557ea95f
+EBUILD spyder-notebook-0.3.2-r2.ebuild 1336 BLAKE2B 80af99f36afe561b82d5b16a95ab975b6711eaaf1200e644e0b346034210133679286506486958e1d485dffffc930c3549a98c8ee39e781c87d67a3f82c7ffc2 SHA512 3da8116be8f1cd9a5b05b77a90940ac04a960c6abae046b4eb38cac967d83f64663ecbb3dd8d960dacb71dc43a950fc71806ecc5b7df8517aa338b84fc55c3b2
 MISC metadata.xml 360 BLAKE2B 0c9d7f85523a02c6a4c867c2a4ae0c706d69f9bf7ffde077c28c97d9b12348ff797101cb784e702b4b6d910823efe5f0d426fdc4c7952efa02ae79c2cbf3041c SHA512 679dbf9cc9d01046262a7371dc9b523349583a6f8e2586f5ea06c1e91332f6aee004109c62d255a9d8ee61be40706097427cd1027c4a63487ad87609de9e3fae
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.3.2-r1.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.3.2-r1.ebuild
deleted file mode 100644
index 8a3c6f0edf6c..000000000000
--- a/dev-python/spyder-notebook/spyder-notebook-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Jupyter notebook integration with Spyder"
-HOMEPAGE="https://github.com/spyder-ide/spyder-notebook"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~andrewammerlaan/${P}-spyder-5.patch"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/notebook[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/qdarkstyle[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/spyder-5[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}]
-)"
-
-DOCS=( "README.md" "RELEASE.md" "CHANGELOG.md" "doc/example.gif" )
-
-PATCHES=(
-	"${DISTDIR}/${P}-spyder-5.patch"
-)
-
-# Tests do not work inside virtx/emerge for some reason, core dumped
-RESTRICT="test"
-distutils_enable_tests pytest
-
-python_test() {
-	virtx pytest -vv
-}
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.3.2-r2.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.3.2-r2.ebuild
new file mode 100644
index 000000000000..e62f67cf8633
--- /dev/null
+++ b/dev-python/spyder-notebook/spyder-notebook-0.3.2-r2.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,8,9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Jupyter notebook integration with Spyder"
+HOMEPAGE="https://github.com/spyder-ide/spyder-notebook"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~andrewammerlaan/${P}-spyder-5.patch"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/qdarkstyle[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/spyder-5.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-5.1[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+)"
+
+DOCS=( "README.md" "RELEASE.md" "CHANGELOG.md" "doc/example.gif" )
+
+PATCHES=(
+	"${DISTDIR}/${P}-spyder-5.patch"
+)
+
+# Tests do not work inside virtx/emerge for some reason, core dumped
+RESTRICT="test"
+distutils_enable_tests pytest
+
+python_test() {
+	virtx pytest -vv
+}
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
index c45a060c1281..38eb925b652b 100644
--- a/dev-python/spyder-terminal/Manifest
+++ b/dev-python/spyder-terminal/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-terminal-1.0.0.tar.gz 10098665 BLAKE2B a81e4cd2b1194cd750aff7d5a4d2c587ab60264b89e6e4264352b5f8ba850b66f278245fffed176dc36c2d5912e6f676ba2701d0a09bb384810230f631534059 SHA512 aa426e037dce6c2c7010fbf924ace27fa5dce9f736cd3b6b55d8ba3935e02ba4f6dab8815930c8686525c6e74f4119f781afaf9432f22f5436abec2c5a14c570
-EBUILD spyder-terminal-1.0.0.ebuild 601 BLAKE2B bdb5bed1476fa329c256ab323a6304a09929770d2a18c6f9ec632d1785d8a9420f3f9bcfe210c6416a5575ce2c5aa37dce768be980ffd9ea150f7e0d54c5510e SHA512 1cfa003e0889d617d0157fc9a2ca024d521ca0c88cd6a3ca91847cdb9c06a9b1cf321b152a749406437eb9049f61cbe80524636aad09463dbf5343e6c473dd23
+EBUILD spyder-terminal-1.0.0-r1.ebuild 643 BLAKE2B 97468c51254d98fc96100ab680567cb829f14d64060edf717674426419679e8c122693219e8028919b439cf6ebf23893ad8dd17bf7e8fb3a8780c702ace479dd SHA512 8df665588ed90405b2fecf49092de7305c72b08503e4e7cfb4c26b1a4a3a3e4901c0b0cbfe3bb1e0d62d7fd693875e881b3c01c4ff74c7cb2df5c7e59b9feb37
 MISC metadata.xml 360 BLAKE2B 76b0535377eaf46594ae7a7dd1fabd1d5c3a53e476e2068c66b7b50773f21e7fe1bf609b12e03763e276131d5f426aa95df7d483d993b0cdabb683fe884a2db7 SHA512 87e065d435f8fcff1c0da0e69c50904e5ce13980ae5463cec66013acdff144b5274289347bb9fa16c519cd4345a22062289b74537a5aaafc5606ac4614cdefa5
diff --git a/dev-python/spyder-terminal/spyder-terminal-1.0.0-r1.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..a1a0efddee4d
--- /dev/null
+++ b/dev-python/spyder-terminal/spyder-terminal-1.0.0-r1.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=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Run system terminals inside Spyder"
+HOMEPAGE="https://github.com/spyder-ide/spyder-terminal"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/coloredlogs[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/spyder-5.0.5[${PYTHON_USEDEP}]
+	<dev-python/spyder-5.1[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.10.0[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/spyder-terminal/spyder-terminal-1.0.0.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.0.0.ebuild
deleted file mode 100644
index 4150c3b690f6..000000000000
--- a/dev-python/spyder-terminal/spyder-terminal-1.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Run system terminals inside Spyder"
-HOMEPAGE="https://github.com/spyder-ide/spyder-terminal"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/coloredlogs[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/spyder-5.0.5[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.10.0[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/spyder-unittest/Manifest b/dev-python/spyder-unittest/Manifest
index 8d73060f3812..bbcb1795c079 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 1131 BLAKE2B 74a73101befd576e43470861ab715864173ce23a413f0142389c031314b990659fbc42f917aeaf71d05cc2f4d4144915779e306161240a2aed75a72d25cdb7ed SHA512 9a9685721c56c33b0db0fc9a556bb10b46685aebb90d21d8050f7bd0232b6c74785ffd7aa1c67b4d70d1699128015bdcd3a55ac0031c3c2b242034198a76ffc5
+EBUILD spyder-unittest-0.4.1-r1.ebuild 1173 BLAKE2B d64d8c767b2885c207195d69f00788a2fb236bae5ae4a460c3fbffd140a8e3efbdc1b7fe02f8496b646664de2fd9013fde853385155b81dc922b45f3032be06e SHA512 01c3be4900ebf154a9c5287bb0cebaeb0c7940ff8046c64a089b869b322d24298e8906abd3769424061274cffd62cd286938bb286c1125dc6e292b461e31a87b
 MISC metadata.xml 360 BLAKE2B 8157712dad4e0e35bb988afacd2c0d4a6b1e5cdfe16c64958d7aafbab827e87bcd8cbf4e7de4c04328311d3a80b609fa53123e92c53562bab77fb95c23bfdcba SHA512 522539af150d97c3ee19cb04b110584777ac903cee791a635078f4b14a1c215f43d6327f7e0e3345e217e4501676f0d91e2276ff0b824fb95ab38e73db659fe5
diff --git a/dev-python/spyder-unittest/spyder-unittest-0.4.1-r1.ebuild b/dev-python/spyder-unittest/spyder-unittest-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..38bdd2eb9179
--- /dev/null
+++ b/dev-python/spyder-unittest/spyder-unittest-0.4.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Plugin for Spyder to run tests and view the results"
+HOMEPAGE="https://github.com/spyder-ide/spyder-unittest"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-5.1[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+
+DEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+)"
+
+# Tests fail with spyder-5, however the plugin does load and is usable
+RESTRICT="test"
+
+distutils_enable_tests pytest
+
+python_test() {
+	spyder_unittest_test() {
+		# fails to test in ${BUILDIR}/lib
+		# test do work if executed directly in the extracted tarball
+		local PYTHONPATH="${WORKDIR}/${P}"
+		pytest -vv spyder_unittest/tests spyder_unittest/widgets/tests
+	}
+
+	virtx spyder_unittest_test
+}
diff --git a/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild b/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild
deleted file mode 100644
index ca9b9487f598..000000000000
--- a/dev-python/spyder-unittest/spyder-unittest-0.4.1.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,8,9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Plugin for Spyder to run tests and view the results"
-HOMEPAGE="https://github.com/spyder-ide/spyder-unittest"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-
-DEPEND="test? (
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}]
-)"
-
-# Tests fail with spyder-5, however the plugin does load and is usable
-RESTRICT="test"
-
-distutils_enable_tests pytest
-
-python_test() {
-	spyder_unittest_test() {
-		# fails to test in ${BUILDIR}/lib
-		# test do work if executed directly in the extracted tarball
-		local PYTHONPATH="${WORKDIR}/${P}"
-		pytest -vv spyder_unittest/tests spyder_unittest/widgets/tests
-	}
-
-	virtx spyder_unittest_test
-}
diff --git a/dev-python/spyder-vim/Manifest b/dev-python/spyder-vim/Manifest
index 4bba940d9da5..a9b745165ad8 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 806 BLAKE2B 08fa791def71696d7e5c98bd19adf317057a174a878fbdafa045078851c6a50771ec001e6d922e27fd38e8d955ce1dc7eaa26bbdc331ca3c32f6511cb673878c SHA512 c08d96f7b6fff994f99c8dcc430aa75e0d4e35949229444429fc04c9df46f84a210621a36a347cc8385b64cf9b3747c778723f539eb904eea9c94f081c4de87c
+EBUILD spyder-vim-0_pre20201026-r1.ebuild 852 BLAKE2B 44210d89a0e11fd2fdab1aee9db39ecf0cf0583ab0d5a2914164fad6f49694bea214e90994baa48776cf2e0bd797190e5e6fab2ddcda5f478a357db3bfc5e94a SHA512 f3c8eb60ad8e3c5f2adb8a031295165d301234785ffb033610a71ef89e2d997ab66acd010035edd71ccde00e0769b0b5a07ff4d1adc517ea56b0dd938beac03d
 MISC metadata.xml 282 BLAKE2B 723887f64c8928a88fb027b9281cf3c37264eb14d86c5f53a2e63f7b86da612a18f9fba397e4a8b57df75ddb755e4f62a2c2759174b3fcd8c9dfb3d19a0219f2 SHA512 b7943b255eaee8517f7cc0fc5d081ead6a0f380348dcf376dff573c40163502257a1df896c9ff47c5c572f5363f4750b2147b68e11ef4351c0c5c994336f8504
diff --git a/dev-python/spyder-vim/spyder-vim-0_pre20201026-r1.ebuild b/dev-python/spyder-vim/spyder-vim-0_pre20201026-r1.ebuild
new file mode 100644
index 000000000000..29e15e60845a
--- /dev/null
+++ b/dev-python/spyder-vim/spyder-vim-0_pre20201026-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 virtualx
+
+COMMIT="4d0bf821abb193bfd158e2489970e1873a9f1138"
+
+DESCRIPTION="Plugin for Spyder to enable Vim keybindings"
+HOMEPAGE="https://github.com/spyder-ide/spyder-vim"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-5.1[${PYTHON_USEDEP}]
+	"
+
+DEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+)"
+
+DOCS=( "README.rst" "doc/example.gif" )
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx pytest -vv
+}
diff --git a/dev-python/spyder-vim/spyder-vim-0_pre20201026.ebuild b/dev-python/spyder-vim/spyder-vim-0_pre20201026.ebuild
deleted file mode 100644
index 168e5eb75d56..000000000000
--- a/dev-python/spyder-vim/spyder-vim-0_pre20201026.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 virtualx
-
-COMMIT="4d0bf821abb193bfd158e2489970e1873a9f1138"
-
-DESCRIPTION="Plugin for Spyder to enable Vim keybindings"
-HOMEPAGE="https://github.com/spyder-ide/spyder-vim"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">dev-python/spyder-4.0.0[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}]
-)"
-
-DOCS=( "README.rst" "doc/example.gif" )
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-distutils_enable_tests pytest
-
-python_test() {
-	virtx pytest -vv
-}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 39a3ada1af39..a795bc41ef8c 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -4,8 +4,11 @@ AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7
 AUX spyder-5.0.1-doc-theme-renamed.patch 346 BLAKE2B d0f894f5f736a32e78aaaac6c9c8f051dfdf5f12b09038c047be8885d05ca149830fbebc0bcc2764bbb24033817874be0e1b2609e2a6cae591254bb139488954 SHA512 0a2e0eaee4386ab85881ff67669a4820c26a17993c85b33a6df3576a07aba1c331eef5853db1ef8a760e95c315036411f6f13880510efda20933ee3cc0600741
 DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
 DIST spyder-5.0.5.tar.gz 20606379 BLAKE2B 52f05ffcf0b6aabdac23a055af1c674c6aa80a7d4f3608779df1d46e0e51de63a71b4e97db286dc92e071cbb44a0dc827aa750d8ca538e6764b5e780f493d615 SHA512 17654ee76eb51c5f5b9f494d009af3d7813f869f27f22ceb8ad8ca96dcedcbcd6b86c7a3895bb63eba3cc60e4a57ab94128abb8d21f05c4672b8bb8d545fe1ff
+DIST spyder-5.1.1.tar.gz 19782262 BLAKE2B 64dcd45b91eba57cb5e435fe4b9d9c2f0884165e68099fa0a354ddfba13fc41022564218ad9661126c18f638dc5d26083494d0a97454e5a1055d01848df896fe SHA512 ba6ee6681ca2c3ae0b41aab57b28747d27141f274bb28331926ad75d9c5011cee604895f7b187853f5d7dc4777d4ca21a954911adb1b063dc1da26ff88cbfa2c
 DIST spyder-docs-5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz 85362596 BLAKE2B 7294dcd0f169958da132b141379b9b1cf497095981a86416fb98d98f98e30a425fe2e628a523785f932bbc06a2ba1ecddb45bae0df009887db928f879e08cdef SHA512 45f45546b83afb3036348e89ee3eded4d8ecee36ce58fe697da14677fbff8fa2dfe170be7385ecf10e1989817780c07b5676d545ee34e87a8f252929ad72882e
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
+DIST spyder-docs-ebf13f362a604c5ac127efcddb74a91610d92f59.tar.gz 85347412 BLAKE2B 3d7ef7a491a974d3255040998716931cf14d88c74af9f44b6a46edea6d75585c4d9683e03dbc4175c237a7baafe409e4a2ba43a0db666c7d4e96b864e2ee58b8 SHA512 c0f50ad9cd721558484c8dce3cd59c503475e814a3d42e8786b4678a449baff46b13c8ec1227fdc8f8b733c856736ecc4652f0a43db36feab27f2fb10355debc
 EBUILD spyder-4.2.5-r2.ebuild 9965 BLAKE2B f94f8de5c81eac740cb34912fd7aedf6f9768fa63c564c5869ab025068d558de4052c9990a95682a8045a5b5e7dbc7c705f4d8d992f978e0f9706888339e0277 SHA512 0e4c1d37d26ff4b02148b28254750cdf5e36f5440e575ae097deabb8606ae32c681e6666a47753c71f411a626d24f5333ab8b8d0c270a447a0723ae93b03d9da
 EBUILD spyder-5.0.5-r1.ebuild 7943 BLAKE2B 8564bf7aae20878fa68a6fa1d9b0abb71c76bd8c87364525808641b97d8da88f86c362cd3b1bae32f3875bf691c5b15ee8043537ddbf5ecd738750d58e69ec8a SHA512 9c206b76177eb1e76757d0586056f2201ae17f9760cfecf7458c0ca1029967b094270ee4302dc94eee09245b33d445f46128dbd3e20e1df9906da59d3964ae64
+EBUILD spyder-5.1.1.ebuild 7152 BLAKE2B bec57606bd7ae195e68e8f02c807565982acf2e5f12e89eda4d2467835d246270774deb889967041ce2a94d2f58f203ba76442a19e5b648a630f9f20accc1f27 SHA512 ce55f2d923c60e8bb67cad21626c9032a388e72cf49ac4dc0f330289f7ec24755d174c8c8cf5d1dc7c2f7484a6a83a34e9933aca211b219f715c38553d4d463d
 MISC metadata.xml 1315 BLAKE2B d6969e1a2167c283ef39b5041f58307ce0eda6a70ec0efa6aad7f0871dd9202f857af5d5a676bcc45af9f31743b856ac6c7e90e3767f82810f2c27a2b266d76a SHA512 eb59a948abca8c2920705647d09d339d09e10d27b08ed3e4ff6acdfb2cf0662fc60c3983d6bf44cfe68b11023f7c71b642b0453d0e11c1c701f281a1dfb3be08
diff --git a/dev-python/spyder/spyder-5.1.1.ebuild b/dev-python/spyder/spyder-5.1.1.ebuild
new file mode 100644
index 000000000000..404f796dec26
--- /dev/null
+++ b/dev-python/spyder/spyder-5.1.1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit optfeature xdg distutils-r1
+
+# Commit of documentation to fetch
+DOCS_PV="ebf13f362a604c5ac127efcddb74a91610d92f59"
+
+DESCRIPTION="The Scientific Python Development Environment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/
+"
+SRC_URI="
+	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# The test suite often hangs or does not work. Technically spyder requires
+# pyqt5<13, which we do not have in ::gentoo any more. Likely this is the reason
+# many of the tests fail or hang. RESTRICTing because IMO it is not worth the
+# several hours I spend every single version bump checking which tests do and
+# do not work. Spyder itself works fine with pyqt5>13.
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	~dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},pyqt5(+),svg,webengine]
+	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.1.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		<dev-python/pytest-6.0[${PYTHON_USEDEP}]
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-ordering[${PYTHON_USEDEP}]
+		<dev-python/pytest-qt-4[${PYTHON_USEDEP}]
+		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/sympy[${PYTHON_USEDEP}]
+	)"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.0-build.patch"
+	"${FILESDIR}/${PN}-5.0.1-doc-theme-renamed.patch"
+)
+
+DOCS=(
+	"AUTHORS.txt"
+	"Announcements.md"
+	"CHANGELOG.md"
+	"CODE_OF_CONDUCT.md"
+	"CONTRIBUTING.md"
+	"NOTICE.txt"
+	"README.md"
+	"RELEASE.md"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/doc \
+	dev-python/sphinx-panels \
+	dev-python/pydata-sphinx-theme \
+	dev-python/sphinx-multiversion
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# these dependencies are packaged separately:
+	#    dev-python/spyder-kernels,
+	#    dev-python/python-lsp-server,
+	#    dev-python/qdarkstyle
+	rm -r external-deps/* || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || die
+
+	# Do not depend on pyqt5<5.13, this dependency is carried by QtPy[pyqt5]
+	# Do not depend on pyqtwebengine<5.13, this dependency is carried by QtPy[webengine]
+	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
+	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
+	# The explicit version requirements only make things more complicated, if e.g.
+	# pyls-spyder gains compatibility with a newer version of python-lsp-server
+	# in a new release it will take time for this information to propagate into
+	# the next spyder release. So just remove the dependency and let the other
+	# ebuilds handle the version requirements to speed things up and prevent
+	# issues such as Bug 803269.
+	sed -i \
+		-e '/pyqt5/d' \
+		-e '/pyqtwebengine/d' \
+		-e '/python-lsp-server/d' \
+		-e '/parso/d' \
+		-e '/jedi/d' \
+			{setup.py,requirements/conda.txt} || die
+	sed -i \
+		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
+		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
+		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
+		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+			spyder/dependencies.py || die
+
+	# do not check deps, fails because we removed pyqt5 dependency above
+	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# can't check for update, need network
+	rm spyder/workers/tests/test_update.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+# Calling pytest directly makes the tests freeze after completing even if successful
+# Exit code is nonzero even upon success, so can't add || die here test results
+# should be checked for success manually
+python_test() {
+	"${EPYTHON}" runtests.py
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-autopep8 does not have a release (yet)
+	# and are not compatible with >=spyder-4.0.0 at the moment
+	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+	optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 6ef817e7258e..709192bd3c13 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,10 +1,8 @@
 AUX sqlalchemy-1.3.20-pypy3.patch 7321 BLAKE2B 706ff7da1f25a667784f462effb85593e8ad9a3fe893000866e487ec32328a571f4440ce4dcce61e2b5f1ded5c8145f5cd12a141c40f4bb64e87135aa18a8274 SHA512 40944c59cc6cb17f512d0df1e2cf50626dfa6a53e2e8b182c0ccb4007c2338d8058459a9158e9e72ee6aa89394275cf818f0c7572b249175d3acd52f5a1c2827
 DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e3338320973287afa4a37477ec28d47e7422a19c3a60e6290a6da7b23512c0d818a26400958d02097def778c917f098bb3db SHA512 4f5f0a23e80e1cebe541f8748a7e794e8964d986252803b3289a7cea732ad22557e00221775332e2766b6ff16ad5d9069223f441f8880ca6d0c47011f15fee5b
-DIST SQLAlchemy-1.4.18.tar.gz 7643090 BLAKE2B 8046bb9f9aa459eec95af57e597540552f6cd79ca3c393abf66d7370754e8433d743e739803929aaf0e2788b0c0419c022ddda1517d38da6580f3afeee1bc4d4 SHA512 06110bf727fd6d83404da2e031a27163c06059bf9eae4cc5b79ce047b5bab67b54432890091fa03abd9644156b92569001ae78c48c22799ab3bec220d4bbe1a0
 DIST SQLAlchemy-1.4.20.tar.gz 7682074 BLAKE2B 7921bbab0c7fcaccb232121625dcd9acc162cb21e747b889fa032863435b6a922b9ad21c7ba136b94617710d3aa6ec331941b11b0fd87a8d543b633d3d605c36 SHA512 cb9ec5c74b27c93824b7d46844d2a122c719e358d917563039f3dd96a44d057d4daa239b2820893db42348f46546efc469a202999be2c722027abbb6eed50063
 DIST SQLAlchemy-1.4.22.tar.gz 7709437 BLAKE2B cc4ab689c8f53601ba76632ad32ed2ae23f9ac46fe23f40cc7657b66f48cccc6a7801f9bea64dcebbe1c39786d7ff0708fad8e8d05534a5ab4ef691e6da8d85c SHA512 92a36a77d104db23577dda9add6dca86c1e1c416d3dc552c4dc6049522683da2857c1071c81d216d41a723c11de081af92800acb5d44d69fb0e36ee6756839ce
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
-EBUILD sqlalchemy-1.4.18.ebuild 1689 BLAKE2B f416319b85910319c2978ef29269ef78073aa917a503ab9b9c5d649480179d918c15530170783108d6c48dc8ed24896f4e82607588d8b36a041e404581983cbc SHA512 706321122605b9b121346f7e408b06dcb9864fcc59f778c50612f01819da7a92930dd9c01d137fe23ce76b8c43aadf94a93fae421d9d6a1fe77a1a558c85d275
-EBUILD sqlalchemy-1.4.20.ebuild 3129 BLAKE2B dea891b5cf7c6f91fd9539ff5391fb56423d3ee5607d6fce242dd474b41ddfefe5b8d981285b08f2380788b03e233a45fe6192be7585ef9ebab4b4b79531f472 SHA512 f9ee209be3903d2935621d5036214483159685c21ffb2914b6630f04a02930a3f4335d89a3c7a560c1ed158da2093756d085cc781510f7eb7bb60c293a293ea1
+EBUILD sqlalchemy-1.4.20.ebuild 3127 BLAKE2B 1eab3aec274e4151fdf6fbc3dcf7d6160da7f086f15d8663b5f1ada31b5485b996403543a25d3794105dde8976911aeedcd8f61bd3803f0dbd02f2858641d51a SHA512 87037d20361db24faf4b55d975f54a36f2b6b1d113ee8c0cbb7ff410270812951160c53ec5f6002a1533498be28e9487178a15c916c9bada7539599154d8cf4d
 EBUILD sqlalchemy-1.4.22.ebuild 3135 BLAKE2B a33219c712e87ef93f1cb549340d04c513222878fa3e374824158711407272be30f64d865aa2a5a5e2e30434c79728bee719214a7d1f9ce8c077d62842727037 SHA512 390ac7f5f6f607d2418b275192ef2fd53387fb9ba1df6f4ed4519b9e512bc98bbf2fdf49b6ba09f36b2d568a9f882752966e3727bf925c9c5d1c4d70afb37f16
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
deleted file mode 100644
index 4e64d3a7d6d6..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
-# Use pytest-xdist to speed up tests
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
index 842ded996206..b0801a904449 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
index dae3ea426ae9..843ea58cf99d 100644
--- a/dev-python/tomli/Manifest
+++ b/dev-python/tomli/Manifest
@@ -1,3 +1,3 @@
 DIST tomli-1.0.4.gh.tar.gz 120508 BLAKE2B bd75568315b405598578b395ec0e20b7f37e9ceee58f145cda8adaf58a3fa549cd35902650f5b2aa84b764ab32eac8a21d3ffd94c0c4c43eab3c3a0b49203a71 SHA512 e30e06ea805c94359596c3d6db82464ccafcdde0172cae12d62c889c70986159b3198cf465183854bef1b048c21e487c2b0dad2825e2477d363885e749b238ee
-EBUILD tomli-1.0.4.ebuild 605 BLAKE2B 742599f57c015247c50e9e06cfe4f460e9a19fd710e6efc825fe0abf48160b4965554f130c3137536d5544a2d93e73ccb2eff7f3241f1a86cc01560db89b6761 SHA512 255da837f0e42fb505c7d8f4fae366192ab2663df69fd4879d949cedd93c30f781eb9fb35ced8b6153b8e01bd7469fc8b9d6ae819f822ed90f37f0d8991b405b
+EBUILD tomli-1.0.4.ebuild 816 BLAKE2B a837bf74fef98b24112be0c2f9e704ddabd75e3712c00aa62316dc66534c6ad6dc1dac923c6e67064846eb00c189659363920727517e9fe833fef6215a715bd2 SHA512 9cc575a78ef9e1c7acd0813210c9d795f05c558d5023df3c6f12385ec9d94b911932aa2db37d59bd82a2f2477a48a5d00aade484a39358d7e70a7e279af92dcb
 MISC metadata.xml 338 BLAKE2B 9a121aa354145d8764982615b75e0d7bbafd9fd9f62d8aec58f75b07ee4c86a2e31d56d4f9e15025eafd639fb8bc378e2e7524d8d5310aadc98d06cd374644b7 SHA512 4be4620f741c382a83c748af54f8f9744703d0eef7302bff78d3d85da6b9c2628ad0bdda54b8bd75399f9e89ecf5eb80a961029574d85aaefbdd95cbf35b6099
diff --git a/dev-python/tomli/tomli-1.0.4.ebuild b/dev-python/tomli/tomli-1.0.4.ebuild
index b35f22cf0cf9..7ad7d69a48f2 100644
--- a/dev-python/tomli/tomli-1.0.4.ebuild
+++ b/dev-python/tomli/tomli-1.0.4.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
@@ -23,3 +22,13 @@ BDEPEND="
 	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
+
+src_prepare() {
+	# we don't use pyproject.toml to avoid circular deps
+	cat > setup.py <<-EOF || die
+		from setuptools import setup
+		setup(name="tomli", version="${PV}", packages=["tomli"], package_data={"": ["*"]})
+	EOF
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/typeguard/Manifest b/dev-python/typeguard/Manifest
new file mode 100644
index 000000000000..7e15745021db
--- /dev/null
+++ b/dev-python/typeguard/Manifest
@@ -0,0 +1,3 @@
+DIST typeguard-2.12.1.gh.tar.gz 35894 BLAKE2B 309b5fd906ae5122fbd2134ff30f6f2908a5d64fc8510dd054a9f47feef5f1674ea6133156fb6649c85a6fc8a98609387f742e7f9588db8ab008ef2caec0c740 SHA512 ea91140ba0ebfe7cc83bf212ae20aca777279fc88ff806bf6a1f4208581bb726c6091d0777371d487e7422887814d81c84ebac9f06bfacc5a929f5a2657312a8
+EBUILD typeguard-2.12.1.ebuild 981 BLAKE2B 3306b30332ad9d8f9943206995afca09ab34fa33f07e2836ab9a62621a0ba7f67b3018c1329ebff995d4ec362da06b82e2d59c7cf6701160a0977c048dd0cd44 SHA512 44a09aea91107a9eee9f24ecc1c63e6774ea00cd056728590e2995637bdbcb6cc5dd7bbbf53609adb2a30c2c58599ae508244fbfdbd159230b6073b8e31951cd
+MISC metadata.xml 349 BLAKE2B 873714697a9a764860b297dfbb7fe6132810af46e1eff9fa2748b4228522b6a9277e41eaceca817223fddab6d8e6b1b82be475c1db8ceac5b7d67846573cff16 SHA512 b15a90ad3556ed039357792d7370d9b0333307ac1e8f29bfeb93a5ae89ca10a0392c4b600392bb55fd5d4ca5367e1efdce77f326d0e535ef97c7042845b55ab4
diff --git a/dev-python/typeguard/metadata.xml b/dev-python/typeguard/metadata.xml
new file mode 100644
index 000000000000..4522c923343f
--- /dev/null
+++ b/dev-python/typeguard/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">agronholm/typeguard</remote-id>
+		<remote-id type="pypi">typeguard</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/typeguard/typeguard-2.12.1.ebuild b/dev-python/typeguard/typeguard-2.12.1.ebuild
new file mode 100644
index 000000000000..92dfba2742ea
--- /dev/null
+++ b/dev-python/typeguard/typeguard-2.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Run-time type checker for Python"
+HOMEPAGE="
+	https://pypi.org/project/typeguard/
+	https://github.com/agronholm/typeguard/"
+SRC_URI="
+	https://github.com/agronholm/typeguard/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	local deselect=()
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# https://github.com/agronholm/typeguard/issues/199
+		tests/test_typeguard.py::TestCheckArgumentTypes::test_newtype
+	)
+	# mypy changes results from version to version
+	epytest --ignore tests/mypy ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index d86e6a169c2f..f50c7630b63a 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -2,6 +2,6 @@ AUX uvicorn-0.13.4-fix-wsproto-1.0.patch 1122 BLAKE2B 4190a5e61af991e77271aef8be
 DIST uvicorn-0.13.4.tar.gz 505858 BLAKE2B 486436c0b4c717741c11b7da6a979dc9fe977baa2dbc3e2538ce28551d2dee593076b670b16c099056165624c149f96974f64d2847e38234122ec93b65b31cda SHA512 5332494e0b43b4e87f9d6742be679527b1ec2bc4d2e061768594d44b1fd1d6961a2bd1fa23469fca6c530ef36d6123e453306c2bb664cb27b0cd6145b9a70fd7
 DIST uvicorn-0.14.0.tar.gz 511593 BLAKE2B 9f7aee0001874c128e44d31945aaa0ca92237e594debb6fea3c6c6d0f283c96cfad5248578b0e1c170fe2fde96a6b17c56ecf2436783fcae135b8eab1997b701 SHA512 f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f
 EBUILD uvicorn-0.13.4.ebuild 1297 BLAKE2B e2e429e266084c92acf6965e86220494101135001bf656ce9ed1ee08b8ea07b61a8cb844bd416ddfa77ae9c8dd0d3618a8438b3dd1b08d12857efce9e6fbcbbc SHA512 3fd28de46cea2f2b8a2a7aa688155127d1a6d8e7f79137443606019e05825a1f4ab1c1ecd1dd8f4a04c8dc8e6851b59136fdcc68d5d4344be98fe70f97714dc0
-EBUILD uvicorn-0.14.0-r1.ebuild 1279 BLAKE2B 90399c2f4a25353b5e59e6468de1b9082370c70942bbc12522060023adcfda8051d28f72960e375381d8f160607fb7f81fe2325e4c49f88c8c072766191d9086 SHA512 fe1564d7e1ae099680c19be4f5f12dcc8d15bb4a277f2bc314f2ec54ace4afaf0641f055e9c93815f82b81e47f300aa51c3a0b3aa000a735fb69966df4d2ba78
+EBUILD uvicorn-0.14.0-r1.ebuild 1280 BLAKE2B 63482aa3db046fa48f4b3d175aee5ad07f2094a93fab84172cc5c8709dbf365fbdf3262b63a8e1e0d5edae1b8f1f810482a4aedd937e4e9fa71ef004fe532836 SHA512 9df124e0b0ad41e8d37217e0ef522ac950ad971ac9501d5365e3d5158ee427c64730e005208eaae0c07a219aa19c1f3710cd820e03fd4c82885f616cd7479c51
 EBUILD uvicorn-0.14.0.ebuild 1426 BLAKE2B 7051151bdae8ad61fe11b8b209f2895cc37b0d0998dfdc110210cbcc5774082e8a5d0b21e6265d7b9a9c2437784e3c499750b48c5b0271691e5a1092c6083037 SHA512 982224e58b7cd8cf7a9596b921b226bebb6d8463b7c844b691be1c284598586d8ffaf70f911644e85f5518d2a21aa1c54eaa6741e5d9227b05b8b3d42709353e
 MISC metadata.xml 450 BLAKE2B e6413874e7247880323b72113f002ade2edff362d7464ebbd5890ec95946b97bc37d74c2d6e9ff7a6a416a45f32bbab1b6eca70db8964adc6be287793c0fb4b4 SHA512 a1138016ec2d87c77f82333a0d41a68113d87c74d50e1bd6ccef0e0300f53663ecb907959be2547b42cc5cd007f47626e98b8c8cdc7e3557d2dfd0a369447268
diff --git a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild b/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
index 90b6ff8d6663..70d867f283a3 100644
--- a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Lightning-fast ASGI server implementation"
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index d94b85dc2689..ea7bfe25e9f5 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,7 +1,7 @@
 AUX uvloop-0.15.3-uint64-thread-id.patch 1548 BLAKE2B 2d1af0cd42f1911e2296db843bace2c3281e9defff1b174a7ca3c2bf651af2b9149b4066e9e252b216a33751591e0e15afec035142c35dac2bce7683c52a48e7 SHA512 0ae9fd1210d80f8efdf1d29b84450c60578848467b49616e9c5e71476779972e94ccebe13d99e74cef99ea59cf50617a8152a1768a0c14b812036310b403a55c
 DIST uvloop-0.15.2.tar.gz 2092589 BLAKE2B 05c518ba5854fa22fe72a0224856fa0529af0b9432f366b5b1cb0df09a92c787425713fadb85b151363df28800a94ed2a2ad617aaa1c4e854586e49d16f7dd1c SHA512 e398c7ff85da65344a6ab637e9b2f560e9ba61a3be7a3138d546138949359e30bc2e5f8268f1569b73c3881c66d71cf6298038ca1a883be71a33d7ef86d09eed
 DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e042a30a1268e9ad18f5de2b296b84931fb6b2022d2351f33521a84264f74cbc30caa5ff84b0f429bc9f1d426a0 SHA512 5687371a13509bdac0ef7a5ca0f7c78b54d0d9225cbf68cebc6d4fdf3807c2e3346579f5440eb0ff6578088780cc5efb09fba114da0bc0e60ad3f607d9df652f
-EBUILD uvloop-0.15.2.ebuild 1179 BLAKE2B 90824270e60d1444e154fa694831fe6c9a6deefa790babfa7afc8deef627295545da7d966998165db1ebff37ed7ad466fbede4ecb13fce22586858ce3b75d335 SHA512 1df3a69ed7cf55669219004c1ed4c620788cee5a9f009e906575aadea9babdfdf61c549b1c850977ac4cb97e4c533d1644de6151d571bbf801b99f6075ad32e3
-EBUILD uvloop-0.15.3-r1.ebuild 1368 BLAKE2B dbc27abde002b5db0cb9034f092909bb2b5faba902c0de5025c7ea88a91998188a1fe4b5bcaac7ea989ebb1c32b95794615170fa6766c44216fba53a6ef80e63 SHA512 997cb0ae5f2e94e424f5f8f06b6ebb8d750f90a06113607c332cf11121e9ab232bb20a1479087921b8a485bc303a1c4232bc17b48917a0b99a39f4180dad7e1c
-EBUILD uvloop-0.15.3.ebuild 1187 BLAKE2B ee17834d7053f51fea2ab82738e4da26b84709d0f97558dc759f9ce7e0f9da6c465cfa85c30423a85ef21f5732229a6ee117ceee04d9d94c7d579d671c9bbe57 SHA512 73a371db1120e099db3e18926e63902698b2a5594233662efb91bc11549de7f9d2904476c7dde83e1a185a0bb22687e5aeb341ff8d44c2c0ab758ece9a0afe38
+EBUILD uvloop-0.15.2.ebuild 1186 BLAKE2B fd0f48927d952bc9708aa93a987a64b5d0eaca3af5394c4874a2fd31212c0d89114da7cc2c92374999a60b8d822e3b22375dfe60832170e02d29e2b891fbfc7f SHA512 682e85299f491a92eed9c5c06baea83778e748c94e2d99240db0c07866829655f5b351aaebe83fa93fede258f42709b6c411df5f5f2d999988af7dbbc631088d
+EBUILD uvloop-0.15.3-r1.ebuild 1406 BLAKE2B ba8d047185aa66f1048ff6fb5f31247e964f48ee39786ce3962177b4b503b12563342020501312e90011b88e265fc4681474a3153548afe225dd9b572284d204 SHA512 6fb3967147daa33b6c9aa00cfd7c37faa2aaac9fdc1554d2be1b21b5c71aada4c2df83723079f3ee4a69eabfadb0491ccd4702f60dc6c6bb8ae8a3daf116d47a
+EBUILD uvloop-0.15.3.ebuild 1194 BLAKE2B 6af2b9ff94aa9213dc90d430e2f814795e0737770d4d8d05e2283219bf1837437cc1dd180a677b6acc3796b2b30cfe5b31835ff892b1f3cdcc5be88aa6f8c645 SHA512 cb50ec260320f110e0a393bebbe0bbfe63f5f815aba8b0c58bc3f7cfa30ee52e5b93460ae9fb1d3579e474c9a7881a269a6f57eabf18de707e5b97b7f6976878
 MISC metadata.xml 526 BLAKE2B 1c5d5ffd994ab70aae22d5a6312708a168f89790a5999d81ccf4eab552e910fd063ace9f1e51d1b477ed96604a23265f586781feb7b692d1f49a0c502d59dd3a SHA512 e38163d8b0b033c5825d4f977cb58bc727195a7e577eb229a70c4b089943ad99f4c8121e0d4e209db51fe2977ffad2f88b8bfae3baedd853eabefabb15578b85
diff --git a/dev-python/uvloop/uvloop-0.15.2.ebuild b/dev-python/uvloop/uvloop-0.15.2.ebuild
index a85e64a2ad6e..b10e112d367d 100644
--- a/dev-python/uvloop/uvloop-0.15.2.ebuild
+++ b/dev-python/uvloop/uvloop-0.15.2.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/uvloop/uvloop-0.15.3-r1.ebuild b/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
index 4c2a70b59ede..ca1f98ca45b5 100644
--- a/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
+++ b/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/uvloop/uvloop-0.15.3.ebuild b/dev-python/uvloop/uvloop-0.15.3.ebuild
index 3ff9f3019ff5..14bd0d99ccb3 100644
--- a/dev-python/uvloop/uvloop-0.15.3.ebuild
+++ b/dev-python/uvloop/uvloop-0.15.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 121cec59a413..f89901e2be45 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -3,5 +3,5 @@ DIST virtualenv-20.6.0.tar.gz 8700762 BLAKE2B 718bbfda175ab4ef0820ba66b480060c03
 DIST virtualenv-20.7.0.tar.gz 8714219 BLAKE2B 81b5ee144614a7c854e03599270d03454f991520e8381b98ef01b64e91bb7520a3949e5af9710ceb6292be6b7b7e3738ed7a08324b5ada37f8f4941b408fb425 SHA512 af0f993045013814d9397419fc9d789a1ad64dc53818cbeceb5146e418a8535f76b74ed36b4b164d6974660be77de91cda244eb70b810c8c9fb522ba1088813a
 EBUILD virtualenv-20.4.7.ebuild 4256 BLAKE2B 8fbe67f90a9b7079b5eb6b6e9c6c28fcc887fdcfa1bf31ba9fa02c62166ee8f7e42d1a98336110d452907133a0d75892b7d28c202a8075f88b32ac354dd57ca3 SHA512 db31bfb20d836ad986acff3b6ff5d16ef00a78379b02cf7d6be853aaaa08cbcbfcd7de106d47d398e9b8125644fc9daa164bfa6cb09a302e1f3135b709f38bb3
 EBUILD virtualenv-20.6.0.ebuild 4276 BLAKE2B 6533c59050af3916bdf02e38671cb6fa6558bacb9ca47af9a9282594fb5d97d3c8eb405db4c6f41a180203ba54dd77066f7bab75deebc8a101d078b22e8dd5c2 SHA512 f49d6360516804b898fa90bfd4a0592c58ed224e1abea528730f041e7f3cc15d68bf2628323feb5c05f724fdb1c085dd940ffdaedceae7010551f6ebc00d08d0
-EBUILD virtualenv-20.7.0.ebuild 4223 BLAKE2B 750a8ba95e246111f3d7f59db4f724caf2b395d850bfc6bfd3197ae986515ca9aec1ca1ab0f33337c23cafc0dd8afd1a013d0650e5c6dd03b6ce9b982583408e SHA512 d0777e46b38b8f0cd8b986fa506a2500f0a694ecaaeeba5d6d08cad60e79bc364369106cfe88b89b9785ddcddbd6107ba1651dc94e2efd128d0ec8c96179670e
+EBUILD virtualenv-20.7.0.ebuild 4254 BLAKE2B 001e09ffdad208c5386993419b56dd0f0c35504d6591896a306b39e70f01ecbc0f47ef800f8b50bb502ee10eeb03d952d7c65cd6ec94823450c7b8d83c2b4fca SHA512 501bb46fb0e7ee7fabba977a25a4ab8b4168e18e5655226900320543e15dd95f84d0932bafd6a5230f3e7424e66c560ba853cc515cb2995dea7dea020595abad
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.7.0.ebuild b/dev-python/virtualenv/virtualenv-20.7.0.ebuild
index 848d5dc99614..1c6b72d16019 100644
--- a/dev-python/virtualenv/virtualenv-20.7.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.7.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index a480479f1b94..8b5e69b1828c 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,5 @@
 DIST websocket-client-1.1.0.tar.gz 58890 BLAKE2B b7557f0847ee4ec31279d98661f2370f32eff35de5ea6207abe4afa6ef7314258da275d823487773722ac717888ca629284ef92870b5880fb385f7fb677506d6 SHA512 6f4b963455bdb6a0e0defff92a6b898ee4bdf605c18fef7e25e18e2c72a2ae360d760c2069a0ed330e5dc0f3347f16a9129c405d5c98cd2d56014f8636e7d5b5
+DIST websocket-client-1.1.1.tar.gz 59092 BLAKE2B c71e16e427584434781fe407f3185ccfc9fed3e638ef7374752584e35623f56c082ab7a4e7ae01038025e0435b24b567bb9a2abe4da50800f421930c982e4b39 SHA512 f4ed98180910068415ed3b66b70091491d6b11098c32abd9bfc0f8e0d4cb5a25df096c9437fb59c66bacff66440f9422b3f67bf43af746019d74b17d7bcba474
 EBUILD websocket-client-1.1.0.ebuild 761 BLAKE2B 09a7a7ec1110f0d9b5c43504139c555f2777d2f3a12071daf6900ea9210d18d620506b7795f2e11ae353e32b0453557cb8bf901d2aef36027c000958c9b85495 SHA512 1607c7cac20dc8e8b8b6be41bf74d74acaf607c51ddef355b85e5565c5094355d69ecec545207ad248387a75b756de933fc2b0cff4b9df687c9e33a2fb233268
+EBUILD websocket-client-1.1.1.ebuild 639 BLAKE2B 04289450b50888e60941274005cac6ad16f5c09738f0cb48138ed4cd011d54fda4d995f5136cf7d99804a73a2894f1e93c53ce988c96bbcb9b022f6f36286265 SHA512 e27ec163137610e1ba1123227fc5e38c0d68f9ef3912dae0cc233e53bb0933b3ef3c9f3b92a5b3b3bbfea11898debdfc9aac74f2a65998c0e21432eedb1c3846
 MISC metadata.xml 497 BLAKE2B 1a68fcd42a257afae80db03043a732a321079f146c252a89d1c5399bc5800a5475fd36f31cef381544c9592e39a86c14eb5334ab1800a5191b0f7ec9e0806f19 SHA512 ce4184c2e87f87cd787cacf1c7b566df2fbf7dda97a6b6639e02c003ede6ac5b90494eb9b3b509c303a56fc4e829acc05ec9d3d01846e85b233a561d1cdbd5b4
diff --git a/dev-python/websocket-client/websocket-client-1.1.1.ebuild b/dev-python/websocket-client/websocket-client-1.1.1.ebuild
new file mode 100644
index 000000000000..73166b2954d2
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-1.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="https://github.com/websocket-client/websocket-client"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="examples"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index ce828ab25a1a..0443e6e23de1 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,3 +1,5 @@
+DIST websockets-9.1-python-3.10-support.patch.gz 6940 BLAKE2B e4835c7d5efaf956d07b884c85e0b95f26674bf36164fa8362d1c1a564a959bde761d25e747333c58864f74a5ea1b199f228a46ec6a1647c5495ea032020c179 SHA512 7fb4b298a9167c8d913e293fa7549b21d5acb333a5b97e0624a22cb83548ef548b819ac23750c40295140b6f83a701c73a81fdcaed3ab8e704dbee8e17d22f1d
 DIST websockets-9.1-src.tar.gz 191813 BLAKE2B cb3807f01e1a4c22a40bf5150d1e8b21ca786dc5bc4da8f3e6602971f3f7c79b57092f5ddfe3ee52ec00e7fd15f3a992fdbb94b5e26599f2621a7f51434ba6dd SHA512 ff2907a913ff0b8ced6dda72b6fc6512a2ece3ffded2e2dcb8ff6805de9ad504430cc1871c1f6e02ab8069e7b96b2e7609afaf3c9c25f9271b28e2daa72bd3ac
+EBUILD websockets-9.1-r1.ebuild 936 BLAKE2B 0a9c53c5a15a9b6d6b4ad2a16cb31dfd3c445346d7352bae307f4a6334cb06e869f7dcf55704d1a1e08319d0bacb5899436e2529bc4919a14f2f1acca51092db SHA512 93acf9b63835c187a0a79c1ea66a1f116aab90f77570a799de887680436d9215062fc2358f5a7e368d5a8442b9423d123c01d7d55091033cdef4ceb3c1b8662e
 EBUILD websockets-9.1.ebuild 711 BLAKE2B 76b5e96b67135d5173709b1ea9ebd459595a26986fe8f522434a8b744fa5b7faf21e80480323b0573ceb4b4656c9e65d3ee91000937d184a99a50c5bc5697c78 SHA512 c097db15bf8ece86b4595078699f9644ab2026dd215288fdf202aff356c88d3bace38539cc280f4efcd2c467d0d17d26e4ca1ad278e4b7f89498fa2fbf034f93
 MISC metadata.xml 487 BLAKE2B 7d67f4b4e650d1cc83e80eb7ad5020ef997f92997d94f19274b7e0c794f9efdb3d085faa8582321f0732cf489a5358310368a2e22b8e471d815bc9b09a16f47e SHA512 6b88582ba918dd95faa5b7e3d4aeb59f7ff455a509c018c61f61a1d2e9f69734c9d02c9d666447ea787f771fd13b44f7a54b0e6147703187a7a9fe9fccf186e2
diff --git a/dev-python/websockets/websockets-9.1-r1.ebuild b/dev-python/websockets/websockets-9.1-r1.ebuild
new file mode 100644
index 000000000000..4fe1b8159c40
--- /dev/null
+++ b/dev-python/websockets/websockets-9.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for building WebSocket servers and clients in Python"
+HOMEPAGE="https://websockets.readthedocs.io/"
+SRC_URI="
+	https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz
+	https://dev.gentoo.org/~sbraz/${P}-python-3.10-support.patch.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	# https://github.com/aaugustin/websockets/commit/08d8011132ba038b3f6c4d591189b57af4c9f147
+	"${WORKDIR}/${P}-python-3.10-support.patch"
+)
+
+src_prepare() {
+	# these fail due to timeouts on slower hardware
+	sed -e 's:test_keepalive_ping_with_no_ping_timeout:_&:' \
+		-e 's:test_keepalive_ping(:_&:' \
+		-i tests/legacy/test_protocol.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index 625c868fa4fb..10eb5e6c7f93 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,5 +1,5 @@
 DIST wsproto-0.15.0.tar.gz 51765 BLAKE2B 6eae2d2ceeb2d1e870c1ca70db22708fc2e5d10aac6b1d1a44ab00f4b31e18f21fd324c7e8c95e28769f4642601b775dc687eb28b419c5698ed68e617d054599 SHA512 c9666ec65374181da762f460f0c394a5bb599f8a0666989fb2d53e5e8822f5ebdd28eae3098e115d5bbacf6d6e1dd33a9cfeb808d569e1a01025eefaff18c531
 DIST wsproto-1.0.0.tar.gz 53423 BLAKE2B b4cc8c1ef0ccf324821b893b57fc86ab744c639dd07604618485004ef56ca105b5515e1f34a08ccc93de941b1a93eb76ef0d1946f11e05f80d40b98bfe7e4c56 SHA512 36f8c4eebf84bfe869f7124330898d22416b423f47396f2e3f72069e14f1763514e1df700c3e8ee81467cf973197e10143e088978d0688930fa98518af8773fb
 EBUILD wsproto-0.15.0.ebuild 507 BLAKE2B a010d403ef7e818dc7577d45898ed3ccba0879182f935c1cab9f55549ad9721413c7828f769562bb0f52dbe5c74a6822980b3b5d329acf5e9859f8046f75d6f3 SHA512 5b57c2fe1a79e68e245e58415071cc73cad18a8124b72d58af71307d3633d7aa1fc90f7f0e0eb6076fc97307ee2b5e4f5e0c3a1b36d5b0a7d56fe5f5d8c871d9
-EBUILD wsproto-1.0.0.ebuild 532 BLAKE2B 5d7d0c1e3d59e29e080fdb685197ef6e1bb1189bac66744ca29c91e6c31ede6672cda5a04d1910db4a93f037a255868afe782f2778194a347e289daa1e8176c6 SHA512 81c5b2c440fcefd5f3d3bfee5401e1c55a69db9a7b649b61dab2f0a7bd542c591a816d4d1d0e8783ba7f0ed750d77a333ab3b07ebce3c38d83630c5049d61328
+EBUILD wsproto-1.0.0.ebuild 532 BLAKE2B b39eff2ad82384e1880240f7cd489d6700a4c8c0ff1abfc1a13af7da4e22e86d76a93af17b09015177b055ab98796bfdee6b7da37249670d19b4e49c2fa494ed SHA512 80d128d5cda2c6a5f4586191528852f077e41162b2a5977145099606d40f58e05b849bd2b2fb41381e21f5709e87fe638080feacf6e518659126af0058f3bbf1
 MISC metadata.xml 493 BLAKE2B 82485e0fa56d1f0e3e1bd3d6f54c929cacd58055d0993520134ed7bb74bfc34a990e65303b33ad2ec74c625f8c4d14f9f4e65a1c14e063995ce20a7bc6ae82b6 SHA512 83ef31eda65a98f50ee0e800cbb358b49f579ed893cd5cdcfb38a0da79b62a1359453127140dfce971b9dcbfc7da9efa83fc1426cfe40167f0ee987d0b9f9c56
diff --git a/dev-python/wsproto/wsproto-1.0.0.ebuild b/dev-python/wsproto/wsproto-1.0.0.ebuild
index cdaaf69cb505..488a8311e788 100644
--- a/dev-python/wsproto/wsproto-1.0.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 3dc95f410c22..3e5c57755aba 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,5 @@
 AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa
 AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
-EBUILD wxpython-4.0.7-r1.ebuild 2310 BLAKE2B 90fb0b24c3aeb64693ed7b62541b27775192630ab49ce18b83f68fb2e8db1d7aac4b650d2546d81e487068955322d415e786088a7390d429431749b9cd557472 SHA512 75113ecf7f1d9cf8d6f35ef78ff18bd5ed9f27b41a1f8534da526f34fbaac3d6b08917ceb29f4394193bd621bf276256a8456d300c0f4eeace3834e57c09cc9a
-EBUILD wxpython-4.0.7.ebuild 2273 BLAKE2B faf2c0361be73a32f7a27b5010e4fb66c0a7cfb899046f34373bf3c30c344317226bd0c12f1db0c71194084368f8bdb59eaab675fe91153ffc32d52eb169aa21 SHA512 52fb7e58b05874e3f878a23f1c7a27ce7795f89d58ad11bddfd50a30106191d0af034ad0a99826b6303a2de265c16b2a1334e5bdf1b65f1016e20e76d9889ed5
+EBUILD wxpython-4.0.7-r1.ebuild 2309 BLAKE2B 0854dde5690dd6db4012b788d0929f29560f52ac26f540e1cdb1500c9e7130833c945aacc287c1bac6042e083286446baf94782735e792f99a5e9735e8cc706c SHA512 ffd1ffa380753dfb844c0a57921973cdd643a5b1eabe9a404c03f1b66547c4f220d302e2bb6686c8b83b355dbc508f80cc521a14bebc33556f045d6f6034fe94
 MISC metadata.xml 490 BLAKE2B b268c95de8e09d5027a6dff7413f8e85030c64610f0f5739321bca1c66892981e2e4273e3e4fc92f3edbbcee1d2ede23a366dfec9ffbc17c8b015b784847755f SHA512 a33e6390e4cfcedbe7a2e950b1f447195f439747e37acfa6ad234b58fd449d80b16d342213e5190fa3143c71a5e95861f11daff1b61fcb5015c3a5255a27cadb
diff --git a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
index c4eb46fbce64..cf5ea393f6b4 100644
--- a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 RESTRICT="test"
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
deleted file mode 100644
index dcf072142cb9..000000000000
--- a/dev-python/wxpython/wxpython-4.0.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-WX_GTK_VER="3.0-gtk3"
-
-inherit distutils-r1 multiprocessing virtualx wxwidgets
-
-MY_PN="wxPython"
-MY_PV="${PV}.post2"
-
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="https://www.wxpython.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
-
-LICENSE="wxWinLL-3"
-SLOT="4.0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~sparc x86"
-IUSE="test webkit"
-# Tests broken: #726812, #722716
-RESTRICT="test"
-#RESTRICT="!test? ( test )"
-
-# wxPython doesn't seem to be able to optionally disable features. webkit is
-# optionally patched out because it's so huge, but other elements are not,
-# which makes us have to require all features from wxGTK
-RDEPEND="
-	>=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	virtual/jpeg:0"
-
-DEPEND="${RDEPEND}
-	app-doc/doxygen
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		${VIRTUALX_DEPEND}
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"
-)
-
-python_prepare_all() {
-	if ! use webkit; then
-		eapply "${FILESDIR}/${PN}-4.0.6-no-webkit.patch"
-		rm unittests/test_webview.py || die
-	fi
-	# Most of these tests disabled below fail because of the virtx/portage
-	# environment, but some fail for unknown reasons.
-	rm unittests/test_uiaction.py \
-		unittests/test_notifmsg.py \
-		unittests/test_mousemanager.py \
-		unittests/test_display.py \
-		unittests/test_pi_import.py \
-		unittests/test_lib_agw_thumbnailctrl.py \
-		unittests/test_sound.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	setup-wxwidgets
-}
-
-python_compile() {
-	DOXYGEN=/usr/bin/doxygen ${PYTHON} build.py dox etg --nodoc || die
-	${PYTHON} build.py build_py \
-		--use_syswx \
-		--no_magic \
-		--jobs=$(makeopts_jobs) \
-		--release || die
-}
-
-python_install() {
-	distutils-r1_python_install --skip-build
-}
-
-python_test() {
-	virtx pytest -vv unittests
-}
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 2729013bdf08..3b653ca08013 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,3 +1,5 @@
 DIST xmlschema-1.6.4.tar.gz 369270 BLAKE2B f3b98f0b8b4446dfa67da778c6b63585a894f4dcc9fd7ea98637ccd54b26e63aebc7f3fbc00e13ce43730b88da0f773a491917d5eae9301b5d22f6efe620473b SHA512 7e13d20a6add1cc5b6d0f732e672be3eeeb2f107fd2031cd5c22d1059d24b7d818c534817ea115d0c5f011727175bdcae71a0b8d55f1d6bd263a7e38286c26fc
+DIST xmlschema-1.7.0.tar.gz 370433 BLAKE2B 0270151705ca65d4b0f587e2ac75f7273a20242a0a315b4b954a6ccad6d46d7d093330a4c40d74a44c0c55af021da1c4ddde85f8431e0779d30e2164a599a335 SHA512 c4620f205cbdccef95a38eab6e6a5d6082681e3ff71708376f0ddeecd75a5c53f686fd740a41e98afd2ec5ec0f14be913b6c65bce80fab0143fa5fe1cc8a2ab6
 EBUILD xmlschema-1.6.4.ebuild 779 BLAKE2B b122698cef27e5e87ea640ba5c33838efbec2ed1f70373637046b666ac829fdf8583368d4ac325a02f782eb0b25771f7aabffcf3b2b5a2c4f281ec97c7e27f26 SHA512 392c42ad67bf932549a56d1f2de75871cf8f49739c110d84e4d61f5db02ed410d3374ecd2612288552b07dc87f0a0d7ee1af2d5c3f763c521031f14c2a9b00ec
+EBUILD xmlschema-1.7.0.ebuild 787 BLAKE2B 03aa4c39550d304c71c4a17be07df8ab34db4e86f6678d68bcd6a855e86c861109fa6efe4049a2f95862c78cdc20c1c6eb53d04f6a7592d38a6a1bdeeb68f5a8 SHA512 8c3306d60dfcdd48515c7f3968c4c3c424793428f5b5e2121d77fed159ea6b3cf6a38d5a1207f22964543e7002f66a4e65734d57d796374d2162ccd19d9871c0
 MISC metadata.xml 375 BLAKE2B 16a422a1beab981008ef66eccca94cace74cb244fb6123d2495e13045b4c786bf00f2807d3ac73e98f1c962fc0ccb7f7aa84f565dff54e2ef2077776a85bd479 SHA512 db2b030851d7357aea0b41066bcfa36b9ae81c745f413a3cdc1a528a38f2ea1a8c7876abff7f139801185f075be9e841d637f238b9d3bc37fa212f13c06ec411
diff --git a/dev-python/xmlschema/xmlschema-1.7.0.ebuild b/dev-python/xmlschema/xmlschema-1.7.0.ebuild
new file mode 100644
index 000000000000..be89448c38aa
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/elementpath-2.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/xxhash/Manifest b/dev-python/xxhash/Manifest
index 086c676173fa..02eac696388a 100644
--- a/dev-python/xxhash/Manifest
+++ b/dev-python/xxhash/Manifest
@@ -1,3 +1,3 @@
 DIST xxhash-2.0.2.tar.gz 64283 BLAKE2B 01fe9868b45f0be762c233a80b550e4069bd7f259fac8aeb90407864ac1fa6cda314880c87ce03d8854bedbecea1eba665ec4e00b27b68a8573c398238c5ce97 SHA512 8908e78207ff7b835259e359e2617f6b96555bd9dbc5bb079c850e9de22fd33c15396fbde0cd824cf8af2a195217f3ddc1aa8e62f1ed4071408b4a29bab31f2c
-EBUILD xxhash-2.0.2.ebuild 591 BLAKE2B b042cdc1a8c5362b80294da4d10e3b3150777cac4c8b61c5d16d8d1f222465019a14e41d57670f9582cb78a90c0c2119b75a1113e8f7eae6bd25dcfc76005dba SHA512 573f721d3c20fe7b330679c5a2c2b1805cf010e645eb69af552c04b015e7bfb5be579123e89820162635e424b1fbe1716313d306247546166d68d2a57db0981c
+EBUILD xxhash-2.0.2.ebuild 595 BLAKE2B a6340f3c9f22ccfe8f0d0d75944043351e85b3503f0279d90bffa617626f14e4d7c316d5b9ec1e9074ba533698ebb919754267b6e1b94a28e01e89473c836b93 SHA512 0f7228c525b072b1b123f4d53626d1109f1a0072c482d359e573418a529dffff86a5a78da301501dc8a24d407e0789e7ee489fdb9267b316871346e5c7cb7dda
 MISC metadata.xml 459 BLAKE2B 6d21bb3d1d6c87afa60f906321f40e0cca071167ff256655a1d16357cf2104850305ed3fe3e4dbd9a3d8c40876e95f2e295f9519f159e2c3228eb492b9063094 SHA512 6ae6d99e9495dca1a0615d0ba908f01454fed46abfb8fee74bb8b00ea73d4f2ab335abaa729b42cd0beecfb61b0a1d123085d28642fbab50ddf031f8050a704c
diff --git a/dev-python/xxhash/xxhash-2.0.2.ebuild b/dev-python/xxhash/xxhash-2.0.2.ebuild
index 57d6734c93ad..b13178e0671a 100644
--- a/dev-python/xxhash/xxhash-2.0.2.ebuild
+++ b/dev-python/xxhash/xxhash-2.0.2.ebuild
@@ -11,13 +11,13 @@ DESCRIPTION="Python binding for the xxHash library"
 HOMEPAGE="https://github.com/ifduyue/python-xxhash
 	https://pypi.org/project/xxhash/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
 
-KEYWORDS="~amd64"
+LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=dev-libs/xxhash-0.8.0"
-BDEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index b8efa2b75068..9718478fe23e 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,11 +1,7 @@
-DIST python-zeroconf-0.30.0.gh.tar.gz 64301 BLAKE2B ea0d5e36f3f012f217cbd4eeff0a9cd366496e2f64b06112ee3629ad016c8e28877f62358d5b5fd27387cfe474e488e99a9ad8ca1802f6d23612f99310243c57 SHA512 1f3165500a07525ef182bb60c1804fe2002a33a9f800470bdb32bdfd44a1b8f466a818a4390537674952159e5c0e257cf9e4ca570b1a9936e1cf8be294be6311
-DIST python-zeroconf-0.32.0.gh.tar.gz 115276 BLAKE2B 7084c02f989ebc6db6686b82ce3212158595b87e00567e4857e84790a30a2fa6f688288769d1eb118da485a6755da1ef404765070d26905d10ab45b1d95ca849 SHA512 6a612b39be85e673cffc560ea5bcc16facc5a16a370ff6edb1d4f7ff978a01d6ba249a9b313caca3b3ed0c6463a4914a98063eb89f28268cec1c9a2faa4db611
 DIST python-zeroconf-0.32.1.gh.tar.gz 116507 BLAKE2B 03de415620745b75cd43be74b724faf909aad9628175f18cf4b2c04245d02adbca984eaa861e807729f36caa3feecab913f2e4aafcdd9aac1af02de6eeefbb3d SHA512 cefcd1abdc3ca2b5ed796aee09e6826c0d0f54343bdefbf45c425d6e033542dc061c84fb4438ba53774d87c6516801c6e2196c1e6cfdd9dbf9187f5d8d4b1b11
-DIST python-zeroconf-0.33.0.gh.tar.gz 118002 BLAKE2B e5bdf8011777f46207c7f0aafbf4bfc34e704b59e01fcecd93e2ca05154f836bbe206688242eb37578a0e3b6d462de86944bdc81b96b0f3613eed21e9d0b6be0 SHA512 214fc1b25e1b900b6745f808144c0a1d94102dbc30f1e6ae49dfbfe2e75e9611e33d1341d192641be363662a0259aa340f52fe20fcf2bd5cf1611e823754186d
 DIST python-zeroconf-0.33.2.gh.tar.gz 118266 BLAKE2B e239443c778d24895a830ac8d4f23be5eeac701b92ddf945efc955a731cbce62bea10243f57a0929ad21c4444d32c37b0a9e23b53e734362b9c6b9ce85e2eb59 SHA512 9631dc348baf028794934d826a1fd2e874cf9039e6fb1c93a1b9a8e2a95ae436ab2fc1a955e2d89656c37a56b71075b578857f6de041a7e61ff55c7a62a2a7a3
-EBUILD zeroconf-0.30.0.ebuild 1089 BLAKE2B c5aebaa0b0bc8ecf9a809bd2964da3c822c87e5ff35ade028ed69894a277a0cac2f20438a616695275f94c3e32d9ae20ed53451f76ae490588f9d41309d37860 SHA512 986a489207ea2c47bfd3cc02ff53a48e3f3925f6326f1c9911d2da4adc3619c53e671f25ad024168b048b93cef39b43d7f155c1baa379d791e1f06abb97c0aa0
-EBUILD zeroconf-0.32.0.ebuild 1165 BLAKE2B 310bf2df5ace5e3ece81e42e764d7cca4f3124608287e674a308acef4060592f93c2c871c8140aafbe52e4b79d6340053b704c91c5fe227b7cf204cf3e4ae2a2 SHA512 fd1e8e11d8381cdcb38bde8d0da2b6971c3812ec90c389750ec7d23166fbbc8a379f3739c0bc60ac3b810b64e97eab0da41080ed2bb5e27b892fe003c3cb5231
-EBUILD zeroconf-0.32.1.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
-EBUILD zeroconf-0.33.0.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
+DIST python-zeroconf-0.33.3.gh.tar.gz 121202 BLAKE2B f457a65d26b58e4dac6c83b66be48e57ff0c34dd59dc3bfa008e2fd204f2f290088e6c784580114b91ddefce1cd2a3cea9310cfd4848c983c04749a1dbf3ebb8 SHA512 4e232fb9ad1e447333880d9737c3af3e9c652db2e0d7187d485cb6cdf8fe58076b78da4e1db3d2467b147c71343aeb18878f259bbfde6acd0faa3c4b9196222f
+EBUILD zeroconf-0.32.1.ebuild 1163 BLAKE2B 128ee4afa146f073b96fa6b4fa6e961319cc38997f0bada936b05d325c175ecc2063cca7e247a40292c41be35b22a7ff4f69813694655c96c8a3f35e8b065a89 SHA512 cff5c5f655f74230da9a2ab05d0cb2e767e78627ffd65e1f310f2aef54319f9216cfbb5d0fcb12707255a24b1e6c05272ce35e3771b1dd6c986f083fd16101fd
 EBUILD zeroconf-0.33.2.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
+EBUILD zeroconf-0.33.3.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 MISC metadata.xml 412 BLAKE2B 70dd13f9065885850c7c24da7e1a0825a1537e452213847e00d8af9977818d6bfcfda9c8f9e0d0b2241550a95d186432e0072762a1b77e65b66441812b29651a SHA512 28bafc2919fa66c0f1e532798ac40c537a53c18e781590881116440886d09f5511425f2cddee912e3fc63ef92ee1a9c4da0f7f79cb44dab6e5f51d62202de844
diff --git a/dev-python/zeroconf/zeroconf-0.30.0.ebuild b/dev-python/zeroconf/zeroconf-0.30.0.ebuild
deleted file mode 100644
index 3c5bffd941ce..000000000000
--- a/dev-python/zeroconf/zeroconf-0.30.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local excludes=(
-		# network
-		zeroconf/test.py::Framework::test_close_multiple_times
-		zeroconf/test.py::Framework::test_launch_and_close
-		zeroconf/test.py::Framework::test_launch_and_close_v4_v6
-		zeroconf/test.py::Framework::test_launch_and_close_v6_only
-		zeroconf/test.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-	)
-
-	epytest ${excludes[@]/#/--deselect } zeroconf/test.py
-}
diff --git a/dev-python/zeroconf/zeroconf-0.32.0.ebuild b/dev-python/zeroconf/zeroconf-0.32.0.ebuild
deleted file mode 100644
index 0fadc7be4ba7..000000000000
--- a/dev-python/zeroconf/zeroconf-0.32.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local excludes=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-		tests/test_core.py::Framework::test_launch_and_close_v4_v6
-		tests/test_core.py::Framework::test_launch_and_close_v6_only
-		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-	)
-
-	epytest ${excludes[@]/#/--deselect }
-}
diff --git a/dev-python/zeroconf/zeroconf-0.32.1.ebuild b/dev-python/zeroconf/zeroconf-0.32.1.ebuild
index 0e1b2943b16e..8078abee7f30 100644
--- a/dev-python/zeroconf/zeroconf-0.32.1.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.32.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/zeroconf/zeroconf-0.33.0.ebuild b/dev-python/zeroconf/zeroconf-0.33.3.ebuild
index 0e1b2943b16e..0e1b2943b16e 100644
--- a/dev-python/zeroconf/zeroconf-0.33.0.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.33.3.ebuild
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 806cc9190888..6acd3e00aeeb 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/actionlib/Manifest b/dev-ros/actionlib/Manifest
index 62d2bb889406..9bf6d29eddfe 100644
--- a/dev-ros/actionlib/Manifest
+++ b/dev-ros/actionlib/Manifest
@@ -1,4 +1,4 @@
 DIST actionlib-1.13.2.tar.gz 101040 BLAKE2B 3c48ea46a5a6f91ead92c49870415f2e3addfb21190066a9b7d3e639a1dbe50a696b1cd61dc31dcb92d25a8e5a283a5c6184848ea7270e709a43b444398e4077 SHA512 f6186c8cdff916c5a13e635322fb915867b15fe175da1e0916713e4f2fd3c8e60f59dabc9dd9b31e1f0dcf699118a00e5a2d60db4a15bc65a731ba7a956147d9
-EBUILD actionlib-1.13.2-r1.ebuild 863 BLAKE2B 7a6c2b63a42727e8bee858b3bed0fb7e74a6d7919a891c7d8fa2d3a04b1a5bace96501b15141d38f3a9e700e71fe6ffb6fab80ee2e92dd47075ec7c4ba0f46d3 SHA512 2a140a173f70e556b9914478aff5b483142897abf5e4a663914fb60f51c505bdd7f8a07eb983382c6208973f6d1f236c08b0f399cc151a17705203ab6fbc2837
-EBUILD actionlib-9999.ebuild 863 BLAKE2B 7a6c2b63a42727e8bee858b3bed0fb7e74a6d7919a891c7d8fa2d3a04b1a5bace96501b15141d38f3a9e700e71fe6ffb6fab80ee2e92dd47075ec7c4ba0f46d3 SHA512 2a140a173f70e556b9914478aff5b483142897abf5e4a663914fb60f51c505bdd7f8a07eb983382c6208973f6d1f236c08b0f399cc151a17705203ab6fbc2837
+EBUILD actionlib-1.13.2-r1.ebuild 906 BLAKE2B c397a54658eb8ad27d6a198732e78af66f1b759090a093fcd1a599d8b140af037a6d12e6790239a9e559fc67c3408da17077215461f0a5deda2f756b6d01d9f9 SHA512 b20df58de3983d970f181f7963c8158cdf108f9b0ca2005cb66e4151cfca455cfffcdff0ac99910168cfd0622aa764617edc63df2350ea046e02632b6bfe3019
+EBUILD actionlib-9999.ebuild 906 BLAKE2B c397a54658eb8ad27d6a198732e78af66f1b759090a093fcd1a599d8b140af037a6d12e6790239a9e559fc67c3408da17077215461f0a5deda2f756b6d01d9f9 SHA512 b20df58de3983d970f181f7963c8158cdf108f9b0ca2005cb66e4151cfca455cfffcdff0ac99910168cfd0622aa764617edc63df2350ea046e02632b6bfe3019
 MISC metadata.xml 327 BLAKE2B 007cbc7d1abad4e0f3aaf4509c5c3856044c3ac530924921d0f21d795123c8651001b05d7ec26d9ff22304784bdd5bca25a2fae2474f3c5b5f031b9518a59f3a SHA512 f76c38a1b5699078331b74d7ed7cf40de05e2d24b398589b6dc9fdd03a486c438f2109ddab42de0ad41fb72b8eff87e69cdd7f21e79cabd03a8bbb8a8d3ce7b8
diff --git a/dev-ros/actionlib/actionlib-1.13.2-r1.ebuild b/dev-ros/actionlib/actionlib-1.13.2-r1.ebuild
index 77fa73a7d42f..082ffedaef8d 100644
--- a/dev-ros/actionlib/actionlib-1.13.2-r1.ebuild
+++ b/dev-ros/actionlib/actionlib-1.13.2-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
 	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
 	test? (
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
 	)"
 RDEPEND="${RDEPEND}
diff --git a/dev-ros/actionlib/actionlib-9999.ebuild b/dev-ros/actionlib/actionlib-9999.ebuild
index 77fa73a7d42f..082ffedaef8d 100644
--- a/dev-ros/actionlib/actionlib-9999.ebuild
+++ b/dev-ros/actionlib/actionlib-9999.ebuild
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
 	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
 	test? (
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
 	)"
 RDEPEND="${RDEPEND}
diff --git a/dev-ros/ament_cmake_copyright/Manifest b/dev-ros/ament_cmake_copyright/Manifest
index d83e4a77c3fd..65e76032f0d3 100644
--- a/dev-ros/ament_cmake_copyright/Manifest
+++ b/dev-ros/ament_cmake_copyright/Manifest
@@ -1,10 +1,6 @@
-DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
-DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_cmake_copyright-0.10.0.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
-EBUILD ament_cmake_copyright-0.10.1.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_cmake_copyright-0.10.4.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
-EBUILD ament_cmake_copyright-0.9.5.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
+EBUILD ament_cmake_copyright-0.11.2.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
 EBUILD ament_cmake_copyright-9999.ebuild 1660 BLAKE2B 3980914f8813bc3b30914f0dc0bac722be513a78474ad27db8770217c9e1a9996ecd8736f54de04f54b3ea0c1ade7033f083090a8cc1b5817b2d51285121400a SHA512 05d65a67a27999b048cdc3965fe198027443b9d6d79ed5a029c46816922b4517663cce51812c059f8bfb52f4db993db1a930b2fbc20ab293e8bc33f7b5d97ed4
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.1.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.1.ebuild
deleted file mode 100644
index aedb04bff69e..000000000000
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_copyright
-	dev-ros/ament_cmake_test
-"
-DEPEND=""
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_copyright[${PYTHON_USEDEP}] test? ( dev-ros/ament_lint_cmake[${PYTHON_USEDEP}] )' )
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_test
-	dev-ros/ament_copyright
-	test? (
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
-		( use !test || has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.0.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild
index aedb04bff69e..aedb04bff69e 100644
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.0.ebuild
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.11.2.ebuild
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.9.5.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.9.5.ebuild
deleted file mode 100644
index aedb04bff69e..000000000000
--- a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.9.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit cmake python-any-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ros/ament_copyright
-	dev-ros/ament_cmake_test
-"
-DEPEND=""
-# Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_copyright[${PYTHON_USEDEP}] test? ( dev-ros/ament_lint_cmake[${PYTHON_USEDEP}] )' )
-	dev-ros/ament_cmake_core
-	dev-ros/ament_cmake_test
-	dev-ros/ament_copyright
-	test? (
-		dev-ros/ament_cmake_lint_cmake
-	)
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
-		( use !test || has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
index e02dba12b8e4..051d211ceefb 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_core-0.9.6.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-1.0.0.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-1.0.1.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-1.0.3.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-1.0.4.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-1.1.3.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
+EBUILD ament_cmake_core-1.1.4.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 EBUILD ament_cmake_core-9999.ebuild 1075 BLAKE2B e13f709aa6dd4c5786d09225d0c6e47b93b2d9bb57316c7da9d5f2e575e2a2a320bb53e171878fd55814c1f4f741cb4c6f30beea5fad1d9d33e68721c99541d1 SHA512 57908d5a51949e628a08e946ec08a109e4404355630e2a5917d37274c7ee75c449e0316b670b9ce5aced856f90f9083635578548ae3a9aece8af7f497f29b161
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild
new file mode 100644
index 000000000000..a1dc3e627817
--- /dev/null
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The core of the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-python/ament_package
+	dev-python/catkin_pkg
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_cppcheck/Manifest b/dev-ros/ament_cmake_cppcheck/Manifest
index 0d76a0ebc33d..af4c672e20b1 100644
--- a/dev-ros/ament_cmake_cppcheck/Manifest
+++ b/dev-ros/ament_cmake_cppcheck/Manifest
@@ -1,10 +1,12 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_cppcheck-0.10.0.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
 EBUILD ament_cmake_cppcheck-0.10.1.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
 EBUILD ament_cmake_cppcheck-0.10.4.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
+EBUILD ament_cmake_cppcheck-0.11.2.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
 EBUILD ament_cmake_cppcheck-0.9.5.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
 EBUILD ament_cmake_cppcheck-9999.ebuild 1537 BLAKE2B a53eefde7cae95039d554c2514a5eb0d94c2aadce0cea6e7923b7186909cd84a04fcdd0b59291bec620b20c9e6b6ee06c306ed673ac5ea6f92ebb1b552ab6083 SHA512 45cff84303c29a7d05cb66b25d01c26cf6e84f228aba58ef0119113aff269bdca6822e156f984e766c8835e85b9268c3fbf31f26ef969f9f0dac5290e54af67d
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
new file mode 100644
index 000000000000..db8cbeb51733
--- /dev/null
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="CMake API for ament_cppcheck to perform static code analysis on C/C++"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cppcheck
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	test? (
+		dev-ros/ament_cmake_copyright
+		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_cpplint/Manifest b/dev-ros/ament_cmake_cpplint/Manifest
index f74f2af33f8c..90c1d755b3eb 100644
--- a/dev-ros/ament_cmake_cpplint/Manifest
+++ b/dev-ros/ament_cmake_cpplint/Manifest
@@ -1,10 +1,12 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_cpplint-0.10.0.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
 EBUILD ament_cmake_cpplint-0.10.1.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
 EBUILD ament_cmake_cpplint-0.10.4.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
+EBUILD ament_cmake_cpplint-0.11.2.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
 EBUILD ament_cmake_cpplint-0.9.5.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
 EBUILD ament_cmake_cpplint-9999.ebuild 1503 BLAKE2B e3393824134e0ad87e9df8c937cd0b00c4263a4a351740ce7f36949be5392b5fbe32296d521503b2efbb3059b0857c51496de10da95498c400d11af601ab9221 SHA512 fe6811b1405e6bb04082648970b11f9292e6c3cdb97125378de9dd8fa52c6424b49e7d9f1e0040e3343a8c72d9a336809c9aea7718d3d6c916a58b1e763cfef7
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild
new file mode 100644
index 000000000000..c9b636058541
--- /dev/null
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="CMake API for ament_cpplint to lint C / C++ code using cpplint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cpplint
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	test? (
+		dev-ros/ament_cmake_copyright
+		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_export_definitions/Manifest b/dev-ros/ament_cmake_export_definitions/Manifest
index 18f075de3b45..f083ab6e012e 100644
--- a/dev-ros/ament_cmake_export_definitions/Manifest
+++ b/dev-ros/ament_cmake_export_definitions/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_definitions-0.9.6.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-1.0.0.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-1.0.1.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-1.0.3.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-1.0.4.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-1.1.3.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
+EBUILD ament_cmake_export_definitions-1.1.4.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 EBUILD ament_cmake_export_definitions-9999.ebuild 1157 BLAKE2B b990becd71cf419937a271d33214f9443ca08af53534cc3a4b06f82b45250fe547daa9c3b2eda1566fce74d76078aa0775c0b648fb7aa5bff168a8191642ea70 SHA512 f87f0df43c68353c18f6673d2d7044fb7823a2b59a7c1db1dc287ee0b131735a98e0c26a2324bab47b9a8e1230ceeaa3db94fb256c1f667a2a8cef9d32ee8ed1
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild
new file mode 100644
index 000000000000..40a130e4953e
--- /dev/null
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export definitions to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_dependencies/Manifest b/dev-ros/ament_cmake_export_dependencies/Manifest
index 7235086e6634..6b304bf9253a 100644
--- a/dev-ros/ament_cmake_export_dependencies/Manifest
+++ b/dev-ros/ament_cmake_export_dependencies/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_dependencies-0.9.6.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-1.0.0.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-1.0.1.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-1.0.3.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-1.0.4.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-1.1.3.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
+EBUILD ament_cmake_export_dependencies-1.1.4.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 EBUILD ament_cmake_export_dependencies-9999.ebuild 1198 BLAKE2B aa10e6775337c949aed6b7311acbf605a806e1e404bd6eaa49430edfc23f7465f6f803a94e3297e403c96b874b0a90071bf5d88cacf05dc39703f28e60ccfc75 SHA512 b4ded0f0018ebe67a1b0850ad893c4c639c66d53a5a79cdab0b5b35bd55a7d0daf4197a7738952010aab6bb57666a0fe8078a7c04ccf3d0acec23ae24da6d3da
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild
new file mode 100644
index 000000000000..6be2a34aa01e
--- /dev/null
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_include_directories/Manifest b/dev-ros/ament_cmake_export_include_directories/Manifest
index d755b9b67237..31b934ecd168 100644
--- a/dev-ros/ament_cmake_export_include_directories/Manifest
+++ b/dev-ros/ament_cmake_export_include_directories/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_include_directories-0.9.6.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-1.0.0.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-1.0.1.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-1.0.3.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-1.0.4.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-1.1.3.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
+EBUILD ament_cmake_export_include_directories-1.1.4.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_export_include_directories-9999.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild
new file mode 100644
index 000000000000..4a30d0ac2418
--- /dev/null
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_interfaces/Manifest b/dev-ros/ament_cmake_export_interfaces/Manifest
index 88f4bfcfea93..1ae1a5e69643 100644
--- a/dev-ros/ament_cmake_export_interfaces/Manifest
+++ b/dev-ros/ament_cmake_export_interfaces/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_interfaces-0.9.6.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-1.0.0.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-1.0.1.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-1.0.3.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-1.0.4.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-1.1.3.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
+EBUILD ament_cmake_export_interfaces-1.1.4.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 EBUILD ament_cmake_export_interfaces-9999.ebuild 1194 BLAKE2B bcef251f9271cae691e7cdc477df078e6228d1d5cb0df4e3b373daa8204711af2f99b74d13fcf43ea48f37e86f193daae0714b03566b7a18824acb758d4df527 SHA512 f7750f56e7239a01ae9d557955d33ef3a4f1452ce5b8ad16e7952b9a732b76258e2d6e0e722b9c32948d4177a87743687f1243466360014650d047aa2d672361
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild
new file mode 100644
index 000000000000..e618a9ad7d4d
--- /dev/null
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export interfaces to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_libraries/Manifest b/dev-ros/ament_cmake_export_libraries/Manifest
index 2e65c68f6a4c..a9f0e4ae53d8 100644
--- a/dev-ros/ament_cmake_export_libraries/Manifest
+++ b/dev-ros/ament_cmake_export_libraries/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_libraries-0.9.6.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-1.0.0.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-1.0.1.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-1.0.3.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-1.0.4.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-1.1.3.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
+EBUILD ament_cmake_export_libraries-1.1.4.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 EBUILD ament_cmake_export_libraries-9999.ebuild 1155 BLAKE2B 7ddac875570204413f9a2879108f191b180a01d9ab28dd6d0f1d38dbccf6f1a64582955df88cc2e6516944eb92c38150818496a796a08808b1de5ae8ab72f5aa SHA512 7fb49dccbe48f26c6a7fc13de0f3f863869cb9125bf64200c68718f2cec5e7b13b140314c03055e65232c4d2fdeb185767c393b25929082ae74c94b022a15bda
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
new file mode 100644
index 000000000000..5a63a39ded54
--- /dev/null
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export libraries to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_link_flags/Manifest b/dev-ros/ament_cmake_export_link_flags/Manifest
index 4d08271072ed..1fb98e05cc41 100644
--- a/dev-ros/ament_cmake_export_link_flags/Manifest
+++ b/dev-ros/ament_cmake_export_link_flags/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_link_flags-0.9.6.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-1.0.0.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-1.0.1.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-1.0.3.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-1.0.4.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-1.1.3.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
+EBUILD ament_cmake_export_link_flags-1.1.4.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 EBUILD ament_cmake_export_link_flags-9999.ebuild 1156 BLAKE2B 640b451d2800a60ccd927f4ac4c703a90e404219a0322d10e4e4ba8fc4ae2edba6a65eea4b1a7d42748bfed9cbaff141afe991b397472973b0dfaca1666faafe SHA512 ad51051f78f922b5b58893362e32d40a282194b5b78c54fd68b03b002246e1df91da99080404d00ccd668c3e62068c89b034178e6d669427e9e92d4ac87c5f07
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.4.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.4.ebuild
new file mode 100644
index 000000000000..e31c09637e5a
--- /dev/null
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export link flags to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_targets/Manifest b/dev-ros/ament_cmake_export_targets/Manifest
index dd0d3a9a6a2f..deb97f0ca0d3 100644
--- a/dev-ros/ament_cmake_export_targets/Manifest
+++ b/dev-ros/ament_cmake_export_targets/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_export_targets-0.9.6.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-1.0.0.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-1.0.1.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-1.0.3.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-1.0.4.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-1.1.3.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
+EBUILD ament_cmake_export_targets-1.1.4.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 EBUILD ament_cmake_export_targets-9999.ebuild 1191 BLAKE2B ffdacf3804630a8049cd74172c62a22c53cc81116de5755948f8d38c9062db4f4b7caca1b14b68203f5bc65666d683096aa5440a729fbcc9e07c5cfd8d778ee4 SHA512 860f8290f6e4d28edc8edc4ca6fbed325e99f2ab3ac37a622541253a8b47b43a369152dea173c8625e179098109c87fc80075fe73e278fdeeee0454995dae2f4
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild
new file mode 100644
index 000000000000..50b62c2a317b
--- /dev/null
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export targets to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_gmock/Manifest b/dev-ros/ament_cmake_gmock/Manifest
index e1a9a3fdb8e4..e3cf038e8d4d 100644
--- a/dev-ros/ament_cmake_gmock/Manifest
+++ b/dev-ros/ament_cmake_gmock/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_gmock-1.0.0.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 EBUILD ament_cmake_gmock-1.0.1.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 EBUILD ament_cmake_gmock-1.0.3.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 EBUILD ament_cmake_gmock-1.0.4.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 EBUILD ament_cmake_gmock-1.1.3.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
+EBUILD ament_cmake_gmock-1.1.4.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 EBUILD ament_cmake_gmock-9999.ebuild 1158 BLAKE2B d97a5089a055c9bbfa733f42d848f01c849cf5a4c5f106305346e9b7bbcd7a3bd93898b334133280a7be9b71911f3ea9c2f4ea62d4db6240b21d27f072a12bec SHA512 3a05e2fc64eccf5c6fa31b015eb86746a2089837cf44ab901b84c1fa80e09cde06459e4f0e4002ca31cbaed367804c8d445edb5bda4ba20940d85afa29b3134e
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.4.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.4.ebuild
new file mode 100644
index 000000000000..17c189d5d54e
--- /dev/null
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add Google mock-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_gtest/Manifest b/dev-ros/ament_cmake_gtest/Manifest
index f39d9e1adbdb..521b01ac9ea7 100644
--- a/dev-ros/ament_cmake_gtest/Manifest
+++ b/dev-ros/ament_cmake_gtest/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_gtest-0.9.6.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-1.0.0.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-1.0.1.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-1.0.3.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-1.0.4.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-1.1.3.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
+EBUILD ament_cmake_gtest-1.1.4.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 EBUILD ament_cmake_gtest-9999.ebuild 1152 BLAKE2B 2cd1992330143a38aee0b19da8f7f49330990d308920f5986851a45ee996d59e7b0cc57f3ca9021bebabccd2021d16889551906323b5599f48a5a363f1c4eb21 SHA512 9a07236d5e249eb4db1302f31ae646172349c728e7a14b152621e0cef486a8eb6dee8dad373c65602de2c1eb82b556f9cdaf33e6ba49146de0299169800430b6
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.4.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.4.ebuild
new file mode 100644
index 000000000000..b93c7a39772a
--- /dev/null
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add gtest-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_include_directories/Manifest b/dev-ros/ament_cmake_include_directories/Manifest
index c29231baff15..6d7d9c64ad13 100644
--- a/dev-ros/ament_cmake_include_directories/Manifest
+++ b/dev-ros/ament_cmake_include_directories/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_include_directories-0.9.6.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-1.0.0.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-1.0.1.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-1.0.3.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-1.0.4.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-1.1.3.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
+EBUILD ament_cmake_include_directories-1.1.4.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 EBUILD ament_cmake_include_directories-9999.ebuild 1165 BLAKE2B 73c706b13714c044ec3e31d61ae5c057c1e0032e1549d9616aad198c9e6008d4f6cd78293307cae63b5c22877dac29e987c99c6acb90c647e87905b71d44e83f SHA512 31a985c6b390cc5a0b27fefb0ad20d4398751a8c9a224be83f964304caec38a17b3ebdb07e078ed892b5ba8a4d4af62993797e0775c954354d11c7626b6edf65
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild
new file mode 100644
index 000000000000..4a30d0ac2418
--- /dev/null
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_libraries/Manifest b/dev-ros/ament_cmake_libraries/Manifest
index 60f453b8bc7d..c6fdbea6090e 100644
--- a/dev-ros/ament_cmake_libraries/Manifest
+++ b/dev-ros/ament_cmake_libraries/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_libraries-0.9.6.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-1.0.0.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-1.0.1.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-1.0.3.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-1.0.4.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-1.1.3.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
+EBUILD ament_cmake_libraries-1.1.4.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 EBUILD ament_cmake_libraries-9999.ebuild 1158 BLAKE2B 886235c5526814c1cd29a1e5b0024f174b32f308c6a0f3c96a59563581c6f714382488cd38d6795150aaf47fe3a8823a56d4aa298767cc71facbcc3afc2719b5 SHA512 6cd988444b7fb656d25e81951fdd605ce1518ef4fdac9e2393fb3ae1ff2caf0f5881cbfda18c81731927224108e6ba69f9aaa79e08b7137c855e014a9d5e8f82
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild
new file mode 100644
index 000000000000..f4eece8f0db0
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The functionality to deduplicate libraries in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_lint_cmake/Manifest b/dev-ros/ament_cmake_lint_cmake/Manifest
index c93c26485fbc..d3defaa0c95c 100644
--- a/dev-ros/ament_cmake_lint_cmake/Manifest
+++ b/dev-ros/ament_cmake_lint_cmake/Manifest
@@ -1,10 +1,12 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_lint_cmake-0.10.0.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
 EBUILD ament_cmake_lint_cmake-0.10.1.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
 EBUILD ament_cmake_lint_cmake-0.10.4.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
+EBUILD ament_cmake_lint_cmake-0.11.2.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
 EBUILD ament_cmake_lint_cmake-0.9.5.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
 EBUILD ament_cmake_lint_cmake-9999.ebuild 1260 BLAKE2B d8a066607f3882b1fcfb7309c125ea4918d87e66e77fa1bcbdee4c3f924d9dbe39a332c8c2435ca607d3ce1a7ac69fc1576b1ba894947c36b8fed674fae399f2 SHA512 2e2181f42119a1d2e20167d13dbb42343f6c4b425c729c32d7b9ca8022f9691f591f335edccdaa2e3f01b04b7b84c4116f7e21f71c582ebd4964150da9e0ad56
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild
new file mode 100644
index 000000000000..d16461b67cd9
--- /dev/null
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The CMake API for ament_lint_cmake to lint CMake code using cmakelint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_lint_cmake
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_pytest/Manifest b/dev-ros/ament_cmake_pytest/Manifest
index 32a69232f09b..ba13dd289735 100644
--- a/dev-ros/ament_cmake_pytest/Manifest
+++ b/dev-ros/ament_cmake_pytest/Manifest
@@ -3,10 +3,12 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_pytest-1.0.0.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 EBUILD ament_cmake_pytest-1.0.1.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 EBUILD ament_cmake_pytest-1.0.3.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 EBUILD ament_cmake_pytest-1.0.4.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 EBUILD ament_cmake_pytest-1.1.3.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
+EBUILD ament_cmake_pytest-1.1.4.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 EBUILD ament_cmake_pytest-9999.ebuild 1160 BLAKE2B 1e876dd0840295037a3ba7066f6775673196c6946b661647d731e4f6cee928bc70b2abbb680a2a16fc9e42b0209a00a59c0489ed9cf1be34033447897c79b4e1 SHA512 53067e8a88265f8d96ec184411739922d32b000f6d7214ee18c05e080a55d3ba4a46ac1ebec0c008198453992f1f1c004516712d6207e713000e21a801edddde
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.4.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.4.ebuild
new file mode 100644
index 000000000000..cf7e6c682106
--- /dev/null
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to run Python tests using pytest in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_python/Manifest b/dev-ros/ament_cmake_python/Manifest
index 9c8b2c62a6f9..7f36c461a791 100644
--- a/dev-ros/ament_cmake_python/Manifest
+++ b/dev-ros/ament_cmake_python/Manifest
@@ -5,11 +5,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_python-0.9.6.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-1.0.0.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-1.0.1.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-1.0.3.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-1.0.4.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-1.1.3.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
+EBUILD ament_cmake_python-1.1.4.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 EBUILD ament_cmake_python-9999.ebuild 1181 BLAKE2B c314514223beed84bb8cffd375d3f72f76e7136b705f49b6a20174c45ba5b6056b4272af2e33a9df5aadcc3f7a87f3907aaf37516cfe55453b22c64868a5c9d7 SHA512 5ac7707c0bab83b67d12c8732f7d86151595fb50bee930d1c3e4dacbe545d37b7b1038a8f4452cae51bf7e7f18c89e7a1b8b3178db94c2e8cb641f8ff9ff330e
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild
new file mode 100644
index 000000000000..0e793810f45b
--- /dev/null
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to use Python in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+PATCHES=( "${FILESDIR}/destdir.patch" )
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_target_dependencies/Manifest b/dev-ros/ament_cmake_target_dependencies/Manifest
index eb9790f0ee10..358ce31b6969 100644
--- a/dev-ros/ament_cmake_target_dependencies/Manifest
+++ b/dev-ros/ament_cmake_target_dependencies/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_target_dependencies-0.9.6.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-1.0.0.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-1.0.1.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-1.0.3.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-1.0.4.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-1.1.3.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
+EBUILD ament_cmake_target_dependencies-1.1.4.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 EBUILD ament_cmake_target_dependencies-9999.ebuild 1231 BLAKE2B 3b2f9b63aac301d9bc463434727a18b228c59631b658a3a47c1a742aee447e8c0fb13ee43b0aa8e90e1c5e6bd2de2423a2990ddae6a67e308c6d7007316586bd SHA512 878f2b4fa0a2958eafa4a2a216911d3bffe503842dfd4422a559df1b7f65eccc4c104ad5f6e97b6cee5da7e8a7ed52b57af24047766edee66bc996a783291d80
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.4.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.4.ebuild
new file mode 100644
index 000000000000..cc319e25dd31
--- /dev/null
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Add defs, include dirs and libs to a target in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_include_directories
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_test/Manifest b/dev-ros/ament_cmake_test/Manifest
index b9871d40a3fb..f5eccd697667 100644
--- a/dev-ros/ament_cmake_test/Manifest
+++ b/dev-ros/ament_cmake_test/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_test-0.9.6.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-1.0.0.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-1.0.1.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-1.0.3.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-1.0.4.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-1.1.3.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
+EBUILD ament_cmake_test-1.1.4.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 EBUILD ament_cmake_test-9999.ebuild 1230 BLAKE2B ad72401a56e4ac64486d61351446ce4639f59f5ce2038ca825dab2a447731a3178a5f7e6f0694ee9008ac2e513bdebee04c692a5489d31dc7d4dde0f5b87007b SHA512 48d31a6a7069b611bd5889c1ebd8cdf9f476672f91d3264be925b83763bf80363394a2120b790089dd2ce2f16ea036113a12f5821f5eed79ad3a94f05e2cc037
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-1.1.4.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.1.4.ebuild
new file mode 100644
index 000000000000..bb59c0de949c
--- /dev/null
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-1.1.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+	dev-ros/ament_cmake_core
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-ros/ament_cmake_python
+	${PYTHON_DEPS}
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	python_foreach_impl cmake_src_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+src_install() {
+	python_foreach_impl cmake_src_install
+	python_foreach_impl python_optimize
+}
diff --git a/dev-ros/ament_cmake_uncrustify/Manifest b/dev-ros/ament_cmake_uncrustify/Manifest
index 7e01f9ce2936..9764617cbc1b 100644
--- a/dev-ros/ament_cmake_uncrustify/Manifest
+++ b/dev-ros/ament_cmake_uncrustify/Manifest
@@ -1,10 +1,12 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_uncrustify-0.10.0.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
 EBUILD ament_cmake_uncrustify-0.10.1.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
 EBUILD ament_cmake_uncrustify-0.10.4.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
+EBUILD ament_cmake_uncrustify-0.11.2.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
 EBUILD ament_cmake_uncrustify-0.9.5.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
 EBUILD ament_cmake_uncrustify-9999.ebuild 1517 BLAKE2B 7611ecb510ac8094b3b4878b4dfc83339e198e24910806025d1393477bd3c7d8c7de5afb5a351e021408279d1f16348e1d2cffb3b42c24139ce471b64d5ffd69 SHA512 9df72e736c4e772e75c3131b1774550a03b785e3ee9f4504d6ceea19d18960ac96fd1d8e415a349e8a65d4be33e51022d2618a779cc04e40822720b87125ebc4
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild
new file mode 100644
index 000000000000..ba3ee494af1c
--- /dev/null
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The CMake API for ament_uncrustify to check code against styleconventions"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_uncrustify
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	test? (
+		dev-ros/ament_cmake_copyright
+		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_version/Manifest b/dev-ros/ament_cmake_version/Manifest
index b5ebd62698c9..93bb41c1bd7f 100644
--- a/dev-ros/ament_cmake_version/Manifest
+++ b/dev-ros/ament_cmake_version/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake_version-0.9.6.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-1.0.0.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-1.0.1.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-1.0.3.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-1.0.4.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-1.1.3.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
+EBUILD ament_cmake_version-1.1.4.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 EBUILD ament_cmake_version-9999.ebuild 1153 BLAKE2B 6fbaf31737aa20280559316944af2ccbd3e42b7781e8a8f41bed5abf9925217a9c656a38a12d74810f7d91dea4ec562626ef63695d58ca5fb2127813441939df SHA512 bc318b68e254433e022ad162579ad69bcb665af361f92e8675d76a1f42c4b95f15f349804f19d038631722d210aeb3152e6860370a5d9574479c4bdd8ea6bb18
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-1.1.4.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.1.4.ebuild
new file mode 100644
index 000000000000..a03f6bbe74af
--- /dev/null
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Override the exported package version in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_xmllint/Manifest b/dev-ros/ament_cmake_xmllint/Manifest
index ab5a46372491..35764b1a5d10 100644
--- a/dev-ros/ament_cmake_xmllint/Manifest
+++ b/dev-ros/ament_cmake_xmllint/Manifest
@@ -1,10 +1,12 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_cmake_xmllint-0.10.0.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
 EBUILD ament_cmake_xmllint-0.10.1.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
 EBUILD ament_cmake_xmllint-0.10.4.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
+EBUILD ament_cmake_xmllint-0.11.2.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
 EBUILD ament_cmake_xmllint-0.9.5.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
 EBUILD ament_cmake_xmllint-9999.ebuild 1453 BLAKE2B adb8a13381da60fda8c430297974c6e53992342984a2f4c7115b3d9370b9397ebabfd3d7944b8e8571a2e0de8e5613f55834e0c3e95922a3a32a096e257a1686 SHA512 f4ce7240407a8dd1eecb4332f25d1fb2ab5d45980b3a101a09521e9507c62d27f3aab18d87c20036060a3012f084d40de5145fe8daa61adb07185e928b302eb3
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild
new file mode 100644
index 000000000000..91e92ca5ad7d
--- /dev/null
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="he CMake API for ament_xmllint to check XML file using xmmlint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_copyright
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_xmllint[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_copyright
+	test? (
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_copyright/Manifest b/dev-ros/ament_copyright/Manifest
index 4cd92ee91b4b..1e0ce41b2b92 100644
--- a/dev-ros/ament_copyright/Manifest
+++ b/dev-ros/ament_copyright/Manifest
@@ -1,8 +1,6 @@
-DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
-DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
-EBUILD ament_copyright-0.10.0.ebuild 1146 BLAKE2B 2dc60a4dbe7576339ef943632712daa4947ca09fc86d6354c817c9c437f7c27f58f9ea357e8d235437647c6387e373a1439d31c20cb35a8dceab634d41f3e2b0 SHA512 6e9a1dee263be9edf0f7408a31640f43452d3107344c528eb19c9614aa57b66e53783f47ce65d194d0fe8eb4a4154bdc45df7d1baf01b64b2d96cf311ddf2902
-EBUILD ament_copyright-0.10.1.ebuild 1146 BLAKE2B 2dc60a4dbe7576339ef943632712daa4947ca09fc86d6354c817c9c437f7c27f58f9ea357e8d235437647c6387e373a1439d31c20cb35a8dceab634d41f3e2b0 SHA512 6e9a1dee263be9edf0f7408a31640f43452d3107344c528eb19c9614aa57b66e53783f47ce65d194d0fe8eb4a4154bdc45df7d1baf01b64b2d96cf311ddf2902
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_copyright-0.10.4.ebuild 1146 BLAKE2B 2dc60a4dbe7576339ef943632712daa4947ca09fc86d6354c817c9c437f7c27f58f9ea357e8d235437647c6387e373a1439d31c20cb35a8dceab634d41f3e2b0 SHA512 6e9a1dee263be9edf0f7408a31640f43452d3107344c528eb19c9614aa57b66e53783f47ce65d194d0fe8eb4a4154bdc45df7d1baf01b64b2d96cf311ddf2902
+EBUILD ament_copyright-0.11.2.ebuild 1146 BLAKE2B 2dc60a4dbe7576339ef943632712daa4947ca09fc86d6354c817c9c437f7c27f58f9ea357e8d235437647c6387e373a1439d31c20cb35a8dceab634d41f3e2b0 SHA512 6e9a1dee263be9edf0f7408a31640f43452d3107344c528eb19c9614aa57b66e53783f47ce65d194d0fe8eb4a4154bdc45df7d1baf01b64b2d96cf311ddf2902
 EBUILD ament_copyright-9999.ebuild 1146 BLAKE2B 2dc60a4dbe7576339ef943632712daa4947ca09fc86d6354c817c9c437f7c27f58f9ea357e8d235437647c6387e373a1439d31c20cb35a8dceab634d41f3e2b0 SHA512 6e9a1dee263be9edf0f7408a31640f43452d3107344c528eb19c9614aa57b66e53783f47ce65d194d0fe8eb4a4154bdc45df7d1baf01b64b2d96cf311ddf2902
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_copyright/ament_copyright-0.10.1.ebuild b/dev-ros/ament_copyright/ament_copyright-0.10.1.ebuild
deleted file mode 100644
index dfdc3192ac68..000000000000
--- a/dev-ros/ament_copyright/ament_copyright-0.10.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to check source files for copyright and license information."
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND="
-	dev-ros/ament_lint
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND=""
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-ros/ament_copyright/ament_copyright-0.10.0.ebuild b/dev-ros/ament_copyright/ament_copyright-0.11.2.ebuild
index dfdc3192ac68..dfdc3192ac68 100644
--- a/dev-ros/ament_copyright/ament_copyright-0.10.0.ebuild
+++ b/dev-ros/ament_copyright/ament_copyright-0.11.2.ebuild
diff --git a/dev-ros/ament_cppcheck/Manifest b/dev-ros/ament_cppcheck/Manifest
index 2febe71b7d15..c4ec08ecf59b 100644
--- a/dev-ros/ament_cppcheck/Manifest
+++ b/dev-ros/ament_cppcheck/Manifest
@@ -1,8 +1,6 @@
-DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
-DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
-EBUILD ament_cppcheck-0.10.0.ebuild 818 BLAKE2B 43ed9e32118dd4a0aad9625ab4551284a0f0f24216450b3cb437bf701865e3969c5b27e4f1cb39c11f3d45f4db981b8813a3b937f237fc2b2ec2fb093bfb1640 SHA512 58fb1c31e1fa8caf69485dbe13575f79678aee33a9fb2138d611149d496fa0039e04d6dfcf22a0133097eb8255c1e45ff0a0a935ccbcc75101a37d74e081766d
-EBUILD ament_cppcheck-0.10.1.ebuild 818 BLAKE2B 43ed9e32118dd4a0aad9625ab4551284a0f0f24216450b3cb437bf701865e3969c5b27e4f1cb39c11f3d45f4db981b8813a3b937f237fc2b2ec2fb093bfb1640 SHA512 58fb1c31e1fa8caf69485dbe13575f79678aee33a9fb2138d611149d496fa0039e04d6dfcf22a0133097eb8255c1e45ff0a0a935ccbcc75101a37d74e081766d
-EBUILD ament_cppcheck-0.10.4.ebuild 818 BLAKE2B 43ed9e32118dd4a0aad9625ab4551284a0f0f24216450b3cb437bf701865e3969c5b27e4f1cb39c11f3d45f4db981b8813a3b937f237fc2b2ec2fb093bfb1640 SHA512 58fb1c31e1fa8caf69485dbe13575f79678aee33a9fb2138d611149d496fa0039e04d6dfcf22a0133097eb8255c1e45ff0a0a935ccbcc75101a37d74e081766d
-EBUILD ament_cppcheck-9999.ebuild 818 BLAKE2B 43ed9e32118dd4a0aad9625ab4551284a0f0f24216450b3cb437bf701865e3969c5b27e4f1cb39c11f3d45f4db981b8813a3b937f237fc2b2ec2fb093bfb1640 SHA512 58fb1c31e1fa8caf69485dbe13575f79678aee33a9fb2138d611149d496fa0039e04d6dfcf22a0133097eb8255c1e45ff0a0a935ccbcc75101a37d74e081766d
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
+EBUILD ament_cppcheck-0.10.4.ebuild 933 BLAKE2B cab561ffc7ee22991f8905fa4579b3481a08efd7f67d7975706aa968df1fdf302d7b395137d8d87a6d1fcd72856c22ca1c133f5f6716fb24d5d86471a5e1b944 SHA512 525c5c031e8d70722d2b51d9a108f488c641ba7f85cb4d9720ef6cb89eabdf82162e6e1e5870c5e0a1bf19ef5d2b75e68c154641bfc8443cff7f8c95272d9e1b
+EBUILD ament_cppcheck-0.11.2.ebuild 933 BLAKE2B cab561ffc7ee22991f8905fa4579b3481a08efd7f67d7975706aa968df1fdf302d7b395137d8d87a6d1fcd72856c22ca1c133f5f6716fb24d5d86471a5e1b944 SHA512 525c5c031e8d70722d2b51d9a108f488c641ba7f85cb4d9720ef6cb89eabdf82162e6e1e5870c5e0a1bf19ef5d2b75e68c154641bfc8443cff7f8c95272d9e1b
+EBUILD ament_cppcheck-9999.ebuild 933 BLAKE2B cab561ffc7ee22991f8905fa4579b3481a08efd7f67d7975706aa968df1fdf302d7b395137d8d87a6d1fcd72856c22ca1c133f5f6716fb24d5d86471a5e1b944 SHA512 525c5c031e8d70722d2b51d9a108f488c641ba7f85cb4d9720ef6cb89eabdf82162e6e1e5870c5e0a1bf19ef5d2b75e68c154641bfc8443cff7f8c95272d9e1b
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.0.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.10.0.ebuild
deleted file mode 100644
index 2dbf9430dfe6..000000000000
--- a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to perform static code analysis on C/C++ code using Cppcheck"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-util/cppcheck
-"
-DEPEND=""
-BDEPEND=""
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.1.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.10.1.ebuild
deleted file mode 100644
index 2dbf9430dfe6..000000000000
--- a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to perform static code analysis on C/C++ code using Cppcheck"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-util/cppcheck
-"
-DEPEND=""
-BDEPEND=""
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.4.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.10.4.ebuild
index 2dbf9430dfe6..1ec0564cee82 100644
--- a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.4.ebuild
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-0.10.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -36,3 +36,8 @@ RDEPEND="
 "
 DEPEND=""
 BDEPEND=""
+
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.11.2.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.11.2.ebuild
new file mode 100644
index 000000000000..1ec0564cee82
--- /dev/null
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-0.11.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to perform static code analysis on C/C++ code using Cppcheck"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-util/cppcheck
+"
+DEPEND=""
+BDEPEND=""
+
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
index 2dbf9430dfe6..1ec0564cee82 100644
--- a/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -36,3 +36,8 @@ RDEPEND="
 "
 DEPEND=""
 BDEPEND=""
+
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_cpplint/Manifest b/dev-ros/ament_cpplint/Manifest
index 233eac7b8cc0..9cd51a8b9f54 100644
--- a/dev-ros/ament_cpplint/Manifest
+++ b/dev-ros/ament_cpplint/Manifest
@@ -1,8 +1,10 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_cpplint-0.10.0.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
 EBUILD ament_cpplint-0.10.1.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
 EBUILD ament_cpplint-0.10.4.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
+EBUILD ament_cpplint-0.11.2.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
 EBUILD ament_cpplint-9999.ebuild 1025 BLAKE2B 1a90d417f2c6a3c05a9e8171520b84520c3936d0e7a38abd6a29846b3da00b6972583fed66acd98324766ece259484fd859a1c0746b2afaa71742b54fafa2db8 SHA512 2e43e46d5029a4e213379f2b7a44ee53a6778eb831a12abad119674deccf5f0adec1320ba43a9b1624dfc37f71f2bda0c2f0123123d89cfe8495b7b8e029076e
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cpplint/ament_cpplint-0.11.2.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.11.2.ebuild
new file mode 100644
index 000000000000..c8856b376bb5
--- /dev/null
+++ b/dev-ros/ament_cpplint/ament_cpplint-0.11.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check code against the Google style conventions using cpplint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_flake8/Manifest b/dev-ros/ament_flake8/Manifest
index 31044acb6b44..71733a621de1 100644
--- a/dev-ros/ament_flake8/Manifest
+++ b/dev-ros/ament_flake8/Manifest
@@ -1,8 +1,10 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_flake8-0.10.0.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
 EBUILD ament_flake8-0.10.1.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
 EBUILD ament_flake8-0.10.4.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
+EBUILD ament_flake8-0.11.2.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
 EBUILD ament_flake8-9999.ebuild 968 BLAKE2B 72fdf816476eda52b369baede1ad220599eef94170efb53e2aafbe21f03e81d332e7552383c643308909f8d05e982954ffd600a1683bc6e442f3191320f5c19b SHA512 fdd06b0c0946e6aa1fbc538c541cacdf40448d606fe3b04d4b968195175200731672d120bb92ea2aa9b8e5805c274cf5551f82b4d174dde7ab62bf2a211c7ff9
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_flake8/ament_flake8-0.11.2.ebuild b/dev-ros/ament_flake8/ament_flake8-0.11.2.ebuild
new file mode 100644
index 000000000000..c2beb0d53809
--- /dev/null
+++ b/dev-ros/ament_flake8/ament_flake8-0.11.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check code for style and syntax conventions with flake8"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint/Manifest b/dev-ros/ament_lint/Manifest
index 9010cd7eb826..34789ffd5682 100644
--- a/dev-ros/ament_lint/Manifest
+++ b/dev-ros/ament_lint/Manifest
@@ -1,10 +1,6 @@
-DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
-DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_lint-0.10.0.ebuild 739 BLAKE2B 97f094a6502949d08eb635c0baf7e7d8f1385ef41e6371790cabfd70b490e2f34b721b59e8a496add7b1c316d397f96fcae1898167c22e8c6eaf2066b389d996 SHA512 9a9db031c397e4d323a3ea4088867713786a8710aea41ef6a30ff207c1960a351ff2c4115f5b79e7ae2ff1f47b5e0aa738c56ee3122dd303b07acb5017a38eb0
-EBUILD ament_lint-0.10.1.ebuild 739 BLAKE2B 97f094a6502949d08eb635c0baf7e7d8f1385ef41e6371790cabfd70b490e2f34b721b59e8a496add7b1c316d397f96fcae1898167c22e8c6eaf2066b389d996 SHA512 9a9db031c397e4d323a3ea4088867713786a8710aea41ef6a30ff207c1960a351ff2c4115f5b79e7ae2ff1f47b5e0aa738c56ee3122dd303b07acb5017a38eb0
-EBUILD ament_lint-0.10.4.ebuild 739 BLAKE2B 97f094a6502949d08eb635c0baf7e7d8f1385ef41e6371790cabfd70b490e2f34b721b59e8a496add7b1c316d397f96fcae1898167c22e8c6eaf2066b389d996 SHA512 9a9db031c397e4d323a3ea4088867713786a8710aea41ef6a30ff207c1960a351ff2c4115f5b79e7ae2ff1f47b5e0aa738c56ee3122dd303b07acb5017a38eb0
-EBUILD ament_lint-0.9.5.ebuild 739 BLAKE2B 97f094a6502949d08eb635c0baf7e7d8f1385ef41e6371790cabfd70b490e2f34b721b59e8a496add7b1c316d397f96fcae1898167c22e8c6eaf2066b389d996 SHA512 9a9db031c397e4d323a3ea4088867713786a8710aea41ef6a30ff207c1960a351ff2c4115f5b79e7ae2ff1f47b5e0aa738c56ee3122dd303b07acb5017a38eb0
-EBUILD ament_lint-9999.ebuild 739 BLAKE2B 97f094a6502949d08eb635c0baf7e7d8f1385ef41e6371790cabfd70b490e2f34b721b59e8a496add7b1c316d397f96fcae1898167c22e8c6eaf2066b389d996 SHA512 9a9db031c397e4d323a3ea4088867713786a8710aea41ef6a30ff207c1960a351ff2c4115f5b79e7ae2ff1f47b5e0aa738c56ee3122dd303b07acb5017a38eb0
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
+EBUILD ament_lint-0.10.4-r1.ebuild 886 BLAKE2B 9ac10e0798fa14239e84f238837eb8f7effe92b8e4d489d02f49573feef22aa42aef2d72efc1cd46f9a95c194a6b7ebd0d46685e12aaa7c87cbedeb0d412a6ee SHA512 21fd9bade417f7c95cffaa6089baa43e5562768746b33129adadbf93cc0a85682d1c4a50a3d1b580301b67e2a7fbad2f31274402cfef7f86699494a6efe04163
+EBUILD ament_lint-0.11.2.ebuild 886 BLAKE2B 9ac10e0798fa14239e84f238837eb8f7effe92b8e4d489d02f49573feef22aa42aef2d72efc1cd46f9a95c194a6b7ebd0d46685e12aaa7c87cbedeb0d412a6ee SHA512 21fd9bade417f7c95cffaa6089baa43e5562768746b33129adadbf93cc0a85682d1c4a50a3d1b580301b67e2a7fbad2f31274402cfef7f86699494a6efe04163
+EBUILD ament_lint-9999.ebuild 886 BLAKE2B 9ac10e0798fa14239e84f238837eb8f7effe92b8e4d489d02f49573feef22aa42aef2d72efc1cd46f9a95c194a6b7ebd0d46685e12aaa7c87cbedeb0d412a6ee SHA512 21fd9bade417f7c95cffaa6089baa43e5562768746b33129adadbf93cc0a85682d1c4a50a3d1b580301b67e2a7fbad2f31274402cfef7f86699494a6efe04163
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint/ament_lint-0.10.0.ebuild b/dev-ros/ament_lint/ament_lint-0.10.0.ebuild
deleted file mode 100644
index ea29b12dcd48..000000000000
--- a/dev-ros/ament_lint/ament_lint-0.10.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Common API for ament linter packages"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND=""
diff --git a/dev-ros/ament_lint/ament_lint-0.10.1.ebuild b/dev-ros/ament_lint/ament_lint-0.10.1.ebuild
deleted file mode 100644
index ea29b12dcd48..000000000000
--- a/dev-ros/ament_lint/ament_lint-0.10.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Common API for ament linter packages"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND=""
diff --git a/dev-ros/ament_lint/ament_lint-0.10.4-r1.ebuild b/dev-ros/ament_lint/ament_lint-0.10.4-r1.ebuild
new file mode 100644
index 000000000000..8c8bff8aecc0
--- /dev/null
+++ b/dev-ros/ament_lint/ament_lint-0.10.4-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Common API for ament linter packages"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+BDEPEND=""
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint/ament_lint-0.10.4.ebuild b/dev-ros/ament_lint/ament_lint-0.10.4.ebuild
deleted file mode 100644
index ea29b12dcd48..000000000000
--- a/dev-ros/ament_lint/ament_lint-0.10.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Common API for ament linter packages"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND=""
diff --git a/dev-ros/ament_lint/ament_lint-0.11.2.ebuild b/dev-ros/ament_lint/ament_lint-0.11.2.ebuild
new file mode 100644
index 000000000000..8c8bff8aecc0
--- /dev/null
+++ b/dev-ros/ament_lint/ament_lint-0.11.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Common API for ament linter packages"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+BDEPEND=""
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint/ament_lint-0.9.5.ebuild b/dev-ros/ament_lint/ament_lint-0.9.5.ebuild
deleted file mode 100644
index ea29b12dcd48..000000000000
--- a/dev-ros/ament_lint/ament_lint-0.9.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Common API for ament linter packages"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-BDEPEND=""
diff --git a/dev-ros/ament_lint/ament_lint-9999.ebuild b/dev-ros/ament_lint/ament_lint-9999.ebuild
index ea29b12dcd48..8c8bff8aecc0 100644
--- a/dev-ros/ament_lint/ament_lint-9999.ebuild
+++ b/dev-ros/ament_lint/ament_lint-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -33,3 +34,7 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
 BDEPEND=""
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint_auto/Manifest b/dev-ros/ament_lint_auto/Manifest
index 08173d82dfe2..363ce1c70b46 100644
--- a/dev-ros/ament_lint_auto/Manifest
+++ b/dev-ros/ament_lint_auto/Manifest
@@ -1,10 +1,12 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
 EBUILD ament_lint_auto-0.10.0.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
 EBUILD ament_lint_auto-0.10.1.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
 EBUILD ament_lint_auto-0.10.4.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
+EBUILD ament_lint_auto-0.11.2.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
 EBUILD ament_lint_auto-0.9.5.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
 EBUILD ament_lint_auto-9999.ebuild 1174 BLAKE2B 56c7160c249225a87f4614fc1a391ca6b0a4f70a8997a32e52259c60ca39f50aa86d63a51235aaa9f01fbbdbd3f92ba8c015566ec92231267ea1df7c54739eff SHA512 dc3fd294fa9d90a5e64b9d30ef5f042d510d5f9361c5c9ff584122999b654f0ddba2208ac758e1680b93a736b91c77de98e4a61774aefa5885779f5a9cf61b48
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild
new file mode 100644
index 000000000000..99bd8c66a9d9
--- /dev/null
+++ b/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_test
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_lint_cmake/Manifest b/dev-ros/ament_lint_cmake/Manifest
index 685000704d72..4246e5869a0a 100644
--- a/dev-ros/ament_lint_cmake/Manifest
+++ b/dev-ros/ament_lint_cmake/Manifest
@@ -1,8 +1,10 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_lint_cmake-0.10.0.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
 EBUILD ament_lint_cmake-0.10.1.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
 EBUILD ament_lint_cmake-0.10.4.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
+EBUILD ament_lint_cmake-0.11.2.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
 EBUILD ament_lint_cmake-9999.ebuild 1017 BLAKE2B 7fca1803c7fa666a9dc860bb9cd4c474f20d9904f29b0f59f88875b0648f76d1c3737a24d901ed50617032068ccfda4d3841e1f6de62dfd25488ec7d63cd5517 SHA512 679e7f313ecc007a698a3c978ab11718c6fddad57655869a3b81a14cefc7d1d2d60e11311a600b6186ed6c0c13ac84834f1ecfe54dbbc81f8efcf77b4d2b547f
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.11.2.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.11.2.ebuild
new file mode 100644
index 000000000000..b926d90a9384
--- /dev/null
+++ b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.11.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Lint CMake code using cmakelint and generate xUnit test result files"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_pep257/Manifest b/dev-ros/ament_pep257/Manifest
index 6bf84debd651..8767b230bc3f 100644
--- a/dev-ros/ament_pep257/Manifest
+++ b/dev-ros/ament_pep257/Manifest
@@ -1,8 +1,10 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_pep257-0.10.0.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
 EBUILD ament_pep257-0.10.1.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
 EBUILD ament_pep257-0.10.4.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
+EBUILD ament_pep257-0.11.2.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
 EBUILD ament_pep257-9999.ebuild 1020 BLAKE2B 7f8c5a1e7873b10041b8d416bf3b78c358e53911d74390daaf63377d0d4b27709376a80e09e9e68a10e3cdb25cf27853111aaf88f31a20da7fcc0e709150027b SHA512 405e63b87196f1dbd91358b8c14c39a0a478791bff751c3b78000152c553acf1a712e7425e104e05489e16ad3b8151ec3399b937eaa8db74aad7db9c1c471c81
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_pep257/ament_pep257-0.11.2.ebuild b/dev-ros/ament_pep257/ament_pep257-0.11.2.ebuild
new file mode 100644
index 000000000000..d68cc9cf4ecc
--- /dev/null
+++ b/dev-ros/ament_pep257/ament_pep257-0.11.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Checks code against style conventions in PEP 8 and generate test result files"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-python/pydocstyle[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_uncrustify/Manifest b/dev-ros/ament_uncrustify/Manifest
index d76aeed5a914..8f8c88988efc 100644
--- a/dev-ros/ament_uncrustify/Manifest
+++ b/dev-ros/ament_uncrustify/Manifest
@@ -1,8 +1,6 @@
-DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
-DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
-EBUILD ament_uncrustify-0.10.0.ebuild 816 BLAKE2B 7070d46df8adb949d058221bafcd245a33e2c10483423f6353b40ab57f1eb762c84e2c0e830933a03df6c2846034ada3d15062e108c0c4c00ba5758bdc9bc772 SHA512 17a6834ef2910066214e6c651c5ad19bd88e87dedbe62636464fcd27de8a7cd2e3e6aadd5f41e43117420615760be4a3331dd5f02cff3ebdc8068eda291f187f
-EBUILD ament_uncrustify-0.10.1.ebuild 816 BLAKE2B 7070d46df8adb949d058221bafcd245a33e2c10483423f6353b40ab57f1eb762c84e2c0e830933a03df6c2846034ada3d15062e108c0c4c00ba5758bdc9bc772 SHA512 17a6834ef2910066214e6c651c5ad19bd88e87dedbe62636464fcd27de8a7cd2e3e6aadd5f41e43117420615760be4a3331dd5f02cff3ebdc8068eda291f187f
-EBUILD ament_uncrustify-0.10.4.ebuild 816 BLAKE2B 7070d46df8adb949d058221bafcd245a33e2c10483423f6353b40ab57f1eb762c84e2c0e830933a03df6c2846034ada3d15062e108c0c4c00ba5758bdc9bc772 SHA512 17a6834ef2910066214e6c651c5ad19bd88e87dedbe62636464fcd27de8a7cd2e3e6aadd5f41e43117420615760be4a3331dd5f02cff3ebdc8068eda291f187f
-EBUILD ament_uncrustify-9999.ebuild 816 BLAKE2B 7070d46df8adb949d058221bafcd245a33e2c10483423f6353b40ab57f1eb762c84e2c0e830933a03df6c2846034ada3d15062e108c0c4c00ba5758bdc9bc772 SHA512 17a6834ef2910066214e6c651c5ad19bd88e87dedbe62636464fcd27de8a7cd2e3e6aadd5f41e43117420615760be4a3331dd5f02cff3ebdc8068eda291f187f
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
+EBUILD ament_uncrustify-0.10.4.ebuild 931 BLAKE2B 55a9368980aeef9619a836facb642fd13ce5740329376478dd7e53683cc960233666068b4519f677153a578adb0363b907efe6a45b7fc2deabb7dc15c7a2afe1 SHA512 8ca56ff77559f58901428996e93ac6b635f519baa9b6ace0e0d2c17a658513409a448ae6ae7d4cd6f25d04f9a25e2fc9b63d10bacf33e311c09fc857ebfbf8ac
+EBUILD ament_uncrustify-0.11.2.ebuild 931 BLAKE2B 55a9368980aeef9619a836facb642fd13ce5740329376478dd7e53683cc960233666068b4519f677153a578adb0363b907efe6a45b7fc2deabb7dc15c7a2afe1 SHA512 8ca56ff77559f58901428996e93ac6b635f519baa9b6ace0e0d2c17a658513409a448ae6ae7d4cd6f25d04f9a25e2fc9b63d10bacf33e311c09fc857ebfbf8ac
+EBUILD ament_uncrustify-9999.ebuild 931 BLAKE2B 55a9368980aeef9619a836facb642fd13ce5740329376478dd7e53683cc960233666068b4519f677153a578adb0363b907efe6a45b7fc2deabb7dc15c7a2afe1 SHA512 8ca56ff77559f58901428996e93ac6b635f519baa9b6ace0e0d2c17a658513409a448ae6ae7d4cd6f25d04f9a25e2fc9b63d10bacf33e311c09fc857ebfbf8ac
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.0.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.0.ebuild
deleted file mode 100644
index 9fbde9ec7c94..000000000000
--- a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to check code against style conventions using uncrustify"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-util/uncrustify
-"
-DEPEND=""
-BDEPEND=""
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.1.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.1.ebuild
deleted file mode 100644
index 9fbde9ec7c94..000000000000
--- a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to check code against style conventions using uncrustify"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	PROPERTIES="live"
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-util/uncrustify
-"
-DEPEND=""
-BDEPEND=""
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.4.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.4.ebuild
index 9fbde9ec7c94..4a530cd280f9 100644
--- a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.4.ebuild
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -36,3 +36,8 @@ RDEPEND="
 "
 DEPEND=""
 BDEPEND=""
+
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.11.2.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.11.2.ebuild
new file mode 100644
index 000000000000..4a530cd280f9
--- /dev/null
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-0.11.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check code against style conventions using uncrustify"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-util/uncrustify
+"
+DEPEND=""
+BDEPEND=""
+
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
index 9fbde9ec7c94..4a530cd280f9 100644
--- a/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -36,3 +36,8 @@ RDEPEND="
 "
 DEPEND=""
 BDEPEND=""
+
+# pytest.ini is there but no tests are ran causing it to fail
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_xmllint/Manifest b/dev-ros/ament_xmllint/Manifest
index f72ddc2df7a0..0b97b511c051 100644
--- a/dev-ros/ament_xmllint/Manifest
+++ b/dev-ros/ament_xmllint/Manifest
@@ -1,8 +1,10 @@
 DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.10.1.tar.gz 221215 BLAKE2B 47ffa7dfd892b05f345ba962c7c08dcf1627c4653cc75e1a1d1cad28971974ef5ca9c09d3989b3fdbfacd7f94dace9651c44911cd7747f39c5c59083f0195443 SHA512 1dd996d86cfb7488bd6bf57510eb5b7531fe4fe21d25203a4801046ec719ba19afdb89eb7ba9d862317d2e041e7139fadde27d114614d96741a177e8ec2a2ba3
 DIST ament_lint-0.10.4.tar.gz 222285 BLAKE2B 81a15dc996bad0fe3fa461aa7067eba423550d94a04881a12c8a4b0732a4a0ddcc30ab6bef94f81cb236836d8de7959b53d5560d5fb6eb480f2fbd849bd02489 SHA512 cb99084622f598b17f1ffe55620c9c822867771f2603e673098f8943d95b7be188e25480d4e22bf7c2988e94d8b69f6f7fa3b60cd042213f6bd8c2ad2c5deaf3
+DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c4a6456635238b7038ff87799f9cfde9c2d3c7ceb4c01b71594ba7bd159e8b6b3c2370bdfcdbf3d6189a895b96292a SHA512 1a379f4fb0ead306a668aef2b9e390728d6d3901b75f43fac6ccc28681a8010e42b094237f3f1ab95ca304ba917c8fb5d5519ec0581cadb346e6eb05466e39f0
 EBUILD ament_xmllint-0.10.0.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
 EBUILD ament_xmllint-0.10.1.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
 EBUILD ament_xmllint-0.10.4.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
+EBUILD ament_xmllint-0.11.2.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
 EBUILD ament_xmllint-9999.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild
new file mode 100644
index 000000000000..dc712bff4c31
--- /dev/null
+++ b/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Checks XML files like the package manifest using xmllint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/calibration_estimation/Manifest b/dev-ros/calibration_estimation/Manifest
index 69d9aadbab74..4bdae2875ed9 100644
--- a/dev-ros/calibration_estimation/Manifest
+++ b/dev-ros/calibration_estimation/Manifest
@@ -1,5 +1,7 @@
 AUX py3.patch 3416 BLAKE2B 7f879cee3a10359d5988fe8ee04ccfb9c2d30fff7609e52950c7a61c3f02ad571363094f47e841ef9796c49c0d14f75c275cf3ba7534a5a0c1c0680ec48a2c70 SHA512 6200c57aa4f6f95338eba80342efcdd026b971d3b373a946fd45ce92bddc67f329c1fcafcedc74f2169ce871565a91b1d442a862cd5f87cd99f9aa225304b15f
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD calibration_estimation-0.10.14.ebuild 1371 BLAKE2B 2dd06306d99468d2670da4c706ed3cea54239a01cf3a4311c0364a0f0b50dbc171fc4bac4950d145b15ea6bf720a06fdc2377276b3966f3acc96a569e985b2a9 SHA512 6e001af223d114e5cfbd1ad5f96e4bdaab495e6a6fd766ac4f553670b6d3eb18a05d0665ccb10181cbe7914e088ab73152b9347003c4408697499702820b9afb
-EBUILD calibration_estimation-9999.ebuild 1371 BLAKE2B 2dd06306d99468d2670da4c706ed3cea54239a01cf3a4311c0364a0f0b50dbc171fc4bac4950d145b15ea6bf720a06fdc2377276b3966f3acc96a569e985b2a9 SHA512 6e001af223d114e5cfbd1ad5f96e4bdaab495e6a6fd766ac4f553670b6d3eb18a05d0665ccb10181cbe7914e088ab73152b9347003c4408697499702820b9afb
+EBUILD calibration_estimation-0.10.15.ebuild 1285 BLAKE2B 71e12a96ee250844b0172a6d70913112feed42cdbdebedabe2a33e88c4f68d94c67201ee844b0e2c0616257158de2159c8dfd5003c50682d1efe6fa8abc6742a SHA512 f2a2ea46508e763285bc9f9e6aa15ca905c00f5b09162986f80e0a0ffeba0ec350027be7feedb61152163d6c73298dbcea03a5d6c009bf725fa9ebc456882c51
+EBUILD calibration_estimation-9999.ebuild 1285 BLAKE2B 71e12a96ee250844b0172a6d70913112feed42cdbdebedabe2a33e88c4f68d94c67201ee844b0e2c0616257158de2159c8dfd5003c50682d1efe6fa8abc6742a SHA512 f2a2ea46508e763285bc9f9e6aa15ca905c00f5b09162986f80e0a0ffeba0ec350027be7feedb61152163d6c73298dbcea03a5d6c009bf725fa9ebc456882c51
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_estimation/calibration_estimation-0.10.15.ebuild b/dev-ros/calibration_estimation/calibration_estimation-0.10.15.ebuild
new file mode 100644
index 000000000000..65951f6a974b
--- /dev/null
+++ b/dev-ros/calibration_estimation/calibration_estimation-0.10.15.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Runs an optimization to estimate the a robot's kinematic parameters"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/matplotlib[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/scipy[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+
+src_prepare() {
+	ros-catkin_src_prepare
+	sed -e 's/yaml.load/yaml.safe_load/g' -i src/*/*.py -i test/*.py || die
+}
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
index d445cebc3fda..65951f6a974b 100644
--- a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
+++ b/dev-ros/calibration_estimation/calibration_estimation-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
@@ -30,12 +30,10 @@ DEPEND="${RDEPEND}
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)"
-PATCHES=( "${FILESDIR}/py3.patch" )
 
 src_prepare() {
 	ros-catkin_src_prepare
 	sed -e 's/yaml.load/yaml.safe_load/g' -i src/*/*.py -i test/*.py || die
-	2to3 -w src/*/*.py src/*/*/*.py test/*.py || die
 }
 
 src_test() {
diff --git a/dev-ros/calibration_launch/Manifest b/dev-ros/calibration_launch/Manifest
index a366ca68a574..94c1febe24ed 100644
--- a/dev-ros/calibration_launch/Manifest
+++ b/dev-ros/calibration_launch/Manifest
@@ -1,4 +1,5 @@
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD calibration_launch-0.10.14.ebuild 524 BLAKE2B aed2d59c7dd17a1fa59b3e85482c561ccd420eb4a5c4b251a9533befeb3cfb45892107b4c4f16b8bd96c52da516c26e51644e5f491d9cbc9523646d4895d3b12 SHA512 b4867dba2dbc1d9b66a4a6c3f9ad5ce64ff2e81b35988c8fe2b01718ee534c96d80c1325c2eceab3dda7e66f13defe2d62947e9564fff1be8908ff335c356daa
-EBUILD calibration_launch-9999.ebuild 524 BLAKE2B aed2d59c7dd17a1fa59b3e85482c561ccd420eb4a5c4b251a9533befeb3cfb45892107b4c4f16b8bd96c52da516c26e51644e5f491d9cbc9523646d4895d3b12 SHA512 b4867dba2dbc1d9b66a4a6c3f9ad5ce64ff2e81b35988c8fe2b01718ee534c96d80c1325c2eceab3dda7e66f13defe2d62947e9564fff1be8908ff335c356daa
+AUX py3.patch 608 BLAKE2B 8f9b52a959979d34b939536177d2e3f542046d3013ccaef79e6cc758385d3122fc220bcc81fae50ee73a0cccbab931cd5acbf173ed24ccd13ee6f064883cbd29 SHA512 2fa478d9389676d1d0e1a2a1d7720f871e5eff464be195ada8fc6093958e5bf3d893e8a90a89a60daa5443230b9a10f307e363de16e88206f79c1af60bc04fb2
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
+EBUILD calibration_launch-0.10.15-r1.ebuild 560 BLAKE2B d80874bd54105a9ab2478a2f9f57eb3305455948475b871c591decb96d86de5fae498eca90b0033950ae5f06d214a266ca4477c205990e626652016168cc3b86 SHA512 990416151166bcaa2b77882f0b56ffb895f3f5503fff832a543734d3231092729221b9d2a952cda64979e4c35c7e0f9636ee1aa9caa2a4a87d88aee223ed3c9a
+EBUILD calibration_launch-9999.ebuild 560 BLAKE2B d80874bd54105a9ab2478a2f9f57eb3305455948475b871c591decb96d86de5fae498eca90b0033950ae5f06d214a266ca4477c205990e626652016168cc3b86 SHA512 990416151166bcaa2b77882f0b56ffb895f3f5503fff832a543734d3231092729221b9d2a952cda64979e4c35c7e0f9636ee1aa9caa2a4a87d88aee223ed3c9a
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_launch/calibration_launch-0.10.14.ebuild b/dev-ros/calibration_launch/calibration_launch-0.10.14.ebuild
deleted file mode 100644
index b3b796757277..000000000000
--- a/dev-ros/calibration_launch/calibration_launch-0.10.14.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
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for configuring the calibration stack to run on your robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/interval_intersection
-	dev-ros/joint_states_settler
-	dev-ros/laser_cb_detector
-	dev-ros/monocam_settler
-	dev-ros/roslaunch
-	dev-libs/urdfdom
-"
diff --git a/dev-ros/calibration_launch/calibration_launch-0.10.15-r1.ebuild b/dev-ros/calibration_launch/calibration_launch-0.10.15-r1.ebuild
new file mode 100644
index 000000000000..2ea52c5982a2
--- /dev/null
+++ b/dev-ros/calibration_launch/calibration_launch-0.10.15-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files for configuring the calibration stack to run on your robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	dev-ros/interval_intersection
+	dev-ros/joint_states_settler
+	dev-ros/laser_cb_detector
+	dev-ros/monocam_settler
+	dev-ros/roslaunch
+	dev-libs/urdfdom
+"
+PATCHES=( "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/calibration_launch/calibration_launch-9999.ebuild b/dev-ros/calibration_launch/calibration_launch-9999.ebuild
index b3b796757277..2ea52c5982a2 100644
--- a/dev-ros/calibration_launch/calibration_launch-9999.ebuild
+++ b/dev-ros/calibration_launch/calibration_launch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,3 +22,4 @@ RDEPEND="
 	dev-ros/roslaunch
 	dev-libs/urdfdom
 "
+PATCHES=( "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/calibration_launch/files/py3.patch b/dev-ros/calibration_launch/files/py3.patch
new file mode 100644
index 000000000000..ee9aa2c41f34
--- /dev/null
+++ b/dev-ros/calibration_launch/files/py3.patch
@@ -0,0 +1,13 @@
+Index: calibration_launch/src/capture_executive/robot_measurement_cache.py
+===================================================================
+--- calibration_launch.orig/src/capture_executive/robot_measurement_cache.py
++++ calibration_launch/src/capture_executive/robot_measurement_cache.py
+@@ -174,7 +174,7 @@ class RobotMeasurementCache:
+            return m
+ 
+         # TODO: eliminate print statement or convert to rospy.log*
+-        print "Received everything!"
++        print("Received everything!")
+ 
+         # Push everything into a RobotMeasurement message
+         m_robot = RobotMeasurement()
diff --git a/dev-ros/calibration_msgs/Manifest b/dev-ros/calibration_msgs/Manifest
index 123720a3fa5f..d472d38999ab 100644
--- a/dev-ros/calibration_msgs/Manifest
+++ b/dev-ros/calibration_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD calibration_msgs-0.10.14.ebuild 506 BLAKE2B 286bea7d10840fe5bcf037a516d1449b8a89af9df43d50a5fb68506b4866751a6ee924f1bb80ca2ae8ec6d6276e93b37396168f6b79ee218ac8ac057d7432be5 SHA512 18c8009c537a446fc318b9120a4fe8c34ab116ad4f3b0fa988399b2cc6c8fae24a3d6b187eb336866b24097ab87485d3cda04635df07ac39193350beb4949ec2
+EBUILD calibration_msgs-0.10.15.ebuild 506 BLAKE2B ab8e3f3d6283667e3363aa212b2339103323650ff8baca68b401b66ebcb859b0adb0bec22fd74c2272469746b8a6c6825dfcbe151effaf776520b18b66f93183 SHA512 52656b1c3d86cbaecb49b10f8a10bcb30c92b2dbe7ddd09fcd4c9329c1c71718eeb3daf613e299e0231f659a4869f98a3f1b8bec072b7cd9ea3a7f006a9d9b68
 EBUILD calibration_msgs-9999.ebuild 506 BLAKE2B 286bea7d10840fe5bcf037a516d1449b8a89af9df43d50a5fb68506b4866751a6ee924f1bb80ca2ae8ec6d6276e93b37396168f6b79ee218ac8ac057d7432be5 SHA512 18c8009c537a446fc318b9120a4fe8c34ab116ad4f3b0fa988399b2cc6c8fae24a3d6b187eb336866b24097ab87485d3cda04635df07ac39193350beb4949ec2
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_msgs/calibration_msgs-0.10.15.ebuild b/dev-ros/calibration_msgs/calibration_msgs-0.10.15.ebuild
new file mode 100644
index 000000000000..84fc5ca3dc67
--- /dev/null
+++ b/dev-ros/calibration_msgs/calibration_msgs-0.10.15.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for storing calibration samples to be used in calibration procedures"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/calibration_setup_helper/Manifest b/dev-ros/calibration_setup_helper/Manifest
index 260e29b51570..f841ea818e5e 100644
--- a/dev-ros/calibration_setup_helper/Manifest
+++ b/dev-ros/calibration_setup_helper/Manifest
@@ -1,4 +1,6 @@
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD calibration_setup_helper-0.10.14.ebuild 403 BLAKE2B 55191eb5632c1dae29ec4af2bd744b6ede7a57252757e93669a209a05cf023ede8e57f9313e4cff53d4709219dc154ba40387c4bca207f033a3d8b5e8cba0888 SHA512 36feae4bb388f2789c49831bb60ea4ee048c3a067f93e2f1692e27d73e529e34a5a4e51ab065a3897dff2a4114cea0bd0a89859f914d154c0ae43dcaf6ea51ab
+EBUILD calibration_setup_helper-0.10.15.ebuild 403 BLAKE2B 707bd613ab618f42e0b1042b77ee019ce7b533e6de779fd35478dd1e255c0cb67846c99371f00853ddfae760790ca086bf3344adef3d9fb56a197f5fab8e9deb SHA512 e738a9467c2a7fb8d981a7a2d7d75e42b0b99613ae037d85857e46840d768c60a0c5c9071d1c11f14fd0515417b94fbea0fd0e8b861b3193683390bfb3263874
 EBUILD calibration_setup_helper-9999.ebuild 403 BLAKE2B 55191eb5632c1dae29ec4af2bd744b6ede7a57252757e93669a209a05cf023ede8e57f9313e4cff53d4709219dc154ba40387c4bca207f033a3d8b5e8cba0888 SHA512 36feae4bb388f2789c49831bb60ea4ee048c3a067f93e2f1692e27d73e529e34a5a4e51ab065a3897dff2a4114cea0bd0a89859f914d154c0ae43dcaf6ea51ab
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.15.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.15.ebuild
new file mode 100644
index 000000000000..6fd09bcbc177
--- /dev/null
+++ b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.15.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Script to generate calibration launch and configurationfiles for your robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-ros/calibration_launch"
diff --git a/dev-ros/clear_costmap_recovery/Manifest b/dev-ros/clear_costmap_recovery/Manifest
index 2693c30ea7d0..4a3928d03fbc 100644
--- a/dev-ros/clear_costmap_recovery/Manifest
+++ b/dev-ros/clear_costmap_recovery/Manifest
@@ -1,6 +1,4 @@
-DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26
 DIST navigation-1.17.1.tar.gz 349192 BLAKE2B 4cb946a296ab53d7196a70c66cc1dda0cf62f5f279fe020ca7c39781ecb5402af6addcd6164ab6e0a9bcfe3ba26e42f647546280f03b572202f0f4df8d6ed3cf SHA512 23178adaef9b720c644f621c67ed579be312101e70a7d12b527164c5cc55286982c99149a521a76c6dda05248e859435e51f9a0f09e582b89aed3b7c2173cfaa
-EBUILD clear_costmap_recovery-1.17.0-r1.ebuild 621 BLAKE2B 8d8594ceddca1f908df74bd711e295223bf0b532c45af6fa99ff88b06d3341f560b7a907669c867f1d63ce59107ed520662c4b24081ab210230e8c083f0b76b6 SHA512 2808752157d3a0e52cd5d2a592f2edd4e05003fcc4285982ccfc451d3078c13614bde600ea5f8de444f01adbb2d9aeb1bbc1ce801a89975e3ababe77f2508ba4
-EBUILD clear_costmap_recovery-1.17.1-r1.ebuild 621 BLAKE2B 8d8594ceddca1f908df74bd711e295223bf0b532c45af6fa99ff88b06d3341f560b7a907669c867f1d63ce59107ed520662c4b24081ab210230e8c083f0b76b6 SHA512 2808752157d3a0e52cd5d2a592f2edd4e05003fcc4285982ccfc451d3078c13614bde600ea5f8de444f01adbb2d9aeb1bbc1ce801a89975e3ababe77f2508ba4
-EBUILD clear_costmap_recovery-9999.ebuild 621 BLAKE2B 8d8594ceddca1f908df74bd711e295223bf0b532c45af6fa99ff88b06d3341f560b7a907669c867f1d63ce59107ed520662c4b24081ab210230e8c083f0b76b6 SHA512 2808752157d3a0e52cd5d2a592f2edd4e05003fcc4285982ccfc451d3078c13614bde600ea5f8de444f01adbb2d9aeb1bbc1ce801a89975e3ababe77f2508ba4
+EBUILD clear_costmap_recovery-1.17.1-r1.ebuild 710 BLAKE2B 5835e55c083976e8f4f0fc84e5c2055ff6db2e2aa14188f9fd282a83225029c1b104776c1c4cc03d7fa91fc432ba5e6c3d95c5fafa7c063fa6bc2f02ad664d2e SHA512 ab58af869489d217ad3f1fcb2ad51a162165217b8c8c2f3fab9e2334734a156981720a3857818961c11799d79b5f8a973a6d0d1facef862b458696015d66ecfe
+EBUILD clear_costmap_recovery-9999.ebuild 710 BLAKE2B 5835e55c083976e8f4f0fc84e5c2055ff6db2e2aa14188f9fd282a83225029c1b104776c1c4cc03d7fa91fc432ba5e6c3d95c5fafa7c063fa6bc2f02ad664d2e SHA512 ab58af869489d217ad3f1fcb2ad51a162165217b8c8c2f3fab9e2334734a156981720a3857818961c11799d79b5f8a973a6d0d1facef862b458696015d66ecfe
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.0-r1.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.0-r1.ebuild
deleted file mode 100644
index 385e41ceda38..000000000000
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.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
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts reverting the costmaps to the static map"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.16.3
-	dev-cpp/eigen:3
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-
-	dev-libs/boost:=[threads(+)]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest dev-cpp/gtest )
-"
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1-r1.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1-r1.ebuild
index 385e41ceda38..3f5cb324e386 100644
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1-r1.ebuild
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.1-r1.ebuild
@@ -28,3 +28,8 @@ DEPEND="${RDEPEND}
 	dev-ros/cmake_modules
 	test? ( dev-ros/rostest dev-cpp/gtest )
 "
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
index 385e41ceda38..3f5cb324e386 100644
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
@@ -28,3 +28,8 @@ DEPEND="${RDEPEND}
 	dev-ros/cmake_modules
 	test? ( dev-ros/rostest dev-cpp/gtest )
 "
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/combined_robot_hw/Manifest b/dev-ros/combined_robot_hw/Manifest
index 9222de2e9020..35271b99d61f 100644
--- a/dev-ros/combined_robot_hw/Manifest
+++ b/dev-ros/combined_robot_hw/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
 DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD combined_robot_hw-0.19.1.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
 EBUILD combined_robot_hw-0.19.2.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
 EBUILD combined_robot_hw-0.19.3.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
 EBUILD combined_robot_hw-0.19.4.ebuild 466 BLAKE2B 4fa7e7c8dfbe348f1f925de94af95400525ea76c10bde1b74368a84397dff9fd222c06fb146e3278aaf639569748ecf7b03a75d9d4ba42869556e0a01371be9e SHA512 a25657753c6c449c007e2c8fb05ee817ef3bad069ca0c6f17a3a03bd85427a43f154b34f2f38a75495a0651c863b82115d22d4b79e5e8a54669283355000397b
+EBUILD combined_robot_hw-0.19.5.ebuild 466 BLAKE2B 4fa7e7c8dfbe348f1f925de94af95400525ea76c10bde1b74368a84397dff9fd222c06fb146e3278aaf639569748ecf7b03a75d9d4ba42869556e0a01371be9e SHA512 a25657753c6c449c007e2c8fb05ee817ef3bad069ca0c6f17a3a03bd85427a43f154b34f2f38a75495a0651c863b82115d22d4b79e5e8a54669283355000397b
 EBUILD combined_robot_hw-9999.ebuild 466 BLAKE2B 5bb38127d200a88d822d24fcc6d3f09963c88d48a432873a704489c2cdf30caba2b531cb54731b444c0e551517e8f65de6e3ad45ac2e770be79d551ef7cfac34 SHA512 902bc604b2ea4a2ca32e1244ea33c989c63a9ae3420f85586badcf581f7b88c598766cbd97848e1f691ffa9b8ed30f575cf9d25df3376d889b273cb66786d85f
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/combined_robot_hw/combined_robot_hw-0.19.5.ebuild b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.5.ebuild
new file mode 100644
index 000000000000..d1ef9a1b84bc
--- /dev/null
+++ b/dev-ros/combined_robot_hw/combined_robot_hw-0.19.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Combined Robot HW class"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/hardware_interface-0.15
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/combined_robot_hw_tests/Manifest b/dev-ros/combined_robot_hw_tests/Manifest
index 14a9fb1fd477..ec1f3e9e009e 100644
--- a/dev-ros/combined_robot_hw_tests/Manifest
+++ b/dev-ros/combined_robot_hw_tests/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
 DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD combined_robot_hw_tests-0.19.1.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
 EBUILD combined_robot_hw_tests-0.19.2.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
 EBUILD combined_robot_hw_tests-0.19.3.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
 EBUILD combined_robot_hw_tests-0.19.4.ebuild 827 BLAKE2B d7a4eb4a9fb523fe8afdf973b541e04bf608fc51d6d1255f1a4ed4a6f3e05706b88b332b53209cd4bbf1f614e2e5ace3adb2ec41638bca5dd9c9862ec90d343e SHA512 dab4795383815b36ac64319a9397646dabc207768872c489ab1b549982ae5b4e23232ce83d5478161b27c39edde9b315d8a550a6d50ed061a498763acc09d3ed
+EBUILD combined_robot_hw_tests-0.19.5.ebuild 827 BLAKE2B d7a4eb4a9fb523fe8afdf973b541e04bf608fc51d6d1255f1a4ed4a6f3e05706b88b332b53209cd4bbf1f614e2e5ace3adb2ec41638bca5dd9c9862ec90d343e SHA512 dab4795383815b36ac64319a9397646dabc207768872c489ab1b549982ae5b4e23232ce83d5478161b27c39edde9b315d8a550a6d50ed061a498763acc09d3ed
 EBUILD combined_robot_hw_tests-9999.ebuild 827 BLAKE2B 2053ebb7a7974d6cfd54b34a041442e3b8e4a7e9c354bf7c0234fcdf18125cd10f373e14b147a7b35f4cbdea4a22590834895c47177ec894be57c51a6ccf47b0 SHA512 078b0482d716cae3cc2d3e8c2bc2357921d77e6430dadb79cd8db16b9876945a060cfd2f37c80316c5427b19fc380cb5d7f85f7ebde221763c86d371e70fb774
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.5.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.5.ebuild
new file mode 100644
index 000000000000..b52a335bd58b
--- /dev/null
+++ b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Combined Robot HW class tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/combined_robot_hw
+	dev-ros/controller_manager
+	dev-ros/controller_manager_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/controller_manager_tests
+	dev-ros/hardware_interface
+	dev-ros/pluginlib
+	dev-ros/roscpp
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/control_toolbox/Manifest b/dev-ros/control_toolbox/Manifest
index 731b43d95c14..5d4c871ec049 100644
--- a/dev-ros/control_toolbox/Manifest
+++ b/dev-ros/control_toolbox/Manifest
@@ -1,4 +1,4 @@
 DIST control_toolbox-1.18.2.tar.gz 24244 BLAKE2B 13c4d4d6991db496ea6223c6cc33c9b0b7fa7b3e18c13cc330cf032ac67b185a596ca2eb118678faf6f0a3106458e3ce20635dfd99fbc1acf176ee2844e6ec99 SHA512 0b8bbd0fec88b1679260d9b5d5c5762f52fd14f4156be45ea07a410a7967571136a65115f530ae4f7a84e456e56c363616e23d0b54d8c092a38a80fad691c705
-EBUILD control_toolbox-1.18.2-r1.ebuild 610 BLAKE2B bb11b7d9f0596168911899cb5e1f247f8f8a20a7ede72872b685e0b8e9fac6957d505f8b763cb8937e09fde122d6ba969c2eaa433e8827147c4b7ae3a65c5ef8 SHA512 8e344534cb12d51d5fbd6c1d9e01079c4f5649eaedd69056acd53520db6709453d34e93cca42c36a684baf30fa6356a817d0870aa7a55f9832e884a41f002f2d
-EBUILD control_toolbox-9999.ebuild 610 BLAKE2B bb11b7d9f0596168911899cb5e1f247f8f8a20a7ede72872b685e0b8e9fac6957d505f8b763cb8937e09fde122d6ba969c2eaa433e8827147c4b7ae3a65c5ef8 SHA512 8e344534cb12d51d5fbd6c1d9e01079c4f5649eaedd69056acd53520db6709453d34e93cca42c36a684baf30fa6356a817d0870aa7a55f9832e884a41f002f2d
+EBUILD control_toolbox-1.18.2-r1.ebuild 635 BLAKE2B 454ad473f15cc341bc5c4736164638dd0de96737064ea441b94101beba565c4bd5a0faafc4aa747790102fc0be4955057a80d43dfce7ff05944e7d1add2a79ad SHA512 7b476b5921c98d83f3b0e86ddd72afb7d77a8b9e710a981bf1d7493b275fc8a2f81fa5ffe2f9c551a1eeb8590b34206ead7924cccb0e2c7875186b141582fd15
+EBUILD control_toolbox-9999.ebuild 635 BLAKE2B 454ad473f15cc341bc5c4736164638dd0de96737064ea441b94101beba565c4bd5a0faafc4aa747790102fc0be4955057a80d43dfce7ff05944e7d1add2a79ad SHA512 7b476b5921c98d83f3b0e86ddd72afb7d77a8b9e710a981bf1d7493b275fc8a2f81fa5ffe2f9c551a1eeb8590b34206ead7924cccb0e2c7875186b141582fd15
 MISC metadata.xml 342 BLAKE2B fb0771fe1ae1d9988202a13aa319eca68cde1c129b68b74405ba854416522c81917bd7ecc26dd6ff0d9c32a02c5b089dbbaa4b13eb6ee3e65c050a09ec6731e8 SHA512 81835aefd67c55665a6f7d2a2cdbced84032d83ca35d6924410a62c00021cf7eb0e11e1094e0bb70becb635b480c8e527c7e9bdfaaa17149918552d440539e0c
diff --git a/dev-ros/control_toolbox/control_toolbox-1.18.2-r1.ebuild b/dev-ros/control_toolbox/control_toolbox-1.18.2-r1.ebuild
index 83cfabc81f04..a600c6fd73a7 100644
--- a/dev-ros/control_toolbox/control_toolbox-1.18.2-r1.ebuild
+++ b/dev-ros/control_toolbox/control_toolbox-1.18.2-r1.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/realtime_tools
 	dev-libs/boost:=[threads(+)]
 	dev-libs/tinyxml
diff --git a/dev-ros/control_toolbox/control_toolbox-9999.ebuild b/dev-ros/control_toolbox/control_toolbox-9999.ebuild
index 83cfabc81f04..a600c6fd73a7 100644
--- a/dev-ros/control_toolbox/control_toolbox-9999.ebuild
+++ b/dev-ros/control_toolbox/control_toolbox-9999.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/realtime_tools
 	dev-libs/boost:=[threads(+)]
 	dev-libs/tinyxml
diff --git a/dev-ros/controller_interface/Manifest b/dev-ros/controller_interface/Manifest
index 5185e13792e2..9c2ace1559e1 100644
--- a/dev-ros/controller_interface/Manifest
+++ b/dev-ros/controller_interface/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
 DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD controller_interface-0.19.1-r1.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
 EBUILD controller_interface-0.19.2.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
 EBUILD controller_interface-0.19.3.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
 EBUILD controller_interface-0.19.4.ebuild 433 BLAKE2B b9e597cfaf5fd2201a44d63655609fbcb9f04b334f2ba039321bc6eea08f2d8343a4bf24ea4d753bdb00bf15c416368c6f3d24481a746e4afaa44d52961921be SHA512 fd7dc7cb7e862433cb8791b249677e2de28cab0a781825b642f218974d90bd5ce0b13dfddb3da7458abb02a49ed4e845f8d6953063169441d869826ee89cecbb
+EBUILD controller_interface-0.19.5.ebuild 433 BLAKE2B b9e597cfaf5fd2201a44d63655609fbcb9f04b334f2ba039321bc6eea08f2d8343a4bf24ea4d753bdb00bf15c416368c6f3d24481a746e4afaa44d52961921be SHA512 fd7dc7cb7e862433cb8791b249677e2de28cab0a781825b642f218974d90bd5ce0b13dfddb3da7458abb02a49ed4e845f8d6953063169441d869826ee89cecbb
 EBUILD controller_interface-9999.ebuild 433 BLAKE2B 463bd58e5be22fe5defd3c905b67f07c52a695419a6c1cd46f8949dd7b1a84ca51beceb1115f0f6331e5f0019ab69c1442afd5d394df156eaa04bb65bdf324e1 SHA512 fe59bcc4f329a6118219a9764491d2ffd8729a25bbf723f210233807221e527c6146288e987ed545df5da425291136d350d4eb561053c5769fd1cf075e7ac5fc
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_interface/controller_interface-0.19.5.ebuild b/dev-ros/controller_interface/controller_interface-0.19.5.ebuild
new file mode 100644
index 000000000000..62002566d3e9
--- /dev/null
+++ b/dev-ros/controller_interface/controller_interface-0.19.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Interface base class for controllers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hardware_interface
+	dev-ros/pluginlib:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/controller_manager/Manifest b/dev-ros/controller_manager/Manifest
index 771938bdb745..8a44cea65006 100644
--- a/dev-ros/controller_manager/Manifest
+++ b/dev-ros/controller_manager/Manifest
@@ -1,4 +1,6 @@
 DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD controller_manager-0.19.4.ebuild 1000 BLAKE2B 6f8af83ea608426623327158f2508acfd7d46d38cf9cc92ceecb5d55001baf86d0d5b557cb8683bf53f1819e7ec4a6f4182382c05dc26aabbf4a48e35d5ef957 SHA512 deadf61be20441ff1685fc221b88b24e19fc0112f2be1178a5035b31c70530c64aac4db5ee24383a57131d81e7e4f2cc338ff085e588b43f84e24367a9b08308
+EBUILD controller_manager-0.19.5.ebuild 1000 BLAKE2B 6f8af83ea608426623327158f2508acfd7d46d38cf9cc92ceecb5d55001baf86d0d5b557cb8683bf53f1819e7ec4a6f4182382c05dc26aabbf4a48e35d5ef957 SHA512 deadf61be20441ff1685fc221b88b24e19fc0112f2be1178a5035b31c70530c64aac4db5ee24383a57131d81e7e4f2cc338ff085e588b43f84e24367a9b08308
 EBUILD controller_manager-9999.ebuild 1000 BLAKE2B 6f8af83ea608426623327158f2508acfd7d46d38cf9cc92ceecb5d55001baf86d0d5b557cb8683bf53f1819e7ec4a6f4182382c05dc26aabbf4a48e35d5ef957 SHA512 deadf61be20441ff1685fc221b88b24e19fc0112f2be1178a5035b31c70530c64aac4db5ee24383a57131d81e7e4f2cc338ff085e588b43f84e24367a9b08308
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager/controller_manager-0.19.5.ebuild b/dev-ros/controller_manager/controller_manager-0.19.5.ebuild
new file mode 100644
index 000000000000..e039c57a8218
--- /dev/null
+++ b/dev-ros/controller_manager/controller_manager-0.19.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The controller manager"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/controller_interface-0.15
+	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	>=dev-ros/hardware_interface-0.10.0
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/controller_manager_msgs/Manifest b/dev-ros/controller_manager_msgs/Manifest
index b98d881c1751..851df24f67e3 100644
--- a/dev-ros/controller_manager_msgs/Manifest
+++ b/dev-ros/controller_manager_msgs/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
 DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD controller_manager_msgs-0.19.1.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
 EBUILD controller_manager_msgs-0.19.2.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
 EBUILD controller_manager_msgs-0.19.3.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
 EBUILD controller_manager_msgs-0.19.4.ebuild 440 BLAKE2B 2c780d5d1e17615eabf6dee08037b0ee99cb17b1737785f2a98be197a60c86f3af1539282d468619237f79a338733345cf44910f9fc627c198a2ba253b452f76 SHA512 84105726da609158ec97a81c41b6c8dafcd3d2a07248c82e1e4d9ca40f203b23d94ce3dcecb68314698af7bbe3da1c12ef54bddd1a5ed8a128290a50b158c543
+EBUILD controller_manager_msgs-0.19.5.ebuild 440 BLAKE2B 2c780d5d1e17615eabf6dee08037b0ee99cb17b1737785f2a98be197a60c86f3af1539282d468619237f79a338733345cf44910f9fc627c198a2ba253b452f76 SHA512 84105726da609158ec97a81c41b6c8dafcd3d2a07248c82e1e4d9ca40f203b23d94ce3dcecb68314698af7bbe3da1c12ef54bddd1a5ed8a128290a50b158c543
 EBUILD controller_manager_msgs-9999.ebuild 440 BLAKE2B e49c9671a6c3ff79321dc8c9d800c2ae79ef11d6fc240bfa593651230206b9432a0f1bb6a654996c6821aaa2a16048a8e76151e52ca24c87341b8697c9981981 SHA512 2d1850460349c82074fd0d8f503ac7602d4f59100598ee0ee844b07116ea2c40e38a83e27ff743d3845f4073328b449b1a6d7a353a950ac875238360febc57d5
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.5.ebuild b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.5.ebuild
new file mode 100644
index 000000000000..dcfdcd21f983
--- /dev/null
+++ b/dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="The controller manager"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/controller_manager_tests/Manifest b/dev-ros/controller_manager_tests/Manifest
index faea41e74ebd..2ceb027a130a 100644
--- a/dev-ros/controller_manager_tests/Manifest
+++ b/dev-ros/controller_manager_tests/Manifest
@@ -1,10 +1,4 @@
-DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
-DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
-DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
-EBUILD controller_manager_tests-0.19.1.ebuild 916 BLAKE2B 2863c87ca0bc54a305777f574d127c53b61580761dabbb5a7b694ec87c2558dedfe38ca4ade4600684991c330a0d38fcb7d35ebc6afc54d06fb9d2f49e953915 SHA512 13364da33088948d81937f9c613920b651f1f19fda2cf256a6ed22a4cce95bc7c40ffc0447936e93e7604064a8be75b58efced3ec6aae50e9f9a77ec7b09183c
-EBUILD controller_manager_tests-0.19.2.ebuild 902 BLAKE2B 60b0543b7f2b092d15eee1adbb089f47f37adaa3682a141bd58b7976dd4b6582856aa90c3e38010b29563f26af44a36fabae61e84d7dd153e4e9525c3c9fd29e SHA512 1f154dfc3a04d0bdfe1534e88ee66c381c4dac76cad042ed69eb9c6a00d91fd73dcaca14cc7836783c70514e83d787276b2e15f614cd0969cde1b09f1a24fc2a
-EBUILD controller_manager_tests-0.19.3.ebuild 902 BLAKE2B 60b0543b7f2b092d15eee1adbb089f47f37adaa3682a141bd58b7976dd4b6582856aa90c3e38010b29563f26af44a36fabae61e84d7dd153e4e9525c3c9fd29e SHA512 1f154dfc3a04d0bdfe1534e88ee66c381c4dac76cad042ed69eb9c6a00d91fd73dcaca14cc7836783c70514e83d787276b2e15f614cd0969cde1b09f1a24fc2a
-EBUILD controller_manager_tests-0.19.4.ebuild 902 BLAKE2B 7b06e897aa15f6c287898a4f0d410ce1f3ad9fb8669a091a4e05cb6964a5fb2afb3ae11d46aa02436d3f62672a94ce7ee19f508bdecb8c8cfe64a879ac9b3a7d SHA512 7c7e4aa58b76b12b9e283bb4a03ba3f550e39bca0b0485a1f6bb895ebf2211ab849af5e2e5ec678b0cd98fce829e4e43b266722eae5372b5b2ff9011d6e225f0
-EBUILD controller_manager_tests-9999.ebuild 902 BLAKE2B 60b0543b7f2b092d15eee1adbb089f47f37adaa3682a141bd58b7976dd4b6582856aa90c3e38010b29563f26af44a36fabae61e84d7dd153e4e9525c3c9fd29e SHA512 1f154dfc3a04d0bdfe1534e88ee66c381c4dac76cad042ed69eb9c6a00d91fd73dcaca14cc7836783c70514e83d787276b2e15f614cd0969cde1b09f1a24fc2a
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
+EBUILD controller_manager_tests-0.19.5.ebuild 932 BLAKE2B 3688839251bbcdcab09703ba8bd395137b84995f397a3f2b0204d3e3c0ead08579bc4c2f48be2b68a5cf5897f57e68a33a408f45da8332c471d924f096c7faf7 SHA512 db2936ee1c76c759a31eca899f1c2d129fce2044335321a00dd80bf7f00d54117d4d15a7a607d7d8874fe0797a55c5df6f1cf976783a3ca87a0c3232b0dea47e
+EBUILD controller_manager_tests-9999.ebuild 932 BLAKE2B 3688839251bbcdcab09703ba8bd395137b84995f397a3f2b0204d3e3c0ead08579bc4c2f48be2b68a5cf5897f57e68a33a408f45da8332c471d924f096c7faf7 SHA512 db2936ee1c76c759a31eca899f1c2d129fce2044335321a00dd80bf7f00d54117d4d15a7a607d7d8874fe0797a55c5df6f1cf976783a3ca87a0c3232b0dea47e
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
deleted file mode 100644
index 44483c86ebe3..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.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
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-cpp/gtest
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	)"
-# needed by combined_robot_hw_tests
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.2.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.2.ebuild
deleted file mode 100644
index 3c574d1b681b..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-cpp/gtest
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-"
-# needed by combined_robot_hw_tests
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.3.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.3.ebuild
deleted file mode 100644
index 3c574d1b681b..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.3.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
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-cpp/gtest
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-"
-# needed by combined_robot_hw_tests
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.4.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.4.ebuild
deleted file mode 100644
index 976ea1f42e0f..000000000000
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.4.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
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for the controller manager"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/controller_interface
-	dev-ros/control_toolbox
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-	dev-cpp/gtest
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-"
-# needed by combined_robot_hw_tests
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_test() {
-	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
-	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
-	ros-catkin_src_test
-}
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.5.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.5.ebuild
new file mode 100644
index 000000000000..c28c2b9f697c
--- /dev/null
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tests for the controller manager"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/controller_interface
+	dev-ros/control_toolbox
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+	dev-cpp/gtest
+"
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		dev-ros/rosbash
+	)
+"
+# needed by combined_robot_hw_tests
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
index 3c574d1b681b..c28c2b9f697c 100644
--- a/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
 	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		dev-ros/rosbash
+	)
 "
 # needed by combined_robot_hw_tests
 mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/gazebo_plugins/Manifest b/dev-ros/gazebo_plugins/Manifest
index 6b61f3a15cfa..a1f46eec1f07 100644
--- a/dev-ros/gazebo_plugins/Manifest
+++ b/dev-ros/gazebo_plugins/Manifest
@@ -1,6 +1,4 @@
-DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
 DIST gazebo_ros_pkgs-2.9.2.tar.gz 1864333 BLAKE2B d8a777594624fe6ae38f1ae27ea49f9629a59f507ec5e8512f50dbf8ae551e6b171dd47eff308ab1badc4e07de7183fe512ff8179637169896f6cb1dbf3d50ba SHA512 38ca70b44a229d8ca87bf9cb2ed3e0eaf7855f5711a81891986a985b7ff4218cdd6c914c1d25352da47a3fb52a3df5638af36990264e5241d17bb43ae0fa6f0b
-EBUILD gazebo_plugins-2.9.1.ebuild 1399 BLAKE2B 772438439e62014bad0fe4996181e5020df138a843a61f9396381aa123f34aec150af31157d86a07f94d84f5aa7baafa2815d7d54a9328577b4acc8f3bb374db SHA512 f87939c38cd358d99502b4cdcb6528c03cab2b5fa28468acd9c990157abce6974d44ef25a2fed3aaebbdf329e7fdd3795d79ee095aae9fbad553ad99acb13a29
-EBUILD gazebo_plugins-2.9.2.ebuild 1399 BLAKE2B 0549aeed743dac942b8d1241b202270014b86f9c75f334c8533f19e0e54d42a925aa29b45822e9abb2122202c055d59cbb23fdf3d500af6b0cabbabda2e7b695 SHA512 c64626e04e64138a98d17bf8d23116aa0c9ff0c8ef18f0ebb91230a9b6bc2eae4ae08953564d7e069c6c3068ff20733a7598dfab9282c4b41526be97433db4b4
-EBUILD gazebo_plugins-9999.ebuild 1399 BLAKE2B 772438439e62014bad0fe4996181e5020df138a843a61f9396381aa123f34aec150af31157d86a07f94d84f5aa7baafa2815d7d54a9328577b4acc8f3bb374db SHA512 f87939c38cd358d99502b4cdcb6528c03cab2b5fa28468acd9c990157abce6974d44ef25a2fed3aaebbdf329e7fdd3795d79ee095aae9fbad553ad99acb13a29
+EBUILD gazebo_plugins-2.9.2.ebuild 1458 BLAKE2B 979043bd0e332273d9e9b4d81f0a400ea0fedc259579dcd09f5268c2a7706997439fc1b396c7e958da3537bd94feb783f7e631ac42e1dfbe12600c2adc6f3252 SHA512 5b0043db8076ae7a0d9aad84ca81a608bdfe046f655af2181f5dcdf7b9d67ae01f0d8576245512fad1dd7c950228eda10125786ea784f356ee206fcae61f47eb
+EBUILD gazebo_plugins-9999.ebuild 1458 BLAKE2B 979043bd0e332273d9e9b4d81f0a400ea0fedc259579dcd09f5268c2a7706997439fc1b396c7e958da3537bd94feb783f7e631ac42e1dfbe12600c2adc6f3252 SHA512 5b0043db8076ae7a0d9aad84ca81a608bdfe046f655af2181f5dcdf7b9d67ae01f0d8576245512fad1dd7c950228eda10125786ea784f356ee206fcae61f47eb
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.9.1.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.9.1.ebuild
deleted file mode 100644
index 743965d423ed..000000000000
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.9.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Robot-independent Gazebo plugins"
-LICENSE="BSD Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-ros/roscpp
-	dev-ros/rospy
-	dev-ros/nodelet
-	dev-ros/angles
-	dev-ros/std_srvs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/urdf
-	dev-ros/tf
-	dev-ros/tf2_ros
-	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/driver_base[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/pcl_conversions
-	dev-ros/image_transport
-	dev-ros/rosconsole
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/polled_camera
-	dev-ros/diagnostic_updater
-	dev-ros/camera_info_manager
-	dev-libs/libxml2
-	>=sci-electronics/gazebo-7:=
-	dev-libs/protobuf:=
-	dev-games/ogre
-	sci-libs/pcl
-	dev-libs/boost:=
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.9.2.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.9.2.ebuild
index a13320901ff6..de6216b0cc3e 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.9.2.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.9.2.ebuild
@@ -51,4 +51,5 @@ DEPEND="${RDEPEND}
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
index 743965d423ed..de6216b0cc3e 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-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
@@ -51,4 +51,5 @@ DEPEND="${RDEPEND}
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
diff --git a/dev-ros/genpy/Manifest b/dev-ros/genpy/Manifest
index e071cb20be13..a83615e86ce0 100644
--- a/dev-ros/genpy/Manifest
+++ b/dev-ros/genpy/Manifest
@@ -1,7 +1,5 @@
 AUX yaml.patch 543 BLAKE2B c476c582c2363bd5bdf9b472dc784726eb2bd65081d3629f7d822decbb92ecfe0c695691219c661b7bad850521346eb591c9c00498c3ab1e0f85597b8497c3a8 SHA512 4fc53e0c904d5dfa637476b833e8a5038305ebd0672f5acf08f81b2ae97970b0e4996df483ff087a2eb16957b659d0a528545fe8704cc26f1f6029105a2aea87
-DIST genpy-0.6.11.tar.gz 53128 BLAKE2B c0c6d9aa8d713e873a5cbceda8763c23e4b6259f5708be1575c4eae600b3f96bd8f05cda281711c799a0a4e00d69623ed0ddcb7812b4894d7c45717121f51c00 SHA512 267391cce6119085ae974f00fa4a33767b2b62a5d61bd290b3d2164cee275ce88b21d124b2da9ca9d85ac6a3a030ceddef766be34fba9c0d57ba26d6e1e41186
-DIST genpy-0.6.14.tar.gz 53964 BLAKE2B ff1503a56fdb07a5165d2891589450e3b40e85f68d541990828959b8d7f0e440091d77fd0bb4ac70fa0e39114b366c061e8d03979482539d2e5ca6cc3ff15b8c SHA512 5ce357ef41d2c06025ca2a06ca4111baf0d3b92dbdf877ea0ce5515d516d9e0fa46171057293ba96d5b55c5fa32b7c24ef28cfcd45be8bf9c3d73302feec6957
-EBUILD genpy-0.6.11.ebuild 581 BLAKE2B 9db9e3ef13ca81cf25d8aa9018265ae19b8b60801489a6c291163365c50369c6ff2be37924557e270abcdadba0030b093eb1e630501927f80d0dcffa7179e4cb SHA512 0bf566b2fe5fac3e6b17a9b1be2d82fa020b9a901c64f7b9ac06f4163a5bb1ecb468b6c6483957232d6c540efcdeb3089e350cf97c320c1f9f85bcf54c24b7be
-EBUILD genpy-0.6.14.ebuild 581 BLAKE2B 9db9e3ef13ca81cf25d8aa9018265ae19b8b60801489a6c291163365c50369c6ff2be37924557e270abcdadba0030b093eb1e630501927f80d0dcffa7179e4cb SHA512 0bf566b2fe5fac3e6b17a9b1be2d82fa020b9a901c64f7b9ac06f4163a5bb1ecb468b6c6483957232d6c540efcdeb3089e350cf97c320c1f9f85bcf54c24b7be
+DIST genpy-0.6.16.tar.gz 55296 BLAKE2B 061b7c761a8a8892ffbd27073812ffd375bbeabe1606efdd5d43082f693968cad1fbbdf87ec87b0f4ddc6cef81c22c6e562455885a4b8b82519f544bd5d1c672 SHA512 e87a368d6d966ca681d8abfa0fb16ce1f827aaa9cc0649ffd88ccb849fd3c479db0a36f7a82e16e386e83d471e2a75c38afebe33975a1cf6d42b98804ec7a1bd
+EBUILD genpy-0.6.16.ebuild 581 BLAKE2B 4649504ee0d8863077f766a8494d9f0e569c83e6340b20caa07cb341149a3be9ab47e63814e028ce798f10474a9d3099814e7681574dd7cc3bce41e15ab6fb18 SHA512 deb86c987f36e049df1c4da6f8d51808ad051e46ab0a99d4dd1ad9e9483940c6ffc238d47fb210ebcd57dc7226ac5e0e40dc330b1460bb00639a31eb38b6723b
 EBUILD genpy-9999.ebuild 581 BLAKE2B 9db9e3ef13ca81cf25d8aa9018265ae19b8b60801489a6c291163365c50369c6ff2be37924557e270abcdadba0030b093eb1e630501927f80d0dcffa7179e4cb SHA512 0bf566b2fe5fac3e6b17a9b1be2d82fa020b9a901c64f7b9ac06f4163a5bb1ecb468b6c6483957232d6c540efcdeb3089e350cf97c320c1f9f85bcf54c24b7be
 MISC metadata.xml 323 BLAKE2B 025145a67d18622d14ea6ac43585246aac2cdc4f65e63b04dbfd32aa6f04f4e301e22f2e326a486e2fad3c1ef82f9890179a8dc142f4aa551b5b9db155e616da SHA512 523ec83e710fb0b80d731b536c8605a4211bfa176951a1af5ee6f6e60fee1ca3634c0d659b2d3ae71f3bb9d3765cc44cfdada5c7a364cea63f323c462227f364
diff --git a/dev-ros/genpy/genpy-0.6.11.ebuild b/dev-ros/genpy/genpy-0.6.11.ebuild
deleted file mode 100644
index a5796a02b2e9..000000000000
--- a/dev-ros/genpy/genpy-0.6.11.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
-
-ROS_REPO_URI="https://github.com/ros/genpy"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="https://wiki.ros.org/genpy"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/genpy/genpy-0.6.14.ebuild b/dev-ros/genpy/genpy-0.6.14.ebuild
deleted file mode 100644
index a5796a02b2e9..000000000000
--- a/dev-ros/genpy/genpy-0.6.14.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
-
-ROS_REPO_URI="https://github.com/ros/genpy"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="https://wiki.ros.org/genpy"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/genpy/genpy-0.6.16.ebuild b/dev-ros/genpy/genpy-0.6.16.ebuild
new file mode 100644
index 000000000000..e8cda9d3e500
--- /dev/null
+++ b/dev-ros/genpy/genpy-0.6.16.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/genpy"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Python ROS message and service generators"
+HOMEPAGE="https://wiki.ros.org/genpy"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)
+"
+PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/geodesy/Manifest b/dev-ros/geodesy/Manifest
index 4dd262bc9ca1..e583bc3843f6 100644
--- a/dev-ros/geodesy/Manifest
+++ b/dev-ros/geodesy/Manifest
@@ -1,5 +1,5 @@
-AUX py3.patch 1627 BLAKE2B 050e4fe368d65e09ff9074c07e430d695fb5d0829ca75716146f861ad13a522bb364d70482840b225a4f71b5fed06f093bc8e5069e7d22c7156c615e6cf2792d SHA512 d2fd39c0c797dee88da86efc1a10e49f3bd8383b0f97e0e0f20461347aeaa2649ca7e426a872c7f2c5f2323d914e1beda5de7022c5cb7561e29b942c1d92ce8f
-DIST geographic_info-0.5.5.tar.gz 27762 BLAKE2B 9235911d6a2b010e47722268f5aa14b2bd10dac73bf4445bcd6585c5094947e9ea43ee2ccb6d6a3b0ae788d149fcc546e6618f0097e4bde32d69ed9baacbf255 SHA512 a1699778cd85960603435e7b7d46831c7c5ac4b57f4a06e9f394933799151a5ebf95c59bc109ca05eeb9376763aae8c77bc9150081c81170f1778730145910ec
-EBUILD geodesy-0.5.5.ebuild 1008 BLAKE2B f5f79e5f165f7277ae83f9fd363c3458c8496d4f9d315f457a22c8e8281089b5d916015d259e9ec4509fb2891580da63b6054ecd06e9c72da50fa2c154bb3696 SHA512 64a105b628a9d5adbb6d1ee222f34736acd065e93c45e2c23922e063fd480364efb165cdc14f022ea789ced48efa744a244246a5bfdd270563e0283f016563f3
+AUX py3.patch 524 BLAKE2B 68d93bc01ddd03660820d5e5ea6284ee595f18d0272423f9ddbb1357e18ecdb6280acfde2e00e62a921225d2a48837f289732b3321877be16102a21ea9e75371 SHA512 f854f820acc878c95bec1eca186c027ec0f3763195f6fd63a4a357aaf7affe3c20c640b3afecfa7ecce1702922904820d2a82c1d9caddfeace022478e4c5e91d
+DIST geographic_info-0.5.6.tar.gz 28130 BLAKE2B 4d7013543db91c02c470c6b6dcb6e00070d5356f91ace20b3bb97aafa71eff2b525fc11994796f2de103b1df40efe8358d19a7e8fc0b1290c73cc28c791f22ce SHA512 d2f41320d2b094c2ea04593941e35d2b5581b84cc2f599099880dd671255dd59bc8787ad4a5640539cc25a13592df2ec7a887e3ea171398cfeafeccc669bd7f0
+EBUILD geodesy-0.5.6.ebuild 1008 BLAKE2B 8861dc85fcfe3ba308c59f377f3804178c0c6e6b07fcb89ab50212eb3865e268f1670eadc4a925ec8a9f598b1ddba55527bf567826cf5059e9fbdfec910ca3c4 SHA512 967203b07343af56ea218548aabe1f3a0ee94c1f8f4d15a8e77d91362ad136837033eafe2266d2eedc21811245a56bf30c75bb610196448a3c883725e3c55ae1
 EBUILD geodesy-9999.ebuild 1008 BLAKE2B f5f79e5f165f7277ae83f9fd363c3458c8496d4f9d315f457a22c8e8281089b5d916015d259e9ec4509fb2891580da63b6054ecd06e9c72da50fa2c154bb3696 SHA512 64a105b628a9d5adbb6d1ee222f34736acd065e93c45e2c23922e063fd480364efb165cdc14f022ea789ced48efa744a244246a5bfdd270563e0283f016563f3
 MISC metadata.xml 349 BLAKE2B f945481736db4b708a82107474a58d9dd6e805eae69557ea08bb80c9bff8913446618bd610ef7cfb69e84a88e6477de9fe4c2c86a1b693c7515114b78820ae1e SHA512 453f7929a678908957bfde47ef0816a11162200a6b5541850320d874b3419155c4efebae51ef2d1b542f73bb4dcb319fdd93098817819cad2a9cb74adf008918
diff --git a/dev-ros/geodesy/files/py3.patch b/dev-ros/geodesy/files/py3.patch
index 08259ee976c1..66ef4e5dd3ca 100644
--- a/dev-ros/geodesy/files/py3.patch
+++ b/dev-ros/geodesy/files/py3.patch
@@ -1,31 +1,3 @@
-Index: geodesy/src/geodesy/wu_point.py
-===================================================================
---- geodesy.orig/src/geodesy/wu_point.py
-+++ geodesy/src/geodesy/wu_point.py
-@@ -159,12 +159,12 @@ class WuPointSet():
-         # Initialize way point information.
-         self.way_point_ids = {}         # points symbol table
-         self.n_points = len(self.points)
--        for wid in xrange(self.n_points):
-+        for wid in range(self.n_points):
-             self.way_point_ids[self.points[wid].id.uuid] = wid
- 
-         # Create empty list of UTM points, corresponding to map points.
-         # They will be evaluated lazily, when first needed.
--        self.utm_points = [None for wid in xrange(self.n_points)]
-+        self.utm_points = [None for wid in range(self.n_points)]
- 
-     def __contains__(self, item):
-         """ Point set membership. """
-@@ -259,7 +259,7 @@ class WuPointSet():
-         """
-         return self.way_point_ids.get(key, default)
- 
--    def next(self):
-+    def __next__(self):
-         """ Next iteration point.
- 
-         :returns: Next :class:`WuPoint`.
 Index: geodesy/tests/test_wu_point.py
 ===================================================================
 --- geodesy.orig/tests/test_wu_point.py
diff --git a/dev-ros/geodesy/geodesy-0.5.5.ebuild b/dev-ros/geodesy/geodesy-0.5.5.ebuild
deleted file mode 100644
index 88ea377b0cc7..000000000000
--- a/dev-ros/geodesy/geodesy-0.5.5.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
-ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Python and C++ interfaces for manipulating geodetic coordinates"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/angles
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/unique_id
-	dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyproj[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/geodesy/geodesy-0.5.6.ebuild b/dev-ros/geodesy/geodesy-0.5.6.ebuild
new file mode 100644
index 000000000000..52d160f557de
--- /dev/null
+++ b/dev-ros/geodesy/geodesy-0.5.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python and C++ interfaces for manipulating geodetic coordinates"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/angles
+	dev-ros/geographic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf
+	dev-ros/unique_id
+	dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyproj[\${PYTHON_USEDEP}]")
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+PATCHES=( "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/geographic_msgs/Manifest b/dev-ros/geographic_msgs/Manifest
index 7db5efcee3ae..fc205831a73e 100644
--- a/dev-ros/geographic_msgs/Manifest
+++ b/dev-ros/geographic_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST geographic_info-0.5.5.tar.gz 27762 BLAKE2B 9235911d6a2b010e47722268f5aa14b2bd10dac73bf4445bcd6585c5094947e9ea43ee2ccb6d6a3b0ae788d149fcc546e6618f0097e4bde32d69ed9baacbf255 SHA512 a1699778cd85960603435e7b7d46831c7c5ac4b57f4a06e9f394933799151a5ebf95c59bc109ca05eeb9376763aae8c77bc9150081c81170f1778730145910ec
+DIST geographic_info-0.5.6.tar.gz 28130 BLAKE2B 4d7013543db91c02c470c6b6dcb6e00070d5356f91ace20b3bb97aafa71eff2b525fc11994796f2de103b1df40efe8358d19a7e8fc0b1290c73cc28c791f22ce SHA512 d2f41320d2b094c2ea04593941e35d2b5581b84cc2f599099880dd671255dd59bc8787ad4a5640539cc25a13592df2ec7a887e3ea171398cfeafeccc669bd7f0
 EBUILD geographic_msgs-0.5.5.ebuild 483 BLAKE2B b407d4afa03e79e4116527cea8b7b52e7999ec8593158a955b7c1b244475c3316c45fc14b5bb5f5cf108e2ba8491e950fabfea0ec1f39adc79ec5b394792622d SHA512 fc850fd7150f3ee12b02be14bff6cd5a43c65a69485cc2a5584a9b86e75f216b0b1ed03172beb258361e02c44108b642f849a5518bbebfd3367f96d5c78e7747
+EBUILD geographic_msgs-0.5.6.ebuild 483 BLAKE2B a831785a84fc14793883abf78f730e628a2c3da6490bf63c1892e66cb08522fadf5270889921246c68bded3487fbbf19ef956c8b4c70e2c79d39a005ca0d9368 SHA512 5cf66dbdc67beaeb42b48da0955c7cecc912a1d33aa4b0fb54ae59fe31998f6eddf78de32759f5d17645e9b6dfc6e822ecda34fe59113b4f0bf410d53c2d8b44
 EBUILD geographic_msgs-9999.ebuild 483 BLAKE2B b407d4afa03e79e4116527cea8b7b52e7999ec8593158a955b7c1b244475c3316c45fc14b5bb5f5cf108e2ba8491e950fabfea0ec1f39adc79ec5b394792622d SHA512 fc850fd7150f3ee12b02be14bff6cd5a43c65a69485cc2a5584a9b86e75f216b0b1ed03172beb258361e02c44108b642f849a5518bbebfd3367f96d5c78e7747
 MISC metadata.xml 349 BLAKE2B f945481736db4b708a82107474a58d9dd6e805eae69557ea08bb80c9bff8913446618bd610ef7cfb69e84a88e6477de9fe4c2c86a1b693c7515114b78820ae1e SHA512 453f7929a678908957bfde47ef0816a11162200a6b5541850320d874b3419155c4efebae51ef2d1b542f73bb4dcb319fdd93098817819cad2a9cb74adf008918
diff --git a/dev-ros/geographic_msgs/geographic_msgs-0.5.6.ebuild b/dev-ros/geographic_msgs/geographic_msgs-0.5.6.ebuild
new file mode 100644
index 000000000000..a299373688ff
--- /dev/null
+++ b/dev-ros/geographic_msgs/geographic_msgs-0.5.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/uuid_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="ROS messages for Geographic Information Systems"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest
index ba6ba62d4c42..104813881e9e 100644
--- a/dev-ros/geometric_shapes/Manifest
+++ b/dev-ros/geometric_shapes/Manifest
@@ -1,4 +1,4 @@
-DIST geometric_shapes-0.7.2.tar.gz 84443 BLAKE2B bcfcfeb08cbd60c889a2a801855eddd85a3ac42752991c0721ea0aee19a5650493e390d80a8ed99610a40efb5ca1fe0c1a49329471368b335483f8ceb193ca8a SHA512 5c1a05c0166c32c0d5ac9d22dd6feb784845342d7cde8d642731a08aafa54ed0b1545864f42b7de7641031bf7f0e353a632404799051770d55c7855b57d78027
-EBUILD geometric_shapes-0.7.2.ebuild 962 BLAKE2B 0ff665f8bdd88170d8882ec6f747268db7bc7186443f4df47945e6bae598aa2c4fabbf666aadab7df5eb534d2c666dc9ff8dcc4466222bc84da8a7c77ec782fd SHA512 63443250aa14f3e756ebe334978fe6fee23f7c8de255ab76712f6d0c0b786beace93ffc8a96df5bcd0b5407c366754ad1792a564e191e81224a03804a8581cc6
+DIST geometric_shapes-0.7.3.tar.gz 85830 BLAKE2B 2e5475a55e389ccd0cf2819c268efdf6e8764daadc7adae48d89d636b8155c49b892ec7204f2ecedc2e01948f6fa31fcaa88a14709d2ab63f850aee9352f5b1b SHA512 bd35a3aa23243d1bf85e7c9cc8b2263cbc1e5af626ae80950fd0867222bd5aaa29ac7fed6c1d5e28943916314ab941b182ba343114452b98c6f18b33a570123c
+EBUILD geometric_shapes-0.7.3.ebuild 962 BLAKE2B 840e12d79c63939d8201411beeddcdbadccbd31e99dc22b73370fe2a3f3f9ceb22e41b42b839a19d6cf91c9c5f354bcc3ca8965393aac6984e3836cb95723496 SHA512 e3173b034363be24385dad27b04a894cced4b899972a86e333461cc6c5aaf0d451657bc6cd0fb99cdff31df3ae3ec31ac7012f4b1623ed7e8e388fdca83f826a
 EBUILD geometric_shapes-9999.ebuild 962 BLAKE2B 0ff665f8bdd88170d8882ec6f747268db7bc7186443f4df47945e6bae598aa2c4fabbf666aadab7df5eb534d2c666dc9ff8dcc4466222bc84da8a7c77ec782fd SHA512 63443250aa14f3e756ebe334978fe6fee23f7c8de255ab76712f6d0c0b786beace93ffc8a96df5bcd0b5407c366754ad1792a564e191e81224a03804a8581cc6
 MISC metadata.xml 343 BLAKE2B 583ed67450346fcbca09f5714c29d20e728f827c1448ce275683f600b6f87d3f00337dfbf39b694906787b5db9dfc878a316121eb7922494ce631b9a8b9b3e2c SHA512 10c40ddc16c176ed5503b7d098bc133e85973301631878b36f793df95fe2c55576cacaaf2cbfcc9152cb0659394d7ab7c5fca72cbdba32c5310b4a2ce7b365c8
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.7.2.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.7.2.ebuild
deleted file mode 100644
index 4e9add6e0660..000000000000
--- a/dev-ros/geometric_shapes/geometric_shapes-0.7.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
-ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
-KEYWORDS="~amd64 ~arm"
-
-inherit flag-o-matic ros-catkin
-
-DESCRIPTION="Generic definitions of geometric shapes and bodies"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	media-libs/qhull
-	media-libs/assimp
-	sci-libs/octomap
-	dev-ros/random_numbers
-	dev-ros/resource_retriever
-	dev-ros/eigen_stl_containers
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-cpp/gtest dev-ros/rosunit )
-"
-
-src_prepare() {
-	ros-catkin_src_prepare
-	# https://bugs.gentoo.org/738556
-	# http://eigen.tuxfamily.org/dox-devel/group__TopicUnalignedArrayAssert.html
-	append-cxxflags '-std=c++17'
-	sed -e 's/add_compile_options(/#\0/g' -i CMakeLists.txt || die
-}
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.7.3.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.7.3.ebuild
new file mode 100644
index 000000000000..d7890463d7db
--- /dev/null
+++ b/dev-ros/geometric_shapes/geometric_shapes-0.7.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
+KEYWORDS="~amd64 ~arm"
+
+inherit flag-o-matic ros-catkin
+
+DESCRIPTION="Generic definitions of geometric shapes and bodies"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	media-libs/qhull
+	media-libs/assimp
+	sci-libs/octomap
+	dev-ros/random_numbers
+	dev-ros/resource_retriever
+	dev-ros/eigen_stl_containers
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest dev-ros/rosunit )
+"
+
+src_prepare() {
+	ros-catkin_src_prepare
+	# https://bugs.gentoo.org/738556
+	# http://eigen.tuxfamily.org/dox-devel/group__TopicUnalignedArrayAssert.html
+	append-cxxflags '-std=c++17'
+	sed -e 's/add_compile_options(/#\0/g' -i CMakeLists.txt || die
+}
diff --git a/dev-ros/hardware_interface/Manifest b/dev-ros/hardware_interface/Manifest
index 11bda41999b5..b27ec67d17b3 100644
--- a/dev-ros/hardware_interface/Manifest
+++ b/dev-ros/hardware_interface/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
 DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD hardware_interface-0.19.1.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
 EBUILD hardware_interface-0.19.2.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
 EBUILD hardware_interface-0.19.3.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
 EBUILD hardware_interface-0.19.4.ebuild 389 BLAKE2B 74cc5e3320c34aa5fe7c11258689e2e95ee506230f0a8d92d5dc6afc0973771214798cb765454f63d76895df4ed151073ba7a0eae1184bd0cbc92f9d7b9b0fa3 SHA512 69e3028d77a905a356cedb5d95bbee836d5d5f3732cbaba71b50dd1cae3fae2e0bf09244bce00959de06f715d87f362917a2b419d678989fa6e9d3d1306b6293
+EBUILD hardware_interface-0.19.5.ebuild 389 BLAKE2B 74cc5e3320c34aa5fe7c11258689e2e95ee506230f0a8d92d5dc6afc0973771214798cb765454f63d76895df4ed151073ba7a0eae1184bd0cbc92f9d7b9b0fa3 SHA512 69e3028d77a905a356cedb5d95bbee836d5d5f3732cbaba71b50dd1cae3fae2e0bf09244bce00959de06f715d87f362917a2b419d678989fa6e9d3d1306b6293
 EBUILD hardware_interface-9999.ebuild 389 BLAKE2B d50230140b3849df3e305428fe4be4b27f38d85b143c29a75b6f5064b75ba847db2c21187e5d85b8340c4bcc3397380044e67cb79ff23eb4687d4998badc0b52 SHA512 d6e1ee1fcfef637ead28b5906246a0435a8bf97a578b580032e390c3dea379104efc46bfa0ce81848a4d73543630abd1248dd63311c2411c765761eb5ad43e52
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/hardware_interface/hardware_interface-0.19.5.ebuild b/dev-ros/hardware_interface/hardware_interface-0.19.5.ebuild
new file mode 100644
index 000000000000..3cbf6c2cb246
--- /dev/null
+++ b/dev-ros/hardware_interface/hardware_interface-0.19.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Hardware Interface base class"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roscpp"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hector_compressed_map_transport/Manifest b/dev-ros/hector_compressed_map_transport/Manifest
index 4cfe6a89e10d..90ed678b1808 100644
--- a/dev-ros/hector_compressed_map_transport/Manifest
+++ b/dev-ros/hector_compressed_map_transport/Manifest
@@ -1,4 +1,6 @@
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_compressed_map_transport-0.5.1.ebuild 678 BLAKE2B 209013a02cf08a9271b4d0ae30d8a8c0b55d6ee831fb8fccf6acf4f96148341478145951e5c7bf9be06667062678bc8f6ef6dc2014ab2c960d38152eca396fdb SHA512 ad68777e963b47bddf6fa20f6b58a4e09d6a457b8a01385fd6a2a4364db521fa35168d61ea311960f7c1f21c087c6f618c209c8fa54dc47a2c5a6e43b9f65a57
+EBUILD hector_compressed_map_transport-0.5.2.ebuild 678 BLAKE2B 209013a02cf08a9271b4d0ae30d8a8c0b55d6ee831fb8fccf6acf4f96148341478145951e5c7bf9be06667062678bc8f6ef6dc2014ab2c960d38152eca396fdb SHA512 ad68777e963b47bddf6fa20f6b58a4e09d6a457b8a01385fd6a2a4364db521fa35168d61ea311960f7c1f21c087c6f618c209c8fa54dc47a2c5a6e43b9f65a57
 EBUILD hector_compressed_map_transport-9999.ebuild 678 BLAKE2B 347105c139dad0aefe18fb25051b778e61e332e15e9a47c6bd5241f2e074d51ec40b4c78f2d5212e78e11390def6ac4a251bf4e3f7e3c3e274d17cc8d4c83e73 SHA512 9f60acb8ecb6fa9dfed30e7bdd986c37941b9c4e8b2bc8dc16503bc68a43ffbaf60a1bad6679e6d67b4698b67ae08661c57b5ebc96a51ab762dd47c955d52c2b
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.2.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.2.ebuild
new file mode 100644
index 000000000000..b17d75bdeaca
--- /dev/null
+++ b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.5.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Means for transporting compressed map data through the use of image_transport"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/hector_map_tools
+	dev-ros/image_transport
+	media-libs/opencv
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_geotiff/Manifest b/dev-ros/hector_geotiff/Manifest
index 875efefe78c1..945e9a21c006 100644
--- a/dev-ros/hector_geotiff/Manifest
+++ b/dev-ros/hector_geotiff/Manifest
@@ -1,4 +1,6 @@
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_geotiff-0.5.1.ebuild 747 BLAKE2B 9fe061390c2fc3a19664b20f70937b5e76d9694451bcea3e47dd89bd86ce32312ece1ccdc6474741369a9fcf79ea656e4dda58e416544c393b50ed98338e2a4e SHA512 8e622813620b6917fa70f745e1b1c331adb4fcfc56de941586db18de1ba011d7daeb9009191b1bc7342cf9a7f51139ead1837e5b37810c4f57970fd7c5871a98
+EBUILD hector_geotiff-0.5.2.ebuild 747 BLAKE2B 9fe061390c2fc3a19664b20f70937b5e76d9694451bcea3e47dd89bd86ce32312ece1ccdc6474741369a9fcf79ea656e4dda58e416544c393b50ed98338e2a4e SHA512 8e622813620b6917fa70f745e1b1c331adb4fcfc56de941586db18de1ba011d7daeb9009191b1bc7342cf9a7f51139ead1837e5b37810c4f57970fd7c5871a98
 EBUILD hector_geotiff-9999.ebuild 747 BLAKE2B 9fe061390c2fc3a19664b20f70937b5e76d9694451bcea3e47dd89bd86ce32312ece1ccdc6474741369a9fcf79ea656e4dda58e416544c393b50ed98338e2a4e SHA512 8e622813620b6917fa70f745e1b1c331adb4fcfc56de941586db18de1ba011d7daeb9009191b1bc7342cf9a7f51139ead1837e5b37810c4f57970fd7c5871a98
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.5.2.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.5.2.ebuild
new file mode 100644
index 000000000000..5dedc3aec918
--- /dev/null
+++ b/dev-ros/hector_geotiff/hector_geotiff-0.5.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Saves occupancy grid map, robot trajectory and object data to GeoTiff images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_map_tools
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_geotiff_launch/Manifest b/dev-ros/hector_geotiff_launch/Manifest
index 3c35bba526f3..10faac3dc875 100644
--- a/dev-ros/hector_geotiff_launch/Manifest
+++ b/dev-ros/hector_geotiff_launch/Manifest
@@ -1,4 +1,6 @@
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_geotiff_launch-0.5.1.ebuild 441 BLAKE2B 52fc80a84bfa2030de4acde0c07a230b599708221dbcb862d790d5c9e23ce8393972854927c50262e54093e50ec89b1498e574598f7b2b2e73f16922cc40b1a4 SHA512 74a424701eca68354514ef74c8eeaa9a578bdc55471795b70e1692bb0c9fff54dec6f04a6aa19965ac921b5b702349140716b087a7f230ac7ada87be430dc35d
+EBUILD hector_geotiff_launch-0.5.2.ebuild 441 BLAKE2B 52fc80a84bfa2030de4acde0c07a230b599708221dbcb862d790d5c9e23ce8393972854927c50262e54093e50ec89b1498e574598f7b2b2e73f16922cc40b1a4 SHA512 74a424701eca68354514ef74c8eeaa9a578bdc55471795b70e1692bb0c9fff54dec6f04a6aa19965ac921b5b702349140716b087a7f230ac7ada87be430dc35d
 EBUILD hector_geotiff_launch-9999.ebuild 441 BLAKE2B 52fc80a84bfa2030de4acde0c07a230b599708221dbcb862d790d5c9e23ce8393972854927c50262e54093e50ec89b1498e574598f7b2b2e73f16922cc40b1a4 SHA512 74a424701eca68354514ef74c8eeaa9a578bdc55471795b70e1692bb0c9fff54dec6f04a6aa19965ac921b5b702349140716b087a7f230ac7ada87be430dc35d
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.2.ebuild b/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.2.ebuild
new file mode 100644
index 000000000000..1a0d1f94dc3f
--- /dev/null
+++ b/dev-ros/hector_geotiff_launch/hector_geotiff_launch-0.5.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files for the hector_geotiff mapper"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_geotiff
+	dev-ros/hector_geotiff_plugins
+	dev-ros/hector_trajectory_server
+"
+DEPEND=""
diff --git a/dev-ros/hector_geotiff_plugins/Manifest b/dev-ros/hector_geotiff_plugins/Manifest
index 2e1bc787fcc1..5f84e8fb2ef9 100644
--- a/dev-ros/hector_geotiff_plugins/Manifest
+++ b/dev-ros/hector_geotiff_plugins/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_geotiff_plugins-0.4.1.ebuild 505 BLAKE2B 3d11eb0af1355ae3eeaabd26044ad17faf40497d1e31e72d39efb345bec37d07bb3c67debde2201c447a98f22ca53c4814fffabbfa77918a4ea78b13405a95fe SHA512 5e67812d9ad85f206bf058c79b184210348499493f463a64b996e6a85e0a1f5aea9a0a3dab8e396814860b86880a2b3e55515ff208550bed70b2d38bc7d364e4
 EBUILD hector_geotiff_plugins-0.5.0.ebuild 505 BLAKE2B 5ae7c48da80faee349ba262bd97fc6fed221987f0ded412cfe585a3f910fdcf969528cdeb29f0a138bc5b3b42b9f51049da8d9c0df0f257923ceaf88bf4eb1a8 SHA512 fad10f3ed181bc55434b0700ada45fa62e859e45e9d0727d0b66e9aca058c461e42a7a658cbc0e7aa753c7ae20cb04639972c7cb0f449f70121bc538c3469437
 EBUILD hector_geotiff_plugins-0.5.1.ebuild 505 BLAKE2B 5ae7c48da80faee349ba262bd97fc6fed221987f0ded412cfe585a3f910fdcf969528cdeb29f0a138bc5b3b42b9f51049da8d9c0df0f257923ceaf88bf4eb1a8 SHA512 fad10f3ed181bc55434b0700ada45fa62e859e45e9d0727d0b66e9aca058c461e42a7a658cbc0e7aa753c7ae20cb04639972c7cb0f449f70121bc538c3469437
+EBUILD hector_geotiff_plugins-0.5.2.ebuild 505 BLAKE2B 5ae7c48da80faee349ba262bd97fc6fed221987f0ded412cfe585a3f910fdcf969528cdeb29f0a138bc5b3b42b9f51049da8d9c0df0f257923ceaf88bf4eb1a8 SHA512 fad10f3ed181bc55434b0700ada45fa62e859e45e9d0727d0b66e9aca058c461e42a7a658cbc0e7aa753c7ae20cb04639972c7cb0f449f70121bc538c3469437
 EBUILD hector_geotiff_plugins-9999.ebuild 505 BLAKE2B 3d11eb0af1355ae3eeaabd26044ad17faf40497d1e31e72d39efb345bec37d07bb3c67debde2201c447a98f22ca53c4814fffabbfa77918a4ea78b13405a95fe SHA512 5e67812d9ad85f206bf058c79b184210348499493f463a64b996e6a85e0a1f5aea9a0a3dab8e396814860b86880a2b3e55515ff208550bed70b2d38bc7d364e4
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.2.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.2.ebuild
new file mode 100644
index 000000000000..b45c4e15ac25
--- /dev/null
+++ b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.5.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Plugins that extend geotiff maps generated by hector_geotiff"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_geotiff
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_imu_attitude_to_tf/Manifest b/dev-ros/hector_imu_attitude_to_tf/Manifest
index ab468a47839a..861ec048fd2d 100644
--- a/dev-ros/hector_imu_attitude_to_tf/Manifest
+++ b/dev-ros/hector_imu_attitude_to_tf/Manifest
@@ -1,4 +1,6 @@
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_imu_attitude_to_tf-0.5.1.ebuild 489 BLAKE2B 87ae6a5a1329bf0dcaac0641fcfd4a51ba389f7c36b25a1cdc65da62787b603c004f54bd357a9c465416a31459da5f12ac7010e8cb743cc2c06819253a59380e SHA512 8ab2f10403298a8b34c849c3156a01c7d8f0fc1e3813f6ec86bd11d8fbd245db8f443bc8192e6b05367b72c402085cb1cf00872eff96c791bf1ed5a138e4bee9
+EBUILD hector_imu_attitude_to_tf-0.5.2.ebuild 489 BLAKE2B 87ae6a5a1329bf0dcaac0641fcfd4a51ba389f7c36b25a1cdc65da62787b603c004f54bd357a9c465416a31459da5f12ac7010e8cb743cc2c06819253a59380e SHA512 8ab2f10403298a8b34c849c3156a01c7d8f0fc1e3813f6ec86bd11d8fbd245db8f443bc8192e6b05367b72c402085cb1cf00872eff96c791bf1ed5a138e4bee9
 EBUILD hector_imu_attitude_to_tf-9999.ebuild 489 BLAKE2B a24246dc0be0680b78059fd194246a0ba24b92ab2b83b087345f2263e5abe7bf319fca117b5af771604a745bc7ef4066cc38af154a25b81fdabc8c089485dd06 SHA512 a448d96cbdc03f40c676489151ef8fdc4197f50f063fe1c3b2b9a07788465155a561502cacd2a17eaef167664aa73b62cca98c1a12fe99cd8a78b627633bbaa1
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.2.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.2.ebuild
new file mode 100644
index 000000000000..bf058d3517e9
--- /dev/null
+++ b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.5.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Publish the roll/pitch attitude angles reported via a imu message to tf"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_imu_tools/Manifest b/dev-ros/hector_imu_tools/Manifest
index 9346fb0099b6..3af0e17a8a74 100644
--- a/dev-ros/hector_imu_tools/Manifest
+++ b/dev-ros/hector_imu_tools/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_imu_tools-0.4.1.ebuild 554 BLAKE2B 0dfd89a98f03a0e9d388af31d9e0ada1f2e5cd40102df57ad5b5e1ef9abf5b9ddfe02feab1be018ae801780493f40def54e1c7a74787d05e05384aa16d5e3b35 SHA512 74b673fc4d1ccb486020d20c2bca9cf62402df7a8f164c20206746b27bc829c2d5bf165cbc36aab130469fe225ddc6813c3d7f4fb6f7fdb77e5f8ca3b3fcc224
 EBUILD hector_imu_tools-0.5.0.ebuild 554 BLAKE2B bba7ee3b50a7f033a4621aeb15e7373e09d668bfdf514312394d6e3eb2f8470c46c07fb46e97d37c79b66da1d58dbc76e385e3189299d00e7775c7ffb8f35a8e SHA512 25eed480895c7ff02ded5bdef18cc2bffc3b813afbdd8e93e7df4a7b74f8c9e257ef1f4b7d2f77fe9445035b6f03d649cce838331d139ab77f3abce8c7613c80
 EBUILD hector_imu_tools-0.5.1.ebuild 554 BLAKE2B bba7ee3b50a7f033a4621aeb15e7373e09d668bfdf514312394d6e3eb2f8470c46c07fb46e97d37c79b66da1d58dbc76e385e3189299d00e7775c7ffb8f35a8e SHA512 25eed480895c7ff02ded5bdef18cc2bffc3b813afbdd8e93e7df4a7b74f8c9e257ef1f4b7d2f77fe9445035b6f03d649cce838331d139ab77f3abce8c7613c80
+EBUILD hector_imu_tools-0.5.2.ebuild 554 BLAKE2B bba7ee3b50a7f033a4621aeb15e7373e09d668bfdf514312394d6e3eb2f8470c46c07fb46e97d37c79b66da1d58dbc76e385e3189299d00e7775c7ffb8f35a8e SHA512 25eed480895c7ff02ded5bdef18cc2bffc3b813afbdd8e93e7df4a7b74f8c9e257ef1f4b7d2f77fe9445035b6f03d649cce838331d139ab77f3abce8c7613c80
 EBUILD hector_imu_tools-9999.ebuild 554 BLAKE2B 0dfd89a98f03a0e9d388af31d9e0ada1f2e5cd40102df57ad5b5e1ef9abf5b9ddfe02feab1be018ae801780493f40def54e1c7a74787d05e05384aa16d5e3b35 SHA512 74b673fc4d1ccb486020d20c2bca9cf62402df7a8f164c20206746b27bc829c2d5bf165cbc36aab130469fe225ddc6813c3d7f4fb6f7fdb77e5f8ca3b3fcc224
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-0.5.2.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.5.2.ebuild
new file mode 100644
index 000000000000..45f66eda01ab
--- /dev/null
+++ b/dev-ros/hector_imu_tools/hector_imu_tools-0.5.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for processing IMU messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_map_server/Manifest b/dev-ros/hector_map_server/Manifest
index 41abd0f5d1a3..0897c76039ed 100644
--- a/dev-ros/hector_map_server/Manifest
+++ b/dev-ros/hector_map_server/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_map_server-0.4.1.ebuild 608 BLAKE2B 4dfaecce739d51f09f664ea6aab55d4e5b7c5af6f10ca5b715f430ac5de47427ce354808ff4632d660051450069680ffdf1bbbd02e8108ec1f6c12f4f2593d96 SHA512 38b0ccc36ba5eb4720a75fc580872221c13c786fed08a76ec234549b5369aee94ab44221b22084656bd30c7474b037f5c4770b50c25b28e1a6d5857ea8f9b2b4
 EBUILD hector_map_server-0.5.0.ebuild 608 BLAKE2B a4a7ff8c2624057048dc4c626a9f8f7c070b064bb6806399f07d1ce68f9319793b157df5fe1ab16b1e30f213087a87cb8e7486fe2b401aad23297b088f9b9df7 SHA512 5861f9c1e774934b89f2d4ad70818a63e74d1693a643c38716abd473de926273e84c92c22c515b35cd24ace95b29b516aed1a1c97f1c7fb9111d2f67dc568246
 EBUILD hector_map_server-0.5.1.ebuild 608 BLAKE2B a4a7ff8c2624057048dc4c626a9f8f7c070b064bb6806399f07d1ce68f9319793b157df5fe1ab16b1e30f213087a87cb8e7486fe2b401aad23297b088f9b9df7 SHA512 5861f9c1e774934b89f2d4ad70818a63e74d1693a643c38716abd473de926273e84c92c22c515b35cd24ace95b29b516aed1a1c97f1c7fb9111d2f67dc568246
+EBUILD hector_map_server-0.5.2.ebuild 608 BLAKE2B a4a7ff8c2624057048dc4c626a9f8f7c070b064bb6806399f07d1ce68f9319793b157df5fe1ab16b1e30f213087a87cb8e7486fe2b401aad23297b088f9b9df7 SHA512 5861f9c1e774934b89f2d4ad70818a63e74d1693a643c38716abd473de926273e84c92c22c515b35cd24ace95b29b516aed1a1c97f1c7fb9111d2f67dc568246
 EBUILD hector_map_server-9999.ebuild 608 BLAKE2B 4dfaecce739d51f09f664ea6aab55d4e5b7c5af6f10ca5b715f430ac5de47427ce354808ff4632d660051450069680ffdf1bbbd02e8108ec1f6c12f4f2593d96 SHA512 38b0ccc36ba5eb4720a75fc580872221c13c786fed08a76ec234549b5369aee94ab44221b22084656bd30c7474b037f5c4770b50c25b28e1a6d5857ea8f9b2b4
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_map_server/hector_map_server-0.5.2.ebuild b/dev-ros/hector_map_server/hector_map_server-0.5.2.ebuild
new file mode 100644
index 000000000000..c3cd30cb4ede
--- /dev/null
+++ b/dev-ros/hector_map_server/hector_map_server-0.5.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Service for retrieving the map, as well as for raycasting based obstacle queries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hector_map_tools
+	dev-ros/hector_marker_drawing
+	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_map_tools/Manifest b/dev-ros/hector_map_tools/Manifest
index ae0e72da3b18..2b7b61c99afe 100644
--- a/dev-ros/hector_map_tools/Manifest
+++ b/dev-ros/hector_map_tools/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_map_tools-0.4.1.ebuild 454 BLAKE2B f988377cebb5870bda67ee924fce553976f1d8ed9e387e563e3d2d80b6860eacf176a08134cccf6c64af70db905e38b7941abf2ede5be5a5920f1fe366fce6d1 SHA512 96821180f2533ca08da654b7c371c53f69222fff9fdf35414e45d6070b105594d3fbedf6c1063ec24dafbb14065a5ce39bd3e0c0ec56d267adf8a3d3161b9f44
 EBUILD hector_map_tools-0.5.0.ebuild 454 BLAKE2B 625717054377d325d39ab7c7f3023470cbc82db925d748ac819b71698cfbe9be30a3e1e9ab03186cd42261a3b7a5a53aa60dbee4238c55df326f6d9e76755bd4 SHA512 a82c5e914939b8448f849e244733aea929d1ff55ecb1350bb6dd7101f866b9c5ae3094381eb1b06adec6180de35a3b3cb2f18eaff1bb885f3c5a0e91de767b85
 EBUILD hector_map_tools-0.5.1.ebuild 454 BLAKE2B 625717054377d325d39ab7c7f3023470cbc82db925d748ac819b71698cfbe9be30a3e1e9ab03186cd42261a3b7a5a53aa60dbee4238c55df326f6d9e76755bd4 SHA512 a82c5e914939b8448f849e244733aea929d1ff55ecb1350bb6dd7101f866b9c5ae3094381eb1b06adec6180de35a3b3cb2f18eaff1bb885f3c5a0e91de767b85
+EBUILD hector_map_tools-0.5.2.ebuild 454 BLAKE2B 625717054377d325d39ab7c7f3023470cbc82db925d748ac819b71698cfbe9be30a3e1e9ab03186cd42261a3b7a5a53aa60dbee4238c55df326f6d9e76755bd4 SHA512 a82c5e914939b8448f849e244733aea929d1ff55ecb1350bb6dd7101f866b9c5ae3094381eb1b06adec6180de35a3b3cb2f18eaff1bb885f3c5a0e91de767b85
 EBUILD hector_map_tools-9999.ebuild 454 BLAKE2B f988377cebb5870bda67ee924fce553976f1d8ed9e387e563e3d2d80b6860eacf176a08134cccf6c64af70db905e38b7941abf2ede5be5a5920f1fe366fce6d1 SHA512 96821180f2533ca08da654b7c371c53f69222fff9fdf35414e45d6070b105594d3fbedf6c1063ec24dafbb14065a5ce39bd3e0c0ec56d267adf8a3d3161b9f44
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_map_tools/hector_map_tools-0.5.2.ebuild b/dev-ros/hector_map_tools/hector_map_tools-0.5.2.ebuild
new file mode 100644
index 000000000000..85ada002eff2
--- /dev/null
+++ b/dev-ros/hector_map_tools/hector_map_tools-0.5.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Functions related to accessing information from OccupancyGridMap maps"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+"
diff --git a/dev-ros/hector_mapping/Manifest b/dev-ros/hector_mapping/Manifest
index d7bf758af933..76d1828ff4a3 100644
--- a/dev-ros/hector_mapping/Manifest
+++ b/dev-ros/hector_mapping/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_mapping-0.4.1-r1.ebuild 648 BLAKE2B 9fdd9615a1a25d83d02d7ae441eac222526c48e2b5a4563216a49233033207fb0a11037eae2c398d731183bc2f229bcee43fdcff92ea1d1d00bfcc52831a89dc SHA512 7c68f83d7aa3ff2b3ec24c3e30cd3a88a513a78767dbc6e1ec72ee31b7cd6e8213f284ee47e051d799801396063053063b481cc55d05ea2465be05a2bbbbe936
 EBUILD hector_mapping-0.5.0-r1.ebuild 648 BLAKE2B 9fdd9615a1a25d83d02d7ae441eac222526c48e2b5a4563216a49233033207fb0a11037eae2c398d731183bc2f229bcee43fdcff92ea1d1d00bfcc52831a89dc SHA512 7c68f83d7aa3ff2b3ec24c3e30cd3a88a513a78767dbc6e1ec72ee31b7cd6e8213f284ee47e051d799801396063053063b481cc55d05ea2465be05a2bbbbe936
 EBUILD hector_mapping-0.5.1-r1.ebuild 648 BLAKE2B 9fdd9615a1a25d83d02d7ae441eac222526c48e2b5a4563216a49233033207fb0a11037eae2c398d731183bc2f229bcee43fdcff92ea1d1d00bfcc52831a89dc SHA512 7c68f83d7aa3ff2b3ec24c3e30cd3a88a513a78767dbc6e1ec72ee31b7cd6e8213f284ee47e051d799801396063053063b481cc55d05ea2465be05a2bbbbe936
+EBUILD hector_mapping-0.5.2.ebuild 648 BLAKE2B 9fdd9615a1a25d83d02d7ae441eac222526c48e2b5a4563216a49233033207fb0a11037eae2c398d731183bc2f229bcee43fdcff92ea1d1d00bfcc52831a89dc SHA512 7c68f83d7aa3ff2b3ec24c3e30cd3a88a513a78767dbc6e1ec72ee31b7cd6e8213f284ee47e051d799801396063053063b481cc55d05ea2465be05a2bbbbe936
 EBUILD hector_mapping-9999.ebuild 648 BLAKE2B 9fdd9615a1a25d83d02d7ae441eac222526c48e2b5a4563216a49233033207fb0a11037eae2c398d731183bc2f229bcee43fdcff92ea1d1d00bfcc52831a89dc SHA512 7c68f83d7aa3ff2b3ec24c3e30cd3a88a513a78767dbc6e1ec72ee31b7cd6e8213f284ee47e051d799801396063053063b481cc55d05ea2465be05a2bbbbe936
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_mapping/hector_mapping-0.5.2.ebuild b/dev-ros/hector_mapping/hector_mapping-0.5.2.ebuild
new file mode 100644
index 000000000000..f3266ab2140e
--- /dev/null
+++ b/dev-ros/hector_mapping/hector_mapping-0.5.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="SLAM that can be used without odometry and on platforms that exhibit roll/pitch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/message_filters
+	dev-ros/laser_geometry
+	dev-ros/tf_conversions
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/Manifest b/dev-ros/hector_marker_drawing/Manifest
index 339dac25ff56..0db0b1157dbf 100644
--- a/dev-ros/hector_marker_drawing/Manifest
+++ b/dev-ros/hector_marker_drawing/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_marker_drawing-0.4.1.ebuild 479 BLAKE2B 3641cecc731f6febb3d0ca4bc5ae00a766f3f81b409aba8071cf0c3efb75e950cea35a92993e553eebc928570866fbd6a4c7857369ec3380020519e939bd002b SHA512 e5cfe9dc3e4ee8a2014f297558da44aa894dfd3bef625dde73177093402bee90d83750f80216ca758aebdce0adebaf726d9cbafb98d3eeee0b049e9a7732efa9
 EBUILD hector_marker_drawing-0.5.0.ebuild 479 BLAKE2B e0f047bd9e77c0d7bbb88edba6ba67da9e663bd30da649ddfbfe43c73c0d46a0da880a98c185301dc22e44a98232806367c64ba20da641dd54c24440c897418a SHA512 3523bea52c2b61ef7f8b6bdb622f7e04bcd3364575877ca91eed533b05cbaaf6e004f735e732628e7756ce5ee1aede1f733d2895efee53593c37390b67216416
 EBUILD hector_marker_drawing-0.5.1.ebuild 479 BLAKE2B e0f047bd9e77c0d7bbb88edba6ba67da9e663bd30da649ddfbfe43c73c0d46a0da880a98c185301dc22e44a98232806367c64ba20da641dd54c24440c897418a SHA512 3523bea52c2b61ef7f8b6bdb622f7e04bcd3364575877ca91eed533b05cbaaf6e004f735e732628e7756ce5ee1aede1f733d2895efee53593c37390b67216416
+EBUILD hector_marker_drawing-0.5.2.ebuild 479 BLAKE2B e0f047bd9e77c0d7bbb88edba6ba67da9e663bd30da649ddfbfe43c73c0d46a0da880a98c185301dc22e44a98232806367c64ba20da641dd54c24440c897418a SHA512 3523bea52c2b61ef7f8b6bdb622f7e04bcd3364575877ca91eed533b05cbaaf6e004f735e732628e7756ce5ee1aede1f733d2895efee53593c37390b67216416
 EBUILD hector_marker_drawing-9999.ebuild 479 BLAKE2B 3641cecc731f6febb3d0ca4bc5ae00a766f3f81b409aba8071cf0c3efb75e950cea35a92993e553eebc928570866fbd6a4c7857369ec3380020519e939bd002b SHA512 e5cfe9dc3e4ee8a2014f297558da44aa894dfd3bef625dde73177093402bee90d83750f80216ca758aebdce0adebaf726d9cbafb98d3eeee0b049e9a7732efa9
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.2.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.2.ebuild
new file mode 100644
index 000000000000..693076a81b34
--- /dev/null
+++ b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.5.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Convenience functions for easier publishing of visualization markers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+"
+DEPEND="${RDEPEND}
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_nav_msgs/Manifest b/dev-ros/hector_nav_msgs/Manifest
index 9cd84bcf9808..a7f4e2b5c5c5 100644
--- a/dev-ros/hector_nav_msgs/Manifest
+++ b/dev-ros/hector_nav_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_nav_msgs-0.5.1.ebuild 483 BLAKE2B 8c8677bd9f062ac3b2a1cfb8ee1e39b116e6e8705854d65cd1a7fd097a71058a4b202c6e11d2f9397c7172e34f08ef7fe3858df23f3e41b05d7da44cc47749e9 SHA512 1e28ec392c967794b94b7a7d76fe7d91f6240536571e11726fa69d057825ecad70a7a4c8c5b17538b8d5e80c1791f3fc4a48fb19e120882b29ffdc01cdb1210e
+EBUILD hector_nav_msgs-0.5.2.ebuild 483 BLAKE2B 8c8677bd9f062ac3b2a1cfb8ee1e39b116e6e8705854d65cd1a7fd097a71058a4b202c6e11d2f9397c7172e34f08ef7fe3858df23f3e41b05d7da44cc47749e9 SHA512 1e28ec392c967794b94b7a7d76fe7d91f6240536571e11726fa69d057825ecad70a7a4c8c5b17538b8d5e80c1791f3fc4a48fb19e120882b29ffdc01cdb1210e
 EBUILD hector_nav_msgs-9999.ebuild 483 BLAKE2B 8c8677bd9f062ac3b2a1cfb8ee1e39b116e6e8705854d65cd1a7fd097a71058a4b202c6e11d2f9397c7172e34f08ef7fe3858df23f3e41b05d7da44cc47749e9 SHA512 1e28ec392c967794b94b7a7d76fe7d91f6240536571e11726fa69d057825ecad70a7a4c8c5b17538b8d5e80c1791f3fc4a48fb19e120882b29ffdc01cdb1210e
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.2.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.2.ebuild
new file mode 100644
index 000000000000..44844ddc3e42
--- /dev/null
+++ b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.5.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages and services used in the hector_slam stack"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_slam_launch/Manifest b/dev-ros/hector_slam_launch/Manifest
index 023fffe55981..f25906ae6322 100644
--- a/dev-ros/hector_slam_launch/Manifest
+++ b/dev-ros/hector_slam_launch/Manifest
@@ -1,4 +1,6 @@
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_slam_launch-0.5.1.ebuild 519 BLAKE2B 856ffe79ddd20a5f0615bb9bd3c41472cecf848ee2fb50170b77aeb4f949dcda7a24e34733e6eeb407f9a4824f4e96422f488998785cd8f181b13da499c76709 SHA512 aebddccbb45ffe300f449718a1515eb21324fef3a12a5b67ae969b5a25e0a0dc191a780b3daa6fe24bc7de0204f6f90b1b344f9f6d07cc562cbabffbc1dc50de
+EBUILD hector_slam_launch-0.5.2.ebuild 519 BLAKE2B 856ffe79ddd20a5f0615bb9bd3c41472cecf848ee2fb50170b77aeb4f949dcda7a24e34733e6eeb407f9a4824f4e96422f488998785cd8f181b13da499c76709 SHA512 aebddccbb45ffe300f449718a1515eb21324fef3a12a5b67ae969b5a25e0a0dc191a780b3daa6fe24bc7de0204f6f90b1b344f9f6d07cc562cbabffbc1dc50de
 EBUILD hector_slam_launch-9999.ebuild 519 BLAKE2B 53190caf679c2f36115cb1c74a21ec8d8c967797d708071d14442f60e86fc9ef74d1e091da8f532a79b9f0b6f2763ec2caf7e77b359f4b5ffd1b7400ff3c17b5 SHA512 c718a7784284dc5de1b80f9c3f5ff7813f13fb473beb4defb739a31bd88ebf82b7dd4a095cb78cc2f6186ee8eaae61f0739034579ddef903a38dfb6b96f94720
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.5.2.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.5.2.ebuild
new file mode 100644
index 000000000000..aaf43b374170
--- /dev/null
+++ b/dev-ros/hector_slam_launch/hector_slam_launch-0.5.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files for launching hector_slam with different robot scenarios"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	dev-ros/hector_mapping
+	dev-ros/hector_map_server
+	dev-ros/hector_trajectory_server
+	dev-ros/hector_geotiff
+	dev-ros/hector_geotiff_plugins
+"
diff --git a/dev-ros/hector_trajectory_server/Manifest b/dev-ros/hector_trajectory_server/Manifest
index a45478c3c5df..318ec12f1314 100644
--- a/dev-ros/hector_trajectory_server/Manifest
+++ b/dev-ros/hector_trajectory_server/Manifest
@@ -1,8 +1,10 @@
 DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 DIST hector_slam-0.5.0.tar.gz 160320 BLAKE2B 9109b81740296aada8b0987d153774ac547cf063546973e8034849a5c81117c10047c12ca65f15feae5355c35a6e746cbf0ab8fa2089d282beb1f7aa06528254 SHA512 d9d7e0e7de96330358bcd98de2083ee67e0d232d6758599291607951696aef5dd93b335252448ddec59202627f69fd5a9122c0f3a2829744b4b6417906aab3ed
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_trajectory_server-0.4.1.ebuild 558 BLAKE2B 55da0649badf7ecc0a20d71ae38aedea7e75ea85d89058e637afa9321f121f8375e96c40a6dae2a7602163c4feec91b95228c20e97270463946214f81bd037b5 SHA512 ded21b655ef93b8793c48e9d36fdc4a07499a4e47105c49e65e2b8df07568ef0145d1e2623b54f49152aa37f5be20ff2529ae47bc84f7ba3d91fc14437a490c8
 EBUILD hector_trajectory_server-0.5.0.ebuild 558 BLAKE2B b71f5a989550f8fc6d88f525564cec0d8c4c41bb5d935f02f2d5ec0e0d5b4b424851e43d13a49cd730c30633ba9349e76fdfdbc94b07da4916bff414d962f0fa SHA512 2ac81db7df2c2861e8811f185d7742766be4a104d321784fda100fd16169f80f37d2cc1b93d3908e0eeab767853101f05f539e9965f68adea86591789648271e
 EBUILD hector_trajectory_server-0.5.1.ebuild 558 BLAKE2B b71f5a989550f8fc6d88f525564cec0d8c4c41bb5d935f02f2d5ec0e0d5b4b424851e43d13a49cd730c30633ba9349e76fdfdbc94b07da4916bff414d962f0fa SHA512 2ac81db7df2c2861e8811f185d7742766be4a104d321784fda100fd16169f80f37d2cc1b93d3908e0eeab767853101f05f539e9965f68adea86591789648271e
+EBUILD hector_trajectory_server-0.5.2.ebuild 558 BLAKE2B b71f5a989550f8fc6d88f525564cec0d8c4c41bb5d935f02f2d5ec0e0d5b4b424851e43d13a49cd730c30633ba9349e76fdfdbc94b07da4916bff414d962f0fa SHA512 2ac81db7df2c2861e8811f185d7742766be4a104d321784fda100fd16169f80f37d2cc1b93d3908e0eeab767853101f05f539e9965f68adea86591789648271e
 EBUILD hector_trajectory_server-9999.ebuild 558 BLAKE2B 55da0649badf7ecc0a20d71ae38aedea7e75ea85d89058e637afa9321f121f8375e96c40a6dae2a7602163c4feec91b95228c20e97270463946214f81bd037b5 SHA512 ded21b655ef93b8793c48e9d36fdc4a07499a4e47105c49e65e2b8df07568ef0145d1e2623b54f49152aa37f5be20ff2529ae47bc84f7ba3d91fc14437a490c8
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.2.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.2.ebuild
new file mode 100644
index 000000000000..0a7151550c78
--- /dev/null
+++ b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.5.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Keeps track of tf trajectories and makes this data accessible"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hector_map_tools
+	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_cb_detector/Manifest b/dev-ros/image_cb_detector/Manifest
index c6c2b6c8b55f..67acad4e901d 100644
--- a/dev-ros/image_cb_detector/Manifest
+++ b/dev-ros/image_cb_detector/Manifest
@@ -1,7 +1,7 @@
-AUX boost170.patch 551 BLAKE2B c98a11a8faa4c22d78e991bfa911b13bcf66fe3b8b8be2efce6ba723eb1a2226de9d73186c05073bf6b12f360a160f9fe00fe24f8c9e71120abbc58252d02a6b SHA512 e75225d990f7c56522b244f95bf812df565394a3a586b4d71032fb164ae77f351f43ed27af29aa4aed0f40e4ec613600f16a10281f47223b5cf65b2860df7777
 AUX c11.patch 587 BLAKE2B 2cf07b3b5eebf9840bd45aa419283cc53e03dc45c5cf4eab6cd5894143983c7cb05146c9242c91ac105c90bba8d878ff8da4776629f04fc3f32b5290aa59fd87 SHA512 1ae09e987fb231400594019832f8a6d42ca1ebd07eafaca151d08812d8a4b62f95d4fadac0227c96d115c69da24bc3889f7d30af27000347ee000a937ae2b498
 AUX gcc6.patch 495 BLAKE2B 50ac60a74148e3e32b2a69750cad6d98ce2ecef22ed4462431821075f6e247290e28b8d57b58b4b86a7cb9600988a8e22ea2aa5508da6dd6ac85a93aac197ad1 SHA512 5b99edada624eabd4830997677ebb4916c6a9a3c631eead6ae723985e3ce5a0f3b77c484777182a34e727dba869181d11002ba38cfb49cf20eb0832aca67f6bb
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD image_cb_detector-0.10.14-r2.ebuild 978 BLAKE2B af4bab5f3112e05db7a08a986c45f0452d0d6b664951e41d30f9caffce2009bd252269fb3fcb27011b086e63e83cfc5f5728b617d5c6cfa5ae069f502f6035fb SHA512 18d98b0ed798270184200e4cb351da57de993256e366960a7d87dd5616241f5fcc63e29ff0e0bd83014c33fdc85d29ed3673006a5b1f449ade8301cb11b41e6e
-EBUILD image_cb_detector-9999.ebuild 978 BLAKE2B af4bab5f3112e05db7a08a986c45f0452d0d6b664951e41d30f9caffce2009bd252269fb3fcb27011b086e63e83cfc5f5728b617d5c6cfa5ae069f502f6035fb SHA512 18d98b0ed798270184200e4cb351da57de993256e366960a7d87dd5616241f5fcc63e29ff0e0bd83014c33fdc85d29ed3673006a5b1f449ade8301cb11b41e6e
+AUX py3.patch 747 BLAKE2B 73764cc8fbf4d8bd418a1c632a2b24bd5c1a80c7de94f5e06fb8d8ad30fb62947d7a349a3deb717669ced272c7c88edf5b5aa48ad3101e1ec67c5747cb099bec SHA512 d4009bc0fd12c597356351cb12d0bf95c963c41b9fe339dcd24c0230c21fe2d0b1a17f1de389eed13fc99ac950eeb8446170199c166067f2c7bcfd2daabb34e2
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
+EBUILD image_cb_detector-0.10.15-r1.ebuild 973 BLAKE2B ab907c667d6362cbb1c7f94ed5779e45be611c142eb57ae8982bbb3975c90d549968bbea79c6895e41bb79eef28632f388b439ff171ed0c189589322f75ea215 SHA512 d92b9468016376bc8f1583390ce5e133946f0b9a9b819a3269915f40618578c3d86c45c60099cdebedc6061945c1dd48ae11f6488fc6d7624655c0c8fcc91902
+EBUILD image_cb_detector-9999.ebuild 973 BLAKE2B ab907c667d6362cbb1c7f94ed5779e45be611c142eb57ae8982bbb3975c90d549968bbea79c6895e41bb79eef28632f388b439ff171ed0c189589322f75ea215 SHA512 d92b9468016376bc8f1583390ce5e133946f0b9a9b819a3269915f40618578c3d86c45c60099cdebedc6061945c1dd48ae11f6488fc6d7624655c0c8fcc91902
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/image_cb_detector/files/boost170.patch b/dev-ros/image_cb_detector/files/boost170.patch
deleted file mode 100644
index f8ae562dadc5..000000000000
--- a/dev-ros/image_cb_detector/files/boost170.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: image_cb_detector/CMakeLists.txt
-===================================================================
---- image_cb_detector.orig/CMakeLists.txt
-+++ image_cb_detector/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 2.8.3)
- project(image_cb_detector)
- 
--find_package(Boost REQUIRED thread signals)
-+find_package(Boost REQUIRED thread)
- find_package(catkin REQUIRED actionlib actionlib_msgs calibration_msgs cv_bridge genmsg geometry_msgs image_transport message_filters roscpp sensor_msgs std_msgs)
- find_package(OpenCV REQUIRED)
- 
diff --git a/dev-ros/image_cb_detector/files/py3.patch b/dev-ros/image_cb_detector/files/py3.patch
new file mode 100644
index 000000000000..54475afd66dc
--- /dev/null
+++ b/dev-ros/image_cb_detector/files/py3.patch
@@ -0,0 +1,22 @@
+Index: image_cb_detector/src/image_cb_detector/cb_detector.py
+===================================================================
+--- image_cb_detector.orig/src/image_cb_detector/cb_detector.py
++++ image_cb_detector/src/image_cb_detector/cb_detector.py
+@@ -39,7 +39,7 @@ NAME = 'image_cb_detector_node'
+ import roslib; roslib.load_manifest(PKG)
+ 
+ import rospy
+-import cv
++import cv2 as cv
+ import math
+ 
+ from sensor_msgs.msg import Image
+@@ -130,7 +130,7 @@ class ImageCbDetectorNode:
+     #we need to convert the ros image to an opencv image
+     try:
+       image = self.bridge.imgmsg_to_cv(ros_image, "mono8")
+-    except CvBridgeError, e:
++    except CvBridgeError as e:
+       rospy.logerror("Error importing image %s" % e)
+       return
+ 
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r2.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r2.ebuild
deleted file mode 100644
index 505371176272..000000000000
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Extracts checkerboard corners from ROS images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
-	media-libs/opencv:=
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=[threads(+)]
-"
-DEPEND="${RDEPEND}
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild
new file mode 100644
index 000000000000..3cb98fba9da3
--- /dev/null
+++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.15-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Extracts checkerboard corners from ROS images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/cv_bridge[${PYTHON_SINGLE_USEDEP}]
+	media-libs/opencv:=
+	dev-ros/image_transport
+	dev-ros/message_filters
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
index 505371176272..3cb98fba9da3 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
@@ -30,4 +30,4 @@ DEPEND="${RDEPEND}
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/boost170.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/imu_complementary_filter/Manifest b/dev-ros/imu_complementary_filter/Manifest
index 62ae38a84fe4..85584e19f2d0 100644
--- a/dev-ros/imu_complementary_filter/Manifest
+++ b/dev-ros/imu_complementary_filter/Manifest
@@ -1,4 +1,6 @@
 DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
+DIST imu_tools-1.2.3.tar.gz 1656874 BLAKE2B d11a3d706ddd1eaae7562ca55ed25ade02dc79456ef8f99aa772e4dc6c6d38684d47175b3ffca3ca69e89aff1f02353379d2debfd53a03aa9a1eadd216a9dfe4 SHA512 b3c652836c049e096113ac075790ecb03fd8867b5702f83e52e5b97e41b1fecb448835ab9c8846b24104387e9148a1678c4d0b294885bc2472e8694dd090ba82
 EBUILD imu_complementary_filter-1.2.2.ebuild 587 BLAKE2B be25bfb649264fa13df02cb8a1b8a9711fba65c8c4ce8e6cc24cf7463f70860adf064508c5bfe1fbed6267c1708a8b5d093654ab679f93c41f1b6820d0657b0b SHA512 bee1c188cd555a4ac68c4edfb9665b19214bfc06d122cb51e1e2fd41d4fc27bc7c1977ab6b2be35653da842031a5bed1f7a14790bdc5031db564931bb27c696b
+EBUILD imu_complementary_filter-1.2.3.ebuild 587 BLAKE2B d0a18dee8ebd6a76e2402ec699ca2c57664720a0302dd3adb26d511075970046779908bac84a166f1cc444605c7d4e2e864101fc3d30b7d366a90c3bc8bbc422 SHA512 05fda7f83baeca40d3f21f7d0c8f9203782605ac0bac202e26323bf1b02f26aaec41fc3a1390e12718d89b24d0e6131b54567d1907c5dc8dd42e813b5761b1ce
 EBUILD imu_complementary_filter-9999.ebuild 587 BLAKE2B be25bfb649264fa13df02cb8a1b8a9711fba65c8c4ce8e6cc24cf7463f70860adf064508c5bfe1fbed6267c1708a8b5d093654ab679f93c41f1b6820d0657b0b SHA512 bee1c188cd555a4ac68c4edfb9665b19214bfc06d122cb51e1e2fd41d4fc27bc7c1977ab6b2be35653da842031a5bed1f7a14790bdc5031db564931bb27c696b
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.3.ebuild b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.3.ebuild
new file mode 100644
index 000000000000..6d1597fea89e
--- /dev/null
+++ b/dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/message_filters
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+BDEPEND="
+	dev-ros/cmake_modules
+"
diff --git a/dev-ros/imu_filter_madgwick/Manifest b/dev-ros/imu_filter_madgwick/Manifest
index 017253bbaddf..956c3e9e211d 100644
--- a/dev-ros/imu_filter_madgwick/Manifest
+++ b/dev-ros/imu_filter_madgwick/Manifest
@@ -1,4 +1,6 @@
 DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
+DIST imu_tools-1.2.3.tar.gz 1656874 BLAKE2B d11a3d706ddd1eaae7562ca55ed25ade02dc79456ef8f99aa772e4dc6c6d38684d47175b3ffca3ca69e89aff1f02353379d2debfd53a03aa9a1eadd216a9dfe4 SHA512 b3c652836c049e096113ac075790ecb03fd8867b5702f83e52e5b97e41b1fecb448835ab9c8846b24104387e9148a1678c4d0b294885bc2472e8694dd090ba82
 EBUILD imu_filter_madgwick-1.2.2-r2.ebuild 779 BLAKE2B 25cc5ad6c562ec09fafd6d67682f64e35fbb056b737897d3907d356b4f86f621b046228510cea4c3e56f1a424c29bbfe4f6cbb11ebd45a9c98ea2ef63659b59a SHA512 6013ebfb4c8069db28619969ebc9cf5bd94896c6c47784ac236e31ad9f7ed3a6933cd6d4c0992350890703e9254ec32a6a1275987c608b69c3b86fc8a81ec7cb
+EBUILD imu_filter_madgwick-1.2.3.ebuild 779 BLAKE2B 25cc5ad6c562ec09fafd6d67682f64e35fbb056b737897d3907d356b4f86f621b046228510cea4c3e56f1a424c29bbfe4f6cbb11ebd45a9c98ea2ef63659b59a SHA512 6013ebfb4c8069db28619969ebc9cf5bd94896c6c47784ac236e31ad9f7ed3a6933cd6d4c0992350890703e9254ec32a6a1275987c608b69c3b86fc8a81ec7cb
 EBUILD imu_filter_madgwick-9999.ebuild 779 BLAKE2B 25cc5ad6c562ec09fafd6d67682f64e35fbb056b737897d3907d356b4f86f621b046228510cea4c3e56f1a424c29bbfe4f6cbb11ebd45a9c98ea2ef63659b59a SHA512 6013ebfb4c8069db28619969ebc9cf5bd94896c6c47784ac236e31ad9f7ed3a6933cd6d4c0992350890703e9254ec32a6a1275987c608b69c3b86fc8a81ec7cb
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.3.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.3.ebuild
new file mode 100644
index 000000000000..9c8ff8ebace4
--- /dev/null
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Fuses angular velocities, accelerations, and magnetic readings from an IMU"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs
+	dev-ros/tf2_ros
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+	dev-ros/pluginlib
+	dev-ros/message_filters
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rosunit
+		dev-cpp/gtest
+	)
+"
diff --git a/dev-ros/interval_intersection/Manifest b/dev-ros/interval_intersection/Manifest
index c1bad0344681..261e0e473b49 100644
--- a/dev-ros/interval_intersection/Manifest
+++ b/dev-ros/interval_intersection/Manifest
@@ -1,4 +1,6 @@
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD interval_intersection-0.10.14-r1.ebuild 706 BLAKE2B 1bd3d95736cea60b8971ba06d5c05b30de0e39afd58d56d5ae8beac93f8dfa7d30801fee5adad585c96e5f6365dc81172f11a93743ccbd428b139a786af96f5c SHA512 09615189a77667409d10e69b19859e9367dfc75322294a71c56cfe56dfeed651e460b78e31238d5755a7b745fe147c973ec63f08107a9ef8af2768e6c4e7f4c4
+EBUILD interval_intersection-0.10.15.ebuild 706 BLAKE2B 1bd3d95736cea60b8971ba06d5c05b30de0e39afd58d56d5ae8beac93f8dfa7d30801fee5adad585c96e5f6365dc81172f11a93743ccbd428b139a786af96f5c SHA512 09615189a77667409d10e69b19859e9367dfc75322294a71c56cfe56dfeed651e460b78e31238d5755a7b745fe147c973ec63f08107a9ef8af2768e6c4e7f4c4
 EBUILD interval_intersection-9999.ebuild 706 BLAKE2B 1bd3d95736cea60b8971ba06d5c05b30de0e39afd58d56d5ae8beac93f8dfa7d30801fee5adad585c96e5f6365dc81172f11a93743ccbd428b139a786af96f5c SHA512 09615189a77667409d10e69b19859e9367dfc75322294a71c56cfe56dfeed651e460b78e31238d5755a7b745fe147c973ec63f08107a9ef8af2768e6c4e7f4c4
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/interval_intersection/interval_intersection-0.10.15.ebuild b/dev-ros/interval_intersection/interval_intersection-0.10.15.ebuild
new file mode 100644
index 000000000000..3d821a2d187a
--- /dev/null
+++ b/dev-ros/interval_intersection/interval_intersection-0.10.15.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for calculating the intersection of interval messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads(+)]
+	dev-ros/actionlib
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/roscpp_serialization
+	dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/joint_limits_interface/Manifest b/dev-ros/joint_limits_interface/Manifest
index bd62937f1854..eb74c98c74ce 100644
--- a/dev-ros/joint_limits_interface/Manifest
+++ b/dev-ros/joint_limits_interface/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
 DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD joint_limits_interface-0.19.1.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
 EBUILD joint_limits_interface-0.19.2.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
 EBUILD joint_limits_interface-0.19.3.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
 EBUILD joint_limits_interface-0.19.4.ebuild 548 BLAKE2B 590581b099ba0c3a93d8d2681a2bb63f0e1d1a648a4ae03eb34bb5ca3c167315e8b609a4d83cb7d2243715ea95fe7c53bdec11c65dd3fac70dd7512e8391569b SHA512 ea969f5ca1ce2a93b6961ea436318e3ef7af833ac7dafff4b6cdbc1d4d0227d386bfad5b11aa8ab1bbcc2ffc129a6f99a4e74b3bfb1eded44244e7e9edbc997f
+EBUILD joint_limits_interface-0.19.5.ebuild 548 BLAKE2B 590581b099ba0c3a93d8d2681a2bb63f0e1d1a648a4ae03eb34bb5ca3c167315e8b609a4d83cb7d2243715ea95fe7c53bdec11c65dd3fac70dd7512e8391569b SHA512 ea969f5ca1ce2a93b6961ea436318e3ef7af833ac7dafff4b6cdbc1d4d0227d386bfad5b11aa8ab1bbcc2ffc129a6f99a4e74b3bfb1eded44244e7e9edbc997f
 EBUILD joint_limits_interface-9999.ebuild 548 BLAKE2B 82cb562202e8dafa222ce16731fdf3c710af5c26ef2b7ffb10dc65598da75fee4323c9b2c894dd1a3fcda796319b0607f3dc6d01cf3b087427872da98f50d91b SHA512 c6d37bfa6ac8ad51a4fc114e54558f30cb90c7390c876b6dd6c649c29e26e0d40d27f47ac6079a9f27abb7a0aa78322e35a69ac638631122886244eccaa5f944
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.19.5.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.5.ebuild
new file mode 100644
index 000000000000..3d396fd3f3f1
--- /dev/null
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-0.19.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Interface for enforcing joint limits"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/hardware_interface
+	dev-libs/urdfdom
+	dev-ros/urdf
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest dev-cpp/gtest )"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/joint_states_settler/Manifest b/dev-ros/joint_states_settler/Manifest
index f13b901416f3..25cb1ae2c806 100644
--- a/dev-ros/joint_states_settler/Manifest
+++ b/dev-ros/joint_states_settler/Manifest
@@ -1,5 +1,7 @@
 AUX gcc6.patch 459 BLAKE2B eadc7eb78eb79bff30535776516bed691354706192fe196107efd319b357f8b0c361bbd70492f37525137c78399954681e4ab8eaf48cfe71903785b5f889765a SHA512 dca02dec9e53395941bcb263d88b3a96ef1437315431d242ffcfa7768a2b0c4d5ec394db5c7e7d2dbe46750264adce5e7032caa207e912ec7dedbcad9c345519
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD joint_states_settler-0.10.14-r1.ebuild 690 BLAKE2B b2eed3848302174a0b603edf9807ded20c261d8e1d272f00bd959e586e8f8e07098032b876b26873109da10236d277b175d08ee4800a5c67d0b3d1d3dcd6dde8 SHA512 3d3b85004b5f7882a4d1c6c27322f5a8eeff840f0e92a70e64e981be4687c0117788c5d71313a927525fbed553c9ce7fed1d8b4b349e203a702b8b9929df295b
+EBUILD joint_states_settler-0.10.15.ebuild 690 BLAKE2B b2eed3848302174a0b603edf9807ded20c261d8e1d272f00bd959e586e8f8e07098032b876b26873109da10236d277b175d08ee4800a5c67d0b3d1d3dcd6dde8 SHA512 3d3b85004b5f7882a4d1c6c27322f5a8eeff840f0e92a70e64e981be4687c0117788c5d71313a927525fbed553c9ce7fed1d8b4b349e203a702b8b9929df295b
 EBUILD joint_states_settler-9999.ebuild 690 BLAKE2B b2eed3848302174a0b603edf9807ded20c261d8e1d272f00bd959e586e8f8e07098032b876b26873109da10236d277b175d08ee4800a5c67d0b3d1d3dcd6dde8 SHA512 3d3b85004b5f7882a4d1c6c27322f5a8eeff840f0e92a70e64e981be4687c0117788c5d71313a927525fbed553c9ce7fed1d8b4b349e203a702b8b9929df295b
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/joint_states_settler/joint_states_settler-0.10.15.ebuild b/dev-ros/joint_states_settler/joint_states_settler-0.10.15.ebuild
new file mode 100644
index 000000000000..287ce5956f88
--- /dev/null
+++ b/dev-ros/joint_states_settler/joint_states_settler-0.10.15.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Reports how long a subset of joints has been settled"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads(+)]
+	dev-ros/actionlib
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/roscpp_serialization
+	dev-ros/settlerlib
+"
+DEPEND="${RDEPEND}
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest
index 7e4df761d3f6..89dc269eaa12 100644
--- a/dev-ros/laser_cb_detector/Manifest
+++ b/dev-ros/laser_cb_detector/Manifest
@@ -1,8 +1,4 @@
-AUX boost170.patch 539 BLAKE2B 02288b4d5c3de5ef4290ce7ba4f8c46c95148ea2417c172f0ae90ec7604c7c08c3f8b9eebdbb4d9bf26f81011f996148db3fd0243b56ad77be7533282f9ecc0b SHA512 d2185960b22b9539f318c452e5bb95612e21156380183ed795142d87c9d1f8ca74c6bb08a2039138729767800cf6592b6bb64bf12db62166c8c3ee2176aec65d
-AUX gcc6.patch 461 BLAKE2B 2e745eb80783777fb510d763b1c3119e8fb89f2a7defd9a3a62ed902c9f9a5fcf973b032281049499aa7ea4b36569c5cba72ea89d74040580a8a06a2b99d2f5d SHA512 122b897b905cd9212f038887d23c6a4c9648bcdcf64231b400fcaff7aa7c3a4c731ede2d6d69d85949ca20905a3b166451bb4de7a9ad09b3ffc9b94eb2959702
-AUX ocv4-2.patch 1116 BLAKE2B 2de5c0aaf13b30ef81094fe70ca5634de8575817125e36217d3cf1944112b8944231dcef9b075990d113ec6e06b281a14d018328492693007a3ad581621d42ea SHA512 e1f93dcbd8b829bb0ad99d45295f13f4f791c9c92962aa39ef436b6b81b014fb52b022a231a942a28b266763e8374d80543c7c606a4cf7fecbc539930b630077
-AUX ocv4.patch 597 BLAKE2B 0b87de52c3a2fed94c32c47500a69f79d6d6861b5881d5ba357aeb9924be8356b204ceaf7ae9e14055048e7ddc6fb74751cadfd7a6e275b4115e793c5723f007 SHA512 711c26a8539facf376686e619c4a90cc77ae26480f3754edf5b04f0a14aaa861f14d58b19172e37fb4e501eb92883ff4173ae93d8ec5b31379eefb4a0fb2c1a1
-DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD laser_cb_detector-0.10.14-r1.ebuild 946 BLAKE2B ad5220e1d1888fe45724619cfd72cc886c104ef84cb230ed5803eb17ee9751bac0dc0b294b067b6fac321d97df9a2a8ee274dfed51b7deb768aace6839899850 SHA512 e70d4db4218d6b28e6aa026f88a9bc078577831ce5a19fb88728b63276affae0f9158a8c288dc0bc9f25df88152a280572503d1263076bd0de47fc539ab1d20d
-EBUILD laser_cb_detector-9999.ebuild 946 BLAKE2B ad5220e1d1888fe45724619cfd72cc886c104ef84cb230ed5803eb17ee9751bac0dc0b294b067b6fac321d97df9a2a8ee274dfed51b7deb768aace6839899850 SHA512 e70d4db4218d6b28e6aa026f88a9bc078577831ce5a19fb88728b63276affae0f9158a8c288dc0bc9f25df88152a280572503d1263076bd0de47fc539ab1d20d
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
+EBUILD laser_cb_detector-0.10.15.ebuild 828 BLAKE2B 632c1f262f1a40d3b369117e2a50a65f5d2b34d25b34dcd7ac446d43fe7fb10370eebcabd9f5098681b6fa27c8b5f185fbe814c4cdadf805590856edbb94f34e SHA512 602542e11685b5675a362ba2523f0987235d15a92f3538e7c0709ccc6d41f2534fce64ad3e96173ac3be6ca7fd0bd12401a70ebf5aafb857f5049379d33c779e
+EBUILD laser_cb_detector-9999.ebuild 828 BLAKE2B 632c1f262f1a40d3b369117e2a50a65f5d2b34d25b34dcd7ac446d43fe7fb10370eebcabd9f5098681b6fa27c8b5f185fbe814c4cdadf805590856edbb94f34e SHA512 602542e11685b5675a362ba2523f0987235d15a92f3538e7c0709ccc6d41f2534fce64ad3e96173ac3be6ca7fd0bd12401a70ebf5aafb857f5049379d33c779e
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/laser_cb_detector/files/boost170.patch b/dev-ros/laser_cb_detector/files/boost170.patch
deleted file mode 100644
index 019a948be95c..000000000000
--- a/dev-ros/laser_cb_detector/files/boost170.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: laser_cb_detector/CMakeLists.txt
-===================================================================
---- laser_cb_detector.orig/CMakeLists.txt
-+++ laser_cb_detector/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 2.8.3)
- project(laser_cb_detector)
- 
--find_package(Boost REQUIRED signals thread)
-+find_package(Boost REQUIRED thread)
- find_package(catkin REQUIRED actionlib actionlib_msgs cv_bridge image_cb_detector message_filters roscpp settlerlib std_msgs)
- 
- add_action_files(DIRECTORY action FILES Config.action)
diff --git a/dev-ros/laser_cb_detector/files/gcc6.patch b/dev-ros/laser_cb_detector/files/gcc6.patch
deleted file mode 100644
index 6580ca5e8453..000000000000
--- a/dev-ros/laser_cb_detector/files/gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: laser_cb_detector/CMakeLists.txt
-===================================================================
---- laser_cb_detector.orig/CMakeLists.txt
-+++ laser_cb_detector/CMakeLists.txt
-@@ -15,7 +15,7 @@ catkin_package(DEPENDS actionlib actionl
- )
- 
- find_package(OpenCV REQUIRED)
--include_directories(SYSTEM ${catkin_INCLUDE_DIRS}
-+include_directories(${catkin_INCLUDE_DIRS}
-                            ${OpenCV_INCLUDE_DIRS}
- )
- include_directories(include)
diff --git a/dev-ros/laser_cb_detector/files/ocv4-2.patch b/dev-ros/laser_cb_detector/files/ocv4-2.patch
deleted file mode 100644
index 3cc51c45d7dd..000000000000
--- a/dev-ros/laser_cb_detector/files/ocv4-2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: laser_cb_detector/test/laser_cb_detector_unittest.cpp
-===================================================================
---- laser_cb_detector.orig/test/laser_cb_detector_unittest.cpp
-+++ laser_cb_detector/test/laser_cb_detector_unittest.cpp
-@@ -37,7 +37,7 @@
- 
- #include <laser_cb_detector/ConfigGoal.h>
- #include <laser_cb_detector/laser_cb_detector.h>
--#include <opencv/highgui.h>
-+#include <opencv2/highgui.hpp>
- 
- using namespace laser_cb_detector;
- using namespace std;
-@@ -55,8 +55,9 @@ static const string test_path = xstr(TES
- 
- calibration_msgs::DenseLaserSnapshot getSnapshot(const string& filename)
- {
--  IplImage* image;
--  image = cvLoadImage(filename.c_str(), 0);         // 0 -> Force image to grayscale
-+  cv::Mat mat = cv::imread(filename.c_str(), 0);
-+  IplImage  image_v = cvIplImage(mat);
-+  IplImage* image = &image_v;
-   EXPECT_TRUE(image) << "could not open image file [" << filename << "]" << endl;
- 
- 
-@@ -92,7 +93,7 @@ calibration_msgs::DenseLaserSnapshot get
-   }
- 
-   cvReleaseImage(&float_image);
--  cvReleaseImage(&image);
-+  //cvReleaseImage(&image);
- 
-   return snapshot;
- }
diff --git a/dev-ros/laser_cb_detector/files/ocv4.patch b/dev-ros/laser_cb_detector/files/ocv4.patch
deleted file mode 100644
index 4bbb0005fda0..000000000000
--- a/dev-ros/laser_cb_detector/files/ocv4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: laser_cb_detector/include/laser_cb_detector/laser_cb_detector.h
-===================================================================
---- laser_cb_detector.orig/include/laser_cb_detector/laser_cb_detector.h
-+++ laser_cb_detector/include/laser_cb_detector/laser_cb_detector.h
-@@ -37,7 +37,7 @@
- #ifndef LASER_CB_DETECTOR_LASER_CB_DETECTOR_H_
- #define LASER_CB_DETECTOR_LASER_CB_DETECTOR_H_
- 
--#include <opencv/cv.h>
-+#include <opencv2/core/core_c.h>
- #include <calibration_msgs/DenseLaserSnapshot.h>
- #include <laser_cb_detector/ConfigAction.h>
- #include <laser_cb_detector/cv_laser_bridge.h>
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14-r1.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14-r1.ebuild
deleted file mode 100644
index 3f7c54d7040d..000000000000
--- a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14-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
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs	dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Extracts checkerboard corners from a dense laser snapshot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/image_cb_detector
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/settlerlib
-"
-DEPEND="${RDEPEND}
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-cpp/gtest
-		media-libs/opencv[png]
-	)
-"
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" "${FILESDIR}/ocv4-2.patch" )
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.15.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.15.ebuild
new file mode 100644
index 000000000000..993633f2ddf1
--- /dev/null
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.15.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs	dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Extracts checkerboard corners from a dense laser snapshot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads(+)]
+	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/image_cb_detector
+	dev-ros/message_filters
+	dev-ros/roscpp
+	dev-ros/settlerlib
+"
+DEPEND="${RDEPEND}
+	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-cpp/gtest
+		media-libs/opencv[png]
+	)
+"
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
index 3f7c54d7040d..993633f2ddf1 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
@@ -33,4 +33,3 @@ DEPEND="${RDEPEND}
 		media-libs/opencv[png]
 	)
 "
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" "${FILESDIR}/ocv4-2.patch" )
diff --git a/dev-ros/laser_filters/Manifest b/dev-ros/laser_filters/Manifest
index 032c774334a2..ca40c9b99032 100644
--- a/dev-ros/laser_filters/Manifest
+++ b/dev-ros/laser_filters/Manifest
@@ -1,5 +1,5 @@
 AUX eigen.patch 715 BLAKE2B dc12bfbb1eeba06624b70d0cab04a723288fd6740b66e8cba9d2e1108b050ab66efa361bc8a9f0455a338a228389d1b346401b77c94eec8b56dcfd51eabec2cc SHA512 f3cf4f9b2ddb8a6baff879e1eae5520c8db4da0b78b2d5af49b84cdde6b9a502cacb6eabfefb8ac36971ec1e86e673d8d0f7fca4e1c32d46001d2c693595dade
 DIST laser_filters-1.8.11.tar.gz 42303 BLAKE2B e5344b273ebe3f9ad75c32f15f15c69a241273def5b3a4b90e39b5a329f3d3a682f67e687c48da3d41c93db0fc94a39f31153ad23cbe1e4997139f57a4c34f75 SHA512 06833adfa96248e360f4bf1b267ddec6c9263296afe64eac3716014f53071ec8cedd8b73f93438d9072e3785843e2ba345f007036d680ba7f4fbd3b720f40b2e
-EBUILD laser_filters-1.8.11.ebuild 765 BLAKE2B c4208b0d5fcd0df3a66525007e8d33cd3c0bccccf61a29eeb6ee884e12f7b136ea16409f49155f67b84f6e7884e669b78463e23fa3706eb4b5642201bacdf177 SHA512 c55f5f9a74ef2c9384e0e95bba7d7fe72afd08165072270d94672f2a70545de9c826965e97daa87e9815589a88dcb56a6560899a4091c6f1b60bf6d3387fdaf4
-EBUILD laser_filters-9999.ebuild 765 BLAKE2B c4208b0d5fcd0df3a66525007e8d33cd3c0bccccf61a29eeb6ee884e12f7b136ea16409f49155f67b84f6e7884e669b78463e23fa3706eb4b5642201bacdf177 SHA512 c55f5f9a74ef2c9384e0e95bba7d7fe72afd08165072270d94672f2a70545de9c826965e97daa87e9815589a88dcb56a6560899a4091c6f1b60bf6d3387fdaf4
+EBUILD laser_filters-1.8.11.ebuild 790 BLAKE2B f87ec10f35ff25292877140b02ec92c0f0bb07460de6b9a7e9d8ec428c75e8e24c191c454e953a48760cb112e59c7fc1ee47d7539a33ca3e32f199ae0961b73e SHA512 d6f5c0bba524a4cfd1fe1eae580294fa43ddcbb7e14ed3a926144df930111e8413e8f08dfe2501c993ac11c46655094bff111abca7b81583f357df55d3b8fbda
+EBUILD laser_filters-9999.ebuild 790 BLAKE2B f87ec10f35ff25292877140b02ec92c0f0bb07460de6b9a7e9d8ec428c75e8e24c191c454e953a48760cb112e59c7fc1ee47d7539a33ca3e32f199ae0961b73e SHA512 d6f5c0bba524a4cfd1fe1eae580294fa43ddcbb7e14ed3a926144df930111e8413e8f08dfe2501c993ac11c46655094bff111abca7b81583f357df55d3b8fbda
 MISC metadata.xml 342 BLAKE2B 92f4937b0999d701af2eb4810e3d0d9d713fd0238fa57500e7bfdbfc1d602afdd51252b796c3a27c2eb8ea398330b04c3d1f78ca8f5c307bf5adfb4570c3db6b SHA512 4ab282060abc14838675f8d99f245894bec67f8e824191e666671bfc6134383c23853137cff023f59b81141aae204f282d3b40e779627c375609fc4223af8ec5
diff --git a/dev-ros/laser_filters/laser_filters-1.8.11.ebuild b/dev-ros/laser_filters/laser_filters-1.8.11.ebuild
index 6d0bb2a716e2..f673ce90a46a 100644
--- a/dev-ros/laser_filters/laser_filters-1.8.11.ebuild
+++ b/dev-ros/laser_filters/laser_filters-1.8.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-ros/laser_geometry
 	dev-ros/pluginlib
 	dev-ros/angles
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 
 	dev-libs/tinyxml2:=
 	dev-libs/console_bridge:=
diff --git a/dev-ros/laser_filters/laser_filters-9999.ebuild b/dev-ros/laser_filters/laser_filters-9999.ebuild
index 6d0bb2a716e2..f673ce90a46a 100644
--- a/dev-ros/laser_filters/laser_filters-9999.ebuild
+++ b/dev-ros/laser_filters/laser_filters-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
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-ros/laser_geometry
 	dev-ros/pluginlib
 	dev-ros/angles
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 
 	dev-libs/tinyxml2:=
 	dev-libs/console_bridge:=
diff --git a/dev-ros/laser_geometry/Manifest b/dev-ros/laser_geometry/Manifest
index ef716d6c5dc6..3e3b8c0daed7 100644
--- a/dev-ros/laser_geometry/Manifest
+++ b/dev-ros/laser_geometry/Manifest
@@ -1,4 +1,4 @@
-DIST laser_geometry-1.6.6.tar.gz 19050 BLAKE2B 852dc42b9ff3a6e262cac74441999de030f3cd35c0536859ebe253f270065a10a11f855299d81b1319949ff4ec775aa377d34894a1a889b4a0f9c0d8afe8eecf SHA512 4ffef2467c0bd6cfca6022308e97a766ab544705395d13863a1a5d924eda728a7473a58a57492db4ae8d503c0aef38d6747fefad8624a6f4b1b2b1e709919781
-EBUILD laser_geometry-1.6.6-r1.ebuild 917 BLAKE2B 9f2ed6850650978d16828ff2219032d3cb153014bd702d9dbd733704ae957298b31b213e1dbf2321e1beb80797afb57a5ba7ac8ca186328260395922029e5b8c SHA512 50463fda795f2bfadfc0617c1923b5ab2a55d7d63a75ad704f0ca47fb7f90cd783b5ff1aa127f94ad4f504081b749ec6c70d840dadd6e465da9d1303fd49a7c3
+DIST laser_geometry-1.6.7.tar.gz 19095 BLAKE2B 9ac9b1d24f26386e1e23e3ab75e1af18ae306670b5a86af2f547918327cd3fc9ec9140a3479c600ea799158617a9e4ce350f45f71db688aa2446edfaf04a5912 SHA512 7f6f887c3f8c4212adef90812fa877904e1e3fcf679df15cadca34a4ad451135be5086506eafee16682441c70df0d1c89fa90d2b365f5eed4f349ed741974c01
+EBUILD laser_geometry-1.6.7.ebuild 917 BLAKE2B 9f2ed6850650978d16828ff2219032d3cb153014bd702d9dbd733704ae957298b31b213e1dbf2321e1beb80797afb57a5ba7ac8ca186328260395922029e5b8c SHA512 50463fda795f2bfadfc0617c1923b5ab2a55d7d63a75ad704f0ca47fb7f90cd783b5ff1aa127f94ad4f504081b749ec6c70d840dadd6e465da9d1303fd49a7c3
 EBUILD laser_geometry-9999.ebuild 917 BLAKE2B 9f2ed6850650978d16828ff2219032d3cb153014bd702d9dbd733704ae957298b31b213e1dbf2321e1beb80797afb57a5ba7ac8ca186328260395922029e5b8c SHA512 50463fda795f2bfadfc0617c1923b5ab2a55d7d63a75ad704f0ca47fb7f90cd783b5ff1aa127f94ad4f504081b749ec6c70d840dadd6e465da9d1303fd49a7c3
 MISC metadata.xml 343 BLAKE2B a797ebc84630a2db52e772c1d06a4df97d824941660a1e3a1709ba0498c20bbd300e794ee550e47727bb6bfb1d836b08ec63729be7ae439696bfd1035e5ae707 SHA512 7d4f2ddb636794d8d0b493ea1ef5a06b2cfac3bb5fb18f6daf174f16d719d9ceea5eca29762596dca085c94d3e1ab7a49047a8410933505521f0dbceb8c50b9f
diff --git a/dev-ros/laser_geometry/laser_geometry-1.6.6-r1.ebuild b/dev-ros/laser_geometry/laser_geometry-1.6.7.ebuild
index e1b93a17bd7e..e1b93a17bd7e 100644
--- a/dev-ros/laser_geometry/laser_geometry-1.6.6-r1.ebuild
+++ b/dev-ros/laser_geometry/laser_geometry-1.6.7.ebuild
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
index 3b1f4c7762c8..bc6eeff3e259 100644
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@@ -1,8 +1,10 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
 DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
+DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
 EBUILD libmavconn-1.2.0.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
 EBUILD libmavconn-1.4.0.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
 EBUILD libmavconn-1.5.2.ebuild 454 BLAKE2B 271cc373da00c3224c4fe2cc1404ac7726ecbd24650dfea7535180ee38b76652bf85a23a23ac982a4b7ec5829a576e0476654b505f1ea2fc6c2762918fafc2f1 SHA512 f253d391930adf479b0bee734b185ef285dcf760e9c0f602779ff74b6f1a8f42e0800b2be634ed532d055b0eec402e64ead5f499a0341fe44b198ecd3c7aa1fb
+EBUILD libmavconn-1.8.0.ebuild 454 BLAKE2B 271cc373da00c3224c4fe2cc1404ac7726ecbd24650dfea7535180ee38b76652bf85a23a23ac982a4b7ec5829a576e0476654b505f1ea2fc6c2762918fafc2f1 SHA512 f253d391930adf479b0bee734b185ef285dcf760e9c0f602779ff74b6f1a8f42e0800b2be634ed532d055b0eec402e64ead5f499a0341fe44b198ecd3c7aa1fb
 EBUILD libmavconn-9999.ebuild 454 BLAKE2B 2714c2f1b81848d481f64267b025275e129129e03d3f174e1043b7f45b6a1b25fdd3f33e8e4a0b3d1eed837a6ed6bb46b9a5cc82adc8c89d7bacc21039a025ca SHA512 2cbe5315f4c5591cb15d566f82b5b553ff40cb618560ee1f239b0229c4611440206d7631083f463e455e3446ad2d93a1da66c8a6f8414cc28a6c2c267512a79f
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/libmavconn/libmavconn-1.8.0.ebuild b/dev-ros/libmavconn/libmavconn-1.8.0.ebuild
new file mode 100644
index 000000000000..8f7b83354449
--- /dev/null
+++ b/dev-ros/libmavconn/libmavconn-1.8.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/mavlink-gbp-release-2016.7.7
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest
index 50bcd816c0dc..15f605d333d1 100644
--- a/dev-ros/mavlink-gbp-release/Manifest
+++ b/dev-ros/mavlink-gbp-release/Manifest
@@ -1,6 +1,4 @@
 AUX gentoo.patch 708 BLAKE2B ad41a87474f0c542dcab2189e08f744c37ebc0a5993c9ca46633d3f02b3c13b002cd1b1644123694bd0bea756168d29d121eca9cd8071a548ae592f6e81431f1 SHA512 2ab7861c421e630a87924ae4b5f282493be043d1d0a53188ed6ec2938250ac4fb1e402072d4f10afc747271c94cad424bd84ca15d49d38e871b245b5068de698
-DIST mavlink-gbp-release-2020.9.10.tar.gz 4134330 BLAKE2B a8b2ad07ebf67bf19b37d6fefd6e41a5d6c95e9eaac413785943bd88e63f1a8acf4a4ea7d7ecd680e5ff306d46235a8cf0239af724d01d960c96cd8623818a22 SHA512 9c3429b16b0bcd364d89db3817cab76545f799407095cd6d7af5fff552aa4a4314645b6db517389bcdb511e009b4bfce5d62ae6b4aec7b0542bdc892cdf1ebb9
-DIST mavlink-gbp-release-2021.2.2.tar.gz 4266346 BLAKE2B 6f70c9ee4b4140f7478210ba8a31739316a89f890d1412e5d9480d83ca1a186a12855d9b33f254222aa5156333fc74dd5f00988ffe904fad96ef5eaccea6a793 SHA512 1e857093d91c154b0780c530f1ad741120cee31e9ba3373cc047644990e7d58b2b703716d39509c753c41cbaf95a9e330bbc15ed6c970af2ab4d6bbc66de23eb
-EBUILD mavlink-gbp-release-2020.9.10.ebuild 563 BLAKE2B 75b26d4d4d13d45a52cb31a6603a84679093b32b6161d3d03009ea8057a773edd0bcb18ec4d6d21681bf45d793e8d7f7bcff965f9d27829f258fa660e8cfae73 SHA512 36b7e697a6db198c8477a4997d51361c4d5fa3deb826907ab61239c373efdfe0249e0a5d3a1f4c17277e3ebfca739d7788dadf6ca93adb6a36ea9cc5397ceb9a
-EBUILD mavlink-gbp-release-2021.2.2.ebuild 563 BLAKE2B 56d0e10b830789364f5e12ba17baca70f520ec2b0e6cb753a53b081e40e2e726d74b7a62055416c69ba7f18cfe16dcbc6d8a104f82b96501467006754f757043 SHA512 aede556ebe20848f1c246acf61f7fcde3f58ee809b26c9304c9082142b7434962c3ab615bd1acacf1d2a315c491751b04c9f8a90e04dd1e99ea75f600ab267e8
+DIST mavlink-gbp-release-2021.7.7.tar.gz 4280663 BLAKE2B 36fe1f224178ec954866b07c470cebf50fb779eb004911092b24fc380492c6b89b5509fc3b823ab5b355a0957ab113ea4915c94d499667b1e27ee964867e1063 SHA512 b3e7b196ff0e58c3cccfd2ea21f8804732ffbf62bf0288f2c8e0f518e387629fb0260ce9c7cffd94d83b21e8203f2077176d568aa9de4818f2bd6badae9f6a0c
+EBUILD mavlink-gbp-release-2021.7.7.ebuild 563 BLAKE2B 56d0e10b830789364f5e12ba17baca70f520ec2b0e6cb753a53b081e40e2e726d74b7a62055416c69ba7f18cfe16dcbc6d8a104f82b96501467006754f757043 SHA512 aede556ebe20848f1c246acf61f7fcde3f58ee809b26c9304c9082142b7434962c3ab615bd1acacf1d2a315c491751b04c9f8a90e04dd1e99ea75f600ab267e8
 MISC metadata.xml 341 BLAKE2B 1292ea0319edc3c3597165f59f246829e6954b5582e623e92227de5503f35d0f61150a0516998dd1d99942c371291ed623a38112210abac7dd0a050cc810b34c SHA512 0b545da2a0f2d6372e63db33fd5f50497c0de04a69fdb3b94e57418ff617fcebaeed515241c474995efc38bbdf1c099ec67ad6a56dd3ae94b2e24be9f1f72d36
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.9.10.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.9.10.ebuild
deleted file mode 100644
index 86036c60a87e..000000000000
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.9.10.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
-ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
-EGIT_BRANCH="release/noetic/mavlink"
-VER_PREFIX="${EGIT_BRANCH}/"
-VER_SUFFIX=-${PV#*_p}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink message marshaling library"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/future[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.2.2.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.7.7.ebuild
index 2b6b1f3ec934..2b6b1f3ec934 100644
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.2.2.ebuild
+++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.7.7.ebuild
diff --git a/dev-ros/mavros/Manifest b/dev-ros/mavros/Manifest
index 60e22e71046c..e172dba37738 100644
--- a/dev-ros/mavros/Manifest
+++ b/dev-ros/mavros/Manifest
@@ -1,8 +1,6 @@
-DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
-DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
-EBUILD mavros-1.2.0.ebuild 1034 BLAKE2B 4d613cae01fcbc82955bfd139a7d35800f33cd6fe42dfb8c500b52d4bd214d8a6baa23db8c7a64afcd90165dc13e53b6259f91a235e403cf6e571baf6ae771a2 SHA512 fa742657088ad5275af8161b4fd795bd6d9e102fd745299117ae0c8b67b77932abd62445798a1870f6d4273cea660458006b98fcccd5112ecf310423fcfbd3fa
-EBUILD mavros-1.4.0.ebuild 1033 BLAKE2B 7b90ad9b79f3aaa42bb5296c848385bb8e4362af6714cc37ce3a93d93f7adec725a781c76a251f5b2c0232af47d1625af5662a93b6094865251a24a72633860b SHA512 3bd7175c6ca7d74f2f6bbb5c04b7435a9289a957f4b6f3b0c0d20a368381ab923d052bd2a60efc9cd4e6a09e68e70ef9c526eb3aafcb74b12381950bcae38325
-EBUILD mavros-1.5.2.ebuild 1033 BLAKE2B 5caaad992ccd4dc1591792f0e104c44121d0899ce8b2e0099267a079b6ea0809832683acf32f74b14f5401adc2604de2e9c73ae87f6f224e3270f60195590691 SHA512 987266fcaf780b3fcddd3dffb1af6870e3f90fd21c0a8f1508539d2929361adfb5f0e0dd4c4aa5c5039c8c5229503c231f46427aba8fe03fb1671d0913393459
-EBUILD mavros-9999.ebuild 1033 BLAKE2B 7b90ad9b79f3aaa42bb5296c848385bb8e4362af6714cc37ce3a93d93f7adec725a781c76a251f5b2c0232af47d1625af5662a93b6094865251a24a72633860b SHA512 3bd7175c6ca7d74f2f6bbb5c04b7435a9289a957f4b6f3b0c0d20a368381ab923d052bd2a60efc9cd4e6a09e68e70ef9c526eb3aafcb74b12381950bcae38325
+DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
+EBUILD mavros-1.5.2.ebuild 1089 BLAKE2B dba2a8cd9d10c7ef087d8c017a5d321c4e50067b5937c7615930f39e80a45b191f5976eea11f66c781ad6326cb1a397879274935b342e86e323749b1d1ff6660 SHA512 af4bfe89d2ca3204065fb79173e66700458a68bb0d2bb1c789d24692cf698472fb40926ff3cd52aaab94b89c17ed0db8b2752759c5498010838a3b3e9ae0a598
+EBUILD mavros-1.8.0.ebuild 1089 BLAKE2B dba2a8cd9d10c7ef087d8c017a5d321c4e50067b5937c7615930f39e80a45b191f5976eea11f66c781ad6326cb1a397879274935b342e86e323749b1d1ff6660 SHA512 af4bfe89d2ca3204065fb79173e66700458a68bb0d2bb1c789d24692cf698472fb40926ff3cd52aaab94b89c17ed0db8b2752759c5498010838a3b3e9ae0a598
+EBUILD mavros-9999.ebuild 1089 BLAKE2B dba2a8cd9d10c7ef087d8c017a5d321c4e50067b5937c7615930f39e80a45b191f5976eea11f66c781ad6326cb1a397879274935b342e86e323749b1d1ff6660 SHA512 af4bfe89d2ca3204065fb79173e66700458a68bb0d2bb1c789d24692cf698472fb40926ff3cd52aaab94b89c17ed0db8b2752759c5498010838a3b3e9ae0a598
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros/mavros-1.2.0.ebuild b/dev-ros/mavros/mavros-1.2.0.ebuild
deleted file mode 100644
index 74118adcd502..000000000000
--- a/dev-ros/mavros/mavros-1.2.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
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink extendable communication node for ROS"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/angles
-	dev-ros/libmavconn
-	dev-ros/rosconsole_bridge
-	dev-libs/boost:=
-	dev-ros/eigen_conversions
-	sci-geosciences/GeographicLib
-	>=dev-ros/mavlink-gbp-release-2016.11.11
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/mavros_msgs-${PV}[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/mavros/mavros-1.4.0.ebuild b/dev-ros/mavros/mavros-1.4.0.ebuild
deleted file mode 100644
index 12562bf79410..000000000000
--- a/dev-ros/mavros/mavros-1.4.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
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink extendable communication node for ROS"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/angles
-	dev-ros/libmavconn
-	dev-ros/rosconsole_bridge
-	dev-libs/boost:=
-	dev-ros/eigen_conversions
-	sci-geosciences/GeographicLib
-	>=dev-ros/mavlink-gbp-release-2020.9.10
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	>=dev-ros/mavros_msgs-${PV}[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
diff --git a/dev-ros/mavros/mavros-1.5.2.ebuild b/dev-ros/mavros/mavros-1.5.2.ebuild
index 6d42a584d799..b2927fcf9bd2 100644
--- a/dev-ros/mavros/mavros-1.5.2.ebuild
+++ b/dev-ros/mavros/mavros-1.5.2.ebuild
@@ -36,4 +36,5 @@ DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
diff --git a/dev-ros/mavros/mavros-1.8.0.ebuild b/dev-ros/mavros/mavros-1.8.0.ebuild
new file mode 100644
index 000000000000..b2927fcf9bd2
--- /dev/null
+++ b/dev-ros/mavros/mavros-1.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink extendable communication node for ROS"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/angles
+	dev-ros/libmavconn
+	dev-ros/rosconsole_bridge
+	dev-libs/boost:=
+	dev-ros/eigen_conversions
+	sci-geosciences/GeographicLib
+	>=dev-ros/mavlink-gbp-release-2020.9.10
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/mavros_msgs-${PV}[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/mavros/mavros-9999.ebuild b/dev-ros/mavros/mavros-9999.ebuild
index 12562bf79410..b2927fcf9bd2 100644
--- a/dev-ros/mavros/mavros-9999.ebuild
+++ b/dev-ros/mavros/mavros-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
@@ -36,4 +36,5 @@ DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest
index 6ba9b3aa594d..2fddee804864 100644
--- a/dev-ros/mavros_extras/Manifest
+++ b/dev-ros/mavros_extras/Manifest
@@ -1,8 +1,10 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
 DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
+DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
 EBUILD mavros_extras-1.2.0.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
 EBUILD mavros_extras-1.4.0.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
 EBUILD mavros_extras-1.5.2.ebuild 937 BLAKE2B 93a0e54096dd1473d688e8804e404012644826c24189740799bab7821942fe8db50773789572c19c6e054b8dec4c41f8309dd2bf17e13236d52f7ef42b8fd7d3 SHA512 21d079dbf7abf1cf9114b2acf839cfb599a25738ceb4f4611fa55c6edcb56f3ad17d462d2115f9911d90885995d1286f263555c7e1e035b28a054904dc716ba8
+EBUILD mavros_extras-1.8.0.ebuild 937 BLAKE2B 93a0e54096dd1473d688e8804e404012644826c24189740799bab7821942fe8db50773789572c19c6e054b8dec4c41f8309dd2bf17e13236d52f7ef42b8fd7d3 SHA512 21d079dbf7abf1cf9114b2acf839cfb599a25738ceb4f4611fa55c6edcb56f3ad17d462d2115f9911d90885995d1286f263555c7e1e035b28a054904dc716ba8
 EBUILD mavros_extras-9999.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros_extras/mavros_extras-1.8.0.ebuild b/dev-ros/mavros_extras/mavros_extras-1.8.0.ebuild
new file mode 100644
index 000000000000..4a27f7707f48
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-1.8.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/cv_bridge
+	dev-ros/mavros
+	dev-ros/roscpp
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/urdf
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/mavros_msgs/Manifest b/dev-ros/mavros_msgs/Manifest
index 53dcf5d8b0cd..b5daaaa18106 100644
--- a/dev-ros/mavros_msgs/Manifest
+++ b/dev-ros/mavros_msgs/Manifest
@@ -1,8 +1,10 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
 DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
+DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
 EBUILD mavros_msgs-1.2.0.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
 EBUILD mavros_msgs-1.4.0.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
 EBUILD mavros_msgs-1.5.2.ebuild 460 BLAKE2B e65c5f3a1c33f1808bec285c49a4e972cce02d468960449013b9d9778b8e03af75051f1683a61da1704e969e7d14830cfcd953f925cfcb815b1c462cf37d051c SHA512 318126d816e129f964dc2cded761f9d3527782149a451e3d936af8b3441e0112dbf5d50e6461106af8b0e3cb84cdbd8b69cd7992f3421497dd6aceca595226fd
+EBUILD mavros_msgs-1.8.0.ebuild 460 BLAKE2B e65c5f3a1c33f1808bec285c49a4e972cce02d468960449013b9d9778b8e03af75051f1683a61da1704e969e7d14830cfcd953f925cfcb815b1c462cf37d051c SHA512 318126d816e129f964dc2cded761f9d3527782149a451e3d936af8b3441e0112dbf5d50e6461106af8b0e3cb84cdbd8b69cd7992f3421497dd6aceca595226fd
 EBUILD mavros_msgs-9999.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros_msgs/mavros_msgs-1.8.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-1.8.0.ebuild
new file mode 100644
index 000000000000..11b0de2bd004
--- /dev/null
+++ b/dev-ros/mavros_msgs/mavros_msgs-1.8.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geographic_msgs dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index 3ce79b22371e..489254046c74 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -1,8 +1,10 @@
 AUX tests.patch 4837 BLAKE2B 2793652865f2d1f8ce1499b37922e480d40ca3931f098156a6cf541ad48985a3bee29364bb09e37c4f15424765dd057875f26dd5290f5747718538bcbeb3aead SHA512 2c778a7e4c7fc6d89ef162fd42d6f1dbd487d885c7ee04f6a8243142aaf949b02bfcd0c08cc8799f7a1ee95d13c8d21aef340abc4a3e6ca3c0f2231118985796
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD message_filters-1.15.10-r1.ebuild 902 BLAKE2B 2c3b89f5aa8aecf32580628af9f138050086b6d2b0f4e4b0d1170cc5cf24eb04969b468bb69c095f1dec0f836a47c957750b2393d3763ba6392ee0ea1ed2b36f SHA512 4f0b34f78581432a34f6b1c86eabc6379ad4b8f9a675d82f4170e7ae30c291df573657c783f29c3f483bcf8d499334500d5c4a84d0493268bc540806802a1063
+EBUILD message_filters-1.15.11.ebuild 902 BLAKE2B 2c3b89f5aa8aecf32580628af9f138050086b6d2b0f4e4b0d1170cc5cf24eb04969b468bb69c095f1dec0f836a47c957750b2393d3763ba6392ee0ea1ed2b36f SHA512 4f0b34f78581432a34f6b1c86eabc6379ad4b8f9a675d82f4170e7ae30c291df573657c783f29c3f483bcf8d499334500d5c4a84d0493268bc540806802a1063
 EBUILD message_filters-1.15.8-r1.ebuild 902 BLAKE2B 2c3b89f5aa8aecf32580628af9f138050086b6d2b0f4e4b0d1170cc5cf24eb04969b468bb69c095f1dec0f836a47c957750b2393d3763ba6392ee0ea1ed2b36f SHA512 4f0b34f78581432a34f6b1c86eabc6379ad4b8f9a675d82f4170e7ae30c291df573657c783f29c3f483bcf8d499334500d5c4a84d0493268bc540806802a1063
 EBUILD message_filters-1.15.9-r1.ebuild 902 BLAKE2B 2c3b89f5aa8aecf32580628af9f138050086b6d2b0f4e4b0d1170cc5cf24eb04969b468bb69c095f1dec0f836a47c957750b2393d3763ba6392ee0ea1ed2b36f SHA512 4f0b34f78581432a34f6b1c86eabc6379ad4b8f9a675d82f4170e7ae30c291df573657c783f29c3f483bcf8d499334500d5c4a84d0493268bc540806802a1063
 EBUILD message_filters-9999.ebuild 902 BLAKE2B 2c3b89f5aa8aecf32580628af9f138050086b6d2b0f4e4b0d1170cc5cf24eb04969b468bb69c095f1dec0f836a47c957750b2393d3763ba6392ee0ea1ed2b36f SHA512 4f0b34f78581432a34f6b1c86eabc6379ad4b8f9a675d82f4170e7ae30c291df573657c783f29c3f483bcf8d499334500d5c4a84d0493268bc540806802a1063
diff --git a/dev-ros/message_filters/message_filters-1.15.11.ebuild b/dev-ros/message_filters/message_filters-1.15.11.ebuild
new file mode 100644
index 000000000000..7b93ac1d75aa
--- /dev/null
+++ b/dev-ros/message_filters/message_filters-1.15.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of message filters which take in messages and outputs those at a later time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-libs/boost:=[threads(+)]
+	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/mk/Manifest b/dev-ros/mk/Manifest
index 83fe0d8318d1..2c0575c53004 100644
--- a/dev-ros/mk/Manifest
+++ b/dev-ros/mk/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD mk-1.15.5.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
 EBUILD mk-1.15.6.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
 EBUILD mk-1.15.7.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
+EBUILD mk-1.15.8.ebuild 427 BLAKE2B 9fc29af0db3479c6cf61407838a0efb57f434979c14235dc83bf0f2d45bbcfe84c4d5289ef652720d75e5818d362c0d1c59efaecc4d3d72ff3b241b6428f48fc SHA512 4f5e49f2543bb6b0417653d0c04a22888741cd4b05b751114359a89e305a1c6d82dba9f0af7bc9f96a57fd26558324283033911205cec8bc541053e02f366cc9
 EBUILD mk-9999.ebuild 427 BLAKE2B f2c4fb3f622cae0cc67d230fe3d86f4825ed80af6f16f00012d8fe27fe60e31fb5fcffcf841bfb3d2fadf8ed4a774c24807c2003c367b416b7467ce9497ec770 SHA512 69241cb64aa30288a318141c9a363bb4c23499028ce7b0b83c73298df45644e1d5a8d3da151f81ad9195ba8abff80e13638db2a4bb45924737738997cc476588
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/mk/mk-1.15.8.ebuild b/dev-ros/mk/mk-1.15.8.ebuild
new file mode 100644
index 000000000000..fbe42319472d
--- /dev/null
+++ b/dev-ros/mk/mk-1.15.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A collection of .mk include files for building ROS architectural elements"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	dev-ros/rospack
+	dev-ros/rosbuild"
diff --git a/dev-ros/monocam_settler/Manifest b/dev-ros/monocam_settler/Manifest
index 8c7bd3a4da7a..a6735968d510 100644
--- a/dev-ros/monocam_settler/Manifest
+++ b/dev-ros/monocam_settler/Manifest
@@ -1,4 +1,6 @@
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD monocam_settler-0.10.14-r1.ebuild 646 BLAKE2B e9805973cec8e06feeea6b4c90b522c175ddd8bdd35b3fffdf44a209c469514fc39b4a6c7d1e024d734d572fd64de0dcfdde48c66fad569ff33bf5a109263795 SHA512 a96f8e49cff1b589cd26626fac69822c16c91b66016a5120f2ef1b19eea44144c7148ec2b3bb4fe229950120f12f1fc4d5b7aeac20074050e39d239f6d7af2bd
+EBUILD monocam_settler-0.10.15.ebuild 646 BLAKE2B e9805973cec8e06feeea6b4c90b522c175ddd8bdd35b3fffdf44a209c469514fc39b4a6c7d1e024d734d572fd64de0dcfdde48c66fad569ff33bf5a109263795 SHA512 a96f8e49cff1b589cd26626fac69822c16c91b66016a5120f2ef1b19eea44144c7148ec2b3bb4fe229950120f12f1fc4d5b7aeac20074050e39d239f6d7af2bd
 EBUILD monocam_settler-9999.ebuild 646 BLAKE2B e9805973cec8e06feeea6b4c90b522c175ddd8bdd35b3fffdf44a209c469514fc39b4a6c7d1e024d734d572fd64de0dcfdde48c66fad569ff33bf5a109263795 SHA512 a96f8e49cff1b589cd26626fac69822c16c91b66016a5120f2ef1b19eea44144c7148ec2b3bb4fe229950120f12f1fc4d5b7aeac20074050e39d239f6d7af2bd
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/monocam_settler/monocam_settler-0.10.15.ebuild b/dev-ros/monocam_settler/monocam_settler-0.10.15.ebuild
new file mode 100644
index 000000000000..6826337aa05f
--- /dev/null
+++ b/dev-ros/monocam_settler/monocam_settler-0.10.15.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Listens on a ImageFeatures topic, and waits for the data to settle"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp_serialization
+	dev-ros/settlerlib
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/moveit_msgs/Manifest b/dev-ros/moveit_msgs/Manifest
index ab3349593d8c..28faafce062d 100644
--- a/dev-ros/moveit_msgs/Manifest
+++ b/dev-ros/moveit_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST moveit_msgs-0.11.1.tar.gz 20617 BLAKE2B 12b6f6f606d5f3ecaee8bafc5703526020ef60b421e452bb603390236caede4e7fb0d1310d0fc5c38dd63676085a083a76721f97a3548022375b3b2a8b72596c SHA512 b9f99bbae3d13040368ab8fb649682becd194ff91279c7c5a3060104789df91a4d61334a369a46e9d161f9f7386d42b97a189451c2ac0b5f124fb17df92ca680
-EBUILD moveit_msgs-0.11.1.ebuild 585 BLAKE2B 9869f0901d9a7147418fb131865f33bb4f221460eacb9eb635fe50e12d1c436a7b87c841880e1ec28574e739a5a8172894a54b21a13a89771a7871db02108fd6 SHA512 3ff92b8cf23fefac59574aef6a5154a331282fcb78dc355be7bd230b1fd1ecd78a1f9f9e90259272cdad2448dc226bff433c23e14f9fcec8ff4c81510338a5d2
+DIST moveit_msgs-0.11.2.tar.gz 21764 BLAKE2B 9994ae4468e6913a811103d7f107868eac60970016f2dacaf666fadc0c236db583001631a7378e18d97be9ddbe9823dae95ff984f91a3b28b1833412ef905326 SHA512 4b401c47b6d2a5c61c9e69807c4aec7f0aa20ff27de952ea91b2b8e339a5e5f18138f36b9e679601b7471aa0aa78d8d5763af12c44685a201bc4dbc67602857f
+EBUILD moveit_msgs-0.11.2.ebuild 585 BLAKE2B 35fa2b79ff082cc25f06ccf7e9f25e7b99277bc118c85741568e5da43a58b16d4b1565d442ee40aa228935a1151dd4c605dc1a9baad7ce54366190899b4505d5 SHA512 f78ac5466cfac89c96019064f192a9f435b69a92c0bd65e1bd60425b0c235925793428eed8467a71b9b9828589410382bee25daa1a204859badc558bd58674e5
 EBUILD moveit_msgs-9999.ebuild 585 BLAKE2B 9869f0901d9a7147418fb131865f33bb4f221460eacb9eb635fe50e12d1c436a7b87c841880e1ec28574e739a5a8172894a54b21a13a89771a7871db02108fd6 SHA512 3ff92b8cf23fefac59574aef6a5154a331282fcb78dc355be7bd230b1fd1ecd78a1f9f9e90259272cdad2448dc226bff433c23e14f9fcec8ff4c81510338a5d2
 MISC metadata.xml 338 BLAKE2B f91c4144e8f04fe987c5db67b6ebf539420aa3c07bd50c58394bd489a5d6b41f6122a645dd2c182dc6c14d4755d97b89fe444e2a1b48a6b048a6726c36bd31e9 SHA512 232c4c964a3798a5b5aa26692e74b2f71e1a6f4bf89e618c86824d0a6fd97b4064b68ecb380dc505c4cf492fd45671e89bb419d96377e5fced8a665b864fb1a1
diff --git a/dev-ros/moveit_msgs/moveit_msgs-0.11.1.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.11.1.ebuild
deleted file mode 100644
index 6490a10393ef..000000000000
--- a/dev-ros/moveit_msgs/moveit_msgs-0.11.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
-
-ROS_REPO_URI="https://github.com/ros-planning/moveit_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="
-	dev-ros/actionlib_msgs
-	dev-ros/sensor_msgs
-	dev-ros/geometry_msgs
-	dev-ros/trajectory_msgs
-	dev-ros/shape_msgs
-	dev-ros/std_msgs
-	dev-ros/octomap_msgs
-	dev-ros/object_recognition_msgs
-"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages, services and actions used by MoveIt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/moveit_msgs/moveit_msgs-0.11.2.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.11.2.ebuild
new file mode 100644
index 000000000000..16c7d7fd966b
--- /dev/null
+++ b/dev-ros/moveit_msgs/moveit_msgs-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
+
+ROS_REPO_URI="https://github.com/ros-planning/moveit_msgs"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+CATKIN_MESSAGES_TRANSITIVE_DEPS="
+	dev-ros/actionlib_msgs
+	dev-ros/sensor_msgs
+	dev-ros/geometry_msgs
+	dev-ros/trajectory_msgs
+	dev-ros/shape_msgs
+	dev-ros/std_msgs
+	dev-ros/octomap_msgs
+	dev-ros/object_recognition_msgs
+"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages, services and actions used by MoveIt"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/openni2_camera/Manifest b/dev-ros/openni2_camera/Manifest
index 3585eeec5ffd..a176399e5cf3 100644
--- a/dev-ros/openni2_camera/Manifest
+++ b/dev-ros/openni2_camera/Manifest
@@ -1,4 +1,4 @@
-DIST openni2_camera-1.4.2.tar.gz 39789 BLAKE2B e20fe380e4832c7c38ed945e3472867ea7546c675677a89eda216bbaa448538b73a7b546e7182dc493520c9cb60b9cbdd9fb1bd1cd82ac75bf4ba3320a1521aa SHA512 b6dde7b55349e4d3a2f06f07e944208c90ab37f9e0b5366d8eefadda37a96f970de81784fa107ba8eb6a9e6636881279f3a2b3e7d60a9ac64eab4b0c9efccdb3
-EBUILD openni2_camera-1.4.2-r1.ebuild 659 BLAKE2B 01643578fe29b938d19f48d63ff40cf7a0bfdfc26e66a54989c7b6253f3e5f8e2a2d73fc2b4250e482fba2ba27c70a17f425ae8e09c8db604b26c75796450ba3 SHA512 fe9824708d48b26b3bdd8e41a581468c3406c85142eca5838a36ef433d49387ab3f21d2fe63e61562fe72c4c8cee84d67846afc82b0213e77ba1f97adaccc610
+DIST openni2_camera-1.5.1.tar.gz 40518 BLAKE2B 10cee624b9eda0a3d8f45df1fa6ba720a6e1c7f1a36dd0f0b933266854904f3a16f2292a5a51ed5f7e3d6f4ba5b9aaaf5260d7d2f6f012dbba060b5f3e3445f6 SHA512 59ab19bf60f6bd4196374138b68e64dc8aa44a8c451c3e7d5893f1501e83ab1c9034ddea2cbc1eedf12b2b2a13a9ecc4bbf2b87a71ab7fa38cde4c0d6ccc04cc
+EBUILD openni2_camera-1.5.1.ebuild 659 BLAKE2B 01643578fe29b938d19f48d63ff40cf7a0bfdfc26e66a54989c7b6253f3e5f8e2a2d73fc2b4250e482fba2ba27c70a17f425ae8e09c8db604b26c75796450ba3 SHA512 fe9824708d48b26b3bdd8e41a581468c3406c85142eca5838a36ef433d49387ab3f21d2fe63e61562fe72c4c8cee84d67846afc82b0213e77ba1f97adaccc610
 EBUILD openni2_camera-9999.ebuild 659 BLAKE2B 01643578fe29b938d19f48d63ff40cf7a0bfdfc26e66a54989c7b6253f3e5f8e2a2d73fc2b4250e482fba2ba27c70a17f425ae8e09c8db604b26c75796450ba3 SHA512 fe9824708d48b26b3bdd8e41a581468c3406c85142eca5838a36ef433d49387ab3f21d2fe63e61562fe72c4c8cee84d67846afc82b0213e77ba1f97adaccc610
 MISC metadata.xml 340 BLAKE2B a66fd18f61874c90197221e853b05c28502cf38118807b51616c9feb0db670945ffe31bd325aa9092dc22c226f214ec2259276c7bc11ee731a694fa200cdfd03 SHA512 c8b9dc967e3e6de3bcae15894d39b3701e4bd223565660284c0b2a41d4b7e475935b9342296644e620b63a8c99098c8bf65363aa4899e7e5de3ad92059a4b064
diff --git a/dev-ros/openni2_camera/openni2_camera-1.4.2-r1.ebuild b/dev-ros/openni2_camera/openni2_camera-1.5.1.ebuild
index ee182d23620f..ee182d23620f 100644
--- a/dev-ros/openni2_camera/openni2_camera-1.4.2-r1.ebuild
+++ b/dev-ros/openni2_camera/openni2_camera-1.5.1.ebuild
diff --git a/dev-ros/openni2_launch/Manifest b/dev-ros/openni2_launch/Manifest
index 0736e40c490b..aedf569d04c1 100644
--- a/dev-ros/openni2_launch/Manifest
+++ b/dev-ros/openni2_launch/Manifest
@@ -1,4 +1,4 @@
-DIST openni2_camera-1.4.2.tar.gz 39789 BLAKE2B e20fe380e4832c7c38ed945e3472867ea7546c675677a89eda216bbaa448538b73a7b546e7182dc493520c9cb60b9cbdd9fb1bd1cd82ac75bf4ba3320a1521aa SHA512 b6dde7b55349e4d3a2f06f07e944208c90ab37f9e0b5366d8eefadda37a96f970de81784fa107ba8eb6a9e6636881279f3a2b3e7d60a9ac64eab4b0c9efccdb3
-EBUILD openni2_launch-1.4.2.ebuild 558 BLAKE2B a7999520b80a7acfc5ca55731aa174254522d9d78af34ef134db203341d076f117b98cb1f8a94e487c7047a5bb6330b3544faea142ffa029b48fad7c6010c691 SHA512 66a88ea7c2b75d8a38c1d8a427cef83050cd0a4d75f88e02c02a500905b28d64d59c935c0de0363d7d1df76880f1801d1b29c67818402a1ce65f6e07cbc657b7
+DIST openni2_camera-1.5.1.tar.gz 40518 BLAKE2B 10cee624b9eda0a3d8f45df1fa6ba720a6e1c7f1a36dd0f0b933266854904f3a16f2292a5a51ed5f7e3d6f4ba5b9aaaf5260d7d2f6f012dbba060b5f3e3445f6 SHA512 59ab19bf60f6bd4196374138b68e64dc8aa44a8c451c3e7d5893f1501e83ab1c9034ddea2cbc1eedf12b2b2a13a9ecc4bbf2b87a71ab7fa38cde4c0d6ccc04cc
+EBUILD openni2_launch-1.5.1.ebuild 558 BLAKE2B 24b984bc6ca8234b4b10cf216e64c31c76496ae5117559b8e576ffd9f9deb7372440402f7e40d695a8218dc7eb409fa901058458d532e095913ec7be5402ee22 SHA512 11705ad41bbf7163c27d0b772030f3c8bb847f7e2825b0669e4f174f746deb33b7e09bca034e8f3b789242ce11cbc74d61642416f92b46a5b907d7abc576e786
 EBUILD openni2_launch-9999.ebuild 558 BLAKE2B a7999520b80a7acfc5ca55731aa174254522d9d78af34ef134db203341d076f117b98cb1f8a94e487c7047a5bb6330b3544faea142ffa029b48fad7c6010c691 SHA512 66a88ea7c2b75d8a38c1d8a427cef83050cd0a4d75f88e02c02a500905b28d64d59c935c0de0363d7d1df76880f1801d1b29c67818402a1ce65f6e07cbc657b7
 MISC metadata.xml 340 BLAKE2B 666c2530cabfb6d86f6fb1e45072133c9a3826254a42b7713ca3b0506b09adb38be616e281a8e19fab3f6540133a9eee6c9605accbc7b7444715faf38e199b97 SHA512 5fdcf4ac865e7456967ef7e20b7694a7dd04eed9658eab3dbaa1754538a843e499ca1671189d444730b47ff85267d643518c6f1faa708f374fabfeb4d7af7caa
diff --git a/dev-ros/openni2_launch/openni2_launch-1.4.2.ebuild b/dev-ros/openni2_launch/openni2_launch-1.4.2.ebuild
deleted file mode 100644
index 227a922039f1..000000000000
--- a/dev-ros/openni2_launch/openni2_launch-1.4.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rgbd_launch
-	dev-ros/depth_image_proc
-	dev-ros/image_proc
-	dev-ros/nodelet
-	dev-ros/openni2_camera
-	dev-ros/tf
-	dev-ros/roslaunch
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	sys-apps/usbutils"
diff --git a/dev-ros/openni2_launch/openni2_launch-1.5.1.ebuild b/dev-ros/openni2_launch/openni2_launch-1.5.1.ebuild
new file mode 100644
index 000000000000..230a0150b089
--- /dev/null
+++ b/dev-ros/openni2_launch/openni2_launch-1.5.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rgbd_launch
+	dev-ros/depth_image_proc
+	dev-ros/image_proc
+	dev-ros/nodelet
+	dev-ros/openni2_camera
+	dev-ros/tf
+	dev-ros/roslaunch
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	sys-apps/usbutils"
diff --git a/dev-ros/pcl_conversions/Manifest b/dev-ros/pcl_conversions/Manifest
index b4df79390c1a..74942491e811 100644
--- a/dev-ros/pcl_conversions/Manifest
+++ b/dev-ros/pcl_conversions/Manifest
@@ -1,6 +1,5 @@
-DIST perception_pcl-1.7.1.tar.gz 80899 BLAKE2B 2898d88efa1b27a27eea06fb949254127cf92eb2c788ae914a40f0000fa8204202c4823c69ab5fa9bd83c2426289a4897a56fab9ec3df61e3ab0a184fc068c41 SHA512 97e9240c660adde84976860ed9c94cf8c127615526641dbcdb729ffbda4cda4dfb9f351cc2d471988732ad61e6508bfa5906c8b4503c31172e7f4e4dfc31260e
+AUX pcl.patch 2427 BLAKE2B ec9099ea6b6c39054df19aba957c6503db864190b4704445440b5e0cc93065b269d070d21b3cdd18a392dbd4acc2380b924efae34f4e3d70f96da7733ef80979 SHA512 33fdf3284c4c34fe0e7f4f36e2c6328eba471b2f2d7a30bf9bf44c82b81ff4c68a522404eafea81546d7be0d07988fa6b94e2e6d5ec96278bb11ae68177bb741
 DIST perception_pcl-1.7.2.tar.gz 81897 BLAKE2B 692f000337090c7a2354bf9626d391aa0fe390041042718e7dde7335c750137e7e1b6f939728ad1e2af3411e535ba63b42bc17f74b3535e38628f2b6c1c87036 SHA512 228b1d7d589bfd1460e8c58448b0d9257e86c1796b009853aeceeb1da20d8f46462d8c273a95804003ce3c43326c6575553d19b319aa9effcef4854347d5c3f9
-EBUILD pcl_conversions-1.7.1.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
-EBUILD pcl_conversions-1.7.2.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
+EBUILD pcl_conversions-1.7.2-r1.ebuild 636 BLAKE2B 41739024596fccb8ea978f74c4f7b57552766f23c05a556e6726b3aa78fc26d9dae54f7d469dc6ceb664325fd3f30a0f5b23910478847d8b80dd15de3ded8030 SHA512 b558b33311491e1fcc409c39c37640bae397de978a333654817a0ac6255a2a6d0545193cb908e3414b5681ccd5d93e62630eaf031d9fd30c2ca38a8581bb21ac
 EBUILD pcl_conversions-9999.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_conversions/files/pcl.patch b/dev-ros/pcl_conversions/files/pcl.patch
new file mode 100644
index 000000000000..fc0ef8866863
--- /dev/null
+++ b/dev-ros/pcl_conversions/files/pcl.patch
@@ -0,0 +1,68 @@
+From 6900f7cf650e6c0df2aef45e0011833905b0ba9e Mon Sep 17 00:00:00 2001
+From: Markus Vieth <39675748+mvieth@users.noreply.github.com>
+Date: Fri, 6 Nov 2020 19:13:16 +0100
+Subject: [PATCH] Change conversions of Vertices for new PCL versions (#313)
+
+In https://github.com/PointCloudLibrary/pcl/commit/ad00c7bee2fad0391649479d90eee4461a2e74e7, the vertices field of pcl::Vertices changed from std::vector<std::uint32_t> to std::vector<pcl::index_t>, where index_t is an index type with configurable size (currently by default int). This commit makes conversions from and to pcl_msgs::Vertices possible again, moving the vector contents if possible.
+---
+ .../include/pcl_conversions/pcl_conversions.h | 23 +++++++++++++++----
+ 1 file changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/pcl_conversions/include/pcl_conversions/pcl_conversions.h b/pcl_conversions/include/pcl_conversions/pcl_conversions.h
+index a5671c25..5ac0a41a 100644
+--- a/include/pcl_conversions/pcl_conversions.h
++++ b/include/pcl_conversions/pcl_conversions.h
+@@ -350,10 +350,25 @@ namespace pcl_conversions {
+ 
+   /** pcl::Vertices <=> pcl_msgs::Vertices **/
+ 
++  namespace internal
++  {
++    template <class T>
++    inline void move(std::vector<T> &a, std::vector<T> &b)
++    {
++      b.swap(a);
++    }
++
++    template <class T1, class T2>
++    inline void move(std::vector<T1> &a, std::vector<T2> &b)
++    {
++      b.assign(a.cbegin(), a.cend());
++    }
++  }
++
+   inline
+   void fromPCL(const pcl::Vertices &pcl_vert, pcl_msgs::Vertices &vert)
+   {
+-    vert.vertices = pcl_vert.vertices;
++    vert.vertices.assign(pcl_vert.vertices.cbegin(), pcl_vert.vertices.cend());
+   }
+ 
+   inline
+@@ -370,7 +385,7 @@ namespace pcl_conversions {
+   inline
+   void moveFromPCL(pcl::Vertices &pcl_vert, pcl_msgs::Vertices &vert)
+   {
+-    vert.vertices.swap(pcl_vert.vertices);
++    internal::move(pcl_vert.vertices, vert.vertices);
+   }
+ 
+   inline
+@@ -387,7 +402,7 @@ namespace pcl_conversions {
+   inline
+   void toPCL(const pcl_msgs::Vertices &vert, pcl::Vertices &pcl_vert)
+   {
+-    pcl_vert.vertices = vert.vertices;
++    pcl_vert.vertices.assign(vert.vertices.cbegin(), vert.vertices.cend());
+   }
+ 
+   inline
+@@ -404,7 +419,7 @@ namespace pcl_conversions {
+   inline
+   void moveToPCL(pcl_msgs::Vertices &vert, pcl::Vertices &pcl_vert)
+   {
+-    pcl_vert.vertices.swap(vert.vertices);
++    internal::move(vert.vertices, pcl_vert.vertices);
+   }
+ 
+   inline
diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild
deleted file mode 100644
index 2aa2de1919aa..000000000000
--- a/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides conversions from PCL data types and ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	sci-libs/pcl:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.2-r1.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..ec80ff5fa28b
--- /dev/null
+++ b/dev-ros/pcl_conversions/pcl_conversions-1.7.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
+ROS_SUBDIR=${PN}
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Provides conversions from PCL data types and ROS message types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	sci-libs/pcl:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+	test? ( dev-cpp/gtest )"
+PATCHES=("${FILESDIR}/pcl.patch")
diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.2.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.2.ebuild
deleted file mode 100644
index 2aa2de1919aa..000000000000
--- a/dev-ros/pcl_conversions/pcl_conversions-1.7.2.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
-ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides conversions from PCL data types and ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	sci-libs/pcl:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/pcl_ros/Manifest b/dev-ros/pcl_ros/Manifest
index 528574068c64..9f46917ee2db 100644
--- a/dev-ros/pcl_ros/Manifest
+++ b/dev-ros/pcl_ros/Manifest
@@ -1,5 +1,6 @@
+AUX pcl.patch 2215 BLAKE2B ff38d380d743c69de3c7377c52af5df23cb89ccb7011b12b34f921fa1a3bf10ec3ec72e8c8b7fe1ade282a8b926467895198db8c6545ba33b0434dbcdd533bba SHA512 82cc5101f2545262f966acfa238b2d630a31da621840beabb670ba3ab9a988a4a29d80c81739fff259d98004579e3fe1f0a3221fd6253f7cfed94bf0024e395b
 AUX tests.patch 526 BLAKE2B 6a4c015707096bea03a5921387286a70289e8933ff75300aee8f070fec7a2870932e35f5b4a4ddbe2131611716c2493b99ed63f93fa34880c36fd918a04eb158 SHA512 fdcba450c84e92aaa5f7263b02f118d4d3832725cd3aa30b218f3ff1af4439406ae930ccba8c601b757173572d99a26c12a670b33ad7600e71695a165461459d
 DIST perception_pcl-1.7.2.tar.gz 81897 BLAKE2B 692f000337090c7a2354bf9626d391aa0fe390041042718e7dde7335c750137e7e1b6f939728ad1e2af3411e535ba63b42bc17f74b3535e38628f2b6c1c87036 SHA512 228b1d7d589bfd1460e8c58448b0d9257e86c1796b009853aeceeb1da20d8f46462d8c273a95804003ce3c43326c6575553d19b319aa9effcef4854347d5c3f9
-EBUILD pcl_ros-1.7.2-r1.ebuild 1035 BLAKE2B 965a9c0d963c84e4d7391af07cfdad5c21f08cdeeb782807cf4c7ae7e33d1841f06d6d1a680794f42657c13bfdade9db38db25a53055fa41fdb3ff96acb3e6c7 SHA512 ebc4f6eca8b9c9e899417fb27b0f7eca004015d5a3a88f03b578ec9b182ac8ca5c65cb18352f6294544ab19dc8fe03cd8bd70d8e8ec6fec1297b49bcfb7f8e81
-EBUILD pcl_ros-9999.ebuild 1035 BLAKE2B 965a9c0d963c84e4d7391af07cfdad5c21f08cdeeb782807cf4c7ae7e33d1841f06d6d1a680794f42657c13bfdade9db38db25a53055fa41fdb3ff96acb3e6c7 SHA512 ebc4f6eca8b9c9e899417fb27b0f7eca004015d5a3a88f03b578ec9b182ac8ca5c65cb18352f6294544ab19dc8fe03cd8bd70d8e8ec6fec1297b49bcfb7f8e81
+EBUILD pcl_ros-1.7.2-r1.ebuild 1219 BLAKE2B 202836a530955dd41a4e6cc62b7a85a9f086d7a11d741ef7c0877939fa3e32da648315aa715b2762e2932489cf7348ed97115ae3b4d76533a73860a84ca29550 SHA512 b42b4c26000a31c78ce98b57c2ec9770ed2627447b99a121d58f3f08bc940cecdd923e4c784d29543f9b1c361e7b6c5bcc3cc4e4a772e1015dca62eb6b443ddf
+EBUILD pcl_ros-9999.ebuild 1195 BLAKE2B 6e8600e3aa5583c00092d01a2be8011aae8ac50c47666a0115aa2cabc315af0bb8454229bdd1a8487ed6d9cf7a3284c28165ed94dcd5da487076d07f7090f983 SHA512 95a1295ff0d50a4ea60dae18174d4b620254308359f4d9a84ef78f11f22d90b9449f694cecd3a7c0a7dd1d6e82d2d337fa6f5fd98b63a1312907aa01049100f8
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_ros/files/pcl.patch b/dev-ros/pcl_ros/files/pcl.patch
new file mode 100644
index 000000000000..6847fff9c4ce
--- /dev/null
+++ b/dev-ros/pcl_ros/files/pcl.patch
@@ -0,0 +1,51 @@
+From bd21be2cb8ec6ad70a282c61b14aa9dd43edf9ff Mon Sep 17 00:00:00 2001
+From: Markus Vieth <39675748+mvieth@users.noreply.github.com>
+Date: Mon, 21 Jun 2021 19:42:58 +0200
+Subject: [PATCH] Use complete namespace for traits members (#330)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This prevents errors like this: error: ‘name’ is not a member of ‘pcl::detail::traits’; did you mean ‘pcl::traits::name’?
+The error appears for newer PCL versions (everything after commit https://github.com/PointCloudLibrary/pcl/commit/d39d3d3300746b952997e5bd2742dac7482aa5ab), but this change should also be fully compatible with older PCL versions.
+---
+ pcl_ros/include/pcl_ros/point_cloud.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/include/pcl_ros/point_cloud.h b/pcl_ros/include/pcl_ros/point_cloud.h
+index 93df7365..3c57f298 100644
+--- a/include/pcl_ros/point_cloud.h
++++ b/include/pcl_ros/point_cloud.h
+@@ -23,19 +23,19 @@ namespace pcl
+ 
+       template<typename U> void operator() ()
+       {
+-        const char* name = traits::name<PointT, U>::value;
++        const char* name = pcl::traits::name<PointT, U>::value;
+         std::uint32_t name_length = strlen(name);
+         stream_.next(name_length);
+         if (name_length > 0)
+           memcpy(stream_.advance(name_length), name, name_length);
+ 
+-        std::uint32_t offset = traits::offset<PointT, U>::value;
++        std::uint32_t offset = pcl::traits::offset<PointT, U>::value;
+         stream_.next(offset);
+ 
+-        std::uint8_t datatype = traits::datatype<PointT, U>::value;
++        std::uint8_t datatype = pcl::traits::datatype<PointT, U>::value;
+         stream_.next(datatype);
+ 
+-        std::uint32_t count = traits::datatype<PointT, U>::size;
++        std::uint32_t count = pcl::traits::datatype<PointT, U>::size;
+         stream_.next(count);
+       }
+ 
+@@ -49,7 +49,7 @@ namespace pcl
+ 
+       template<typename U> void operator() ()
+       {
+-        std::uint32_t name_length = strlen(traits::name<PointT, U>::value);
++        std::uint32_t name_length = strlen(pcl::traits::name<PointT, U>::value);
+         length += name_length + 13;
+       }
+ 
diff --git a/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild b/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild
index 8dc162b3fa11..274b509a8358 100644
--- a/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-1.7.2-r1.ebuild
@@ -42,4 +42,10 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 	)
 "
-PATCHES=( "${FILESDIR}/tests.patch" )
+PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/pcl.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/pcl_ros/pcl_ros-9999.ebuild b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
index 8dc162b3fa11..ca03876062f6 100644
--- a/dev-ros/pcl_ros/pcl_ros-9999.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
@@ -43,3 +43,9 @@ DEPEND="${RDEPEND}
 	)
 "
 PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/poco_vendor/Manifest b/dev-ros/poco_vendor/Manifest
index 6e3b476efe5a..ed2a3ed72b96 100644
--- a/dev-ros/poco_vendor/Manifest
+++ b/dev-ros/poco_vendor/Manifest
@@ -1,4 +1,4 @@
-DIST poco_vendor-1.2.0.tar.gz 3145 BLAKE2B 6143f73ec9f741ff72147ac43d4876cb17553d8a4ba33d54b60f546cd2988389de4cbc1b3fcb0300f507f91610ba64284515a3d736417f611c3ffa6eb32d5aba SHA512 f38f00028ad1b6b236305761f53748597f1203e267488ba2a08b8c06ad155338a2c413b3e5e5501becdb09aec4600ae700d95765a5b4d0861b163e4f2a9ee413
-EBUILD poco_vendor-1.2.0.ebuild 874 BLAKE2B 2c66e812eca126879da8570ec0accd48dd4ee953451841da9648079975a7b213898b2c89dfa737abf338bd4a3616fd65e40ed157e9fbb10d1bd3799ac2b2a566 SHA512 cb26e5b21f294ea8fee595dfdb553075c121f77826aa9a679c921194c597cdac2d372c5c06b3e0e495957d6c17a75ecbb8849269340a80eefe6a63f8d9d0484f
+DIST poco_vendor-1.2.1.tar.gz 3156 BLAKE2B 3f9714c81046892463d043642eee5295a6d6436730a22f7b2e114e4d9163d11e50afab895b32b31b1985373d51ea10290b5b22176643890b2f9a2f82ac9ed4f3 SHA512 21dfa72bb413e710f1ac51bbeca18b6ae111078ca06d3aba456628071f6763a386794334d0565b5111e907bb9012dbb124b73fc141002cd77717931009fa1161
+EBUILD poco_vendor-1.2.1.ebuild 874 BLAKE2B 2c66e812eca126879da8570ec0accd48dd4ee953451841da9648079975a7b213898b2c89dfa737abf338bd4a3616fd65e40ed157e9fbb10d1bd3799ac2b2a566 SHA512 cb26e5b21f294ea8fee595dfdb553075c121f77826aa9a679c921194c597cdac2d372c5c06b3e0e495957d6c17a75ecbb8849269340a80eefe6a63f8d9d0484f
 EBUILD poco_vendor-9999.ebuild 1143 BLAKE2B 692aa6060f50c0ba8ce02a6c80511c5070f634a6f9815a658816c7dca5d272d42a6f5ec1467ff7f61d332a848150e1fae9e6c48d7f70e84d55f01423abbc59a8 SHA512 734cadbe328d4dde925282c0f72f1a99b4337531919ed3803f17867c910c0bbe52f8c77a5a44004c01ce7c2dc8bd99ec800185f80b2f6040346e3973f3abf7e2
 MISC metadata.xml 330 BLAKE2B 7880b16541c752a5d4fb5e729d4305ca3f6430a4fddb36ced24cbf6f2c75964cfbbc34ea8a16cd306b8d49412c822a17d4cf44639f1e2cb7218c437aa2500830 SHA512 b9af45457315c529a21cf6d3ca9711513aa662cf21b9de1eba6a4a0498c28525cd6175878836d5c90c72afcef201bea2ef54e50a2103d4c7c07156b6bbfbc908
diff --git a/dev-ros/poco_vendor/poco_vendor-1.2.0.ebuild b/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild
index 8665d91b1561..8665d91b1561 100644
--- a/dev-ros/poco_vendor/poco_vendor-1.2.0.ebuild
+++ b/dev-ros/poco_vendor/poco_vendor-1.2.1.ebuild
diff --git a/dev-ros/python_cmake_module/Manifest b/dev-ros/python_cmake_module/Manifest
index 754d0c045691..7b89963a8435 100644
--- a/dev-ros/python_cmake_module/Manifest
+++ b/dev-ros/python_cmake_module/Manifest
@@ -1,4 +1,4 @@
-DIST python_cmake_module-0.8.0.tar.gz 7026 BLAKE2B 38946d2499ee2d2d6bbdc261453ca9b1d3d3743a5e7b5facd88ce6fc1cd310a475b9a388039ef3a1c6f1990d987b1e7e121bab8b2c993b6cd2034835f4430671 SHA512 8c19ea65c6848c5df1efdbb4134e410af00ffdc9e980f761b448eaee04259fd6faa511c2b7fa8ee1ba2a8c5e3bd0c4a20cc7cdeba534512592a2809cf64f3ab7
-EBUILD python_cmake_module-0.8.0.ebuild 1113 BLAKE2B e7d8580459b468295c8a801b74b8079c7987ec0cde60d10761765a49bba31d6fef0945760048dbb6762fee722b94d9f1553a5fb5e92e2a7261f8a3e42a61d782 SHA512 09d97095ff454ea8f046b4dc6afddb65eae195508b1bfce94f83aa74554afac255d7e44906559b73df7aee23a3612661d88706d23bc948e8af8800c3c806db00
+DIST python_cmake_module-0.8.1.tar.gz 7047 BLAKE2B 79f6259913d42381443f3d93d48f67fb325abf423baf054465d83f641ca40f5bfad0acab0f19560968a280eaacecf56df253c90688d75144e25e27e28f3646b0 SHA512 f513031c9d0bbd5d05a1711074287a5ffd0c30be79d2f4849599ff539584f950c2e7c2322763358c8a1ac266da325f40fe9cd4d3a127cd6a9e4dfd83a3e4149c
+EBUILD python_cmake_module-0.8.1.ebuild 1113 BLAKE2B e7d8580459b468295c8a801b74b8079c7987ec0cde60d10761765a49bba31d6fef0945760048dbb6762fee722b94d9f1553a5fb5e92e2a7261f8a3e42a61d782 SHA512 09d97095ff454ea8f046b4dc6afddb65eae195508b1bfce94f83aa74554afac255d7e44906559b73df7aee23a3612661d88706d23bc948e8af8800c3c806db00
 EBUILD python_cmake_module-9999.ebuild 1113 BLAKE2B e7d8580459b468295c8a801b74b8079c7987ec0cde60d10761765a49bba31d6fef0945760048dbb6762fee722b94d9f1553a5fb5e92e2a7261f8a3e42a61d782 SHA512 09d97095ff454ea8f046b4dc6afddb65eae195508b1bfce94f83aa74554afac255d7e44906559b73df7aee23a3612661d88706d23bc948e8af8800c3c806db00
 MISC metadata.xml 338 BLAKE2B 09f1c53f00178afd4738a502187b87c5df6d08de21ed2495715cbab52073b307ce335fa2b29e5c4d77d84def4edaa04efa37add566b8d9a7d40a122d44b0e769 SHA512 b1de856f11f458954837430045b05058912bde28badc8c7e9082a66d72e5ded51a5914acbb50adbada11ee123137d25dec76132b17d2ced01d4cea1e67ea30e0
diff --git a/dev-ros/python_cmake_module/python_cmake_module-0.8.0.ebuild b/dev-ros/python_cmake_module/python_cmake_module-0.8.1.ebuild
index 150095c180f0..150095c180f0 100644
--- a/dev-ros/python_cmake_module/python_cmake_module-0.8.0.ebuild
+++ b/dev-ros/python_cmake_module/python_cmake_module-0.8.1.ebuild
diff --git a/dev-ros/python_qt_binding/Manifest b/dev-ros/python_qt_binding/Manifest
index c5d42cfd8e2d..4258752c6db7 100644
--- a/dev-ros/python_qt_binding/Manifest
+++ b/dev-ros/python_qt_binding/Manifest
@@ -1,4 +1,4 @@
-DIST python_qt_binding-0.4.3.tar.gz 12632 BLAKE2B 1403602262a18ce359d153234bb01ff3a6a90e91f9f4a84ddcd0551723c04c493526f51b81f750c90f78005d2c5b78cf77396ecd3132f1c505038bad8639b63d SHA512 103f791a27f8e8dad668a63c0bfc96facd93cbb043541bd036355d62c787759724fe0d66788c587c3cb68486e6d2732039d7c27f567ed48f2ecf21ce98d275af
-EBUILD python_qt_binding-0.4.3-r1.ebuild 462 BLAKE2B 11287745485473ecee2f88bf531b9193e90c0136cea9312364b3f12cdeaaa32314864a838371ec5d3b786dc121af8b9eaed62c14a54d6a4100ea7d74f8355a2c SHA512 66d6ec04d1f79dc79b1dc4097a0169ea1ece1e5cc0949f4a4db685eaf0731d0f7eb34e22448f3a5e3f1c8a1a8a0bfd085b3929a5686064d575bc0d3b23fec3a5
+DIST python_qt_binding-0.4.4.tar.gz 12776 BLAKE2B 519b10d2995fa508c1a2013740c82fe834f069b944c02b78168a51b8a87a86952189ea92bf214b13becd81454ba2120a644adf08527cf76db51bd9e459d24884 SHA512 db3f60c72bbce012b598ede1ad2e8beafb495dbd4ef2be15a6e75daec0ae97a618061849995cfac2b71af14d6e858febbf6b3b07e9acfeca3630af15cd24c1dc
+EBUILD python_qt_binding-0.4.4.ebuild 462 BLAKE2B 212a2f8978ed89e6c9ca7dcff9f7d71f64f0cc7734aa1d2c9698d7600a8dfd47f5384c8d7cde39a571c428352573657394611e84f4f82ef3718175594674de34 SHA512 a22195eacc02d1bb9b5edf36d10e21728e813f0fa10ad4e84d834f4ac0d1e670d5f6d80bb3d848d36b41bb2f2690774f238cecbc8fb0e136fe5c0aa0c7a7dbd7
 EBUILD python_qt_binding-9999.ebuild 462 BLAKE2B 11287745485473ecee2f88bf531b9193e90c0136cea9312364b3f12cdeaaa32314864a838371ec5d3b786dc121af8b9eaed62c14a54d6a4100ea7d74f8355a2c SHA512 66d6ec04d1f79dc79b1dc4097a0169ea1ece1e5cc0949f4a4db685eaf0731d0f7eb34e22448f3a5e3f1c8a1a8a0bfd085b3929a5686064d575bc0d3b23fec3a5
 MISC metadata.xml 349 BLAKE2B bc205c9c90eab1ea292d3e90f9f4a1d769c5202af60c57371152eaf80a50bdf6257cb2bb0ad6070a8443f0d19cc64e8493d5ec43e2701085f96c90ec6187a705 SHA512 f388f612a53c2de0a6cdece5a03d08e583f848592da6763b7995ff80e60756caca49da4318ded57ba09141facf717442141066142ed0691172f4e6b98a5ee266
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.4.3-r1.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.4.3-r1.ebuild
deleted file mode 100644
index 09f3528474a0..000000000000
--- a/dev-ros/python_qt_binding/python_qt_binding-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/PyQt5[gui,widgets,printsupport,\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.4.4.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.4.4.ebuild
new file mode 100644
index 000000000000..a5642194ace7
--- /dev/null
+++ b/dev-ros/python_qt_binding/python_qt_binding-0.4.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/PyQt5[gui,widgets,printsupport,\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/robot_localization/Manifest b/dev-ros/robot_localization/Manifest
index 76833a8cb1be..d3fe5d81e992 100644
--- a/dev-ros/robot_localization/Manifest
+++ b/dev-ros/robot_localization/Manifest
@@ -1,5 +1,5 @@
 AUX nowerror.patch 478 BLAKE2B 9e2d2079524b14db178bebce4dac0471dee662ffc208d97ba0e4a2327b38800d077dc751db28220079cc274b25738b853f0d0302442a72acf2879ceca3c7d05f SHA512 11543749935449cf98dd92724adedcc0396dddff00a01fed0bf8ea53d53f7e96a7b1824771761137b531cf39fed2aed34c44c4841f2b5f129d34dddbea73ef05
-DIST robot_localization-2.7.2.tar.gz 6525425 BLAKE2B 6074f24731bce065639a29507bd330a391a60025381ccd5a90be2b4c4c1087deca9fce58fd9e623051be3b7ca0234c14430be973e6b57087a77fad449c3f3749 SHA512 02a0a555e81285c3062dd229d23daf2b9af02902f3ed7f5d35bdea8a08a1046befb035fb2a0f2e5ebb8c11998d8ecbd16e5aeb9f82757241e4c3f44fce3499f5
-EBUILD robot_localization-2.7.2.ebuild 1378 BLAKE2B 33b893a9ee237559bcc6260e8290e328ef93287b17a21482dcb3e59273b1176a5e6b1feaf83b092dccc2bf0a017220016bdb089b886450efdbcfb762083fca9a SHA512 40340340eea28c31436b040da28d171dcc480ea528c993af7772354aa329dde4eb80a6f83c6af8118eee5dce7a96fe36aaa816415374019152631b9d40b640da
-EBUILD robot_localization-9999.ebuild 1378 BLAKE2B 33b893a9ee237559bcc6260e8290e328ef93287b17a21482dcb3e59273b1176a5e6b1feaf83b092dccc2bf0a017220016bdb089b886450efdbcfb762083fca9a SHA512 40340340eea28c31436b040da28d171dcc480ea528c993af7772354aa329dde4eb80a6f83c6af8118eee5dce7a96fe36aaa816415374019152631b9d40b640da
+DIST robot_localization-2.7.3.tar.gz 6525696 BLAKE2B 74003020bb9e4ba84664ac60f5ba5122e77c55581b6e8f395bae92ef50b74cc0c6339d97c97e80a503a737d092454dace14707e73531a755b151e2c3c058b356 SHA512 2d0d7d029e01424eb35126bbe98b23b687f34331d177e4f7f5ee27a75382b72a27f1cdf90062b59ea4a471338cea57545c858479e04b0e1dd964cb04f4df7bfa
+EBUILD robot_localization-2.7.3.ebuild 1392 BLAKE2B 7d1948639ef236582dca668cba40b09c017691158e74ac253abad95165ecfb6e9eb6fb7910b27dbbc37fda6e40416c49033bfde6cd5da802e7b90d37dee3d819 SHA512 10f60a07af450854e5fff49b7ca668c82901859ff075c3559e58cbf1180633c42a41fff2e9cf1f072d4aef20c8f9fcd86954cb71f23b9b738f9ebaf88ba76f04
+EBUILD robot_localization-9999.ebuild 1392 BLAKE2B 7d1948639ef236582dca668cba40b09c017691158e74ac253abad95165ecfb6e9eb6fb7910b27dbbc37fda6e40416c49033bfde6cd5da802e7b90d37dee3d819 SHA512 10f60a07af450854e5fff49b7ca668c82901859ff075c3559e58cbf1180633c42a41fff2e9cf1f072d4aef20c8f9fcd86954cb71f23b9b738f9ebaf88ba76f04
 MISC metadata.xml 344 BLAKE2B 96e3dfb26e972a619ecd9e986e67272c46186bf0fe88721d42fcce8f94329417a30ddfb0b3b7a5f6b4dee8094bdeb842ba74da67a46db1270c4932dd3548d8d3 SHA512 682ee23502ff9b98b82cc8edb5dffafb1bde520ffa42ce8ab417e9c5dabab929286bb572e0988108201e29363315d12c8a5f55f841324fa339effe82ac1595c1
diff --git a/dev-ros/robot_localization/robot_localization-2.7.2.ebuild b/dev-ros/robot_localization/robot_localization-2.7.2.ebuild
deleted file mode 100644
index de42590f0e81..000000000000
--- a/dev-ros/robot_localization/robot_localization-2.7.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/cra-ros-pkg/robot_localization"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geographic_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Package of nonlinear state estimation nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/eigen_conversions
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-ros/tf2_ros
-	dev-libs/boost:=
-	dev-cpp/yaml-cpp:=
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	sci-geosciences/GeographicLib:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit )
-"
-BDEPEND="dev-ros/roslint"
-
-PATCHES=( "${FILESDIR}/nowerror.patch" )
-
-src_configure() {
-	local mycatkincmakeargs=(
-		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/share/cmake/GeographicLib"
-	)
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/robot_localization/robot_localization-2.7.3.ebuild b/dev-ros/robot_localization/robot_localization-2.7.3.ebuild
new file mode 100644
index 000000000000..043bb3e92385
--- /dev/null
+++ b/dev-ros/robot_localization/robot_localization-2.7.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/cra-ros-pkg/robot_localization"
+KEYWORDS="~amd64"
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geographic_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Package of nonlinear state estimation nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/eigen_conversions
+	dev-ros/message_filters
+	dev-ros/roscpp
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs
+	dev-ros/tf2_ros
+	dev-libs/boost:=
+	dev-cpp/yaml-cpp:=
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+	sci-geosciences/GeographicLib:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit dev-cpp/gtest )
+"
+BDEPEND="dev-ros/roslint"
+
+PATCHES=( "${FILESDIR}/nowerror.patch" )
+
+src_configure() {
+	local mycatkincmakeargs=(
+		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/share/cmake/GeographicLib"
+	)
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/robot_localization/robot_localization-9999.ebuild b/dev-ros/robot_localization/robot_localization-9999.ebuild
index de42590f0e81..043bb3e92385 100644
--- a/dev-ros/robot_localization/robot_localization-9999.ebuild
+++ b/dev-ros/robot_localization/robot_localization-9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3
-	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit )
+	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit dev-cpp/gtest )
 "
 BDEPEND="dev-ros/roslint"
 
diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index ac8d83897dad..717683d00929 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1,9 +1,11 @@
 AUX pycrypto.patch 402 BLAKE2B 2f784f93115b205285bb9eb9c910185f84871da7ecc5865304d220df7e1e9bea3799743a1f7a2a274423ec3fa4e367773814bd5fbb5cb074acb7252845ba6e94 SHA512 2343aca88929010f76389f31187b913f92f8d510a18a0d81b20c2c9accc2da68d15fd959404f11d363bdbe98f644ff2e76a70fdca4a718b490fa7f812a1b417e
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosbag-1.15.10.ebuild 961 BLAKE2B 41c1b43271318a507cdd6153811ab76908819f0e75dc7c8dcfb1c7c4dcf6ed0e59b673647107caade89e21f6b6700b164053c4ce5b7de7db5fbef5ed8c8a473b SHA512 de5b04faed760e3ae5b12fbd58acdae9168de808f99e023b0f3564eca8dc1118ca30d09a14978c4fedae8c8e6e7a018b1ed0dd12b38df28002088ca8a43674cc
+EBUILD rosbag-1.15.11.ebuild 961 BLAKE2B 41c1b43271318a507cdd6153811ab76908819f0e75dc7c8dcfb1c7c4dcf6ed0e59b673647107caade89e21f6b6700b164053c4ce5b7de7db5fbef5ed8c8a473b SHA512 de5b04faed760e3ae5b12fbd58acdae9168de808f99e023b0f3564eca8dc1118ca30d09a14978c4fedae8c8e6e7a018b1ed0dd12b38df28002088ca8a43674cc
 EBUILD rosbag-1.15.7.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
 EBUILD rosbag-1.15.8.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
 EBUILD rosbag-1.15.9.ebuild 961 BLAKE2B 1fe92d6cd74a7eb7ce6c002073b82bef14a6bb85042a60cffe28627cb487005d87d5a38c0c8674929c084d81a802b74bbbc22bd73ada7cf11e8f3ee33ba1b57d SHA512 70adb3692fa3e2bfa8f0eac8e12542015a15155129a10361055102459aa16a98041d35ddc3841ade1ff564a0737285d7f100c3088b466bbfa19fbc5775302280
diff --git a/dev-ros/rosbag/rosbag-1.15.11.ebuild b/dev-ros/rosbag/rosbag-1.15.11.ebuild
new file mode 100644
index 000000000000..d6ca262b4d4e
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.15.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE="lz4"
+
+RDEPEND="
+	>=dev-ros/rosbag_storage-1.14
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/topic_tools
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/genpy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/console_bridge:=
+	$(python_gen_cond_dep "dev-python/pycryptodome[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/python-gnupg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	lz4? ( dev-ros/roslz4[${PYTHON_SINGLE_USEDEP}] )"
+PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest
index 042cf1aacfcb..1a6c6f8f57dd 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosbag_storage-1.15.10.ebuild 909 BLAKE2B b4349a13dd368a337f113770facaff0cf46e699972664f1f657a5155cf28225266d128bc7cd1c8d77e0292756c5143fd771374f7c1fd1473ae2c06e5c769d8b6 SHA512 846a5308cd223c0bea1a691cd73c9ecac8184732b6a766d5b6dcd31504c479f0fdcdd655bcfc905709fa299b160a8cfd3222a123a5eda46d312aa74b392a9aa6
+EBUILD rosbag_storage-1.15.11.ebuild 909 BLAKE2B b4349a13dd368a337f113770facaff0cf46e699972664f1f657a5155cf28225266d128bc7cd1c8d77e0292756c5143fd771374f7c1fd1473ae2c06e5c769d8b6 SHA512 846a5308cd223c0bea1a691cd73c9ecac8184732b6a766d5b6dcd31504c479f0fdcdd655bcfc905709fa299b160a8cfd3222a123a5eda46d312aa74b392a9aa6
 EBUILD rosbag_storage-1.15.8-r1.ebuild 909 BLAKE2B ff001115ff23dae3f7716ede48c603a57ac58a4d044a42876c6a2a23def35cf6f5d235e0a1a38cecba4fc2c66378fd51e2e995a1525c91768f800b666ad29772 SHA512 11a5e8b06dd0a5febf9d0c67c7ec68ef72b8ddc24636c4d9ef1b9e458074eca3d8f5362cd55a3f2df2d09666dc9e82e5c558608da68a929cdf3a194118df556a
 EBUILD rosbag_storage-1.15.9.ebuild 909 BLAKE2B ff001115ff23dae3f7716ede48c603a57ac58a4d044a42876c6a2a23def35cf6f5d235e0a1a38cecba4fc2c66378fd51e2e995a1525c91768f800b666ad29772 SHA512 11a5e8b06dd0a5febf9d0c67c7ec68ef72b8ddc24636c4d9ef1b9e458074eca3d8f5362cd55a3f2df2d09666dc9e82e5c558608da68a929cdf3a194118df556a
 EBUILD rosbag_storage-9999.ebuild 909 BLAKE2B ff001115ff23dae3f7716ede48c603a57ac58a4d044a42876c6a2a23def35cf6f5d235e0a1a38cecba4fc2c66378fd51e2e995a1525c91768f800b666ad29772 SHA512 11a5e8b06dd0a5febf9d0c67c7ec68ef72b8ddc24636c4d9ef1b9e458074eca3d8f5362cd55a3f2df2d09666dc9e82e5c558608da68a929cdf3a194118df556a
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.11.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.11.ebuild
new file mode 100644
index 000000000000..98d1abfadea8
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.11.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back ROS message"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge
+
+	dev-ros/cpp_common
+	>=dev-ros/pluginlib-1.13.0-r2:=
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/roslz4
+
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-libs/console_bridge:=
+	dev-libs/tinyxml2:=
+
+	dev-libs/openssl:0=
+	app-crypt/gpgme
+"
+DEPEND="${RDEPEND}
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rosbash/Manifest b/dev-ros/rosbash/Manifest
index 975980f04b31..dd89cb01bb64 100644
--- a/dev-ros/rosbash/Manifest
+++ b/dev-ros/rosbash/Manifest
@@ -2,8 +2,10 @@ AUX catkin_prefix.patch 443 BLAKE2B 4b366a582a5ebda3cfd644fb0319cd6cd07e9e983db9
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD rosbash-1.15.5.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
 EBUILD rosbash-1.15.6.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
 EBUILD rosbash-1.15.7.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
+EBUILD rosbash-1.15.8.ebuild 408 BLAKE2B 128f53622cac97f22f89acc18820facfa2994ee5da8dc99edf722f0b08098ccb971541502925ec7d1dbea6beae97a7060644e64278127125a9b1fd05917db21a SHA512 7ef15abeea17af2acd308d2457841f53b38f0f693d4a9749ce97733f1be1c057d3639015254496b951025b09737678e8e442c56d54c20d0d260b237b5cc605cf
 EBUILD rosbash-9999.ebuild 408 BLAKE2B f1cd0b3d8f4b45b02da8d8e2416514af39d5c06eb92f4d6d798747db255227f5b7f47a527cf95889e6a3570912d1afef17ea8a26d05c8c9e97fb354f4c1fb980 SHA512 8fe645a744e36f11f80cb5d4d4fd8ac5e80426decb33e552aa26ab263d274a14a16bbd7c70de243ab7fba3470597473ba4735f51e078be515e1636448300f009
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbash/rosbash-1.15.8.ebuild b/dev-ros/rosbash/rosbash-1.15.8.ebuild
new file mode 100644
index 000000000000..2177afe2fcf5
--- /dev/null
+++ b/dev-ros/rosbash/rosbash-1.15.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Assorted shell commands for using ros with bash"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rospack"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
diff --git a/dev-ros/rosboost_cfg/Manifest b/dev-ros/rosboost_cfg/Manifest
index dce8a4532d98..58adc740c37e 100644
--- a/dev-ros/rosboost_cfg/Manifest
+++ b/dev-ros/rosboost_cfg/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD rosboost_cfg-1.15.5.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
 EBUILD rosboost_cfg-1.15.6.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
 EBUILD rosboost_cfg-1.15.7.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
+EBUILD rosboost_cfg-1.15.8.ebuild 363 BLAKE2B da3ac96f4bb836728226d82b7202f88ac210592d950a05f3980a97cc9b89a7cd42469a4e3a7068fa509994d7cd0b06f794073a72e95859cb380d4162ae64f91e SHA512 f7b7b23f0cb18d32cbd0af6e66a1a575398e1022af1de99408829676703d824d89e33cde8cd7ffcb8d6f27c118e7511c9f1350cc26ac103db90f07ba4b5b0a3d
 EBUILD rosboost_cfg-9999.ebuild 363 BLAKE2B 33ab4b86cebcd6c3ae2af1991c22159c54f49c9c83fda291683cab5df3ce2a98ed574d054df63574a20f693ac199b21d16735a5daaf544cfda4b5a4d2578cc09 SHA512 a9f65adaf5dbcdead5dbc662f7de8b729f00d52885bb4f86ae2bc5b55312abe0cc7d801c0cd7560fdfe04304914552fc4c428e18824bb25af38f6d6b8d071da6
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.15.8.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.15.8.ebuild
new file mode 100644
index 000000000000..68c0316e8510
--- /dev/null
+++ b/dev-ros/rosboost_cfg/rosboost_cfg-1.15.8.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbuild/Manifest b/dev-ros/rosbuild/Manifest
index 8c809d9c36a3..c91a52c75afe 100644
--- a/dev-ros/rosbuild/Manifest
+++ b/dev-ros/rosbuild/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD rosbuild-1.15.5.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
 EBUILD rosbuild-1.15.6.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
 EBUILD rosbuild-1.15.7.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
+EBUILD rosbuild-1.15.8.ebuild 356 BLAKE2B 2b5a012d6c007b90fb8154678e6a5db9153b043a9c4601b1bfce6caefb51a208865e70798b452e192be6b0fd942b62c43c8e41a81433f36a01bc115e5b8ba040 SHA512 6ec6204e743e60e3a2dc7db1c69402e833ea4e3e8604bcdd9d241a352732ac0a5b850be7c56793b00fd51679f2a01a900bfd57fdac9891dfb092d967dbdc415d
 EBUILD rosbuild-9999.ebuild 356 BLAKE2B a3f80a31d0bfb733854ac89fa0435a9e084db5f05b32e8cb3132ee94d21ecf67f7025c1ba457706e5374aa7bee060895541a328763dcf95c7677f1d76fd9cae2 SHA512 aa88a7718ccb741df3c06d422790b9c0e01d27a23bb27de9a71935157b32766bfa67406135e6c51dde4265ba5b9693111b5e34d660a67cfa1d1b0769f86b55ea
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosbuild/rosbuild-1.15.8.ebuild b/dev-ros/rosbuild/rosbuild-1.15.8.ebuild
new file mode 100644
index 000000000000..a66d7458c4dc
--- /dev/null
+++ b/dev-ros/rosbuild/rosbuild-1.15.8.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Scripts for managing the CMake-based build system for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosclean/Manifest b/dev-ros/rosclean/Manifest
index 161390d525c9..9e7f4903bc09 100644
--- a/dev-ros/rosclean/Manifest
+++ b/dev-ros/rosclean/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD rosclean-1.15.5.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
 EBUILD rosclean-1.15.6.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
 EBUILD rosclean-1.15.7.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
+EBUILD rosclean-1.15.8.ebuild 478 BLAKE2B 5203b3ef3612407db9bf3d4e202569dabcbefab768a38c74b7b403a553d32e37c5a215f93382221f57f8113d730eb29ec4209726b9b6f21f0c9e5450f3eba280 SHA512 ba2ffb59731adbe0d7ac11b0af63bcdb12e3d6eacad46176a119d292807f404bc31ec6eeeaa1dfca1e2faf776603eec7ac79639e0d0521e2f0f73e1b980ecd3d
 EBUILD rosclean-9999.ebuild 478 BLAKE2B dd60994c921a1667e9f6c29bb0a151bcf886887386ccc555f58b6daf77c0cb62413f4b6eea2982dd1cf29180097584c5ba588c059911e76b6a153b89f76fa305 SHA512 9ff32db2c13c6163cb7d303c2f4dcc0650486f8d79617f7c28841db4af7e7f8489396b3e27610c41fdf0f9fc45ca13bccf7a65e2b184fce462beb55d2eeb7378
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosclean/rosclean-1.15.8.ebuild b/dev-ros/rosclean/rosclean-1.15.8.ebuild
new file mode 100644
index 000000000000..ab620eea3d8f
--- /dev/null
+++ b/dev-ros/rosclean/rosclean-1.15.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
+"
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index 6725b0694c08..c4399fc9dd06 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD roscpp-1.15.10.ebuild 606 BLAKE2B b8e78e2ed68bd093f06a3649296603d192b8e2c2632d13146585e5ab506c197ff704a911bf915ee752e67f4dbe24cf5585158d00d06f7014652ab85237003576 SHA512 6066703301141ca2d920c33dcc76e59c8fd4bc8ee428de58490a56989bc91188ed5a52b3df441dca451283a95bdc0f0a9298d5d1ff74649ad753ff1f3964ec7b
+EBUILD roscpp-1.15.11.ebuild 606 BLAKE2B b8e78e2ed68bd093f06a3649296603d192b8e2c2632d13146585e5ab506c197ff704a911bf915ee752e67f4dbe24cf5585158d00d06f7014652ab85237003576 SHA512 6066703301141ca2d920c33dcc76e59c8fd4bc8ee428de58490a56989bc91188ed5a52b3df441dca451283a95bdc0f0a9298d5d1ff74649ad753ff1f3964ec7b
 EBUILD roscpp-1.15.9.ebuild 606 BLAKE2B 7c38cba14922e02ec2bbc0c6f0365a66f5c691644f7509ff718cf932b49404c90013156c76a13313c60386a215010b2044fce30f3b3b675575e92717178e8b31 SHA512 3d3c82c30a6dc1195675fa4268a8ce463dfebcdc3e411df45a8222f99554c049a748d18ef2d47fb3d956314414b2e98ae8e913667f5610751b0c023d71fa3236
 EBUILD roscpp-9999.ebuild 606 BLAKE2B 7c38cba14922e02ec2bbc0c6f0365a66f5c691644f7509ff718cf932b49404c90013156c76a13313c60386a215010b2044fce30f3b3b675575e92717178e8b31 SHA512 3d3c82c30a6dc1195675fa4268a8ce463dfebcdc3e411df45a8222f99554c049a748d18ef2d47fb3d956314414b2e98ae8e913667f5610751b0c023d71fa3236
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roscpp/roscpp-1.15.11.ebuild b/dev-ros/roscpp/roscpp-1.15.11.ebuild
new file mode 100644
index 000000000000..7cee4461c7ca
--- /dev/null
+++ b/dev-ros/roscpp/roscpp-1.15.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscreate/Manifest b/dev-ros/roscreate/Manifest
index b274e5babfde..0a21c82add64 100644
--- a/dev-ros/roscreate/Manifest
+++ b/dev-ros/roscreate/Manifest
@@ -1,6 +1,8 @@
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD roscreate-1.15.6.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
 EBUILD roscreate-1.15.7.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
+EBUILD roscreate-1.15.8.ebuild 626 BLAKE2B c693496ae70386c6223d046e07448cfa8c6f1d50546f4c1a3f70a5821aae386f5c23b0a80b231855f5c2b226f4cb1f9733708e929dc19b3ff980620344ebbaf5 SHA512 787dd7bf22f32415830805254742c4bf7847544167aa71433233196a07225e4f25ed410a8bcddf05c9bd59ca0bed5354b2765d72456f434473c2ef0b362c188e
 EBUILD roscreate-9999.ebuild 626 BLAKE2B c880b48ff7e31fb2325430bc6598fc183494f5b70c57c01daed20b5748dda199f288ef41991a1829d5a0730b8ca9788dcae36f566d55214ac4c370894d60bcb7 SHA512 b50345e9763f4e56bd789c723e29eb53403c4ee859ae39c4d9470ab2b7ab8fbf564ce83c34fd54faacbefc72f964588e879f212fd4d441038eb62a0c8001be26
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roscreate/roscreate-1.15.8.ebuild b/dev-ros/roscreate/roscreate-1.15.8.ebuild
new file mode 100644
index 000000000000..fdca9421e8ab
--- /dev/null
+++ b/dev-ros/roscreate/roscreate-1.15.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index 9b606f904c9f..3a7c685c6968 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosgraph-1.15.10.ebuild 710 BLAKE2B bc1be14a2d80c6acf980993059cb6ca0903dc884dddcfbced3d709057f827ba00f5743e99874ea5f0900c837b7f95c05d3ce89c99ce3cf502f226982d901a152 SHA512 3f1a196462ad7125e2384543384e0dfa7909bb974efdb311a9ab6584c8b31eb7fe16099594fb7fd5fa2c7c50e8c0746bf50b4ec3bdcd47f7e1960b203b3c8a9b
+EBUILD rosgraph-1.15.11.ebuild 710 BLAKE2B bc1be14a2d80c6acf980993059cb6ca0903dc884dddcfbced3d709057f827ba00f5743e99874ea5f0900c837b7f95c05d3ce89c99ce3cf502f226982d901a152 SHA512 3f1a196462ad7125e2384543384e0dfa7909bb974efdb311a9ab6584c8b31eb7fe16099594fb7fd5fa2c7c50e8c0746bf50b4ec3bdcd47f7e1960b203b3c8a9b
 EBUILD rosgraph-1.15.8.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
 EBUILD rosgraph-1.15.9.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
 EBUILD rosgraph-9999.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
diff --git a/dev-ros/rosgraph/rosgraph-1.15.11.ebuild b/dev-ros/rosgraph/rosgraph-1.15.11.ebuild
new file mode 100644
index 000000000000..79863bd48ac7
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.15.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Prints information about the ROS Computation Graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/roslang/Manifest b/dev-ros/roslang/Manifest
index 4785dc06f276..06c0b7cb773c 100644
--- a/dev-ros/roslang/Manifest
+++ b/dev-ros/roslang/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD roslang-1.15.5.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
 EBUILD roslang-1.15.6.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
 EBUILD roslang-1.15.7.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
+EBUILD roslang-1.15.8.ebuild 342 BLAKE2B ed208da62480d0e5ae90fe19496d9c3ee27e97e38b27d0c3f6921893e27db1369b8d7cdaf3d9a9ca5b97c21d792b651a1e7b4b1b2e45cde54cca4ac7f34424bb SHA512 aecdf1dec4b31407eacbf8c5ce0db4b421fe884293a135499226d31651271f1c6b267e31583ee7d0370c1fd7f4be74823792dc8c9177570c5d7b0270554c141e
 EBUILD roslang-9999.ebuild 342 BLAKE2B ce1b9ba89906a027900c3c42de9cae98313517b93debbdaeb55855880791556c5747fafbfb08b55890644e46f784cb94e3f44f8cbd2ada1f47705993368d33f9 SHA512 694b372d7f0ac31cf86fc4cd55e8539a6d66cd245d8c301b20724dd22127cf098fa6f75595a3ed444d6058cb9de9a30b891fd13f4c911a4f903bdd1cd741fc50
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslang/roslang-1.15.8.ebuild b/dev-ros/roslang/roslang-1.15.8.ebuild
new file mode 100644
index 000000000000..a2c65f71cd37
--- /dev/null
+++ b/dev-ros/roslang/roslang-1.15.8.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common package for all ROS client libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index 83939db14de7..c8014eabbc59 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -5,6 +5,8 @@ AUX roscore.xml.in 347 BLAKE2B 05c90bd6a2cffeaab16d1fb576e2cbe5768a848c5b6231af9
 AUX roslaunch.confd 46 BLAKE2B 24fcab885cf07185c751da12863e3af0ac8f1097a636c3641be1b6357e26b5178d13ee42d04bbacea27763df075f5436813afc2025dd9013461059b0c5feacd9 SHA512 0a86b0beb7b4bad2c01f3814070d27a3c85a99629ab26fa3aa6cce19d178d500c912665b152403cf7301f210e3cf9e6bd03103c3654b1ef61dae165ba5ac704d
 AUX roslaunch.initd 915 BLAKE2B 11f2c6f2db2ad1084332a1b704a90ed3a3fc9fe671f96f6ca74bbabdab3b7f22bed96c077dd994e3c3fc54eb299e93001167fe16e688eb062033f3da86ac168d SHA512 4f8bb2dfe085d09245ec2343e423e1dacbd02108868c5d9523d63929c939b753f45ce963d5d44b5ad0f547f7d85b82ea6d3a80f8984dfe72ade7f8a5372c850c
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 EBUILD roslaunch-1.15.10-r1.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
+EBUILD roslaunch-1.15.11.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
 EBUILD roslaunch-9999.ebuild 1615 BLAKE2B 520bb52d2fd22675c70bc5b78160016f00c5c3ecaed2fee42f111067c5c01699ec120b88fe7e150331b6b08d25705e79149734fbe07245d5879f41d37a6baf48 SHA512 61313cb9c6d97ed313577208471f4fe589213f8eb7bd04d9333de017175a17f7cf47ec77574204b4c91db7774c9ce5b470d8d67395225c502aa8baec6a7e985a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/roslaunch-1.15.11.ebuild b/dev-ros/roslaunch/roslaunch-1.15.11.ebuild
new file mode 100644
index 000000000000..2cc8912dd83a
--- /dev/null
+++ b/dev-ros/roslaunch/roslaunch-1.15.11.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for easily launching multiple ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+
+CDEPEND="
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosout
+"
+
+RDEPEND="
+	${CDEPEND}
+	acct-group/ros
+	acct-user/ros
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/test_rosmaster
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
+	ros-catkin_src_test
+}
+
+src_install() {
+	ros-catkin_src_install
+
+	dodir /etc/ros
+	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
+
+	newinitd "${FILESDIR}/roscore.initd" roscore
+	newconfd "${FILESDIR}/roscore.confd" roscore
+
+	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
+	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
+
+	doenvd "${FILESDIR}/40roslaunch"
+
+	# Needed by test_roslaunch
+	insinto /usr/share/${PN}
+	doins test/xml/noop.launch
+}
diff --git a/dev-ros/roslib/Manifest b/dev-ros/roslib/Manifest
index 089d358e74d4..da3e9648d2c3 100644
--- a/dev-ros/roslib/Manifest
+++ b/dev-ros/roslib/Manifest
@@ -1,6 +1,8 @@
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD roslib-1.15.6-r1.ebuild 657 BLAKE2B 1a0ad9cf1e77b2c99d5a07c2354b1dd1788398726cf62aa9a3b1e4650271fa92b02629f600c8f382a4fd42e80fb14b51f096c20a6b989b8f555126b5f8332279 SHA512 797943c61df32a63597d047d143a14dcd02bebc76a2d9f2a25d8ce930eea21cdc565fe180070147239b4a9b24fc8202089eaaa1e5b963ea097db01454e2d0294
 EBUILD roslib-1.15.7-r1.ebuild 657 BLAKE2B 1a0ad9cf1e77b2c99d5a07c2354b1dd1788398726cf62aa9a3b1e4650271fa92b02629f600c8f382a4fd42e80fb14b51f096c20a6b989b8f555126b5f8332279 SHA512 797943c61df32a63597d047d143a14dcd02bebc76a2d9f2a25d8ce930eea21cdc565fe180070147239b4a9b24fc8202089eaaa1e5b963ea097db01454e2d0294
+EBUILD roslib-1.15.8.ebuild 657 BLAKE2B 1a0ad9cf1e77b2c99d5a07c2354b1dd1788398726cf62aa9a3b1e4650271fa92b02629f600c8f382a4fd42e80fb14b51f096c20a6b989b8f555126b5f8332279 SHA512 797943c61df32a63597d047d143a14dcd02bebc76a2d9f2a25d8ce930eea21cdc565fe180070147239b4a9b24fc8202089eaaa1e5b963ea097db01454e2d0294
 EBUILD roslib-9999.ebuild 657 BLAKE2B 1a0ad9cf1e77b2c99d5a07c2354b1dd1788398726cf62aa9a3b1e4650271fa92b02629f600c8f382a4fd42e80fb14b51f096c20a6b989b8f555126b5f8332279 SHA512 797943c61df32a63597d047d143a14dcd02bebc76a2d9f2a25d8ce930eea21cdc565fe180070147239b4a9b24fc8202089eaaa1e5b963ea097db01454e2d0294
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/roslib/roslib-1.15.8.ebuild b/dev-ros/roslib/roslib-1.15.8.ebuild
new file mode 100644
index 000000000000..ce412cbff520
--- /dev/null
+++ b/dev-ros/roslib/roslib-1.15.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Base dependencies and support libraries for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep ">=dev-python/rospkg-1.0.37[\${PYTHON_USEDEP}]")
+	dev-libs/boost:=[threads(+)]
+	dev-ros/rospack
+	dev-ros/ros_environment
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}/../../"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest
index 2784f22fd507..2503bcaffc09 100644
--- a/dev-ros/roslz4/Manifest
+++ b/dev-ros/roslz4/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD roslz4-1.15.10.ebuild 423 BLAKE2B ee04baf38a91a0d5a0cda63d01dd680343998aab1b0d97ad7f5858df17df4189f2565c1c592d2f1c00b317d38f3df4db221970b8ce52fb6ba4cfd58b42029a69 SHA512 5154747f57c5529cd781f3542abe7cbdc4c7a6b94ddfbb2c9521ad00d98ffeaa3ccd9546580e77a6e9aa34e6f3ec15479d0a6c9f23f3a9036a0c1996adff49e2
+EBUILD roslz4-1.15.11.ebuild 423 BLAKE2B ee04baf38a91a0d5a0cda63d01dd680343998aab1b0d97ad7f5858df17df4189f2565c1c592d2f1c00b317d38f3df4db221970b8ce52fb6ba4cfd58b42029a69 SHA512 5154747f57c5529cd781f3542abe7cbdc4c7a6b94ddfbb2c9521ad00d98ffeaa3ccd9546580e77a6e9aa34e6f3ec15479d0a6c9f23f3a9036a0c1996adff49e2
 EBUILD roslz4-1.15.8.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
 EBUILD roslz4-1.15.9.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
 EBUILD roslz4-9999.ebuild 423 BLAKE2B 07733e7ff6a8499ee8b776196447a3cf96447c56546e347301460aef88599ef435b0df425485b5cd6a690d087b5f76e4fb63b4f09d638f9d882af859ef6a52e2 SHA512 f3ba822f1e1e7c1bec61e1e3b607fb0db2724c48e84c898e9510731bc96daa5d6bb63abf84fb93d6ced24e74d88370f7ddbfa18a788b08b7a3680df5cc5e1b2e
diff --git a/dev-ros/roslz4/roslz4-1.15.11.ebuild b/dev-ros/roslz4/roslz4-1.15.11.ebuild
new file mode 100644
index 000000000000..bcbd9d65b47d
--- /dev/null
+++ b/dev-ros/roslz4/roslz4-1.15.11.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-arch/lz4
+	dev-ros/cpp_common"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/rosmake/Manifest b/dev-ros/rosmake/Manifest
index cfb343bb9235..ce06e2f25a67 100644
--- a/dev-ros/rosmake/Manifest
+++ b/dev-ros/rosmake/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD rosmake-1.15.5.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
 EBUILD rosmake-1.15.6.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
 EBUILD rosmake-1.15.7.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
+EBUILD rosmake-1.15.8.ebuild 464 BLAKE2B f9144487971d8fa50862515420d0ce69dea3635744a73086d236baaa91dc5598fd78b1e14dd9b650f47386a083b6566e9d6182a1dce530e9fabf3c75c42741c9 SHA512 18a9a93645dec8fdebf0719cab37245395618c204878c333c01dc4f2233086c763ccc27bf8ff18b5db027a6cea19de31b6735f12efc72aa4863b6393555e7b91
 EBUILD rosmake-9999.ebuild 464 BLAKE2B 79d72e2052108d28c39977c1cbebe80821dc836d3a9e709ac78fdf519b9e9cb9b90402890e5c2921418508c6e8f251004e861b992b71e897384d7c6bf346a49a SHA512 0e7c3bbf085636584863eddd17761d537647ec7beaa9f80a801ece101e6626afe8600d5c84b6770ed8028831fee2809f5ff7ddea279ef5c63d76aa4740ba7c79
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosmake/rosmake-1.15.8.ebuild b/dev-ros/rosmake/rosmake-1.15.8.ebuild
new file mode 100644
index 000000000000..8081da39d9a8
--- /dev/null
+++ b/dev-ros/rosmake/rosmake-1.15.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS dependency aware build tool"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
+"
diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest
index 6f4051c73e32..90c0883341ae 100644
--- a/dev-ros/rosmaster/Manifest
+++ b/dev-ros/rosmaster/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosmaster-1.15.10.ebuild 512 BLAKE2B a25499b4aaeb75dab3fa4c4dc78b06dfd06e4f80dd177110d09fb9a2d0f3f4ed79e043173ddcfd2cfd97495fe5e417afb5dd868b7729c521b584f501e30a7ead SHA512 2b85897d594e2b727b977ba1058b1e2e6f359a2491799a04527b1ba3a867636a625c81498a1f892cfab68e987398544362397da19466c9dfc949819e5d12067f
+EBUILD rosmaster-1.15.11.ebuild 512 BLAKE2B a25499b4aaeb75dab3fa4c4dc78b06dfd06e4f80dd177110d09fb9a2d0f3f4ed79e043173ddcfd2cfd97495fe5e417afb5dd868b7729c521b584f501e30a7ead SHA512 2b85897d594e2b727b977ba1058b1e2e6f359a2491799a04527b1ba3a867636a625c81498a1f892cfab68e987398544362397da19466c9dfc949819e5d12067f
 EBUILD rosmaster-1.15.7.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
 EBUILD rosmaster-1.15.8.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
 EBUILD rosmaster-1.15.9.ebuild 512 BLAKE2B 2bc45ed2f61251e6c25fe3caaf50536f5379356d9aacd1840d1011ce17cd8954a5ffd1dfa2e9164afd6c0b03ed77c4e9a6f73ad0f1f071c1e9c086f666d73e01 SHA512 f07ee64c88f466b5bcd95cf59a43340aca286e9367b9a9c4975cbd6cfee013389062b6d08e87828bbd55a6e732bb16dd12b297703aae324d4b158de39d47ce99
diff --git a/dev-ros/rosmaster/rosmaster-1.15.11.ebuild b/dev-ros/rosmaster/rosmaster-1.15.11.ebuild
new file mode 100644
index 000000000000..44c1207c39a0
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.15.11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS Master implementation"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/defusedxml[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )"
diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest
index 5a9d85d8368a..d1e595d420e3 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 EBUILD rosmsg-1.15.10.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
+EBUILD rosmsg-1.15.11.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
 EBUILD rosmsg-9999.ebuild 1004 BLAKE2B 44fc7c48bd1c7180d2ad189969dc4ae3e7e77009f84361f0f75f328727fc0dfe4f97cf7d5ffbdb686359ecb69e371b45c41a57019d684e72ec3e64fc119141e4 SHA512 c04019456247c996ea0eb2600d28f7d5e298cb37ee784f433b67bff7185d36ec267e9d7d87419f956cfa4c31d42070446d2162049031bbfa071872a0f8e26f5f
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmsg/rosmsg-1.15.11.ebuild b/dev-ros/rosmsg/rosmsg-1.15.11.ebuild
new file mode 100644
index 000000000000..d4be4db4044c
--- /dev/null
+++ b/dev-ros/rosmsg/rosmsg-1.15.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tools for displaying information about message and services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}/../..:${EPREFIX}/usr/share/ros_packages/diagnostic_msgs:${EPREFIX}/usr/share/ros_packages/std_msgs:${EPREFIX}/usr/share/ros_packages/std_srvs"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rosnode/Manifest b/dev-ros/rosnode/Manifest
index 842344a0f487..5dbc924b7f4f 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosnode-1.15.10.ebuild 658 BLAKE2B 5e7abe60f4ee02dbf749d1c39a25bbaceeb379553faa6f4607dcb0459d7fab7f3c81e1a8e702c36002cf764e14012bdf67d1d47d8bed3acb81b57cb18271c82f SHA512 bbc3f5f60cf01ee7e5d5dd69b639ce9464bfecf979c191c648aa531e4e4574fc4a606662d3cc4b13599b69de38b98d4c0d97ee0d4267c5472c2d3b3963e53e04
+EBUILD rosnode-1.15.11.ebuild 658 BLAKE2B 5e7abe60f4ee02dbf749d1c39a25bbaceeb379553faa6f4607dcb0459d7fab7f3c81e1a8e702c36002cf764e14012bdf67d1d47d8bed3acb81b57cb18271c82f SHA512 bbc3f5f60cf01ee7e5d5dd69b639ce9464bfecf979c191c648aa531e4e4574fc4a606662d3cc4b13599b69de38b98d4c0d97ee0d4267c5472c2d3b3963e53e04
 EBUILD rosnode-1.15.8.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
 EBUILD rosnode-1.15.9.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
 EBUILD rosnode-9999.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
diff --git a/dev-ros/rosnode/rosnode-1.15.11.ebuild b/dev-ros/rosnode/rosnode-1.15.11.ebuild
new file mode 100644
index 000000000000..991a2183e013
--- /dev/null
+++ b/dev-ros/rosnode/rosnode-1.15.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	)"
diff --git a/dev-ros/rosout/Manifest b/dev-ros/rosout/Manifest
index 6e1e7db5e02d..08a8004fdb73 100644
--- a/dev-ros/rosout/Manifest
+++ b/dev-ros/rosout/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosout-1.15.10.ebuild 445 BLAKE2B 93d2a83966d5d04e40a269e47c22afa993f6f4d2380c3d7f90ff32c9c327ec0b22339772e493530bdeb68867038008aadafc9139ac46e33e65cb033a7e8a0aea SHA512 a1b6d7242d722f62132aa155570a41aa2b8c3048ee56676e45357e11361c89b023b67be31b0fef848cd8e448b59f5852849d32e215895cfb9816570c6e126913
+EBUILD rosout-1.15.11.ebuild 445 BLAKE2B 93d2a83966d5d04e40a269e47c22afa993f6f4d2380c3d7f90ff32c9c327ec0b22339772e493530bdeb68867038008aadafc9139ac46e33e65cb033a7e8a0aea SHA512 a1b6d7242d722f62132aa155570a41aa2b8c3048ee56676e45357e11361c89b023b67be31b0fef848cd8e448b59f5852849d32e215895cfb9816570c6e126913
 EBUILD rosout-1.15.7.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
 EBUILD rosout-1.15.8.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
 EBUILD rosout-1.15.9.ebuild 445 BLAKE2B 962dda734a0d479db9be66e9413414d687dde713c768b944c66c752bfd313ca6d9c4eab5a888d57e3abec45c638b37b3a5b8730378a54398949c0a00d6dad1dc SHA512 8808989a59d0f18d340a05513d107ce0b11063737e869b20e2f97eb49acd5f967a3229de4fceccb2b0c60beaf76fcfa5aeb8415758ff6ce3fcfb22e9002e715a
diff --git a/dev-ros/rosout/rosout-1.15.11.ebuild b/dev-ros/rosout/rosout-1.15.11.ebuild
new file mode 100644
index 000000000000..f6b95451b596
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.15.11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+"
+DEPEND="${RDEPEND}
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest
index ee4efa984123..14e6eba5c77e 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosparam-1.15.10.ebuild 492 BLAKE2B 3d8ca72560a2be15028255af1ad9f0e926f43b76bfcf4c0ee1fd43549ea7466fb1b070a421f2bb8e9299c0ba9d54b9ec126b5099b975fa88389976dfc78e80b3 SHA512 f57762ce39deaa4f2698aa3c9f8ae5471b05e4c6eee714f3639bf7a8dfc247a5cbcbc40f7ba99d6faf91d0ea59cc9d052b79c9b687d47f051ee24fae44894469
+EBUILD rosparam-1.15.11.ebuild 492 BLAKE2B 3d8ca72560a2be15028255af1ad9f0e926f43b76bfcf4c0ee1fd43549ea7466fb1b070a421f2bb8e9299c0ba9d54b9ec126b5099b975fa88389976dfc78e80b3 SHA512 f57762ce39deaa4f2698aa3c9f8ae5471b05e4c6eee714f3639bf7a8dfc247a5cbcbc40f7ba99d6faf91d0ea59cc9d052b79c9b687d47f051ee24fae44894469
 EBUILD rosparam-1.15.7.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
 EBUILD rosparam-1.15.8.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
 EBUILD rosparam-1.15.9.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
diff --git a/dev-ros/rosparam/rosparam-1.15.11.ebuild b/dev-ros/rosparam/rosparam-1.15.11.ebuild
new file mode 100644
index 000000000000..61ac1e322a5d
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.15.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospy/Manifest b/dev-ros/rospy/Manifest
index 3334a7f2739c..3598ed9a8490 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rospy-1.15.10.ebuild 727 BLAKE2B ed3f1431e8f954adc67a1284d387bd6e5afbbb8380d3f98d5a0308f3192fc743fccda2670a09316f2f03749fd40634190a85671299984cd9fcf62ba9335f0726 SHA512 f4663f6221e330c7d902fc948032daff726f0b78b301eecee22c6a746ba2ae55f9cebc093cf7f875ccb21a0abf178c1cf2da6afda512325d3428908e8fbc6060
+EBUILD rospy-1.15.11.ebuild 727 BLAKE2B ed3f1431e8f954adc67a1284d387bd6e5afbbb8380d3f98d5a0308f3192fc743fccda2670a09316f2f03749fd40634190a85671299984cd9fcf62ba9335f0726 SHA512 f4663f6221e330c7d902fc948032daff726f0b78b301eecee22c6a746ba2ae55f9cebc093cf7f875ccb21a0abf178c1cf2da6afda512325d3428908e8fbc6060
 EBUILD rospy-1.15.7.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
 EBUILD rospy-1.15.8.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
 EBUILD rospy-1.15.9.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
diff --git a/dev-ros/rospy/rospy-1.15.11.ebuild b/dev-ros/rospy/rospy-1.15.11.ebuild
new file mode 100644
index 000000000000..47344d9c9de6
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.15.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python client library for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	ros-catkin_src_install
+	# Other tests need these nodes
+	exeinto /usr/share/${PN}
+	doexe test_nodes/*
+}
diff --git a/dev-ros/rosserial_arduino/Manifest b/dev-ros/rosserial_arduino/Manifest
index d7df19e7d286..09a5095fb536 100644
--- a/dev-ros/rosserial_arduino/Manifest
+++ b/dev-ros/rosserial_arduino/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_arduino-0.8.0.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
 EBUILD rosserial_arduino-0.9.1.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
+EBUILD rosserial_arduino-0.9.2.ebuild 548 BLAKE2B a1271d513c2460988419b0f2ec3bc35d47dcc44b73c187e7eb1de5bf2ec97afce57ffd77097e25020be5b7686873c45ddc6a8ca67a61178a092f73ca1fa6ca5c SHA512 748b80c3f90b7313fcb94f25e086f5ed9fe52981c3e6b5972f3931130ee5b25a2cd61337c7b1acc4dd5627c63bf09d427ffb008fa0d0439adb533ac3f90e8484
 EBUILD rosserial_arduino-9999.ebuild 548 BLAKE2B 27d998f1f8a5d3c23db89c917c6e87f41a98a39f6c58fac15aec0263b87ec59c04e0cfb12ebd7e0ba8f76a01d67d4b1828091fca1c095b8ca601c92366c9eed8 SHA512 e79b4cf7b54d944a8c818ef0696645833351cd6588d1db7cf476b260819bcf5c91a9578c1f6d0d34f7cd3529a62cec9d32199b36a5f9976914c28ce533150e6b
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.9.2.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.9.2.ebuild
new file mode 100644
index 000000000000..0da31aca2d16
--- /dev/null
+++ b/dev-ros/rosserial_arduino/rosserial_arduino-0.9.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Arduino/AVR Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_client/Manifest b/dev-ros/rosserial_client/Manifest
index 702acbc8b63c..14832f666847 100644
--- a/dev-ros/rosserial_client/Manifest
+++ b/dev-ros/rosserial_client/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_client-0.8.0.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
 EBUILD rosserial_client-0.9.1.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
+EBUILD rosserial_client-0.9.2.ebuild 539 BLAKE2B ac54f0f24ff772c2ff086530b72b5e31c850e78dcdbba2992284c59142efa9644a89dc81665f0b6bb6fe1128872c6cc4541e3da6df7b8ad1ba7e95e67f730a17 SHA512 39e8c838aca0de10ddcf112864acf79cab09aa8604310deb2be42b957d89d31d60c2c5059ad449a8a1150b32127e71efd36256edeb15f9af6d1f3f4c91cc632f
 EBUILD rosserial_client-9999.ebuild 539 BLAKE2B da74557635d36b5eca90c602c08fd019adb016983e8020ed323494364d72e04ad8a0a9ec10c656385a4b6007c19a6f317071d1867cefb54ef3287bcfc1fa838e SHA512 652104de1796d68783793fee30369672263acd9d22263aee7171399dfec0fc2dc82561b54784e4e5dfd68251fbd51e22f33980b10370741c9aabc4be2fb4baf3
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_client/rosserial_client-0.9.2.ebuild b/dev-ros/rosserial_client/rosserial_client-0.9.2.ebuild
new file mode 100644
index 000000000000..96de6ddc1bce
--- /dev/null
+++ b/dev-ros/rosserial_client/rosserial_client-0.9.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Generalized client side source for rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/Manifest b/dev-ros/rosserial_embeddedlinux/Manifest
index 9ce8403b8368..d4dde7b95f5a 100644
--- a/dev-ros/rosserial_embeddedlinux/Manifest
+++ b/dev-ros/rosserial_embeddedlinux/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_embeddedlinux-0.8.0.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
 EBUILD rosserial_embeddedlinux-0.9.1.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
+EBUILD rosserial_embeddedlinux-0.9.2.ebuild 687 BLAKE2B 46e551d2047b5abffec7252d9c717f28704e858c78fa189a9571f662474522ee43ec202bc0b4d01e743cdf9fb32bc35092dc7787379dbf19bd1f76e245ee5f58 SHA512 32682365867fca82b12fd2e4f92b6c2518c8fcec44d97057922475b762fba5c0c3458bc7f1333ab7e532eafecc94296c42db1c1798e7e029051f806f5a24a606
 EBUILD rosserial_embeddedlinux-9999.ebuild 687 BLAKE2B b3b7e24440c0d323fa83f59638b18260e491b33f1956077d35b023a329d2a9d6b70af75e08d624ead4b07be8e7cf5d5081081336c90b5a669f7ea4fcc311318f SHA512 439b2dfdba81bef226851cf69fc56481d72b107ebf5437b46bc3a716417c4af2def56d4e78b345c9c4651fb7037c6c011079d4a24ed7abaec3bfb09319b51b97
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.2.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.2.ebuild
new file mode 100644
index 000000000000..152ee753e375
--- /dev/null
+++ b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Embedded Linux Enviroments"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_msgs/Manifest b/dev-ros/rosserial_msgs/Manifest
index 86803e8d22f6..828f3a83f678 100644
--- a/dev-ros/rosserial_msgs/Manifest
+++ b/dev-ros/rosserial_msgs/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_msgs-0.8.0.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
 EBUILD rosserial_msgs-0.9.1.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
+EBUILD rosserial_msgs-0.9.2.ebuild 389 BLAKE2B 77bcabc8d7d8e37eeb3df5b94e7500f4ab454e842cc0d846c7ba54cc35c27e8fd93f11c6fd210a10bb1c3690f1a33874b124f42356ba6d464df7fe918fb46c29 SHA512 8f4627ef74b0f1596aed71088e5f82a12866cb314d8e67800dfcb47df1dba150ded7bb6dd0a97a6c8093044da3e0b959ec7c752d93dd90048324ebd308961def
 EBUILD rosserial_msgs-9999.ebuild 389 BLAKE2B 234bcf626bfc4630ee1f5b8f51f2ad1b647d2f5192f90963f857199e1e19ae71d1ecec963903b0b9b094c85630f83eb1bc51a17b54d12431c127a3bd4b31d4a1 SHA512 2ab9b776da7d158a66da5f46bd4237df51d4e3a6a469839a84b9aabcf5c9ee5e1b295eddbeff926b7e1ba1bd1e6baf7d09a9dfbf46da21fbb6c55e51ec020e1a
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-0.9.2.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-0.9.2.ebuild
new file mode 100644
index 000000000000..cb49f6afd33e
--- /dev/null
+++ b/dev-ros/rosserial_msgs/rosserial_msgs-0.9.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for automatic topic configuration using rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_python/Manifest b/dev-ros/rosserial_python/Manifest
index e4e6f9c14518..340367b9438a 100644
--- a/dev-ros/rosserial_python/Manifest
+++ b/dev-ros/rosserial_python/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_python-0.8.0.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
 EBUILD rosserial_python-0.9.1.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
+EBUILD rosserial_python-0.9.2.ebuild 586 BLAKE2B d40520623148d422e46a3bfc6b72bdb16506c0cf584f063f4bbcf929cab5f0c0932352475ff57e16a43639eb04696b78e6369c78604d8f3d5a0e67e7066ccf96 SHA512 de09e5dc1a1b70b4a375be0b9204750db412deff7da347f6a31afb93415b08e34346faf924d9b11fea73c55dc151e51cb78ce732cf8be0df1b0efaae9ba66683
 EBUILD rosserial_python-9999.ebuild 586 BLAKE2B 0cae58d4cf90d4a0f43961f61bfd5b3446a536354ec02a36adfbccca8c87e6ad1ad53ada5b8f6133b2d90fdfc3e51ced9189fda0e1a01692767eb8972d1dee29 SHA512 a94d8dacfb76b95f725552e8ff07155b849ff82a9abb37c96239b8930c838526e8fc8655d32ea70a6368d81e643f9c57895fa5bad7fc5527e4994b05d8e838b6
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_python/rosserial_python-0.9.2.ebuild b/dev-ros/rosserial_python/rosserial_python-0.9.2.ebuild
new file mode 100644
index 000000000000..29c26a180d10
--- /dev/null
+++ b/dev-ros/rosserial_python/rosserial_python-0.9.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A Python-based implementation of the ROS serial protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/Manifest b/dev-ros/rosserial_server/Manifest
index d40e21ed47dc..0f96af5e24a4 100644
--- a/dev-ros/rosserial_server/Manifest
+++ b/dev-ros/rosserial_server/Manifest
@@ -1,4 +1,6 @@
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_server-0.9.1-r1.ebuild 478 BLAKE2B 40aafdcd8a78e1ae39fcecf43793d4531fc537e360d08c24cf66ca2e6e271e106cfdf1a55789cb46ffc6095010dd7e137620362bb30e82e78da61e999062d4fb SHA512 b625be0970b7c8775aff820ecfe249d457175eec8a7783af881a8b8979f379e3fe94d5f3b25531a14b25e1f99ecae33249158365e66d67274788dd53df3c87be
+EBUILD rosserial_server-0.9.2.ebuild 478 BLAKE2B 40aafdcd8a78e1ae39fcecf43793d4531fc537e360d08c24cf66ca2e6e271e106cfdf1a55789cb46ffc6095010dd7e137620362bb30e82e78da61e999062d4fb SHA512 b625be0970b7c8775aff820ecfe249d457175eec8a7783af881a8b8979f379e3fe94d5f3b25531a14b25e1f99ecae33249158365e66d67274788dd53df3c87be
 EBUILD rosserial_server-9999.ebuild 478 BLAKE2B 40aafdcd8a78e1ae39fcecf43793d4531fc537e360d08c24cf66ca2e6e271e106cfdf1a55789cb46ffc6095010dd7e137620362bb30e82e78da61e999062d4fb SHA512 b625be0970b7c8775aff820ecfe249d457175eec8a7783af881a8b8979f379e3fe94d5f3b25531a14b25e1f99ecae33249158365e66d67274788dd53df3c87be
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_server/rosserial_server-0.9.2.ebuild b/dev-ros/rosserial_server/rosserial_server-0.9.2.ebuild
new file mode 100644
index 000000000000..dbc6e13e84e2
--- /dev/null
+++ b/dev-ros/rosserial_server/rosserial_server-0.9.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the rosserial server side"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/topic_tools
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/rosserial_tivac/Manifest b/dev-ros/rosserial_tivac/Manifest
index eb54ca6bfffc..77d595d36a86 100644
--- a/dev-ros/rosserial_tivac/Manifest
+++ b/dev-ros/rosserial_tivac/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_tivac-0.8.0.ebuild 496 BLAKE2B a5a535ad4c877c8fb72eb7fa298b7f02c1ce52faecf9aa6a4a8bc9d59c86c9d494b75abfafd8003f060c1cf6fd93895e0496e7a1989365953b155bc1bc5e71a8 SHA512 cfc3d38a7ad8dab2b095df719a9cd4d108b4425858b3ab7cb2834545a3066c1f3faa5be0ed2c044829d16495eca3d5d66b8f3811c1c39c0a3268d0c135840e51
 EBUILD rosserial_tivac-0.9.1.ebuild 496 BLAKE2B a5a535ad4c877c8fb72eb7fa298b7f02c1ce52faecf9aa6a4a8bc9d59c86c9d494b75abfafd8003f060c1cf6fd93895e0496e7a1989365953b155bc1bc5e71a8 SHA512 cfc3d38a7ad8dab2b095df719a9cd4d108b4425858b3ab7cb2834545a3066c1f3faa5be0ed2c044829d16495eca3d5d66b8f3811c1c39c0a3268d0c135840e51
+EBUILD rosserial_tivac-0.9.2.ebuild 496 BLAKE2B 55adc1544d5ff023753681476d365ae0c6cf14588e0d85ef6b5d6dcff6868955432aacc2861612f6c7256ab1f01afa5143c7958eaf556ec80c32d6a4d50e6dbe SHA512 862d87900f990a70d6e882718f0d974e3be5f20a0ca805f1d8214c135a0cdc1c77f7a47cf580ff55a1b3da5655234d0b6c7714aaf827f66cfbd95e6853dc7bed
 EBUILD rosserial_tivac-9999.ebuild 496 BLAKE2B a5a535ad4c877c8fb72eb7fa298b7f02c1ce52faecf9aa6a4a8bc9d59c86c9d494b75abfafd8003f060c1cf6fd93895e0496e7a1989365953b155bc1bc5e71a8 SHA512 cfc3d38a7ad8dab2b095df719a9cd4d108b4425858b3ab7cb2834545a3066c1f3faa5be0ed2c044829d16495eca3d5d66b8f3811c1c39c0a3268d0c135840e51
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.9.2.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.9.2.ebuild
new file mode 100644
index 000000000000..2010ac8ddba2
--- /dev/null
+++ b/dev-ros/rosserial_tivac/rosserial_tivac-0.9.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Definitions for rosserial_client targets for TivaC Launchpad evaluation boards."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/Manifest b/dev-ros/rosserial_windows/Manifest
index c305869a592e..f8c48fa00515 100644
--- a/dev-ros/rosserial_windows/Manifest
+++ b/dev-ros/rosserial_windows/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_windows-0.8.0.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
 EBUILD rosserial_windows-0.9.1.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
+EBUILD rosserial_windows-0.9.2.ebuild 702 BLAKE2B 8ef037819bdc4433357d06665e2be29c1b3a175d1084f2b15bf2d75e46ceadcb19e7c6c0077a1d5e209ed7e686688ed7a5dd0e5149127c9a503afbc0677ce156 SHA512 5cb1a8537b9c61bbcf1f8aad9090440bdda81a18cff2c13545dedf239cd037c1c54c895b98a9acdddacfeb01e74a8261bb276a6d27dd3416a0e872a5c3b93125
 EBUILD rosserial_windows-9999.ebuild 702 BLAKE2B d93f97f30b94f86ea7b5fd0342e4e9cf51fab2e1b5b0008e4ff7f4e1a12f6a5a24c50c7e2ddba0c79abb692bb9a7a71bef20ac7e8c719f7cedc960f0c814ce42 SHA512 dd6fcb093c3973180c29c29f159c09b4984d0a761df8700aca2cb0dc139c322e6376da9ff9433b17ef659cfdfe23a1bc0714159f013e3f928bdad4fac283fb09
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.9.2.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.9.2.ebuild
new file mode 100644
index 000000000000..5741c715553c
--- /dev/null
+++ b/dev-ros/rosserial_windows/rosserial_windows-0.9.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Windows Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/Manifest b/dev-ros/rosserial_xbee/Manifest
index d4790999caba..2613eeaaf889 100644
--- a/dev-ros/rosserial_xbee/Manifest
+++ b/dev-ros/rosserial_xbee/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial_xbee-0.8.0.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
 EBUILD rosserial_xbee-0.9.1.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
+EBUILD rosserial_xbee-0.9.2.ebuild 649 BLAKE2B 2caf4bfb3d9312fe8442f067844432e8a6049547009ec307b53fd572c141e45a1521b5f584d2c9783e3b674915e03944bb34c103d8657377aceddf170694bcdb SHA512 18debed2bad910dc9ed37389e29e0fe0de390f4cff492e991bc174f2add0ad9e6a0010d4397ead40d02d34032e18e1f5d48376e5999b7a39706afb8105e2279c
 EBUILD rosserial_xbee-9999.ebuild 649 BLAKE2B fbd016a5c96d7c313f2aa06aaf1efa36d71f637e5924339a001bb501673dacae88ea0522267dfd11657fde1f1e1cccd3f0df80e50aaee0dbdb31ec5698efda5d SHA512 32e5ac40d57fc52b2eb1288dddb8361360f2f698fe7e313e719fe047abc5411e5f0fbc66566ca6922c4dff73eb11147e54765988b202983d6418edb74ce145c6
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.9.2.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.9.2.ebuild
new file mode 100644
index 000000000000..0c7384c1e7c8
--- /dev/null
+++ b/dev-ros/rosserial_xbee/rosserial_xbee-0.9.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools to do communicate between rosserial nodes connected to an xbee"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_python[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest
index c2017eb445ec..9de2d2a86ed7 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/rosservice/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rosservice-1.15.10.ebuild 526 BLAKE2B 3b9ea5d200f431087ce8fbc675b42adb19818bb100260e5a8128a6ac56c48442bf3629ec434a48bc4531c164194a693111f62fb21c76c0f0adc58c00bd6bf12b SHA512 4ddb1476e18efd87b1fc017222ee64961f9e9417008bc32a6dbc3b1db926c018b7772fbdd78da9cbe229968ecd4fe33f5486fa6d20e51d98a50f61e05d055196
+EBUILD rosservice-1.15.11.ebuild 526 BLAKE2B 3b9ea5d200f431087ce8fbc675b42adb19818bb100260e5a8128a6ac56c48442bf3629ec434a48bc4531c164194a693111f62fb21c76c0f0adc58c00bd6bf12b SHA512 4ddb1476e18efd87b1fc017222ee64961f9e9417008bc32a6dbc3b1db926c018b7772fbdd78da9cbe229968ecd4fe33f5486fa6d20e51d98a50f61e05d055196
 EBUILD rosservice-1.15.7.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
 EBUILD rosservice-1.15.8.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
 EBUILD rosservice-1.15.9.ebuild 526 BLAKE2B 8cb13efa66e3c5195c6e068ea35383b2a787cab7bfc194a9e849c9cfd85be0c4f41ff69550acbb98be97ae492fcc515fbf759cffb58b569a1f10973cf30109ff SHA512 52e5e56b6ddbd78c13c94ac71cb159730dcf2ce914c84279b1cbdb2b1ae53bb85d89cb2d93e1e4749f38816faa5fa7dd3a645630c06cea6541a554d48a108105
diff --git a/dev-ros/rosservice/rosservice-1.15.11.ebuild b/dev-ros/rosservice/rosservice-1.15.11.ebuild
new file mode 100644
index 000000000000..a7c61cee1d7d
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.15.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for listing and querying ROS Services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rostest/Manifest b/dev-ros/rostest/Manifest
index 2cbe12251465..a992d4a1e2a9 100644
--- a/dev-ros/rostest/Manifest
+++ b/dev-ros/rostest/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rostest-1.15.10-r1.ebuild 742 BLAKE2B 34a90031dea413cd529733e0a9bd2146d30a7409e69005299922dad54e3abd9276a3fcb7e3a2146ab9759e5295d502e4b3b108feedde0303ddab25c41c39741c SHA512 f6cf32c8a596f1c0035b42ce9851570b5262b04f19e53af13b0685e384d83d1e019a2f36018917db14b0f2b933761801a9742db44cc2fcd178c29926ea2348f6
+EBUILD rostest-1.15.11.ebuild 742 BLAKE2B 34a90031dea413cd529733e0a9bd2146d30a7409e69005299922dad54e3abd9276a3fcb7e3a2146ab9759e5295d502e4b3b108feedde0303ddab25c41c39741c SHA512 f6cf32c8a596f1c0035b42ce9851570b5262b04f19e53af13b0685e384d83d1e019a2f36018917db14b0f2b933761801a9742db44cc2fcd178c29926ea2348f6
 EBUILD rostest-1.15.8-r1.ebuild 742 BLAKE2B 34a90031dea413cd529733e0a9bd2146d30a7409e69005299922dad54e3abd9276a3fcb7e3a2146ab9759e5295d502e4b3b108feedde0303ddab25c41c39741c SHA512 f6cf32c8a596f1c0035b42ce9851570b5262b04f19e53af13b0685e384d83d1e019a2f36018917db14b0f2b933761801a9742db44cc2fcd178c29926ea2348f6
 EBUILD rostest-1.15.9-r1.ebuild 742 BLAKE2B 34a90031dea413cd529733e0a9bd2146d30a7409e69005299922dad54e3abd9276a3fcb7e3a2146ab9759e5295d502e4b3b108feedde0303ddab25c41c39741c SHA512 f6cf32c8a596f1c0035b42ce9851570b5262b04f19e53af13b0685e384d83d1e019a2f36018917db14b0f2b933761801a9742db44cc2fcd178c29926ea2348f6
 EBUILD rostest-9999.ebuild 742 BLAKE2B 34a90031dea413cd529733e0a9bd2146d30a7409e69005299922dad54e3abd9276a3fcb7e3a2146ab9759e5295d502e4b3b108feedde0303ddab25c41c39741c SHA512 f6cf32c8a596f1c0035b42ce9851570b5262b04f19e53af13b0685e384d83d1e019a2f36018917db14b0f2b933761801a9742db44cc2fcd178c29926ea2348f6
diff --git a/dev-ros/rostest/rostest-1.15.11.ebuild b/dev-ros/rostest/rostest-1.15.11.ebuild
new file mode 100644
index 000000000000..1f8991fc0261
--- /dev/null
+++ b/dev-ros/rostest/rostest-1.15.11.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/boost:=[threads(+)]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${DEPEND}
+	test? (
+		${RDEPEND}
+		dev-ros/rosservice
+		dev-cpp/gtest
+		dev-ros/rostopic
+	)"
diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest
index 794f6419a048..2979f1d2b4e5 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD rostopic-1.15.10.ebuild 661 BLAKE2B 3fb5d2acef06664f880d1af9147943b5384ce44a109e857d0f7f9d70870978e08760b9fb67dc7e65da59ef7c8221652bfa695475a1e6ae1899f7c50f5528e61c SHA512 85a8481a49ae471fcd1c95e4fca5675ef5ba0435c1d0e898cf621a8ccd12cd421922bb12b9b567620c3d3322928698b17683d8966226a4579ad5606b5ba3e213
+EBUILD rostopic-1.15.11.ebuild 661 BLAKE2B 3fb5d2acef06664f880d1af9147943b5384ce44a109e857d0f7f9d70870978e08760b9fb67dc7e65da59ef7c8221652bfa695475a1e6ae1899f7c50f5528e61c SHA512 85a8481a49ae471fcd1c95e4fca5675ef5ba0435c1d0e898cf621a8ccd12cd421922bb12b9b567620c3d3322928698b17683d8966226a4579ad5606b5ba3e213
 EBUILD rostopic-1.15.8.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
 EBUILD rostopic-1.15.9.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
 EBUILD rostopic-9999.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
diff --git a/dev-ros/rostopic/rostopic-1.15.11.ebuild b/dev-ros/rostopic/rostopic-1.15.11.ebuild
new file mode 100644
index 000000000000..9ea612e200ff
--- /dev/null
+++ b/dev-ros/rostopic/rostopic-1.15.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rosunit/Manifest b/dev-ros/rosunit/Manifest
index 8c40b4064786..e62ab365fe7c 100644
--- a/dev-ros/rosunit/Manifest
+++ b/dev-ros/rosunit/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD rosunit-1.15.5.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
 EBUILD rosunit-1.15.6.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
 EBUILD rosunit-1.15.7.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
+EBUILD rosunit-1.15.8.ebuild 505 BLAKE2B 24f9e9888beb7f14d7b08467eab826897ea50429d71774e55cea157c574cfcbb4ff8054b46490421936a3d1135bd2b5c12ff3fc389ee4ef246a904ace94af8e4 SHA512 deee7e57754944cc2a4cfe88b236ea7670c523b52970b419670fbdb7c8d0b270f2f0a831d2db664cb9005f457ec11912d17394c94af5f44b626c2b88abc013ae
 EBUILD rosunit-9999.ebuild 505 BLAKE2B 4f9b26d7728fbcb21ce6fe3aa70982afc65c2de19d86f5a828f4b1b8d5c07d19cd1b3187dff03bb3cc3cbd84515b3267c1dfa18676d4ed9ab7c9f31a29d556cc SHA512 35952c146d24201c3d3c7244aa788465b10d2d8c1e84f7708a4d3b58e1697987d315e619f51f2d83c4820f83d75d9317d6eeb5fdb369a460ba06b1e0c37731e2
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/dev-ros/rosunit/rosunit-1.15.8.ebuild b/dev-ros/rosunit/rosunit-1.15.8.ebuild
new file mode 100644
index 000000000000..5e1930ae53d6
--- /dev/null
+++ b/dev-ros/rosunit/rosunit-1.15.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit-testing package for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )
+"
diff --git a/dev-ros/roswtf/Manifest b/dev-ros/roswtf/Manifest
index 6163990393fc..919366dcd491 100644
--- a/dev-ros/roswtf/Manifest
+++ b/dev-ros/roswtf/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD roswtf-1.15.10.ebuild 1251 BLAKE2B 7e1a6dedbaf7d355990c29b1be423dc41528ccc2cd9901d4d517691056e44ec2ba776c1f0c57f21c9ee6f44250507d4872894f62a1480ca357ba63f7a80a3ff5 SHA512 d6b205648ef5482263076bf5344d0628c3f7fca525e4e7b20ba257974fa8f43f1252acb33d7392bd343d32a026c1551676f9f62758a18b01644d2984cbed7b99
+EBUILD roswtf-1.15.11.ebuild 1251 BLAKE2B 7e1a6dedbaf7d355990c29b1be423dc41528ccc2cd9901d4d517691056e44ec2ba776c1f0c57f21c9ee6f44250507d4872894f62a1480ca357ba63f7a80a3ff5 SHA512 d6b205648ef5482263076bf5344d0628c3f7fca525e4e7b20ba257974fa8f43f1252acb33d7392bd343d32a026c1551676f9f62758a18b01644d2984cbed7b99
 EBUILD roswtf-1.15.8.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
 EBUILD roswtf-1.15.9.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
 EBUILD roswtf-9999.ebuild 1251 BLAKE2B 303c0c50720d47750aa73ad06e3140fa732339c5ba7c9f848fc883305fc557a24a01a04b272aee46a56a9ffc686990666c3f47fb1e00f643d53dba24e8b1627b SHA512 8f0703e03fba1f02852ca921347733299c7950eecb49be7bd854e4ffd5b0f3996a4cda5d393711f5ca2e6b110420e3438899c1ef75cbd8d668c9c7792b52a64e
diff --git a/dev-ros/roswtf/roswtf-1.15.11.ebuild b/dev-ros/roswtf/roswtf-1.15.11.ebuild
new file mode 100644
index 000000000000..4e877541ab42
--- /dev/null
+++ b/dev-ros/roswtf/roswtf-1.15.11.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for diagnosing issues with a running ROS system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosbuild[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/roslang[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+BDEPEND="
+	test? (
+		dev-ros/cmake_modules
+	)
+"
+
+src_test() {
+	# Needed for tests to find internal launch file
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rqt_bag/Manifest b/dev-ros/rqt_bag/Manifest
index 81e11ea9828e..88b5a413e4a4 100644
--- a/dev-ros/rqt_bag/Manifest
+++ b/dev-ros/rqt_bag/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_bag-0.4.15.tar.gz 51549 BLAKE2B 87e1a5b997efa6e0b460edd11b14608ba35a49e3b404c2df32fa6f5bf442bca271e9329a2a7eea5b21b07488e0b06b7a23e706fa631dc4146c8911a29ddf36eb SHA512 01df2bf2626057ad05a52f0c069b013fd2f9ef00afa57e76b696fc7b66c6b6766a8ae6f880b1fa5493759b53deb87ac4d12bd5c22fe81ea9192f5ae6f91aa976
-EBUILD rqt_bag-0.4.15.ebuild 670 BLAKE2B c7233f8c285eb728e0314dd7a99a18a0572b93b392f89441934158fb83cc5997b5160c080e1f1138a895f35b18222a3a8cd1f5b7738f5d745b4c05687a1f9681 SHA512 adc55e129b7e78eadcf77b0c2c1426740e40695ed12982dc3e3438ebd080d4332f405833c0888c0cce4a8c13d9aa88071272a24cfb23243fd9bb16f2b3b82843
+DIST rqt_bag-0.5.1.tar.gz 53151 BLAKE2B 4165c2596fa77f059e211f9f760ce4c0634b4f5a1582be34ee40400a2715f1a5c09b2ea3b0aabaf7cf9a75eea1baec8b07220f9297d86b30e58155da05d66234 SHA512 e1b4c15cb085f285911bc8077465616923e6c2954553779c62d7cfb889b56ef88ca0bdf4e3e280fc1f489e3aac49de5d0567703d37f8ef8b1d55aa1e47e92d4f
+EBUILD rqt_bag-0.5.1.ebuild 670 BLAKE2B 4b34e7f81278ecc511795adad21e7257e71b7dd4992b77ce340b10cabafa6954117f9d26c87b1544bb56ad53eebf301c0d7fa06132eef0b50a83acfba795dfab SHA512 c5b33a0f75a8dd934895f912ff4a8059e807e1b8ce3ca0d2d30e4a799f6f85f786ab28adbf56d008b6d82ade019b4bd790da28bfbec45e42a56c8102de637d63
 EBUILD rqt_bag-9999.ebuild 670 BLAKE2B c7233f8c285eb728e0314dd7a99a18a0572b93b392f89441934158fb83cc5997b5160c080e1f1138a895f35b18222a3a8cd1f5b7738f5d745b4c05687a1f9681 SHA512 adc55e129b7e78eadcf77b0c2c1426740e40695ed12982dc3e3438ebd080d4332f405833c0888c0cce4a8c13d9aa88071272a24cfb23243fd9bb16f2b3b82843
 MISC metadata.xml 339 BLAKE2B 0ab275c9533eaf810c3fd33f5fcfbab2de7d7258604b431cc7a90a5ac63127bf048188835d89237de809b314fc5bff2a3afbea2dae6a7299ada7dbb0183ec262 SHA512 4925d508214e10ae0538559a9d17ed336e721ac3b25375cd4cf94e4437b7f509ccb60aa4865a89cc482817230de827c5adb4c83fbfd63c697c833d19b7da8e16
diff --git a/dev-ros/rqt_bag/rqt_bag-0.4.15.ebuild b/dev-ros/rqt_bag/rqt_bag-0.4.15.ebuild
deleted file mode 100644
index 51bedaaa5154..000000000000
--- a/dev-ros/rqt_bag/rqt_bag-0.4.15.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
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
diff --git a/dev-ros/rqt_bag/rqt_bag-0.5.1.ebuild b/dev-ros/rqt_bag/rqt_bag-0.5.1.ebuild
new file mode 100644
index 000000000000..9e3b5a9ca419
--- /dev/null
+++ b/dev-ros/rqt_bag/rqt_bag-0.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+"
diff --git a/dev-ros/rqt_bag_plugins/Manifest b/dev-ros/rqt_bag_plugins/Manifest
index 2c8173cb79ff..e13a4f863c09 100644
--- a/dev-ros/rqt_bag_plugins/Manifest
+++ b/dev-ros/rqt_bag_plugins/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_bag-0.4.15.tar.gz 51549 BLAKE2B 87e1a5b997efa6e0b460edd11b14608ba35a49e3b404c2df32fa6f5bf442bca271e9329a2a7eea5b21b07488e0b06b7a23e706fa631dc4146c8911a29ddf36eb SHA512 01df2bf2626057ad05a52f0c069b013fd2f9ef00afa57e76b696fc7b66c6b6766a8ae6f880b1fa5493759b53deb87ac4d12bd5c22fe81ea9192f5ae6f91aa976
-EBUILD rqt_bag_plugins-0.4.15.ebuild 903 BLAKE2B 3758a7b809b257d62052f25602c116973ad72dfcc4f2205e8110804fb3149fae848f1c400d15522ab3af613c622218540d9a8fc399d5116c61ec94f1e43c25ce SHA512 58db500bb8bce1318b64cc656e67b70f833647c19bad1f83dcef607e4949e73555b6ebe7373f1ce9ef7c151fec197c7b0c28b1df2bcda89fac315bdc501046a3
+DIST rqt_bag-0.5.1.tar.gz 53151 BLAKE2B 4165c2596fa77f059e211f9f760ce4c0634b4f5a1582be34ee40400a2715f1a5c09b2ea3b0aabaf7cf9a75eea1baec8b07220f9297d86b30e58155da05d66234 SHA512 e1b4c15cb085f285911bc8077465616923e6c2954553779c62d7cfb889b56ef88ca0bdf4e3e280fc1f489e3aac49de5d0567703d37f8ef8b1d55aa1e47e92d4f
+EBUILD rqt_bag_plugins-0.5.1.ebuild 903 BLAKE2B 274671bfa03909424fb05f7cfd88c964d3125bdcde1517097753559f1c422314f2a03a40d41bc4a56dfbc80d93912866d3dac6f38597dd56a5399cb213230c68 SHA512 e4866686ecfd2289129bf4fe01a5e91f60e671e50ae24ba57c61b9a3563f281dc0ba014c50af4734ad6cee3480067175cfdedeb07a90d017f70ed215645d964e
 EBUILD rqt_bag_plugins-9999.ebuild 903 BLAKE2B 3758a7b809b257d62052f25602c116973ad72dfcc4f2205e8110804fb3149fae848f1c400d15522ab3af613c622218540d9a8fc399d5116c61ec94f1e43c25ce SHA512 58db500bb8bce1318b64cc656e67b70f833647c19bad1f83dcef607e4949e73555b6ebe7373f1ce9ef7c151fec197c7b0c28b1df2bcda89fac315bdc501046a3
 MISC metadata.xml 339 BLAKE2B 0ab275c9533eaf810c3fd33f5fcfbab2de7d7258604b431cc7a90a5ac63127bf048188835d89237de809b314fc5bff2a3afbea2dae6a7299ada7dbb0183ec262 SHA512 4925d508214e10ae0538559a9d17ed336e721ac3b25375cd4cf94e4437b7f509ccb60aa4865a89cc482817230de827c5adb4c83fbfd63c697c833d19b7da8e16
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.15.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.15.ebuild
deleted file mode 100644
index f0c32428d755..000000000000
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.15.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
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pycairo[\${PYTHON_USEDEP}]")
-	$(python_gen_cond_dep "dev-python/pillow[\${PYTHON_USEDEP}]")
-	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_bag[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.5.1.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.5.1.ebuild
new file mode 100644
index 000000000000..0a3df3567f5a
--- /dev/null
+++ b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.5.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pycairo[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/pillow[\${PYTHON_USEDEP}]")
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_bag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_controller_manager/Manifest b/dev-ros/rqt_controller_manager/Manifest
index 224ea3147c28..60eb69b5f623 100644
--- a/dev-ros/rqt_controller_manager/Manifest
+++ b/dev-ros/rqt_controller_manager/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
 DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD rqt_controller_manager-0.19.1.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
 EBUILD rqt_controller_manager-0.19.2.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
 EBUILD rqt_controller_manager-0.19.3.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
 EBUILD rqt_controller_manager-0.19.4.ebuild 427 BLAKE2B 756425c7f23b938e0911cf846f3ae8e198a4e75cc6e214bdfae8fbacb8cc994aa67d7332122a0343e9e83095814b3b29f86b5c6493c4ed2a6c078e9e9c6e9ff9 SHA512 c58b4cdf26c2cd4e5f9b7f4de3d54491f854901e9ff3d47f5d25e195142cd36de63a817d4b428c330dc6c697a0b4096b1743b488007a1fc79481b0dc3dfe1edf
+EBUILD rqt_controller_manager-0.19.5.ebuild 427 BLAKE2B 756425c7f23b938e0911cf846f3ae8e198a4e75cc6e214bdfae8fbacb8cc994aa67d7332122a0343e9e83095814b3b29f86b5c6493c4ed2a6c078e9e9c6e9ff9 SHA512 c58b4cdf26c2cd4e5f9b7f4de3d54491f854901e9ff3d47f5d25e195142cd36de63a817d4b428c330dc6c697a0b4096b1743b488007a1fc79481b0dc3dfe1edf
 EBUILD rqt_controller_manager-9999.ebuild 427 BLAKE2B 3ecf12e6658ea615e3eef0b7fb0e521714a4aa8460f0c3d01685f4837b9783ba2f4a8cadce0d9f51c950c640588d05a0534399a743725029d1399e004df91ec0 SHA512 38034063d79e54980873015db92326b57021cb42604045ce3d7ef621077114feeac1b9bfade11e37055423b9ab2c11f26e1ba36ff0e9ac3ff8c88dc2eeba883c
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.5.ebuild b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.5.ebuild
new file mode 100644
index 000000000000..5325e3799433
--- /dev/null
+++ b/dev-ros/rqt_controller_manager/rqt_controller_manager-0.19.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="RQT control manager plugin"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/controller_manager[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_dep/Manifest b/dev-ros/rqt_dep/Manifest
index 93b1e208ffef..4b3893c0229f 100644
--- a/dev-ros/rqt_dep/Manifest
+++ b/dev-ros/rqt_dep/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_dep-0.4.10.tar.gz 12730 BLAKE2B dfb0624433086a005f3a0c85dc9e5ff92e018a47d541a039a29f9b39bcf1bd99a99ef1abac847b73b643ad043f8732ecb2f34c8adbb128e95339d1625a8527ba SHA512 6cd590e991a786f3017956a25fc8a977ab581ee931710637a9b4e4cff5f2f863e67c1923dbaf66ad203ae12e484a124d822ccbdc7dde57856e4011e6cc722221
-EBUILD rqt_dep-0.4.10.ebuild 768 BLAKE2B d37dc8a7bfc7fc8dbb13fdad59418f9d5181b1447e9f60199a20b8f950627f63a7f9e8cc5643f9a429b18e36efe77ff7efb73224e8d3e960590748c974cac72c SHA512 0304c38f7007bc09267939a72b8f1eadd9ac4ac32a152c8ccd72f3e23b2ca2245011a74d4e90172af4781297b48d43955ebe09c45461aacfb4e92995371be5f3
+DIST rqt_dep-0.4.12.tar.gz 12888 BLAKE2B a265b54a52a9dea66c7e5f35583150da84891ca90298bee0c9ae236ed833d6d305d15f705729335db956a7fd9602260547258f7ed6c3acd3ecb668a3255d028f SHA512 7df25801662cf6eaaf5ab17a4639ce784b4e1886d5f5c9e83ec7daaf212ffef06e9ef192ae41faf8751e6ff87278e6b679b37628f527db46a6bbc7fd915df499
+EBUILD rqt_dep-0.4.12.ebuild 768 BLAKE2B cce2323a9b8a8024502074ff65afdaf5b7616d002cd65b1546d61c17064361b3bfdc4facf8b9bf6f299213032f978adb32487e2c23533beebae2b97a92b8a402 SHA512 763b9e92765fd9eee1d7781baa4ec53329dff01e9812d235806e0b7d71167b7bf7566d45cde18e9d75f3d4263169dbab8d4f0820ebac1850e682f8fbd7f7225a
 EBUILD rqt_dep-9999.ebuild 768 BLAKE2B d37dc8a7bfc7fc8dbb13fdad59418f9d5181b1447e9f60199a20b8f950627f63a7f9e8cc5643f9a429b18e36efe77ff7efb73224e8d3e960590748c974cac72c SHA512 0304c38f7007bc09267939a72b8f1eadd9ac4ac32a152c8ccd72f3e23b2ca2245011a74d4e90172af4781297b48d43955ebe09c45461aacfb4e92995371be5f3
 MISC metadata.xml 339 BLAKE2B 88e2a45dbf383c5addb2bc4ad4d83ec4b75ce5eaa525f40422964e12df5a35b402cc5b36d3a579ae37608c3d9ee17bcdda88e605cce24b85edaa103c47da0245 SHA512 9634570bb6226eea78ab642d0645516e9c523e4669fbd42b1a375f3f56e37ce9a87dff464fcc0c956c21606066bd71378ab4dc11a7590282ac8b011223d1ec96
diff --git a/dev-ros/rqt_dep/rqt_dep-0.4.10.ebuild b/dev-ros/rqt_dep/rqt_dep-0.4.10.ebuild
deleted file mode 100644
index 0f0d8315777a..000000000000
--- a/dev-ros/rqt_dep/rqt_dep-0.4.10.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
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_dep"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS dependency graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_dotgraph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/rqt_dep/rqt_dep-0.4.12.ebuild b/dev-ros/rqt_dep/rqt_dep-0.4.12.ebuild
new file mode 100644
index 000000000000..315de5e38656
--- /dev/null
+++ b/dev-ros/rqt_dep/rqt_dep-0.4.12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_dep"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for visualizing the ROS dependency graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/qt_dotgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_graph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/rqt_msg/Manifest b/dev-ros/rqt_msg/Manifest
index 3823279a5e79..872503d33821 100644
--- a/dev-ros/rqt_msg/Manifest
+++ b/dev-ros/rqt_msg/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_msg-0.4.9.tar.gz 6920 BLAKE2B 5187c050972045401f76546f3e5abc9cfd9fd58d2a42cc0ae317e0f689ca7c3b73ae6f160777510a522670cd03d2553e195157ea51af81c73334c99f705c619c SHA512 a0d36bf30dbd3582d93c3d89d495b4b5aa25d76895b61eed70cc8878ced43e407a72d593e8b38194522d56cbfc2a5622c30179116dcd86de4d3e7b49dc24a9ff
-EBUILD rqt_msg-0.4.9.ebuild 781 BLAKE2B d1af9204bc0c781008668acd5dd22e3596305966c479488c7846d06d4ceeb4cd5e7c465c0bd7490c409003ba4877db495aabedec59ca4286bbef50ba0736e070 SHA512 42a0b1bc7b8ee75d9d958ac3fc5b8c43684068fb189c225e6aea003d5954268d144e2d24644cd007ad4c15b29d4d8e629ec77bfeb3a3dad8e440a915d9ead06a
+DIST rqt_msg-0.4.10.tar.gz 7042 BLAKE2B d095dca56f59c85554882a5272d2cab9bea002a4e78652c62bcde6c145e00b16afef4d061ab53d7684824211ed782476aff1ec0a91a07c0d92a743aeb49ee3aa SHA512 6a4a67ebb51f7a488efb8560366a47eb594be46615cf6f16d302608f07d51a7606d3e276bc82faa0bedf340fec1748a56c071543a26130adbe5233117b396ee8
+EBUILD rqt_msg-0.4.10.ebuild 781 BLAKE2B 414479c6f491c2d2b285bee415c025ee37264f5ad9fb157cd2ab1783b8bee2aee719492ad33c74261e14ba4ac3c728c46b64e61900d542da08d93bd04c7a8700 SHA512 57ddca92f2cea7ba94aa3b357effb96f8ffbbc710bae50ffa5e0544df7287c7ff9e2029e68ffa11dc2a229fba1d6f8d0a40c41297dc740bf114f668d2f92e57a
 EBUILD rqt_msg-9999.ebuild 781 BLAKE2B d1af9204bc0c781008668acd5dd22e3596305966c479488c7846d06d4ceeb4cd5e7c465c0bd7490c409003ba4877db495aabedec59ca4286bbef50ba0736e070 SHA512 42a0b1bc7b8ee75d9d958ac3fc5b8c43684068fb189c225e6aea003d5954268d144e2d24644cd007ad4c15b29d4d8e629ec77bfeb3a3dad8e440a915d9ead06a
 MISC metadata.xml 339 BLAKE2B acb4a2863a4c506310686a1977f1637d738296860abaa3c3b3be8978e292ed4308fc2b6ced16161320f705b1d38558182861fcd273c8d43ed8472ea58856bf71 SHA512 0b20862cd86ae1fa79707986d39c0f33008fd7848fe9dafb0323dea6ebfa75634fd05befe068b72927d7188448ea2f3471cc0b78fad36a87b895b2b59d5ed726
diff --git a/dev-ros/rqt_msg/rqt_msg-0.4.10.ebuild b/dev-ros/rqt_msg/rqt_msg-0.4.10.ebuild
new file mode 100644
index 000000000000..6f493e14862b
--- /dev/null
+++ b/dev-ros/rqt_msg/rqt_msg-0.4.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_msg"
+
+inherit ros-catkin
+
+DESCRIPTION="Python GUI plugin for introspecting available ROS message types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_console[${PYTHON_SINGLE_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_msg/rqt_msg-0.4.9.ebuild b/dev-ros/rqt_msg/rqt_msg-0.4.9.ebuild
deleted file mode 100644
index d88c80ad96cd..000000000000
--- a/dev-ros/rqt_msg/rqt_msg-0.4.9.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
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_msg"
-
-inherit ros-catkin
-
-DESCRIPTION="Python GUI plugin for introspecting available ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_pose_view/Manifest b/dev-ros/rqt_pose_view/Manifest
index 8a95c2d140c6..f9682d148e94 100644
--- a/dev-ros/rqt_pose_view/Manifest
+++ b/dev-ros/rqt_pose_view/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_pose_view-0.5.10.tar.gz 8508 BLAKE2B 39436926caa82a6ffd15161429081f2c101da802b802ebf798b3e474d0b977dce58d0ed00da87674ad1c2dfbab1c0e58a49b83b1c93163b1dc6c731c7fb4de19 SHA512 53874a7782ba8338accda84643a8103d23de24b175a6ec373ac7cbbbc3f158c08dc07ad8d82755a06da80740f3354759c076e082bfef081fc5d403c16e420ced
-EBUILD rqt_pose_view-0.5.10.ebuild 824 BLAKE2B 44c14e4297f6ddf62fbb9f0f0d4d8a64a02ac6f8538d5bfd2a8392a14539a8d58efc919b49ab8a784d20f96868fd3308145c051144e277845fa447cabf85d9a8 SHA512 5a6285018588f9d7d52f4524d9b537f3e48b08eb0c1f991a10b638708f270166da3137a1e81d39ec5b46644484e0c0a4945f04d52a657f0b170c6362ac0719de
+DIST rqt_pose_view-0.5.11.tar.gz 8572 BLAKE2B 38529a9153b713a1893f3c3d9e4a275c7506fd7e17dc3cf78b18e789c658d3e64775f51f3d9310cb1b1ea3546c189583478a82bc4b324d692244efaea8191247 SHA512 da6f3c670c84b360320e5e49a35d7f24776f004f8ec15141b8ea6c10ff3b98748cd7fbaada7a11b6aff8a7bcb13ca83d641e6ca446ad2e712e3a6d367223e322
+EBUILD rqt_pose_view-0.5.11.ebuild 824 BLAKE2B a2cf32894e9eacfd2463ef659a9388b6437c51c348b476e1abbfe1f32fd9ab6dd6cd3242ad543a4878182c75a5f18d82f9b98800940db9a066de92401771d3dc SHA512 e74fd52ed56a854cb02a29d2dd4db18329da4f05c517752136690688dd1ef54f3c10e591ee97d15a90bdc453505b7701e8683967b4de1e26bbb96ca98a18a2df
 EBUILD rqt_pose_view-9999.ebuild 824 BLAKE2B 44c14e4297f6ddf62fbb9f0f0d4d8a64a02ac6f8538d5bfd2a8392a14539a8d58efc919b49ab8a784d20f96868fd3308145c051144e277845fa447cabf85d9a8 SHA512 5a6285018588f9d7d52f4524d9b537f3e48b08eb0c1f991a10b638708f270166da3137a1e81d39ec5b46644484e0c0a4945f04d52a657f0b170c6362ac0719de
 MISC metadata.xml 345 BLAKE2B 0e6b4a4d3b8d1ff17491fe1cd16adb738771381f2e6d1279f68cc826f0931575864a63e6d2fa36af6a3897016125bce96df83ed43f5ef11df47cb955c0667ba0 SHA512 774daed773f2070d016eb616daa80e65f300c69ab1d436edf5aab5cc256f7e2ebdadf66a3c0fc5571ddb3dc496fd7353eed9dbf85cae48ae4f468dd4be95f22d
diff --git a/dev-ros/rqt_pose_view/rqt_pose_view-0.5.10.ebuild b/dev-ros/rqt_pose_view/rqt_pose_view-0.5.10.ebuild
deleted file mode 100644
index 903a748d5bfa..000000000000
--- a/dev-ros/rqt_pose_view/rqt_pose_view-0.5.10.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
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_pose_view"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing 3D poses"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyopengl[\${PYTHON_USEDEP}]")
-	dev-ros/python_qt_binding[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_pose_view/rqt_pose_view-0.5.11.ebuild b/dev-ros/rqt_pose_view/rqt_pose_view-0.5.11.ebuild
new file mode 100644
index 000000000000..cd3b6a564f73
--- /dev/null
+++ b/dev-ros/rqt_pose_view/rqt_pose_view-0.5.11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_pose_view"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for visualizing 3D poses"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyopengl[\${PYTHON_USEDEP}]")
+	dev-ros/python_qt_binding[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_publisher/Manifest b/dev-ros/rqt_publisher/Manifest
index 6ebd675251d6..3271c67eab53 100644
--- a/dev-ros/rqt_publisher/Manifest
+++ b/dev-ros/rqt_publisher/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_publisher-0.4.9.tar.gz 10662 BLAKE2B aa5911433152237e1a0c11b382ca825bee1f4309fccd9b674f0ca7a24215fa94515bbae3c29afad5ce9f8b0f0afc254e92b36cfccd0687980562771e73a3a4d2 SHA512 5828edebe19bbb0e771628ba53e73d5c6a2c58d7b54cd278c956bb926f51e17662d2bbb4d4000aa85140ee33612917a8e3f95a203dd97c1abba6d0f495000adb
-EBUILD rqt_publisher-0.4.9.ebuild 769 BLAKE2B 9486a720d528505fce4ccca7d4a09760c184783edaababc513b42503da39993da9e8ba80a5abfb8e33c4007ae4706a92a47c4a94a2d561c8d313e43b16b76b89 SHA512 d21e0a36a12e3549d96529a78023546da818ee460a5b786f4a07f8da5e88f24fbef3f38965aab5c2a5729ab56503d265df6b51562f1842ee6eae514b04e06b22
+DIST rqt_publisher-0.4.10.tar.gz 10726 BLAKE2B b8b06570bd74c80de5227b5ba5e9b08716a53cb91627f033767f3e4e39df5aae071ef6a215f15b1cb25aa397f558641edc88eac69a9291288975eca005cc882e SHA512 b3786a9431691419155f8ac6e865d65b6c4cbae1189a7d2ac66338399285d266cf860a4ccfe49cb45d361a57333136afc1d96a655f13265cf054868efccf3a07
+EBUILD rqt_publisher-0.4.10.ebuild 769 BLAKE2B 1ad8246893f0653f79b574316a82076327b877b3ca6ab240b3de6aab5b2dcbaf72fe43d8195032aec1defb37091db79b685841378dac8e9bade69a07e28e13f3 SHA512 a27c66d936ee4934ed5bad453a97adfe3e47e0fd56347a243403eef9ab08cc81e48a4cdb7177c6e8859dd95173b66d477ab7a5894d85e1a8e9af10b5f4bf8b4b
 EBUILD rqt_publisher-9999.ebuild 769 BLAKE2B 9486a720d528505fce4ccca7d4a09760c184783edaababc513b42503da39993da9e8ba80a5abfb8e33c4007ae4706a92a47c4a94a2d561c8d313e43b16b76b89 SHA512 d21e0a36a12e3549d96529a78023546da818ee460a5b786f4a07f8da5e88f24fbef3f38965aab5c2a5729ab56503d265df6b51562f1842ee6eae514b04e06b22
 MISC metadata.xml 345 BLAKE2B 64fc91bbd538f31ef418ae121fafc1ce9cb7cf8f5372883954025473563996800c4ebb5a04126ad897eab0f3393a477eac23d58fe1a702c915b6354c67f47e0f SHA512 8483076bb71220bf91931889a48412b23865e964fbf05182b726e498add7bfddfab59c2cf56161ad39af79628bfbb69be25e18a2aa7535b97bfbdada7dd21cb6
diff --git a/dev-ros/rqt_publisher/rqt_publisher-0.4.10.ebuild b/dev-ros/rqt_publisher/rqt_publisher-0.4.10.ebuild
new file mode 100644
index 000000000000..87a23cd47743
--- /dev/null
+++ b/dev-ros/rqt_publisher/rqt_publisher-0.4.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_publisher"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for publishing arbitrary messages with fixed or computed field values"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_publisher/rqt_publisher-0.4.9.ebuild b/dev-ros/rqt_publisher/rqt_publisher-0.4.9.ebuild
deleted file mode 100644
index 5320800e2fde..000000000000
--- a/dev-ros/rqt_publisher/rqt_publisher-0.4.9.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
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_publisher"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for publishing arbitrary messages with fixed or computed field values"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_py_console/Manifest b/dev-ros/rqt_py_console/Manifest
index 908bad822652..6fc690baf926 100644
--- a/dev-ros/rqt_py_console/Manifest
+++ b/dev-ros/rqt_py_console/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_py_console-0.4.9.tar.gz 5523 BLAKE2B 6cd717e2311a913179eb3257d504494f9aa03d91a3f5416c3df80c43299aaee9ddb044692331f4b5317a16d8fd9900087b729bfd40cd01d8584d4e6163c0d2e7 SHA512 74f66797752c863f1204548fee0dec5e83a1e168c5e0063b7d7e56a4fe543d4c9f1f559accecea42a4e0390c74c13c11056867d361616c4beb962fe5abb75a11
-EBUILD rqt_py_console-0.4.9.ebuild 637 BLAKE2B 77e4ed1b48ae9073f7980c96aab255ce931e919de2dfe9684944f7efddd652f1f5bce83ea12c967721d2bfffe3a6738295a1bcf607de64d69334c2e4730659ab SHA512 61cf5bcf9f4607fd28537972825503f53f3497a0d3def0ce9c46fe030c99c613a18eaeaa0dc9f341673b0a2119675bbf65ce3202e92c674c7110ffd74a830d54
+DIST rqt_py_console-0.4.10.tar.gz 5658 BLAKE2B 837f172c250a6a12bb56b1b5b7640ddff2a573a5299c2165b597e1ded542992463006ac8b0a051d63d61e0431a5bbdea151ea3dd6693b5b93386bf02d4fbf8d4 SHA512 d121e166f88a54f70b27b6d44f2159ccdd3b862afd7adab57f3532fb6376709a9ce193628a912c839b5dae5e72e346317f6dc457832493d6b74e8fb2b78cb708
+EBUILD rqt_py_console-0.4.10.ebuild 637 BLAKE2B b06b32bd908753ce365e3716bb28854d9c23b706bd3408dd327df54687a7857e1c43ae782b598819f3065c782e89cd5742449a921037c4f1b3b82f1ac8b6ece7 SHA512 5f98ac49d9c7e5667decc0006e2f9afe4084a2910575f2da4619836acf38e32c1fd2ebb44e583feb9ce1dd893431b9d877cc50884ccb4e881474694a77ce1f18
 EBUILD rqt_py_console-9999.ebuild 637 BLAKE2B 77e4ed1b48ae9073f7980c96aab255ce931e919de2dfe9684944f7efddd652f1f5bce83ea12c967721d2bfffe3a6738295a1bcf607de64d69334c2e4730659ab SHA512 61cf5bcf9f4607fd28537972825503f53f3497a0d3def0ce9c46fe030c99c613a18eaeaa0dc9f341673b0a2119675bbf65ce3202e92c674c7110ffd74a830d54
 MISC metadata.xml 346 BLAKE2B b161c9a69ca70a509d52e7944fd08411f14a1cd414e7e7b2f8c33e73a32a60c6256251e6f3f7400e450ed454f9f4c36e9f189d81fae535c106df178f7bbfb8ea SHA512 a49aa6af8d730d2eb71df70b58570704a8f9b0b800c44b02e695732b2e318818c073973664882986b23b743b7fe039e9dd30d3b43e918b7ba4732114c69c4bfa
diff --git a/dev-ros/rqt_py_console/rqt_py_console-0.4.10.ebuild b/dev-ros/rqt_py_console/rqt_py_console-0.4.10.ebuild
new file mode 100644
index 000000000000..474d032774d8
--- /dev/null
+++ b/dev-ros/rqt_py_console/rqt_py_console-0.4.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_py_console"
+
+inherit ros-catkin
+
+DESCRIPTION="Python GUI plugin providing an interactive Python console"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_py_console/rqt_py_console-0.4.9.ebuild b/dev-ros/rqt_py_console/rqt_py_console-0.4.9.ebuild
deleted file mode 100644
index 46f53c8850d9..000000000000
--- a/dev-ros/rqt_py_console/rqt_py_console-0.4.9.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
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_py_console"
-
-inherit ros-catkin
-
-DESCRIPTION="Python GUI plugin providing an interactive Python console"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_runtime_monitor/Manifest b/dev-ros/rqt_runtime_monitor/Manifest
index fb84b7461ccc..a09b4d61cc9e 100644
--- a/dev-ros/rqt_runtime_monitor/Manifest
+++ b/dev-ros/rqt_runtime_monitor/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_runtime_monitor-0.5.8.tar.gz 6899 BLAKE2B 62babadaca55ba6bbd4cdca9f1b1e716e95539bf5ab4132f8f3344adc9b557ded5061f5f4ba6eb9aa97ef32ca647646450a5ac6688abe2fe85f6f4837a6d9ec1 SHA512 d0c73dab65553be6dc5a2bb098266ea1e4b65ff8cd933777f11b894fea247eacd3f4bdb0b3ec373c012b10ca36b17e09b49617415f005921d14e9cb6a6af7fae
-EBUILD rqt_runtime_monitor-0.5.8.ebuild 637 BLAKE2B 94ad53d4be80ee8de9755b5ff94804a9768cbccda2fed8ef6008d1442954635f20218b01a0e37116e918097fdf797ca9844bd87bb940e2f5b3c07220276448f8 SHA512 1500ad24cacbb54f4921e87e70cb47c498aab25d7dd4b98068e21875d4ba639ccdcfb344340d86d76491cd48534a2ebdd3752154a13313384dd3662b9fab3617
+DIST rqt_runtime_monitor-0.5.9.tar.gz 6943 BLAKE2B 51e96d0463909bf6648de9f75b687b18bba76249aba3ccbfaa1671604e07cc61d2d0744e23bea8452e26bb5297a99543c2714231aa236fc46dc5a9b37fe53bda SHA512 fd6cfb1dae53f7278c1c0ebb8a1ef331640d235cc29a8a3f056004a0a6a420ced912d2c3114fca441e29e9066c0f33b6534b404a70b7a5560e5fbaba046e2672
+EBUILD rqt_runtime_monitor-0.5.9.ebuild 637 BLAKE2B b8f07558e73894e7b8f558bf6711ff0f852df340b2445f2fd4bc2f102a4dc655789f93875aadac1b6b4c1736a8594459694d1412b4e6858715681c20157bb5f6 SHA512 bedbf21328126eebad51e5b83360375cd0eef04e4b88a1ca3da20fa98164391cc961f2c817504b83ac5df5bea592804fe652e20ec79702b342b25036440d53cd
 EBUILD rqt_runtime_monitor-9999.ebuild 637 BLAKE2B 94ad53d4be80ee8de9755b5ff94804a9768cbccda2fed8ef6008d1442954635f20218b01a0e37116e918097fdf797ca9844bd87bb940e2f5b3c07220276448f8 SHA512 1500ad24cacbb54f4921e87e70cb47c498aab25d7dd4b98068e21875d4ba639ccdcfb344340d86d76491cd48534a2ebdd3752154a13313384dd3662b9fab3617
 MISC metadata.xml 351 BLAKE2B 85adf905d433b2678752fe3469b6c6e44e8161c1064846283ebd0554e42a51f82ab2e89c7597e630baa8337b0d7d4901dc70a39d7340ccec5b267946c1e2fdeb SHA512 a532ef4a335611ffe8fc2f79b4bb1f3de29f500fcd52a6067b3ad17cbd44f4037aaa7b5c8c0dde04f56039692c25f2f146ff72f62e968786a8e7f8840c174244
diff --git a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.8.ebuild b/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.8.ebuild
deleted file mode 100644
index f15b3cdd299d..000000000000
--- a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.8.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
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_runtime_monitor"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin viewing DiagnosticsArray messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.9.ebuild b/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.9.ebuild
new file mode 100644
index 000000000000..5e331b7e803c
--- /dev/null
+++ b/dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_runtime_monitor"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin viewing DiagnosticsArray messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_rviz/Manifest b/dev-ros/rqt_rviz/Manifest
index 522bbe58451a..1709d56d46ba 100644
--- a/dev-ros/rqt_rviz/Manifest
+++ b/dev-ros/rqt_rviz/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_rviz-0.6.1.tar.gz 7455 BLAKE2B b4f64e076c584e741640fb23a337e43b1b81b9898a75acf52ad946272551f8b47cfb91156952fbbd474a247ad218e78cf2656a5a896bf366236e6c791c0b382b SHA512 e9281603bab5ac7b71870e769eb6648945f33e2f2f5c320d506a51d4c5e7f5a680edd6133532e28b8b829d023404290f5bb65565fa5b87f6299cdda2c6a9e73b
-EBUILD rqt_rviz-0.6.1.ebuild 529 BLAKE2B b269fd2402f60dfb8e6d84c293faaf5cfaf56696e9cdafa7ee7b4c8d0b8fb21222b920f16306b2f551be02109a4037845932fd337a5bc54ae5b4a6ace7dedfe6 SHA512 631e9128f4462460af3bff1cb3e6b91198947763135df23a50d175ea0ee282276369ad68c6c8f789177ebdab3be521604a1871c70a17d5b365de661eadabd085
+DIST rqt_rviz-0.7.0.tar.gz 7569 BLAKE2B 0024c333c6337892b6aba745c527c2ccc3426b5220dd89cf60c2daf381f23a817c89b372c6c7957545d5cad115c07f059fdea00981487987c3c1508b709c5e42 SHA512 efbff6163b26ef43a27dd3c6a1a013f691856c816f3f85b3fb39c7f373aa6d88876259aac2b94afac90bf3d16c56f329376fcbef7defc2d3bf745bb85c380fda
+EBUILD rqt_rviz-0.7.0.ebuild 529 BLAKE2B f831d78a77c74e315a77b345e0c6af21768e73e54c1da2827d54c4d37a9f270d1c0d54551c2392d5c7b82975e3cb755b344f6b674dd1345d37e56392d221d9c2 SHA512 18441832d04a2438b240ac45e829d01979aa4c0451dc500a26e72f14f75867d99be0702d06a6086a8502638e8128db74b60bb68ccd71b9d6e050fc5cd428764b
 EBUILD rqt_rviz-9999.ebuild 529 BLAKE2B b269fd2402f60dfb8e6d84c293faaf5cfaf56696e9cdafa7ee7b4c8d0b8fb21222b920f16306b2f551be02109a4037845932fd337a5bc54ae5b4a6ace7dedfe6 SHA512 631e9128f4462460af3bff1cb3e6b91198947763135df23a50d175ea0ee282276369ad68c6c8f789177ebdab3be521604a1871c70a17d5b365de661eadabd085
 MISC metadata.xml 340 BLAKE2B 4172ee0043191333587f0531f753f03f9aceed8cf29a81ac12b6833adb1be0a1583a542ad97775b0bc19e2ea4ba87edda2654eef085c49285b5ce2176daa2303 SHA512 81d265770fdf37279c8d815459f7b365d1bff1e8d18758565adecba21599878edfa3be3a0bcfed0afe1157fb373edc4e0f3087aadffd1736569be937538115da
diff --git a/dev-ros/rqt_rviz/rqt_rviz-0.6.1.ebuild b/dev-ros/rqt_rviz/rqt_rviz-0.6.1.ebuild
deleted file mode 100644
index 86e0acc0c884..000000000000
--- a/dev-ros/rqt_rviz/rqt_rviz-0.6.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_rviz"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin embedding RViz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/pluginlib[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_cpp
-	>=dev-ros/qt_gui_cpp-0.3
-	dev-qt/qtwidgets:5
-	dev-ros/rviz
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_rviz/rqt_rviz-0.7.0.ebuild b/dev-ros/rqt_rviz/rqt_rviz-0.7.0.ebuild
new file mode 100644
index 000000000000..47315bb2d7e1
--- /dev/null
+++ b/dev-ros/rqt_rviz/rqt_rviz-0.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_rviz"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin embedding RViz"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/pluginlib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_cpp
+	>=dev-ros/qt_gui_cpp-0.3
+	dev-qt/qtwidgets:5
+	dev-ros/rviz
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_service_caller/Manifest b/dev-ros/rqt_service_caller/Manifest
index 1be797c3da7e..2ba93288f513 100644
--- a/dev-ros/rqt_service_caller/Manifest
+++ b/dev-ros/rqt_service_caller/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_service_caller-0.4.9.tar.gz 7287 BLAKE2B fb65fc9375ca5690ef82c31949a4157d2f6dac420e7d3c62aa4e9abb9fd6ff370e8edc41fa5e1181d0dc35b58b3663a5f0225e2ba23d14f657bcac236c8cc4b3 SHA512 803c5803236bff6e482753aa994adbc60492aec92696c09ac49538601eb42d79b781e80e92fc3e528ab8767338e799252d51418708dbdfdc71314aada39e5259
-EBUILD rqt_service_caller-0.4.9.ebuild 586 BLAKE2B a56f23f70f70d55d125cee3a8acb14ebef9158be8f7d6452d8f0193143d50de8be5c71837c9fbfc0282bd5b8dd32f26b82971b567023b257eec659667d71fcf1 SHA512 1b65b030ce144ac25bd9167f7a3b4e49a0a06a70a077186b7715dafd8f870bbf630c95260b872a5d7d70baaa9bfdd26b351f2f0937b1ecf54d3b4657050b4342
+DIST rqt_service_caller-0.4.10.tar.gz 7402 BLAKE2B bbba811d0833edd7173c0c66a88e8ab30959a67e4f1108a552ed69f1fffc0415b5cb862f4ff1daa5dcb2251c7da8b7caa0d68ec4c061374b953d71b52af4467b SHA512 015b843db3a07f043a62f95a66fa17bffff80c13fb3577095d3f38229f414b662ffa5c2c3c629425d2373d965f40cca842cbc78b1dd79bc3fa3e40f06eddce7b
+EBUILD rqt_service_caller-0.4.10.ebuild 586 BLAKE2B 21c6017408da6bf249a36e566a15939216b37ba915216091b284d35e7189587edb8f35bede3a66b6bd5661eb597e490badbe43aa4e2a32ab5101704c9dfc45c0 SHA512 5b6652e30efb753ffed7ce352ddfcc6287eb9910ee3094956b11d1a5a4bd6b7da31637e2db9d1526644952046a4730ad5c52ece069e8bb9870ff3dac4eada1bf
 EBUILD rqt_service_caller-9999.ebuild 586 BLAKE2B a56f23f70f70d55d125cee3a8acb14ebef9158be8f7d6452d8f0193143d50de8be5c71837c9fbfc0282bd5b8dd32f26b82971b567023b257eec659667d71fcf1 SHA512 1b65b030ce144ac25bd9167f7a3b4e49a0a06a70a077186b7715dafd8f870bbf630c95260b872a5d7d70baaa9bfdd26b351f2f0937b1ecf54d3b4657050b4342
 MISC metadata.xml 350 BLAKE2B 4cc51a8225389126a5fc973fd489a13347a71275f7b759499b7761d0f176666f690614e873af4172df5bd56622589bba378d7777f01c6b77c5e3e6f150ab2bef SHA512 1b2e245248e936b9fddb4738972a70eb7df62244938f671517bceeb952d50956b8de74072d05421d274291baf3a3803a4a1c4d47f1c5bc3ff81def938be01a27
diff --git a/dev-ros/rqt_service_caller/rqt_service_caller-0.4.10.ebuild b/dev-ros/rqt_service_caller/rqt_service_caller-0.4.10.ebuild
new file mode 100644
index 000000000000..256f3a0fafa8
--- /dev/null
+++ b/dev-ros/rqt_service_caller/rqt_service_caller-0.4.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_service_caller"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for calling arbitrary services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_service_caller/rqt_service_caller-0.4.9.ebuild b/dev-ros/rqt_service_caller/rqt_service_caller-0.4.9.ebuild
deleted file mode 100644
index 68e3fdbd40e2..000000000000
--- a/dev-ros/rqt_service_caller/rqt_service_caller-0.4.9.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
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_service_caller"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for calling arbitrary services"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_shell/Manifest b/dev-ros/rqt_shell/Manifest
index c7c0ef8f5e2e..1611c485c7f3 100644
--- a/dev-ros/rqt_shell/Manifest
+++ b/dev-ros/rqt_shell/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_shell-0.4.10.tar.gz 6966 BLAKE2B 51e42222083ec64cdd991f9a3b0096bca19cd4b7f9083a4286d7ded0f2695382c132edd90af47c59c69e1ed1f9e35e5ade4469c40e8a072855d63f17ac4f0da9 SHA512 7562ac0aba35ad75dc884a81a737669e473516cdbc3c7207657d6fb24ea82aacb340eee68eed346fed57bca33bc878008fdd4569d6113df2609012dfedcaecc6
-EBUILD rqt_shell-0.4.10.ebuild 576 BLAKE2B 38a6240bfe600dc4a283a20a1a8f1c3a02a009d96e696455a7391d27016f293fb13dae6c39e606a821f0e79bf29630f57055bdc880a198e8563ca90117edcedc SHA512 67ebfd21a2515d63c6f8bcca5081fff4de821105620cc9f25a1df185a7b760fac39ed3ebcbcce0c4b751b08875262d115df5199bb8b339e731f2b6725c42072a
+DIST rqt_shell-0.4.11.tar.gz 7077 BLAKE2B 23a9ffb0903dc912a7a995d308234def49698c9db430b7195ed6a95b5876f2bb73c28c1a1214ec6e74f6ca6bd8c292dd3140ddd5b08880414672d8a7177dc6e3 SHA512 d8e72b136515b1ad2dae6cddbf308cce52512430610455cbcf5963c91d22616844b720658c8658227d44525b62b00d4bc43caf16fbc733be4088991f404591dc
+EBUILD rqt_shell-0.4.11.ebuild 576 BLAKE2B 2873bf7c0d1fec2be6aa7d48b021254f862a9f161ee81bd636459698509f8e1c15a95111e8e13daa44b260294cb9c9cc0e42f45ed5ace82473df978a5826b29c SHA512 435c629d4ad7bec72dadb9e9a7196d04f6d81856a43944f28e0583579f330d62bff6d6a03d8ff058e91be79e051e635733355e5932285fb4d470659079722a3a
 EBUILD rqt_shell-9999.ebuild 576 BLAKE2B 38a6240bfe600dc4a283a20a1a8f1c3a02a009d96e696455a7391d27016f293fb13dae6c39e606a821f0e79bf29630f57055bdc880a198e8563ca90117edcedc SHA512 67ebfd21a2515d63c6f8bcca5081fff4de821105620cc9f25a1df185a7b760fac39ed3ebcbcce0c4b751b08875262d115df5199bb8b339e731f2b6725c42072a
 MISC metadata.xml 341 BLAKE2B 37d602b430bbbbedaa984412c5773768475f9c29aa636896dc923729aab5536ac5effe75aaa207d3ef3aef85d6ecc9e009be0c705115bc39b46ee6e99e7ddd7e SHA512 ff2e33aac7330f2c74a047d052ecf393f7d04ce951a573ba799951be199291c028fd37f13aed3e2a2485cd0688b76ba0e4baa655576a68010aecffc9e7b4b206
diff --git a/dev-ros/rqt_shell/rqt_shell-0.4.10.ebuild b/dev-ros/rqt_shell/rqt_shell-0.4.10.ebuild
deleted file mode 100644
index 8e1d4bb5ae68..000000000000
--- a/dev-ros/rqt_shell/rqt_shell-0.4.10.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
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_shell"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin providing an interactive shell"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_shell/rqt_shell-0.4.11.ebuild b/dev-ros/rqt_shell/rqt_shell-0.4.11.ebuild
new file mode 100644
index 000000000000..556657691279
--- /dev/null
+++ b/dev-ros/rqt_shell/rqt_shell-0.4.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_shell"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin providing an interactive shell"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_srv/Manifest b/dev-ros/rqt_srv/Manifest
index 6c14dbcf7ea8..bb9c25bcdccd 100644
--- a/dev-ros/rqt_srv/Manifest
+++ b/dev-ros/rqt_srv/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_srv-0.4.8.tar.gz 3518 BLAKE2B 9a6a592c611ac01d3aedb3c211bfe629b0eccae9c5081b8872fbe2af77b4750b152ce18bea15fa47ed979533648bea51690bdb68585624920b71b2d7c090f06e SHA512 dc3712e3f84d3baae7ccddf55a64b3543698dabb828273a2cd99af06fb8d6155941c277ac48023aa37eff2873d11cf150f2b4e2fc616d01576703f69f5a4289e
-EBUILD rqt_srv-0.4.8.ebuild 557 BLAKE2B 628b12c13742dc1d55fb32af5a66810c11aff1462c688440d6a45889f7c0c98da56b642e0139f7f4029bba32a0198d0f6d7e9463e44b66e9875baf17b36efd28 SHA512 c1494231b631bba4f93240ef17f86ed917a3a390cf44b7c79a06501c1bca998fc0c02ea76abb1e01c45f8ec962babd4d69b58b94f1ff734f46b964350f529dca
+DIST rqt_srv-0.4.9.tar.gz 3712 BLAKE2B a8f8493e9ca15150153d0a7df2eca63d93b1bc730273d15b4a03edbb532979f2c9635c6138ce1612b295e069af24b25b1cdf95b98f7c734cda333ceea5264926 SHA512 42c2e9bc9a45c960b51adce98d18d0f6d2821d2dea3d1d586522e273b04158a3a0df6e7b1bcadceb8052bdc8cf4f9c19ce73b7d415e015468247ea94a73a23dd
+EBUILD rqt_srv-0.4.9.ebuild 557 BLAKE2B 24ab8f5dd40c477684fd05e21f781530af88e6736854a379a002ac9a43db307e70a1262d700cddbaace6a230ab5263e0f299e90114aae8b7a94a05ab53c2e05a SHA512 003a567f79ee8d3faba17c8016a810bf8b5974f4d7ac8c423f7d13f7ee7c52cfcce0e68be1d8aa2f1eb779504ea499e6d7a581bbf54f44f1895abfe28122fee1
 EBUILD rqt_srv-9999.ebuild 557 BLAKE2B 628b12c13742dc1d55fb32af5a66810c11aff1462c688440d6a45889f7c0c98da56b642e0139f7f4029bba32a0198d0f6d7e9463e44b66e9875baf17b36efd28 SHA512 c1494231b631bba4f93240ef17f86ed917a3a390cf44b7c79a06501c1bca998fc0c02ea76abb1e01c45f8ec962babd4d69b58b94f1ff734f46b964350f529dca
 MISC metadata.xml 339 BLAKE2B 0eb9310139bad173fe8a8189d38a07b6b515c15b8a8e4539112ece7f26d2b24f1e30feb0ddb50a3a2170af13e495f89eebb58456e160f995216ac8d8eff06a64 SHA512 885828f3661bc17a6fbe23243df8fd984e595c6b83d11f5139f1e3140bc4095bef3e348212c101de50b890ec9f11fb185644fb50902c6a0d4191de9ac110b6e7
diff --git a/dev-ros/rqt_srv/rqt_srv-0.4.8.ebuild b/dev-ros/rqt_srv/rqt_srv-0.4.8.ebuild
deleted file mode 100644
index 03edbbca41b5..000000000000
--- a/dev-ros/rqt_srv/rqt_srv-0.4.8.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
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_srv"
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for introspecting available ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_msg[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_srv/rqt_srv-0.4.9.ebuild b/dev-ros/rqt_srv/rqt_srv-0.4.9.ebuild
new file mode 100644
index 000000000000..3793ad4f32ee
--- /dev/null
+++ b/dev-ros/rqt_srv/rqt_srv-0.4.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_srv"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for introspecting available ROS message types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_msg[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_top/Manifest b/dev-ros/rqt_top/Manifest
index 057b526f7ef3..c233640e0536 100644
--- a/dev-ros/rqt_top/Manifest
+++ b/dev-ros/rqt_top/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_top-0.4.9.tar.gz 6507 BLAKE2B 4c0fd53073a91e45de7fdc27c037c002976da0d5bc8d1e6f85d1d50d2c821b9a96968ed4189b2c17e6bbdc2ca0b4eab55e70f5f86bd24a18d32986ba153028e6 SHA512 42eb45d0a4ac271be150ee67fc1b0911a977ae636f4fec90240bec83ac024543ab9dec194f69c46873122efcf64f7c1a43328afbcde3e41f56274a87e8bc0b77
-EBUILD rqt_top-0.4.9.ebuild 520 BLAKE2B 69f6b7b448850c8021078fe43de32d904c165fd09633a5de0263cd524b17b1ac61ee48ec575d86c73fde894fcb606c731e7e51fb54a1e06d1454337f2bafcd20 SHA512 8c54187fdf31f5e8b48774314bec119952c3236bfb7d1860c1f60dd8c6e9d6e0d203ba1a7098b32a6bfe01d43f3ca6e74f474f0e879ce9c5b4bf4f371f82dca2
+DIST rqt_top-0.4.10.tar.gz 6662 BLAKE2B 23de23cf8685b4dd2d118c3b47d941695872c4a0e44538a4e6dec95cd95ce70f4c5361d65123e6cffa872d6b00166839d03ee4eb6b4ff03314cfbd5b4299fac7 SHA512 719fb16be898e37014167c31987e3f54bab7526e54bbed09bbb264f32b28f998c8b3341850c7eaf49201eaa29fcf19df7407543fc8d1511ddefb73696295d29c
+EBUILD rqt_top-0.4.10.ebuild 520 BLAKE2B f7c9c197c581edf5f5f879d7b37de26498c9e26574f7ce0bfe224cdf6014fcecca1914ab618a39be51326b5ec4ae98d093b537d9a7375b13e38c62757e96f1ca SHA512 a99d36519aba45ea7ac2e71a04d10c767c3707d08e07088a34bffeacf58eae365671abda3b153d8a68f2f64a937e1589aedb45abe67859ac2faea70de16d97df
 EBUILD rqt_top-9999.ebuild 520 BLAKE2B 69f6b7b448850c8021078fe43de32d904c165fd09633a5de0263cd524b17b1ac61ee48ec575d86c73fde894fcb606c731e7e51fb54a1e06d1454337f2bafcd20 SHA512 8c54187fdf31f5e8b48774314bec119952c3236bfb7d1860c1f60dd8c6e9d6e0d203ba1a7098b32a6bfe01d43f3ca6e74f474f0e879ce9c5b4bf4f371f82dca2
 MISC metadata.xml 339 BLAKE2B 2ba9b45f7390efddf6043ca229f7ad5c4b5f1630e2dc6cec28cddb9bba0f35731421972fac8e1d82b095e133503fa4c53127bd323fc20be2bade7f1de2368ee9 SHA512 b988663d3571ef8b2a6825063c37526249e53cec0b32924eec6c8a55205cfc2501747281ecbdfceaf9ad9693dcd913582091d8493be963c7dd1471c612644368
diff --git a/dev-ros/rqt_top/rqt_top-0.4.10.ebuild b/dev-ros/rqt_top/rqt_top-0.4.10.ebuild
new file mode 100644
index 000000000000..b312ed9dd5a4
--- /dev/null
+++ b/dev-ros/rqt_top/rqt_top-0.4.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_top"
+
+inherit ros-catkin
+
+DESCRIPTION="RQT plugin for monitoring ROS processes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_top/rqt_top-0.4.9.ebuild b/dev-ros/rqt_top/rqt_top-0.4.9.ebuild
deleted file mode 100644
index 1ef0fdf3d25e..000000000000
--- a/dev-ros/rqt_top/rqt_top-0.4.9.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
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_top"
-
-inherit ros-catkin
-
-DESCRIPTION="RQT plugin for monitoring ROS processes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_web/Manifest b/dev-ros/rqt_web/Manifest
index 57edff1b49f4..feb4ca056f94 100644
--- a/dev-ros/rqt_web/Manifest
+++ b/dev-ros/rqt_web/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_web-0.4.9.tar.gz 6055 BLAKE2B 4366be2be307c4a565a8eced30144e094d7bb1958d09c313d81771bba8eb8911fc625809a3f43344cdd3c171a2484de1b66f04f34c4e07e90ac95710fd2639de SHA512 c6b67e34e9bb844d9eea17accf570b439b58f4665ecca3625c520b4546b958404b257025d79ce06833ebfcecce029c88bb375b7271df19a351a6692c35a0ab8f
-EBUILD rqt_web-0.4.9.ebuild 555 BLAKE2B 205a357c9326b7b1c6b0cfccee5752955cee49d815e3466ff52721c33ba9f86079b4ec4d197bc4b29abdb15521a3e0942ae41dbe587ef2bcf41695de1d0a7372 SHA512 a4a23a3fb7008a3e5df093377a6dfab81877d1fe813ae13944b4edb1bfed78bcae8b0f1adfff64f3cb7b8e3d72d726dc2d642ebcd72308f73748b1c14a15a877
+DIST rqt_web-0.4.10.tar.gz 6119 BLAKE2B 6afc8392d799eee835ec2b7d99b6254735a0756937f25021e3b1754380ce17c903288b854ef2cd87fd67613d6ca2759144edb03ba08a7bb8adf0aefde9624e9b SHA512 bdb3c2c241d7e4a9fb363e38d8776ce05affbb7b5d2d798e2ca9cb48532258d95af03adf9fce693fe7df0ea66034482537ff931d62edded3704eb48b3fd47d33
+EBUILD rqt_web-0.4.10.ebuild 555 BLAKE2B f411b556512923afe2999c1145bca2ae430673cd345a43bf15582edb7a1720961bdd30121b90d6a3fb0216255859985fa84be4a9e3324089f33e0a2018bcc5d3 SHA512 a3eeebf8943ae12103a4bf2dec2ed4b6d47d18c2eea10f580cd76ecf1e27f350cf901bd0a5ebdfba37869356867b3e6f0173867a6ba5d2b559e8be952b1be47b
 EBUILD rqt_web-9999.ebuild 555 BLAKE2B 205a357c9326b7b1c6b0cfccee5752955cee49d815e3466ff52721c33ba9f86079b4ec4d197bc4b29abdb15521a3e0942ae41dbe587ef2bcf41695de1d0a7372 SHA512 a4a23a3fb7008a3e5df093377a6dfab81877d1fe813ae13944b4edb1bfed78bcae8b0f1adfff64f3cb7b8e3d72d726dc2d642ebcd72308f73748b1c14a15a877
 MISC metadata.xml 339 BLAKE2B 404fb427a6076397a1ea41e275bfa3c921e48140b5a418e0c00e7898dff5633a314385e2b1594b88b100b61e897f2a0c1f8056e028ab0316607fa1d5aec3ab11 SHA512 e5bf773a7f2deff19d4041ee2f8374be10f1fa6ff57ee94c7d455ffcbb9ae09046ba2907346c19f9a47a0726c9f225e9f170ae7a2cf3da53e97569a9d3df1523
diff --git a/dev-ros/rqt_web/rqt_web-0.4.10.ebuild b/dev-ros/rqt_web/rqt_web-0.4.10.ebuild
new file mode 100644
index 000000000000..a60dd51d9372
--- /dev/null
+++ b/dev-ros/rqt_web/rqt_web-0.4.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_web"
+
+inherit ros-catkin
+
+DESCRIPTION="Simple web content viewer for rqt"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_web/rqt_web-0.4.9.ebuild b/dev-ros/rqt_web/rqt_web-0.4.9.ebuild
deleted file mode 100644
index 60b0b9016d48..000000000000
--- a/dev-ros/rqt_web/rqt_web-0.4.9.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
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_web"
-
-inherit ros-catkin
-
-DESCRIPTION="Simple web content viewer for rqt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index b90c1629af9e..b89580b90e8b 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,4 +1,4 @@
-DIST rviz-1.14.4.tar.gz 5121671 BLAKE2B f691b80d0240c7b09100c6cae8f25839969547654b7b974191e8ebbacf73a6e996cf69593910a1bb38a9db182446f6f89917115e9923805cd054e8dd25356786 SHA512 a7ae0d4196d7fa9c6b5e461d7cb9d044e09b8620b256d2cbccd8975266b81eeafd5693b01b0ae6fa21a73b7329cad335f8179bb7c90295da495da5552c304d33
-EBUILD rviz-1.14.4-r1.ebuild 1802 BLAKE2B 0b191ec76e3d8d02a18b12b8a306041cdab9a2a3c0f20acad89945a81fdfb275d15f6829a9fbe895cff765e0639be7f9d2ebcd6c6977d7a311e206e92dca0085 SHA512 a05fd274e14b2fd5e6a9a09ca5f86ebb14d4712d433c92c8b305735ea76a3d4a2399ee692ba206c387bcc173b893ed6188d8ed8901a5d95a7c44f05af1368107
+DIST rviz-1.14.8.tar.gz 5127738 BLAKE2B 317d38e73f078e043984aac465bc3284f92febe2693f80871e9bf3ec55c800b42fbc87f0adedd888c3c62f526157846fe61ad6a33d97314b36fb89d8e305fe0b SHA512 a6e5d08be925f7df1f11eed72905447f30f829ddc4e9f39b957c1af284f0533814f29affa5105bafd2a31aa894c3700687401cef8bc36d31b28923f95da53904
+EBUILD rviz-1.14.8.ebuild 1802 BLAKE2B 0b191ec76e3d8d02a18b12b8a306041cdab9a2a3c0f20acad89945a81fdfb275d15f6829a9fbe895cff765e0639be7f9d2ebcd6c6977d7a311e206e92dca0085 SHA512 a05fd274e14b2fd5e6a9a09ca5f86ebb14d4712d433c92c8b305735ea76a3d4a2399ee692ba206c387bcc173b893ed6188d8ed8901a5d95a7c44f05af1368107
 EBUILD rviz-9999.ebuild 1802 BLAKE2B 0b191ec76e3d8d02a18b12b8a306041cdab9a2a3c0f20acad89945a81fdfb275d15f6829a9fbe895cff765e0639be7f9d2ebcd6c6977d7a311e206e92dca0085 SHA512 a05fd274e14b2fd5e6a9a09ca5f86ebb14d4712d433c92c8b305735ea76a3d4a2399ee692ba206c387bcc173b893ed6188d8ed8901a5d95a7c44f05af1368107
 MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120
diff --git a/dev-ros/rviz/rviz-1.14.4-r1.ebuild b/dev-ros/rviz/rviz-1.14.8.ebuild
index e25c75bee058..e25c75bee058 100644
--- a/dev-ros/rviz/rviz-1.14.4-r1.ebuild
+++ b/dev-ros/rviz/rviz-1.14.8.ebuild
diff --git a/dev-ros/rviz_imu_plugin/Manifest b/dev-ros/rviz_imu_plugin/Manifest
index 1c9c052434c9..6ce52acc70fd 100644
--- a/dev-ros/rviz_imu_plugin/Manifest
+++ b/dev-ros/rviz_imu_plugin/Manifest
@@ -1,4 +1,6 @@
 DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
+DIST imu_tools-1.2.3.tar.gz 1656874 BLAKE2B d11a3d706ddd1eaae7562ca55ed25ade02dc79456ef8f99aa772e4dc6c6d38684d47175b3ffca3ca69e89aff1f02353379d2debfd53a03aa9a1eadd216a9dfe4 SHA512 b3c652836c049e096113ac075790ecb03fd8867b5702f83e52e5b97e41b1fecb448835ab9c8846b24104387e9148a1678c4d0b294885bc2472e8694dd090ba82
 EBUILD rviz_imu_plugin-1.2.2.ebuild 466 BLAKE2B 5c124c4c7a1d71f90b84f08308d5b0283d89fc65195237fab77809bddade3ec22861c8e4742fcc959601a05c36fe7e80244f5916264e769ec7dae3bf01b28220 SHA512 a5b0edf3e1ad60fb88f38d5777c9b05abc9b797a6f40f002ce06ee1d0d48b1336ae03b8f244befa553aeac1c5aede8f0d816d6602aba8a2a8d73eb3afa74de60
+EBUILD rviz_imu_plugin-1.2.3.ebuild 466 BLAKE2B 0f3fbc1f3eb677bcc3fbadf4b395ae778e951182e623d6f7cb790e22f18e0fd098cd315ac23ef87357608a21d310f793b448c9910f80e269fc52a87cea525e89 SHA512 9a54e21791e387a418c570381343585d0973e96c9736edb6e9917d84d14c047d14fcd7666a93a1ecdb33b2350e91713697cebd5ed7fa587de11fa9e712713f5d
 EBUILD rviz_imu_plugin-9999.ebuild 466 BLAKE2B 5c124c4c7a1d71f90b84f08308d5b0283d89fc65195237fab77809bddade3ec22861c8e4742fcc959601a05c36fe7e80244f5916264e769ec7dae3bf01b28220 SHA512 a5b0edf3e1ad60fb88f38d5777c9b05abc9b797a6f40f002ce06ee1d0d48b1336ae03b8f244befa553aeac1c5aede8f0d816d6602aba8a2a8d73eb3afa74de60
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.3.ebuild b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.3.ebuild
new file mode 100644
index 000000000000..c30e89f04cff
--- /dev/null
+++ b/dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="RVIZ plugin for IMU visualization"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-ros/roscpp
+	dev-ros/rviz
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/settlerlib/Manifest b/dev-ros/settlerlib/Manifest
index 1790d262891e..4ed5281a13ff 100644
--- a/dev-ros/settlerlib/Manifest
+++ b/dev-ros/settlerlib/Manifest
@@ -1,4 +1,6 @@
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD settlerlib-0.10.14.ebuild 519 BLAKE2B 53246e5baa6fcaa5d1fb8578a74aaa532fda40e5093b8de596584ce7c1db4d0ff0e73e812fa06f4385ebb24a3fb9dcab7587af3d5d41fa03660e232696ebdfaa SHA512 ee1c139abc9566e14fe8c451eda97bdb6267de7c4e13c052066a966418b87e5895b1a3e7ae04bfeac3c36517a0ffa7223863ae223889f5aea308998aa23173af
+EBUILD settlerlib-0.10.15.ebuild 519 BLAKE2B 6ff2d710bd16ff3188e2dad5176a78ad87af0e98e8ef79dbf3c0d7958bb025497d2c9b1bd710a9262bb2beba98e4caabc794e82a7b7a49c3fd62611eea528561 SHA512 29163c9967448c89d20433bb63bbdb15ec3428b1acb8ebd271ff943239c09edaff20b5dc31ddf22d2bb576a20c638c67b045b453838d3abe2b3535965c5035ce
 EBUILD settlerlib-9999.ebuild 519 BLAKE2B 53246e5baa6fcaa5d1fb8578a74aaa532fda40e5093b8de596584ce7c1db4d0ff0e73e812fa06f4385ebb24a3fb9dcab7587af3d5d41fa03660e232696ebdfaa SHA512 ee1c139abc9566e14fe8c451eda97bdb6267de7c4e13c052066a966418b87e5895b1a3e7ae04bfeac3c36517a0ffa7223863ae223889f5aea308998aa23173af
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/settlerlib/settlerlib-0.10.15.ebuild b/dev-ros/settlerlib/settlerlib-0.10.15.ebuild
new file mode 100644
index 000000000000..f002fa2984e2
--- /dev/null
+++ b/dev-ros/settlerlib/settlerlib-0.10.15.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Helper functions for creating a settler for a specific sensor channel"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/rosconsole
+	dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/stage_ros/Manifest b/dev-ros/stage_ros/Manifest
index 05a7d1155c11..95de009f899b 100644
--- a/dev-ros/stage_ros/Manifest
+++ b/dev-ros/stage_ros/Manifest
@@ -1,4 +1,5 @@
+AUX tests.patch 362 BLAKE2B 1c57128de8575dbdcdbb09717eb839998ab9efe3c8dc796702773fe68661353324d3359ebc2e7725bc8ba673e7f460b82b255aae8125302265eed59c74e5d212 SHA512 b0a7afe2fdfe4af6a79039f6580bf584e67b34b10eb4cca90ef7d4433e0b84658f9fa60a3f3dc4014333406e4b97b74e28b453b0259e59df1558d7ffe371313e
 DIST stage_ros-1.8.0.tar.gz 59891 BLAKE2B a70708ce0e30418116a1b7b4a2f6b9bfa1e8f03b6562013f51a49e3a349ab0d7d8c090f61d620e4ef7c8d2e19f77165c04b05fb5ceeab061e9d88895cbb6eef7 SHA512 d953e819d1955e7b1f0ca5a3d91e5b052b485045c057ecfe210e8b31dd3b4aa3418ac642dbad87ce8925e74295661a9fee9b10d826c2b1a2a17f8ec478a87927
-EBUILD stage_ros-1.8.0-r1.ebuild 650 BLAKE2B 14c2dc850afb86e05c87324409e13bc8c1ccdc26ba5e04df85afc510dbb4bd1db8d9cc2d0911c0cff658016d8310914cc4a0e6228a3194d0f8cfaa5cccb042c4 SHA512 c7fa2549a25abe1f1936e32b71e5a01f8ba57c26d02f94400e1e48f874c77b4305d69da257ee7f5304e960f10d5b2de4b14b333ec9a1b94881ee84853d01fc0e
-EBUILD stage_ros-9999.ebuild 650 BLAKE2B 14c2dc850afb86e05c87324409e13bc8c1ccdc26ba5e04df85afc510dbb4bd1db8d9cc2d0911c0cff658016d8310914cc4a0e6228a3194d0f8cfaa5cccb042c4 SHA512 c7fa2549a25abe1f1936e32b71e5a01f8ba57c26d02f94400e1e48f874c77b4305d69da257ee7f5304e960f10d5b2de4b14b333ec9a1b94881ee84853d01fc0e
+EBUILD stage_ros-1.8.0-r1.ebuild 689 BLAKE2B 216331e2053e89d4d14dd4e8414f79053309ed16907420c45f85f47b6c29b80a85af311085309b0a311e7e03bbbc124b773c6add606d3b4dc3107a59c31a7649 SHA512 5c9901f71a205e585c0275d8f3b5f3eb12a21056b059a6e917dfe796b29fe87a18bbbf59b6fdca28a6bc3b31fd3438ea6c26797d6ce783bc0029ac840094299b
+EBUILD stage_ros-9999.ebuild 689 BLAKE2B 216331e2053e89d4d14dd4e8414f79053309ed16907420c45f85f47b6c29b80a85af311085309b0a311e7e03bbbc124b773c6add606d3b4dc3107a59c31a7649 SHA512 5c9901f71a205e585c0275d8f3b5f3eb12a21056b059a6e917dfe796b29fe87a18bbbf59b6fdca28a6bc3b31fd3438ea6c26797d6ce783bc0029ac840094299b
 MISC metadata.xml 338 BLAKE2B be113ba641978d842732dba943269bfbecda305f280a1e594e66e80432987e754f04e83f1da5a94ba941e21900bd626f7dbfd0371dfd68077cd6f74b5531aab6 SHA512 60d3c473f35f325bd591eb4b81993b474b9477904362c8459266eed6c4da08c0bfdcf46deb8c9ab77dd28f11a07870374da80c49469b6a824d3d467d23455b7c
diff --git a/dev-ros/stage_ros/files/tests.patch b/dev-ros/stage_ros/files/tests.patch
new file mode 100644
index 000000000000..e3cf108bbef5
--- /dev/null
+++ b/dev-ros/stage_ros/files/tests.patch
@@ -0,0 +1,13 @@
+Index: stage_ros-1.8.0/test/intensity_test.py
+===================================================================
+--- stage_ros-1.8.0.orig/test/intensity_test.py
++++ stage_ros-1.8.0/test/intensity_test.py
+@@ -3,7 +3,7 @@
+ import unittest
+ import rospy
+ import time
+-import Queue as queue
++import queue
+ from sensor_msgs.msg import LaserScan
+ 
+ PKG = "stage_ros"
diff --git a/dev-ros/stage_ros/stage_ros-1.8.0-r1.ebuild b/dev-ros/stage_ros/stage_ros-1.8.0-r1.ebuild
index f5c232a1c22e..0fbed9fbfb07 100644
--- a/dev-ros/stage_ros/stage_ros-1.8.0-r1.ebuild
+++ b/dev-ros/stage_ros/stage_ros-1.8.0-r1.ebuild
@@ -31,3 +31,5 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/stage_ros/stage_ros-9999.ebuild b/dev-ros/stage_ros/stage_ros-9999.ebuild
index f5c232a1c22e..0fbed9fbfb07 100644
--- a/dev-ros/stage_ros/stage_ros-9999.ebuild
+++ b/dev-ros/stage_ros/stage_ros-9999.ebuild
@@ -31,3 +31,5 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/test_rosbag/Manifest b/dev-ros/test_rosbag/Manifest
index e19e18782e98..ee10d5daab1e 100644
--- a/dev-ros/test_rosbag/Manifest
+++ b/dev-ros/test_rosbag/Manifest
@@ -1,4 +1,5 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 DIST test_rosbag-1.15.10-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
@@ -36,6 +37,41 @@ DIST test_rosbag-1.15.10-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7
 DIST test_rosbag-1.15.10-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
 DIST test_rosbag-1.15.10-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
 DIST test_rosbag-1.15.10-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
+DIST test_rosbag-1.15.11-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
+DIST test_rosbag-1.15.11-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
+DIST test_rosbag-1.15.11-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
+DIST test_rosbag-1.15.11-converged_gen1.bag 5197 BLAKE2B 99b3a9807b2e569f6773b791b008b1430408843037203a257892c82a6f59dd3e688a4f516e91d26fa567b56bececc3f69d69f4999e7a1e1430a9a606686a8de9 SHA512 490677292a7ea95109e7542e1219f51d7de9cf3bfbf90f48836fd80387655752ecb1173cbb65fc40908eb552fe1bae45e821c1b8510a401c7b643d2c0c433881
+DIST test_rosbag-1.15.11-converged_gen2.bag 5197 BLAKE2B e5b620a47c7f44911e5ee44c5787cd9ff753763816535ddaaf64f5e83a27504a5f6d241d900c0c3eacc5b9273113ad05f72cd828a4ebfb6d997df46fbc8b0cc7 SHA512 2779711e7d1223b14223312e1cbb6222ef6fdc32bd28dab6cb830784d5207f5ec7cc826e1336328520a45b15ddc937bf0be7eb8329932b77b9f1f42d162b7795
+DIST test_rosbag-1.15.11-converged_gen3.bag 5209 BLAKE2B f6d3615c771b086220350982c5ff726f263a460a714aaa3abcd683216dbdeaa72ddfd2fa2b42e761f82223af29ffa1bad554a67fc6afab52f08ffd1718fcadf0 SHA512 d896b361c73ba904c1766c9899d03f09d7ce62126378c195c620b659ff06dbdb61783ef7cddd999088a973382e60387a8eadd1d7dbd67af2d7af6c1c1fa87b6f
+DIST test_rosbag-1.15.11-converged_gen4.bag 5207 BLAKE2B d25369cfa2e0f34ab7b344ac56557292ec1b5609802327ade48d60e632900e4d746e15c9a46b700a44c198d1aef1975b042efbb1ca885f4124b5cef4936925ff SHA512 329694efa2dd1ad82a87f1419958bc2cb1edf4d8ae4ffde1c2d3d3b792d1dcba842b82c9f028cf3bb2f85fadbb068e5ed25eaebc8cd6e305c422d40dbeb75775
+DIST test_rosbag-1.15.11-convergent_gen1.bag 5485 BLAKE2B bd906d5ced9d123e04fa8b948834b907530ba2c56f4197f7ff209ec5d6afb18ff42e29d03f883d2d44e89e49c12e3769013f8209e5a674a7fd138d0264083295 SHA512 85a4129f954d4d3a2374c1c2c7fbdd82ee685853763ab62a836ab128b1dd118746984d1c1b8290ac1b522fac18493e1ab825b1a66924151dff608af0a5e07541
+DIST test_rosbag-1.15.11-convergent_gen2.bag 5485 BLAKE2B f5f6c3ed07b8cabca79fe826dcb7dbf0a9e3d7aed1d3bb0767e47a1f269e5c198de90f6e0052911f4148238b99bc3f48ea417d9a1642efb5bee74d5b5f9e7b5f SHA512 09fba991e4efe5758082f9af2501b0bc9ea452b247e3672b8eae5cef3d8d43ebbc0c7307bcb5730f1ec9a94e86506258d04e1cb25fb8d5f680f38b4b73e96c68
+DIST test_rosbag-1.15.11-migrated_addsub_gen1.bag 5031 BLAKE2B eeaff544bc0de8f9d058ebec594318b9ea8ee383f8b5083258de9dcb0068d1d6c0169cf97cc221675509932c8aa630e13958a2e82f413d6e834b3114c4702824 SHA512 b41a4a5651a97f70774c1395c8f9d5b0f4815f7e39052904fe1e89483270f9eb5216a6bd3652c2372c6c64666b4cc5e60d04f390f5ea83f88653035fa1a432fb
+DIST test_rosbag-1.15.11-migrated_explicit_gen1.bag 6172 BLAKE2B 9d5692ed7683a8a426467969488836102c56d51878c1c2d28d60f5a66a3429395cadfff75a177003238e1184ef1ff927479fb205a28e359c9e4efcbd41a1e767 SHA512 e11282b83feef48c039d34400216406537704ea5bcc10e62434bd2917a9ee0942a67315a8667d0ae7e76da178537b01f88a638f5e360663e51a438a4c6049661
+DIST test_rosbag-1.15.11-migrated_explicit_gen2.bag 6212 BLAKE2B 97b231a06d372d813dbfb6c80a6c293dda743ba4ad436ac0e265c37650461bb83315304f25d5a299eb4d82e59e6a776b4c7a66ace154aa6fb9d75bff10e45e06 SHA512 690fdad115ac672617bad2510e139f5cf67599b4e21a56dafd45bfda9f1991f4fc9251dc41c36834931402722261b008ff0ea283afd99daa3eda20bb357810ed
+DIST test_rosbag-1.15.11-migrated_explicit_gen3.bag 6220 BLAKE2B 7f9ba4eade5e2e7c03b2e180f1507cce58331493a2dddc1213a6ed5d8a46d198569ef5d5effe398c97c372adcbfed756649c35c0ae38362f017cf768faebc30e SHA512 35911f4d68eda67a49cfa03ad65c6b6a84e74f161b38839fed7a1ceeadd10715f4d82b124d640f7cfc356f107e376ea6bc9016c1be32592fe2f6865d5bb8f868
+DIST test_rosbag-1.15.11-migrated_explicit_gen4.bag 6359 BLAKE2B 156e06ff065827bea0797c6f55dfaf37cb973ac07085cb56d4f3c85eadf1c994cf859e0e7b85bf65234a52b56cf4632d2ce2c8c05c172f5c838c403fdb83fc42 SHA512 5dccc7f8bd03ce08b584a69d6a9e54969bd014d22d7af3e1a9b09d9c42ab4029cf13205f56ea81913ce47c6a5f383d1c9082feb8857fa0d4f1459f97d2f4460c
+DIST test_rosbag-1.15.11-migrated_implicit_gen1.bag 6690 BLAKE2B b6d9d8dda4bae2d41aa81928daaada62da89a7be38e8f73ed9c2c2bb7c652d194eb7afd201ca0c0283ee88a77e103d8ccb86c60bffa4adcacde7a0f7f3b7f56d SHA512 a09816ef8c00b0005c1ee42b4d33739b776e6b8792f34f3c5e70ffb91ebc4c4e3c92396d733c3fe4314bd646533d71ede9cae57faeb8a311a25e13421731aeb6
+DIST test_rosbag-1.15.11-migrated_implicit_gen2.bag 6740 BLAKE2B 2f3d4a397188454f6ee4f2cfd2438361a3ce83b4e7d124feaa15788f6e49a074db433d8e87b43961984b0c243cd02651abb26ebeca0a51eeda9b61cc7d786f8e SHA512 da0fad58643a06c8c15ae6b13530b3e879269602b6dde750ec2706087206db82bb8f4a386830b36426c98fdc71eb6d2fcf6d2ee8d0be230beb3855447acc3bb3
+DIST test_rosbag-1.15.11-migrated_implicit_gen3.bag 6752 BLAKE2B f5f7c56815dd1e9bd277cde0a91dd53a68c342527578123ad25ec981c30486ddeca774c7d4f8dcf0606d189b14e235f349490f47ceb3a191250cada8f82c32e0 SHA512 2068238ca893201d24ed26b17d8b94e13a82d9f556352572da8c44e2455f75c984454bb09074b688f11ec0a7a5e38791b669f7cdea98863d0c301917ffe5d342
+DIST test_rosbag-1.15.11-migrated_implicit_gen4.bag 6889 BLAKE2B 6f8dbc6f2920d10535c8574470e23d3007033942949ef599437dde5fd64b860139f79a9835e255065fe3c74445ef702c3793f0adfc972f88fa7046c081ec5976 SHA512 4fb2b1f78b4cfd5b155415724ab224b6d619a44af94ade80f8bd6ef30b46e498633a5457d8f939c96902a641e0fd45cac2aa8e4e7f7a26efb6c78109b2dcd4d7
+DIST test_rosbag-1.15.11-migrated_mixed_gen1.bag 7120 BLAKE2B 1788a394a5cef74864071994a97fa0a7df28167531261636b74cbb688e0e62902e2e9577f09d1546b3f3dbb0533332b8c5aee47f01a30606744cdaaa5c573a0e SHA512 a8354f9386fe2b8da148919cc036041570eb999b94be162ee06b2abfd5f0b150fe96af45530c18b86eafda2e0299b8dfa8faf1cf3ab1571a0f62f17e6ba1147c
+DIST test_rosbag-1.15.11-migrated_mixed_gen2.bag 7178 BLAKE2B aa251ca30288b42d91f5bc37e672551a90575b10ecb058042deb88b45d41a9dc38c5e17081780ca75436cee886f71e1405f7970ac1025693fbc94f8444aaed60 SHA512 fd1ffb05ea65a798c07568778da71b6f3d5c7cebd4a541ace4d800b2eff3c9ee3ce1b1b21017e4aab73438ab3005d6cf966993a7b17afce16c5b788354c5d868
+DIST test_rosbag-1.15.11-migrated_mixed_gen3.bag 7252 BLAKE2B 29896d975cd406b525e8e59e24d26817a9a13b84833d9c08733bfc05be392d6e0be6de5bbced5068bed33ae60ce4053922c8092f259a48e23ae796ac43e8e601 SHA512 d0a5fd042c614e6451b9b6518ecd3317a727939db81fa8988c700a657be77f9cc14127cd0595c97a505094df9e96b63f79381be2da3717e34f3481d521905518
+DIST test_rosbag-1.15.11-migrated_mixed_gen4.bag 7387 BLAKE2B 55de46bbc4e115113df7ccac4c08e61308e7c06ddde1f6e69a436b4b32fb296b9f60d029473f46cf37b0894e501040f4e748302a9d7c8c8684911983860519c1 SHA512 5f106b3a64968ced5baeb0f91dac7209af508c6cdc2c3148bd9c86421024051f2bd7d12027af2857dd1e49964babb330333e02bb94a120426763695c06bd31ef
+DIST test_rosbag-1.15.11-partially_migrated_gen1.bag 6568 BLAKE2B c3d16f271e035140ab802123d7d848d4d7c0e00841edd0282c632c92bbe030847bd879e7e7ff24f6384f9f2f34a9dd38bb7b5e281de9df7203d2c43c28600fa3 SHA512 ecec0e8c3ccd4613048d300417218488a3578a131ed0bd346cf07dc6c702abb2354288558e56ffd6c192abb1e2afd7084a856eecd51a935e207936b5e3d52e32
+DIST test_rosbag-1.15.11-partially_migrated_gen2.bag 6616 BLAKE2B 846b84e3d221b490d3f7b90083d5354ea21906b51569fa9c57642c6e52d06e3caa4a68b3f0fffbb5c808bb440fd17507c80a60a87bd0cb8207a14eb01418de24 SHA512 aac71997873669661eaab2d0f463e3e5afb677c9852a572fd9f139a9037d3e26e2d2ae8b9e16c204eae8f494a1a867638e5f7750293ccec27402dbea0804e712
+DIST test_rosbag-1.15.11-partially_migrated_gen3.bag 6707 BLAKE2B 6d5df33b8def73503cc35de95b680607cb7d687a16082558dd95b8b869866837cb584173088ee2a2c2d9f7ca21193eea287bef111103f8bacec2aa635cbe3e68 SHA512 e730b1b0604253286b4e53d917f01bad10cbe81b8b1547984657bd8e90112c20e1b24ba315aedccc1495374070fbbe6f7b8e51cd68e82986f68efd0785b7386d
+DIST test_rosbag-1.15.11-partially_migrated_gen4.bag 6910 BLAKE2B bde0ec1f776c109cd0c21cf4ce87b3f363c50b0eeebe004ff0060713204391f88fdae3a2a801dd6c4530f3eaf0ee74bd51ecb31ef78c34ced7a26f2a6c80de4f SHA512 42e894acacc8e974f495d8c2ca088b89a71506996f10dbfac431e6bd48af2338b2e8b7eee4c5a40098b04086c47e63f2f80f228ed39a0db4c197a47081c69f4a
+DIST test_rosbag-1.15.11-renamed_gen1.bag 4825 BLAKE2B 37b156027af0b490e00611eb31cd407cf576dd2be1abe77f3a2ca01e04e19f0a498163673928bd82fc660e38c7f9b9f7745f0b5bc2c3b5254e3d41f575561510 SHA512 99c6b187a45ac4d56544b163a876107be744d12515ff4baa6195857796d81c3b7fa0f75369c945a2bdf2954429129f5802a8a8ac6ac3a69ac1bd6b7feeb05173
+DIST test_rosbag-1.15.11-renamed_gen2.bag 4825 BLAKE2B 8a1ee3a3e421f0c2b298fcc9a4260dd76cc211c05e5d944f76f3f7d1feb461b439a5a6dc7dc545295237756510383042ab86e590e879ad35b6cdb8131d054ceb SHA512 c64b77c215c08c443d674bb12e9ac50a5fb234442c14cdea77e2936eabfe8c369947902ff6c9a211d8c3b9aa93f5677dadf8bb3b8145fc3a4b80f6c4f235e6f8
+DIST test_rosbag-1.15.11-renamed_gen3.bag 4835 BLAKE2B 8884b8fa15c3698a1d1fb19147fb2023cbd2946441ad9d4df2ef5ded3c455b2bce5a5cf6618f6e47729dc495b20b8f55a1750c4763ab4fb65c25d2a1f01de011 SHA512 67142debaecf05b76a42cf198572a9ff4bddf4c4da0b798e467f02ed5aa8ff2b6fabc248fa5caa33f346560edac1b3f38eb72ebae75b0224f6b281e5c21211a3
+DIST test_rosbag-1.15.11-renamed_gen4.bag 4833 BLAKE2B 72010f49332c337f998c4dd54a3399773e893f4f41ce01f7b130861993684641ff575c65e8bfcf1127a8dd590c0152ffcce08dfcd124e7a43c9ae8443983438e SHA512 2adfd75e05469793eb95ab68ca8403cd78f3a836157b0b1abcf21f11f16633b0e9c840f800ee5d51376fe91a31710d5674deb2c1c6e1a262517ab173550253cc
+DIST test_rosbag-1.15.11-subunmigrated_gen1.bag 5200 BLAKE2B 6786d316f28f7038b961fce5d4094b6948eb1f292dc63c04efdc9459c012acefcc7f962452a11ae53e8de4096c758833d7374ccbfc1a16b626e6c21af92b7979 SHA512 318d921f505ee97ab9ceba536ee48c4d5d5d8aa7d2619864b325d8083582daff43cf9bb61ff5ec3814e815cc334190b11687734e21141fbade9611a98244783b
+DIST test_rosbag-1.15.11-test_future_version_2.1.bag 6051 BLAKE2B 5368be834eaaf7d48519560295406a92ecc6573f7cbcbd5a29c9f05c12322198b1da8209b0316b5d694cdfbde8a9ba26be3a6f529154594e148743f7b618de45 SHA512 9a9870b28d5e0f12ed98fd1df6be21fa37e5db9f9423eb39cbbc7e8f042078210f7ccc8f534a02a5edc51fb61817ddeec705a8687917742648c1fdb70adf88db
+DIST test_rosbag-1.15.11-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd2723ff7a38ea6b99e272304ff8be83641d31d3c4bc3bbddf835923da447d274d27253d0cf162ff065e6f952799c204a6d3b8a429bc SHA512 8c2b6973e549d1b5c2e1fe5f6873c40b7877fa87e7864d39e86646083baf481ecb3d9c1fc4ca5d44332b3b4b0f41856dd5dd2c71ce9f2281fdc61c9846bcd5b8
+DIST test_rosbag-1.15.11-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
+DIST test_rosbag-1.15.11-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
 DIST test_rosbag-1.15.8-chatter_50hz.bag 28923 BLAKE2B 2a2304b98d33b902fa3b8fc4d2a0fa3da9af600ab9f66ebf74ecb2214160346d10a0ba58d2b8dfb7039dcd7ca05e58bf7b253899238dabab1c29264970b124b7 SHA512 7493e773d678aed10ca274f8a253a412846c90fa238ac7407b04f39355b94285b40b177ae45a0a5b5ae1c2fe2d74284fba1c082550f21dd30cf5e5891ef402e1
 DIST test_rosbag-1.15.8-constants_gen1.bag 4783 BLAKE2B fec06b1016d0a6e616893f050c22072ef01cc4bc944f3778cb45613d699e404b8721b35f9563f22fa87e473f9f439965ba804cc6478c59dbeab95309375046c7 SHA512 724a420e99946a5fba1b092363cb11af11a50e85c4531b57fe64b207ed1e4022e35a870014873919a7bfe3680ae0b5b4275777f3305b8c5d1fdd7316e7d67e7b
 DIST test_rosbag-1.15.8-constants_gen2.bag 4783 BLAKE2B 6db44a7ddc61307f49bb28e276b8a834044b43d79d37ceba0aef21c8dea8a6d3ee32cc156f8bc429f074752dfc5a249b789936a6d8bf5e11397c2ee4f0e7d925 SHA512 a0df68425bf268da7d622ea43fb755dd7161bf3443c5c2499862c8932ce5e86e4edc6746a9f4a6bc4b4bb9c070a2b3af26d26755e18e796600184f280579aedc
@@ -142,6 +178,7 @@ DIST test_rosbag-9999-test_indexed_1.2.bag 142311 BLAKE2B 51e4f41334a4191a02e6cd
 DIST test_rosbag-9999-test_rosbag_latched_pub.bag 4816 BLAKE2B 2a0a90eb46665486ac7a31249d7bc9c3c4f125c934a09e3fb0130bf43b10035552f9de0f0fd8280cec4cb1eb71fc7dc624ba1152724e602a2483a2df63869c3f SHA512 e1655185e8ea6a02aaccce4e819eb6d6aec48032f4f55e17d7c8649aa0d0b56eded659a97e2f83c7d04e221beb8a330bce093300d422c63f3b330f5b2b8bb8ca
 DIST test_rosbag-9999-unmigrated_gen1.bag 4828 BLAKE2B 0fc0e446f8c31fef4b21a669b15a86340d0dcff2406a85f88ccdc84e6f3ff4a71252151d191c30c9879d2ce3031faf9101aaa22834cdd733491a2f92d53a7a04 SHA512 333dbf41976ae732e33f394883965d9d07bfe35d8f3c5be1bd129ff4ded31f8c8201b9fdd8bee7ecaf7f04f49d0ee7c7d2be1ec4c8322d0b0b9cc0a236fe8342
 EBUILD test_rosbag-1.15.10-r1.ebuild 2439 BLAKE2B 653d07ff7c4f18d6b0e8544b66d83e51dc6e96857a8424fea088c1bea757a1f0ecfc85a93b58b6937b9e3c6c6a58208bfaf957d4bdcde3e60a589267ff61849c SHA512 81cb0d3c642622af052e82db014b7614f77ca5c536648588ae797c9463be3218f917907417a8fba2761ed9db2fcd522312ab4aed982b2fd13d931c46d844995c
+EBUILD test_rosbag-1.15.11.ebuild 2439 BLAKE2B 653d07ff7c4f18d6b0e8544b66d83e51dc6e96857a8424fea088c1bea757a1f0ecfc85a93b58b6937b9e3c6c6a58208bfaf957d4bdcde3e60a589267ff61849c SHA512 81cb0d3c642622af052e82db014b7614f77ca5c536648588ae797c9463be3218f917907417a8fba2761ed9db2fcd522312ab4aed982b2fd13d931c46d844995c
 EBUILD test_rosbag-1.15.8-r1.ebuild 2439 BLAKE2B 653d07ff7c4f18d6b0e8544b66d83e51dc6e96857a8424fea088c1bea757a1f0ecfc85a93b58b6937b9e3c6c6a58208bfaf957d4bdcde3e60a589267ff61849c SHA512 81cb0d3c642622af052e82db014b7614f77ca5c536648588ae797c9463be3218f917907417a8fba2761ed9db2fcd522312ab4aed982b2fd13d931c46d844995c
 EBUILD test_rosbag-1.15.9-r1.ebuild 2439 BLAKE2B 653d07ff7c4f18d6b0e8544b66d83e51dc6e96857a8424fea088c1bea757a1f0ecfc85a93b58b6937b9e3c6c6a58208bfaf957d4bdcde3e60a589267ff61849c SHA512 81cb0d3c642622af052e82db014b7614f77ca5c536648588ae797c9463be3218f917907417a8fba2761ed9db2fcd522312ab4aed982b2fd13d931c46d844995c
 EBUILD test_rosbag-9999.ebuild 2439 BLAKE2B 653d07ff7c4f18d6b0e8544b66d83e51dc6e96857a8424fea088c1bea757a1f0ecfc85a93b58b6937b9e3c6c6a58208bfaf957d4bdcde3e60a589267ff61849c SHA512 81cb0d3c642622af052e82db014b7614f77ca5c536648588ae797c9463be3218f917907417a8fba2761ed9db2fcd522312ab4aed982b2fd13d931c46d844995c
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.11.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.11.ebuild
new file mode 100644
index 000000000000..ac4873bb7e45
--- /dev/null
+++ b/dev-ros/test_rosbag/test_rosbag-1.15.11.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+TEST_DATA="constants_gen1.bag
+constants_gen2.bag
+converged_gen1.bag
+converged_gen2.bag
+converged_gen3.bag
+converged_gen4.bag
+convergent_gen1.bag
+convergent_gen2.bag
+migrated_addsub_gen1.bag
+migrated_explicit_gen1.bag
+migrated_explicit_gen2.bag
+migrated_explicit_gen3.bag
+migrated_explicit_gen4.bag
+migrated_implicit_gen1.bag
+migrated_implicit_gen2.bag
+migrated_implicit_gen3.bag
+migrated_implicit_gen4.bag
+migrated_mixed_gen1.bag
+migrated_mixed_gen2.bag
+migrated_mixed_gen3.bag
+migrated_mixed_gen4.bag
+partially_migrated_gen1.bag
+partially_migrated_gen2.bag
+partially_migrated_gen3.bag
+partially_migrated_gen4.bag
+renamed_gen1.bag
+renamed_gen2.bag
+renamed_gen3.bag
+renamed_gen4.bag
+subunmigrated_gen1.bag
+unmigrated_gen1.bag
+"
+ROSBAG_DATA="
+test_indexed_1.2.bag
+chatter_50hz.bag
+test_future_version_2.1.bag
+test_rosbag_latched_pub.bag
+"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+for i in ${TEST_DATA}; do
+	SRC_URI="${SRC_URI}
+		http://download.ros.org/data/test_rosbag/${i} -> ${P}-${i}"
+done
+for i in ${ROSBAG_DATA}; do
+	SRC_URI="${SRC_URI}
+		http://download.ros.org/data/rosbag/${i} -> ${P}-${i}"
+done
+
+RDEPEND="
+	dev-ros/message_generation
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/topic_tools[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/boost[threads(+)]
+		app-arch/bzip2
+		dev-ros/rosout
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)
+"
+
+src_prepare() {
+	ros-catkin_src_prepare
+	for i in ${TEST_DATA} ${ROSBAG_DATA}; do
+		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+	done
+	sed -e "s#http://download.ros.org/data/test_rosbag/#file://${S}/#g" \
+		-i bag_migration_tests/CMakeLists.txt \
+		-i CMakeLists.txt || die
+	sed -e "s#http://download.ros.org/data/rosbag/#file://${S}/#g" \
+		-i bag_migration_tests/CMakeLists.txt \
+		-i CMakeLists.txt || die
+}
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rosbag_storage/Manifest b/dev-ros/test_rosbag_storage/Manifest
index 12cb39283fc5..7acab8f0ab7c 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_rosbag_storage-1.15.10.ebuild 465 BLAKE2B 34c4c6a5b4dd5994296e0de0caca6e00b04fa44292d6e6c3b4052fa96536f1b02b4a30d5385b0cc7745b64cf3cc38a0da6544ba486b704dde9e18fbe6f2d8d23 SHA512 fec456fe44002bb25f5c0b6377d54e2512a71eed69d7cc1805af28f7e930e067281b718a9fba6769a65fb5f4058953b9b2c8e55cd57d79d1d8528b4d1ba26b63
+EBUILD test_rosbag_storage-1.15.11.ebuild 465 BLAKE2B 34c4c6a5b4dd5994296e0de0caca6e00b04fa44292d6e6c3b4052fa96536f1b02b4a30d5385b0cc7745b64cf3cc38a0da6544ba486b704dde9e18fbe6f2d8d23 SHA512 fec456fe44002bb25f5c0b6377d54e2512a71eed69d7cc1805af28f7e930e067281b718a9fba6769a65fb5f4058953b9b2c8e55cd57d79d1d8528b4d1ba26b63
 EBUILD test_rosbag_storage-1.15.8.ebuild 449 BLAKE2B 211dd15ae3eb1f7aac8829f7e43c60a87f2c0a9fb16deca301ebee0450171d551606cc69264eb0cf7e6ad8453a3d13815b5b29873efb600c3bea51b6eb7f8fd6 SHA512 6e599f7da72c39133a6017fd21c76833a9dde42876839133eefc641362e8c03a18f47c2e3c3c0a7b48cc49f313891fdd6f04fe69c8a11e4642efd8be3fc6805b
 EBUILD test_rosbag_storage-1.15.9.ebuild 465 BLAKE2B 9f68320ee0d3b7e76bc344ca2ee54007efbbc9b7083aac353ce3cf94e74ac10575c79f7f2d41ae8ccdf93e03597e387151c6bdd7487c483652ed2029241ca26c SHA512 be77680f6db9f03bf414540eab944ac5598860b56eb4779e871ad917d9f7c135a2912daf6b2f27318830f1c508c4a08c53da5bf0c42d3562d7afedd2d0354e6b
 EBUILD test_rosbag_storage-9999.ebuild 465 BLAKE2B 9f68320ee0d3b7e76bc344ca2ee54007efbbc9b7083aac353ce3cf94e74ac10575c79f7f2d41ae8ccdf93e03597e387151c6bdd7487c483652ed2029241ca26c SHA512 be77680f6db9f03bf414540eab944ac5598860b56eb4779e871ad917d9f7c135a2912daf6b2f27318830f1c508c4a08c53da5bf0c42d3562d7afedd2d0354e6b
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.11.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.11.ebuild
new file mode 100644
index 000000000000..56f714211def
--- /dev/null
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag_storage"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rosbag_storage
+	dev-ros/rosbag
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_roscpp/Manifest b/dev-ros/test_roscpp/Manifest
index f97712762545..8a333988d332 100644
--- a/dev-ros/test_roscpp/Manifest
+++ b/dev-ros/test_roscpp/Manifest
@@ -1,9 +1,11 @@
 AUX tests.patch 512 BLAKE2B 1744807e87cdf18c3c2d74e971828a3f34986f2aff6c17e663e464a7ad522abdbaf96f20771c0f699ef24a5afd572a4a6431a7f21b851e95408e1c7c57032694 SHA512 2f923f01f7b5c869ff1279e6cb1d82f0699388c16caa615b84dd6b3f914355a79ffddb55491bea227980404ff85b3663f51c84e242d5540e3c88f10d912cdca7
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_roscpp-1.15.10-r1.ebuild 907 BLAKE2B 635d95284f78606deb6325567446894e49fe976b2f5df6cbfa35302bd1dfef3da7ccf314f4f56f56709b6d5c88dfd88a84ed48fe459cc00debfe16ce0edcfb67 SHA512 2c8684327c4a5c5406f2d46ae3fb25de89fc0ba8a8d29393327533965f738c4bef49feaa8573f1f98e1a825fa6ec90d43ed02a04a376ce623ee8c5f086a7332f
+EBUILD test_roscpp-1.15.11.ebuild 907 BLAKE2B 635d95284f78606deb6325567446894e49fe976b2f5df6cbfa35302bd1dfef3da7ccf314f4f56f56709b6d5c88dfd88a84ed48fe459cc00debfe16ce0edcfb67 SHA512 2c8684327c4a5c5406f2d46ae3fb25de89fc0ba8a8d29393327533965f738c4bef49feaa8573f1f98e1a825fa6ec90d43ed02a04a376ce623ee8c5f086a7332f
 EBUILD test_roscpp-1.15.7-r1.ebuild 672 BLAKE2B d667af1a1b0809ac52691ff4defb6468497dd523927c9938a18f5daa223abf082bf062c7a9b80859a3175ff9f6cd94132ae6ec30f362c864285fbcb9900bd5b1 SHA512 73b3d9b3d53934885fa4fc3c3516a5782b3490f9b14907a7c1ea581dbc89a5b68d1f201c054cbec5b090d2ea0c5c6be72b97c9766b9da317c35d4ef2d1238bda
 EBUILD test_roscpp-1.15.8-r1.ebuild 907 BLAKE2B 635d95284f78606deb6325567446894e49fe976b2f5df6cbfa35302bd1dfef3da7ccf314f4f56f56709b6d5c88dfd88a84ed48fe459cc00debfe16ce0edcfb67 SHA512 2c8684327c4a5c5406f2d46ae3fb25de89fc0ba8a8d29393327533965f738c4bef49feaa8573f1f98e1a825fa6ec90d43ed02a04a376ce623ee8c5f086a7332f
 EBUILD test_roscpp-1.15.9-r1.ebuild 907 BLAKE2B 635d95284f78606deb6325567446894e49fe976b2f5df6cbfa35302bd1dfef3da7ccf314f4f56f56709b6d5c88dfd88a84ed48fe459cc00debfe16ce0edcfb67 SHA512 2c8684327c4a5c5406f2d46ae3fb25de89fc0ba8a8d29393327533965f738c4bef49feaa8573f1f98e1a825fa6ec90d43ed02a04a376ce623ee8c5f086a7332f
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.11.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.11.ebuild
new file mode 100644
index 000000000000..38c3002a2918
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.15.11.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roscpp"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=[threads(+)]
+	test? (
+		dev-cpp/gtest
+	)
+"
+REQUIRED_USE="test? ( ros_messages_cxx )"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	# Sometimes high number of tests running in parallel make them fail
+	# https://bugs.gentoo.org/738620
+	ros-catkin_src_test -j 1
+}
diff --git a/dev-ros/test_rosgraph/Manifest b/dev-ros/test_rosgraph/Manifest
index 7efbd10baf12..d7b8fe497590 100644
--- a/dev-ros/test_rosgraph/Manifest
+++ b/dev-ros/test_rosgraph/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_rosgraph-1.15.10.ebuild 510 BLAKE2B 382d62773752ff15bc623162e895539469b6efd98db83e6dd5ea255bc2417cf850c72cc47cb45e2c9078de708f9b1c22ac9a881fdd6a8ab243e7502c707e3199 SHA512 770669c3faf6acead18da9b7e445a62242b814322d6b69a161839c42e7018467162b6f8ce00bc89122a26935c1bdb1ad9eb0224f2e9b1b8008740bec62f3b8a7
+EBUILD test_rosgraph-1.15.11.ebuild 510 BLAKE2B 382d62773752ff15bc623162e895539469b6efd98db83e6dd5ea255bc2417cf850c72cc47cb45e2c9078de708f9b1c22ac9a881fdd6a8ab243e7502c707e3199 SHA512 770669c3faf6acead18da9b7e445a62242b814322d6b69a161839c42e7018467162b6f8ce00bc89122a26935c1bdb1ad9eb0224f2e9b1b8008740bec62f3b8a7
 EBUILD test_rosgraph-1.15.7.ebuild 421 BLAKE2B 511420303458e310ce9aa7247d12fec089f2caf0e73abea4145c7a530c819fe62042cbaf8bcc2f2c13d51fd8b7099234e725e79efd630db2adc01675ac636951 SHA512 b43c9865b12656ec3dbcbc14b29cf258fa7f4093c8a528f6dc68ddbbeeb8fc72579f9d37ef3703e24d27c51dff6a5dde1855837eac1173734ca2cc457b2c1b08
 EBUILD test_rosgraph-1.15.8.ebuild 510 BLAKE2B 50a7d2d46a51ff814ed2723360ee1a20b9b5c62e0a8bff0fd5e4cfb05f6b32669ce835c570401624e3c2b56339e264250d9b52a87b3e4bc605cba5efeb3d48f5 SHA512 01bc68bbe8446b2caa942850e2f7c323e259c04304e87267addac7da987f152382451037167f6fe6c2878437d6b7d0f7658b3915eea5c9cbdf5b4c13e67f580b
 EBUILD test_rosgraph-1.15.9.ebuild 510 BLAKE2B 50a7d2d46a51ff814ed2723360ee1a20b9b5c62e0a8bff0fd5e4cfb05f6b32669ce835c570401624e3c2b56339e264250d9b52a87b3e4bc605cba5efeb3d48f5 SHA512 01bc68bbe8446b2caa942850e2f7c323e259c04304e87267addac7da987f152382451037167f6fe6c2878437d6b7d0f7658b3915eea5c9cbdf5b4c13e67f580b
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.11.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.11.ebuild
new file mode 100644
index 000000000000..63863b4ad56b
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.15.11.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosgraph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}] )
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_roslaunch/Manifest b/dev-ros/test_roslaunch/Manifest
index 3c2587b35252..96af9ff82079 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_roslaunch-1.15.10.ebuild 581 BLAKE2B 52ab99c09f873d9e147832a2a64467cba685509112af203c220189ae63f3a049c42e32f9d148c3b67d33edb8955ea81e1995c8ec5a534056a8ebfe1db63e0ea9 SHA512 7b5aadcb55285e7377899cb70f41941d1541d26d9ab221c54553deb017831147823bda1afa71ea90dfff956937d903c7de2d524a40a8474e3e024cdc1430c3e5
+EBUILD test_roslaunch-1.15.11.ebuild 581 BLAKE2B 52ab99c09f873d9e147832a2a64467cba685509112af203c220189ae63f3a049c42e32f9d148c3b67d33edb8955ea81e1995c8ec5a534056a8ebfe1db63e0ea9 SHA512 7b5aadcb55285e7377899cb70f41941d1541d26d9ab221c54553deb017831147823bda1afa71ea90dfff956937d903c7de2d524a40a8474e3e024cdc1430c3e5
 EBUILD test_roslaunch-1.15.8.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
 EBUILD test_roslaunch-1.15.9.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
 EBUILD test_roslaunch-9999.ebuild 581 BLAKE2B f8a48b9d29f48846193dfa403c0f5578fa90dc5e223f150a51bdcd6d3897585ab4b71ed212d40a4efbdb952ae1b120c9d7c2a7d5c21633fbdc383caf8bde03eb SHA512 7380b34283cfe2d4b920085a021de1de01bac3e298978b805b604e97c6260d416097230d8f77f5fbb56e53001f8df3f91e968e6b9c86aada1791b8cadcddaa32
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.11.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.11.ebuild
new file mode 100644
index 000000000000..b506232d6f4b
--- /dev/null
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.15.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslaunch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_roslib_comm/Manifest b/dev-ros/test_roslib_comm/Manifest
index 20473b574bd7..b403b4e5d4e8 100644
--- a/dev-ros/test_roslib_comm/Manifest
+++ b/dev-ros/test_roslib_comm/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_roslib_comm-1.15.10.ebuild 706 BLAKE2B d829ac240a72ceb0b2f471cafcef8df98caafb964f353ea0d4bf5faab1eee38b892e3cb738026ce8051ec6057914f4b5a55d93608dca96607f8ebd2c829dd36c SHA512 7135a1d03ad39137581c79d0b473014aa8d27c8f0ac7a9271103fd753ca836d5123fa8b4314fbcc958f975699f82f6e36733de0cd8f7a02692c8d7e340afdacd
+EBUILD test_roslib_comm-1.15.11.ebuild 706 BLAKE2B d829ac240a72ceb0b2f471cafcef8df98caafb964f353ea0d4bf5faab1eee38b892e3cb738026ce8051ec6057914f4b5a55d93608dca96607f8ebd2c829dd36c SHA512 7135a1d03ad39137581c79d0b473014aa8d27c8f0ac7a9271103fd753ca836d5123fa8b4314fbcc958f975699f82f6e36733de0cd8f7a02692c8d7e340afdacd
 EBUILD test_roslib_comm-1.15.8.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
 EBUILD test_roslib_comm-1.15.9.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
 EBUILD test_roslib_comm-9999.ebuild 706 BLAKE2B a432620b8fbed9bad43dbfab3d0b6b438d2a2f1021099f54e9e63643629d0efca42dd4d187d8b675decf58ff89ae2d724cf5669ab0e6544856ac155fe14c9863 SHA512 05b7a3b259f91173395a5eb964b7dcc881d6f1ae2eb0fd44a7e4de1320bd29641454ed8824c94e5327b75abed7757e2b3fa0826d6c08051c5da394e88295d62a
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.11.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.11.ebuild
new file mode 100644
index 000000000000..e4dc35ffaea9
--- /dev/null
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslib"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/test_rosmaster
+		dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest
index 52d16a32b7af..d4a604494e92 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_rosmaster-1.15.10.ebuild 783 BLAKE2B 004586236178305c6652839892f87a786efff23a57b6891f42dd5b8fa136a732085dda3860c72e20e300ee09cd9458606f13651eb0c16fcc48b39d4fb5d228ff SHA512 c456107a41e4ee63a7c6d77e71efca13ceeb2c8f793e72c10acaad8d1953405c41363983a6969ca0d48cc7287c4e606402fd85da77635bb5bac816e36fcbcfd1
+EBUILD test_rosmaster-1.15.11.ebuild 783 BLAKE2B 004586236178305c6652839892f87a786efff23a57b6891f42dd5b8fa136a732085dda3860c72e20e300ee09cd9458606f13651eb0c16fcc48b39d4fb5d228ff SHA512 c456107a41e4ee63a7c6d77e71efca13ceeb2c8f793e72c10acaad8d1953405c41363983a6969ca0d48cc7287c4e606402fd85da77635bb5bac816e36fcbcfd1
 EBUILD test_rosmaster-1.15.8.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
 EBUILD test_rosmaster-1.15.9.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
 EBUILD test_rosmaster-9999.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.11.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.11.ebuild
new file mode 100644
index 000000000000..2e62994a05c3
--- /dev/null
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.15.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosmaster"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] )
+"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
+
+src_install() {
+	ros-catkin_src_install
+	dodir /usr/share/${PN}
+	cp -a test "${ED}//usr/share/${PN}/" || die
+}
diff --git a/dev-ros/test_rosparam/Manifest b/dev-ros/test_rosparam/Manifest
index bcbbcfc46532..b7e6445c1590 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -1,8 +1,10 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_rosparam-1.15.10.ebuild 600 BLAKE2B b51b6d1981df545993b81a00d805e66a65e5d04b2454270192d95e2a7546141fb614b7983ec653baf96ba4f989c2e51f0761e66a80fa2c195393e9c1bcdbdf97 SHA512 4b560c3bd4e5dca6c77c6197e9533bdeaf780832104ec64fb5171754abd09491ec4b102fd7578fc704b4918317ac533e77d081d00f040514c5cf6ebc796a60ae
+EBUILD test_rosparam-1.15.11.ebuild 600 BLAKE2B b51b6d1981df545993b81a00d805e66a65e5d04b2454270192d95e2a7546141fb614b7983ec653baf96ba4f989c2e51f0761e66a80fa2c195393e9c1bcdbdf97 SHA512 4b560c3bd4e5dca6c77c6197e9533bdeaf780832104ec64fb5171754abd09491ec4b102fd7578fc704b4918317ac533e77d081d00f040514c5cf6ebc796a60ae
 EBUILD test_rosparam-1.15.7.ebuild 511 BLAKE2B a324a281705bc80360f1c447f7191aae44dbef988217d13d3addcee32bd91b705aa947a53c778f9cf6e3e442cba7c6e64f8cf46100727be29f99f76bb8c0a8cf SHA512 f1d00655518e6aea60aef0100c357b6526d38354ce03b98c7baaf2d76c1d4cbb6a6c1f11877c1847bf6ecd61393f577c9330814b3876832736ee12f5db1325d5
 EBUILD test_rosparam-1.15.8.ebuild 600 BLAKE2B 4d0797df48efa718a5111e2d1725155b7c177688c7f3384b07594786422c56ba6b1ffecf31bf1841cdb5db38d272ae420f35094a82cf36b7d04e0257b0d220fa SHA512 910aad8bc034550401cf40a46562b197be5294c6e9374dc726fa7f49a298f7ee948671a6523afeec64f443490e48f8c58aec43602fb18ccbda558e67af2a7380
 EBUILD test_rosparam-1.15.9.ebuild 600 BLAKE2B 4d0797df48efa718a5111e2d1725155b7c177688c7f3384b07594786422c56ba6b1ffecf31bf1841cdb5db38d272ae420f35094a82cf36b7d04e0257b0d220fa SHA512 910aad8bc034550401cf40a46562b197be5294c6e9374dc726fa7f49a298f7ee948671a6523afeec64f443490e48f8c58aec43602fb18ccbda558e67af2a7380
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.11.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.11.ebuild
new file mode 100644
index 000000000000..108cabfb7564
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.15.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosparam"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest
index 95b9641e7ea8..7c282ef5a672 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_rospy-1.15.10.ebuild 1013 BLAKE2B e524efc6aee0a4d784dacd1f80857f0c46f2a44976c52df8a3f949a9dd79b2ee6cea38fdaca917552985c37fbce7fa7a956614c04f7b3f41a4d8737bd4dcc404 SHA512 2d6f0e11e8f25209c4e25c3adf43e5e145b4ed81e4ce61140c72733ac40f05646daed99f8c5b4b4e69c942798408bc832ba94c5d4c18049a3263d86e00a8b559
+EBUILD test_rospy-1.15.11.ebuild 1013 BLAKE2B e524efc6aee0a4d784dacd1f80857f0c46f2a44976c52df8a3f949a9dd79b2ee6cea38fdaca917552985c37fbce7fa7a956614c04f7b3f41a4d8737bd4dcc404 SHA512 2d6f0e11e8f25209c4e25c3adf43e5e145b4ed81e4ce61140c72733ac40f05646daed99f8c5b4b4e69c942798408bc832ba94c5d4c18049a3263d86e00a8b559
 EBUILD test_rospy-1.15.8.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
 EBUILD test_rospy-1.15.9.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
 EBUILD test_rospy-9999.ebuild 1013 BLAKE2B 37058ad100f52ac127d95444a415b1ffe56408048842e9628a9f0ab31fb82e8911399d169234ee4659d786d6575d80a7ad934a687cacb31f8832ee4c376d43e3 SHA512 a7c6fda6661c18be0d595b5c50c39b6f1428987ece563cb07e8a2c6e1f37ea62472108d0bcdcffd4d0f2c7b6fce763ebcc756df684c1041c37ae5e18452148b2
diff --git a/dev-ros/test_rospy/test_rospy-1.15.11.ebuild b/dev-ros/test_rospy/test_rospy-1.15.11.ebuild
new file mode 100644
index 000000000000..af5f3520b53e
--- /dev/null
+++ b/dev-ros/test_rospy/test_rospy-1.15.11.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+		dev-ros/rosbuild
+		dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest
index 3285e4e89dda..c125384491eb 100644
--- a/dev-ros/test_rosservice/Manifest
+++ b/dev-ros/test_rosservice/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD test_rosservice-1.15.10.ebuild 747 BLAKE2B ee2ed54c8d72484922df3e9d7296d7985eb33ad8c56c5c55ef5a45ffd1267313c762f820d8dc69250727f9a6664c003b2ca0674bca74ff77380d1eb1fcbd3d01 SHA512 e67ba7aae73f2d0794d15fb3a75ffba10f0e8099bda9d457fc08b7365ab3c1931afadb2636d6f8998fa1e81ae18265cfe0a8c18b6663a59b85e902e856ca3ad7
+EBUILD test_rosservice-1.15.11.ebuild 747 BLAKE2B ee2ed54c8d72484922df3e9d7296d7985eb33ad8c56c5c55ef5a45ffd1267313c762f820d8dc69250727f9a6664c003b2ca0674bca74ff77380d1eb1fcbd3d01 SHA512 e67ba7aae73f2d0794d15fb3a75ffba10f0e8099bda9d457fc08b7365ab3c1931afadb2636d6f8998fa1e81ae18265cfe0a8c18b6663a59b85e902e856ca3ad7
 EBUILD test_rosservice-1.15.8.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
 EBUILD test_rosservice-1.15.9.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
 EBUILD test_rosservice-9999.ebuild 747 BLAKE2B 40c198294cef61fd7b95b91984dc3ee881e7567d97e26862a1263acd65439e132106052dc72cc6b26b77e99f3c08816094daf981496154adb6afe83e7f19def6 SHA512 09fe74b32c6a922eb8822e47645f6c19268dff1338a24b471d0902fc8ba1ea002a6c3a6ff13afdf38d8b4dbb83a32ec8a414ff0485615c9362afc5ce8bb95bfd
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.11.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.11.ebuild
new file mode 100644
index 000000000000..b73420876103
--- /dev/null
+++ b/dev-ros/test_rosservice/test_rosservice-1.15.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/test_tf2/Manifest b/dev-ros/test_tf2/Manifest
index 405d078c7512..03fb1812372b 100644
--- a/dev-ros/test_tf2/Manifest
+++ b/dev-ros/test_tf2/Manifest
@@ -1,8 +1,4 @@
-DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
-DIST geometry2-0.7.3.tar.gz 175974 BLAKE2B a0edbeea6db30f07d5cf6ddd4d0a8a1ce0221c8b0ad01929aa6a73a7a49e2e5bd08dfd01cef6cd964ea93b6e8f5aa1dd6ec395e8e4bbafa1117eb3436cae9c10 SHA512 20d207218000905a17411ee9c662778b3022481e84b903ca616cdfc439b2af55c7182988dc843103edc471d564e988fa311be916d0810ec86228585500ed532e
 DIST geometry2-0.7.5.tar.gz 176126 BLAKE2B 56f2062ca86b3573e9df59df4c400fd5eee35c7e30abb1f0d94b1e117a224fcb1272eaf9de14dc257d8c8438a414fd8d121d314e560e6712ca4db0da190075d5 SHA512 b3413282d2ad0aae54b0093607eee106cdd7ed23f4e5fbb1728ed4f848ee081257b9217696301e9f7860369dc98679d8abff12213ff3a69b39b061f02f5da8c9
-EBUILD test_tf2-0.7.2-r1.ebuild 785 BLAKE2B b92918a03825820a52346023d23de27f05856976a5075cde41b1489984a55185b79241af1b2af838cf2817772d199f5331ac8b2ef71f55989e1d06c6ebb1b2c3 SHA512 f2012a7302f342209758e43d178e96aedf361bbbde55bc692135de14bbfbcc57157bc9a4d17235d8b0767daf6af5a25b944e393c837ab618b0015d0f55b35d16
-EBUILD test_tf2-0.7.3-r1.ebuild 785 BLAKE2B b92918a03825820a52346023d23de27f05856976a5075cde41b1489984a55185b79241af1b2af838cf2817772d199f5331ac8b2ef71f55989e1d06c6ebb1b2c3 SHA512 f2012a7302f342209758e43d178e96aedf361bbbde55bc692135de14bbfbcc57157bc9a4d17235d8b0767daf6af5a25b944e393c837ab618b0015d0f55b35d16
-EBUILD test_tf2-0.7.5-r1.ebuild 785 BLAKE2B b92918a03825820a52346023d23de27f05856976a5075cde41b1489984a55185b79241af1b2af838cf2817772d199f5331ac8b2ef71f55989e1d06c6ebb1b2c3 SHA512 f2012a7302f342209758e43d178e96aedf361bbbde55bc692135de14bbfbcc57157bc9a4d17235d8b0767daf6af5a25b944e393c837ab618b0015d0f55b35d16
-EBUILD test_tf2-9999.ebuild 785 BLAKE2B b92918a03825820a52346023d23de27f05856976a5075cde41b1489984a55185b79241af1b2af838cf2817772d199f5331ac8b2ef71f55989e1d06c6ebb1b2c3 SHA512 f2012a7302f342209758e43d178e96aedf361bbbde55bc692135de14bbfbcc57157bc9a4d17235d8b0767daf6af5a25b944e393c837ab618b0015d0f55b35d16
+EBUILD test_tf2-0.7.5-r1.ebuild 804 BLAKE2B c8c1c45ecdc87cc9f8e06fc48f91f84a7e913ec4a7c95b64e915503082b67d696e291e0bfb94d873132a236ebe8b7a2fa18ad304438a18d043b554a627b74f4a SHA512 076119e5f25702e1f57e7ecda23e762e5e313a9f17221f88f11f2a79b9717dde8327182352f11ba0515f1213789d8471354d6949f19a613b7bffdc39ac5d6e0d
+EBUILD test_tf2-9999.ebuild 804 BLAKE2B c8c1c45ecdc87cc9f8e06fc48f91f84a7e913ec4a7c95b64e915503082b67d696e291e0bfb94d873132a236ebe8b7a2fa18ad304438a18d043b554a627b74f4a SHA512 076119e5f25702e1f57e7ecda23e762e5e313a9f17221f88f11f2a79b9717dde8327182352f11ba0515f1213789d8471354d6949f19a613b7bffdc39ac5d6e0d
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/test_tf2/test_tf2-0.7.2-r1.ebuild b/dev-ros/test_tf2/test_tf2-0.7.2-r1.ebuild
deleted file mode 100644
index 6c0d24e8c5f9..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_bullet
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_msgs
-	dev-ros/rosbash
-	sci-libs/orocos_kdl
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=[threads(+)]
-	dev-cpp/gtest
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.7.3-r1.ebuild b/dev-ros/test_tf2/test_tf2-0.7.3-r1.ebuild
deleted file mode 100644
index 6c0d24e8c5f9..000000000000
--- a/dev-ros/test_tf2/test_tf2-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="TF2 unit tests"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf
-	dev-ros/tf2
-	dev-ros/tf2_bullet
-	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/tf2_msgs
-	dev-ros/rosbash
-	sci-libs/orocos_kdl
-	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
-	dev-libs/boost:=[threads(+)]
-	dev-cpp/gtest
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/test_tf2/test_tf2-0.7.5-r1.ebuild b/dev-ros/test_tf2/test_tf2-0.7.5-r1.ebuild
index 6c0d24e8c5f9..24c879237de4 100644
--- a/dev-ros/test_tf2/test_tf2-0.7.5-r1.ebuild
+++ b/dev-ros/test_tf2/test_tf2-0.7.5-r1.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 	dev-ros/tf
 	dev-ros/tf2
 	dev-ros/tf2_bullet
+	dev-ros/tf2_eigen
 	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
diff --git a/dev-ros/test_tf2/test_tf2-9999.ebuild b/dev-ros/test_tf2/test_tf2-9999.ebuild
index 6c0d24e8c5f9..24c879237de4 100644
--- a/dev-ros/test_tf2/test_tf2-9999.ebuild
+++ b/dev-ros/test_tf2/test_tf2-9999.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 	dev-ros/tf
 	dev-ros/tf2
 	dev-ros/tf2_bullet
+	dev-ros/tf2_eigen
 	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf2_kdl[${PYTHON_SINGLE_USEDEP}]
diff --git a/dev-ros/tf/Manifest b/dev-ros/tf/Manifest
index 09ff5b3bc83c..529d423fa4fa 100644
--- a/dev-ros/tf/Manifest
+++ b/dev-ros/tf/Manifest
@@ -1,5 +1,5 @@
 AUX yaml.patch 559 BLAKE2B 228004c7cc268ebe011dfc8f83aeec9a32e98566c970b7e94b8fcd19879ad1974038fdee9b850ca7bebc770e96cf8b81a92ae9583188191de86e7d5a4100b835 SHA512 67f8aeee746fc3137310fc5eb127d8dc12be2c33b38b2237b6889f7837d2637125394ebe5d22c6dfee28787fecf0cf48be3168c09a50c435dde7040eed39dfc3
 DIST geometry-1.13.2.tar.gz 188225 BLAKE2B b08e78b298c94c38baa5d25a878be703d7d3a310277b66690b9fe4da1d0cd3f9083cf3bf6dc1d59149599b6fb0ec10feaf668206da245ed7e0cb9cf1878b620c SHA512 504de0e7ebf1dd73e918ab4fa39967cc9e39a53d487072430106b391d669ddfc7e530b66b38f4f73d1787e4a73acdad8e707c6757afe2e235157d4aa19f28af2
-EBUILD tf-1.13.2-r2.ebuild 1116 BLAKE2B b8fccd23423a0fa60b14756c1bfed2f5fe135b96d1a6a391f3c0b7c174bb0c8bc6792e35507c0244a761f3458d377fab542d53cac8d9189c877ba78aeb3d350c SHA512 3b169604503c08c89c27c685e54abd3d628c1cd2b346e6ef7a11cdd09d1580dccfd3037a4b96f008e158386bf966e862bf551e66f96ad90e6210dde12575d82f
-EBUILD tf-9999.ebuild 1116 BLAKE2B b8fccd23423a0fa60b14756c1bfed2f5fe135b96d1a6a391f3c0b7c174bb0c8bc6792e35507c0244a761f3458d377fab542d53cac8d9189c877ba78aeb3d350c SHA512 3b169604503c08c89c27c685e54abd3d628c1cd2b346e6ef7a11cdd09d1580dccfd3037a4b96f008e158386bf966e862bf551e66f96ad90e6210dde12575d82f
+EBUILD tf-1.13.2-r3.ebuild 1178 BLAKE2B cf6928da6e8f5f50955df7d362cb6ad621776da87ce566c95be7b5f286e2f2bd1c400937e3052e3c63242e6bf47adc1dbec0e8586163426951f20ebfb25dc25c SHA512 6d8612891200e740a07dddcfcbab2ba06d0cf4bc3691a5676c4d5decde6e29c8d50c87c182d11daac8b5216a0820b091239b42ff3e9550994b9926909e3f4334
+EBUILD tf-9999.ebuild 1178 BLAKE2B cf6928da6e8f5f50955df7d362cb6ad621776da87ce566c95be7b5f286e2f2bd1c400937e3052e3c63242e6bf47adc1dbec0e8586163426951f20ebfb25dc25c SHA512 6d8612891200e740a07dddcfcbab2ba06d0cf4bc3691a5676c4d5decde6e29c8d50c87c182d11daac8b5216a0820b091239b42ff3e9550994b9926909e3f4334
 MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/tf/tf-1.13.2-r2.ebuild b/dev-ros/tf/tf-1.13.2-r2.ebuild
deleted file mode 100644
index 0a1e2df469df..000000000000
--- a/dev-ros/tf/tf-1.13.2-r2.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
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Maintains the relationship between frames in a tree structure over time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	dev-ros/angles
-	dev-ros/message_filters
-	dev-ros/rosconsole
-	dev-ros/rostime
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/tf/tf-1.13.2-r3.ebuild b/dev-ros/tf/tf-1.13.2-r3.ebuild
new file mode 100644
index 000000000000..1bca719cd3f7
--- /dev/null
+++ b/dev-ros/tf/tf-1.13.2-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Maintains the relationship between frames in a tree structure over time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads(+)]
+	dev-ros/angles
+	dev-ros/message_filters
+	dev-ros/rosconsole
+	dev-ros/rostime
+	dev-ros/roscpp
+	dev-ros/tf2_ros
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/tf/tf-9999.ebuild b/dev-ros/tf/tf-9999.ebuild
index 0a1e2df469df..1bca719cd3f7 100644
--- a/dev-ros/tf/tf-9999.ebuild
+++ b/dev-ros/tf/tf-9999.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index 2f5385bafe5d..e0ed222435d7 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -1,4 +1,6 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 EBUILD topic_tools-1.15.10-r1.ebuild 833 BLAKE2B de242b907f1063dec86baadb58aec99b1b1ece5027e253c24bb54207f172778bb5d2819392436fc68651a9715364c6bbe87dbbf9ae3e5122e7f60a15c4eafa64 SHA512 f44b083ee74d4dd855e0fa89c51bee534bb1c93508fb14189f2c1730ad638379c0ff0b0aa1fb508aea8e4d263eb10cb5e6310a043d55ec0b813f38fffd769e92
+EBUILD topic_tools-1.15.11.ebuild 833 BLAKE2B de242b907f1063dec86baadb58aec99b1b1ece5027e253c24bb54207f172778bb5d2819392436fc68651a9715364c6bbe87dbbf9ae3e5122e7f60a15c4eafa64 SHA512 f44b083ee74d4dd855e0fa89c51bee534bb1c93508fb14189f2c1730ad638379c0ff0b0aa1fb508aea8e4d263eb10cb5e6310a043d55ec0b813f38fffd769e92
 EBUILD topic_tools-9999.ebuild 833 BLAKE2B de242b907f1063dec86baadb58aec99b1b1ece5027e253c24bb54207f172778bb5d2819392436fc68651a9715364c6bbe87dbbf9ae3e5122e7f60a15c4eafa64 SHA512 f44b083ee74d4dd855e0fa89c51bee534bb1c93508fb14189f2c1730ad638379c0ff0b0aa1fb508aea8e4d263eb10cb5e6310a043d55ec0b813f38fffd769e92
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/topic_tools/topic_tools-1.15.11.ebuild b/dev-ros/topic_tools/topic_tools-1.15.11.ebuild
new file mode 100644
index 000000000000..56e95ed254bf
--- /dev/null
+++ b/dev-ros/topic_tools/topic_tools-1.15.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=tools/${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/transmission_interface/Manifest b/dev-ros/transmission_interface/Manifest
index bd96a1aae76c..d17dd4e91f13 100644
--- a/dev-ros/transmission_interface/Manifest
+++ b/dev-ros/transmission_interface/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
 DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD transmission_interface-0.19.1.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
 EBUILD transmission_interface-0.19.2.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
 EBUILD transmission_interface-0.19.3.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
 EBUILD transmission_interface-0.19.4.ebuild 693 BLAKE2B 7bc97259441054d58c554ad12d24e47d84e7a998b4d5a938ee444620c4034c1c607b0b1e6843aed82d76eb2ec701889ffc00babd0cd7101b4b2fefb1a3a35142 SHA512 c36a887ee7a82ac3b282d06e3a87ff0252e41fdecb8ed3ac134af45360bccf50c87a9b2aef379e6d7a5710babb56065398521b74cf497f26f2fc16597f3d8f9f
+EBUILD transmission_interface-0.19.5.ebuild 693 BLAKE2B 7bc97259441054d58c554ad12d24e47d84e7a998b4d5a938ee444620c4034c1c607b0b1e6843aed82d76eb2ec701889ffc00babd0cd7101b4b2fefb1a3a35142 SHA512 c36a887ee7a82ac3b282d06e3a87ff0252e41fdecb8ed3ac134af45360bccf50c87a9b2aef379e6d7a5710babb56065398521b74cf497f26f2fc16597f3d8f9f
 EBUILD transmission_interface-9999.ebuild 693 BLAKE2B 4ad32954a9822e3a44c676e602745356d7ce4c03b19cce04bcdf6cdac58d0bbc33d591ed4e8e1411d846b41802cb615819698bbf91cca51b4165548f490d085e SHA512 2ca6e1bfa6fd74625e91e52e647216565ec1999b42ea820179ff0ab0ca3b57b83486b56943d90cfeb495effd00a02f78cbc5c7c7690cf80e369c0e92096dfddd
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/transmission_interface/transmission_interface-0.19.5.ebuild b/dev-ros/transmission_interface/transmission_interface-0.19.5.ebuild
new file mode 100644
index 000000000000..92d38e504c33
--- /dev/null
+++ b/dev-ros/transmission_interface/transmission_interface-0.19.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transmission Interface"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hardware_interface
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-libs/console_bridge:=
+	dev-ros/resource_retriever
+	dev-ros/roscpp
+	dev-libs/tinyxml
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+	)
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/visp_auto_tracker/Manifest b/dev-ros/visp_auto_tracker/Manifest
index 14a419f9517e..0b87d9edd6c4 100644
--- a/dev-ros/visp_auto_tracker/Manifest
+++ b/dev-ros/visp_auto_tracker/Manifest
@@ -1,6 +1,4 @@
-AUX boost170.patch 497 BLAKE2B 3ff7f23fe562d9597bd379123721a24a6b949d38ceddce49c4dd0a12d4e6597704511c31fc133ce4d3bb8897c725c6ab207d9330482287ecb44830fb16765e65 SHA512 489454810cb6fa313ac24668c655e59e9a520c32548f9df3b7d0529f0e6a7fc83691a0f2b48d9b1f3f74fc77738e79e06fb0f32fce427c3aff3fa76886b71be7
-AUX ocv4.patch 980 BLAKE2B 9e2ab8f0bb49c3f18191ecba66853ac23de278069c0493b74db0d1f368959d91499a57a36cd8ccac85fd7c86ed0a828da4f857785c9ea9951ac23b54e9739aab SHA512 f9f5b2060e0a780dc4ef09a79685c0698c097b248cfa0bd651572f7446f3e382913a9040ec3209991fc5b641cb1c482597ad8cd84ab7f4d88d42c14e78bf11c2
-DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
-EBUILD visp_auto_tracker-0.11.1-r2.ebuild 912 BLAKE2B 232d7b2d964c93d85aaa5c5fca83aa2cd44153adc20197ab5f2f1960307cf4940290d1ba87463ac129982237eae84a81c1a5aadfe971c2091dcd56864be5ba3f SHA512 d374ed710dae20e546cfac6165c53bf3c8be86b8dc8a8eb0e30adecfaa48c764106936fdf1061e9f33858dad7c604b0174c5cfd5702577a951dd66e7f0405708
-EBUILD visp_auto_tracker-9999.ebuild 912 BLAKE2B 232d7b2d964c93d85aaa5c5fca83aa2cd44153adc20197ab5f2f1960307cf4940290d1ba87463ac129982237eae84a81c1a5aadfe971c2091dcd56864be5ba3f SHA512 d374ed710dae20e546cfac6165c53bf3c8be86b8dc8a8eb0e30adecfaa48c764106936fdf1061e9f33858dad7c604b0174c5cfd5702577a951dd66e7f0405708
+DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
+EBUILD visp_auto_tracker-0.12.1.ebuild 843 BLAKE2B 8c8e24c40f9f2864ded53828a0df224c9f29597fab03376dca06bba79499ff1d30b261fd605c8ceb7511d53e75ee43ec790775730ddb9673a169303afd4c4a8e SHA512 f3fcf0ff36688fae58d28c16262221f158011e0a9a172d2e49de3466d9b485b5aa01d161ec98ff005204a44f2bc3928a47655d9c3f87f9faf96852ecfd30ec14
+EBUILD visp_auto_tracker-9999.ebuild 843 BLAKE2B 8c8e24c40f9f2864ded53828a0df224c9f29597fab03376dca06bba79499ff1d30b261fd605c8ceb7511d53e75ee43ec790775730ddb9673a169303afd4c4a8e SHA512 f3fcf0ff36688fae58d28c16262221f158011e0a9a172d2e49de3466d9b485b5aa01d161ec98ff005204a44f2bc3928a47655d9c3f87f9faf96852ecfd30ec14
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_auto_tracker/files/boost170.patch b/dev-ros/visp_auto_tracker/files/boost170.patch
deleted file mode 100644
index 47f04d4989a3..000000000000
--- a/dev-ros/visp_auto_tracker/files/boost170.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: visp_auto_tracker/CMakeLists.txt
-===================================================================
---- visp_auto_tracker.orig/CMakeLists.txt
-+++ visp_auto_tracker/CMakeLists.txt
-@@ -36,7 +36,7 @@ find_package(catkin REQUIRED COMPONENTS
- find_package(VISP)
- 
- find_package(Boost REQUIRED
--  COMPONENTS filesystem system signals regex date_time program_options thread)
-+  COMPONENTS filesystem system regex date_time program_options thread)
- 
- include_directories(
-   ${Boost_INCLUDE_DIRS}
diff --git a/dev-ros/visp_auto_tracker/files/ocv4.patch b/dev-ros/visp_auto_tracker/files/ocv4.patch
deleted file mode 100644
index 79a6970af9f7..000000000000
--- a/dev-ros/visp_auto_tracker/files/ocv4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: visp_auto_tracker/flashcode_mbt/libauto_tracker/states.hpp
-===================================================================
---- visp_auto_tracker.orig/flashcode_mbt/libauto_tracker/states.hpp
-+++ visp_auto_tracker/flashcode_mbt/libauto_tracker/states.hpp
-@@ -1,6 +1,6 @@
- #ifndef __EVENTS_H__
- #define __EVENTS_H__
--#include "cv.h"
-+#include <opencv2/core/core_c.h>
- // back-end
- #include <boost/msm/back/state_machine.hpp>
- //front-end
-Index: visp_auto_tracker/flashcode_mbt/libauto_tracker/tracking.cpp
-===================================================================
---- visp_auto_tracker.orig/flashcode_mbt/libauto_tracker/tracking.cpp
-+++ visp_auto_tracker/flashcode_mbt/libauto_tracker/tracking.cpp
-@@ -1,6 +1,6 @@
- #include "ros/ros.h"
--#include "cv.h"
--#include "highgui.h"
-+#include <opencv2/core/core_c.h>
-+#include <opencv2/highgui/highgui_c.h>
- #include "tracking.h"
- #include <visp3/core/vpImageConvert.h>
- #include <visp3/core/vpPixelMeterConversion.h>
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r2.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r2.ebuild
deleted file mode 100644
index 8867c1fe5284..000000000000
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1-r2.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
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Online automated pattern-based object tracker relying on visual servoing"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-ros/visp_bridge
-	dev-ros/visp_tracker
-	sci-libs/ViSP:=[dmtx,zbar]
-	dev-libs/boost:=[threads(+)]
-	media-libs/opencv:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
-fi
-
-PATCHES=( "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.12.1.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.12.1.ebuild
new file mode 100644
index 000000000000..5932c11a16e9
--- /dev/null
+++ b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="noetic-"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Online automated pattern-based object tracker relying on visual servoing"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/message_filters
+	dev-ros/resource_retriever
+	dev-ros/roscpp
+	dev-ros/visp_bridge
+	dev-ros/visp_tracker
+	sci-libs/ViSP:=[dmtx,zbar]
+	dev-libs/boost:=[threads(+)]
+	media-libs/opencv:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
+fi
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild
index 8867c1fe5284..5932c11a16e9 100644
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild
+++ b/dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
+VER_PREFIX="noetic-"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -30,7 +30,5 @@ DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
-
-PATCHES=( "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/visp_bridge/Manifest b/dev-ros/visp_bridge/Manifest
index 09410af7059b..d8b94e663f67 100644
--- a/dev-ros/visp_bridge/Manifest
+++ b/dev-ros/visp_bridge/Manifest
@@ -1,5 +1,7 @@
 AUX gcc6.patch 362 BLAKE2B 07aa55e77c23987add38afbb9612a4ac17d4295a51deff3986c9fa4eacf2604815d2cb654169c03c2943c7e6e0d8041ab1a3f380656643f660f176abfa347e67 SHA512 b4fc5219f35ac7ce1a81cf7b82ce0aebaef61b6e20cf42e62a1811c996dd0a68fe92dc49642ff38454c5d1f5496dbe954ba4029c93791f8ddefe71118377a03f
 DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
+DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
 EBUILD visp_bridge-0.11.1.ebuild 762 BLAKE2B 5ef20780ecd532b788613af374bae30f4d80377b37b36d50a12ed4cbc95833319f86e98b6fcc0b8681bd7544a410576578bc709afe9615882d92a35640e7a5c8 SHA512 56078ac8cdae3b6bb5dabceb26576dba868f5c7f671135d0d778f145bb6112bd52b3391ed7fd79f7476996d59a4bf635474acd20f7e4bed9a5c26d06067579c4
-EBUILD visp_bridge-9999.ebuild 762 BLAKE2B 5ef20780ecd532b788613af374bae30f4d80377b37b36d50a12ed4cbc95833319f86e98b6fcc0b8681bd7544a410576578bc709afe9615882d92a35640e7a5c8 SHA512 56078ac8cdae3b6bb5dabceb26576dba868f5c7f671135d0d778f145bb6112bd52b3391ed7fd79f7476996d59a4bf635474acd20f7e4bed9a5c26d06067579c4
+EBUILD visp_bridge-0.12.1.ebuild 760 BLAKE2B ddcf1687ccddff262c4d300546216ded28d23254dbcc96e599c85cb5f6bd65a7c61f1e63b5caf672294ea67553807ddec9dc3b8839c2929a45eac9c4cd286079 SHA512 13c7150afcc6f650f4e485f580635ff1195c78668f1d19c6bf307e9f0088e58e6b4477ad9054375447270ccacbf1a5ab9e0fd9bcacb50ecfbfb8b0701a8add1c
+EBUILD visp_bridge-9999.ebuild 760 BLAKE2B ddcf1687ccddff262c4d300546216ded28d23254dbcc96e599c85cb5f6bd65a7c61f1e63b5caf672294ea67553807ddec9dc3b8839c2929a45eac9c4cd286079 SHA512 13c7150afcc6f650f4e485f580635ff1195c78668f1d19c6bf307e9f0088e58e6b4477ad9054375447270ccacbf1a5ab9e0fd9bcacb50ecfbfb8b0701a8add1c
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_bridge/visp_bridge-0.12.1.ebuild b/dev-ros/visp_bridge/visp_bridge-0.12.1.ebuild
new file mode 100644
index 000000000000..897184ef36a1
--- /dev/null
+++ b/dev-ros/visp_bridge/visp_bridge-0.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="noetic-"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Converts between ROS structures and ViSP structures"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-libs/ViSP:=[xml]
+	dev-ros/roscpp
+	dev-ros/camera_calibration_parsers
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_bridge/visp_bridge-9999.ebuild b/dev-ros/visp_bridge/visp_bridge-9999.ebuild
index ad50242778c0..897184ef36a1 100644
--- a/dev-ros/visp_bridge/visp_bridge-9999.ebuild
+++ b/dev-ros/visp_bridge/visp_bridge-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
+VER_PREFIX="noetic-"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -26,6 +26,6 @@ DEPEND="${RDEPEND}
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
 PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_camera_calibration/Manifest b/dev-ros/visp_camera_calibration/Manifest
index 922c29dd1d2c..fa0e6f0d04e1 100644
--- a/dev-ros/visp_camera_calibration/Manifest
+++ b/dev-ros/visp_camera_calibration/Manifest
@@ -1,5 +1,7 @@
 AUX gcc6.patch 421 BLAKE2B cf5b648dbd6d5121db22cee0aaddd9a359a87e9305e3887b4ec15b148e2921baf2562c9c377abb6c848088ce9592952bf537469fbe68cc025ad6e32db8817c61 SHA512 a4ed8165e1a8099d79bfe48563558bbb6de20b90dcc7def4b9dbb46a6c1115cbacfe09ed0c3ddb2b654914fe3b49554f11453fc3d2c87c8841b6755a24f08c4e
 DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
+DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
 EBUILD visp_camera_calibration-0.11.1.ebuild 792 BLAKE2B db393f726d448787244777fe03c8f5d1c0f3d7bbae3167b4c8be442a36c7c18967f9db73d1397da68ae5114f191aec69279ec35819b92936cd2456a5af50fa9b SHA512 1c5d49edccab9e4831dc742661e9060835d4af2e57ecb75abff215068f29aa136dc0be33f4770a159bb5f1ebee77aa738cf4aa9f9e32aab86ad5581d7dd54f98
-EBUILD visp_camera_calibration-9999.ebuild 792 BLAKE2B db393f726d448787244777fe03c8f5d1c0f3d7bbae3167b4c8be442a36c7c18967f9db73d1397da68ae5114f191aec69279ec35819b92936cd2456a5af50fa9b SHA512 1c5d49edccab9e4831dc742661e9060835d4af2e57ecb75abff215068f29aa136dc0be33f4770a159bb5f1ebee77aa738cf4aa9f9e32aab86ad5581d7dd54f98
+EBUILD visp_camera_calibration-0.12.1.ebuild 790 BLAKE2B ec466d93cb7d09767206de7f1acdc684fbdba7d3e05f567fe36d0f5d4654d7236e52cb8810eb68c0ecfcaa3fa9b2a962202eb61d54ac305b13d3ba02386b91be SHA512 44d964629d1f0f45f2ece96f014a4f1ba587ed57028042ec75f3fbad01d78d1df2e0d1746a0fbd709bbe1541828f9861ab448148edbe061c3052f5e83d221268
+EBUILD visp_camera_calibration-9999.ebuild 790 BLAKE2B ec466d93cb7d09767206de7f1acdc684fbdba7d3e05f567fe36d0f5d4654d7236e52cb8810eb68c0ecfcaa3fa9b2a962202eb61d54ac305b13d3ba02386b91be SHA512 44d964629d1f0f45f2ece96f014a4f1ba587ed57028042ec75f3fbad01d78d1df2e0d1746a0fbd709bbe1541828f9861ab448148edbe061c3052f5e83d221268
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_camera_calibration/visp_camera_calibration-0.12.1.ebuild b/dev-ros/visp_camera_calibration/visp_camera_calibration-0.12.1.ebuild
new file mode 100644
index 000000000000..7e2b91a99ee2
--- /dev/null
+++ b/dev-ros/visp_camera_calibration/visp_camera_calibration-0.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="noetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Calibration of cameras using a customizable pattern and ViSP library"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/camera_calibration_parsers
+	dev-ros/roscpp
+	dev-ros/visp_bridge
+	sci-libs/ViSP:=[X]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild b/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
index c68c3131f198..7e2b91a99ee2 100644
--- a/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
+++ b/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
+VER_PREFIX="noetic-"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
@@ -27,6 +27,6 @@ DEPEND="${RDEPEND}
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
 PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_hand2eye_calibration/Manifest b/dev-ros/visp_hand2eye_calibration/Manifest
index ae8b5626937a..323c8a076971 100644
--- a/dev-ros/visp_hand2eye_calibration/Manifest
+++ b/dev-ros/visp_hand2eye_calibration/Manifest
@@ -1,4 +1,6 @@
 DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
+DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
 EBUILD visp_hand2eye_calibration-0.11.1.ebuild 709 BLAKE2B 5a1c93863cc2608c6030d419b95786b221fc4805af01788631664fc65aa8f755bd638f93b39ec13417bc31e592513856a10d16c1b170aa0744e1e5ca65c04fa1 SHA512 e4731b6b68149f26e8e7f93614ffbd7f5eef997905c9d68131c1ee0981aa8130052915b649a613a086b2fad7b8a73185c5d2db5f51d7ba8dd1222145245cfece
-EBUILD visp_hand2eye_calibration-9999.ebuild 709 BLAKE2B 5a1c93863cc2608c6030d419b95786b221fc4805af01788631664fc65aa8f755bd638f93b39ec13417bc31e592513856a10d16c1b170aa0744e1e5ca65c04fa1 SHA512 e4731b6b68149f26e8e7f93614ffbd7f5eef997905c9d68131c1ee0981aa8130052915b649a613a086b2fad7b8a73185c5d2db5f51d7ba8dd1222145245cfece
+EBUILD visp_hand2eye_calibration-0.12.1.ebuild 707 BLAKE2B bd4e7297978f1004ee8ac249e18d3de727d4aa2ef54195b6200dd00e787da79b9927c4abb1ebf45fa726aee6525cb453a2a510b9ceadf8fe8aab7af4ef18a063 SHA512 bc3f3ec2ef481f6bcbc5bca8600021f60bb25e19b7ed56fc332f93af6bf3b3cf2d4f6be28afc5fb9348ee475ec8069526cb97f064a72e96566e2ea6d3c82ae12
+EBUILD visp_hand2eye_calibration-9999.ebuild 707 BLAKE2B bd4e7297978f1004ee8ac249e18d3de727d4aa2ef54195b6200dd00e787da79b9927c4abb1ebf45fa726aee6525cb453a2a510b9ceadf8fe8aab7af4ef18a063 SHA512 bc3f3ec2ef481f6bcbc5bca8600021f60bb25e19b7ed56fc332f93af6bf3b3cf2d4f6be28afc5fb9348ee475ec8069526cb97f064a72e96566e2ea6d3c82ae12
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.12.1.ebuild b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.12.1.ebuild
new file mode 100644
index 000000000000..edbae8378ad0
--- /dev/null
+++ b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="noetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Estimates the camera position with respect to its effector using ViSP"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_proc
+	dev-ros/roscpp
+	dev-ros/sensor_msgs
+	dev-ros/visp_bridge
+	dev-ros/visp_tracker
+	sci-libs/ViSP:=
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
+fi
diff --git a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-9999.ebuild b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-9999.ebuild
index 4f14eac92f13..edbae8378ad0 100644
--- a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-9999.ebuild
+++ b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
+VER_PREFIX="noetic-"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
@@ -26,5 +26,5 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
diff --git a/dev-ros/visp_tracker/Manifest b/dev-ros/visp_tracker/Manifest
index 30d027aa01ab..e8d1de9c83cd 100644
--- a/dev-ros/visp_tracker/Manifest
+++ b/dev-ros/visp_tracker/Manifest
@@ -1,5 +1,7 @@
 AUX gcc6.patch 350 BLAKE2B 5e0f54319cc37bf0a4cf46e3b96f37bdb059af0f0e4a2b7219363504c96a2ed43121f4028c4d264959f1cf78e10d329ac67ee85d6a2868212b0cbcf924e2f93d SHA512 b1647cca84792212a1fe20685e83ee28fc225fb7272ed892fdbc4faae809059ce955cf5df1d8b3543c1248a741ad9a0bcb263a547aa21be2cebd8608dfba457e
 DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
+DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
 EBUILD visp_tracker-0.11.1-r1.ebuild 1059 BLAKE2B 00e115d602728ebcd542d5673fe0ffdcf23a9711a673aff1525b9174d1a5931346ff3e81114300d2390d45a266a7bafa0fdc6bc90ca8e8ccb95ee1eb3375b157 SHA512 601529cbb921b96349c998525f186fa541a56c64251d7401451a481201e5dd47c24b491d45148ccea9c16e4b78c0f435292900173082d2d7ec087ba21f98c1b2
-EBUILD visp_tracker-9999.ebuild 1059 BLAKE2B 00e115d602728ebcd542d5673fe0ffdcf23a9711a673aff1525b9174d1a5931346ff3e81114300d2390d45a266a7bafa0fdc6bc90ca8e8ccb95ee1eb3375b157 SHA512 601529cbb921b96349c998525f186fa541a56c64251d7401451a481201e5dd47c24b491d45148ccea9c16e4b78c0f435292900173082d2d7ec087ba21f98c1b2
+EBUILD visp_tracker-0.12.1.ebuild 1057 BLAKE2B bdaa61a26af4da88ddf813996c46203ee8ee63cb056d64c0b73e809dd75a71c33b96774bed8d5af369bfd9c31d9a6ce4e9930f904c10c67afd4a31a230e1f48b SHA512 9422a71751ee39f203bce5cb2762a7038fb07e8f31e9e6583c64ecefb0bdfbc57d1c51a9c22af493a208a5f5228893004e6b2de283c17cfb330e80ea9eff9ac1
+EBUILD visp_tracker-9999.ebuild 1057 BLAKE2B bdaa61a26af4da88ddf813996c46203ee8ee63cb056d64c0b73e809dd75a71c33b96774bed8d5af369bfd9c31d9a6ce4e9930f904c10c67afd4a31a230e1f48b SHA512 9422a71751ee39f203bce5cb2762a7038fb07e8f31e9e6583c64ecefb0bdfbc57d1c51a9c22af493a208a5f5228893004e6b2de283c17cfb330e80ea9eff9ac1
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_tracker/visp_tracker-0.12.1.ebuild b/dev-ros/visp_tracker/visp_tracker-0.12.1.ebuild
new file mode 100644
index 000000000000..81537d67935a
--- /dev/null
+++ b/dev-ros/visp_tracker/visp_tracker-0.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="noetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Wraps the ViSP moving edge tracker provided by the ViSP library"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads(+)]
+	dev-ros/dynamic_reconfigure
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/image_proc
+	dev-ros/image_transport
+	dev-ros/nodelet
+	dev-ros/resource_retriever
+	dev-ros/roscpp
+	dev-ros/sensor_msgs
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+	sci-libs/ViSP:=[opencv,X]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_tracker/visp_tracker-9999.ebuild b/dev-ros/visp_tracker/visp_tracker-9999.ebuild
index ccb52c00e4db..81537d67935a 100644
--- a/dev-ros/visp_tracker/visp_tracker-9999.ebuild
+++ b/dev-ros/visp_tracker/visp_tracker-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
+VER_PREFIX="noetic-"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
@@ -34,6 +34,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
 PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/xacro/Manifest b/dev-ros/xacro/Manifest
index 3708d30fa5b5..d5a5ef53eaca 100644
--- a/dev-ros/xacro/Manifest
+++ b/dev-ros/xacro/Manifest
@@ -1,5 +1,7 @@
 AUX tests.patch 625 BLAKE2B 5ec4d6bca2278f40a4886371abd75beb0ff933d3b7e6e9e4554e7f9d63b521d2ff9d2c91c530177c818de2006bbc7db77e86ce3f4323017f870cb6b2a186ba9c SHA512 10da25011dc5c63d282d45862c35d9f900a90bc61059d6e703e50e2a94bdd4ca9c0f20d3fe6e5b03b3f98059e1bcb74272adcbb7f72d5e5f1d3ad4ce5a5f6bca
 DIST xacro-1.14.6.tar.gz 81362 BLAKE2B b0ec80e8f224f1b31e9f21e1c11669a46da1b13cf82b5d82912196f9f647aa1c45a7084f4ea1e1690c0d969b5e126cd5b6069c9987034898b72d92310b7d565f SHA512 0796c07cbf4d51699ab07d656a42d13fc140406f6dbee3b94554f2aa91e68b64bd5d2c218930edb5b139ac41b5d5c6bffad505d220353d5748f371ec6bb196a3
+DIST xacro-1.14.8.tar.gz 81831 BLAKE2B 6ad5c8545f5b7167faea122834cb1226e2935f0e40dbd0da1a3e63dc5981adabf83b9d72bf0b51842e82bb31ed469c72a63d4dcbb3dd79b6c8f91fdfdf75b202 SHA512 a372dc3a9e62a9eb1a0cf6b2491c45685e8f5f7442da86f7767b47c8122ec67780aee4e76a4b9278046b85a16000b1ffe72e44a9ac04f39da21c5bc1cf788b0b
 EBUILD xacro-1.14.6.ebuild 773 BLAKE2B 2911b685e1a3992014b35541f7d261ea3b744716602211cbcc09df27a892fbd4dfa0576a8b70cebc5d6249fc4e70494be958c4a1cfa081b290b4232130c38cc6 SHA512 792e024feab8a468d906f332dab2806d05c0d4d643b6cbd9d995efede0dfd3a2e909110acd761af34753166a13ddf983793fdaa4bb510c583de3cd4a5ff96bc0
+EBUILD xacro-1.14.8.ebuild 773 BLAKE2B 2911b685e1a3992014b35541f7d261ea3b744716602211cbcc09df27a892fbd4dfa0576a8b70cebc5d6249fc4e70494be958c4a1cfa081b290b4232130c38cc6 SHA512 792e024feab8a468d906f332dab2806d05c0d4d643b6cbd9d995efede0dfd3a2e909110acd761af34753166a13ddf983793fdaa4bb510c583de3cd4a5ff96bc0
 EBUILD xacro-9999.ebuild 773 BLAKE2B cffe52b6159091b8fa0e657680e1c6bde3fe55c60645ba55bb09d14514a066f70b81a690507ccfa29586c809225fc42e173bd643af08e94a56ce5148512efd4b SHA512 66e63f19b3d547f7b0cbfafd7ca6417baafb1dcd25dedffe6e0662f8ca35693d433ce3152b7fdfdca0b3184ffb213ab7a280991717d2790ae5f3a5723def6aa2
 MISC metadata.xml 323 BLAKE2B d43754a1147a95e3536569c858b3dafecbc9dd4ec06ef00d23d7948de3aaf40d15aabf502f6c1b5579c03139c06579517c86fddc6eaa61f970baf101d9fef68e SHA512 9c6fccac3f7ab699969eb90199aa9690d064f1d66cc003c157bf85bc3147ae42f1433ac1589f57ce5b05ebd78a44c7f1a92f99e3af29bdee58727c1a676afd37
diff --git a/dev-ros/xacro/xacro-1.14.8.ebuild b/dev-ros/xacro/xacro-1.14.8.ebuild
new file mode 100644
index 000000000000..5c1e6682dc01
--- /dev/null
+++ b/dev-ros/xacro/xacro-1.14.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/xacro"
+KEYWORDS="~amd64"
+
+inherit ros-catkin
+
+DESCRIPTION="XML macro language"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roslint[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)
+"
+RDEPEND="${RDEPEND}
+	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	local sd="$(python_get_sitedir)"
+	local local_sd="${BUILD_DIR}/devel/${sd#${EPREFIX}/usr}"
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	PYTHONPATH="${local_sd}:${PYTHONPATH}" ros-catkin_src_test
+}
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
index dc77a671e12b..40f2b4019e1f 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1,7 +1,9 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD xmlrpcpp-1.15.10-r1.ebuild 447 BLAKE2B 335e1857bcf0a4d9b19809e53371d9d10ca0eb1addbcadb99d4342189dc15de4a222bbe9d70721e4e4d1de2eceee8e2397051aef2153d5b05e54d352138895a0 SHA512 467551d8ba0d0b471df55f7903cf18d85fbf489ea10b5128d798d78bd376f139c6b69fa17a2314a2e9c082c629e2870cf42022c95123dad922c1f5384754ed90
+EBUILD xmlrpcpp-1.15.11.ebuild 447 BLAKE2B 335e1857bcf0a4d9b19809e53371d9d10ca0eb1addbcadb99d4342189dc15de4a222bbe9d70721e4e4d1de2eceee8e2397051aef2153d5b05e54d352138895a0 SHA512 467551d8ba0d0b471df55f7903cf18d85fbf489ea10b5128d798d78bd376f139c6b69fa17a2314a2e9c082c629e2870cf42022c95123dad922c1f5384754ed90
 EBUILD xmlrpcpp-1.15.8-r1.ebuild 447 BLAKE2B 335e1857bcf0a4d9b19809e53371d9d10ca0eb1addbcadb99d4342189dc15de4a222bbe9d70721e4e4d1de2eceee8e2397051aef2153d5b05e54d352138895a0 SHA512 467551d8ba0d0b471df55f7903cf18d85fbf489ea10b5128d798d78bd376f139c6b69fa17a2314a2e9c082c629e2870cf42022c95123dad922c1f5384754ed90
 EBUILD xmlrpcpp-1.15.9-r1.ebuild 447 BLAKE2B 335e1857bcf0a4d9b19809e53371d9d10ca0eb1addbcadb99d4342189dc15de4a222bbe9d70721e4e4d1de2eceee8e2397051aef2153d5b05e54d352138895a0 SHA512 467551d8ba0d0b471df55f7903cf18d85fbf489ea10b5128d798d78bd376f139c6b69fa17a2314a2e9c082c629e2870cf42022c95123dad922c1f5384754ed90
 EBUILD xmlrpcpp-9999.ebuild 447 BLAKE2B 335e1857bcf0a4d9b19809e53371d9d10ca0eb1addbcadb99d4342189dc15de4a222bbe9d70721e4e4d1de2eceee8e2397051aef2153d5b05e54d352138895a0 SHA512 467551d8ba0d0b471df55f7903cf18d85fbf489ea10b5128d798d78bd376f139c6b69fa17a2314a2e9c082c629e2870cf42022c95123dad922c1f5384754ed90
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.11.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.11.ebuild
new file mode 100644
index 000000000000..f3fb15501966
--- /dev/null
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.11.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the XML-RPC protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost[threads(+)]
+	)
+"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 136a561d34a9..edf58da00f66 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index bfb360f59974..4c487ad38380 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,7 +1,9 @@
 DIST autoprefixer-rails-10.2.5.0.tar.gz 705265 BLAKE2B e6619cb2498eed46af1e92855e960e74f443c364d5d9c11b839e114bbd97797b90c2f6c6180ae68ba291b0035c1ef24f85d7dadfe07f236c6a611e0fe602bcca SHA512 8b3e80c61735d509e4448887272f2b9304ad1431ad4728a524fc87f096822bd10b6855bd1184943037ba2d10920a0fb1b16d09c8124d023b4edb7e9d1b9fb269
 DIST autoprefixer-rails-10.2.5.1.tar.gz 705267 BLAKE2B 089e4bbd8a2acadd7f07a2b3ea5bfdf77b6e83a35a1fdaf55deadf26a8a2e6ca0777c834c300d75877a38cdb10542dab4661dfcb0008c0cbe54c14741a6390be SHA512 97388b55fa0d3df72525c82c105307cd1bd9009e6bcfe161b218f40e1a6508f9c470b990164cbdb2b3c2cac13dc88628c24c3620f814eccbc5de0407536c84f6
+DIST autoprefixer-rails-10.3.1.0.tar.gz 1357327 BLAKE2B 2071b3a9c5848e06695e32445224f6e101481fac0ca73a23b86d138bfada9f7339bd51031f121ab8b0f614d2ea1ec386cb81dbbcf8f728075b12ff2393c0c8b5 SHA512 fff90cad950228e9d3b61259f26bee26b2fe3cd87557ed81f1235630357204e3cf9ce6cc9439551727d4d62d27f3510c8c2683ab12b05ad11549945f741e5db5
 DIST autoprefixer-rails-9.8.6.5.gem 231936 BLAKE2B 7c702f5484f9aa2318408fb8c5c8866ccf9d3565d3282e43279b9bea875ac3610b26c0ec302b2bed0779dcd46eca12badaa16faba1046585cddcfa3e8b22b51c SHA512 6b7281661fcaf0c17ee258a321f8d18664f2f305172719f76fe1f3ef6b04fa1460c7102946e95153df7ecf5c3ade3bfc8c22d302927f2e2183ef3b0f3ef8d623
 EBUILD autoprefixer-rails-10.2.5.0.ebuild 965 BLAKE2B 1ee9621734150b62a10e40aea20505b164354b87890559d80d15ed0c79eba1239b315b963b4085d36b96f3b881fca9e879626fc1bb1a45e1cc1747b42a14c693 SHA512 c0aae0ed51f6c44dd5f90621ba12214d4215816d782e2697c96b7180108e495bf3193a79d148e341aef8cc28af52797c55820adb526a2e079cc46a6ff76ba8f5
 EBUILD autoprefixer-rails-10.2.5.1.ebuild 963 BLAKE2B b8d133591b1118d2022281c64090dc440f24335e451a6bb550580c5a71f7e5214b030b23f0d0f88868bfcbb9ea124cb259966e5e4d7f866361e1f8f105181cbc SHA512 e832eb928120a75a234637f25b28f7be7f61ba08f25ee90724c0bfca10136dae3d2304468b66d571731b33fc0d5276d415383e67e499dddae82982b74b8fade9
+EBUILD autoprefixer-rails-10.3.1.0.ebuild 956 BLAKE2B ab61a2cd608d5d8f64bfbd4e52903556ee80d5b83277b717e5fd853ea0a163cf46a83934b022dfd5394dae296076019d2b6ba1156711220dd027bf01955ac04d SHA512 b4541812a6e97072489608f041e54e992b65476a44f56e9a9eb71340214ff891bea9c6e4f45a9ae694fdd0221f85311d4797c1c8d9bf89432923e0e79d29ffbe
 EBUILD autoprefixer-rails-9.8.6.5.ebuild 884 BLAKE2B 9cab1081148382ce4444ffcf206d53028180b2562f02e913459ec7ee4710592a0c0360532251884e1e7a0d702cb4dfdf46f097acb9ef4bac9345b92f5318180a SHA512 8e3ec03aeddfced88c758094c3d45f83c2f4e76f12e3e3883e7edcf7933d3ee8219753305a6c46cdba608b4bbbff004905fc41c6c68aa43d1d2ef0f400182491
 MISC metadata.xml 347 BLAKE2B 71b067345809944df1e70cdcaa44e44ae416d0c4ff80975aa796b8217170825e6be32a15d2549f464d9a65e8aa9ff1b2e9496989e66bce29d3dad672742495ec SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.3.1.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.3.1.0.ebuild
new file mode 100644
index 000000000000..efaf80056df3
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.3.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/rails-5.0.0
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/ s:^:#:" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/builder/Manifest b/dev-ruby/builder/Manifest
index 76f63900d092..c6096c90641f 100644
--- a/dev-ruby/builder/Manifest
+++ b/dev-ruby/builder/Manifest
@@ -1,5 +1,5 @@
 DIST builder-3.2.3.gem 31744 BLAKE2B be970ffd29f146faea5e7a9d76fedb513ce9bde3ed21ed7a44fe7d4a81e3836cecbf62f3f4c19f0b1e333f607b8978d9c707f4af76613592e966cda7e537bd1c SHA512 7869f44bcf40d547846d50ab82234694420b2f38e08037ae671c90a7c3b547f11023f864e70adf82970fdddf7ee811730c17e30ec298bb6d1999f4c0c050fbb8
 DIST builder-3.2.4.gem 32256 BLAKE2B a2768fe25023631d134f062d8e7ff2aa25f6b4db0358bdc0d4baebb33d93673fca66049b8b9c42382bad3494f6e03cefdedc72d71958dff63d43eb7a2a187c75 SHA512 730317ec0a4af33e183283e309e38d47deb08db0ab6bd6dfebdedcebb7470bd383c6c1d32ad674adc43298e0f86930b97c652fff9827ca8890db2d1d68e792f1
 EBUILD builder-3.2.3.ebuild 849 BLAKE2B 9d7bd80ec5701eb1f2fe664e9b80df6ef0ee9319d2fde95f3eda430b714e6ee41ae7ae3108b0e7df02a34123603a5878e79c6645925bd8ebdd2a87116252b869 SHA512 5b764fc76d45cdc3fb799c07209ecead308e1892ca88820d99d120616f826010149f7a08d9c2a16fd94afbfbdd0988c50635b90feef7e70851c52337a6ffde37
-EBUILD builder-3.2.4.ebuild 814 BLAKE2B 38f431f51bd43327d3148c8535150c827a0c011b79aa248e3cd5e1e21a58965ef0041d7d306ed65b41195434f9a42b33b6bde540227e50a9321bce762736a73c SHA512 41749e82f5bb4d460badd3d45a2a88bf7c947dad8eec78eb143adb40203dfe1af661ddd62ad32b5a96d3ff522f177a4b9b7a936b703201263cac5fe2f972a8e0
+EBUILD builder-3.2.4.ebuild 812 BLAKE2B c1b221b439cb2f34515406b14efc94f4a24fbe33a3898dada6a6af44cc9704110291ebb881d129fecc9dfcdb093c2dc54bcd981e9cb463f425ae4bc5c0f13dd2 SHA512 b809a6eabbdc68366694c98ec61e60d1920883d268a41f56467e56793a13dbc692b31e0c52f310668a1f8f07820ca415cc9ba329239588079ba7e662cb086e6f
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/builder/builder-3.2.4.ebuild b/dev-ruby/builder/builder-3.2.4.ebuild
index 2c2296a1422b..c1f1c4381a4e 100644
--- a/dev-ruby/builder/builder-3.2.4.ebuild
+++ b/dev-ruby/builder/builder-3.2.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://onestepback.org/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest
index 9b9e46a5be5b..dcb090cbafef 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -2,5 +2,5 @@ AUX coderay-1.1.3-ruby30.patch 1472 BLAKE2B c04f821cc2768c50fbc5ddd998c37878fb57
 DIST coderay-1.1.2.tar.gz 220645 BLAKE2B 85405da2b148ae23573abf2c3fcf94a643024756308e83c4cecf0a5edae2fedc4ca7c7bdf8fb5936310f6699ca8f06f91cceb475e00511a54af0a96dd517c234 SHA512 cfce5e9f0a0d988e7920912e064ecbef3b54200a08ca2e07453452edd7f382a1eb9292bc566e069f5d1b784033e816f13d9ddfb39520e8e44a8d1e898aa33591
 DIST coderay-1.1.3.tar.gz 229139 BLAKE2B a900cc5fbac950f66814d9300876d6a273b296d07139297d5344d26c5710d23c37761e5743ef972f523afa20fa663f239c03d9d2ad47232b77e53fe5053736f0 SHA512 a5208965e8dbad53d179fdc1c57df59ba4e13522a1a57c371ccd3f9369408a1c7d878867df48b201a1d590b46ef0f9bada3f3e7810866f17d244b5b370aba3fb
 EBUILD coderay-1.1.2.ebuild 1349 BLAKE2B ab08112a58cdadd308cb89a58a2f9260155c7648e1550a1aa796a62a78bfcf94e0343f8141d558648bad5267f257c397ae7623030c87f935425d89ba10134fee SHA512 d5b4745f057ced13541c0e48b23fb134e25d1e9025c26824f5bf509935e28ae425f8b43f21857f21b1188c347a1b6e31adbce47a72605cabcf86e6450eaf060d
-EBUILD coderay-1.1.3-r1.ebuild 1579 BLAKE2B b0326abc1a498f1a42419bc916f3b4ba5aaea6fc66a78b93fd0485fafbc2cebe0def9097f1ec880e180d058ecf2bc282fe0b36b27b571c343a4d984cd5a1c5ce SHA512 a093f2755c71cc4dd1b48c87920347f706ae2536c9874e3333ea47aaf91114f11b9b6ad64532292c27d74bb62b0ab81ce4772d731abf91b43330a2253b54e50d
+EBUILD coderay-1.1.3-r1.ebuild 1586 BLAKE2B fc31fc4399b03d75ca56d5f7d613a0b2759a71a38077b5ed79451e71996c3cdc6ddc5f5c5224491af3495f8219b31b749ad8440ff0b55ce3256ae17678abbc6f SHA512 56366ceae810f66ec5101aea12416eeb5aedefbb548e9ef1de74cf131eb4bed9e4a87cc4d3154388204ed00615408607780b54ca727290e49a877904fe61833b
 MISC metadata.xml 342 BLAKE2B b907829065b996e9bf467150216ce92b7fa4bedef8dbe9b9d79a1ba6831c706c312ce0d1cbb418df6c5b43dad59509c132187637025d4c49e9b29e21fa68a107 SHA512 13f33c6d77b3297dab6c125c2ebc9a1f7584dd5374e7f13d416d5a80ffe04e39ecdddd93de30fceed22e110e1c68e4b853fdd5b6ab5ec4d254c05b17f624ca4f
diff --git a/dev-ruby/coderay/coderay-1.1.3-r1.ebuild b/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
index 3481d92b38b6..380b0699f14c 100644
--- a/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=("${FILESDIR}/${P}-ruby30.patch")
diff --git a/dev-ruby/colored/Manifest b/dev-ruby/colored/Manifest
index 197a0b2eb56a..bf873726de9f 100644
--- a/dev-ruby/colored/Manifest
+++ b/dev-ruby/colored/Manifest
@@ -1,3 +1,4 @@
 DIST colored-1.2.gem 5632 BLAKE2B cb384fe13692d453f86e403a8684604d07543e3ea3270ad15b6d6d8be2c0d3610911a23b82f23c40e0472f40174a290948804eeb8cf5c496f36ab49d56ee4413 SHA512 92a50ba1c434b6a0b409e546812ae6f4331be00a68725cd207504bdd65c9512f4fc3bf83057dd4fad09b8a3e5869595a6bb572c4303f0bef1f241ce63d4fc90b
+EBUILD colored-1.2-r1.ebuild 365 BLAKE2B e760d13ed4c3116388c58b0a380875854a8f9cc282e89ab50bf3a8318cf73c6acc81e3f5ad141c6b3c769f7de0ef0ad199ac6e969ff87a694002688da884913a SHA512 201322892bca33277c3c9dcfb51636f180c8a83fa490476acd5e20857999203675bbbad5d13b6e723f631653ca4383b0b5e2f388cb0c9b383fc74c4228409e59
 EBUILD colored-1.2.ebuild 404 BLAKE2B e92384f08d1e7e2b8414c5eccf642920d4faaf5728638b90ef89b701d8da0301430c42d7cf3cef16ee5892c9f04dba40deef4b318bef99f858d1defdfb099efb SHA512 201bfedba17adde7e0f86314707174f6de7bb60e80b43a0f2bbebecce55a68a68e22295574e9dda37f82d5be237e02c2e41f0a4f516d893d453b129dcb1a6ac8
 MISC metadata.xml 341 BLAKE2B 7b1268ea443452b288b3ae7ab5fb0375d9617ed871b096fb13a3cbff2316b9c512eb02d94e6e78c7581f5785363e7732f6123f02d48ad6f8cd0fb1f68141c4af SHA512 44886af1c3a8092ef96b5cd1be402c478dc7129f79d1245c43015f35b5a8acce2aca76c514d37c1b78267cc9ef50bdc01772a7313b6cb3fb2e95c9b3e5b8013e
diff --git a/dev-ruby/colored/colored-1.2-r1.ebuild b/dev-ruby/colored/colored-1.2-r1.ebuild
new file mode 100644
index 000000000000..ccfe25469b91
--- /dev/null
+++ b/dev-ruby/colored/colored-1.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Console coloring"
+HOMEPAGE="https://github.com/defunkt/colored"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_prepare() {
+	sed -i -e '/[Mm][Gg]/d' Rakefile || die
+}
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index 868d56389725..3c78b2dbe9f2 100644
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@@ -4,6 +4,6 @@ DIST diff-lcs-1.4.4.gem 50688 BLAKE2B 0b72890b147696425120f2dc71f8d741d993411bd8
 DIST diff-lcs-1.4.gem 48128 BLAKE2B 6ec3259dc366769c4008c6ea6c7e5f1fe75350dc0318c8d45991bb8173274630b3be734fe6375dbb131620d8124faa7c0567e57d299393c3165b0e1c2d29c138 SHA512 a352fdfb89587b38f3e518f76dddd048530501080dba5abb0c37033f44bee65bca12550ea7d6f1edb8a719092538c20d1c58dfe7a6f67ba1d46549608c09feae
 EBUILD diff-lcs-1.3.ebuild 630 BLAKE2B bff2b7dcb83f1d84b500dbabd9e797929e86d97af751a7e074d024db67f9561cb6a6b332b051f6965c16d96164e656994100eadde194399ac46d52c962dd5b81 SHA512 ef3ccaae4f96c61063b251eaa688193b49361003ba2ed2490b157049593bf87cf88969cf04eb02de8ff7732b1d47f9b6d9d8ad19c5b55f11feb7f4dda685fb56
 EBUILD diff-lcs-1.4.1.ebuild 599 BLAKE2B dc7bb6ac8d252e4b7bdf7f131043041453b9e646ce046ff222fdf013477449e2ad48ac8b8ca6e21f7560f66ff484c365ba60eb9540ca059720bf3d8bfedba911 SHA512 73b53e115fe37da479352dc3a55ec15c569866b518d735f23e8341703c47bc97b0e5436800fb7713d51ce34bdd0684a8f29f11737e1747a00e08cadd5259682a
-EBUILD diff-lcs-1.4.4.ebuild 748 BLAKE2B 2700f20d633295a15b936b96fd7fbacd5fba76238661ac463a825766e61ae32c0779a476a5919069984deaa0bde76517185091f37d4d2aa4423a4e4ce89696f7 SHA512 7a443d9e67a447a9a15d9c68025c78da6c36b3e43b20689f6460c05514ebbe4935e4c247a29282eb58d52c0b514dff17926aa7400668de4cbbb56b3aa16a3855
+EBUILD diff-lcs-1.4.4.ebuild 755 BLAKE2B 00fdf19861af31a4f4f6c561a5c061ac7cd6ddc405c5834ae0483229583d7f3ffd0f6c52542beca9c3ae4b620f98be6f2b33a187a2f0a74e6dae642c9e2ec9c6 SHA512 d18f06d63a78e7a96f782ad6c9c2871fe479ed35c937971500c937e86c52a0c14bdceea0ac4f367998c02b8b52cda31b6220a631d8e4158460f86baf2de36f9f
 EBUILD diff-lcs-1.4.ebuild 599 BLAKE2B dc7bb6ac8d252e4b7bdf7f131043041453b9e646ce046ff222fdf013477449e2ad48ac8b8ca6e21f7560f66ff484c365ba60eb9540ca059720bf3d8bfedba911 SHA512 73b53e115fe37da479352dc3a55ec15c569866b518d735f23e8341703c47bc97b0e5436800fb7713d51ce34bdd0684a8f29f11737e1747a00e08cadd5259682a
 MISC metadata.xml 345 BLAKE2B 99a21f71cd3b7984131e3b43a14297bdfa3cb4238833deade649c4afb880ce6fca1bf4c3dfbd2fc75f68f42d5b7fcf97b1cc85a416da75490266a8bd57a36846 SHA512 b96c7243c3d4a6a3fb41e63d8dae54dc233e20b98698636d6d7f30f2c00bae3af9a01df68fa9c38aa0baa0b1bb3c267775dd8a5db539db3d8b46c497e85e860b
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild
index 6a6134ae087b..ab8de55c677f 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( MIT Ruby GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 1945fa6fb43b..691d9d4a1bbd 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -5,5 +5,5 @@ DIST ffi-git-1.15.3.tgz 167804 BLAKE2B a0d040cd87a0606ebf618bb1e5bf5189e03fa30d2
 EBUILD ffi-1.11.3.ebuild 1514 BLAKE2B e9f0371a43b379abe302818e5cf837022f049bd66396554fe90abbf36754a8ae350733ea258df8a90e07165db6af5b250867396c3995202555ed6561f2f9a575 SHA512 f4e8db2b0a3e73d050178bfd92a5227ad74575e3f3ba6eed5f6be25fc33651adad54e8b6527532e713136a065e2385ef574b3e010dc5c08c930082e88ea32798
 EBUILD ffi-1.14.2.ebuild 1576 BLAKE2B b8ea5c66d926ff7d2b7bf4c9443935e4a2274afc1a8bcf84abaafde9ec71e4313bd0392ff34aa12c47bb23852b53b559445e0b212142caf4a2d33641460578d2 SHA512 b5f3415732613101f21e60d12cfc5349e56b49eed982687d1ee98a76c4e88cd5868a6212361e41ccfedee70f237b5f7a8e9c4be8b7be3dece295e9cdcb658d20
 EBUILD ffi-1.15.1.ebuild 1665 BLAKE2B 04fad5bb54cb08a52525a413b04662e1e0fe4745b72bfc5aa7ac3bcd70939078cd2aa4860afed7f6a518d9b7f7b47f62162c3eb7d558a377641f71475d3fa766 SHA512 e5fe8935e8ffe610e9cf85862e29e6539792335787ab408df1ec625e3681d58117f537d49598a297731733d72c226d8a51d7af5aa7bf027154d0c81f30604e09
-EBUILD ffi-1.15.3.ebuild 1665 BLAKE2B 04fad5bb54cb08a52525a413b04662e1e0fe4745b72bfc5aa7ac3bcd70939078cd2aa4860afed7f6a518d9b7f7b47f62162c3eb7d558a377641f71475d3fa766 SHA512 e5fe8935e8ffe610e9cf85862e29e6539792335787ab408df1ec625e3681d58117f537d49598a297731733d72c226d8a51d7af5aa7bf027154d0c81f30604e09
+EBUILD ffi-1.15.3.ebuild 1672 BLAKE2B a3850132e42565dcf3924a963b93b82f85b6e5f3823804b46ea5515472dbd570cbca4c32c7ee7b876308803af1574f23ed3cfbd3bb4c7338e2bb39eaeb23bcab SHA512 9c2e6a4a257f6835ebd73028437b0dc0bc70549d1fff73404d0d3de65ecb2169478cb9df47c44f08f168e7109aa10a84fe474ff443c42dba5f972002a3f254c3
 MISC metadata.xml 333 BLAKE2B ccc40c1a86563165c3d6aba6bb40012dc02d86f836a5e050dafc34298c9b08aaa676be33e7c2ce5bf6acd36cdd8250328150383652ac5a1515c2832969c481ae SHA512 9105a49b39afce8695d4c8e7082690ca25806cf08ad6b6b9528343e1bfc72097369ab2868b3eebde55c6cd70d0baae1f085b4ad3468a9c5621d97dd8def76173
diff --git a/dev-ruby/ffi/ffi-1.15.3.ebuild b/dev-ruby/ffi/ffi-1.15.3.ebuild
index 244b9737ea49..92b209d828be 100644
--- a/dev-ruby/ffi/ffi-1.15.3.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND+=" dev-libs/libffi:0="
 DEPEND+=" dev-libs/libffi"
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index dfcd5915ef35..10d89a8689b3 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,6 +1,8 @@
 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
 DIST globalid-0.5.1.tar.gz 18978 BLAKE2B bf13df8d8a5ce21f85c5bec3c5d0b690ceea94a51b0fbfe9bcb7dd9fe55d8abf2c5a36589147a72b6a68d1263afa130a2acff7fbe0075599e6a67fc416ac20a9 SHA512 998478876781b70cadb6c6ce0624443033f6e29ce9cb7ce145f5e3f288b7998267c63aa1b43ce0d3f7c5fc378d7e148ee11b9d88b63665fa951efb1cc72ad93e
+DIST globalid-0.5.2.tar.gz 19137 BLAKE2B 8e01b965b396aa04149f83b30066ae99a50970fb2de97c99e09c422f4ccd59325bd7697de6a0873d3876cee9e1ead7ff0715233eaa3abf03b10cc1ed7168e4af SHA512 4954b9f558048eb143d4a9d1b041dc438f5852779340e11d93840e540f1c030714da2412e9eb2777d3eaafc887cc94c43ffabdc0060cc809a033e7e6352fb4a6
 EBUILD globalid-0.4.2-r2.ebuild 828 BLAKE2B 1f2fb67010d33eab7831a911f7a7cbd95a056ceb214b6741c38cfa6932ab2fc4513735990c29edab19392b454fe2af9292c3f872204059d3d6c6c95d3cf0feb8 SHA512 1a38d7cf266efdd9938fcf0b739fbd67bc4bab4586fa2411a1db7d07e7f622d19ea7bc264a422f26b5cd3726a14a5861362b9e05afe4c174cd81b3b06d175c7b
 EBUILD globalid-0.5.1.ebuild 764 BLAKE2B 917ff93e91fc33e82169d2591ca885cd7ac08af8248b25b8e1867ea0e1497edfa33cf9e583e0170eb028b8434dfd4ba973f5995eaac070cbe1f8ea489ea2fbb6 SHA512 fb78487f6eb890f680bfe105c4a1c2869e01c481bdf71d5ccccd33c6a534a91e93b72647a9c99f8d6021372d8463fef1f77f6cbc27e2ef0c81e22e994d713253
+EBUILD globalid-0.5.2.ebuild 764 BLAKE2B 917ff93e91fc33e82169d2591ca885cd7ac08af8248b25b8e1867ea0e1497edfa33cf9e583e0170eb028b8434dfd4ba973f5995eaac070cbe1f8ea489ea2fbb6 SHA512 fb78487f6eb890f680bfe105c4a1c2869e01c481bdf71d5ccccd33c6a534a91e93b72647a9c99f8d6021372d8463fef1f77f6cbc27e2ef0c81e22e994d713253
 MISC metadata.xml 340 BLAKE2B c8aa9febd2a1238630c8d42d1670d1333a9c9b8ad8a1195bc49518b4b90e0c5238e8d3859a71a304629c8931b7fa286f805b4eabd1b0782263c689888d168546 SHA512 31207f04b56e2be06ebe5367d496e8f7e9c73732cd0fa852d19bb49cfdb7b53ff30d23131a53ec9a9ca8c7aee8f8d0b4d74cd896c7e407a8b6aead17f06e106e
diff --git a/dev-ruby/globalid/globalid-0.5.2.ebuild b/dev-ruby/globalid/globalid-0.5.2.ebuild
new file mode 100644
index 000000000000..8795d175a2a6
--- /dev/null
+++ b/dev-ruby/globalid/globalid-0.5.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="globalid.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Reference models by URI"
+HOMEPAGE="https://github.com/rails/globalid"
+SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-5.0 >=dev-ruby/railties-5.0 )"
+ruby_add_rdepend ">=dev-ruby/activesupport-5.0:*"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+
+	sed -i -e '2irequire "forwardable"' test/helper.rb || die
+}
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index 63106e704fb0..a70537652541 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,3 +1,3 @@
 DIST hoe-3.21.0.gem 193024 BLAKE2B 2ff65edc6e0aebc93ebc8f3e628261ac3fabec4034b8e7b1bb3c38ab45c8b4641267a8c46c851ad69425c08782553c628574ae0a1417257cf64ba05a86de08f3 SHA512 39da93520bdb4efcbc58af58562ff8abbdecf45f92071ddb31f68ac799eb6f704431cea3d699aa039ba3a5217dc9b0f2d87f8b553d62860c34cb63803b625754
-EBUILD hoe-3.21.0.ebuild 1466 BLAKE2B 71d8239fa721f5118038c44291695ea537a53d436adea714522cb57d81686609bfd5c3d7b9b707ed345b9ce5f7b495837f63a5863001faa8722bd2855d69e2e8 SHA512 5fc5fd8009608e5fc7ba702b5260512df7b85a88cf86ae7ba0dc218e5eb760178ebd0d8ea471d9dfba12b675eb475000ed272108b2e36f52fed712159529b8bd
+EBUILD hoe-3.21.0.ebuild 1473 BLAKE2B 4f5e446eea384bc7e4a7f97998dc62ff6f5fbd56f3b9cb938855d4015601a4202927e46b16c3961c55e85c4d2753fae6cbf452198b200eb2b0e994e7e58ba264 SHA512 c1c69b183dad00e7230a49a216dd537ca607104d5cda9994b72423545749ddcf6748e6b0e6a36f0e87313387fd0a4d238d8d1beb89a083180ce57bc619b0aad1
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/hoe/hoe-3.21.0.ebuild b/dev-ruby/hoe/hoe-3.21.0.ebuild
index 441b335771a4..778e91ac9e95 100644
--- a/dev-ruby/hoe/hoe-3.21.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.21.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index aa92da5c8e4c..0b2ba8c0510c 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -3,5 +3,5 @@ DIST mime-types-data-3.2021.0225.gem 167936 BLAKE2B 59d4b3a347fc19537c4e94bced93
 DIST mime-types-data-3.2021.0704.gem 169984 BLAKE2B d5179c3ae38215eaab5244b59d8935800d05b3b79d496f765633e5a799f5d46cbf59b53682ef793a340ddc69f89302285c081d535c7d211e9eb458cbf64d07ed SHA512 0d0b4787bb39d7cacc202e2eba3c3e5e04efe1cd053332dbe1f0daeb9a58d533bceb01711a0d392ecca83f8d00f8fe7cc55f586060c3633b42749d7cb25246a3
 EBUILD mime-types-data-3.2020.1104.ebuild 613 BLAKE2B f3a0b4ee032f6358fe61fd9289047898c17e365eb741b0f3a985fc510132c93ead0afb63aeee71480dff001f745e05438df2e1c29daf0f218342447943eec146 SHA512 9ca058c3a817b845aa09b084db8c01798ec30177710ba71bd1febc76bd0c936d8f8d61e864b3ca5ec357bd65854ed28f5227a012acdb654c59d888a2ea7e6e26
 EBUILD mime-types-data-3.2021.0225.ebuild 620 BLAKE2B b247c690ae342767e30398baebd7c4a9ee1ad3d5a652294526bcc529a5b3d0346d0de3d8926e2b9056f14075976d36a5beee1f4a12d1f8865caa04f4622b96bf SHA512 4c22b456f0239421f4877a361df7a05f5f849b2c9ebedce15ddc468d28bb7f1659b807a21e88eb4f7db2c842db71aa7b388ba1cf22c07cd1e21a7493b321b264
-EBUILD mime-types-data-3.2021.0704.ebuild 621 BLAKE2B 5befef9f59ecc1fbb287ec9006599533c625c65cb3cb53c6b9d3cf56d79c2f06caef15ba220583bb69610eb75d5650ee06762086eac4fb787e7e5ad87363b8ab SHA512 dd443b2b182a8f490dc6686d8c46045e26a1114907820556f132a29b0155f53580573304b6d282935788d18c0a5fbf357a20f5f6edbfae920dda4003b71e5f96
+EBUILD mime-types-data-3.2021.0704.ebuild 628 BLAKE2B af8544da8e61d9cb5971b94ca253a771588265506ecda75fd36f03d2feb2d659ce53ad58f5575eab6b2d825613707b36ae433f53cf97bdef03482aaa08151b43 SHA512 9d9e6e969d587fd41530ec211b38bd2c90b71876cc53020d2ae4c770ee70867e4d14d22b8aff829a1dce9ee8e5ede50fe8f74c33df313437875c63424018767c
 MISC metadata.xml 352 BLAKE2B 31923bc222e1b0230ff1b03dff06215d199c9f0de7c7def0a0acfa7e6d74088efad1934704aa817ac91a8ed7d8a6287c059ae72d925fb83b2a15226b9a2f7dd8 SHA512 b994c7733a66987a405c5e03c34cc1c5c33a102d6121843147b846b2c6c0eb5eba2e5bfb6b8bdc27c39adfdeaadb1f5a525de3667ee7b22f9362b8539f42ec44
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2021.0704.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2021.0704.ebuild
index 2c61323cab5a..c085181d21be 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2021.0704.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2021.0704.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index 054308e467d2..9cc2869969f3 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -1,5 +1,5 @@
 DIST mime-types-2.99.2.gem 149504 BLAKE2B d2088d606b0210a8607d351ce7b7e3b7f25c3d518eaa3cb32ccfbf56a16eea104c908614f315317cece175003261d240f43bbf203619b54da35702abb94be8ce SHA512 46b3add451c3a6879f0f5df5f1e09c41d78d5a5b3872c2fcae7c8b097008cb04a9f5606360af9cc9880d7d659fe2dad19a118e6dfca1774ec3f5a5b852e31720
 DIST mime-types-3.3.1.gem 36352 BLAKE2B 66b97cc51d157d445d05823a3059efb6684a59d6b976945df77beb6497979a83d3ada4832cc36a42b6fad2353d1b5f2d7d1271a7947a0264978f30b857c0c7c3 SHA512 48646c5d3cc1b65ad0418bd765c86102d5dd7d0196f1b2b4b92acd350d6927e0c0fec3d30d04bf8b073d342f56b38663dee791f2c87f82b5743c6508265692ec
 EBUILD mime-types-2.99.2.ebuild 954 BLAKE2B f7b0ef6ce92e3ec23fa286d55e645864ee517a13deda8ad78b94addcbffd61f1ad9887a87ca912882b8e03b3336f08d0e4e4617e50808bad3fad2881f86655f3 SHA512 cff676037784df55c8da8e171d3efbc0c6a16567b1b52f938c45964cf8e7e1ff50cbcc098c90434e0468cb3a82e24c3ecc6612e9125ff86105140a69cf27d147
-EBUILD mime-types-3.3.1.ebuild 877 BLAKE2B 0fffe898532e1d6598e786fe93c873c9a4a6f5d6e705727da063db49e7bae8c0de59c5cd5fd892d9aab572799033233d361f6a19f515a1b3d28e93e6fc7d00ae SHA512 8f7cdafb8266ced32e0defaf7ad436d953419a2c674562717ee1cc534343609052bd0cfc6f44d0ef653427852d66a9ed88d4e77da1d48b856fc53f7de8b20cc7
+EBUILD mime-types-3.3.1.ebuild 884 BLAKE2B 67066d635c05a69c5b92c1312638ee00d709095bf428f2e33ff530a640973d05f72a4fcefbfbb9bdafd54521e899e0180bfa7d52b304fe715a95425aec8baf68 SHA512 343ef943022f3007d4b038bc82fe3196b3b51ecfca7f8bffcc1f35632b8002f1ef84cc224658f03c1cc7ff8f3ae6cf5f8900f2acb40a087d6b5cc2ea62f957f2
 MISC metadata.xml 352 BLAKE2B 6edd7bc99a1f3c2522e87695e078800275b4e9301597961b8e9ba3b920f7b75c92c8133860be4642995d2501e9bcc6f8f7cdbf611d85aa8ea23dfeda9353011c SHA512 01ae71ee2d991c0669ce4f9ac252f8edcdbe1df3f2510e5497f9a0fd0bcc1dc10a10259dc1b3dd14b73edd58895911d363b6a60105b619033a2bf09f987f4b5b
diff --git a/dev-ruby/mime-types/mime-types-3.3.1.ebuild b/dev-ruby/mime-types/mime-types-3.3.1.ebuild
index 9c3229c8a73d..84d2493d89f6 100644
--- a/dev-ruby/mime-types/mime-types-3.3.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-3.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/minitest-bonus-assertions:2 dev-ruby/minitest-hooks:1 )"
diff --git a/dev-ruby/minitest-bonus-assertions/Manifest b/dev-ruby/minitest-bonus-assertions/Manifest
index 1697f5bb0ecb..c5c62177c29b 100644
--- a/dev-ruby/minitest-bonus-assertions/Manifest
+++ b/dev-ruby/minitest-bonus-assertions/Manifest
@@ -1,4 +1,4 @@
 DIST minitest-bonus-assertions-3.0.gem 13824 BLAKE2B 415f8b48875b8335ded9fc21b5430b575d3d104179066de19aa58d1602da7ff9994c8ceb49b1cf34fd4c8553c76999bf1b638d2c44761af84d510ca1e276cec1 SHA512 8b07e5d3be7cf68be53b06f6b545445efd9021ff5423bb67c4b0e8e40aa004d75f34eef3fc23ebe83bceaaa064c57a5ac1b9969a28f48203a6ae4c34092c5621
-EBUILD minitest-bonus-assertions-3.0-r1.ebuild 1111 BLAKE2B ef3775d53c760e64d0b7c5a1a53c975e772631d409574286c4811c9db12e71f430d81133a0592213dccfaea41d882ee80a8dd794b92d86dfab10e35310a8a145 SHA512 b11600c6913e2129b7273daf05bce2342a385fb9a12af26af2e16a55cc941288227bc9bc390e06265608d22ea7dea323a7bb9d5d92a3b6d7b46224e22cb43e68
+EBUILD minitest-bonus-assertions-3.0-r1.ebuild 1118 BLAKE2B b00f54dfe03765d354e7f6781ec1554126cf914d47fc7b064be86a96fd01b25351a535e2276bc263c33895e1362a2c83990964f863df79c9b102e4565cbc7fd4 SHA512 c935e8931c738553d302a25dcc15d4d03cc0062b4493790c12d9ac9aa9d8480d3f0d111538f8fcc5b8ec6111097790114f25a6068ee9e70af6edfc12a57652ac
 EBUILD minitest-bonus-assertions-3.0.ebuild 846 BLAKE2B dfc1e69788e12e01bddf68bdf1eb141910a44e5138db82f1151856306961b182bbc623ab791fd409c7c4366b214b17d468a249b2857153e13d697456085c7bf8 SHA512 bf0058400ce0d284e62785e80ffb03a352923d0234eb2ddfc15e49a377251fd3314833baa9f09ccadebab4a24ffb557de8a43912bd85d31f71f81fb1af1184dc
 MISC metadata.xml 362 BLAKE2B 95200bd3aaad44ff65f068e52fada9744ce88f2f07fa11c4da2ccd1b02f769255b42dfed8ac92dee531a8c736439cf9806e3ce68153d6197e484178a252a083e SHA512 271ca99c64e529107a901b00168c4b8f2039d7410166b6e2fa75be591bb889d30d693c345161c71b4484d188683328b4656eac3859ec90900fde35c31be14018
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
index 21e882e70473..704a67c3b0b0 100644
--- a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
+++ b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/halostatue/minitest-bonus-assertions"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-pretty_diff )"
diff --git a/dev-ruby/minitest-hooks/Manifest b/dev-ruby/minitest-hooks/Manifest
index 6212234230b1..50a074f61276 100644
--- a/dev-ruby/minitest-hooks/Manifest
+++ b/dev-ruby/minitest-hooks/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-hooks-1.5.0.gem 11264 BLAKE2B 740df3b75ade3372fbf75ed7bd861c70af6f11d8cd1f37819272b98bc8cd1fad6ea09375856cd48a75499e0a692411c6da4f5aec212ebae91b47531c4bedda54 SHA512 4e7c969485c6e8d3414710b787c8880ad26b71de9f0b4a93ca1bf343deba426feee1cc06fcc51eee05c4880d851664fff045026d44728e217607e4cb32aa8f4b
-EBUILD minitest-hooks-1.5.0.ebuild 524 BLAKE2B 7237d937c1cd7b0b1f88090354190cf477bf5bdb958402a92c8a28d6655ca5aecf50b3adc83347685b986d94312245fd1ccd8234de4f1943b3c09126786261ed SHA512 3d82101a199d1622aaa5628c26e6e0b905c358a55cd56055086fc739f9e496119ca4de3af645949267654c9512627130dcb4fe6fc9466c0cb71a67a42ba58e0b
+EBUILD minitest-hooks-1.5.0.ebuild 531 BLAKE2B 0d4f94cf1156e54f3651d034cc1c8c04c3690e45a719b22eef37bed20655cb6c2bed3aa7eeceba80da8ee27611dd49b919b849ecc1edc4343ae0df02829c4868 SHA512 6e59765eed55f3777b24dbb2e56ca72f4bf627d95d1bf84cd992a45ac10db5f9514d658c2f3c70cac72092e8b777113e6dfce21935cafcb25b3ce71d2220c743
 MISC metadata.xml 352 BLAKE2B 539e21ac97fc133fce76db269b77e686bdd01610202402e26cf6d32b67cf02641e0093b5fdda5af861c2cdc2223c36e24806bbf7770b9066f09373596fc7e9b6 SHA512 f4f19a80cbd7f0c0c2465bfd1b86ae33d77dbbe5555f25eb0602b6f21d80b6160cf7d7a9f6b863440b6cc728283d75c60cd1e16e5b496eef34d72e6e5ec1b0da
diff --git a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
index e2f45e983ed5..4ed2bfe1bc3f 100644
--- a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
+++ b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 # Skip tests since they require unpackaged sequel
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-hooks"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/minitest-pretty_diff/Manifest b/dev-ruby/minitest-pretty_diff/Manifest
index ad06a2fe9920..2c856893f97a 100644
--- a/dev-ruby/minitest-pretty_diff/Manifest
+++ b/dev-ruby/minitest-pretty_diff/Manifest
@@ -1,4 +1,4 @@
 DIST minitest-pretty_diff-0.1.gem 4608 BLAKE2B 4002f4f2df03885a0c1f13c5561bbf48ccd707f44af44f4e91d4f6337a31791754b3e38160f088abb7aee8ec6d9abb6734d3305dec808033697611864559efa1 SHA512 e04cbbdb9cd12f2b60824dc0e20f5f3ee3e97b6cf3c8b290da941f26af120fd8eb47e33cb501380954ebfd84db817095f2f8a205ea8ee2095868befd443172b6
-EBUILD minitest-pretty_diff-0.1-r1.ebuild 635 BLAKE2B 934254f1396ffae5b87f364a726fdff1ee4b5e98372314912e40d7aafe0cb84252b7b2e55bb02c6a8a28267f312cf302f0d6650ba7905e1a4d2e94deb4545079 SHA512 3d3e7bb72589f8b80eab2f94443ea8fe1917b9fb218b5da49c8579f1f33cba8e8667a08ad595122c9c06c2bacf19180042d2c0d87394f2c4165c4228b6c4a49b
+EBUILD minitest-pretty_diff-0.1-r1.ebuild 642 BLAKE2B 75449d436221c3a3588a2dd6460af4d6a94c5d187148f6120bd9c6f1c67f73dd3378da76bcc601c2ba3fdc4a8c494f75c40f74bab3c2180c52e0ae3453b525c7 SHA512 7d665e8a9f64f67ecffd4cecccf880596e5b867ff40f7e8344cc31059d4bc889eef7ead9a60db8ea94ab4eff4010fcc1af1625c802e4f17585f3ad14e92f7053
 EBUILD minitest-pretty_diff-0.1.ebuild 666 BLAKE2B bbb218d4b6c16949ad76ff6844440ef1c57e31601b7b168ed7fc5ea722b3e2315ef96fccd6aa277e34cb5e965996abc523333fc3376701dbeee1143cfa7a78dd SHA512 353a933a435bb24292898e1d356381c5072fd6091bfe65f50783225beec8e4120d2cda6bf6853198066cfb9d269c64734d7512f084baed79a1cc933c27f15258
 MISC metadata.xml 354 BLAKE2B 2e5c062ea73990a1eaf3b5f4bd4f4cd1171e4590f0065dee618eeb46e796d75d8c6c9f7a54f7fbc384a8c4ea8a3d3c9071a48a1483b5cda277177430d06d9a5f SHA512 88eab741974382c3cc5fa28e639b0c5d8cc5f74d9e6135348e9ad663ada2ff2b882dfdc99472bf47586db537fcc1c05939b2c7bca6ddfaece511c58ef810348a
diff --git a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
index 4033a8a3a327..ade5492f1ed1 100644
--- a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
+++ b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/adammck/minitest-pretty_diff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/multi_test/Manifest b/dev-ruby/multi_test/Manifest
index 7ec3bf72707c..35f461594567 100644
--- a/dev-ruby/multi_test/Manifest
+++ b/dev-ruby/multi_test/Manifest
@@ -1,4 +1,4 @@
 DIST multi_test-0.1.2.gem 9216 BLAKE2B 9a5888937c82f87822445855eb15406b4250b3b42f00116a2c54360ab35b923d08c4015d90b14003679aac5d674baec8756b74aae4a5246beeefbae262edcc1f SHA512 a0d59f51dc959b7febe9c32853b5ac5cbbb3215e8810de5e46fe10fa42931c1ea89df477155cc8124264d608c5928e54fd4e1949e7d0940f927e1430bfd60a2b
-EBUILD multi_test-0.1.2-r1.ebuild 520 BLAKE2B 2b468d87e40dc3072769c0cf111ca60cf25e9623489cc1bd4a32ff9775a217f54a9d69d5d838f07146c5e86667b14baa4c63de2132e6d568a516b0213a95a7b8 SHA512 66dbcc90dd5a64772016d81494dfda968a6ed4c8313a971204e9257290a5492657fc30ec2d9f7007d78d22cf5ab820fb99f3ad0cbd2bd0116b1a9d92ef92e507
+EBUILD multi_test-0.1.2-r1.ebuild 527 BLAKE2B 9b148ab7a9cb2a9e110ca378338a71c6be7c99de414979227bee2c8a6f809a2ac6c916e0688799a232996e8a2c722925687c026912a38b6c5388f2e72123591b SHA512 28a54b2f0c1e5764139cc8e9fe7d01dde45beeceb5d4dc89c7233a2b6a4fa79b6766fd02faa88c5c9d78aa706fb804fcb18d13fc6ab0a7e7b46ccb693334d2af
 EBUILD multi_test-0.1.2.ebuild 550 BLAKE2B c580624a7e4be8674657f047a408847d4129f8dbd570bf836636ff347071aaf56c9bb34c74419e57c2c8ec202fda6c5adf5f1ae869623e64b4f118263c5a39a3 SHA512 d195dbe2ed2e4201a594f97b74dd1ad00fe8f5d2b1ed65a3623bdc687965fb9984a19fb7cf176e0f6052523570a801f0157f66948a3048c4305e15117650075d
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild b/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
index 3c4074d80be4..0057dfec65f2 100644
--- a/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
+++ b/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="A uniform interface for Ruby testing libraries"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nanotest/Manifest b/dev-ruby/nanotest/Manifest
index 2a20569c6d70..6526ffe80372 100644
--- a/dev-ruby/nanotest/Manifest
+++ b/dev-ruby/nanotest/Manifest
@@ -1,4 +1,4 @@
 DIST nanotest-0.9.4.1.gem 7680 BLAKE2B d6353949241c85df6286728938c017881763c332fe7deebfe641cf2ca85e65d9934ea4567494afd775d54171e5ebc86558ff1c376d6519fb9ff0f6d5addc1bfa SHA512 0ef48c747130fadb5f11818e131780b05032d57102a142293e29f135f75c1dd57c75005479880974342c257c645b3d2a4489432049683e3421743fa3e252cc09
-EBUILD nanotest-0.9.4.1-r1.ebuild 455 BLAKE2B ea20def2a3f89cd4b8510c06af5fc93c8b3ffadeea60b19edb08621904619cc61a4234f438c358f5bd448f7d75a81af27febbc0d27d6dda88b2649dbe9a1b605 SHA512 603188ccccf1789deea6b3a2c88d39f30ec096a11146ad00235c95dd150d5f32f5e20b15d12ac5ae5eedfc0c84321f4ba8e73ea1278c1ea1a8871e9955ecc4a0
+EBUILD nanotest-0.9.4.1-r1.ebuild 462 BLAKE2B d33a4f99bf840903f1c4069dc87c46ef6111889618556f58f683ad7071a7d352524e70754c856ec15e2cce4521bde32910e729cfb06945dc130949d7433d6edb SHA512 b50a52a2a15acc701e58a949373cf8dfa6a6675cae6db2e21841bc994adb6ab2441c7d6d114ba6536659e4f8b768c9dce8bcc0f9a939cf445782390b0ffed241
 EBUILD nanotest-0.9.4.1.ebuild 486 BLAKE2B eddf679d269316f5eb8f2d3cdc866194cdde5b89035a9de238c9ecfb21f99d4fa70df3c78f4f862255fd5376ef583b938f45a75f39339e2c297b757a6ec00f27 SHA512 d8a7a0cf2d7a985085f850c273a893d387a8c1442bcef39c77c114752ff4103b42058ab025198ec0d890b81a02711073ff3e1e2f19d577e0dcbaa600c25d6da9
 MISC metadata.xml 341 BLAKE2B e0a1896a9c6b6c9e1dbe1824237ab79ff59ef337a6c38ea9a37d3244fa69dd58a6b32456eded92cc73ab769b15402c6cc3fc557db5133ee44cf5b9bb666d882e SHA512 9211350efb92ba99f2db802a2507abb8ea5995b6ad8734c5dc7df8f3d2e8a96ed7ac970c68948946ee69ae3821ce39db987feb3dffdb37e54a10d9311d9b93c5
diff --git a/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild b/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
index b9be42e26654..0382216dc642 100644
--- a/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
+++ b/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Extremely mynymal test framework"
 HOMEPAGE="https://github.com/mynyml/nanotest"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nio4r/Manifest b/dev-ruby/nio4r/Manifest
index 3b3dc6f87758..310db6abe51b 100644
--- a/dev-ruby/nio4r/Manifest
+++ b/dev-ruby/nio4r/Manifest
@@ -1,8 +1,10 @@
 DIST nio4r-2.5.4.gem 110080 BLAKE2B 9aaed6cd4d74cf6ff3fed114d7c0c9162afb646aa6eadf294e0a6710dfca1e6b4ccf1eb8850c8704f3792eb6695034612813db08fbf74814556455db6ab48b4a SHA512 f7e383516ac6b55fd49339280e624a4c35f9cd2d31915b3d117189506522d967fc53a43cde75e8601f3fe0530e1322aeaa8c94a09289ddbefb2afd8d067341ec
 DIST nio4r-2.5.5.gem 121344 BLAKE2B 5e63c528055c4db6b52de7e3f1a0f32aa8b1776d21c303a16030376e1548860a72eae4c2fea09ee5dd458e49e2b4f0da50fe80e4e82f5dbba44b194dce4c35fc SHA512 e0d661b17f44aa5b469061a9b22c1cb565d01d1cf5318e4db39dcc4452bff99774c250853511c2b9742d61ccec123fec76d375069bad74ecb2f411c4495a4121
 DIST nio4r-2.5.7.gem 121856 BLAKE2B 3fda3dfb199eb2db20e76e4c2b27dc29e5ff7f7433e30e2499f65d8c1578d57bfcca749e793990c276b3beca7b869dfddb2302d62be1c89da22c3b97d00b5fbb SHA512 0173fd034e5fbb538bb465cf10a6ca74106c522e75129645911acf064bd5dfc60880ced3cb21a7b6a6ffdb32aedfb283d1f0ff8f6d591d3fcb427fef03abdf85
+DIST nio4r-2.5.8.gem 121856 BLAKE2B be79548761f52abab632b8e4660ab8557946079a51fe7f30c346f4f656ed2f8d0c8f2f463ed76a89bd4278bdfc0a0646ff2b8e0a815f97750836cb0bb250b9ef SHA512 3942403147882380b86f42c54a6d4e92c4e85dd3c0b5b9f473a05fcf98c041853e21d11d0481d1973342b5a4bfb59e02cfd523a44e9e45c3740627a45f7f99c7
 EBUILD nio4r-2.5.4.ebuild 1100 BLAKE2B 387435fbc31a02febcff2c3cfb595990694d3f05054f53901ea804e20b864a97d14da8db710c64ca4edbf7d6b52a621d5cbe59021eb7feab44d1a0a4c1aac152 SHA512 bd136bbdc154fd8325523b30236c9821087dd403a2471d1e3a60822fa1a3a71346019a9505cef341cfaaf3eaf7b9d1a386611869ac0494a5b60da35af70285ce
 EBUILD nio4r-2.5.5-r1.ebuild 994 BLAKE2B 89a1f8c68ba044f5f7a7c1bd0a1beb9f8056fc0599b99e4fa90e457aad204de61ccec0c3b77ec79275ebe920f111ebfdbac72ac6945a1abc67b8a5c1fc8a2f27 SHA512 879ed71eafdea52ec0dcd448347431dbb57a49e9ab9c6ef4b0338f5df5334ea8ccb6841325644f30eea9953fee63079124497dfad8fd2203e4168b9d3e1506d8
 EBUILD nio4r-2.5.5.ebuild 1102 BLAKE2B 4c8dd275a790a6d4c4e11cf06a08e709bd04bab18b433056ebe7b4791a63561a04e588217ec8890f766644d4ab96c900551bf84516012357233dd0fc2a27b666 SHA512 8a9f9c0ba5630da19552a841ce4968cccc09a1ae6c22cb463a7c76f292964417b242e30a053297df2b205756790e812834898dc2146b42c355fff60596213f55
 EBUILD nio4r-2.5.7.ebuild 950 BLAKE2B 024b0a95bccd583cb94f2f1665b7f3a10735a4b70f6de38241293f02ef61c6d03cbc302271bec9b7d5e5d192f8adb4ad1485330686e53c4cdac8d2b22afd4bbf SHA512 65f1b243c99063a0c42ddd786a9fd781e026bafae9db7626035c4bfd319d8a7b4ee3369d22432743df0685eb405dce9888b5de6d4fa0b1dba2bd943f9e5d3820
+EBUILD nio4r-2.5.8.ebuild 943 BLAKE2B 687d669e9c93a23d1b88fba9b79cd7e693a1c4708b6181ee794c1a3e9181f286ee74fa5bfa06db1dfd448c393427b5905a3ec300b54bee1298857b810c5bb17b SHA512 6afea9f62a9c8fee38f067c91e0270b0a4920de59a771c6c0d177977adcd5f4be48d531160dd0203304b07434b43b4590d527971254171246beb7af3cba45604
 MISC metadata.xml 341 BLAKE2B 97c99a0ec8181c92b543ec63b8d1a40c8cbf88905afe02e6f13fa5e8906755bafadf426b7845f2e9bb0c1244168796d661a44e5138eca44068b142a39d3ad4d4 SHA512 8ba86bd5b9b9823cca53bdf18023db7385332c31fcaade177d394a36d60b892fcc632fc91b60addb77fbe907130682b435ab6103a33c71f2ad172b345e6f389f
diff --git a/dev-ruby/nio4r/nio4r-2.5.8.ebuild b/dev-ruby/nio4r/nio4r-2.5.8.ebuild
new file mode 100644
index 000000000000..40f25d7abfe2
--- /dev/null
+++ b/dev-ruby/nio4r/nio4r-2.5.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nio4r/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A high performance selector API for monitoring IO objects"
+HOMEPAGE="https://github.com/socketry/nio4r"
+
+LICENSE="MIT || ( BSD GPL-2 )"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Note that nio4r bundles a patched copy of libev, and without these
+# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
+
+all_ruby_prepare() {
+	sed -i -e '/[Cc]overalls/d' -e '/[Bb]undler/d' -e '1irequire "openssl"' spec/spec_helper.rb || die
+	sed -e '/extension/ s:^:#:' -i Rakefile || die
+}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 850254e80279..2695f3fcb438 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -3,5 +3,5 @@ DIST nokogiri-1.11.6-git.tgz 5869434 BLAKE2B 222b6b9e871c124a14ac5d9ac3901d9edfa
 DIST nokogiri-1.11.7-git.tgz 5871407 BLAKE2B c0449b5cb8210d22be31f1f9a43c0c13c7ab21feae2d731bf30475fc21c69a3928395109936b9ff242a89da424a5192c8a8cb0ede9d05d6d9ac16c1d6e5a7f63 SHA512 f355185f490e0ce73fdfb496f49e36b39c89835ebef2cbe3aecbfc5aceb5a9757dc07738a709059c3e22b5808fac11e7b340b7ebbb3b2c1b5ea3df8aff0db131
 EBUILD nokogiri-1.11.4.ebuild 3140 BLAKE2B b53910356936e9e450ecc28220343ca68491ea93eceb070c4adb09d67e9017f0d9b20319ed2d2ba2494dc8cc40df220d49450001cb8f60b881f88564464871e4 SHA512 3fe0a0805e12b52556483f1e0a0daa6ac84a0faddad121d2fa0b3f62976f289fe5fb50881ce493d712f2f39408acce5c9b174f515da64fde3ae33c0b4dcc1899
 EBUILD nokogiri-1.11.6.ebuild 3147 BLAKE2B eae6d6a5380b6168830c9ed3a5e59ba71a567134ea7b9604263c27517b2111346cd2792f4f366ae1c0983d7a0b359f8f4b5343eddcb5dc72656fc861a29f3991 SHA512 0d8a1ba138ef5ae9305c79b7d3faa49e6a54dc312e131a83e2eaea7ac2b281c40ec3a473e11a46ed204cc854c10538b59ebc9d00968101158b5211fba74358a8
-EBUILD nokogiri-1.11.7.ebuild 3147 BLAKE2B eae6d6a5380b6168830c9ed3a5e59ba71a567134ea7b9604263c27517b2111346cd2792f4f366ae1c0983d7a0b359f8f4b5343eddcb5dc72656fc861a29f3991 SHA512 0d8a1ba138ef5ae9305c79b7d3faa49e6a54dc312e131a83e2eaea7ac2b281c40ec3a473e11a46ed204cc854c10538b59ebc9d00968101158b5211fba74358a8
+EBUILD nokogiri-1.11.7.ebuild 3154 BLAKE2B 92307c6fb1c305dc9271ebe5833a0f1afae1ad6b2a506ee0665cf98f182282eb755e601a84496b823a0f1393e584cdb1c9400912c8eb5b055cb6b950ced4db46 SHA512 c61d7a401a39f6d471f5882f6ced4b3c18625b33dacfc451d2a416f0fe4b3c7b9b73fee8754b87591e42a4d19de810cc3b12c9f986c40e7f14774684c9937a6d
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
index 0a05340414ac..e1c14225b0f0 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/pastel/Manifest b/dev-ruby/pastel/Manifest
index dae826bc8171..b48ec7e900aa 100644
--- a/dev-ruby/pastel/Manifest
+++ b/dev-ruby/pastel/Manifest
@@ -1,5 +1,5 @@
 DIST pastel-0.7.4.tar.gz 48176 BLAKE2B 3564aba28f9315d2f988dabdd0686e6c7a53c1b200e6e03519c1ebcde917503760d4f0d790e456c7a732b47535f692d7f5b88cf786e5b4236e9b2e8b5eee66d7 SHA512 a1ad8487babd1e788282e141538855370e09bb2745731670b814cb4572c54e0568955108f7657809b98f92b94d9d94cdd555e2db8146b20f80db98bbab3512ea
 DIST pastel-0.8.0.tar.gz 49560 BLAKE2B 646cdf5f7cd1e62e83d87cdcdbbdc2cb2619fd570b4715191825344346053b7bf8f8f18b177a8bad6416c13858ab007d94ccf5c16b71c123e4a3d2fd03cd0720 SHA512 8066b372f08e1d6312b87744309692e3e6fd5e2737374bce53087af45141ea4f14e67ead6dccb11df70f73cbb0611ab9e20f7fb553d87a349996bda0f7a3862d
 EBUILD pastel-0.7.4.ebuild 770 BLAKE2B eb2478af74a467d8a9590019cf5e32fdb85021c80628759909872cbed943b5aa2dd1ebf19df6d9d82908cee489ec8995bea4333050ddb06e02bd4460eff9cd9e SHA512 fc0ba91e34d06dc2ccc92a4745a2c2edb9451dbca2a8f7644c1522fb5e9fb85d39b0a4bf74b5399ff6449a565b6f19f60309a075e667b7cc3a60d15578266153
-EBUILD pastel-0.8.0.ebuild 711 BLAKE2B 8d5086e8aa2f4fcdb3835bf913c1f4f0942916d5246ebf6bf244c4ec7f56f9e7d3993f22fabc904332c0ef0f65a82794bdce99bb1e6dee6030b5f7c138681983 SHA512 cb3d9eed579eab09a593be6d297d38e6e7c03019bc98f7e4bdceb0d068d029da9f6cfe087383a8d61074eec83af5e573201ca8633a33e696ff520a83cbb65785
+EBUILD pastel-0.8.0.ebuild 718 BLAKE2B eb514851f3ddbacdc85980a328ea4b08a81bcd3c168e1bd34a4acd26128f56fe5cb844d2d78d71a966f9324c95204da31a8ee23b1e1c9508488001ac8de8b8d8 SHA512 68efcfc054a2291deb1dd83fa3847934eb01e1c5be45ab2b44bb347d9543a990f0c4d13844ae41d2bcb10761ac04b0e312f53393a9bf0f9f71c86af78140675c
 MISC metadata.xml 334 BLAKE2B 2998a15f4351a2089d4e0cfe14c2b29826aa0028924409cf2ab674ff7ca27568cca16b6071907dcc9f31cf284d1356677a9634bf943771518840906379b6a7a8 SHA512 a0f32d3a71a2969b1bfe46736321ae60a4dcf7fe304c3729f56fa7ea56c159d9bfd05563a2549335ef96308fa740c7c1469d1c1fef444fb080a407204be5e527
diff --git a/dev-ruby/pastel/pastel-0.8.0.ebuild b/dev-ruby/pastel/pastel-0.8.0.ebuild
index 9418a00698eb..03b8c84f98c1 100644
--- a/dev-ruby/pastel/pastel-0.8.0.ebuild
+++ b/dev-ruby/pastel/pastel-0.8.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/piotrmurach/pastel/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 23d458bcb931..b4b869c51e95 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -9,5 +9,5 @@ EBUILD pkg-config-1.4.2.ebuild 782 BLAKE2B c98e5b89f526daed4e5f6df0b5fbf74ecbe22
 EBUILD pkg-config-1.4.3.ebuild 789 BLAKE2B bbd800055fab6aeaf9330028be5c028d5ba213b60b334f816651b6a79248ea72503a7c9f2a54d93cffb0ccfc88b0dbbae604731f80f3218fdd322db6d2876a35 SHA512 7ce7ae53ba76ebc321b14a02041fafdab819bff40bef5acdec81e411ecefb19ef082b3bd2fc68fc8a21b0405033b0ee37ce71f75bd2869961588cd12c2b42576
 EBUILD pkg-config-1.4.4.ebuild 643 BLAKE2B 33bce683f9945c9e6c439a99ba790990ca0488de65ce251381d2d57eef8a778840cc1b62ce8129d5703bd0c143339f579d6b32e6d56e3493968ef80b8a3deb1a SHA512 f41236d2d64280d629c4131c0d5c4877eb675d2f4e2ac2c4eabd9bf9a91dbedd7c4f756068fb5dc2be74c8028ecfd618f029e22bf6e7dee69355f8b780d55335
 EBUILD pkg-config-1.4.5.ebuild 643 BLAKE2B 33bce683f9945c9e6c439a99ba790990ca0488de65ce251381d2d57eef8a778840cc1b62ce8129d5703bd0c143339f579d6b32e6d56e3493968ef80b8a3deb1a SHA512 f41236d2d64280d629c4131c0d5c4877eb675d2f4e2ac2c4eabd9bf9a91dbedd7c4f756068fb5dc2be74c8028ecfd618f029e22bf6e7dee69355f8b780d55335
-EBUILD pkg-config-1.4.6.ebuild 643 BLAKE2B 33bce683f9945c9e6c439a99ba790990ca0488de65ce251381d2d57eef8a778840cc1b62ce8129d5703bd0c143339f579d6b32e6d56e3493968ef80b8a3deb1a SHA512 f41236d2d64280d629c4131c0d5c4877eb675d2f4e2ac2c4eabd9bf9a91dbedd7c4f756068fb5dc2be74c8028ecfd618f029e22bf6e7dee69355f8b780d55335
+EBUILD pkg-config-1.4.6.ebuild 650 BLAKE2B 23492383e7f855c67740272c551d0925490a97437747b0f5a2f7802fa57f3fe504eebc03462a1db279d011bc5a06980b1ee09e23f0fc099d8e715b34159ac4bc SHA512 48e3d83a5c7485bd8829bf47f9817b7630f3db6645a6ac9682a1563b94e921adfd51d7b485915e570d33d9c19df5d2f00bd334adfbf7b83085b4688274f4d73e
 MISC metadata.xml 424 BLAKE2B f3283c73952daca20d85a5421afb67150aae553faa03d653686718ca5216c1a65ab5983fb669cc34003902b0a969275bd22e4d1765f3896c7e25bee301323f42 SHA512 40e700a309e3678157d9da4ef18e8f0178e23aa192949ac06acd6f8026d0d53d4f79c199aaf59e0e27dba17925f44a97ad901e0774c6b70583b24b09254eb8d5
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.6.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.6.ebuild
index 6ad94f426799..d93955918c5a 100644
--- a/dev-ruby/pkg-config/pkg-config-1.4.6.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.4.6.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A pkg-config implementation by Ruby"
 HOMEPAGE="https://github.com/rcairo/pkg-config"
 LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index a525b2b95fb4..5e1a1d08c457 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -2,7 +2,7 @@ DIST racc-1.4.14.gem 116224 BLAKE2B 67abd0e9bed46d7c589c62426943c8594d3b119328cd
 DIST racc-1.4.16.tar.gz 451711 BLAKE2B d3bcb72a69df255d5468054541c281bf7bd3225eb3ba1997fccd6dcd219d3a8890e3df7b43fe106ffa3fc63a8d8079cab83e7096b0737f5bbacf816b7c3bbfb2 SHA512 7cdf6a62449e8f39984a8b27706045e509828a93a72d112b22a4c467184a63ee23b4b2048ef7017846053fb2ff4021aa43d96a6147fa271257df584ab3d66f38
 DIST racc-1.5.2.tar.gz 434903 BLAKE2B cfbaa09c1b2e233e82228075cf979c54688e51e702cade072d42b2952100b74a53e536d904cbbf15cb04ffc74018b48e5b27a5773adf6240614c815250d47119 SHA512 73c68dd75fa35727fd93a76886dd77afbb7032271e535c6e885a4ede6822052a93a610dec8a1f84daf24903c749b30a185831ec96d651588db2a2524f3dcd477
 EBUILD racc-1.4.14.ebuild 1824 BLAKE2B 1707d38bb941dcfa20e737da4281c9d588830aee6a25c23698ee25cd83831e4c187e181e60c5942e30d4016f9b864354b0c7045bb3bf3811785547d37185c5a8 SHA512 8ff0842b29957a15d063bf7496127d24777af11881b307aa88fd9250345f90d59cd1e749cec8d44e7ffd46e02ccf120d142318deb446d199b75e850150bb95cc
-EBUILD racc-1.4.16-r1.ebuild 1923 BLAKE2B 629a32b303c87b6da05fd893315bba3dbd33d4cc6b35946e4d2c1f5a29c493dfd6ed50e0da2732815d8a38d0f3aa7b1fe0e8ff77c99b1e99f8a98f21658e361e SHA512 897c5069871a3e6ecb8f06000d90f6a50acae87dce2a2413112e82cc7be0b46499e5d9105c31bc6bcb7debb879726bc47ff6f53ab54b33ecafa1a36d1bc935a4
+EBUILD racc-1.4.16-r1.ebuild 1921 BLAKE2B d94500a6f0676626661bddf4c4057ee0f2b3bccb0f2673b04ec6fa1891242cab213feca9e547e4d1bbcfdf9a4ca961a4bc06aef0d3d7245395e4abeb6acad1cf SHA512 c29be6f4315ad7d761984b2284a06eb767edbc0353d30c1720847da9966ea84d15f87d8304d8fc04013378b455804fcdaf28f730e89569e1e67bfac1db588e30
 EBUILD racc-1.5.2-r1.ebuild 1742 BLAKE2B a770ba3bd89dd17eb51246b612bf7928f7740db981e9165d82a49a9a8bf42d1a7c0e8b1d0f7564802130f73407de7190b5eb353c4b5076529a4c48416f27b01f SHA512 97f772ca30602aae276256a3e18f15acc7e64a8467c6d2e1b412bd3ec6b735d515931b35b09d99e22324736d5c64debbb3acf602ecf4d70a2ecdaa56e677ec69
 EBUILD racc-1.5.2.ebuild 2001 BLAKE2B f9c86a3ee7065e818e7dd6d1f865b1c6450e77d786946d6f58cbf87d07c4c413e9838a5183bacf9ab9576392b803add944d8ba92da20cf9915e0bb58fa9f1067 SHA512 9e9aaae14b6171189122c8616450a246a7969b35cb8f1ae7fec1bba22bdb332ac5cb180a77636a069077c7fc03497694fb67e45cba0cfb0eaa5a49e3fee7de26
 MISC metadata.xml 331 BLAKE2B 67dac6bbbf2927c5fa694a0de98635c952eab8ceffa913aac7762c88625957b83f7bbeb22dbab5adb445b306e7bb5efed458e23b9a2c8137e65c36b4d12744fa SHA512 cf609ee98391504a83037f2fb2601b7b4f5dcb3ce58be9dfb895b8b961ed54e19d9782979cf24f1c1187087c1a8482e755d24abec089187870dd6361f17559b1
diff --git a/dev-ruby/racc/racc-1.4.16-r1.ebuild b/dev-ruby/racc/racc-1.4.16-r1.ebuild
index 4fd8f68e5a46..991d3f4dd44f 100644
--- a/dev-ruby/racc/racc-1.4.16-r1.ebuild
+++ b/dev-ruby/racc/racc-1.4.16-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index 01fb9b55d14d..647a64b538ff 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 1457 BLAKE2B c15c0f17fc7418431e08d0f217fd96c726863231cefb8ad5ef3bc7aee1253b52f7fd41fac0f1385352afd20cbee9bff0ae7f428f54d0ac155ca9a40429686bcf SHA512 fb4b23dab2d0462bec8cae3269a21e851d685684bb1fb7b288dd49fcd81c18323acd7a510fbaf2f6bdd2eb0b4e48581b35279260a2a4435ed46ee58a2c3af592
-EBUILD rake-compiler-1.1.1.ebuild 1460 BLAKE2B c15b7983b125df448ae02c57ad0622291b3972dfd56982628d76f3d19273b116296ccbce78566899fee5f1008a8594f9a7e47a2d0cd2f171f846685d882742e8 SHA512 113e8a358b68ef3da3fe667d63cc195e5691629c9e54f57096deda120cc711ef39c461eebda729d77d63111d1d891dd37984b0a48bd56a44b2f0169df87792b5
+EBUILD rake-compiler-1.1.1.ebuild 1457 BLAKE2B 5d29f50337f8c374466f539a228681552cc1cd70d73b281256172cbc5bd25310f3702a8ac066d5a8f0bd107ac8281674e5c01c41f42be5081ddc4559ee7f28f9 SHA512 048880ba68d2a15f222f1543f9d0f876486b8f0af044dc6ad94e1f8cd65bab5531d1b135648dedf2253a4980a750b8c224b7a64178ff15b5b1eb09c97ea7becd
 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 6838617a5121..e8d2e24d7f49 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
@@ -19,7 +19,7 @@ LICENSE="MIT"
 
 SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-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"
+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"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index 803a04551869..f876706d785b 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -2,8 +2,10 @@ DIST rbs-1.1.1.tar.gz 547506 BLAKE2B 5bfb64214d4fe0d19ec1c633b3f42567d2615fb0ed3
 DIST rbs-1.2.1.tar.gz 560668 BLAKE2B 25cd2c232a26527e7693d8fe80f0aea08c1d261bbff0d1cd9d20d5d6e06423d3b06e86bdd0ebfdfaf3224307dab683588959f23306fc48953ea2a96fd93b0176 SHA512 8c2e791cf751581720238a6fce347dd03378c42e5d7eb1495c191677bd443ec6294d082e22f589d28ad63ab2f4c98575f1619bad7e31e72af98914695eab2d86
 DIST rbs-1.3.1.tar.gz 632463 BLAKE2B c222430bfa14fa7380cab393448b54e4596fe3984a1d31caf5a41bcd75cfd0a795813b4278ab89d5453cb5f4d090122ebb217cd336c03b31063acf4f4e303b7b SHA512 691ee6466172189e52ec949d361ccf66b82e8343efed5ec36673a4588b8de78e11f03b98c93c90a3c655819a29d56bb502f20fedd40a0515da3acc1aae126f27
 DIST rbs-1.3.2.tar.gz 632507 BLAKE2B 5d67cf89ea3e832ba2418c840f151a351fe5f181e5acb8839d8832d7d4836a69fe72a65e253829af7f7f13453d5b0e15b116ce2171954150b3ac3f1f04c0b9c9 SHA512 63e05eb3613489a6966656bcd4ad61a7550d36aeeae66f80d6010f38fe8e43a43b025ace2e6b4f6fd71a02faf499c45dc894206d1bac9327a2f82fa6de40cfae
+DIST rbs-1.3.3.tar.gz 632597 BLAKE2B 810f090800ecb9507c07de6991e45a089fbaaa677337e924234ce7487a38a51ec5a3966c670c9d828ad351ea921c0d245c66cf0c497b672b3c2fdb04ac99578a SHA512 084b6e84858b2a947181602cdd707b1812486be86787afaaa18894b5ea71ad3b1438e1addb995a0dc24b65cd81f4f844b77f7a6fcaf42a653f718b39ff7c371b
 EBUILD rbs-1.1.1.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
 EBUILD rbs-1.2.1.ebuild 1188 BLAKE2B e6eb0b7b25631b6d65779d737381764d6a856d5aaf2369f695fd8d2330eb3f4f5edd67d5dc0becf79581b768f68df19c7420b5bb00cc12e7aa766b8d4f88036e SHA512 21a63c61d4078bbffbed89086551f649398609e1b655f8afc8ab78641a7a0dd978b9dfc37867e2d58ad42606549e90e6d68185ff5e6b4d8059175aec3bb77b30
 EBUILD rbs-1.3.1.ebuild 1188 BLAKE2B 9c309c9befa8e76e809c4aae1dc2f2e574293bc1ad273eafca746328fa185f25d4c566ec590e634422f9d7617fa9a28af622f790e2c8e6cada2f75891de75a09 SHA512 3a896d5c0a9723c5009a9271d7125f052660a52a2ba450721133d7546b3c00d8f5697d28191c6bc4aa4db1558f09f5593972d7ec663d6b44d5235021c1f70248
 EBUILD rbs-1.3.2.ebuild 1188 BLAKE2B 9c309c9befa8e76e809c4aae1dc2f2e574293bc1ad273eafca746328fa185f25d4c566ec590e634422f9d7617fa9a28af622f790e2c8e6cada2f75891de75a09 SHA512 3a896d5c0a9723c5009a9271d7125f052660a52a2ba450721133d7546b3c00d8f5697d28191c6bc4aa4db1558f09f5593972d7ec663d6b44d5235021c1f70248
+EBUILD rbs-1.3.3.ebuild 1188 BLAKE2B 9c309c9befa8e76e809c4aae1dc2f2e574293bc1ad273eafca746328fa185f25d4c566ec590e634422f9d7617fa9a28af622f790e2c8e6cada2f75891de75a09 SHA512 3a896d5c0a9723c5009a9271d7125f052660a52a2ba450721133d7546b3c00d8f5697d28191c6bc4aa4db1558f09f5593972d7ec663d6b44d5235021c1f70248
 MISC metadata.xml 334 BLAKE2B 06663250439d029482e4050e769ba2e5bdf9813dcb9244e06a260247d0275b9a172f0cf06dff21bc81d4eeb2eee2bcb73a11fbd3b9cede4abc7d4edacc6d0d5c SHA512 2e1b1fb38bdf7b589cfc2b448cdcbf7786179b92d391a7db698a1fa8ffc6b7a3f6f7f52356ba76cd367314bc6596a735a17743f06d3141fb817abb4aa63b1cf4
diff --git a/dev-ruby/rbs/rbs-1.3.3.ebuild b/dev-ruby/rbs/rbs-1.3.3.ebuild
new file mode 100644
index 000000000000..6b1c5644770c
--- /dev/null
+++ b/dev-ruby/rbs/rbs-1.3.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rexical/Manifest b/dev-ruby/rexical/Manifest
index b407a51c22dd..0489ea855c57 100644
--- a/dev-ruby/rexical/Manifest
+++ b/dev-ruby/rexical/Manifest
@@ -1,3 +1,3 @@
 DIST rexical-1.0.7.gem 22016 BLAKE2B aaadf4131fbc4958a6a17be02b970070e511dcb031fd6432fb62fb841eff36b4d5c41d8f8f295aed4ac376c49e736e5d795166f71957578c6cbe14fd6cea26be SHA512 f71c86bd9764e65ebe0c66acd5446b5da7a1b38aae9d33367d70bfa253eb53c178634ce90c883c5459622219670d4d32f375b216c3023a3109329d6930dec1fc
-EBUILD rexical-1.0.7.ebuild 979 BLAKE2B 848f2d33dc30619e662d435cc20aa3fad421ec9f2ef37bf2ca6895e4a79339ae87a766cd4729c59e996f025506102589537eed92320fc0b4ca7bab1c0d40fc5c SHA512 58059a9785613a20dd58b11fa61d1dfd40001e57cba9701ac739cc1b4342758cc13dcfaedb07c48938b0f9d05e535fe2e24dd7e642f12029feaea60b7886a89a
+EBUILD rexical-1.0.7.ebuild 986 BLAKE2B 538638fe99060773105561b56ffa6a473d731adcb52ea7082103554b1597ad4410e3ebcf7cf26ab30ba5ed1c59f0e5d02324c45251f4ffc84e2ccb7b61e95bdb SHA512 9092969b0fbe1d9867b4d00c6954c4889ad21d3b3245f327080877070949e815f20e496cd69e6a73e75d8bef24121a5333c3f49d0a2bbf19984af21fdaafe6e8
 MISC metadata.xml 344 BLAKE2B 308f72345dd9f7ce808e53f6b3883102b7c5b51d41ff822d28888d684abb4efdce86e24fbbb2d6ba46342c85e23189fa619343c467689a13b62382a5ea024d2b SHA512 96c6b9e4f3ca4aad95e01087158bbcd9a159569d7ccfc90365732e4ee6b9772506521c7e4706043897ffceccc98236077abf570efac9f0ddb24ef56efa65176a
diff --git a/dev-ruby/rexical/rexical-1.0.7.ebuild b/dev-ruby/rexical/rexical-1.0.7.ebuild
index d64e82c10cfc..e77b7ec191ba 100644
--- a/dev-ruby/rexical/rexical-1.0.7.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.7.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
 HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
 LICENSE="LGPL-2" # plus exception
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 663d3fa2b2d9..4087acf88c62 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -1,4 +1,4 @@
 AUX rrdtool-bindings-1.4.8-graph-ruby.patch 1857 BLAKE2B 4a36c4dee4e755bd39851c5c333fddacdddb53324017290f15345687b577caf9efb41d97ce55cc0bcd57554746e1a90d9a2d9fd92c0acd48b405eb02957e491c SHA512 1803247c9949a6d28d7027242604b5d61bc9da38ff22ff9d6302ca69743e49328372b4e51554c868b19a459c4341fa6d1291d09d62ea6a414a81d4558a7ef66d
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-bindings-1.7.2.ebuild 1377 BLAKE2B 7aeb6367a8f7cc14af180b129e6be0c077f029fb03e42c9d7afa0498fe673a35f119c8f1f1e3f1e6602795c0a0ab58b8681cab84cb6a597f5870627b2694b32d SHA512 f919eafdb88ee0903c99f202835dfa15449a1229512da5c2323f7803bad9117c3e5db211f4e32876d0437357dd016ec24f8bf32ed5a104a167c655b66c96f418
+EBUILD rrdtool-bindings-1.7.2.ebuild 1384 BLAKE2B 41e25c46ee6396873c3116b2b240b03621c0de7238f49d7c84959477ab18be9b794f8778d2a6c7aa134e5182b4a7541fd17cb3af8210138eb8d7a2218e4d3e85 SHA512 a2a48c792d77dbed939d51fdb8e11e8af6e2eddd4f3ac7b44eff83a90e344b59405516c14081b7bd50789415279ad5b9c0cc6b18aab3b9092850bda392bea7c6
 MISC metadata.xml 463 BLAKE2B edb3b1f3703163a7f6c28ea7d16a79158d108721a2a775e30967885fb6b7b31d6074585951cc5b1c7b640c88b0694b95f0aaf62b71df43a8d6d6a0d6f78e07c9 SHA512 60732861cde4604b50875b6bbba205f232a52c4d91e6e21bce49a46bcef824bc542140e73b07ce4c18518a366ff8c9bd34569895741b0ac292124f43b0f02aa1
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
index 888795b41f5e..d52b6b98cdec 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 RUBY_FAKEGEM_TASK_DOC=""
 inherit ruby-ng
@@ -16,7 +16,7 @@ RUBY_S="$MY_P"/bindings/ruby
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="graph test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index b386e584d0ed..3b01dfd0886a 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,7 +1,7 @@
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
 DIST rspec-core-3.10.1-git.tgz 398302 BLAKE2B 3ecd2a93b77435ef44dd7e52e2987155f71de3b04376dfbfc9c831ce075b4105f6a23a210f8508784b66c46f1126c188a3bd0548cc4f24060373b9c7e0b79101 SHA512 2d134e742e36cfaac0a52fa7ebd949391cfe58419956536a65fa3aefa2c7f3638fe19f7324ca3e0d2642cc5a9d33de11b09bd571844f1cfae9c077e5f27563d5
 DIST rspec-core-3.9.3-git.tgz 396080 BLAKE2B ea52a33586dc32af49a72950c7dbf24eef52a74891b2d7004ec4c5083e2e6d63c602f5033fba3a8ec1dfe6e8da349208b468a79b4e16aa5150d2fc8e93055c0e SHA512 f821ae3017c0fd9ac7f3ced0e81d0ebc54f2c17261f426c58a46c0bf1debb20efca7acc4b751b671e160de72ce5790f897bcb55d5d276fab228a4ea8d388a046
-EBUILD rspec-core-2.99.2-r2.ebuild 5100 BLAKE2B 44d2904b5aa3f222fad677c0ac53a5f46602e2fc5505b57f1e4b0d8c68bf8222b506d9cf0c1403a4e05292fbbba6eb658cec5727e48e4c79b6bb4af338d8d370 SHA512 6feaa484ecc73472c5f5909b82d9570fcd617c5eecd08e70037fc96f1695fb801f21baa12dc4224c79f54f615a0afb0b53c06d7758e215e08c2c34f034a7367b
-EBUILD rspec-core-3.10.1.ebuild 3123 BLAKE2B e3b71067f8cd09b4bb239d3e7ca54b82d0a601ff9e3d041461e75dc15a1e977269e26c7a5092a2fe1d7b6e631f17b747ca390b322a9f9b4fe0476c14a26c891f SHA512 a4a2ec451fc9d8c9ee39ef51b121c4cd1e1a99a70f6561d3a41bcc9b261200644a95689e55fde522ca55a512421d2c73d31343744d843cffce2e35a65bfb96bf
+EBUILD rspec-core-2.99.2-r2.ebuild 5107 BLAKE2B c48797239a5230b5aaea1a2e424460ec67943fc5ef2c8e8456f3a86ac7d91ce6e07872570d2edc3a4db3a55bbd6a936f909cf817509cbf5520a833efc083a379 SHA512 3468e46e9e30f4b36a7e23019fde3b25da777661dab314e5da17654c74dc6879ec473c133e6878857a0618e684dee5fe7178282466fc5bd1d2ec0f258cbedba8
+EBUILD rspec-core-3.10.1.ebuild 3130 BLAKE2B dedefb2079ee3e7b71536c29d61ec32bf51823ffd94ffe98cc201bdf0ccec63006d0e5c499062b672184228c9318aea8bfdb315de8ee90f3f9482972da3f9e26 SHA512 00a147cd6e865f2470da7084e79663dd0494ab45172feb29854e4b5252ca7f4d182920b8d4211301ffb2f7a217bcaee1cbce64689b9ce7ce0901383b08f050ea
 EBUILD rspec-core-3.9.3.ebuild 3122 BLAKE2B c8dcd45114eeb2f4acf1aea3934f9daa173ff57899cb234586f7e720508953d960bbc5d8bee29695140f4177660f0ab4081639a5b274d747b7b0f6b4a7530053 SHA512 6050a529b3c922a832403288731ac2b4ded5719693d735e5e6650c62b3a7a8a22a3091d2f66376b23a51538c2c36a61f7b638a0f5f6c701a58e4ac071a8eb076
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
index 1b261a08012a..75108e8aa0c7 100644
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST="none"
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
index 6c6820a447be..3896fbb54d42 100644
--- a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 1f2261af6e8a..2967fa8084c4 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,7 +1,7 @@
 DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc6adf7be6cabad6df6fd16195c71787d73495924233d793633fa041a94d796f63c9ff97c58e6f4a75bdc09dfbe56e770bb6a5c9 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a
 DIST rspec-expectations-3.10.1-git.tgz 212281 BLAKE2B a1872a7f71c198db1662eca48bcb34c054f05c16193395962cb47a7fa230c2f0f83bedee302a0ab6a81380a361640177ac3370d8829faa6bd362c07e3a551e5e SHA512 35999542bf70ff04a472e50434abb8815cac8bf10b680da458f5e0e6ee290a1a6356a22cc12f0a8a6310cf282bb6cd99f922fcc63a0cf1e252b167e451bcf7d4
 DIST rspec-expectations-3.9.4-git.tgz 206297 BLAKE2B c5dbebcf7b411c9cb5cd815dc06fb6f455e82181856661110f803b25f3910975f0676f3cf154e93fe771849363593e104e0f2dd298dfd3d8b1dd96a6ff991547 SHA512 bd025b89751b5b8d3c6bd61a90386fc05ca371e04247d93b29334bbb3eceb84bacea3f3846c20f08dbf53f174992b2dc0fe9f2bc449c4591188b5e428b1d8003
-EBUILD rspec-expectations-2.99.2.ebuild 1624 BLAKE2B 4cbf18eee1c7b553b3fa9fb96e7c08f9f46bdb681dae046f8305e1af545746bbf77331412b0b4acffd522425c43c2d773524e4e29a8d8f68364f95f9e52c3166 SHA512 3f7a1635a4f8bae6a87f9523b42a1cd55c8e48ae2e580d7cd7066da60d6fe98c1a449263cc8e593e451bd5f2eb245065548faf1d540021ebc83ff90eba614b8b
-EBUILD rspec-expectations-3.10.1.ebuild 1304 BLAKE2B e5ce9e9664d9535b3dc3f24d1493b2574754430af41bbaaaf65281a95948ccfe4f0a4eff26e688a06bb17d179c932d6311a102dc0ab367319b8f429a9f2bdf72 SHA512 0715ef7cfe98ce0acec7864836bf0a79d300a17a5d084f766ed549388cd17abc08863d2e41c9e06808a3f0f4dadee0764b86c0bd3b3c5bb7a682132336f76f0d
+EBUILD rspec-expectations-2.99.2.ebuild 1631 BLAKE2B 2615ea756770527b5995f6849579b352ad1ca23dead5059de56f1da33f515df4b6e6f1a8f27a2ab58d44c9d25ea0bc9a554e12006079328284573f588d01b1b0 SHA512 8e704765209e260ee881e44f5faa162e3ad68fce865bfbc2e9eaa163ae74e93063f07b6ae5195882c562db2d4a23f0f6caa7165f654cc7b9c1c8feea3af239d4
+EBUILD rspec-expectations-3.10.1.ebuild 1311 BLAKE2B 9dfb52e62ff11b037678e39e986602c9a9d9982b1f230f126d060e5d4fd53a77e942d8c63f7a466fdabf3d2a66fcbbe21a75609643d0874b7712efa5d46df7b3 SHA512 3f82f0e97cb560ebc7d5df647dcef05ef70126f108da01dbe2d6b47bc1a54dbd19d503e9670883f28a7ff51488a69abee0eba2001223bd4e46a2c29216c87afc
 EBUILD rspec-expectations-3.9.4.ebuild 1296 BLAKE2B 17662e721fd6dedf56a32fe1d93828a0585dea6e8e43a546f552ef8dc173f3db2bc42492c82d25c263dae964f1af6436147f53cf0a9b1518ecb82ed41edaf9f2 SHA512 847676fecf6abcaee6801ecd477cc86fac1de5c5bf98c2af411200ae5005dc5598a2ee2e1de8679f0e7a9d420be97360421557cc40afa9f1734d0ce69cfd5dcc
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
index 1e6a4c2af165..ba8439da565b 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
index 0372144c60f7..7ff27b85ca39 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index e3a18e0c244f..c4c5ad978f10 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,7 +1,7 @@
 DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602caba4252ddf5393949d940be8474110eb0697901afaaa878cd8d368f081c6644c0fcbce86d9d14b9f93f48c027ae808 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d
 DIST rspec-mocks-3.10.2-git.tgz 196040 BLAKE2B 8e975dc8480d4709f650ff27c517104714156c551b8b9ec04681132bd92be80bdb11867730f462e7fb6b672430246a0a11404dec5638b5350b57d81a8eac2e57 SHA512 ab11fa77c5f9e3bec2003dc8825d9582dcbffa08a36818bd9cdbe2dfd357113de3712c818deafc165530f9e4d2683ec06e54d37c37aeb820ae3cd592f76cf2cb
 DIST rspec-mocks-3.9.1-git.tgz 192772 BLAKE2B abcc8fc82648993e6a407a8c4ac4f5b146b821e1e842c1dd2b95824d8468aac0ea796438d77e376c897675f66bd2bc9024da8fa5ccaf60139ea296b388d542cd SHA512 f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f
-EBUILD rspec-mocks-2.99.2.ebuild 1510 BLAKE2B 73e9ab4e1931b72fc900af16ca022a6ce1b2c053e32904b5b07f4023e3347c3e9974e6e834c0688b3feefae0720bad1000526b2702779ab19f4aeaae468b9052 SHA512 057e150cdbe87559c945285ba98ab615fbd900e538b48aeeb73847563cdf9e0b05fe287cbcbb0ed687c644df5cd085c68d078ac02b2182f998392fef04ccd56b
-EBUILD rspec-mocks-3.10.2.ebuild 1435 BLAKE2B 0175a12eced10895ff2794e76c7864c6c0e73f24910e37e5a1b8fd0f86e4e82cb1db8aa5ee89ab18c3bf22f61a758e0dff89acfc03c0e5ec40cc8b545578b8ac SHA512 b4a6e9753e2b307f2ae00ce26d2d2fb4101e2edea7bd78b437653780e941c1fea655e19baa08c3ddb9c28bc93ff7ee3e9e86ae4e1620c408e729a34ad488eac8
+EBUILD rspec-mocks-2.99.2.ebuild 1517 BLAKE2B 239e43ae3232aa4a6e8924375186ae5379499aff4a13b773465b6204dc79f66202ec86f65b668356aa567576df38d65b5f914ce858f444f37e691ce729c93ed6 SHA512 62c49e43f65c7a36422b3b3e6ac1af4fcb8a4dfb337a5960b7a8397a996190826691bdecb351510d23371bce173db6334f15863fef9dbc5df226bf851d6beb39
+EBUILD rspec-mocks-3.10.2.ebuild 1442 BLAKE2B fec61c4afdf328f06e2c2a9d7e0f3644836376b9925dbf27a55e959956f9c049343a56e95e3272cf9d062d86d2914998309d6cd51a6f6db1b86352d90cd5adc8 SHA512 11f1f35d5b2d59292a42ad277b3676c5c34bfaa72e22bf5705150eeff1d94fc3688e5f9daaf2b11e327767d481102f1a1890329562c0a6e78bbae0146e9ed3e7
 EBUILD rspec-mocks-3.9.1.ebuild 1435 BLAKE2B 82814e4352a4fad72c57ff163fcfc10ef08ac94b3048b3b96fa5c5a42e0d2612a8328365b5aa8002e8ef97c3fdc85d592eb9faf6c2d90a3b0a4b0c7c2f11479c SHA512 a5b411e0173fa229e6e754335911807c10768311508d8a2f8c0decff12c422cc6185290c9d2a5b9e94c9b510c8e739ae7a6e6c5957bcf9d1becbf0c56beaa90c
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
index 13c8935cccb4..7b863760dac9 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
index ca8efabf8ae5..cecb8a217cbb 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 7f447ff4301c..1363aa97d83d 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,5 +1,5 @@
 DIST rspec-support-3.10.2-git.tgz 74812 BLAKE2B e6c7e768d0df05fa5e77055efcc69699192928a35029264300faccf500b1ce7367e74e9c2ae0f7f8f0a5e755692ac83b982d0a3dab3da3ab697ad2c5766aa30d SHA512 bd1fb5d737dfdbb7399d766854f0b173dad89675bac580cf65c5d42ab6cd04ad1773e7cfa875dfa4c6fac14f4ccbd6b48813bae5de26c931c804962d29b014be
 DIST rspec-support-3.9.4-git.tgz 72490 BLAKE2B 03c3ba8316a2c6a79faf68db87adf193b684b82119dd9c5b67f2954f3ce72cf03e3e16898e2f5d57d76aef37bb8fb08ab8dacf8aaef6d1445a8257e2be14afe5 SHA512 95be2e03c37117d6bc132ce466779a8ac3c4fedadfb2a6dabb1fa11601aae908e341c87436dd526bbc8b02040b23200c95bd113d0475405afdb4acd099c67403
-EBUILD rspec-support-3.10.2.ebuild 1758 BLAKE2B 7d85cdc4ae2e3164dd4e98dd18148aa3f0c86c9366b1a877e3b8be80dfc4b52dbb424d43a3f836fda6436b808908b793cfddc31a6c259d7c0b724913a8864f71 SHA512 6956fb199f908439ba3aebc0046f36eaa20bfa778452a76a8f761ef1d17eac56b0905d94292b02bef7ee944ee79efd864b06c4376f4ad68e52ba6b9727864cd8
+EBUILD rspec-support-3.10.2.ebuild 1765 BLAKE2B fcde701c0554886322c31ddf8b8b84e6007e8bfe8a601facabed603ae36247193ed5dc5d9db16246bc2692f5d670a0945db08f8ce16bf8dcd7bec377d0556298 SHA512 e5f98158b36e72bbe08ac8b8ac56030776e0aa6331751b9fca32a75b03809eb4f4ecc1914d642d3f859f5285c12ae33a4c329304b0569042436fcdd0303090d7
 EBUILD rspec-support-3.9.4.ebuild 1751 BLAKE2B a68477e2a7e7deb6af3b4d4ff1a31cb3810b1e545ccdb309f73b9665527f14952caf2471b4f04da4174da930c25da66a348c804c80b214ce0a889f93d87fdc54 SHA512 ef906eb462681dfc4d95458228a9f796af4ccf59cba157392492601382a4eefe629bccee1f7d6359c877c159de40e31ca604395973f08cf700843b7604ae15b2
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
index 03f785d0b401..420caa87edaf 100644
--- a/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 52868cd9b415..345710de53fd 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,7 +1,7 @@
 DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a6703998885418460b2c0bb59574ef144c416518099a77905ca7676852903804169d1bafc2cf8b3f79654b669c43762 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8
 DIST rspec-3.10.0.gem 10752 BLAKE2B e0af9c31a5263b0656341be7432e1597afa56af9bfc5e6d21f1daa7553e5bd3daf2b383a7e1a5b6f761a5880540020e7accd8d4eb6cca6e57d616dcc41690970 SHA512 dd1a3a1c7c73ae9c053e071d7851780d8cf61e92ddba24072b9f2c00a342ed08c81090332ba2eaf7ab96adac3fc723685996195e5cc584e15de57ff02a4455ec
 DIST rspec-3.9.0.gem 10752 BLAKE2B 212cebbae9e71b8a090757ec4b9902f20043eaf95b079a409247990e1fca4236e13d0e9a3bd9b9eacfbc2d2aaab19583452dbe08b298ca69a85e20f0163741c2 SHA512 a7dbb22f01d842a41b54c375d32d94c77a7b964d1ea5b1971e7c228dfd5dbfcfe03c007d687781addb93f819dde8de664dda307c266137fdd0a07dab96f96fad
-EBUILD rspec-2.99.0.ebuild 774 BLAKE2B 7063d9c2312d4609dee333c73b6c4f60f7762d27efc93cfc18f305aae582e55144635a6c7bd0178a4a86d02010cd932552c3fb801df1c31af46ea542c5d5de98 SHA512 481067515fd46d721fb2de15150e34b5d1652fd725e9af505a1ec3b074c100cdb5bc0996d305c9fa010dabbac2545c2980ad748cce101bd92aa56bf561fce104
-EBUILD rspec-3.10.0.ebuild 617 BLAKE2B 58609176ea6440751f5289841bc7a1d90b5060637b2c87191b1449c4564240dd506fa35ce949658ba4aa4a9047d9f9bc7489fde4faf7410c7ad1649ec4bde8ee SHA512 398f55c35d40295c6426dd0ad93d1702b64f40f2e9192f9b6801f345148c7597cbcf6e741d100851685cf224e8efaab1501f9b0183d459adffb44f4a9bdc15f7
+EBUILD rspec-2.99.0.ebuild 749 BLAKE2B fe4a984aa16df47490dda24c9480d1e4291b251d29495d064f1437c9da63f95fc4a9524882c4022b7111e9480f6e2d99fda43ad2b537dc5a1180557df164efc3 SHA512 e3b7750d2cfe4a1827ac0ca5c1c91b626f0ca0805e5b659d3a01d3d0d18a36528e32c004cd73c48c6a618d0fc88cc5d01bab9dc009ca9d5bdb7906366b423ff1
+EBUILD rspec-3.10.0.ebuild 624 BLAKE2B 260c1d1405c0ec28ec7a551f28297562482def48c4b8ca92052a484ccfaf88161c0305bd944751167bd5c4f81e365a0ec8f9f57d354d5216d9b9b5c72f20b3b6 SHA512 6d78ebd364b4afa15485128f0b947da833a011491e127beb632a178fc2fa6d811a3003b6db93698b2095cdbaab3504c72548eb48bec5642c8d3aa6c57bfc757a
 EBUILD rspec-3.9.0.ebuild 616 BLAKE2B 5ee7420b2f39d491dd42555ffd63047cbfb40d598b39912210b37a09bc0e7f7ba633a2e4f3d53ebdc3e6658bd1fc869cdb08cb85b033bb8d18fb4814439924fc SHA512 6654d32e2f13da07e83513131653defd0717f63563c30e631e68bbb5d2ddb5dc00649b19002d94dfd5071a6af56c0234f595f4b53705929ea61e936cb615c8b0
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-2.99.0.ebuild b/dev-ruby/rspec/rspec-2.99.0.ebuild
index c2425910bce2..ca99b70d6f0d 100644
--- a/dev-ruby/rspec/rspec-2.99.0.ebuild
+++ b/dev-ruby/rspec/rspec-2.99.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
@@ -9,17 +9,17 @@ RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem
 
 DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
 HOMEPAGE="http://rspec.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-SUBVERSION="$(get_version_component_range 1-2)"
+SUBVERSION="$(ver_cut 1-2)"
 
 ruby_add_rdepend "
 	=dev-ruby/rspec-core-${SUBVERSION}*
diff --git a/dev-ruby/rspec/rspec-3.10.0.ebuild b/dev-ruby/rspec/rspec-3.10.0.ebuild
index 4a03c0dc3421..2e91c81c069f 100644
--- a/dev-ruby/rspec/rspec-3.10.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.10.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 8f480dc654d3..984a20d98d4f 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -2,8 +2,10 @@ DIST ruby_parser-3.14.2.gem 466432 BLAKE2B 2694888b5b705733468eaf074f7f059814e2a
 DIST ruby_parser-3.15.0.gem 527360 BLAKE2B c27b98052c0850df8decf123a471fbe541190b611b6abc803bd868749ab2c020d15935264d607ee617b8e75df44871b2985bd11bf17062051a172df935fedcd9 SHA512 f4d64a7f86d94a324b47f9354b8962a5b96d62ac41b6fedae602b0c3782bf2871ec3d0131770d886c5f58de188a7ed71fa3c31c548f53b75ff04474962b442ee
 DIST ruby_parser-3.15.1.gem 527360 BLAKE2B bb8c486f5c1e5da82aa6f0c2e0c08a8fa21928cb6fe1468f68d93cf79159848ae9f88f9eaa446d4d2a41b3f49e2cc961048f3bd6341da639aac99755095f5b8c SHA512 221af19b0b3d035af1b57a098076989f93f8237da3a0833aa2dbc85d5840b343215a2e1421d4685f9cb49f1d85af8640623ce387fd5a22af440432f0699097a8
 DIST ruby_parser-3.16.0.gem 584704 BLAKE2B 87b9308beb4434565b4238bc3e0faaff4c19fbb9531b534121e1e707a9c890be3450137a4190e819ac3cd77241abdbf4db04f4378c2f1f682d31b7bc6325c26d SHA512 224c316097f11fc37e46d20edbfaa4f1bb29a7fc0ef5c86e6852d1df42673b50762941ca4f6a3386047e24fadeaaa8041f0322934b6df5a9e651fde5e3cc3703
+DIST ruby_parser-3.17.0.gem 586752 BLAKE2B 4d3b7d2105e7c4529eb69e4459f73255907ff17cd7008f5282a92598b014dc4a107e723e44d91e907e1fbac17ae2495aed3daaa8e2473d6dc20d042d6a3ae83b SHA512 6786f58aa4007b407e04669554add6d2fac2260c1ad12db78a4b7816799b7b30d163a554d93d4fa7f043a8e45dd11316854e9f42d63bbd5a542cd2f950c05278
 EBUILD ruby_parser-3.14.2.ebuild 1067 BLAKE2B 75ab55434aef8bf6d53b49948b9050b7cd43f9b1b2f6ec816f28937d17fcdc40742e153b020b03120847f5d6359f251fd9f51ece19ff1f8c6ee7fa75826aeb6e SHA512 f8a847213cc83752ed30bfddccb4d709ce9444591d787901921279a198b4b5c57afbde22527027cb51ac2a13a5c5b50d1731ede3991672b791476aed8636a281
 EBUILD ruby_parser-3.15.0.ebuild 1062 BLAKE2B 3257dc721852aa236a7150fe9e89d7bc00cfad1fc0f5085c79fb47bf6e014440f831505b58786187014b40398d12bb4aa8a63ddb643213986e8a9c75093e95e2 SHA512 98b0f594469af0fa26676ec2db600cbeabc8f7192ea0521351dc22bf27e753558740fe4781e303afc40a96941d641a5bfe17a09e6a2ed2482a9016ee27d16149
 EBUILD ruby_parser-3.15.1.ebuild 1069 BLAKE2B 3ee4919e24ac1fb28865fe6c3d306a9396a9e12c2968034102fba2b2f757c5789cd3a2c67547d6fc214f70a7d8583e07728f92f13fe1710071a07149ae313f0a SHA512 da9f9c9fe8d88ea339757011e3597c13f94fbe4aa4ed30370e6b5891925ac62732ad7e95174de12c11501d547972d29c66cae9c2e0996240338a1c01c68b7b8d
 EBUILD ruby_parser-3.16.0.ebuild 1070 BLAKE2B bfd247a8ea17c5f62a66160b8b88d65496076ae74acca68be18e7b20c710394c44952331bb7ba9d068ef116671cf47ee2f43bec81a2f70b1d5078705a1d0afc4 SHA512 35d466825f7c3c902363dceebc55a8c6eab72a8dd9cf00375af448875d445b2af8d0f9e1e6ad9789efadd4b4b8576260b4fa4572af03012f2357f78bd7e364fa
+EBUILD ruby_parser-3.17.0.ebuild 1063 BLAKE2B d16162910ec89410527e8b57f233557b48fd3e4d4d7a9ccb40f424733e12e69e8670123b9ed2123c6a4543ae7776c83cf2684f4142e0b7df27de7811065ddf32 SHA512 88bbaa9cadbd0862514b52c7fe388c12c0ac5d0def695e2bf11022b73e1f8fe48393008356fa26b6f3e09600c990306e4c62718f27f077be6992daefb446e2e4
 MISC metadata.xml 347 BLAKE2B 58585950079ff918b98a50b41060c516e4640d3d9e382bdd659ad6b17c1f0e138782cc7e94085cfae35faca53445beef7ce645113a49a47d42e912246ce8dd6b SHA512 ff141bbed5bdb7f610f87c5f8040889784f9a3a1f7a2f5802d0ee52a2a3d660d7ef2e8e3cc37af9c8b549433447f1d523b4864a6175efab755a3009c99c59632
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.17.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.17.0.ebuild
new file mode 100644
index 000000000000..1b67a5fa672a
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-3.17.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby parser written in pure ruby"
+HOMEPAGE="https://github.com/seattlerb/ruby_parser"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.15.1:4"
+
+ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.15.1:4 )"
+
+DEPEND+=" test? ( dev-util/unifdef )"
+
+all_ruby_prepare() {
+	# Remove reference to perforce method that is not in a released
+	# version of hoe-seattlerb.
+	#sed -i -e '/perforce/d' Rakefile || die
+	sed -i -e '/license/d' Rakefile || die
+	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index 2038d4f1f3a8..38ba0673bdbf 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -1,3 +1,3 @@
 DIST syntax-1.2.2.tar.gz 41485 BLAKE2B 09a1fc9a4172ec8e6a748981a966c891038fe43303360a3e5f2302aa0fb370b1098c7fd7b8a1fc2f022365ac8491b3e9f9146f940dffc772fb68fa8be5245986 SHA512 a3be7ac736d6c77833aa532f17485c076d34e66c40426c9c6be2dbbde87b2adb7154c9b3bed3439cc12577dffc01c8148e0870a0d02b3a02ffbf9fb1d651433b
-EBUILD syntax-1.2.2.ebuild 880 BLAKE2B 716824a9525010a52d3bd537731e61c2f461f56e4faf27afcc0061ca62e75011740d764b2c11179e3e69a8964d540933cb0db719de3e3c55f5d8e33eb0587555 SHA512 4c21845939ec72e85b642fbff9dca873b79644506008728af2af95deaf6f6c10a89d1442d1cc3b572467eed9075265c76d77e65a6e885db71f1ecbdf205cc94a
+EBUILD syntax-1.2.2.ebuild 887 BLAKE2B 35dbf45b767f2fad10088e36ea0c6bc656b2158b2980b1fcfec8a61113b876b6821bf1ad814ffaeefa9eca757172952057a0acfbbf3feca42c068b6261d9c449 SHA512 6f60abec4069192485f3d608cf2359b928a2faa109f6dbdebcc8da7d36064cab0877c5701a9f7930d3cf1e699828e3be5898d95fdf17ab8374da40f5624de5aa
 MISC metadata.xml 339 BLAKE2B 007757aafebca384bbe340c653875cdfa7c36a40d0fcc948f28f2a1eae85265100d30442f1bc05af9b4286f88f969d54bcf001ad9156aa0bd3dbbbf999a3f129 SHA512 d3d2406f489b687ceb61d99a66ec5e0a4539491277a5c2b5006e03414d14fbd5a25d7de00d2983ab629a1c8efb3e4999681734d07df9ef67f6a01c6abe3f0608
diff --git a/dev-ruby/syntax/syntax-1.2.2.ebuild b/dev-ruby/syntax/syntax-1.2.2.ebuild
index 325db2885e28..0feef614cd49 100644
--- a/dev-ruby/syntax/syntax-1.2.2.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test doc"
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/sys-uname/Manifest b/dev-ruby/sys-uname/Manifest
index 8c8aa11820e4..7ba1e1d60b03 100644
--- a/dev-ruby/sys-uname/Manifest
+++ b/dev-ruby/sys-uname/Manifest
@@ -1,3 +1,3 @@
 DIST sys-uname-1.2.2.gem 29184 BLAKE2B abfc9172cde35f946d420f8737a9b60b6810e551c2c361027614cd812a50c86bf8e92446c9a113d0e7e2f6dd09c6f40ceeb5a024defc7cacbb45c53f4b761809 SHA512 97a7a8cdbbc80e9d886be92d104aca389d82a1eac61b7a0172ce8fa27dbe751b0653dc8a027610d69051a79ed1fb2c855e2ee802308a74300dcc709c9e56b9fe
-EBUILD sys-uname-1.2.2.ebuild 577 BLAKE2B 625f2f0a55921048236f42aa1d4d747fe7bcc52dee87101be082de6942e9a8c24885501d453c1a2ab311c627336be471955ffea14392db78f80fb374d81ae957 SHA512 1fb6529050613c0e8e6a84d2d2ff1a97ff42851adeb4cc1b430cf78bf133d9a4595e2fc72a6c14f4f743eb153c5eed6a8154842bb654fa64d767d79c169f58db
+EBUILD sys-uname-1.2.2.ebuild 584 BLAKE2B 16a8c79062658413d594c9b34af425028c3c1e106609d28a6aae0dea308d11a20bab8252e597cd944b48ab05acf90c6e11a11085c2da7bfa285a2eb4fb5a2cbb SHA512 991f87ae580634996c45058ada80e2332956646ca2596c0096b424a9376470de2813bc34d0207a5c1fdb467bdd3208214d0309ee56c7492d2b77311d4b34ad11
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild b/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild
index af630f9399c2..78c2c52a08be 100644
--- a/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild
+++ b/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/djberg96/sys-uname"
 
 LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/ffi-1.1"
diff --git a/dev-ruby/thread_order/Manifest b/dev-ruby/thread_order/Manifest
index 29b5ddf3b7dd..2f5639afb5f0 100644
--- a/dev-ruby/thread_order/Manifest
+++ b/dev-ruby/thread_order/Manifest
@@ -1,3 +1,3 @@
 DIST thread_order-1.1.1.gem 10752 BLAKE2B 2d4677fa1f58cad02697d7946ec57080622deea6853b24d176cd3d77d857275d0f7b97a8701620e4afc7c4658de51a889b72fd7755c8edae03e00bf9b9b560ab SHA512 6c6ab86f7d0472d503107a7c58f84f24948e9418b00ad0076be40ac667f97f1cac78b1cc23692e73e37e2b3ebe1e2ea96c1b95c08d97984944860522d278ef25
-EBUILD thread_order-1.1.1.ebuild 805 BLAKE2B cc8342667d97eb72ed6388b691f5323a7608022243c2813bc7817192b9a78fa9b03a40e823ee6fc91d438c9c85b84b49d627fd4b5ee10fed8b32c4f83f5aad04 SHA512 e193cf0f7e4174945280d15c28aecb300c3b972d285f98b664628739f538d0ca7d3a91532de0c6f162449cab18e985771c35a726b6eabc9d659a8190302496c5
+EBUILD thread_order-1.1.1.ebuild 812 BLAKE2B 8dc442fc917063b75058afc4dddb6988e4eee73401a4780247182107f686ce94392e9fc2d71ce68567b7904fe8877037b87bdafb88f53851acbc715aae70684a SHA512 6f6d83a4bac1c8c3508529f502ea9e2b2605f593af0fd8ff9ef611f35e184c47b73d527533da1158168bec8d88670dcc8a1077b17fff9d176fa6b74fcfe3b7c5
 MISC metadata.xml 348 BLAKE2B 7921753d82a3bf12a78fd7e3d648800083c61fa6297bdb5a415cc7275ac01d14f1ea1ac6b4c470463b30b728f6867a8402f6d0536f439b6caccb6052c423253a SHA512 63fbdf51c3331bbc7294d04f9e2d397791abdbcfb3f193d28824cab257f19db0685f1ea696791f82fa56b3ae76b03dff65d558d0b884d0b8c07d375dadc4a38a
diff --git a/dev-ruby/thread_order/thread_order-1.1.1.ebuild b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
index 41508f0eef59..24c840b4c3d7 100644
--- a/dev-ruby/thread_order/thread_order-1.1.1.ebuild
+++ b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/JoshCheek/thread_order"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tty-color/Manifest b/dev-ruby/tty-color/Manifest
index 4b215ea16b34..45886c38e544 100644
--- a/dev-ruby/tty-color/Manifest
+++ b/dev-ruby/tty-color/Manifest
@@ -1,3 +1,3 @@
 DIST tty-color-0.6.0.tar.gz 12298 BLAKE2B c6d86666cbc8b46f2e5ef37556457bcffd4a92c65ae6a281ad989ded3d89ded8e3e3f5a1a3f91b009b7acdad9f2697d7100239c13eece4d2222c1fe1e8c2c2d0 SHA512 ab4f550ccf8fdc2cd0ad9368948819e4b77473a087510a4853036f18cfb21bab89e36631372cc5f2ee4f5d44c8c84954d14956d7cb7c3050e58d1ce19d11754f
-EBUILD tty-color-0.6.0.ebuild 694 BLAKE2B 56dd912bb9820cc383d9277b73421c7ec2eead1a0fad62aed08e67afad6da1763a61ccc317880ed60e1e262aa3d5a157aa057644902d1a8fd26003a1594a8d17 SHA512 889f228d62c0030ad3388e95f4f5ab34d9cfcf3cdb84872df961aeba780f1d7c1a643a25d5d90cf1436f3a132bf18b4416af1e78d5911a37012529dcb028bd22
+EBUILD tty-color-0.6.0.ebuild 701 BLAKE2B 95d87ce0db8d57ae640800404d396b8a8271ba33b899cc88e3c151e7da6c04be04559d4926588d512d68b6d3265074e7d2ce81b23ad4ad3fb3c66a886af2c8e5 SHA512 f1105bbdd000c64976ce34e5757b36fd776112103d820994b67296940965d9a35946828ecfb8b38d52b92ffe2e1ff1ae38751cfb41279a7fd4ac5794701e42c4
 MISC metadata.xml 337 BLAKE2B 0da0633a903a0e58597b8d73bb5ea564c6dc581191dcfd1311801e8e2c7cf399c6520095ac034a4d93b7938f57abaf098304a444d274432bd0ea1d497bd21003 SHA512 95fb8fed44f8a1ee5d26cd7fe2ab1f7117208a736b45e0d10e3d06f4b1174729ef3733efe2fc455fc398f17605c84c6cd050805578255073b2a1b64b483c082b
diff --git a/dev-ruby/tty-color/tty-color-0.6.0.ebuild b/dev-ruby/tty-color/tty-color-0.6.0.ebuild
index fe1f7aeef14c..f49ba1964e7f 100644
--- a/dev-ruby/tty-color/tty-color-0.6.0.ebuild
+++ b/dev-ruby/tty-color/tty-color-0.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/piotrmurach/tty-color/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tty-cursor/Manifest b/dev-ruby/tty-cursor/Manifest
index 4dccc228874e..8fe36e0dfbeb 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 c672f8a771c5538263ae1613e022d5a9dde10cee5cb8fe02d093c961536464805103246b064251b2faa8ea376f078a386c98c664a0bdccde24cbdb412a43da17 SHA512 ce4c9c922c5c066c343530b94cf0053640b48bee1d07308c62db9ee86f90c88058392400ec55c4b2ab92dbf353892c35d65c5d4b71cfa4b70f86742f26b7df9f
+EBUILD tty-cursor-0.7.1.ebuild 746 BLAKE2B ff64156452b67e857dd13d055551317a148fe8d719a4f175cb0de8969b00d7fcd3e873cd7b2a4ee0126308f1ce4f67c270295b91efcce7677d7abaad45189de5 SHA512 031a6735d3d9d8f3f7b65b081fa379a8ce4bdbc5377b5f43bb5de9bf33cc191e1c3e6c0326c1adfdcc84ae2ae7cba89b380cae9276c3ac1774e76decf45b711e
 MISC metadata.xml 338 BLAKE2B bdac6bb02b0cae81856493016a56c9c3b3b0debe5ac10b6f6756d90efdfd417561daad174c3c5efbfc779a37953b2dd94f79b8e0205fd07b8a4ea78e713a92cd SHA512 ca2c7a398c08e9c8488f280a3fcb603bdc5ae678da282e7c194f958c3691272fcf07d0473b61e8bb4757cdc5f3825a9b12f061a02c96f24ccecc21abb5f8e9fc
diff --git a/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild b/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
index ff798696483e..59e1350e225e 100644
--- a/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
+++ b/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/piotrmurach/tty-cursor/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tty-editor/Manifest b/dev-ruby/tty-editor/Manifest
new file mode 100644
index 000000000000..d0177663b790
--- /dev/null
+++ b/dev-ruby/tty-editor/Manifest
@@ -0,0 +1,3 @@
+DIST tty-editor-0.7.0.tar.gz 18140 BLAKE2B 917ea287b30588ffdf705d4ea06c711884b4dc7ba348f9acd08f0cf4e71c854ebcec6f7b8285e9fc1d45225f8ccb295dcb23b9493fcea2ac831c352cd7cc3680 SHA512 c5d6a781b0be00ee14e6fa30ff0bbb26fd9548726ff0e101163a8b4206bec9c7ffb520679041c1f174c2f65d76ea71177718a6fc5e06e8191dc5510aafd33175
+EBUILD tty-editor-0.7.0.ebuild 758 BLAKE2B ddbdc63a470fa4f7bc8f60c4f937361fc9dcf2ad94b245cdb229045f12c67a7d6f90e42931b30fb59d29ee4ce5d68dd4b2c33484113b79222dcb2dad3c3cdbc9 SHA512 fe495414737626f87f6c2c2810e930aa733290b635486b9322fe1246198408f01b6437074a2f912924998a78885597bcd7c4aa617136e750163eeaae8b2d97a3
+MISC metadata.xml 444 BLAKE2B dd362fad763ae5103f98616805bb6ea069c12b004d0318896e76acc91663c100c1b821a879fce1a04d25dbacb82bab45521b95df93769768e99a7d5125ef2d6c SHA512 2a6987bc5d706ae528db7f787ea3ff770ba8a5edd76318060438af6062f4e2266e06147b313cfb15dfc877418d59a4816ddaac1679d7a869d8fb7b528946e3f4
diff --git a/dev-ruby/tty-editor/metadata.xml b/dev-ruby/tty-editor/metadata.xml
new file mode 100644
index 000000000000..0454749b6ec2
--- /dev/null
+++ b/dev-ruby/tty-editor/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">piotrmurach/tty-editor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild b/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
new file mode 100644
index 000000000000..0291b8042b51
--- /dev/null
+++ b/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Opens a file or text in the user's preferred editor"
+HOMEPAGE="https://github.com/piotrmurach/tty-editor"
+SRC_URI="https://github.com/piotrmurach/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+ruby_add_rdepend ">=dev-ruby/tty-prompt-0.22"
+
+all_ruby_prepare() {
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+	echo '-rspec_helper' > .rspec || die
+}
+
+each_ruby_prepare() {
+	mkdir tmp || die
+}
diff --git a/dev-ruby/tty-prompt/Manifest b/dev-ruby/tty-prompt/Manifest
index eb37c2be5a63..18b8785eddb3 100644
--- a/dev-ruby/tty-prompt/Manifest
+++ b/dev-ruby/tty-prompt/Manifest
@@ -1,3 +1,3 @@
 DIST tty-prompt-0.23.1.tar.gz 554471 BLAKE2B ae39444b80781ee5c85df87f4ec2b2231b4551a23202070c4570d0e4807a3e4465bb026299dd775de9abf2b8cefe3157cb3fc5297cce4d248f6f8e2aca8c572d SHA512 5e2762d2b229f0aadde7fa09e43ccd317dbda057d829c9003fc6b18f9aaacda1416357af733c4e4f308041c8119ef344b3adc1954a6d31abf801cffdb1848a61
-EBUILD tty-prompt-0.23.1.ebuild 759 BLAKE2B 42666c98aa7906cd58486dc55f15fcc78ec90e71d59522233f4c6bd2f88f6f47571203b6d8ec6075f43edf696be2c92d3366aeb7a1538c6170fa7707b08ec199 SHA512 58da9f154244a48694ab22729294ba933fb4d8299372326d41d5849458809bfe82ebbc9bb70dcbf67ee8e00b853d7823c6f41d1fb8e7d582ac9a55cfbdacea9d
+EBUILD tty-prompt-0.23.1.ebuild 773 BLAKE2B 7f2b0e9fdb0f7750c5cab7e1bced8638abb13111e8446ac04d65849fca3e579315aafd7a457f545962f30b574c9dbf4f03a175584dfdc572cedf8f6642de4e69 SHA512 b509519b0c1264be2b15e4e9ed4ed12f27498d67e3f6d21334664418e352f392c3a77db3edbf86913884f5dc8685654fa45bd09b521a84cb976f14d3b1d5de95
 MISC metadata.xml 338 BLAKE2B 8d0c948aefd302a8cbb6e42214b6173a4f8c0349875576c0210fa01dfa14f8574638305952feacf56ddfa087d773ee7465e5c9c19977701c5d6e5af65b5b1693 SHA512 bfbf88166ca6a7bbf39b9a0696d750cd2e75412f732a7a4267e604071e3c4bc28af3a5297cdee5b27bbeae18359710c9ec707f390fbba70e219e94e6803a6640
diff --git a/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild b/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
index ccd06d3c998e..ce5427566113 100644
--- a/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
+++ b/dev-ruby/tty-prompt/tty-prompt-0.23.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="rspec3"
 
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/piotrmurach/tty-prompt/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/tty-reader/Manifest b/dev-ruby/tty-reader/Manifest
index ba4f1070fef7..96666bc15cdc 100644
--- a/dev-ruby/tty-reader/Manifest
+++ b/dev-ruby/tty-reader/Manifest
@@ -1,3 +1,3 @@
 DIST tty-reader-0.9.0.tar.gz 461051 BLAKE2B f2a48a929fc7ec0f6f98e4508ed50638e041939ae2eadf96cb8d04e4a771304e63648d5c3a85581fef3ae4740a570114e8d427637c6b3a05ece400f7963a26cb SHA512 2480f480a6ab0fa0854386ba0c31b5e78ff53a2d65b23825b13e50929337f56f8e38d1277f61509139cb43eddd8a933fadcd9d3c916c9dbaacf4dac1ec38dbaf
-EBUILD tty-reader-0.9.0.ebuild 841 BLAKE2B b584ed08adb309095c93d10489fa3cd8f674500a33c3c9b279ee8cb8d740d71c863ce64ccef1badba6633f04134f1cc2b362b747e1d6922cee15dd0cf4c95c31 SHA512 c9ed810321549eedbe324d65f59bd32b011a60484a227cd51265ab7ffdf14979d30a514dd507241586d4708715554439ee7ca3721be85d001f90f0b5ad263979
+EBUILD tty-reader-0.9.0.ebuild 848 BLAKE2B 439d4b29070340d888e4b0f594d58ac66e4a15b6708a052d5466b8d1bf6c2a754150ea60182ba147eef72a28e350e634611baeb25c1c5c4f3f924fda2db3838e SHA512 57dfadd9a452786c0326baf25c575f122371878d1cba2b883a810e6f4317c5d67dd43855afab34115e8af6aef7b857054fc9d029792b783b126c05a6556601ab
 MISC metadata.xml 338 BLAKE2B ec5b393631bf2e718fbae78e864f2e1a196b3612fdd306c9cd2dbb8e799a1022beb460aa144eb936d595658f89261ce62b774a81f09c9a2338f978d71302ab5c SHA512 abaac738d7e0f3576e26844c9b6315ed39dd3532816d2896d0c04464d7d80633b679d4579ad2059f7e3da5157a218fa977448fa0a7cc006d72652f7968f1c083
diff --git a/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild b/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
index a871eaddb9c7..3f2dabadd761 100644
--- a/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
+++ b/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/piotrmurach/tty-reader/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/tty-screen/Manifest b/dev-ruby/tty-screen/Manifest
index 66bb07867124..0574f28e67dd 100644
--- a/dev-ruby/tty-screen/Manifest
+++ b/dev-ruby/tty-screen/Manifest
@@ -1,5 +1,5 @@
 DIST tty-screen-0.7.1.tar.gz 11377 BLAKE2B 485b5610bc81524cfe525f8a837e99d13788da499dd8fa0f7c3be3f580ada63861f04652031e84817ef6ee49ce099c5fa97104b6634fc306d9ee0bbed0828ac3 SHA512 1ef5ce12cdd6337c47f09e5b6ae116985a80efe9f493d52c404496319f1377d4308cd829343d84f5c653b70327c033955232ca62fc8a134503a87a33a264130a
 DIST tty-screen-0.8.1.tar.gz 13019 BLAKE2B 9c9ccb49ae323ebc67c5bca918303586fb749813539aed32a892f3135aa392f6c77b078bab2c7bd116d9f152ee2745d72aae38a91cf4292d1f360085d88060ba SHA512 b0a01c49bb0c56f23c8b384a2d4f4b5c7168863a35c3ab7160d0f34c7d63a2b10b3b9f0f54c6d56e2424a8b16e6ba74268ac81af631976876fb37eb9c347c393
 EBUILD tty-screen-0.7.1.ebuild 735 BLAKE2B 60f62ca1543f4d20e1ba4531de9bed610e43d3021c1f8a75605c38e3e61fed8499dd8eeffadbe35137ef2ffc7a8522fd981959ee03bfa82bf8ea6ed1b76af657 SHA512 26715c2e8d7cd957a81b3651b85006f428b28ab90011cc34a73790d15c8a161a34eca8d69731e2aca67eee30b97233f1c8407f71a137b391e3bd0388d79c96b2
-EBUILD tty-screen-0.8.1.ebuild 772 BLAKE2B e69773032558d18ec1484c978cd1061fcadcba8f5ed7289d14312f6777a665c98c6a902fa25b02b64accec4931ca9c4d43338efe8ca4403ee53a1bff40b5e7d3 SHA512 8b11d03b7b925f0dcee033f6ce8b36e5f78e01f389404949126dfeda2a8c7d9e04d7482221c07d038a7e37ad7a2625c10a2925c4ba765414ac4bf7160d02d7e7
+EBUILD tty-screen-0.8.1.ebuild 779 BLAKE2B e9afa0dd5b5db89c524a2e79a381ca8d0e52ba949dfe3b84fea9efde95313f3cf5f9f39d7fc869e3970b6f55466a17c8ced04a372a3ae04b3ec12f55097a76a2 SHA512 418fc2a490184c3db8ea6dff2c4385c8b616b9104903b33d3c890d85f918a07416df9a35bd45c096d55899b7fce2bd7ba40b1f9292c2bbbafffbfd081b47c241
 MISC metadata.xml 338 BLAKE2B c7415669713e2429d8d7cf1a727208f00e860e959481199e88e03b8bb3eb47d1250d4815cd2c38ff544cf3dc53c5ccd05e717312f004eeb7cab716565e1db8c3 SHA512 d192914129dea0f28d740a3e0754b738c96791302af9efcecaae0de3d9a3845a37827d23876c9f5eac4f6533976f06cc070fea375b1b795c9928e651765577da
diff --git a/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild b/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
index ccb7ad58d426..b7292cb456f1 100644
--- a/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
+++ b/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/piotrmurach/tty-screen/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/unindent/Manifest b/dev-ruby/unindent/Manifest
index 1a1c2f723ada..a138e33a28fc 100644
--- a/dev-ruby/unindent/Manifest
+++ b/dev-ruby/unindent/Manifest
@@ -1,4 +1,4 @@
 DIST unindent-1.0.gem 6144 BLAKE2B 8720a1f6aca7da8cc8659f5a3943e9e56d15f9349efdd622857bbeffc39b04b61beb2b72a9cd337d516db2fbefd7aae02827b6705a81622ca5904dcdcc7575ad SHA512 1bab3352fc8da8b8a3ade8dff2f7c565e36529a79ca68c0a1ca73cdeca93fa507baa9399c6eed4fa020aa74dea6c4260a0242fa8057931a90bc172f138a5e655
-EBUILD unindent-1.0-r1.ebuild 502 BLAKE2B 4778cd88fb57a091dcbe2657173e6579af988168eb82861308040f36ca65934977d47a93cfc9999dfa1e6314e4ebad2b13c95153647def67ee87e1b725cd009c SHA512 34b014659b987bdca57e07200266503cd4ef4a9578c958ca22b3b25d86e3233bb69f7970174bcf7bc7998539453d06d1805025a0ab5cc4733822abc61c1b3bb9
+EBUILD unindent-1.0-r1.ebuild 509 BLAKE2B a89dee3c60dd401474ea475617a748018145f5c498eee9790de736c521708d22a7b3c3357fba599613c027450f7964f8bba0da21a1efb240ddadf8ac759934a1 SHA512 9a7bc587d7844a2de43d0f9a75d834002185462100694895be692989fe5b510d55de8b3e55333a07952a69337663a008e21f626bc8c8d92870e6a27caab480b3
 EBUILD unindent-1.0.ebuild 533 BLAKE2B ecd119a1b6dd26bde0b8b38e78a6236313027d7296ffb66355371c8d9b67b543aeebaf58e125203cf743eddd8ee196308cfc46c2698390bad280003387921e81 SHA512 05046ab219719e3cde630f2af113d9d8e8f9bd2e2b779b6f850006096b4280ef7e43aaa1f0915be9e2947da8766740ecddc0687653ffe78c9bf82b61686d254d
 MISC metadata.xml 341 BLAKE2B b95139c053f991f2430ac53d70f116c8d70757162b4bdd246283cd3e477afc58c0bb9ce2de89cdf27a7f54148f4958920b04a5066522a7f628a062a81f4bf033 SHA512 41d29de1617293949f2df18b503f931818137f002639578a75b7b6254d78f47d5b56f08ac028c37b3d399dfd8a1d63b2d3f40e22452f9a7ec8beb61c52d88e21
diff --git a/dev-ruby/unindent/unindent-1.0-r1.ebuild b/dev-ruby/unindent/unindent-1.0-r1.ebuild
index 5c81007c698f..079be974ac36 100644
--- a/dev-ruby/unindent/unindent-1.0-r1.ebuild
+++ b/dev-ruby/unindent/unindent-1.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Ruby method to unindent strings"
 HOMEPAGE="https://github.com/mynyml/unindent"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/wisper/Manifest b/dev-ruby/wisper/Manifest
index 473634a08a01..5e51171d588d 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 3334ef2bf03829a5d818399e252857e475264b5207ad6236728ab6dee0e5819ead380255b905786043ef4a8954521aa71dd468e045f85ee6790a8a152d925ba8 SHA512 7251ff0dbdf415d407b3a5b4f9404598c88d1f2dd5c3491c7729a84effc6bf781bfc8ecfd64a51b9e465dfa5dee31e765c302feaadaa147b0bf49c7360d0ceca
+EBUILD wisper-2.0.1.ebuild 540 BLAKE2B 026fad8e6ca60fa194d7e2dcf20ec05fcda45eb3b7d28eb05f1a35fec50257b8b8dcf6f82107122742bc257e79f42b3935e5340963fb6f77ab3e801e2ae844f8 SHA512 a681524ccb43a4dc0f0569508ad4fb034eed4e234ae05d362db0e135735e4b5f5fca0009bed51ccc11f33f6eddee69748b8c1fbac5aa47a23b7d998b9596d074
 MISC metadata.xml 332 BLAKE2B 4bcf48a0a3dd7a92b54195584e9fadc814a3d011956d08f51090bc7d32ab14baadeb61ce4d1549e77f6a52042542bfa0130683df08cf05f06c36107b5a300a09 SHA512 a996d5e847d5f13dc33afcc1db43aa46699ef56ac194d6ce4b572d9aa11936bd62cdeb46e8632b94d3dadcd4553ca692156a092084e7fc2e812bafc65b964503
diff --git a/dev-ruby/wisper/wisper-2.0.1.ebuild b/dev-ruby/wisper/wisper-2.0.1.ebuild
index d3ca01b8df71..a0b71a96f0c1 100644
--- a/dev-ruby/wisper/wisper-2.0.1.ebuild
+++ b/dev-ruby/wisper/wisper-2.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/krisleech/wisper"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index 9aeaaf338c1f..355f86a452d8 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,5 +1,5 @@
 DIST yard-0.9.20-git.tgz 921130 BLAKE2B 37b1b2524147a1a8cb36c3835cce4e7666e2c8d3d5c187eb402000fb251df64111c4f104957ac9d28bd0e8d9328eb1d97571337ae54479626dcaab3cf07625a6 SHA512 b7e035a3598c8ef32fcbaae57254c0fb0cba875606b434571da2ef754f3171b5c42a4b3a45bd4bf41bce368f6fb7e448567f601a9cab5fbdae695bbec1b73608
 DIST yard-0.9.26-git.tgz 930901 BLAKE2B 19baaefc54269bbc7eee053b42f2be85644a062cbf55b0fafb63748876aad3a3143767855f4ee7b10a1ae814110a6cf63c01e4055e054aeb31bf8512e793d80d SHA512 0f70a089d5e5ba33e326b0ae0cc84a2cacfc5a3f3080545d5fc5bb324dedbbbf65116cc9412b3496c09b2b6c15514e854a741a1fd7e2ae782804d6e4ac28fcd9
 EBUILD yard-0.9.20.ebuild 1766 BLAKE2B c8b561e62e689e9dd828cbbd4674a317ce50dddbfd63a82766eabd315ed4a1c8c7ab80f6a84ef77dd2181c164c9419d62ec491a94dedb7eaa6a4a66bc0a25e8b SHA512 9554cd54d05877dd5e3197127e463c01dd01f578a5d92249d2adaf27bba34a8627075a7ed3af229ab28c473b5144959b519d2006dfc034318d00d2e28e73b37e
-EBUILD yard-0.9.26.ebuild 2052 BLAKE2B d30b5c7a6d74d5241aea8fbd3d6a76c7f5366c30a2b752feaf89ecee93d9291489b26ed86436b868305edd768c19cee655f3222005a182715fe63aaf488e6b14 SHA512 b25e75ec195cc983610038bd7230313c984b473b2a5de05a787af36567ad44cf819a15bf46b5cef911d46ae305a8ae6c53d05e09faeb0863f091e2439a525da4
+EBUILD yard-0.9.26.ebuild 2051 BLAKE2B 2657e475e29d2b3463156b482be69881ecf632abe647a4e527ce3b69f5aafd7d0aa19de198ddb593f35a0b8570b5dc440ab02443b448a41b8217edf74dbef7b0 SHA512 6b3d7b93300a8788977794843b7e92e2b0344f7602eaa45ec4f9a3a85e4b6e9a503ac8d49e05d0d017686b70cc601673a15bb309f5d192c4fb0cf31f195d7a96
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.26.ebuild b/dev-ruby/yard/yard-0.9.26.ebuild
index 2bceb2a0fe8f..e621895337e3 100644
--- a/dev-ruby/yard/yard-0.9.26.ebuild
+++ b/dev-ruby/yard/yard-0.9.26.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 0cb6eddc097f..b80d283e0740 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/bytestructures/Manifest b/dev-scheme/bytestructures/Manifest
index 44ddf463bebd..2b66e2659c1f 100644
--- a/dev-scheme/bytestructures/Manifest
+++ b/dev-scheme/bytestructures/Manifest
@@ -1,3 +1,3 @@
 DIST bytestructures-1.0.10.tar.gz 103312 BLAKE2B 85f688242523efdad2eb2b54c07c83edd424ce0f41e9b060dd4a265d0344d2eb44376658580de8e8a7a15967a0412851c4bc2fd988dda0a877300a6fc42512ee SHA512 721f5eab256b28f7354b6051aaea87ad6baa062e89af13443907038df1621bc600c781c73f541dc1000f6d472168fa954f9075721646e8493cf2b7d9f46a08f0
 EBUILD bytestructures-1.0.10.ebuild 1057 BLAKE2B f0147eb2a634f720d8a9d2081781c9103c7611c23b1b017512ae22306fc5e9ce448e70a5c230d428c0ff62ec0fefa624e647b4c19fb5d53791749fe01f9c4ec8 SHA512 7790ba3ddf9e483b4e58e576a55e9c046cdfbb6c79a4349cfdc39104e420bb4773666a938900e847156ba2a54d37e07551be48c70129d263fb6442955fb8d4c1
-MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-scheme/bytestructures/metadata.xml b/dev-scheme/bytestructures/metadata.xml
index 2907abeb0c42..7a38bb900964 100644
--- a/dev-scheme/bytestructures/metadata.xml
+++ b/dev-scheme/bytestructures/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>slyfox@gentoo.org</email>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-scheme/guile-gcrypt/Manifest b/dev-scheme/guile-gcrypt/Manifest
index 06236c0321d0..b763836d5b3b 100644
--- a/dev-scheme/guile-gcrypt/Manifest
+++ b/dev-scheme/guile-gcrypt/Manifest
@@ -1,3 +1,3 @@
 DIST guile-gcrypt-0.3.0.tar.gz 55022 BLAKE2B 20d0948df250637c38a9e583ed9b8e0f4fd6d6142a60b4cceddab9a6a5c3062ffc7a0c8bc61187a1e942a137186ccc6e3cbc44b86d3c64f8cea91c67ae46cb08 SHA512 036017bbf10247bf474f41bb23fa0e824ed17241f169d0b36da5b20753502050bf6b14fa3a584076521e8f076732b75fe3f5e0ec9fb9ffeaf142319a98d36ae9
 EBUILD guile-gcrypt-0.3.0.ebuild 826 BLAKE2B faf02b92b9ebf46ee622b6a5fe4d185c9c3b79ee57a4f00dc8d6ed37ada01bca3e6b0758384fee21eda4b65abfec8a0b1f8f6186d6de1950cc3462846bf0efce SHA512 4c73edce849e9d891992cddd24171854a645bd56c314481a7431ebd34a09fec2d660fd114403ba109a82fdd332bd4dbdd4536847bca307134c32053e947a06ca
-MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-scheme/guile-gcrypt/metadata.xml b/dev-scheme/guile-gcrypt/metadata.xml
index 2907abeb0c42..7a38bb900964 100644
--- a/dev-scheme/guile-gcrypt/metadata.xml
+++ b/dev-scheme/guile-gcrypt/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>slyfox@gentoo.org</email>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-scheme/guile-git/Manifest b/dev-scheme/guile-git/Manifest
index 31e87b7d9db7..06b08f0e4933 100644
--- a/dev-scheme/guile-git/Manifest
+++ b/dev-scheme/guile-git/Manifest
@@ -2,4 +2,4 @@ DIST guile-git-0.5.1.tar.gz 305077 BLAKE2B f1dd4dade424045f992f9df9fb6c0c6e010de
 DIST guile-git-0.5.2.tar.gz 305493 BLAKE2B 03fa85e1943fadc5e7e2da4bed2b6476e5a275856ed087a1730815defc17586f43eb2006bc3970d6f97d42822bcf83ef3d57a74c9a7ddb2fb877f5f0f8237a49 SHA512 4ac55c04c555f1a343f842bbda80d54314697d5bbc28bc3967edfdfacb8afa07c673ef7fd651388a6c55b6977b041174732cde14359a0127f0b931364a7eeda9
 EBUILD guile-git-0.5.1.ebuild 1326 BLAKE2B c846b257e729e7c41fb7f59281373ede6d96321612d7a2b1582a1751ead68e8a5d671d4a70e28e0f4c71f08d29acb7a0b940992478d9138cfeebb09ed7ec2798 SHA512 642614d2c1aed98a302e9ee0283863724cc77af3554b2db387364ebc12fa619f8f4503eb97436e62238828fcc1369abc25327d4288da27e74429ecbaa8892b30
 EBUILD guile-git-0.5.2.ebuild 1592 BLAKE2B acade8b6015e3b7613a717feb2d83a8023c918853c938b4cc1446cc2b735d41d0500e3a47bf654db33554295c7d43b2de76269ec161b9626ac266b635de057da SHA512 b802a99d469cd7e7f53ba537877fd3e1d4434ce420625ccbd048220ffa45da27efda7e24da3436905d0be24048a72980b3bb0f916495fd76aaf20ef16b77864f
-MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-scheme/guile-git/metadata.xml b/dev-scheme/guile-git/metadata.xml
index 2907abeb0c42..7a38bb900964 100644
--- a/dev-scheme/guile-git/metadata.xml
+++ b/dev-scheme/guile-git/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>slyfox@gentoo.org</email>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-scheme/guile-json/Manifest b/dev-scheme/guile-json/Manifest
index 0fa8c195f3d0..dd1ccd1d49b3 100644
--- a/dev-scheme/guile-json/Manifest
+++ b/dev-scheme/guile-json/Manifest
@@ -1,3 +1,3 @@
 DIST guile-json-4.5.2.tar.gz 159925 BLAKE2B 5324da707f8c2962d06b2375d7844de0d2eb2adb0db9b4f2c9103c1bc9f0258b0ac29e6828d03d725e964f92fb85c1a7358b002a9b054c040e0fa25e6b4faf25 SHA512 ed189d49b0529f36f76bf16ea371ca6b9651cd40dd86f755062cea9fd93f5a4d8ceb571cc62bf0f88c404a2ab86ea6f7ccb682e81cd5bcdb78f0bdf52a39502b
 EBUILD guile-json-4.5.2.ebuild 672 BLAKE2B 498596ba5856057193b098e2020b6607e55ca1fa1476a5cfbffc039e3a578856bc29f0edb1cf61fd80c65ae96e4b8e69a87b2ba23b1ae0b7da87b4fee5242a70 SHA512 f0ea956f66206f6fb26223bf5fca8733535c70762b2db7bf98c341dcbac002a873cbda87f1c2be0f9f40a0531e850ef417ceb4517782bddf1241f5cc01865f03
-MISC metadata.xml 326 BLAKE2B d05d251d501000390dccc9c07656dc4a36a8c7b2fca80ccb9cc147ab6fcf270e03574e4614676a3e5c2a2a2b2c000463d3c73595a5f5da7941de840ce8b69a94 SHA512 08bc92338019e10651874c2a45053da7e5d61f9d0013849f3939902c452dc43abee97be085d8f6520dac35fc12bd01fd71e1a1ecaf48e5be947a203768f04449
+MISC metadata.xml 251 BLAKE2B 192529903b8f966db2ab52ecc2ca58c2f5d3a18686c070e272a275ab2cb877103675fdf3ed443d4294a78979f7d3afdf53d07d56ffa36247969d480bffb23e9a SHA512 4fda90c4191ba8ea396da2c4a434893d4b9df976a918e4fb5651acaf92c6efc9103b738681a3d29abe801a4ad09eecf5a4b0bd799dab5b5f1e42a34c3b27d918
diff --git a/dev-scheme/guile-json/metadata.xml b/dev-scheme/guile-json/metadata.xml
index 2cba0fe62404..8703fdc61595 100644
--- a/dev-scheme/guile-json/metadata.xml
+++ b/dev-scheme/guile-json/metadata.xml
@@ -5,7 +5,4 @@
 	<email>scheme@gentoo.org</email>
 	<name>Gentoo Scheme Project</name>
 </maintainer>
-<maintainer type="person">
-	<email>slyfox@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-scheme/guile-sqlite3/Manifest b/dev-scheme/guile-sqlite3/Manifest
index 67bc4f32f314..1e7748f8c70d 100644
--- a/dev-scheme/guile-sqlite3/Manifest
+++ b/dev-scheme/guile-sqlite3/Manifest
@@ -1,3 +1,3 @@
 DIST guile-sqlite3-0.1.3.tar.gz 25017 BLAKE2B 74d78592a7d87a66fe74bab49a5fbbabe66bc1f7967ef1323992a04cb4996f78759d2aa05827cad24298a9349fe0a24c94a0cfea54a9f09aeaef01c7dcc19d61 SHA512 1abc6646c775b4bf61d7f9f8a75d8ba4da2e67c9d85cd6a29c432acdb0ed68fcb6e7073693d06787d83c3ceb84bd512e71f53d18afeb0063e1cfc296b6873f79
 EBUILD guile-sqlite3-0.1.3.ebuild 735 BLAKE2B 74730782b62dfac397377107a01c9a1ddf045810427db15ddecb12834a009929cf2b0e502d9de5a62144ad37799904f503e3c054c58402d40262babd53a91bc2 SHA512 137b82b58fef900e6c6aaf86d0cfc1828812fd81f848208516c8f21997e7ac4b76023def2bcfc7449647106fd01103736d4d35bbee6b3a0c7ec9325e26fe4595
-MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-scheme/guile-sqlite3/metadata.xml b/dev-scheme/guile-sqlite3/metadata.xml
index 2907abeb0c42..7a38bb900964 100644
--- a/dev-scheme/guile-sqlite3/metadata.xml
+++ b/dev-scheme/guile-sqlite3/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>slyfox@gentoo.org</email>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index c50335031b3e..0bcce7b3aea4 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/glossaries/Manifest b/dev-tex/glossaries/Manifest
index c388722ee467..2a953c8d1ead 100644
--- a/dev-tex/glossaries/Manifest
+++ b/dev-tex/glossaries/Manifest
@@ -1,5 +1,5 @@
 DIST glossaries-4.41.zip 6285205 BLAKE2B df3dc8e6a6a8cd2fc741c6891a9d0322b5d012e6ed9428e5b5b016eece4bba72647081a482a338c0b895b6aaf856c75f344b1327f88e854ea8c8c246d50398ff SHA512 4f93d7568e280da96c8e32dbbdeab48c71282fb8bbc2e8b88b74976b74f5f466683b1b3d983aec7c8749ee9807d76236366276754639e5ba68888584850fd243
 DIST glossaries-4.46.zip 7028263 BLAKE2B 3d1479a50ea938eb3bd273b2a17db2675275aece241f4bab0329656966d2d28fae2e82268c667998b111fa35f1a04f24ddb3b5130e897c13e2cef965783f9606 SHA512 6ade1039b91b719035cdaef5381cd4904c4baccdd7b9f9a2e655e47a833bfe5b20c6775e30ce08645c0c30d3cec140ce92e36c5a872b40217c5a82bca2a6ce5c
 EBUILD glossaries-4.41.ebuild 937 BLAKE2B 0a4ac18d21b03496b97bc1f72a7975b9a698c2e46eca521f1d201cf604c6fb71290800cbea3552dc91a4a75110a40126f0b8bf15a798c4e22a0a2a26c51459e8 SHA512 06fbef0603f9b2ffe60be5404c66ff13e98721050cc91afef1f7f60396b4a342422ff2af52f586126da8969749a9bebaf00360e580d9481f8b16ea67aa9838a8
-EBUILD glossaries-4.46.ebuild 930 BLAKE2B a146dfdb9ffcb8f74f25da57384f6e7ae8ebf6fd78cb1e4177194533ba3a29a6956f974cdf1bcd5a6963a327bd783ba2756a386908d97e8617b4e564fba426d6 SHA512 f78ce77c11c47a92fb864489cfbbda2549a31e753dd6a261de4c36601d285567c2814e18848e0300007b36ef64c5dba3805ebba530ee3dc02674cea34c000175
+EBUILD glossaries-4.46.ebuild 937 BLAKE2B 80684fbb7633839283427f3ce79fe6be8bf66d36928ad3b05de783304cced0093e86277a63aa34ba980486fae9e43945edf3d2062a8068bbfa9c8b4752efa3a6 SHA512 bb03d6c61aa4c518146ee1ca3de52ed09b03d3fdb7376f46481f047a5c0624b17c67633769faed476948cc8fb1707066e51532c3604c4d5ca32df563a9e5b4ca
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/glossaries/glossaries-4.46.ebuild b/dev-tex/glossaries/glossaries-4.46.ebuild
index d698d9105176..80f1a3cbea0e 100644
--- a/dev-tex/glossaries/glossaries-4.46.ebuild
+++ b/dev-tex/glossaries/glossaries-4.46.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mirrors.ctan.org/macros/latex/contrib/glossaries.zip -> ${P}.zip
 
 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="dev-lang/perl
diff --git a/dev-tex/latex-beamer/Manifest b/dev-tex/latex-beamer/Manifest
index 888093dcf793..c251314ea8e6 100644
--- a/dev-tex/latex-beamer/Manifest
+++ b/dev-tex/latex-beamer/Manifest
@@ -5,5 +5,5 @@ DIST latex-beamer-3.62.tar.gz 662385 BLAKE2B f34563716092c83da5bfafbf4730e4a4175
 EBUILD latex-beamer-3.59.ebuild 1009 BLAKE2B 1ebcb4c3912b2eff4fbe2d9512c26ea5d6c9dd75c25c7ad9e14779d0b9a8dd2bf26fc29ab73a29a2fe29a2d9f378f1851d53f8c3af1f30ef4c7046771c2c2059 SHA512 ef5a2e3d08b0f9c312f0d0fe327bc1e7ae01e896a993f7ec318b7b2259b5cc915f47f43b2a2a62e7a90109d11bbc433082eecc8e9f1669f10245b270a0b645f6
 EBUILD latex-beamer-3.60.ebuild 1011 BLAKE2B d2f510738a518d8675c0c3ee51faf3f4b548055cab3759129f1f42055952413eded688124a4032352430f2842e412711e51453e3c32fdabc29261078e24639f9 SHA512 d919e99f7bb4b3c60a4141737c417934b931bdb570801c3bf86cb7f78dd38a3da292781df8b3bf880b5fc1763b056b4e31a3d0dab5f805343771e266bd050872
 EBUILD latex-beamer-3.61.ebuild 1011 BLAKE2B d2f510738a518d8675c0c3ee51faf3f4b548055cab3759129f1f42055952413eded688124a4032352430f2842e412711e51453e3c32fdabc29261078e24639f9 SHA512 d919e99f7bb4b3c60a4141737c417934b931bdb570801c3bf86cb7f78dd38a3da292781df8b3bf880b5fc1763b056b4e31a3d0dab5f805343771e266bd050872
-EBUILD latex-beamer-3.62.ebuild 1011 BLAKE2B d2f510738a518d8675c0c3ee51faf3f4b548055cab3759129f1f42055952413eded688124a4032352430f2842e412711e51453e3c32fdabc29261078e24639f9 SHA512 d919e99f7bb4b3c60a4141737c417934b931bdb570801c3bf86cb7f78dd38a3da292781df8b3bf880b5fc1763b056b4e31a3d0dab5f805343771e266bd050872
+EBUILD latex-beamer-3.62.ebuild 1018 BLAKE2B e750324c8e759aaa5a9cb115374790b67babe5d1fa28eeca71857b2e22573603142a5a8b862373421fe144099410239207dc0a3ece469d7f7d749d5410c9c8f1 SHA512 60e33aa39d14be20ffc84487f2e37f6d5ec0ac1c99f76fe0bde692f9526f886be0c9805bf5fe63bd983360c19779af108f3ac39a81febd13c3add36ac2148b82
 MISC metadata.xml 446 BLAKE2B da66d52e35985a328e4bc6994c84f554aab9eee80bfe3988e1f4a27c2c1f5a4f07100921a1ca21d9087ce7c800137d932b87632b86b354a16e352237e16d4ee4 SHA512 f119998212dee08dae68bf33317f5855910fa2565d2549de15c0e895bb2af6ee4e452048cc8ebb9cdf62b6e1cc06eaf6233defd14815cb500585ad7b205919a4
diff --git a/dev-tex/latex-beamer/latex-beamer-3.62.ebuild b/dev-tex/latex-beamer/latex-beamer-3.62.ebuild
index bd2b9ecb452b..2dfcbd3e2d84 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.62.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.62.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/beamer-${PV}"
 
 LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="dev-texlive/texlive-latex"
diff --git a/dev-tex/latexdiff/Manifest b/dev-tex/latexdiff/Manifest
index eca569574184..06ac91f8822a 100644
--- a/dev-tex/latexdiff/Manifest
+++ b/dev-tex/latexdiff/Manifest
@@ -1,4 +1,4 @@
 DIST latexdiff-1.3.1.1.tar.gz 1879814 BLAKE2B 1f537dff75ff12eeacfcdfa05c0199a29a0ffc4e8ff728b390dcbd35b3ba490e4e1c2e7201b7313335aabd8b870e764b9573d6322c34141be9d4fa141349db0a SHA512 bdc573b4fdb4d647ab3208f350e89843e4602e81c293665e1d08ff9b1b0d531c665d687be0185ff9ae229b9f43fd9bbd6aac437b6b1bcdca9d72d39f360b6136
-EBUILD latexdiff-1.3.1.1.ebuild 1165 BLAKE2B 22dc838a53ec04a1559e9071d007b3db0b8cb5d9b55347839d229df50cb319d27a0b676d8454b6307a58a273f08a9a8065280b34cf4a84ba76f74455cf953ff8 SHA512 682772d8b994e37ace8449d4036b6ba547189e283a94c97b711eaebecf4e9799c713f83cf650d972a463dbc8b3bd4aa36dfd1fb28650d622229f6659c34eb7db
-EBUILD latexdiff-9999.ebuild 1171 BLAKE2B f1b65ed80eb08cb4d6820119104a6f11404a9c831a10eaa562677a292f2e65a1586eb214c9fca304a37aab98a40dc3c6654d14cfc42d18abd93ed6e7b0042ea9 SHA512 4bde7fae0334539eb290615ae79b9ee2cd972a5a2dd9ff936680b5c8a369bb8c6ed95d40edb2ca4897c17493a398f4b34d72fcfc05c9e5772dc64924ed7b1122
+EBUILD latexdiff-1.3.1.1.ebuild 1172 BLAKE2B fdf294679f5c5c6b4339d802b30eb90d338794a70e631e7668e10378bb4bbd91b599db9e57229bfe774faec2da32a9341df8a75f312e4df802ea11ae5ba13c91 SHA512 7f55e977d5e1cf0218b6a11c61df9e3c975ed4bf05435e843f26b82f9d4b17c944d38e19acfbf1f6e8013407fc30435b45748ed0c02f09794a84d4bdcbd53455
+EBUILD latexdiff-9999.ebuild 1178 BLAKE2B d43acacc2d9c131550f87b6da08e767e1da5fe963a9aafa954dee6c7a01e58fe3a02f26e468d942292dcb2d9415749053586de6a22c99c5fbebbb42d7ab3ad81 SHA512 da722e0f3fc29e6e70eac4f49f55a6ebc57752acca505e0b0b428d58124bcb8a8b6e3264e36425e54cb58ad35e17143d7c229889116be0067d3fe7dbce51c27a
 MISC metadata.xml 332 BLAKE2B e23b9e1ce0df618f8130ae9291147e4c2cdd33e0aaa3f26e6900cf30f41dae7f4954144180ca0886a8a3370910e1e4bba21dd87b303e23e6bbb8ceea484e00bc SHA512 a0e324d4d38574f5f5af8003e9e048f4c0628022e5b6553d1ce4b20cf12424f15e1bea07c6bd6cf87b7f7ba54c9983e2c025b42d517ef31c9fa3853def50ba3c
diff --git a/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild b/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
index 157df8a32ccb..47552cdae1ae 100644
--- a/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/ftilmann/latexdiff.git"
 else
 	SRC_URI="https://github.com/ftilmann/latexdiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/dev-tex/latexdiff/latexdiff-9999.ebuild b/dev-tex/latexdiff/latexdiff-9999.ebuild
index 53f8ebb29d0a..1c85ac57a2e7 100644
--- a/dev-tex/latexdiff/latexdiff-9999.ebuild
+++ b/dev-tex/latexdiff/latexdiff-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/ftilmann/latexdiff.git"
 else
 	SRC_URI="https://github.com/ftilmann/latexdiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/dev-tex/latexmk/Manifest b/dev-tex/latexmk/Manifest
index 4296b15a11fb..63a2e1a2a2c7 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 783 BLAKE2B 211c57009909d356554db027246e7113153fb1085fe5d748fa9323ca8ca690b6f1cf4ed8d132fd75a3213ea8d9fb059be675e0b65dd2d9e9a72de008e3da4242 SHA512 caae6e1fa8ca68f022f820fed24170f59812612d0210c4f09d41f52596dca911dfd5d15943c72d2971628e7c736a244e78363735a9a9d9ac74b9a652bc498cb7
 EBUILD latexmk-465.ebuild 790 BLAKE2B 3b76a87568185539e32c52b6f48ed306695b6fccb77339950c3f7a34f7aea0e656bc8043cbb731831f64b63e95aae59d14eb1017ee96d0ee17ca9c9f8824a236 SHA512 e264c72b3ad2e8c4481937c908afa5eed885344c54a185c7e2472dbd8e4414752e09672798c184911604947c0bb1f7aaabf28723550a98c2d3c79f94d4a26a76
 EBUILD latexmk-469.ebuild 806 BLAKE2B 5dbed5e5ae2f770940e7730914588c643112f3807714b451bc32a3c04fca4d72c646dfaf83e083696acf6141e9327a1a70fcb48b53f2bdc1a600580c1093aaea SHA512 e8fefd6ba3b85db4802572c2ea30229a097a245a9b0336203c5c1b435fe3f8b973847985e555ba07456a8e2b6a45523b9c1eac07697d4b62d2bc6982c9f864f7
-EBUILD latexmk-470b.ebuild 822 BLAKE2B 57186a45acdac301e1203e6abf65891cad71d8e116b8b478ee28e7b56b390caed3dfc98f8372c2dee1ac549bc2030198c7e8580665c2a6a4899a3a6afa57675b SHA512 03dd5cf4a9ff4a84543cce80df84cc377b974f59e407cf792f620100700ab9a59662dcac7973fdba116d9ec20e16b3e26c322e842b6a88f025986d9ab5186a07
+EBUILD latexmk-470b.ebuild 829 BLAKE2B 4eb9eab30f2d312a773ff7b8b9e1dfe5ccf7c15e708ee79296de5ebe9ecf69cef4ea7cac978cc3a53b3422cec22aa36fd191fc542aa95ebb380c659b520eaaa5 SHA512 f3d8c15081227fc2b172c7d77f1e23665fffb10d10aecbdd5ade90cda17793d85b7a93538426fc1aaa69295085745e3202a62991070daca1edccc3a2241beeb3
 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 f57f8a505d6d..78e68eeaf3c8 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 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="virtual/latex-base
 	dev-lang/perl"
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index 594da9649599..d9f4a6c47936 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -2,5 +2,5 @@ AUX 50tex4ht.cnf 192 BLAKE2B 38a4543a22281d9b757e823e95cc8743a0c18b3fe7d6ce02831
 DIST tex4ht-1.0.2009_06_11_1038.tar.gz 2576719 BLAKE2B d04fd7b5f614414a200b01f11bea9880ea12561873fc08cb2f5f6f62167d6128cc50abbeeee0c7eae5d80046f6d3b504493d66262153c5a534fd1b56bfa1dfcd SHA512 868961c16da63ef20a8af3ec3e56a2b6c518a291cdbc3974f701773dbb55b844f0df06aae4c7b481c96b9e2ba29cb0f1ed1279b6f32340e4708e31bb67170963
 DIST tex4ht-texlive-20210603.doc.tar.xz 136388 BLAKE2B d379e35b8fcd37243e2e1e9b4c378b78004774c530031ecbc0f10b99041a9f785d2317054d2f41181f41d29718d3dbbd7e9632541013eaeea6d54fcdb3568f3f SHA512 de7c2fb855010f62d8dc7dda39826a549aa38daf5acb9e89abf19cf26724db5ac25f362a490058a1456a056ee9954eaa52985b9a05dcb89d6a947474593a77cb
 DIST tex4ht-texlive-20210603.tar.xz 908004 BLAKE2B bbc5ce16c10314120b998b5d2b527cf918c0991f47e6c7abe322dba62c1371a38f80ba971a971d756df548aa91d8c5b1f1f0ce3128a6dd33ac052ee465e0be99 SHA512 5a51db0b4cfacba33f9cd83b757d45f83c8470bb451a0376f328a1e78ffe39e5f22dcf2be6f9bed5724eed373ff020c8fa4aa38d9bf34bb45a05186e224e144e
-EBUILD tex4ht-20090611_p1038_p20210603.ebuild 3967 BLAKE2B a74f6746ddabe033cb910ce30b21a74f4faaf02b12c35943882576ecfac0e4a3c59798d63595724b98ffbde757bf10d736fd4c3c619d2d1bdf2db17a0882bfa5 SHA512 91378227dacdb8bb666eea172ef43579c7bb9628649714ff1c80eaed4b0a58df77ee4d1f6df903d582078efb2e852c56b5fceb06d041e0d37866f3ed8cd339aa
+EBUILD tex4ht-20090611_p1038_p20210603.ebuild 3974 BLAKE2B 5e1e2a6436c3071370ec12f59145073ebb84d7720e19a9bdeb91b4b5f3775b3e76d767a9c07d5fa56a02ac8471070bcd984e975f3251c62519e2d0638772772b SHA512 6d9525c963a4f5a8b2965978a0c8ce3a20ac56b8299e0956102191fa39f63aea0a5c22d13ed5b54775c5a4d7a906df4b179f4582abb73ca92a01d8ec96cbe624
 MISC metadata.xml 317 BLAKE2B feec903cd392ba092a0dc0f85e44788604c6fde736ebc5c81a930ed0109ecde56c0ba8220f5a56559b06fb1573cd2f159754dcda52c982601bb67306e2c15aa7 SHA512 33ba7a4fa5948eae907a650c1c53b3c5d3b71cef6ae9cc371017c14aca8e641f3badafaf3b3387b6638c877d10787d430bfc16a7e191b2b4327049a56a37b3af
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210603.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210603.ebuild
index 44bf075390e6..86af953521e7 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210603.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210603.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
 
 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc java"
 
 RDEPEND="app-text/ghostscript-gpl
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index b00b048fc0bc..6dd7b697ce93 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-context/Manifest b/dev-texlive/texlive-context/Manifest
index aabaad66c72c..b241bf7241e2 100644
--- a/dev-texlive/texlive-context/Manifest
+++ b/dev-texlive/texlive-context/Manifest
@@ -73,5 +73,5 @@ DIST tl-context.doc-2021.tar.xz 89005556 BLAKE2B 6ac54bb7ac15e19c1e648b8799b2644
 DIST tl-jmn-2021.tar.xz 40048 BLAKE2B e3f6d9bff7a3a5d438a688baf76c0bdd58797461c0020929031b07f47d49b59359d791ac237165284e48951075c4512619be880e2b3dc1bca761e4703a3050dc SHA512 2e250c3f115911c56f9b8d46d358fdef289c624a5b24c9b4213bbf7818bf42c7b778df55d4bf181bce115b388915cedc90ef7cfa99ee6ad8dd621e7853fc7c29
 DIST tl-npp-for-context-2021.tar.xz 664 BLAKE2B 5882669c85f04553ad8d5f1722f4f27b967367cfb109ef782a90b3fc1fe42c8a898129f296e61e6ab3825447e798544109e1556533aeecad01137396058649ac SHA512 6d5da8b6e2f2bb6b514d43e8b72157a81285b6c15cbe74891a94f21a09a313813ebcf9e3a0a12847875f13d5599436ada4e5febb694c0a480931dd62a23035c6
 DIST tl-npp-for-context.doc-2021.tar.xz 2136232 BLAKE2B 241dd233f3faec33222496aca1c6a9823772af68b2daff4256f532e2f5a28634bf0ded0c733524a053b6b985472009409fd99ac0daff719f8c54f9b181f632da SHA512 b3bddb0b9254ef9755628097ccb24ccbe86c25d3cba7a120c5d55da98a19061b716df1590a39323f57a8a698c5aafb5ecbe8b27d6505f2ba4acdf1ccdbcf82cd
-EBUILD texlive-context-2021.ebuild 3343 BLAKE2B e5dc00cc6a1b74d9e797e2ce1a069284ed85475a93dbfb28bfdda42bbd9a11eee67db1ba1e7f2d7db06fee96506a66ecc9bf674c53a9c875521cbe2d342e22ff SHA512 af8f497b4bffd38024b027f471f55ba9211a6ed727cc81ad6597b675a66ca86980b61573ecb2b5d9ebac578100b5f82da78a62e97adc43f87185e9216ebfeeb7
+EBUILD texlive-context-2021.ebuild 3350 BLAKE2B a46fc2ff5d6a727f705d7220441c895a07185ffc80452759300a64bd50c4d89525f060daf78b41adcf2791017c8157f41a6f46998d580e84b3313ad9db786ba5 SHA512 c88ba4de63609ead2adc420cd9d11e8233f38a2008e957b26145c29269e9025a40744c951628f02c7b1ffd0d4b8cb5d007bde8b62ba41aad8eb3830c59975021
 MISC metadata.xml 517 BLAKE2B 18bea3fc4db71d01c85ed3d254367f5cc9be257dbbb6d524c2fdaf87215efb617bc2268bd598f3c69bb8bd3b1bb1cf529268db118305fc6394bec447504c72b3 SHA512 6a05b0aa2626563c21edc01c8d842ac54e7533420e86d41d91a2f6730ef1dabcaf96bc2d68088a9ddf89fae4a932b9bee5dff998b75c1824d789cf6937995311
diff --git a/dev-texlive/texlive-context/texlive-context-2021.ebuild b/dev-texlive/texlive-context/texlive-context-2021.ebuild
index 7d59f4afcfda..f4f8b4ffb8c1 100644
--- a/dev-texlive/texlive-context/texlive-context-2021.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive ConTeXt and packages"
 
 LICENSE=" BSD BSD-2 GPL-1 GPL-2 GPL-3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-texlive/texlive-latex-2010
diff --git a/dev-texlive/texlive-games/Manifest b/dev-texlive/texlive-games/Manifest
index f764fa0f7eba..a3cb47cfd099 100644
--- a/dev-texlive/texlive-games/Manifest
+++ b/dev-texlive/texlive-games/Manifest
@@ -90,5 +90,5 @@ DIST tl-xq.doc-2021.tar.xz 210248 BLAKE2B a392738691f1fa0973e566e9e4b0fa6a04f68f
 DIST tl-xskak-2021.tar.xz 14052 BLAKE2B ae97410192952e220fbd4a1d70db31537039dbae3e62d13ec2a88c7e1c13447ba2994b4f13a01d3859efca679ef262e7164f01984293d3d5ae1081d2e8f333cf SHA512 202f61fffbf22346ff6ad6b2b8f411b2a8e4f58a9d53e5613810f2fe0b56b0c73867f0c1c293bb0c1f0edcd4ab73135ae33a953d3709d2d01060c1b638842dd4
 DIST tl-xskak.doc-2021.tar.xz 789680 BLAKE2B 561351c89556e6f281a55647a8c468fc6290a9ec4bbfa6f0624751bb7eda250dd51ee103b7826532a311954797abf9a614a15511451f145c338ca499a66f80a5 SHA512 6256df468580dcee451e4a650ebab0323c92024e9bf872fd683af1f10c19221887b5bd1bed7540a517eb6716627e689759b7ceaaa2944869e18591fba5467114
 DIST tl-xskak.source-2021.tar.xz 14172 BLAKE2B c3e73783732adf08731e33a3a0b0429093b9e2dff41be0e2ef5383bb47bd4f1c1f4a03af825da49c94f7c70994f8806ad30024898ace13b35faefe6824fece2c SHA512 11119e38b4f21663e36764d2b9e7da22d9493de7296590db4beefe185b2c9e89224806257d3880c78b07c3984478843b1886e37e5a33fc798920be221789de04
-EBUILD texlive-games-2021.ebuild 1824 BLAKE2B fdbc303d9ccef149863c0a620f4d85dc2a10bdaf791ffb24408d7690db073ec5c2e97372d73a149ac753eacf34a41c3c05cdee844600c5cb0d39eceaab0c97d4 SHA512 15cc5dd3dd709dc23352f3338e001fcfcfdfe91c4e428e49bd13341c55c0938c8ec035d211491483bc99fd47c9ae22adfc97b43ec5dc8f3ca1c9db7e2e469450
+EBUILD texlive-games-2021.ebuild 1831 BLAKE2B 6cac0db96ec7cf2ad7917782f92f3883d356c1367a0d528c2f98288cc5f694c172cc183a4e42e9948466236fa29cbb14d5952e1641c28be18c00132ddabb2766 SHA512 05eb97b7cb87f245addaba03e2026a228719ea57bd6cf6785abc556b623fc3ae148c7c1d774619ec98623ebccd67b76d9f3629f0f086e34c56f2994a27fb156c
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-games/texlive-games-2021.ebuild b/dev-texlive/texlive-games/texlive-games-2021.ebuild
index bf7424249208..b91c566efa2c 100644
--- a/dev-texlive/texlive-games/texlive-games-2021.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Games typesetting"
 
 LICENSE=" CC-BY-SA-4.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2021"
 
diff --git a/dev-texlive/texlive-humanities/Manifest b/dev-texlive/texlive-humanities/Manifest
index d70b5669055c..6d970288da7d 100644
--- a/dev-texlive/texlive-humanities/Manifest
+++ b/dev-texlive/texlive-humanities/Manifest
@@ -132,5 +132,5 @@ DIST tl-verse.doc-2021.tar.xz 422968 BLAKE2B eaefe89dd8466f17899f0d7997c0ca6b8e2
 DIST tl-verse.source-2021.tar.xz 15460 BLAKE2B 71614f3c4d0ab69a25affaf74e4ee25f677fabd372e2cbc0f09b9905ca8544b9b9ce52ce384846a481b394fdb3f4aaaa39e95c8dce7e7eb05c875aabe3f54b29 SHA512 ce1f07f40bd329383d8a0fc97038ee975d61b58eb0ff60f8a1894a6028b2afb9db58b7db599d252cb88fbc040d9938b7b934b6e8ad683e7f4de2be9a15b37820
 DIST tl-xyling-2021.tar.xz 10540 BLAKE2B 3ca946c655e20ca775d85746f8cd1afa9651a0a63fc5a4172ce0f0910b0e218368b688247041b815273138d5c7b394c6c02971c399361152ba75a2ea30e20b4f SHA512 5f78d2d61050d9ed84d56136fe59b4674f4e03a536015e3ebc3b9500dd8a08878164ce9fb1aa9ca9a1262a000149061f3fe22f10cfd68941316aa186b81fe923
 DIST tl-xyling.doc-2021.tar.xz 148332 BLAKE2B ca9f2cdd941042d3336ceae9ba2573a5609958d5413f9b1275cae43a0e908a045b295c2830bed7eb8ad0ac11121685c6ceb75be040d2d4da584d511d46296dc7 SHA512 7b4ca312ea917329260eb0a19bd504ac2f3ddfb5f066806296b164fc541bfe26e6ed1c03ffac5b52af6b19fb4ba1e77b5228ac4b4db0c2ee8f2394fc0f888d09
-EBUILD texlive-humanities-2021.ebuild 2190 BLAKE2B e83758eaa7858b79b4f8110f895e283bada6f0ad4c9522c4914d19012fef028d452fb40d93839f2d493cd016c69000f42690ff8fbfaed7baf0bfccb4ed0e8f7a SHA512 f66f087f770dbd8f471cdf38ee6852d66bf7e9cf8c7c8c0787d13bd697aaa03deba633cfc7f53720720bb9758a7b7337f8e7fdf656c3d73ec3a4febf708b03bd
+EBUILD texlive-humanities-2021.ebuild 2197 BLAKE2B 1805e88439320454e9bbecd44b38f6330b21700a2f18764d38f34ecc079d0571457447eed6e1c2a74a1a14b084a77fccf2cd9cac3e7088bf77f2ef654998c8cc SHA512 0f75dc1bb18d2120e8b5abe55347f9412aa24b4d7353c66733a6cc3e6ca2d0fc348b5ea2f07d3d7f286bb3361b82687e8be1377b10ba11fd934d73e8a873afdc
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2021.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2021.ebuild
index e130a47c861f..383e61aeeb2b 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2021.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Humanities packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2021"
 
diff --git a/dev-texlive/texlive-langarabic/Manifest b/dev-texlive/texlive-langarabic/Manifest
index 3b4445826e0c..4e07ecb8f0e0 100644
--- a/dev-texlive/texlive-langarabic/Manifest
+++ b/dev-texlive/texlive-langarabic/Manifest
@@ -56,5 +56,5 @@ DIST tl-xepersian-hm.doc-2021.tar.xz 1289764 BLAKE2B 021767e871d076dd888834fe344
 DIST tl-xepersian-hm.source-2021.tar.xz 9028 BLAKE2B 8c46843a99e04046dec990b1f7f95d565540064e61111d3f591305338a1db6ab1a46e7bdf4fe3eb47ac4f915d4b568ce3bdb768aab3f711d38a7f4ba8fc91fa0 SHA512 b43f74f1cbb9e2bdd06ca614f17fce49a18018cc3df9f88ec3a4732bd0b4bbf7068ac77a65d549806be4c07a2b7ab16c165fa7d5a9c9401a4dfb60426c5fde23
 DIST tl-xepersian.doc-2021.tar.xz 987500 BLAKE2B e7e3d10c12571d65f2516bfd4fcc4774a84c4d8989332c141454f9db720a83edb7f73a81c3cd15325027be183746558db5aa3e41f74b6cb256d45aa3b40989a5 SHA512 395bdd506072a2e234bb45f120ad748322f78657fa5c7013097af28688dfc7e58d2a7c865fd2c80592132fa46a02e35f65aa4bbfa752c5fb6b4b829a79a302cf
 DIST tl-xepersian.source-2021.tar.xz 74624 BLAKE2B 2d8075959efa5be76c2ef5fcaf701a47813f0e99e6c83af20abfd58046e1f777292c4a60fd97958ce4321bbd30e93bbc9257d0e7d1f0d5502078b59f15b7cefd SHA512 866a5fb8007fa600c50b343903a306d17e26d5616eb7fc14487ae93005cb7bce1209d382104021cd2b345ea02f2a4b058518454bf797600ad59e8f9254bee8af
-EBUILD texlive-langarabic-2021.ebuild 1229 BLAKE2B 202ce6dce6cbc54603944cc0083be900c54f8d75d44c2eb2a016bc47b469ee2f91ab558086462f24fcecfc0091a308654ef9a01810c9a232c6b252fb74c825b8 SHA512 531011c66d5928645e05f1c8aa4ed7a43d16059356dbd96a26c5c20d9c5c2544dcc3c3b84a1b231e8974bf834327cee0036b8f23eefe8949ecc2e8686a5f39ad
+EBUILD texlive-langarabic-2021.ebuild 1236 BLAKE2B 938b8ff2c380a618123c44bddada1b7d6bd50d87eafa5ad88b953c54f0a80e272d2b4ac74185755d958c9d8772c433d13377d505ffea6229064b81bd2e5d7881 SHA512 e7d3a9b7e0b9b80877f0be8230fc260ddd4d227b60ae08c24ecc45b66d6c0a0a2230a359fee0aed12643054d9ed233f75346d4a2b747f62e0f0180a144eb7dd0
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langarabic/texlive-langarabic-2021.ebuild b/dev-texlive/texlive-langarabic/texlive-langarabic-2021.ebuild
index 60105cc5228b..81842795ad42 100644
--- a/dev-texlive/texlive-langarabic/texlive-langarabic-2021.ebuild
+++ b/dev-texlive/texlive-langarabic/texlive-langarabic-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Arabic"
 
 LICENSE=" GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langczechslovak/Manifest b/dev-texlive/texlive-langczechslovak/Manifest
index 61e88c058079..4cdd52b8ba40 100644
--- a/dev-texlive/texlive-langczechslovak/Manifest
+++ b/dev-texlive/texlive-langczechslovak/Manifest
@@ -24,5 +24,5 @@ DIST tl-lshort-slovak-2021.tar.xz 392 BLAKE2B e9a6859383e625273939eb815db3357ca8
 DIST tl-lshort-slovak.doc-2021.tar.xz 708848 BLAKE2B df53e7fea00b3463e181e89d9799ea30f162339ca4bc7cba6313345707a978502d302cafe1aaee3eeb574551c39d5f261ee88d79242d3a43c0fdba818e889f42 SHA512 8ee79c17e5ccc9dbb9f833b4f8927b22e7ce368f49f4d016fb936d2a5ec964791d9473b679a037d704efb269dc6caa1344168927a90a8e859527c64b0410996b
 DIST tl-texlive-cz-2021.tar.xz 280 BLAKE2B 35d39f52ba76142421702c9f13deb8b16c6cc4d1ff7abfb1b91b530411e1551067ac539a7dee97dd435706b7d890a48e44faba12116d3c9e0f19cae48b6b4893 SHA512 d4332dc9fe838cc3dd6bf28bbde16f0f41b6f7f75877c358fadae2584cbd1d1fc4fe810569ac5c26dde3eba1fd26447eb6928fc8533a1c4304309a83b734131d
 DIST tl-texlive-cz.doc-2021.tar.xz 1197876 BLAKE2B 9ec7619155ff74808e0939a88506a03453c70d7d449a35c79c1d91320f1476b7984d7195f65f6b4f84c75d2462b8f1d8bf777b6540e524c85495a7ef7fe736c8 SHA512 ecfc4149bddfb665c6f48e65b719cc3d2240d0be151bec94676a188da08a203e84443b4c8e77590476c3194fae55ea23753a248c6f60ddd0b27895dea703a219
-EBUILD texlive-langczechslovak-2021.ebuild 1276 BLAKE2B 28f9bf44e7bb95d460c4a81d11a48ef15d44c77cacb6fb8bc0df1f5d2558f8ff0cb7798f832cf3566bd6b2d68d445fc342fc3017533725343fc5ed6a76e007fd SHA512 8553a8cb63d35142f04a0b458c9f2eee1d260cd31d0ea67a4d20ec4c1df2f1f7e9613b562f8479594fb602c7355b59ef5ce4fb7fe5f0fa4ea23f74c712800666
+EBUILD texlive-langczechslovak-2021.ebuild 1283 BLAKE2B 958fccfa583b738730c2b83570fe538083532c6e6c209414c028c8ec27dda4865e893827ee895e3bbb45dcdff72a21e064fd263fcc3afde8151104de2b0d6316 SHA512 1e00c42af4dbdf346bfed50014cdf65da7b4f3f2b745da76bb4aac7298c3c15c55ee8fd82bed263695b5d578ab9f103db04d450f7849f6197562e508287d6d86
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild
index e8c941b6322b..9041cb74d2a6 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Czech/Slovak"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-texlive/texlive-latex-2021
diff --git a/dev-texlive/texlive-langenglish/Manifest b/dev-texlive/texlive-langenglish/Manifest
index 6806f9c3bf1f..5c53111dea36 100644
--- a/dev-texlive/texlive-langenglish/Manifest
+++ b/dev-texlive/texlive-langenglish/Manifest
@@ -125,5 +125,5 @@ DIST tl-webguide-2021.tar.xz 452 BLAKE2B 07bd787f9ab87314901e00305d2a690c8f8e59f
 DIST tl-webguide.doc-2021.tar.xz 145660 BLAKE2B c45d2647c7709e37068a575a7c8969e923f9bbf17857109244abba1fbf401a73ebc8d7ce249664f6c93594fa4d0ae9f81e998e254ac62cf189cce12f68c58d56 SHA512 933ceaf7bb2400fff1bfc5ec26f60d750e0995680579fe487536ddcf8eca670e2b6d3fb6150b4ad659c6fa594b9db540523a878c74e9aba9be7710b5380e55af
 DIST tl-xetexref-2021.tar.xz 444 BLAKE2B 2145f8dd02b3f8aaa22125b49cffba4a703c97d35fe0772fe19f6bb2c59c3315ae1cc33c22c05802b7bab4c361cda01bb48b2defec7a4260f392157c648131f9 SHA512 5d2610deed12422bdcd7e177c339d3aa701887ff12bab214ce0b67f87abd70c569a0aab85f59f877399d440c75c712a4ec8ecf12f6059152d0d0c70f40f2b1f7
 DIST tl-xetexref.doc-2021.tar.xz 157316 BLAKE2B 193159a6c6f755a956522e68c863e449d24d1c1c4d9790ef8493ad3a5d1179e795b30e42cc019729eb25522444c51c3f79f25d24de2c195c2374682e016db9c9 SHA512 24d62e618217ec5454bd23662711e10637a7f67cc11880288bfcf301ab89ab22d87a6d65af8c37c99d924a4dc77b95308ef38eb8ad6bb81cf2900cbd3ebeeef8
-EBUILD texlive-langenglish-2021.ebuild 2580 BLAKE2B 80857b53957621faf4cf0110efa82e55c2402491aba29a1480f4f48d14f08ac82e20500464125fd29e22a3ac5f385ee90b45a5d6058ba8a27dcac83156e3463f SHA512 c8ee782a4f22e7fccd0504c6e20a65f634dd31fa1a775f1db69a30ce39c3b5adc5de1eba6ace4589e0be59624b87eeea99b6ceaf1c12775ab0501c53e1ffd96d
+EBUILD texlive-langenglish-2021.ebuild 2587 BLAKE2B 136785bf3aa6dffef790da53ac214cada603206df1dbf3b6e458e2d0da1b98c7cb4dd407338e4e1cdbb0c158322604229db6504156de57bb2324be65d295b605 SHA512 1795c9db4b1d74ec758acd0c796f0a4cf48dc77756b5af625cc578748a5b0ac9fa3f571d81348133756ecfce5b5ec5b8c437d9a9e6c925def0915004eb9e3b64
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2021.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2021.ebuild
index 712cd12624af..2e8d53d3e608 100644
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2021.ebuild
+++ b/dev-texlive/texlive-langenglish/texlive-langenglish-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive US and UK English"
 
 LICENSE=" CC-BY-SA-4.0 FDL-1.1 GPL-1 GPL-2 GPL-2+ "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langeuropean/Manifest b/dev-texlive/texlive-langeuropean/Manifest
index 8fa5885ab398..6ce3486084a2 100644
--- a/dev-texlive/texlive-langeuropean/Manifest
+++ b/dev-texlive/texlive-langeuropean/Manifest
@@ -139,5 +139,5 @@ DIST tl-swebib.doc-2021.tar.xz 492 BLAKE2B ad7af7e9dd007e32cafc62c8f23ef07cbbba4
 DIST tl-turkmen-2021.tar.xz 2216 BLAKE2B d6904f2bf02f641e64d7a35acdf799f1cbd27f7fd6da8e7b78083b013b6c9a985eced1e04a48d1884317b51561aaf8a26c3420bd8e66823ec3296494f658074e SHA512 437ff775642326f25f260280ca8d846e546f0f4b3c3082eb1ebaadcfc6ca5196967f82a00237367754b3ff307f983a828dba5c8117539d65634379567062a377
 DIST tl-turkmen.doc-2021.tar.xz 109384 BLAKE2B 0d916db0ea1e6c9ae0a28c0a7fce763539e0217f9d11784d534571297449820a62900c74aa17001951781be970f3ad1b818a1981588ad7569a598c68c0d4df07 SHA512 39014c9049322a1966951a242152b8774b2bc914bd620b6eba8c97e8ec457a1ed3547f2c211b3bba333cab21bac98882dbc9a1e9028443e7365780cf4d78b577
 DIST tl-turkmen.source-2021.tar.xz 3932 BLAKE2B e2c9c2b9c5be58a73373f36829f834e0c595a24bcd2d0222c237618240735c70514a7783ab1b523b6fa370d241e1c13461bb59436fab184a59abbd71c43745f4 SHA512 1d69e90b8aa74db44b7b89c8a3346ffbfca2b8514205a04610b5049e50e61b19ef063d9b3e9c99bf4c141d52bb03d600ad5ce1a13494b06fb7d13d12f47b860a
-EBUILD texlive-langeuropean-2021.ebuild 2925 BLAKE2B 40fe2153dd3812502fec12093dd35fe7a78fb8b162c35f8bbff95da48867e7aa07361b7806c048d7087b92551417996a98828adb710e651cd6f04b044961da3e SHA512 d627641de0b05210a63dea6601f85c82634fe9cd10c19827140e2c8148edc4b9ae511d18a70eaeb49e569f654cb671102ebd3dd0c2c799a7b142ca8cfb426030
+EBUILD texlive-langeuropean-2021.ebuild 2932 BLAKE2B 1caf8304a43c146da202731a251378936411f2557742b7dda964c2c6a231d5c156d9aca271c016892775e2aa39e7b681dcb9889d32d9defa1c6e7b5ec2e4dc0f SHA512 60c6c2a9b7e94e1e15014696590f903e0928d5562183d707e9ce4e19b7f87cb724683e44be11587edb9c6f95e9fa7e58be40243fb94de1a746c94c0ba5f8891e
 MISC metadata.xml 567 BLAKE2B 1529aa51facc0942b5c0c6e8463aef9b45946bac106e2e5a73357ccb738d724eb0bbdabb382d2d86e27b581f7f573f4544e8e4193efb763039a6109a326aeb00 SHA512 34c78d457f3560fbf5693c5e601a908605082a182c0933b0c00aff363f966e0251b06e5e4751741e0ab9359f3dc92b5ec2bf8fbe72fc0a09ae7a0eadeb100727
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2021.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2021.ebuild
index 492653144ca3..7489ece8141e 100644
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2021.ebuild
+++ b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other European languages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langfrench/Manifest b/dev-texlive/texlive-langfrench/Manifest
index d868c28a8b06..f84ebc7f7b51 100644
--- a/dev-texlive/texlive-langfrench/Manifest
+++ b/dev-texlive/texlive-langfrench/Manifest
@@ -88,5 +88,5 @@ DIST tl-variations-2021.tar.xz 1320 BLAKE2B e370238831a601ed76ab03a4d0054d10849d
 DIST tl-variations.doc-2021.tar.xz 75756 BLAKE2B a5bd15f625fff8af8fd2d21cac9a28bc233ad3b844c4bebf944c9fbb0eb02cbad8b2adeb2a39f4470719f87a7b4b5d566059aa81d302245ddd361d5d64bbc606 SHA512 75d6d8afd13f6751bad23d0adc58355d75e355554dd95971dc16ac148150990e1362ec211a3f3e6fd832ce231dbd08e50ed9d44856c763e47ddb5374b1b182ff
 DIST tl-visualtikz-2021.tar.xz 456 BLAKE2B 7ad4e16b1a90cc47f300e1275c645c3bd0dd7c86b4a2877222dd8fd957b8de20d78f64e6046f94064eab7642e7454ee888c8134bae91ab3121f4231951bb4f9b SHA512 fbd3f158e72dd8b0ebd3fe9c33fe47127ecfd38bc0feac3312d569718672e9f88165856fa61389b307a211071467c10ef73981178cc9afd8ecd720cdf627dc1b
 DIST tl-visualtikz.doc-2021.tar.xz 3961060 BLAKE2B f667101c5a92289ee3c0f65baaffbfc773914c8d4b5204232e4979f23191b2f568b42dbbce0a06a7e84ef33b4ff52e232ade293791e6f4380725da75400617f1 SHA512 16a32e64ef4d00d2bf6f99fa05b35a071539d71944227eaa5b37762e838a62b80ee4b227a8bb9cc49b831bf19976421684872f8eb104f37365669907e9621a6b
-EBUILD texlive-langfrench-2021.ebuild 2005 BLAKE2B 97038fc1f847e28017a14f9ddf46c92ce717463ebe8ba0bc87327f19450895839e59b93fc08aced9510523593426017f18c2734279206b331c487deaa2077dc3 SHA512 6b8a8f47481de98acee4dbc704df5a970bfe5239d19deac8f94916b48b998d86d0efd86ec528a7871540fd683df30ede6e8e3ce8bc9f6e636912415369605d46
+EBUILD texlive-langfrench-2021.ebuild 2012 BLAKE2B 89166a7cbdd33a9e87680aa1220c64d776712c6a4e8cea8ea0c6acf733b4df65a06b283358ad280be3e9298f461e2e1c495d443bc22a5cf2abb9e83ecb4bcd6a SHA512 ed32efed3eac2747693e5151750b92f4c8c9f164e481db00f85b678277fc40925fde01498d4346eae25562526c44cfb18356c236e3e58fe5cfc2fb57de7424ef
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2021.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2021.ebuild
index f13f8f06124e..ab944b8f5df7 100644
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2021.ebuild
+++ b/dev-texlive/texlive-langfrench/texlive-langfrench-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive French"
 
 LICENSE=" GPL-2 CC-BY-4.0 "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langgerman/Manifest b/dev-texlive/texlive-langgerman/Manifest
index e99d795bb602..4bd565a45771 100644
--- a/dev-texlive/texlive-langgerman/Manifest
+++ b/dev-texlive/texlive-langgerman/Manifest
@@ -95,5 +95,5 @@ DIST tl-umlaute.doc-2021.tar.xz 106300 BLAKE2B 3de7d4389ef61cb9504e57b840162a9fe
 DIST tl-umlaute.source-2021.tar.xz 5732 BLAKE2B 1f8e2f2b68596687c3ffddb737fa28b318db4121361c4cef96d2d61456868217529a5e19471a30fb90dfb24e3b85ca002eddbb7d13fdd1b1e0bda7feb8958215 SHA512 494ee6d1432d783f9586c80cee044e2857d4d24358c7dcb7d3043945bb3f5331b8eee78a13ee759ed6260518dcdebab33d78bab4cec5d384c4773b502c96fb0b
 DIST tl-voss-mathcol-2021.tar.xz 548 BLAKE2B 93f7acd0a2277133e6f8e95051654daad1c7461b2d6e955e073da3798d12ec3af7d4e6793b812a1b8f2b683e217792c832fc7de32ca375be503a519b8f7070ca SHA512 cec0ea20b409192c618278001045352ca6c4c11c8eda59633a9bb65ebb7a89c8c1db4046936a7f0096f52efca8a251501fccf7890288ed830f13e0b24b1bb017
 DIST tl-voss-mathcol.doc-2021.tar.xz 230644 BLAKE2B e5909c24b46b5ef771a43240bd636908eca41b95f6aac6b1009b7d36b867fc3db0acaf20d82cb16443b76cae1c7821f1c620a2c1242f3a7fbc2978c3126d0b8a SHA512 5d91b23d9eb45998282731620097f214b274ee744972b3d7fbeda1be2268799572f36b5f4c8b707f48e8ec2d825438bcdcee7f1376531f366af8949a862ff379
-EBUILD texlive-langgerman-2021.ebuild 2174 BLAKE2B 1cfce39668b94ff041e25098853dfa84414c560f3eaffb3d93546f1528d9e37047d244d29b60b97f8fca23d78a3d7292b2d1f6071aecd088284a1e1a3dd85993 SHA512 ce5e91e38e44b21cc0278fa07745adae4d63bbf60dd1623cce88d70cee6be274c7e94c688f06d3afbb43cd77089e8d8fde6c1a0dab2dc7ba48cd39b23ee51373
+EBUILD texlive-langgerman-2021.ebuild 2181 BLAKE2B 764ff8e343ec59b06aa8b9991e04e177780e60d68493bff739264b6ebf640a69281a14fba63ccf309166bc5e3ae09f94e0a2f4206eefc690d83caa3bbd55d2fe SHA512 2d7e3625cff8e7102974e218375eb7add790eb0bb7e3bbfc5386f59b2f57c67881966e3de6b57a186f262164f26856b372314914cc55bcb28eaf3fe47d499492
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2021.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2021.ebuild
index ccf8d0739513..0766d9482616 100644
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2021.ebuild
+++ b/dev-texlive/texlive-langgerman/texlive-langgerman-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive German"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT OPL TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="!~dev-texlive/texlive-xetex-2020
 >=dev-texlive/texlive-basic-2021
diff --git a/dev-texlive/texlive-langgreek/Manifest b/dev-texlive/texlive-langgreek/Manifest
index eb0b81fcde5b..9c8fef4a9f45 100644
--- a/dev-texlive/texlive-langgreek/Manifest
+++ b/dev-texlive/texlive-langgreek/Manifest
@@ -52,5 +52,5 @@ DIST tl-xgreek.doc-2021.tar.xz 67772 BLAKE2B 54401f995d393513ce082699696a5c9ac00
 DIST tl-xgreek.source-2021.tar.xz 9864 BLAKE2B d0009c33f177505c9ce1f82ce3d261010aa6000814c8d984e86745703b04f2e1e2617196e6856af95b22bc4dfe5f33aad3f5f8b7d5769c45764d11eb6c08a13b SHA512 a982e91c9fd68b583ed3d28c841e91e45ba83a9b961cf710cea2a025c69f3e4c98124eb3d5ef45062347ae8b48c6ad54ef5c7631fffa1be5cb9705842ca23987
 DIST tl-yannisgr-2021.tar.xz 37576 BLAKE2B 59931ba223dd10f71e853f6ac529ece7db1760ee5abe9c768d2b298e7a9125113a1b96a0b9852cfcd5c8bd133998ea79664deff461b43f703c03c9aca16299f8 SHA512 509e69acdef68eadc65fef6980e9166c6327e8927fb9cdf6a7a33786a8668ac9b900954a4bb661f223967b26dd240d5ebd91683658b324be284e46876c39061d
 DIST tl-yannisgr.doc-2021.tar.xz 28912 BLAKE2B 7287b6f4cf5f0df50356197d4170cb90c5b3bc3421d6b724a730098b2fb7f67284c69a0708c51dae6cf0f99d30d10841bae2da170f2b95cfebc3e51704c20ab8 SHA512 40ecdfe71670357e8ec84fd262015b5b5d0b8e486ab80c05d0863a335649501e9548d785cc2b2374f989b820dadd9a074cc229674dd1ae9a6252d4a0ebeb4191
-EBUILD texlive-langgreek-2021.ebuild 1371 BLAKE2B c2c3414a50304dcd7bab7014bdf9ff0c7c43f1911eeed498c713982a8283ea520d160999d8b03975615eb55ba0660a827ac1f87dbe381123e19ad978f51b7951 SHA512 caf7c455dfbe8faf8bda58c648e8f5de8112195ba959a1717ad2bcefdd7699dba897103fb85111fc0098513eb2a031b4df1000d3720dfe9c177160f3170ae418
+EBUILD texlive-langgreek-2021.ebuild 1378 BLAKE2B a6c3b51097f4b93486fad4d15e0249c905a7f41cc2a164e5999c14d8e9598364f27f6943b0a03417f1cf9a884fd788eda5784b31bbeba21d57ca0ffc1af7882d SHA512 8bcd1855d374f44d0f2f92e42f439159098df33f45e9df4df2461ebb86df2ba828bf720e4fbfce15b7f8752d7381c119d3e77b4bd78b74a912634a3a8bff2f46
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2021.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2021.ebuild
index 316dd1178a35..ed51fd05f1ca 100644
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2021.ebuild
+++ b/dev-texlive/texlive-langgreek/texlive-langgreek-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Greek"
 
 LICENSE=" GPL-1 GPL-2 LGPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langitalian/Manifest b/dev-texlive/texlive-langitalian/Manifest
index 724775bbe724..c7f1f898b252 100644
--- a/dev-texlive/texlive-langitalian/Manifest
+++ b/dev-texlive/texlive-langitalian/Manifest
@@ -42,5 +42,5 @@ DIST tl-texlive-it.doc-2021.tar.xz 1269912 BLAKE2B 56f79ee0cb7f77d819d98d0dbac34
 DIST tl-verifica-2021.tar.xz 3804 BLAKE2B 1aee6b2f68c72bb9d130e71ef5351dd227afaac5af1663633cf1b49739b201b5953fbd6096960e48883c242294a76dd3d0d448a9f0769d4cb686ace3e656e90e SHA512 8c3258fdf2040e00495b56605f88160b5179743a7ae3abc6334e734ba9f1fb122bf2e4847fd9a577c1221c9e22dcfa650f15612d7a005b3719ce6c92df180bb3
 DIST tl-verifica.doc-2021.tar.xz 1158784 BLAKE2B e97e7189d30c53b24427d54587a7dedb7aaa813cce1f6879a9e9529ecfb740e77da4caf832530eaafe27c1ead7bf2fc70d4bae1629fb494e70e79d4e4beaf4fa SHA512 de41df53ca78cabf7ab3f672dd00c0042cfd8a71219d694985c18aeffa045dcd37c7b999058d7edf6a2348d83c9ae27d1e242f17a91d43b61f2b873ee2d157ef
 DIST tl-verifica.source-2021.tar.xz 21712 BLAKE2B 2d47b11393dd752b890fbc897c8359640d3f216e9a0af6fc065ddcb83a4fb895310d3c7aecb2866c595bdba41aff73fe443f6d6a593c6e61107306f603ebba24 SHA512 85e46be6f8ee729753362243492c7946166049ebd0a89f0871bb9308e6803f5ef9416c30fe380be4961aa466a03afd9541d09e5920a196550582d326a6de8b9f
-EBUILD texlive-langitalian-2021.ebuild 1269 BLAKE2B 03cf962325dbd894a5c1a7cf2a84c9c9d6f811a215de2af043e3a823eb4acb8fdfbcdc4af01d957b790d5f4dccadedd23b232eb0ea56060e12561b9b2f122e5f SHA512 2eccc95cfa01fb3bb0266921ad36f7c4ba3a4cdad15c696f941cb809d05cd360c013906b8cd6c960331ebc42cbc7cb0ccf8d7d357da58e5ef64aff6cad3bd9d3
+EBUILD texlive-langitalian-2021.ebuild 1276 BLAKE2B 09420c75b09ca21e409372eefc082eca8802aef37864673a9bce2d42d668f609354958091e92ecedaec90cecd71f55360d9b8f5b34b526bedffadf62b249a9e4 SHA512 9c2c10d8eef12f08d2e7f7b8380eb5590c381b4cf7f7b796838fe6134cced913aeda529e793f5104b1e0219ecf89d8aa1523a9f68568b0c0750d2fad040b6ece
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langitalian/texlive-langitalian-2021.ebuild b/dev-texlive/texlive-langitalian/texlive-langitalian-2021.ebuild
index 91507bc18564..f0eb57eb947c 100644
--- a/dev-texlive/texlive-langitalian/texlive-langitalian-2021.ebuild
+++ b/dev-texlive/texlive-langitalian/texlive-langitalian-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Italian"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 LPPL-1.3c TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langkorean/Manifest b/dev-texlive/texlive-langkorean/Manifest
index 6262f406ae36..04b9d437c8c6 100644
--- a/dev-texlive/texlive-langkorean/Manifest
+++ b/dev-texlive/texlive-langkorean/Manifest
@@ -23,5 +23,5 @@ DIST tl-unfonts-core-2021.tar.xz 14727532 BLAKE2B 1041bb36f03b61340de1effa07f63b
 DIST tl-unfonts-core.doc-2021.tar.xz 10592 BLAKE2B 3c72eccc7e4f625b02719953024bdfc9d429b1463ce6df5d2007b557265f5f7c794536438d97cd6793aa20508299f6038a2012452f575b6aa2f3680c24de1bc3 SHA512 8f51172be1093ff9da6ebb7071f5fea435e2bdace5619faa24ebdef52b3e34197d91b8f9d302844d4e1377a2a4712247743172afcd4b01367e9f166bd76112fd
 DIST tl-unfonts-extra-2021.tar.xz 6565804 BLAKE2B 40890d4d36f0f5f198edf6850665f2c7191766ae5376f841e0a39ae40510b7f904f97a7ce7ae1d3b2da8a22041ca5adb776c1407e7583be727a686447851fa20 SHA512 9cf9a73ba3c2190da7999c3b770e92d8afb43c640d651173c126e930155e9f87f371392accd4eadae8922ee846a5e02c0eeab845561dea943b34b185164bba3c
 DIST tl-unfonts-extra.doc-2021.tar.xz 10160 BLAKE2B d3bbc2235bd6576c86cfa81df2010d6f37de0f5e317b2b8f4b4dc37059a45672ae1de224f98b2e855f96cff3c44a9a0fd23162c848d1bbb868c8589f323bf31d SHA512 6173d49bb64c9b162763ff08af445e518fa650fcc13e02f5c72454d335285d9c82347cf79f945fae94429f3a9d15f9c9b58ff1d175c8f59ea7b75766cd279303
-EBUILD texlive-langkorean-2021.ebuild 1076 BLAKE2B ba593d65d04fe856876a8c1dec163087ea04984420cb3fb9c2052ac49c078af2535a69d985d06a1a206953dbdf6aea4d88094f289c676caf147bea88225d5a40 SHA512 8c1ffa9f781f9920811f3fb9cf0a81fcb678f3f518fefa550f65b2195595bae6ad3d7658a81842aa40a64fa3a5cebe818a02276cf1636c90251ddd913890d3be
+EBUILD texlive-langkorean-2021.ebuild 1083 BLAKE2B eab271601f4793aef7cac318ec5ea62141fd014e9df963f77fbe054dfd42b21623fbca464339a087d7ab5711e8677541c1df3fe9a99e9287e0f1fec4ff2770a9 SHA512 87de8c99b94ce20b6e42c9e8ac992cec5aecef2edd4269e35ea582bf979c79a57eab36a4b855e74c2e86e3d11635b01bfa7f0d45ef0b375dc44b8773a2e8bba1
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langkorean/texlive-langkorean-2021.ebuild b/dev-texlive/texlive-langkorean/texlive-langkorean-2021.ebuild
index 05ff23dbe790..b85cef8637f2 100644
--- a/dev-texlive/texlive-langkorean/texlive-langkorean-2021.ebuild
+++ b/dev-texlive/texlive-langkorean/texlive-langkorean-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Korean"
 
 LICENSE=" FDL-1.1 GPL-2 LPPL-1.3 LPPL-1.3c OFL TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2021"
 
diff --git a/dev-texlive/texlive-langother/Manifest b/dev-texlive/texlive-langother/Manifest
index e1e00fa00e3c..b5031731cc6c 100644
--- a/dev-texlive/texlive-langother/Manifest
+++ b/dev-texlive/texlive-langother/Manifest
@@ -129,5 +129,5 @@ DIST tl-wnri-latex.source-2021.tar.xz 4364 BLAKE2B 16efde6716d5b1695336f5d49df5a
 DIST tl-wnri.doc-2021.tar.xz 6784 BLAKE2B 9e42bc653775630fdf5d6c93c49029d2d1b3527c2ea22c3e3690f79c5a291fd67679650c48d3e1e68997aa8f36bbe5cb42d9d59aaefcfab4730fbe62c0cfb193 SHA512 c3d6ff664edd89fa711e9573b138b29b113b588ddef9ad4a258e1f28c4ca2aad1f05741a402c1c1972bbc317e0cb989ce7a51e52d59b42629343d9a5780b64d0
 DIST tl-xetex-devanagari-2021.tar.xz 12452 BLAKE2B eabf7b25af950f401317a00dc411d3754d33b9e28f94effa3a121b960606567d3dfee329d7e062955ac43bfa296acd09b49d40bbdb6707409e5cf1b7b03bf309 SHA512 96eeb5289b4b0ce252eba1daf15fbccaf2cbb2d251a85818b6dd761048532f36355619e37f1f857caf4592cbf85d112d6d48d5944c455ef36da9913529a783fc
 DIST tl-xetex-devanagari.doc-2021.tar.xz 992 BLAKE2B 1806612ed558a514644a65063b4ad1f1ac879c31cf3acd82c65aee13deaee021ff687b68b4f0b760671bb06ba6ba58a2f3f196d361087b88a20aa397811b9632 SHA512 0f360c3f43c6562520b8843269068fc46ecc405cd3a4d8faecddc4f606d69cedcab28950fc1d2e11699e297fe4d70c4c3d50765a2ec30541c237914accbc7129
-EBUILD texlive-langother-2021.ebuild 2525 BLAKE2B aed56148e8b938e471641a748caf88a63383ae11fad709b4465b31221189c74b12368016be6ff5d0d6e2d84cb6367fa758cabfb6375b6aefe09382d244e8dcad SHA512 ab498334f154b5ac9f3bc4f6fea03b40a37ca6819d405e6bf61a802f40d86bda669a455473401aef8679d8522cff382b4282fb89f634fc27fced26473bfd7cea
+EBUILD texlive-langother-2021.ebuild 2532 BLAKE2B 533aff3afa9aceb714690abe4371722736062834149491339dc6f7c26e300efaf119dfbe8057858ce5c9ba65d546d925160073fd267e5a495985c7436f443cc0 SHA512 a8774ac241c20ce6fc14e83853bbf08b8baa23a5e9625623bfa933dbdce018e655ed13b5111de6eea6832156287a91b80ea0082ba3e9d20d512a58b6a591f58c
 MISC metadata.xml 692 BLAKE2B fa87041bafc6f25a3ee065fa21c064cb2109470b9833a4d20c5d3d8e9488ee91fff4364cb078287f481402219a77d1c0fd655b90951ae7d7226011e5352af5f6 SHA512 6c9fbac4fe09b5d24c5ce682f68801725f66857ec30418a8fcd2614319750936af116b30357ab03b2dc4ef761dd397a8786e81374f7f230a4d77660df67c083b
diff --git a/dev-texlive/texlive-langother/texlive-langother-2021.ebuild b/dev-texlive/texlive-langother/texlive-langother-2021.ebuild
index c46058f3568b..e0d376503414 100644
--- a/dev-texlive/texlive-langother/texlive-langother-2021.ebuild
+++ b/dev-texlive/texlive-langother/texlive-langother-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other languages"
 
 LICENSE=" CC-BY-SA-4.0 GPL-1 GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langpolish/Manifest b/dev-texlive/texlive-langpolish/Manifest
index 2e00e1f3e4f3..5c3a478bb734 100644
--- a/dev-texlive/texlive-langpolish/Manifest
+++ b/dev-texlive/texlive-langpolish/Manifest
@@ -36,5 +36,5 @@ DIST tl-texlive-pl-2021.tar.xz 272 BLAKE2B 16b003487b19e4865c304c3961ec4a30ba25d
 DIST tl-texlive-pl.doc-2021.tar.xz 1213604 BLAKE2B 832f46a2099d8fa99a226ba83ebe7079d3f4094dd66bb8d914b2bb4d9de0ffee6fddd007ff30613bcc0370fcec230dd6a2e5f273902512d0e1b978a1523f8fcc SHA512 7949a67fc205e499faebd121a395b55b009fcd5a5bc9aa7c940c62a01d9e003b5b9902e3677d1a3c7ff12df7532293b4bd309406e26c0f76493bca8a46043a1e
 DIST tl-utf8mex-2021.tar.xz 2868 BLAKE2B 388b3bab671dcb6e7c40ac6678c4df35519a11a677c3ea8c8e90c4862ef8b2f6327dc5962508310c48a9463eaa81213a291b7da8dde67c006685720876476a07 SHA512 0cd4c549c7b00939dec5055705658f76f6ebbe5de70e082652b761673ba5a249924fb862a319512a9a124b9cdaae8906c74439bba97be8825d4d1ffc70642c8f
 DIST tl-utf8mex.doc-2021.tar.xz 7496 BLAKE2B 49b76229d1644218c86ee27fca343e013734a112d36191cd5f3ffc7c6ca8720d4096c6990d5537ce803a60738aefb61e149426d5e9ca0a71975e91aeb615e5ad SHA512 cd438089d90faa0e9144d23adb78ce91d85b80ce084cb92511cc23882c675cb654cb704aebeb623bb29c70b764c8a0ab19915607664895c457c583f376c1088e
-EBUILD texlive-langpolish-2021.ebuild 1070 BLAKE2B 2166c568d1f0d04121ec7981b92e1f2bc1f2127349ff97c5ea653a1de264cf19638bef3fec4281af4b4dc316ff665c6bbd48ade99640943e6a7fbfdce49f9ed7 SHA512 d2c79b08cd2c6c85be3095a936a0c2d2ddfa6fe55d336c709500687c0c496f288498d6aa1c028e30714e0d59b5d26d887d103f17d5dbcbedb542a7c586cdb6d8
+EBUILD texlive-langpolish-2021.ebuild 1077 BLAKE2B ae8483a4e54c83e19c2a98240693ffdae8b3007d6b0f49a7fc4545524794d89245d8daad373c579db7a1a29959541a05a40de2b6dbb89bd688439f6688f21247 SHA512 4fa2f5ba774e1670625919dc2850a38e3a6c775c8296385c87ed3ac0f4ebb6758ea78a2dcc9aca5057397443cc91db3eba08f26d0362948b3a58ffd834bb95bf
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langpolish/texlive-langpolish-2021.ebuild b/dev-texlive/texlive-langpolish/texlive-langpolish-2021.ebuild
index 217cbbe3e367..2194d0dfbb00 100644
--- a/dev-texlive/texlive-langpolish/texlive-langpolish-2021.ebuild
+++ b/dev-texlive/texlive-langpolish/texlive-langpolish-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Polish"
 
 LICENSE=" FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2021
 >=dev-texlive/texlive-basic-2021
diff --git a/dev-texlive/texlive-langportuguese/Manifest b/dev-texlive/texlive-langportuguese/Manifest
index 952c529fcfeb..b110d507bcc9 100644
--- a/dev-texlive/texlive-langportuguese/Manifest
+++ b/dev-texlive/texlive-langportuguese/Manifest
@@ -23,5 +23,5 @@ DIST tl-ordinalpt.doc-2021.tar.xz 258992 BLAKE2B 4d4ae26d558f3b572fb1280311a4e08
 DIST tl-ordinalpt.source-2021.tar.xz 4580 BLAKE2B f8ef0c60e58f84a8103d365712dc028c16fde251a446d58c63b56e86fc7ee4bf22dbbfd1292532f37361fc7d8eb74a3987a6e90480ce53186861166a610a9d92 SHA512 c4264de0f61c1d2abb6785f2a19e76578a154bcdb5314a3016c3a8bf700725294847a482f33095bf7173885e765db2afb4a3a34de3fdeb1d0c2a213c1e60b614
 DIST tl-xypic-tut-pt-2021.tar.xz 360 BLAKE2B 95292083c723c54cbaa866b0c483b0b2f1fcb04f1aa79a4106a65bc7a1c13e911a94fffc5bc4906ebdea72251575f290d3fde940f8fddd3ea00ea6dbf96c8985 SHA512 291825c3461b397deb825266c7ee4316c5d04b8db1a29759378409de55c20d81552e31260468f4fa6a9a04f04705422714a8ec70a866c87fca2f4f1e189e0e4e
 DIST tl-xypic-tut-pt.doc-2021.tar.xz 225208 BLAKE2B 006de6f3b5eaa53a66318bf7e839018c0c1feb946c68a59b9d760ccafee8cc2deb71c2271dbc1a7b503d641653de15665bccd01761b8588972b68e6cd46a7817 SHA512 e27dfa0b36341bcd02ba63a8b543f1a6c55c674745cc790543ea2cfded80e536e5901f184a3af62b92b4534c738a06bf4fd5cbd4dfb4da865d13991279309aac
-EBUILD texlive-langportuguese-2021.ebuild 955 BLAKE2B 46ca76dd6657203914c9b3cdb8d616be46a39a49d260ccddf6db87ae7d8658538392eb18c407621731fc9ebffa46d14ae349e785ebf2dddcf62a3efdd63516a7 SHA512 66436c7ac10eae7f74c0e887dadfc0cb9105428eb9ec1c8e446565ca986ede2eb1219f8e28007c5f907d01f72db0616a2cd6aa019b81295dee72fd1886a67968
+EBUILD texlive-langportuguese-2021.ebuild 962 BLAKE2B 4014a71ec64984229d7ae73ffdce309f5ba1398f67133847049de0e8ecada1953e12c068c636adc558c91f605720c45a8eba55f6fbee5e684b339226c13e920e SHA512 80cb340537e54fb6c3d510297868eff9c43ecd1ca0bd8279884e7bc8c39d0fbd67ece0c1dd7f10161ad12945062f59731c790c0a0dcecf3e59a473cd21d1d0b9
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2021.ebuild b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2021.ebuild
index 0747298035ab..e298299f8c45 100644
--- a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2021.ebuild
+++ b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Portuguese"
 
 LICENSE=" GPL-1 GPL-2 GPL-2+ "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langspanish/Manifest b/dev-texlive/texlive-langspanish/Manifest
index a17b1fb2982f..4c3780e79bb7 100644
--- a/dev-texlive/texlive-langspanish/Manifest
+++ b/dev-texlive/texlive-langspanish/Manifest
@@ -26,5 +26,5 @@ DIST tl-lshort-spanish-2021.tar.xz 412 BLAKE2B cb96633a695bae58184135c353f66c90c
 DIST tl-lshort-spanish.doc-2021.tar.xz 1538720 BLAKE2B cafaffc1c2f7b1a2bc8083ab7f54dfc73360092aec26e66adbe479f604427a9d936d63ba0fdf750d3b1e651ecad6d9802155bea3c9fffc5b76933b9fe4121afc SHA512 f968352fe1e32a918c1d5ebfce16d3975c436539349af22b32bfae1ab06061ac2b2b85feaed3e8a28da89956f4d5948e7d1a6426766144b0c0ebec72ecfe99cb
 DIST tl-texlive-es-2021.tar.xz 276 BLAKE2B e70b75a27ec402b50db214bc2c2f6f0372ba905656ec3dcd9bedc082d95b1e0c48986f4081a86012d30bc4f8aa2680f0bd6660b4640d8f5f45132eeca8c17383 SHA512 358ca051118ac9316ced67be9142c076f015984a0ffff70198792a946f04881350d4f0111476fc376a1ca8721d3a900998a8f516af9a6ba2cbbf05a1120f8798
 DIST tl-texlive-es.doc-2021.tar.xz 3090144 BLAKE2B 51d8306c6ec0a565f684a77170004702b512694474f585b153fd6740f32529b147780d098bad58b249a978c9a26c0d054adcba17361e04c0bac083b0b2116a1c SHA512 c65c8cee1e9b46f9a778b625f880a70ddf9297a77dd0f925bd9cdeac9b2d18d483879f88b72f701277974d983c82870aeaa0023c39399552bf243e49bd235f3e
-EBUILD texlive-langspanish-2021.ebuild 1079 BLAKE2B 0d8a77b5c16c174849cc9ee5ccdae64a7dd7f2cb4a46c9e2af4fad49dadd5eb2fadeafd6db1c3d2e0a04a953ff4c1d1655341c6cc55c812cc90bbcf11d668e5f SHA512 077d624d8c39fe46cc67e42fd35e7a43a2d56f811e518d43d7c9c7ac615115a50e0d453b5b3b973f5eee8e9c07267f22178266ddfef8308879640c276965e86e
+EBUILD texlive-langspanish-2021.ebuild 1086 BLAKE2B 5edca07de31d7578dfcef6f26cfe4d69d10ce51167766701eda8d532116200eb84e07ab055b8507f4989be8ada9ff8f492688c5f6cb0c8bafdff2a128bed4e06 SHA512 93603f5f86bcefcc8e06f4219b6a991e85fe62d5055cd888fa7d9a5f2f645b470dc21f71bb3ee777a70f268e91864fb7a87851e4deb97a088269753347685f91
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langspanish/texlive-langspanish-2021.ebuild b/dev-texlive/texlive-langspanish/texlive-langspanish-2021.ebuild
index 3319fbc920c7..b2714645dbb4 100644
--- a/dev-texlive/texlive-langspanish/texlive-langspanish-2021.ebuild
+++ b/dev-texlive/texlive-langspanish/texlive-langspanish-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Spanish"
 
 LICENSE=" GPL-2 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-music/Manifest b/dev-texlive/texlive-music/Manifest
index 40373d341ffc..28fa7e9c3ef0 100644
--- a/dev-texlive/texlive-music/Manifest
+++ b/dev-texlive/texlive-music/Manifest
@@ -68,5 +68,5 @@ DIST tl-songs.source-2021.tar.xz 94680 BLAKE2B cd284b3fbb29bbe73d94b33e2391ba8b8
 DIST tl-xpiano-2021.tar.xz 2812 BLAKE2B e20cf09fe9deddb959c3fafb8631992ed4f067151ebab2cd48aa697de99e59d0d5db3e27563d304ec346b458c04ed4f1ecf1e874283221091427e8de9ef89caa SHA512 3554bd514e1108649bc98d38dc84951edf17533758325d46726f55d9909d1a3747024aeff62842dc6eb1b5fc760c41a452e207b156bdee06468e9d7732e223b6
 DIST tl-xpiano.doc-2021.tar.xz 556172 BLAKE2B ddf49cf05f63d557bc719e130fb176e88ea1a2815294def0f564f7e8ebec93e3885a1a02861de98e8be7464996c59de8f8b492b1e115a00f20a9becfccac1c48 SHA512 257c484983eed03adc77b1776c9207ff89b4152b817aa09fb57cb41d8f6494af0db191c61b954a7f2a605cb8695fdd0562cbab1e0c48f85329c3ad61fef0e62d
 DIST tl-xpiano.source-2021.tar.xz 6324 BLAKE2B d6eb7fd8b17b26a18a03380d7018a7d620253f5cfc5bf1d654b759e41f2d3ba95454d78eed79580d5d179efee3a0a22c18b52453d3b14a2aa915085f1efb6b5d SHA512 b52814268736b61fe3f417f410e4b29f778b6492f838d16894d33db85645799d52d3d744f10b429e68e315a142964b2f5ff57f15e9c4ee7e93a58dbd4b0fa2e2
-EBUILD texlive-music-2021.ebuild 1708 BLAKE2B 777a0ba90d86a1379cfdeeb8b936f7b6c9403a397442804b05cceb52d8b7f63332544891cc6b5bb73ecd2dca384d304208f2fdb107a99b13a482287e2f1fc2b3 SHA512 6895fa8ad4c6429d3ab377cf639c374fa82f03f877f48bd05814d6960ca93e608af65213b25ce5e68e325046826307d0018e15997fd3d6446792c977475b7402
+EBUILD texlive-music-2021.ebuild 1715 BLAKE2B 615aeda0115706ceb8673edf5eb22a2149b6ad6f8c4b36c2d9c2daefb92655fb61447a4e90526e0389268b48074328a94921789a4207d846d5e47b1ab0bf8292 SHA512 ca84b69cc9efe1da255f8620770e7dd4fe232e4d2dda1255b5406a5fec025bdf4ac4e97e3ad861ca5227ea6fe88b5d4b5bb3f5d7ebeba264067a9856dfd324a4
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-music/texlive-music-2021.ebuild b/dev-texlive/texlive-music/texlive-music-2021.ebuild
index 6b110408adbf..9643787a484d 100644
--- a/dev-texlive/texlive-music/texlive-music-2021.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Music packages"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 GPL-2+ "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2021"
 
diff --git a/dev-texlive/texlive-publishers/Manifest b/dev-texlive/texlive-publishers/Manifest
index 35ff3e673680..25c23eea8f94 100644
--- a/dev-texlive/texlive-publishers/Manifest
+++ b/dev-texlive/texlive-publishers/Manifest
@@ -589,5 +589,5 @@ DIST tl-yazd-thesis.doc-2021.tar.xz 2170868 BLAKE2B ff3345abb4bc696cdaeffb26b6c5
 DIST tl-york-thesis-2021.tar.xz 4292 BLAKE2B 7ac2768390be3e3a14d88be50ba29d1a95d353e4c39609048cd1b42e610f4a250f0125ff3f7dca05f8d56645da415a5efa809bf5a30ab98ff48a2cd658a12a11 SHA512 5b5152cc315dc05164ba3502d6e7aff355d853e43a3836bda0a15a4af7a90ef9fef02c852125c7e1e4842c05d51f2be6441b5131400eb46bb6704b281711e18d
 DIST tl-york-thesis.doc-2021.tar.xz 111744 BLAKE2B 7cea2428eb5f7252cbae7443b6b731127785c12e271d62c0a67c033c395cf8baee82687b48629eda84280ef5f446d74b15b573650a25912a4dfc64cc9dcf9f89 SHA512 e1ee454ad9996b61f1cac9bbeec30210359ecd8939bd9e0696e7cca7106733b13b8831946c47652186d4b80060f96c479b642274f5c90f8757953b1c3861f0bc
 DIST tl-york-thesis.source-2021.tar.xz 12580 BLAKE2B ed9f83a7f7fa3e97616af33f8969b0a19bb05a615b0afdae4b6e51439a0f2ce3644c547cf54f65bc5585419298c614af2037c8f3fa966c7472763c13f6af54e1 SHA512 3096ee9334bab690b38ff943559a0a7b0c54f8b831e7d1320ae4581740c48dd05e09813e220ce1d28d4523fb456d7fd01920e89e7e0d66da00e9dce88bfadea7
-EBUILD texlive-publishers-2021.ebuild 8329 BLAKE2B 90dcfe29100f5d577fd757e581dbd49f43894bb87123cbbb3c0f29a18e3ab70318cc5e47cb55b1a2743e7f3ffc7e4493abb0e71b25674fc4f6798690630b0141 SHA512 7098a2ce15320c6e4fb2b6ebc096b6588e2e96279844ae024555ddf359bdd5ae76a5b3c021e1ea17e00c61b6af5f5b7d04f1bf2345f5ede6dce01ccfb30f0fbe
+EBUILD texlive-publishers-2021.ebuild 8336 BLAKE2B ae638119d8916846cf1f61545a0a1ace45c8b85b44968050803dc8347cd33b80c800d0a8ab078af875ed4ffef762f97ab537bf7713a6612099796a9eb64baaa6 SHA512 db1fd3ad06cc37a0ff4c9c15e706666a67bf27bc4f535f4db187c24ff62955b46040656f13b145922d7effaab9e905474ff84828a0fd4e0ac4cde8687be62bdf
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2021.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2021.ebuild
index 255ed12b3cc2..aafced3ae015 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2021.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Publisher styles, theses, etc."
 
 LICENSE=" Apache-2.0 BSD GPL-2 CC0-1.0 "
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2021"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0590a388c450..1889d331f1ed 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 46e8add80879..4ccd0042e9ad 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -3,10 +3,13 @@ DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef
 DIST aruba-1.0.2.tar.gz 132977 BLAKE2B 762abef412a62e91931690a0a56ee1b04868c9f446f79e1c282e15c1ded1faf609d480e7fb032b09c3230e2d233b3cb0e09a58b2950c7a138f486c34339b8a0c SHA512 ff9161a94627e1bd123c00a0c3dd8624034b10741867d60c85264322e4ae5f2226d585d361fe8f2229003c187a1dff38c4278c359f018ca28cef1fd6efd26aa0
 DIST aruba-1.0.3.tar.gz 133790 BLAKE2B 4008cfec1bc1d63113b1d8961e3bd6219f3884875350b5f2ec6676f6a6167e9bbc6b759c8cc0a29a6774877d3ab2f1c95954d83dbfe3e79669cc8968c1c533ec SHA512 ff89846b805267e2a4bff394c8285b9227d40a2cd93a7ca8fdf8cd6d38a3b2144d5e96b0bd1cef94714df630ad7a779d609e05585c671371124b400130f3b3b4
 DIST aruba-1.1.2.tar.gz 132680 BLAKE2B 328c012eccfb988eec280a102da94150d1811fc67816c09aa2b94f1b6a06ca68e21cd4612e87fba089f4eb9f3b90716cfe121bda306936eeb53019cec539e651 SHA512 58f658c118fe83ddfbb6c361ab3ce6ae5e6084e4233dba62350eba1c911d8ad0558d1ca604206691d097a48453d608042bd992730b92971cdd3d2475d8f6ca4e
+DIST aruba-2.0.0.tar.gz 132762 BLAKE2B b06190d3a1698c5a2d295df16096b2bd587c60a9c428d35e8ad24204b71b7a3d86f5b52a5f601f57204903412508faad3d4032f1499d78a309a99df63e8a68e5 SHA512 214de8dd3dd29b46ddac2605bab5008ac9d9755eef53c140aea5f160aba60ed9ac71ac5e1410f59700ddd8a506faedf6b54d99682c875faeaecbb47ad8660435
 EBUILD aruba-0.14.14.ebuild 1746 BLAKE2B 419b70985f18519c23aab2e13b006d867a19ae534fda30c9a4ab88a3df18bab5a38b74b5614c8fa00f1577acca27b90ab260c05de2da8700133d33c71edbc97f SHA512 84eb8be2f99c0e7a65a61450ed56ddf632565da6db96e1b10e5cd5dffeae24f476a765507a2e57fffa22a7d90447036967f66cd346bf03c7151c5797d6118140
 EBUILD aruba-0.6.2-r2.ebuild 967 BLAKE2B 6a11fa4ca7af64f825b1251d470190a64608279aa1f2735e1ffd458479e22e9ffa6739bef16d3e714cab5ec53a16fd31401d1a47c675538a5fe8b2480d48204b SHA512 c922d4e5a19162aefb55b4415547222d1b799bcb7f239e6e9167a96349c76804b569829b60f91289e781c1dd4211361ac7b3ef547be92a8b35712dd5075b6916
 EBUILD aruba-1.0.2.ebuild 1922 BLAKE2B f7d9aa054e862cf7aeef26a322a067ef8b279c8a96a472471aa0dd2a027c0e06d66908ede4730ccfeeec07c76dcc52657a497f7040d9b83104a60cee83d4f032 SHA512 e8451f0ec7ec1c9967dd0046050eb01b96ce616c55fb50ab98705595ad4b98b747df4be1c468da45163c710398d2de2b253d3b3ff58f042153f45e30664bc311
 EBUILD aruba-1.0.3-r1.ebuild 1968 BLAKE2B 1423a47057cd55850ddffa55a807832d6c88a3d6c52b40151e6722f7b06c2486c6757286f184528e34b962ad39e87ff4853f94fa3422febf8c79b67529ba7fad SHA512 145d0ea4cc31df24758d3baa19567b82fc68a2a890034d3e03fc64ade8ea262954796c96f421bf77e45de6d79cd4db99cb59a25d26e71fa79c4680e18c35c897
 EBUILD aruba-1.0.3.ebuild 1955 BLAKE2B 0b36d1b42e8a9cf1ca22a19118189f2a8bcd5291cf8e4626d2de1542fa3352a0e9c2a777394f93b7bc92888debfa32673863a52137c8077cc0b97040eeded385 SHA512 25587725ee21665a2d36bbae4eae8e836cc96f57b95b974a7dd0f0ba0e9a8a8b520451e1543d80ae335d1ad6ab00b681beb67bc294e71ad0160dcad5e732053c
+EBUILD aruba-1.1.2-r1.ebuild 1948 BLAKE2B 3350e24d20c4de6d9738efb11424e6963df85112e66286166285f81d7e100fea21e6d2e779ea3ba454b6345e51ba4ebb31374f14450de5d7f2af792c09f3f324 SHA512 a48b19aa3574fe8263224fd7b927ceb0201ac0baf57e9871c5ac1e886664f34f17e8fe7c1068f8fe57a8c08287af14ccb82f5880900a059761d15cf33237f2da
 EBUILD aruba-1.1.2.ebuild 1974 BLAKE2B e72155ac6254e637f690956f5f8c5ee8fddc820ad53431c895c3934f512e20569c0ac90e027d3d6148fea9751683d59863cc41feb4319ea1911dd05cc315d623 SHA512 5a86831f7a0679f1e40b64f4c028d60636bb8b6417f5b3c86126fec17a4e8e00484089398b71c58456616e9a83e08a8944be0fc2c04e3249132ac4ea561922e8
+EBUILD aruba-2.0.0.ebuild 2001 BLAKE2B 6e5f04bf9309082b3b034a53bb67e27c9ac9d5ba734d5845ad5f59f18fb5c02a721d2d272a415d50b259a343db8a1aaf00be42027e74255934978e48ee5f6bdb SHA512 a1f339e0886e8b51839e4708283b4cb145f988bdc3661be52b961b7dc805651fccc6936472ba7a8dfd901f55c98d01801864ed87c8553136f6e548a8cb2caeb4
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-1.1.2-r1.ebuild b/dev-util/aruba/aruba-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..0d5d922bf2ac
--- /dev/null
+++ b/dev-util/aruba/aruba-1.1.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="cucumber"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications"
+HOMEPAGE="https://github.com/cucumber/aruba"
+SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	=dev-ruby/bundler-2*
+	>=dev-ruby/childprocess-2.0 <dev-ruby/childprocess-5
+	>=dev-ruby/contracts-0.16.0:0 <dev-ruby/contracts-0.18:0
+	>=dev-ruby/rspec-expectations-3.4:3
+	dev-ruby/thor:1
+	>=dev-util/cucumber-2.4 <dev-util/cucumber-7"
+
+ruby_add_bdepend "test? ( dev-ruby/pry dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
+	rm Gemfile || die
+
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/Before/,/^end/ s:^:#:' \
+		spec/spec_helper.rb features/support/env.rb || die
+	rm -f features/support/simplecov_setup.rb || die
+
+	sed -e 's:_relative ": "./:' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid features with minor output differences
+	sed -i -e '/Use .aruba. with .Minitest./i@wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die
+	sed -i -e '/Create files for Minitest/i@wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die
+
+	# Avoid feature that requires aruba to be installed already
+	rm -r features/03_testing_frameworks/cucumber/disable_bundler.feature || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
+}
diff --git a/dev-util/aruba/aruba-2.0.0.ebuild b/dev-util/aruba/aruba-2.0.0.ebuild
new file mode 100644
index 000000000000..a3476f7ee530
--- /dev/null
+++ b/dev-util/aruba/aruba-2.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="cucumber"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications"
+HOMEPAGE="https://github.com/cucumber/aruba"
+SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	=dev-ruby/bundler-2*
+	>=dev-ruby/childprocess-2.0 <dev-ruby/childprocess-5
+	>=dev-ruby/contracts-0.16.0:0 <dev-ruby/contracts-0.18:0
+	>=dev-ruby/rspec-expectations-3.4:3
+	dev-ruby/thor:1
+	>=dev-util/cucumber-2.4 <dev-util/cucumber-8
+	!<dev-util/aruba-1.1.2-r1"
+
+ruby_add_bdepend "test? ( dev-ruby/pry dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
+	rm Gemfile || die
+
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/Before/,/^end/ s:^:#:' \
+		spec/spec_helper.rb features/support/env.rb || die
+	rm -f features/support/simplecov_setup.rb || die
+
+	sed -e 's:_relative ": "./:' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid features with minor output differences
+	sed -i -e '/Use .aruba. with .Minitest./i@wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die
+	sed -i -e '/Create files for Minitest/i@wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die
+
+	# Avoid feature that requires aruba to be installed already
+	rm -r features/03_testing_frameworks/cucumber/disable_bundler.feature || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
+}
diff --git a/dev-util/babeltrace/Manifest b/dev-util/babeltrace/Manifest
index 2d23ea82da0c..7d6fa9351e85 100644
--- a/dev-util/babeltrace/Manifest
+++ b/dev-util/babeltrace/Manifest
@@ -1,3 +1,3 @@
 DIST babeltrace-1.5.8.tar.bz2 992610 BLAKE2B 3d47f9ba40b406271a0b35e441968718c93e8744f95b56f79acf8359001ebffb4966931f2860d48ced4f0d98261b37156564a0d798bf8d9e0ed465c05355cc5d SHA512 827749ae8507efd433bb97ef668628837a3ff15b5be5097af5621d46055c6f10401da0be1f9d9f843a96c8c307b33745e04284d166e275e03b7ddb0a7dd57e96
-EBUILD babeltrace-1.5.8.ebuild 684 BLAKE2B d7f90289274ca984368aa944a45e83f3220edabbe94f0db58e5227fc04ffc5f0b4f4312c65bda3b2ea3bc4fa6aa59bab7f2829910c6e29246bc1c5ef6eda96a7 SHA512 66df8bc11385a432cc8fc6624b99311c29be76d5c56dae37ff79e9953a28c050150f72bbb8e34c6ec30d689ecea889718953531ada03beb37157646b34c61ec9
+EBUILD babeltrace-1.5.8.ebuild 691 BLAKE2B 23ce64cbd5e221f95894b972ba3f2096fe37843baaccb98700115363c1680d1a96ae7353aaae8c3d558f94ebcdb591d47e9dba62772638f60253f5b21cf30089 SHA512 f7c12b007e4a730e1c8738d80a61458802c970428a44898a99c97d6cc15ebcb612287dea7d3c39de65625a09b129af34c8322930377725fa1996f19db2277886
 MISC metadata.xml 463 BLAKE2B 72758379b046978592bcebdc6d11a07aae6b14e052bf00fd3f40a45dc2858e59305d39fb1bbfba81ea3abdbf1dc81ce08bc6c57d7efa0bce77db322c55744a0a SHA512 385f56632473bd068e1a2b1aa15190eafe5cc25fc5fda59f91bd35355dbc549f7937d4a3f5fbd82c2009385b2c5113a93aa3954a18fefb4d9fbae933cfb52fd3
diff --git a/dev-util/babeltrace/babeltrace-1.5.8.ebuild b/dev-util/babeltrace/babeltrace-1.5.8.ebuild
index aca7ac981f9b..3e308a46b42e 100644
--- a/dev-util/babeltrace/babeltrace-1.5.8.ebuild
+++ b/dev-util/babeltrace/babeltrace-1.5.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.efficios.com/files/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 4bb536d89637..6ef9d5450d49 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -3,5 +3,5 @@ DIST byacc-20210520.tgz 878173 BLAKE2B feecf3708eb6269c046043bff7f3ca40f4d4240e1
 DIST byacc-20210619.tgz 880118 BLAKE2B 29a8f586c191c46fcec8d2a4203332621a9f03875aea81d7ba21a4e4676843320213e765709f22a385cf4328060496c154d036d4d757dd925ae81857f0977fc1 SHA512 878c7b5ab17bcfb0acb29ab06066630ee42cae7e768c7386308ec1f58e61744b5b6baaf7e9416cef32f9be406af65eb8f791ccf6e192caaf3f34954e6bcc1642
 EBUILD byacc-20210109.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
 EBUILD byacc-20210520.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
-EBUILD byacc-20210619.ebuild 598 BLAKE2B 23b974c5f7c54d5ae79dcd0b39302ccb37893e256d0a48aa1a4d5ef53f87d8454986c11891e6e6a2e473dd0d0904d031c62a5646523bebe2deb434066842f61a SHA512 81f7d4b1fa81e4e7750ef495f60fb8854ffbd6dc2f84717a8c092506453256d34a0d0b849e2cb20a62525414836e70119d609bf1388dbc3bfaf5b512d6bcbdc5
+EBUILD byacc-20210619.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
 MISC metadata.xml 355 BLAKE2B 10160435379a759071cde21a0195dbeaac5783119695a9d9b092090158c429d01280d2442d351e5dd8a6368ff11566f153e02abc07d81c19ace1838f1943a09a SHA512 b0b39011f45894df952d34cd75ee087fd42a77aeb5a0e60e4201fb404781d77c4a5a82d2492712ad0ac2a2daad029a19c1284f7fc8f624c2ed47fd0b55d680dd
diff --git a/dev-util/byacc/byacc-20210619.ebuild b/dev-util/byacc/byacc-20210619.ebuild
index ad7086f143d1..b7181571aa4b 100644
--- a/dev-util/byacc/byacc-20210619.ebuild
+++ b/dev-util/byacc/byacc-20210619.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
index 88e71a28c833..183620adfb70 100644
--- a/dev-util/cargo-c/Manifest
+++ b/dev-util/cargo-c/Manifest
@@ -348,5 +348,5 @@ EBUILD cargo-c-0.7.2.ebuild 3192 BLAKE2B ea2a2eec0dd38feb1147ea0b3d0d40372a73983
 EBUILD cargo-c-0.8.0.ebuild 3192 BLAKE2B 0fe2675e9548f4d6535a2f444911b5a2da9640cfcc45394ecd12e1f6985a6b68c7347453090af31ceff243c09d4212fe1b0ce621309bd33a9249b1c4e7c89199 SHA512 8ce15977a920f0f046c4e8e8b80fd935d39567a8aa8eda4c7011833a242eacca55264dbfa6114a50ca03f8b7c23cdb4cfc9a3c81939b200be42a9362a67f7073
 EBUILD cargo-c-0.8.1.ebuild 3192 BLAKE2B a0bbb911985266211fd05f267d9aa00a628e35043ca9a4b73c1c0c49b64fb0f305ecb7f2b6acc0aae88adea6d54ccb04291461b735ff9f44c616b320468cd7f9 SHA512 28de32ac6a16aac7148830ff45764e0c2256bde66b8edc3e4d6822068efa118ab82aca2834ed96429581c011c9f6615e3c68a778de04be574789cb5e02cb2e88
 EBUILD cargo-c-0.8.2.ebuild 3226 BLAKE2B c3ccd6af0ebdfff108277baf0f3f8abdbfdea62a7ef8365f3bd875a5627322d664101b4c741102f6690cba51242d15782fdf336fd0cc776da56f4a556bf946be SHA512 d6ba14f86b52328893feb71ee7346ab98db5e3a5e1e2f84424cb8e173e6059d64ee109810827c6fc9a4d4281742b624154a9560e370b7d23928eecde488d96cb
-EBUILD cargo-c-0.9.0.ebuild 3256 BLAKE2B 7fc3a3b614882c832bb0661fea4d60cb51f1004f3019352a940313fcedfd8985e883d8760678ad6deff2ae06a53f08d2100ab4626d88cf58bf5112e2e1660ed8 SHA512 6fafcd7f2885aa28a6aaa5b9211328a50c488768b24d50df661a2788e2241e705ce0cf01959e4ddbe4578994c7e74d1f66ba222babb3b7d90c746bf1b463c7e2
+EBUILD cargo-c-0.9.0.ebuild 3263 BLAKE2B 294aa3bf22cf616eca06c681161429f058706dbad7488457252df35fc8650ccd6bf94acbafcb194b5968b46ba7649465a73bb1c11eb7d19644fb313cbc574d99 SHA512 6337735515564496fc29a04024d362624d80ec0d1a533ef4c56286a22a4580ecd9a43b34781e3c21f762822c983e19fb0a99dfa1802f5e8c95043d6b9e97f374
 MISC metadata.xml 326 BLAKE2B ec5622ca2c87640dfe5c409704f1674bc53ef0ce4d0778227d3816cd4a151f5f09e3de1f09814ce98f5e208e04a5cc0a6c28dd1b9bd81fa3857b688d8e9eebb9 SHA512 f28238739f1c2d04cb617ac31c2965fb110b560e5b9bbc6fa2749f22cd4cb353ef6cda1df1d718f165e4ae56f5bdf66da9104f6440d7d0009ba352a877c1f3c8
diff --git a/dev-util/cargo-c/cargo-c-0.9.0.ebuild b/dev-util/cargo-c/cargo-c-0.9.0.ebuild
index 75c1f3ceb444..4a1a563db57e 100644
--- a/dev-util/cargo-c/cargo-c-0.9.0.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.9.0.ebuild
@@ -159,7 +159,7 @@ RESTRICT="mirror"
 # use cargo-license for a more accurate license picture
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="dev-libs/openssl:0=
 	net-libs/libssh2
diff --git a/dev-util/cargo-ebuild/Manifest b/dev-util/cargo-ebuild/Manifest
index b8445d383a82..fbd09a7b1911 100644
--- a/dev-util/cargo-ebuild/Manifest
+++ b/dev-util/cargo-ebuild/Manifest
@@ -1,215 +1,113 @@
-DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
-DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST anyhow-1.0.26.crate 26024 BLAKE2B 09cdaf61531f3a36b186fbebc2c783d472b54494c1dbd0e2b808be332bfba5783f40d66e46b2148a677ec61ed89f73bf2db04ebb6d43c8b395162177181d2094 SHA512 362a22854f90032f407875ee3687287f2c9c87e3b462e808219e0fd4d3067ad245544d1b6f38b3130d824af77390a331ac0b5a918498ee6c6b401fc8d0292ccc
-DIST anyhow-1.0.31.crate 28514 BLAKE2B 1177bbac61e96eb007a7a9a79499a7dab08a5c828987221df32c137b69bed53473b37f01debf49a7da0883407c6da40192fbc800c9b7983128738b2889d327a4 SHA512 e60394f48b74f8db4e61b9bfdb146b8e7a8b014c0a729ccb9e657d648a9310e642c77f6e5e5d4c8a6ed40a65c65bda79e45cda9a3efd04a901376e3912aebb8a
 DIST anyhow-1.0.41.crate 34561 BLAKE2B 32889ec5ad2750e97f9d5486c7b367edc2fbaf19480bbe8114a2deed3f78e4c3e2cc31304a33fd60bc70c33c17ed8020f6df0c05a958f4016d363803dc5a08b8 SHA512 c6fba5fbb5646d195fdbda65003a8741188d49db02b805a84e695c81a054d9d5265b1c296c23d65cf089af35ce470083de88e1b65aadcc3ce33c8fb22b9cb91f
-DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST anyhow-1.0.42.crate 34827 BLAKE2B adf276a869889819c78dc10cf9ceb310d57fc64dd00b603a16e7b6f111d446ca8ed43439c3f18f590c28c1e59a67cbe39fafb00c510d03b65eb8ba15a18d2b0d SHA512 7bbafa2fc5d78a6d8e68b44b104fd8d6a7882fc127b39e04c5a76240ee24ccf311004b754d93836d6daf1918be9c33fdb68a6baf55eab8f1e921b7aec3a35455
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST backtrace-0.3.38.crate 68133 BLAKE2B 75794901cf8d322cb642672eaab9403b00f802a917f04505d8a4df1466d340f92f1824cd0cd501d5f6017ff98cf17e4ad61ce32fce07b061fbcdaecce5ac0c55 SHA512 a962b8ffd435691bf229f6db6cc86a0e9fabec1dea589824a85f11ee77e2c36458cdebd68acc0624d45195df27a9fb6dace0afb98a9fddc0291bae93928345fe
-DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
-DIST bitflags-1.2.0.crate 16814 BLAKE2B 5b7aee7388b01cebf96651e979025e9bcac85f7324982055d7d805361f91da2b9489a07f00350133c8a58eaf70c5397e3561c15b3f2544aa8202bfdb852c145b SHA512 bd9e3797fb9b91e815308a5286439e7eedb285666c937184493cfce45ff1d4c10f505f29be3a6317add313a7fdc72a006682c1b3e1cc9fa05166f6c4ecaffcaa
+DIST base-x-0.2.8.crate 10614 BLAKE2B de50c274295b12234d9c4b8a551058b3345f3f3801cda0141f18b6df9e0f92d2a1fe09dca185e475fb95a1b2bee7935549d1ca1bf882d77e64afad5bb0b55955 SHA512 ad140fc44bdf0342875b7087ee242e70ebedf591075cf80d2362f74e544882971bd9b1cc21dc5b4ac13e38710ec0e087474b54b238d6ea6748d3ca4755b25929
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
-DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
-DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
-DIST bytesize-1.0.0.crate 7522 BLAKE2B cd4f9687753ec1ea4e7435f34b64afdf6e5534d33515d00c413da37081dea57eb76b2f3b8e001e65ca40908efccddcfa458ce1e3b5974aa79232567d9df7faff SHA512 a8837bc05efbf6faf55ce76cffb0f8ef2f47baad2f65875da246f4a8f1052af0fcd8f156950deac0e57e015183d740e0d8ced1e6da1aaecf03244ad370d926b8
-DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
-DIST cargo-0.37.0.crate 1016321 BLAKE2B 7b47599dba5ab5662a24412f496f94b10af4636678f6e5521cfbc603188a768697ab4667e387286cab4f15b16facc71e49035f015c41796aaff1f6889828da5f SHA512 8ec554818e58e9c80740ad5130e65318836059944a1dc2dd9bcc74b2a51e69ad3d66d99669c0f497110daf92bf5215db963504e492f416d0addc545916b554b3
-DIST cargo-ebuild-0.2.0.crate 19731 BLAKE2B c72df800403dff677fd686997cebaa9d4b96802f8d64c1247883e9a6ffd84eab3b17406af22bc2e471b400634ec1d3b806d261c8318164d84ae3e9d9aa98ea3d SHA512 1baa0a7e8bcd91b0e2bd89b89efe1bdba62e28900d1e681b346550ae4826f6776de2ee4fb4a27e748710ee7cbfdfe586daa07265a203917313d6eb144bebaac3
-DIST cargo-ebuild-0.3.0.crate 12098 BLAKE2B caa4b194cd9ee6f9c11a1f953d4ef6f1bb0e646f4a6d0578b198789b9ed99e577b850847279585a01c824fad917867d8d19530bc854eda26edf1dfe9624f28b5 SHA512 ca3c77e0c19a72f8dbc6f238d9f38c8e11d5da05949e8dfa940982d1a59b0d89d80663725049fdfca5cfc7902eb1fe75f296be73021b274293bcffdcf0dd3a95
-DIST cargo-ebuild-0.3.1.crate 12449 BLAKE2B 02266e24f20592d2c84b4d2a27b6857e1b229614fbbf386021aec8e6c0a2cd4142150928be45f1e5b43ed933991e32e594d9cc03cf856670f4d39c0f53c734be SHA512 56bbabd6ab60fefeb49dbf578c9e25ea98f29cd7e7ad4dfc01a305209e0f795c4bc2769dced62b467b34065ae02c0c3443cee5190b9ec08a7f4c632b2024a280
+DIST bumpalo-3.7.0.crate 134261 BLAKE2B 15c4944abc803537c57076dfa8f5fb4b59949909450edd9e043a6cd438ddd227820e20e95236324c06e40cb27ec1e4d958bebf3d38df90f0723b8e30df79b6ef SHA512 0b570e1baee530b5c3f775330ead7cf5f8878eab75e5a6a61b5d3f64d4d82912cb26de1c098ec9492c29c7a04fc49565db97a54373c546d8ef58aab276d77c59
+DIST camino-1.0.5.crate 29642 BLAKE2B c345be490622b50f3a744f9c42392d12e02e286d75e09f4eaa8a1c6f86cc849c5a752aa7cb5fb1f697ed8beb741c7d9cea951f4f5ce7049dcaf6de5ec69a60d7 SHA512 1131997ca090426a25daf3be2fcd6e559d980078dd71fbf3f16b4d593531a24c0f030aa6c9652080fdc02b5420da98991b9c93115ce1c0cad8c0fad4437b1d59
 DIST cargo-ebuild-0.3.2.tar.bz2 12104 BLAKE2B 044e0c22c60c8e00db414d4a6d66a96c50b6eff47abce77db10b5506b75a51259ebebb4fc48a9980ff5f5fa9e69b91b39f2404effeeaec83acbb783190b32de3 SHA512 006998dee8b8a7be9e43af05ce850d490a5118837d673390d69a6d660efcab72920668437b6e4446f4b8aaa9591014e72b65339b76c7d8fb7ed4a3b31dc84cfb
+DIST cargo-ebuild-0.3.3.tar.bz2 15542 BLAKE2B cd59096e518a8010ba4b20a24074ad2f6942f70702946f104eea9de3e75829249c504a9e4739c8182f43a1d2175be6f6cacd6a09fc896eee5cc3ddf79a50a9ea SHA512 e8eb3bc08e4d0658bb4170558e839f70abbcd3f0027618b8d3bed35bf5b53dde5d524666c086b13391f5d167e18a7e299d929cbd2b4a9729650c8a2e514e9bfa
 DIST cargo-lock-4.0.1.crate 59280 BLAKE2B 42571f4c1e4eac06c654b16b08db53d0c60a6367b0a89d9c0c3e69733fe3e6407f8a49ab301586c6b71390713f9418f23cd63eb4049fb9e65e64f62dcc9b2848 SHA512 1046c4bfbe8b2826135159759c7056952291c2065230a5488a7648f8531a8ee22e7e9ecfc42a76b149c0d84c0ceeb94e4ffd356508d5f0dca3567299b2420be3
+DIST cargo-lock-7.0.1.crate 60137 BLAKE2B 43b5fbb04471f4b639a99ad87a9b97316478ce53a804b3600fb2601708572476c361b2108b7545b88f23b0854ba01e2a81a2530fb073fe86ac8a309d65572cb9 SHA512 7ea98c9ab1b769ed8a801d18958be70ab17a3bfa07c974661b3ab064c754ee7da5a064fe1a1732d9b44b305ea89206c8497772deb215ee433b15ffab31ebb65e
+DIST cargo-platform-0.1.1.crate 7409 BLAKE2B 503bc17f9cf08cecdc02371cfb69c70b0f61203153fee4ad4e5b8adb995e1f84e6a6cbb12565607fdb1606372b744fd3d4519f2605f05eb83078c1fc14d789a3 SHA512 b8758e002ac6c4c4440707a27cd747c90e2b128f51bc80464be93bf8677aaa26bec28cc1f730cfba639fb022bb030fae5c06c41773c5692bf3a12167d04f0d57
+DIST cargo_metadata-0.14.0.crate 17008 BLAKE2B 00fd6841170d5dae463a60daf442eb3033d616ab171dfb7efc201596196571b06df83f6ab23e88397c77baf3135745bc3ac6051557ebad2c3ea96440f00e1d2b SHA512 d33f691d56df56bdea260363cd29864b17f0326b90b4b9688781c37d3eba4437b93b48e6448dc1d012a8542d7d2495f0acb73322340269db9cc4a4aa955f9605
 DIST cargo_metadata-0.9.1.crate 14876 BLAKE2B ff4b404231831641826fd11e2c43c12a83f9fdc4277eac351a154db8df219b09f53fa97f2138b28e280215b52d167ea733134d12e932419a5b53e5167a102792 SHA512 d1c0ff7625d0479764305b33410d8c95d5dcb3c8154cf18f84c7d5b63809dcf6a998e3f511d8245f399701d08ea54864b1f976b40db968eeb094813ff473a01f
-DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
-DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
-DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
-DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
-DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
-DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632
-DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
-DIST crates-io-0.25.0.crate 8384 BLAKE2B 7c501851ee4c83632d64434355570c0add0a868247ce82b2235cab252050cb27000b9ba6199c3e9b8fd480f18404204b581dc31d1abc2f2d9cf9cdc42cceb20b SHA512 c431caae97a7522d3b398e0da46d471948e736702fe41caf73494be376c6ef87c196ae2bb6b00b30907c634a751cd36ebcab96ea3a3e437d9182537b090e2f4f
-DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
-DIST crossbeam-channel-0.3.9.crate 86771 BLAKE2B d0898ecfa5aaccd03ed714b657aee7a3279f4242516c2943073e75d23f23437f34bf63b465bdfef6567030c998e7b3c6bd4f5fe2e0ee4b50a03d8a15396a2090 SHA512 4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919
-DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
-DIST crypto-hash-0.3.4.crate 8102 BLAKE2B 8bcf39d195d40a2e6d899fa254c9f64e982d742fb304f4b271b75db305d5afa8ea5361c0b6adb23c0fbfd212f3c4601bc7476b4874eaac00a26c8a65b711b0ae SHA512 57d020650689c988859f51ec9252702a7e8510526364b00058b263f4decb249d7296811adf3b8c5e76f8aa744cd5e444aa198f3dfe134c98257b99cdeb824537
-DIST curl-0.4.25.crate 75171 BLAKE2B 8b9e10bd0690932dafbe49f825253ab4f0bfad79f7c32d093d31f831076de7a42d6f1944ff2352a71f3c6659203cf3fa5c050e864187e14ec70cc7d56490e52b SHA512 c42efa6bcb5989c4f3a91629d0a547448ccce7fc8556b802ed2bdd10941cae25bb1ad15cd914024f1fdb0d1799ac2345fdc649b985b86eb87074b2b80e7c80d3
-DIST curl-sys-0.4.23.crate 2935053 BLAKE2B a6230f0cec0d0d2ad59d0f29a1caeab178ddd8f1035a87fdb9979e41b873abe9e030b719c3b89004a620eeb562a212dfc7f90bab26dd81450609a2a95301a9e2 SHA512 67299a70b3e00a04e5de6370b2d2a04a8310ba6ba5d16f8072f47e4004430e2126759ce6fd746807904c3735c0e0775df55c23dddfd303fd47d73d66bc6e5f46
-DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
+DIST const_fn-0.4.8.crate 12662 BLAKE2B ee8d12d8bd01e64c308b27fe4f55e665fe6ccbba6e911745061e816265b096d17c708fc4ff9d28ebe7101a6523edc65e8c54d189a4a9815b2d4341c69f20d741 SHA512 e7bd5c50a10f55bc9578e55f9bca80c8ca1cebcd49206ce1feeeeaaac3dfbefdaa89f3c197a992d8ef52efc8327b3b34935e253a41ae9ac20b0b08b73f19df8b
+DIST discard-1.0.4.crate 4700 BLAKE2B 423cb655d6d58b4ac68269a63332f4828a3f6a4823f6f98f83d748bd16afb7ae68d2bfe5852fbd86c10b79713576d6e16425bd2541451f715a7e9e3a9f2d2927 SHA512 51e0335509a16c73d2620ff83de4b73506a45b36e306dd0eedefcfe89c6054eb5abcfed0ff5b3868c3b17a1c6d82d958d7899f25aba50709c5dd486fdfd0dd6e
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
-DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa
-DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
-DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e916389d034aa3b82521445829e7fcee102e1c03030df9cc55e4b1f14c933ab83faee8be910037d33f15d15ef9c86e SHA512 c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a
-DIST filetime-0.2.7.crate 13469 BLAKE2B 6ec71f64de621b86c0ea46856fd9a7f364820916922f88611bc324696d5d34c73600ddaa204bd2119e29b0b38cdbbabc55aee669d87e9d77408dfdd844200a8d SHA512 410d45d9ad4d657da1d2cd16de58963f3096cf6e1978ffa4579b3696f0f4926cda303df7c4d02cfa8d71560518032750729a4184160a31229d590cbbec471d6a
 DIST fixedbitset-0.2.0.crate 13597 BLAKE2B cfbdb06fefda131509b04cfa780c9e9574ef0acb902479d7ef98f32ab45b18d78cb1cc94fba78bd023267a7f2a081aab29171f81a9e90912d4aad9f5fc17ba3d SHA512 44642b270d52f71637a87e5311f70ac77baa2a377f94254d1bd728b4ff02a3176f3a5d07732c0c4fb9bf303dbeecf327432ae01e2779d966cc13b5fb97cbc28c
-DIST flate2-1.0.12.crate 73844 BLAKE2B 46d0e592e68dae030c4e05aa073ac8940c8778e707b315b33f54eefabcbb2074f9843b784a98b4c7955a34d965482505ea0700e5ac04774b40473889fb335e3e SHA512 3247d6cca560ed4e7518a3b035e1745472f5ad98f049c764a16a4559b6dcf2a006acb613b57557556f917b529376ab0eea2d3c5ce0ea9e044b0fbae804dd3ecb
-DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
-DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
-DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
-DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
-DIST fwdansi-1.0.1.crate 4658 BLAKE2B 9ff7630d03280a27d4c58e858391bb9fa0e51d4f8aab875e8b1ac6ceb5f97e0db27f46efeb8e380cefc0348cfc845a10c72cb97ab5ae8a287b84fcfca0773acd SHA512 171044bcb47a672f0d22014741e4509c571a20511ed8d9cbc26fd857b65979925e5f51affff1033c9899a6b5448a696f661e6ee617a349dc732edb02456b7098
-DIST getrandom-0.1.12.crate 23809 BLAKE2B 9669147c455bd03bd15f304eb7019b218cbc482af850ac3cb4378327de5afabd50826a686d51b00437d740ac4e3a0bfc761c54ed295806ac8b77ae6848742346 SHA512 0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518
-DIST git2-0.8.0.crate 151568 BLAKE2B b4bf47247e7add92f8c96e4e8c2b1ade9d7db8e79b799ebae9e07f11870b0c660b4355a0581eef627ebeec2167a501a498e4a4bcbfe9ffa1895ca123086d2e73 SHA512 06270d9f1284796d1c56c4bcac7de477b4665f6c32b5d8ea2fe816d4ff72d662f67f3482349d5d2b055232d9f1619f6fb7afcc7fe0a9053df7133efd9fd342d7
-DIST git2-curl-0.9.0.crate 9290 BLAKE2B b90729fb3de5781f7d1ee180658be92a94fcde5b61991493703e7b60c34c0a730054f36ba49f42b9bd5d64d7bf9471f3f1e6e7eb5224d7f13eb928d3f6a0f981 SHA512 f43b1a9e62f53f96c4108975225ed4c0b214cb86cfe969ec399bc2483ae1eeec409d163fbbbcb78386208bcefcd26971f7a29537a29d37fdfd1051e02f0128ea
-DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST globset-0.4.4.crate 22369 BLAKE2B 7265cf19e3f7a8e710be40760098242fe156ddfa974a59aa29018c2c317876049dec21e70f8b416ea9a0d16c33754118c7f070dd0e50de70cf8cc10e484a6030 SHA512 b9da7f4d67d4269b0b3564d65904c9cca0db7df6d33255f6022eee614f0ad03f3dc6f9e52e52fca7461308d9f01dac1f3588baf87aef735c266561b1119f9985
+DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST gumdrop-0.7.0.crate 16558 BLAKE2B 1c6ae5fc20365b47b6a3e0179e935270d29c558c986e3b82a3f4201793ac86af04ca268aca222d8711f9b4b4b095fab0709e7b3636d3d93cecd97b9b7778d6e7 SHA512 c4123cb660f367fb46d0a38aa2f9213a05af7371334869f1cc1d84f10c145eced993f7c5c5dcf3ccd1ae716ea900801340f610d2d829addf573f28f9cae1e0bc
 DIST gumdrop_derive-0.7.0.crate 11381 BLAKE2B cac3aeba79db7c6ee7f17642021cd6141173af801176198e8da5e2d120a62b220235cd161cd7a6f2f5ef9f1af035b9c8901a1a2853bc525a242cc0183676b614 SHA512 1c9e718dcf6f6d9c297f149aa5baf4e825154a0ea898910f912ef757c59b01024270b0f3d8ab350f67e9a3eaa8e6074bed310081faaa08e890213b01ca742039
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
-DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
-DIST hermit-abi-0.1.14.crate 9556 BLAKE2B 03b27536c3a8ce98d26321439ea6d0b14785fa4dc1666f2bfc6142f4f79d003393aae4fa0e351f6eb3cee6719bdf14e32fc6e07f5aa6f75916cdd20d3c1f5be4 SHA512 a3b5eb8462f47d9a0d7342d45ded3c22578cc19bca05ea0856daf04f263d88b0ca1a4f4c1daec14708282dbc39efcc11e100a3a7fc2bdfa73522ce5575ee7b8d
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
-DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
-DIST home-0.3.4.crate 4167 BLAKE2B 8e71387f6063446aa565dcfc6f08f72e2e406681d413bae835393d31ce1f80d451928e3b434bdf569ba3ccde23e55be320f0081f2c2570c3e4e4069915dfc0a9 SHA512 0e6fa44f4464229e833f8ffa893fd84dcd0bff181c718adcbe5f202b76bd2e16044aa44e1828d4eb332fc71637a3e9ac432a048ad2c6e8f87c719e9e88d4a9b1
-DIST http-0.1.18.crate 101326 BLAKE2B fa8dcf6cb5dbafb5883dd27110cf583c4e656852170abba050568ced0241d4d62e0c299d9bcb50b707b495ed0ffbbf3688d7a5a5f29e6aac07657fdd0f279b58 SHA512 850145ca90272d5f474cc9998bdb173bd94a2a16cb08383815d30d9eb941b9fdb8b0d1a342a4c24bbf94d9e63336f4e10b2b95f5dcaeb26392efeef143cb0726
-DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
-DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
-DIST ignore-0.4.10.crate 49022 BLAKE2B 4e1fef531f800bf95bf1a601cb8f64d93ed46623217392368cd1f59fe6e353dae8e8e6d2a017c5b3bc89acf2a964eb682d30803f2d4ac3744935c4567d2675d1 SHA512 ef4b3f58bbdc3b5317a14244494ba9cad8e3d062f0c8e137dd2d33572dc8a06b20f59860aabafccb729dc682134aa4e2bdaea8c07b351aa73a8ebb00e361ceeb
-DIST im-rc-12.3.4.crate 124256 BLAKE2B 6ee5fe39142b8a6bb96c9a2f50206b67088377ecba753b92fde0211df409b82faeaa5a534016aa91a70aa5b93396af2247c2094d10a0dc136ad4319303e4a22c SHA512 bf85209dca389ec4681a53fec3d58a1f98f56a1821e916d95b152ed8a1eb7ca1fe704062c27a8af27c209da1bf84fda9f39f92202b4d810dac36ead4e225bce8
 DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
-DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
+DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
-DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
-DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
-DIST jobserver-0.1.17.crate 19563 BLAKE2B 369af1c6ea420f3be059e7dec5e59d3634dbe0c7bd30e2067bad0ab7702b1643841943f72d8d8624d9b9b208f7e7c1480d2d2dadbadbe52855a6c08316ee1298 SHA512 14578203a000efe2cd88e9de96af216b5aec50f02aa2f33a884119d2edbad02626c05eae6f203ef92032f7d6f9ca58f427a368f843bd379e9e35b585d04fa161
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
-DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
-DIST libc-0.2.71.crate 474209 BLAKE2B e380a6936248992b1b1f63ef0cc3d3de410d414bb19350a2327da3947ae0e8e700e82f0f4a802cc485e37571b3a6a68bd773f964496f572a721294623d135c1c SHA512 b6f6eebc42817107aa2f94d426154c2449a2558646414464a31ee9d9dcf714e641fe6613b95ecf9e751d77102c0cedb74b35ca1f76c6df2231a5bad168de5e16
 DIST libc-0.2.97.crate 517712 BLAKE2B ad769579a8e89e9e0ea6a08b8fd82b69a3a299721d63b63efcb436b333021c097933565e86f4b66ffcce6a589718bed2aacb36b80a936dd3dda763b9c0c240d7 SHA512 9b94a43d7da1e419900f7a016d5eb958bc42a006e1bb621ab8e2be2167e91f05cee81144c25e81a85c1b1ea2a26ff88980a4cc292fd42db8b09c5c49bf5531ed
-DIST libgit2-sys-0.7.11.crate 1176919 BLAKE2B 9793a5131c805f8474c17d336514c480203938f51fcdb3d4e09bfc609e6599027a05436660077a526ddedbcab3c587a411fd9ec8d7dd921fb352ebb61e52eb1d SHA512 361aa7d75a029209f59c799e2f091f6ab8c0ba6a4677932537eea8e0198a36a2382327e8c5db98a2980f47b6a4baf07708720f128734081ac58e30d8721c3435
-DIST libnghttp2-sys-0.1.2.crate 2307177 BLAKE2B a76feb5a820f143691a954cf6d62938522408bca4c8c4bd346e4e4b25b43f1e26490a75acbb06971ec15dc1bb61efbc2f7ec95877d236facb99bc1006ea18147 SHA512 d82a0f5bed2dd43cbeb8c12b7fd0a7015bf99139ef1fbc9ed6b27bfcc72f3cb21b726cbd5083fede5cfee0d6a29c3e09b22240fde11c3d9b121342720897065e
-DIST libssh2-sys-0.2.12.crate 468388 BLAKE2B 83010257061fc04ac461aefde945583e94970715e8edca3e8346c085d6a8ebbff61e0fedad9b39d6d848fd0a19caebbb1e20d648537a4d0c8622962911d5caef SHA512 85503ce61fc7ceb5aef619091089b075d19f54c65315c41fa8b24d8a2dafb5ad99709e3ea7d014cf274d1af254ce8a1ce40b815df2aed1f218ca5832dfb2dfc5
-DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
-DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST libc-0.2.98.crate 522087 BLAKE2B 950686d7cde31322e1cdf82ae189192091b8543d14d0da0dcf3892910f4216e8e46bb1d5e7e8fcb1693a372577c57a6eb6538a0fef997c1c1a0466c3a1f7acb8 SHA512 2e730b8d46c42608c7da5ff4c5475667171b552b485c2684d3821310ac0f55c1a7a12d9a2cf68a05608cdd2a0928da5e290275c70a519a379d0ed25350689689
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
-DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
-DIST miniz_oxide-0.3.3.crate 54561 BLAKE2B 79bfb64ee52a5cba786486d055cc742119db2957e484616d5cb487330406eb6401c92d03bf43dab5e97da5dee7f97c07b30a2bbff7f9bdae91726ee38121b3da SHA512 d8924c3a496136c0f1bc4a94befa8ebba72865c454296975cbce6e9269051e6894002dddad8027eb32ce650e1350ac3ddf75a655469cad5ee7b5484641c554ce
-DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
-DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
-DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
-DIST openssl-0.10.25.crate 185164 BLAKE2B 17cc67db6e4188d111f75f52fa03da910c86ae79d8211f6fa252d04c064ec90a1008efd2d69e0c8a54719d3d547a783bb6950c9bb0525840c31efe45bfe9c7b0 SHA512 db7a8af332c8db921cd07f778bb591a5d013d98848e1772cf5b9550562a5ae55e6459047f4b3263f813dc9a0b8f0bd302ad86dc620b71339bce3136f7daed029
-DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
-DIST openssl-sys-0.9.51.crate 45001 BLAKE2B e872039554c7e07e3303c1345ca91b246435c7bb37fb00b91f23d8718d5e18e857bccf46a488489ec142e73e535f3eda49f15bc74c555b48a69d62f3c24c57f3 SHA512 2d9041e03ab647507e2cfa71b8f76a1dd72c3d57455a0bde957f833f487129c20441651e5a31e3ba7bbbdf963e994a333a42cfe3f36ff1935a2ecdc813e04450
-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 petgraph-0.5.1.crate 147173 BLAKE2B 3b74b2965ecdb37a82439111ad849581254698c8701d8d5bdb050f4a30cce05016511928443cf65dac394dd45584279a933435a77ef3c610a64c73cc5a68ff9a SHA512 c3d5f53b1a0900084b0693a6f3a849bb9b443b1b6fd1ad88bce8beb12ed1b45f2399b68db3366ba15f33c2d5682e052b733dbde76fb1b646b7bb1e660a38d8bd
-DIST pkg-config-0.3.16.crate 14429 BLAKE2B f850910fd54891c39bb4187c5ea49997e0628858d7c1f579cea719b8a2c47beb907b3f6e72056c8d8eb037314f4c5a129280504a7c1e8c676fae48241ee6dfdd SHA512 13431f3f8cda05615c91be2fcb8eb2fba085b46df70c5dce773748ffc15f0b48a45858aa69c37c173ce6353b028851f94f03ded58649c641e66a1c1a65b60572
-DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
-DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
-DIST proc-macro-error-1.0.2.crate 23699 BLAKE2B 2d8310300002d1dc3fa68391190c5536e1faf6be05f1dd2ed1429d530dc527f431bdb93a994f2e68ff6120523b0d10a4a2ab35a0703f3013b404d0b82ab68372 SHA512 a9ec65c02f853f05f6adbfd398a82e84dac5bc376f041ede65a47b510914f5def1ae480c1a7e68aa6fab836efb6bda0d712d45243472b73c12d1ce7cdf8c3583
+DIST phf-0.9.0.crate 4712 BLAKE2B 1ecba00b75d980ac6f7d0a2065233c1b388bf54dfb8efda7f7deb5221ccc7975b94dc9731481043a94ec06d2d54206c77891351701fe8fb7e5e01e017586f6e3 SHA512 0a10c9afbff6e40146cf32f8a279368ef0f73ce32d1ca7f7e527e03f3432635ae2b993531b3d9ae3624c2feb875b302cdd0c3588047287dbbc201e8485260ee6
+DIST phf_generator-0.9.0.crate 7769 BLAKE2B fca5d84d48164ab394b335368861fc601bf7d16726b2a2b9d99cc27447a3b61c1a63a9a6c3b32fd59bf66eb7eaf100ba252880b0ddb07fbc6f36d7b9e699c713 SHA512 6adb363d1ee9f2b64e29755e8e92efb3203f3f384bd0cffab60a14b98ba544c3f6da067ba714cf3cc9901c153d5b464d2824216f35f94fc95cdcff7f8657c36e
+DIST phf_macros-0.9.0.crate 3537 BLAKE2B 4e82ea5dec7b8b9d0e321a56b12218c8b04292a90465b11c6f8b2f0440dcf9a9b02dc15e6ef775b091dacbbc589d3cec03770a0ecdc779b2f97a85a238875335 SHA512 92b14f1b9e47acf448583538d4f783e0c8da1ed0231165cf852788e2aa5af29e646d655612b7ca7a2af14e0139dc7be5a34464938109863db33aeac2d5c313a2
+DIST phf_shared-0.9.0.crate 4111 BLAKE2B 04d4344d7f07a8116ff7ac2497d64e60eb527d1387107d7bb8f7dafe14802434e8e8e3f4587580a673760a7332fab90fe6307905d571ada432b6541cc29af2b6 SHA512 9c15d6d0af7809c036c510b964a6f9e2c07b7c866333b30e71c3e302035821ad1c21993b3c56522c0f2641028dce42aaa8532a04a50f0706c6501f5c2c739f26
+DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
-DIST proc-macro-error-attr-1.0.2.crate 6974 BLAKE2B 4b8fb0c70873eb487dbfbcd37d5a5dae6d877a910f3523d9985a511ea97795082548f03bef926ca91028340dada954217926e7b9d8cc70765343f6d86c1e7c01 SHA512 1fe7ea1e005ab4d6b777b2caa4a5c2ad7655b5375fa987b0b2cfbec6a0673d844aee2dc273dd327687dcdf21a165261e78175eed69e881dfbe1f2992eb505c78
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
-DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
-DIST proc-macro2-1.0.18.crate 36252 BLAKE2B f55674ba8294f48d72a71dbf36a2e464898b96e53ff32d8dfb6f66271a3427e59e5f8e868309aa6c15e3b718983806b35f65599afa119ab76b658af863f90e63 SHA512 3e7cf577bc3548e03a2f1bee620e3ef484dcaa45fbaf7858a8ea04f79d82d636b527584765ef43c92624e1a1afac50e60ad3f9dd8efc34e8e6b84cda20c864ef
+DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
-DIST proc-macro2-1.0.5.crate 35430 BLAKE2B 3bb45a1659cf7352120e066f095da7f91343d17198c4af4d4b2600b78e5bc7900f7b3c1fa72b4c707e80c05f6b91155015dc72ca317932195f727c333d34ae41 SHA512 0fd9cb01781b7fca910e905c0cddd0deebb6a862d84286b694b78b7210a586ff497a211eabd27b80c3714b2019736206f88d9d97dc21f3dfffe49ca041f98783
-DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
-DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
-DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
-DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
+DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
-DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
-DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
-DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
-DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
-DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
-DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
-DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
-DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
-DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
+DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
+DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
+DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
-DIST rustfix-0.4.6.crate 13488 BLAKE2B e2b2f54d4420966f4bf0b6c7cb8ee96ec1a4847295bdfd00a88a2f7f6bc00542e471fc6abb2dfb6fe1949ad0c2b9a5ae1911232a47f670de1792637c2dddb44c SHA512 76927c924025bcecd885a71e5f8802e6f44700afceac4acc67e0caa3e594ed6445879d92088cd4d01f8f1e00d8e09cdee9e2274a3a83ade9db24f0a67d04949d
-DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
-DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
-DIST schannel-0.1.16.crate 39153 BLAKE2B f06cb0dcb3d93ac1debf396b23faf5df2b87ce98732ccf5c0ef78af0c36fc9825f2b716f0a5772dc71cd2b2e6ecb477a81c2dbfb6bbd4f84bf3d1187dd7cf187 SHA512 11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b
-DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.101.crate 73115 BLAKE2B 6b80a6e7f8965c412c6f5db62cf3782329818c59c43c9947ad9a33be56b334feb0fc0afae4722f368d708236e2763ee2b1e71b323b3e961880f99f2e178a82a6 SHA512 3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678
-DIST serde-1.0.112.crate 74450 BLAKE2B 585c499e2f869c82d1be54878be266b3715929b98e288b751ab339d3c7e71ed807893d0a19c475ac2a49ab2a407fec465c560921385747591b224fecd3a35b9b SHA512 9ed5a8906c6f6feac945da6f08c33764c678d8049fe9c249a23558976f27aacbaaa2dd2770a30ea9f6ff6e5018258eea68769b3a22273fe00c6ab2d5e2a396fb
 DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
-DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd70733669627628cbdc921dbecc384d1a328fc8a37a8f5b96a84498d5fb4514374760ccccfcee1f3e809d35da5677cf4932 SHA512 08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417
-DIST serde_derive-1.0.112.crate 50233 BLAKE2B 03177d1b014dfd1e62aaf05c9a1c950876f662761e15e1148ee51f1f31f11a92d26ec06c886973cc6038148a90f2c9f0c620a115e74f08da15910b82592728b1 SHA512 ef09cd9aef974dbfaa101134e06c6262ba528a7e74b37f0eb3439c7ba595a47676eb7f15d028ca64f0efbbc4629109f06fa667a9e8f90f908c39c7094886ea08
+DIST serde-1.0.127.crate 75162 BLAKE2B 7472c9328b4398bb25bd71febe9483e6255b309d98d2655babe5d16933c5b92a71cb75df8aec3abaff84082bffdc44a549673d30a3cb68888d17157e58b32be0 SHA512 dc2b9c0a71028853bc05b4bdb3db1e9e753dfc588ebcff5dccc42d05252fe250b797e10b4d574f161fe11747c9740e93a47a2eba2b4ffd6ecf1992dfadbdd2ef
 DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
-DIST serde_ignored-0.0.4.crate 9533 BLAKE2B 07d08459a3333fb30a9413a882169b5c5b49f26f58128dc8f0458c3e7e668948f3a84d3e5c4dff78905f51604f4f317d76f96c3a900da85d669c0c9065e6191d SHA512 29911d05145b33ddfdcd5c86d57af331262393cd445eb5c464df07f8853032a156b0b1be7b90b66666748e0383831272cb53252cad7778fdd3ea20f2a04e23b4
-DIST serde_json-1.0.41.crate 69870 BLAKE2B 328935ee765889b82cd88ac7eab921e279ea8ad41445a8344b194605e1571b30b6204add7dc4de1f87994d8162428eaf4d825e9744c9971349e8fee19507265f SHA512 63ac513a4813a65962d8f63476ce8e63ce71d1e6643da7443d774078e4a743835276c50c04ce535b2e43251383c537365581838a0bd5d4893a644e396eeec55b
-DIST serde_json-1.0.55.crate 114335 BLAKE2B 89118d6ad9c62b5177651a65391cef22258b3fbbfa85c8dbe38f99e7388a3a9a44f20db800ff2b62f0484bc1766d2cb7c9dc1088894aa18c2e50be5d45b98f77 SHA512 db81c9ddaae20ff5f712d8a2cbb58a95bfd139d9358797443c9ee10fb8af18f1396faf09f7335c249118feb32f52192734d61efcb0b40204ea58825056eea9c9
+DIST serde_derive-1.0.127.crate 54201 BLAKE2B 207c20d2e276a173a1ae0326be307f3d77937442838a7890db923fea434d6e134a9591a07139f8eabb9981aee74dd092d6e2c0a98f17aa67f069faa3dccec6c8 SHA512 2c346d45bb96867ea5b4a0ca24aa9b0584d83f26578f5a1ec8a51c514d0158d98c7b76408a0ea64e5718567afb6a0cfc5922d3c5588a89b7e19035b13b1a0416
 DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
-DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
-DIST sized-chunks-0.1.3.crate 22156 BLAKE2B 48edf5e404ab5967ab90d7cafda783d0bc9e3faa4040e815e6dc80f7041c667f0e109f6b43638ab6cbd9e41e7cae9a4d65b91fa36a4fc63aaa7963b1b0f5aa65 SHA512 613a306d7596846da858543c5eb34bcb52356e5ebefe77ebe36623f1bdd4579d18fea955c6ea07788dfaccfea013afa0c817f709afaaf01317362575370dda54
-DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
-DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
+DIST serde_json-1.0.66.crate 115121 BLAKE2B c46c65339ff79138649df206f2ec759945c31ac11bac4807a8d1e76095c1937211b0b4ebf88c69d2d22cbd90ba25643a74cafeb291e815ddeb5c5ca208eec9e6 SHA512 8cbb64a24781a94e9448dd39f9429830fff6fe61be3772c1ca825f7d489ac3c06b189c42730129e281d8f43f7128b3b9cd2308727e625763588bbaf61b54d1d1
+DIST sha1-0.6.0.crate 9244 BLAKE2B d992f1803fc17f8f8081ccbafd07ebb9d78056a705444b45dd51b2f57cbdaaf071685b8e6ad9f4fa21e032cc78b4305c8101b079594c7bf6e67894bb798b16b3 SHA512 32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c
+DIST siphasher-0.3.6.crate 9708 BLAKE2B 652b226927c1a2020a1d407bf53582d10d9e2cf1e0a71ff07c6b30edb31d3def77b9e9e1f9bd3c5cc6206b2158cbd5753d6c05ea0010a2ada3a26ebf64c425d6 SHA512 2b2295b4807ae418ae03ad5b1d1a9adb8c29706179e1e77a483b0d1786736385e0681384e8f5879d21c1b009958659f2efa8c553a2a93618e66dd0660aa1e169
+DIST standback-0.2.17.crate 29011 BLAKE2B 96081a4036d2e17d96f24be446f5179880f7089cce5dd9acb5140277526bb8395384225055b9f60749e29d48283f2251ad514618f460b44a6850cb75eee9845a SHA512 cd953c942afeacea01b2114eaae2d80e754da7df2f399fcd2cd5c6ff31a15b0644bce4ef1bcc019bbfe60c6521ee15f370b83d77b0a1efc75dcc35a81faea662
+DIST stdweb-0.4.20.crate 194102 BLAKE2B 68a34d4729ded806846a82f0453cd8a82e7a2bf5e7761725af4fdb70be2c9d9c0022c64c5d11a23c8f449d8da7b707e285a8a994b6f027500c4d11da8458d280 SHA512 d6e608e4124e92c94f22172ad1e985dfd9a8a5182f123abf2d837680ad7f791120774f9a483ae5f8d2066fc6e658045c1ad3ee8791a19caf1884970e5882f7ce
+DIST stdweb-derive-0.5.3.crate 3894 BLAKE2B 922b52eebb5e21f1f3f58866dee0db28506e37a716f8d58924cba568783098fd236954b52f432434c28f0439e9b6153468c5c3e32f4feb3748a56a49162c9b43 SHA512 d47048f9b1a84d3201ff6189873606df678e22216a7b3e26d23b5708b4115564262aa8ab51151e2ea61b4fdb633ccd5e0af73e62548fb653c30545ea4800834c
+DIST stdweb-internal-macros-0.2.9.crate 11828 BLAKE2B 6343aa183e07df93082845b10b564d17af8e65aed6d938054020519a8a96af21838c19a04f6f20d0c1e7ad511d9798f85ab780ffb4dadd049a7bfa19583aa7a3 SHA512 05aee9e19565abd18f781cd6b7e60a5d7fa576ed37724265eb4808b37d9241d89d0eca1aadeed7f3be5237859cd3d905b8e3ce5001a3f1d68ff002bedb7513ea
+DIST stdweb-internal-runtime-0.1.5.crate 5445 BLAKE2B 6684fb69a8add47cdfebf7d85c784b3a8f9431ee43d8033d67781dee1eaa6cac71a5330c5eb1a12f5f3d73b863caec31d33985ad8a93d32088c506f70839970d SHA512 9a73f8007d6fa52031ac19f3a2adbe49c0690cec856c484cd81d534ad5b7e4002af0e6615cc9bc8d6753d0d3c1cd5a009ea3ca3750ab518b7aedfbe39b3ae11b
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST structopt-0.3.15.crate 49378 BLAKE2B 5474b71fefea749d2bba1be76f4aeef52564b686ca6315e56192de2fa01377df82ce1331ee35c6c5c8ab25fcc936e909f2d85448d8464722bab11cccb1d7b361 SHA512 92f577714dae111b6a3c0a4b2f2e30be60f9387427c4458b1641e2589e17c6c1055c9860f3370a89bb6e1fd48333d0a88c7af007c6310ec881436a7aec444e99
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
-DIST structopt-0.3.3.crate 40622 BLAKE2B 0960dbd15b9ae1258ea9f98c082c974eb8be6635f3c7366d3a382415947647e66658bad52faaa56eea42c2e06e8dae03f6d8906923f78b1d85c177bbf9424024 SHA512 8239f1db65401ac0d31589f362938fbbccbc10a930480e183cd0c503c10b75c5e3723e0d0686b84b3d3837d788627a48f7954b81ce5fed4c963d0fa2969496bf
-DIST structopt-derive-0.3.3.crate 16237 BLAKE2B 995fd46f6017802c957f5a7f23bf219cdffca8f9e34809c64ca00b8cb3087ef7e579d28ab01125dbce7c80ba95b9657564bb20d658fad9cffba2e8fda81bbeea SHA512 27df870ff020c2b115fc1fbe8a65d8ca9818d79c46ca24a588d0f1589bf62538430bbc63a9dc34832b4212895e7873c47fb4266fd502d6444cc8767add86da24
+DIST structopt-0.3.22.crate 51665 BLAKE2B 310597cd82596b8a63501d122b20d845d5f9bdef0f3babcc53e9e6f93f9cc11f2aa4702bf2c20cb0b2105b4cda4ca0dcaf79c67454261424c3e5d90da4261a48 SHA512 fcd37107dc6cff85e30345c816ec6ef9bca57f05e9b67d8dce196a94fa18d79d33e953036b394521e76534fd5cc9e4fbbe14588d7cd4ccb01076f4c8ae8f5739
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
-DIST structopt-derive-0.4.8.crate 19647 BLAKE2B a260833142085899cabe918c748ba661dd14d3adcca2d4e35698a4df404a81230ea4bfca8a34dcabf411efe229c9adeb7ea51b514899ca40690d18c8d477ca17 SHA512 b8819fb5958d889f7d871fd952084e7695ab061458e8c97b5be8a7171bea6dff92407fc87d816bef62e322d2aee0ed1375029aaebbc4fee17cd909a7f5a01848
-DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
-DIST syn-1.0.31.crate 203988 BLAKE2B c4cc691abc2590e361187984f627e5928015893987945b344d18bf449009081e789b14ed6f2c7ad889f63b34e0e6a632ccc7a801d146a0cb37727b252c6eda43 SHA512 9d7ffd4f7acc2790587934e0a99e2615a4292b03fb3701fb55795cd94722d7a757d5e94e7a224284496d812ef5007936164467917e6aacc428f5b45d2ae3fa79
-DIST syn-1.0.5.crate 190286 BLAKE2B 7d5c813bb4cebbc104978181532a050b0a7f79963a539d69a253ebdb15a83c275a5d5b04dfbb66a426afec2c90a450ed7be595619a2b5a31b0725d904f5adb92 SHA512 4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc
+DIST structopt-derive-0.4.15.crate 20861 BLAKE2B 3c97e31f8f3c549af548a3c75eef06b50039e513171251162af08eb7a70d900e0fc533d5bc711fed489252e5102e5245d343197eb03161c2d03e4464c6319fed SHA512 a241cd02ee91195548759e6143f4c08eac70466d6e13fc5af59a09c15dec27816cfb766c7f2024d4a678a1a1fc8fe5d78b858b3ac0f53fda914ec9ec1d8abc8d
 DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
-DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
-DIST synstructure-0.10.2.crate 17988 BLAKE2B 62bdc896819ba1f0820286dda3596e265dc7ebeda83595d89ad6baf584046242f774141b25ee4cd9b120bd7c392973a99d307abbe956b50eddbd05e9b7b7ce72 SHA512 48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458
-DIST tar-0.4.26.crate 42689 BLAKE2B 174baa480caac4734282003b5277004d87ccf9d5519b0adc3a02ceb0831e053483eb4cb7d21170ba792e2a573748aaa9589a261ffa8050d8bf2bc36e86451e16 SHA512 83ee187b253347068121d04242a488ac44ca6da159c6f9029f3e063b04544b7fa3ed40fed7e251692ffd73553dd369edb413f52f3b3718396451ec916eba15ab
-DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
-DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
+DIST syn-1.0.74.crate 232974 BLAKE2B fc17dc2645fbe2d1ee409f895732b86cb77dc14837d35d7773e7f9f055e0b56f70be86203f13c549f0b43e1e4e1e777cc5bee2f08a733fe447f907dfaa443da7 SHA512 5aae03a68a4a8c1234d4e9a69cd37b9f6c698e2b635f10a030c0fac22cf00414c2a5e7523e0efe43181bc29c17abe6abc0eab103391259c97ce566713e3349f6
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
-DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
-DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
+DIST time-0.2.27.crate 65167 BLAKE2B 358463967b7f17af5d2d80f8bb967a85ce096927b6b656545744d446d2f0ebf55250178cb345354ca64f8a46ba12ed280621ca16a786674cac103914e6dc02a6 SHA512 a54421ebb3b4b833fe5122bfbdb8d7e1fe2d605afcc252a1106183d148e5fc298e29d86284827a4545beee0810b8b756aff66eba03bc9a27e8686d5683e0f13b
+DIST time-macros-0.1.1.crate 5447 BLAKE2B 4b9dbc879711804f4af172e46e10421d35177242a10c6dcc32bbfe9cad7ed865c7c3d18cd9b8ffee79bc47f0ce5622bc9609ba511d7750a358b6e5cab8426934 SHA512 c6792be54dab0847d621684b4afe2e9803f2004bc3d4f01d84802af7f557799cf4d2b5ff6fe58e0b4018d92ab3868feb9b5df5691b2c8ee188e6e7b39deb8c8c
+DIST time-macros-impl-0.1.2.crate 10096 BLAKE2B 6a1208bdd9a687f682a3310b0720648f7bc9e6afb020e65800decf1f6447d971b360b94030dfd433397ce4c8d0921852de41f611fffceca39ba2173cf28d66ef SHA512 7f783390b4cdcaed2b9c8d8083f42d5708ad25605d3c17c3a484ebd1bb93531627d563d4506281a856bc4a23ff2a4d3d4b42eb8be15da0dca2712bf47c3dcf66
 DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
+DIST tinyvec-1.3.1.crate 42386 BLAKE2B 9fa7dc7c4967bc3ba3f7e5fbef54a7b6fca46f6520aed2482d355b1f6434ac702e073df19034908f214e5c0ffaaa3bdb41c7d394d9f828dbeaa177158ee99ad2 SHA512 ad07998e9bacccf8ce2bcb01fea8008c6514ad73c15c6426453cfdbb432dac7d588d05551b179c83ca062ea02f0853e97e2b9712da0b8dc20ddab4c0efd5afd2
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST toml-0.5.3.crate 51654 BLAKE2B ba0b8af941edb4557bc06a24351420ef89619ab9115b85e3f6eb5eb327dc08496d02023a5e375e3546fe763db11f201fc576804eb291d423702ab81f7b7854ef SHA512 f3798afe9cbededee2c5d0cc2cd45a9a5b09004bc4d6f0e2863aa56a3aa377e9eb8fc2e4c557fe448afbec77bea5bb6953fe6ff59cb83389351ea207bd912458
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
-DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
-DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
-DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
-DIST unicode-segmentation-1.3.0.crate 90567 BLAKE2B 2bfce62b981b6b8d41be760f0663c3301f974fa9c975e7859c6cac6778cecafa2ee5dbe2e4368959b4fc2f0dee3d93cdab236dde593665b76740d07009051cb2 SHA512 6f32a36c8c69e80b3aacfcf68cde088a34b88587e20de6e49a14b24941caa51a0031623941ef05e6d36e5c99f50472c9bb26d670b5396749bae8373ae4bc7d4c
-DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
 DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
-DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
-DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
-DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
-DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
-DIST url_serde-0.2.0.crate 3525 BLAKE2B 3beadf5f536b091ea54f8a1cf31553f2c9c51719a1d586ceed396363d26f1441c12a23bf8017cad4daca62a57b4f5b55b0b5d5577b4c61c1854f16a3d4554247 SHA512 9abf777f8ac1f369e8db826e35fd09a2a5f1685560027740a8388ce1c60de92da79b4d1b938f9bd082363396f5b7a742811feaf298b269b2f5e9465650ee827f
-DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b
-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.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
-DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
 DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
-DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
-DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
+DIST wasm-bindgen-0.2.75.crate 160048 BLAKE2B 5e0fb4b5093e51d59007d202a4fc30ebfe0d174101a7178412c7cf0c11de1e1dfda2a86ce403f925eda5f286dfcf07d348143108905b912d2c4222f07ef414b9 SHA512 6e44827bddf78f38203f864564e7315744b4ee232a20b62f74551d9c8099005e5289074ca123acdb98f367e6e09ceb694124649d26ca16aa5c4137dd9494df91
+DIST wasm-bindgen-backend-0.2.75.crate 25521 BLAKE2B 8b4d494cc903e1d37f4b5f0cf0dad2304f35534a15a4381cf511384b090b635f9926647eccb434c148c0fe86f0621e8aaaab3fc38c8c61d2b45363a2c8ddcaaf SHA512 27231ae632b3377f54dba755c7db2334c77f75d2f2d6062fe9be27d19ee071552b8c36f037f5bf5cf383f262a88464a0fb5018fef2c301202c9927e0abd08637
+DIST wasm-bindgen-macro-0.2.75.crate 11550 BLAKE2B 160805abd3343c43634c2d8cfc2ae9eafdd18be207fbb849caefeef47d6ffad70e436775b86c3432ccb78d994ce81cee97c1b41c29484148d23946392a5dc9fa SHA512 200999b53937df7daae4779ec7aa1b78bb10d399c3ebe7dc8d9806ef697cfe6c4111296623610fb4aea48cf7cfdc6ac2fe66398db781796f8fdad32e4809a4cd
+DIST wasm-bindgen-macro-support-0.2.75.crate 17883 BLAKE2B 007f789084f42f7aee7db984763c0d224ad16b04d134aa2208b53a93911b408a4e95ad51e3f6e010157ee2a4ba8f9e52cffc20f2c47ecc7ffece797814c99b10 SHA512 cb0bb02c7f0bb6ad7de3adff606d18e7eae3f4dfd276abd540de6dbf30d995445347781e681ae6f71a943cc2b7c4da36459f49af32cd1574e5634948ee65421f
+DIST wasm-bindgen-shared-0.2.75.crate 7177 BLAKE2B 89da1efd60d9f1a5f99fe216a1ddb56aaa53e75591dbdb11aeb07f350f95dc436e68d7e16c182fa10385b7eb07788fdaa87f374a007d687a473a7049d585f6be SHA512 35c8ef834dc0ffdc245a52d987a543483f4caeee0f2d831e2a48bd7c0dd43bedf02b460323ef0d40a4e7945b351768cc4a07112771f197b93702887b828e9821
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
-EBUILD cargo-ebuild-0.2.0.ebuild 2723 BLAKE2B 2c971c4e997c8dcdf14ac770b58172f509fb488cee9ce23599964725762d7f0dba7c435e3e0d5163e1c3448de83be949dcc2508deced0774b97713c4b1a62ce2 SHA512 ccef06000bcfb7b08ceed1edddb08945d36c04ecc5317543b8d3f83bcc7144afd2eafc8cc3b30f0808d27a819faf46df3892e0814bcdedabfdfb2c554015d6c1
-EBUILD cargo-ebuild-0.3.0.ebuild 1296 BLAKE2B 7ef1f0e28e2eabe61298cf8f5400cb7b8172bfe0d16ff6f46e68d5b407ede061fc5c952659af1c3bfe2be552d03c1e4f5063a7e027d7c2f69e0308cd2ea838bd SHA512 bd5343845a3b3f899ba5437ace79f95ca8e229fbf400dc93f3cc2cb0be04e100939f86def690ca36b5b9654a0721a4049282e42fa61fc7890966d25f6f3896fd
-EBUILD cargo-ebuild-0.3.1.ebuild 1376 BLAKE2B 767c8e784eaec455a9e54981953aa01e099536c8e1f29acaf71be0daa8a2f923dc771fc1b6693c11a94eee6fd0131a4f229a748a31fe9e179d593602e91b6277 SHA512 571bdfe5035575d2b50167fb65efc7079c034c4f7a7394a37aedc713f547d3a94dc79838fe9f3be6a6f514c9bec04dda94516a8c860dc288a79a901a7339fb11
 EBUILD cargo-ebuild-0.3.2.ebuild 1576 BLAKE2B 3a216181f177a4a8b93f56d62e47443b09064bf92e10508dc6cc64d59b844d1fbcdb1543de37024e23b3feb97a6a228c8ef808500d2a4339c84401d6e3a8a470 SHA512 42ae9e9e15235e644fbad8478c9affd367f81a9aebc11060a3852ffb0763f53b3cfcb882f81006e79f7095f6d67cf4987d820b26bb6ff1914ffef085f01650e7
+EBUILD cargo-ebuild-0.3.3.ebuild 2130 BLAKE2B 864985437083c7f28b5e0b721b87cb27ba8e0078fe6fbfa353fca46d8a0d1f9cf30d84f635a4c07795ddf7a27a6983730704499cfa454641afae08cb10479e1b SHA512 3396bbfad8f8b68a89ea853c09c10ec90ef43ff6cde7a95f34b62cea51eca7196cd6277337758d2b76bc8620a3eb71d89ca0c56126f100f801b9007b38594779
 MISC metadata.xml 412 BLAKE2B 752bf35b06842a5b4866834ad9b2966b9a61541b6467b4bacc63cb49231c71156bd28815440db8c03bd88cb14bd1e1b8b19738ea9ba780963868cab820f52405 SHA512 77d8773b4aa0d674e6ca07406170c8b8d113be61cd27e03293f2a1ea46289a5a69b0660da5b9b1a8c78e1f3c2461fdb69a8f0f41d49ae8160d1ea181ba8a0982
diff --git a/dev-util/cargo-ebuild/cargo-ebuild-0.2.0.ebuild b/dev-util/cargo-ebuild/cargo-ebuild-0.2.0.ebuild
deleted file mode 100644
index aa0e59b2b1ea..000000000000
--- a/dev-util/cargo-ebuild/cargo-ebuild-0.2.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.2.0
-
-EAPI=7
-
-CRATES="
-adler32-1.0.4
-aho-corasick-0.7.6
-ansi_term-0.11.0
-atty-0.2.13
-autocfg-0.1.6
-backtrace-0.3.38
-backtrace-sys-0.1.31
-bitflags-1.2.0
-bstr-0.2.8
-byteorder-1.3.2
-bytes-0.4.12
-bytesize-1.0.0
-c2-chacha-0.2.2
-cargo-0.37.0
-cargo-ebuild-0.2.0
-cc-1.0.45
-cfg-if-0.1.10
-clap-2.33.0
-commoncrypto-0.2.0
-commoncrypto-sys-0.2.0
-core-foundation-0.6.4
-core-foundation-sys-0.6.2
-crates-io-0.25.0
-crc32fast-1.2.0
-crossbeam-channel-0.3.9
-crossbeam-utils-0.6.6
-crypto-hash-0.3.4
-curl-0.4.25
-curl-sys-0.4.23
-env_logger-0.6.2
-failure-0.1.5
-failure_derive-0.1.5
-filetime-0.2.7
-flate2-1.0.12
-fnv-1.0.6
-foreign-types-0.3.2
-foreign-types-shared-0.1.1
-fs2-0.4.3
-fwdansi-1.0.1
-getrandom-0.1.12
-git2-0.8.0
-git2-curl-0.9.0
-glob-0.3.0
-globset-0.4.4
-heck-0.3.1
-hex-0.3.2
-home-0.3.4
-http-0.1.18
-humantime-1.3.0
-idna-0.1.5
-ignore-0.4.10
-im-rc-12.3.4
-iovec-0.1.4
-itoa-0.4.4
-jobserver-0.1.17
-lazy_static-1.4.0
-lazycell-1.2.1
-libc-0.2.62
-libgit2-sys-0.7.11
-libnghttp2-sys-0.1.2
-libssh2-sys-0.2.12
-libz-sys-1.0.25
-log-0.4.8
-matches-0.1.8
-memchr-2.2.1
-miniz_oxide-0.3.3
-miow-0.3.3
-num_cpus-1.10.1
-opener-0.4.1
-openssl-0.10.25
-openssl-probe-0.1.2
-openssl-sys-0.9.51
-percent-encoding-1.0.1
-pkg-config-0.3.16
-ppv-lite86-0.2.5
-proc-macro-error-0.2.6
-proc-macro2-0.4.30
-proc-macro2-1.0.5
-quick-error-1.2.2
-quote-0.6.13
-quote-1.0.2
-rand-0.7.2
-rand_chacha-0.2.1
-rand_core-0.5.1
-rand_hc-0.2.0
-redox_syscall-0.1.56
-regex-1.3.1
-regex-syntax-0.6.12
-remove_dir_all-0.5.2
-rustc-demangle-0.1.16
-rustc-workspace-hack-1.0.0
-rustc_version-0.2.3
-rustfix-0.4.6
-ryu-1.0.0
-same-file-1.0.5
-schannel-0.1.16
-scopeguard-0.3.3
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.101
-serde_derive-1.0.101
-serde_ignored-0.0.4
-serde_json-1.0.41
-shell-escape-0.1.4
-sized-chunks-0.1.3
-smallvec-0.6.10
-socket2-0.3.11
-strsim-0.8.0
-structopt-0.3.3
-structopt-derive-0.3.3
-syn-0.15.44
-syn-1.0.5
-synstructure-0.10.2
-tar-0.4.26
-tempfile-3.1.0
-termcolor-1.0.5
-textwrap-0.11.0
-thread_local-0.3.6
-time-0.1.42
-toml-0.5.3
-typenum-1.11.2
-unicode-bidi-0.3.4
-unicode-normalization-0.1.8
-unicode-segmentation-1.3.0
-unicode-width-0.1.6
-unicode-xid-0.1.0
-unicode-xid-0.2.0
-url-1.7.2
-url_serde-0.2.0
-vcpkg-0.2.7
-vec_map-0.8.1
-walkdir-2.2.9
-wasi-0.7.0
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.2
-"
-
-inherit cargo
-
-DESCRIPTION="Generates an ebuild for a package using the in-tree eclasses."
-HOMEPAGE="https://github.com/cardoe/cargo-ebuild"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-RESTRICT="mirror"
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-util/cargo-ebuild/cargo-ebuild-0.3.0.ebuild b/dev-util/cargo-ebuild/cargo-ebuild-0.3.0.ebuild
deleted file mode 100644
index baeb2817a75e..000000000000
--- a/dev-util/cargo-ebuild/cargo-ebuild-0.3.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.3.0
-
-EAPI=7
-
-CRATES="
-ansi_term-0.11.0
-anyhow-1.0.26
-atty-0.2.13
-bitflags-1.2.0
-cargo-ebuild-0.3.0
-cargo_metadata-0.9.1
-clap-2.33.0
-either-1.5.3
-heck-0.3.1
-itertools-0.8.2
-itoa-0.4.4
-libc-0.2.62
-proc-macro-error-0.2.6
-proc-macro2-1.0.5
-quote-1.0.2
-redox_syscall-0.1.56
-ryu-1.0.0
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.101
-serde_derive-1.0.101
-serde_json-1.0.41
-strsim-0.8.0
-structopt-0.3.3
-structopt-derive-0.3.3
-syn-1.0.5
-textwrap-0.11.0
-time-0.1.42
-unicode-segmentation-1.3.0
-unicode-width-0.1.6
-unicode-xid-0.2.0
-vec_map-0.8.1
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="Generates an ebuild for a package using the in-tree eclasses."
-# Double check the homepage as the cargo_metadata crate
-# does not provide this value so instead repository is used
-HOMEPAGE="https://github.com/cardoe/cargo-ebuild"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-RESTRICT="mirror"
-# License set may be more restrictive as OR is not respected
-# use cargo-license for a more accurate license picture
-LICENSE="Apache-2.0 Boost-1.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-util/cargo-ebuild/cargo-ebuild-0.3.1.ebuild b/dev-util/cargo-ebuild/cargo-ebuild-0.3.1.ebuild
deleted file mode 100644
index 48d0c5a41348..000000000000
--- a/dev-util/cargo-ebuild/cargo-ebuild-0.3.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.3.1
-
-EAPI=7
-
-CRATES="
-ansi_term-0.11.0
-anyhow-1.0.31
-atty-0.2.14
-bitflags-1.2.1
-cargo-ebuild-0.3.1
-cargo_metadata-0.9.1
-clap-2.33.1
-either-1.5.3
-heck-0.3.1
-hermit-abi-0.1.14
-itertools-0.8.2
-itoa-0.4.6
-lazy_static-1.4.0
-libc-0.2.71
-proc-macro-error-1.0.2
-proc-macro-error-attr-1.0.2
-proc-macro2-1.0.18
-quote-1.0.7
-ryu-1.0.5
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.112
-serde_derive-1.0.112
-serde_json-1.0.55
-strsim-0.8.0
-structopt-0.3.15
-structopt-derive-0.4.8
-syn-1.0.31
-syn-mid-0.5.0
-textwrap-0.11.0
-time-0.1.43
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-unicode-xid-0.2.0
-vec_map-0.8.2
-version_check-0.9.2
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="Generates an ebuild for a package using the in-tree eclasses."
-# Double check the homepage as the cargo_metadata crate
-# does not provide this value so instead repository is used
-HOMEPAGE="https://github.com/cardoe/cargo-ebuild"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-RESTRICT="mirror"
-# License set may be more restrictive as OR is not respected
-# use cargo-license for a more accurate license picture
-LICENSE="Apache-2.0 Boost-1.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-util/cargo-ebuild/cargo-ebuild-0.3.3.ebuild b/dev-util/cargo-ebuild/cargo-ebuild-0.3.3.ebuild
new file mode 100644
index 000000000000..536e479ebd74
--- /dev/null
+++ b/dev-util/cargo-ebuild/cargo-ebuild-0.3.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.1
+
+EAPI=7
+
+CRATES="
+	ansi_term-0.11.0
+	anyhow-1.0.42
+	atty-0.2.14
+	base-x-0.2.8
+	bitflags-1.2.1
+	bumpalo-3.7.0
+	camino-1.0.5
+	cargo-lock-7.0.1
+	cargo-platform-0.1.1
+	cargo_metadata-0.14.0
+	cfg-if-1.0.0
+	clap-2.33.3
+	const_fn-0.4.8
+	discard-1.0.4
+	either-1.6.1
+	form_urlencoded-1.0.1
+	getrandom-0.2.3
+	heck-0.3.3
+	hermit-abi-0.1.19
+	idna-0.2.3
+	itertools-0.10.1
+	itoa-0.4.7
+	lazy_static-1.4.0
+	libc-0.2.98
+	log-0.4.14
+	matches-0.1.8
+	percent-encoding-2.1.0
+	phf-0.9.0
+	phf_generator-0.9.0
+	phf_macros-0.9.0
+	phf_shared-0.9.0
+	ppv-lite86-0.2.10
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.28
+	quote-1.0.9
+	rand-0.8.4
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rand_hc-0.3.1
+	rustc_version-0.2.3
+	ryu-1.0.5
+	semver-0.9.0
+	semver-1.0.4
+	semver-parser-0.7.0
+	serde-1.0.127
+	serde_derive-1.0.127
+	serde_json-1.0.66
+	sha1-0.6.0
+	siphasher-0.3.6
+	standback-0.2.17
+	stdweb-0.4.20
+	stdweb-derive-0.5.3
+	stdweb-internal-macros-0.2.9
+	stdweb-internal-runtime-0.1.5
+	strsim-0.8.0
+	structopt-0.3.22
+	structopt-derive-0.4.15
+	syn-1.0.74
+	textwrap-0.11.0
+	time-0.2.27
+	time-macros-0.1.1
+	time-macros-impl-0.1.2
+	tinyvec-1.3.1
+	tinyvec_macros-0.1.0
+	toml-0.5.8
+	unicode-bidi-0.3.5
+	unicode-normalization-0.1.19
+	unicode-segmentation-1.8.0
+	unicode-width-0.1.8
+	unicode-xid-0.2.2
+	url-2.2.2
+	vec_map-0.8.2
+	version_check-0.9.3
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasm-bindgen-0.2.75
+	wasm-bindgen-backend-0.2.75
+	wasm-bindgen-macro-0.2.75
+	wasm-bindgen-macro-support-0.2.75
+	wasm-bindgen-shared-0.2.75
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Generates an ebuild for a package using the in-tree eclasses."
+HOMEPAGE="https://gitweb.gentoo.org/proj/cargo-ebuild.git"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Boost-1.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+QA_FLAGS_IGNORED="usr/bin/cargo-ebuild"
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index 1397294354f8..b218c87a2e35 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -7,7 +7,7 @@ AUX gnuinstalldirs.patch 714 BLAKE2B 32364640271a4868d5a92fcc9ca803df8067ecda2c8
 AUX gtest.patch 1676 BLAKE2B 2f53c95833d47d6637d4aecd07212e33be66e576ed2d869c221b77f0215f6d3879b85b4d70ed554febea86ab9c5246486dc21ed40b5796d081b271057e9cf0a7 SHA512 844e37fc82055eb5e22404b6786910043365a8425a3852e760e3122cc99716083a21155ab9a685d800b034fe34538849cd94740dc851f15e3bafa0773820912b
 AUX package_xml.patch 1588 BLAKE2B 15a11031b704f307778e8cb85438851bfa38a2784abee9c544a10fa4e61036ffb45a391f40eacd7f97ec92abf060a1afc790d87cc1cfa40ddc07561db14c027f SHA512 7d6e1cb0076681c6cbb1332b05e6cd33bae4f780939e00412fd4b022f71b0418a4ff4f8e13d06f42fd21225e78d058818d680fef691dad4412d75ea0f0ef9f5e
 AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e83acaa0aaffed9c316ed482a821219c9c074c71ea15bad343a7f63b887b9b266982fe4afe7f71 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913
-DIST catkin-0.8.9.tar.gz 217743 BLAKE2B e59df77a7df04492942917377f4f3dd9e302e20fd901bbc8878d1f51879a481e15b01482db4f1d3b8d1eee360779bedb5d999663fe58f10d33c5e4f1964a3be7 SHA512 a34784d349935f5917e7d4600c5ad3e728a86d8ed235fb3be86b4dec212693a1e4209901929d284e50c112f31ada62a04a9caf9845ee06c6db2e98e79602ecd9
-EBUILD catkin-0.8.9.ebuild 3139 BLAKE2B 814f839892968462a8d1cef298f0e7ae91f071e377f497dc11e11e342fa3552192469596e04453c01a748e434d4487642216a28a30a544f895a681eb5f3fb9d4 SHA512 4f14a2fbee4f8abd1df90d96c1a94849057adebaf7fc51f99877c76e53b75d6296812ee7dce246053de3b5b056ea52ccdbf7b4f8ccf81d29eb32a1ab60e99165
-EBUILD catkin-9999.ebuild 3139 BLAKE2B 814f839892968462a8d1cef298f0e7ae91f071e377f497dc11e11e342fa3552192469596e04453c01a748e434d4487642216a28a30a544f895a681eb5f3fb9d4 SHA512 4f14a2fbee4f8abd1df90d96c1a94849057adebaf7fc51f99877c76e53b75d6296812ee7dce246053de3b5b056ea52ccdbf7b4f8ccf81d29eb32a1ab60e99165
+DIST catkin-0.8.10.tar.gz 218095 BLAKE2B cac62d7682e14e258cb7b8a55ae93c8792dcdb38b281c68b8135adfe9225c07a0c6c16717426f9b12ccc6aba91178cf18eeb05a0474ee6524131970e0c158c92 SHA512 0bab7a7b13484b09d301af52f7e563b78d8b80ac5cfc36a36a725baea7f23bf374d4814303875a4a1aa3981e346a3e5fa3f9b1e27c3ae819102dbc239ca767b1
+EBUILD catkin-0.8.10.ebuild 2734 BLAKE2B 6017e5cac7053667df9386eebcb9e67caf1cb17e3772127be5a3c407f24243e0e7944226bf9dddcbdb5843425f280ec5c11d93fb37506d55ccc535446ab5fb6a SHA512 8cd5ceebc295769a2d92274d51d66aa803000b9fa762249ecee159895b974bfb308e192fe24e0e4d3f7f5df657911214833a4bdaf4482b7f452628a7d777c0b8
+EBUILD catkin-9999.ebuild 2734 BLAKE2B 6017e5cac7053667df9386eebcb9e67caf1cb17e3772127be5a3c407f24243e0e7944226bf9dddcbdb5843425f280ec5c11d93fb37506d55ccc535446ab5fb6a SHA512 8cd5ceebc295769a2d92274d51d66aa803000b9fa762249ecee159895b974bfb308e192fe24e0e4d3f7f5df657911214833a4bdaf4482b7f452628a7d777c0b8
 MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94
diff --git a/dev-util/catkin/catkin-0.8.10.ebuild b/dev-util/catkin/catkin-0.8.10.ebuild
new file mode 100644
index 000000000000..1918b71d47c2
--- /dev/null
+++ b/dev-util/catkin/catkin-0.8.10.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/catkin"
+fi
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+inherit ${SCM} cmake python-r1 python-utils-r1
+
+DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
+HOMEPAGE="https://wiki.ros.org/catkin"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/empy[${PYTHON_USEDEP}]
+	dev-util/cmake
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/distutils-v2.patch"
+	"${FILESDIR}/catkin_prefix_path.patch"
+	"${FILESDIR}/gnuinstalldirs.patch"
+	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
+	"${FILESDIR}/package_xml.patch"
+	"${FILESDIR}/etc.patch"
+	"${FILESDIR}/gtest.patch"
+)
+
+src_prepare() {
+	# fix libdir
+	sed -i \
+		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
+		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
+		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
+		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
+		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
+		cmake/*.cmake || die
+	cmake_src_prepare
+}
+
+catkin_src_configure_internal() {
+	local sitedir="$(python_get_sitedir)"
+	mycmakeargs+=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+	)
+	PYTHON_SCRIPTDIR="$(python_get_scriptdir)" cmake_src_configure
+}
+
+src_configure() {
+	export PYTHONPATH="${S}/python"
+	local mycmakeargs=(
+		"-DCATKIN_ENABLE_TESTING=$(usex test)"
+		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
+		)
+	python_foreach_impl catkin_src_configure_internal
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+catkin_src_install_internal() {
+	export PYTHON_SCRIPTDIR="$(python_get_scriptdir)"
+	cmake_src_install
+	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
+		dodir /usr/bin
+		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}"
+		done
+		touch "${T}/.catkin_python_symlinks_generated"
+	fi
+}
+
+src_install() {
+	python_foreach_impl catkin_src_install_internal
+
+	doenvd "${FILESDIR}/40catkin"
+
+	# needed to be considered as a workspace
+	touch "${ED}/usr/.catkin"
+
+	python_foreach_impl python_optimize
+}
diff --git a/dev-util/catkin/catkin-0.8.9.ebuild b/dev-util/catkin/catkin-0.8.9.ebuild
deleted file mode 100644
index 65304103f95e..000000000000
--- a/dev-util/catkin/catkin-0.8.9.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-
-inherit ${SCM} cmake python-r1 python-utils-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="https://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/empy[${PYTHON_USEDEP}]
-	dev-util/cmake
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-BDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils-v2.patch"
-	"${FILESDIR}/catkin_prefix_path.patch"
-	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
-	"${FILESDIR}/package_xml.patch"
-	"${FILESDIR}/etc.patch"
-	"${FILESDIR}/gtest.patch"
-)
-
-src_prepare() {
-	# fix libdir
-	sed -i \
-		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
-		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
-		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
-		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
-		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
-		cmake/*.cmake || die
-	cmake_src_prepare
-}
-
-catkin_src_configure_internal() {
-	local sitedir="$(python_get_sitedir)"
-	mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
-	)
-	python_export PYTHON_SCRIPTDIR
-	cmake_src_configure
-}
-
-src_configure() {
-	export PYTHONPATH="${S}/python"
-	local mycmakeargs=(
-		"-DCATKIN_ENABLE_TESTING=$(usex test)"
-		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
-		)
-	python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake_src_test
-}
-
-catkin_src_install_internal() {
-	python_export PYTHON_SCRIPTDIR
-	cmake_src_install
-	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
-		dodir /usr/bin
-		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}"
-		done
-		touch "${T}/.catkin_python_symlinks_generated"
-	fi
-}
-
-src_install() {
-	python_foreach_impl catkin_src_install_internal
-
-	doenvd "${FILESDIR}/40catkin"
-
-	# needed to be considered as a workspace
-	touch "${ED}/usr/.catkin"
-
-	python_foreach_impl python_optimize
-}
-
-pkg_postinst() {
-	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
-	ewarn "installation path for package.xml files on Gentoo."
-	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
-	ewarn "packages that have it installed in the old location:"
-	ewarn "		emerge -1O /usr/share/*/package.xml"
-	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 65304103f95e..1918b71d47c2 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -67,8 +67,7 @@ catkin_src_configure_internal() {
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
 	)
-	python_export PYTHON_SCRIPTDIR
-	cmake_src_configure
+	PYTHON_SCRIPTDIR="$(python_get_scriptdir)" cmake_src_configure
 }
 
 src_configure() {
@@ -85,12 +84,11 @@ src_compile() {
 }
 
 src_test() {
-	unset PYTHON_SCRIPTDIR
 	python_foreach_impl cmake_src_test
 }
 
 catkin_src_install_internal() {
-	python_export PYTHON_SCRIPTDIR
+	export PYTHON_SCRIPTDIR="$(python_get_scriptdir)"
 	cmake_src_install
 	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
 		dodir /usr/bin
@@ -111,12 +109,3 @@ src_install() {
 
 	python_foreach_impl python_optimize
 }
-
-pkg_postinst() {
-	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
-	ewarn "installation path for package.xml files on Gentoo."
-	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
-	ewarn "packages that have it installed in the old location:"
-	ewarn "		emerge -1O /usr/share/*/package.xml"
-	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 743510f4942e..62bb4e6f2ac8 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -4,7 +4,7 @@ AUX ccache-4.1-avoid-run-user.patch 557 BLAKE2B 956ac163da6c8acdefb5b39554906727
 AUX ccache-4.3-PWD.patch 2677 BLAKE2B 4a21c496fc2e2249490246d9595935afe13244a4ba39181ac7193445299870a00f8168d6d1602d1ef17881ed32acae27ccb68a1cbc3b386e6c88a2bf5e8ee341 SHA512 2c71fccb53f6205e99995e66b2666834d5c3fd106933b715bc4325bafc27121e8cf6b7925ce1c9d524aac6941f444137c249bda837cfc7be4c08cf6cb5a49f8f
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
-EBUILD ccache-4.3-r2.ebuild 2041 BLAKE2B bdae1d9186802507b70c775e374b4566d1d816e72079a8d58b323fa51c0c4c21a9f842228dfe341d8b58b5f7a6fb4a888264242e0707c381987bd80073b79fe7 SHA512 c3e724820400577c08a1b2f0076527a8ea17ba59aed6b270197fe367ec1ff2793c618a032e75a1d5fec093a25ad9cb63a0ae5e6eef2906c68d659f47b0fad643
+EBUILD ccache-4.3-r2.ebuild 2040 BLAKE2B 8016d81a0d7b8b4af592b49f1b16ae013a0a86db3900c94dc6c0b4fcc999f99469ec756679796b7917777e07bd359ce93e58f4e7569846651f881f60e6075e47 SHA512 6ed3f885dce3dfa048486b7635fc11e0506ba8d72e5379b04fd5c656ed769e3346aba429c163cf8960c8ffda049b3e4057b9c8c057ee46f1da1bf9d55dd9b79b
 EBUILD ccache-4.3-r3.ebuild 2125 BLAKE2B c2390d35d1f1f32cd4861eadc080b06b35047207937c6a71eb88b175b849adb2af58f61713375e664328ae47bd0a07392461a611b0085344dbf29990934977dd SHA512 8c2b00b7f810beac432b18ce61620eef5d1a8187d0f9a7b5f29658291af6ad6f1498148fc2f422026871d068b8c8267b9c8460f4a980bcab560b601a883b7cde
 EBUILD ccache-4.3.ebuild 1655 BLAKE2B b3cc038828f86dbd2d8060f5d13a197c399e7b99d0c0fcf4a82fbb498c212a9624fcb023f481c628a123fd1e2237689b1b094187c5fa1caa98aeca38c9c870d7 SHA512 0adb9fe19611bd373870e85d889b2bdaecb0fe6b11c40f3d48add1ecdca99c4b6beed5b151c685eaf13f0b11b0988bf870525ac23e3f78c865565f84e1aba156
 MISC metadata.xml 538 BLAKE2B 5d70ae3ee732e530a300eddb61097898034fd227dbc9f9b7d1a86004c755b247f3d7e23737e23a68028fa35d07d9fa76a940bbadcb2e279e80e297d0562fe169 SHA512 1688d981f12ab344da5a579da421675dded7bc1a1e7db5f784f4ab757c630a012e377802aff6b30a59d1928ec0f026d9a60a7d84e9eb0593f1de02b980a7d86a
diff --git a/dev-util/ccache/ccache-4.3-r2.ebuild b/dev-util/ccache/ccache-4.3-r2.ebuild
index dbe17e3ac11a..9de66b172c8b 100644
--- a/dev-util/ccache/ccache-4.3-r2.ebuild
+++ b/dev-util/ccache/ccache-4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-c++ test"
 
 DEPEND=""
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 80f0f5a2085f..3c170a83bbd3 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,3 +1,3 @@
 DIST devscripts_2.21.2.tar.xz 980516 BLAKE2B 907f2f4e258a8396ad0a28eead1e2058b8e19be205f024ea80c0fbd9621d5ca4299844fe83d66cac7f653a917705d9c36eddb9d51454a7fbb9d7e2b52bc994ff SHA512 a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01
-EBUILD checkbashisms-2.21.2.ebuild 799 BLAKE2B aadf1a4ce2d57ae5cbea234c1f06d72def99082f661329a59b2deb3c06a0a30389bc15bf8a0ef4fcf6df1f6082b9d2fc8958ecf0afc54369e6dc49821c1e594c SHA512 84cce305f16cad007920ec67aa6f1d2a4a3dbcee5d8ea011044da44652ef421893b569067de46e1d485e5d3f297c02f104cbbf671e76c605b3e57832fdbb0c0f
+EBUILD checkbashisms-2.21.2.ebuild 804 BLAKE2B 3327e778848aa5aaddb57e44ad561465133c2833db704842d1fc5e3533fcf5d15a33c065baa5dd199d3e2694b770096805f7719236eca33b35953afd6d1814a4 SHA512 bff58abba0ecc7da82e22d5a5aea758fb5a665a7cb05d0f472ef423de5273dc9ba89ba6af5ef613bcb740faa1e8a7d0d0e4debf53baa632e36fff31c736fc292
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.21.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.21.2.ebuild
index 79c9187e7075..8078bd1b9ac0 100644
--- a/dev-util/checkbashisms/checkbashisms-2.21.2.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.21.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 1cb18b77c472..751fbd6b2e32 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -15,16 +15,10 @@ AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
-DIST cmake-3.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.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
 DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008
-DIST cmake-3.21.0.tar.gz 9617926 BLAKE2B 70a67bc6916ea566f8ae9b48d1e6882ff834dee796f67aa01ea2a6c95ecdeaef8b6e7fe95410f8f1206a92e05bcc659d90bde5254dfb107020e52d9e938f3e8c SHA512 b635c50db0d3a18392a84b24f14017bb625708bcc6f6ba2d749a5c37d45f5e0565e415a802d129090a18e0747f80f2640747650d28fa0b3069d28e3e6a735ebc
 DIST cmake-3.21.1.tar.gz 9629567 BLAKE2B 1f33117f6fe3491923d053e4d025741340eff477a7a34ef26a6185d7e8f197d159a4cb45b0d79af3298939f8970c27e663a6011fcf479405d458b294fdf3dd72 SHA512 1453b1f5139950f501c570c305257e4e5dacb8224944de8ed1489aae162c6dd75fe1cd5188d619c47e4e53ca5b846f07318ffb3ab004a0547f2c8b13f60083b4
-EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
-EBUILD cmake-3.18.5.ebuild 6070 BLAKE2B 24ab19a092db23bbcbf3d8f1a87e21cc8f17575e8eff885efa81c3fb0161204f8f821bda04ac819fbad5f73936db8b2bff38b688252a9bcab30a7df002adfc71 SHA512 59b479102626d771fbf66f1dccc011e33ca5e3d77bc37f291c6e28fbdf998b7b5853da56875345807714b85a1e95c7b41fe2f5e98f6486191b1c80d6962697c8
-EBUILD cmake-3.19.7.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
-EBUILD cmake-3.20.5.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
-EBUILD cmake-3.21.0.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
+EBUILD cmake-3.18.5.ebuild 6073 BLAKE2B f8097439f239e2fee487988f2a9ab3ff67c4d5b9ecdad28551594b20012aad2b778f10fc9fe34343bb1a26da10a6788ccc6c672238d77d07c07f6075042c2a9c SHA512 89d0bd67cad84d7afc87931fc5bf9d6a48042fea582f4f64a18cda133382de96356f1dbeb2a05a673ba972d76d4bb60b756d87ac5e05dec73994ffb6dbe449f8
+EBUILD cmake-3.20.5.ebuild 7037 BLAKE2B 45f59bb070dfe37e60d9ba6227c277fd916b6c8d5a94e71a1bbdc14473a6cf7183061e134bbba0fdb50b562582b90635e88272d3927c113d8517264ae8ecb83d SHA512 fcce3cb2f5e34e7864fbeab2f0f1c2da8bbe6f281082011d0fdc8e4df92691c8a335e68478fb3a76c996d54ac9d8f82ecc622feeb180d6263622fe6efb3f2067
 EBUILD cmake-3.21.1.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
-MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
+MISC metadata.xml 337 BLAKE2B b5072e22c7dbf6ac9047fd7ffca1ae44796f3de7453668e7fb43df54952777fcadca5b17e3b7bf13f4257e4a70043fa204088b471e05251861b8c81233fd05ce SHA512 a6d95246e55fc770db8b00487890dbb34cc9e99688907e4fe2c378756a2f91a00f36be8786611019ada86af2e04bfc109198aedbe70c00268c3a6219fed976b2
diff --git a/dev-util/cmake/cmake-3.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild
deleted file mode 100644
index 2b496b439633..000000000000
--- a/dev-util/cmake/cmake-3.13.5.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=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
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.13.4-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# boost (#660980)
-	"${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
-	if [[ $? -eq 0 ]] ; then
-		par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# disable Xcode hooks, bug #652134
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-			Source/cmGlobalXCodeGenerator.cxx || die
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.18.5.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild
index be86fdd110e6..f3b612048616 100644
--- a/dev-util/cmake/cmake-3.18.5.ebuild
+++ b/dev-util/cmake/cmake-3.18.5.ebuild
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
 		dev-python/requests
-		dev-python/sphinx
+		<dev-python/sphinx-4
 	)
 	test? ( app-arch/libarchive[zstd] )
 "
diff --git a/dev-util/cmake/cmake-3.19.7.ebuild b/dev-util/cmake/cmake-3.19.7.ebuild
deleted file mode 100644
index 3d40c53f2157..000000000000
--- a/dev-util/cmake/cmake-3.19.7.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actually bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
-	#    TestUpload: requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-		# disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.20.5.ebuild b/dev-util/cmake/cmake-3.20.5.ebuild
index b1cc1455ac6c..a4f26387efe4 100644
--- a/dev-util/cmake/cmake-3.20.5.ebuild
+++ b/dev-util/cmake/cmake-3.20.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cmake/cmake-3.21.0.ebuild b/dev-util/cmake/cmake-3.21.0.ebuild
deleted file mode 100644
index b1cc1455ac6c..000000000000
--- a/dev-util/cmake/cmake-3.21.0.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actually bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
-	#    TestUpload: requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|ConfigSources|CMakeOnly.AllFindModules|CPackComponentsDEB-components-depend2|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-		# disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml
index 633caf12afbb..df610749ad74 100644
--- a/dev-util/cmake/metadata.xml
+++ b/dev-util/cmake/metadata.xml
@@ -5,9 +5,6 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag>
-	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:cmake_project:cmake</remote-id>
 	</upstream>
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 5cea1bbc2ed7..12f48437cdef 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -5,6 +5,6 @@ DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B b688974ff83019422cc5b2ec575d9838bdff4a
 DIST cppcheck-2.2.tar.gz 3561406 BLAKE2B e436de4bec5412a18f013c8557a966c28c14edcd07fbb80eb53a897848d15f32afc180798ea1a074742f896b15d4020755c104b87dc8f82252121b58a92b92dc SHA512 d766187a69d6aa839e072e3c0ed44009621ca8492504257288ca2f49774f705a1ebcf2957f0801ac6eab2ffbdd845e9237f1213f85c6d0fcdbf16b1e7c690327
 DIST cppcheck-2.4.1.tar.gz 3761646 BLAKE2B 4c791088621f989e2529c92de38a73676fc3394e8cac72822596f7a75594283d0983693d693aa903a3ffb80bc0e1e20e71b55db5682d4d01c135ed77b2fc2e3c SHA512 8fb1ed5faa0071fc69405b7eb5b41e9f94b77d097158ea0d4f5e4da8a5087b9d1ab7bf37f8dc73d00096d3d2494aeb431af8029f0d4f1e2085f5b9b72bdc2d09
 EBUILD cppcheck-1.88.ebuild 2355 BLAKE2B 1d7c21225df4b3af7621842680af021da76f3b456d57f0ca28d00a6ef76b5be33da435839b1282fb33686de88897f2c4ac6f4a839d2e926fab04e45fa42c41f2 SHA512 7a6ab26533ae9f26abc95893460c6dd634bc9a12a871c745a0fc1ca8d2f4d1fa72d5924eda57a97d626a1015f3d38d755516c424d7b9e5cc613c9cc3e74e3070
-EBUILD cppcheck-2.2.ebuild 1702 BLAKE2B b00b67bf679c6e7f3cf8b3f6e735ed22906a230c18af78a8742dc13e683a5afb285bdb37c1411166b941ea10147d19d8d6894d9b2e931075f893a77f4c12e1ae SHA512 42dbe570713326485107184deade6972c9f328b735cc07c1e1a2ecae407a73cc0cc3b9944dada6cd8c6988f3c0dd42e6ceb8f8301a0664e1959b2b27d955d4e7
+EBUILD cppcheck-2.2.ebuild 1701 BLAKE2B 989310dbe5d76b981327a4c6c0a581bd150c8dc30712e275b2bf1eb5869c8a97b42ce7989387a129e131f4d494880b88364f08db9dec8c5e6b20a0d8b60ec2b2 SHA512 c438b70fe8d172eeb1e9aceb300b0826dacc6fe1129d0d3328652e7a602201b479c0b57ce3fcfa3f60ad4d7ac12a9a892f62afe9f05b30b9027a28ac6f30f5af
 EBUILD cppcheck-2.4.1.ebuild 1767 BLAKE2B d00753321c8fdd0ca9be2ecbc97b0a1cf802395fd084b1c5eda17b27193f26e241d2398aa32988e809e4e8c8cb00d09bfbff2c157b7aa96b92fe85aceab4114d SHA512 d981a44eccdbb90891f7d7b409f46b2b2e586e196dc6d88aa8038e497691a7d6c9fa2bbc611e7dc25c6c6d4b26cc876df3f71dcb96977a2436677f6991198081
 MISC metadata.xml 490 BLAKE2B 63b66d1ab0e87f0dd53dfaec62c4d17c1e806ddf2208df30b1a5fcc0f198ca343afa5a39ab55d92a3b4ac3b0143c24ec5c161afe23982c3c5eaca2050621c776 SHA512 1db095c4b258ccea938d6e4648aca9c3a165a123a703311de95f1743f641c5860cd1dd0369e6539efadd270b9f82f25694f504c34129cf55c74b323ffb3ac3c5
diff --git a/dev-util/cppcheck/cppcheck-2.2.ebuild b/dev-util/cppcheck/cppcheck-2.2.ebuild
index 692cdedf480c..175f33dd4bce 100644
--- a/dev-util/cppcheck/cppcheck-2.2.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
 IUSE="htmlreport pcre qt5 +z3"
 
 RDEPEND="
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 7256d1f5789e..ea89225faa51 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -3,7 +3,7 @@ DIST cucumber-core-10.0.1.tar.gz 47196 BLAKE2B d048c36e3d28871e603b2092062af1e9a
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
 DIST cucumber-core-9.0.1.tar.gz 47009 BLAKE2B 2c78956643dfb08319732af24c08d5df811574891b582ba7ab51281c9a5299a3063c6c607af5cd9659aa0e160c0f3cab1d54b9cbd57d3dbf2768e97bb8f79e8e SHA512 0ac61797cda1d62d2b452d3d843be855f84b12fc9c435e8b5261700a981d94c9c88e36e309d8c2dc637ff195032768d363ffd9e7424c842d5b0ba98c3c678752
 EBUILD cucumber-core-10.0.0.ebuild 937 BLAKE2B 03ed124e774bbccac900eeb53342b7485613d325ff3719e8d1bbd9d6e935ce7444cb8548626fc959509aaed2304942552f5aec2c9b21ff40f12dec388cf13d57 SHA512 576f76e49e010f70a546d1a3e866f762c469e983d4517d228619498ac02d92b543a8c5e6e8b2c4adfe727786ec048df9b75fed86d43a2295285e97bbdf0e5406
-EBUILD cucumber-core-10.0.1.ebuild 956 BLAKE2B 465a655a3aaaacd2900f74ec78ec5d9305e4c708c197704b14efef5e2df4966a8f0384a79cde6ae876407116bdc7da7a9f546e229bf4b6a99f632a54b2f09b87 SHA512 330ed5b9f618592cebde44a64b058975c48f844e823881315f90abe7b9e6e53244f4ff63cc5705e15de078572b653842d7ffc0df4df3273d94c32971f064e3e9
+EBUILD cucumber-core-10.0.1.ebuild 963 BLAKE2B a575af4325fdea86617331b26bc3c22d1f37e0afe89f145e04808f04bb0419cfe87e863333cac09f5a343535e662134727141262bc381e4bc78984050d32f4c4 SHA512 15c73645e2681e19a15efcccbaaa09f156e4ddbf3c6c78352a1e4a853fbcc0784ca0ef75fb11c3d70a5b709acc4a20ed5e41e5d927a5c69d04df400e7c5703d3
 EBUILD cucumber-core-3.2.1.ebuild 1063 BLAKE2B 115e5a34df2654655c4c4d4eaafa34bbec22b277a35f484370f73e9987bc3be3809ecd61cd352a76a28b09a9afb929cfc034f82617aaf58bde424a7be07be9fb SHA512 4d0273470f96259204c7f909ddf29704c46adb498524304e4bd19f69505a5c0a78be29ebc32269fbcefce56f69c3ad27ef83df02b00aed40b8095e4b927b6d4b
 EBUILD cucumber-core-9.0.1.ebuild 1133 BLAKE2B e69b419451512f3c0212ac25657531511c5adbdb7868af45741712839ad17e2b37d687459836687895e9a2e593c8db37ba79eb968fbf749e1c95f8145e5790d5 SHA512 342e947e4f480aa3cb0829868914562941d2d085dd76fffedfe06b7d720b99e337fc3957c39bd787eab875446ea6be14b19d64f624a05620d2dccc2311df91a3
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild b/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild
index 4250d27effd7..36392e73a309 100644
--- a/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-create-meta/Manifest b/dev-util/cucumber-create-meta/Manifest
index 359265e8c2cd..36c01c235fdc 100644
--- a/dev-util/cucumber-create-meta/Manifest
+++ b/dev-util/cucumber-create-meta/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-create-meta-4.0.0.gem 8192 BLAKE2B 4809b0f9ec7f922af374ac46bd9d0cb9797f48738596f00c08bf3d861a19141160032421715d4d141b1b1854e77f3798d09308f626188c3ef6b30a491fadcd29 SHA512 0103b8277741d4eb2e590e1d7f9231187482d32f9a2c19c837baab759b3c48c11a39ac7af686d56fefb7b79120110e930c9af25fb895294529a3b5b0612a5b63
 DIST cucumber-create-meta-6.0.1.gem 8704 BLAKE2B 6e438871ffea3723d5466d24a0ccf1d672b05222de5063a6d9587b951357e631a938eac3b93dfc5f01155ace5dafafbf9d4a08f828b972c7f8b3e35f74ece26e SHA512 6e61bf4163a3575a2988c5a8fc351ad360d3b55e5bd615ee915f0f66064675514777868311d53f40d1fbfcdf7ffae2795c0d84c4f90c710f7d27a56009463b1c
 EBUILD cucumber-create-meta-4.0.0.ebuild 560 BLAKE2B b7259ad1746e8a479c54ac45e5c8f27f8b73a73f05c92263ca1be0c080515dfdd738368dc2902e10f64c5a2a69f6b4bfa84afcd632dc0d291403e78029520bd7 SHA512 acc849845cdb8cb65a444d303019b873871bf422335e640fa2dd40226a0361196da85e7d074459910cd7404b5b9d86007872712468f82150bb0418a70af37071
-EBUILD cucumber-create-meta-6.0.1.ebuild 567 BLAKE2B 9dcf9481a07c2a99625ad41a302d296cb8d78f8897864f6f1d70731d04b6276134b52b58eac9b1a7020963ff1e50932041e9ca50b98e79ea0fc5f2ba3dbe714c SHA512 2d2a62ca653628a89a6f223ae4c3a113ea4fc29e3ab301f109b1a896b701a0ec483d7da59ce6947a6161ce268a2807858867c85bfe201ba659eacefadd4684b7
+EBUILD cucumber-create-meta-6.0.1.ebuild 574 BLAKE2B baec08d0cb383101fd0f3839541eb8d6fffb05a24cbc20ae1e1b99b78068cfc95b9aa1d3c81091b097849b59894b495c4c4fdfc8e610d81b7583392aee2e06e1 SHA512 5a2e8a205a6aaa7d0d189ccab34cce93fcfba21888c5330d46b35c9123707fdd7e88b1432624ae387fbe76f179c4e1d53c0f48e1b0e0e00e8af050fd8da71560
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.1.ebuild b/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.1.ebuild
index 8744c8c04a1d..b40761927a1f 100644
--- a/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.1.ebuild
+++ b/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="HTML formatter for Cucumber"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-cucumber-expressions/Manifest b/dev-util/cucumber-cucumber-expressions/Manifest
index 29e9af12a201..96ae7dcdc923 100644
--- a/dev-util/cucumber-cucumber-expressions/Manifest
+++ b/dev-util/cucumber-cucumber-expressions/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-cucumber-expressions-10.3.0.gem 23552 BLAKE2B 6aab081690081e991a1c1dfdaac93e114165dc1b2a39a1825e6424304765c96836cec9dcb8635e9f97ef0c07a6b58cfe7fc587c651dc73bab0670f4230828640 SHA512 d560c62f625f6b284a94974cef5227a3623fead9c8c4f45ea9fed2300b37c405ba69161d6c6f5e159b2a36be5eeb05b122789cafcafec0dc84efbb366bd0166f
 DIST cucumber-cucumber-expressions-12.1.1.gem 32768 BLAKE2B 3b885771889349b84ab4a83537d720eef63c44297217a5b06ec78a9759d5617437ee7e1dc98d7dc692a3afbcfbbf1c315b76f2685577e861214b8ca943e6eb00 SHA512 6d931a589e4959d6e2647a3ae2a16fdc57e6de04d3e875277da55a60278548cb789d00216c2cb1374c56bcdc58d2e39228dc03f047d1a3a12774c8c03429c149
 EBUILD cucumber-cucumber-expressions-10.3.0.ebuild 475 BLAKE2B 200a330f113a55b51d98ad04636633b38a369ad76fdd2b20d11fc609b904f40a3bb6ffc107877ec670843aebc9e5f065574916a6d5374754e480a9cff84097df SHA512 fbcc950bcb316eecfffbcdd4addc9a64a7c3c280bab6eb56bae67e5a6ba0973ccef92beeba9653c7310de441488776ef70fbd87852e4dba88c5ca663ec3f6ae1
-EBUILD cucumber-cucumber-expressions-12.1.1.ebuild 475 BLAKE2B e26e384fe5073ccd078edd56cf23b98e6c3851e68ceb5c3be2e73e021b9022c4c161185194266fcef04cbc418ae392166a1ebf1df82a3dcb8f0306434f25e4d9 SHA512 dcb76c3fbd0997da31866e596ab9206ad4b8ab59175d20809e029de349935ceec01bf9c4d41213b6be08405e0bcc118b13e14cf885d508e6404a660033ab6265
+EBUILD cucumber-cucumber-expressions-12.1.1.ebuild 482 BLAKE2B fc33a2bc078bd342333bfdb9108b55fcfab9e8736bb320cf7c8b5bbd35307230c772a45611cbf151aaa43d77ebc49355e730cb5eb8ce44dbb90f289b1d166648 SHA512 12c3fc2fb7377bc0bfbae2acf1206827fa653ffb6362a16facbee0a3dd5ce43166fdd49412c4a8ac3d59b065cee9e10ec9772f189dc376551db729f0392a621b
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild
index 1f98b61518ed..fb5ffe411c48 100644
--- a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild
+++ b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-gherkin/Manifest b/dev-util/cucumber-gherkin/Manifest
index ca59113db648..34e707f4ea2f 100644
--- a/dev-util/cucumber-gherkin/Manifest
+++ b/dev-util/cucumber-gherkin/Manifest
@@ -3,5 +3,5 @@ DIST cucumber-gherkin-20.0.0.tar.gz 9238574 BLAKE2B 40dd7f31e234740528301ed20be5
 DIST cucumber-gherkin-20.0.1.tar.gz 9410066 BLAKE2B 2c34b1eec9d74b96bbf21ea20b479d9a1ab42669bce08eeac9c9f0c97b86c64e9119423eb8ed3c42897c8730d1dae9c0a75e32e407a63b6c1955e773d35fa16f SHA512 0a53a7110fde39ed921c3a883b2aa00f8599e7dda87cdf1766d606a696ba6f9e350d176edb9cf849567a9f4733d5e0653944d738fe9a9451ecf0763b8687706b
 EBUILD cucumber-gherkin-18.1.1.ebuild 951 BLAKE2B c1aafeb0612a41f93fd1465cd1c8f7f1ea77ef72c1848bcd739ddab3f88854961ca0554a5062cb4ad9678fd974e45a9be7502e8102e6250c8638f1db9ada6202 SHA512 52d650ee344b3afac54b1cc6a364708f706a56645dfb63a0c4c24734b78f3603b688fe5f43f9a998c3967c1b7d6e7320d2d6588ba8b677406979fb78f6dfdffa
 EBUILD cucumber-gherkin-20.0.0.ebuild 741 BLAKE2B d8afd727a9ae4f2b5ecf8fed65fa63cdb963b615e3c2093a1b1c6b44766d2add104984599ce79ade9c99e42a165f6afd7ea4c7d9acc3c4d242acff05d4ee7a04 SHA512 6cc882826dd95d6e83fd9a78fcb4094d9689494f6c0471ee610fa43a40159f15f75383be959d621a212e8f44c0421c596299e291adb52071a0b3976a83461ed5
-EBUILD cucumber-gherkin-20.0.1.ebuild 760 BLAKE2B 7ddf37df216f43c9f4c8136374d28e8766e7ad69502594aadead575bbb4fa18685416bdd5e4997c4c64277b3c7b68a8d771321f5669a3edf22c887088cfa0262 SHA512 133984c547ee5fdd7317c0f32d04eb4007d17dc2d1d403b1eb2af3dbfe743d3f81b7a9936dd724bd4fdd462fd9ec22cf49d77a131e1835f3b5c4569d2b39c85c
+EBUILD cucumber-gherkin-20.0.1.ebuild 767 BLAKE2B 0b00bb545806296d93919f57c8e1e29ed6aa6df3337724b544de78e6ebff6a07d648e194bcad7657b008902ab8b90acff41cee440cac50ba4c15f3dd324b7740 SHA512 b160473cf344ed070d1a79985f57f2ffe1f6517cfbd0d1cad3431661296b20032cd4077a216b174e7504944903a8e17e119845d3525fd60851126a84624ba379
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild
index 07dd652b4306..5e864900cb5e 100644
--- a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild
+++ b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/cucumber/common/archive/gherkin/v${PV}.tar.gz -> ${P
 RUBY_S="common-gherkin-v${PV}/gherkin/ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
diff --git a/dev-util/cucumber-html-formatter/Manifest b/dev-util/cucumber-html-formatter/Manifest
index 4841de30cd29..26f8d6a5915b 100644
--- a/dev-util/cucumber-html-formatter/Manifest
+++ b/dev-util/cucumber-html-formatter/Manifest
@@ -2,6 +2,6 @@ DIST cucumber-html-formatter-13.0.0.gem 436224 BLAKE2B ce3f58995560f6d78e855e95a
 DIST cucumber-html-formatter-16.0.1.gem 432128 BLAKE2B b1b53566d15573f6f4fa87a9a87ce5c1844d9bd6f43715aee1a08ab45d66baa211631a612aedd59f97c24364ce9b6b607697763744906ec78f96adf0c5ca260d SHA512 2bcdd55e0d3dfebc60c25e2a64a0d2b132e561fdb0f77ca0a491464c9b338cffad5a436123d3ed5e85816d509caa60badda958d7b435a42d89ed27a17f97edbc
 EBUILD cucumber-html-formatter-13.0.0-r1.ebuild 560 BLAKE2B 832ad6722d23d43c276dba57ca62e46a6685cf6a4ef49dae1b361b1e5be59dd412e3f5509ac27d318130c4a97b9b46e50154e9442e7b6233a7e7341fcceb0587 SHA512 b63b1576e0def4b6c00388e4bf4284aae4c3e053bc4af691a77d533de66838dbb1cf1ed5b23a27f543ddb9735e138b51c866a19fdec60e33effbb5259da2b87e
 EBUILD cucumber-html-formatter-13.0.0-r2.ebuild 585 BLAKE2B a824bca37a52cdcfe65e3deab5bf4199b308fa5e5c7a81b6d1d62a1cdade0ddcbef9fe71fe0f6afac1a6ec223af1467a4e242952554b098607a261b2b2d7e91d SHA512 5e335a3824c233b2087d8e4bcadace8f90ce9af165fb9caf4c889e86a52cec50e06f873696aa325899eac00c466657e7945698c4a51a0779dbe8c7f0371b75c6
-EBUILD cucumber-html-formatter-16.0.1-r1.ebuild 613 BLAKE2B 844d5276740f7675b4ca6d73ebe9dafbf299d20c7c7fb697f225845be2ffc3b96bbf756db4b565a54551033c254decc3ed944372c6ec5420242e84f744eba4b3 SHA512 256c0363835472c001763517f2aa25df0081294a03787aaad2a45b7bb79f23171a8cd6872e93b33c90fe12b863ec67aeb4926b03f2dd70c17f04e25624c73367
+EBUILD cucumber-html-formatter-16.0.1-r1.ebuild 620 BLAKE2B de7237cfad709d374815a67f1ecf2a05e0a7def0033b395ad4096ec931f2bffaf62d86bedcc2e40431ae76eaca9b5ae83f819f1b4e9cdf8208048f2ec5cf98be SHA512 aea00c0116db5074f833694b32d1f3786fc5ac1a240dd2df1c753c16bc7c4c25d95761578f2e2fa02601326bde75b3b58be249ad5a3649b13e0c46b5cc4eabdd
 EBUILD cucumber-html-formatter-16.0.1.ebuild 548 BLAKE2B 9726a4c2398928feefb92b8be7d0a70a3ecbe16dfc8f7f4bdf7dc5d467bd164e1d4b3de837453ece67d07e413d58607d332c6640afab5028ce2225a8119ebb8c SHA512 7e0d7e0e62cf29cf95a12b9c58cff5eae018a12bee207e1ec6c82ce49f3bfdaf36cc0aa61adc340dcd43e5c21f1ded114bac2a00293eb82eb09a36b10c382051
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r1.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r1.ebuild
index 18026d637c55..7bb9afe0e9c5 100644
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r1.ebuild
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="HTML formatter for Cucumber"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index c540044442a9..51037ad7092f 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -7,5 +7,5 @@ EBUILD cucumber-messages-13.2.1.ebuild 535 BLAKE2B 57f655316794694d9dacfa77c5fe4
 EBUILD cucumber-messages-14.0.1.ebuild 535 BLAKE2B 57f655316794694d9dacfa77c5fe4f5297c78c9206cd618b859805cd8f7963161880014b66d663a80c093f2a9f3f393056e5b3f82d46aede1ce1d4896e662832 SHA512 018db7289a6caf01688ca1677b92ed96b9ad97922af6f9e18c06d9c3f10e5ae7058c5e41f4b955af13114e67a7627dab513e10acc86e43aa6d1bee830f2182ca
 EBUILD cucumber-messages-15.0.0.ebuild 547 BLAKE2B b14433d359038538968dfd0388b6bb9726a460ae29bded7fa0ebdd5bdbb8f5f05a39494505e222fe1355249775b2e15d733815eab3bf68caed00e991302341f9 SHA512 b1443c1575f19c59fd411b06ea0be2dcf0af58717a85e6731329ca30d9b18ea014c734bfd6de541261b04292000346c23e182d3f5fb2df9416b48d0943db5e5d
 EBUILD cucumber-messages-17.0.0.ebuild 477 BLAKE2B 7bbab777d90e354ee290e6b9c2be7dd28b7c8dc0f1cb8d279e998973458d437eb3bf5ad29e63991691077daa26de1a7ec83dfdb3b3779fd099a9746572c43f28 SHA512 04e4e6e64114b9fb03f4f303086ac273817c2e44594fa8d79e91cb8d65441219441e543a9ef0dfdd6eda5fcaff3db378ecffc5ccb7db7c3cfa3f8610f048ac9e
-EBUILD cucumber-messages-17.0.1.ebuild 496 BLAKE2B 0b3a6247cbe0c5bc6b33426c4a4f932aa96c09938071c03427ab143ed9c5c323b17a1e782b95e3247419c4e0528834bd8f6a52adaf2dd7140f465c499b567251 SHA512 42087bdd634b5cd3294fd69333e7f7d71f27dc01c51fe83bd37f682a147aded4a8b98c8a20d3f071e03e03e9969899a9ab2d08591fb8c5ae3d2452308dd741b9
+EBUILD cucumber-messages-17.0.1.ebuild 503 BLAKE2B fb09445c6a8a54142e8b0a7f5c8c448e2c7adbadea494a7cd076fc10743660af671aafeb878eb6d35ec7e85a7c1b8e549559136adbc99aa72a55749f6a07e0d7 SHA512 2dff02c94f90e24f804ef41019dc3f55e95efbc461d0308acec09c394e2036942487828325924ba1cd27852d3b8e9f35ce1780c89cb950474a7d05e7b51e6976
 MISC metadata.xml 313 BLAKE2B 8043a2240cf0e24b0307a6f068bd8bcccc65471d59ac643f3c654227695ec7a2392a6c1ed9ce4c0ca7cdd926a26be275b248626509c79aeaad48930e00f00c62 SHA512 949342e57dd6165f4402bd068865400a7affcc6e7f73adac6f8e121caf1ef9564bc95b61fa9bd7f80d9ca8597e5b5e0f3200a210d496577d4ec2fa881fbc23bb
diff --git a/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild b/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild
index 3d6e49c5097b..77fc213683c8 100644
--- a/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild
+++ b/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild
@@ -15,5 +15,5 @@ DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication
 HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
 SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-tag-expressions/Manifest b/dev-util/cucumber-tag-expressions/Manifest
index 4d1ae0879a6d..7c11a55c6dc8 100644
--- a/dev-util/cucumber-tag-expressions/Manifest
+++ b/dev-util/cucumber-tag-expressions/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-tag-expressions-2.0.4.gem 8192 BLAKE2B 1ca07c8b1c018aa0011e6b31fd2b1a6085f5de9aa5a9abd4cfcc2bf0feb9fd3018a1fd07b7a3026e62b32aa629718ca1acb7c4b2e9d19a118ed500e2d60d0c87 SHA512 d52d07f4415c69db54e3d37e5627e8587386aa777e1816b8c8d6dd284388a5ebfe48f7ab3c8f8ff3f4c3e6b3dfa6a1136460f501504b1dc71554f2878e81756e
 DIST cucumber-tag-expressions-3.0.1.gem 7680 BLAKE2B 83d89259c5451886e9d699a3a7bfe4b0d09ae6164fe2b3d271e62cc8185876cdd1173cf1223b8eb07f898ae43bd599efddc7e589eb353342548b376ed7aa670c SHA512 699cac80ec0fa41d55f5600e84772d471e9268cc46382813ccdf1aae99f2d50c9e89b7b60baf79c9dc9d5d17189056212726aeb7dec3a4e18c2e982191078fb5
 EBUILD cucumber-tag-expressions-2.0.4.ebuild 452 BLAKE2B c21f86fd0f1e0c35351b990fd600390d4426d0b990ba7c622d152a8b6e3c55db280e6f9e8029b17c4e227c353c7b71240ccca3c4fcb6cb0ba68fd693017c1774 SHA512 5c46a1ff034dba684cb496008345dcc1e70bafc8a9e83f08951a69437f21aadc6474206c67c4a39658fabd250f3cd9dc540f4a5c9a5ac8d866a6cb4eac957814
-EBUILD cucumber-tag-expressions-3.0.1.ebuild 445 BLAKE2B 61f06f123d909f4088c3e8805a6a8a2b3bcbfe0f55eeb485d44b644a57dd1203a02ebe0b246f7e1cd102668bcc6c13137d4c8a6e9e2a7cea3fa6d49f55449319 SHA512 4a408941211647ba21c9ae2a899272abb2923b6ea48dd5fcc0da8020a6c7f8fe3aafc73af949ef4fc909e4329945ef9ad9ec2c80b86d10d3e6564df168f05f2b
+EBUILD cucumber-tag-expressions-3.0.1.ebuild 452 BLAKE2B 37b0334a750805c982739443ee355734d5f87344f12295b0d0ae89e00c64e922ff2ae540f19b51d38e34a246581be2ad2c728b7d40d4a160ad1cce74f0c7e219 SHA512 856318ab2947dbc36821f5510043ee89ea3f764f9fbf34e53a0cfc0371e5485b0753850ffeb851a341ca48fbf84819060bb905fbdba2dbe0ceeee0947e352b26
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild
index aefdf429cfd3..75d8e58d1023 100644
--- a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild
+++ b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
 HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 222dcd51e7da..2cf5ee36107a 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -3,5 +3,5 @@ DIST cucumber-wire-5.0.1.gem 12288 BLAKE2B cbbf593d43cbbc003ea247d41db2cebaed14d
 DIST cucumber-wire-6.0.1.gem 12288 BLAKE2B f7d371e186a27ee1a6ce489c8663c456c29b1e8dcf3788032c799575ad42b4658110b50bff6e4a446bca7227bcd12eafb117782675ff2ff7e1d0ce67eccc6c48 SHA512 b056dd78b0e715771ec591578fa3d4a29297a1ba1abf3a0d009cc90e36b44ae20578a20198f463a0c8760b70722a0655612f286c34224849db675ae2110c0bd7
 EBUILD cucumber-wire-0.0.1-r1.ebuild 520 BLAKE2B 2a05625d160dca569f254cc0f0b78f26aff853f86bb5df8ced10f81ae09b41d5b906d0956dfc160b6564d3f805266cebc0e16185ab844ee4e8f8f545ba225e41 SHA512 49d1079ec8ae4ea16a47d509424ed299b0d1467c6ab4bc22811093f8982c7cb1d7877e951e61320e70c29ed76d8c3b3135d4ee2f655ca8ed12cb2b9c05136990
 EBUILD cucumber-wire-5.0.1.ebuild 564 BLAKE2B a23e9e882a3bd669f00ee00eb311b58d26daaca5a3bc275a1f9104671db900ba8cbfcfe93ccd8e2ce6eb7cd821e4a364bfa8e1586f270e0a1d79e241338b421f SHA512 2d0e867ce7ba1cc03f38662c08cd352ec3067f69f1db819038c2e2709fd1b6303c32309d9714f889e307e78569078950f5358f1306fcc02c7e2c627f4725c0cd
-EBUILD cucumber-wire-6.0.1.ebuild 614 BLAKE2B d8d095c0fd727e873134248ddc006498ba161e2e4eb956bfe34425ae911d2575ebcb60f46fec497f299f77eb73f925ea4422f187ce2732b788d549240c65e1c0 SHA512 11ef35e9f7746ce0289dff068df8ca36a2f006bc37ccda4d19d5ffaf8c1de692408fa2bcb7b28457362f17da2a6e54e862f75391cee1961e0e75417d60293592
+EBUILD cucumber-wire-6.0.1.ebuild 621 BLAKE2B 7922a8be4708e2c3284b11016adfdbd2f9de73c498c5992eb4dd3bf5d6d82f6b3470ffa3d1363193ab9ce91775ecb35d470442366a53d54c183580a49f51e13c SHA512 c82714c682bf2f6a64978c196a7d887e08f6eb7c943ef8ee5dc25444af3d6a3e4969b354a33be369efdc8494ec01d29a314c1d4941c46153fa66a82d36aaab81
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild
index 5099bb1c1102..48c5484c5f9e 100644
--- a/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 86684d9266e2..0e3d641c7c65 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -3,5 +3,5 @@ DIST cucumber-6.1.0.tar.gz 250437 BLAKE2B 64b2adfe5b9b78e70bdf6eea5bad4fe96b5598
 DIST cucumber-7.0.0.tar.gz 406986 BLAKE2B 6d06d40e7b7029f3f5fea782b5060cf8985cd65334c722744132f40048d1d261963dd4baaa80a8fd44b18d66b63b08960350abedfbfd4d95e0a033a22192d010 SHA512 ca083c2de895f11d7cfd955c216e1e2c52ea9e5ed0034aacbec44e5daf1809e6a67a4621a64a5f236c6a0be9d8057beb917fd00a5f03191fe3d9d2c8814fa22b
 EBUILD cucumber-3.2.0.ebuild 2864 BLAKE2B ba02dcb6f95ec1f5bea0ead4f3751e5ef8239886639225bc8d7bf473a157f623edfab6562f8c59691d5fc2f301fd68178824968f66f514d57d1334c194e8268a SHA512 d95106aeb1be4f9e5e790f317571ad74a96a0a7ac6d3317ffb30485a99e0cbcdc28639e8cfdaf4586f09f2be7609d4d6855014bd6344234594c749bdf61966ce
 EBUILD cucumber-6.1.0.ebuild 2554 BLAKE2B 5705b28444f15db814ae30cfc317d1350b65c3f639cf383df0f5fc22183ba0442b44cab55359ce0acc6a458400f6970627f697c1552108e3ae0d2eeb9d0f2d78 SHA512 d588448b97c1d0e3ba789fdf3c872071cbaf2ab227f80a4b0593bc194073161e15aabc9f352b8977a4b4f9d4ea8e99bf3a5d773e8a2795edf98f7c414c74eeb7
-EBUILD cucumber-7.0.0.ebuild 2564 BLAKE2B 9fca07ed3c611b4d9f9fe9107a4d25a0fd9c54c224038a3c844b30ea09a2e79479468c44cffdff4f9f7aaf705d622c4eb6442de14a43b3d25ab714bceccdc7c3 SHA512 15c0c89cf5d6650118eed0f8a7afb4aa587d84ac1f141ea9044e6c5fa2bf0adcbd96a97b647f43c1090bd9b131af9aed26506e8ff6c919c1fb2935e8999cbd61
+EBUILD cucumber-7.0.0.ebuild 2571 BLAKE2B cb613b911be80e0a891d975cd381dbc602d366754a1c90405bc930740596ccc9df9ae434f4ab3ee19daac4c9778b6de73679547f9e518ef6180ef6d293a0f934 SHA512 89c6efdbea342091ca45ceff03d444eda678b53f9f125f38ba1bf822eeb542b29f37eb4970caf691fbfda00942b0fe557ac40f52a83a4d31bf7b4316ce12f159
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-7.0.0.ebuild b/dev-util/cucumber/cucumber-7.0.0.ebuild
index 0a0684b7343b..05dc5805c701 100644
--- a/dev-util/cucumber/cucumber-7.0.0.ebuild
+++ b/dev-util/cucumber/cucumber-7.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index 89827cc2250b..326748e898fc 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,3 +1,3 @@
 DIST dbus-test-runner-19.04.0.tar.gz 444289 BLAKE2B dc3b11c8d376103b320d98d211bf1ace035a2de5a1caceadd946bfdc46a6aab3fcf69fae15c7142500b9487a9832275a6157f887c8efcbbb56d13c8841609dd0 SHA512 5906225f0ce429ea218d7eb4c67281b7ef368d6a173965b214f4f4501e729002ca3293a94fd8afd3002f301cd1f2208cba01c733f678c2d51661220e8a7ce971
-EBUILD dbus-test-runner-19.04.0-r1.ebuild 1241 BLAKE2B b8456b3472aed023c2b019fbe985cb3b0cf9619d5b71fb91906528a2be776834fba8880817e683249df55543a2782aad0a2766d21b7023b08859d91f2488f95d SHA512 9c4983e9b4266988820488312e3432ca7eec7efdcf30d9193631e0c848d8ea26510710dc81ae3e8a476c1f5709069bf3a2a7060a60a29c54bc6c5818598df617
+EBUILD dbus-test-runner-19.04.0-r1.ebuild 1248 BLAKE2B de80111e95bebb08e14ae0a6301742d4169bb6344fbb4ff30ade987783dfc95b165c3e54ad70e4cc0f587f9789a68328874876d9e691a254fd52e10a2dc46ba0 SHA512 128cc973e935e37a8107441eb408379590ef5cdbdfce316a6351dfc569684ae22690152ea602b8dd6ad250a0624016c79e37d176f1b20e7bf4c1fa627b9bf8fe
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
index 9cc536054dcf..a3899dd29a7a 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index 85ed763998bc..cdf4f3e2602e 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -1,5 +1,5 @@
 DIST dejagnu-1.6.2.tar.gz 525879 BLAKE2B 1a4cf8bea350d7fca8983fe9f5f77756746e9ef81a06e2bc733a9fa32f54e3c791f28d80ab563306df4082f2d5f9f30b87f1380b57b15213bf401783e5384dde SHA512 ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042
 DIST dejagnu-1.6.3.tar.gz 622059 BLAKE2B d22d66a233c2643c98f45d260585790b4c1293de2bc84470e7942e0364e0cb15f55888a3b6ab13e82823f4e03198159c93e1904571a5df3fcd6f2da568078726 SHA512 1a737132bd912cb527e7f2fcbe70ffff8ccc8604a0ffdecff87ba2a16aeeefd800f5792aeffdbe79be6daa35cedb1c60e41002ca4aabb5370a460028191b76c4
 EBUILD dejagnu-1.6.2.ebuild 520 BLAKE2B 5d35364056aa60b443fef9785257ed648c3493e599c680cfc210e95153cf12282764d97e391d3e115bd5ecffea9f4c618baf90a1847eb2488be94ba8d69d61ef SHA512 d0d23efa9a108005965090718a4102c47c07c6186200d642cbafce55d0982a9e2f5bb1842aa383bf18a5d52a4ee34e87adaaa96a4e37daae061f1df25dd020cb
-EBUILD dejagnu-1.6.3.ebuild 580 BLAKE2B 1d7287fdd54ea2a127cc9f0a54bfbda57eabb758f6bca54437b08dc76016460b94eb71c48a1eeab8ef120c0b900641eff81ef14292616b16172182717a80254c SHA512 7fc4084a3fe04ffad688d541c3142f80851f923ad18a5127cffbb99afa56228c7e33799771ca1252292c58a81a9381f69ab7df2f4abf744e1ef962ebc5ef4a3e
+EBUILD dejagnu-1.6.3.ebuild 579 BLAKE2B c29a1cc41f46de480c76dca634ed24c2ec1d632ea1f2ddc03158e5197509b09b03011f9721c29bbfba31c3ebf2eb74d5d9e08acae3b1757130f2910874c58126 SHA512 c1b136d576ba1d56c60ed09eea0831c41c566966b1f5b626435b8014b145b975d8c5c6674b8bfe689736c5873318ec96299ca481306aa5def28f3ff174b7a272
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-util/dejagnu/dejagnu-1.6.3.ebuild b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
index ebb587e2d3f8..9481829f71cc 100644
--- a/dev-util/dejagnu/dejagnu-1.6.3.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 #RESTRICT="!test? ( test )"
diff --git a/dev-util/diff-cover/Manifest b/dev-util/diff-cover/Manifest
index 73cf09f2f1e8..c024d26d73ca 100644
--- a/dev-util/diff-cover/Manifest
+++ b/dev-util/diff-cover/Manifest
@@ -1,3 +1,3 @@
 DIST diff-cover-5.0.1.tar.gz 84135 BLAKE2B 6a246df971e76155864d8b4ba11cbecd0e3f6b2f97edbb458f410e89e1748e91053fccd03bd4b73e8a5704d70169c3183f61e04326d391b01663fe446b2dd365 SHA512 d21fe75695b635222c3d9b053aacfcd22792ad9db87a6bbc0cc72491183c96e144b34edb75c97b7625d05bdbafb2ce7e2e66f0b65f3502cba801d11c23efc7e8
 EBUILD diff-cover-5.0.1.ebuild 778 BLAKE2B 54163dcc41393b87732470508ce96b62e2b71321568490c661f6ebbf0e7f8cff06ae4f807a948b9acd735ac93b43d9c6c770318f79122246a8580086dbf8c1d1 SHA512 e61c9a8635f65cd669ec1f4dc379b39c9240f76b29db305e9e0b685ad78344cf2a45d37ca8f2cf101270faa249d3f3c92328be3d44e176cb22341a16dc7fbf38
-MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
+MISC metadata.xml 384 BLAKE2B 010207250eb20532082df1122e10f75b6eb8cd45f14b9700772984305950167dca4e66387146ebed2d816d16ce281050622082f437459705f41a9223919b2d9d SHA512 ccd53c91b7f70d9ac1a3be5163c42d0fad61d18697bb3555f9b7f9c93239ef04a574e46e2a59248902249273d92f545184133a86178029e60b5dda9a060b8ce7
diff --git a/dev-util/diff-cover/metadata.xml b/dev-util/diff-cover/metadata.xml
index c36c37139fad..c0139fb5e746 100644
--- a/dev-util/diff-cover/metadata.xml
+++ b/dev-util/diff-cover/metadata.xml
@@ -5,4 +5,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">diff-cover</remote-id>
+		<remote-id type="github">Bachmann1234/diff_cover</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index bf85bc8be3ac..dce239a438ef 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,9 @@
 DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811
 DIST diffoscope-178.tar.gz 1600094 BLAKE2B b40e45748be56e49736a826decfb3a8c3ebd91983755719f2665733ceb6ec4e860265c33b5a3c15bc501abe4efdbecbdf177431bbbc79f1ad758c7deef83e1ae SHA512 706c95f5c04cfe081fed7e3e5ed73579949c948b15eaf0f984fc7d406b74007859f7946c44e4ca13e1210b105ed65ea68fd1f03452a50f161ed27f996f4f2540
 DIST diffoscope-179.tar.gz 1600145 BLAKE2B 64b7db8ad53980b80b3c563797736032a235d82b57dfb31496cfbd19978734759919482855ac7dadb62573f950294f02987fd9525b00886e56060450df390915 SHA512 7c3a73097bda2fd55414e52f557707afd08728c73305b55dc9482aff092a65c9bef33913c5e715ff6257aec6cc67095abfec3e8e23f002d43bf9e77e0d565154
+DIST diffoscope-180.tar.gz 1600542 BLAKE2B 0cc34106f039e0682b32de284b3ce1be90e8629fb4ba18cffa31d7c970a9d18392060f37b201d4ee9ab3f4f65401684c72edf2d00d56827cbaacbfde0ce81d11 SHA512 abf2c514b9f3b074a5b9a6e19f09a474a8ba58e00974a48ebd860cc31547204fb4690224cb752b4248a0674d979bd20c6d4c77ffb912f2b85499d48d90affeb4
 EBUILD diffoscope-177-r1.ebuild 3325 BLAKE2B b11da425c3c3f5cbf6b6c654bc203c3d6bf56908e2dbdf35d9262a1e5b969655a62aab9aadf7501d6ffcf5c51a7c27a088dca858e81d6b041b72c52d53323da0 SHA512 137eee2580e2693c71fdc72c6cad6499c8be5bc5bb9c3eb302ae95578cbcd15b91a003357eca753392c69aa726797a8e550d7665811370b76fa54dc67bf3a55e
 EBUILD diffoscope-178.ebuild 3340 BLAKE2B 6100a3b1d8a2f4ed70ead3f59a2734e6a9844cd85e68d2824e1f27e9d12bce575f2b4e46453469ad227d6f9e238b3b17e176b58e1cec6e9e8895e5f57315dc0a SHA512 28cc4833596e5a91ff194c62c194ce1d8773961d0b7498d29a932db19726e196cd3d429502c47bea46edea986784fc041f4f121ab3a4a853cd823e1949605df6
 EBUILD diffoscope-179.ebuild 3335 BLAKE2B 62131fbcc69564f8efa0c11a048a5464f0b6306d5c8b939a499f973d895926c92d2a1767d9f2e7c91ecc4fa3866b2103b2fc693195f1d1a472df00e087a233da SHA512 f86b53fd970f20e927f5b8a21434cbcbac4c22e7d622a7d5e2752ed059cfb10ecfe4ce299dfab2b329eae711d978b1ba5937f0e9a555b7944f51660179e2abc0
+EBUILD diffoscope-180.ebuild 3335 BLAKE2B 62131fbcc69564f8efa0c11a048a5464f0b6306d5c8b939a499f973d895926c92d2a1767d9f2e7c91ecc4fa3866b2103b2fc693195f1d1a472df00e087a233da SHA512 f86b53fd970f20e927f5b8a21434cbcbac4c22e7d622a7d5e2752ed059cfb10ecfe4ce299dfab2b329eae711d978b1ba5937f0e9a555b7944f51660179e2abc0
 MISC metadata.xml 2077 BLAKE2B 2f4d188accf1f75c139a388f564ef5130ea8e74e403072871e4b73b848eaf405076bae7190565f374c193cb4f3fd0be16e3c781ac73df1d1cfb36101142b59eb SHA512 683e181724871d636610c7cfa93c714ceddba7e95b80fda8837e04b396f63049307b23b0471cfc19c46de5bd8b6f7bc868412f8f1c817933ac9507e7280b2272
diff --git a/dev-util/diffoscope/diffoscope-180.ebuild b/dev-util/diffoscope/diffoscope-180.ebuild
new file mode 100644
index 000000000000..ee2bed80f614
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-180.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="ncurses"
+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 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+
+RESTRICT="!test? ( test )"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-text/docx2txt
+		media-libs/libcaca
+	)
+"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local exclude=(
+		# test seems to use different tarball
+		tests/test_presenters.py::test_text_proper_indentation
+
+		# needs triage
+		tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+
+		# needs triage
+		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+
+		# img2txt based failures, bug #797688
+		tests/comparators/test_ico_image.py::test_diff
+		tests/comparators/test_ico_image.py::test_diff_meta
+		tests/comparators/test_ico_image.py::test_diff_meta2
+		tests/comparators/test_ico_image.py::test_has_visuals
+		tests/comparators/test_jpeg_image.py::test_diff
+		tests/comparators/test_jpeg_image.py::test_compare_non_existing
+		tests/comparators/test_jpeg_image.py::test_diff_meta
+		tests/comparators/test_jpeg_image.py::test_has_visuals
+
+		# docx2txt based falures, bug #797688
+		tests/comparators/test_docx.py::test_diff
+	)
+	epytest ${exclude[@]/#/--deselect }
+}
diff --git a/dev-util/duma/Manifest b/dev-util/duma/Manifest
index 10e6aff24eb3..d87f985a73f4 100644
--- a/dev-util/duma/Manifest
+++ b/dev-util/duma/Manifest
@@ -1,5 +1,5 @@
 AUX duma-2.5.15-gcc6.patch 599 BLAKE2B 7fa6c2d42b9c1191e40854aae2bfee236b0c9f9e5360f8c59a32d9b4a89c1a5351812dadce8943848478751ce49db30d5374251a759fa5af9ce28420be64ddbe SHA512 9577e34e97b6f63654a8fa5b6ad26f54733cdd758a2a96b99c2771f9593436501b09ade40e8b20ff61da033e64c635a29b4884a6e4ea3b62fa9a4c12587cf947
 DIST duma-2.5.15-GNUmakefile.patch.bz2 4618 BLAKE2B 506127ce1f8f3d01d0443ab1240c585aa734bf3756ae632ccec8ff88f33fc0ffc5113705d5c3c31c14bf52a2cf3c82132669c2c14d24f0c6df17b8e802c8ef40 SHA512 6d83294897a60c6d0ebac388c8f791adc6a199b2c9838497bcfff39502262014c8437a331e08e3526568d3ef755a7dfdc2557771bdae89c58cd5f714eae70df2
 DIST duma_2_5_15.tar.gz 240479 BLAKE2B c79f47ba418e22a65a2ad2d4cbff796c2a620ec5f36743d543fe1260e61ec700c648033ac3c91e71be3f3e1129a1c12e9f83a91277244962cfbd494d9588d681 SHA512 0e2abdb08cfbaf9fd0a6be348c831a83ac4ee86d2297dcd1c4d625ddb4b2c1c73eef05e2b895e291d5b8076b1baea559c89d475f30e409210df4ab69b71b6345
-EBUILD duma-2.5.15-r2.ebuild 2219 BLAKE2B a91034a0b2bff018cbd1cbda7cf577b275bdbb6b9874ffa30e267b3ea8711a5aaaa1451e2b7889c33421704f3e594e46d845c27843effa0cd3c382f97c50230e SHA512 e6d030b394f788141954ecb4c37f1be1d9721d1043cfb51f90e8a3ffef6af128b73a2864821aa35d717a5512630033ca57879a9174ac4872cab3fc739a383113
+EBUILD duma-2.5.15-r2.ebuild 2276 BLAKE2B 4ac38d95deabb12f4d1066fc6e304726d222da03ece0cefecb2e258965fd6f839d7530a4b6ea9640fb3dad4655b499af31ea4579a08a947425198241612ee486 SHA512 28597688146092c8b2d7dc452ddb5d1b19e036148708e72106baf842b1e4d7eb3ea87a7543a3f511468894032813224ebe76a8938140e9973fe2a44795bf887c
 MISC metadata.xml 600 BLAKE2B ad3ed230f64bc5ead8d50bf7f8949e783ad95f90efbd5bbf8a8a39e6a4a7876d3a4371a5116096d53ba24866accdb6498c816f87da40885f9f7359921bcdeff0 SHA512 f849e5c61d27430f2c7de1f86ac9f12b8424571703e08661bccb0415743bf2e88aea981e72a5b1c287c949c6634e975c5e3f9882b9a29171389bed998c352f08
diff --git a/dev-util/duma/duma-2.5.15-r2.ebuild b/dev-util/duma/duma-2.5.15-r2.ebuild
index a3293c92f738..92aff79a7b79 100644
--- a/dev-util/duma/duma-2.5.15-r2.ebuild
+++ b/dev-util/duma/duma-2.5.15-r2.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
-inherit toolchain-funcs versionator
+inherit flag-o-matic toolchain-funcs versionator
 
 MY_P=${PN}_$(replace_all_version_separators '_')
 
@@ -28,6 +28,9 @@ src_configure() {
 	export CFLAGS="-O0 -Wall -Wextra -U_FORTIFY_SOURCE"
 	tc-export AR CC CXX LD RANLIB
 
+	# bug #789708
+	append-cxxflags -std=c++14
+
 	case "${CHOST}" in
 		*-linux-gnu)
 			OS=linux;;
diff --git a/dev-util/ftjam/Manifest b/dev-util/ftjam/Manifest
index be788c5c23b0..540e1f47feda 100644
--- a/dev-util/ftjam/Manifest
+++ b/dev-util/ftjam/Manifest
@@ -2,5 +2,5 @@ AUX ftjam-2.5.3-false-flags.patch 1682 BLAKE2B 5b57ea37f2d99439e8ff550a6a8100922
 AUX ftjam-2.5.3-i-hate-yacc.patch 1756 BLAKE2B 26aefb56b2125b765eee2b6dc9a55fd0d3accc9244b8aa70dedca621a3ca69cb89218ba7920f2a47a4af6548b5343960fcde8701fc11c15c0ebe0bcd1f8ea452 SHA512 e02948ccccb963ddfeb777c217efafaf19239cacff80514c167166ec666a6301b90e1a86a2b97ab58fee006f509106cc0e3dacbbde822efd0db2b9f5f4645be8
 AUX ftjam-2.5.3-nostrip.patch 780 BLAKE2B 7299ec77c1ed3ccbc87669850ee54d6d61534983793f076e56d95ea83e9c8617c80ec08d84bad24bbf45f11b6e0275167f4454223366ef041a81a4360d1b1d09 SHA512 6d8b399f8a4047c34b1315a230cf47e8ab76c7fbad9089fd4c3c18b2ba7fbb2f3ecbcb2d3a1075f0d95d36e547490de345167ba55fed75221b2b8162796ccc25
 DIST ftjam-2.5.3rc2.tar.bz2 215963 BLAKE2B 77e92dba10dd2b99b53bea87dc47c7f1d5da2a39789cc938d8141debf3ba5d6e25ab4092e1a3b69266b3353866c76e72706d13d3751a321e42bc5aafdf87e8cd SHA512 18a40c6741493adf293f032d9c7a9ab419402505a37993fa859e36e7a1655ec9d3d07662e6ee242487b143aa7e0f6c46f253bc7e23c3162c7381aaced001bfcd
-EBUILD ftjam-2.5.3_rc2-r2.ebuild 821 BLAKE2B 4c808634b6277b317fa8290795303b48d5f6b875b181a881160bc7376e4845c8068757a973bdcc8c278050a8acbea1079fc274d4f61b92dfd1300021433e974e SHA512 443c9c0a741ca6d4f4019eb58746b177257cab0ad7d0011d5b201cd29c38f564107af86568efa6932b176b0cee0f12d26b4ae26dc1646533f9b884b25a3b973c
+EBUILD ftjam-2.5.3_rc2-r2.ebuild 828 BLAKE2B 16cc619baad79898ace3293b3e9ef447cab4475ada317529cee894e3a3ef323851935986de9ca6a21f8ea1073a5d43ee316ab7fdd8b98c40d70c9d38224a56bf SHA512 440f862c70dbfda64c52c961b641a303676c78958a6c25dab11dc0ce19667aa49b04cc5a4c4c8063f2a69a0443a6f406a2d706d5d24f102c8931af2f9230663b
 MISC metadata.xml 243 BLAKE2B 08246d6c76c2720c2feb89cba6d9c817718a9910f19ae5b0e90da4c8bfe7fb25616e02b46c860fe81b93ce71a78c341093062cfcfddd449bdaba1aa4497fd9ab SHA512 2e71aa0db138811dd97cc5d3e5fcadc54dd877ee5adb9d8988c30680e55e764e1391b0628e8a298fb2679bee30061d7a0f9a4678d29ce248183d5b9a25f8a343
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
index 5ebae4e40d2a..54b4c54d4338 100644
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
 
 LICENSE="perforce GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="sys-devel/bison"
 
diff --git a/dev-util/fuzz/Manifest b/dev-util/fuzz/Manifest
index 704aed73f603..99782805b763 100644
--- a/dev-util/fuzz/Manifest
+++ b/dev-util/fuzz/Manifest
@@ -1,4 +1,5 @@
 DIST fuzz-0.6.tar.gz 54431 BLAKE2B 8f9652fbcf13038e066d9eff5bb803a9bb76ded9c9f18f9c39981e40530a8fa2ef2fa1aa39e6196908046e7c3dc9acab8ef2adea9a9c8ef824635b1c02aae248 SHA512 87a9b103bb37c91937e2bd4667a33f3792c464f8464fe1f35b022d9c01a13255c7228ab80ce0bfac4ccfdab9a25238a5e1add00e9380cbeb24f95b686d18151b
 DIST fuzz_0.6-7.3.diff.gz 3004 BLAKE2B fbbceb60b58e973ceae6485f26297bd843261db8d80d0988ec08eaf275758d32d5e3c992999543db1e3f1cc546dd881f8fa19b6c027bdb79dc3dad84b8f77ae9 SHA512 aef080a908269d44536071bb6d4a91560d7f357fb2145fc0d0369ea5997fa6a5c1b13b3fc673c370a61add5c76f40df3501f5103f2ac35ddce9662c9345e20af
 EBUILD fuzz-0.6-r1.ebuild 680 BLAKE2B 1347efdd1f830537b560dc3f789d5dd050994dc8fa7878fd2ff0bd88a0236d9293a2f5ad79b0846f3adf99a57a2ae272765d973660d1fceb5b6836608900c575 SHA512 5bac0c017bfb099d72045fd68dee49ce798cdd9c56fb1ff2aac84af3b97809f1e936920bb1c34edf2ad5b30aa10d687fc06f84ed0dc1f6a8ceb3aa7009c162c8
+EBUILD fuzz-0.6-r2.ebuild 674 BLAKE2B 3f5150c746f2f8d9f5861ebe6bcea6a18759a807e6c46a548410a3637562aabfdc5c0fd5037e5a4ce750f99945dabf91bbd187e3e37d3b6c9723c33196a4406c SHA512 1b46f1ab0252bcea717a9fa4274550f32ccd3c2c247b474c1e07a7f1b1da3aac0f458a297997c4f2b6757dc64f6af11c5593ec932dea2bbae68ea2ddb44d2688
 MISC metadata.xml 300 BLAKE2B f17207f1908f2965eee994e46f9df82b58e3ce96b2f5ca180a42c02cd1a45f34f56ab2fc666a8ffbc1f4e23c1570d61f10a9e23270d15ace015860b28ec09ba0 SHA512 fdcbbda56cbb94b5738e0f3ace1647ec35f228b4251c66a330ba269217f3cfe57893fc05e8e1cf9b2fae0a4845171c74e71bd9af67dbaed25cc5a9c4e034b102
diff --git a/dev-util/fuzz/fuzz-0.6-r2.ebuild b/dev-util/fuzz/fuzz-0.6-r2.ebuild
new file mode 100644
index 000000000000..92ef90211b32
--- /dev/null
+++ b/dev-util/fuzz/fuzz-0.6-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Stress-tests programs by giving them random input"
+HOMEPAGE="http://fuzz.sourceforge.net/"
+DEB_P="${PN}_${PV}"
+DEB_PR="7.3"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${WORKDIR}"/${DEB_P}-${DEB_PR}.diff )
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc NEWS README ChangeLog AUTHORS
+}
diff --git a/dev-util/gengetopt/Manifest b/dev-util/gengetopt/Manifest
index 26df9be9e10a..2fdbbafb8fcb 100644
--- a/dev-util/gengetopt/Manifest
+++ b/dev-util/gengetopt/Manifest
@@ -1,4 +1,4 @@
 AUX gengetopt-2.22.6-docdirs.patch 364 BLAKE2B 06919d379a6f0e13271d89dda845dcc920a7581ff380d52318ec11f658327c73c1102326108080b9129610fe89b80aec39c01e0923c1449ae2d00123f4e8609d SHA512 f2bb3ba6e63c32deeda6d0408621a480b0902d2e93a3ceecbe3e79f72c79f3269bbd2e2fd3cd6bcb248bd81d0105dcd8520d44d523c53ce58843bc38a9cb21f6
 DIST gengetopt-2.23.tar.xz 584860 BLAKE2B efd94e28d35319f3a04af4f97b87fd8a07bef93856da0dcfad54ab4800d43510f7948bbb7440f39abfe242aede5657abd874bf4ab4dd311336e10f37e7960cb5 SHA512 3749191d35acbeff6680f2a4d0516706a0491053f632aaa44ead7c3a42e56f9870bd7c4a85a1886f2052e17d86a2853e2f65d445e0c9920e41f1dc354f003712
-EBUILD gengetopt-2.23.ebuild 664 BLAKE2B 98c4ee0e597308e0f17b422522bd02a751494616c6385f9976c795dd7f0cc005e947a2f48a872335ea87d787dafcd8b3643e021bd9f3db9a5782e49536e33771 SHA512 5587a5732f944fda17b10a62b2cd17d3832f11e0bd1183dee2d9a6b993f70fd6a3b9042e895a5a89355e65c04f309bf4c7d15a2d453cfd0c5ed711bc9906ad9d
+EBUILD gengetopt-2.23.ebuild 671 BLAKE2B 92d88bac91131f6624578f39e7d843aa8f1c243811a6ca94487cfecf43a36a1b93fb735f73b73b6ebf6fc9b5eef95b5e290afc91ff0adcf6f84770fbcabcbd4b SHA512 d20dd0f0ffd9bc14ac2e810074137b07cca3e5296bf7ededefc4ae1e5d439864882c28f369c528fd8de88babf84ad4eb483ccb6ccbb6699490378b385dea47a8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/gengetopt/gengetopt-2.23.ebuild b/dev-util/gengetopt/gengetopt-2.23.ebuild
index 6066b5d5aad4..6e5334e0c13b 100644
--- a/dev-util/gengetopt/gengetopt-2.23.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.23.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://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.22.6-docdirs.patch
 )
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index f6f835bf930d..f1dad650c476 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -3,6 +3,6 @@ DIST glslang-11.2.0.tar.gz 3295235 BLAKE2B 42417f3be070a57f0c71f5a0c81ffcf493804
 DIST glslang-11.4.0.tar.gz 3342311 BLAKE2B 880f2c5bc2afe5c28b4c9246faed5a12492e24d1f3d75a0df036457ed7767541a18757d368e2298dd7e8e4f8ca9a2a168973274ea6364453130b2928bce4d991 SHA512 e507ff5420a192133dd25b3f1d18dfa4a20c7fff9908e58bad5a7ddf8119989977c2a180575cc24b3434cab4a7cc7559a3254676f6298c0fa3b82dc9e802e1f5
 EBUILD glslang-10.11.0.0_pre20201216.ebuild 890 BLAKE2B d2ae97e1228f30154c2e0674284aeee59943c6b97c619a594106e0765353c14a58e5a03ab03a024a934ccd6b6d66091764af9ad181dc79f577a495037415ef77 SHA512 889bd334d5a13e3ad22e97de659687bdcdc575f30cb45e21a4c253e469181008a5fdb05ef6ca5a21dc03ae22ef3ebbcf88ac8d09941c1d7ce0442942d826f5a0
 EBUILD glslang-11.2.0.ebuild 855 BLAKE2B 76f4c363a7ef228854cd948e1017f92c5cda2bca6240a4e011745775981a35266e06a84d9aa77092d111b4685218027facdf7390a020f1bfb074598ce5529ea7 SHA512 c6032b4b76e3cdcb80ff17e7c6dacc1df7930fc58869a6a48df3132665f4ad6661cf3b726f70ad2b5ee660331f90daa1607285aec6dbabcaa063e3b41d963f5f
-EBUILD glslang-11.4.0.ebuild 861 BLAKE2B bffd4abe4cf2742a3b4b69c8462175a09dca24545000686ef3fd3a5620abf5aa2af5648b0bfadd90871674b3b21534eb3b8f777306c657e56da3b95edfad50ad SHA512 96086d4cade525c556c58b6c869fae8c14dc8d2096b792cc028e989ad65fa5e7a9ca66cad22d01c708abeee810575924c49748b1b27ea18b5ce6d8c686a749fd
+EBUILD glslang-11.4.0.ebuild 855 BLAKE2B 76f4c363a7ef228854cd948e1017f92c5cda2bca6240a4e011745775981a35266e06a84d9aa77092d111b4685218027facdf7390a020f1bfb074598ce5529ea7 SHA512 c6032b4b76e3cdcb80ff17e7c6dacc1df7930fc58869a6a48df3132665f4ad6661cf3b726f70ad2b5ee660331f90daa1607285aec6dbabcaa063e3b41d963f5f
 EBUILD glslang-9999.ebuild 758 BLAKE2B 802d3dec30280cea4dc1c5b8dc652495537f93ef3b52c7d60740d8f9d6ea1343f22b0f0f4b6bc127eb3bca925daf6b1837a1763416cb27489e6db07173aec4ca SHA512 c8db05953380d7c0709e25a9507d5f043a05da423d9e119ae09ef00e5afae939c209b078a0b6da9d6072f07d04c3c20fd9d3827f6fdd71c793ea21036d4e03a6
 MISC metadata.xml 329 BLAKE2B 6238c1e548b8044e1112033dc166f06d7690d05bbdd006670f2151f28640a2c96d9d7fe4d8e6eeb6beb1bd6248cf177315e5cff314593718d838c91a81c02832 SHA512 6242378037de440c8e216330d6f2861ed3d473a0dfe55b9df1234c0956365d3206c1951034b9b2ee31702f741483f4fa113d801c6b1fdece9aad468021202326
diff --git a/dev-util/glslang/glslang-11.4.0.ebuild b/dev-util/glslang/glslang-11.4.0.ebuild
index 2fe500d17138..12268208d43e 100644
--- a/dev-util/glslang/glslang-11.4.0.ebuild
+++ b/dev-util/glslang/glslang-11.4.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="${PV}"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index df691ee4a7c6..92533db71750 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -5,9 +5,11 @@ AUX hip-3.9.0-DisableTest.patch 4560 BLAKE2B ef1bf5fcd19d8c1db722206afaf5bf8197e
 AUX hip-3.9.0-add-include-directories.patch 468 BLAKE2B 4c787a6ffe0beada2ab431b2262edc51b814e57d599f783b884da84a6f1b919ceeab561ee09eccd54338ae55118e2d45133b248fd20b5163eba548d49f79d1ca SHA512 1fe35858c526c891e5efd9ecf7a166c3a67d7a4874ab6f7eb34c6ed6652d0e21a7290829a3a5063682a7229af3ef63c180e198172c3bc69be6550547806249e3
 AUX hip-3.9.0-lpl_ca-add-include.patch 418 BLAKE2B 7d1439e51b1c5e20fcb1768c5f33b22d1d6bec5cf36242cbaf030a9a83bd404cb02c95d6ddba2ada6740bb2c1006da3c1507927ab561e29cd47f1a7e64aed1a4 SHA512 511684b5f0f70f67371e34674933dd4cf1992d11406a77a1aa695b68880a031812b8ba7e399abb61a84e8e07d8f814c93c412c51952d4c27443a01c3a62ce276
 AUX hip-4.1.0-DisableTest.patch 2201 BLAKE2B 2e3ba78fe748312edad994d063c2a41e75ec988d8c04ca97bcec15b33cc8328e384b64e3be7bd43bbcb21b947db40a0e153b249921dab0f9e1ecc0926a16fd6d SHA512 8d98b0a53b7b10f7ce3e30ca969181aa01325da6f6627ab7e190e32fbfc6fc659ea07a0a7afe6f20732e7009b9a2da66d8788814d942dbbcdae3d5384c21b8da
+AUX hipvars.pm 518 BLAKE2B e7ad6fb282a0ec44b80a96feb0489ecc81e785c58b82a524e8f5c475f369575b86f3acb10af1c24cd47c2ac256a9d338887a2529c656c683595666189c2f83ea SHA512 bbcfbe35774c4ffaf6b527a6c39fd78cfa371b74e49bb6ddc2cb858b1be1616a308f1ab38abdeb8fd5af2545c99db30192e8595ee953d39b3eb65735d8b198b4
 DIST rocm-hip-4.0.0.tar.gz 1012154 BLAKE2B 02343239a5b27c42dafd241f2c9b6f5195c50f78bfd717ae72bcb16d384bd6cf97ff6f2b86bfcf323aaaf022d6897f46d0987826c80d6f6279be4cb4792e15be SHA512 cf840dbe28a9a15e3be14351bfa22d3c81e1654813a7aee55f53e71b2ee183f8dd0de14a79791617fabb5b357cadbf2ce2f476f78884b2843d30f206d65088f6
 DIST rocm-hip-4.1.0.tar.gz 954215 BLAKE2B c4b75ab2158e6921be1c34820ab5d1a5e2eb36112834b0143c50023caa27de384e0497f4837947cc7fe05554c6c95201340b1979eb916b31ebb4ffec8c923735 SHA512 420ffd7b79e2b4506873cbfc56e96395f8ed9d9375ce28df51626601199d4d8dca6920528e255d39a48ad66ee11f4b653f3b9f659df489d32b21886fb86c64b5
 EBUILD hip-4.0.0-r1.ebuild 3817 BLAKE2B c01eb20493f27e9650d1cad3413b7fa14ef799d67e8b02de235d1e37a4f6633c8f0f6ea73fa8f075d0a10ffb2dbe0ccba4a65c4a505e665be7d657d5c773641a SHA512 2b5b58f13d832572f547f5ba4e67daf62b180523424e1e4605e96d1b7d834b700f8aebc95b047ab08ba36e16098aa07ddf7f9c91654672b00edc863bb5c25d68
 EBUILD hip-4.0.0.ebuild 3451 BLAKE2B c219b26871ab9197ddd75a4d8e03bdb2d6f9c12cc9d8bd4b29e1babceb3572afb5f859288c395952befd8520fdf2875703566a4dd7280045f98f309af8c3756b SHA512 d7b82a954d9dfde559e48dcad266aa7d3cb204442045ea2c3eaeafa7513f0f549ca3a656d5d823e636600e3b9112fd276fbfb9e9ebac74f01024327de76276dd
-EBUILD hip-4.1.0.ebuild 3724 BLAKE2B 44e77165aadf96ebb6aa502b7d416004e123160a4c5d8eb81b3a148acc07f247e27197895dddacf79ac7530a17c0f0283feb454e0256809e9ce34bf9fc28d915 SHA512 64ac414b032787c2f22cbbcd2bbe91a2b9acc6759a82dda53700c7845a92bccd533208d194c3e668f8141d567033e9e5755c4b1a3454c974d9e849e65f95751c
+EBUILD hip-4.1.0-r1.ebuild 3199 BLAKE2B 2ed7d2494c9954b4fd49a89415650a3043432a9b73416d28a22a07cc7a837e57606c117e17441bd7e4435bf11b65d0ab3954e4c8c06f62ccb9f6c6d96fef6a4e SHA512 e93aff845bc3bd6c69ae527a0653b17420f3ab0aa72f13f25091386e324594dad87e7d511b3332f4d8692d81b296db8e77d79b1390f241927bcb5d7858758eef
+EBUILD hip-4.1.0.ebuild 3476 BLAKE2B 101bb84d3083388e6dc761dca7ccf0ef5393a44be7666831e83303d1dfbd50e81e3fa09d572f9c5cdf30c6fb738e0587bb9ddd0ccb0627bef543bd64648b66f0 SHA512 3af9dc2a5ab5735dfb0cd5341cfe1e99961858d40409ffb065231bea793b8faa3de3b305d28f2dce90e4535e0406f90a3f933b4cbab06933d83b04dd3e433023
 MISC metadata.xml 596 BLAKE2B 32b0fcf237a501e546584504ead6f5cc817f5f7891715df60d9e6a8863a87d779f6ccdb365536338440b3bdeb1f541dc481f2a29c014506519f6c62f9834ef0d SHA512 b67b87b25453471fe1337c78095341c00fe6e76a4d222390cb47d1b52226f7ebdf23c1f66f5926819a384ac1473cb1d6f22f5467ec1c600a5a96eef5e24fe1d2
diff --git a/dev-util/hip/files/hipvars.pm b/dev-util/hip/files/hipvars.pm
new file mode 100644
index 000000000000..3f5c88409e0a
--- /dev/null
+++ b/dev-util/hip/files/hipvars.pm
@@ -0,0 +1,19 @@
+#!/usr/bin/perl -w
+package hipvars;
+
+$HIP_BASE_VERSION_MAJOR = "4";
+$HIP_BASE_VERSION_MINOR = "1";
+
+$HIP_PATH='/usr/lib/hip';
+$ROCM_PATH='/usr';
+$CUDA_PATH='/opt/cuda';
+$HSA_PATH='/usr';
+$HIP_CLANG_PATH='/usr/lib/llvm/roc/bin';
+$HIP_ROCCLR_HOME=$HIP_PATH;
+$HIP_PLATFORM='amd';
+$HIP_COMPILER = "clang";
+$HIP_RUNTIME = "rocclr";
+$HIP_VERSION_MAJOR = $HIP_BASE_VERSION_MAJOR;
+$HIP_VERSION_MINOR = $HIP_BASE_VERSION_MINOR;
+$HIP_VERSION_PATCH = "0";
+$HIP_VERSION="$HIP_VERSION_MAJOR.$HIP_VERSION_MINOR.$HIP_VERSION_PATCH";
diff --git a/dev-util/hip/hip-4.1.0-r1.ebuild b/dev-util/hip/hip-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..827305877f9f
--- /dev/null
+++ b/dev-util/hip/hip-4.1.0-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake flag-o-matic prefix
+
+DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP"
+SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+IUSE="debug profile"
+
+# Don't strip to prevent some tests from failing.
+RESTRICT="strip"
+
+DEPEND="dev-libs/rocclr:${SLOT}
+	dev-util/rocminfo:${SLOT}
+	=sys-devel/llvm-roc-${PV}*[runtime]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.0-DisableTest.patch"
+	"${FILESDIR}/${PN}-3.9.0-add-include-directories.patch"
+	"${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch"
+	"${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch"
+)
+
+S="${WORKDIR}/HIP-rocm-${PV}"
+
+src_prepare() {
+	cmake_src_prepare
+	eapply_user
+
+	# Use Gentoo slot number, otherwise git hash is attempted in vain.
+	sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die
+
+	# disable PCH, because it results in a build error in ROCm 4.0.0
+	sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die
+
+	# "hcc" is deprecated and not installed, new platform is "rocclr";
+	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
+	# which makes "stdlib.h" not found when using "#include_next" in header files;
+	sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
+		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
+		-i bin/hipcc || die
+
+	# correctly find HIP_CLANG_INCLUDE_PATH using cmake
+	sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die
+
+	# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
+	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
+		-i "${S}/hip-config.cmake.in" || die
+
+	einfo "prefixing hipcc and its utils..."
+	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
+
+	cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm"
+}
+
+src_configure() {
+	strip-flags
+	if ! use debug; then
+		append-cflags "-DNDEBUG"
+		append-cxxflags "-DNDEBUG"
+		buildtype="Release"
+	else
+		buildtype="Debug"
+	fi
+
+	# TODO: Currently a GENTOO configuration is build,
+	# this is also used in the cmake configuration files
+	# which will be installed to find HIP;
+	# Other ROCm packages expect a "RELEASE" configuration,
+	# see "hipBLAS"
+	local mycmakeargs=(
+		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc"
+		-DCMAKE_BUILD_TYPE=${buildtype}
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip"
+		-DBUILD_HIPIFY_CLANG=OFF
+		-DHIP_PLATFORM=rocclr
+		-DHIP_COMPILER=clang
+		-DROCM_PATH="${EPREFIX}/usr"
+		-DHSA_PATH="${EPREFIX}/usr"
+		-DUSE_PROF_API=$(usex profile 1 0)
+		-DROCclr_DIR="${EPREFIX}"/usr/include/rocclr
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
+	echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die
+	echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
+
+	doenvd 99hip
+
+	cmake_src_install
+}
diff --git a/dev-util/hip/hip-4.1.0.ebuild b/dev-util/hip/hip-4.1.0.ebuild
index e6e6a374a787..c5b5027b241c 100644
--- a/dev-util/hip/hip-4.1.0.ebuild
+++ b/dev-util/hip/hip-4.1.0.ebuild
@@ -26,7 +26,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.1.0-DisableTest.patch"
 	"${FILESDIR}/${PN}-3.9.0-add-include-directories.patch"
 	"${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch"
-	"${FILESDIR}/${PN}-3.5.1-hip_vector_types.patch"
 	"${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch"
 )
 
@@ -40,19 +39,15 @@ src_prepare() {
 	sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${PVR})" -i CMakeLists.txt || die
 
 	# disable PCH, because it results in a build error in ROCm 4.0.0
-	sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i "${S}/CMakeLists.txt" || die
+	sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die
 
 	# "hcc" is deprecated and not installed, new platform is "rocclr";
 	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
 	# which makes "stdlib.h" not found when using "#include_next" in header files;
-	sed -e "/HIP_PLATFORM.*HIP_COMPILER.*clang/s:hcc:rocclr:" \
-		-e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
+	sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
 		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
 		-i bin/hipcc || die
 
-	# replace hcc remnants with modern rocclr.
-	sed -e "/HIP_PLATFORM.*STREQUAL/s:hcc:rocclr:" -i cmake/FindHIP/run_hipcc.cmake || die
-
 	# correctly find HIP_CLANG_INCLUDE_PATH using cmake
 	sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die
 
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index c25f4256ede7..0bbd26805f0c 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,5 +1,7 @@
 DIST howdoi-2.0.15.tar.gz 27545 BLAKE2B 204d7e3ddab07e24ccc08964c3880477743970502423887a2360079606c832b93d1e8fbcec237b77533c2e21d4a35af08b9418d5ce62f8b2ceca70ee844c21ff SHA512 e0b3faf1cde78d35a23e11070b3d73db7468bfe79ec8f71b2370681d3dea1bcf1a313594fd1e4f21aa62035460e5c31509ff683fea3e0e35e9412b173ad874bb
 DIST howdoi-2.0.16.tar.gz 28483 BLAKE2B 466ddc6b6f5a2bfbbf781dddf89d272b609d530b080a06dd33528727010dd6f42b823996bfb3fcbb4afea95fc667f61d30b1cf17a8c5fb1a4c66836be57e1110 SHA512 606346514670d891df91c6d3bd83cae599b2ed2d7d1908b8b805435579ea75c6e25f171bc31af1af7519ac142459b73cae7ffe93d747effb2fb0cee00aa59b1b
+DIST howdoi-2.0.17.tar.gz 26892 BLAKE2B 5b0eee59a3136db35a40a5ffeac6fb95378bf036e005ae0bbfac894969e54435720396bb8f9bc45b3aa575a8955f203b7f352d7cedc0031443e358b9db11808e SHA512 e9b67386909e7015eff45db33857e935a2e995d6b08c1ee9d9d13caeab4c25b9dd9eab2a8bc653684c5b5b0e33b6b1eef382ab559736099811bae4f74bb784aa
 EBUILD howdoi-2.0.15.ebuild 684 BLAKE2B 9f7cb5189659a41a8f1cc416557a676bdf309253390f801a43653bab3edfde6cd0f9b40452cca0943b9904fcf1951a0ea97ab31d984cbefd722c913f39d40bf8 SHA512 b3660bb4744592976f51a12f814d3c8c1d92581f20a5997a3cc582f8b5f053877fa59b9e64fd43a33dbeb9c662b6e8a84cf0ede02e12113f53290e5b14066036
 EBUILD howdoi-2.0.16.ebuild 686 BLAKE2B 7a92b6d345261177bd4d0139370a3c353d72f8181fa8bb85ba32430c52cacbbb05627e40661bb83f116796419927c96dcbb4905776400150d0e034ff0af66cb4 SHA512 7f5fed60db5035831ebcc5a5be3e178e9c0fffeba0bf2be1360c61d0c6795527a0ea4cb19fcdcde02d51f4312856352a8d2795ff5fe77d0977c147eb7b7a1cfc
+EBUILD howdoi-2.0.17.ebuild 686 BLAKE2B 7a92b6d345261177bd4d0139370a3c353d72f8181fa8bb85ba32430c52cacbbb05627e40661bb83f116796419927c96dcbb4905776400150d0e034ff0af66cb4 SHA512 7f5fed60db5035831ebcc5a5be3e178e9c0fffeba0bf2be1360c61d0c6795527a0ea4cb19fcdcde02d51f4312856352a8d2795ff5fe77d0977c147eb7b7a1cfc
 MISC metadata.xml 367 BLAKE2B cad999effcfe4ba7eb7fcce4efa22b7cc1bc501c01f28c647c8d94fd560645b96d25bc89703bd43c8f5a969606f9842e14f955bc7ace46fcff0333469843e62b SHA512 eacaf9118ec14ec50c3f22d0abf5deafb42ebbcb3bfbdb87f01c6908983b36c6c837b13f903c0cdd7be3137d9c999f66d7983157a7ec33685d08d608096f0e27
diff --git a/dev-util/howdoi/howdoi-2.0.17.ebuild b/dev-util/howdoi/howdoi-2.0.17.ebuild
new file mode 100644
index 000000000000..a0b3cd960b87
--- /dev/null
+++ b/dev-util/howdoi/howdoi-2.0.17.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="manual"
+PYTHON_COMPAT=( python3_{7..9} )
+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"
+
+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/lldb/Manifest b/dev-util/lldb/Manifest
index 11cd0a5aa448..eb62ef3ce40d 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD lldb-10.0.1.ebuild 2324 BLAKE2B a09d486d0feab20c3bee3a61d2e7443883624bfd51f0a27079163092a38dc69f52d0f2ecbc65bd88c5f6a5eed8e07b8c823f19d231498ead36f4ab70958bf231 SHA512 05248c1d41f860dac014d40f8330ca85bcd3085198652d5c6b011b71ae03311336f5f7cd68b49cb22e325ea1d9043261cbc99727a08a10317b39d7cdae97d5d1
 EBUILD lldb-11.1.0.ebuild 2343 BLAKE2B 7ac5a408af2ac8e74f9ca3bc7e8ea636e394a325cd2dfdeaa5c5521b7a6d7b97ad846514fd131c5d432fe92ba3373c6ce546a999862dfbc63eba361cab63d0b2 SHA512 52ad596b0264f162667ddf3357fbb3a06c4976e9af0451fc999fe27e84ce36cf08336edbec49581248bf3865ca6432770b0202aedfcb0bb3d87dff090c3bcabb
 EBUILD lldb-12.0.0.ebuild 2415 BLAKE2B 72591b9369461530face31022adfedb46c27e973a05c19c55dc33c580fda116b1e8f22df0b760cbdffafc60ccee438009c7bb1175fcbfd15cb9f55c0084c34f1 SHA512 abce2969538626084d680561ca85ece8fdb999fdf9ad41487e60f6fad62bd628ccebee369b56d394588403f7a6c3a2911ac4f699d0c51b284a6ffcbcd22dff22
-EBUILD lldb-12.0.1.ebuild 2420 BLAKE2B 8fd461752260d2e7d3cde1112863d43b0681d46ad129d36056b73b03c67b13c1263656e3577ab04ec729b70af167796991d20c91cfda5643fd63c898a3f2a993 SHA512 d14631da412a5e822f98ae6bc703e66383d848ace0d705363a4d0bf8e8f4f9126a1c7a472a4805b495b185d91098748d35a7a89f4047456904edb97735f5925c
+EBUILD lldb-12.0.1.ebuild 2419 BLAKE2B c8d6d0c375f9a127d9c0f5772cffcf2fae7a2c964de780af241d19733efbf32d6a7c25b200fc78942491022e7cedd17a0ac22942a64b86e0e319dde9b677b0d5 SHA512 63c7aec510f7106f1b327ff00f2a8feb8b450578b47e39e6de674bcb8649afc8be7fa1f3374be0041793e070170a60d82effd98ae86d3a28f2342c68a813b245
 EBUILD lldb-13.0.0.9999.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a
+EBUILD lldb-13.0.0_rc1.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a
 EBUILD lldb-14.0.0.9999.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-12.0.1.ebuild b/dev-util/lldb/lldb-12.0.1.ebuild
index 1460455009fa..cd5fc846aee8 100644
--- a/dev-util/lldb/lldb-12.0.1.ebuild
+++ b/dev-util/lldb/lldb-12.0.1.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/lldb/lldb-13.0.0_rc1.ebuild b/dev-util/lldb/lldb-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..468fe7b0cf61
--- /dev/null
+++ b/dev-util/lldb/lldb-13.0.0_rc1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-lit
+	# failures + hangs
+	#use python && cmake_build check-lldb
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 942821937530..c1f1e3f4920e 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
 DIST meson-0.57.2.tar.gz 1853721 BLAKE2B 9c167a21745719589a165e7ffc31007bd6307b347027f390fd660b2f44b5a2e6d8f36e999e15fa4b28ae269ddb0bb3897e0297288c59b62cc493aad058126293 SHA512 a3b0bf3d5e1d1b7ac7c97313f43046c94aa2a6b21964958569c89764dfda08db166adb89d48cbfad735bd472114587a71089d5e8b4f0fce04c3289da21b3f40e
 DIST meson-0.58.1.tar.gz 1896205 BLAKE2B d42e04b262c6715ba2776f64d2e616016381303b07e609c804becf72db2ebd8ef08030c969f43813b2072552cb76974b2ed84f2da6d6c809ad612169d580395c SHA512 64ac1a9bcc642fb6d37c4b677d8b7db16d821f852f927a980d3fb1c149d680b7ff2c8d03676c6772666d46a33b6ce8674220433d302fcd92d13d9818558d6453
 EBUILD meson-0.57.2.ebuild 2303 BLAKE2B f05ddd144872cd4a01891b089af2adec6e53bd6bf69707557dba5f7770385062d0111b0706e328aa5b21fb2acde9efb136221fbd651828ec16e902f5b7c878d1 SHA512 5bfdeeb4ed0542917ae6bc1780e06ff7733c1e03b9c1fb8816d6ffa26fc18b843008a3a32aa5ca1e596d219a0a7fdcf2984e9fabeb34f7ea793798239ab46653
-EBUILD meson-0.58.1.ebuild 2679 BLAKE2B 3c6ea51023cb8e10a5a3a6fcfe9b609cbf520f7401f7a65f7d5b46860f416c727b02ebc76dcfaa80019892079aa338f6f0cc32af2f87e73ce4eefce2483b3972 SHA512 2292d2360e1e3514fa0656c237b30ee5bdc79f0e676619e7e32ad70d25e683bd3d5bb485707776561ef612e39caeb2ce5928a23a3882f3caa8dce364806f039d
+EBUILD meson-0.58.1.ebuild 2678 BLAKE2B f4969a73c757f7b64d673bab442d07aac6de77fc015c340fea9f7ec4383d0049d051e1eeae09ef9ddffc029245483c336b17a837d5af3df89e7566c0e58f193d SHA512 d14b5bcdb990c0124e5e625b8b8501782c6247e38265b9ab2570ab92cac8546c0f14dd636e951ade6574b3c2872c6fed6e2f249dbfac408bb25ff57cc5df49ab
 EBUILD meson-9999.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 MISC metadata.xml 423 BLAKE2B d5ccfb020cc6bd4c163a6807d27528e6035ef59d0e0a7122c0a194da25126408ed5d5a1d97effb6e7e4721eaa20d15efb2bccb48db4215c3c5609cdcb58938ef SHA512 88f01def35adfd916e55aea1abf8234108338f1b692c1702e64b1fdeb6354f50965651e741b347cf792cd9ae90897ee4451060115d757af6b6235469f8d9aef0
diff --git a/dev-util/meson/meson-0.58.1.ebuild b/dev-util/meson/meson-0.58.1.ebuild
index ea602445e4c3..3056c22a3bd1 100644
--- a/dev-util/meson/meson-0.58.1.ebuild
+++ b/dev-util/meson/meson-0.58.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 1d7098a54191..12b32d6fc63e 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -2,8 +2,10 @@ DIST ostree-2019.5.tar.xz 1972452 BLAKE2B a8b015118855b8b0097f535ac074aeffc599c3
 DIST ostree-2020.6.tar.xz 2014456 BLAKE2B 97d84c6838993edfbabb598bce800332ab1c8b22c0431839f7129f2f57afdd71c1b8ea8b8d6c1dc2cbf8d7f6828d624394b5e8c533f7a98eb1b1c3aeedff92cf SHA512 1d8f8ccaa3e543a6f494d3be2a3651ad340846f0c314e003955260b7bd1d8c0421acf102ec2ca6580379c354bf4cfac0940e4e95b724b7aaf9dc8116085aa538
 DIST ostree-2020.7.tar.xz 2022004 BLAKE2B 2113117ce8553b7ffcfea17e1cb3a9c697d39b4933b48c30729af72fc833bb00f39e7e3a327efeebaac1df307b1f62ccf16a7772e12ad77737e2219c87623824 SHA512 f42dca3c9e1810c0421ab99588f27c625733b71ef811534b66e0c0c4afafbad5bf475e08feaf87c2f8414c38f127fd344adbb57a4b75001077aedbfe92af3706
 DIST ostree-2020.8.tar.xz 2081080 BLAKE2B e856f9642db9fd16e96d6bdc9b3f3be93989458d72258c4586e5a49e67c197d0b7b20cefd0b5a28d77dee986db42ae5584d2894005ede654b8320402aa3af367 SHA512 2523f5742c4472f8e64614bb99edc5aec1a8f8a837b54f67efba9760aefc3385014e1296c9246ac81b361f4588deb4794768a231bf8f338c24a14255ab63da04
+DIST ostree-2021.3.tar.xz 2089804 BLAKE2B 5df33b676173b1ec08ac7592d4ddf8e3bfdcd84df1b3ce19e2f24c85780fed1f210b8adce1baf4ec87869c72984502276bf6e5a72268daaae6ce9b3d6dc6f88b SHA512 0df0d8f9bd82b16562dd5146997eddfb7cb6cffc1886601307d97a1cb1dc926bda7d0c899db26c974ed0dff1012dee11937e47c11c4d03307fa3d2d430adc60e
 EBUILD ostree-2019.5.ebuild 2221 BLAKE2B e50770f764770a23583e9392e83505907e5633d0d201aac8bd6ad558c3b6d7a91a9dd0497ec660e80f5113fc696eb9199fb76a68cd8ec7b52371f1907092e5af SHA512 de09aaefd77487ec238e941355172ecedc76dfefc708d0abab635a461f86199a57e422254b3bbacb46bed19729233915dd9221e8063e4889f4a430bbe56be7c1
 EBUILD ostree-2020.6.ebuild 2249 BLAKE2B a7f0195886ec3d0da5ad40825a0b043a3f654c1fec3469d1b037d8bf70a36f1cd43e27ab052636042feadbe218b5f54b56dc8272d4ddd83602944d70e427f8e1 SHA512 0ea92cc30d34f15e14a7012acb9ed5ca487e9de8e15599b436b510f0936c8ebe396dd23dbd72e41b3a36609596d64c3198350cee250554df92b385d2ca91b83e
 EBUILD ostree-2020.7.ebuild 2534 BLAKE2B eb5a2e37dd6013140190abd1298e88179a147df2c4c6fa7b880c8a09285757aba2dff078d720e0d8f6e38aa946c7f157afc91ec29dbcf998ce7a033f6958ad36 SHA512 8805e8cb12e1f0aee907bb8951b53e3ab373045874e98a31d84f45378005edf1db2ebc41e3430b2a13640e9248dfc1c83a08dd3e246ed48cf77dd2fbe5874e75
 EBUILD ostree-2020.8.ebuild 2531 BLAKE2B 4766ab79400f6bd586bbb6613816fe0ce8ce2d8e57708abaf23fcf7d5dc3c592aa97d6275d37273a41f2113c4f06ed8bf18a3723d003b7e39da0e1fde178c4d9 SHA512 850a502d58688ca713bb37ba734b41ea668a063529cefd8ed8cbdf27f0bd78c43ad517d1b5fbb1036731c3f3eb6783677fbf8d9be84e7e70a5c9f5f392607e67
+EBUILD ostree-2021.3.ebuild 2534 BLAKE2B eb5a2e37dd6013140190abd1298e88179a147df2c4c6fa7b880c8a09285757aba2dff078d720e0d8f6e38aa946c7f157afc91ec29dbcf998ce7a033f6958ad36 SHA512 8805e8cb12e1f0aee907bb8951b53e3ab373045874e98a31d84f45378005edf1db2ebc41e3430b2a13640e9248dfc1c83a08dd3e246ed48cf77dd2fbe5874e75
 MISC metadata.xml 1989 BLAKE2B 783f5a34c80ba2bb20cb1660a72741d8f0275dce984b67038cdd7b05fe144fe97a134562dabaa53263c378d7f2bb0459f8cdc31fb13884cc03136133116c672b SHA512 31f848aeca7afb1b3f2d5f4e1d1ddea40715acf7835ae2e1dd8111153087ffdb02c3e423a9418fb790e4459385b19b16609cc413d70443f49030111a9df760c8
diff --git a/dev-util/ostree/ostree-2021.3.ebuild b/dev-util/ostree/ostree-2021.3.ebuild
new file mode 100644
index 000000000000..20c372540e27
--- /dev/null
+++ b/dev-util/ostree/ostree-2021.3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Operating system and container binary deployment and upgrades"
+HOMEPAGE="https://ostreedev.github.io/ostree/"
+SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
+RESTRICT="test"
+REQUIRED_USE="httpd? ( || ( curl soup ) )"
+
+COMMON_DEPEND="
+	archive? ( app-arch/libarchive )
+	app-arch/xz-utils
+	curl? ( net-misc/curl )
+	soup? ( net-libs/libsoup )
+	dev-libs/libassuan
+	dev-libs/glib:2
+	dracut? ( sys-kernel/dracut )
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	grub? ( sys-boot/grub:2= )
+	introspection? ( dev-libs/gobject-introspection )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	>=sys-fs/fuse-2.9.2:0
+	sys-libs/zlib
+	libmount? ( sys-apps/util-linux )
+	selinux? ( sys-libs/libselinux )
+	sodium? ( >=dev-libs/libsodium-1.0.14 )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( dev-util/gtk-doc )"
+
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig"
+
+S="${WORKDIR}/lib${P}"
+
+src_prepare() {
+	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
+		-i Makefile.in Makefile-man.am || die
+	eautoreconf
+	default
+}
+
+src_configure() {
+	local econfargs=(
+		--enable-man
+		--enable-shared
+		$(use_with archive libarchive)
+		$(use_with curl)
+		$(use_with dracut)
+		$(use_enable doc gtk-doc)
+		$(usex introspection --enable-introspection={,} yes no)
+		$(use_with gpg gpgme)
+		$(use_enable http2)
+		$(use_enable httpd trivial-httpd-cmdline)
+		$(use_with selinux )
+		$(use_with soup)
+		$(use_with libmount)
+		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
+		$(use_with sodium ed25519-libsodium)
+		$(use_with systemd libsystemd)
+		$(use_with zeroconf avahi)
+	)
+
+	if use systemd; then
+		econfargs+=(--with-systemdsystemunitdir="$(systemd_get_systemunitdir)")
+	fi
+
+	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
+	econf ${econfargs[*]}
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm -f "${ED}/etc/grub.d/15_ostree"
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index a67aa4616fdd..84323bd2df2a 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -5,6 +5,6 @@ DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8
 DIST patch-5.10.16.xz 498880 BLAKE2B 14061b505285f24938fb955ccc7f9fbd78ccc0b1026bffb17a89fdad08ea54bfee7bbb841123d9af4d0720a960a27c649c39852af7e2be8a286af926c7bce9c0 SHA512 be9cfe1ae6697956ca7476cedc212a8cbd9da2c3c72096a89afaaf73c5b6655fd04d458f96c472f680c5513c0ea3e4449c4092a958425b6040f0c7774453cd2f
 EBUILD perf-5.10.16.ebuild 6860 BLAKE2B 7535ca0e30e06f5dd246fd2b66730830f4ef29f71b09e7604ade827c4d73e652cb90adb4793c0e52d2dcd765a2e843f55905f7318ca44c2f810b5069f7c2665d SHA512 235d5ba2f366d90ff98bb9810c9eb3ddd01de4bef9fdd6405c8015f918d58826b912aa76b877cad1bd143926a27b1ce53541a231efc9b7a58e0f43ff3e1f4e19
 EBUILD perf-5.11.ebuild 7094 BLAKE2B f823eeb8a1c8eda5b8670da5f0105e1f77a01ed8430049a54d312770727039bd135f9a1dd75d2e86c02f3682f78dff9d74ecbec5e669bad06b979075e51fa41f SHA512 ede87c249fb0fcbe81d2c1abda30bb4fb4d367037d03fdb672f6bef120956e4ec2f2b14e203c3aff4c83ad9e5eec3902b9e655c63ee1f2f46f0bab2dcf97fbdc
-EBUILD perf-5.12.ebuild 7134 BLAKE2B 9d12c35d68165620057b32960a742eac23f75d8ec69cd2b9ff1565c64d8a3e2199e95a317d1de6873420183f79c43b6d56720a5de37fd2d48db23cabd3c39f00 SHA512 843cc0e335c673b59f13de50445535d1d4401c2d9c3b228c041bb59719c0eaa776c20689ea9e200093db8b162ad24c7d117374a7295f9cf7a89c3b6a96ae8b8f
+EBUILD perf-5.12.ebuild 7141 BLAKE2B c01433656b261470c4c72513e7b7ab100860ea4b0950dc6678fe45ca4fd8f26be96691f31a9cb8ff3ee157267aa3e26773c63b78e0e567030e32f02aa1609b3c SHA512 ea21d83517d7f83ed485190395283582aaf9f79b00be06ce2cf185496be3753850b38ca6fc6cda623c189353e582a5e19bf94bccf604b3faec1842c24a6544bd
 EBUILD perf-5.8.ebuild 6757 BLAKE2B 490ff9045ea6dae5b14aca9e91d322d0e6d7879f2efd4bf9a4f2e919569b752e9933ba8be586f7615e81a04be28ffb5a5ca832a7491df13cfa6e67ddaf8ad86a SHA512 da92c2600d4033fedefad6e1f73a56261f2bb3b38b3a0c0fb195347d20509b8f3797386a75f52faab5981622e85db9e38cae805fcb8a86a1d2ce6916e95f5b76
 MISC metadata.xml 1701 BLAKE2B 6171bbe52b79f1892209789442e0adadbb657e7895630c112c1540046b1e4fa1de511bac15e4ce921214b34f14d0cb296e396e5857228666c7af8a3155ef5391 SHA512 1d51993edb452fee8430a1937f2e6581fafe19a20867dc71fbe6a7d84a35a15781fd9cf895ba708f907dbb11c98689c4a2d56f65087f7198939cda9df568c418
diff --git a/dev-util/perf/perf-5.12.ebuild b/dev-util/perf/perf-5.12.ebuild
index 795634dc8cda..2f8dc2e665ce 100644
--- a/dev-util/perf/perf-5.12.ebuild
+++ b/dev-util/perf/perf-5.12.ebuild
@@ -31,7 +31,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="audit babeltrace clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
 # TODO babeltrace
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 0c60413b22d3..e3f63fe7e9f1 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -3,11 +3,13 @@ DIST pkgcheck-0.10.0.tar.gz 453555 BLAKE2B aeb211619f400b729a9f5e7e1ffa787c33c1c
 DIST pkgcheck-0.10.1.tar.gz 454051 BLAKE2B ba0e91fee539d0a41c27da08c91e1c65078eaebea33b8254cbad38d49feb91a4aa490992a5d88bd96ce0570d89f9f8343d0ff0a2d7368f09d55637b2597aad6b SHA512 044067928bc1c1280a95e785def80e6ebb289e0882f9a61b18d1d75ddc22c4f7eea1da4a4621fd5a598c3e7ee75ece2adedb936086f3c3cbc92c23ab93419215
 DIST pkgcheck-0.10.2.tar.gz 454643 BLAKE2B 4585a72ce9675a23a3bcd7228ac811bdf45bacf2a25d91b9665f833de6dffbac5c4e11405b112bd5dd6e643fc51c3f57cf7dda989c2521c11e279324a02740c7 SHA512 0151d6fb81f800d46b65bb02bd5474ae36e8e4dc35376f1abfaa1c8be61e3429e527947b42f76c9f6da5ede648617d58f6b9ac44a93ff58175b748dfd9a43cbe
 DIST pkgcheck-0.10.3.tar.gz 454953 BLAKE2B 5ee2c13cb1ca5b13bfcd8434700c69e6839c5dc2f25dec4060020f8477159ff071b1487a446ba7e03bf1b8d139e8c65a1cd21a777d8bfe3ce677bbfe39b8d85f SHA512 edef25fc1542c3d3fb89c0c1546ebfa736b6ad4b113b0e6bc9ede379b0a5cb9ece5dd8b79ddb2df2cfeaf7f67f290e96a8baee1f2dfcc3bcebe32d9dcf4c264e
+DIST pkgcheck-0.10.4.tar.gz 455252 BLAKE2B 3fb8183120b8a45569a007e4c9e521e5b070554523c5c2fbf44c383996896924800d42f79f9809e0fcc3b04363b2c50a8894b547376a8c030f4d0451c7f943bf SHA512 f5f01340ff4ac882da8e56cbb44440425dcb42c5ed6a9ab102c435a61cfca6861a421ee294039f055fec5b93cae338ea4ba23237f1ba509e6e24bdba351427eb
 DIST pkgcheck-0.9.7.tar.gz 453478 BLAKE2B 486bae68af1757fbdb4b109b34cea836cb6dee258d4e53b4c3818c1aa6194da86e7ee339335ac6f2a1c2fb89a547f46658fadd88706fa807a9fdce2bb82a5c65 SHA512 e8fc02997d558af1e8e89a13130076b4db59e9c2a8ea383d0dca9a57375dae1fb315619593178d67c89d30e7b16810905694c838ea4ec608eaee195fa4797569
 EBUILD pkgcheck-0.10.0.ebuild 1507 BLAKE2B 70f6f537fa953ec59c3ed9b0ea017bec0fb7c569e6006b066e35a2b2b868a4e75da078c5bd60faba16a9c80f8e011a565366e611b9202628f073a27fc4e47aee SHA512 07dbe05c8d6a60d411bbd2d07e890b914c85703e024822ad7b6720818d15e6843ea05f95bfeda54b3f4c1f8db96948d25e719bf5d415082ad9c038a0403c50af
 EBUILD pkgcheck-0.10.1.ebuild 1507 BLAKE2B e9faf1f21afbd8a9846f54cb795083ecdc48853e47e171b9cbb9e7a9e668a3b09caaf1870a31830d33488c4841e04c3fedfd8c2b1219cb391f74c981dcd999ae SHA512 0b1b30f6e5fea0bc8175206903e90ef60e65d0456fdfb14448342abc811e4e9d0333000e8cd6fd79974e22803673f64349cc8404c1ed8dbff4e3f54b58ddf3b2
 EBUILD pkgcheck-0.10.2.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
-EBUILD pkgcheck-0.10.3.ebuild 1512 BLAKE2B efeaa6e4cc534e46a35b6785c5ed17d691b53502480bd6fe33487891d55920a1c4759705399fcbb7d17004936bb45500863bba7aa8abcd87ae42c686a81015b1 SHA512 208c9a6162bc712ad3107bff0a4f1fae1b4d419d2062c600e3b065bdd78fc930aaf38b04ee976724bcd7f76f1d27c1a30b895ee1dd52f3468f42e2bd219de55e
+EBUILD pkgcheck-0.10.3.ebuild 1508 BLAKE2B f7e417191f84d5fd4fda320278831cc847dd356816556b3bdb7b55138d667d64696d20135537616f21de9c331c4e063c612000198663b3d1337904ae90c6113d SHA512 a2d1fdc2fa45f2f1be07066d798145eb185f8616c96170d5436ce58b6f67840374f73e0bc9424121b914aa8a18d5830639580550ca3a1cd991355a9bc3513fb8
+EBUILD pkgcheck-0.10.4.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
 EBUILD pkgcheck-0.9.7-r2.ebuild 1544 BLAKE2B 7bea3bcebc9b0397682d6ea9c39798a59857ea9276095548927e6fc6f09c606e60504b7a6ebba401fd00c55238489211889744b6480e559b897d7824fa33bbd7 SHA512 1de34366c44024ea677d6ae3e41a2a71819490d22a7f0813307f790ae3f3b019daa07d259ebc2ffe39121588dfc3a9183f46cbc7858d1c17e631ff2f6668bc50
 EBUILD pkgcheck-0.9.7-r3.ebuild 1604 BLAKE2B 0e6042b6fe93f617544b08d728eb1bbc4217e6e1b675c4069990c02f99937c9ba5668a68f3b5b595c688eddad5a47a96140f58daf9ca94a803eec7b933dd874b SHA512 6a3dd00c5158e8d004a002e820dc4553294c6faa2759ed672dc91f8664725bf6e7eaca8c1f7417a6d232566fe6031dac8df045307beba52137d003d8a1b76b28
 EBUILD pkgcheck-9999.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild
index 0d14dccfbd9b..d347d42a40a6 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.4.ebuild
new file mode 100644
index 000000000000..9a255efb0571
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.10.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..10} )
+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 ~riscv ~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.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.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
+
+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 14a6aefef453..9e49947eae0a 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,9 +1,6 @@
-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.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1
 DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28
-EBUILD pkgconf-1.6.3.ebuild 1668 BLAKE2B 2343a05fc855973ed0868d066c1ff5067905b0378676efefa47211e06201f36bb3171b04754fa82f6c5044baf6465f958f7880c0285224f9431838ff86e6142b SHA512 6033f6726fd819119b2e6506e68b0bd22b50f754fa4f12c2f689b4d7a0a03c20d310203ce92eba07b90313028904f6d30c116933b305d7442438d1c8b6d9612a
-EBUILD pkgconf-1.7.4.ebuild 1873 BLAKE2B ed29dd0df41ffce8527085cc96af044e11ab33ecaaa91897cc3e174a4c1a7559b60c4608bf4192e917a2c645482af7cec704e7aac28adec1df53d910c2724d60 SHA512 7964d22b28ab00ee8d8ba63e24c54ef66366ce8e961a9f28142d6e00731f4870d598b08f7354f4ceff97e40da3caad60bb9066397019b061fd09c758af2a0b68
-EBUILD pkgconf-1.8.0.ebuild 1880 BLAKE2B 52f19a7111de7ba6de8906d59dba37be6c27cb75daa17758dc8f65c98b7fa9b63592b35b665d28db897e3e5dbe9590adfc601555b5dbc4dbd27891e9859209bc SHA512 abec978faca72c4286ed74fe9bd6479a78b8ae87fca9ce29d8552cee1ca7de0f53eb92fe13918700fb0dc1c09e0e6075e24777ed8fd9c2febe999e9b1889f09a
-EBUILD pkgconf-9999.ebuild 1766 BLAKE2B c470aa4fc8eeb6c2e61c636eab8d9b1684eda76d1d7f2c5734e5159ae9ab4f905adbdb372166ba38ab13bc5bf83c92022c07023a0ca7ac512baa0c348086ff1a SHA512 c101e8a92926436c40a82da763c6a92a43e503b10014cd59ed202b1ea257de52f12e5c8d1bd91ea23aa07880e11a0bf8fbaea89009cf563fa9495e3b8b8a9efe
-MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
+EBUILD pkgconf-1.7.4.ebuild 1792 BLAKE2B 11d4e56fc11e64e3c3fbc3fefff0c4e63b48f7a7276b814601b6cf1afa90d43d8b79e07864ad91a48da1ef9d5bd92fe229780e5f442b0d87c589c7e5756cbff2 SHA512 8d818589365b14b13991546b26c00dc10ead19246c8d464d6c6ae30a4ee22df1f5f0035bbe68757857182be094ffc20547894034353976873868e5eba0fd7962
+EBUILD pkgconf-1.8.0.ebuild 1800 BLAKE2B a9a820deedff587a5c6229dd52d4902a3183eed39dbcb5277e757203a22756ee67584ad87327a54289b7ec0fb3f6ca5a0d8f430d478b504088e08b8c43ce377c SHA512 a4e406b66bd33c71de03f8b71c0f68177cf9693db8e4d74ed30078fe30d6887c94dea861eb8c18d06589e61af2f087bd1a5db59040743cdb0f1cb3e59651a5f2
+EBUILD pkgconf-9999.ebuild 1804 BLAKE2B 3404606c1a539968083011ff32730df918e97e8666bfbe934fb571c9dc558637a784ada2f2db1ddeeb7e56eef1b43a34813d65952e917e7891d0ed0c048794a6 SHA512 fb056ad2cbee82dfd2679b4e2adcb73ebf799b9ead815357363d6dfd50d49bd4d261c1d3fca248e1631bc7884247e2a1909ccd6a239757467f6c98ad31fda540
+MISC metadata.xml 689 BLAKE2B ba307c593f7ff5b271b4795f114e3dbaf3ae03a72719ee6bbece732bf4669f9633a25fb8fcdd295907a77dfbcbf4914ce68ac4afc3e2fc4a014609312af7001b SHA512 e7364d608bba7294d4e24f7f2c7d9fbbe2fb90f2ca855ed55ffe2b7abb21fba19520c771c8b990ce3427b92900a0cdecc62582fd69892744fed4efad4186e82c
diff --git a/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch b/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch
deleted file mode 100644
index f41de43b97c5..000000000000
--- a/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-darwin9 does not malloc on NULL resolved_path
-
-https://github.com/pkgconf/pkgconf/pull/208
-
---- a/libpkgconf/path.c
-+++ b/libpkgconf/path.c
-@@ -92,15 +92,11 @@
- 			return;
- 		if (S_ISLNK(st.st_mode))
- 		{
--			char *linkdest = realpath(path, NULL);
-+			char pathbuf[PATH_MAX];
-+			char *linkdest = realpath(path, pathbuf);
- 
- 			if (linkdest != NULL && stat(linkdest, &st) == -1)
--			{
--				free(linkdest);
- 				return;
--			}
--
--			free(linkdest);
- 		}
- 		if (path_list_contains_entry(path, dirlist, &st))
- 			return;
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 8447141053d6..894f008349f2 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -9,6 +9,9 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
 	<slots>
 		<subslots>SONAME version of libpkgconf</subslots>
 	</slots>
diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
deleted file mode 100644
index 1593586bcec8..000000000000
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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"
-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
index 2b50f55d8aa2..edfc4c30bd49 100644
--- a/dev-util/pkgconf/pkgconf-1.7.4.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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"
+	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"
@@ -40,8 +40,6 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	default
 
-	[[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${PN}-1.7.3-darwin9.patch
-
 	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(
diff --git a/dev-util/pkgconf/pkgconf-1.8.0.ebuild b/dev-util/pkgconf/pkgconf-1.8.0.ebuild
index 5be8ccdbf798..257e865e259d 100644
--- a/dev-util/pkgconf/pkgconf-1.8.0.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.0.ebuild
@@ -40,8 +40,6 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	default
 
-	[[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${PN}-1.7.3-darwin9.patch
-
 	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index a29e166995b7..463b0b7e2311 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,10 +7,10 @@ inherit multilib multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
+	EGIT_REPO_URI="https://github.com/pkgconf/pkgconf.git"
 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"
+	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"
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 5f56fec94d7d..31d5ea2e055b 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -3,6 +3,6 @@ DIST pkgdev-0.1.7.tar.gz 55781 BLAKE2B 218842bbba75a0cc3d6005e75859ec679d2c03019
 DIST pkgdev-0.1.9.tar.gz 57093 BLAKE2B 5f5d9b4956cdc949d5e37c24160c692c32cf7e5d9fe90c167adc364993370dc42291edca048db3b0a2f17b199003aea61bd6b541bc58de1c1a084365ce517660 SHA512 78c117163549cb021e8cb9bd65e9a7752633506f3db825133fc3c4c515549c6e10dc974164489c06f94c1a1e25acb8fe050a57754353b907d6026892ef034cb2
 EBUILD pkgdev-0.1.6.ebuild 1558 BLAKE2B ea3a783859224ee8a89a34e96d63a8bd0754918ede96126df4875bed41d25f2813bdb09659d542466fa2023c534d7623b27157a28b63070f9a971bb95619337b SHA512 8d275b3d06f53eeff7d0714c1a7dd7b2b5132a1394543f16ce32945c3d4de45509e30476770f291f6c5803b45b0cb3bc53b3a80bb73c0907945f85eb52c8f207
 EBUILD pkgdev-0.1.7.ebuild 1567 BLAKE2B 2227adb507811b67779e7b8a603a9d54e06685ba7ef1d54d58398cec5a300de918cb2d6f2ac1860b6260faaaa1b3a61bba365e89a99b21d9573be6c8c72633c6 SHA512 7bfbc08935cf2ea5b17850e71220606eb844731e3490df884e672f8a4157b7c15275e549b47841207be985f669ad40d1a81c135140b232d85d1c1e875043c0a8
-EBUILD pkgdev-0.1.9.ebuild 1567 BLAKE2B 2227adb507811b67779e7b8a603a9d54e06685ba7ef1d54d58398cec5a300de918cb2d6f2ac1860b6260faaaa1b3a61bba365e89a99b21d9573be6c8c72633c6 SHA512 7bfbc08935cf2ea5b17850e71220606eb844731e3490df884e672f8a4157b7c15275e549b47841207be985f669ad40d1a81c135140b232d85d1c1e875043c0a8
-EBUILD pkgdev-9999.ebuild 1567 BLAKE2B 2227adb507811b67779e7b8a603a9d54e06685ba7ef1d54d58398cec5a300de918cb2d6f2ac1860b6260faaaa1b3a61bba365e89a99b21d9573be6c8c72633c6 SHA512 7bfbc08935cf2ea5b17850e71220606eb844731e3490df884e672f8a4157b7c15275e549b47841207be985f669ad40d1a81c135140b232d85d1c1e875043c0a8
+EBUILD pkgdev-0.1.9.ebuild 1584 BLAKE2B f2c22a9c4f6418909fd28c8755259aa50896f5c6ff80dc1634685d6a4e95433bd9140b9a820cfaec40c084ec1e474f9bf2545346419b5072c287355d1222fa47 SHA512 145322c5ba32fa3c6927c1eae954f2a787b284500d3ef413f4fc7e811f8b5aaf13098fb337dc5dd3ca859e586e0e23446c6116ebee78a40802598f88f036496e
+EBUILD pkgdev-9999.ebuild 1574 BLAKE2B dab1ff6de45f7b63c8907ec5f64e36ef67d0f5e3d9560917f7ffda2ec9051a46ec1e425c1eaf6b1ab6e0e771b2562902adb6ab0260026746773441a4591c36c1 SHA512 e055493097823f7a837db0b33524c1cdc93ae9a755f0755c7ffadce3740c76a6e95882570bd53a75c8fb64bd68404a32f0e718e81fdf21b0c98b3db4fc7f7448
 MISC metadata.xml 426 BLAKE2B 32d3852a1fcd8dee461509886d3d031570f6691e99dc919a6acbd12d94ee8650af4fb7623d3c7582150fba36c656aa59c580b1b743c65e736e17508f01707b1b SHA512 c0f6689e722cfab69e8b4ca174c5aaedcd2702147d6b4c3c01864e1df651f9a7622731af70c717349654558792fba5261c339a72aeb8b0d7b06bc7752bd961b8
diff --git a/dev-util/pkgdev/pkgdev-0.1.9.ebuild b/dev-util/pkgdev/pkgdev-0.1.9.ebuild
index 8902eff76956..5da5efcd9ad0 100644
--- a/dev-util/pkgdev/pkgdev-0.1.9.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.1.9.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 8902eff76956..a2cbb327919c 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc ~x64-macos"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 737c3ca81cd7..1c3ec4c60769 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -3,4 +3,4 @@ DIST re2c-2.1.1.tar.xz 1340740 BLAKE2B e0e3cdb7ea78324467a8fe3161fe9b0cc1eb44baf
 DIST re2c-2.2.tar.xz 1460740 BLAKE2B f9e5920cb31c7ae8fa9f880be30513eee33ad23bcc7d44b24bbcb93376e13b092f6d0bee3304e49f87430be54b868c43115592a2accfdd94cda0d789b234f43b SHA512 8c4f18fa9a2ef6b0b5c03b73b8b7deafcbd7b17baf72e0008c9344296fcb0abeee6024d4a78ccb15b090e37ae67ddd6f2a68b4932331096328530612112ee37a
 EBUILD re2c-2.1.1-r1.ebuild 1031 BLAKE2B 37bd605831fcac4a33ed2973a9f419d71dd295e59d28227444bf664d4b7f4f568d43b161ba22dd92f08c20d82b0a27d5152b81ee4c7d8dbe4e4acb52304a5859 SHA512 10c26da7a45635380d4350a23cc0b4795bd9c4d8ffa7648ac5ef7051ee12c3e7bd875ba254982aad1b264b3b1aa1da8c30b93070390eb37bb398bbd96f192e51
 EBUILD re2c-2.2.ebuild 1002 BLAKE2B c6d4ed7b384c990ee56fc31a95530a2e0c9c55dfbfe894685bf5364bbe93dd51a567de725b5cf03d9dcd1762b01d45dd4c7e452848ae31b263f0275e2a24c963 SHA512 ce62682ceec2c95eda5b6e04c4b82ff8615899e7151f20363df29dda5c7118c1a5490582941b748098140e44890612a116dfd5427a8a5e82ec750922333fe1d1
-MISC metadata.xml 476 BLAKE2B b2dad245e1cdcbb73e8b6e53442f7e9ec41337746c50f026c0fda68d57ebe10fb6193a26fcf9fca11e23570f44b104bd40d22fa1283fa91034f7cb792d436463 SHA512 e3018ee81606a018d66169cd142a17a34248587b77deb4baeb6daae6aca2d9a70095fb5dc2180d146043030631172f6fa17b3c8ddd5bebe85eebf6f3be79f9ab
+MISC metadata.xml 398 BLAKE2B f10b4b7acc825c9c67ba2f0d2d21fa1763b9da1a01870bb885255940278747740a92fc5f413ba253521b80b57e739bccf89a249d3eb0ddb4c18886d41d29f1c9 SHA512 c2340842c02b08cd618dd61b2969d33e7c4eaf1aa44a24dce343d70e27f8aff10cc788080cf88c75c8884bb5422c673a9e858cd87b381f7f7e739aaae37da10d
diff --git a/dev-util/re2c/metadata.xml b/dev-util/re2c/metadata.xml
index 0093ef8412f3..ecd4742359a2 100644
--- a/dev-util/re2c/metadata.xml
+++ b/dev-util/re2c/metadata.xml
@@ -4,9 +4,6 @@
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">re2c</remote-id>
 		<remote-id type="github">skvadrik/re2c</remote-id>
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index e6ab0997e9a7..da4d435e6390 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,5 +1,5 @@
 AUX tests.patch 886 BLAKE2B e631053ce6ecd6419cf88ca952d28a225229d248f52f6f600bb9865cf9760dea01e4039401b5039330aa6776ae18e1fe0159c725ee5f1bebcc1fd73248d37209 SHA512 87f7ca16f7b7f781ac5a2173ee4a9a6ed1baa2d9583d740d0cd46590d41a5781395fc5fbba185a20cac5cae0a1f967abfc205a67bce3487c0f82b04b0c08600b
-DIST rosdep-0.20.0.tar.gz 310881 BLAKE2B f81275e6b88de10b1bd080feaa97a5f870aea6f4bfa7d8ccaa788df01b5b43890f99fee3d2bdbf7dda811745a89d54aac948201a218dd32d56f2ed49eefbdaf8 SHA512 f464b4a1bd3ef437f4ef0ca55eed873125c537aed793b22e99dcdfdeb078bdd3dc03cbe75b67d6ba7b29c7390b893f85c436fb90fc339a26dca338e8652db917
-EBUILD rosdep-0.20.0.ebuild 1609 BLAKE2B 4c00b9fa66bb080f651154342ee5b5be37bfc39475486baa46cdadb60d4ee1cd3244a2d5b7df4243e8a4b4336bcd51ead94caea145d86de53fe4611a160387c2 SHA512 0ca03af2b33947a00a8256b9c5f7a11e74c98958a61c1ff91cd8797659df78946750e04c2d714fb9d02edd993f6694a78c6b93b7d3b337123da532edf3b9a633
+DIST rosdep-0.21.0.tar.gz 312028 BLAKE2B 7ad3bfe027c574fdc82952085a5ea447e811b6858fca13121ad25cf1bda04e33091782b69c4a8f9a71383f1716678bd19c8752600987f7c41016ee93eed1ddcb SHA512 fb784c1603087b62444d767f1ce9e45303d2161e69ac82fec0edeeefd99f0c70e14b25b64a516df01e72aaa3a1b4a25b9507855edaa169c3af945e6581d9751d
+EBUILD rosdep-0.21.0.ebuild 1609 BLAKE2B 4c00b9fa66bb080f651154342ee5b5be37bfc39475486baa46cdadb60d4ee1cd3244a2d5b7df4243e8a4b4336bcd51ead94caea145d86de53fe4611a160387c2 SHA512 0ca03af2b33947a00a8256b9c5f7a11e74c98958a61c1ff91cd8797659df78946750e04c2d714fb9d02edd993f6694a78c6b93b7d3b337123da532edf3b9a633
 EBUILD rosdep-9999.ebuild 1609 BLAKE2B 4c00b9fa66bb080f651154342ee5b5be37bfc39475486baa46cdadb60d4ee1cd3244a2d5b7df4243e8a4b4336bcd51ead94caea145d86de53fe4611a160387c2 SHA512 0ca03af2b33947a00a8256b9c5f7a11e74c98958a61c1ff91cd8797659df78946750e04c2d714fb9d02edd993f6694a78c6b93b7d3b337123da532edf3b9a633
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/rosdep-0.20.0.ebuild b/dev-util/rosdep/rosdep-0.21.0.ebuild
index dde1899da88c..dde1899da88c 100644
--- a/dev-util/rosdep/rosdep-0.20.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.21.0.ebuild
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index b2094c4d5f33..1e1b370797db 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,4 @@
-DIST spirv-headers-1.5.4.2_pre20210327.tar.gz 403907 BLAKE2B 9154b2c9abed730c0d292c5adc38d2723a8748d1eaad885ebf624631128edd227521f3e7f7185daddbd9ff404741e9fcd9adcd5eafff7a6a234585c7a327beb5 SHA512 02631716e4307f2bef9e7e294a5e4f2e6f7522f2b42f34eb919c7b8280fa8e55437ff1dcf6b5cf4bcdef062f1f0ed00b3afcb1dd1051b63ad3ec0b5a311b15fa
 DIST spirv-headers-1.5.4.2_pre20210526.tar.gz 406038 BLAKE2B e10042a4c09668a6eb0d2f08a873794e20d83e6f7be40d58c3a59e1d96aa6845060a9fd7e90ea4e6a940eddbabf6b725be756ea64b49ef9034b34dc6c33fa5bb SHA512 ef9b171c168963a3f25643a3ce5f6a5df3b811daaf237700f793c1d313016c148b107b0d8cfe81fa4cb72f8da87a3da58387545f7bd76d15927c4742d0dc2b68
-EBUILD spirv-headers-1.5.4.2_pre20210327.ebuild 514 BLAKE2B 3baa735fc68ed6d407a02356bedc3ee715f7f110684bf6b34356d9e176072fcbacca66d2994e6471607044a81c1eca03c6c1c77e989947f456b881ff77c14aae SHA512 811f7deb5744b644935908953bbfc82106e35a04656452cae833bf470d1ee26d3123feafa32c4a80e99f290e52b22d4efe87b9e014f5f8c67897312eabfaaf97
-EBUILD spirv-headers-1.5.4.2_pre20210526.ebuild 520 BLAKE2B 9b9e27cef5d3d407be980f4813ee8802269ce5ed8daf87e9993d5c0816d95f5a9f3ac40dcaadda13c12dc011bc86eba520405dc4f32e65c3f1a72309073a4fd9 SHA512 027325a6d7aee6fe5546b57cbddf49a4fc04e97e67d9f89e634a1c36f49b1da244aaf9d589abdfce37cb5f1622d5af0f100ba2c3e81178df3eefe2c5ead017cd
+EBUILD spirv-headers-1.5.4.2_pre20210526.ebuild 514 BLAKE2B 411e68b89f8ca47e4d7b28c863cc933df12034186ef6c811b65522aec05655be4d87bb20b9648cf51a31933447a7a22844325b4da7ff3b3cec37371ea28845aa SHA512 2595b8d59279ad0eb28beb55c4946c1848a7ab86fb8fff6e17a9ac085918a7f9f3c226729c5af86b19c860f6b7d2e65dabb754601df9e92073d88858435d871e
 EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
 MISC metadata.xml 430 BLAKE2B 6b143a506671795115d2b676cd50050b856f54cb93569d7c4892d620b742c9f2c0cceea268e9438b20854a73d7c7a157d78b353e17a595302c21c3d2c52b55cd SHA512 59dc2bf8f8df13626f1b48600ebfa1f9d14fad03efe8e0512f9db5b1928d98ccee16182ade4567f49764f69bb4004747d6746a1e966ef6d1feeb88bf0be766d4
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210327.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210327.ebuild
deleted file mode 100644
index 7832d997ae67..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210327.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 cmake
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="75b30a659c8a4979104986652c54cc421fc51129"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210526.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210526.ebuild
index 0d082617b74f..f298084e3bba 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210526.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210526.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index b212213eafb9..02d4e7a50538 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,8 +1,4 @@
-DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2
-DIST spirv-tools-2021.0_pre20210327.tar.gz 2591201 BLAKE2B e850bb2ccdd83bbd618ded22df8553c6e977e65ef623e881ec5b4dc15c3646a2c679dbf2a41166ddc98b75aa73a3404a870cd6fac577197c21623c97e7f07192 SHA512 56c206bf62d45a2341272612f979f9ef9bb933185e2f2852a39367dfb68f6647662d8995dfb9067e71b04cd76d2da0789346335dbabd7258406d96627f689e96
 DIST spirv-tools-2021.1.tar.gz 2613619 BLAKE2B ab5816e3407ba827f5db69cb391b0e4820661aa7367edfc5a9a41cb9fee98a7e814f765d99548cdab1a11869f79710e6243f2c97ec3ee4f6a919990dc24e63dd SHA512 74be4ecb3f6926cebdbfdc2351e3d3e0db18a8a312ce12882442d4e33737f9ccfb0ec6e1f5cd6bb5604525467605c080a8494b4aef6dd797dc805e12bc10226f
-EBUILD spirv-tools-2020.6.ebuild 1197 BLAKE2B 05ac606f25f2bfd1280ba5c19574628578046b033a9f01b2c939c7e2d1e55d0386ba71db94d988e8689cd8b20bd8f427ccb2f8259f17b7352e770d44aa337238 SHA512 bf598004767b75ee52149e7e2cb90e949c10284e3e0053bfd06de3ad69ad19cfee608f24b11eaf46345ed07d21239cc601f5e6984e82c738de6157a077d15a66
-EBUILD spirv-tools-2021.0_pre20210327.ebuild 1243 BLAKE2B 81b3d871bbb9b6cea243057ee94379cfb24ae80fe6b53586d0929d40634e8bfdca891c1f793319cfefcc11334ae8dfb2cefe5b5f0e7d5ed6cdc096d22a7bd848 SHA512 016926e221828e62db8c27539e94fc4368cb21cf5db3262f5e73f9d692c06b257b4bd9c815080cd428d8641d633fc137aab5aeec7418ecf77cfbdec0ec21516a
-EBUILD spirv-tools-2021.1.ebuild 1260 BLAKE2B 3769f033a8d70dbba1c022f33b73ac530607ec05f5df8b5942d86fb5f6a6eb6b90e4b67589f94263cb840e76de7a2ecfc8d8d505336e039ff5122d044e1710db SHA512 ca681cb2f4d05a35dd0a5a9b85d1bd31f82a07f21877c9c9a34ac754cda2f8e713450a9373d94e549b3c0c338787c4bde3fa57406517df693a035ba3a0110d6a
+EBUILD spirv-tools-2021.1.ebuild 1254 BLAKE2B f59d178590ac5c0985abb3698c6a2b7618e6f199fbc5018cac01b2e9f63b73ed87e6f1d05bd5bbfaf6edc929e9ab119e46bfae51573b621c7a7f6a694634b9bc SHA512 6a47a37de6a9b741e37c279f8cd910486b1978ab3e94bb89013d7d30b648e511e90559d1798d95b8a9d1816c18509668e5182125b8e7f790c02a53c99c4f434d
 EBUILD spirv-tools-9999.ebuild 1249 BLAKE2B fff6ed718fed7223911810ad47847230aa3f77c08925893e63e04cd55d4c3486b4e653d26e638a44bce7d9cdce178dff9a01e8b5d99777b245eac9b8563453b3 SHA512 0081fdbc259e420597b3efcd1985cc4e30a963bbc08e49701fb1b7218b092d2af373d510cc484a2e8a1de8e9032f91d0d49272e09f9a5645042bebd9cf278dd1
 MISC metadata.xml 428 BLAKE2B e5ec493782c93cb593d56b58a4f1d8b89dad2b0a11cc5eb2faf6b9cdb898e1097440ad446f0c920c69bd0eddfb9225bf8fce8d3749a03f8e6e5c94cdeea5173a SHA512 a5c873d573590a7c538f96d03bbe66b9a42eaabd5b96bafe8642a9cdde2a27bd067e5e46802ceb76e83160af0e4dd052ecc0b6e8c3b6fda3ee15a2eedf1d8b08
diff --git a/dev-util/spirv-tools/spirv-tools-2020.6.ebuild b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
deleted file mode 100644
index ba1095682791..000000000000
--- a/dev-util/spirv-tools/spirv-tools-2020.6.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
-
-MY_PN=SPIRV-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="${PV}"
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.1"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
-		"-DSPIRV_WERROR=OFF"
-		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
-		"-DBUILD_SHARED_LIBS=ON"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/spirv-tools/spirv-tools-2021.0_pre20210327.ebuild b/dev-util/spirv-tools/spirv-tools-2021.0_pre20210327.ebuild
deleted file mode 100644
index e4fac91f50fb..000000000000
--- a/dev-util/spirv-tools/spirv-tools-2021.0_pre20210327.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
-
-MY_PN=SPIRV-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="1b35745ad1c9a988bc427b976a9a2fe7afd4dada"
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.2_pre20210327"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
-		"-DSPIRV_WERROR=OFF"
-		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
-		"-DBUILD_SHARED_LIBS=ON"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/spirv-tools/spirv-tools-2021.1.ebuild b/dev-util/spirv-tools/spirv-tools-2021.1.ebuild
index 1d32288308fe..782275865502 100644
--- a/dev-util/spirv-tools/spirv-tools-2021.1.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2021.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="c2d5375fa7cc87c93f692e7200d5d974283d4391"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index cb3227d9bba6..f75a9edb0b61 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -3,7 +3,7 @@ DIST strace-5.11.tar.xz 1926632 BLAKE2B df47612c0928466f8b5788c4a7dc74208fe76c69
 DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
 DIST strace-5.13.tar.xz 2040116 BLAKE2B a604342d68f504b42ff1cb4918aa9ced6575f589caeb62f53e0b125f24cfaf0423f1911f352f21ecea0d702197d65edc85d3e97ffca3561f619f9c4c80386cdc SHA512 ba8b0eae396fa2b762bf17cbcdcd84b0660b2a5d5e7e9caf098ef3414a87fd28d4140dd10136483f35904560e5044e40be2bf6117462868a360306d62887c8ed
 EBUILD strace-5.11.ebuild 2348 BLAKE2B 59a4676d944dc05b012d9f8b47da68b3d23f95d996dd25ccdb9aab5cda3c3cb950c1ab000aa9536df55b4ee9e59bb4f42bf865f42b295c15cd75655ffcdfc918 SHA512 00c1828d50d7b02ca56f586eb2c3187f9ccddfe38b71a230304a9e111d6d7fe7119da38ff9a4998a4cc6393971874ea6ce699dfc8ae5291f038aca762533084c
-EBUILD strace-5.12.ebuild 2349 BLAKE2B 73bb5914368cdfd725239cd4d7f25a7169826de3b403b52dacfd2183a113cdd26cb6e3e705bb80f66334930ddbede5a713e2996992e73be0395ece04c59dc027 SHA512 47f5e603aa0d54babcd19f87e119a0a23043107bd824afc7e2ba9c1f4ae3cc2b00df3aa243a5e0b2a24cc1b5296118b40d4a7fbd5081a308722509ac63bd987d
+EBUILD strace-5.12.ebuild 2348 BLAKE2B 59a4676d944dc05b012d9f8b47da68b3d23f95d996dd25ccdb9aab5cda3c3cb950c1ab000aa9536df55b4ee9e59bb4f42bf865f42b295c15cd75655ffcdfc918 SHA512 00c1828d50d7b02ca56f586eb2c3187f9ccddfe38b71a230304a9e111d6d7fe7119da38ff9a4998a4cc6393971874ea6ce699dfc8ae5291f038aca762533084c
 EBUILD strace-5.13.ebuild 2356 BLAKE2B b065af02da7b5432fec1b1fe5c7389325cbb9526318aef6045c42011a002480b569b122311dc52ae9c76ffa27a732a6de1986e525e840e86535ba5392b3c1598 SHA512 52e62ee4c32480c762a49e85aa81b200b2eb0104794ab8535b9202824f126769f42dc013e805cc58fa03f318682c2c9c2f83b5388d425d0c8ece0e79f2de1f03
 EBUILD strace-9999.ebuild 2356 BLAKE2B b065af02da7b5432fec1b1fe5c7389325cbb9526318aef6045c42011a002480b569b122311dc52ae9c76ffa27a732a6de1986e525e840e86535ba5392b3c1598 SHA512 52e62ee4c32480c762a49e85aa81b200b2eb0104794ab8535b9202824f126769f42dc013e805cc58fa03f318682c2c9c2f83b5388d425d0c8ece0e79f2de1f03
 MISC metadata.xml 760 BLAKE2B 05d51ee681a1103d9619582b1f7788c1c0f2ff180b55fd26cbed2f5aea52cae0e9333ae31fc93a90f8c33798f5caeaf6bc1039cac9a023f114c79c71abfb8480 SHA512 3a7445fe5210eaf6c98ed5193f3e79567e6e815e295671669c2894f3f53a2decd5f2b4db5c87e85cf8b71cc4743fc94cc4a800fb33493c5f99f40ec83b6e57b3
diff --git a/dev-util/strace/strace-5.12.ebuild b/dev-util/strace/strace-5.12.ebuild
index f0b5ca9851ff..d71516e9a04d 100644
--- a/dev-util/strace/strace-5.12.ebuild
+++ b/dev-util/strace/strace-5.12.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 7b52e44f9286..831bb9d1ed70 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -2,5 +2,5 @@ AUX umockdev-0.12.1-preload-Declare-__xstat-prototypes-for-glibc-2.32.90.patch 1
 DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
 DIST umockdev-0.16.1.tar.xz 478308 BLAKE2B 3d49ca1d9c9b7573ac63f5f7ecd81071041597732b507619c333379095434ac55eb26f16bdf5897b94bbeb5c307a34b703accd220cd6202482e172dd3a6d1983 SHA512 baeaf05cc6b8d8e2a5cae16b808db759a18a969cea0f2ceed5f6c2521edc0c4c07dc16265a4821051de51f4314fd39d63ebf2da124fcd3e103ec743dadfedaa8
 EBUILD umockdev-0.12.1.ebuild 1304 BLAKE2B 35be39188381c08265e988b7dfc58b6b1f48b57ddb9b8d253513b37e592239d53e0e3b3a7561767336a4910505c47d4db2bba5bcb9d8472b63395d748275e8f6 SHA512 68943daec6ca268b1cc2069286fd4432cdb036c161e4b6a19c1de935a8f28414db30edc854fa87cfc04523c494886d4dc2c86f296f6e8209eee9deb13faf0dbe
-EBUILD umockdev-0.16.1-r1.ebuild 1108 BLAKE2B 1d1c0929beffe47d7752f8da835a3a8fb49ac5fba252afe918f34496632cee0fbf44977d38361d7cec53e284020bebe3b26440432cac35989931635b1bd0639b SHA512 4bb6f364395e19786b547506d57fb31a5b62ad539816c9cee5a3e528e15f0ca401adb23012a2a1414f6f653a0d19550a277d16c3ff54c762ca36670b5b40f635
+EBUILD umockdev-0.16.1-r1.ebuild 1120 BLAKE2B 3f5741100f7d394377b688a6bf22aa9c122461e7ede33dd2752996fb554490600d475ea620168903e042ce2c222dec81d9f2d560ed0dcc89d5bfdd83dee0ff30 SHA512 6bfcd02f109a149ce43025c964d397e74c2fe1ca679a675bfb06fed3afaf9391157fa32a02ebc56e4d8d7cee471b37ec0eb55401cc87df67a913b0b24f5b8377
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
index 40ff4e8639d2..d2985fd47ed8 100644
--- a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
+++ b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson-multilib python-any-r1 vala
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/unifdef/Manifest b/dev-util/unifdef/Manifest
index dde250ebde80..2d4327a8c29d 100644
--- a/dev-util/unifdef/Manifest
+++ b/dev-util/unifdef/Manifest
@@ -1,4 +1,4 @@
 AUX unifdef-2.12-tests.patch 677 BLAKE2B 67ea52814b0a993df4f639262332b462f62f38b257a28a97c2a0cc8cd115c41638cfec27ebe0ffab98e99787c8ee3700da33f4d5bed3fb8a3234a6741092a8b5 SHA512 ab8b6dbab6c4122a15551b881e715bd33dff9d500dfffee065851da983bc43331c2cdea56bee6a2b7b45f0b0847cf9c807430f497b1d83f5fb90e1dce83d09f5
 DIST unifdef-2.12.tar.gz 87091 BLAKE2B d14072f79b9d8b17a033c7068a3c6a423c2e66570aac6d232e387ffd256bc66ad3c4c1467b6f101124bf494f2c12c7b8d37c64104623b0022e435a7e5aa78d5a SHA512 9a00f69309578817af5b3a6cf45f293506e8326b520bed7c0ab2f66661e32a115b7f5aa9b0572cfbee5887044e5f0d70967904ec137172e67a1aab5abe09d3b5
 EBUILD unifdef-2.12.ebuild 605 BLAKE2B debe1238d39aa80eeb4f167ac911e74d65eb4668a20920b438b53c56d92b7015e3523bcc1f043442d8edf77d0a5c9b618458b3b806989ab46b916c53f706148d SHA512 dcf2db7b060234cacb53323f3456c10b1b528cf7d66dee7ee80f915b7ae45d14424c7cf19d1dec078bc0733f7af8f9ce5216429a0f7f9d9e30c6223a9536aa7d
-MISC metadata.xml 329 BLAKE2B 3ae4c297a4b6e28d4a79a0f8c0aa65b5dd7888440753103507a3325ac39586d2dea786a34cc41a67cbeddc00a4fb2efacff0cf070bd71b1d6f41f7d77fa32f7f SHA512 5c97ac70928d4e9ef2c4d7a69a26b3e2fe243cdbc1a6dc0ca3401ffe7fb33ed86b02d98524fe30c06fe3daaa6bf6c26de12a0fb10c4d1ee1d70e865488007a2f
+MISC metadata.xml 245 BLAKE2B b7478a40da9137ac51f8e9708af304ba56ec62da0a37ae70041f62f5c446c4b26c71672c0364a8454672956f94c2981c2c60aa628ff5c5ca106a12917664c0e5 SHA512 f9fc0c5854d3f66430fa53ebf787ffc2f19cb098cab9b0c0daaf0e605aa4246f4200550fb4337733e451de817d59f45a3fde7582ce950cf153a11792e2fcd6d2
diff --git a/dev-util/unifdef/metadata.xml b/dev-util/unifdef/metadata.xml
index 56b39065e340..b3e5475cf47c 100644
--- a/dev-util/unifdef/metadata.xml
+++ b/dev-util/unifdef/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">fanf2/unifdef</remote-id>
 	</upstream>
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 6a4ce25ba537..4ae7e7afcde2 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,9 +1,7 @@
 AUX visualvm-r2.conf 1243 BLAKE2B a1e97a1e1ee914620a29bd68580043654304b9cff29edbb700de02473113a7984f3ec910cbff674465ccab6f1deac4da5412ade9a8069918b4acae839ba8d731 SHA512 0f826859bba484e8eae20750e4c3f021ce129cd06dc6c19cf2724b0c2c3d4c68a4370788bdc5cf7e0859348197466382c877c885937c0a87c0e8467944160bf7
 AUX visualvm-r2.sh 423 BLAKE2B cdc5db4465a339735ccff5f37bed89d76da2f2d514f522b7768fa37aad46804997d267285b09d6346674d43964d0ef0a0cadb24d28e9b90256a593d7420aab4a SHA512 eb7356e10a94db048fb471215b2115b93764931ed4178594bca5a1aac480f2262ef361b2f53fc23dbcdb4d44e1aeab678204c50583abb8016696a7d87288a9bb
-DIST visualvm-2.0.6.tar.gz 39086223 BLAKE2B f5657d4ccc0063281226b4d70c35820c78333db5574bae5acadc321938cfe42a3e0e4c1752badcc3e01b5694f6081213f5da898f5a13587d44e36d18fbd5c2c7 SHA512 03ad628f753e31f26217366d8f5f184f4657ba55badd55f1466dbf00cda61e9c320cc8ddb82b228863b9c6416aec3e94a01c5429e2b2f4664c9daaccd02f5d7b
 DIST visualvm-2.0.7.tar.gz 39155599 BLAKE2B 8a460cb161357114d829d41a7e4b2306e9e0023a6995aceed89cc12fc0b54d5e05402bc1b8c72d4cb3caba5a4844bfbebb4734d7f7c5663343dfb3bd4470945a SHA512 d75217fb1b2a8c4d1c44b600dc42d488be8447fc569f78c10c59954c7c64f8e1ccdeef2e6a7936e7708b9392bbd7634d7149c6d6cc797df1f0036c6c473398ff
 DIST visualvm-2.1.tar.gz 37175908 BLAKE2B 2bc435b09af9061122eb62a8de4b4b9ce47bb8cc2b7e2bfba57767bee380f6db041ec758a54f5a90e21d9ee3a5e6db5af8c0f89fc347d8e49322caeb07db4233 SHA512 ae662df96224a366c54210b85d6a859fd7412ea6ebbbb4d6a5e6b1a75c04a8060ac08a524d8e58aa9a037ecebf7ada142d9633db389cd5332742a21d26e5ed17
-EBUILD visualvm-2.0.6.ebuild 1903 BLAKE2B 612e393a06c26225c1f0e76925dfc447d41e7843e63b26a0019126f674b4a09b418fa10dd7b1b8471000b1573fd211e8ea778b08fd55ac986cc48ea34eddc83e SHA512 8123f7999a45111a745f7e8e38fde858d7af3cea4032c8d72cd3e46e91d412c128b2541082960fb212f45592aaabfbdf08c9e14083b8c463f7b9635d6a85d0df
-EBUILD visualvm-2.0.7.ebuild 1904 BLAKE2B 302b2318c8f5be891333ff791de2834a47f2c1a67225a1837c181190c55008ea03e5ad96c8766b6a0d738f47dc9ecd5398b72391bff572de68dfe5d5843b1b92 SHA512 c4c921215285343094f8e31faf4b3cde7bfca6e77e23b2fad60e91ebf0e098626b160f47fcc50faf12b9ae7b796cbbe31a50b5389af8fbe6c757a93200942bf9
+EBUILD visualvm-2.0.7.ebuild 1903 BLAKE2B 612e393a06c26225c1f0e76925dfc447d41e7843e63b26a0019126f674b4a09b418fa10dd7b1b8471000b1573fd211e8ea778b08fd55ac986cc48ea34eddc83e SHA512 8123f7999a45111a745f7e8e38fde858d7af3cea4032c8d72cd3e46e91d412c128b2541082960fb212f45592aaabfbdf08c9e14083b8c463f7b9635d6a85d0df
 EBUILD visualvm-2.1.ebuild 2347 BLAKE2B 8a095af10ab1e2020e23b95e09721e67afbcd33419387394c4155a50d0dc9dee5237082c2d2e6fe198c9325611ce8251cbf4fa8d9e63cc42bf639f459001220e SHA512 12bc18fad16a35bced42e2104a36975870d2efb79b689c127c7536a7d8e3aeb70963c019bcb59f70180dad5524e1c39ddb8fd783915cb4c2f9121ed9369fc0f9
 MISC metadata.xml 316 BLAKE2B ad191b52b75273728dec1af289e8df2ee7d538cde7dd30b2c8facd2623a6984de090356891a9e9f992d99da4bff9ae48be15bc7257987e8b6419fe8beaa979d9 SHA512 46972dae3e0d778f11af43101b50944f9edd850d1e7eecca9f5bf08c4db438dd53415348f61b85f37f788435410867e61bb516960d4ceb6edb8e88fde71cb243
diff --git a/dev-util/visualvm/visualvm-2.0.6.ebuild b/dev-util/visualvm/visualvm-2.0.6.ebuild
deleted file mode 100644
index 001ed43cc6e0..000000000000
--- a/dev-util/visualvm/visualvm-2.0.6.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
-
-NBV=113
-NBT=27102020
-NBZ=nb${NBV}_platform_${NBT}.zip
-
-inherit java-pkg-2 java-ant-2 desktop
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
-HOMEPAGE="https://visualvm.github.io"
-
-# Netbeans plattform is already included in the main archive this time
-#    SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-#       https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-# it does not compile with java 11
-DEPEND="
-	virtual/jdk:1.8"
-
-S="${WORKDIR}/${P}/${PN}"
-
-QA_PREBUILT="
-	/usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so
-	/usr/share/visualvm/cluster/lib/deployed/jdk1[56]/linux-amd64/libprofilerinterface.so
-"
-
-EANT_BUILD_TARGET=build
-INSTALL_DIR=/usr/share/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	# unpack ${NBZ}
-	unpack "${S}"/"${NBZ}"  # archive is included in the main archive
-}
-
-src_prepare() {
-	default
-
-	# Remove unneeded binaries
-	rm -rv netbeans/platform/lib/*.{dll,exe} \
-		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
-	find libs.profiler/lib.profiler/release/lib/deployed/jdk1? -mindepth 1 \
-		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
-}
-
-src_install() {
-	# this is the visualvm cluster
-	insinto ${INSTALL_DIR}
-	doins -r build/cluster netbeans/{harness,platform}
-
-	# configuration file that can be used to tweak visualvm startup parameters
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}-r2.conf ${PN}.conf
-
-	# visualvm runtime script
-	newbin "${FILESDIR}"/${PN}-r2.sh ${PN}
-
-	# makes visualvm entry
-	make_desktop_entry ${PN} VisualVM java "Development;Java;"
-}
diff --git a/dev-util/visualvm/visualvm-2.0.7.ebuild b/dev-util/visualvm/visualvm-2.0.7.ebuild
index e132e704c5ce..001ed43cc6e0 100644
--- a/dev-util/visualvm/visualvm-2.0.7.ebuild
+++ b/dev-util/visualvm/visualvm-2.0.7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="7"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=virtual/jre-1.8"
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index faff9424edbb..d90664288240 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,10 +1,4 @@
-DIST vulkan-headers-1.2.162.tar.gz 852973 BLAKE2B 3907c247f115f4dee2fc8697f157aeb30a3ef91a774132591771c0b327090abf7c0caad2082edb86c787883c167ce1ffe75c199d9b94fc642aae30526f5311cd SHA512 7b33f6ef32f1ef34d3b37ad38b077a3a2ebcef62612371afa1b6f4910815bbab8418a837c49b3872b57d2e5012c15623521121f5d62836e46d6f20773841d7b0
-DIST vulkan-headers-1.2.170.tar.gz 890902 BLAKE2B a38fa355e1716940f2bd34b4ac7e90ef95bf85da13b19e6408b488051441c20f9618e044d72ca06e1906851bb54b3087e894d6aeeb786a8dd028885f08d485ba SHA512 458e69f34776eb032ef9024744b34083c2a5e3dd074d511a3076d6be61a03dbe1383e6588979e700099a13a6411a72eaba97df9f0968b0b98e85049bc62a1c73
-DIST vulkan-headers-1.2.179.tar.gz 1048047 BLAKE2B 7ffdbc12e9bd3f1f37598620c03989a7e70d98af8c42c660ab52478857fbe32a215ca1fba2b43ff25fe1c61f4c09d439ab353d6ba2a4044894219eee4e9cc981 SHA512 c82ae0de40c19db97c385fe3012beb6018f57d96f8bfa5829c77416730fdbffdb03aaaa96710a3a52d3b3e03d86a5089383f504a86d7cb3fa7ee61077dad3ee7
 DIST vulkan-headers-1.2.182.tar.gz 1162517 BLAKE2B 0dd396dde2cea94529b99a079cb082d01b4223cd1a63a4bff6405f882b95d896080d62ebfe34365ee104de8530ceaaba6f889443a813926838c82db9938d5ee0 SHA512 045091ad94d335fb4743fb033ca581a5c128b23633d61dc403bddfef8f88b6ae86afff628b2f2f333ee5edfb0f6f68f060e2402d27d5ab53eaed850a16de8782
-EBUILD vulkan-headers-1.2.162.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
-EBUILD vulkan-headers-1.2.170.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
-EBUILD vulkan-headers-1.2.179.ebuild 617 BLAKE2B de17fc55658dff792497262a77db71dbc9a360c6a35497522a7681452bf52398f90435bf6738477f09fa4cc1fcf96c3785ed6b222d9d7a5bb4ff257778dc63eb SHA512 9396dd22eee89217748990fcd336163561244de835947edc5ab6028b63ab16666c9ce28fb737563d572891de036bf3b435b68f6a89191bd2f97b12575af1b80e
-EBUILD vulkan-headers-1.2.182.ebuild 617 BLAKE2B de17fc55658dff792497262a77db71dbc9a360c6a35497522a7681452bf52398f90435bf6738477f09fa4cc1fcf96c3785ed6b222d9d7a5bb4ff257778dc63eb SHA512 9396dd22eee89217748990fcd336163561244de835947edc5ab6028b63ab16666c9ce28fb737563d572891de036bf3b435b68f6a89191bd2f97b12575af1b80e
+EBUILD vulkan-headers-1.2.182.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
 EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
 MISC metadata.xml 431 BLAKE2B 69dedef8b74edc3fa3b45eb8af40784b585f84007d205c4db52c3d05abccb20e7c078708f3bcedcc8dac268eced84c03b0bf92cd836ee7a9f2dda01b1c87a65d SHA512 88631011f2fc130495c8a9feeb24691389bfac96a8db4b1bc4b5503e354f0fa882a516ba1af7bcf72d7604c8974ab72a2189c8cd7feddefaaaada54cb405898d
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
deleted file mode 100644
index 482f4914180d..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Headers
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.170.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.170.ebuild
deleted file mode 100644
index 482f4914180d..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.170.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Headers
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.179.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.179.ebuild
deleted file mode 100644
index 9eea670b13dc..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.179.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Headers
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.182.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.182.ebuild
index 9eea670b13dc..482f4914180d 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.182.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.182.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 09a89e7e37b9..29d27390c78c 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,10 +1,4 @@
-DIST vulkan-tools-1.2.162.tar.gz 724232 BLAKE2B 16eb2dde35883fb2c7c263a72a615818ff8e1557ac9d74553ec3784d96a827e6900efa4e42218cb9081f7501d9b1a53eac82c360c2d20922043308515ab48983 SHA512 7827f6775dfb26820a2a2cbc60e7da8c7e7bdcb57b65523fbc6b2e989ae6869b04a57ae458c72715722c67d842660574697834c92f9b909dd5673da1945ac6dc
-DIST vulkan-tools-1.2.170.tar.gz 835063 BLAKE2B 5b7b9c9ea07b3a25d2b989a0981417b4a1c4f97d03fc9f1ab765ac2ade3bd33e99657813a3cb6b3290559539cd9dca3d6992cacf848c0ea9eee536eeef99553f SHA512 0cc361c1a7cecf74dab25e6a4bead7870a0cf363b07a6e5fbd6fa245027fb8e4f2b651affda095fadad90e114507c4f80370c2fcb4e6b9cbc013eac8a67d2d6b
-DIST vulkan-tools-1.2.179.tar.gz 843725 BLAKE2B 0304f7672b5405404dca9b9800dd0927f3af0f17580f021bc30e651ecda5b5e6194971a6a95e30cce956d094cc8fbab580f0f0ecd8fa4c81a9bc15ced5ad92ac SHA512 227b5023c21720c94fb5583f0f6635cf2b9d8067cae02dc6f22f39a106bc0b3e569b2730a1dc4fd469fe0a5e5653167fdc56fe37852a1acfc38df953b4524dcc
 DIST vulkan-tools-1.2.182.tar.gz 847991 BLAKE2B 5ab9d73383338bcc3c54487f0f433466d9974269d3be2aa0d50281affeee8fb94414eb638fc94be6fd2dc059c0a2d3dca4e9a8caf3e2b8758c03c57373e2f73b SHA512 5cc9500923288641529556e82a708b88f7dc775c75166d10ae2a807562ce9dda3993aa01a261ff4f9c2cc31ea47423a12f21ec64d32e6aee66ef7c3fc2dc17fc
-EBUILD vulkan-tools-1.2.162.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
-EBUILD vulkan-tools-1.2.170.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
-EBUILD vulkan-tools-1.2.179.ebuild 1865 BLAKE2B d1666ff63c8fc969109848012d01ca40071995b98fda6203c5663a9cc4443d4f452272837a1c1aafc74646e95a78057971ddbeb4633f1d13158108fb297e16b3 SHA512 abe5dcc70239e8d31d31412a8beed52c8c3dfcd03889857e8ae91923f16435fc413fdda9aa5137f4b7801ab2deb0f6b94c3aea6e0f53c8cf33b32eae127bda70
-EBUILD vulkan-tools-1.2.182.ebuild 1865 BLAKE2B d1666ff63c8fc969109848012d01ca40071995b98fda6203c5663a9cc4443d4f452272837a1c1aafc74646e95a78057971ddbeb4633f1d13158108fb297e16b3 SHA512 abe5dcc70239e8d31d31412a8beed52c8c3dfcd03889857e8ae91923f16435fc413fdda9aa5137f4b7801ab2deb0f6b94c3aea6e0f53c8cf33b32eae127bda70
+EBUILD vulkan-tools-1.2.182.ebuild 1860 BLAKE2B 3e3f89a5c3f26601333dc91a3532638d08bb15023f2cf487dd075f300245fbbe109b7b84f4046af3972132504d41a8f8bcb82c03bc8c24f9ad0c738d456beab7 SHA512 ad5a23b0a5e4375d80f0d5f912daceff89992c563ba29858f8ddd9b5b3a34a5c3570a80d57617493662b76aa0033027849b0908f463ac88aed55715c91860c9e
 EBUILD vulkan-tools-9999.ebuild 1860 BLAKE2B 90d45eff50aecafa4f59ddfcfe22919ad54c32d75f8d1c398cc91286ce092a32bfe34c168f29355b51284226f04879f3de7b236770dc8f4e4599b0466ad22cdf SHA512 ae072450e257f0766f657be7bcad7180679eed3983858284fe649e59f9acdc2039cf6f23f146aa67c542d7576caae9b564d9f31b88fd4db034a541ce9a552b15
 MISC metadata.xml 499 BLAKE2B 9ede9725de281e0877f865e41ce68be15d5c04fd95023d3ab1180f4987c506a8f12ad23412ecf5795f6f8e6f36e576bc65f7cef786ced70296f5a4a8584ac4f1 SHA512 eb5dbcfbb58449c5a6ae7580f0c8a25c06f85fd6ac32fe1354fffe550214465921dace3c05264c11517d7dbeeffa444eb468d63f4781c6383f4be8a4202ecefd
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild
deleted file mode 100644
index 6a7567745c07..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.162.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
-
-MY_PN=Vulkan-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cube wayland +X"
-
-# Cube demo only supports one window system at a time
-REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )"
-
-BDEPEND="${PYTHON_DEPS}
-	>=dev-util/cmake-3.10.2
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	>=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/vulkan-headers-${PV}
-"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/vulkaninfo
-	)
-
-	use cube && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube
-		/usr/bin/vkcubepp
-	)
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_VULKANINFO=ON
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
-	)
-
-	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
-		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.170.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.170.ebuild
deleted file mode 100644
index 6a7567745c07..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.170.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
-
-MY_PN=Vulkan-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cube wayland +X"
-
-# Cube demo only supports one window system at a time
-REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )"
-
-BDEPEND="${PYTHON_DEPS}
-	>=dev-util/cmake-3.10.2
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	>=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/vulkan-headers-${PV}
-"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/vulkaninfo
-	)
-
-	use cube && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube
-		/usr/bin/vkcubepp
-	)
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_VULKANINFO=ON
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
-	)
-
-	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
-		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
deleted file mode 100644
index fd88aef18326..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.179.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
-
-MY_PN=Vulkan-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8,9} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cube wayland +X"
-
-# Cube demo only supports one window system at a time
-REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
-
-BDEPEND="${PYTHON_DEPS}
-	>=dev-util/cmake-3.10.2
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	>=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/vulkan-headers-${PV}
-"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/vulkaninfo
-	)
-
-	use cube && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube
-		/usr/bin/vkcubepp
-	)
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_VULKANINFO=ON
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-
-	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
-		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.182.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.182.ebuild
index fd88aef18326..cf753a5558a8 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.182.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.182.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 33602b0f9ac2..7abd1623848d 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
index 5c4a420ee06e..2130e2e34914 100644
--- a/eclass/check-reqs.eclass
+++ b/eclass/check-reqs.eclass
@@ -7,8 +7,8 @@
 # @AUTHOR:
 # Bo Ørsted Andresen <zlin@gentoo.org>
 # Original Author: Ciaran McCreesh <ciaranm@gentoo.org>
-# @SUPPORTED_EAPIS: 4 5 6 7
-# @BLURB: Provides a uniform way of handling ebuild which have very high build requirements
+# @SUPPORTED_EAPIS: 6 7 8
+# @BLURB: Provides a uniform way of handling ebuilds with very high build requirements
 # @DESCRIPTION:
 # This eclass provides a uniform way of handling ebuilds which have very high
 # build requirements in terms of memory or disk space. It provides a function
@@ -38,14 +38,22 @@
 # These checks should probably mostly work on non-Linux, and they should
 # probably degrade gracefully if they don't. Probably.
 
-if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then
+case ${EAPI} in
+	6|7|8) ;;
+	*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
+esac
+
+EXPORT_FUNCTIONS pkg_pretend pkg_setup
+
+if [[ ! ${_CHECK_REQS_ECLASS} ]]; then
+_CHECK_REQS_ECLASS=1
 
 # @ECLASS-VARIABLE: CHECKREQS_MEMORY
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # How much RAM is needed? Eg.: CHECKREQS_MEMORY=15M
 
-# @ECLASS-VARIABLE:  CHECKREQS_DISK_BUILD
+# @ECLASS-VARIABLE: CHECKREQS_DISK_BUILD
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # How much diskspace is needed to build the package? Eg.: CHECKREQS_DISK_BUILD=2T
@@ -60,19 +68,13 @@ if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then
 # @DESCRIPTION:
 # How much space is needed in /var? Eg.: CHECKREQS_DISK_VAR=3000M
 
-case ${EAPI:-0} in
-	4|5|6|7) ;;
-	*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
-esac
-
-EXPORT_FUNCTIONS pkg_pretend pkg_setup
-
-# Obsolete function executing all the checks and printing out results
-check_reqs() {
-	eerror "Package calling old ${FUNCNAME} function."
-	eerror "It should call check-reqs_pkg_pretend and check-reqs_pkg_setup."
-	die "${FUNCNAME} is banned"
-}
+# @ECLASS-VARIABLE: CHECKREQS_DONOTHING
+# @USER_VARIABLE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Do not error out in _check-reqs_output if requirements are not met.
+# This is a user flag and should under _no circumstances_ be set in the ebuild.
+[[ -n ${I_KNOW_WHAT_I_AM_DOING} ]] && CHECKREQS_DONOTHING=1
 
 # @FUNCTION: check-reqs_pkg_setup
 # @DESCRIPTION:
@@ -82,9 +84,9 @@ check_reqs() {
 check-reqs_pkg_setup() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	check-reqs_prepare
-	check-reqs_run
-	check-reqs_output
+	_check-reqs_prepare
+	_check-reqs_run
+	_check-reqs_output
 }
 
 # @FUNCTION: check-reqs_pkg_pretend
@@ -101,6 +103,16 @@ check-reqs_pkg_pretend() {
 # @DESCRIPTION:
 # Internal function that checks the variables that should be defined.
 check-reqs_prepare() {
+	[[ ${EAPI} == [67] ]] ||
+		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
+	_check-reqs_prepare "$@"
+}
+
+# @FUNCTION: _check-reqs_prepare
+# @INTERNAL
+# @DESCRIPTION:
+# Internal function that checks the variables that should be defined.
+_check-reqs_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ -z ${CHECKREQS_MEMORY} &&
@@ -118,6 +130,16 @@ check-reqs_prepare() {
 # @DESCRIPTION:
 # Internal function that runs the check based on variable settings.
 check-reqs_run() {
+	[[ ${EAPI} == [67] ]] ||
+		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
+	_check-reqs_run "$@"
+}
+
+# @FUNCTION: _check-reqs_run
+# @INTERNAL
+# @DESCRIPTION:
+# Internal function that runs the check based on variable settings.
+_check-reqs_run() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	# some people are *censored*
@@ -125,23 +147,23 @@ check-reqs_run() {
 
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		[[ -n ${CHECKREQS_MEMORY} ]] && \
-			check-reqs_memory \
+			_check-reqs_memory \
 				${CHECKREQS_MEMORY}
 
 		[[ -n ${CHECKREQS_DISK_BUILD} ]] && \
-			check-reqs_disk \
+			_check-reqs_disk \
 				"${T}" \
 				"${CHECKREQS_DISK_BUILD}"
 	fi
 
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		[[ -n ${CHECKREQS_DISK_USR} ]] && \
-			check-reqs_disk \
+			_check-reqs_disk \
 				"${EROOT%/}/usr" \
 				"${CHECKREQS_DISK_USR}"
 
 		[[ -n ${CHECKREQS_DISK_VAR} ]] && \
-			check-reqs_disk \
+			_check-reqs_disk \
 				"${EROOT%/}/var" \
 				"${CHECKREQS_DISK_VAR}"
 	fi
@@ -153,6 +175,17 @@ check-reqs_run() {
 # Internal function that returns number in KiB.
 # Returns 1024**2 for 1G or 1024**3 for 1T.
 check-reqs_get_kibibytes() {
+	[[ ${EAPI} == [67] ]] ||
+		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
+	_check-reqs_get_kibibytes "$@"
+}
+
+# @FUNCTION: _check-reqs_get_kibibytes
+# @INTERNAL
+# @DESCRIPTION:
+# Internal function that returns number in KiB.
+# Returns 1024**2 for 1G or 1024**3 for 1T.
+_check-reqs_get_kibibytes() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ -z ${1} ]] && die "Usage: ${FUNCNAME} [size]"
@@ -176,6 +209,17 @@ check-reqs_get_kibibytes() {
 # Internal function that returns the numerical value without the unit.
 # Returns "1" for "1G" or "150" for "150T".
 check-reqs_get_number() {
+	[[ ${EAPI} == [67] ]] ||
+		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
+	_check-reqs_get_number "$@"
+}
+
+# @FUNCTION: _check-reqs_get_number
+# @INTERNAL
+# @DESCRIPTION:
+# Internal function that returns the numerical value without the unit.
+# Returns "1" for "1G" or "150" for "150T".
+_check-reqs_get_number() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ -z ${1} ]] && die "Usage: ${FUNCNAME} [size]"
@@ -192,6 +236,17 @@ check-reqs_get_number() {
 # Internal function that returns the unit without the numerical value.
 # Returns "GiB" for "1G" or "TiB" for "150T".
 check-reqs_get_unit() {
+	[[ ${EAPI} == [67] ]] ||
+		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
+	_check-reqs_get_unit "$@"
+}
+
+# @FUNCTION: _check-reqs_get_unit
+# @INTERNAL
+# @DESCRIPTION:
+# Internal function that returns the unit without the numerical value.
+# Returns "GiB" for "1G" or "TiB" for "150T".
+_check-reqs_get_unit() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ -z ${1} ]] && die "Usage: ${FUNCNAME} [size]"
@@ -214,11 +269,22 @@ check-reqs_get_unit() {
 # Internal function that prints the warning and dies if required based on
 # the test results.
 check-reqs_output() {
+	[[ ${EAPI} == [67] ]] ||
+		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
+	_check-reqs_get_unit "$@"
+}
+
+# @FUNCTION: _check-reqs_output
+# @INTERNAL
+# @DESCRIPTION:
+# Internal function that prints the warning and dies if required based on
+# the test results.
+_check-reqs_output() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	local msg="ewarn"
 
-	[[ ${EBUILD_PHASE} == "pretend" && -z ${I_KNOW_WHAT_I_AM_DOING} ]] && msg="eerror"
+	[[ ${EBUILD_PHASE} == "pretend" && -z ${CHECKREQS_DONOTHING} ]] && msg="eerror"
 	if [[ -n ${CHECKREQS_FAILED} ]]; then
 		${msg}
 		${msg} "Space constraints set in the ebuild were not met!"
@@ -226,7 +292,7 @@ check-reqs_output() {
 		${msg} "as per failed tests."
 		${msg}
 
-		[[ ${EBUILD_PHASE} == "pretend" && -z ${I_KNOW_WHAT_I_AM_DOING} ]] && \
+		[[ ${EBUILD_PHASE} == "pretend" && -z ${CHECKREQS_DONOTHING} ]] && \
 			die "Build requirements not met!"
 	fi
 }
@@ -236,6 +302,16 @@ check-reqs_output() {
 # @DESCRIPTION:
 # Internal function that checks size of RAM.
 check-reqs_memory() {
+	[[ ${EAPI} == [67] ]] ||
+		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
+	_check-reqs_memory "$@"
+}
+
+# @FUNCTION: _check-reqs_memory
+# @INTERNAL
+# @DESCRIPTION:
+# Internal function that checks size of RAM.
+_check-reqs_memory() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ -z ${1} ]] && die "Usage: ${FUNCNAME} [size]"
@@ -244,7 +320,7 @@ check-reqs_memory() {
 	local actual_memory
 	local actual_swap
 
-	check-reqs_start_phase \
+	_check-reqs_start_phase \
 		${size} \
 		"RAM"
 
@@ -260,17 +336,17 @@ check-reqs_memory() {
 			| sed -e 's/^[^:=]*[:=][[:space:]]*//')
 	fi
 	if [[ -n ${actual_memory} ]] ; then
-		if [[ ${actual_memory} -ge $(check-reqs_get_kibibytes ${size}) ]] ; then
+		if [[ ${actual_memory} -ge $(_check-reqs_get_kibibytes ${size}) ]] ; then
 			eend 0
 		elif [[ -n ${actual_swap} && $((${actual_memory} + ${actual_swap})) \
-				-ge $(check-reqs_get_kibibytes ${size}) ]] ; then
+				-ge $(_check-reqs_get_kibibytes ${size}) ]] ; then
 			ewarn "Amount of main memory is insufficient, but amount"
 			ewarn "of main memory combined with swap is sufficient."
 			ewarn "Build process may make computer very slow!"
 			eend 0
 		else
 			eend 1
-			check-reqs_unsatisfied \
+			_check-reqs_unsatisfied \
 				${size} \
 				"RAM"
 		fi
@@ -285,6 +361,16 @@ check-reqs_memory() {
 # @DESCRIPTION:
 # Internal function that checks space on the harddrive.
 check-reqs_disk() {
+	[[ ${EAPI} == [67] ]] ||
+		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
+	_check-reqs_disk "$@"
+}
+
+# @FUNCTION: _check-reqs_disk
+# @INTERNAL
+# @DESCRIPTION:
+# Internal function that checks space on the harddrive.
+_check-reqs_disk() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ -z ${2} ]] && die "Usage: ${FUNCNAME} [path] [size]"
@@ -293,16 +379,16 @@ check-reqs_disk() {
 	local size=${2}
 	local space_kbi
 
-	check-reqs_start_phase \
+	_check-reqs_start_phase \
 		${size} \
 		"disk space at \"${path}\""
 
 	space_kbi=$(df -Pk "${1}" 2>/dev/null | awk 'FNR == 2 {print $4}')
 
 	if [[ $? == 0 && -n ${space_kbi} ]] ; then
-		if [[ ${space_kbi} -lt $(check-reqs_get_kibibytes ${size}) ]] ; then
+		if [[ ${space_kbi} -lt $(_check-reqs_get_kibibytes ${size}) ]] ; then
 			eend 1
-			check-reqs_unsatisfied \
+			_check-reqs_unsatisfied \
 				${size} \
 				"disk space at \"${path}\""
 		else
@@ -319,13 +405,23 @@ check-reqs_disk() {
 # @DESCRIPTION:
 # Internal function that inform about started check
 check-reqs_start_phase() {
+	[[ ${EAPI} == [67] ]] ||
+		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
+	_check-reqs_start_phase "$@"
+}
+
+# @FUNCTION: _check-reqs_start_phase
+# @INTERNAL
+# @DESCRIPTION:
+# Internal function that inform about started check
+_check-reqs_start_phase() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ -z ${2} ]] && die "Usage: ${FUNCNAME} [size] [location]"
 
 	local size=${1}
 	local location=${2}
-	local sizeunit="$(check-reqs_get_number ${size}) $(check-reqs_get_unit ${size})"
+	local sizeunit="$(_check-reqs_get_number ${size}) $(_check-reqs_get_unit ${size})"
 
 	ebegin "Checking for at least ${sizeunit} ${location}"
 }
@@ -333,10 +429,22 @@ check-reqs_start_phase() {
 # @FUNCTION: check-reqs_unsatisfied
 # @INTERNAL
 # @DESCRIPTION:
-# Internal function that inform about check result.
+# Internal function that informs about check result.
 # It has different output between pretend and setup phase,
 # where in pretend phase it is fatal.
 check-reqs_unsatisfied() {
+	[[ ${EAPI} == [67] ]] ||
+		die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}."
+	_check-reqs_unsatisfied "$@"
+}
+
+# @FUNCTION: _check-reqs_unsatisfied
+# @INTERNAL
+# @DESCRIPTION:
+# Internal function that informs about check result.
+# It has different output between pretend and setup phase,
+# where in pretend phase it is fatal.
+_check-reqs_unsatisfied() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	[[ -z ${2} ]] && die "Usage: ${FUNCNAME} [size] [location]"
@@ -344,9 +452,9 @@ check-reqs_unsatisfied() {
 	local msg="ewarn"
 	local size=${1}
 	local location=${2}
-	local sizeunit="$(check-reqs_get_number ${size}) $(check-reqs_get_unit ${size})"
+	local sizeunit="$(_check-reqs_get_number ${size}) $(_check-reqs_get_unit ${size})"
 
-	[[ ${EBUILD_PHASE} == "pretend" && -z ${I_KNOW_WHAT_I_AM_DOING} ]] && msg="eerror"
+	[[ ${EBUILD_PHASE} == "pretend" && -z ${CHECKREQS_DONOTHING} ]] && msg="eerror"
 	${msg} "There is NOT at least ${sizeunit} ${location}"
 
 	# @ECLASS-VARIABLE: CHECKREQS_FAILED
@@ -357,5 +465,4 @@ check-reqs_unsatisfied() {
 	CHECKREQS_FAILED="true"
 }
 
-_CHECK_REQS_ECLASS_=1
 fi
diff --git a/eclass/optfeature.eclass b/eclass/optfeature.eclass
index 8fc346c3ac6a..f9870e047326 100644
--- a/eclass/optfeature.eclass
+++ b/eclass/optfeature.eclass
@@ -4,12 +4,12 @@
 # @ECLASS: optfeature.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: Advertise optional functionality that might be useful to users
 
-case ${EAPI:-0} in
-	[0-7]) ;;
-	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
+case ${EAPI} in
+	6|7|8) ;;
+	*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
 esac
 
 if [[ -z ${_OPTFEATURE_ECLASS} ]]; then
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index 4357e7367cc7..273e6ac72d41 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: wxwidgets.eclass
 # @MAINTAINER:
 # wxwidgets@gentoo.org
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Manages build configuration for wxGTK-using packages.
 # @DESCRIPTION:
 # This eclass sets up the proper environment for ebuilds using the wxGTK
@@ -21,10 +21,9 @@
 # The configuration chosen is based on the version required and the flags
 # wxGTK was built with.
 
-case ${EAPI:-0} in
-	[0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
-	7)     ;;
-	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
@@ -37,9 +36,14 @@ _WXWIDGETS_ECLASS=1
 # The SLOT of the x11-libs/wxGTK you're targeting.  Needs to be defined before
 # inheriting the eclass.  Can be either "3.0" or "3.0-gtk3".
 case ${WX_GTK_VER} in
-	3.0|3.0-gtk3) ;;
-	"")           die "WX_GTK_VER not declared" ;;
-	*)            die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT ('3.0' or '3.0-gtk3')" ;;
+	3.0-gtk3) ;;
+	3.0)
+		if [[ ${EAPI} != 7 ]]; then
+			die "${ECLASS}: GTK 2 no longer supported in EAPI ${EAPI}"
+		fi
+		;;
+	"") die "WX_GTK_VER not declared" ;;
+	*)  die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT ('3.0' or '3.0-gtk3')" ;;
 esac
 readonly WX_GTK_VER
 
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index afd5395b2b60..7c56adf0cf85 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/ceferino/Manifest b/games-arcade/ceferino/Manifest
index d3da9c2e1220..2170dd42d4d4 100644
--- a/games-arcade/ceferino/Manifest
+++ b/games-arcade/ceferino/Manifest
@@ -1,3 +1,4 @@
+AUX ceferino-0.97.8-fix-audio.patch 234 BLAKE2B 305b2a152d688648ea1c914d58db317eb7419e08cb5807b7c56db0a7742373538fd06d701964ccd43e165cd8727b8aa740c8b1f7d7eaf2ecefa7e9d5b5ac1bef SHA512 e7922ffdbb4bfd59a0492fb0741937c714570452d17ec0c324444dc50f763344ef8991fb367c2b8c98e8c163f711573f399a9bf8ab9d6843d2bca4dd668e9410
 DIST ceferino_0.97.8+svn37.orig.tar.gz 2104956 BLAKE2B b3cb68d37e383223def569a333950511e4506b1bea1337189dda36e4c04fd6261c45d532bb2ad3691e73989e8ce5544f7d5e750d035081441f8241401d62217b SHA512 83bccb39f0ecd9f41767c4d94cebb3266c77f11eb22d6cf517f6488af384bad88bdd538b5746e0a3c6e1a57481a4c946ec03afb97a000cd21664d3f179e1a9b6
-EBUILD ceferino-0.97.8-r2.ebuild 1126 BLAKE2B 64b68b3f59af2ca6577fcd2df882ff92f2c977c8aa0061b308a6aed6e7d4b3177fd61a99d69f3e2f5a5c38c9ee88b3cda844e4aa595a07d90369f295bce10ec6 SHA512 b172b191c483ac885fa88c33cf1c0d3cfc8fd3c6cdeebbca075933a36250f60c6d1550893b4f43551f266704f199e06ca1a52e14ccaddbba84535a66d38bed2a
+EBUILD ceferino-0.97.8-r3.ebuild 862 BLAKE2B c0e22f68d87f4ea5f2b0cbae6cf1f311ecd6746a0a1678ddf3f8d9ff757da282c557b50473029eb42f3573c81c970b2714ec0a6b49d54d1f7a1ae28b3f9c483a SHA512 398718fa3cbaf7021d5a2b079648d0795212341db19550fe7e6d0b0418da439b0481f6a911bd2cb76e9ac0025cad4cd9c6c39d7a01c5a75656822a1257a8c496
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild b/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild
deleted file mode 100644
index 390859615e7d..000000000000
--- a/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="Super-Pang clone (destroy bouncing balloons with your grapnel)"
-HOMEPAGE="http://www.losersjuegos.com.ar/juegos/ceferino"
-SRC_URI="mirror://debian/pool/main/c/ceferino/${PN}_${PV}+svn37.orig.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2[video]
-	>=media-libs/sdl-image-1.2
-	>=media-libs/sdl-mixer-1.2
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${P}+svn37"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^INCLUDES/s:\$(datadir)/locale:/usr/share/locale:' \
-		src/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-	newicon data/ima/icono.png ${PN}.png
-	make_desktop_entry ceferino "Don Ceferino Hazaña"
-}
-
-pkg_postinst() {
-	if ! has_version "media-libs/sdl-mixer[mod]" ; then
-		ewarn
-		ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer"
-		ewarn "with the \"mod\" USE flag turned on."
-		ewarn
-	fi
-}
diff --git a/games-arcade/ceferino/ceferino-0.97.8-r3.ebuild b/games-arcade/ceferino/ceferino-0.97.8-r3.ebuild
new file mode 100644
index 000000000000..d3aa76c8576c
--- /dev/null
+++ b/games-arcade/ceferino/ceferino-0.97.8-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop
+
+DESCRIPTION="Super-Pang clone (destroy bouncing balloons with your grapnel)"
+HOMEPAGE="http://www.losersjuegos.com.ar/juegos/ceferino"
+SRC_URI="mirror://debian/pool/main/c/ceferino/${PN}_${PV}+svn37.orig.tar.gz"
+S+="+svn37"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[mod]
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-audio.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+	newicon data/ima/icono.png ${PN}.png
+	make_desktop_entry ${PN} "Don Ceferino Hazaña"
+}
diff --git a/games-arcade/ceferino/files/ceferino-0.97.8-fix-audio.patch b/games-arcade/ceferino/files/ceferino-0.97.8-fix-audio.patch
new file mode 100644
index 000000000000..6ac1de0d07f8
--- /dev/null
+++ b/games-arcade/ceferino/files/ceferino-0.97.8-fix-audio.patch
@@ -0,0 +1,11 @@
+12 .wav files for an array with 11 elements invokes undefined behavior.
+
+--- a/src/audio.h
++++ b/src/audio.h
+@@ -50,5 +50,5 @@
+ 		int canal_musica;
+ 
+-		Mix_Chunk *sonidos[11];
++		Mix_Chunk *sonidos[12];
+ 		Mix_Music *musicas[2];
+ 		
diff --git a/games-arcade/circuslinux/Manifest b/games-arcade/circuslinux/Manifest
index ae3d9a5de4fe..90516fb75405 100644
--- a/games-arcade/circuslinux/Manifest
+++ b/games-arcade/circuslinux/Manifest
@@ -1,3 +1,3 @@
 DIST circuslinux-1.0.3.tar.gz 1253839 BLAKE2B 1f0b57e417144b88688b2f900efebd95d35d7656a16a1b074197e0bd1fb33de3434582ac66e3bf996e7f1fbaafaefadc5091967696eecfcbbdf4a1c2316e0d17 SHA512 292bcaad39342ad69862f1add36b11505ca5f2601637a8db6fad438c5a4b32d7801bc7e6c08b903b0fb8bf68dcb3ec8d968fb913cde65941b9b9ac64b5a5266f
-EBUILD circuslinux-1.0.3-r1.ebuild 775 BLAKE2B db816b156f1ee60a4ec1cd5ab0ab7e5801392222b70b3c2780e385b7ea2056f6d78a797130cd17fac1831f77d8900047c8b798acbe2e0ca3a4dd2afd99e6da6e SHA512 bca4aa9664d722f72cda03396583eccb04e27d9da5a5835a71a3628f1f02b798d6c6fa14ae522ea27190f9ca20a420e630febb7e68f930bdd9b6166cded65963
+EBUILD circuslinux-1.0.3-r2.ebuild 894 BLAKE2B c3edb7eeaeb2974cb4a71d9ec872d82198f2c7d5cb570dbf851958ce817d2db00ddfd5d3a47430cacce5e741548352fcd4e10e84cbfc244d81922a71f9625807 SHA512 8efa8300680026f841a888a976b2056f6afb7c9df09894f2481d04893eb9f55a771bb8fefd2a53e55de1c3d8fd9a9a6e95e19091ee71a96d4c7025e1fe362f5b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild b/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild
deleted file mode 100644
index 1001c7c8aeba..000000000000
--- a/games-arcade/circuslinux/circuslinux-1.0.3-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 desktop
-
-DESCRIPTION="clone of the Atari 2600 game \"Circus Atari\""
-SRC_URI="ftp://ftp.sonic.net/pub/users/nbs/unix/x/circus-linux/${P}.tar.gz"
-HOMEPAGE="http://www.newbreedsoftware.com/circus-linux/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/^install-data-am/d" \
-		Makefile.in \
-		|| die
-	sed -i \
-		-e 's/\$(pkgdatadir)/$(DESTDIR)&/' \
-		data/Makefile.in \
-		|| die
-}
-
-src_install() {
-	default
-	newicon data/images/${PN}-icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Circus Linux!"
-}
diff --git a/games-arcade/circuslinux/circuslinux-1.0.3-r2.ebuild b/games-arcade/circuslinux/circuslinux-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..cc14d4936470
--- /dev/null
+++ b/games-arcade/circuslinux/circuslinux-1.0.3-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Clone of the Atari 2600 game \"Circus Atari\""
+SRC_URI="ftp://ftp.tuxpaint.org/unix/x/circus-linux/src/${P}.tar.gz"
+HOMEPAGE="http://www.newbreedsoftware.com/circus-linux/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+
+DEPEND="
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i 's/-O2//' Makefile.in || die
+	sed -i 's/$(pkgdatadir)/$(DESTDIR)&/' data/Makefile.in || die
+}
+
+src_configure() {
+	tc-export CC
+	econf --enable-joystick
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
+
+	newicon data/images/${PN}-icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Circus Linux!"
+}
diff --git a/games-arcade/defendguin/Manifest b/games-arcade/defendguin/Manifest
index fa495ed1b9b1..9dc68b32ff91 100644
--- a/games-arcade/defendguin/Manifest
+++ b/games-arcade/defendguin/Manifest
@@ -1,3 +1,4 @@
 DIST defendguin-0.0.12.tar.gz 2235694 BLAKE2B 4e694edb5a8e51948e343da8ba4555062505c1c7f2563e291cc4f421624b791630dec7b0c7ce08df0ca0db40070418cd67f750fbe525ef1b1d1577951a5224bd SHA512 3a62c7ac62b016eeb6fc63655e8a8c1ac6c5c7cae7eee03c4ab0b9951ba605c7634336d94adb538e94ccbf1d9f927ac530f58da87413a4b1555b2684681e4167
-EBUILD defendguin-0.0.12-r1.ebuild 911 BLAKE2B 537f99b346058fd2c00f0a56dcb069fcfb69b33fd551b2e4dbbf78ecc3fde27f11fa27c494c0337a6b3c5c5ef2ad7dd7bf24ee1846fba92517d84b1de0cc7577 SHA512 0c2de00a424aad305aeaafdcc88b26088d25e4df98d59173074dd9ab928ed1f2ae7c8cfe7c11f33f9f73ed509cdd398a46e4609c6662219c5e2089422016a2e9
+DIST defendguin.png 4444 BLAKE2B 54790605accf524c8fff3b465ace1d09f2a320a66dd4dcf7a216eb74489a02ff029c95aaec32ad31ca4491809ccc8bdf5eecab44c7a6ce7060db96bd01d2c8de SHA512 3adc8db2ea8c3f726b03fdfafba3e79121edb8b3ca70a4006c288ccbebb5d35c104f0095d3812a7c094dc23760bd846902133d5252ae7e186ddf1a114bfb37e7
+EBUILD defendguin-0.0.12-r2.ebuild 977 BLAKE2B 16b4126c97b1ffc196fbaa4942f2071a9e00c511ee042c95a72a566444695f4133f82337e8a5f3852b1c6bfac2041534863cb54a1821f17c46514181f2a24e55 SHA512 2734c468d1481d62bbe595012cc6a54c53d07360a6763d0440f7ecb76c4d7a60501d1a81338fa97187376d3d6b96408ccc31ec2549b7f443153dc97936e3b6a1
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/defendguin/defendguin-0.0.12-r1.ebuild b/games-arcade/defendguin/defendguin-0.0.12-r1.ebuild
deleted file mode 100644
index 574938e18d7b..000000000000
--- a/games-arcade/defendguin/defendguin-0.0.12-r1.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 desktop
-
-DESCRIPTION="A clone of the arcade game Defender, but with a Linux theme"
-HOMEPAGE="http://www.newbreedsoftware.com/defendguin/"
-SRC_URI="ftp://ftp.tuxpaint.org/unix/x/${PN}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/sdl-mixer[mod]
-	media-libs/libsdl[video]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:\$(DATA_PREFIX):/usr/share/${PN}/:" \
-		-e '/^CFLAGS=.*-O2/d' \
-		-e '/^CFLAGS=/s:=:+= $(LDFLAGS) :' \
-		Makefile \
-		|| die
-	rm -f data/images/*.sh
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r ./data/*
-
-	newicon data/images/ufo/ufo0.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Defendguin /usr/share/pixmaps/${PN}.bmp
-
-	doman src/${PN}.6
-	dodoc docs/{AUTHORS,CHANGES,README,TODO}.txt
-}
diff --git a/games-arcade/defendguin/defendguin-0.0.12-r2.ebuild b/games-arcade/defendguin/defendguin-0.0.12-r2.ebuild
new file mode 100644
index 000000000000..31b4eb2280dc
--- /dev/null
+++ b/games-arcade/defendguin/defendguin-0.0.12-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Clone of the arcade game Defender, but with a Linux theme"
+HOMEPAGE="http://www.newbreedsoftware.com/defendguin/"
+SRC_URI="
+	ftp://ftp.tuxpaint.org/unix/x/defendguin/src/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/sdl-mixer[mod]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed	-e "s|\$(DATA_PREFIX)|${EPREFIX}/usr/share/${PN}/|" \
+		-e '/^CFLAGS=.*-O2/d' \
+		-e '/^CFLAGS=/s|=|+= $(CPPFLAGS) $(LDFLAGS) |' \
+		-i Makefile || die
+	rm data/images/l2r.sh || die
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r data/.
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+
+	doman src/${PN}.6
+	dodoc docs/{AUTHORS,CHANGES,README,TODO}.txt
+}
diff --git a/games-arcade/jazz2/Manifest b/games-arcade/jazz2/Manifest
index d2e9302bd004..bfe5c3944ff5 100644
--- a/games-arcade/jazz2/Manifest
+++ b/games-arcade/jazz2/Manifest
@@ -1,3 +1,3 @@
-DIST jazz2-0.6.6.tar.gz 11030519 BLAKE2B c354ba9b20ea8fc559da66411ba6561dcc8943d2a87113f1166515cefd7c1cd4e13c5d9b257ee15f06a8016d0ff145bd8875ff195355d70f1c2a55088b85931c SHA512 ff896da1ec0ebc9968b469aeba3c44f599340550e3ad2cf590b9f63a50b64a59153632de1374a94d53a3b735dec0791f486c1f7c521ad3be96e2f69745486aad
-EBUILD jazz2-0.6.6.ebuild 1897 BLAKE2B 224442d63f6c54ca783d88aa12f22b644ecee5f757119d6b033ac9588ea77385da21cdf2d7a8242707b64e5deccdc0ef181e53f282945ad90c47843f2abb33a7 SHA512 8dfd2d4135837640740be8d7716e0f5de9a6a92d3e5d41342f99dcf72d22a31778308b6e27dd7aedc94e5a6796aaa4fc9205e2b5d552e16e276bcdfd1253a531
+DIST jazz2-0.6.7.tar.gz 11031735 BLAKE2B 014ff24c6f5a834a727aaed3760a1e228d9f7d9653dd293e98030c9105cbf15a3b420c2d515605e36187cc833ae892ed30589f1bf821c0b674b883cea216f3f5 SHA512 7172a3ccb367122d1c9bfbd36b76cc3d365024affba9aea5cfa595fd11a9b4dc980e57c1cfdb0d32bc28bb7ecb5f6f5225909697c4c93c43117596f44d80ff8f
+EBUILD jazz2-0.6.7.ebuild 1897 BLAKE2B 224442d63f6c54ca783d88aa12f22b644ecee5f757119d6b033ac9588ea77385da21cdf2d7a8242707b64e5deccdc0ef181e53f282945ad90c47843f2abb33a7 SHA512 8dfd2d4135837640740be8d7716e0f5de9a6a92d3e5d41342f99dcf72d22a31778308b6e27dd7aedc94e5a6796aaa4fc9205e2b5d552e16e276bcdfd1253a531
 MISC metadata.xml 413 BLAKE2B 4951d29e0e2c8c94b95b4a7728af705aeb615969506c5b5c79d3e8ea9e5d10da9cb69a218f021cc484904e16495ba73e23074cb2deda248dec913b69ff263248 SHA512 826ca7350339385e3dbd40b8e64cfa0a5fc1d03e351b38028ce073d515d176be5282346e9837d5e0f4a7bc55f635cdc398ae8cd5052e7c1d0d002beb8749f772
diff --git a/games-arcade/jazz2/jazz2-0.6.6.ebuild b/games-arcade/jazz2/jazz2-0.6.7.ebuild
index 3bf8b603eeeb..3bf8b603eeeb 100644
--- a/games-arcade/jazz2/jazz2-0.6.6.ebuild
+++ b/games-arcade/jazz2/jazz2-0.6.7.ebuild
diff --git a/games-arcade/xgalaga/Manifest b/games-arcade/xgalaga/Manifest
index f7732150d11e..613edeb15865 100644
--- a/games-arcade/xgalaga/Manifest
+++ b/games-arcade/xgalaga/Manifest
@@ -1,4 +1,4 @@
-AUX xgalaga-2.1.1.0-respect-AR.patch 358 BLAKE2B 99e600a4cd2dba46b774e50cb54a303593a22c979385e5a891a525ee6685bb3429f843cfd5737a1d49b2fa96e0118294273c4f5f377c08374b15217fe5a9ccce SHA512 4e2283d8bd7b8b974d1df9e83945e215355204a4746ea2ba3e0a4a8179d794ce85f226526007cc5d88092baa06bbd9fc1bfd00f366c45014e233cc3a1ddf8aa9
+AUX xgalaga-2.1.1.0-respect-AR.patch 633 BLAKE2B 9bfcf18f6bfc8deaa39427269539c0f07ffff02dcec7cbdebdfd432bb07138ca85464d4bc4db96bf49ce8cbecaeb544074a22ba3a424526c4b2b6af4bd5f9668 SHA512 e094a8158bae4ac25573ce99f12e070eb444bb14e15f80c7d5380b0b9697ccc696797fb575e82ac9f5b214ef1a6561f71f8a84d42576bacae6d9c14718cb0367
 DIST xgalaga-2.1.1.0.tar.gz 331621 BLAKE2B 290881eb89cacc7a2be469af8da2c11d710dea45f165daa43d4a10a310e681c9f6ffb012e057e266f1e50c5629122ca38cfd97e31a788104e7710f02d756f59d SHA512 087db9e0501cedb042bb673a217f9de32640d3e4f4f529a29fd25ed682a1aece9ae1beacdc2ee77fc93ac931411a1051e2cd19873578ccffe5f03a083bffe513
-EBUILD xgalaga-2.1.1.0-r1.ebuild 1499 BLAKE2B ab130acab095ca4edd4938a5c422dcce41ba6c4898cab46b9e0975cf5c58ee9f4edbbab917c2c1479461dac098b348425d93b030e118698cd041e73bfd56653b SHA512 13021e7f56a0456ef3b0a2da52cba7d9b95df54c75f38459c3977f9834073cdc6487c761147eb6b51f4e4c855406f0bbdf07d3483a812f2eccf78ee4842c7fbd
+EBUILD xgalaga-2.1.1.0-r1.ebuild 1427 BLAKE2B c37ccc685beea069675296c7d3ae9122e201bf1769f4e7ffbe20c5c922e6d0bb36a3ef65d03eb839cf23d9c3c6d359aea3d8c40171d302933944ca9503dd6126 SHA512 e2d02a5e628a29e13c6ce091884dbb9063323bad0dab3c46701a25884611691dd1178eaca7c92d538cbd53f3a2fc50cd63e61763ce3001e0afeba62b98812325
 MISC metadata.xml 330 BLAKE2B b3e61a8f4911203a72c70798959045a62572b4a814bbf8f03ccf17f8da74eaa4c542883da6f2ff780c7e83ab26398ff95a46b36a41c22785903b0299707e6e9c SHA512 2c0045dadc3b72dda9b7f3389aebb5a2d38b91f2cd63891a9bd97e2f23971c916ce515cbbda6b0c6f2b8a600fc56bd77d9db749d223eee5cd6edc99525217545
diff --git a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch
index eedc9b24ce17..8a4991d4299b 100644
--- a/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch
+++ b/games-arcade/xgalaga/files/xgalaga-2.1.1.0-respect-AR.patch
@@ -1,10 +1,24 @@
+Allow user to specify AR. Derive ar from --host=.
+
+Bug: https://bugs.gentoo.org/730796
 --- a/configure.in
 +++ b/configure.in
 @@ -14,6 +14,7 @@ AC_PROG_INSTALL
  AC_PROG_LN_S
  AC_PROG_MAKE_SET
  AC_PROG_RANLIB
-+AM_PROG_AR
++AC_CHECK_TOOL(AR, ar)
  
  AC_ARG_WITH(xpm-lib,[  --with-xpm-lib          Directory containing libXpm (may be autodetected)],xpm_lib=$withval)
  AC_ARG_WITH(sound,  [  --with-sound            Type of sound to use (native or nas)],sound_type=$withval)
+--- a/libsprite/Makefile.in
++++ b/libsprite/Makefile.in
+@@ -8,7 +8,7 @@ VPATH = @srcdir@
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+ 
+-AR = ar
++AR = @AR@
+ AR_FLAGS = rc
+ RANLIB = @RANLIB@
+ 
diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
index d644d2087dd3..45c550a058be 100644
--- a/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
+++ b/games-arcade/xgalaga/xgalaga-2.1.1.0-r1.ebuild
@@ -41,10 +41,6 @@ src_prepare() {
 		-e "/SOUNDDEFS/ s:(SOUNDSRVDIR):(SOUNDSRVDIR)/bin:" \
 		-e 's:make ;:$(MAKE) ;:' \
 		Makefile.in || die "sed Makefile.in failed"
-
-	sed -i \
-		-e 's/AR = ar/AR = @AR@/' \
-		libsprite/Makefile.in || die
 }
 
 src_install() {
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 6387fc1a9ba1..589f295d08ae 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 7fda8dff2d03..d456d868cdce 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -2,4 +2,4 @@ AUX dolphin-5.0_p20210506-musl.patch 779 BLAKE2B 5f962082cf58377801a266ec987417b
 DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862 SHA512 5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
 EBUILD dolphin-5.0_p20210506.ebuild 4817 BLAKE2B 5285d51e4404f2ae273c8315b143a18f5587356ad1d8c6b1c4fa369d5e9737742bb5b6af4c3c3f7d04e63edf5052245632256eed16136dfcc3beca83f861fb96 SHA512 f785395201fefb634972bd1c5b4538cb5e2534f1a4716f744ba1424f61deed7c833d406bfea71197d8a297e593d372c3b93c19447925ec8f72f518a900a016b6
 EBUILD dolphin-9999.ebuild 4910 BLAKE2B 6956e91cc557566ba3712050b4218f0994484037ba61ec21c66072f7d2ea050a93b52449c78c6400404f9126796f160ffdf8cc71339945304d7a1956d01e02bc SHA512 e3dd529047095cd936d9ba8dac650bc65011825e8345777e66ed35fd92523fda0a3e420a775b014081599e56804e3b28f175fd5f3c1d5857f75194db5806b207
-MISC metadata.xml 932 BLAKE2B d5ca4a316ba7874a6e3e4639c1debaef5e05cae72de68631b5a61c00ed2b9715cdb160b1c3cd7d07dcbbc619596c011e8899f295ee7b2c7401d08b616f3762f9 SHA512 5b5f339ab7cc4d12c5e388315f20ee61eb3f51215667e6a99bbecc8e60fee5d4895b6e0fca5f451c40f5b0c2d5c94e501846f029a870eab96c869eecd7b2ca71
+MISC metadata.xml 1080 BLAKE2B ee31389514b6843ab5476a61b286b5d8462ea57576c8a915cb83cfcbe89f0379f0c7f661ea14b978aae0a75af880a10ccf36f18fca1fc150e2ddee419f850477 SHA512 457d96e3388258bbd8ac0b888b5cee96f08fb5663acb4756b7b90720f8f68b60396449243217064f1a95c6a2c56f580067139e59a7f1bfcd3a4f22f8bb991876
diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml
index 73d4bba4f2b1..11a98aff7546 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -2,7 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
 		<flag name="discord-presence">Enables Discord Rich Presence, show the current game on Discord</flag>
@@ -13,8 +18,8 @@
 		<flag name="vulkan">Enable support for Vulkan-based video backend.</flag>
 	</use>
 	<longdescription lang="en">
-Dolphin is a Gamecube and Wii emulator. Most games run perfectly or with minor
-bugs. Games are playable at HD quality, with 1080p and more.
+		Dolphin is a Gamecube and Wii emulator. Most games run perfectly or with
+		minor bugs. Games are playable at HD quality, with 1080p and more.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">dolphin-emu/dolphin</remote-id>
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index da1c4646a3c3..781d5930bbc0 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/dMagnetic/Manifest b/games-engines/dMagnetic/Manifest
index 5afbddf29d74..c8980314c46a 100644
--- a/games-engines/dMagnetic/Manifest
+++ b/games-engines/dMagnetic/Manifest
@@ -1,3 +1,3 @@
-DIST dMagnetic_0.31.tar.bz2 87440 BLAKE2B b1d5b2815f9d043c1cc912356d9cade6a71d35fefa985b6ce0a8a1826328c2350f76eef5a828bf186d88f6f44580800d4d9a1a23ac4ed6c9e415fc739729024e SHA512 05917e363d90a6dd7a8570e7e8ec1c96f91539ceb08fc065672437322e10d14bce1a335684e0d518f188d91d90ea40e383077265da871f429fe0df7a85b42efa
-EBUILD dMagnetic-0.31.ebuild 769 BLAKE2B 43871f31ba29971f160c90fe281b66664059ca759e8eb5a7636083f161374a12a8fb7ae5e57e2ec11786fce183c676846c6eee81d5584f11415fd685403a7ad0 SHA512 61088c1a281f56fde6998646ad4dca9ed0f70cfd2d65ddad3467cc8bc7640f1904b1ff4754dc07cff51ae213d07eee83c9d33a93cd4a5a862e73ff70bbb50c65
+DIST dMagnetic_0.32.tar.bz2 89191 BLAKE2B 8fb5637ba587152fed8ca4f36a46bd72e226874482cb32f9cefa4fc626d2c7f2549c5d3bcabbab9420461c86a42d58180e15fa4bf45e66acda19f9f24c8a014e SHA512 aeee63e836c43018dc7f8bfe104342be18fd336404986b9dc3bfa0c64a8ddda359fa5a0babe952baa4737f5d21d6783821763160268b73f8f32dcf5b8978e49b
+EBUILD dMagnetic-0.32.ebuild 769 BLAKE2B a977fb08e9217af2f518c878be2c6c39fce4994dac675b73fb12c406a36ebc8f6f9a5e19a2897b63e8501a3948d16bddd1e5856b43cadcb515c64017f5e9aa13 SHA512 a75758ac2411d3ebdc7a7bf7eb94975205a0b4475ef648980a7002df15dd3d3707463baf2644b6ddd48ff24e7556002ffc6ae6e532ddd6c15a92e41d69517cb8
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-engines/dMagnetic/dMagnetic-0.31.ebuild b/games-engines/dMagnetic/dMagnetic-0.31.ebuild
deleted file mode 100644
index cfde8727b2fa..000000000000
--- a/games-engines/dMagnetic/dMagnetic-0.31.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit prefix toolchain-funcs
-
-MY_P="${PN}_${PV}"
-DESCRIPTION="A Magnetic Scrolls Interpreter for playing a collection of old text adventures"
-HOMEPAGE="https://www.dettus.net/dMagnetic/"
-SRC_URI="https://www.dettus.net/${PN}/${MY_P}.tar.bz2"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k ~x86"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	hprefixify src/toplevel/${PN}{,_helpscreens}.c
-}
-
-src_compile() {
-	emake all \
-		  CC="$(tc-getCC)" \
-		  LINK="$(tc-getCC) ${LDFLAGS}"
-}
-
-src_test() {
-	emake check \
-		  SHA256_CMD=sha256sum
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.6 ${PN}ini.5
-	dodoc README.txt
-
-	insinto /etc
-	doins ${PN}.ini
-}
diff --git a/games-engines/dMagnetic/dMagnetic-0.32.ebuild b/games-engines/dMagnetic/dMagnetic-0.32.ebuild
new file mode 100644
index 000000000000..763d4b9855db
--- /dev/null
+++ b/games-engines/dMagnetic/dMagnetic-0.32.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit prefix toolchain-funcs
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="A Magnetic Scrolls Interpreter for playing a collection of old text adventures"
+HOMEPAGE="https://www.dettus.net/dMagnetic/"
+SRC_URI="https://www.dettus.net/${PN}/${MY_P}.tar.bz2"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~m68k ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	hprefixify src/toplevel/${PN}{,_helpscreens}.c
+}
+
+src_compile() {
+	emake all \
+		  CC="$(tc-getCC)" \
+		  LINK="$(tc-getCC) ${LDFLAGS}"
+}
+
+src_test() {
+	emake check \
+		  SHA256_CMD=sha256sum
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.6 ${PN}ini.5
+	dodoc README.txt
+
+	insinto /etc
+	doins ${PN}.ini
+}
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 015e64ed5dd8..2cf560ab7d1e 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 44f928e34d04..a5a5844088f2 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,6 +1,8 @@
 AUX fixed-font-path.patch 802 BLAKE2B 1c831b28b65b764bdab9e8522cbf80d8449907611c77cc820c5ffe0f18b37fbf01c083ab1554ade3933182546b992fc7e5bf3e8109191723b428009a05d24449 SHA512 3db5ca3c06a27ad26a4ba2961d429153983fa51412e301da2341da87eb54422d590b8e676b4e8a06c8cbf71230e3149e7fab217fc14558d1ff20a94094ce1e82
 AUX gitless-1.patch 639 BLAKE2B 646abd41a65b5744618161bd2a66f3fb43c06e40bd64ae78fdadf01bf5669b07f470be5eb3afc4931889d91f2f7a782036d1f10e1812bd7cfe14fe88c3ef40bf SHA512 b46fc9531c06a1f51b23c35be5f9f751f96d72a66f40a3aef3ffa89e0c9af56bc08f4aa6cad237f208aa789ee8511fec7304135fbe1e271345599f9107c52212
+AUX make.patch 2728 BLAKE2B 94930ab98012754cc2760dbffc905173bafc0303d492e3f1180f7d4fcff1bd12aef3ea3f74c2ded37cb36c66cecd09003dc630ba8090605bffe52f7ae087c165 SHA512 7144caa5e4a4612c32efe5ccbee5763fa271f1d887218a42740a2b507babd67444f834e75cee645c03a0499c0135df118ede4a52e222ea05fac8b31846696bc4
 AUX rltiles-ldflags-libs.patch 1373 BLAKE2B 5a5a48bdb6081bb81bd66993bed3a6cfed4951ca059b2bf7069ab512e30c855eb65abc9d552da4e3c15c5156924bf14adc852dbb46248aa9840b8f63d1d33652 SHA512 955b6784f7a2ffbccefff6648de2072391d535f998516f52a7b5681e41aeedb34c47ac6cb6d649519448c23ce7007f08f0b0c36ced976dac0f111f2dae204287
+AUX rltiles-make.patch 1704 BLAKE2B b740e8b305e9071a9b024589e4ef6cb4fd088d4424e35ab164f920ec0cf06b94a46b19ac7d223d5eac3ca92bb2565efea00731a556e429056041cddb5658988a SHA512 378bea1e53477c881b93f824e45231b13c34318e34cf1413325a642d2d4f7f16c654b00584bec552238e1e2ec6e8046b67ea7cbd5aa4cb6ecf9fb6a70d600dd9
 DIST stone-soup-0.25.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
 DIST stone-soup-0.25.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
 DIST stone-soup-0.26.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
@@ -11,6 +13,9 @@ DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
 DIST stone_soup-0.27.0.zip 96917949 BLAKE2B 1da7d54e4f3ec98514630eeb8c69c7dca02f96cdfe16974856406da0a057011f17a388669ec29844f3657cd4c7c4ef977f522578cbe0dec02ce497063c25ac83 SHA512 e3f79ce8837056c0a34847857b058e055ed23cc0987ab1d862b60739b8b7ec1e955746fa49c339f449603ce9d0707e64e564592b0798310c7c6bdc1a9edc3e70
 EBUILD stone-soup-0.25.1-r101.ebuild 4906 BLAKE2B 27a656e08f7e4539c71e1c6bced442bd23a54efca2bfd287a369ea8b8cdb0b0b0275a13912ea1316aa62ad92551890cbcfe0e9e5f7acf58d0ca7ded3b69bec78 SHA512 20b3ab2f78bba3b5b344dac9bea7ba8c4e0cfa47a0cc6cf35a7e0afe49ebbbfd5cc18d568e160ac7a9bd3963961c170d6ee79dc342dd33735cc775121eaaa026
+EBUILD stone-soup-0.25.1-r102.ebuild 4571 BLAKE2B 60b2a36b69920ee4a8f010a88e7678704c46868e2ffdebe5298c04cc2ac831bf9f679e9b0804decbdfdd155eb4e2d7ec1e3d352431d5f5e1d2ce2a50dc1297f2 SHA512 9cc5370f27c7553153d90ded879f314a444cf84140fbefbfcc64a68675374f52141268c8b9bfa92ad26d5fcf52c9d9bf043593a4ad0ac53bd0ae89693a91f749
+EBUILD stone-soup-0.26.1-r1.ebuild 4784 BLAKE2B 221e15ac63a17f1155d3367b82192a546d3af70e0394e244b871d98a78337cbbf5196c1faa36ba0ccdc5068672df3d13ad7b467f4c629643d07fffb64335b98e SHA512 aa8a1b499c780fa6ab98871c6ed80bc10c884c505d7d06de42e1eeeba3a5b417e5e5dad9351cc803923582a064b8be50e44696b2c0d7ade7522b15cd3256c35e
 EBUILD stone-soup-0.26.1.ebuild 4906 BLAKE2B 691892c10fd8fce1a232ebc9f25a1ab98faf737a634c9585dfbf50d62250ecf01eaaf82f4a479a2614fbbad6fcf2dffd24523c004289587791d4a1c021d3ff76 SHA512 a23c1ae7253c7bf585c9dbb64213a18b917c796c45971e84ca89187c972182cb0d6639cfb81f206d47b45feb52593ba07c99303aa06e5176298b470aac6c73a5
+EBUILD stone-soup-0.27.0-r1.ebuild 4571 BLAKE2B 9d1608138b00dec79b9b9afbaa732388d0e14cbcb3bbd74606beb216bee9c87e7753a6ec016c48f90603641d9679d3560e9e53c897dfee1c4774c06e6f61771b SHA512 e9bd1892bf735f273d0ed864d174c5c76420127555154359f08adb5b9a0ad9754947e8e537596c1ad0d03b1f81f2940a08b7a5a630904b47aaa62f1cdf05d48f
 EBUILD stone-soup-0.27.0.ebuild 4908 BLAKE2B 405a3587ccd039bdcc652d630ae28de860ee3f26587c054dac91461bb0625d7198b6803af7bca1c14f4608b4213c26993773bf9b7416212bdb0094970b1f32fe SHA512 fa1dbc5258646c806f08df0ed8b4085127bb36aab54472b5b5f0e2df7de2d9fa28f5dcb25b20146e97a678dcdaac7aaf7933d88b91d6aa5bece661414f4f5f9d
 MISC metadata.xml 1619 BLAKE2B 2977dbcb30328109cf2f2c75535175ce089c4ede9d9ce7e550ae715bb8624abffdcf2ba53cb6dc545112dbf1da10b0237a8bffa7719956763955ff81b31554f7 SHA512 711ef0ab70235f7ab3a447bc49508b3e8f53f2dd0e108b4874f6e5a916b3c373decece2d6e4a134971941261315819c31799fd318d0c7be103356ac8e5218137
diff --git a/games-roguelike/stone-soup/files/make.patch b/games-roguelike/stone-soup/files/make.patch
new file mode 100644
index 000000000000..b43c9c41e8c8
--- /dev/null
+++ b/games-roguelike/stone-soup/files/make.patch
@@ -0,0 +1,94 @@
+--- a/Makefile	2021-08-02 13:54:26.603900984 -0500
++++ b/Makefile	2021-08-02 13:57:26.018910565 -0500
+@@ -186,7 +186,7 @@
+ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+ uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
+ 
+-HOST := $(shell sh -c 'cc -dumpmachine || echo unknown')
++HOST :=
+ ARCH := $(HOST)
+ 
+ ifdef CROSSHOST
+@@ -457,15 +457,7 @@
+ GCC_VER_SUFFIX:=-$(GCC_VER)
+ endif
+ 
+-# Attempt to use a full compiler name, to make
+-# distcc builds work nicely.
+-LMACH := $(shell gcc -dumpmachine)-
+-ifeq ($(LMACH),-)
+ LMACH :=
+-endif
+-ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && echo "Yes"),)
+-LMACH :=
+-endif
+ 
+ ifneq ($(FORCE_CC),)
+ GCC := $(FORCE_CC)
+@@ -765,7 +757,6 @@
+ 	FULLDEBUG=YesPlease
+ 	DEBUG=YesPlease
+ 	NO_OPTIMIZE=YesPlease
+-	COVERAGE=YesPlease
+ endif
+ 
+ # Debug-Lite
+@@ -773,7 +764,6 @@
+ ifneq (,$(filter debug-lite,$(MAKECMDGOALS)))
+ 	DEBUG=YesPlease
+ 	NO_OPTIMIZE=YesPlease
+-	COVERAGE=YesPlease
+ endif
+ 
+ # Profile
+@@ -781,12 +771,10 @@
+ ifneq (,$(filter profile,$(MAKECMDGOALS)))
+ 	FULLDEBUG=YesPlease
+ 	DEBUG=YesPlease
+-	COVERAGE=YesPlease
+ endif
+ 
+ # Unit tests
+ ifneq (,$(filter catch2-tests,$(MAKECMDGOALS)))
+-	COVERAGE=YesPlease
+ endif
+ 
+ ifdef HURRY
+@@ -938,7 +926,7 @@
+     INSTALL_FONTS += "$(PROPORTIONAL_FONT)"
+   endif
+ else
+-  SYS_PROPORTIONAL_FONT = $(shell util/find_font "$(OUR_PROPORTIONAL_FONT)")
++  SYS_PROPORTIONAL_FONT = /usr/share/fonts/dejavu/DejaVuSans.ttf
+   ifneq (,$(SYS_PROPORTIONAL_FONT))
+     ifeq (,$(COPY_FONTS))
+       DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
+@@ -958,7 +946,7 @@
+     INSTALL_FONTS += "$(MONOSPACED_FONT)"
+   endif
+ else
+-  SYS_MONOSPACED_FONT = $(shell util/find_font "$(OUR_MONOSPACED_FONT)")
++  SYS_MONOSPACED_FONT = /usr/share/fonts/dejavu/DejaVuSansMono.ttf
+   ifneq (,$(SYS_MONOSPACED_FONT))
+     ifeq (,$(COPY_FONTS))
+       DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
+@@ -1187,9 +1175,8 @@
+ 
+ LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
+ SRC_PKG_BASE  := stone_soup
+-SRC_VERSION   := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
++SRC_VERSION   := $(shell cat util/release_ver)
+ MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
+-RECENT_TAG    := $(shell git describe --abbrev=0 --tags $(MERGE_BASE))
+ WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32)
+ 
+ export SRC_VERSION
+@@ -1523,7 +1510,7 @@
+ endif
+ endif
+ 
+-install: all install-data
++install: install-data
+ 	[ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
+ 	$(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
+ 	$(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
diff --git a/games-roguelike/stone-soup/files/rltiles-make.patch b/games-roguelike/stone-soup/files/rltiles-make.patch
new file mode 100644
index 000000000000..9a43932c5989
--- /dev/null
+++ b/games-roguelike/stone-soup/files/rltiles-make.patch
@@ -0,0 +1,58 @@
+--- a/rltiles/Makefile	2021-08-02 14:03:40.106930544 -0500
++++ b/rltiles/Makefile	2021-08-02 14:03:51.145931133 -0500
+@@ -1,7 +1,7 @@
+ uname_S := $(shell uname -s)
+ 
+ ifneq (,$(findstring MINGW,$(uname_S)))
+-LDFLAGS += -lmingw32
++LIBS += -lmingw32
+ endif
+ 
+ # Note: since generation of tiles is done on the host, we don't care about
+@@ -29,7 +29,7 @@
+   endif
+ 
+   CFLAGS += $(PNG_INCLUDE)
+-  LDFLAGS += $(PNG_LIB)
++  LIBS += $(PNG_LIB)
+ 
+   CFLAGS += -DUSE_TILE
+ endif
+@@ -39,26 +39,15 @@
+ endif
+ 
+ ifneq (,$(findstring MINGW,$(uname_S)))
+-LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
++LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
+ endif
+ ifeq ($(uname_S),Darwin)
+-LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
++LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
+ endif
+ ifeq ($(uname_S),Linux)
+-LDFLAGS += -ldl -lpthread
++LIBS += -ldl -lpthread
+ endif
+ 
+-# Attempt to use a full compiler name, to make
+-# distcc builds work nicely.
+-LMACH := $(shell gcc -dumpmachine)-
+-ifeq ($(LMACH),-)
+-LMACH :=
+-endif
+-ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),)
+-LMACH :=
+-endif
+-HOSTCXX ?= $(LMACH)g++
+-
+ DELETE = rm -f
+ 
+ TOOLDIR := tool
+@@ -134,6 +123,6 @@
+ 	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
+ 
+ $(TILEGEN): $(OBJECTS)
+-	$(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
++	$(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
+ 
+ .PHONY: all clean distclean
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
new file mode 100644
index 000000000000..6b3620cceb23
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r102.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
+
+MY_P="stone_soup-${PV}"
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
+HOMEPAGE="https://crawl.develz.org"
+SLOT="0.25"
+SRC_URI="
+	https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
+"
+
+# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
+# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
+# Public Domain|CC0: most of tiles
+# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
+LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ncurses sound +tiles"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	sys-libs/zlib
+	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
+	ncurses? ( sys-libs/ncurses:0 )
+	tiles? (
+		media-fonts/dejavu
+		media-libs/freetype:2
+		media-libs/libpng:0
+		sound? (
+			   media-libs/libsdl2[X,opengl,sound,video]
+			   media-libs/sdl2-mixer
+		)
+		!sound? ( media-libs/libsdl2[X,opengl,video] )
+		media-libs/sdl2-image[png]
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/flex
+	tiles? (
+		media-gfx/pngcrush
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+S=${WORKDIR}/${MY_P}/source
+PATCHES=(
+	"${FILESDIR}"/make.patch
+	"${FILESDIR}"/rltiles-make.patch
+)
+
+python_check_deps() {
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+
+	python-any-r1_pkg_setup
+
+	if use !ncurses && use !tiles ; then
+		ewarn "Neither ncurses nor tiles frontend"
+		ewarn "selected, choosing ncurses only."
+		ewarn "Note that you can also enable both."
+	fi
+
+	if use sound && use !tiles ; then
+		ewarn "Sound support is only available with tiles."
+	fi
+}
+
+src_prepare() {
+	default
+	python_fix_shebang "${S}/util/species-gen.py"
+
+	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
+		|| die "Couldn't append slot to executable name"
+}
+
+src_compile() {
+
+	# Insurance that we're not using bundled lib sources
+	rm -rf contrib || die "Couldn't delete contrib directory"
+
+	myemakeargs=(
+		$(usex debug "FULLDEBUG=y DEBUG=y" "")
+		BUILD_LUA=
+		AR="$(tc-getAR)"
+		CFOPTIMIZE=''
+		CFOTHERS="${CXXFLAGS}"
+		CONTRIBS=
+		DATADIR="/usr/share/${PN}-${SLOT}"
+		FORCE_CC="$(tc-getCC)"
+		FORCE_CXX="$(tc-getCXX)"
+		LDFLAGS="${LDFLAGS}"
+		MAKEOPTS="${MAKEOPTS}"
+		PKGCONFIG="$(tc-getPKG_CONFIG)"
+		RANLIB="$(tc-getRANLIB)"
+		SAVEDIR="~/.crawl-${SLOT}"
+		SOUND=$(usex sound "y" "")
+		STRIP=touch
+		USE_LUAJIT=
+		V=1
+		prefix="/usr"
+	)
+
+	if use ncurses || (use !ncurses && use !tiles) ; then
+		emake "${myemakeargs[@]}"
+		# move it in case we build both variants
+		use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;}
+	fi
+
+	if use tiles ; then
+		emake "${myemakeargs[@]}" clean
+		emake "${myemakeargs[@]}" "TILES=y"
+	fi
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" \
+		  $(usex tiles "TILES=y" "") \
+		  catch2-tests
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" \
+		  $(usex tiles "TILES=y" "") \
+		  DESTDIR="${D}" \
+		  prefix_fp="" \
+		  bin_prefix="${D}/usr/bin" \
+		  install
+
+	[[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}"
+
+	# don't relocate docs, needed at runtime
+	rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license
+
+	mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \
+	   || die "Couldn't append slot to man page name"
+	doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6"
+
+	# icons and menu for graphical build
+	if use tiles ; then
+		doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png
+		doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg
+		make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	elog "crawl is a slotted install that supports having"
+	elog "multiple versions installed.  The binary has the"
+	elog "slot appened, e.g. 'crawl-"${SLOT}"'."
+
+	if use tiles && use ncurses ; then
+		elog
+		elog "Since you have enabled both tiles and ncurses frontends"
+		elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the"
+		elog "tiles binary is called 'crawl-"${SLOT}"'."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
new file mode 100644
index 000000000000..71060b04b353
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
+
+MY_P="stone_soup-${PV}"
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
+HOMEPAGE="https://crawl.develz.org"
+SLOT="0.26"
+SRC_URI="
+	https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
+"
+
+# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
+# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
+# Public Domain|CC0: most of tiles
+# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
+LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ncurses sound +tiles"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	sys-libs/zlib
+	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
+	ncurses? ( sys-libs/ncurses:0 )
+	tiles? (
+		media-fonts/dejavu
+		media-libs/freetype:2
+		media-libs/libpng:0
+		sound? (
+			   media-libs/libsdl2[X,opengl,sound,video]
+			   media-libs/sdl2-mixer
+		)
+		!sound? ( media-libs/libsdl2[X,opengl,video] )
+		media-libs/sdl2-image[png]
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/flex
+	tiles? (
+		media-gfx/pngcrush
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+S=${WORKDIR}/${MY_P}/source
+PATCHES=(
+	"${FILESDIR}"/make.patch
+	"${FILESDIR}"/rltiles-make.patch
+)
+
+python_check_deps() {
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+
+	python-any-r1_pkg_setup
+
+	if use !ncurses && use !tiles ; then
+		ewarn "Neither ncurses nor tiles frontend"
+		ewarn "selected, choosing ncurses only."
+		ewarn "Note that you can also enable both."
+	fi
+
+	if use sound && use !tiles ; then
+		ewarn "Sound support is only available with tiles."
+	fi
+}
+
+src_prepare() {
+	default
+	python_fix_shebang "${S}/util/species-gen.py"
+
+	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
+		|| die "Couldn't append slot to executable name"
+}
+
+src_compile() {
+
+	# Insurance that we're not using bundled lib sources
+	rm -rf contrib || die "Couldn't delete contrib directory"
+
+	myemakeargs=(
+		$(usex debug "FULLDEBUG=y DEBUG=y" "")
+		BUILD_LUA=
+		AR="$(tc-getAR)"
+		CFOPTIMIZE=''
+		CFOTHERS="${CXXFLAGS}"
+		CONTRIBS=
+		DATADIR="/usr/share/${PN}-${SLOT}"
+		FORCE_CC="$(tc-getCC)"
+		FORCE_CXX="$(tc-getCXX)"
+		LDFLAGS="${LDFLAGS}"
+		MAKEOPTS="${MAKEOPTS}"
+		PKGCONFIG="$(tc-getPKG_CONFIG)"
+		RANLIB="$(tc-getRANLIB)"
+		SAVEDIR="~/.crawl-${SLOT}"
+		SOUND=$(usex sound "y" "")
+		STRIP=touch
+		USE_LUAJIT=
+		V=1
+		prefix="/usr"
+	)
+
+	if use ncurses || (use !ncurses && use !tiles) ; then
+		emake "${myemakeargs[@]}"
+		# move it in case we build both variants
+		use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;}
+	fi
+
+	if use tiles ; then
+		emake "${myemakeargs[@]}" clean
+		emake "${myemakeargs[@]}" "TILES=y"
+	fi
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" \
+		  $(usex tiles "TILES=y" "") \
+		  catch2-tests
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" \
+		  $(usex tiles "TILES=y" "") \
+		  DESTDIR="${D}" \
+		  prefix_fp="" \
+		  bin_prefix="${D}/usr/bin" \
+		  install
+
+	[[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}"
+
+	# don't relocate docs, needed at runtime
+	rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license
+
+	mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \
+	   || die "Couldn't append slot to man page name"
+	doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6"
+
+	# icons and menu for graphical build
+	if use tiles ; then
+		doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png
+		doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg
+		make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	elog "Since version 0.25.1-r101, crawl is a slotted install"
+	elog "that supports having multiple versions installed.  The"
+	elog "binary has the slot appened, e.g. 'crawl-"${SLOT}"'."
+	elog
+	elog "The local save directory also has the slot appended."
+	elog "If you have saved games from 0.25 but before 0.25.1-r101"
+	elog "you can 'mv ~/.crawl ~/.crawl-0.25' to fix it"
+
+	if use tiles && use ncurses ; then
+		elog
+		elog "Since you have enabled both tiles and ncurses frontends"
+		elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the"
+		elog "tiles binary is called 'crawl-"${SLOT}"'."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild b/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild
new file mode 100644
index 000000000000..8c3f2a14c8cf
--- /dev/null
+++ b/games-roguelike/stone-soup/stone-soup-0.27.0-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+VIRTUALX_REQUIRED="manual"
+inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
+
+MY_P="stone_soup-${PV}"
+DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
+HOMEPAGE="https://crawl.develz.org"
+SLOT="0.27"
+SRC_URI="
+	https://github.com/crawl/crawl/releases/download/${PV}/${PN/-/_}-${PV}.zip
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
+	https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.svg
+"
+
+# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
+# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
+# Public Domain|CC0: most of tiles
+# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
+LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ncurses sound +tiles"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	sys-libs/zlib
+	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
+	ncurses? ( sys-libs/ncurses:0 )
+	tiles? (
+		media-fonts/dejavu
+		media-libs/freetype:2
+		media-libs/libpng:0
+		sound? (
+			   media-libs/libsdl2[X,opengl,sound,video]
+			   media-libs/sdl2-mixer
+		)
+		!sound? ( media-libs/libsdl2[X,opengl,video] )
+		media-libs/sdl2-image[png]
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-lang/perl
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	sys-devel/flex
+	tiles? (
+		media-gfx/pngcrush
+		sys-libs/ncurses:0
+	)
+	virtual/pkgconfig
+	virtual/yacc
+	"
+
+S=${WORKDIR}/${MY_P}/source
+PATCHES=(
+	"${FILESDIR}"/make.patch
+	"${FILESDIR}"/rltiles-make.patch
+)
+
+python_check_deps() {
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+
+	python-any-r1_pkg_setup
+
+	if use !ncurses && use !tiles ; then
+		ewarn "Neither ncurses nor tiles frontend"
+		ewarn "selected, choosing ncurses only."
+		ewarn "Note that you can also enable both."
+	fi
+
+	if use sound && use !tiles ; then
+		ewarn "Sound support is only available with tiles."
+	fi
+}
+
+src_prepare() {
+	default
+	python_fix_shebang "${S}/util/species-gen.py"
+
+	sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
+		|| die "Couldn't append slot to executable name"
+}
+
+src_compile() {
+
+	# Insurance that we're not using bundled lib sources
+	rm -rf contrib || die "Couldn't delete contrib directory"
+
+	myemakeargs=(
+		$(usex debug "FULLDEBUG=y DEBUG=y" "")
+		BUILD_LUA=
+		AR="$(tc-getAR)"
+		CFOPTIMIZE=''
+		CFOTHERS="${CXXFLAGS}"
+		CONTRIBS=
+		DATADIR="/usr/share/${PN}-${SLOT}"
+		FORCE_CC="$(tc-getCC)"
+		FORCE_CXX="$(tc-getCXX)"
+		LDFLAGS="${LDFLAGS}"
+		MAKEOPTS="${MAKEOPTS}"
+		PKGCONFIG="$(tc-getPKG_CONFIG)"
+		RANLIB="$(tc-getRANLIB)"
+		SAVEDIR="~/.crawl-${SLOT}"
+		SOUND=$(usex sound "y" "")
+		STRIP=touch
+		USE_LUAJIT=
+		V=1
+		prefix="/usr"
+	)
+
+	if use ncurses || (use !ncurses && use !tiles) ; then
+		emake "${myemakeargs[@]}"
+		# move it in case we build both variants
+		use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;}
+	fi
+
+	if use tiles ; then
+		emake "${myemakeargs[@]}" clean
+		emake "${myemakeargs[@]}" "TILES=y"
+	fi
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" \
+		  $(usex tiles "TILES=y" "") \
+		  catch2-tests
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" \
+		  $(usex tiles "TILES=y" "") \
+		  DESTDIR="${D}" \
+		  prefix_fp="" \
+		  bin_prefix="${D}/usr/bin" \
+		  install
+
+	[[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}"
+
+	# don't relocate docs, needed at runtime
+	rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license
+
+	mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \
+	   || die "Couldn't append slot to man page name"
+	doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6"
+
+	# icons and menu for graphical build
+	if use tiles ; then
+		doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png
+		doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg
+		make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	elog "crawl is a slotted install that supports having"
+	elog "multiple versions installed.  The binary has the"
+	elog "slot appened, e.g. 'crawl-"${SLOT}"'."
+
+	if use tiles && use ncurses ; then
+		elog
+		elog "Since you have enabled both tiles and ncurses frontends"
+		elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the"
+		elog "tiles binary is called 'crawl-"${SLOT}"'."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 0ca0bff368d9..9a0ea1885579 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/corsix-th/Manifest b/games-simulation/corsix-th/Manifest
index 0fa1e3c2b8b3..4f15b98db28b 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,4 +1,6 @@
 AUX corsix-th-0.64-cmake_lua_detection.patch 288 BLAKE2B 90673498871c16f48c752c5581dfec0a290966ef0ec79c977b69575b26a22843829679a7c0225caabe2b570b9b6a38e025115f3a2cf0597b0dad9dc78f01f36d SHA512 52dc61c7aa8c170da225801f2eb06140e9dc28c4d55853eac99b573475a21fb03b945de676898719927abd517b34ecce2aa5c4998ac6e6fcc673cf2aaf7cdb9e
 DIST corsix-th-0.64.tar.gz 4062048 BLAKE2B 2b807a5c712a19cac80bae613065dd8c9e1219573a3c288c1433b6fa857c3a93632e9c51ba126a70626b4044d469ca1ebc815257f291fa9f86ea94491aae35fe SHA512 c02d07ae4fb9a1ce008f32c4b9ea12a949316feddca4e2a29e860e0d88efdfa0440d372b00b9d3eda5e5c3ca739085510ebe8650790d06a7e91255b7d0990e6c
+DIST corsix-th-0.65.1.tar.gz 4163922 BLAKE2B c1d9255e41521876716b377579642ed46b9fc54823816dc431f7b56ffa532af7091ae0b1e291bb1c4fb74165ca07786e0991a990c90bc3a13e234ba31c6fa706 SHA512 b7e964c22517b94cb1dafb0529368c87a2e58cf1f784062b9f2f72749ba69523b63d4f846ebd582c71cf5ca7e7c437a34717ca3877ad3737139ba2fd6a316577
 EBUILD corsix-th-0.64-r100.ebuild 1952 BLAKE2B 02649e3c0f2de55cb02e036e330080f36aa07dd4e170ac18ea391adbaf041e3cac9d02abee22541442ec5c4dc0649f881b558c18f4af4f488b4525a823682486 SHA512 8e0708ae6c2fc61a59c3951a556e9ce38ae24c24903cc282e4712f47f5f44892e34c02ff52134be5136c6e5809cfc0bd9796ae550826bdda69ae683f7480d22f
+EBUILD corsix-th-0.65.1.ebuild 1923 BLAKE2B a7a1da03327d47ae76baca6f6db3d31595d4797209e9fcd63456e391071bf6ce930ac5b920addc0110825345cd24415133f5cb4bc33a82644ef648d0037bb834 SHA512 a16e7f70f62a92ffcca948d6c6c74a33b2d8e3b8b3cd38de95daf378dccb16852e8012a2a607f9eef9ca94cd00ec4f60f3607b8b63c691118eaec52d447beba6
 MISC metadata.xml 716 BLAKE2B 16fe66f9f3fce58b6b17df3906fdcf4e9b7a9a49be872ba69cd5deeb47bffca495ff3a8b8c89fc71cbe8b3960954a462aff8c10c6afd34c18acef95931c382f8 SHA512 643ef59451c07fd3e61b22fb9891cc2478dff78c1e2a50ed455b15bf1c01e49d384af177c687e48b2bd6590278ac121458a94760a25bdc064ce309ff5ab3b868
diff --git a/games-simulation/corsix-th/corsix-th-0.65.1.ebuild b/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
new file mode 100644
index 000000000000..96f236c3d3d4
--- /dev/null
+++ b/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit cmake lua-single xdg
+
+MY_PN="CorsixTH"
+
+DESCRIPTION="Open source clone of Theme Hospital"
+HOMEPAGE="https://corsixth.com"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc +midi +sound +truetype +videos"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		>=dev-lua/luafilesystem-1.5[${LUA_USEDEP}]
+		>=dev-lua/lpeg-0.9[${LUA_USEDEP}]
+		>=dev-lua/luasocket-3.0_rc1-r4[${LUA_USEDEP}]
+	')
+	media-libs/libsdl2[opengl,video]
+	sound? ( media-libs/sdl2-mixer[midi?] )
+	truetype? ( >=media-libs/freetype-2.5.3:2 )
+	videos? ( >=media-video/ffmpeg-2.2.3:0= )
+"
+
+DEPEND="${RDEPEND}"
+
+# Technically, build-time generation of documentation could use any version
+# of Lua (or to be precise: if in src_configure cmake has been told to use
+# LuaJIT documentation generation looks for LuaJIT, otherwise any
+# dev-lang/lua slot will do; see the first few lines of the bundled file
+# CMake/GenerateDoc.cmake for details) - but since dev-lang/lua conflicts
+# with the other slots of same, try to keep the deptree sane until we get
+# rid of unslotted Lua.
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		${LUA_DEPS}
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.64-cmake_lua_detection.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLUA_VERSION=$(lua_get_version)
+		-DWITH_AUDIO=$(usex sound)
+		-DWITH_FREETYPE2=$(usex truetype)
+		-DWITH_MOVIES=$(usex videos)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+	dodoc {changelog,CONTRIBUTING}.txt
+
+	docinto html
+	use doc && dodoc -r "${BUILD_DIR}"/doc/*
+}
diff --git a/games-simulation/gl117/Manifest b/games-simulation/gl117/Manifest
index 1a6914d62f08..4c2c3a1d9d12 100644
--- a/games-simulation/gl117/Manifest
+++ b/games-simulation/gl117/Manifest
@@ -1,4 +1,5 @@
-AUX gl117-1.3.2-mode.patch 394 BLAKE2B ee932b73f82100910bea6466edeb4a8a0d5782ac64baac4b64872cb95b3018391bd66550c5a2ff7575aff7449aa01e856769aabd0e4f9ef51bed71c4de7349e6 SHA512 b6bdfa938f19481dff3f4d275826f1308aea99c1a2fc78df6f2b49096ecabce6c476cbf7de64afd0ac0903ea0ac3b5d84e43a876ae333bd0db20b39a0085ca11
+AUX gl117-1.3.2-mode.patch 353 BLAKE2B c162beb97aff2708d3e74e215a729ed7b6f6b40ac971f5387b65d31eaf9abd15b9bc13794518ce2d079f55092ebc49adcc78dc7418ef15579984cc622cfc0abb SHA512 693f11b8a6db7aad431421b58deaff843e24319830efd8cb44c046e7e2b7ec830a29d08bad3f4ba33bdc8a71e58aebea7fb9de28c6a52bf1ee3c4223bf2413a5
 DIST gl-117-1.3.2-src.tar.bz2 2411075 BLAKE2B efd2c7b9dd3f71bf0b8b1aac79f90dcc6286301997913346f8ee536b3f5981564438e6a805c658678b5ae0402f84da762b60472ddc553cab49f9ffb421d69993 SHA512 1d2382576c6399d8c84d56ddc7eb2b11b9e1e3ffeebcc1bd30e258ef231626d15d1be649f8c791f30e4f2f78aca2b4290c5d08036c5f482eef01eda8f4f48b5f
-EBUILD gl117-1.3.2-r1.ebuild 790 BLAKE2B 9e0539a943ce93f7db7bb0481a6c9baf4cf0642ff3fc13300a60e43825dfad17e3299d9fc8dd5644c35bb2af1c2595efbd19d8cdf5dec56b0637aa22c9fc2a96 SHA512 dfa801635069584401af3e9b7fed23ed79cd54217dfffe1a5f3666704d666a11fd470adfd437fe02d05e46179477981ab3b9128edacbc6663c635b069faa02f8
+DIST gl117.png 2274 BLAKE2B dfa2b8fe0e858e1f0fa1af27bd8e38d3bba55c31d4c26abe831cd08f01a9d198c2a38ec7c9c1c49af851da24cce692c489220624b93eae0ed4692139c73f8f7d SHA512 374b41af6cb5ec10e3b59b983f28206cb7bc88c3559a24332ef43bd4b135971c0541dbf6f3b5e97c7b7e329bc3d5bbfa5119b9be6cbec243193e5a4ac0220c3b
+EBUILD gl117-1.3.2-r1.ebuild 763 BLAKE2B bea26b402569d973ef86b1157d65a85fb85e2908035822f5ea99737225b0dc673d1fb505724760a9062f10cdb7e3b38fa2cb05235d5b55cb3e37bca6aea4da56 SHA512 87d472743d1ecb11c19bb127c73785e294e5c4d71822808bb2b2d83ce2c4fb00d365898a84263cf518c7be3dfdf68b8adadb645826471669f75912526581a179
 MISC metadata.xml 329 BLAKE2B 69ad3f12c9a48f6cbb1094fb1952d75e5e317060ad8534cd95e1e94bf2e3bb824862ad2a050aa81f55970b0cb0d032197ae86b6336beb09835a9f6c56aba0a0f SHA512 a2756adb5a9afa30e93c7f7726706ed9b435f76631d268685f9fea734a4ef6e643a8f8fdae8f59cc979a1bfcb91e2778496828db50458d6adacd789b3b3763f9
diff --git a/games-simulation/gl117/files/gl117-1.3.2-mode.patch b/games-simulation/gl117/files/gl117-1.3.2-mode.patch
index d3f13084a96f..c63fdaa26074 100644
--- a/games-simulation/gl117/files/gl117-1.3.2-mode.patch
+++ b/games-simulation/gl117/files/gl117-1.3.2-mode.patch
@@ -1,5 +1,6 @@
---- a/src/main.cpp	2010-07-13 09:35:18.374122609 +0100
-+++ b/src/main.cpp	2010-07-13 09:35:45.334955120 +0100
+https://bugs.gentoo.org/327965
+--- a/src/main.cpp
++++ b/src/main.cpp
 @@ -71,8 +71,7 @@ int mode = 0;
  
  // pre-defined screen resolutions (x, y, bpp, fullscreen)
diff --git a/games-simulation/gl117/gl117-1.3.2-r1.ebuild b/games-simulation/gl117/gl117-1.3.2-r1.ebuild
index f5c52f6068ab..8f27db3990a6 100644
--- a/games-simulation/gl117/gl117-1.3.2-r1.ebuild
+++ b/games-simulation/gl117/gl117-1.3.2-r1.ebuild
@@ -1,37 +1,41 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=8
+
+inherit desktop
 
 MY_P="gl-117-${PV}-src"
-DESCRIPTION="An action flight simulator"
-HOMEPAGE="http://www.heptargon.de/gl-117/gl-117.html"
-SRC_URI="mirror://sourceforge/gl-117/${MY_P}.tar.bz2"
 
-LICENSE="GPL-2"
+DESCRIPTION="Action flight simulator"
+HOMEPAGE="https://sourceforge.net/projects/gl-117/"
+SRC_URI="
+	mirror://sourceforge/gl-117/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="
+RDEPEND="
 	media-libs/freeglut
-	media-libs/libsdl[sound,joystick,opengl,video]
+	media-libs/libsdl[joystick,opengl,sound,video]
 	media-libs/sdl-mixer[mod]
 	virtual/glu
 	virtual/opengl"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-mode.patch
 )
 
 src_install() {
-	DOCS="doc/gl-117.pdf AUTHORS ChangeLog FAQ NEWS README" \
-		default
-	newicon doc/src/falcon.jpg ${PN}.jpg
-	make_desktop_entry gl-117 GL-117 /usr/share/pixmaps/${PN}.jpg
+	default
+
 	doman doc/gl-117.6
+	dodoc doc/gl-117.pdf
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry gl-117 GL-117
 }
diff --git a/games-simulation/lincity-ng/Manifest b/games-simulation/lincity-ng/Manifest
index 4c7f25ad1079..ff3b8facf44b 100644
--- a/games-simulation/lincity-ng/Manifest
+++ b/games-simulation/lincity-ng/Manifest
@@ -1,3 +1,4 @@
+AUX lincity-ng-2.9_beta-flags.patch 235 BLAKE2B 262c4080bae5d88197cd6ff3ac20dd8740127504aefc5c947aef330ddfef6af6f0a423ec888e810398e2a5c5d3f5a2bab0ea6de9376b9be02187be5c61620ef3 SHA512 be56ba3aea08e425741c4ccb1cd87a23a595b5b974cdeb52e0e91b1b8579588bfee3b6052ab9728fbec41aa312107cabec19e1d7c27680d2c979351e5d8394ca
 DIST lincity-ng-2.9_beta.tar.gz 115799513 BLAKE2B 038c69172af9a62b35199823ef56200e170a8eafef2849bc6d8797bbc20ffa01656d05b1ba0725d4d33e217602f6695d3bdf2774b90b85c6e257e13e019bebcb SHA512 194b7389d7172b7987eda14cbbf2dd91aa503af36db9cf3bdf07ab6ae5e0068ac00988fec6068d65da6bdf14dee623bba57a58192e2a9659e741a7c9036e6d65
-EBUILD lincity-ng-2.9_beta.ebuild 1382 BLAKE2B ddca268df7af315fffe16c84ff7224356e3174abc7d634268199f11e9b15e70b84b578bc218196e5cf9ecdb266d1cc26819cc71f862c4cc88c2361c8ec71339b SHA512 f2c0cf3735e6f5e42a309ff20f85d3e31dc810c79258d27944f8f3803ef3bc4f637ba54d829dba2a2d3171bb597950a0c3f5b00bc710517db5dc95c67e4365cc
-MISC metadata.xml 341 BLAKE2B 971b9b371fbe6bbb577214a2fcb2f39948f4f8abe02398fd7f6e86d650434f778bc8e1556a6d08be49149da35f848e7e8a23e56034626823704872e88ada99e5 SHA512 0c2607743dbc1b832fad2d9edf774b51c9e816cca447c5991cd3958f001fded11bfd0fd0b90316ddab7c3371b0ec98d6f4ada27054e5d74e3295cf2cd1beeb90
+EBUILD lincity-ng-2.9_beta.ebuild 1469 BLAKE2B 9533955630a368f8ac4373d357c95592eb11feb5db57e210f4910e9454af36275f6490ca40b5186edc1840f6ffc0bf10daad9bc5d76b3c78655f84ac8496de20 SHA512 76757c1dd3e8d5d5d1dfc5b3c781b90cff96e1204f3acb18b7bfe915c40bba1b0e4be672b99b5a0e07540f67d4cc34ebd261a30b8462ce8dce0bb4d5989230b6
+MISC metadata.xml 402 BLAKE2B bb9f0732f1f4d82689c556ea23ef87b93da2802b533f4aabec8f1e9d44eb2e6fe7d3740ff3bacc87983f240c651715f61356026d1e9c1de8ae7462ffcee48c8f SHA512 53b57dcf1dc3843d7a6d1f4425f357273e287e010c975f12e9bd178bec3ff415560ca3d391edbf3d7873dad8cef7d54132bc78a59caf4d0f5e50e879d71eb118
diff --git a/games-simulation/lincity-ng/files/lincity-ng-2.9_beta-flags.patch b/games-simulation/lincity-ng/files/lincity-ng-2.9_beta-flags.patch
new file mode 100644
index 000000000000..1c960123c216
--- /dev/null
+++ b/games-simulation/lincity-ng/files/lincity-ng-2.9_beta-flags.patch
@@ -0,0 +1,10 @@
+--- a/Jamrules
++++ b/Jamrules
+@@ -23,5 +23,4 @@
+     case optimize :
+-        CFLAGS += -O3 -g -Wall ;
+-        CXXFLAGS += -O3 -g -Wall ;
+-        LIBS += -g ;
++        CFLAGS += -Wall ;
++        CXXFLAGS += -Wall ;
+     case debug :
diff --git a/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild b/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
index c49cae5849f8..793d68044eab 100644
--- a/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
+++ b/games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools libtool multiprocessing toolchain-funcs
+inherit autotools multiprocessing toolchain-funcs
 
 DESCRIPTION="City simulation game"
 HOMEPAGE="https://github.com/lincity-ng/lincity-ng"
 SRC_URI="https://github.com/lincity-ng/lincity-ng/archive/lincity-ng-${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P/_/-}"
 
-LICENSE="GPL-2 BitstreamVera CC-BY-SA-2.0"
+LICENSE="GPL-2+ BitstreamVera CC-BY-SA-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-games/physfs
+RDEPEND="
+	dev-games/physfs
 	dev-libs/libxml2:2
-	media-libs/libsdl[sound,joystick,opengl,video]
+	media-libs/libsdl[joystick,opengl,sound,video]
 	media-libs/sdl-gfx
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
@@ -24,35 +25,38 @@ RDEPEND="dev-games/physfs
 	sys-libs/zlib
 	virtual/opengl"
 DEPEND="${RDEPEND}"
-BDEPEND="dev-util/ftjam
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/ftjam
+	sys-devel/gettext
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${P/_/-}"
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch
+)
 
 src_prepare() {
 	default
 
-	# Missing CREDITS files actually breaks the install.
-	sed -i -r "s/\b(COPYING[^ ]*|CREDITS)\b//g" Jamfile || die
+	AT_M4DIR=mk/autoconf eautoreconf
+
+	# strip down autogen.sh / makerelease.sh for needed additional actions
+	sed -i -e '1a\set -e' -e '1n;/# generate Jam/,$!d;/^$/,$d' autogen.sh || die
+	sed -i -e '1a\set -e' -e '/^$/,$d' makerelease.sh || die
 
-	# Can't use eautoreconf as it does weird jam stuff.
-	autotools_run_tool ./autogen.sh
-	elibtoolize
+	./autogen.sh || die "Failed to generate Jamconfig.in"
+	./makerelease.sh || die "Failed to generate CREDITS"
 }
 
 src_compile() {
-	jam -q -dx \
-		-j$(makeopts_jobs) \
-		-sAR="$(tc-getAR) ru" \
-		-sRANLIB="$(tc-getRANLIB)" \
-		|| die "jam failed"
+	tc-export CC RANLIB
+	export AR="$(tc-getAR) cru" #739376
+
+	jam -q -dx -j$(makeopts_jobs) || die
 }
 
 src_install() {
-	jam -sDESTDIR="${D}" \
-		-sappdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-		-sapplicationsdir="${EPREFIX}/usr/share/applications" \
-		-spixmapsdir="${EPREFIX}/usr/share/pixmaps" \
-		install \
-		|| die "jam install failed"
+	jam -q -dx -sDESTDIR="${D}" -sPACKAGE_VERSION=${PVR} install || die
+
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
 }
diff --git a/games-simulation/lincity-ng/metadata.xml b/games-simulation/lincity-ng/metadata.xml
index 7dd75a46b634..af89c7a1eb31 100644
--- a/games-simulation/lincity-ng/metadata.xml
+++ b/games-simulation/lincity-ng/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">lincity-ng/lincity-ng</remote-id>
 		<remote-id type="sourceforge">lincity-ng.berlios</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-simulation/lincity/Manifest b/games-simulation/lincity/Manifest
index 539a3b531e2f..afeb062be4f1 100644
--- a/games-simulation/lincity/Manifest
+++ b/games-simulation/lincity/Manifest
@@ -1,5 +1,6 @@
-AUX lincity-1.13.1-build.patch 2196 BLAKE2B 871577b9ac4b2536b9d46c094c6bd3492eb8e46188f2fc7d8efafa84d6e76914e60a579e30b1294e56daa96f8ab4a2b0247c0ddb5d0ce7d6d9e2180a7b0306cf SHA512 c0590673e7f04e16ffb6c9a25ce0f00d25dcaf689908117647e00989ed6db3a2c5d1db63abeb23e5c9a0f0999219515a53994ed4400f2712a8dea5b6eca5a8b3
-AUX lincity-1.13.1-gcc-10.patch 1552 BLAKE2B 7ead7d4f4ff699f20d4c06b3ac14cfae1ae234ba8f03ad7c9188fab3e38626c85767196f3dd1de7368b140d941c14485a77045a2f7775ea07bcdd00a5dccdd16 SHA512 c80aaa9b3d39fd7661c8b7d24f7e38e34389ba82520073ef6e24e6eaf8cd0e2394ade05f7fcc98d5b5597d2878b5465856fda509669871cf80ff2ac06d4734bb
+AUX lincity-1.13.1-build.patch 1476 BLAKE2B 941fca117f259915c0e55fd8febddb5c3b6b3d86e1eb9f332edbb76eb8c8361fc4e410d01a8526b73c694f059edf49e55c8f9e9635cea645f34c9fdbe3d0f819 SHA512 e2d014006e0425ab68c685b23febc27ae18500d0b62d00642964c1b37f77646143869f6fe199d34d6a5b931c7449ed0762b934f38e60f20d719bfc0a12d3ac28
+AUX lincity-1.13.1-gcc-10.patch 1540 BLAKE2B 9eb02f6f5820ddb6fdd0edbd25921f7f2a01595f1c1ac3d70e0683bd3fa625ee5a477e5df5d616eb334648ff01d8379970ecb72d272abadbd4867cac349cb0fa SHA512 433929f62f2dc425304bd34ccfdcbb92cbef17486c3628bb649d0c74e0fb68c5c5ab4219a2eb1028d197769ec02566db221c2e9666cfae84dc49e96f67e8d215
 DIST lincity-1.13.1.tar.gz 1064236 BLAKE2B 1172ced3255048f3132f85cd9ae994c7e0558170f7e7a24909af1856669c4ad90d57acd76f330fb556656ed74843dda159005350760fc059c6b184cedf1e9393 SHA512 bc4ee7a1642b1efa25f9edaabd3aeb52d1ca1d016735c5094586f52fda3ec4e9080ff35fe518c1ccbfad9fd54babb370f4b9b6a158b4d2f43b7182155084eefc
-EBUILD lincity-1.13.1-r1.ebuild 976 BLAKE2B a8869f6a34959af3e537a327f186ed70c95d6d19d348e0ca0653337132cc27b64bb98e1399f8186d4735482825f04e7734852e307238e21a3bcf16f18bc8848e SHA512 bdcc7d91ed2c73fabea88eeb695c3f74b763119b91e2d1013794f276ceb84d3366c596d1627d9397279040d1bac22fc04d078ea2b0ca4073637322dec6a4c7e6
+DIST lincity.png 5377 BLAKE2B 2238140719a8c1b094fbe6d7b52b9224245f2c36f970e04aa3fcaf6090409145f17dad2c2a83f6528e695fd9d26d9c053c45978502b7e44f73cf25719d7ed3aa SHA512 40a8955fdc8397662ef0d084163e7dcad59e278429792bd7096e193a0d04791c2355a0dbd2c1f72a032bbfc71bc4e27e37a3d0d4e82de8e7170bb70205d983a3
+EBUILD lincity-1.13.1-r2.ebuild 989 BLAKE2B 6616dc088ae5d0b9712176727b1288719f81cb57db3a7910100a8b07f91133868b31ea1fc1d52571d97f2f91072ba4e6d6c9c875926bbe4bcca680c79a0d2e7e SHA512 80ce2dc386e4036ae2906c263ecb400940c85a02ab41c01243bc7fecd0e4f4c4920a9f6e71d581b032b01717212e2ed3fd45ada288c09e16d4195100a07defa4
 MISC metadata.xml 330 BLAKE2B 27e534512b77895bcfea8da8f49e1fa4ce2c9a8df47cf0ce813a8a88893b3c69c03d25083412d22bea3d2d73dfe2baa6a26292b983409c28d6c40bd70e222f6f SHA512 c36fecc06a5c84b3a93dfd25ffeb05bb14a5a96676eb1d7e976903ef7892a10c22ee7afa894c581c0bc3079ce2e30574143cc6b49195b346463c48f3e34ff1c0
diff --git a/games-simulation/lincity/files/lincity-1.13.1-build.patch b/games-simulation/lincity/files/lincity-1.13.1-build.patch
index f7f41f954baf..a5244b5387f3 100644
--- a/games-simulation/lincity/files/lincity-1.13.1-build.patch
+++ b/games-simulation/lincity/files/lincity-1.13.1-build.patch
@@ -1,16 +1,5 @@
---- lincity-1.13.1.orig/intl/Makefile.in
-+++ lincity-1.13.1/intl/Makefile.in
-@@ -32,7 +32,7 @@
- libdir = @libdir@
- includedir = @includedir@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = /usr/share/locale
- gettextsrcdir = $(datadir)/gettext/intl
- aliaspath = $(localedir)
- subdir = intl
---- lincity-1.13.1.orig/mouse.c
-+++ lincity-1.13.1/mouse.c
+--- a/mouse.c
++++ b/mouse.c
 @@ -1057,7 +1057,7 @@
     and set to 1 if the existing transport if the more expensive sort
     (e.g. GROUP_RAIL when overwriting GROUP_ROAD).
@@ -20,8 +9,8 @@
  mt_erase(int x, int y)
  {
      if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
---- lincity-1.13.1.orig/pixmap.c
-+++ lincity-1.13.1/pixmap.c
+--- a/pixmap.c
++++ b/pixmap.c
 @@ -390,7 +390,7 @@
  		  likes it in the file.  Still need to fix this in autoconf,
                    but for now this will do. */
@@ -31,8 +20,8 @@
  pixmap_index (int x, int y)
  {
      return y*pixmap_width + x;
---- lincity-1.13.1.orig/pixmap.h
-+++ lincity-1.13.1/pixmap.h
+--- a/pixmap.h
++++ b/pixmap.h
 @@ -19,7 +19,7 @@
  void initialize_pixmap (void);
  void resize_pixmap (int new_width, int new_height);
@@ -51,19 +40,8 @@
  pixmap_index (int x, int y) {
      return y*pixmap_width + x;
  }
---- lincity-1.13.1.orig/po/Makefile.in.in
-+++ lincity-1.13.1/po/Makefile.in.in
-@@ -21,7 +21,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = /usr/share/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
---- lincity-1.13.1.orig/readpng.c
-+++ lincity-1.13.1/readpng.c
+--- a/readpng.c
++++ b/readpng.c
 @@ -3,6 +3,7 @@
   * This file is part of lincity (see COPYRIGHT for copyright information).
   * ---------------------------------------------------------------------- */
diff --git a/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch b/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch
index 77f3a41dcf6c..a1d6ea0f2e70 100644
--- a/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch
+++ b/games-simulation/lincity/files/lincity-1.13.1-gcc-10.patch
@@ -1,7 +1,8 @@
+https://bugs.gentoo.org/570574
 https://bugs.gentoo.org/706394
 
---- lincity-1.13.1/fileutil.c	2004-07-03 08:26:33.000000000 -0000
-+++ lincity-1.13.1/fileutil.c	2020-02-26 09:16:31.406614385 -0000
+--- a/fileutil.c
++++ b/fileutil.c
 @@ -105,7 +105,7 @@
   * ---------------------------------------------------------------------- */
  char LIBDIR[LC_PATH_MAX];
@@ -11,8 +12,8 @@ https://bugs.gentoo.org/706394
  int lc_save_dir_len;
  static char *lc_temp_filename;
  
---- lincity-1.13.1/ldsvguts.c	2003-10-10 04:11:29.000000000 -0000
-+++ lincity-1.13.1/ldsvguts.c	2020-02-26 09:17:22.410992011 -0000
+--- a/ldsvguts.c
++++ b/ldsvguts.c
 @@ -91,8 +91,6 @@
   * Private Global Variables
   * ---------------------------------------------------------------------- */
@@ -22,8 +23,8 @@ https://bugs.gentoo.org/706394
  /* ---------------------------------------------------------------------- *
   * Public functions
   * ---------------------------------------------------------------------- */
---- lincity-1.13.1/main.c	2004-07-03 07:59:05.000000000 -0000
-+++ lincity-1.13.1/main.c	2020-02-26 09:17:04.222857373 -0000
+--- a/main.c
++++ b/main.c
 @@ -96,9 +96,8 @@
  #endif
  #endif
@@ -35,8 +36,28 @@ https://bugs.gentoo.org/706394
  
  #ifdef CS_PROFILE
  int prof_countdown = PROFILE_COUNTDOWN;
---- lincity-1.13.1/screen.h	2004-06-22 13:24:19.000000000 -0000
-+++ lincity-1.13.1/screen.h	2020-02-26 09:14:31.473725606 -0000
+--- a/mouse.c
++++ b/mouse.c
+@@ -1094,7 +1094,7 @@
+     return 0;
+ }
+ 
+-inline int
++static inline int
+ mt_temp(int x, int y)
+ {
+     if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
+@@ -1128,7 +1128,7 @@
+     return 0;
+ }
+ 
+-inline int
++static inline int
+ mt_perm(int x, int y)
+ {
+     /* By now, it has already been mt_erase()'d */
+--- a/screen.h
++++ b/screen.h
 @@ -20,7 +20,7 @@
  extern unsigned char start_font2[4096];
  extern unsigned char start_font3[4096];
diff --git a/games-simulation/lincity/lincity-1.13.1-r1.ebuild b/games-simulation/lincity/lincity-1.13.1-r1.ebuild
deleted file mode 100644
index 6479c984045d..000000000000
--- a/games-simulation/lincity/lincity-1.13.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="city/country simulation game for X and Linux SVGALib"
-HOMEPAGE="http://lincity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lincity/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-# dep fix (bug #82318)
-RDEPEND="media-libs/libpng:0
-	x11-libs/libSM
-	x11-libs/libXext
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-gcc-10.patch
-)
-
-src_prepare() {
-	default
-
-	append-cflags -std=gnu89 # build with gcc5 (bug #570574)
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-gzip \
-		--with-x
-}
-
-src_compile() {
-	# build system logic is severely broken
-	emake
-	emake X_PROGS
-}
-
-src_install() {
-	default
-	dodoc Acknowledgements CHANGES README* TODO
-	make_desktop_entry xlincity Lincity
-	dobin xlincity
-}
diff --git a/games-simulation/lincity/lincity-1.13.1-r2.ebuild b/games-simulation/lincity/lincity-1.13.1-r2.ebuild
new file mode 100644
index 000000000000..c67386702def
--- /dev/null
+++ b/games-simulation/lincity/lincity-1.13.1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="City simulation game for X"
+HOMEPAGE="http://lincity.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/lincity/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libpng:=
+	virtual/libintl
+	x11-libs/libXext"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
+
+src_configure() {
+	local econfargs=(
+		--with-gzip
+		--with-x
+		--without-svga
+		ac_cv_lib_ICE_IceConnectionNumber=no # not actually used
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_compile() {
+	emake
+	emake X_PROGS
+}
+
+src_install() {
+	default
+
+	dobin x${PN}
+
+	newman {,x}${PN}.6
+	rm "${ED}"/usr/share/man/man6/${PN}.6
+
+	dodoc Acknowledgements
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry x${PN} ${PN^}
+}
diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index 0a7e87918024..26e20a2429e2 100644
--- a/games-sports/Manifest.gz
+++ b/games-sports/Manifest.gz
diff --git a/games-sports/speed-dreams/Manifest b/games-sports/speed-dreams/Manifest
index ba41de788cb6..fd62335ef610 100644
--- a/games-sports/speed-dreams/Manifest
+++ b/games-sports/speed-dreams/Manifest
@@ -2,6 +2,12 @@ AUX speed-dreams-1.4.0-asneeded.patch 4214 BLAKE2B e0cf81e4bc04dd0a41ca813e2fbd6
 AUX speed-dreams-1.4.0-automake.patch 995 BLAKE2B 04280a67277a420108db5ae2675e99d6cdb3461120e9c04313cc6be4f910572cb87b6703d65444cb199d4b5ef2018239a843e1b64cdcb0820e4efdbdb30b0c38 SHA512 2300dd95087d0b7f0aada40041eea70976046085a9d9dc467c86691cf21058855941e642547a7eda26786b5a756d5930867616fb62534a0a2da1301dab3af8f0
 AUX speed-dreams-1.4.0-libpng15.patch 516 BLAKE2B 0464b8a006cc8a35442345d024bb301b0e3a1b4fb16110098aa27422cea35bbb67ccbd2fd689e8cc93b811ca37a4426799c9bd180e4bcca5ae3c20c76462f5b7 SHA512 f945622e791d15020370a1e31d328bc1329e08163a3c4f66fd63987e2dd357e2708338402fcfb5b2e994d4339a3d8d6df7f908b2ecbdff5cb6bd865259d40fa9
 AUX speed-dreams-1.4.0-math-hack.patch 1426 BLAKE2B 9457a89d48dc5fe1e5879ae1ee036ce87fdf51f7042fe7bb0c2213dad2e14d6009d21effc7b7a6a8832a269d0a8ed7c8e6b7e957815a24991fcf01d0a42e64ee SHA512 6187e0948b4b9b29f9934d4a760fb9bfdd81bd083d9f01a119f023fcacfe3f6163f8950934241cde24678ec4e4e081eafe6183263bc09c5f9f4db00c5f90259d
+AUX speed-dreams-2.2.3_rc1-xmlversion-rpath.patch 365 BLAKE2B e8e515f75c0300638a2354b7f07c7cf5b7c8a9cac31e1aa4f4d497fb058ec22776b032f6593558add6a301112a128e55d6f10cbd161354f6a5301cc78e567d25 SHA512 a54cb7315aaef8cf14432f7694aae9368d5e687677cdc9baf4b0270580cef15e9e15155c295e8c8d1fb840a0f66f87b1fc502d137cf7d609089caa2791b4258b
 DIST speed-dreams-1.4.0-r2307-src.tar.bz2 332667666 BLAKE2B 17455c6fc6bbe0cb4b5e00d4217eb49e0f6e39a8aa389f304771e32429c48e2e6bc834d8d0c7a01927376c5b37ae8e7b27399da88784b5f46b9549d46d01222f SHA512 6ae88691f52480351825c20c8bfb3ff54783b84bfbbc385ae2c0578991fa9025b16dcdc4ce136b85246a2a479452f2b209ecbec2be0a7ae85818929ea5fa1195
+DIST speed-dreams-src-base-2.2.3-rc1-r7601.tar.xz 212142540 BLAKE2B 894c29281d4ee75b7917fac2f98e2509beb8b6c92b2743f24636407fb3ea54a362ec6bf8cd13e79e96696d83caa5db9c6d05a5baf74228d07c7d8d75542f8c12 SHA512 42dd12283e55289e00e25edb769e5786f0d45b6be4c3056f72e6af7cdb2493fc7266f0485a91118c9c9b1a609fe78ce97c10db006ee0dd51e07b5fdb969026b3
+DIST speed-dreams-src-hq-cars-and-tracks-2.2.3-rc1-r7601.tar.xz 578684928 BLAKE2B eeb567bc7bd713c349037e3c630791ead8dd53c4e7c8d8f75b534d72e85352e546a031211aae4a42338f64b3d21496318b72b08e9ffbb3615439d82fd983e424 SHA512 a9ca5926bdf70173df18abd6be7be54705c916207371595bda1bdd5e70d5ee9105f0fd16a72f5a713ea359b2b001b6f8a39251aac46e117ea4bc9e5dad7b69b9
+DIST speed-dreams-src-more-hq-cars-and-tracks-2.2.3-rc1-r7601.tar.xz 668750172 BLAKE2B 851f31e52acd604b5bcb0ec7b393d33f513a6f2f84239160709fde6db3a23ec94dc39d554c9fb3bcaddcb90c308ac5d11a74a9e9fd410b4885fc9bedee60fb50 SHA512 1aa25700bb60c7a4d47817f821f54603dca9aaf662a23607a3fad367352f69c5182825a8ff4051736095b1277d4de017f5106200f77d74cb7a59780c97d3536c
+DIST speed-dreams-src-wip-cars-and-tracks-2.2.3-rc1-r7601.tar.xz 429292132 BLAKE2B ffb20028ec792a423cd745db1a47274a5db9115510c33bf28c7323bf23a024aa3441dab045b6e81fdc3d17ac22f8919ffa044d07932d242f8cefaa7e274cbc51 SHA512 a31a592c6d86bc12b8d8df6013fc783677e611f4953b6a8650465dbd6ebfb0adcf51193e5003ff38b30619f145c752fe18121d2630bd64687bac113cd8d8c283
 EBUILD speed-dreams-1.4.0-r1.ebuild 1786 BLAKE2B 2ab52173cc2029a066a241d7b48bebb578f5d8ad637fc11fbc9c9b86316e3ffaa9c8336e51c087d4556c640d3a00fef2caf97bd10adc7b28c3aeb9fba8171ae9 SHA512 6d6cf5bcb934167eb38aad7de10d2d32b71507293281e08f9413ff180428caa5387096572d962e0427c1055bc8a1ba9a0af0075153790186d372f349bec90438
-MISC metadata.xml 435 BLAKE2B d5cf15023cbbcfdb115d16b462337e9545185bd6e827e226965f8fe470c8a9825872fccfbdbdf8c208e2902f4adc4afdb1ff0f880fb0954aa8897115b9d47669 SHA512 d7b7bcb0acec23ac1f3b45f794a99597318194ab58d9b488c21766a8a6c32572b3d62540090a0c06e06a7f90d4330d3f7eb730e4c4a56a0a7a7c2bc94d77ed2f
+EBUILD speed-dreams-2.2.3_rc1.ebuild 2408 BLAKE2B eadd258c2ed982d977891434fe41454349ce558c78e95cbbb2c1d8222dcfb46fc1008003dbf0ed81710501905832b54e0168d09c5748a297a9dcab2c001bb217 SHA512 656b09707a1c1331cdc937818e318dfde4bf481bfc681a56d2d5c799625155305b37096ca4c1200f1f59dd41e1db366ca21070cbe4071347d80a40abaaa2b9f3
+MISC metadata.xml 643 BLAKE2B a9a526d2b3abfb2ba3935d7e62c24fa39f9e43c6f68d9e9128a709bc95aa02681327594eaeb59ab63e2759066fb563360d51eabeb8c0e86ec8bbfb47cfafb5d9 SHA512 274c8d4ee746f6af0faf237710fb3406a440a5a6a660ba53312858195652875fd2a047ef6e43fd692bb0a178c617a0e004bffa03ce41b22f361655b46e8787f0
diff --git a/games-sports/speed-dreams/files/speed-dreams-2.2.3_rc1-xmlversion-rpath.patch b/games-sports/speed-dreams/files/speed-dreams-2.2.3_rc1-xmlversion-rpath.patch
new file mode 100644
index 000000000000..784a35f9826a
--- /dev/null
+++ b/games-sports/speed-dreams/files/speed-dreams-2.2.3_rc1-xmlversion-rpath.patch
@@ -0,0 +1,11 @@
+Building with install rpath makes things simpler, but this is an issue
+for used-only-at-build-time xmlversion. Suboptimal fix given all these
+are built for CHOST.
+--- a/src/tools/xmlversion/CMakeLists.txt
++++ b/src/tools/xmlversion/CMakeLists.txt
+@@ -2,4 +2,5 @@
+ PROJECT(xmlversion)
+ 
++SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ SET(XMLVERSION_SOURCES main.cpp)
+ 
diff --git a/games-sports/speed-dreams/metadata.xml b/games-sports/speed-dreams/metadata.xml
index 7585d6ad4181..98a79c4a7da3 100644
--- a/games-sports/speed-dreams/metadata.xml
+++ b/games-sports/speed-dreams/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="xrandr">Enable support for the X xrandr extension</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">speed-dreams</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="osggraph">Enable the new work-in-progress 3D engine using <pkg>dev-games/openscenegraph</pkg></flag>
+		<flag name="webstats">Enable support for sending racing statistics to a web server (experimental)</flag>
+		<flag name="xrandr">Enable support for the X xrandr extension</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">speed-dreams</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-sports/speed-dreams/speed-dreams-2.2.3_rc1.ebuild b/games-sports/speed-dreams/speed-dreams-2.2.3_rc1.ebuild
new file mode 100644
index 000000000000..24aa937c04a0
--- /dev/null
+++ b/games-sports/speed-dreams/speed-dreams-2.2.3_rc1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop
+
+MY_PV="$(ver_rs 3 -)-r7601"
+
+DESCRIPTION="Fork of the famous open racing car simulator TORCS"
+HOMEPAGE="http://www.speed-dreams.org/"
+SRC_URI="
+	mirror://sourceforge/speed-dreams/${PN}-src-base-${MY_PV}.tar.xz
+	mirror://sourceforge/speed-dreams/${PN}-src-hq-cars-and-tracks-${MY_PV}.tar.xz
+	mirror://sourceforge/speed-dreams/${PN}-src-more-hq-cars-and-tracks-${MY_PV}.tar.xz
+	mirror://sourceforge/speed-dreams/${PN}-src-wip-cars-and-tracks-${MY_PV}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+ BitstreamVera CC0-1.0 Free-Art-1.2 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug osggraph webstats"
+
+RDEPEND="
+	dev-games/freesolid
+	dev-libs/expat
+	media-libs/libpng:=
+	media-libs/libsdl2[X,haptic,opengl,joystick,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/plib
+	net-libs/enet:1.3
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/opengl
+	osggraph? ( dev-games/openscenegraph:=[png] )
+	webstats? ( net-misc/curl )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-xmlversion-rpath.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_WITH_INSTALL_RPATH=yes # see xmlversion-rpath patch
+		-DOPTION_3RDPARTY_SOLID=yes
+		-DOPTION_HUDDEBUG=$(usex debug)
+		-DOPTION_OFFICIAL_ONLY=yes
+		-DOPTION_OSGGRAPH=$(usex osggraph)
+		-DOPTION_TRACE_LEVEL=$(usex debug 5 3)
+		-DOPTION_WEBSERVER=$(usex webstats)
+		-DOpenGL_GL_PREFERENCE=LEGACY # legacy needed for gl*ARB symbols
+		-DSD_BINDIR="${EPREFIX}"/usr/bin
+		-DSD_DATADIR="${EPREFIX}"/usr/share/${PN}-2
+		-DSD_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN}-2
+
+		# These features currently lack official support and portions
+		# of the required code is missing in release tarballs.
+		# Check if these directories exist on a version bump.
+		#-DOPTION_3RDPARTY_SQLITE3=yes # src/modules/simu/simureplay/
+		#-DOPTION_CLIENT_SERVER=yes # src/modules/csnetworking/
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local HTML_DOCS=( doc/userman/. )
+	cmake_src_install
+
+	newicon data/data/icons/icon.png ${PN}-2.png
+	make_desktop_entry ${PN}-2 "Speed Dreams 2" ${PN}-2
+}
+
+pkg_postinst() {
+	# Issue reproduced in testing, warn in case it's widespread.
+	elog "If you experience freezes in menus, try to disable menu music in options."
+	elog "See: https://sourceforge.net/p/speed-dreams/tickets/973/"
+}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 20db2cd8e370..b559760fbc70 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/megaglest-data/Manifest b/games-strategy/megaglest-data/Manifest
index 7f45d303c99c..1fe885a7e278 100644
--- a/games-strategy/megaglest-data/Manifest
+++ b/games-strategy/megaglest-data/Manifest
@@ -1,5 +1,5 @@
 DIST megaglest-data-3.11.1.tar.xz 283383936 BLAKE2B d3c3d6c99f8b5f1360ecf72f69b47ce1ee1777019bdd8c2c0cfad8128a0ca07906a906be031526bcd255c5db3565bf4225a1170fdbcfc76819f65055d4d69c79 SHA512 a0ca22c2ba44992ce244c19f1bf3b19983a76520566286728ff4de4c14ef568aec3b166a2dde615b221d4cded8f2714b873a56fd58c1beebdc7120508ba0e357
 DIST megaglest-data-3.13.0.tar.xz 291190184 BLAKE2B 369dfb2f9a0271c686b77b4368043717b57e5863f8918afe3cc429c630ed79173c025ad0c5bad1e94949f4caf841b0e3c6706491a8534b829568c7d89ba97383 SHA512 ac6a6dd85ec2e45d3107549199251b504f128b8fc254b683c7d9c0841b86cd4c32cd45c9d3cbddc3f989bd965d61ef5a0dca9212431876c00a13f8398ff45f4c
 EBUILD megaglest-data-3.11.1-r1.ebuild 622 BLAKE2B 8442d613c7bb399394dfc2eb4b8113ee6677c417e2cb8b87283633f3ef9c2a91b3ac8bc1e9ca6191a4abf62896d0c54d95e1e99cd1d91dd07cb8305da9d366a5 SHA512 cc45ffc465d32cd741625e19d0bb5b273899ff1c3c95b3c9ad8b6635b43116ded4e101f6900b7b1f831577f91ade69b427182579d085f78399b0764cab21cebc
-EBUILD megaglest-data-3.13.0.ebuild 786 BLAKE2B 5bdf6608b7c2622981b30716b32979c8c66cfb82ac1353621828943c668565e0e7b3999e26a8ae40419b2a326a8f1ae7190e2fcd194a3f8dc5c477b55203073d SHA512 84165dfe9e8ab75a076459245ab38a5a8326708150874faca24fddc9b237473347d60862a41a89bc269fc673042f4940ef89eb2d1741d40f31218b3a9ca98cbf
+EBUILD megaglest-data-3.13.0.ebuild 735 BLAKE2B c673c37e617fdfcb580555102528cd93eb67fd9cfb82643da88137dcf8d6a1d8b74bdc766f92bfc0aca5ee817635d68dbb86b356ae06e67bb4e601bbaccab50c SHA512 8011dca05ea8cfcd2cf2d2f3fe897225919cdf0504c27ae2a9181f49374397c0b38d6f744fe5c5fcad68ce785e8680a53306829ad99ca4605497a34d231214d9
 MISC metadata.xml 342 BLAKE2B 3e1f532ee136e71fe0c923694e49cedfdce563f052f0e1a48bad9086fa511ffdef728107969738251cb13fe8df360270df227d1b7dec383110564f5cad54ab1e SHA512 6ae571607c0fefd0ff846ea1f9946d1e5de8a208494b71474f2c46495beb4d306edc37d7ed754305c6e325e7b7306f13f3e78010235bef1c97873cf01de519fe
diff --git a/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
index 9a1f00300e1b..d3e8912a573b 100644
--- a/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
+++ b/games-strategy/megaglest-data/megaglest-data-3.13.0.ebuild
@@ -2,31 +2,30 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit cmake
 
-MY_PN="megaglest"
 DESCRIPTION="Data files for the cross-platform 3D realtime strategy game MegaGlest"
 HOMEPAGE="https://www.megaglest.org/"
-SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/megaglest-data-${PV}.tar.xz"
+SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/${P}.tar.xz"
+S="${WORKDIR}/megaglest-${PV}"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc"
 
-DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 src_configure() {
-	# See bug https://bugs.gentoo.org/709450.
 	local mycmakeargs=(
-		-DMEGAGLEST_APPDATA_INSTALL_PATH=/usr/metainfo
+		-DMEGAGLEST_APPDATA_INSTALL_PATH="${EPREFIX}"/usr/share/metainfo #709450
 	)
+
 	cmake_src_configure
 }
 
 src_install() {
-	use doc && HTML_DOCS="docs/glest_factions/"
+	local DOCS=( docs/{AUTHORS.data,CHANGELOG,README}.txt )
+	use doc && local HTML_DOCS=( docs/glest_factions )
+
 	cmake_src_install
 }
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index d040a278b35e..a920df84db86 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,4 +1,6 @@
 DIST warzone2100-4.0.1.tar.xz 337713608 BLAKE2B 4f1bf79e71c13cd507890f2fe4131687fd70bc3b302aea68c7f17314a0d596797a34d9ab46a6736e98d823122199fb0dfcfb62b1f6b702c6d8ba99eb3c338c9e SHA512 820ab41ebc0ca3e81aff67f90eb3946f6a889776b243795c0cab8dbea44d4c5c3620c849cb70fa45c40af14b9a5667823373f9887078bb2b4feb30d2af007180
+DIST warzone2100-4.1.2.tar.xz 337480924 BLAKE2B 2042aedd43a3515bf6ccfc210dd02502bc20d487ff96ce763f573f0dd92ef08577ee21fd54237b4cf4f99c31ed33197febc70edd25d0e0a515e286167d815f9d SHA512 7218f98757e421d8ccf6c36de5e310060b52506d4e10c3cba6e32d1917da30b9deb52b8081026d8efc84ef44842a7db8604d4a86157409281a30bbcc52b556f6
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
 EBUILD warzone2100-4.0.1.ebuild 2551 BLAKE2B ce7404e0a4fe23a372830f976530636a74f2ddbab39441edfabbe9b53a98f4979959dfc349b657f4b976da11bb15311d0aece530aa5eb141195605ce31f8cb00 SHA512 aab1404f57f3d773eb20f54507e382840f6dcb266ec3534d15f67cedb232fd845afea539267acc2535a7148cc4257731a620bbbd7639b9b02ec77ab4c823454e
+EBUILD warzone2100-4.1.2.ebuild 2523 BLAKE2B 83fd3cbf0941864e1dc2b193411b55b6668495bf043ed7c44e4cb404420e44d6949cd7571aebc13754060e1121f7aa8903a2b729cc8a909606850cc88fc5abd4 SHA512 5070cd1b61eb4395172a93e890ea68b503268e740c56968ce9bb74398f04a6c75ae634173aeb1635621e277bb95132c34911923a6b1889369738a1297df239e6
 MISC metadata.xml 811 BLAKE2B 3b34613b3eeec7f6f428f9e2c48561df6fecc03566d7b9b10618aba37fd53e2f1bd1d09e46804f2c87f2504e4d91d1a289a2a22afea8c7eac01820b779a77cf3 SHA512 af44da84a5578f11e6f01e0310a7aefedf29582c90d257eaa51e64a59fd85a5e60c2f56ca401c58fb40c079c556abc400586aa74dc49d1b5b9073bf750ce1845
diff --git a/games-strategy/warzone2100/warzone2100-4.1.2.ebuild b/games-strategy/warzone2100/warzone2100-4.1.2.ebuild
new file mode 100644
index 000000000000..cb780494cdd6
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-4.1.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+MY_PV=$(ver_cut 1-2)
+VIDEOS_PV=2.2
+VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
+DESCRIPTION="3D real-time strategy game"
+HOMEPAGE="https://wz2100.net/"
+SRC_URI="mirror://sourceforge/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz
+	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
+SLOT="0"
+#[[ "${PV}" == *_beta* ]] || \
+KEYWORDS="~amd64 ~x86"
+# upstream requested debug support
+IUSE="debug discord nls videos vulkan"
+
+# TODO: unbundle miniupnpc and quesoglc
+# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
+CDEPEND="
+	>=dev-games/physfs-2[zip]
+	>=dev-libs/libsodium-1.0.14
+	dev-libs/openssl:0=
+	media-libs/freetype:2
+	media-libs/glew:=
+	media-libs/harfbuzz
+	media-libs/libogg
+	media-libs/libpng:0
+	media-libs/libsdl2[opengl,video,X]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/openal
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXrandr
+	nls? ( virtual/libintl )
+	vulkan? ( media-libs/libsdl2:=[vulkan] )
+"
+DEPEND="
+	${CDEPEND}
+	app-text/asciidoc
+	dev-libs/fribidi
+	media-libs/fontconfig
+"
+RDEPEND="
+	${CDEPEND}
+	media-fonts/dejavu
+"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
+DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md )
+
+src_unpack() {
+	unpack ${P}.tar.xz
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWZ_DISTRIBUTOR="Gentoo Linux"
+		-DWZ_ENABLE_WARNINGS_AS_ERRORS="OFF"
+		-DWZ_ENABLE_BACKEND_VULKAN="$(usex vulkan)"
+		-DBUILD_SHARED_LIBS="OFF"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_DISCORD="$(usex discord)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	asciidoc -b html5 doc/quickstartguide.asciidoc || die
+}
+
+src_install() {
+	default
+
+	insinto /usr/bin
+	dobin "${BUILD_DIR}"/src/${PN}
+
+	insinto /usr/share/${PN}
+	doins "${BUILD_DIR}"/data/base.wz
+	doins "${BUILD_DIR}"/data/mp.wz
+
+	if use videos ; then
+		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r data/music
+
+	doman "${BUILD_DIR}"/doc/warzone2100.6
+
+	doicon -s 128 icons/warzone2100.png
+	domenu icons/warzone2100.desktop
+}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index da21f5ec4a01..bdd4c202e308 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/linux-wbfs-manager/Manifest b/games-util/linux-wbfs-manager/Manifest
index 814f8627fb46..35745b3767b4 100644
--- a/games-util/linux-wbfs-manager/Manifest
+++ b/games-util/linux-wbfs-manager/Manifest
@@ -1,4 +1,3 @@
 DIST linux-wbfs-manager-0.1.12.tar.gz 34251 BLAKE2B 57a3e5c405318ab128455455e6e45fb58b397c6b3135d97b54642569b26fd9f388d65250723818795fc310704afb59db7a682dbcaaea9c26e113bf0a28998e5d SHA512 58ac4d110e27123d04261d618df8734a0471bcad63171025aa4766a73bcc4a9240fceec59b1ba91fff71230e98f57b5fdd12390d380dc0c41d08740b7076bf6f
-EBUILD linux-wbfs-manager-0.1.12.ebuild 885 BLAKE2B c532d4dab9a898b3201b232e8db19e388bfa2674a224325332bfbc21e50bef187dc11b5ef8aec8ffcebe388211dcd8c38a6f178f6ef9183cb2edbfacb9d773ce SHA512 6b89eaf4fa7d97b52368ca0f5fd6cef7c925137f1262b3bd20060487fac4715db85efaf3e327c41a444e2e1907bfb5fc242c1f88333de421f8f2333ee13adce2
-EBUILD linux-wbfs-manager-9999.ebuild 885 BLAKE2B c532d4dab9a898b3201b232e8db19e388bfa2674a224325332bfbc21e50bef187dc11b5ef8aec8ffcebe388211dcd8c38a6f178f6ef9183cb2edbfacb9d773ce SHA512 6b89eaf4fa7d97b52368ca0f5fd6cef7c925137f1262b3bd20060487fac4715db85efaf3e327c41a444e2e1907bfb5fc242c1f88333de421f8f2333ee13adce2
+EBUILD linux-wbfs-manager-0.1.12.ebuild 704 BLAKE2B cecc2a1fa975aab6b1d1bc52583d3bde944fdbce47e6485c0980947c6fcd4cbec2d8178c48a4bae215093060904a1e361367b483eb11a27f342b230ada6c12be SHA512 e14351d2197187057456cd8290e503adedcaf7f91395df5d59a9b063abee6d2ae7b6eaa2d4b3c1bedeed640e061837a9fc1618ae261e41def9dc429f07a3de05
 MISC metadata.xml 341 BLAKE2B 6dfa68b48d7d834af0a719e930d49fca895d7f929780e087882b9e5889ab492f02ad3f3ebaa990e4c995b80ef43e714fce299ff16181426138dcbe5fe1a6c211 SHA512 46913ec989d81928c2faf97ef1a4e57e19f412189b9acf6de875fea5a9615e808dde58ad29df401fa8d125dd1be232f76800dd2497c60a160db752a13f2ff8cd
diff --git a/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild b/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
index c94ba9084a1f..aba85f691454 100644
--- a/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
+++ b/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
@@ -1,45 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	ESVN_REPO_URI="https://linux-wbfs-manager.googlecode.com/svn/trunk/"
-	inherit subversion
-	SRC_URI=""
-else
-	SRC_URI="https://linux-wbfs-manager.googlecode.com/files/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi;
+inherit desktop toolchain-funcs
 
 DESCRIPTION="WBFS manager for Linux using GTK+"
 HOMEPAGE="https://code.google.com/p/linux-wbfs-manager/"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/linux-wbfs-manager/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+	dev-libs/glib:2
 	gnome-base/libglade:2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	S=${WORKDIR}/${ECVS_MODULE}
-else
-	S=${WORKDIR}/${PN}
-fi
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		subversion_src_unpack
-	else
-		default
-	fi
-}
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_compile() {
 	emake CC="$(tc-getCC)"
@@ -47,5 +26,7 @@ src_compile() {
 
 src_install() {
 	dobin wbfs_gtk
-	dodoc README
+	einstalldocs
+
+	make_desktop_entry wbfs_gtk "WBFS manager" applications-utilities
 }
diff --git a/games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild b/games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild
deleted file mode 100644
index c94ba9084a1f..000000000000
--- a/games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	ESVN_REPO_URI="https://linux-wbfs-manager.googlecode.com/svn/trunk/"
-	inherit subversion
-	SRC_URI=""
-else
-	SRC_URI="https://linux-wbfs-manager.googlecode.com/files/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi;
-
-DESCRIPTION="WBFS manager for Linux using GTK+"
-HOMEPAGE="https://code.google.com/p/linux-wbfs-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	gnome-base/libglade:2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	S=${WORKDIR}/${ECVS_MODULE}
-else
-	S=${WORKDIR}/${PN}
-fi
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		subversion_src_unpack
-	else
-		default
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin wbfs_gtk
-	dodoc README
-}
diff --git a/games-util/xboxdrv/Manifest b/games-util/xboxdrv/Manifest
index a2236d7a99ff..920d2aaf60b4 100644
--- a/games-util/xboxdrv/Manifest
+++ b/games-util/xboxdrv/Manifest
@@ -1,8 +1,13 @@
 AUX org.seul.Xboxdrv.conf 247 BLAKE2B 0829d1e65203f56efc0442c798070cf8c9f6b53792b5eb4fd8cc0671068d5d66d281b2c53c5cdb06474b635c2c9c5076d3a64364afdffc87a0c1bf052015f9ff SHA512 1416e80d326481e224ce3381a8feeacf304107f945d787183c74118aae955e191cc89269e8de44d6ce4efc2502def6957b690e9bad70072fcf0bbd47c8ab12cc
+AUX xboxdrv-0.8.8-Update-SConstruct-to-python3.patch 3026 BLAKE2B 344ccb6c567b2ec775bc0cee5562595343ba8baf636a83a7aa841a18c3ec87330832b22661d8d6f100cf20666bc41de9b3fe5823589120e8c27b4742a6407c01 SHA512 91fee5305e55e6158b9ab2198376d84bdff30b3114f4e7c0185d67cf1c6e127d7101bebf80a39adb8d855fdcc25cf08ba9d7a061d25ce7aa6c8a3f3abe686d22
+AUX xboxdrv-0.8.8-Updating-python-code-to-python3.patch 8610 BLAKE2B a92e10e0695c3d271fe40a82f24630c6e09cfce77a3c7064915779f73ceff2dfa3454c7f39d3255f8c9d3436e8657db2f55b1051ab17b58636969f438cf43a80 SHA512 50ef61511e2fd4496015ba8058845bb0e011380445d64ffa5f05988e6a049445b9ddae6e5c60cdd13b8257480a68d2ad5757efceeb40b444aa5b17ce09082a50
+AUX xboxdrv-0.8.8-some-boost-fix.patch 322 BLAKE2B 18a26c6ae89b62cbd261da2f9baa79972587e082beac67854f37d903f29af65cbe39cf24bd81451eeff276453cd04efa5cf8f49f4c18d2cc244e10cf92d12591 SHA512 f698b86ace7558a4a8646826ede09c5a2fc931cd6745741f2abeaa59488b5e3666cc5d839819eade4c350f7a354421e46a06d8cb83041a0ef575b1674a6842b7
 AUX xboxdrv.confd 211 BLAKE2B 7a79059b29edbfbde33fe3daf9c89346246ac4323d7053ea4b26b6dd1fff07d731f8f7faa6a79f152f76eb1722606655f1d8d1026a3a83b0520e1909915039db SHA512 4c8a784a18979746a45653244e451fe1ba9e7cbb14301cc18f58e474e51f7569177364c5a96cbe0275db2b359424febd27c040ede5820148aadb80e90ebf8178
 AUX xboxdrv.initd 446 BLAKE2B f78cf4af5cca703efc0a480c2ba34b0189d2b86a64aa89533e59a4d325ca03592bc911a9c85ff1fe5801ef2ade537dcfcc7266052a77f64ff05dad5f43630167 SHA512 e87d4b4b4313cb4ae983aef4ab7fa799f6b466e0f504eb15905b82f5b8bca2f0ff6f3d9a7d9963c048b6189e2a4c4b862a3f39d4201c2f5f02234362ad7b3af1
 AUX xboxdrv.service 371 BLAKE2B afd5f5397f4ae15af69d8e12865201fe159691ba2a36c00fe207304afe5126814fafd0394e7618e9f4d27611bd2c0dd7371717c7a07a57d27c3a4ab8e6e40140 SHA512 80e7657edae9c771740628ef5f9752b79d50288ead33afe97e71ffc6e7d7c24343eeb213668cdc823b28742976e2e56f4defdcd823716897f3262be1fc7832e9
 AUX xboxdrv.udev-rules 251 BLAKE2B 5a3af6d378b2d6ad5bb2da0dfa356c6939a274b194f075281bbfc3dcaee1c5b9fc63740bbfec2ecd0c8245065262a0449c47fad6c522e4773ef2e193018dc95f SHA512 131c90bee6ac4da5e3d51c7212abb362a540092db97af56332cdfe14e836c84c97727823462ea378da6e5544fda2fb4d36fbe00b6210e5663316f914eaa3f4ad
 DIST xboxdrv-0.8.8_p20190118.tar.gz 322541 BLAKE2B ffa1021f974414ab9efebccf89e8be9137647ba7e1adf3bc9dad3b17b362b340f087fdac42c9b91a29a4cfe13295df6d3861fe953d9f96e80df08d4a6b1ce754 SHA512 ede650090c67642dc4729acc37630ae807f354d76f9bf31e23357668b6ae2b8d0261d2cf6e33090ab2120083b0664332dab22f1ed682bcdcbf1cac88b97e67af
+DIST xboxdrv-v0.8.8.tar.bz2 268046 BLAKE2B 3092a0e1e1cf1ee351879e791212445c567772f4115eb09eeb0c28bc1692b1951837ae7f6488091eb57d06cd38edae4e964502524606370f1ccd8fc39b307db8 SHA512 9b90f866ab322aaf3223215c78120a7aeacb56970fedf2e603f14704bd517b8316a3e28edb6a75e1a47729e9ced4cde5cac3a2f7a95d8514b83219b8821eb9db
+EBUILD xboxdrv-0.8.8_p20190118-r1.ebuild 1604 BLAKE2B 49b8bc3711a61018dbf581837b0a6753920f330d798289c8e8fda8863506b4d4fc90046b44d5e564a5ea00f7b55647140fb6c42396ed3b02b974554594aa8737 SHA512 6e77f68b5c0e969632981272cefc7768d61b2624d5c4604c16e4536c30a31bace8a58957d329f65ff4dfccfbcf55375acbbec3cf474cddc95613c45890797dcf
 EBUILD xboxdrv-0.8.8_p20190118.ebuild 1590 BLAKE2B 49311695c45790b0eea211b88441f94dfc6b5782f6eb864ae5596db92cf79db9701f6333ffe162d10b7b9a8b8642ddee432bcc7fba30df40973a0610728469c9 SHA512 ce9195afe11dab928897142f14a534b0e625ef7342e1e8e2ea4259fcc6105431ac1a771e138eb1d83160ee2fd90c7e4e9bb781724e59b7d846d5f13549bd6cd2
 MISC metadata.xml 393 BLAKE2B d8177cd12ab0e79dc748743bcaad99dd9bb77542703bbac6040af639e191f2fca4356d0edef80b7d21c7b8c27c269b3e1fe04f03ea8d725ab86920c08394f310 SHA512 e8913486c54693f734d541a4f1f72bc1b29adc9e4de3b8b9c16d657082643f256d87d6888ef7e6dd63f540106f96a9a0fe90aef8334629b73ef75b607709c33d
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-Update-SConstruct-to-python3.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-Update-SConstruct-to-python3.patch
new file mode 100644
index 000000000000..accb4317fad4
--- /dev/null
+++ b/games-util/xboxdrv/files/xboxdrv-0.8.8-Update-SConstruct-to-python3.patch
@@ -0,0 +1,79 @@
+From 39a334fbc0482626455f417e97308e52aa8746a7 Mon Sep 17 00:00:00 2001
+From: Ingo Ruhnke <grumbel@gmail.com>
+Date: Sun, 24 Nov 2019 18:16:16 +0100
+Subject: [PATCH 1/3] Update SConstruct to python3
+
+---
+ SConstruct | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git SConstruct SConstruct
+index 4cd7970..54fa11f 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -15,7 +15,7 @@ def build_dbus_glue(target, source, env):
+                             "--mode=glib-server",
+                             "--prefix=" + env['DBUS_PREFIX'], source[0].get_path()],
+                            stdout=subprocess.PIPE).communicate()[0]
+-
++    xml = xml.decode()
+     xml = re.sub(r"callback = \(([A-Za-z_]+)\) \(marshal_data \? marshal_data : cc->callback\);",
+                  r"union { \1 fn; void* obj; } conv;\n  "
+                  "conv.obj = (marshal_data ? marshal_data : cc->callback);\n  "
+@@ -29,14 +29,14 @@ def build_bin2h(target, source, env):
+     Takes a list of files and converts them into a C source that can be included
+     """
+     def c_escape(str): 
+-        return str.translate(string.maketrans("/.-", "___"))
++        return str.translate(str.maketrans("/.-", "___"))
+     
+-    print target
+-    print source
++    print(target)
++    print(source)
+     with open(target[0].get_path(), "w") as fout:
+         fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n")
+ 
+-        if env.has_key("BIN2H_NAMESPACE"):
++        if "BIN2H_NAMESPACE" in env:
+             fout.write("namespace %s {\n\n" % env["BIN2H_NAMESPACE"])
+             
+         # write down data
+@@ -45,8 +45,8 @@ def build_bin2h(target, source, env):
+                 data = fin.read()
+                 fout.write("// \"%s\"\n" % src.get_path())
+                 fout.write("const char %s[] = {" % c_escape(src.get_path()))
+-                bytes_arr = ["0x%02x" % ord(c) for c in data]
+-                for i in xrange(len(bytes_arr)):
++                bytes_arr = ["0x%02x" % c for c in data]
++                for i in range(len(bytes_arr)):
+                     if i % 13 == 0:
+                         fout.write("\n  ")
+                     fout.write(bytes_arr[i])
+@@ -62,7 +62,7 @@ def build_bin2h(target, source, env):
+                                     for src in source], ",\n"))
+             fout.write("\n}\n\n")
+ 
+-        if env.has_key("BIN2H_NAMESPACE"):
++        if "BIN2H_NAMESPACE" in env:
+             fout.write("} // namespace %s\n\n" % env["BIN2H_NAMESPACE"])
+                 
+         fout.write("/* EOF */\n")
+@@ -131,12 +131,12 @@ env.Append(CPPDEFINES = { 'PACKAGE_VERSION': "'\"%s\"'" % package_version })
+ conf = Configure(env)
+ 
+ if not conf.env['CXX']:
+-    print "g++ must be installed!"
++    print("g++ must be installed!")
+     Exit(1)
+ 
+ # X11 checks
+ if not conf.CheckLibWithHeader('X11', 'X11/Xlib.h', 'C++'):
+-    print 'libx11-dev must be installed!'
++    print('libx11-dev must be installed!')
+     Exit(1)
+ 
+ env = conf.Finish()
+-- 
+2.29.0.rc1
+
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-Updating-python-code-to-python3.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-Updating-python-code-to-python3.patch
new file mode 100644
index 000000000000..139336affd90
--- /dev/null
+++ b/games-util/xboxdrv/files/xboxdrv-0.8.8-Updating-python-code-to-python3.patch
@@ -0,0 +1,238 @@
+From e37d3558a1a8a36fbc5d693c53893127a288fd02 Mon Sep 17 00:00:00 2001
+From: Ingo Ruhnke <grumbel@gmail.com>
+Date: Sun, 24 Nov 2019 18:36:25 +0100
+Subject: [PATCH 3/3] Updating python code to python3
+
+---
+ examples/responsecurve-generator.py | 14 ++++-----
+ runxboxdrv/runxboxdrv               | 46 ++++++++++++++---------------
+ xboxdrvctl                          |  8 ++---
+ 3 files changed, 34 insertions(+), 34 deletions(-)
+
+diff --git examples/responsecurve-generator.py examples/responsecurve-generator.py
+index c74e34d..942463b 100755
+--- a/examples/responsecurve-generator.py
++++ b/examples/responsecurve-generator.py
+@@ -1,14 +1,14 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ import sys
+ import string
+ 
+ if len(sys.argv) != 3:
+-    print "Usage:", sys.argv[0], "STEPS", "EQUATION"
+-    print "Simple generator for generating responsecurve data from equations."
+-    print ""
+-    print "Example:"
+-    print "   ", sys.argv[0], "6 i**2"
++    print("Usage:", sys.argv[0], "STEPS", "EQUATION")
++    print("Simple generator for generating responsecurve data from equations.")
++    print("")
++    print("Example:")
++    print("   ", sys.argv[0], "6 i**2")
+ else:
+     steps = int(sys.argv[1])
+     equation = sys.argv[2]
+@@ -19,6 +19,6 @@ else:
+     left.reverse()
+     left = left[0:-1]
+     
+-    print string.join([str(x) for x in (left + right)], ":")
++    print(string.join([str(x) for x in (left + right)], ":"))
+     
+ # EOF #
+diff --git runxboxdrv/runxboxdrv runxboxdrv/runxboxdrv
+index 360c836..6983496 100755
+--- a/runxboxdrv/runxboxdrv
++++ b/runxboxdrv/runxboxdrv
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #  This program 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 3 of the License, or
+@@ -409,7 +409,7 @@ class ProcessManager(object):
+ 	"""
+ 	# Since reap() modifies __procs, we have to iterate over a copy
+ 	# of the keys in it.  Thus, do not remove the .keys() call.
+-	for procid in self.__procs.keys():
++	for procid in list(self.__procs.keys()):
+ 	    self.reap(procid)
+ 
+ 
+@@ -445,7 +445,7 @@ import os, sys
+ import os.path
+ import fcntl
+ import time
+-import ConfigParser
++import configparser
+ from subprocess import check_call, Popen, PIPE
+ from signal import SIGINT, SIGKILL
+ from optparse import OptionParser
+@@ -482,7 +482,7 @@ class RunXBoxDrv(object):
+ 
+     @staticmethod
+     def runCommandAndGetOutput(command):
+-        print command
++        print(command)
+         callcommand = Popen(command, shell=True, stdout=PIPE)
+         outputcommand = callcommand.communicate()
+         return outputcommand[0].split("\n")
+@@ -517,7 +517,7 @@ class RunXBoxDrv(object):
+         if RunXBoxDrv.which(RunXBoxDrv.sudo_command) is None:
+             raise Exception("Cannot find %s!" % RunXBoxDrv.sudo_command)
+         commandline = "%s %s" % (RunXBoxDrv.sudo_command, command)
+-        print commandline
++        print(commandline)
+         callcommand = Popen(commandline, shell=True, stdout=PIPE)
+         outputcommand = callcommand.communicate()
+         return outputcommand[0]
+@@ -525,14 +525,14 @@ class RunXBoxDrv(object):
+     @staticmethod
+     def killExistingXBoxDrv(sig, signame):
+         for line in RunXBoxDrv.runCommandAndGetOutput("ps"):
+-            print line
++            print(line)
+             fields = line.split()
+             if len(fields) < 4:
+                 continue
+             pid = fields[0]
+             process = fields[3]
+             if process.find(XBOXDRVNAME) != -1:
+-                print "Using %s on existing %s" % (signame, XBOXDRVNAME)
++                print("Using %s on existing %s" % (signame, XBOXDRVNAME))
+                 os.kill(int(pid), sig)
+                 return True
+         return False
+@@ -542,7 +542,7 @@ class RunXBoxDrv(object):
+         loadedmodules = []
+         unloadedmodules = []
+         for line in RunXBoxDrv.runCommandAndGetOutput("lsmod"):
+-            print line            
++            print(line)            
+             fields = line.split()
+             if len(fields) < 3:
+                 continue
+@@ -555,17 +555,17 @@ class RunXBoxDrv(object):
+                     unloadedmodules.append(modulename)
+         for modulename in MODULELOAD:
+             if modulename in loadedmodules:
+-                print "%s already loaded!" % modulename
++                print("%s already loaded!" % modulename)
+             else:
+-                print "Loading %s!" % modulename
+-                print RunXBoxDrv.runCommandAsRoot("modprobe %s" % modulename)
++                print("Loading %s!" % modulename)
++                print(RunXBoxDrv.runCommandAsRoot("modprobe %s" % modulename))
+ 
+         for modulename in MODULEUNLOAD:
+             if modulename in unloadedmodules:
+-                print "Unloading %s!" % modulename
+-                print RunXBoxDrv.runCommandAsRoot("rmmod %s" % modulename)
++                print("Unloading %s!" % modulename)
++                print(RunXBoxDrv.runCommandAsRoot("rmmod %s" % modulename))
+             else:
+-                print "%s already unloaded!" % modulename
++                print("%s already unloaded!" % modulename)
+ 
+ 
+     @staticmethod
+@@ -579,11 +579,11 @@ class RunXBoxDrv(object):
+             raise Exception("Cannot find one of: %s!" % str(UINPUT_LOCATIONS))
+ 
+         if not os.access(location, os.W_OK):
+-            print "Trying to change permissions of: %s" % location
+-            print RunXBoxDrv.runCommandAsRoot("chmod 0660 %s" % location)
++            print("Trying to change permissions of: %s" % location)
++            print(RunXBoxDrv.runCommandAsRoot("chmod 0660 %s" % location))
+ 
+         if os.access(location, os.W_OK):
+-            print "%s is writable!" % location
++            print("%s is writable!" % location)
+         else:
+             raise Exception("Could not set write permissions on %s" % location)
+ 
+@@ -614,36 +614,36 @@ class RunXBoxDrv(object):
+         out = ""
+         while out.lower().find(LOADEDTEXT) == -1:
+             out = RunXBoxDrv.getNext(myProc)
+-            print out
++            print(out)
+         
+     def process(self):
+         commandlist = [self.xboxdrvpath]
+ 
+         if self.configfile:
+              commandlist = commandlist + ["--config=%s" % self.configfile]
+-        print commandlist        
++        print(commandlist)        
+         myProc = Process(commandlist)
+         with_timeout(1, self.checkLoaded, myProc)        
+         if len(self.appandparams) == 0:
+             print("WARNING: No path to application specified!")
+         else:
+-            print(self.appandparams)
++            print((self.appandparams))
+             check_call(self.appandparams)
+-        print "Sending SIGINT"
++        print("Sending SIGINT")
+         myProc.kill(SIGINT)
+         try:
+             with_timeout(1, myProc.wait)
+             sys.exit(0)
+         except Timeout:
+             pass
+-        print "Sending SIGINT again"
++        print("Sending SIGINT again")
+         myProc.kill(SIGINT)
+         try:
+             with_timeout(1, myProc.wait)
+             sys.exit(0)
+         except Timeout:
+             pass
+-        print "Killing"
++        print("Killing")
+         myProc.terminate()
+ 
+ def main():
+diff --git xboxdrvctl xboxdrvctl
+index 4807a11..57177dc 100755
+--- a/xboxdrvctl
++++ b/xboxdrvctl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/bin/env python3
+ 
+ ##  Xbox360 USB Gamepad Userspace Driver
+ ##  Copyright (C) 2011 Ingo Ruhnke <grumbel@gmail.com>
+@@ -71,7 +71,7 @@ elif options.bus == "auto":
+     except dbus.exceptions.DBusException:
+ 				bus = dbus.SystemBus()
+ else:
+-    print "Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'"
++    print("Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'")
+     exit()
+ 
+ if options.status:
+@@ -82,7 +82,7 @@ elif options.shutdown:
+     daemon.Shutdown()
+ else:
+     if (options.led or options.rumble or options.config) and options.slot == None:
+-        print "Error: --slot argument required"
++        print("Error: --slot argument required")
+         exit()
+     else:
+         if options.slot != None:
+@@ -94,7 +94,7 @@ else:
+             if options.rumble:
+                 m = re.match('^(\d+):(\d+)$', options.rumble)
+                 if not m:
+-                    print "Error: invalid argument to --rumble"
++                    print("Error: invalid argument to --rumble")
+                     exit()
+                 else:
+                     left  = int(m.group(1))
+-- 
+2.29.0.rc1
+
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-some-boost-fix.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-some-boost-fix.patch
new file mode 100644
index 000000000000..2063979fee4f
--- /dev/null
+++ b/games-util/xboxdrv/files/xboxdrv-0.8.8-some-boost-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur a/src/controller_slot.cpp b/src/controller_slot.cpp
+--- a/src/controller_slot.cpp	2015-11-09 10:19:35.000000000 -0000
++++ b/src/controller_slot.cpp	2021-08-02 13:05:48.647684177 -0000
+@@ -69,7 +69,7 @@
+ bool
+ ControllerSlot::is_connected() const
+ {
+-  return m_thread;
++  return m_thread.get();
+ }
+ 
+ /* EOF */
diff --git a/games-util/xboxdrv/xboxdrv-0.8.8_p20190118-r1.ebuild b/games-util/xboxdrv/xboxdrv-0.8.8_p20190118-r1.ebuild
new file mode 100644
index 000000000000..c2ce54f034b1
--- /dev/null
+++ b/games-util/xboxdrv/xboxdrv-0.8.8_p20190118-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit linux-info python-any-r1 scons-utils toolchain-funcs systemd udev
+
+DESCRIPTION="Userspace Xbox 360 Controller driver"
+HOMEPAGE="https://xboxdrv.gitlab.io"
+SRC_URI="https://gitlab.com/xboxdrv/xboxdrv/-/archive/v0.8.8/xboxdrv-v0.8.8.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	sys-apps/dbus
+	virtual/libudev:=
+	virtual/libusb:1
+	x11-libs/libX11
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/xboxdrv-v0.8.8"
+
+PATCHES=( "${FILESDIR}/"xboxdrv-0.8.8-some-boost-fix.patch
+	"${FILESDIR}/"xboxdrv-0.8.8-Update-SConstruct-to-python3.patch
+	"${FILESDIR}/"xboxdrv-0.8.8-Updating-python-code-to-python3.patch )
+
+CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python_setup
+}
+
+src_compile() {
+	escons \
+		BUILD=custom \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CXXFLAGS="-Wall ${CXXFLAGS}" \
+		LINKFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin xboxdrv
+	doman doc/xboxdrv.1
+	dodoc AUTHORS NEWS PROTOCOL README.md TODO
+
+	newinitd "${FILESDIR}"/xboxdrv.initd xboxdrv
+	newconfd "${FILESDIR}"/xboxdrv.confd xboxdrv
+
+	insinto /etc/dbus-1/system.d
+	doins "${FILESDIR}"/org.seul.Xboxdrv.conf
+
+	udev_newrules "${FILESDIR}"/xboxdrv.udev-rules 99-xbox-controller.rules
+	systemd_dounit "${FILESDIR}"/xboxdrv.service
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 00a7325a594a..97dc71c50d9b 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 382ad76889d4..36d7d9352875 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -2,5 +2,5 @@ AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
 DIST librsvg-2.50.7.tar.xz 22224148 BLAKE2B 323d8125d73c9e72fefe7a868783f16332fb9e047963ccc0c36af280dc5ca4e1f6df3eee8b28b2380140634f51c1acf5b71fc496dd584ed9abf6ca3ebbb9f4c7 SHA512 064df9440802088f4414ffb70e5115809028858065739443444e5eaf6f809da47c697d31f9423e3ce9efcdeea02ff41ec39f5acf5882f2d35f433b7565be3c16
 EBUILD librsvg-2.40.21.ebuild 2535 BLAKE2B fb7707a26b24f05ef9afe464f036d205e72243fe0b411ddc17b42a3f73bfd35e4a92b9236c12218d4bffb8edc825813f3b08cf164faf6cd1f96e689b76ac2970 SHA512 0ae92c01878ed45cd2da511bca6bcb86465723d3f71752168d5764b56d366544bc6bce1fce2d93ad497c901af8758db11bf3a53ad79389bcf54b16210bb18da2
-EBUILD librsvg-2.50.7.ebuild 2584 BLAKE2B 837696ae52e658d5a2d8332ef9cbbfc18002cceeae65264c82cf2828b3296ba989d8cbf0292a5829730d1fce6bf925fbb09350fc2b6bc97c2c448b78557a4abe SHA512 4e7b7fbf31a66cbda799da85320f72edbd9c44c7838e50623357be7ba87081134369183512145be44c66494abe657984d4af9669c91aecd99be4d00c0f6c4849
+EBUILD librsvg-2.50.7.ebuild 2589 BLAKE2B 5df1b41820385453d3ab8e578eeace69cd369d452bc6ac2d980e28bfb65ec7002550b0f14b16560d4ec03dd7ada688b9c60175db2d1d39d62161adeba7871b2d SHA512 456bb04cfcb59aeb924f425afd4a595c4a6b25b74264bfc6978a5c8f66cb97321a2d7beef8fedbe51ddb313caae2613620e08d53e08e3710b719ba26b3911bb8
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.50.7.ebuild b/gnome-base/librsvg/librsvg-2.50.7.ebuild
index 17c60e5ec412..c498732ad533 100644
--- a/gnome-base/librsvg/librsvg-2.50.7.ebuild
+++ b/gnome-base/librsvg/librsvg-2.50.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 2450c4c6e4e6..662516fdebd7 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/slurp/Manifest b/gui-apps/slurp/Manifest
index 4674fe397979..65bba2b88ac0 100644
--- a/gui-apps/slurp/Manifest
+++ b/gui-apps/slurp/Manifest
@@ -1,4 +1,6 @@
 DIST slurp-1.2.0.tar.gz 15317 BLAKE2B 92de74abb54b2d53334e0f0c5d08b0b50e9c4583eb192226e38fcefa07cce2265f808ce81c04170e65d3c1209fa263352e3d70cc0a7cf745ed5e18d57c4d3af6 SHA512 443cd497049a5128e80a48c7b2afcc555a8d58a5eacc2dc6207058a9a399bc9e9804c7bca8b010af63f8be99000c05245720bd3e8cca248a74d5aa63a7faf4f9
+DIST slurp-1.3.2.tar.gz 17734 BLAKE2B 42795f1927742ce9606c685a49f2fb395905c875b50b50b60b68bf129d3c6743278a0eeaed72b94921dd65bd4ca4c078c24c693029cff84dbcbe20165242653c SHA512 9e7f9e4b46095fce5dcc05f8d04b5e576771d15080a0ec451a8a5df681d5ab818cb4d5284a74e1650f775e2d05ca32d66551d8e333d6002827c8b60b12d6bb28
 EBUILD slurp-1.2.0.ebuild 850 BLAKE2B 9bbd040d4c88e4b58b5244b89c423edfc126d2b90e718cf8f2b8cdda6012d01a59800d062d59974452f884c8f30b8f968cdd91dc738e0f7e54ee23d886c1f64e SHA512 95a988c9618f250b519a885ed485b840db2d4d5b29fb02b84dbf3ba62ff55b48789190e4332b9361c1827778b0e83c8e6389fb6be9ed6ba196abcf079a5084aa
+EBUILD slurp-1.3.2.ebuild 879 BLAKE2B 3c1be55b2a74b8fc0933937e05c33e288de0efba52e2d7673faeae5884e2c1c3a162675f436a2911b1266d100d5ddaf3a885fbff690b81783c25c15923e716dc SHA512 7bbb9ee909397d665c6d4c44f3459a5d114ae7766095ee56dd540a64010625c7d2d8a978292cfb263eee66bed1172a8bd0fae72af725e7e599e7071fd0ebd960
 EBUILD slurp-9999.ebuild 793 BLAKE2B 7f071a9a0247b4c77a4ab1eafc3ccf9ad2c02e394a9a9ac746406481d268a2a393595751bc33a5e7e1ed361deee94a11a06386ba8b5cc80a818611e3d1f1e59c SHA512 9032523746be0c4d4d42d93acdc24555a14f4878baf0ff4cf5ef03a643d14524d8cd4d2dc5aa31fedd80a9dbcfb3a9e7f76faf768165ac3ff4d2a36ffdf573a9
 MISC metadata.xml 494 BLAKE2B 84455bb87f740e90f81c1ea2e6d6441bb3eacd8607abbaac35a7b10b04c1ce5b04fb54a0d98cd341f0556d7bec7b58210209e82f1f98af75069d869db2ad2b71 SHA512 6623bbb60d411b27ffac51d3094a8afc0fc3c5877471aa8c09d0988d981d58e733d0d45651bc0ef95ded39f4d051edcc23bcb3fc9539b718ffea7650fd61cdd5
diff --git a/gui-apps/slurp/slurp-1.3.2.ebuild b/gui-apps/slurp/slurp-1.3.2.ebuild
new file mode 100644
index 000000000000..caa314103305
--- /dev/null
+++ b/gui-apps/slurp/slurp-1.3.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Select a region in a Wayland compositor and print it to the standard output."
+HOMEPAGE="https://github.com/emersion/slurp"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
+else
+	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+man"
+
+DEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon"
+
+RDEPEND="${DEPEND}"
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( app-text/scdoc )"
+fi
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature man man-pages)
+		"-Dwerror=false"
+	)
+	meson_src_configure
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 4ec0122e899a..3f5b3788758f 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/libwpe/Manifest b/gui-libs/libwpe/Manifest
index 6841d7896bff..5432bf50a555 100644
--- a/gui-libs/libwpe/Manifest
+++ b/gui-libs/libwpe/Manifest
@@ -1,3 +1,3 @@
 DIST libwpe-1.10.1.tar.xz 51984 BLAKE2B 8afb81e85d134a525a9f7cf0156632ea72a72ab94fcb06c411a11d5304b510cb711a1f2f948cb448bf1ac54c4734cce7a2eaa1ca34c2207c6155d4ab5c350139 SHA512 be1f366ae0d23326ceaab0fe4cdbaea4b50ab822c0e9e7315120fa665113d5eea43f5a23c8e5068f041322d3139cd4de75cfb0f03613cb40586fece1467afbca
-EBUILD libwpe-1.10.1.ebuild 576 BLAKE2B 514f93774c1acd01bf913ac6dc434023d5336a88d33a6ce47fbb0c1717e135abd2fc4fcf9aee08dfb8d4177c82ac7785ca0c63562a9c7e294fb852df07e122c6 SHA512 ee6163f2e7cbb6a50008de3689a64583a003bf2370580f2f477ad2efdeb21c090ebde0981045a9270de08d88c848b2e1042fe2984df432f8e8a5ab76684be84c
+EBUILD libwpe-1.10.1.ebuild 581 BLAKE2B 3fc4b0a386f6439e6d17018450519211758c4da697fe04f34ab139f5003eaf741dfa1317356b035c6050cded2938e246ddadbfaee0e3a7addccb9ddb346f854a SHA512 6981f375058f2a8fccb4b326f2551d8aefc9e2f5544b049b0ced91b6c0ca0d804451d03b4906ca5f1eadda23c67a19b82ce6cbc554f2b00a418a6126969d1f2d
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/libwpe/libwpe-1.10.1.ebuild b/gui-libs/libwpe/libwpe-1.10.1.ebuild
index 32a2637fec72..c5a99f43d35e 100644
--- a/gui-libs/libwpe/libwpe-1.10.1.ebuild
+++ b/gui-libs/libwpe/libwpe-1.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="1.0"
 
-KEYWORDS="amd64 arm arm64 ~ia64 ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	media-libs/mesa[egl]
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index e0c786012804..0b9044786b67 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,3 +1,3 @@
 DIST wpebackend-fdo-1.10.0.tar.xz 38484 BLAKE2B 6b2cb4d4b1321245dee13d33ad58ee8d31aa4f5a25cfc2cde2bc2a67db15e9835de59f1b0550b7a205502b2e201398cf8032a0f235ae01f74e4568874cb47620 SHA512 50e65d1560b943ec85b80449c838b61d7ab3baf96844542cce06028bd934b1145319f3fa07a3dc629d2a7896b95ab388edbe853b7e377cf0ff02fb66291e1ce0
-EBUILD wpebackend-fdo-1.10.0.ebuild 656 BLAKE2B 476bc19ad4fae904968f6c248a24f3b46b2130cad2254ece5c17e1d64cb2d8670254c8c11f80747726c303c1d776562ebaef8ff9f0d4c72e1ba44aeeeb1f1e2b SHA512 9f0854d6c3a5159a13de306880478dc10905fb7b3edd5cb9a8c025e649ae1dfa77976637a86f83304c6e1bdd8d4a312126e9af6d44a7359552a6947972be594e
+EBUILD wpebackend-fdo-1.10.0.ebuild 661 BLAKE2B 985ccacc6b85aa9c1c41e1ca324d8f3b7f43d54782625d6abc2c5b33bfe2c3e3e4628b43f1fa53d429c683fa9eb2f9cf1dd43b69b4166b16995a3e7bc72d4aa5 SHA512 81c33fee1d483702daa7bd68c64585bb4fdcaa8bc2754f224aab2e24a02f70aa02397f424b7644f73d7e623484818fd1e1699dd4aa57d2da328460a4af8aa383
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
index d02a9804988b..6079f455d0f5 100644
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="1.0"
 
-KEYWORDS="amd64 arm arm64 ~ia64 ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	media-libs/libepoxy[egl]
diff --git a/gui-libs/xdg-desktop-portal-wlr/Manifest b/gui-libs/xdg-desktop-portal-wlr/Manifest
index 2e4d73a3a459..5edc9bf8c18c 100644
--- a/gui-libs/xdg-desktop-portal-wlr/Manifest
+++ b/gui-libs/xdg-desktop-portal-wlr/Manifest
@@ -1,8 +1,4 @@
-DIST xdg-desktop-portal-wlr-0.2.0.tar.gz 22260 BLAKE2B a1f3a8244b985874a0b663b311157bc2e2098b8c50b6e3688c89d1c7bf7c454048b359ad42b97edb2faae7b232cd5b6843c07098c07e1f97ede507995d214271 SHA512 9b01919b380510389710c005901810ac6fa00299f2b35a37fa949aab361438ab08c30fc95b88e1805dcea7e97ebe2d19111693f82eee545864077347d2659ca9
-DIST xdg-desktop-portal-wlr-0.3.0.tar.gz 29340 BLAKE2B 848e3cb969a6d9f9cfcbb25336bd66bf75e2ae01fc5ba637950bb202399c2344f14cbc7a65c5940678bc4ca02134cee26ee425b88a91d050c6833c6098d34fd6 SHA512 2b01fab18296cb95cf659ff5a74ed6bf1482c033fdb274904bf2c3ea736dd3c8cb2e82f0662439a88f81ae86cc2fca2fbc3c1a9c72267ba126571973a7662e3d
 DIST xdg-desktop-portal-wlr-0.4.0.tar.gz 30776 BLAKE2B c4a6c07f57cc7cf16f16de43571bf9a281e647bcb1216da5a82e9c40d7a8344e78380b08a215a252011c9da8f97294aacc844d999095f4117ea26d17ff9ffec6 SHA512 544dea4601ce8aa8649d15b7c249aa5b0099fa5a6aec1b7a1433439265acede9ac442092da53080c36b372dd0ef5aaa15747b13a56f4a648e1c00ed3c2435e19
-EBUILD xdg-desktop-portal-wlr-0.2.0.ebuild 995 BLAKE2B 3378be82b18f265074ee9e5e6137e88b72b75b7d1cfba215d79a864d671f63254971ee087114870c67961d4cae378e570080c5dd9f8b5cf50bb11afcef351001 SHA512 75970f99d7affbf6af083eab700e8e838e4e4426f125126c4caff77e2239b18c69812ebefb54283717231fa03567a97b582fe4df36006cc771b18ca9df83c11a
-EBUILD xdg-desktop-portal-wlr-0.3.0.ebuild 1016 BLAKE2B c4f0c87b1f64a5d969d263798fcf1eaf6fbf470b46d654590e30f5578f581022ae987c6762942b086879f176905876ffa0913f288a2f585de2437d235fe9bb60 SHA512 9658e32936251dd2fed71e949fe7f54490c094a0eb1219506ac6584d45d33707f68e82e511716e2b01e34376ecb3f937ca12fe11d3ca680550d9f6f994651cd4
 EBUILD xdg-desktop-portal-wlr-0.4.0.ebuild 1009 BLAKE2B 53f3b9542439be482a96d9298999ae1cbbc659b885980ff0cd045c9f81ee521dfcc784ebbb638ba3c99ae460b751612c954228437e52715ee589ebee2fe15add SHA512 b1b4461bee68ba1cfd126d54915a3b0c4c51fda311d56d5c43b099dbec66ba03818e011f647afccc65a27a15541845fb2ce13a2c5f095c42321f617e98ee7372
 EBUILD xdg-desktop-portal-wlr-9999.ebuild 1011 BLAKE2B 9d45d47f0fd84784799da0ceb8fc2df83bb693ab892696989291cd83a5f07d2f5317500d6842722eeb26177aef961655c79bcdebfd533f62f871c86cf8562ca1 SHA512 3a54802faad39b26497b424396347982cafc55b40ad9c927766df591141f6dd9fc4c0f48057d344e7fd54a16a5e16bba130ba80211020e5996a062434325051c
 MISC metadata.xml 347 BLAKE2B acd0b0dd1010eab7fcb18925c58a2f41a53704327e1b2419f2fba11b5f2c84eca044b7c1998fd16744c91e58d8cfaaa0c3e7758a892ba380774ea3132a7a4d92 SHA512 6cc79a37a31c38f1b3ab61124b5489fd0b9bfb5852eff1cc21b2285c2c7a83fcca129c9dd04c491cc33e5bcd6d3798e20d791a440d8612841315249eb29ca591
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.2.0.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.2.0.ebuild
deleted file mode 100644
index 1aa36ee0f399..000000000000
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="xdg-desktop-portal backend for wlroots"
-HOMEPAGE="https://github.com/emersion/xdg-desktop-portal-wlr"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	#KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/9999"
-IUSE="elogind systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	>=media-video/pipewire-0.3.2:=
-	dev-libs/wayland
-	>=dev-libs/wayland-protocols-1.14:=
-	elogind? ( >=sys-auth/elogind-237 )
-	systemd? ( >=sys-apps/systemd-237 )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/xdg-desktop-portal
-"
-BDEPEND="
-	>=media-video/pipewire-0.3.2:=
-	>=dev-libs/wayland-protocols-1.14
-	>=dev-util/meson-0.50.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		"-Dwerror=false"
-	)
-	meson_src_configure
-}
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.3.0.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.3.0.ebuild
deleted file mode 100644
index e5d42ca22778..000000000000
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.3.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 meson
-
-DESCRIPTION="xdg-desktop-portal backend for wlroots"
-HOMEPAGE="https://github.com/emersion/xdg-desktop-portal-wlr"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/9999"
-IUSE="elogind systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	>=media-video/pipewire-0.3.2:=
-	dev-libs/wayland
-	>=dev-libs/wayland-protocols-1.14:=
-	elogind? ( >=sys-auth/elogind-237 )
-	systemd? ( >=sys-apps/systemd-237 )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/xdg-desktop-portal
-"
-BDEPEND="
-	>=media-video/pipewire-0.3.2:=
-	>=dev-libs/wayland-protocols-1.14
-	>=dev-util/meson-0.50.0
-	dev-libs/iniparser:0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		"-Dwerror=false"
-	)
-	meson_src_configure
-}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 51b7e6608074..1606faef6aa0 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index c4894c34831a..d18dec185346 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-20.12.3.tar.xz 342788 BLAKE2B feb4f73e862279dcabb7800f6152748b440f9a284a683fc62eb4187d4e7abf930c88d2af0c32f59b227a88563841557315eb0ddf79f0d130345ee51f178f6055 SHA512 739a7896d457283f92f94e022139edfc22e80383724818bdc457128d1c952f4024ec5e3c91a444c48977d1c8932c60f5b90bda7dd4dddc82fce7ede5bb04c89b
 DIST akonadi-calendar-21.04.3.tar.xz 353884 BLAKE2B be9dca3e2e4920d1e3fe253dfe986035618cd5d0a28150b757044a5e336549a3c8283142ebda3b4d4688a5a27bc7d14b871ddbb9170f65c47aa330ac704424f1 SHA512 220f5ef5d403d3b1f59faf7f57bbd33670e9bd909896ac786618563c8fc67856727f4587039b1666f1f5b1d4bbce93357d474e865b29ac629b21fb59f023801c
 EBUILD akonadi-calendar-20.12.3.ebuild 1192 BLAKE2B 0c2d06768ec8b1bdd6064497e207dbde6e764beb953522e0813572d35c1e310daef1aea48e3551c977e4f10ed2de434a26ddd060de6046a8daa946a8b67b9a84 SHA512 10690eb300a6a1eabd165043fc982efa2a017bcff1a36d16471a21b822533771e0d91d355d55ce3ae93c88a26d563f3b292a12bfa852ac6eb6cc37077e5ace8f
-EBUILD akonadi-calendar-21.04.3.ebuild 1195 BLAKE2B 0b70b97f73173205153c03d6a5407dcd6feba99b02d60b6ffca56cd9c9ec62fe1910836849775fdfec470ac68ec8d7ddafaf280a6bc6bf638c7c438a30c6fa3a SHA512 941fe3e84d8dcd3c87ce8f49b7184a90bdfeeeb29ff07131c82b993bc614e371ee93e31d37b81ef780e069554ecbfa8e6546740a83f73bcc72017154f48d5386
+EBUILD akonadi-calendar-21.04.3.ebuild 1193 BLAKE2B d96e83fee72090d7d1eecb7f24971c7caecff708229fee5253016b93e2dd363d5afff34ce691364ac331ae8231d51fe92f05795f3e14cd6a9beab88534cdcc55 SHA512 8a82f30a535617f5737e6e741a45ad4316ec66c62863b4ef35bfe486d087e7bed72107516ccfd0b78511619b236cdf609755607d6a062c800cc25e1e826abd37
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-21.04.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-21.04.3.ebuild
index 3b14acc43691..0adefda9308f 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-21.04.3.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-21.04.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi calendar integration"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 13006e90c510..6dc38926e291 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-contacts-20.12.3.tar.xz 414416 BLAKE2B d7898bdf6e5a89c9fc0f27dde4414f4c132131e6a8ccfb8c5fa6405fee972df01ee2ac160f5aa4083d82032851e8a111ea8089bd3e69102e275c06830d9405e3 SHA512 41f201d7e37e7570667f4ef6fa61972622301a11b1952a3558491b9263fa8890fa468e55048353ccbe8b4b12339c36352a5f2630dea36e083e932e9b8c045d6a
 DIST akonadi-contacts-21.04.3.tar.xz 424004 BLAKE2B 2eb168269c287e15cdd6f8c85669eb7f689b183d058b55330fe96f1b5595d7084eb2712ba61b0401515eb49a00c268c7308dca6aaaf5469a5a55c5597c293de1 SHA512 11e9d2122fbd8c870bddae42b63f00a16b755c8aabb0f5f88066179d99b721bbbed93dceb9242a36e6aa222a2eee13bbd88235eedf0899c2d2a85aacf0c00ea2
 EBUILD akonadi-contacts-20.12.3.ebuild 1248 BLAKE2B c754ac64599dbc6aa85c11a7ea6f71b1c47f2e1b6a1a98f67c4d50d1f361ea72ad63addcdde009d48319f82f374ef1dbeec3cdee228ce65098068ebce8fbeb21 SHA512 e785fe326869bcee0a69f8c1754f7d954cbe2a2d0553845e9da275cba4132a10926fc0625be3549c432ea7dfa21e8047cb468b29f030745fd86d58bfc7dfb6e7
-EBUILD akonadi-contacts-21.04.3.ebuild 1251 BLAKE2B 3167ede8150c9cbc5c7163452b3a7a735e82369a497c72e428befd8327df75aaa92f957e25aab0660163e0b7663f28c2f2532cb36edb516af925349e52e89b9e SHA512 60833c003e613daaadb76c3a67a8d9c6dc22ad68a39d205335e1c9cb954fd4aa78eb97cbe8904605d701db338a99893a17529bf59a94220338baedfd158d907f
+EBUILD akonadi-contacts-21.04.3.ebuild 1249 BLAKE2B 53305253df04aabdd49cda771a929adb4a6c4cc41bd0df0b7cc8e5b760778e7453a58fdc21d37be4df0c819eef1dcff905a2d71d67dcac7dde78e662408ccecd SHA512 ac7687c090893ae5e110180fc82ea3b94567f83148373bdf93e798cc06cec09a3f017ef81b7b0ef1343d3cc8078554911936999bcf19349a17e8552ad1fcc66f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-21.04.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-21.04.3.ebuild
index 23974b87bba9..52f5f60a1efd 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-21.04.3.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-21.04.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for akonadi contact integration"
 
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index a4144959a0bc..ad7c499936b8 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-import-wizard-20.12.3.tar.xz 506664 BLAKE2B ad2a4a1e0b97ac154b05b2a44a6c4462f3a3fb8414349b681fb58d8ad2531cada7d4d534a3d4438b5ddebd044c9294afbcf0822aeb0f32518756220defd33600 SHA512 8b35a37617347c39ef4c76eaec8e3a982d985e6bd41b6219ab353542a82168b6bb46f01fb383bf02ef2819c51a60b86b837e126a23415a8bbb025b27bfabef2d
 DIST akonadi-import-wizard-21.04.3.tar.xz 512432 BLAKE2B 106d257fa4b8de5e77bb3587897b233d85d251394a583daadfa63d68d06b0aa3abe8b87bdc0105c09a45d269158830b6e9a26a93d61dd4025aea1245996d7a5e SHA512 9ce6034d96dffd6cc37b80419faf5eea5687ca768193210c5d13ae1d3acae2336c6cea9fb81489a799f79c9c38f2a4d335769f78bad20252ce75bbb8b6bdc749
 EBUILD akonadi-import-wizard-20.12.3.ebuild 1232 BLAKE2B c590de3398d4c23cf84d5194643d0952f53e11079c47056bb065c02616455047f0a565774e12635ea86e2d2023762dbbf6af329dc4c4d0a790438938675e8352 SHA512 0a450c695316c029bd27f4d50e306bcb17a41d79e8cb754fea8c136fe7c0b281879580ba58aa866f9ea6177f18ae00e4c0c54e3916d948f6e3b035c4f3ae6bff
-EBUILD akonadi-import-wizard-21.04.3.ebuild 1221 BLAKE2B d6f16a04ab008b6c9fd16cf9fbeac8a456086a4c099a5d7fca6c8209b02d269688e45b6ada39d16dd72a531ad539e37d68e6bee61789d53f692ed58a9bc8922b SHA512 892d9ee0e6851e870a4649ca55c837594272e3e3f6fb74bc68e1150258f826338e42edca9ce0b2651b7791861523982001c75abc82f6440accdc61dd32cd29ba
+EBUILD akonadi-import-wizard-21.04.3.ebuild 1219 BLAKE2B a6dcb8333f530749c68b57a8a987e35ac582eaec3dbfdd172029d62a6b5c9ff6581a5f06a9f39e6fdd664f81d97b2d13732f538dfe2e68d708781f11a3efb534 SHA512 efad1a0d7ed1eea7f018b51a9f97cb054a5c0e43cc08d14a203e759842443df513acb3ce3a817ac8cf77bdeee22c5d489f0e7ff4e495b719db898c1f8e191aee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.04.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.04.3.ebuild
index 7eb969d1159c..00054d911289 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.04.3.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 9fae12da8732..31b871c229c4 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-mime-20.12.3.tar.xz 136144 BLAKE2B 4d5421e159e45d41d4fe842be7a019d7df4b273b00082a5747b2759db3851a66224a8d2449caaa9228a402e43fee784ddb84ddcc1ab66df737f9c615582a2852 SHA512 9ca435850f4c65ea285b0663d2b2f490ad79e7d238ec3161a1c60e58b0b897c98f0770e20ebc050c68827b129f10af173cf77ae3ec98fca684ef69839df53a93
 DIST akonadi-mime-21.04.3.tar.xz 142216 BLAKE2B 34cee8faa5f32fd0fefabca22de88117a3db9ad625d4abc64f55ede8762ffde982f15e95c4f20702122731d86bc1057c80cfc172591607fdc54d86e2207c3754 SHA512 c665a2b64275798b4732aec651cab1395feb8cfa8c961498065cfe55aa1c937c3fd47912439fbd150cb902c12ca5023dfcf43018b8a394280b50716b5d735a8b
 EBUILD akonadi-mime-20.12.3.ebuild 884 BLAKE2B e3624d8fc1fc10c5caa2ca4a34beac1e15487ec1af17edca91222068dd47576c08e99221e6b14c51b7a823e2d1d06e2060510683917d6a862d5ffdb1bb0ec88e SHA512 441ac88e6424ba6f40043b6b00f5bec28e5d06b2f9aa043e55aaec8855d3786b607d5715503f5e20640d1b2301f308e9ada2f8659b8926d7ad239454a693faf6
-EBUILD akonadi-mime-21.04.3.ebuild 887 BLAKE2B 7c49d7e30d1df6dfa9169eca31707acadc3368ffd96e45880f4fc51692a57f91c9fc582aa72b9696776c1b2b6d7358e87482280677d493eceafb8fe2e65c7708 SHA512 bfd079f171b418a5de894db8b5527124547ac528232bbbd2cd199e1a783ad74a11a7716c7ec8a280fd7c5f45174b5cc31affe78e6319d720568b6db3876cd275
+EBUILD akonadi-mime-21.04.3.ebuild 885 BLAKE2B 0eac38078d1659b485c90e7b8987779cd2c00e9edb7522ddd63c03769f2983794f056511a33b06d1dd0b4fda0db79feef2595e547b0831b0c71079c1ea909de5 SHA512 c0f4f5f8c35e52dbb82f05461173ea495363e4dc20da6a75f285fb3d635684003d0035f9fb6a0105b8828e06f29ecc7ed696a4bb3d7996e079119b4475863e4d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-21.04.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-21.04.3.ebuild
index 37483e3d8f20..ecc77c0b9df2 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-21.04.3.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-21.04.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi mime types"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 4ca14be64e41..9c6c7b5d41d9 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-notes-20.12.3.tar.xz 22876 BLAKE2B 5e3dece4f5b98a22a93a12c3884a5db70d605f1ab0042644542f25e562dffebfae816ce1b44c737f0a6dc320cf8a4ccc2e79f891b691aa95c82fa26e334a8f75 SHA512 100d26caa3e8ace0d58c58ba58a71f301d9979c86dcd993e43d6bac63ccded76e063d942f86533ea4da20d6657eb9992321c83ec73ed0f5817aff6ce6c90d812
 DIST akonadi-notes-21.04.3.tar.xz 26976 BLAKE2B 9bf5ce4d5373b0f1250cfe31ff10ea19db8dd25794ca68957816d9f826a0b1be3f44fd89898b9c347de5da4b07210e949b1203498c35574fabb759a7e5ef22c8 SHA512 2432077d1336a432cc77b553c9e1b0446a2d99a31f588ea865c3a242419dccf9a3a23086ee5ecb91380a8d55aeb9041f6428c903f06bc472e9997a7310abd82c
 EBUILD akonadi-notes-20.12.3.ebuild 468 BLAKE2B 111837329a0247ea9dc34b70577b1d3386ae6eb72cc44a0a4b159ee729f39f837eabe95b3face9488eb0f7bd4fb87af5ff3e0132b35420d8ce1eabb0344b62cd SHA512 2b6e7fa79282cd1d5e40831eb2d12cf3bbc0f726d3521f045c7c277eaeb2cf0f2c42bc8bca1100925413a6939c24d56fe5c9a083bf339924f0caaf5f8e37588f
-EBUILD akonadi-notes-21.04.3.ebuild 471 BLAKE2B 004abc42d1504de04c74e01d6e8ec71faea80975b15e4a1f391623490b0841d47f7fcc15586bd29a7a70be919c3463d54043cee53adbbcdeae02b73908ee7217 SHA512 2e3f775250ef9cc28c8a59d15cf7c37682b311089edb23d5ee3ba73f552cda21ac4cfcc7896b13e0a7c4fc6273cc9a3291321ace605221753bd2b5e737681833
+EBUILD akonadi-notes-21.04.3.ebuild 469 BLAKE2B 794d35dca34dea1fa27c009ac611b1a4d8196912510569bf24b22f5447b7b41c0cf131c8924e4821e75c38d07b9a4a2b2be068106b5fefdbf46a1dd72db25578 SHA512 14a60c8e6cc46a3a7d0c81032060615ae232215e06552b597ea4c3e8f5a7135bf50eba19762f143e23accdea056942d1382030419311ea427c760a08020dd0b0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-21.04.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-21.04.3.ebuild
index 2131768ae4e5..6d865bc669b2 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-21.04.3.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-21.04.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi notes integration"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index 55cf55088a06..d5eae91bd22f 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-search-20.12.3.tar.xz 93984 BLAKE2B 6a360f1acf51ac6647033278d14494ed83b11d227a84ccbe83d98bef2ec59067f71402702f6a6305e267a906ba2702449dbe2c7623e7d40ac58131af34ae570e SHA512 8942788fa0f5034661abd164136b33228ae71e2d305ad8dcbeb97737bfd9ea8d305d7ba6254ecccb160ac41047b3bcfd29e9ee17bb27a290e2e2e2033c09bc08
 DIST akonadi-search-21.04.3.tar.xz 98676 BLAKE2B 7d42c5e1a4c141ced81cc0ac7f3f8b941d6f7f03b358eb3e027eab12ddb65825d335a2e59ea5c956e6c8a4276e14cd90cb616e3a523ce4d708615da39d3df104 SHA512 cfeb929b4716a2a96e284dfec31688ec80b264a422cb2713fa20a8266452351f8d094f0dfd08c8687115c4862481901e183258e269a5ef2421a3736f89a677de
 EBUILD akonadi-search-20.12.3.ebuild 1301 BLAKE2B 85e1806f1e1d7f12404d315de50a0c74a4deb716c4d6aec4ce917fe902014a7506d5c35b8c942fb2a4122815b945194eace519bf40339d5a081802c9ec428c90 SHA512 e63b03fc6aceb77ff80c556bf01ba6d6d59248a68580c2c28225148ab5ad10d539746056a36f17892eb18871a53ba09d0d225ade082f3c81f68b1d2c87569f5c
-EBUILD akonadi-search-21.04.3.ebuild 1304 BLAKE2B 20a371855f158c90e8143675af67b286cf77ce3165af3ecb731e03482ed74ae5ac6f76b970386768ee055843ac4ccb1b4b7e4ad81e8410e867c1d06cb62e30b6 SHA512 8221ce7d4ebc2fcd959ab529d2fbbc6ad84fbc9fc22ef3d73a3a24fa6f5405bb71223bc8d919960254a4ee8b71a67c09218212ac2286703d309d1064be07f9cf
+EBUILD akonadi-search-21.04.3.ebuild 1302 BLAKE2B 1de754adc24fe206da6eb9c75064096fae71aa977e317eb6b7e8af0f3628bbd2933949a6de16722bf4dba36746066e9c8461164ff42d43da0f5b9eba963d5d4f SHA512 148204add1ac1ca72016562d0261b16aa5faacd7b7a1e430175f51ae557be38f4efbb455bcfe2e69c8271e628b9c01bb4de853309b30b940addc0507a4e93f56
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-21.04.3.ebuild b/kde-apps/akonadi-search/akonadi-search-21.04.3.ebuild
index 82ff1bfde225..1c4899e1ab74 100644
--- a/kde-apps/akonadi-search/akonadi-search-21.04.3.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/pim/akonadi-search"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT+=" test" # perpetually broken, bug 662378
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 7865122c8114..3b5566cbe636 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -4,5 +4,5 @@ AUX akonadi-21.03.80-mysql56-crash.patch 2534 BLAKE2B bc36e6a80f6f93695e35fc19ed
 DIST akonadi-20.12.3.tar.xz 1593588 BLAKE2B 783b75a21cf1b1771a5ed25fb25d395af374e249e43ae15f725e92921ef7afdf312cf39c60457a61ba549ba90fc3aebc8ef0b53b666ad1a89ce0cf58c43748b6 SHA512 516f240349b4a680ee8ab1986b8f3d018e9e54a8802aed404b3deb08491edd67413cc4bbb43aedc583f7110812b6bf41277f83908f54221cf21efb3b7f6e32df
 DIST akonadi-21.04.3.tar.xz 1610436 BLAKE2B 28bd02fd19c88c20dace16df8e738a35c7f02b45a216fc93589c1772f9862f175ea86f734bd28dd22c3261c3a8a09f45f194b2e925a3ed2745f402c891b39e5c SHA512 4da83167904ba21305963ba204fd23e42d7a9ae8bb7c1538dc694cccdeeb2bfd4f76bb558e8033d8b100800755308d6e8d6f5bbccd8a4cc5eab6f85484244044
 EBUILD akonadi-20.12.3.ebuild 3444 BLAKE2B 149f5e1df84514187600dcba980905b0e3a81ea1d169e15e0faf5c3a89c96979f35561fd050852314185bcf9e0d8b2396f1815c7280e62e2890d1c270f149a27 SHA512 16ebc6189f20119203af2e26c164324f5d82d7ca3d276e576a0aff2a07004ebbad400b8c99087f96cf6e451fdb849cf7f6c2d161f85a8b62c9839daf945ee3df
-EBUILD akonadi-21.04.3.ebuild 3448 BLAKE2B 923417260107f35463dccf16a7045ef952d4dbeb6766fa9a3a1fdd28230ac83959a7e08340cb9b9e59252e6b4e3e0e3e046a3055568a9cd48d9776d492d7bd0a SHA512 fabaac9fea2a96546e6b44103bec66f5e4b40dcb236919177bc1c02289a516b5efccd7dfe10d83443f73d704563f21f00ab4b080f4c4edf0b1bb93b5da58505c
+EBUILD akonadi-21.04.3.ebuild 3446 BLAKE2B 57874ffbfd5332df85a954daa10513f96c30a605fd1aa8b3606ac0ea07991eb5400b896a4e6cb6590acbc7b2396c799537f9554311e5c139318e73c8ef110b23 SHA512 a0c3dcd80c2b2b2a5f87203d38322456cb9cbea4ba996cd8c19106424a45a19eb168a0575cbf9791ca06b4cfde485a10532b9dc88dedcf653869a59f60563e85
 MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e
diff --git a/kde-apps/akonadi/akonadi-21.04.3.ebuild b/kde-apps/akonadi/akonadi-21.04.3.ebuild
index 7e807c4a6a14..f645353af681 100644
--- a/kde-apps/akonadi/akonadi-21.04.3.ebuild
+++ b/kde-apps/akonadi/akonadi-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+kaccounts +mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 0be904aa003b..af692f8515b0 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,5 @@
 DIST akonadiconsole-20.12.3.tar.xz 198064 BLAKE2B 84d20b4e1b9194d7936848d9096f84da37419cb38384637c01adfecd9ccf800108e3c7465954f0c3e043746bd2da4047af829411e970bfebdf45950832e74d55 SHA512 6a24e4ea642621472f28d9ead78247830393ce2b917a0f8386890c2a61de4a95250e9cf0823a58a53501955e250860c55c0b536486ffd2b9d71b2347f47d2e82
 DIST akonadiconsole-21.04.3.tar.xz 201740 BLAKE2B 89964b6592a155b80357299842aed95e7c1bc371734b408811f1345381e360a3c278f46f42806306182ad2becd8007962c54de5a928847744ddf82bb57c52d47 SHA512 d2a1daf6feba0154dedbdfebdfb1a5744e523a44d35ca38f46567c7cb50683ac83c604057230957be9d735ec5790e2a28abb2bbf1947156c7dd3104b9a2bafe4
 EBUILD akonadiconsole-20.12.3.ebuild 1481 BLAKE2B 70365c62cba2bd3bf2b3c6c6a0d18af426004bdef57962acdc727fe38152865792b89386ae2e15df95d8126ff91353bb672d74f3a4be47a9a35b86a63216fdaa SHA512 b87cf2d33cdcaf8634f7ee0c808657d9f39f246e95947750aadc8286a1e021e2269df0f7c7649cfaef32e056f5b9c53380e7cbd68c4906c29bd72b2cc4c80390
-EBUILD akonadiconsole-21.04.3.ebuild 1484 BLAKE2B 373f9525eafbb30290121ca22df0c63141a607e9b4d363bf98174d8884039d07fb8e2273fb3317a1afff5086f9a8e18b0f1e5bdcc361d04e50ba81a1f3ab00ce SHA512 e0bafad9142aa30c05f8916b7878ba93f52eda19df7fd6cd5c8212bd4939e2e3cb56a237639f53c77a4ea1a35a297376a1b3504d6a941cf63c78b03d2173f424
+EBUILD akonadiconsole-21.04.3.ebuild 1482 BLAKE2B dc2008c33b9f97cd692f0a5ac6411311a743241639ee99b1a71ef608bed65feff57d5c70aad927adde687160c6689b39d4a514733efccd066079b95b6fe5e736 SHA512 1ce0f1d421828b0a59e197bb68b4755d542fe5a9df9aed0579daf25e2672c90bbc3777bd606e5a93f61932b1b1bb70b3782033216411911852a452c7239d8443
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-21.04.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-21.04.3.ebuild
index a0e66c6a00f1..7de949d7f1ec 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-21.04.3.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
 
 LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 9c631c0662bd..707bde01d796 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -2,5 +2,5 @@ AUX akregator-21.04.0-fix-dependencies.patch 1061 BLAKE2B eaec25b98a2f4aadb4547a
 DIST akregator-20.12.3.tar.xz 2206188 BLAKE2B b1bb959de8d792057b6542a9f059687121fc3cfcffa36e519ebbb10940f1a0d002d9d3c0784e0c1f0163ebaf7442fea19985fe434a728c060e254fbbc8369624 SHA512 f223c45fb63a844a1f662c3a77a1f6d23a9b0f8de738fd3a0a88379a82c1be4343536f6ae11856839b03406181ed1bc42cee8ab2cb1ff2515a74a2adb2327ad7
 DIST akregator-21.04.3.tar.xz 2250844 BLAKE2B 25b3e5d2699509d2bc4ce141065eca1da6974314473497c104f75a5054a195106750d084eae9dd11e4f5619d056da0a6b7d86fa7aaec56ca424d566b3fc9edb6 SHA512 cf431b849e31d01976414f89a887f4de46b22607cfbf4332f272ac15cc0d8334df6adbf03c7a3106b560dc01b58522966906bc828333d25cd872d8e7a6cbf396
 EBUILD akregator-20.12.3.ebuild 1802 BLAKE2B f207d7464a271d66f2762c45d91cb4afd541898da1e4e31e7db870fa2543db3bc75dd05e6fa8b494818e5d9c7e27fb3388db0592dc383b8fb625d1134462c6fe SHA512 cdf959861b19a7bfc091927afbda3e5c8a519ec5d876eefbc03464952e9bc5c6e988626a2d0ab2b02fae5ecfc0262d921b9e306b06050ab8eaf186e708df4aca
-EBUILD akregator-21.04.3.ebuild 1805 BLAKE2B 5c94937e76c374834bee70bae4e167e5f9ed80eca3b54f17672e1e1b1577536c3e412c7b57a078fa15f9c68e68c993587c3cfbe8e4353d68b1e1dc65dcd041ca SHA512 80b7b5abe03fba6f3b1ae81f3772e69b0965f1b457e87b36e3ebba8ca56ccc5c18e4e11c8a2ec30b0597a91d0c9e159ccf900d39e6f85e1037e4556b875ee732
+EBUILD akregator-21.04.3.ebuild 1803 BLAKE2B d0c236476bb1a52ab4531c4ed40df8f326fb3560823708c1054a4a1e200342d2f853720dcaac553c31ef5aa90ed76dfbe99bdda8e9899212bd28cf8efa91091a SHA512 b3da59fa972ed9c8e32d621dc8f4c53395d7d436cc3ce58f0f18e803028d813c917efc8a4e0a7fbdb48d9da25f7d15d3cdfbfa81ef4e7f46ff659cb0c902bccc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-21.04.3.ebuild b/kde-apps/akregator/akregator-21.04.3.ebuild
index 6b59cc52f087..68c86b1c7146 100644
--- a/kde-apps/akregator/akregator-21.04.3.ebuild
+++ b/kde-apps/akregator/akregator-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/akregator/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index 073e9ab6f32c..3c22818cfb47 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,5 @@
 DIST analitza-20.12.3.tar.xz 341640 BLAKE2B 0efcf1596f78413523375ec5dbc3ce9007c36ad71173d03f5c9de7de5add8353c856b27c0d18d2243969d4c147664844a39023eee8df32792c6e8e8ab7aaf1db SHA512 2357c5395bcdf66b1a54de7404441ef6966ef6b2a6c2c9a6cc31d5104a126acdd09f7aeb3f4d605591c0e2753a32967eafbccb48e188c96318126ed6657b0d01
 DIST analitza-21.04.3.tar.xz 346104 BLAKE2B 4187d20ae90dd7e2e326af2cb3ae7e0d2fc2d07feba2565bce63be089115f6e2b898fce316aa1ee7ecafed8b1d2da1c9277217481510d907186d2cbc5f9e23a7 SHA512 d97139f9868e8ad19d8560bcc403fa9a45761581c1f048de113523a157d15b201288bf87c79d634ed408660ceb6f31e0514e1e09c73f5c95e0cda3c659bbe211
 EBUILD analitza-20.12.3.ebuild 913 BLAKE2B c458cf7ca5ed9a9283efaea699c7be1eea149280b95734f1f556b8435154377e67bbcde441082d6edbbf5b91153583f7c0cf4cab3e1b19a4617fc4a2162a35fd SHA512 b108b40cfedce4b6c7de394a43a6f342526e855447aa42cabfb2c133b72760cc41763b9ddfbea71aede71a6e3098393637d6d12d20209405b193ba67022344d6
-EBUILD analitza-21.04.3.ebuild 916 BLAKE2B 1ec4d19088961208ba62a7db4cfbe0368f79ad239226a62eb33884bc8e1daeb75264396539ee35046eaceb3dd450831d0d63d1cfc111dcfc90c0803e541769a1 SHA512 775a5e64f37d04503c5b9181f843429f95c90c20ea41e4a4be963e9216ca66e2c3f32afcb64935560e462bb9f03dc9d62fcc812ff756cfba42f479709befb7e1
+EBUILD analitza-21.04.3.ebuild 914 BLAKE2B 459a77f4a54f578d3f53ff193d52ca99165c2c2eb691c1a22555a26127d3014144b3f9a3878a358ac1ab81cac59eb9093a3c9ac6e34bd8751aa5f81e034eb8d7 SHA512 e515cdd141c9f3a2e9c70043e5ada1abe357ac994ce9428b347ca0b81b313fe6458095278f3359913d4544b679ff72ce9955c19c127aee71e106d6bb6ee392ce
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-21.04.3.ebuild b/kde-apps/analitza/analitza-21.04.3.ebuild
index aa7c43b7fda8..f01e313797c7 100644
--- a/kde-apps/analitza/analitza-21.04.3.ebuild
+++ b/kde-apps/analitza/analitza-21.04.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE library for mathematical features"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="eigen nls"
 
 BDEPEND="
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 83f224861804..12e0028f8c69 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,5 @@
 DIST ark-20.12.3.tar.xz 2717324 BLAKE2B 120dd525b1f6a4230dcb6307b86ff866161ba9da8a47d7a13852ebe028d0efc936b1aaaa69160329fff82d26fcb2aa4d198d09c4d1407774c1184aa7c4aaecdf SHA512 c6f3da5f3c24ad274891af99dd118d0c852382ce632abbc1273a5b6e216ecb53ef466d49d2279d3e6f0e1b088975584eadb2d2182d3819b888047c0a59ba0a7a
 DIST ark-21.04.3.tar.xz 2757408 BLAKE2B edc2c874addb49c56f24c0f506d2c39ccd912887f1f30cb3e6eca49749beb22a99ba42c43ed3ce81d94a0b4fe2dc86e842c35ae71ef35d3e68e97d6e8d00d1b7 SHA512 dd68e113d770b5f871b5fc9b9adc136af4fce814f04ee14c18ad16e17ce4c740aafc6a4fd867878142a500590e074d0068ab6cc1ac87d4f8178ec0d4e1f763a4
 EBUILD ark-20.12.3.ebuild 1950 BLAKE2B 86cf329bb2b3e40049616b487b2012889c4f980bd35e069f29d1df30fcfbf8df4167c8bdefa6074ebb1bd6908e9a58ceeaeb44e7b74d568a3a0f44467c517468 SHA512 6ddc1098c27ef28838f5cedb75e77cfd0f54801e7eff35b62857d26fdc6ed209d6a69e082189a94fb972fe7dd33a70ba5bcad9d3c77e54cacce4dd6effee15ee
-EBUILD ark-21.04.3.ebuild 1953 BLAKE2B 96e7ca6c7952643f01a320fa99755a9b2ad14c021b63deab62d77c342078b98ff6054cb08af7e35f98c962c254db427889bb946925b1f7d068da477a50957d2a SHA512 73137e40cd766699e973c6681721bc54cfc3001e78cceeacba378a4100704c5368f4f195aabe6ffe97ff50346699600666eb7d2c168a8b50def05f525d8c8335
+EBUILD ark-21.04.3.ebuild 1951 BLAKE2B 8489e2d09dd6b22d60f75c65cb5378d24d5b48e927104f4f92659c679ecf3314ca19dd3c08c039eb060808a133bf3abdd306c9cdf446935a858cbf61d76234c8 SHA512 adf415875a9704e1cc73dad87c6402165af26c9720ab67df58ae59f75a19b58908c3ef3366742d40d9d95d0860228ed713cfa191f5fcd14cf75e0cfdcb53fbd7
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-21.04.3.ebuild b/kde-apps/ark/ark-21.04.3.ebuild
index 06239e1497be..dbe4914e0adc 100644
--- a/kde-apps/ark/ark-21.04.3.ebuild
+++ b/kde-apps/ark/ark-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/ark/ https://utils.kde.org/projects/ark/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="zip"
 
 BDEPEND="
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index fac3c83e5e39..f7da68411802 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
 DIST artikulate-20.12.3.tar.xz 1085400 BLAKE2B e482a4cb9e4414737bb60b12ba6fec542a804f885f8723b2e8a01a7ceccb09aead993ee7f98358e02e1d9401ddda2348bc6ba18d95f9566c4af1e16c2ee47edb SHA512 34fec06e45120745c668e58ce691c68c28c56e8528a163c6fa330419018cef258a5ce7a33d2e2cdba991e256a50c2523460ca5224180b37e8764559a229ac3a6
 DIST artikulate-21.04.3.tar.xz 1090580 BLAKE2B 974f3eb1cdf8dea80d967cc7311438e0b95688f19240e0c7e7472bce3d9f4c5a6f036c16774ef1709d05f0217918760b696390b7f21bc9b25a403c3326bd6aa0 SHA512 08ce1529011ec0a7baf6417f4839093efac80f79919213e5f85bf0de8575f28966cff0ce24735e07ea3bd0684eacd05a98cd1903b4f46156ee70dda446f1ffa9
 EBUILD artikulate-20.12.3.ebuild 1080 BLAKE2B 133ff3e3ca96b49540a8e1ef6cdca0742e3606d1994b8a7bcab1e87987848037d25a63ba31dc17bcfbcec4baf5ba5a3ac2797af78110bfc93fd28ad4b82ce96d SHA512 358b7f6bc6e11b88c78a6d197aad5f586898223424e7913d26d4d1c4f0468f3300f62a2e5020096c2b9108eade1007af73002342c7a8e834750a98d23b8eb3db
-EBUILD artikulate-21.04.3.ebuild 1083 BLAKE2B 29e59a54b6a5b2ad76603d1834e91a4d85b93cb383784b3f8bf9f633fe6b393b53c7ea8e77dc8d4fa15519686e2fb737074213cbbcdb7a7d376136278b06428a SHA512 0bc6bfed98e3401451d285796358f08fa9eadba49e1a5587d8fa1b1455a6bf75d19d25c3ca44d65a831f877502438e2f844d6937d4534f3ca5c7123c499f98f4
+EBUILD artikulate-21.04.3.ebuild 1081 BLAKE2B e0da3dc87714746a8039aab62ebf22b9266487e3e33bf67bab00de00e8e093d6a3dde8db69b504252802a018f48671c40313b5ae245bff207b4feb42e43ecdd8 SHA512 4662a01b7f7e127e93d308c6307e81ca373c11496000e69f446b82e31e4f6fd337bc7bf89a8dddd8ab4ff3f1a8a664177f3a4647a44be3f0af7de2b752685efb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/artikulate/artikulate-21.04.3.ebuild b/kde-apps/artikulate/artikulate-21.04.3.ebuild
index 67d5b6648309..b4fb5d4e18fb 100644
--- a/kde-apps/artikulate/artikulate-21.04.3.ebuild
+++ b/kde-apps/artikulate/artikulate-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/artikulate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index 8bfebc7f8edc..1a2c51ac03a1 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -2,5 +2,5 @@ AUX audiocd-kio-19.04.0-handbook.patch 717 BLAKE2B 997c82779a9598d0ffbb0605ca7b9
 DIST audiocd-kio-20.12.3.tar.xz 500672 BLAKE2B 44cd5c3f0670f4336352126fa569c5ee53182efca435d6d308b00a50021190b9627f1bc8ac4b64faa1f25fc3f9aa2f9b91a611c1333f9e8341c6a9ba6fa4156e SHA512 0b5d343f802cee3435fa1aadf39ddba3afa6ec70569bab00da0e0cbda4360618e5384042c913a4e54017f82f27f3f202a509d933762d1b7ef4884d2ba70556bc
 DIST audiocd-kio-21.04.3.tar.xz 517876 BLAKE2B 6e6727c4fa02189184bf0702c92860bfb1a4daa5511a15b279af9101ade0eb0740c8364bca486ae2e317c87e9861b85948bd3ecf70dcb4a213811de1b65b0ed2 SHA512 05c824efdd308070a113ec81b1bb8ff3dea1399c2e9228e7d239ade670bc9e6934cee9abc21deaffa01720d0563a116de786320db19c543c06be675be96d8512
 EBUILD audiocd-kio-20.12.3.ebuild 1082 BLAKE2B 2e96da3421b53f2b2c905dfdd7996b24458c81377cad88e20784d20cb7f7c17f0a1e99f0e9554cc078b7830f1fe81647a14bdd687a9a493094cbd4cb4c00e50d SHA512 f665506398264e550c8022b12b8fbad2054688011b15fdd902f3929ca0aad76f3bb238fbdd991866c20699f7170593d99cbd03e15038dacded8d34029fd7c00e
-EBUILD audiocd-kio-21.04.3.ebuild 1085 BLAKE2B b87b785a67ce6a1a6ec388f83f69d9498c0d7a1db3fe295ccd3b32dc465cedc6428deb88c28658283339ab3d02a79d48644e28a1e9e1b31d1e2d9cd698cfcd5d SHA512 7bf729e0364b9e5ed32eed37c9e833316fc99b814154b01e743f3c0e6c2ac054c13095a8b860c4a55b54a31067ac7418476dea42fb55fc7123352f94bf7a79c6
+EBUILD audiocd-kio-21.04.3.ebuild 1083 BLAKE2B d7dfda1fbbefc524e566238dfa5860c9556facb6f752968e4097425581ec684ce73aa94c4c0c103c3f64e3f00ccb1025b1fdbdfd1da7d8bea848a9ac5c12734b SHA512 bc97d29ae83ee8a520dbbc9b7de2ccd2af2647e1fab6ca585683b05659d14164a5bc8c142de766b2f737c52a8bf022189651ee67ddc73bbf047eb94378e7c552
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-21.04.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-21.04.3.ebuild
index af5c2a65eb01..a1645634a266 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-21.04.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-21.04.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="kioslave for accessing audio CDs"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="flac vorbis"
 
 DEPEND="
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 133a0a1d4c26..002c6b8bc01a 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-widgets-20.12.3.tar.xz 261628 BLAKE2B 95bfc55b901dca67795572e4bd77c5822f1bdfd87c9b24526a1275e556c5ae612d54cead1f6f0d20bb519f39304cfb3d9cb6a59369624a215724178320d0ffc7 SHA512 dc00b8196cb0128c69188981b691b17ef242dc150b38322fa7094b400393cd4b592be472c1c17991fd85f8d606f4138936d225a02568b24ee28440ecdba37650
 DIST baloo-widgets-21.04.3.tar.xz 262660 BLAKE2B a8ed3204f80d5c98dc9081dbfc434b855dd193f7c192cf96820d21fd5677848e5b5da51c158cb90549fb498ef7e2d8147d2ec3f20902c0ed25eca360b2c5016b SHA512 89f83b02052d61079ef4b7bc879e1e6deb0f4ffec90905f40cbc0f8647437852a679bf606f1368d68d9d5fff4532e0d3be8ec48ee1f1431a3ed9a03e1e541d5f
 EBUILD baloo-widgets-20.12.3.ebuild 704 BLAKE2B f0f4d61e4937ee0488899d3ca05700c1052dfc475410f24b8d821c324454196124e3868bc21a22435cec574e7495fb708fc60ad23f9431cfff886332761f0e0f SHA512 76d8d06232f7b5919a1a68bf944fcdc9896cbd5f74f3d890624177456d3bdf793879d6a5f50b66f216ed548a5d1ba78bdb99fc7b879ba2acc000f6d88d2b7ff9
-EBUILD baloo-widgets-21.04.3.ebuild 707 BLAKE2B 6d8547ba0f5e07a9be6b6bc461643eabe8d4108d0fc4e108517176dc6a77ec3c5ee7f2fac6814847fffa7c22e085f0aeec57ed704c818085cd1faad2ea29231d SHA512 1335a37eca3bd5acfd901725b1420496b75d7995ce268b83d00125bf73203803c394eb04268ea04130a33eacf63531c805da9468287a6b3df09945b3337d8760
+EBUILD baloo-widgets-21.04.3.ebuild 705 BLAKE2B 401569556a8560f35dcd6dc3a22703717027c583803edd3680613f4a9ec984db12b81768f744f96b6f308ccc5867d8191ee3e40e8d3f7ce2e39ab02256ae0066 SHA512 a527800a2ae80201a43748586cac779aaae9a91d0c89d91f0f28f215c2a42cb88e29eaffe3402dc0e18a01073b4c308df22993c825692e852fd88913dc4b4938
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-21.04.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-21.04.3.ebuild
index 4d5d9a6075bf..14bbd50763c7 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-21.04.3.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-21.04.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Widget library for baloo"
 
 LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index 652191eeed08..047a5e423738 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,5 @@
 DIST blinken-20.12.3.tar.xz 2537996 BLAKE2B e45062261af09bcb568ae04e99bd6c1070ce6aeee92ddd4f78cbd27399a4635b0d43a6e53b52c3c03ea54e25316334d9b7589716be4be137941ea3d73cc6fe18 SHA512 0c78fdddb9772f003e73ef12cd09557fa0af469ecdbbbefe1b6c01e236f6d882b93182bdd99427d430eb680a0cfb2346a36df54f626cab568bb86d60e1fe3a84
 DIST blinken-21.04.3.tar.xz 2713184 BLAKE2B 81fc786d91c752780ef1855881e4a7f50a5ffba5492ad6fcf35673fa8a046035d798f42352161761e228b50870dc61f7206893511d1b30bc4c781f190765a14c SHA512 245944eb06df94f2df53596f7947fb5eaf8c543062234ab5e8dee61114523e9a40c0c85854509f7e48c0bcdf01ca632925f75a6d69a0870563d1c1869523dd06
 EBUILD blinken-20.12.3.ebuild 896 BLAKE2B 04b5358a6750bd32af51fbd97308565237fa5f4dd3db12d94313d72240c80bbc47b342a774331eca9fc9d426c70d86c648a515c16af86be0e24b45f8c58ea04a SHA512 060d916f45b76999e7d9e1541c06d7e348d4e7a48a000e4c4baf4cd588a0798815b445d01f96258cebb1be0a1499c7372706dd88169e1b0505202b4599c0b80c
-EBUILD blinken-21.04.3.ebuild 899 BLAKE2B df9c3dccf4cffeb20d3843c754759034e460a37d14d19bb320cf91e6aa81026eff55e967e46f908cfbd4358857ce017a49129d5e8e4250296381a85a967dd337 SHA512 a6f0bff93a31fda3a16f06526c1233631779f5b8ec35ea9b176eccf0ed60f34a9119691f2982db1d0e10e4674a9cda537476cd2a4def82c0fa2c8548b262e872
+EBUILD blinken-21.04.3.ebuild 897 BLAKE2B f87eb98e1dad30b1b55cfa2b65e8b1ee61b2075af5561f946e0c59d373d124040ad886f2df0f6ee0d7e32d7a82b3616f82a633ba6afd59bbd718903f58a6fed6 SHA512 34b9b5678d7b40afa51e6856d4b446a8d9be32b51c890d27cca0e1eea851ef41e2babee869c629457dfeea48fe993b5c7ade18da7616f3fc755b2a4e7a33805a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-21.04.3.ebuild b/kde-apps/blinken/blinken-21.04.3.ebuild
index 42de31323cfe..48ccf160a41d 100644
--- a/kde-apps/blinken/blinken-21.04.3.ebuild
+++ b/kde-apps/blinken/blinken-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/blinken/ https://edu.kde.org/blinken/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index a5602ea36ee6..67fc2c040f23 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,5 @@
 DIST bomber-20.12.3.tar.xz 825104 BLAKE2B 1f252e8edc3f3e0a033efc8dece86c62227508379ab5766f1165f6313be5a7008a90d10491a9ba97f4e7ec96751b66769c6fcaf03b0ed766536d00fda2e06d8d SHA512 4a40b968507ee3c0b9db4fd0adb87a734a11e170599513fc2bccf4086047eb9991ca566109f82b7b147cb551efe50e9ecb95d9a3a8b723a8c2c7823cebbde50c
 DIST bomber-21.04.3.tar.xz 828452 BLAKE2B f7fbd659a6e8560d2af3a34c39562a63d9e61d7f4211701e74daa15be42c9a07c7fbd1cd4e57bdaaa1409dd90aa937913b0b0b5ee355cbcd1b49ab46fd8e5898 SHA512 3d03b2a5cad86862e694195cb02b93392f7fc6c750fd8c90d6d137277cb35b081aac2a9c3900ff6703a5e99c9184f121a415a734f356cd6272f7ff066d54becb
 EBUILD bomber-20.12.3.ebuild 837 BLAKE2B 0f6c139a5e9c26ac94e2592f95a6af9b74528b655dcaba6d327eee26549f85cdc71667007a06ff40b2e1575a82897c439496bbb93fffbbe037913695757b1538 SHA512 77b42a2b9f84bf182d15929c34c4bcd26126cc41b1daa3fc390c21b77ad935857a86d59f497649fb8f57eee17da5ec0316aa9ca812637a1545596298acdbfa4b
-EBUILD bomber-21.04.3.ebuild 840 BLAKE2B 9f39877c192b2b232be236a309c1364480f7f053ead48b570f2a9c4988bd62b99cbd9b269d5c8d65d2b32f0d41868b1c8f5cc9b35217290a2fd3e33187a8d415 SHA512 3c2089c3c7d650ea6df541937c66b8c4c0f00bf40ffa7a2f8cfc4638ae211f47e1adc1fabee9a8e2968886c7ba7dba2d02c5490680437e8eaf7da7d69bf799ce
+EBUILD bomber-21.04.3.ebuild 838 BLAKE2B 34bd0f828b375478145107350dfa8198b72f61025a535368e7e88ef11143fef48a986194c5121e6eb5e5770d78c4bc76a53fe880bc35148e21d7d3e639114a7b SHA512 2605ac4445b9becb01eb50bc7bcbb8966d7056044261df7a0b2df0a8de69b9089342c35d6d73ff91fda006fc00fa73e42fda123494f6d5bb1a9acdf0ebab252c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-21.04.3.ebuild b/kde-apps/bomber/bomber-21.04.3.ebuild
index 3ebb460d76c9..d6efb8aa2f76 100644
--- a/kde-apps/bomber/bomber-21.04.3.ebuild
+++ b/kde-apps/bomber/bomber-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/bomber/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index 337e81e742ff..de6f8215c449 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,5 @@
 DIST bovo-20.12.3.tar.xz 205792 BLAKE2B 53589575bf462c3ea9c73e0b85fe3af0b60996dcc39ef90e53bc6704d4d927f3b883373b16897ffe77e959f4ef003eebcb5a597b01966cda0ac0a119087dc28a SHA512 3da7166ea79a597eb8efa092fdcaf85a89f32d2fd8cd9113d33741701c259d2267ace1f050ba87f5ed035cd451aa44fc77cb687a3321fa26a48adf118c4fe2ee
 DIST bovo-21.04.3.tar.xz 207032 BLAKE2B ddf93f0987acfde679a5ff50f854ab36c9ce7e8405d0f3d188dd89482ab476bd93e889bdc7cf2bc39e4f05829c13e02df41fc81d5bf6d68e4baf362d2e065358 SHA512 13c7c3bcf275f1f4ccfd4754844b4ab08618ed80a5ba0681bdc62aadb1a7e8a4275c56c5967394d553890c384198d2bfa49dc66200642ea9e5608bff64006691
 EBUILD bovo-20.12.3.ebuild 850 BLAKE2B f56d288fed804eea909c138e6544faf71b253e09c28e5b5dfbf0b6e44fbd063d2193b722885d4c13e1c99571e180456770b857d21838c0c39a818d2fc5313027 SHA512 f538b5cbb4d2054254f109d0f766fcb261de341d9904c18401a0492c76b5f78fff109c96c94e5ee7e3135ba8ce450864a0783e6079892101f3c46583e717e430
-EBUILD bovo-21.04.3.ebuild 853 BLAKE2B 035cd4101b9ca78ee6b5d93e40b581fc1b5629ec56b0df2633060c4e2b56d8494a2d77a37ec4936dd02996964c1c63be414eff1976fd32c45fc79f872b20a7d1 SHA512 33f7721a6bcd246038ebca7e05bd2cb8b6e86926fef5705d6af75035b259214f2371eb85690c950a2205249072b8b9f48ed9b94f864ae2563eec667e79ac8247
+EBUILD bovo-21.04.3.ebuild 851 BLAKE2B b5205f8d753d5c48fe803eabe056f0d08d3d5b8fc0a6f2d999c980fc89e48d6ecb76715ff39529b8677b7c092bb8c6b0682d321caa6d32be38ed6822dff18edb SHA512 e783c3b82b0eb3f88e40211ec269161e3e58d802f5d97a66c464a260026a7dd87a80e8aac9a6ea6d1a8bb2aa26eb3199d0be8c23d6de28cae6a5582efb99608d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-21.04.3.ebuild b/kde-apps/bovo/bovo-21.04.3.ebuild
index 5e0741ed3a19..3ac978f0f3f3 100644
--- a/kde-apps/bovo/bovo-21.04.3.ebuild
+++ b/kde-apps/bovo/bovo-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/bovo/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index b1440cf2e30b..a972dc1e399f 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-20.12.3.tar.xz 224860 BLAKE2B 0f03e653c6cde40a1288fe24d92d612e238768fe38f9c10e7ddf0a20c18cdc8ce44c85e416a0535bf45a8730dee33358a8027a2c7a67442e98d65066de5c3109 SHA512 5890454e49f4cfb04e3edb4895eb4f4f7abfba691185ccc9b9b3c3efc3d675cfe8c7b493b3378143d5da552ff784a391fd194c7107e4ddd11434aa3c130e5d56
 DIST akonadi-calendar-tools-21.04.3.tar.xz 236956 BLAKE2B 96ff649f343c240dff36c80dcf538a2d8f6dcdca678ca8b24a13e1fcd95f513ba1066ceabf8aefe9b5ed00059b797e1944155e8ff4123c29a5d92d681409ce49 SHA512 c2c7d856aa3805b44beac964212fe20a8c63f0e2950e9111d93270a05e48b37ac39339b94067bc3558d2651d5617c82d34433f0741722fbd16b8661e1f02ef3e
 EBUILD calendarjanitor-20.12.3.ebuild 1085 BLAKE2B 1cbd02f4d8eb4ab4468b3650c845cd5c35a56677fd8ff4b01d011bf6847bdb04c9009c53300f6293b28759ffc066ab74080bf98b6f6793d7138321949c7af69a SHA512 53157f89ab676ad494354aa5d2aa9be60492ef4ae3f4d2b424cd9d66969cc3dc53ac399bf0a79990771de73f014387a94b8ef74af6c004546bcad456b593f158
-EBUILD calendarjanitor-21.04.3.ebuild 1088 BLAKE2B 3afa1cd1f78c193905bbb8161bf6c2a18c534aee0b89770037a897e3463bdfb9ae733c178c6fc3d94960884cd53ead00c58d8fdb4d74832f01fbda702301e61c SHA512 f0b89223972c60abccb41c596afa3f7f0dd176a683d1210cde76264fc97b8d5a56b4fb9874a21b532c753ac8f8597bd838f3d08bc19d6523e1a02c88dbbc3f05
+EBUILD calendarjanitor-21.04.3.ebuild 1086 BLAKE2B 303f137c796ab6b55b812c7ba2392eadac949ecf9a2a822bad6cf7d263b029cc5afea812d4355901a80428898563964ed7c2f1371748a7e1b63bd7757d45319d SHA512 7d1254fd1104ce6623618facce7c6e0bae0e9d3b829103a006c99552125c877ab03f781b1e007cfe42812b5152a4ed496ee91655d25877ebd547832488c333d1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-21.04.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-21.04.3.ebuild
index 27ee1f1d5ada..2e4f5a9d760f 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-21.04.3.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-21.04.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Tool to scan calendar data for buggy instances"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index ac4078f5dad9..9ebce8753878 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,5 @@
 DIST calendarsupport-20.12.3.tar.xz 666200 BLAKE2B 9ba81d61384fb1f5f88c7166f54bb68989657416432948a5709451bc3387102c2b54e99465f15b7e1dcaf46a917a2e211a8fdfc2ad1be09f651a899a593d11a3 SHA512 cfb2c1faabdeae1aee13d1f0a6e3b960b68e835e5f96dc86acb9af7c84d57516b3e7ab131e9f0dda12db41e26aabe65f02c4326c989ed2f54620325e6b11196e
 DIST calendarsupport-21.04.3.tar.xz 755748 BLAKE2B ca30c2f2a991c3fe4989220d59c9eb2913169c0dffd5fde1c009bb771882c2440a76b868c907ed41f6a7a01be07e79041d813da6d12275a7ea34591cc5654c78 SHA512 10ed1bfc953483b0af1cb6e8cb5d35659b0400cb5e61723fdc8a22eba7c5205c8c944fb2c3ba7b07907dd673111cc7bb12db2ac3e04f3bc27c824cdfde401cd2
 EBUILD calendarsupport-20.12.3.ebuild 1261 BLAKE2B 49c14bef54245e290d04dae12690dd1cc97aaa95da9fa9465a2e47ed2a0c07541378fb7b6e41b1df356e621a312801c3b902fb4054d2d5bd7dca36fb269f7c1c SHA512 3d0dc16fc5ad074a75837c09585d5de6ae8e78195e0cc75b6dbde463ab7b31c6d4a56176901155086e4b8f742989eba3ec1c6f724f6ae4f3fd07ea97fdb1eb0b
-EBUILD calendarsupport-21.04.3.ebuild 1264 BLAKE2B 73881dd7e173083e7100f8a4bd4d0f47f1feba220a4de4bd6d2170da3399bd12c021a416083d8557eed1cf74c948380fc07be8b9d73d66008e8f8f4f5188f353 SHA512 8866d6b361ccb785dd9dcb4cfee558627fec3fed96d4cf53220ae263d617727612436da37a490d7e9e976c222f27448743d5ce608a223ced9058d42dc62e7eda
+EBUILD calendarsupport-21.04.3.ebuild 1262 BLAKE2B 540ef0aa67ea44327f2b02bbb36a52d3ae6cc681192c85c1a69900e978df7233760d1a3d2e3ac2bcace04da86bb9dcfa84950f178f5a3c893c1460e66a4773e3 SHA512 5f3d76a4e365564898cbd0bc2efdeba54fe338d9fb4939c072158971811d391d29de4c76c863a5c7ca179dae96e2e2f60941e446eb91949513f8c5e7e3ba2a12
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-21.04.3.ebuild b/kde-apps/calendarsupport/calendarsupport-21.04.3.ebuild
index 5349cf98524d..278c779319f6 100644
--- a/kde-apps/calendarsupport/calendarsupport-21.04.3.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-21.04.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Calendar support library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index ff126faf0d23..481f5ac4c652 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,5 @@
 DIST cantor-20.12.3.tar.xz 9128948 BLAKE2B 9cc4c6b28ea1f9946ad6d4eeac98b5c47b17b16efc434f355ba2a0f71b23afd4a58ab31df12a881e2a35e836901075d197ad9550409a97f025efdbd21ac919de SHA512 35461a47c9ce4aa4de8ca8496ca33c42691db6be927f30018e174f3234a485c436cca90b6362c8ba325f8bc220a09079069278bdfd08f4510dd7d12ee1a39ed7
 DIST cantor-21.04.3.tar.xz 9146060 BLAKE2B da7e55a84df1bf8beb436ecb6b95c0289be1690f7662a6fdd398ff1895c814210f665640b5f617673ab4d557cc9d76016105f99c2431e181db3af14b6905d810 SHA512 9010bb70458296b2a29116e16d8be935d4d1cfe5a6b0554aa24247e3bd76cb97b27a2ffa70608402df588307d5f8c4605ad58ae2ac1d936620cfb2a53d00fadc
 EBUILD cantor-20.12.3.ebuild 3067 BLAKE2B c43df7b68d13b1060adc5bff1bc776edd3a5ef74db98ed52b2a4473498dcd95374251b11658f9a520fb3d7921030a1cb696c2b107505aec7fbf70a02c77a7d23 SHA512 17322f3d03b92d722b445cbad971680a0351d7ee1f54a1671813c4b4a3f416a9c1f00bc344a0da1689e3680320ad5596c085fe23deb76ddd4e919d5e1061ca93
-EBUILD cantor-21.04.3.ebuild 3068 BLAKE2B 638742756fb30ed4549eed5c277d9ed8f4848382752406f44a9adc7554b30cff25eafad2a189e64dfcda4f4515673f41e143afe9edaba2f0d928d549a3473a8b SHA512 a18b23817afea545ada278ea4cabd8709f194f54a25de1b4b0c70688ab232db5ed0e0b9b280425f9cb331650eaafea3fa1e478e36d0b68c03b7b9610af3bd7bd
+EBUILD cantor-21.04.3.ebuild 3066 BLAKE2B c7df2c048e2607e1f60100661d7595711fd7c44aaf92a5a04430a24da066162d93fbe80dc6aa7aa5ca01a978915be43f26d64cb0569dd669847fe1b16d4f185e SHA512 413f46fc83a67f1dd3441170cc137044f723f984f92f2eecb8fb6715920a8fd1606f900f9c90dc246a4747eef66cd5cd3234a369377238dab9b5ab06252a7d53
 MISC metadata.xml 581 BLAKE2B 7cfc048a2cf032149544315ef1f9925a2a98908f052cbabc3964d97a76d4cb7f9d7b5adc0eacd10b6b85b5bb32546b005329940f092013b38840f8b4bd266baa SHA512 708d09a5c43b10211c5eeac3458c4803a9956e62b25c58f4bc360fb1037c83554780eae6c85fa8fbff9ddef12c2f48159308b8a29f1882ca066d87997c474e53
diff --git a/kde-apps/cantor/cantor-21.04.3.ebuild b/kde-apps/cantor/cantor-21.04.3.ebuild
index 31fd4cecdeb4..fea1b777b95c 100644
--- a/kde-apps/cantor/cantor-21.04.3.ebuild
+++ b/kde-apps/cantor/cantor-21.04.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://apps.kde.org/cantor/ https://edu.kde.org/cantor/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+analitza julia lua postscript python qalculate R"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index ed30e5645f10..a9301f8f1572 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
 DIST cervisia-20.12.3.tar.xz 1888284 BLAKE2B 2e49250c45ae8f734f94f726fe6b1a133392fc89080fe2b4d7ec74eed728da0755666a074f12d06eb67b9a959de8d2dd934c143c74491c1facffd12a980dda14 SHA512 461f856f6fc5a9381b981c82aea70c005fa0da424a5658a706b9b6f6c90749cef85c3e3692df38210c891db57ca42b214abba29fc22494a359d32ba4fc017113
 DIST cervisia-21.04.3.tar.xz 1911316 BLAKE2B 90400c96735ad0796e3e4a3407d303d1a3e55f05b4b999c23e042868d0f5be73f23f56e97df199b1d58fb359b787eebe79b236bd13bb8d17320495c1780141e7 SHA512 bc1e39adb48f24c4ea687871109a5c6eea8c389de4599a12e3489b523081656414a4f8cab42e1f0e077542c1fabc7663d7105c655f9aa1c50bfed55471a57b68
 EBUILD cervisia-20.12.3.ebuild 1060 BLAKE2B 30a923c102d00f3286169ac2ae57ab2780884c31c7c3d0f1a3db5249405fdb0df74b9dbcc500456a33d98a15d301ff35ada19a4db5216a1591e54093db7c7591 SHA512 acb30540e31a8777febd5b552c6d46300e870d044f9440d3257cd161458610513c229d103c9bff273f1e7124a962ebed150f636ae67ea659e9f0656e1415f959
-EBUILD cervisia-21.04.3-r1.ebuild 1098 BLAKE2B 05a632e6a1094cc03ddab2d3f01c05e0361f2cb955e4865a0c377f52737f916211d909f310684e96d444720d2b7ad5f9990b7a37f107184e34adab631830868d SHA512 1dfb6cb302f25132d6693fa1f642761d59beef6677099f1ce758adaec0b260ae96d2016aeed58cfe00795315b11372d46521e9f25a385ee82dea67a436a4b9dc
+EBUILD cervisia-21.04.3-r1.ebuild 1096 BLAKE2B b56a038dc2943de1123ea9bc48fb6863482ffc26f2dfab0d661b04680e4fa1589948a33b8f03bda8aa09f2fe6aa5b2c48ee5842f789e882ce0b05e6b55c68c95 SHA512 554c777968f9260b328245b75358c572b33010e2d0ad3e2468a7cb3a213077ca7025d838105e182e9659bc2ae16e356c4df4b1762ecf6c3df85a016c6b240500
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-21.04.3-r1.ebuild b/kde-apps/cervisia/cervisia-21.04.3-r1.ebuild
index 4566fb62dcca..3f16b9845412 100644
--- a/kde-apps/cervisia/cervisia-21.04.3-r1.ebuild
+++ b/kde-apps/cervisia/cervisia-21.04.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/cervisia/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index a41591f4635a..63c06d3541e6 100644
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
 DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 EBUILD dolphin-plugins-dropbox-20.12.3.ebuild 1409 BLAKE2B 804b102e29886168a7f91ccc83851b79fd95110b146ce3c53f15a29857a790075535a8286ea20f59bdebaa3eb6cacae32238f3423dee5af8d25b72aacda4683c SHA512 608ac8ef11c8b58226f3d0b49992eff952b7b9c358bb3e2d632347ccfe382390c844f096262291e172f06c2b8142a616a5e4c1234e6d780e463f38fd40b28e27
-EBUILD dolphin-plugins-dropbox-21.04.3.ebuild 1411 BLAKE2B 6676adfc9d52a74cd615eefadee0bcf9b437274a12185bec82a4240e8897d479386215a8c2bb4c830e5887d5c0323381fc5597bb12a05577b2cbc5dac267c2af SHA512 b6885d1c7d9e95bbd6d39b22e943f92be98522045fd101fce220b59cd556fab28b2a1ee53e3dd80cef666a18ad48d7bd99bb2fe48a64647ce9c15070b49cbd94
+EBUILD dolphin-plugins-dropbox-21.04.3.ebuild 1409 BLAKE2B 3b045b7de049be70e0951a7be827af1cadfbb676ee61e95b035641ed8968129c5d4eba1cffda90fbd82591623a58920f93ac0eb6c5bf7d1191e3874e287a6d01 SHA512 ec32a3ec89e17bb7bfbc4ffd92ec71ed9c05681538fbf358bc2fe9dac45699cd6950fc68575b2bf81dc6a7260c896d4fff6f59830ac7124441f0f078554ed142
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.04.3.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.04.3.ebuild
index 1ae3454402f8..2df3e7ee3a83 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.04.3.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
index 0eb982b1407a..e3a5578d13e0 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
 DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 EBUILD dolphin-plugins-git-20.12.3.ebuild 1521 BLAKE2B f88c2f3a0ee5beea3eb69ddebc7bb58938bef25ceb65d2b532425797d971fe1ab97a47a3c91fc06c928bb1e4125725210424699e1fe57333fbffc46135daebdb SHA512 866d2e57f1700b5935e8d3433fca4e4ffa62c5aeb7251bcb30f55f0c0094a56464b600d6e097b07b18aa63dd6284566af4f895edc168e1ef76af93dbe6fb3598
-EBUILD dolphin-plugins-git-21.04.3.ebuild 1524 BLAKE2B 3a7306f21835e736298dfd85fa5023b5fd662f2eed7e8d783e536b0a861d8f37933a90324ae643f9275b787e47ca7e35c9533282e615fb3e9fae745bfd271ae9 SHA512 a1f032f7a16dda3f5248ac41a38ac86da20282bba8e0a3fde227c5d2d71536b2da7fb48b1223afde0d5bf0729f076f618af0408e916a708da4787e0f7dff50d7
+EBUILD dolphin-plugins-git-21.04.3.ebuild 1522 BLAKE2B a60c1f6c580fbb43875d480490f75fe0f45bcbeb00b5cfee9355d3b07a0fa04d940345d2243f75a02ed4ce8b7ccebbc8c1b91211f12f2412ca83fdf4dc9cd1a2 SHA512 e936c2130f0540a56e403d04a857a914f167b47ee6dc2cd9cec655071106c9eae2c2cf4c72989a4ccd9392e756e4803eae1d50216b62c8476099405740f52ce1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.04.3.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.04.3.ebuild
index eaefe503539a..ed18e827b659 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.04.3.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index de33f53bcd5d..ffedbdb7114f 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
 DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 EBUILD dolphin-plugins-mercurial-20.12.3.ebuild 1649 BLAKE2B c72dd3eb0a917486573da106197018e5ac67acac126eea5902e8287486cd4d5560fca52ac557ea03b3dd1c027d72c10463e3cbb442a1efde8b2e7b8aa0d04fdb SHA512 bfacfc143eaff23b5f7bbf9ba3eef6db3cb7d66ce7f4e7eb023bab06b9c6e2b59dcdf3700a76526267cc9d59646b7efa6e81d69d5487369dffb5e227689a72b3
-EBUILD dolphin-plugins-mercurial-21.04.3.ebuild 1652 BLAKE2B f5c0ed8363184ffaa7dd979c0eed821c4173c873dd905ba11b9e213271b325749cd65ba23a164989581e7f024ebedba7fa7e63199ff03fade6530aaa4fd3e8fb SHA512 a6b9e98956f172b9c44a1d59e44acbbbc00161e602ba0dc2ca82f46f35cd9e6c3d6c0e8dca857346b07c66b1bc6c27f9074e21d7e8e62d3a4aecd437761b4a99
+EBUILD dolphin-plugins-mercurial-21.04.3.ebuild 1650 BLAKE2B 1601e51c88f16f535c90a6e0823723b765ed7f5adf1c3ae21fdd35acdd370142b9e11499ed49514e9dacd03a193bf523457a697c9f5f1e10fcaa58d9ffaa2cb7 SHA512 abed743ea65d73a577b34305582d0350070c737b3bb6f8f59546268f5dd266a1ed039d2246ff9543cbbac34b213a63c7ceb97dc3f65f5752f4f37140cbaf3062
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.04.3.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.04.3.ebuild
index d900060660ae..27e0a72b70ff 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.04.3.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index 3130fa7fcc63..ad7ade015e85 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
 DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad
 EBUILD dolphin-plugins-subversion-20.12.3.ebuild 1481 BLAKE2B 9c5c537f7051a415b1dcb56405cf37e022d37058e42bcaf0bd53978acd93e47b8d80945253a245d9cafc594cf80508f96cc7d37240a59ee3cc1bf195f9782dad SHA512 1f37aa9ccb88974b9602c11668701c72586a54055c7ab5ff9a4b3194ff4d8f81124d5a4f7b7c486ae7c5dfbe2f94cf325750cfdddda87f70f0e58ec2cc3b501e
-EBUILD dolphin-plugins-subversion-21.04.3.ebuild 1484 BLAKE2B 29a5761c417d23ece12a145c3518c828e8d4e4870099a2ee1a399bcb2f2b1ab595478b5beab36a6374f0315ea71fd52e8fe7fa298c28735f91366b40a6e8b658 SHA512 73ffb058c5889f2e9651a0f4408fceec43100d60bf7e545fb010ac8cf318e539bb835faaa41d3b19c465b43d550945a52cd2987ef35dab8da992ecc8b3cb4aa3
+EBUILD dolphin-plugins-subversion-21.04.3.ebuild 1482 BLAKE2B bf51d4dac9281134bd2b74f9312442b643b3d7dc02dd189877a85bfc4135ea73d08774defc751d49b6dde450ca89e59c5e2f91183ef6c91747108834af9dc245 SHA512 fbc15485c39f23a04581e3bd9424a2766cef24df48f76cf5743d032bbd092f784865418b7790f9f0afe737d5544211a974780ea58b77286d763a7ee5140e9c7e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.04.3.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.04.3.ebuild
index 1a505cc51305..28202a7fb686 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.04.3.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 1fca4b4f26d4..58f341de0de8 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -3,5 +3,5 @@ AUX dolphin-21.04.1-fix-no-semantic-desktop.patch 1331 BLAKE2B 83c51b160f7813144
 DIST dolphin-20.12.3.tar.xz 5134660 BLAKE2B 3ad3e7c16d0c4203e189bdf035028777115971091bc3c45a3e88231f9715c9439f44c67b2bf2d9d4680a07d222c0c14858028d54499fbe8cf006e3eae63a9193 SHA512 fb57121875fb6b3db9b3071590ea2b6fe7db1d22238af758591835946ac297d7a1734646385a2f6b7ade41de7dcfdf8f6b5e7dccf335a3cf558259d017e44a11
 DIST dolphin-21.04.3.tar.xz 5228312 BLAKE2B cdfbde0789b5c2dfc31d61e8c37b47e82a31877da9437770c463149b33ee46d4b5b1866aa38b1991f12e878ea27f4424c6b162113d87a865e0bcd815941abd4e SHA512 bb7d2f342aecae3b424aef93591124a5ca041e5e75909ed43c6202bc7cf7ab0e34a883050194b6e71f71425b2116ee579e67016205a648de6d5e5b0d01bf3ea8
 EBUILD dolphin-20.12.3-r1.ebuild 3366 BLAKE2B d7fc3fbb64642f656ea3e236511b622e8063bc86686c723e4f7c6e8c89b52b4653b8f02ba40d831ecfacf539280a93c18194497f99b5cf32bad70901e717ab9b SHA512 a9925a664fec0e061d3f37c3776309ba9a20c5f08d140d86ee648edad9d0aaf9742f1b81f4322de563d7dafd1c6fbf3d01e2c8b2924f3bc4474893b6da73dc93
-EBUILD dolphin-21.04.3.ebuild 3138 BLAKE2B fe35f63099ce1e942a8ea05afc66273af1a75b38705e85adf2827b97b4875447d43627505b09df07a5c0d57c7d0586be76a43e929a2922eab8f9435b39606321 SHA512 90fa3c53345d6211539154d1ec5f14697bd95907772f37b4b02f1d2749fd3d396558feac55e0e66f7b737223e0d4a003f866c46d98a2c35eacb472089c4358f3
+EBUILD dolphin-21.04.3.ebuild 3136 BLAKE2B a44f0851b4064502c5fe9d153f75183a4515c6bfefd192e65689222cc93c89a7e6ed6752b8efd625a90c558fa99b122721c2fe87839d33da1dbe3038df132677 SHA512 29467fbaad9c00884f2f7bc7e95b22a4e2d1b40ec5ceab281e2b75200f14a34e45df3127306ee127f3b052b13b2fb60fadf2fa07112664cc1707607e892aae24
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-21.04.3.ebuild b/kde-apps/dolphin/dolphin-21.04.3.ebuild
index a064de084fd2..daf6dedabe6e 100644
--- a/kde-apps/dolphin/dolphin-21.04.3.ebuild
+++ b/kde-apps/dolphin/dolphin-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="activities semantic-desktop telemetry"
 
 DEPEND="
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 9267716897b0..59de8676e6d1 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,5 @@
 DIST dragon-20.12.3.tar.xz 1656596 BLAKE2B a06979932943221fe99f2fb9e2815b87b94d9cb6aa9c591950b3cda2736cc855a00af943f4e76cef2c00a7cb9c40763023595580d53e94551439a2aa5ec5bc52 SHA512 af05801abdf24670286fcfdade58c600b1f0ae4a0316cc95cb8020deafbba7a5b5832e9907b7cc78569d5074d855a348e9aac325305ccb5afd7fdeb0d1e62527
 DIST dragon-21.04.3.tar.xz 1665740 BLAKE2B c19be546a60b22e54e8d7734d9bd2b704e6540b520882e48bf90c7b470ba11059b9b8a24ac0627bd550c3971f409d1e8b9adeebf2d870cab376a663fc2ecb19e SHA512 b3d55168fae08617f2733407f199e1389eb088a6f82d6d3acae52c434a2f9d100fc8a183d76654ce305eb95991f2b82d01eb0f76a443bac59ddfd0133b14389c
 EBUILD dragon-20.12.3.ebuild 1141 BLAKE2B 1becbbaebd43ec7858753d94880fe81874a6616083e6979e8bea44e78f571d0929dc67038cbde3a8207f138aa2b4a4f5cb60740f6f2296b0f73b6b3ca2b58e63 SHA512 d35543317c78e072c956205a8e1a0ebbb251f490a1890219921c2b2ef144bc954fb62e4811d325904e4756327e26c0b1f01bba06993d5c34215b6ee57e205827
-EBUILD dragon-21.04.3.ebuild 1144 BLAKE2B 43876ea62cc8a97fe26bfe5d59f0240ab14ac42c1552fb67ca166edd33ffda162018a6fdcf0e008c545818fb2ded1b44a17f1d9ba5cdafea7738b3a3dd798d1a SHA512 2185c54423384f513cf7a4b8cccef6aeef72220b7b24314222a9fb4abb245a2c8b0d8d48fa219f7e5e9814b0dafdce53fb8e2889a3d72ca0d6be9884468fde4d
+EBUILD dragon-21.04.3.ebuild 1142 BLAKE2B 572ef492ffb97704bece32b2f640153299959131e0395c696259b6600b9901f2547534341f03eab7a7235d30ea84f87f175cd4c7e4c20eaa3692f5ba525e9e27 SHA512 945edf7e239795a356e5214e913e127b28474f3581e9d76db7622fbc4949d3168f97d00255c303f1ae20575db9982373a2a856582777724a85ad1ff59483a303
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-21.04.3.ebuild b/kde-apps/dragon/dragon-21.04.3.ebuild
index 1cb7a8027540..5a7b0c4f4721 100644
--- a/kde-apps/dragon/dragon-21.04.3.ebuild
+++ b/kde-apps/dragon/dragon-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/dragonplayer/"
 
 LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 43202a9e8f66..aef7831dbac1 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,5 @@
 DIST eventviews-20.12.3.tar.xz 444100 BLAKE2B 9afa966f56b364ca047ec6e13368f833bc91fdd733c376a1d690c2a90c59248385c782542a8e3c66ebd1bc89485149bc32b5c433584e1a686358f30eff0c240a SHA512 a9f69fceffe8772cd059e5407660ef040bd9e4a4d8bff8ef4b4be3e18df989b74e4bb8c66b5d42251c89aeac9b1602fed08e75380e332182160c0a00c9a334cc
 DIST eventviews-21.04.3.tar.xz 452428 BLAKE2B 3d82e1596a25b024e9583eb9d0294e2e9f931d531d0163ee4d77f42d1ac1df30703ef1636028d06b3cf15c3bcca2aa901ff2e24c9c7ea86c3228d85ccc5b70ef SHA512 f8c7d9cb2993163ebaf2707b35afb346900405464666b71835a4b365377a4353a3b53af0301f870aa2529b071be0a46a748abc18db84b46cf3b5027882e08a36
 EBUILD eventviews-20.12.3.ebuild 1201 BLAKE2B 2dc6e8e2bc71d77e9d1dbc096355b7159870259968fa2418d8cb0561f6734e3449c1272be3ea4f86997760afaa3c5e567339b241f3f503610e0f61a6aef60dae SHA512 71a3c5a21e4c490516495155e1f166b1607795d1ab0baafcc8015daa5b8ab2170163b6bd7e71cb0085a6d884a742fb9c7f66805d2047633ce7d1fde976657ab2
-EBUILD eventviews-21.04.3.ebuild 1204 BLAKE2B e1db9d70db8ad51d380d1c78defb013362f45d7a4f369b43c784f8c6bb1b2d1804735547bbe22091106d729c1028ba135d2867e9cd0a4c7ad31174a7a274b878 SHA512 a2c34ebb754bf47df8e4a38373168a6d3210a1e38cd7b56fecdc1657c728ee21623948a9caae1347cc3657d83977d95542d80e4cad066980d297d4a584d4687c
+EBUILD eventviews-21.04.3.ebuild 1202 BLAKE2B 212f2bc1cf29028d3b88ace6f44c6c60513fa55ce70d98378f64bf0d61a9b39c70ef133eccf5246ebf26de77dcbd5b367fa0d212bb31c762cabb85bb00338e89 SHA512 81011eb698f6e9e3dca77d5437f8137dfcd91ec962fc7c422952a9ee0f68b186d2ede0ca6ee4878873531fbd234a507d49709c024c094d3eda1681a6464318b1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-21.04.3.ebuild b/kde-apps/eventviews/eventviews-21.04.3.ebuild
index df1e1307e4ff..d1885b631618 100644
--- a/kde-apps/eventviews/eventviews-21.04.3.ebuild
+++ b/kde-apps/eventviews/eventviews-21.04.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Calendar viewer for KDE PIM"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index e4408b02b86c..5123f98d0a8a 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
 DIST ffmpegthumbs-20.12.3.tar.xz 34088 BLAKE2B cbabaff6409d7349939c8b9d63ca3b38490b5d851032e3aa3d4663bae25202c7361e1fb9cff9863b8073a6f91082f93d4fee4dc696a8f762c813eed1e8d2c28f SHA512 d81f89fa3c26982d9f7e84f76b2deb562308467376b5f01af9acda1bc2d62e21cc3054afe5bcbad5d098e3ecf79d9e9b0adee7e719127aaab228ee8efa190aad
 DIST ffmpegthumbs-21.04.3.tar.xz 33620 BLAKE2B a20fc3791c5a85fabc6019b5467ff105a1de84d32a17337b6b956e4259175ce06c8f0f6782def58bc76acdbfe1130650369a61b51dc1e7064b5b3122bac40690 SHA512 a52ae4b51611dec6822c9817e90f62379ee0a7bde1c00733dc49533b0a189e95efe82a8316d098419435d4b3d8ace92c33f4cd19923cb1e136f9137789eba29e
 EBUILD ffmpegthumbs-20.12.3.ebuild 560 BLAKE2B 42c16e6b703d5135ecc12b4269e56794a0efc1cee31ad520705140ae3a4ab6196e25e36c0be9562f9bd00eefa0a876a38ab3859c541a7c450bba011b5e2ce23a SHA512 16378de64a32da30498a3e9e4a2e362221ac887a208537cca1f3cd7f217b66873d002e8150bc666237838c65329a30814c507e9a31d82794ee690481d5708a9d
-EBUILD ffmpegthumbs-21.04.3.ebuild 563 BLAKE2B 7489fbb26915c38e11f285dbe08da67f5a006b022e08e9deec87bbb58d5cb2cea532216c16ade3ac6eca249d777dd2e6874b44749108ee2177c3a739236f6c9a SHA512 62b32648302c31f3409aaec3978911158d4d66034a910fa7f743ede79a789fd3a0b7901b5bf40a247145af452d3ca6ce63dfa053dd467cf38f77063b138e3ed2
+EBUILD ffmpegthumbs-21.04.3.ebuild 561 BLAKE2B 385951c44a58f58c1df688a6a178b095418c342d7474699c0bf0996b2f28dde4d23f222686e1ff09ed1d7c53c0e4d0ea0d6139edec3898c8f26a351c871290ed SHA512 6c181036546b2886f3499059f1bb1d427cd2775807df2af2a01fcd46ec36e03860f77433919d732035445e7f55776dbbbe27c9f737a7187669cd645c98171828
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.04.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.04.3.ebuild
index 416a9c63a2e1..a5c588856af1 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-21.04.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-21.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="FFmpeg based thumbnail generator for video files"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 6551b2bc57af..fa10ee268ddf 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,5 @@
 DIST filelight-20.12.3.tar.xz 671244 BLAKE2B 0de8b3fddba934d1d6cbd014fa7185f16e0736cf1623cda4efba938a958f5134d71f24ee37d4f9753e5c1edf3e5025b0fbc326f55d1e4922ec5b1a0a7d4a58de SHA512 3a30181a95deb4eb8f9f5cc435658bfa9f5d6406a4756d80535de6783c5ab86c31f874cfa86f56b9a687a72b249d73fcdaa7066e99a548301f648b0abe5b2bb9
 DIST filelight-21.04.3.tar.xz 680804 BLAKE2B 5d90c567752923d89f0a896cd9180e19e834674c0f10471ca301cb004b1cb56aa9946799a34000f94834fae7091ee58aac871c336fbca8e36d81015051eb86d6 SHA512 7f239b0bbef95a111407d85cd7da6f9523a3b12e8ab13a29b4a7f661315e47866bf04a9863464124edd14f4e35b4d45e23cfafe059bd325b7f9f6ed3fc416a7d
 EBUILD filelight-20.12.3.ebuild 930 BLAKE2B 3573a6717f2fac50647d338d461f0529f2534689eae31ca16339034a40d1f5af1f050639564f2975e98e0df90837ee31f9cd229c8a8f79dcd86703391d31fc65 SHA512 ac00cd28b4241d539de64d002e8acd7bb5f77be7215b9d28f338c8c8e3d88a0d181dc30c5980ff127e392c0b67cc425d890dcbbb10acd44eabc7a0ce2809c441
-EBUILD filelight-21.04.3.ebuild 933 BLAKE2B cd7de2b9f41ed8cfdc11bbf7e5000e578b5018d73dc3cfe173b792639ce14288f751dd9e9f289caf0d2883ce9591ee3041f286f15e6226383a4d3edc904a1fba SHA512 e16fd68037480a349706a100f587e6a9300eb0f08e97e05cc760d50a36139eb4c21487c908d748ff0555bacc5361072199f1693aef75aa1d19e5756ac4e8d542
+EBUILD filelight-21.04.3.ebuild 931 BLAKE2B a432ef389a5e04cb4c0e8d26a2237fb6ae0d2808084a4b60970f4be20a79d74a7e64d58c63d15c28dde62c8960d9ea4f09dd0fa1456db2d93606a36138c532ee SHA512 37bea258b5c6db0fc7645eab310ed7b89dfcebcc0508930b6cfde499b44f411f470ca667eb398a59aa2b840391ca0a2f888d6d8fa705bae3d74826ca04770710
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-21.04.3.ebuild b/kde-apps/filelight/filelight-21.04.3.ebuild
index 9a68ac6da41b..37b3e66dca3b 100644
--- a/kde-apps/filelight/filelight-21.04.3.ebuild
+++ b/kde-apps/filelight/filelight-21.04.3.ebuild
@@ -15,7 +15,7 @@ https://utils.kde.org/projects/filelight/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index dcf55a49d661..2bc6489d2b95 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
 DIST granatier-20.12.3.tar.xz 1951672 BLAKE2B ed49b7a3d843eddc721cc826db3e59a428b4c80b56a9c4c5bb9217ee8079737fddde61caf4b360862c89aae7ccc0da8501520b3197308319a77f3a3f7e802b39 SHA512 91b577c2b6e87e4e5376e139d6161d03c9f9f7e835446f11b02541d04e2bb1a0f8f5f6f0ae2f10c1d83ec0ce74046d3d926f29c2d051e68a2c83abf61730ee93
 DIST granatier-21.04.3.tar.xz 1953060 BLAKE2B 0367f09e7189a690cef2c37a30f0623b826f1b25c4e6bfdc645ee35c4f83d40d7e6af91d1baaacc25c1c894d0f957e561024f2ae81153935869a1d3f66a32f58 SHA512 06dad7fed7c0f51fc9c9263eb6cf9b80aadcef9850596cbddad31c4f769b09dabdc4789a6ca6c6805e9dbb35ab1fb23e165a4902f0b4fa2c8ef11efcd25325d5
 EBUILD granatier-20.12.3.ebuild 894 BLAKE2B 44934f80488c8f081398241e886e121604b04f7382d0cf91535b36b3ffb0fe7b8a4eb6db013db9627b652455173c5d0ec29a54963bdb6598b492107474afeb34 SHA512 329503ccd0fd8250614d0b2b2f4605b3c06d3c7d9645472d2f4de227fab7b60c2421ffdd0fcb5e8d83ef26e24e882a869b854f12602aaa802c286d5cd31be3e8
-EBUILD granatier-21.04.3.ebuild 858 BLAKE2B 977bcc02e45a98d8a69f36c4a6ab73482bac66c1d3867f24263ec4e95f949740872e39430814216eb56ac2cc7facc9332e4fc8c4672fb65b7c5cefba54593939 SHA512 3f49e974c4696381d788d6ec46aa5dcfea99a9f2092af5794daa3a3be1ae2190df4b8d31d46610bf3e93f31c604fd617327d2d24f8b8e92cf0913e66bc3c5804
+EBUILD granatier-21.04.3.ebuild 856 BLAKE2B 406a377808294153406d6b8f95cdf4467e4588f70f75c5699136c592e34b991d8f025754b5504c7c9c44f7af4219f61f09ca2a8aebc53fcf543bc0ac501da0f8 SHA512 3a774f40d97028fe0369aa2aba44d6bd41518be2a8bb7ffbf52d46a94502b770839e89edb4602c70565dd70baf1ec6918d78da288b1c7432704e505766976524
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-21.04.3.ebuild b/kde-apps/granatier/granatier-21.04.3.ebuild
index 6000f5d8f10d..ccc43873d3b9 100644
--- a/kde-apps/granatier/granatier-21.04.3.ebuild
+++ b/kde-apps/granatier/granatier-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/granatier/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 72f117e0949f..3814848d8593 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
 DIST grantlee-editor-20.12.3.tar.xz 107424 BLAKE2B ba967fa5f5e5b7415f696a3e2e9874625abddebeb135fec2aa510a8c7241434ebde6f42357ec961cf70fc7deabebf0316e8755de942c2b6b17d3be9392893b3b SHA512 7e601b8f180e502f639ee6fc62fea45c383602a8d9732034ffb5a14d27bf4ec47fe5115e09eb8bca6ba039fa703765fe57aab9b5221c70e05deac2438dcf2fbb
 DIST grantlee-editor-21.04.3.tar.xz 111744 BLAKE2B 53563fc1b03b5f984d9d6c595cfbbb906928bea00a91729025e2e39980d565a25a05b60e122a171e20fa391c98db008b8cf0212a8116cfde736d8b87548b6a0d SHA512 4e1b0a74b4115f3f4bbebdae82dedb21ac8093f7d327c77d45b3b8794d74a17562f288f022cbb11bb790a3acf4e700f9f30d7f637813bc56ac02353c0755b20b
 EBUILD grantlee-editor-20.12.3.ebuild 1264 BLAKE2B 053c90baef7fdc08a99665784258fcfc88d97d67670cb20246399881e50c65ed63fd0501cfd0ef5c553fde801bebd117c0bac8ff28dae6242cc630179c27021a SHA512 fd65644ad30a59d3794ee670d548d024204bed1873421589b52d8a4586839fda1445fb0fe530daa69def553014ef3527a2d5a326830c9d103eadaba7752cf6e9
-EBUILD grantlee-editor-21.04.3.ebuild 1230 BLAKE2B bfc0be8563290b4509b2da89f01bf1e8763835aaaf5feea618733e3c505fdae2d0bcc30713b2fe6c18261749b673d9425a81b91b7b47aa73bde57960431e7d19 SHA512 b95a3e1bd55389e234e944fb4a0b3f6c772ac4ea9e40e85ef36e75d5e2533e68e180eb2ffc9330b891e8ca728a2518bf412782fa2eb1c9228bd7eee8aa807510
+EBUILD grantlee-editor-21.04.3.ebuild 1228 BLAKE2B b4e53befa488f1e368cdfc76f4a859bb58d7211b0cdd26eeb5da1d0eda193b5c0625d558c59122dffc531f5f42bffe1572e0790959a60362514f547f1a1e0ccf SHA512 847f3364f944c2c231c00702840edbba5033277bacb7f175c317d9d46b63400ccc1658a31a36f5a143ac0af0b8f42ce0920558d5421a952eb666de860383f74d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-21.04.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-21.04.3.ebuild
index 7a74222088e2..fc986b86ad6f 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-21.04.3.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-21.04.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 00b4eb9c24de..7e6443ea815f 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
 DIST grantleetheme-20.12.3.tar.xz 56540 BLAKE2B fc65cd63ef8c2a2f5e003f6e8eaab67a3c1a2c1ee1ef4b1a17afede8afcc5ab4c00302ecadd16e24d34ec4c5ff3f60d6e05dfd42b56bb7710c595678db0f99b1 SHA512 8daa07c7903dbff3b2435c35f31e8ff0fc7b7d29ca6f8f05473ef09331c0fc14bb18f419c575c2f4f4778fb6847f5f202b2a30d6e2d699bc57711ee8028f3ac1
 DIST grantleetheme-21.04.3.tar.xz 60808 BLAKE2B 4106d32b9374019a84fa802bb016813f6c1b5b9e07fb6d4d10dcbbc0dbd088dade489c1415e80011e5c72da55c74d3d116b05c4924e48a2f1b93f2978bd76343 SHA512 040c539212ee5247953045343a128f636aaf2c0fc0d8af1b7b3d8c1aeae9378af41f00ff7eb55cec07b92a806efa4b5b219beb9215280b6dac235cb95b9f7cd9
 EBUILD grantleetheme-20.12.3.ebuild 825 BLAKE2B 26c6a21af3b67b6175d7f6f439f0cb4ec94b37b88ec731d75c0ab7b892a7d124b46d785f501fdf4df6f8f70508269daa9e4215c2a97079efde7017bd39cab178 SHA512 bb9aabd48ebaf27996308bbf319a19268bb239bc5f565379ae1d378ec8036440c3e0321360f2d8122d7470b448d5fc87d612a3c9a704e0171dbca62de1138b5d
-EBUILD grantleetheme-21.04.3.ebuild 828 BLAKE2B c1b46e7887ffc4fa2520847ca11ba037ad416c4de8271570172202d64fc22e2c79ce79af48186d9a1cc82fa9fdbf7c31b01c3b785eee29724c274d1e2bb8170a SHA512 c279f8f418b27238538e728a3c4d88f6e31a10fefcf87581d86f9fc59ac0025a13cc240cfb40d044841b9f2d102b888070e067c1882656f106baf96a8e447d64
+EBUILD grantleetheme-21.04.3.ebuild 826 BLAKE2B a74500be94991cd9b171922e588d50e72fb2f64a722b7c6b0a5995960747ba9e5b06f7daf5240520c13c66ca66f13daf86f1a6fa1821b830c91e3debdce57dd3 SHA512 ee5a3f8ca486fa1c867b7b217f83eee2de166777473d4827f26ed6a855c3672c38ca918400a11fa851783636df32b7806a560a13d200200db81b544e2e5f7338
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-21.04.3.ebuild b/kde-apps/grantleetheme/grantleetheme-21.04.3.ebuild
index 52f8ed090e61..52d2fa04eff2 100644
--- a/kde-apps/grantleetheme/grantleetheme-21.04.3.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-21.04.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for Grantlee plugins"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 46522428497a..f021cb9b2d72 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,5 @@
 DIST gwenview-20.12.3.tar.xz 6753636 BLAKE2B ebf4cb69941875f9f2cda8816ff16953fd82a8a434efb18dab60c4ce53e1cd4e76ae8d51ef619b39f18fde82a2fb0943b2a24465513fe85cdb774d411e389c38 SHA512 4a2973029d7bb2e8883cebb8b031fa60068b3a258eceb165a8ba2dcfe52d63fa3c505772a895d72aae93bf88b024fbbb2189e9f1b982ecd94a3629f67d15eb2b
 DIST gwenview-21.04.3.tar.xz 6772236 BLAKE2B 83310fd6f290b4980dac774fe46ac8455b0cfde1987ffd76a43f313e8a185381b1eb10186fcecb1a198fa0872266f28aa3d1803a8ee92c0910b488392db12c6e SHA512 83caa2da3afe552a5c48955136a54e5c53b2ffd83ee68fd5f7caee849d9d7547a566941c41f7b13973e8f292a31ad9ad9d9ccdea7f44b76cab8b2f97efe160d1
 EBUILD gwenview-20.12.3.ebuild 2930 BLAKE2B 075a83c1f531a41709f01a9fac06ad598ebd43973bc19aff92de1406235d3d7e88cb57bd8fdc374d5f53dd01eb804c722c7a6d7e7b460b4a148c553d3fd93af4 SHA512 f36edf196b22d88c1159325223c6ec28c00628c37870200a7c5fbb464566542fd03fe67acbec2cfa97df344d35f25211794a3166077b0c817a03349af62c1847
-EBUILD gwenview-21.04.3.ebuild 2903 BLAKE2B e77f76106d59eccb99301e1569d5ed4055d52ad52386bf17d215b752dcb8c247feca5ad17f47886f8ab410dde45ef3fd3de4c88851b3481116509ed3ac0aa9c7 SHA512 41c4b42530ea8be4434c8eb2daa807c5a19b5e7e56beea4ac744fb628371ebd0c17a024fbc3fc0a79eaf817406825913111481e8a8e9d51049f6df626ef2ef78
+EBUILD gwenview-21.04.3.ebuild 2901 BLAKE2B b09a4b3527f283ba7885e8233e83e14fe763ccefacbaa98bbe5ef210411e749057c351cfcf35a651cc35c41b77c1f517617b87ea1a96833a7ced0655559843c2 SHA512 3db48062860077d83a9bc61afc9bcc747bb1b9b4e9bf4fd5e8180d71d73b837b4cafe8f30be14fb708dd498c800c8dc90261b8bd4488cec8b01b869ba89e9175
 MISC metadata.xml 708 BLAKE2B cde335a32954748c28475a1620aac2e6733490fd8e6126f8963c6b5b0b6e8e87065dbab17e1723945e8f5646815acdf9fdfbf89c4dc57639663567fdcab0b5c9 SHA512 b8fffc87db328df9c5dafb6d72b954ce052678810375278adb390c832bec11f419000fcdd08bd73b9dbcc3e475b7e7b927663c9886b6eb92b7caca7e311015e6
diff --git a/kde-apps/gwenview/gwenview-21.04.3.ebuild b/kde-apps/gwenview/gwenview-21.04.3.ebuild
index 95963ca06d68..2dbbeae3ed0a 100644
--- a/kde-apps/gwenview/gwenview-21.04.3.ebuild
+++ b/kde-apps/gwenview/gwenview-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 
 # requires running environment
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index 68d19092b25f..4e9eb6c499ee 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
 DIST incidenceeditor-20.12.3.tar.xz 546308 BLAKE2B 8156fc4bf9a5fb06d755c89debc55c8f765d3d76f9a33b03bad94df8d8dc1617be79e584e6cf6728577c66fdb4db5a627570545d06d0d673615b1d4795c759cc SHA512 cd344322ae026c9782fdd2756c5206b89bb8dc475f38addfc58b3622ea4ab8106287d32b0105506c0b4491c2575b227ea52570c486a29e019b7495f41ba5aa90
 DIST incidenceeditor-21.04.3.tar.xz 540124 BLAKE2B 044d0ece5f9ac83ecf0dc1c4cb08afc46ed6473b4fa88303f80cf8446a04608cf262f88b2b70160954607672e1ef3e2edb8d29c0b93d2f95e4a3c83f4063fd9c SHA512 65dc9257d0d6c238093b59cdaf76512938aa2aaf795e0a8e17c1c64afd75ccbb37941178a9295fcf240791e8daa9ca187184dcfd68294bd553d4ed5b9a9202ff
 EBUILD incidenceeditor-20.12.3.ebuild 1878 BLAKE2B 3e8ef837ff891798e1d0bf5688d3d7d53836a5bd366f1136b782aa0f48dbe6627f507e1973aea214b5442a90108bb3e9c137b41907a593ab3f25cd535e5989b5 SHA512 c2decbf0782791fdd58622bc0a965ae5b192bbd943f5a608ed988a9391edc82ddb72b15dd9f2acf1f0d73752d722a2b87ee10dc3e663390ab445dcd91e259291
-EBUILD incidenceeditor-21.04.3.ebuild 1881 BLAKE2B de1b1848a7685ee92aed0a7a184051a280721326ca6951f2a3d15a7964c238beb3d807a0e03669d10d71e9b21186d2fa1d7093f2afe5023532725cde1e20edef SHA512 7f0895bbde0756fec1e81389c8005f593c6b68419a296a7ab81a89ddd847a391a3ee1135fea50cbaf3b9888bd7af70accd7f2bbb9a688b8172cafc7f1a75807d
+EBUILD incidenceeditor-21.04.3.ebuild 1879 BLAKE2B f3b26db53ccadae4865841a8b18acbf526c76f7a6dc20bac56cacb76f326bda1cfe06916f71b109eba683b181afefe14f89cf7a7981413c5285bc6ff75a7d9d0 SHA512 b4694386eb0aac199b4773a37085da1004f689b54357d392887cfb50ebe41090dc115c73f5f7aa32fa361d5ca21f90e59c84e5a186175160fcae3a13ec2f1d45
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-21.04.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-21.04.3.ebuild
index aab7cb64bd6d..af1c08ecc192 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-21.04.3.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-21.04.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Incidence editor for korganizer"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index 8eabc479d8ea..a9fabfa7031d 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -2,5 +2,5 @@ AUX juk-21.04.0-missing-link.patch 821 BLAKE2B 2bc4ef72c25068a92bbc92c5c8dfa684e
 DIST juk-20.12.3.tar.xz 1997996 BLAKE2B 857defce1e5d089d711f7f70ca0077beec0267d576cb262536b79089622b32e53700d2c031430cdb63d7bf2a5c9eb8a67d5fc0aac64c0ccf2557835b15174f61 SHA512 3eca02446be784cc8d3dd68e7da146dfbe5ab7296d27ba78d0f15ce34b87183692d91ef01126aa97a9bc95a558e9af6b6bef47c0ba0a2f25fbeacda79285edc1
 DIST juk-21.04.3.tar.xz 2010508 BLAKE2B 63251dc3bb0c5363868e789b1d5017e55067b2114e16cfbf25b89ef751ecccef12cfc59acb4ba1f14b9d5e12762c0a65eb3cb6fc8034fc82eec214cbc8bd10a5 SHA512 ef0f1b72d03fcbe6dc5a92bcebbe34687a4cfbecc4f3209a5d57a032fecbcff18914c6a7ac710f9e6897ff3188fff193e276bacb873378d867b130c48ebc81eb
 EBUILD juk-20.12.3.ebuild 1383 BLAKE2B 7dc54ff15eb36854852843bf26ecc1f1cf3f930e6dc299f838a624347df4af04e4ed83c0c56620d58bf5b7acd680db71c6dd348f1c9a0ac63a412fad5c8d6883 SHA512 9b11b7ebfd23fb86c2eb282869c3319f53e737f45995fd1f5371556ba318c4c6fd7ec7317be47a3089e4a75b1016efea5e6a2eb18152ee115ef64f9ccc3facaa
-EBUILD juk-21.04.3.ebuild 1313 BLAKE2B 7598204cdc278a1d2ffd42275bebcfc3f2eea825063eb6b78b40090341e26fa677babe9a581c349c34e3f683bb485986188d49cb0cec173edf7f122171486973 SHA512 7ff880e075b302e7d1c22806bd3d399079bd7bbfb726c9e5df305c535a098a6e6a76cec2549c97d081a0e8a01abe95851ddf0d2bf4e69e381a1f4ddf951b6477
+EBUILD juk-21.04.3.ebuild 1311 BLAKE2B 30ed44b7f204f6f05e03bfd2df444f2b95495537bec6efd8f2ebfcac1b8a9028684b4b91e58ba0995b118ac0f5e0bfb5d99cf036f43f9d4b9ea617cbb6289403 SHA512 e840aebdbe445ad6e7c58f57e292e77f3edc79272a8b622ed4b9b38110807b5d566ee89f96c29ed81b40a74aa25bdb1e94ebc6835d2ec3706ab9aa11a35ca76e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-21.04.3.ebuild b/kde-apps/juk/juk-21.04.3.ebuild
index d0a46342a44c..cdfaafa13e31 100644
--- a/kde-apps/juk/juk-21.04.3.ebuild
+++ b/kde-apps/juk/juk-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/juk/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index d5d1748120fe..b669bb5ed26b 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
 DIST k3b-20.12.3.tar.xz 10688136 BLAKE2B aa2e8de78b98e33888f47454ca5b2edfb195915c000c5a6f94f6cf0bd89575d22b7c4efde1e307a91b61bab1087b2e5fa665bf2abcb28de178f236df1ec37758 SHA512 e0c85d4faa6749d271d92a945e54c68876582b7d5c5719682950ca9305b75d0a46226f080e9c0bac300e63e32387ebb034d48f6ddc3b2d1a4fa2487db53f4039
 DIST k3b-21.04.3.tar.xz 10743696 BLAKE2B 22b58150fda55a0da3c20cd7ce85a3460f5aa195e7198e8ecc916dd3457718136648717fe2e80e37abae1d2b9456105fd1387df4afb112c8683c411304917ef0 SHA512 2bc61ebc26c73513d25a7b54e43781e5cccf2a140a74ffeef0e37a9c3a1bc823066b65c14c902bc3de8fa0b83fe620be4cfce48c880ddb271b8e399d659f4e9e
 EBUILD k3b-20.12.3.ebuild 3436 BLAKE2B 5e88c17153835fbc85e26b7f3f1d7ddb62eba8c3071209b59dd4d69cadddec159620683e0e7db5dd4ae0618e918f772920b972deef0f91faff5e4fac396392f1 SHA512 b060b77b6e28e997a4f0c2925e3a733723daf2403675aa152ef15ae243b569ce82c825d45e2cb59c2f02db94c707f60535fdaa3ed9accb09d437470a25d4c114
-EBUILD k3b-21.04.3.ebuild 3439 BLAKE2B aed9aa085f09cb6d1c95dce596ea768c4013b71962007292c9fa4852088cc3904508ba94f8268ff998b6e9d0804d2a26e5de171a96a54a77b3128c5972db5f23 SHA512 67d5e32f502a1f958c44772719c9c49cafcd35f42aa0b9f6bdf6ea30defd7acdfd0c5aacd46f382c1a14190902de8a8987dd1478eba55c8be7307f1e799647fd
+EBUILD k3b-21.04.3.ebuild 3437 BLAKE2B fa35e646db902a4234dffeb4362602fd716fca99e8b67d89f4f1965bbac0ddb5c1ad2ff7928711507c5424fb8c050dfd0bccd767e21f97c937704467224e3884 SHA512 c4cfaa7effd46495233acc44a325747636de83b4ee33a7a0a5e5b10ce160fad45210d62b210d5795a9d948032201ab7b3a3363466ace99416c325bb15bdc5dee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/k3b/k3b-21.04.3.ebuild b/kde-apps/k3b/k3b-21.04.3.ebuild
index 39162900885f..cb821bc54d80 100644
--- a/kde-apps/k3b/k3b-21.04.3.ebuild
+++ b/kde-apps/k3b/k3b-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 REQUIRED_USE="
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 852b1eff73ee..cf282b84ac97 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-integration-20.12.3.tar.xz 84376 BLAKE2B 55f03614f86f2fa60b5b6475092ecf8f923e5e5c9ca2e057d2488abda250861fc1eb7a5c0141006da8a4a1747efe6a897bfbfc45740baea72c51a898783de34b SHA512 e9089f5d99d665a0568e43d66837faa5e994d2d93a3699057e6b86ff3bd65bddc448dd36afb49642ff80e150a922b4f110541f7834d04b52e9059fbff7795a88
 DIST kaccounts-integration-21.04.3.tar.xz 85184 BLAKE2B 4672f9b8e0d9f376d0d602a443aa6b60da93bde3427d33d2b7380f48978ea6a65c032f0e65483d1a715ffd422dac92840cc2e0186fff2eabc40da1d8e9995a2e SHA512 0552ab2da16b8ab85632f458827a1c16dc0b7e4a4d3b97266249430595abe11f0b76dc2dd7f59dc7796e795855bce122915733b692d9270b6da8b6cabc2c2ae8
 EBUILD kaccounts-integration-20.12.3.ebuild 1196 BLAKE2B d52c3fd612e77097761e849fec0713635aa42d1b51cdcb2522b331dba8d1c4df2ff337874de35dde290a979cbec4f54d6f1b96b62467f1d223a7b4f133e33dd1 SHA512 df7f571320e46516735f230dd2b7b6ded2e74b92d4e2f1a99f8decdea40d10b20189329201a1339afadff31a76bef775806b745db7b1db3420a6ff5fe5ef33e3
-EBUILD kaccounts-integration-21.04.3.ebuild 1199 BLAKE2B 1e5dc6b2ba07e044031e63260908a10c45610e3b7ca5bc43858c2380efb17a339e93f6609081ed5ae8708acca8c8e769395829643e8742ed867d3e3ca1b9a1e1 SHA512 b9bc6d9bea82c9d733e8e6d0d057b65c0998cc056d44aae0cac79f32a095201fb0490851ff2e888fb0bd80de55ebae4c1caa85a5af1bbfa28818057cac448704
+EBUILD kaccounts-integration-21.04.3.ebuild 1197 BLAKE2B 639cd7e0c21f41899b3904abf7fad10692122cac5adffe8920a4dc67dd4d1a8cd780e08d84cb95e1c63ee3e3eb04fd5018088199dc79f5e0debfcdab78e603f8 SHA512 6b709f893bf6e0a544d07766acb5a22ba4749051e306aa471f507ff6f7b65ff5b78d5a0ffdd8987745b6f0e8da1b22dd3ee4dd1fb3bb44867694f34d279fcd3a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-21.04.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-21.04.3.ebuild
index e6a71ffbc9cb..d17a5f461ab0 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-21.04.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index ec2a374537a2..8f1b09647526 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -2,5 +2,5 @@ AUX kaccounts-providers-20.12.3-qtwebengine-optional.patch 2822 BLAKE2B c303be4a
 DIST kaccounts-providers-20.12.3.tar.xz 61612 BLAKE2B 89861cc15a73f7003900b8ee540c904a0e426ed254c802a4116e5a9861f4483daecd00dafbc4f28eca7edc97f52af58d3c5503396e8d3168575e5f654129fd1d SHA512 9ad534fd4e4bfd4992265fb2722b09eb09fc3f4a880751a44b5f29da7250d2827dc1bf62a7df04449064d63d2b0b30ce4038f0920f9a6838f8f4876bf680b2c2
 DIST kaccounts-providers-21.04.3.tar.xz 62920 BLAKE2B 6f399fe0bc8127f085e8e8b3071b048f5c9dc52b6cb81d5ecf8e7383ef120b9954fe616f55564b06d7c189301bf9d7874338f6f2fad8274254c71a410a5838a0 SHA512 429bbe610c2613da430b3a641e374eb98d81f874c63a508a30f7acda2774a0dc31bf5fbf26a142dee15f4ec8556ecb2a28d78d67b6378177ec00d68204512055
 EBUILD kaccounts-providers-20.12.3-r1.ebuild 1006 BLAKE2B cf5d7c5018dada508ce84f2bff23e55d8d8a945be882102e417a7e50e45c297c3a2a22f1864a3176dcfcb8a024e99e419edbad15d64f5a08322fb0f8fe9a82be SHA512 905a180bea05586009022dcc2d4e2d3283f9b144fcf91fc21ca70b68fa1e96845177726d5c51f458cad57f6311cd1235d43b1840572ba0124acd0bf98f3e674e
-EBUILD kaccounts-providers-21.04.3.ebuild 1018 BLAKE2B e99dab445005c70ad998554680b021f5986f58ff104474bb6b8406e6b857699fc3e1ec26e473ede90c0170d6b28ec4a662dc2a26bfdff69bcffb6e19185621d3 SHA512 84c1d27d55701b3fa9c8ffbe70f2bdf45d58992155b88efac6034beebbcd135ce63170ca8557f7ae94b839cc913b4904bc8892f436fae3926e1ffbf5d52a532f
+EBUILD kaccounts-providers-21.04.3.ebuild 1016 BLAKE2B 456debba867117ac56038ac88567425a333aa7a4a977c21f03edfe98de9d05f4c38927393e0a985ce627b7be4c5a0e45de8311737b079d7be998a5c629f5abcb SHA512 56e09860f8ccea6a7ab8336358bed39b81f8291c1bb57df7ef21e55de9fab29875224a3195d75c6bd56973a601e3eba75c7ad3b9c7c0d767ee20c57212cef096
 MISC metadata.xml 366 BLAKE2B 7d04e3030abdea6593027fcdbbb1825369569be3de6312d1b66ca699d0c0817a3ef1bb8b685480a28b703cd6f20698174aaaaca42c886807cbd6dc50aeb3d32a SHA512 18a7a40fae8cd9bd9932a754033e80a8a4a67423964c8bc72c2ced8f9f85ce15843ebfbb2c6850a04965c39e2067d2f52323395d2668d1dba7e32b4fcbf86c2c
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-21.04.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-21.04.3.ebuild
index 0121ca06ed2e..32c7bfd76044 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-21.04.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+webengine"
 
 BDEPEND="
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 697ee0bf3ddd..f47576fca362 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
 DIST kaddressbook-20.12.3.tar.xz 3263556 BLAKE2B 711a518d90d207473b4125c74e3a04d34773feef500ea5635247eeafb8050b870e85cc19ebfd18147e4b4318d6052361cef4bfe1afa54a77fb2a3c63ac48673b SHA512 6f8b069222734fd3d42078d1bb2401db8dc4d8697c0383e49c47479b559fd7776b0ae7f7f757e2e767c2a173b1738c7ba8adda928481ac947dbfd404fdaa0434
 DIST kaddressbook-21.04.3.tar.xz 3329648 BLAKE2B 44b489a613efcedd9e0cbd4c23f3a1b69a5b5e144ecdb9cb485015a441cb18945965a4cb6ad15ca4bc195ef0359b08f97304cd130cfd388440aa4eca801e67d0 SHA512 8325642b057df2489bde527be71691ce54668e13a3e815727c77051f6e7d1b76e7a4195b6f363c78d7fe6bd4f67af61364810b2fe4cfae62988d383f86fc7a5d
 EBUILD kaddressbook-20.12.3.ebuild 2008 BLAKE2B 4a91e3fe3fede6ff383df16e7e5b645b50ae4e116e8b5e7dcec683ce7079e7172183af9a8ce25b5b9561e2c822916a954754dad9ff8fb224d8408148d7334bab SHA512 84eadec047461154bf6a8da3baeae23e80d3a9abb393b61e53102d4f6f81a1d9463f885521e92f6e6eaea940cdd1fce6b9e5269e7076ffce4a368b1f9e3aaa8d
-EBUILD kaddressbook-21.04.3.ebuild 2011 BLAKE2B 8c79ea2c25df9dc271c6d2a7e04a366cdf1d89237bd8f5c70dd71af02b686030f21afdf3729b73dcbb887c6976f0d696650b09459c634f472041085abd2d1495 SHA512 4f569de545aba4bdfc19daa35c18942d91f743573c8e08c1426a9ce5d0058ce182c4aa5376d2b5d05696abafc49c57940a3732289316e1e4194d0171eaf68ad6
+EBUILD kaddressbook-21.04.3.ebuild 2009 BLAKE2B ac970d57d07ca28195e0a7001ae62af1969f232ea00c242bdb5b532ed24d9b3ff904a58741502388fdcab79f2a02803be6d727a8942af670fb7a7bdd92330fc0 SHA512 3a49b4a1fbfb108e38b732e6602a12d8704dd490f593f3b1851b8ce9f586f7225beeb182f76048d3113a69db8eb15897d2f4a05f272df08eaaf45efb4396b84c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-21.04.3.ebuild b/kde-apps/kaddressbook/kaddressbook-21.04.3.ebuild
index f582c173a38e..be1d2d97bc7e 100644
--- a/kde-apps/kaddressbook/kaddressbook-21.04.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kaddressbook/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index e086f9a7f462..9118a901fcd0 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
 DIST kajongg-20.12.3.tar.xz 4471984 BLAKE2B 0101613bada0322e27640135fe103980b5436c34593d2214093adeb8426fbc95a1b7258f027229488daf378a84f44f232ea8ebfb54f39b97b397b06093a85a53 SHA512 6821c06c1eb7aa9f55872234289de9ffe503dbe6183bb208aee104769fe8fa1af4cc2e34448f5902046c576e0823c1724f215a0bc9a3f60ef25b59b81d85ffa6
 DIST kajongg-21.04.3.tar.xz 4473068 BLAKE2B 240ab96013f0a0eff469c2fff6a80f852010563390cfac1ebc9c80f450d63169fd7e7b59ac9147fb67cb2839ee31caac2887c31c584e0ab7fb8c69bacc9c44ba SHA512 1eec0c3dc0f0bbdd8f10afe0d701eb83a6cc8ae4116776f123319b0949cace331476196d80fbd1b81aeee8757644787b3e842386472350486358774fa6358178
 EBUILD kajongg-20.12.3.ebuild 1007 BLAKE2B 24f6127f14a2e165441ab17d6acbea6a6f03ef8c653decedebc9447d7bfb5a261f026a840fb9b7c79f3aaca5dc9c39bcc86868912bf62c05fdcd763fc02fcfe9 SHA512 3bd6a7f00b3e494d26695c538804ca00c8a26e92202c223e6928a1d8f1c22c1f5e3273c9a370bd8bb910394d755ba8ccbb7e7be9fee679f105c06ab5a01bc3c4
-EBUILD kajongg-21.04.3.ebuild 1010 BLAKE2B 6de22787ccab4f220527bbc00e97c129ca81f4135d5bbcd0f5e3449582c1526c74bcd8cbdbff630addac8e5fcee1d7808ff14116450ebdf75b3f9c93c3094328 SHA512 7f0c47153d413fc84c90ae55b0e6f60768de7982b36342140b595f578a0f5ebff97b80effdab8f9afc500295aa88b59a858aa4d842eb2e5dd7790be2b4c564af
+EBUILD kajongg-21.04.3.ebuild 1008 BLAKE2B fc8e4be19585f95375d9bb04ad7f44b449ae8252df789e07c86bbdf3cde9dd3475a2e6ae1f64e5854a1b466a72adb363eaa7b6f3899abcfc90afcfcde5b2ebc8 SHA512 9efac6d6b6213a084ce00c5727eb1bb47cfda1ec4dac4a306be47744418985ef9195c9158f61ec84a97c1c67d99489c99a702106b47bd704f169ce5d11ccc1a7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-21.04.3.ebuild b/kde-apps/kajongg/kajongg-21.04.3.ebuild
index cbbb34ac5e00..d95f5b7dfdc5 100644
--- a/kde-apps/kajongg/kajongg-21.04.3.ebuild
+++ b/kde-apps/kajongg/kajongg-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kajongg/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 3d22c4bb8098..da8b523bc98c 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,5 @@
 DIST kalarm-20.12.3.tar.xz 2110400 BLAKE2B e87af2d4ba02f5aede932894811d3b46a316a40625886f52ac98187a48b637bcb10d7b31f35734627a5379d993930b8d9b4e5abd4e07c4e63d80b2a4da350991 SHA512 c0e335e766349f0474a982325db6d8c6e4fc611a5a2e925a0dd4a108be6d4edb25493e88d08ab26cdc9167546cf1810c5898d036f6f9be32f491ff1662becfd1
 DIST kalarm-21.04.3.tar.xz 2137400 BLAKE2B f5ecec13b3a0b7895cb1f815cb8d6dec828574e890ab26a2dc9410ce1fca63dd46a7dda9e6ddb8b690cfe7563b517b5673553a28c91c44f3d3755f30d712be75 SHA512 19a9bb6e185b86fe4710d04a8dc4985b8d0c0e49cc53c5fde24e23e4c0cfa4587aea4400957190606122db1363be7a705c5ca0a716631b0eb3a496b82b550f42
 EBUILD kalarm-20.12.3.ebuild 2449 BLAKE2B 1eafe17835380b1547e1b00b18586cbe1d3f5f42209198ea43965b77946efc42240b78f4954d17d586374b591d3dced35e56bda31ad551d07b17421a13c1edad SHA512 ea61d88fd37b70fdcf57addce83cda853162f5253312672de71b573a7205111dd2da9f5cee102e5134ecf8d095900e3296e12382809c267d70efcebe07b64dfd
-EBUILD kalarm-21.04.3.ebuild 2415 BLAKE2B c419ba4f8b39c81817661b743e35ca91b039a482d75d61406b7c62fa1c98c65699aacd8d6656d9472b2b28626977194fecdabcfb8266c46edc3b3d0f576320bf SHA512 799ab479df2fae4daf2d2cec25e56bebf088eca8bf80e88b67446c3acc1cdb9476e1c70314981ac94aea584ff78c8cf670014fad9ac35db53ccb45777f97e0f0
+EBUILD kalarm-21.04.3.ebuild 2413 BLAKE2B 611cbcd3029cf8455c3acc417c51e65c038e102882808f180c523bca2d1fbcca1e60ed256be5b6206ccf3296fe1fcf50c28e71d947015f560c8d870bde35bdbf SHA512 3dd9adc2720d588f77cef2e39b7f3b85c1bffc8dcd9d539355d33572ec44244c841efc0d8dbcd1d1e2f2db80804e1ef1f6586c109eed0b8ab5720b1c25c2aee6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-21.04.3.ebuild b/kde-apps/kalarm/kalarm-21.04.3.ebuild
index a37f2a450609..dec445a46c87 100644
--- a/kde-apps/kalarm/kalarm-21.04.3.ebuild
+++ b/kde-apps/kalarm/kalarm-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 4172effc82a2..a6d54d83458b 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,5 @@
 DIST kalarmcal-20.12.3.tar.xz 576680 BLAKE2B 7ddc5fe35c68ca4601dd361a26d7b324b467353d56757712d909a8f8c424711a7189abfb15e9565a2adcde08fa9aadb6ecb59016d1c65d2ba9e98f3fbc19951f SHA512 97391ff398c404051ab2001811cdf317720e8d68100d6e654b8ff416c2f4d49cff8ef3ef65c5476e4990749ab92356c767310637d876e1a0cadc6bcd923f33b4
 DIST kalarmcal-21.04.3.tar.xz 629092 BLAKE2B 7e3e8ef9f123943ec1b8ec1a48d9f141495ed95a338fc528cf0cf9dd634b58a1c3ead0df1a04e8cad26883f8ca70dff3ef27fd3dd80ede5cb525afe862358451 SHA512 3db4c4d3e8e1d3b552f5f094a87d0b283e85328990f992783e93384a02cf2247a8042c8447500e1e238feb32b405f977a0bdcb5aebbd9860ea47872e9ee458a6
 EBUILD kalarmcal-20.12.3.ebuild 766 BLAKE2B 94e92106e1dc6638bdf94bac4f559fdae7bfb7ad2315c84018e7722f777978b32ea33785cbc8a8be8be70c510e80fb17a39f1eabb7ba071f548acb417d52fff6 SHA512 648ff277149868b9adb515eb9327d5794ae59c23cccd48a02305e09138cd3ce7b309399d65f36c1927038bc75d0c23df69ddf54cd33b8a44c8dbc7d0900f39d9
-EBUILD kalarmcal-21.04.3.ebuild 769 BLAKE2B 248699e95012deb3747400d5b6ca60d5faf9e4ca866dce1d23f1e3b4bde084629fb27e20229ff3ba468f92d57a80da436e420840d3a32d71426cb87100a1a839 SHA512 301693d3909986e774bc686b0505439b4d296a955efbecacc00700a1b5c7c0510b0919f2535970f1bc010d451ceed913f275f122890ba1ba9c846792e9bf287e
+EBUILD kalarmcal-21.04.3.ebuild 767 BLAKE2B aac2067ce10b1648ca824dc1acc9e14402c6dc7a2c7e339af79eb0e54d4b0886acff92b196ae1914d31d075feb99a384619227f8dba2638c494f5c0ece5be9f9 SHA512 4c376f7ae72914b71dfa901b936e5707ce14cab385942054d51fccba6bc46622076bfa5bcd92bf89feb935dc68f98c6aba5bdd653163484ee2661a7fe546c8da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-21.04.3.ebuild b/kde-apps/kalarmcal/kalarmcal-21.04.3.ebuild
index 676913358689..87cc7c5ba88d 100644
--- a/kde-apps/kalarmcal/kalarmcal-21.04.3.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-21.04.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Client library to access and handling of KAlarm calendar data"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index dd9667c7fb23..7fca11b684b8 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,5 @@
 DIST kalgebra-20.12.3.tar.xz 1024612 BLAKE2B 0a3a5ce9b91dea0997f7ce8ceb7cfd28d8b5267fce8ea2e321c50b67b66d3230191502058506071621b2c574491256b8824d53986182e67982f4221919a61537 SHA512 75cc1a85253103768486de84526fb3902fe8a269320af0259bdb0c2dc732062a2928b05c8871a74dc0d0563db57fa5d0304e7c0702c928b29d6a40c99a3b9d30
 DIST kalgebra-21.04.3.tar.xz 1025464 BLAKE2B 69169eede2ea15f9fe5b48f909d42bbb75aab2f6d3086c3dc1dc9b28358cbe18bbf898b09501465c8a0df26b704eb0dccff590e40f895ba8020b5efa739c677a SHA512 1b849712c003219ef037c4d17d7ade635460438ec8fa9e192f1c9c084e227501efa00c0b55a57b240018edb089d30279384de860e6ad2fe9956b8b99bb2ff552
 EBUILD kalgebra-20.12.3.ebuild 1137 BLAKE2B d268b23235590eb00368aa42535cc5f4fec9457cf9ec1422a8250752c52c530365f8b3822fe051e78a60137ad8cfea6d8d3d3d74b485f74a44b79670aac645c7 SHA512 dc467b991adc671a1c5569f6858ccb6c054f409f1d891e9a9cdc74c86479f6d3d1da3fe850f0af191260900c2df8a79d0e769ad127239cc5f8c0b9c39c34d3e8
-EBUILD kalgebra-21.04.3.ebuild 1178 BLAKE2B ffc5c544c2b17f95fc37a2b4c056b2c1cee9de835ec89f0ddeb509e55e12fe169f0c32bbb3240aec8a54d4face527e095fe5330d8dcf928f4939cbcca7b5621d SHA512 ccdb796ddef54795766e1309781a70482dc18b5853406e3ade1dab03f3774bdd61f10bb5005ae7aefcefac62164e2710bd375343c8725162b295c6ca87e9b161
+EBUILD kalgebra-21.04.3.ebuild 1176 BLAKE2B 91bcc5b8096c1788742a78a18040a979287d06d91036f24ce26fceff28a835751547635abe837f63f29c129c70b870124a7462f44b76385276f6b2019a800b7a SHA512 31668d64515aa89a38db29b8b1d10bf12ecc90d03d0b9f055abf6bebd6fa9b01fa85e04ffbf4a2cb162ad529d7bf6ee191acfffc22589b3312975b6bd8708037
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-21.04.3.ebuild b/kde-apps/kalgebra/kalgebra-21.04.3.ebuild
index ac61bd5bc1d1..36ae2604a805 100644
--- a/kde-apps/kalgebra/kalgebra-21.04.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kalgebra/ https://edu.kde.org/kalgebra/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="readline"
 
 DEPEND="
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 881b36fb4dc1..496444ed0e57 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -2,5 +2,5 @@ AUX kalzium-21.03.90-cmake.patch 815 BLAKE2B ba13821a0d50f1120e37d73b30d13b7597a
 DIST kalzium-20.12.3.tar.xz 24521912 BLAKE2B 23b1f1aa9948428789e46469c19e6bb9ebfa9841db29b4f8b89254e6cf973b213d49e9abda07fc9ee34a7a661d4ee2849491e0e6ade1e3fc0e544f7ba477e45b SHA512 09e3d588dd0ebcdac0b7c473f5bf7f240516a12797240a36efb1e764968c3953373c04e589ee84ff92b23df97e8d367a155b980175dc8ad01a2551a9d5d1f046
 DIST kalzium-21.04.3.tar.xz 24590252 BLAKE2B 8418e1f7fd298b9a7ee04765bdbe3bcbde94acd09ad02d9befdd88b72139f08028fd996d9048323b2c34b3e9f6519c33d209fc186e097c427eab5124565eda47 SHA512 8c19954fc1fbe70b866769d89ec7cf85afeb71a1c0bd67783808fed59375acbd7f86484b36aa0e724450e4307cfece86846023dac77a24fa82df229007244a35
 EBUILD kalzium-20.12.3.ebuild 1706 BLAKE2B 0f718c344f937f047e0d1fd9af9e0a3a8af1089571ec687a4ce7e9acdb8c318c247cdb3a41555111f184d29fef3688696abaa49dbd42178afdc53636b01a2b83 SHA512 d93defafc6d9b6d40b38c1a57d99e7a494585623c4bb6440d8b0237dce18b4d07a8d489220ed08d6d8edb109d4bfb2adb11b231b3d266b87a606321eb3389847
-EBUILD kalzium-21.04.3.ebuild 1836 BLAKE2B a3387469010bd7b99a1d41e0bf58b3560380ddee7cbb02470546f925a022f85e163f7a1dddd05e0d0ddfb6c5af170d9971265e12580d7f5b5eecb3f290464a7c SHA512 27d8b2e2b0050b3018d4c613c7374665da6fba5602b270c2880c305a46af5cffaaa2e44e3809e7a9e24368cf0852fecb29cc1d395faec265c13f9e111d859152
+EBUILD kalzium-21.04.3.ebuild 1834 BLAKE2B 8dae567e6bd9c663a3cd555ce6375ff291bcc9553e61c4d44f6ace635cd2a0a9b19fb5b6398edb9b25bd174308fcc42a4ad1a5ee16f8ea97e57c1f2d8d47761b SHA512 30958f79a18997c701fcfdac9bbad8437be0b696873c710652c3c6d98c9a2c96eb95cbdbcef9dfc80ca0b08fff2837dd75282caefee6f742a5af0acbf92151cc
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-21.04.3.ebuild b/kde-apps/kalzium/kalzium-21.04.3.ebuild
index e4f90b8b9afa..adbde2c05262 100644
--- a/kde-apps/kalzium/kalzium-21.04.3.ebuild
+++ b/kde-apps/kalzium/kalzium-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kalzium/ https://edu.kde.org/kalzium/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="editor solver"
 
 DEPEND="
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index b5b2b23bc7b5..cbb80c8f3614 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,5 @@
 DIST kamera-20.12.3.tar.xz 108696 BLAKE2B f449aa46ca076d03db9bdd60147702cd56ca3a0d47f9ef510198ea6f87d33ed04a6cd473d29e6060c3b34904239a189fedc12bc51322651e6e022e5f3c7c3ba4 SHA512 7abe0ae6e85e270084e608b85fa5982c3b67ebf16a81b9ed3e9690dbf860abbbc8ca1feb885e3cd7dd93faa91622757c16848a26baa4f68f128cc119fe91bd2c
 DIST kamera-21.04.3.tar.xz 115580 BLAKE2B a7af7c27837ac26c2dd461783f85b895a34f0305f30565f00dfc131ac0ebbb57ab9ab6885cb49b1905630cc5ee9090584721c7a1590b7ac46cf28cc6ebbdc955 SHA512 629f1de8cd94900b8ac247f63a91634613e6f8d3b3889cb289e2f7d926cc58f9eeb0d3b0466d0d963798ea604538485c7409d74dd957398bdc47031e597509f4
 EBUILD kamera-20.12.3.ebuild 790 BLAKE2B 3c3e2baf091d308fd8be718a56073c19b419fa8c0d8debf1517ca5b28c499ada65b0e66bbbd6437d16a45db1c0945e019fb70a1de2ea925c41aaef5045301134 SHA512 e8e213ae7bf936dd19c946a45a17d847b8b7a0aeb9692195a96c45b0634cf2190fadf50e5f237bb6b0a926ae342c859c365cf26aa07e2501ddc4475414e22b06
-EBUILD kamera-21.04.3.ebuild 793 BLAKE2B 88758323b076d36edc706b0140d61111a06858e2791a9ca9fe60e36294313c27a51373e37367631005f9ed3d2fa1bdcc7a747e9a49b5b5769b77ac5daf69d219 SHA512 ec906c8b3c7156aa2521d0d8f4063cda4a3385e65ce169808f1b918c12179dd4134c2916847a2603dd8c73837d513bf064b03ea845e50c833167ef620dc88a03
+EBUILD kamera-21.04.3.ebuild 791 BLAKE2B 03ccfbec491b274aa5a4a704100b0c60a4e71db2fe7f9e1b08eabe5d799582dedfb2912a75156f18133a09432ddbcfc77e05e6be050b534fc5c313fbc1c0adac SHA512 4140f3daee975f73a55c5bc98a9185405e28a616292b22e10659faa0e18902115f9561055c380aa40153c5336a5d56e2201af4c82f6c78415a45027f23442e88
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-21.04.3.ebuild b/kde-apps/kamera/kamera-21.04.3.ebuild
index ef5544de67f8..1c1dde9b41e7 100644
--- a/kde-apps/kamera/kamera-21.04.3.ebuild
+++ b/kde-apps/kamera/kamera-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kamera/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index ac2cc063944e..7841f92b8825 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,5 +1,5 @@
 DIST kamoso-20.12.3.tar.xz 211540 BLAKE2B 2f4b9c8ed3a5f6110769ad30fbb380cafde4381802cd38678f70896d2c1f23902577442cb018c06d15e215dcdbec0b62e2a785ac2bcd1f72dc14d1a29f5ab0cf SHA512 9542452b52c7fb574ca00ce32b2fb836f3da211702ec2cea7c2f7cf735cf0eef7f5f80528e0312bff54c88c9e11bf52d73a54c14b933768a2394a2cc756b496b
 DIST kamoso-21.04.3.tar.xz 212040 BLAKE2B ca11ae524f736af7591dbf6c54116f55ba12f0ab5fd80591a0c7b4461ffd979ca93afd9c1619d173868f0ec1a30e84389b252527370d68719f29d9b3d4dc56be SHA512 e15e703e0e3f189cf065e1709914416a0a1e51f58e512fdc816e06ec9af58c84711b33eda17883ce30074da4b5dd4b924ad402b07899ddf2491b4363bcc8ea9d
 EBUILD kamoso-20.12.3.ebuild 1090 BLAKE2B 5ba13b799a522fd3c8059bd0082eb63418e52a0443a29bd149d807db1a3b97476c949110419a0518a76a3d2306f29ae2adbe66ba8a131aac1d1a6fc0b22bca9c SHA512 0b033ac8e8eecb80275b4eee3b2444f57e5266cf7efd8d56cf916af63b68807b5985a7361d7775d32108a6b559b2bdca0b3019d4bb835a1a18000ec0d29c69ff
-EBUILD kamoso-21.04.3.ebuild 1093 BLAKE2B ac91f593b51d16008e20705650d54dddf148955879e6a577bf3cb6ee752af15de84c076ca26441fb45721b6ba35c2a4435021e8002c18be1ac8c4ef7a1633ea9 SHA512 0dd19cc669c36079dd0dbb9dd887ecf3eb872a5e14dddfc210881665c1090df15ea1367a135874362581892c8cfb25a4f3aa63f7806b7333886cceb251952ee1
+EBUILD kamoso-21.04.3.ebuild 1091 BLAKE2B c6e8790cca0f2ac27417b5b83f8d2af52aef0a3d5fdfd366812b623ecc646b46926104748f1165248bc071aedd65f7b45833d7eb2fc44e7f77562080dc6df177 SHA512 85288c886d206fecedc8d63956ef7509a6ea1d918ce7f19a3004ebe6d05e711c3540a48472be38cdfeb2c0e00d09921d454aaa6222fbaad414e909eb92cc7222
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamoso/kamoso-21.04.3.ebuild b/kde-apps/kamoso/kamoso-21.04.3.ebuild
index 45be9ffaa760..a1f192c4fda8 100644
--- a/kde-apps/kamoso/kamoso-21.04.3.ebuild
+++ b/kde-apps/kamoso/kamoso-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kamoso/ https://userbase.kde.org/Kamoso"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index bc092f0ddd24..566036f02531 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
 DIST kanagram-20.12.3.tar.xz 8028804 BLAKE2B 980219011d912a3acca1356edc6d8cfea3d17967eeb9c5272c70da7896ee011cbd98e82a537b98d1f4d4eca121096aafa2178ee217ab5b594e9f6c042aa1a4c5 SHA512 2e101bc3430ab563c4b7c7f68d60560c60484c11c9e3243d6b7ca872fd4042e339165fcc8533a755c0c161098bef8a66c15afbae88a375a73f62293bddc54c26
 DIST kanagram-21.04.3.tar.xz 8039740 BLAKE2B be7b164348037e961f9780456eeffa1afbb12b526bce7aa947d41f6516dc1c31b38f5818b199b2f8a9703075123a752aad95cb01be297dab6bf6f31a91d654af SHA512 33f0d4f1f2521b057674cc1a870c014716f1acd60bbca5d0b8afdcd1353bb46af468bda307e3c6a0a8e0945997c2349c3e95408dfbae9176e87d626056b03929
 EBUILD kanagram-20.12.3.ebuild 1223 BLAKE2B 61c1c1fa0a7663ae5aaa66efde1ee0c39bec3a63b8577bc6518bc7c9e5721e0138bf47c8d5439fea5ee597dfb3026bba2b104808762e2f093346d55a07124ff8 SHA512 953a4128f73c177f3991ceadb857de3959d7bdeb8d2a31ac822708f648348e8c5b077cd30ea75096e3b8b858de763dd324bb279f5848fba88db44b5b6c806281
-EBUILD kanagram-21.04.3.ebuild 1226 BLAKE2B 16a0ab6a39da693703a474c22f1ff5f0145f77ff6b922f9316118f57f77425216aac88b2c6aee8584ed7bc97de84b2fdab3f480f84bbca28018ba083a0561473 SHA512 74bb2e3f791c5418c8fae0355ad1e00629af04cee8f78f828352b99981dfe94bbc94683fd8d13a21914b63fb0db0cbf73766792084b4d56d00004cfece15209b
+EBUILD kanagram-21.04.3.ebuild 1224 BLAKE2B b006ef02760bca01b593cddd0808d3dba0f28d09ab4400b3a2815eed26d68d029ee9d54647252b757471d1300f9115d0ab4950d319d26dee3d9a77f3ef901733 SHA512 f2f79a9d86f83561b3d8d441dab0e61f23538308527f754383eb34a4a77ddc41f162840a25d6feb0c967e6d3d59e9434ff49e670962c30abf57f8fd704debcf1
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-21.04.3.ebuild b/kde-apps/kanagram/kanagram-21.04.3.ebuild
index a8b6fe80dfd3..7a47975a22c4 100644
--- a/kde-apps/kanagram/kanagram-21.04.3.ebuild
+++ b/kde-apps/kanagram/kanagram-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kanagram/ https://edu.kde.org/kanagram/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index 8c60a72e7b6f..2e83459095d9 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,5 @@
 DIST kapman-20.12.3.tar.xz 2531568 BLAKE2B 9f853146aebf46ecfab0f518d0078385e6233512a221f42cddeb45f903e1cb82f2d8beac9f122ac0ecbf522243720c1f0dcc694b47bceb4b50c044dbfffb3c2f SHA512 cbfd2424a714695b643103300d693de987fb2b893910a9028806b8e18bf2b8841610fe816344821dc9847796af201d6732c86ae0add53e32fab0ade5bfe1be5f
 DIST kapman-21.04.3.tar.xz 2531848 BLAKE2B 99f99f1af115ffa947d36e6f6120b904d11b4194639b1ad0302b85216b4edc5748b81f67ac5ea7e8805fbec824bd4845f059819a0925d57abc3253cb4c8252a9 SHA512 1925b9d05a29e59b4dfec7d8dcaa57fccafcb7e7cd11667bdecc0490ae8c95d2f9b2b2099905343fd6e7b0fb77f17352654116e9952d8d20d1d2b805f7c86858
 EBUILD kapman-20.12.3.ebuild 854 BLAKE2B ecfe6c95cf5d64be99f92b21a7083b00f26ba01bf3e955402de23e5966d7dc128c6ee72b5320946ea517cf63796790d8c6333c4ba6ae9a7f5e3ec58ea14f306b SHA512 a94db20cf5d13e060640102ba2c6c5a0076d7cd21eef5ac5039015853e53801c26da70d02fb4c6615c2d616504ffd3d48b519a626797ab0e5c70e134cd0e39f8
-EBUILD kapman-21.04.3.ebuild 857 BLAKE2B c62a732711235532cb53e37457652879debc8be30dbeeac09f55ff690def856b02804000cc4dbc1892dd5b17ecaf36997129d26d2fe4f871c71f581cdef9db7e SHA512 e1dd85352bc9c1807f5201cae902b1ddc9ef0a0671968f0617f60f3a5a6dff997155843e366a74a87027a2203e6b2ff99f0d6d856f07c6eefe3eb43b6ee5cf56
+EBUILD kapman-21.04.3.ebuild 855 BLAKE2B d350e3c13ea2f66e6b580a79e02f6a167940cc578e25e565700270df2d7f5e7dc57cb39863ac158f9411bd04f5431d75b5c9e3ab95e3bfd9c3a6db04f2e9cd34 SHA512 6646c8b781a4024cea903a81489d64309742545ba05e365e2c076a50578a0582f56f9436b2d75c1a48c22e62bec860f65737c4cca508791cbfe8c795d85482ab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-21.04.3.ebuild b/kde-apps/kapman/kapman-21.04.3.ebuild
index cdbcbe6c8420..8906192fda6e 100644
--- a/kde-apps/kapman/kapman-21.04.3.ebuild
+++ b/kde-apps/kapman/kapman-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kapman/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index 0aa6dfeda005..471b999d2910 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
 DIST kapptemplate-20.12.3.tar.xz 336772 BLAKE2B d0bd72275519d54c60a1b77f9e65dd9dd692475fd431b84440af11ad06c32683c2fb298315ff687a2286a8d23a601e4df554bd9350e16f11aae379de2100720c SHA512 a767c905b5a517c76940fef529a3add8f839c30bf80e36e3ff4a9319265c20686fa26d0b74fdf85cbd4b530931dce19191a267f0aa3fd426a62dacca9404716b
 DIST kapptemplate-21.04.3.tar.xz 334000 BLAKE2B dee8618b3e4e6968c1f1a243355a3f20abd82d20d31b0b9750b0515535dbcdf3823d32332febac00989efc27a27290d5dc235f67c36662287a3ed1d157a17377 SHA512 15a5a8b143ac58300f9f01ca0c37889ab6498b214fdd77c8aa50743015e6ce40f93578b0eb1cbef39fed8505851db2a170eb8f3850a126a2c38a8e4f49984ad2
 EBUILD kapptemplate-20.12.3.ebuild 827 BLAKE2B 8f1b9c8c803f481caaa5d33b81ee8e57c8e3feaa810f987e88e6f594a069751ec258f8e76c2e464f88e5e6fad2d6fa39526e5222e6a89a7b048693e309d9b347 SHA512 dce171bdaa885ad82308de003b0163012a8964408e906ad2de48562fb7b31a6bb0be05c134462313070735ee0a19811b7cb6888a1a69e8a3943fd9109d8f7264
-EBUILD kapptemplate-21.04.3.ebuild 830 BLAKE2B 36c6d21d62f95cd546fdaa0ce7aa4c953d483021f712fd15da3e5887a6d19c28fdbdc713ade01d6c5e408eddb2ba16346775c46e88c51c0958e1fe9d3ee0164d SHA512 d77a69b7951f92e38db619592b6806826e35529c59d643287540b8a81b60944874f087f570dec8afc9d4e0fc8723d62f1472cc2119c7cae2d9a2dd16d6565502
+EBUILD kapptemplate-21.04.3.ebuild 828 BLAKE2B 6024c17a779ee5c699ad185f86978dbbff57f7e7dd8b8bf4d198830d231ca6a34827068ea3f9f32ca6c3f4cb84f8a98d8c606ca55dd0a2bf74cc576bdcffc01d SHA512 624f3b79dbb7755bede550b18605619d73cf501586d4c1ccbb1d962fa5ce01b6d83db724a2c2429a1083c94907f2e529424a04a1bae945714e4caf374490cd86
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-21.04.3.ebuild b/kde-apps/kapptemplate/kapptemplate-21.04.3.ebuild
index 537b49dcfb08..30a8df82d09f 100644
--- a/kde-apps/kapptemplate/kapptemplate-21.04.3.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kapptemplate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index ecd2dc27143a..e551c547e830 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -3,5 +3,5 @@ AUX kate-21.04.0-implicit-dep.patch 2160 BLAKE2B e184cbf456f45e15904e17213813c93
 DIST kate-20.12.3.tar.xz 5949012 BLAKE2B e35c4da5426772286abe54156babc0de09fbdf8fb5c7505714637ad427e3a694fd541ca7b17e99ebab22f9a19f2a8893d34098cb625fd0e1c0f0b6b920acd62f SHA512 545ec2a48ea6ec737011602b20ac2f60a0f9db0a5e55e0b232f9fd7c10b7e3f54d2a346be7e6341537758a3f8f94868c4083a6d2d10b572568f5c56c9d3aee9c
 DIST kate-21.04.3.tar.xz 7283360 BLAKE2B 9520b6cffb284581aaa9bf70daad08fe5ab4570d433ea785a24d0c9122470c9d9d362026c3ea430924c453828001455a377e05537a83a2a81814df4de5e3cf72 SHA512 51c4023f3915edd348c1aa7ce448475f39c3401649510f89c7e17f9943739b67b09330e52b912794b31d4bbab1f94ed322f96bb45d450f016f84efa010d694bf
 EBUILD kate-20.12.3-r1.ebuild 3225 BLAKE2B f4daee96e9978f4abcee811be4d81c15286d932a34546a81ad5798d8dff97fbf79a32ffe425b64a92fffce7a50c5090113bc396bd16bb1483c63322a99be900b SHA512 b312987952acc72bfbb482d9a96b268e341da40d62602cf18cf77be98375984ec7d1827635d1c92bce984cc8a688182ce37d965e0a3b1344150a3482209b9813
-EBUILD kate-21.04.3.ebuild 3169 BLAKE2B 2c79b353e83b2e03a74ffe3488d9782d1d254eb4f6f730e8c6fc0a6e22d088d1017ad958c6235ba45dba0aa1e6b83d927d4d00d46d6f05130ed4a3bdab63fedf SHA512 74221844e82996cda415b7f418e7b0e91bebcf9aae9911128e7625ab162e76c1957ae9b775d10bb5dd67be9ec0922079357a1b6077660f09f2ddc998f0a767bb
+EBUILD kate-21.04.3.ebuild 3167 BLAKE2B 5667a200ba40093cf690f95dc6566559a4099b89902e07530fd7aad939f4afb52690f9e9bc5a17b6cbf6a0484af49be49b81e2ee1e817264a7456bf8b18acc34 SHA512 0b706c5fbdbf7358b4496ea9d34d8d05b0e3616f945462327de5661000df9ebca22c41185b6eb54f02a4f22f38089efb4b06b09c2a6bf1d69cad21775003ec03
 MISC metadata.xml 862 BLAKE2B 9b27a2dc759d83a85b1be9a5afc2dedc77caab98255575d493f4af6961d9b5bb19699eb69858082e1bc05dd8ff14f5c0c9212e5e146ff13ec1a3685008fd837d SHA512 d1a90d55277f25dbbad445d8d591da5fa5ddf3bb65aa0ae2d70ba6626abe7deebb56cbcb8a3718c43ad136da2de1b06a017c9740493504b446f33fbeac2734a7
diff --git a/kde-apps/kate/kate-21.04.3.ebuild b/kde-apps/kate/kate-21.04.3.ebuild
index 569ea5c2b085..53034935a996 100644
--- a/kde-apps/kate/kate-21.04.3.ebuild
+++ b/kde-apps/kate/kate-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/kate/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
 
 # only addons/externaltools depends on kiconthemes, too small for USE
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index ba36ecb6f392..fd4d4ac9e025 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +1,5 @@
 DIST katomic-20.12.3.tar.xz 1429264 BLAKE2B 44fc6055ac792f4e7c0c6c8844f38fc5fadbdf3509a80e0f280149906899b32e774efd40cefe3d0df273a98be53b4392ba1daf06a6e6991ba47eb21709efd2d9 SHA512 3b738b702ae41ab3044da158c38ec267d6cf71f73a49973c4f7d31ef0c31c87d38927dbcd6f8a4aae0b723cd969394d6ea61aa5717b3fc50285ee84d56ca26db
 DIST katomic-21.04.3.tar.xz 1433720 BLAKE2B 36377b88d1630fa278a47e2096cdf42d41dc78ae98dd3b35909ceb7db244f51c24c76b88725bcd9c7ec2a0f69f7f45b3776c2a721b28cf1da1145686a8995a86 SHA512 04ffa027e189b5ec10f538dfa4b51ffa2a124b0f5262c1563fd606deeba981f91b7209e89c4ac09de7371870befd56f2a1ae4f6cb656162a7c70f4e2f244de0c
 EBUILD katomic-20.12.3.ebuild 869 BLAKE2B be8a8f6c041b57a7b25d5f162fe4a6f553304b5a6dd853fec40228c3ddd1eee6e5bdca067bac43b043a3254054f6d3fee738b1113ecfc9ee6524c03ca7b9c8cc SHA512 cd9a08f6eca140b3d9b5d2907c3f6579dcd3b1622b9aeb3b602b72dc50a8117db88536c4a91b4bcf4cb95c5da78d4dd91fd6159842c94a8c48fc7b787fb2c30a
-EBUILD katomic-21.04.3.ebuild 872 BLAKE2B 5fb66d7abb20eda2aba419ce0c7fb93f917f4beba619f691d044dabdaf64be0da11eb5bb743a7e78a69d3646a17b7d4941ddb712ce2b05489bd51e7f263a7838 SHA512 8f5b0a0fdde1ef9aca6d97aec2227d352fe3bea63723c895390d1a5fee4c21ac83c2fbfe7934a915fd15e3d887e8f0d9d4d3d2639831ec2c3687dfc0c8a7573f
+EBUILD katomic-21.04.3.ebuild 870 BLAKE2B 2987a88440671250701248a6b5adc4eb935905c1dd17b781e397990975488d13f941220a7e6039b0fe54f55d7080c5922a857df609ad66316c2927b25166fd5f SHA512 7357c28ec4a89404e8180d5563f85de6ead931a9be3ffd4e71906e9ec6a07776340f616c0a06478b57a466af10ce69fa0441c7276fbe46582fdd9487e0348bf8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-21.04.3.ebuild b/kde-apps/katomic/katomic-21.04.3.ebuild
index f4b70cf6760a..f758beb124e2 100644
--- a/kde-apps/katomic/katomic-21.04.3.ebuild
+++ b/kde-apps/katomic/katomic-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/katomic/ https://games.kde.org/games/katomic/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index b5d77253e237..67cbf7a6a6a4 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,5 +1,5 @@
 DIST kbackup-20.12.3.tar.xz 380824 BLAKE2B 2a24a4b44ae7759e82d61497f38420c478a811ce0e6c49b0c217eb389c66e2c4c9c0c8b572f36b07c766d2a627294fe8bcef0a7869eee137a9378c1dceeae469 SHA512 5fab293909eca6b43ed6f29f0c62b81d6ec175f9a002a09bdae960bb933f370533a0709dfce5625865360b6e5b4a85aadc8bfb48f5ae9ca2dcf3f38981aeac37
 DIST kbackup-21.04.3.tar.xz 383704 BLAKE2B 15dc6890fa5fdcc9400906eeacc3abe43e15c2293c0dbcd0b94ee74cfd93a0befaf699f3a66688c324fa0a865d377a261314a31653d3272904e9628a203089c2 SHA512 749c7611806ec78542cf1f6b56229121d584ef492646fce7a3d50b85024520701e9b61a08b56b3979326bfe823130665552d79ef01dc3c2b95138a6fdb49e8dd
 EBUILD kbackup-20.12.3.ebuild 930 BLAKE2B ec52774e34acbb7726428bc4c7f104fdda5d0a71a6c7a1bbd91cb570e928723dca0eaed269fd1779b468e2346bf7d6b54990c183942fccf95ddda1c5f9aeeeed SHA512 6e6166bb2c7b114b47eaffbd1bb9e82910c0edd7c5338b3e52b790026c5a34670296e553f0e5be97a3e7fe7e5980396482c87f7daf47af75f90f9e7e5a5baae4
-EBUILD kbackup-21.04.3.ebuild 933 BLAKE2B 93c871030579f4b7e3f24fca9c1a94c2e4707f4c0b2e6700ce6ceda81d7e17b5ae0df7fed2090a78d671a7ee4f365509c67696c8e4e8808c5cd72582ac5103cd SHA512 63fbea985418150594fefe6419f9a07fd6f3e8d389d7e924bc5f0df188f4c75362311fc5c4c470cf32c882d4e598451c52825ec091ec4d805d67465219622737
+EBUILD kbackup-21.04.3.ebuild 931 BLAKE2B 1eb1e31a601c2b20344ae8f3ffc39bc565c29a351191512ca9f129a533afe0dd5b711499b434e65f4782992754a4a578dbc5e5713e8295bedef452a37db9f1a0 SHA512 79e9aa56f352bc5badecdc8a00b70d9e6bc57c573030e981d348bbc5aff398a12c35e796d72545573a99b3ef990eb96b1f12cb316d7a602488ce2cc1d68366b5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbackup/kbackup-21.04.3.ebuild b/kde-apps/kbackup/kbackup-21.04.3.ebuild
index d256a27a62e3..0a3e25d2fa28 100644
--- a/kde-apps/kbackup/kbackup-21.04.3.ebuild
+++ b/kde-apps/kbackup/kbackup-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kbackup/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index de5af4dd3775..024e5d744a98 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,5 @@
 DIST kblackbox-20.12.3.tar.xz 450304 BLAKE2B 9ff8a31b61815ad05ac57834d035aa229d7ecd489a1c78c682940ac9169062a0312af848ff03baf9d52a7ba9499b86f88fd2ed70c69f76079d0aa023aef21e19 SHA512 5e641009fa3482e8e1dac73b01224a66a6ce14c1a4180d011d08b812815919a74c9c9285a5a7aa49ea2567ac744475327eef3311fae505e4cd52400b998b6310
 DIST kblackbox-21.04.3.tar.xz 455152 BLAKE2B 0d6238f22a8d28d7e28418f43ce7b0f860cecdcd969e093e1bcc391322e526996fb291d6e1a9bdf91d2a5ccfdcfc8af8709982392c0efcf87f14e5f6f4c37df6 SHA512 b42076c4dc5a5191c8bd4d6584e70361aab6d32e98742a971311f58c6a302dcfa0b706bad5f62cb5751e7a58e60d6788cebebeef7912fe4878d165d758f03b0e
 EBUILD kblackbox-20.12.3.ebuild 991 BLAKE2B 14c9657d30af060d699fcc5b4f8f5eb5e9dac1dd2e6b863afcb346f42865b9dd1a9168754bd5ec9c32b5c2625b60bda8152c9b72d54b9b098313f39c7a5dab59 SHA512 2b24ce9b5f7ebe2b9ff3bdd5d31a4ed5f98fc885cb1ab8c5939700cebfcf728c885e94be207c66ed21aba60e7baee7565127657f16f6c36dc42b983dfee365e7
-EBUILD kblackbox-21.04.3.ebuild 994 BLAKE2B 7a54d7fa179474333b2a2fdb05f275d41e1c7cef2402a4c9677447e83d9ade0e067b80e9d156ccdf9f3630afe55434d70f8abd3c6e3da52c0cc2f48a24d8929c SHA512 cfe6e202c8334af38c07b78f2313c33289f1958557c8c54d3b986c538b41e5edf46d1e0d9093794b9737fbcdf043bccb188301faa97fd32386500b8449eaf68a
+EBUILD kblackbox-21.04.3.ebuild 992 BLAKE2B 4ac211ed923ccd18977a7c20e2fb8e768186781f2f7667fcf19dbf7a9ba78b4d5f78bd2eabd8fe86927f239d1cfc403e86b2696a987dd3f320f91d4d0a5ed456 SHA512 7181efc0413def5d4bc5132970823a440918ce12d61a6ea599ac0c3493b2d1d788d76abd4ed7d3bba455511707cf34bccde7659e881da361908ddc21f5cf7f37
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-21.04.3.ebuild b/kde-apps/kblackbox/kblackbox-21.04.3.ebuild
index 2ff69f8fe1f2..3ca74bd1635b 100644
--- a/kde-apps/kblackbox/kblackbox-21.04.3.ebuild
+++ b/kde-apps/kblackbox/kblackbox-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kblackbox/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index 428a7461981c..b27895b07096 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +1,5 @@
 DIST kblocks-20.12.3.tar.xz 1908420 BLAKE2B f4b5489b1fba530bba81ac446af949fba242812c5dd1b9dbe24c25f237bccddb858c30c882e5d8659685b3a1745af7f97d24b7014abb34dbdfcc7649310d2096 SHA512 ba5164af1bae348780b4ac284be0a696521671d258a26d0e2d7e401b995077d7b4c01fa0c3df4dbffdd6f79c617907e41b452b067d6d8861ffcbe5b68d5a2690
 DIST kblocks-21.04.3.tar.xz 1912336 BLAKE2B 645d5bb20db8417631acf57f83fc57acb38a089a9033deb852aaa9d06dcf52426d8bb576f4360fb8b47f393f3c90ccb944092e0ba732e97cec5513691c7aee94 SHA512 3356063a7d7b20363482e51c0c174a40bb3b799df62593fa4c2564299b649faa008f1ea4b5e2f0c60d46055ea2e77daafe5e7c7ad83b46cbbd0285851e27ce3c
 EBUILD kblocks-20.12.3.ebuild 832 BLAKE2B da17ee1f307d8cf69b9b951d13dfd8337f63462cc673d48ee63f428bb6e387c51a06b0b0b703108920fa3313cfaa968283d042f750d67a56fadcab0484d016eb SHA512 a2d3f86d8ddce75c9cd5b90d5dad5b4b932cbd85e4e15048bdb1ae4f3ccdf9c56964b9a69a7b6b4d3e8fa15c5be9fe9b4c40fb3c29288e3b5dafb3eb2305aa31
-EBUILD kblocks-21.04.3.ebuild 860 BLAKE2B bcb40638643d7dbf49e3c040dbe1b048d6275cfcdfe3ef27606d5a40a054d9bfcd0c9a9686c7cb64bb9c5bc32e9a8776245a3fe4fcc73c3960ba4d1ceb880598 SHA512 e50807d515cb1e938a8fe183ee8bd0e69c630eed4f6946415f3a601117f397ef1b1902ecf80bb9b1b9e6b3665ae11abd071093d8d60a24c233b6a6531a652e18
+EBUILD kblocks-21.04.3.ebuild 883 BLAKE2B 2fb475af2ebfd570ecda1d8c933e27f8df3be8aac73aa43b03550823651ef493e71a20af31c8b17cdcbe1270b424cd96ae8466db4b03dbe8617f6c0371df77ea SHA512 842cd2166849780a7b5ec611d7ee85e87d1e5dd5b74b733a39d28bbc8d0ad52863ee8093fd4fdca1dbd78e851e570556c9e72447d3fb4422086d4fb8bdfea5be
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-21.04.3.ebuild b/kde-apps/kblocks/kblocks-21.04.3.ebuild
index f608ae6d4146..4cf118016cd9 100644
--- a/kde-apps/kblocks/kblocks-21.04.3.ebuild
+++ b/kde-apps/kblocks/kblocks-21.04.3.ebuild
@@ -8,6 +8,7 @@ ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.80.0
 QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Single-player Tetris-like KDE game"
@@ -15,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kblocks/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index ffced1b6eb5b..1cb4cad0fd66 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,5 @@
 DIST kbounce-20.12.3.tar.xz 3443204 BLAKE2B 97cd3d386cc37a60e68cf0f19842abb74df16e1784436299134f7a7473a20f5ace66742351696fb9ef4f8e0a86ebb861668e80df971b81c60d0bd64afa7adb0f SHA512 d1137116ba98a96b129d21fca8f087c87df338ef081dea0b6bcab6b026eb341ad9ef4e9c0858d95a7268e5585aac68336b58bc132acc14148a0f91646637a22c
 DIST kbounce-21.04.3.tar.xz 3447648 BLAKE2B f06cd15abb43f0f95395774ee65992b2d93c861e4e4784f322044cb0e341c1d4fabecfe69d8f4fce6fb4544843df9f2710595a16c3f47a04df0dc9289c7ac4bd SHA512 abd045e3af6e6b65d125e863b9d8814b30a0a0e99137820b5dbc334ff172479c0d67a023bd97c323d2764ebaaa0ebcc6e3d4f8e0b2d4c0f29dbbc85b95b2a3e0
 EBUILD kbounce-20.12.3.ebuild 966 BLAKE2B ec915ad8c6d7915f652f573cfae45c8ea5d4e9b9d86e5ceeeaf43287ab96ee2ba022bcf372208693cf98f1e69a6cd9937d588e6eacee916c84021a2c41e5b8eb SHA512 df5ebdc15b79a667caaf9db38343e0158616346456aad53d4020dcee050f30707d1ebd8766df9280832d6f6ba7b8321000cd4c61ac1d0eecb679c4d6e1e1417d
-EBUILD kbounce-21.04.3.ebuild 969 BLAKE2B 9fa97ca496bee483b0af5fef085d31d31ee80271b397150ebf0c243bfce7a03c860e864f68e3799851d2bfa5db1e4c400565d677a4dab108558ee2aeb4abefa6 SHA512 a87d1cda309879773f518a78e945201e3ed38377afc953ff77a667cc943f587f94309e96678e6cd2be814d464887077179ce7003fd3aeae5b10b0121f39ad398
+EBUILD kbounce-21.04.3.ebuild 967 BLAKE2B 21adc355e720ac9ca20383158bc46a960f2dafbf102aa48e823714906840cb5976b1179b8fa432a63bc4c59302a119f43aa69258cb60977fe19ed3cab6964666 SHA512 151397c6f7a74ae3031e2c6f9e9400b7423d33d750c603e0afa8fc0e365dda9f378396b94098020388c7f801737fe9f85e684738bcdb365a663e96a7205dca53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-21.04.3.ebuild b/kde-apps/kbounce/kbounce-21.04.3.ebuild
index 83997e7d87ae..43d69cd2d56e 100644
--- a/kde-apps/kbounce/kbounce-21.04.3.ebuild
+++ b/kde-apps/kbounce/kbounce-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kbounce/ https://games.kde.org/games/kbounce/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index 52d587d01cb5..e0a80091e07e 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,5 @@
 DIST kbreakout-20.12.3.tar.xz 2284120 BLAKE2B 48f81ade530cf2d601d960030cb5eaca12af38345d736225b8ea65874fe08632a86fd3ff57147eaeb56d1d7c4bf31a93403904f65846d3140fee599fc81aaa79 SHA512 e74d6ecd602d210ca40f4192c00984eea9bc96c18dc2b72194449e578a5656f81c18680bacb444d707d301cdcf06c47b8651117a05b0ff2888117fea994958fe
 DIST kbreakout-21.04.3.tar.xz 2282256 BLAKE2B 09c585e91a1323fdbb0abdba61b3cd38df565b05ad185ad39b41eb79f527b250e36eb41400aa113c09f392434db6a4c2e0cc91bf16c639210facb0e0c7576727 SHA512 0f72faaf376a239c5d107dd4b45c0d0bff9a8710fca018e1ed0e519b087570c5b3679c00556b2a21feddcba8b3a182d2209b42fc8b3ff5785e0dff863b53942a
 EBUILD kbreakout-20.12.3.ebuild 909 BLAKE2B d71f687b32bbf7219d27aac7f44c1bf3a3605046fee01f2f3a860bceb08bbf4a1133573b3501f6d1f2c683cea22b1fa8ad4bb58f78f6c4c4ff2c5b77c8787f5a SHA512 68f793767106b9dcc467e78e013eabc3102ffa283f19896468325ec965a4cc6ecda79fcc0b32756567deae22a590cac98c3a74dfbb12ad46d759351248c764ce
-EBUILD kbreakout-21.04.3.ebuild 912 BLAKE2B 0d18c3a31a3c86300ee31502f13ce879d7bea19cd2acf4fff8949f42014a1310f9a7d82db284560a894fb3667d778f9b94c2ed00f9b849556f817f872e95e9e7 SHA512 fdb1084c7ba43e7da55e8badd17dab4c3547f5ca7fa0dcd5e9ab5b43b991d1402cfb4537fe7f30527a006499aed974ebb07021b504970fbe58204281fffaf961
+EBUILD kbreakout-21.04.3.ebuild 910 BLAKE2B b64542121c983f315c99e83133df090e1b7fec4d2ae4a34701512e5706023ad7d4f59980046bdf1aeed4da55aab4450aee550116b37416cff36b142e45e29200 SHA512 164166e8e3e18b4a9a86182378128b21872ac65c3d3d941fcfe515a2c286587d605db5f7f42b4898f1a97ea79df8fc516776780dba7c2fa6625b0453e1902d90
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-21.04.3.ebuild b/kde-apps/kbreakout/kbreakout-21.04.3.ebuild
index d73a58e74f93..e0cc9d23d62b 100644
--- a/kde-apps/kbreakout/kbreakout-21.04.3.ebuild
+++ b/kde-apps/kbreakout/kbreakout-21.04.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kbreakout/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index 7a87cd4d318f..bad9885f2d7b 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
 DIST kbruch-20.12.3.tar.xz 5614940 BLAKE2B aedcf2426709cc26a992686ec5d561ab7808230d4c58323117d31901873026f101268b2df136390406e43551c61a6117714a8932ab10264b6e5d1d22a4d65d21 SHA512 c0c72e9eef3da49328b201e36160d0ff6e92e011c8be5ff3d82db67a2c598e53a1ed4d95949ae0734bedaa3bf3b49af5722eb184fcb2578a813af5f159797dae
 DIST kbruch-21.04.3.tar.xz 5627384 BLAKE2B 1c87c0efcdadca11e7e56e7b4dd6d5c43fa8fd98ff70e5b8076a32f8d5e4e595d1d966c1303ec91d427f1286e4dbb65b17911db4dcdf96be7caa7548c7d6ca49 SHA512 9e7b9ed8314554f6decf184606d334de87f472532ec7e44d296316884f112382b1f7eb49de275c83dab51048d7211f337b0718cea91fda5df6a1f43aaf0ab09d
 EBUILD kbruch-20.12.3.ebuild 734 BLAKE2B 52c1837552a5ea2b06108340b6101f085c113264a13fddaf01201b13a527d0d4f84d7a45c3a58a91babc33130a9ce673258f2345de169e4f2a9a68be137d9d53 SHA512 81125f13d55da7dc89b49032796700ef0005bb52d63bd985f4612424f94091636dd747962ade1de707d31ffbb274fc00daf2393cfe4626c321cd896d2bea8384
-EBUILD kbruch-21.04.3.ebuild 737 BLAKE2B 82e827df5f0dec235ee82deaaec31837f4bb046d9a963f7dc89a289b4f0b57f7d7fc1da5bbc1e3cf1098d9281fcebd3d0b6d3b59a86e55e870a5cae0340c2505 SHA512 91cac9eb13c23c6a70485824e110ab1b379efae719c2cd31c4a511404347108cbd4c82a98eddd08e8746c9c8b3676ce5c77b109a2ae3d3ae98f96268721a7d67
+EBUILD kbruch-21.04.3.ebuild 735 BLAKE2B f3738c6552b3b0757861e83b6577e4a75dceaf94be3e90c1b7d1f951669cd9ff070e0336bf21eb78c2b6e27a768d7885c435868fd95c09cdbeba61b2526ae162 SHA512 648be41180eac195904e6fe87e37c35662bd5a4326f5aec44efeedea446bcefdab9574727b17c3734caeadcefd39daad96458f87e6345361e008a3bdaf7cfc6e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-21.04.3.ebuild b/kde-apps/kbruch/kbruch-21.04.3.ebuild
index 6520c2c23897..e2df9dc1347a 100644
--- a/kde-apps/kbruch/kbruch-21.04.3.ebuild
+++ b/kde-apps/kbruch/kbruch-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kbruch/ https://edu.kde.org/kbruch/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index 6862a704114f..d82a45617e8e 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
 DIST kcachegrind-20.12.3.tar.xz 818260 BLAKE2B d3dfd5255cfcd8cf9297992d372121683441e0254308de61cdee89b70266c32393da75d065331675f14242d6df450f58174c55d0e6f310487f49eb23d9c33227 SHA512 6c2f3a70becf81736e481595676550ffa12426399e856bf6a33f033fb009b86ae55cac8f60b0fe8f499400e5d19d6fc316a191f47d11c40962c8206da7ffdd9d
 DIST kcachegrind-21.04.3.tar.xz 854044 BLAKE2B 5453bf99c11740f6cfe90f4c0051613aebf1fff832b492800ef9c2e21fefd86c8a8becd2e91d2e82a3a56e1e88450b5f9498dd85c73ceed53d49de00efc9ad95 SHA512 b2823ef28686e4e3f25a0b45d163be55899297ec3115a6c984e361c859eb94d537102add9f630abe5182eec097747355cdf259b7eb1ab9de644414cf7dad92c1
 EBUILD kcachegrind-20.12.3.ebuild 975 BLAKE2B ae63ae164bc0d3d7ff3d42c85e89ba45e87e708a98c34b3b21614ef993c3003427daa2f0e6ed6fd77c4ace4e7c9943c07ad6ff480937ca7734cfff7e1caa401c SHA512 08ea99fe5d6efb98f6d533040f79116ad92304564f5f4d151a2f39e523b8db1a56afde64fa90ef17c8debb44668247f6f876a3e86f26f11433dc9c226d590a48
-EBUILD kcachegrind-21.04.3.ebuild 978 BLAKE2B c411e783b4f6f8113b478d604390f30a614a20de7ff310872e6fc3c04c6524b04e875e8a1313f80df631afac535384486f5ccf6c64f964b112f5093599e747f2 SHA512 97751d0cd2b136219e79bdb2975188b405dd9061542bdd7a56535f3063a4126792854b5ce0e830dd773b8c91b98f19373ffce01790ace6c0c03920c7f98ce42e
+EBUILD kcachegrind-21.04.3.ebuild 976 BLAKE2B 3363835077180f36eb99556ab889d2ea04c7790c117962bb74e29d19ce5e3f24cc22ebc27de52f601fa8c9565034226ed0e839f34553dd8b3c7372b68f0105e8 SHA512 c7c22be1da2a5d00a7c5ca182fa7c107151127186868263ab1db90c6d6972f02efabc4011159a59024ca350583c41f1ee4a4d8c3941f636072eafe986a7f0d2d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-21.04.3.ebuild b/kde-apps/kcachegrind/kcachegrind-21.04.3.ebuild
index f07bcd2cfe7e..74173d4002cb 100644
--- a/kde-apps/kcachegrind/kcachegrind-21.04.3.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-21.04.3.ebuild
@@ -14,7 +14,7 @@ https://kcachegrind.github.io/html/Home.html"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index cfb7a9e4fea0..73c62697475c 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
 DIST kcalc-20.12.3.tar.xz 380676 BLAKE2B 00a091b778d510112e9ad0ce72f103b039f5bd28cfceb68481f20fc5f9d810a8d0ddf0503db532893ae0eba32387b0e844fedb3b48b4ba5ac399f76b9d044512 SHA512 033b57ed3432f09974185a8b237a6e675a5603328be5fe9391a00039a22784e7f5757cf64a65f0cec0eaa878004670447036e54fed25e120558f4bfdeccdb4df
 DIST kcalc-21.04.3.tar.xz 372240 BLAKE2B c7fc9a7bc0092dfbd2177bac52599ec01bbed56a6e428528ccfee0c5ecd6a6bd83e1d18496c96fd79a6e10d5a449186353fcea71aa900c6d97be475588da8d46 SHA512 5a5cf142d2a54a4a587a19fae65b93e08e356d352c0dee477e9258a730b659baeca956b47d59001822f0ef3bb3ff3e127135f61ee0a1b9edabb07fc2457f5f3f
 EBUILD kcalc-20.12.3.ebuild 969 BLAKE2B fca36678a6dcffce65540ea39cbde6368c9f54e472f463a8259d964054c61bc2c929cb3d25ad14bca611b512ee4ba8619115b0d32d739717c3bb32d44a4f9749 SHA512 c08ac62a48a6562b78f715ee0e48e67c9e85b7ea8543118b8227ec1994b3743ae843a0d7cfb327b0d22d2355b69f55bc131e891cfddb4b9267b8fa7599fa0941
-EBUILD kcalc-21.04.3.ebuild 972 BLAKE2B d11c46426700197dfeb7b244384205515d9186dc2049bee5e37ec6e2827ba6a4863b1cd9e428391b8b6b97a6af6d27fc8fcf92e51d884ac0b98907e0fbe82a28 SHA512 fa872d0eed1447b3a3aa1ff308cf1700f110b1a47beb9f177c056cf84847e7b5674b30e19a18422ea62eed3de7088185bf4482ca5c8471fb62f6c5d3b6eac241
+EBUILD kcalc-21.04.3.ebuild 970 BLAKE2B 14b0ff6ef861fc48230d7d153aa6135f1c5a7f7c9e58b133bc3bdb5b829a85b9709f9bcb116aca788ba23c2fb04ffb10adc0248f972080e83ce92a17fdb9543e SHA512 700d0d8bde3541abd8fcf04a915bdfc5565ebed5ac778b4c478bc6efaba46ab005e22256d21be863008d108796a31c2b9b4c761602a3b3fe61df0b00d6c21582
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-21.04.3.ebuild b/kde-apps/kcalc/kcalc-21.04.3.ebuild
index 4aa7ddaa8a06..e3b8ba4f53b5 100644
--- a/kde-apps/kcalc/kcalc-21.04.3.ebuild
+++ b/kde-apps/kcalc/kcalc-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kcalc/ https://utils.kde.org/projects/kcalc/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index a160acc1956c..9fda2af324a8 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcalutils-20.12.3.tar.xz 324512 BLAKE2B 0e475570d34302c6008c597be9fe57cc09c2aad52983dcd0648926492a4b57c93db69b8c34ea08efda808efbac238e0db01502f57bf3cf8f0b4b3292a260f4d8 SHA512 a25d85dcc2e7ece08e9b1e4299954977150ea0e4422f1e9062a86a4829f59a356417bc6cea3f242310e7645f88bd66f8335a8b07b839ef58df1c00abf26558df
 DIST kcalutils-21.04.3.tar.xz 334160 BLAKE2B 76d4c74d0374a1d4d82385a433d246d935bd25b83e142984383f402290bfc026782ead1d2e353e85e0fe55c7967cda7a80397240ce5960d138d806764b41f0af SHA512 0f0cd2112fd014cf824b0c419d952c7e6b41910307d0f6abf9c121029e6754b903b773f92a5d3405344ad58d9fc1fa7fcddcbf4b58aa02e07797b2ee1726aecd
 EBUILD kcalutils-20.12.3.ebuild 974 BLAKE2B f39b69e05d6b2c399d9f0a0a1c85280d3e23784b6a3ef909d5568fa428f2eec49d9d5da70e04144e7caa803b3b9c4ff4830c92eb5d54621e11d6e84eb2fd86e7 SHA512 6da0290904f155230a72bc2dc1dfd4c566428c3e25dc153e58a73e7833462492f91a7fd6e3a80fc1a8abe423c86bad2f3fd69aef7bbe2965c734e9b291aa892e
-EBUILD kcalutils-21.04.3.ebuild 977 BLAKE2B 17f849ce2c0ad9cdf9f26ac01c42a360c4427a1bf7865ccbadf70927fe4dab348cf653f0f7ec2a7351bab84dc197c7be5d74fa71e4db57caa324d774572625bd SHA512 a45fc32369d8ee966912bc6a9ca597fe237abd62b5aba8c0a7113be6b487ad9c4da469b364d4631e7d53c9c553650502ac4b468afb4e788b840a309ea74e6b53
+EBUILD kcalutils-21.04.3.ebuild 975 BLAKE2B b60005735cc87df6298e536b1cad79fedc209dccb92ed84d872f5a9bc3af4bce3c055dcbb50153ef121c7d4153b9b95ee0535bee09e28518d09f80f63e9df8f4 SHA512 61fa2299ea01fa258fe0221640217e5ac3810131a5b01c30f0f3377cf698b72351df7582babd66015c7296f40dfd9ab9d556908e6c9fabfa0c9fa3233b02d38d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-21.04.3.ebuild b/kde-apps/kcalutils/kcalutils-21.04.3.ebuild
index 5a4d4b3ad75b..1b6de8862a52 100644
--- a/kde-apps/kcalutils/kcalutils-21.04.3.ebuild
+++ b/kde-apps/kcalutils/kcalutils-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 5e0b263d08c4..d5c7cd5ed7a6 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +1,5 @@
 DIST kcharselect-20.12.3.tar.xz 366696 BLAKE2B 8154d34a4ca06cfc264542e95bd3b5f379fc9cfbc07acc3a4f9a05002ccd7923285ffe51fd5d1d1089cc75e212ea316ecbb4779a140d2d3e2622f706a16df04e SHA512 327eb664516645df72b671fc6a77c70435e5515506a661a40945a760f9b46f027303f97069e04f1695bd4a79009949fdfda70b213edc2415444a7ca0d05912f2
 DIST kcharselect-21.04.3.tar.xz 368456 BLAKE2B 4a3126a3e5a1383fc2c247fb6b308cbb1e1182d28f01951b60c2e6a03de3ef53fde8c4da4d057b77bb356bbd8af567bfe7706c8ad9e3869fd0618c74cfd2876d SHA512 fbd94b178133cf66fd57894147cd13a3cb48d1894c65330f94c661d52c51444b19f4e24d7649f484763ba5428105eacc7f83d48b56fe18d04ad26fcc0448e219
 EBUILD kcharselect-20.12.3.ebuild 774 BLAKE2B 773c4db71b593a78e27891d8e3449b29d1a6bca7bbedaf3cab54cffe4877a2e84d33bae1be94f71ff0fd4acc33637af71b0d66df307d9e57e01b0c0941199191 SHA512 07608f78d356dbfd1e191266772058fbc5f81a7b533ca5b7e7911a2cde953817da264bdde93a7e97fd5a79976b35e5f1f244b3f5c6f49e8580333c004a15f990
-EBUILD kcharselect-21.04.3.ebuild 777 BLAKE2B 66d0e0add6d0a72e8f9c6928865a5822d8c7ad6b2b56d546b66649601c46da33ac4836262a27d215ca37013b3636f57895059ce3d7418d2f011e1ede5dc2a558 SHA512 1abe5f41eacb1b08b2fda47b13f7a7bfc98a5e2ec49d4b3006d56705141045f062c574b261a22cb39dcffe7ac526b197ebaf9126d6f2bb86deea2c5d9875272c
+EBUILD kcharselect-21.04.3.ebuild 775 BLAKE2B 3761d88a992ebe2232b26b7a915ac70f8cc7120d958bac2b88a13ff853ccc064a0ad20c8175029444d06de1b243173fcbaf49ca95ad982644286e0f7beedebfc SHA512 e284307c5d5a7514a09cb8330b584bc683eb49b58e43cd506d7d50c688a9047f9a778a381d5c86aaba53c2c4e3019dfc4e8f16277e8bd04c5cdba26371f5ddf8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-21.04.3.ebuild b/kde-apps/kcharselect/kcharselect-21.04.3.ebuild
index 4afda42522b9..909513c8d01a 100644
--- a/kde-apps/kcharselect/kcharselect-21.04.3.ebuild
+++ b/kde-apps/kcharselect/kcharselect-21.04.3.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/kcharselect/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index cd1caa59f75e..3e3c4d086e90 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
 DIST kcolorchooser-20.12.3.tar.xz 27660 BLAKE2B 96789e1b1ed6cf3efbf03e53cfbe34c25bef070277ce9e4ea7e63952c7280d961d4f5a74009e103f6b570f964e5f3fe1270ec619c857fc87ed15dd4e9c412abb SHA512 0447b447ef7eab1bfa4a13d1e2767e636602180703c994cbfefe490fb7b18478e4d80ab86e52b88f67ab8bc4a327e3855fadf60f56af0816713703cce4b078fb
 DIST kcolorchooser-21.04.3.tar.xz 28776 BLAKE2B 26186c4fc2f3af8f68916871e58235a3abde288de200cfd0e8802bfa7ebeffdf9f74e25415272bf88e54aea559527c03c6f2cb9ff1bfa9302ed04ea136322717 SHA512 3d56a4640e3c5dbfd1870b5cdcd16794ae3a4d0553af69f79ff8d3a2c205512cde388cff9db5006152fe579c43aa25a7fc51eccc7aa0794f8ff45c95fd94c208
 EBUILD kcolorchooser-20.12.3.ebuild 516 BLAKE2B 4c2fcfc4d8034cb2cb1d26ccb7bbdd2a1bc28f31c1eb081730b8ffb5211c29f7a3daa7174d09b9bea50b7a392f46c2dde56f6f7ad4ada04a62fd15d464c8204a SHA512 a5199a9feaea78e5186bc9ab772f64e031fe584d399bde33e4f825337776e8bdd8c4ce9d54c69d867775ba28a2c1eb0b87b5e0b65399300981856b2d501d4616
-EBUILD kcolorchooser-21.04.3.ebuild 519 BLAKE2B f3977190a22b615c6dcdc5353ec17a9def08f93faabf793c6d94e5a3a2f764bcd1692c9134012614ab39ce997ca6d6a0b3bc5d2c1ac74e531bce78b89113c9aa SHA512 d9710bf66b3f97c72928e5358b7dfb7ae7abb827ca88ac27948e75ec7be1e765ef72fda8068a1db347fb98ade9293d32b474dce201307479402a69ade31a13b8
+EBUILD kcolorchooser-21.04.3.ebuild 517 BLAKE2B 38d66c84374053abfe6f1c755815da0a1874c50c2507b476719eb9cfd9c706546efab20fa9de6c6f65f48b65c8a7bbea09187aaefade1c1f5951fe3af8d9651a SHA512 be857c7dad2591a40f5a71193c5bf88db8cba7b8074bc3243211adb4a72b8cb539ffd9f13669722165f1a41b682a7b6e6e1870a4ccfbbc829ff1209af4aced86
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-21.04.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-21.04.3.ebuild
index a73fd4722fea..459b53d93c84 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-21.04.3.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-21.04.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kcolorchooser/"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index 336c3a816ffe..d668a45714df 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,5 @@
 DIST kcron-20.12.3.tar.xz 899000 BLAKE2B a1bd50d43a885974c76755ea357487dd16d964ff888867ab7325780ad930d9d99f4dd2f609ca14fe7356e71e6d9489cf86349044d312cedaf59f45e22f29c2f0 SHA512 e1571c113d8bf869e0fac0a3811625e35896bd3e64aa711541ecd59d145d2e051ccf563e00f0412f5813c1024b292c7a571111d89f0cb3fbc8fcbe4ef95b9b8c
 DIST kcron-21.04.3.tar.xz 911684 BLAKE2B ceea13bd5766e361f43bf95a39d692bb91378dca222f532a85cb8c558fdf5d128fbd132961adc3182eb01935e34b771714619fe830022cb6f0531c82d73a2743 SHA512 1c5645bdda1ef79dcaeb06ee66c5faa8f02fcd7e94e006b88ad2fd435b28ed974a402a6b5ae3b94a729f738de1a2bc4766c48d2295d4d0e442d211c3849be7df
 EBUILD kcron-20.12.3.ebuild 722 BLAKE2B af5dc98c0a3c6e074be6cbb4e0dde730d0a8cff8888e617076368a421b1f1017ae8bb0a415fafd0880d957017d200b2a2ae62fa0112937316142cc2ad21e7a6f SHA512 1ecf63b31209defef7005ac3f66c1a423ad6ed54aa97ad65be9fd1787ea9630d1597730dc82cc84f2436c2a59bb5600a61558bba6efa35d1d0cfdfe6e161564c
-EBUILD kcron-21.04.3.ebuild 725 BLAKE2B e1be14c9bb646cfd4f865bd625313085b30d07133f060ebed409e98157d516ce87ccdc9f276d0339fe8c7b73a803955a45b65543b5194425d9b99470b50cb919 SHA512 e2563c58e36aed626ce47bf7119b71b60f05f59ec6744904cfbddef083c1b7aa66b049ca3ff9d8ccbf854c56fccfdb028af4ff999b8a34d2f642e071145540e9
+EBUILD kcron-21.04.3.ebuild 723 BLAKE2B 8f2d16e69c36480c796e9ca33d52e7d05d754d9c0f8334fb6fcec76c3ba2044ea65d7c598e556964cab83a8090ca5873457a62039306d5565cfba460c8f71d08 SHA512 f949b9c069788eb9a54fdf45971a2ebc7018e30be8de2883819775ac9e41073138b2bee4ade72784ef3d8dfdf9018c9e1b8f3e0ee0e24791e8052c6ad03e94ef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-21.04.3.ebuild b/kde-apps/kcron/kcron-21.04.3.ebuild
index 6386c23acf14..fb6616a81414 100644
--- a/kde-apps/kcron/kcron-21.04.3.ebuild
+++ b/kde-apps/kcron/kcron-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kcron/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index 391a93fff84b..74237602c400 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-apps-meta-20.12.3.ebuild 950 BLAKE2B f72c901956e376de586e5d0229babcb6b1bd229a13a354a0bdb04fb198afdb685d8de5dc129d9fb74fa959e3a0ae86d3ce5401a468dcfca284d5a5ccad6070e5 SHA512 42720bb05eebb2dcedf71aaf50cf479047075298e606039acad28ba918062dee750f2aa953764d6d1a99dc088258580b3f1f2f2ca683ef2673344c81a981062b
-EBUILD kde-apps-meta-21.04.3.ebuild 953 BLAKE2B 8a0cf50f89756dfc8cf4b334fa9309d001c50acbb9b0813af2524cdb1f52a06345e849d674f00996f3da96712b094a56fe70dc73dd8e0e2c4c5a1fd97424e4db SHA512 6b0d91ea6325a1d5bf4370a7d92d82bd5c37716608c64cb4281aab9d14a1f8e38384bd411965b65ea9fb2932b5de0d730b66b65e7e3988b34a4459b2b6be7c41
+EBUILD kde-apps-meta-21.04.3.ebuild 951 BLAKE2B f35b4d33ef02d14130b3ca9e23da05ba836301620fbee8873c3c2c8ab1d8206cb6f582f2636a97f3ce17fc33aaebfff13a419cb684519714acd0ba477483ffaf SHA512 c69c237bbca504a002e4775534b11fa98595647843ce822c9be5c85410df58434588a57f94ab0c2f763ea854d2fcaccd16805893696b63c7dcf5e01de0b613c8
 MISC metadata.xml 1049 BLAKE2B 778017619970b4273fe80289685d475957f475d667835e05c90b7e39066e1bc33e2bb30d44d24d22adb0f15ff23fcb30fe9be96870192c66ff2c110826d3c697 SHA512 9841707a510b2b7a948fe4e06ecb79aec4650d9f40a4a4acbbcaf1e5500d5ec7767496bd7d1daf194a66a919284dc1c04c8fed73e81d1cacac4b1aee3839c77c
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-21.04.3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-21.04.3.ebuild
index 324d66357462..5166b2d73097 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-21.04.3.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-21.04.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="accessibility +admin +education +games +graphics +multimedia +network pim sdk +utils"
 
 RDEPEND="
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 419791d30530..f99496f24b65 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-scripts-20.12.3.tar.xz 366516 BLAKE2B e828220505de0287bfaa16f690a75a2f12fa2d6f7615aa61da123c9a2dd6473340cb17cb491541d37e1ee41688c10af2b0609a9d65f1a8f38b9cd0fb5d44edfa SHA512 5f6df12e9a43fe0721a9e21f152a25406ed03d7dcac45f06990667b54e13227744dacad2e7092b3c12655159e4c36aad1ebc908978117d8ac22db6f52486b59c
 DIST kde-dev-scripts-21.04.3.tar.xz 366364 BLAKE2B 27726f6fbc727d2f42fa5ad7f3c6bc7eebcdc0db825c7a0723b00082eb3d6a153f1d894393268a90392d8edc6afd80e86cd8e802480a5828b95ca53528a4a704 SHA512 dd35c0b79b7ab6f4dff36b91281a3e4dcd4b5d27d1de5b33d3c4db995dbc909a6d70897f2460659efab74097b95e3ebb1c2c0f08ece07a6fdc5bdba87fdef93f
 EBUILD kde-dev-scripts-20.12.3.ebuild 633 BLAKE2B 0bae83d8f8f1c9b9d8e02a6f38acca0e16e76d55334bed2d0e9e5369ec88fdb794955401c7956eaadd4fe45bb62c4c57020b66a04513533e35b13025e3d7e3d6 SHA512 5d47d0195d41d49e048375fe748399552a74d509521aaaa94c14793c7affbe7ba878c4083b79aeba2a4bdc734fd09f45a8576af0fa8990ae4c02c4d758285670
-EBUILD kde-dev-scripts-21.04.3.ebuild 636 BLAKE2B 968cc7720e01bc48e83ce2e6c582d9a34b2da76b12ab3ae94c536848cd1bb83d8ce9bb1800eb0efbf2858f9fc629875542d26e2bb2eed37829abd3c996c3b0e8 SHA512 ac0a2de5b3cc66d28569a63d70c54f2448e64805f1558708035e866b1ec2794fbd8e8b53c72833b2f7edb2b1094f2323eeff5909d8d0b5185b83e716ae3628aa
+EBUILD kde-dev-scripts-21.04.3.ebuild 634 BLAKE2B 02b97ff5549527850de282ed34e48193eec9a84bea4338bb2d22ec6e223cb5afced610ad5a44fc42d6be0af3232fdc470079b6380e2b5bdefbc26a186c11899e SHA512 5fee2b3e1cf554bc4246a92356743f976f42af56ad063341aacf55a021b84ceff5a0d35003f0dc8cedfdfb8539ccd9c47d8b924e24f3050dec32f104360d0a41
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-21.04.3.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-21.04.3.ebuild
index 8b412e9ee4db..2d0f1d3def3b 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-21.04.3.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-21.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Development Scripts"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 # kdelibs4support - required for kdex.dtd
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index 7da8e0d40ca8..163b86fa7657 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-utils-20.12.3.tar.xz 65832 BLAKE2B c83634cbbddd63b732d327ea316ef067840b70451e7f4eb9cc1f3d003fe4a61c8d2fbac0b5ccc0e1be535d7a31876455d98701f4d7c239393f021850abb38245 SHA512 72f5eccb3a67c4ac1a1bf9a8b81879a622dcae23b23df9caafa90f13f16de449a6c4750b0de55d99146a823716cf3c8845d1547360824c51d3b94882ca83cb7c
 DIST kde-dev-utils-21.04.3.tar.xz 68048 BLAKE2B f8b2775d21f227b5c2c48e8fdb38a1e78064dfc4237ed2dab72fb9a7c29a073d34db61ac74c82617f5b9ae08ee4b7aa6b763b2183ecb5d95015a4f6989700e76 SHA512 5cc7fdf44779852bed67d7321d6a4918dd1973dd9868fe1c4cf0c275a0ae06c21fa388f027a0b15b0839be1c9d482f78db06c96285366a0530f58901353572c6
 EBUILD kde-dev-utils-20.12.3.ebuild 730 BLAKE2B 8d6c16f6c804811a47f48b1e6c27cee16017de2ed82f8b3139d7222c3b7c4dd461817550d907eaa6aeb4c83f9aa3cd454dedaf362d2c462f4b7fc3acd80000fe SHA512 75e004001767a593c7a936e6204e3f3791b87daeb1190d7106fe102fb15081a36d8221d86d41d751a24c622dee0c19d2c7c2c39aee1f85a5d1fbab22c45e2318
-EBUILD kde-dev-utils-21.04.3.ebuild 733 BLAKE2B 788fecfa92193d57a9937f3251ca8917e51ee377c8dad2a7058c1ee84c1195fd905717dab7bcaf40e6e34841b425843c175d547030348baea63a30be93c21f82 SHA512 877db72915a7cc75c9abbb30005125b635bda8251ad60ce93e964644662666149561114fd66e592dca9fdccbba4fcf7a3d7766eae33626d97d1b1a35e732fdcd
+EBUILD kde-dev-utils-21.04.3.ebuild 731 BLAKE2B 1d662574a76dd319e2ce4b20d80fcf38988aa1d34a5048460c2ab14a61dba44d1edd6ecd5160b6b5e78ebd8a8ef16107acd9a036303421c3af2cec5d528d1454 SHA512 9eebfc5e1ee7e33e0cc1d9e230997d5ef9305a062f8f8ec07d7260c7bb3a983911011e98788e1afb33b134583c004e62fb2c34e8373591ef5ccf566b4bbb5ec8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-21.04.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-21.04.3.ebuild
index 7c582a443f0c..7895792fa082 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-21.04.3.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-21.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Development Utilities"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index a8cd99d79232..e27d3e04691e 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeaccessibility-meta-20.12.3.ebuild 458 BLAKE2B d406ec105431b43460050a5ded74658ec77b0fa3ecdfb5dcc8555f82ad0c064a457180f66fffee415ae5eecfab1bdf0501134998b33ec57dc2ba8eb03e090e1b SHA512 f87d0076f181a680f054b2cb05ef311eb4b3dc32643a7963bc81d3b6b848dea1678dc0d91446500c7090edbba5f5542115c17631351737ecf5262c707c8ac4e9
-EBUILD kdeaccessibility-meta-21.04.3.ebuild 461 BLAKE2B 73efa1a252279d36b84dab3115f048dd766a29245a695c5d86197b8ef3f5e99ecfa452631d004fc16b80fdcdefa5fc40ec29276f634258917173876169a4297a SHA512 0696d12c5d9674949eab271b65eb310dabf7d135c0541e38fc022ff6da160fea6b4638c38d050c32649902028e52b064b14e6935095bf4e0709ecaecc737d51b
+EBUILD kdeaccessibility-meta-21.04.3.ebuild 459 BLAKE2B 1f0b29bad1465c9f3bf4db2e3b01d3ed63a435529ee84eabd2fa3313c8014541374ce9244585435d0344f980c5f79deaf28c528002ea0d7c08dc4c966778226c SHA512 33397f526d9644aaf9e0adae1a0f5057a4ae8cb5aacb041ee44da28ab043e0520ddcf9daac4840cd3049530e08114c6890f1caaee07872831971ae14528e6745
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.04.3.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.04.3.ebuild
index e4b3bccf62b5..58b71f53778d 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.04.3.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.04.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index da7aa0c649d6..310c4484a48d 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeadmin-meta-20.12.3.ebuild 405 BLAKE2B c82262c889d94bdcad917f43d818a389607beedb3be7f0eea60dd645ad4e0230967e3edacbfd9655284ed19583a04149b82ad13aa99aeb24a51d0c30f68a3893 SHA512 d03f901b4d8a2b41aa6a758cad59d04a59886e960e495700ae4cb223df2404d09e6fa6f3934f80b52a90c5148ad7dac1953709757eb73d59da7f942f7ca44c57
-EBUILD kdeadmin-meta-21.04.3.ebuild 408 BLAKE2B 7e6d63185c5ea38506d9753a007bdd15634a9558eab09b6847e778fc5017662c8e91c84a83046bc87c13d66b493f7877e465a397e99505ad1955a56fc644265a SHA512 841b134f2be517b0dc47681a4ee2cbe31bdaf01d4b9d143327a5477f708b33837382b027721b95a0a687ae62c04d9f588d5c5eacab38f8195be4986b63939dca
+EBUILD kdeadmin-meta-21.04.3.ebuild 406 BLAKE2B aabeaeb8f5be23e4c5a49dc931cf463bd06349cf24ad6616b67e6d2a0805218821c98c7276771c69fd4a42bffe33328e43a0d5120b95095521a50cd7c0133657 SHA512 d53c58ae3bda741df301b41903853983dab4ddb5d30a4e01415a3a3651c3b212de34d46b096dee5d8c6e8de569ee21a2af00b5494409c0bf99715da2ea8a6dcb
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-21.04.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-21.04.3.ebuild
index d7737ca1704f..56d784e18d24 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-21.04.3.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-21.04.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+cron"
 
 RDEPEND="
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index a67ca68b65f8..dfc246f1817d 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
 DIST kdebugsettings-20.12.3.tar.xz 68344 BLAKE2B 75fcdd7e9fa8374cf7540e0aa229f641f0eaefcab706840ab8bce6027b430f3d194f723517f24f84389bb1b9480f663d3a6302bf54bd3e2269e21bbb515ffffd SHA512 ce03f09aa75a2691a0752dd2fcfbd4f359584b97e18f6b19cc571985d4b6e552a925c6d3c5e16e32e6894f2e7f09a9923a81bb98347255bb9b9bbab951de3fd5
 DIST kdebugsettings-21.04.3.tar.xz 88104 BLAKE2B 86acbab14797946f6561e3b08e8880f51d78201cc4fec6e71c6f47a01da149eced6a73ce9e5f2fc5c5278e74975636f6476fef46fbc5a9194b396362600bf77d SHA512 371f07e896381a21233c4967c9b0f9b7380356edbfceb491017ddc7d985de4c8e685e508762abdaa394adf3796ca734af047411da276bc578f0512b4b633c5d8
 EBUILD kdebugsettings-20.12.3.ebuild 780 BLAKE2B 7ab44898901490eea930775bf27f38eb6d68927a1592ce2df02ad33490f9115a38139d341093ffdc35abdf049c82a67ccc92d3f286887b336884fb52841a60f1 SHA512 f1cc9bbb449a780173dea7266c75fabb3e9b175805526491634046a2ec69e2d2f4f8a64812ed3d451e0e0418fec75fafb69b34900463b57365954146aed0631c
-EBUILD kdebugsettings-21.04.3.ebuild 783 BLAKE2B bbb3ebf634d205b72da62b4224c6de9f2bb087288df1518fa6bdbe082d8e3820fd6cfb759c1ca0b02a9af2408fdf14d825759221e222cc82d19b3886961d8af7 SHA512 51489a9b80e0f160084c4b434dd25788778f17d518825eff8399ad93e4956f1a5fbe34605bddfe8b831dfd0d15fb4fb24525d598092f246e663236c43b2f05d0
+EBUILD kdebugsettings-21.04.3.ebuild 781 BLAKE2B a437bf141d53c5b2b61637a70f8b56d960fc15bcd28a756ae8082c59e5ecf04c570030e437cf72224450f671049fb23edc45a3060897d263a777f30ac99fb8ad SHA512 5648e52e51294df78980b7d8a0c4f4d1553aceb428f9264bb8be2780e7b325c73275dcdb96a97ab1181db8ef03e74db381c23277d5522484221020566f9b32d3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-21.04.3.ebuild b/kde-apps/kdebugsettings/kdebugsettings-21.04.3.ebuild
index 36422bfc1777..aaf611d197fc 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-21.04.3.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdebugsettings/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index 2617d37e6f0d..2abdb868ecd3 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdecore-meta-20.12.3.ebuild 885 BLAKE2B f5573ad359941896a2bd7fbbfffdae42c0db84d8b737268d9e67454f90b1c3d8acc0dcbe2fa095142fc8827ca7f50f8fea5d91dae0077a61d9f76db14684e35b SHA512 ef662757048eaf848da0e67a2229256bb0aa25d20fb060d7edd7e9a0ae61114d697718778d4838d242489f8ca5556fb27382bbacfd7321cd64db674ff7d9c8d5
-EBUILD kdecore-meta-21.04.3.ebuild 888 BLAKE2B cf4ef2a172d734886eb292b865505da063d0eb90046ef44ce745c2e00f57b02dc6370c4b4537c57141ddc7db4a2c35a5ba22352f1de7a020f42cb379bbdc636c SHA512 8baecab0300fff55904271055df814cc1c56970f21a5a1a7bfca83fb7f03fd871069b08d078f80fabf2fa19f1b210b6e9b448b4f00181d0be8db48befbf11e01
+EBUILD kdecore-meta-21.04.3.ebuild 886 BLAKE2B 7b5f97a7e784849893cac39271307fb73739faf6eed1dbed112e67d37e814d837453a9b21c4a85fcd093500bb01e1493e0f3738f84634141b8dbf6bf49e4d7c4 SHA512 a5c221b4e3be5362ccefebcafa42c61a883eb99173217d31e37262c42c7bfedc3031d1c6f478c9769225e5a8ad8688d493c9603833095d60b22079f8b7498060
 MISC metadata.xml 682 BLAKE2B f02620682a0f1f2b1e8a7621ce9fca0f0bec646787a8e2b00b0d7b4b0b2236d07429fb31bab4935f0ad7f969857ccfae49f8c4ca8849c9b733583ce0e41533c1 SHA512 414e4d9cd87a259c5ce473d33e9f55c6aa54428f2024925f6bf49e68df2d458d45e42f865cc8a5ba97eca04ab85c035c253ab98503c5c3855e199b7b97043098
diff --git a/kde-apps/kdecore-meta/kdecore-meta-21.04.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-21.04.3.ebuild
index 747f60dace4a..07d3a8d738d9 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-21.04.3.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-21.04.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+handbook +share +thumbnail +webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 726dc0a65124..0253c82804c2 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
 DIST kdeedu-data-20.12.3.tar.xz 335416 BLAKE2B 2ffc9a521836b2a24bba19bbfd8ce6a70dec164c90d4d57d893ff4ce9111de13e24272df555db0dee84898159a38be5f819acf5bb9c7100c3c3e622b3aec0812 SHA512 f01ff9489e7548ef13ff0d4120e6d2cf77c5e41c26f0a74fa7979dde96cb89e1b08957017e54ae3df60bc440eae2abd653dd16d87d340f58ec17a9d84141286f
 DIST kdeedu-data-21.04.3.tar.xz 335780 BLAKE2B b6ed4e4c221df442154121a87f3208f46050bc9d3013916f4cb6a2b17cb176a6ab607e5558c0375e55877ad653087772d7c9ba6f92dd44901223c75e085a54ec SHA512 987c5d65be467837e458d5d74540ff6ec2d6a47f59043d7a41517642deda5c4645b76ae9cbf8d5f299841b13e4034aedf9ef9afe30b2453e782a6056656885fc
 EBUILD kdeedu-data-20.12.3.ebuild 345 BLAKE2B 316a4a729327f22630b07b69ea3fdcbfd79d379ac7b839572c3c2b9c51b578c61c2fc42dab521cae492a3fbdb7f3968c75a745174a7c54505ca10209093f6165 SHA512 abb4b66376f439d879d02a6b9b19b84a800b8c9e4c866730d7c325d8ba4f124b4068ad7e1df0ae432a24686b9e6defad3d16e004e65a60ec04cd0c17b92ea3af
-EBUILD kdeedu-data-21.04.3.ebuild 348 BLAKE2B 98e4d9d43e40d8ca48072c822e65156a8dd110c1dac602c5024685535bcfc427b9147e801e36a8d4965d5455dd240ab7f61d85a3271f9e939509f253075b49f9 SHA512 8eab227be35d22b6c0ed0b9e5702adcafbec44ba5235cae39bd41449c49e15007b3e33b4008d2dcefca6faeb5dd029853c6534679ae4e906fc1125ff83fa4e70
+EBUILD kdeedu-data-21.04.3.ebuild 346 BLAKE2B 8b870b832fae362deb06e57c696971207bf785e01d125b257e6d62e155b35cb6ce7821a46f3ad32c18779c37383a051a4e4452ff59ea87478a80b94c9f7f30af SHA512 ab9674a4ae726e634f2b69e73eb4d4973ddeabe8b3d00cb9c2d3526d3ff9a950f02eb468c5f6379deea97fc2481e3dcc445ffed1d9511c854ed80940f1677d01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-21.04.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-21.04.3.ebuild
index f4a76399035f..e6b368059a5c 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-21.04.3.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-21.04.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Shared icons, artwork and data files for educational applications"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index 8a6cb65fbb27..a5a3ebe53369 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeedu-meta-20.12.3.ebuild 1206 BLAKE2B e2f473e86877baf0ca717580f22a8a5e8049e3642fcdf761c7082388934e4858c531745ec7f81874c3238fbc968db5cddcafaeaafd5c5bc3c624a71a62cd6232 SHA512 510a5f40b16442a91cd7fb7f0bcfb62ec8e90b070e9f6dc4339fe86351feeadd205de4727c740b67dd69004d145f4192844917af682400596c569e68082bfe45
-EBUILD kdeedu-meta-21.04.3.ebuild 1209 BLAKE2B 8a3708473ac97cbb04bcac1152dbaccfe3cd44ced40ebcb7869ad99095e450e0c7ca92a8909b8253f5fda09d0a854d8e0bff021337e8cd63de78dfc741192e19 SHA512 b7b7abd5c312ad8600d716546574c8eec76df00dfceb945bc5f517e1e6225f6350b59a9802f5ec0ebbcfd7b461869b604608013d9c72c782ef4eb3c45095755a
+EBUILD kdeedu-meta-21.04.3.ebuild 1207 BLAKE2B 0465b4811c3598205140c31333cd319edff5250d0e4d0db1448fa7bba449d91b32666209261b1153bbf584290be540656d9b22f83b8221de5806f6ef7681a0b6 SHA512 9bbe2085081c466406c07df157c2df2da58998780a6bff24736c51dfb4872474aa91e940dab76e4c731ba2adbbd6b6ecdec21deae5c35d48aaf5f33ce43af19c
 MISC metadata.xml 403 BLAKE2B 0cd42ab85cbd256e6080ce92fd939e8138a9639832c2f0a87ce4fec0364ead3a180d344c16672a2631dd294cbb7f50f9d748a6a3d0585c6a834bffb05469792c SHA512 50f9c120fc6e8705b2b40f21a3e119a1a52fdb1bafcaed645f41bd13311cac342f4ccff3090a9fa3ba031904871954f81ef3301c73a58e0688d071ddba5d0152
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-21.04.3.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-21.04.3.ebuild
index 059d5892394e..8565cefbde4d 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-21.04.3.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-21.04.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://edu.kde.org"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index 3ed79671c212..828536fadad2 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegames-meta-20.12.3.ebuild 1804 BLAKE2B 1ea9c4228ab62ffcfcd645f55df6d5db7005078139d80c8ee75f5e20b0fef76bb0eefdeb09deae26fd3fdcf7decf33f262eb91d7d9e868055023c4ca55b71680 SHA512 b9be0ccdd464fc18681a1838fc90ed55c2309f06cdc45a898ceef0defd42f528dfda22842fd819d2d643966b757b25af05b596fd9fe5ece840e638bd6c7e6570
-EBUILD kdegames-meta-21.04.3.ebuild 1807 BLAKE2B ec4e9a72dcdba2cc25454e204c895a7a8d1a4346fd6a35c19ef57a2e96014f3e202ab386bd4ff35cbf6810849f2dca7a0a8fff68062a2b67b44b4934f721be4c SHA512 3d75ceb95e489c181cfebcb7aceea3eb99cb85923827b3b39c30c004f409480f791c0aa6e42b66cd85ffad749c91c2ab8eed65343d5d77c0bc72d8a1c9860896
+EBUILD kdegames-meta-21.04.3.ebuild 1805 BLAKE2B 040a04d590ddb6adc1473a713a758a783364f956a5ccd65737f2f5c868fdb7221e211292709fb1fb2cb171a1f96d770ec493a7b6092966b20582b79d742f7d90 SHA512 8571e4c6b94f848b9a982893d1260646f9ea65a9180cf6a4371bdb674f33fc5ff3ef3b321c4ae95f0a57bf0c8a2a27387ef00a29de4b85e07033ea1d3508b50e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-21.04.3.ebuild b/kde-apps/kdegames-meta/kdegames-meta-21.04.3.ebuild
index 9c1bd5691767..cc2567e8e767 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-21.04.3.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-21.04.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://games.kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="opengl python"
 
 RDEPEND="
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index 57670b8c41e5..2ec2bcd9ba05 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegraphics-meta-20.12.3.ebuild 895 BLAKE2B 62dda55d2fe8e64f0d17f1284e8a69bc9c07c9912e8c0c8c76ae4d61521f5e73d4c8f8cd3d58e7a88cb8c6eab32ad71778e5c1810f364fdd7662908291648eea SHA512 91c6b1f82f61d82dc3986fc6acd6619a5aaf060d1615c419f255064585a6d3b101abe0329f1d40dec8692210d55d1b5e588ee5f9060d4bc80a834da143e5bbd9
-EBUILD kdegraphics-meta-21.04.3.ebuild 898 BLAKE2B 1dd93908c60c42bd3256ec624ce7ea3bbfbc8baddb8c258b7c3d245889f3edb0edf9ab06224cd3fe63ad9da28046278d310ed2d79dc287244aabf657624cb3a0 SHA512 c1353fa8c0cde0c3bac92d4a65d5d006d327a1d2a7b2290c01a9c04f5c6d9ff7ed5aa09d1005fb60938c4b2074a68d06425da6026f5af8304761370b2e036b32
+EBUILD kdegraphics-meta-21.04.3.ebuild 896 BLAKE2B 4c3e14a10f8c30f119134c57222763b5351c1796e55198f539e6cd4c32f831c0a2720107f0839d047f42052237f30f1b692b244023604f4825bae5c90460f93d SHA512 f9a6bd3eb0aca4f01e8bceb6f4b3993a5d1421636e82a31b60ebe8d92b18286b624eb4320fd3956a6c117f69178c5b9f11d84b3cbd84b3a42dc7a827c2336a37
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-21.04.3.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-21.04.3.ebuild
index 0804f556c991..fa812560c55c 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-21.04.3.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-21.04.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/graphics/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="scanner"
 
 RDEPEND="
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index afa25bf54734..c61dabda7a9f 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-mobipocket-20.12.3.tar.xz 17056 BLAKE2B 9d04abfe25535c237db8acdb9e64d093a3da3fd87ad7940e1913b38a53fb59a449001a3b05a9a9ee352bb77af4aabe83511d7433ca0b9a57e3589ecc243b14fd SHA512 53367ccebe087186a30959852daaa0168f0e4c65f11ec9e074dd2f52c37569258b304a3ee5159770d5d2571d5aea98be6e113d9112ed249d5c948f2f00d92e8d
 DIST kdegraphics-mobipocket-21.04.3.tar.xz 17092 BLAKE2B ff2f227b31e2fa491b61f85fe38b2a9017c59cca9a649e79dc15ffb0cc7168aed77f4adde4d6621a796f2a00ed189cf1d0385131ddb8bd9a043f45ba9d84f8e0 SHA512 112b7b176ebf2631dbec5b621b34a1df7eff1ad0836ad4349039a539684aa7a7496ded50fd5d15fd3b3c6807bf2c3a6b9ad7483b2ab8758e72f4cd0bb6488224
 EBUILD kdegraphics-mobipocket-20.12.3.ebuild 516 BLAKE2B 8a65a5496de35ffb8ba9de3f4068977a76059c1af287ae3e2f1f0cde28675e4013b6e7d15511f67a13b3fe6871b6f915a3185f5b22a201b93e8bb289a3a8521f SHA512 43f0c4220195563b5593662b1d7761166443c15846c62839f0cbbffced0e4dc7ce3a4f3baa91d1dc58b8a6b3d02fae6fe1807c2968de0d90ad6c4aeb9c52f8e5
-EBUILD kdegraphics-mobipocket-21.04.3.ebuild 519 BLAKE2B da2bb330bd0c51594f7ac1a430690eda09d5edbf5b82cd60d10479e6b3bf1c5b7833b1d5a1302e60f1b17b31d6b26578155e0bbc8034387823575a9ff2a3f284 SHA512 8200a3960c34aa5380309765095a9a9241b9414e1b7b03d189d74166ca3dfeb29d16e07fb18136d93a1fcb40c54f17d42a2209f9989fb65e56122bbd929cd8f3
+EBUILD kdegraphics-mobipocket-21.04.3.ebuild 517 BLAKE2B d7d26d025d4ac29fdf6f536fd80b157d7ee64df3aa0a68ba76ab5214070c3402bb59620e6a6ceff6ca7b403129f6496ce8b2da21fb73d1958ea95472cbc0bc02 SHA512 40c29fe49ea37451d6900754cb7e5fdac7482b22cea041b10053544308a5dcf5bde3a6f50a6f78440ebb4199fbf86f97ccdf3f0398372c501b2eeee440c136a3
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.04.3.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.04.3.ebuild
index bf1ea99cb9ee..9bd402dc4c83 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.04.3.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library to support mobipocket ebooks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+thumbnail"
 
 DEPEND="
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index ebccdb88d761..15799bf30fdc 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdemultimedia-meta-20.12.3.ebuild 840 BLAKE2B f860ebecc10901d6701e725d8b1e0565c6073d00919f5c1c7f09744e5ec99c28808fd9c47859405b3684820b0b0e3b5c5ccaf5b496a7be9c59f644bbd2aa5e30 SHA512 bb02d01fcd859173eb0819e39f1e252888bd58d6dd320616d5eafbbaaf5205e0cb9d4afc5eb532b4f937040645363f0a3047be502f09787f7585a12e1749ad7b
-EBUILD kdemultimedia-meta-21.04.3.ebuild 843 BLAKE2B 18b352b96bf43e834065d3eac9507d27ffe845af031c49de17996c4fc745530392ee8a015aac510072b3441e4f69e7f45c257b6e54fb49391e25175c031af157 SHA512 4b9135b2a26cb2bf21dc9e94dccf8471dc20dd6efe4d9a77a8a3d8dca4e7685886f635812bc62f54df3c5b4961412e7d5ffe5ff9edf6dd4e487598d7ade118d6
+EBUILD kdemultimedia-meta-21.04.3.ebuild 841 BLAKE2B 0e764d1a998dee8093f85464d150d220a6050cdcb93295720a5665249b650e1da34e7e8537b29ae18e177eb8f9693748339394a10458c0f8f100eb78d360ebdf SHA512 a9fca930ba017a541270d1c0ec0bb25729568508cbc837121a4cae951109aa772c16dc9a8c20d7cd84fe8c9d7b49510c21c00fb25e12af3747ba908603c16888
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.04.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.04.3.ebuild
index b2a8896e78f3..112c409677ff 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.04.3.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-21.04.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/multimedia/ https://multimedia.kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+cdrom +ffmpeg gstreamer"
 
 RDEPEND="
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index 31367d72fb68..c5f96a596aa6 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
 DIST kdenetwork-filesharing-20.12.3.tar.xz 346716 BLAKE2B 8b80132ad55d26ecd9ffffaf11198ea58f284a9118289e4d22b7a74785b6617956fa0116f55304b0623a035e43d1aa3c9b220f564c5eba0d7ee7e656671a797c SHA512 ef635f83e9f4607bf1f0458761dbe918112ad2cee6c798f40c3666836dfa9fec2a6a4d6fa9237ab7694257675f1ab6c09f64a8636f18bc7560a4c4bcc0bee364
 DIST kdenetwork-filesharing-21.04.3.tar.xz 378280 BLAKE2B 345ef38b120de2f1ca6dd256d579995a60c4e5d41b2b2e53aa6de1c051c1deec251cd3943770640445b7c3074105a4584d8144b864bc2c9544ed55a638f4edf3 SHA512 7b8b0d0118829d64d46acfea666a4c274d5c6e7f825624cf02cf7e74558af1f2f2d152cca676ce0da56ed01cb74511c1b20c3940118f2dda129b40551e2ce4c7
 EBUILD kdenetwork-filesharing-20.12.3.ebuild 922 BLAKE2B 6756ec343db59692c020e22e16898e5f53e3991ad4a9257f2cf4d80b796d1f4f3ded1ab0742e36ef71168a48975fcadc5c2ebaf59dbad266c5f109825eae4607 SHA512 70d6fdb1e174ef2bca4678adf42c2597bf69d5da36b4a3f007d05b49e73d740d52aa0cbdfc2c6beb0d145782b038340b0f84ae9e50e1c71193ca8e654a6e7b2f
-EBUILD kdenetwork-filesharing-21.04.3.ebuild 925 BLAKE2B 897cd62920d15bed19d8d3f004ab35d39b6d48a949de9cbb029508ee593e6a659ca48b0da6e2daaaa9c82f5645e68af2f7ffba7df66be06bb2a018060a49ad5b SHA512 bfc24780a736ac433192e0ac43bf659a97c4ba492627bfea5b815384cba86b776a70b34c6a0c8a2882602830652868e08feef3802dfe41817961de55bdbc0035
+EBUILD kdenetwork-filesharing-21.04.3.ebuild 923 BLAKE2B 9c08c7f8c9ba6883f2cc28d328a28f61c5901542ae22e6448559c5992027f26810574ef18e6134fae3f3379e42cbddbeac9b502ba1cd6f423fda7abd75b05648 SHA512 da041d0ecacf8f647bb8d2ce1bdbd3c2d045ae3b2210d7a38aba15422d1d643c15e4fc51afe032f62f5dadbd1fcbb300319d7e6553cb78c471967bc52a56926c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.04.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.04.3.ebuild
index 6327af36a60c..76cbd5f1776a 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.04.3.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.04.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kdenetwork_filesharing/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index e5762bd394d7..a7cf81237d12 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdenetwork-meta-20.12.3-r1.ebuild 904 BLAKE2B 710ff9e513a359de7038a3c7fd84e09fdaba495176a712d483340dc9fa71c1bb72225433e1ea175d7fde5adf93245f6d9afa5ee327d4443aaba9cf413971aec7 SHA512 fc26677b0372968f53020895ad27918d449f18364e8d48d1f94dcda75441ad4a472facdef4386235d28910de7dc821fc6736b2d5e9a10a82178af97d0e90b9d4
-EBUILD kdenetwork-meta-21.04.3.ebuild 907 BLAKE2B c1a475908aa2dcddda8c0b71437835a0d3ea93f749a679e566f35ca7174132c9057d03ce0024ea1179bc20734103f62f24c78a989c0c9be6d4b166c694df0bb2 SHA512 5da145066920161170b9bbccd241a35654f0dd4d3c9bb28a6408ae4712c5190d9d1828b7d45d802216dec1b88c95385558efea6c2437ce31e023d1ba15242ff8
+EBUILD kdenetwork-meta-21.04.3.ebuild 905 BLAKE2B 169c6dcca95455d7562554305993d9b276486b659926978382ba507775fd40ac646b2d18186cccb74f23453f792c3c8c6bc73160a5a0b1bd68b48bb6287229db SHA512 0b7a615b80d650c2955c87b4e45d8c64c382bcd92bf793524b9240cf116ff6b8fcfdd8e58d1a4daa82a7c4f91a1ef66219d0963ac38f94d4dab9e8dfe93cbda0
 MISC metadata.xml 766 BLAKE2B 07e98c3de6c7176a687ca99c8fb0ac74a5128865a1b3abd4774aa11b8884274115f38ddad5da11ac5e84071bf5b9a8987a37a4202c397838eec38c0aa637530b SHA512 36c978d73c8564969fbc234ca7763256cd89069d907a7d1ce5db87681eeaa3a691a3634afd8ffad78adcb3f6d4bad5f71b6a7cb4badbe2f67357cdace976e357
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-21.04.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-21.04.3.ebuild
index 8831a2f47923..a5f93be16dfd 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-21.04.3.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-21.04.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+bittorrent dropbox samba +webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index f44ea386d25a..8597bc4c725e 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,5 @@
 DIST kdenlive-20.12.3.tar.xz 11514396 BLAKE2B eb789a2dcddc67a73122d3fcab06d43d72566de8aeec97dd7bc8b76918231a859e86c8859be7eaab4017c9048edaa951fd143d8e24187437252490464bef0773 SHA512 b21c9bd59171969ab84b93bab2617333160521c3b99b61a2182f9d9b5e65c3220b6dd960d71fe5eeb032733127392dafd40748b950b9973e0edfb5ae6317380a
 DIST kdenlive-21.04.3.tar.xz 11774932 BLAKE2B 7ecf010b82261696d27f1e94f80902b124474e8f3de94d13efc494eb703b073f05047ce17e45a9e161e505eceee046ff3e5ba1b11cc356c1d83a4b3a7e086ae6 SHA512 9ab5e3f93d0423a0bd746b4bc981a1b9ac14e8440b002d76e44b68597b9c8a16c1f2b498e53755fc5399795d6716addb87c75a58053f7560b108d5019282679f
 EBUILD kdenlive-20.12.3.ebuild 2609 BLAKE2B c0e1d6a000d558c613bb79bc5375f7937f25fec6528edec55ddcfd6223b020ab5d29a6fb60ee0d83baef1da57dde9a2fd90ab1bedce119f445011505502a7939 SHA512 0049ef2fc7e1ced0585a16de9a4dec01fcba55787f52dddff8260cf863e8267412870c222fadd45256e1fd1e92098fa62f51d03ca03715fc0f99374e8572ee4a
-EBUILD kdenlive-21.04.3-r1.ebuild 2438 BLAKE2B 4943758632064dcc5d12be348894cd830e6c0be948c57b3daa74a467d73891915f765db9ce5da033fabe328ecb4ec84e7d0c02ab57144e21e49fbb32038ef9bd SHA512 db6ff669701bd4f3a5946d792c26150c999db1ac0cbb513e6b6b4adda20fb8819790f0fc7cb468d8a87fb351811729fb9e89b0f9d0bacb136ab3bdb30ea8aa58
+EBUILD kdenlive-21.04.3-r1.ebuild 2436 BLAKE2B 6dea463a6275e94c5d5eef6651cdb1b0faccc94d0010755c7859a8400e6402ff67eef224f33c80ab21a52da8b326d27101476eb7422c11e83c2d59588d0885e5 SHA512 6d20e37e6109fe0508806f3022fa68082effb02c814b022d61edef33f33310af3f2a28ad3b1a930e454ffc46ed880ac03d90857da89da209472ae04c361e91d1
 MISC metadata.xml 489 BLAKE2B 51ddd82047dffa39b9fcd279857844864ae16144b31a5768384726729019541c9033f6cf2b358331f039954878cb409b4eda3dde8356ca2d3a345667cd6afe04 SHA512 855156534b3863f573fb9ccdffd144d11be83bb77c0b4e0f968a175730611bbc6b16f2a85e172076561aa02b498c975830187006a24a3095af33b6685835409f
diff --git a/kde-apps/kdenlive/kdenlive-21.04.3-r1.ebuild b/kde-apps/kdenlive/kdenlive-21.04.3-r1.ebuild
index de9656ad7665..45f69eed591f 100644
--- a/kde-apps/kdenlive/kdenlive-21.04.3-r1.ebuild
+++ b/kde-apps/kdenlive/kdenlive-21.04.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kdenlive.org/en/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="gles2-only semantic-desktop share v4l"
 
 RESTRICT+=" test" # segfaults, bug 684132
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index a6f019162849..fd26c368e223 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-addons-20.12.3.tar.xz 2145600 BLAKE2B 142a519bd57a311042ecbdd1e246a6d4b8bccd64c64d1aeb13755cd5b55383b161082fdd897ccbd2cce83a5f7e9c24b2951cf25f88b2deae90ae0da5737c169d SHA512 345febeb6cd6db60f4c5e246d0a775e828310bca50288e36ba676185404ae5dfe556262a882a201e85cad851b3612a27de15e5b9d6076ee109abdb01e4909058
 DIST kdepim-addons-21.04.3.tar.xz 2271324 BLAKE2B a5cea9b75d9614dbca933fdcd8512c67ac921069cae4f128da704956bf80237309b5cacfc588ac1ba39890bee1a15903bd5773f035982342fb27af51ad0b1c45 SHA512 3813f3d9dff60158ca14f4afb8b904a5df9f1d54d180767846be2085869ceeb60ce13b6b017cc8297d8d1bdbb4d0fd7e155701c6babaa7c4c8cfb44d658864e7
 EBUILD kdepim-addons-20.12.3.ebuild 2470 BLAKE2B eedc8c5e911714df5b78a1b84729bd78d8cf485dfd0acdec865e222ea985cce63bdb9bbaa1a2f4c7024816d73fadb7e23f2364908eaf38dd73f23098d5d1eb8a SHA512 2085bbdf6c75dc4f217bffa1ed6a4f9ae7394ce89ce8b35ab892fe6993726ba8ea6944534dd9db3d976e9afb05589bb2ff035ac50012f51ee8e15dae1c84ca52
-EBUILD kdepim-addons-21.04.3.ebuild 2473 BLAKE2B f932c72e4885f32a51fd4ac6a395f2b8a99fd9eefdb7619101ca73d3a5b727b58e87c8ea6d272c5efd17b94740c347a1bd157c99d2da1abed4bae75f518e1f67 SHA512 366c31b3c302b6e3c1bbbf1ad3a087e775dc1b7381cf098588ae223108af517ba83be433751af10291ed60e24f3a01708f25e75fec56bd3d8a420433bad6b00c
+EBUILD kdepim-addons-21.04.3.ebuild 2471 BLAKE2B 0f424dcfcc522c54ac691c835dd14ce319b9e09455e1c3cbc2ee7b9725202a78808f9499c9bb84842818444a8b683e2361db57e2006e8a7d1ab8b354b5a30a82 SHA512 1950051ae6bba02b228d66a5e76105424965725530811cbaab09e9500888deceef14e7f590129d8788e8d4952004639d6bfdf33e9bdd747f2b00c887c9866676
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-21.04.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-21.04.3.ebuild
index 120baae4dd03..88cd7acaee25 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-21.04.3.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="importwizard markdown"
 
 RDEPEND="
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index f1448ecf92af..30a02197c04a 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdepim-meta-20.12.3.ebuild 2519 BLAKE2B 2e2ca5b0939579c49ae5ad49ca02b412e875aa617b988f05157677a3c8eb850529fc567571bef6830802d76d97f3a7ea15e038be86e6ce91f3998f551590cc01 SHA512 23b624bebf33729cb83b8246acb6e33a5abb33917cc10c235aceb36b14e1fdec3fac875ecd01cf80a3f342869948d85d47234b8801bde803c6dc9469fbb76516
-EBUILD kdepim-meta-21.04.3.ebuild 2522 BLAKE2B 0797c52ac88dce9ad681c836f2551164087e275b594140ec777809be3a4a98dab14ab5ad1b269d1f9cfa2e512678c5056e7bcfbe017b8f2d468d9ba78af560c1 SHA512 53473a809bb8512d563f90d252a1c0f48bcee261f4aa158979d9f4393de212fcfdde8377f519801c62fd9c2e3d671d044bc4d9cf0b09eeed52867e20b7ec1e78
+EBUILD kdepim-meta-21.04.3.ebuild 2520 BLAKE2B 8382cd110efb81dfb78302c5f4af57f034d5e132bc69febc831146ece47cade0c1eabba851ef63f8940e09d67da869b7f168452ac8f7aba6462a8fbe9ce4be52 SHA512 94fb3e8cfe6b4398914f1f6ad9bbf4fce24b2ee64c918e63395824194a2f8c0e268f6e4daddb52ab728d29cf4d47b567645b28869cf2f66270969ee4b6122846
 MISC metadata.xml 650 BLAKE2B 27e2fa91fe17cd24da17294c2c8a54cd4eee5342c07d8a1a7ad1515d9c52bfe47fe938f3c96e4e2d1ae9b99e2100de9252e180d55458a46aaab03d46725ab9a0 SHA512 dff51eb660ecab8f80e9d865f9e2a9ce5ace1cea6ff322cd2b71af2e3ce83e45d0ea3fbd499a37413bd9572853b90fe860a040d3e3828836ecf842872a4eed88
diff --git a/kde-apps/kdepim-meta/kdepim-meta-21.04.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-21.04.3.ebuild
index 27d8eaa3ad65..e56489871b4a 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-21.04.3.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-21.04.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="bogofilter clamav spamassassin"
 
 RDEPEND="
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 61d6f305aed5..80796fc3214f 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-runtime-20.12.3.tar.xz 1801580 BLAKE2B 491684ee067d43f0b7f74ee3773401bd633a4708586b6054657c267a1b44cfbe0c2b8ffd9bd8ef54ff1196989c2bc4461352315ea8b1ca32bca85aa9cc345b24 SHA512 5dcc122c80575b6ebd7e220d72f71c58fa96fb894c7419ed5f3549eca6c5d3702d20f826baf1b2f7a0e8b80ce03afa5ede26cb558b9d01e38edf38976ab9b12a
 DIST kdepim-runtime-21.04.3.tar.xz 1822120 BLAKE2B 6eb8ec1d5feb136b31c8122db28e586cca6fee2ae29aa89ee9d7050fdb8088178b262935b80e2f213f6f96594a3a83d48df4670700e0acb20306845fad33cd36 SHA512 1830cde921bf6f0e7a772c60a8bf30db1333f9172596843b89c5333ee7a289aec0670849b88adfce4a451ac46c4f5e43dac715d4e42e4df36cb1b5ca711b0afd
 EBUILD kdepim-runtime-20.12.3.ebuild 2517 BLAKE2B 48d1dc27aade780b9418e8ff7b056275b65661d00ed2c218424ad8aea5f1469f4910b7982e1b03f2ff4d5d8180d84f73553f5e8bef478c59deac4aafa1497863 SHA512 e1b1a7249c2741224d4b798caee5cdef3daaab23abc9ab3a925223edcffd1c28aefc3e564b1707e0b2f697c0272fd60214494ceb13b858f286a4d22c081fd8e5
-EBUILD kdepim-runtime-21.04.3.ebuild 2503 BLAKE2B 8fa54e9c490356743fc71b4239030efde9c721c1203089c3837070a0419785deca9ec6d6faf29f5e6b8191da47d9b7317acd686726cb52bcd5551e12ea792d81 SHA512 c3f072612b2b49b6b2029e5a738a6d43a11dd61de9f800ae23b627e54e51dccbfc5d64e1b09c85029104d115928b9f3806952f796b4263e2306eb174d12724bd
+EBUILD kdepim-runtime-21.04.3.ebuild 2501 BLAKE2B 45676e4973d0a00776472440777ae75cbe053d239c04be846559ad56b81a2d99bdfbe25fe2c44cc46fe4fcb7b977bb1e16ecf6e983abc84d70e54fd9dac07758 SHA512 b15aebd6ef531ccf66188d31d34874212e4bf47e4bbc9e7979521f49432af666d8a3574626a8284302b4bac756b6d0445aa101ef5ce38a6c10c1413550a3c576
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-21.04.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.04.3.ebuild
index 00361b766a99..df6deaf17194 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-21.04.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT+=" test"
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index ff5b8d68a0d1..d93ade80fdf8 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-kioslaves-20.12.3.tar.xz 37468 BLAKE2B 5e42378da8ebc64cde7684626519d77c0b788731b156febed47a89dad30fcc0dd94a772b5539c54b74b44d1006b69786490aee1f67f830b5668d10aa1722428a SHA512 8a37af8b86d3a716e2003d17d79fa018d87639b9379bf76b87184e1cb772afa7370b02e17541f3e895cbc7b2df76df85caaa9c697d46c5c7d3fb8677872a83ad
 DIST kdesdk-kioslaves-21.04.3.tar.xz 38424 BLAKE2B 02e24505e22e8e5cbe965302ba51ea3d174f1220b5d779416f267dbebd2c2b0207dc06fd0602669845d803d657c985b8662ba67dab4e434599fe7c2b61525058 SHA512 f0e6354b1bf5fa0dc851e7a90b71a548790903484dcbb7b31b419d33e203ba7f6e8a632ba96c3131a4996b0553bce66d5ba945ade6820c78d7ae6a7495460a3f
 EBUILD kdesdk-kioslaves-20.12.3.ebuild 422 BLAKE2B 3ba00b60e1463fb7ec78fc293f2129560ad51e92eeecdbd0e61d210531b3ee5d84f27a096b25228f82dc77c05d9a6c77773d179457e52026158354357353555b SHA512 1bbd3098ea48782c60173d71280d9f0889d2ae89de9bd7d61f605a865c82a68ab92bb2b8d0fae1a64e866fd0434c7260f6242997b759ba58e050050486d3ea31
-EBUILD kdesdk-kioslaves-21.04.3.ebuild 425 BLAKE2B 5d4b642419486340649a21e8d5af885d6143876cbb367d1da8c0e284ed17da3ac6b92deed1ecb52e5112bc1edef077963a5f2fa727d1a6a078947db16ca4b80c SHA512 785510e559f1a8c33cd081d0524cac9c7f82ce3b5ac0f4fad1af79afd41a4ec0889284717bd52cb71435c16fda6e53bab75eb02ab6533ed4929d7c5bb586ea09
+EBUILD kdesdk-kioslaves-21.04.3.ebuild 423 BLAKE2B 5867ceed008c64b8fff16c707ad302428de8a22e221807ce4a8a5385733afcdb496b5344f325f74bb8b8eeb6b491320cf03cbaa99e7a361bd11fc8091338f9bd SHA512 6fc854e0225ce3a7a26abc2015c83bd6e09d4b1984d1acd46b07fa0b8f3f0981bad354aa3ff948a85faf937826bd0582969248609410fe56732c2c5a83825d16
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.04.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.04.3.ebuild
index e10275243a45..d8e2aa0fb824 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.04.3.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="kioslaves from kdesdk package"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index b7f9e35713d8..db8d80828555 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdesdk-meta-20.12.3.ebuild 1080 BLAKE2B e120cd648304038f1cf119bad0702528f083450e5f0a932fafe340e7f70a61ad64a56b4ed266d713578fc46038ef20c17692a15b678488fc11c60c898281a9df SHA512 56f8338b8724ca941903c306a21f1034789dc9aab8630de4c2d95578d01a6e1a08c24f1a60aa0cd555f0481072a4ae51c2d056185c62de9e1475b8ca9d400cc6
-EBUILD kdesdk-meta-21.04.3.ebuild 1083 BLAKE2B 9fa38dfb1a59683c4e91ddd6bec0a29b25fd77ee70d4549b080bbe387dfa41ea54930d5c71295fc639bccbfa4177e52cf38a8777d6bb7c448ecfb39449b8e140 SHA512 2495443297433e88ef0366db256c6a76497c8a95de8f3448cdcfe631f4e3e101984281b05da3d8725277a42289ed31345e32fe72f63b62b7bd81cb8667eccfce
+EBUILD kdesdk-meta-21.04.3.ebuild 1081 BLAKE2B 207eaab4ef47d9ef0310ae0684ed175f30e1ceaa51f0064e1c7f8718ce5c440bc44c429f841da831fe1e584dc8e805930b17b0b978b5a86b25c3660a81d0e5de SHA512 a68e94a41c31c35573b56f42f39e0c429a9a29cc2a9d4e5e015f65c6bc7400141499e45335e27c5c73705a23de2d5c54774dffb7231b91e91045c406268d33b9
 MISC metadata.xml 694 BLAKE2B cfb8ab0250e68d767f4d361aff6b3d0341806601ef93012289646091e5eba7495ae07ca0eaa9363d5adc65b6f411cd0cd1ef7a092d02360ebd11e43f86905b75 SHA512 f6db059c65c8dee729f25700da4e9aa24384291bea6a28d546726e46ce6f7f64ee66daf872cd2358525bb8739b3fe18166d2e04142c0539e874f44dcd80b5c72
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-21.04.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-21.04.3.ebuild
index c408838c9a98..83432c1cfa94 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-21.04.3.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-21.04.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/development/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="cvs git mercurial python ruby subversion"
 
 RDEPEND="
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index b89be9bc41a8..341d41893194 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-thumbnailers-20.12.3.tar.xz 17816 BLAKE2B e5278cb5403f714e0853eeeddd968b618398107b79cff7d79a998b43e9479f94a7d98a84fc7ac8c546c5d4860270f1cbc43375537346266b07b9ce925091f749 SHA512 35c6af3e0770d45e357e33d3a7159b3be8c09f50a1a57f15fa4cc5e5bfcfa5f6767a890bcc268133975d48e839844aa968300062c54d338ef90298c928884313
 DIST kdesdk-thumbnailers-21.04.3.tar.xz 17872 BLAKE2B 88b7a166855708e0ca70460d4c2886cb2f8dadf3d4bbd7caa7947987764a5830e43aa473c43d7a540efa10eb1ef8600e034178d53902e68437c72199118ce130 SHA512 bb23b8ba412919e926d07bb3ad0546d8b9828617de01e1922c694e1886f9cc7ace096367beaca1487c1f91b178ab2503955d985debbd98c0fa388fe29326789e
 EBUILD kdesdk-thumbnailers-20.12.3.ebuild 540 BLAKE2B 2a2e155a913c9195d62687e3f0043fad52fbb20ce65b501807fd8d2c34cfcb5a76a9b11d5c3ccbed161e136155e48c8b134ce1a1efaec3affabe6bf35d0464e8 SHA512 74cbb53c8e5fd6213e1e86ced6ae59463925fcc7be215d294619f9240e3f5ffeea25f59146ed930e36e610ddf46e9f6788e0334c36dc7d6b5d00dc3434f829a1
-EBUILD kdesdk-thumbnailers-21.04.3.ebuild 543 BLAKE2B fc671853af627ff184f7438149ed81f063fd1b8b7715e52d266016b0dd617ee868219a23576ca21dadb57034f0a4a1b34d814c4f77a43fd5c2ed29b7cd298c76 SHA512 ac913139d24a0eb9576b83e493bd54270294620e4f5b70ae5c31e0dd4d75ea4a77a1196859fd91c929698e71df7e686f91bf4d745ec666b424bb729ba508669d
+EBUILD kdesdk-thumbnailers-21.04.3.ebuild 541 BLAKE2B 4b0b1733d5ea5a517b059f915fe3294cd2b6943c9d3af4c1fefbdd394c5e1ae4bab5afa49b4e7d22b8c22e1cdcb612cda88032b78e0d857c75635c950d56b1f7 SHA512 51629fc05b66cc5565ddfa03966ef74f8ee2e1d09bc92bec9b400863c577d0f536634fc257be7286ecce8ca665795e9a1140b9009e9abd1d5e26637e74c214eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.04.3.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.04.3.ebuild
index 8e31812f6e50..566350fa0259 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.04.3.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Thumbnail generator for PO files"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index 36a979bbf931..311f2e625e9a 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeutils-meta-20.12.3.ebuild 1367 BLAKE2B d24d95bdfb41526dd290b8a629333203fd0eebfe80bef4b78a920415b630c525c4f1ae8ddfe278f6c915af776f58f6fe515afe9513be8ba4a9ba94774dd8437e SHA512 5b5649e9fe80f71aac7b569cc9f25bec7c71f850205dc4205daa54a66dfdfd67d13de88437e71c78f76e4a909d786c78825e202a7fe139dc6be31035f274d3a7
-EBUILD kdeutils-meta-21.04.3.ebuild 1370 BLAKE2B 74f89a387e7f5c5f9581ddd6efa9f835f63f4289c2fb707a69e7f4333595377782f56bc146bb1c3e354e84a067d25beade0e6b472552153e7918a43cb018c1e0 SHA512 d99ecbc78385b907e3ca643fdaaab7fb2be78e8bd05664238301c1c92fd2e49771774c9c4ed36625848f6cae7e267e1c1bcffef4edf654764559f12bb81a7e45
+EBUILD kdeutils-meta-21.04.3.ebuild 1368 BLAKE2B a7911a97b1ae32e2edcf56867014bb492bf0c08493fc0f770399b6b49eaf1625a9c80237996e81be5cec9be1082cff851463dfcd740bfb1374e3fdc06c95e4af SHA512 54958d37846e0455103de0719d811e5dccb59507f93a891e8dbba9697fbf20598d6975e3d48af6274d10b8443fc9d6214d790bb1b9732a3ee2d3346dc7024ba0
 MISC metadata.xml 1004 BLAKE2B f2fed1a10b7eb10ba9016b72fe9c4863e853882e6f66790ffe70e21aace4e10b0fc5c699559934121b071c2e260a83b19d50b5d14adc53dff25d933ea0e8eae6 SHA512 d8f248c827327c4c855cc1ba7c6c9d31578b4a89ecca6dbc0ffde3f2b73b10f66d9923a907dde88481ee933a6047fb18089341ef49b8146836a00cb341a23f7a
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-21.04.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-21.04.3.ebuild
index 1291591b4ce3..873839428f62 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-21.04.3.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-21.04.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/utilities/ https://utils.kde.org"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="7zip cups floppy gpg lrz rar +webengine"
 
 RDEPEND="
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 3c0259789928..480fffb18ff3 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
 DIST kdf-20.12.3.tar.xz 467360 BLAKE2B fabff3ee3f7f2f33ba0667f61ec42cd7e4655b82c620afe655ecef2d3ba4329d2670f80dd97e214bb52b93d1e0c0355d5cb0932ab013c096492ff0e74762d9de SHA512 9b799221e9eaefc57f602c927a08c391792ac919e9d100508ec55ff63be2218048a19496157045f6376629625cf4398ca3efd74ec52f815b2400e63995e0c714
 DIST kdf-21.04.3.tar.xz 472424 BLAKE2B a11b644ed4b4cd3ce841412d0b1d65eb2d5a863936b0b7d6cecb42beb1d1e2db2dbbe7d029a75cd72b81451040471b74cf526c4c657668a75b78f5bb28d2fa23 SHA512 985ec37fade53297e8bbe03aae78a560ec1f69e0c1b093c431e249de340e14e0f372bfe51d15dfdb4c7e0f4fadf3e81aa0b53a6649ce5ce891a837f96fe9e755
 EBUILD kdf-20.12.3.ebuild 911 BLAKE2B 12b3e4a4ba13e5c24509d0f559e5bf7f8f469576055603e5e9b87d7a24eaffd627be7dd8ea8fa4348f7cc524d4e55279abc571d6f02066dba9e2f4180f43e312 SHA512 d4bad9bc1b20ed8d213e7ad72fc64350f45919be64dbb28224ce72f533bcc90b469fc4ef432215340dbfc42970c02d090baead25273a844ea3522b1c8d1c8542
-EBUILD kdf-21.04.3.ebuild 914 BLAKE2B 7c5c0d76e1d54f263d600447bbc9ed6995f7254088af2909d1629f0ac55679d60c519b91e023d5e44e81c5078e4133ec429f452720b1f0c7123d8e21fa69c804 SHA512 47ea3d55aa9634f626fc3ac1acade348b92789d53553ffce710d0eebae201c36502a21ab1b006120dedd0bed0f2f70f3d6a7f417269411f5da1c899e95fe3fd7
+EBUILD kdf-21.04.3.ebuild 912 BLAKE2B 65910bd07983bbe34189e2a21810e86952b43f7b50922c3a0a291fd7dd32e2bd980a5129748c80dbda1036d2fec9068d1cbf2b84b408de815bf09fdf10089fac SHA512 c0e48bae60088f8db10bfe4e0e7d31ba9fddedf0e972de30ae2cb615b67523456d419912b2f9a9a4ba38f63410f89d08c5fd67fc527c5b1a58044e6859b38d2e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-21.04.3.ebuild b/kde-apps/kdf/kdf-21.04.3.ebuild
index 12e906303829..0194505bdf4c 100644
--- a/kde-apps/kdf/kdf-21.04.3.ebuild
+++ b/kde-apps/kdf/kdf-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdf/ https://utils.kde.org/projects/kdf/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index 33b4cb952277..31fdcc77d974 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
 DIST kdialog-20.12.3.tar.xz 108492 BLAKE2B 882cac8b2318fb879737085d3ccc59b121117a4ffca82326d89ed4aad9c66f9c32772da9a723dd6d17d31a400dd11a32d6c9cc4e894d35a16e6eea2a09be6f18 SHA512 09794892b150b8e9637f74971432c231c8abe9f2355b2c0c0ddd2527b5512d024a81f2d3dbab4dfd381495f729d4cb474caa46cfa8784f396abe223f989e243b
 DIST kdialog-21.04.3.tar.xz 114572 BLAKE2B c983944e77e92b6a2f4794294533e8276460fd229b64321fed49b45e69622eb2f11c5eb2a212e6882dd72ea656a476f37573c31e146843298b485bcd36beee50 SHA512 019dd95dd56881eb84f3187fe623e55df947f2ec61eccd57bf2731001f7e7594234b2a800cbc09526bafafc8b2fa78c29a445b578e52c7405936f2eb1bc4dfb2
 EBUILD kdialog-20.12.3.ebuild 1036 BLAKE2B 5ab55aec09e5eb85bebf2f989b40f18a65c67c10a45d3b37cec32a75e86a90178cb96bc0563350ed94e7a35428f0f8fcca96b935f4f9dd0aa273a0b64dea7b77 SHA512 dfc2be8db024b6301a127c25683a76ade646db40f3ed20f215d4ed866719478cba6af111136bcb41b9fcc6dd5d5ca0ff7a62bf5a7f58b8eaa015835fae3a34f9
-EBUILD kdialog-21.04.3.ebuild 1039 BLAKE2B 328f1730311da65343889dc1fa8196cd4646c6968a729a79fd9be995b6e9824a1b0fbe67a34bc908ef2ca69c809db41bace8fdb25451bfd6f4b6981de1e611aa SHA512 1b7ae3225fbb35d106c0661d4c856bc5992cd894e785706da1a8229231004c23d8dee871d60af8efb0d81ab1acf0a91d9d92b7c344c6a82e2881e66358205276
+EBUILD kdialog-21.04.3.ebuild 1037 BLAKE2B 4d5d1a6739ee0b640a3ec651f559b0bed67e6eb42211dce5a8c6dc1f118a80de957cd9b022cf1f3736b47681043e234d3d7d245a3090b61520055a0031443452 SHA512 7fd4f8f21138f615c6042e4dd7b88a25311cc4331e2fd8b96fd97dda01e94a29f019f243e3fefc77df77db7768fc8024291add273e8e952fbad1d220737ec179
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-21.04.3.ebuild b/kde-apps/kdialog/kdialog-21.04.3.ebuild
index 036e456878cc..9125be76ef1c 100644
--- a/kde-apps/kdialog/kdialog-21.04.3.ebuild
+++ b/kde-apps/kdialog/kdialog-21.04.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kdialog/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index d82cc85e8a19..a190add95f1a 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +1,5 @@
 DIST kdiamond-20.12.3.tar.xz 4698168 BLAKE2B 8aa5330c4ff34828dbd044abdebe1b186a5525d83adfbbb9bdbc72abba6a782d634ef43cf603997a7458f252ac9d236115245420bf8a8b152b8c70ec89d55e88 SHA512 f7eb5dbdeb709290a2cdb46b03f829ac111ea629dc49d81d61ce0f32eeaf0f23fcf234cd20d44a54013e93dc42e867b0dd802d54ec624d3ab4b5b9c1e8ce8c75
 DIST kdiamond-21.04.3.tar.xz 4697872 BLAKE2B c7950cba2906649988fbad4dc34b670a39aba9dcd49f4087c9df41c7f85adec9ae5a44e82541d442a843765d312920f2119e45ae8be1000af1e63691158c227b SHA512 a4d3d308ba6529b3bad47cd9d4c916c0d4960e963d7fd9aaee95fdf2884fbcec7e5cb3c9c003b65e2441a8d5190efd05cdb6bae846efa9a4cf355fdd3de941df
 EBUILD kdiamond-20.12.3.ebuild 940 BLAKE2B f1f8b02f7179f9edf08706cdd31c1da9ac7ab672c766c6960f5a056c6e7eff7b309779d092076ac4794ed7b788e590551ef0efb0f3c13e93e73ee0835347c8b8 SHA512 f1d011ac5afcaf764c0937506faf379f8482b060a04e4a07f2f96f749f957de85a0231f9488bad36e8c49eb1a3b29aad53fcb01d383d5691cb5b02b9cf1d79c9
-EBUILD kdiamond-21.04.3.ebuild 943 BLAKE2B 2a2524c6f8ce4086f737c4db6a1eff6b6bdb3269d1867804ca58ff86805f33b2366fdef77497725ad231d7bc86f63ee4aa87b483500e9e02c53bc2049b324b92 SHA512 c661fa267f0f7fdd6f2b50eb1de58845b6d8e0daf2f68f7a7a340bbc914793a5c221af17697943be7448489a74ad3db63d9ab95a838749c089a14225ed23517e
+EBUILD kdiamond-21.04.3.ebuild 941 BLAKE2B 551bd7ae592acee4644daec602d91bd73aa082ff26b03b246292614b4384e81c5d8f30ebabb83020ea3139a049d0c86df10d901ba94c4afa0a2760e16940aa9e SHA512 50fe863769fdc530902b447a73e9268252b08f6024780ade8e0bcba3dd45ec99d290ea88edcf20a15af5706d8c21640919ac73191457fb7a6a354a4dbc2882a2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-21.04.3.ebuild b/kde-apps/kdiamond/kdiamond-21.04.3.ebuild
index aa313f95f419..db7715ec6b88 100644
--- a/kde-apps/kdiamond/kdiamond-21.04.3.ebuild
+++ b/kde-apps/kdiamond/kdiamond-21.04.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kdiamond/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 200e850b6ef3..2e70d11354f1 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST keditbookmarks-20.12.3.tar.xz 191892 BLAKE2B f72d2429258d8d3f912c74a0a972a4c07131f021bc7f1d5052e5347cc2bac2910f6827b014c18ea829f5adb4ca36e42cc9fe30c77df6e7b7ed6506cc068909ac SHA512 6b8341f94e1d170994100e0fd06f0cf7bac7e5b1ad31f595f74b3bff980e0b7ac286f985b7d4bf83bd6f29a4540d89b2d964cabc46dd95769e8e823536f873f7
 DIST keditbookmarks-21.04.3.tar.xz 200720 BLAKE2B a8e5ba51e7c602a3792f13a999e353875577553a3844f3871cb40f89f0c0b35d3d32bc84b9b1bfbbf16743d32ce05cb50a87ddcbcab6bf7b6e24e5d597a259bf SHA512 1467e909cabeec95e235317333b601731daf44866df4106e06dca02c41b647527552e7307bd8ec0762fc2cf31d21a40dd7592ce9f64f8628cd89a886ee292b13
 EBUILD keditbookmarks-20.12.3.ebuild 1161 BLAKE2B 9350a787363d93ce2cf7981608decbd5d2b99ad02d83eebb9b473db4e26751efe7c6cebf717d0a378b1d6541e6eb3239abe4b71949db83e1d89f24426ad4615b SHA512 698dd495dcdba0c26d46f2acbd783fc317a9fcfd9f283784e90c0ca63a92249250a860b854a87fa84124b615f192aed91195d6892571590b7082127c1d702d36
-EBUILD keditbookmarks-21.04.3.ebuild 1165 BLAKE2B 3a3cb0b5b25108a2d7f5057ee515da352830ea6896017ac6a4ce64a64c94656df6e6a49ae5dd278da3a141cd388ac3daae948afd822cb58cda6813de823b75d7 SHA512 055456db8eda052647a65aa446f9695512431ba293e1441eea752e8a74930481e129ff321ee48ee6c68a821e1b88813b5217db4696078cfd6b816e59f3aca62d
+EBUILD keditbookmarks-21.04.3.ebuild 1163 BLAKE2B 924aa4e885ee15795711db7d6784502b5b2fa1c44f4c94a4854fea8b9d3b4859e46d876b1fb5b32bd2147bd7d1a1cc7592fcd7d449ccfcf05baf8283fd4fd9bb SHA512 fc8b196ffade0a5192909c4574388340ce8119064c12ddcb375750c19e392f3065fcc5e8cba22bb94ded5bf2e434440c6002146b912de3f0c08feeba71e83642
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/keditbookmarks/keditbookmarks-21.04.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-21.04.3.ebuild
index d3d7f8341b42..805c264a7e13 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-21.04.3.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-21.04.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Bookmarks editor based on KDE Frameworks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+man"
 
 DEPEND="
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index 90a77c61f036..eb250a1203b0 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -2,5 +2,5 @@ AUX kfind-21.04.3-unused-dep.patch 9231 BLAKE2B 35c67d692f8920008758bf0b4a586c2c
 DIST kfind-20.12.3.tar.xz 278656 BLAKE2B d117d3eefa73d6e716818861c68b928e255a44e594d0da5ff8d05d5cb7509fbe2b6c26558fbe4dc13afa0f05a54f69802de454ebb8e902264413af7037c5b803 SHA512 e66ef911138c844ddad606b31c9075b8b0d3984315e52f95beb6f3035d8ddbf16a40bc1390d4d7ef1e93eaf27aeb4d1b1566db3db0d1b26691c8dea443b0eca9
 DIST kfind-21.04.3.tar.xz 284312 BLAKE2B dedca9757ccde97cc3446c73fa0acbf53303edd2f03be0ef236d12c833a10eb0a19bf138d209e85a8d1c50872bfb848758114f73f5da2e613c38b60a776ec1f5 SHA512 bfb985228e7fd96f6c88dff8792e64a1ccf9e999155acfce76de6cb434b02aab92bcb4c8473399a9de59049138809149f33b423bc46d47abc8b7ea4966bfd61c
 EBUILD kfind-20.12.3.ebuild 966 BLAKE2B 15bbf8cf4df3354d6088b90c11dbf19f38b13f755e9908ba351bb90e173814db02fc7b97bf4a5e6c90fa80682ab749774f9d4ad5075d20c00ce6e1f647e98bc7 SHA512 58a8a656963a400bcd6c6920024e0d69f73a0b98e284c9cc7a9e61605c40a6a6de799bdfe7c928045fab66017a27b078b3d9cb0abad0e47b3091999c9f45be1d
-EBUILD kfind-21.04.3-r1.ebuild 1018 BLAKE2B f82afb0eff4a459cccd210a76b7d4cd94b07c819f0a61333f6087902abc23d209761ac0cc3d1ee7545b205b44ed77390e16e4df20a1a8081c88bb5adfc54b24c SHA512 2e2e756768a92b60a7ce40f39f20ac9fb4e3c4c9ab59931364e167238857906055d65e43cdf5b2725e0b5480c7895bbf878fe1f747cdcd69c7f8d75b0ae8794c
+EBUILD kfind-21.04.3-r1.ebuild 1016 BLAKE2B 0c3563dbae4427f32f09c0bc5b83d88084009ebcd852a698683e652e3edfd6ff6028be87a28de619bf6827c41b0391db38ab85d6af9130cdc285b2eeb1105334 SHA512 1c3974d3e0227d99705aad67308523d0d181c0bcb8ca30a423e37d00b6329be6a8e0c172e73f6c1b66d9ba0654c7973b5235f09fbf947e899c5af868e1353c85
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-21.04.3-r1.ebuild b/kde-apps/kfind/kfind-21.04.3-r1.ebuild
index 96d049f4505a..cf466d662fa3 100644
--- a/kde-apps/kfind/kfind-21.04.3-r1.ebuild
+++ b/kde-apps/kfind/kfind-21.04.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kfind/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 7d23ba9bc39b..0102c82ba448 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
 DIST kfloppy-20.12.3.tar.xz 204260 BLAKE2B f66f9cc1ac3cc6ad6ad01658d3599671608416aafbc8d57bfc1b12a5728584db215557cda3c5b798fcb10484b384fdf013823b68a5b715bfd2814f41b6905c89 SHA512 5220a465fbcb9feeed5f572d26ae4c2cf4eaf2aad68d66e102e3b6d24521d6997582bcb27484c39bb257ffdb19b93239dfe791890edec94af68879e8e10179c6
 DIST kfloppy-21.04.3.tar.xz 210652 BLAKE2B 0523382affe56fc7fa114222a4594d819fe613b7c80d0a6b80abc8ebe4c961dee830363cd9a6d20f32a435fd4e507d57936a5653338749a8f588771dcbb7a9f0 SHA512 daba93610e07a49487d1570b270846a942a4ddda363aa12ef93697816f08e8a60d66830cc8b520a86d27d45a8e8a951422c099dd6454cabacad305b5cc2664c3
 EBUILD kfloppy-20.12.3.ebuild 871 BLAKE2B dc3d97426d7d92ed821a7ea648eca1b4de1da3aee6fca31fad0c849538acaefeffbf9c1afc14e6a7aba896499f32c01170ada8e18a39210a815a41e298e1a240 SHA512 6af9268f63ee83062f0f802b964fe11d2e79028c79130b17ba278ec2e64c60060236b257b4df134faacfdd4187182e6a618105dc0035548b6f9bed9954964f6e
-EBUILD kfloppy-21.04.3.ebuild 874 BLAKE2B 08f7406fa64ac14a484209f1471ed842142458bfcb707f22483453268c9eecb11df37ca2d367b9f95cc998c2cbb6697efb1d2e63166bfef8a5e2f08c499a165a SHA512 6a21de542f940d1677eecf251b0efdea7eb3a28eebc853e828311d52255bed5d0d66c8326c47c69f77aa2d33ef334ff930a73d5edb74b831298590b2fb5ae7bf
+EBUILD kfloppy-21.04.3.ebuild 872 BLAKE2B e90c0f096e1e850fa3df815f42276c78c6321f0014befac7f83d851daddd765075551e86a27ba78a694d58150cbf3f5ccd17e59ca6fe7ded524e9aff5fa9f62c SHA512 463feefbdc11979ede7f23f7c024b5b430b0c4f47aaff84fd4d3c3d4bf54378a719a08b87c8d5fef7167b8881b807c6d6cf32522d88576d117eb08cdd10d6158
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-21.04.3.ebuild b/kde-apps/kfloppy/kfloppy-21.04.3.ebuild
index 78c99e35cadd..1ae6db5329a5 100644
--- a/kde-apps/kfloppy/kfloppy-21.04.3.ebuild
+++ b/kde-apps/kfloppy/kfloppy-21.04.3.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/kfloppy/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index 5ddc1dab2984..24102043ecc9 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
 DIST kfourinline-20.12.3.tar.xz 643812 BLAKE2B e26183d894b4f89c5edd2aff739d9c9c1c16ab0a45fd29070cbe9d0eeae8dbb062e95e6e92a74123fe582b4a62bb558a97d18d1940ae7d8edeff3a6b6d4addb5 SHA512 76792c00f6a2a0a5cd43d4441da5723b4c1ec79021d8fcdd66857ac222b25a80978014eb5878f05d4c091443a664d20fc5a2f25af8ec65f815d7a501775d3f83
 DIST kfourinline-21.04.3.tar.xz 650648 BLAKE2B 1c1c43fa677a3c3ad4a84d877ea9a3f3db8f978104dcf696ecafcf80696f0835a8f40e41db8e7c1c650d0d1c3933e05d17c823153344cbd57dab8e14471934bf SHA512 29460df6c7f0529d4b82a1e30256bb5629bbeacabaa78b843837f6b4c084f07a9748ca8dd41e2a41acb3a5f81662ef224f0ed508714f9f4e53ca33bab64099fe
 EBUILD kfourinline-20.12.3.ebuild 870 BLAKE2B 2625ccd1fb472b569746b917c4a9e70a079e538752ab7528e290b00c2280662c3926a23e6f073917f3635c321852e3189207555d1f361b8e6ebbfea74883c804 SHA512 4a6519f7b9b508585de91fa0b940c089e1d1a1539763f895bbd40d73b1c518e35e4d5d463b0050b0e85c73a5c7ad3c0c5ff3fee40d236622321580fed6cd9bc9
-EBUILD kfourinline-21.04.3.ebuild 873 BLAKE2B 6b16391e03bc607470b0bfda433acbb3373d2247f4a477dad752f1fc1c610a83f58d7b7fe17de8667c584f9b75ead86a6adb39038173c3cbfa472903b12a85bc SHA512 a413ec6bcbbe2ee22c8cd5563ae7bdb700914ab81f74e654d9bbc9571bd295f48f19760617a03b123bde1941e808c6fcccfcb992b70c51276ac112f5e29a86d1
+EBUILD kfourinline-21.04.3.ebuild 871 BLAKE2B 2cb89c8144fa9c149f5cf1c50b5f746c28a7848c7cc41c7541b611d552e65f1ea974f6ff3c493b404f81fe110f516561a56ad0d3158f22a078d90237b5f002be SHA512 82204023b4d40ffa8ef40692f4344249ceebfcd1c1971d8e4d91633ba7b3a739c639442fddaa30650b6b076642da0a4b06ed12800eec6908fc5b962fad5c2e3a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-21.04.3.ebuild b/kde-apps/kfourinline/kfourinline-21.04.3.ebuild
index 31e97beea496..53daae59eb1e 100644
--- a/kde-apps/kfourinline/kfourinline-21.04.3.ebuild
+++ b/kde-apps/kfourinline/kfourinline-21.04.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kfourinline/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index dfb86d3b90a3..f95a86f58cb4 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
 DIST kgeography-20.12.3.tar.xz 10764016 BLAKE2B fb24cbe5ca7b3c8febe8da4bfe9649d5d05462f2a6aeef8e4a99458f6433c66a1003506a6837fe83c2911794687be73993a91511f4f1e20b28e87c42de8c0a9e SHA512 b77f334c063364608875f783795b362aefd0360af1e06f6a3a2eb8047ab3f84a6853bde23e76e38f3f4ca5c348d358551af79fb8290e26d9d6615752df9746ab
 DIST kgeography-21.04.3.tar.xz 11001764 BLAKE2B d8836df12e469c5e3ffe8ce32956eb17bb51d4f6d0d9df4173e944edc7c0d1e0ce41b8ac67d5a0675d8b3244aab063adf91a193b8a27be909a2201215fbc811d SHA512 92be1d653d4b7019bff9018cc9bfe4550326ff4aebf1d63d5b5752cc6b0169d34a8613837ed7e8c27dca827cfa27ae1035de96a2dd1cf0346a3bd2aa4f0126f3
 EBUILD kgeography-20.12.3.ebuild 818 BLAKE2B 6af3646057ef853e652f0f3fa5ae5c083147f1887715bd2c27f1defa2ee098464401c49c48ad27f2b380130621a54f1100d4a1e2fb2d433c31353cf4b10ff573 SHA512 cc5f6449cd96bfebdb19434e92f07a32d89b226207f13ba32c435e6fe1ec907e763087ea051c4959b0551e1af28b71248a0b40c1af79da6f718284b6d1066e14
-EBUILD kgeography-21.04.3.ebuild 821 BLAKE2B 828a1098052d0a6c2d18d12a9ee7c88ba28e74e464fc1a9c7f61eb12efef018fdc4c91a013982b7960a5ca8e42419e459110fc624fc3058c35720869b8cf72db SHA512 8adeab11385f0c5e4287a23be36445efc74c20cacdcdacb2ebb57ce512b8aa74bbf8ba502d12041525a03227d78c444d02451ef522d92a4700921eee712316fa
+EBUILD kgeography-21.04.3.ebuild 819 BLAKE2B acad2453cd1db79077fc3fa7a77f1aa48d5034fd9fbc3aa0e3ef08ae69c7473f9cd363f62a6836aca9f0ca884fb006ad0f644d0e4e6c17ec99fdedb3326ea094 SHA512 b6565b36df36669108f1df016cd5a1e95733addd3a9b01ce9f79ea175aeb490310507d982f1800050a113bbd8710cc8a061c0c6f65e11683e683d9623861725e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-21.04.3.ebuild b/kde-apps/kgeography/kgeography-21.04.3.ebuild
index 60203484a043..65cd83db2326 100644
--- a/kde-apps/kgeography/kgeography-21.04.3.ebuild
+++ b/kde-apps/kgeography/kgeography-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kgeography/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index e4db474269ef..5a5979d22845 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
 DIST kget-20.12.3.tar.xz 5583636 BLAKE2B 174f46a833a5b7d4daae1ef81a6e5c695f97f0855dffebd21c882cd6d43a8725648a0d32cb3a5669ceeae75142cd45822f736ad778ad1b0c07a28daa551a18ec SHA512 f662fcf4915c72a19becd368ef1f069aab14b7a257c810c8290d5ca942446545265c54826588e8a157b009e35a1ea0b21e611085fa2b35976059cf7c19bb1549
 DIST kget-21.04.3.tar.xz 5636204 BLAKE2B d0f5576ab4dd755825f4482de1ce3362197f24181e1e8c922acf039c6b72eb65f205658e34320645cc8a2f40e8e4f19cad09202bbdb478ffeb38ebbacc1c2a28 SHA512 58d2a18d7f918ac161cd19438a4aeeec86e0df85245903cc00fac1cdebe2dca6bf471d12f54301ff9b60899471726c3e410b870ef3aa251f3994e3ee1fb6d30d
 EBUILD kget-20.12.3.ebuild 2153 BLAKE2B 180adcad74dc9545fa1197a29c8c9f1318eb79bba78756d3d0bd49187e53171be0f495216b1c2bbb52c58271eec592da3471b328c6ce6db116e94c538581d251 SHA512 558f009b54b682bc801abd13694282dda41aaf6464c772aca64c474614797ec7dcec876c032534cfec427ab5f8168ff00f8174bce87f26ddd5e347604dba1cba
-EBUILD kget-21.04.3.ebuild 2156 BLAKE2B 70dcb63e4861c9ac40fa97fa2a39f25818a4de8c21914016f0babbbec95ed7b663e95b58e4176cf55aec4983ab813c3e8b66db87978c6a56bc92507c76041111 SHA512 61f6f912564273b629f851312eea279f7e4c077a4804715e07135943481702df31248019cf99d83eaa34aee3e98561ab8e4494d6e56d6a1bf4a482f060b4d37d
+EBUILD kget-21.04.3.ebuild 2154 BLAKE2B d9c9953e68c11cf9a5b02bbf3dfd8a6d0868e22322cc255c476b73664ea998255e099f1df01b2268fd31de459f783cb34f3b8b62d861aad19191cf5a2f5ac6b9 SHA512 b31ec30d259656c3bc669e80c53aaff8005e20d8183e32baeb50685f7c78db0952ac1df83778a7c8c970b74f9ba9874d306f4c7cd79650ea3581dbcb498e6bc7
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-21.04.3.ebuild b/kde-apps/kget/kget-21.04.3.ebuild
index a0ffcb8cf8bc..edb8fdfa23d2 100644
--- a/kde-apps/kget/kget-21.04.3.ebuild
+++ b/kde-apps/kget/kget-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kget/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="bittorrent gpg kde mms sqlite"
 
 RDEPEND="
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index f0d3ad2647db..1681992b18ca 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,5 @@
 DIST kgoldrunner-20.12.3.tar.xz 4444752 BLAKE2B 302a55ce876fde2e8fc5795dad016a86d91464bef5b9dca3b96357dde37581d2dacdc87d028baf712345027e1ec2ae0757e0a47e0d785f14e85ef3240cf931bd SHA512 0cc72a33d0dee5368c034e7f8f5928531e785abd1a62ade58c24e0975af3ac6ec7e5bf89f07f52be720ce5cd8e5f0d6d4fdd4fa02a5bc8d46ecc5175ad419a4b
 DIST kgoldrunner-21.04.3.tar.xz 4488216 BLAKE2B 1ef7a78897181046fc7950c7e36f6e1791414299e7013b43480bc90a119eebff04f76d32543e2d903e1258a61cfe0770f06411ec842a4bc0c8e559e5dbb6219e SHA512 5a4dc8d12755cb7401b9d4588177dec5e8b21ebcff68857e4064c287571255e5e67af8b4996b7c81ab96cd56cb30d6ca25d36265c5c8fe6cd89724865251cdbc
 EBUILD kgoldrunner-20.12.3.ebuild 996 BLAKE2B b783219ba728f18bd6fc0e8114bd3d274cc2952631a0afd39d4b7776a93d2ad0f4cbafdc89bdc8326d8547c2602f4c38a195dd75506906b7fa154bc36a5f177f SHA512 164925573dd3cf4e474297197add0cd9a64ec119678e843d70af8c64cc127c5417c20d823d4264fcd09ef249b6cc4143e0d79642f2083890a14aa6bdff42ae59
-EBUILD kgoldrunner-21.04.3.ebuild 999 BLAKE2B ebdbb8b0a7f0f097c72b24dc818cb3d60fbda004c2e24fe2f20a8aafa999273e6d2265197d2eea8c86a9f46c3b738fd37a7efff09b177f670726dfb4ba37805f SHA512 53a48e04784e70fe8f29ea008c9e28fcf27fd25343e928e3ece330597331b0f2b951a9434eb1e2879abb64bb3c2a0f0d45eea827e08c9a9da73fb2ee8df344fe
+EBUILD kgoldrunner-21.04.3.ebuild 997 BLAKE2B 5f78c3c9b5094967ad7a4b94afb7e1edebc396e4f7e9460334deb73952557a12b15f5e6e47391f3cf0f5e1756c8d8d1c561dda0c13dc46e3b6459f6a3089eed3 SHA512 6c48eeb319bf8449f92eeb53a8609765f18889e5e9f3c68b2466fbd9406d9ec05f67f63a2caa177350a186d30816e2023f9aa7e39cd360a16f29e0125a47e7b6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-21.04.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-21.04.3.ebuild
index 0f68f5ea1e70..24a758555e94 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-21.04.3.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-21.04.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kgoldrunner/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 4cdd35de3393..d7a6378d02ac 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,5 @@
 DIST kgpg-20.12.3.tar.xz 2892236 BLAKE2B d953c76dcbff262827728088a6f4ed0dc2d94b0436cd3ca2fe6adcb2be066217a93226c187d3239c456a1dec8ebe1558606ed85f206ccd1d84d89ac03775876d SHA512 0816b1a2cf5d1bdc3d01230da57c84b357f8b7b5fd5a1afcab0ae47c257ef3ed3f4be6934db48896905437d9e3276c91c441da7139502c511582eba4bc6cb338
 DIST kgpg-21.04.3.tar.xz 2937292 BLAKE2B e1362b6dc04d907b6071e5253cc9349b8ae169d138d81ff022e1de17db122f53cb6089aa5e8b6b004a6b677982462248b9250dbe34e0a0d3cb9312f61907814b SHA512 ec59b8c4286e3fc48f4dffa585fc2fcb03c41d0aeaea1da7a861c70b181d84e33c4df0fb5862a2cbf377dac4d9eb6d8b58e817210f663d57e2c704e39dabb65a
 EBUILD kgpg-20.12.3.ebuild 1465 BLAKE2B 0e46ecedba5c3dbc9edde9367b9a311f88b96a35cf8426db94ba26e0645ead331f8d4cb1cd1949ec8f83834264c02a00353aedfd3b76b41e09f30faa1216af0b SHA512 29a39f506fc7e91e27d29ade650f98a0800a8bd7e3b5e680a58628f5594aef1802c2f1c65ec89bf4044ffd8f29943e62c9b7e56f331ac5b7794af3c4046ed0de
-EBUILD kgpg-21.04.3.ebuild 1468 BLAKE2B 38fc5fb9d4170cc19ed2abfe91e01e92e4c1c740be90b9f9f45400e812973157e9fe32cbcf230f7f8108d359f701442e15fd1c07314a3619da558f947a634aea SHA512 897e5f6c4904c39983716b822f30298da73c2d165c995f75da7766fb65a453140b04cb73d879f57669ecfcc65c31df9fa15b785dae6436256b77872c5fff6134
+EBUILD kgpg-21.04.3.ebuild 1466 BLAKE2B a97117e982fa975a3d8673ac252dddb87c80a446e3b2f702fadc7471d6f58fab5f6f7caa0c3349147e2baaefbe4ad17ce63184645b8d1b53eb67894ba85c0d7f SHA512 51f070ec483c5d9c5eb24a9a546d5b86b12a7482e6d181e49e5a5fe69990c36558cd949f67b431db6931068fda56c071479c8bea1a01ca80f1d08e41ccfd0baf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-21.04.3.ebuild b/kde-apps/kgpg/kgpg-21.04.3.ebuild
index 4d6c6c0d415e..0e520a5d7884 100644
--- a/kde-apps/kgpg/kgpg-21.04.3.ebuild
+++ b/kde-apps/kgpg/kgpg-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kgpg/ https://utils.kde.org/projects/kgpg/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index c8be7d44d671..f2e1599a3f8d 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
 DIST khangman-20.12.3.tar.xz 7400372 BLAKE2B d35d57b5a0af7d21b2c81b0ff0beb10eaea6c320190ee9c0b91376d2718db775b52f70f6f8c3ace0ce13821a2afec8dde047f2a53cb519b7e44db5cf727a922b SHA512 6b421298762a5b1f0747e41946d10f35b576b37d2dd865f45b6b35fc402a44f6845714788607e96bbad657d3f2da147f6661f0e53ed04857bc4a0a3d0ea2a2fd
 DIST khangman-21.04.3.tar.xz 7429172 BLAKE2B a32054dd415282f8ebdbe79ff4014f894db5de4f9a5e5ead3618dbaea98066fff8c052ec275e15e2f8d6e3a091a273dd017ec66206a27606d67cc605c2136f4b SHA512 9b5f719d1740484fcb30492f03c6e88f0306932bcd581425f6c6cf8d85868fe11dfd7b5fbd1bef5cc81c113d8e209961df0147f4d440ed6f6106ff1b215532e4
 EBUILD khangman-20.12.3.ebuild 1195 BLAKE2B 8ec3ecade993b6a3c424e75df5e5809a34c113a6af1fbaffe9cfb8ef8714908fef59154f650d482d5b99a7e20fc6ce66c7ed345a2dca638c820c0daa11c4c3f2 SHA512 c7460edd4f18c50bf36cef37c9600c36a697615512b12836232c530d50a8829d3bbe383e66a65c7a444d23057f3246548deef1020f2186d0d68a4316869aeb5d
-EBUILD khangman-21.04.3.ebuild 1198 BLAKE2B 5e2aefe6accf45991cf61adc535ada87728612e6cb80a67d6c7fe9d57014aafcd26c2ffcd81e0ae927eba3c7a39413fb73e9ca10ae00d0301e1aa8e184f92d7e SHA512 c69d28e15ab12986a729332538b5e632b2b193077221095f3eca814d2e323150f6eb2433c90cb60f6f14e6a6568aad47f705ff3818822bcb8a6dfca5361c79f0
+EBUILD khangman-21.04.3.ebuild 1196 BLAKE2B e6654f3fde72bd2ffde17c65611df0adf4de47b7c66d740f31f960944d3f52c41efbd9e64cd6d4f8c8e831c49c4fc00fe96b3ee0e52f188e996f8b369997249c SHA512 2ddc437f63b94d61e27918db2d64ca839c339c1743a70d8f1b79fb5e74f1985bf2ae6dad81a000adbf4e5534d0ca667f08c660139ab27d49c49ac2dc165215ef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-21.04.3.ebuild b/kde-apps/khangman/khangman-21.04.3.ebuild
index 75f74fe39486..7df1e1975d36 100644
--- a/kde-apps/khangman/khangman-21.04.3.ebuild
+++ b/kde-apps/khangman/khangman-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/khangman/ https://edu.kde.org/khangman/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index 70a9e6a77bd6..207671cdcff2 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
 DIST khelpcenter-20.12.3.tar.xz 4250480 BLAKE2B 08a31566902cfce5d91ac25e6cb6fd04f33c1f3f131839e5dfe15e6681144de7ee464564fb77910edf7b987069af22b0e057e5faa64c7e899f0520ca8b74daaf SHA512 6047f7dd135a5ae8b25494d48ef36c245f9c7055eff294e5c29087d4395df656a6b4d5c6f1099cb99257628ac4362b31bb8c4278be46ebae2ae5c01261b566e0
 DIST khelpcenter-21.04.3.tar.xz 4279056 BLAKE2B fbeda2c982f7aadd280278a199ed4954199b193fe80e5c7fc88409c61d09f4c59a28a5df386abb1f33c357b59f86dd2019d533b197e864a117ec26e2850cfa83 SHA512 59d3b701074dd5ac4c75df6666a850ebbb694b6f4f8501fe70606eec49d2c89a3dcbbac2ca35964a2f830bdb8df430e00b360bfa76f9d467fca4e6fc41cf3844
 EBUILD khelpcenter-20.12.3.ebuild 1486 BLAKE2B b22056c5a661d42373ae9b330d86ee990b7e02204edc7db239a543f62773af4ad40ea03c31a2689040ed85fae23df298c40cd6fc916eec1508cbb16bda9339ad SHA512 3af17e4efa8582404231639f402efd6309257a6d11e97b3ccdbe64fe451ed08b8fee2e504d6198f66373760f1b324703f7a944ccdc2acfa8a990198b657f8cb3
-EBUILD khelpcenter-21.04.3.ebuild 1489 BLAKE2B 06fc913039db609e17650b24a4aad163501a4778169f42772a3fc9a342ca541b33e176caf9c0dc033087a68d88fd2149bfd825cd4344f5e92541d36f3a23db47 SHA512 faa6752daf90deab7a82abb242042931f833233045554b429372a6ad294b19b706df75af124cb44f99a643cd7b78c038e3620730e94feaca4a32d78cf2677bd2
+EBUILD khelpcenter-21.04.3.ebuild 1487 BLAKE2B 4d705f5c429b5fc0c086df692d881b977f2154f77449b95c6e2ddf4c602e486b5a2e3afc1bebbdd04634681e93d805ace146658c92b895e2117786ab2bc3a062 SHA512 98d5baf1895c8d5efae0573d2166d872b322e5abd34989a3396fe79241481310b3a9f40aff0be7a9acf981c2adf1c5e25d19f4e91f2a0b9a72d30ce806fa6951
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-21.04.3.ebuild b/kde-apps/khelpcenter/khelpcenter-21.04.3.ebuild
index 5f4b4f64f406..a441ae992863 100644
--- a/kde-apps/khelpcenter/khelpcenter-21.04.3.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/help/ https://userbase.kde.org/KHelpCenter"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index 2a7873e02d6c..0b1c572a4d50 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,5 @@
 DIST kidentitymanagement-20.12.3.tar.xz 152000 BLAKE2B 1b54c296951be13cadb5db42959ead0e7ac79c9e5a7af8b8ecb5e74355513a8e294158facea289277c998da9de285521f812e5b77249b2e2b7a57b91800d20ed SHA512 24ea71f45bb1dc0efcd9acc03f4a05c4558a77a24689dfc70a3dfecb8a697c7282e05e3d212466961e37661c2c8522606f909df0b750e3b203e3843ea3729e02
 DIST kidentitymanagement-21.04.3.tar.xz 157172 BLAKE2B 6c38baa3813b478a9db56f0f3dd7482539c6126131dc9788e22d583ef4071b4a427bb2cab9fe10e35b27752f8bbd31ed1727c90dfa72e1a13c623991248db8a6 SHA512 f1f8b2bf314165fad19d6cca60e2df265cccb8839de7d1ece4f6ac9567117cee72b4496fdadb6280f26d402a09a9bc8600c49fe4eeb4ffb91536cf0a83e8430c
 EBUILD kidentitymanagement-20.12.3.ebuild 858 BLAKE2B f24dbd50534c999516117207bc085ff97b725385557c75c7961fd7c14f160a73e627b42fe2bf64e76bb4d97f9ada7b2de6972577e0b085c9e6e1aa0470bcab94 SHA512 2ffaf54919072688e47a2d23f8a6d565a7470ae57e9c52c89ed299d2c319bd14cf4474c7cae8fea227cd02e799ed8493796d61627c5b0af3e67d2e27f2a52441
-EBUILD kidentitymanagement-21.04.3.ebuild 861 BLAKE2B 62236dcc4feaeeaf1615e905b2236d714fa7bd7c4eb1d899a9f41bdd03407cbd2eaa2f8b66884f64a059ff0852d5dff06da25a56463f9ea011ff5b4f6bc082b7 SHA512 53d0c93dc7af60d89084152134908deec0a31a7ae33c580a6801b1da9f1cb1f4f2f186754a6a83c89284e8bd1d923ee8207b9820814847ce01bfc6fbb3f6e683
+EBUILD kidentitymanagement-21.04.3.ebuild 859 BLAKE2B f46d58ca1a188cfcc21f9afab763c14885a0b5d72176ea0329929c2ee37eebb3170f978398f4982de54a597dae1f41c083d2264a6cf463f5a36221d939eacca1 SHA512 2ae81bda3cee7b6c926977bed3ee7409d949e52061b97f915244b00651d52cfd4ef8e707746e2d1f30d64aaa711e93cf9d0a6a72eaea5b55a996c35c5de19662
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-21.04.3.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-21.04.3.ebuild
index 05dee7a30e5b..3ba468a2af52 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-21.04.3.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-21.04.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for managing identitites"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 19c74398e596..c015527caecf 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -2,5 +2,5 @@ AUX kig-20.08.70-cmake-boostpython.patch 2660 BLAKE2B 51c473dd8733f44214571772b2
 DIST kig-20.12.3.tar.xz 3122112 BLAKE2B cff7502feada09f674f055c209840e0e665765aa2d744260e629a58f7fde2af442c136370b173d3fd9adbd332e4d70d55aa794bb036f6c7bbdf42e4abc7db547 SHA512 4de18bf47d532c623aa877e2d52ef3e78f9fe715b96a110eb654aca578fb1addb5aa7d8f9e8e0f54f0549954018e3d7f829f07cb41bf587da115f1a2923e5428
 DIST kig-21.04.3.tar.xz 3166572 BLAKE2B bbd64b51cc768de9baeebb3b66906d8e0d8ff133a63ddfe19a9e360e34d6c10b9e08a55ca8aca88c7e723a7af29d5882d214e72db1c7292364631817e6ccc399 SHA512 f82695722fb66a707abaf120b56e0f0977a63065a21849e72f178ee0eb653b73bd5ceb651a92085a34ad7d1c98da08611138a7d52b491c7caa9cbca47b7ff19e
 EBUILD kig-20.12.3.ebuild 1738 BLAKE2B 17f0b7460ec6acf8e16d76f7923abf1df90199be072ea2b0fc746fab80c732ad233ffae753abe736985462d95ad49c7ad058ddb8a991ad27a6aed4a33daafe52 SHA512 2dc3941882c28f6aa77ee35174fb000c117c35414f86d0cdedc1abbd7d89d52b02fe4de017ae36f3e850f8f1bbfaab071a4e3585618adfb92beb2a5abff22625
-EBUILD kig-21.04.3.ebuild 1741 BLAKE2B a603a8b2574f206aff340c6dd7cc240f999b51c04c1b11a7e24f61d5349ea5cea65dfe1cebf7df9f2aac78bd2b5d2ba193dd65c037bc7fca4b01c5fc62c314d7 SHA512 ebe8501aa5764be374ce004d79ff4e4468a05cba78002354afbd1f7b7af5f43a02993f98c7e6d5f0dd66bab3fedf649abdedde337dc3c2c681a76bc65b67a6f2
+EBUILD kig-21.04.3.ebuild 1739 BLAKE2B d7893a3d4df0605232016d212a286043f87662776e7d8f763e609a232f3c4d5d7ac9da7f0f51c038d2809a3c38ff013ddc44aaf31e56a2a9183cc82c5d4462f0 SHA512 2e528ee80592e7f2d5eaae1d8ee5a91d80848c68cbb1f54abdaaab90b4647aea7245e1c5ce4b98a2f93506fd70d08dce94ffd2b8e42530fceb817ee0e3ec8dbe
 MISC metadata.xml 417 BLAKE2B e9b8762ae43f4e8e449b2a649d89d6e909bd34529bffaf6b0c4683a927b5b89486e7b94de5a34bebe5ceb580289b0ffbead4d3f8db19d0c79f95a93126b17f51 SHA512 9a87c6e27600a5bad58df8fc2de4696a6e2a81e1474cae08201e4861d7961537eba510463e3522ff0bf7a1bcdb77aa84804f0fb956e0d0cf096ffd8f523f1ace
diff --git a/kde-apps/kig/kig-21.04.3.ebuild b/kde-apps/kig/kig-21.04.3.ebuild
index 370c5bf8fb7a..f0aed4067f29 100644
--- a/kde-apps/kig/kig-21.04.3.ebuild
+++ b/kde-apps/kig/kig-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kig/ https://edu.kde.org/kig/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index ad92fc262b3c..4b54876af21b 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +1,5 @@
 DIST kigo-20.12.3.tar.xz 5234272 BLAKE2B 394f8dc485e4c544a2649673071c92188491a538920cf8e60df74e936f0cef2f5b1f9292736be3ca97f48609c61ac83dcc7a625c41d74e44f5e23a4f659d3e26 SHA512 6576abeafbd67bddbcb4466a4b1079c2cf709b21921f906270d637b4bc2364fab62030c4b12848dd7212910537d2581d2cde588f242286aca5b2039d684df69e
 DIST kigo-21.04.3.tar.xz 5245744 BLAKE2B 550c51ae8a798c16f04fa15c8bf2e80f061d1f405ea81338ddb53252ec875bb88182bc6e6bce574c33af2450ea4907c409974d4668abb753e6ae388daf4ffc64 SHA512 2e92750125ad644c52f0427d4c39d8ae4e0c0e70588e686551181bdf41002bfa4fb9529c99e717f7a96adb610408d27d946547b98f3715a325ce68c0d4f9d302
 EBUILD kigo-20.12.3.ebuild 994 BLAKE2B b5a6da337b2572aa7ff1de949958e1004a2ec2556d8503904bcf860cfb0d72c2f0a8d9530c9f81eeada2dce0f96c808c7dd8736be9c89ff25b7f7cb26bc317e8 SHA512 0e94d67bf934450545f2864bb3ef77655a68247b6f71dfc6fb874133fa4d49b9dad6553cd770f5a2281545564d7973b32579366cd0f938ffdf7332e62a386f8a
-EBUILD kigo-21.04.3.ebuild 997 BLAKE2B 25b83a0437e360605de555297331f55fba8d1e816b420522fd54e6cfb8ce766211fe4422b10fcd0f465d9b3eb960638042d63729e20b7c51bdf90cb52664fb57 SHA512 da461cccbf9266528cb4b078f2a9fa373e2333ec12a3a536593185a3552683b70a55a56540ccf15a59c30cc3e0a4ebd0606f15d911266c205af4d5a8036693c6
+EBUILD kigo-21.04.3.ebuild 995 BLAKE2B 58568553877ac8594c873b03e381dbcb8bb1245bb40a1830e8778f8652aa8013091548154d33abd75f824ec0533528b15d88b1767d3412b8823aa31dff423eea SHA512 b0f9095ce6c47691661158eb1c3d5a7cb8fcf3d37523bce75f3613d113f0311f21a4274a53b9c25b7484ace3fa9a775df5cbbfcbc1f76864a4a28b243e24ee68
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-21.04.3.ebuild b/kde-apps/kigo/kigo-21.04.3.ebuild
index 6d66cd54105c..5e269780ab7f 100644
--- a/kde-apps/kigo/kigo-21.04.3.ebuild
+++ b/kde-apps/kigo/kigo-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kigo/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 8bcb1bf9da73..780ad4606ef4 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,5 @@
 DIST killbots-20.12.3.tar.xz 1186532 BLAKE2B f2ac6281f3c4d10faaad0a9d3e4a2462a431e9275c0ab6d9e42ebdbf6dce4a393be4b5b61dca8e8745bbc69845c9afc4fdb9d2e7da27fbeab413bc00b00c9484 SHA512 247d4325d705e527ca3934d35d0f939415a05c4f37d7b7b53b43cdb9bf28c3b59b87f60070eeacd24bac9ce22888042081a9503c2c1ce65db8bd4495df7f8504
 DIST killbots-21.04.3.tar.xz 1186432 BLAKE2B a9d958148135d2b6d6fffb4979aab47f6efc6da0ebdaf4abb81d628ee2284e2f5e5b2e1055cfda149192721794e6f1bf6efb8baac9645f7b2d45982f3195f379 SHA512 01b57889dd9bc3ffd6d193206f87fa7fd69078fdae217c3f6bc7eee8e415525383b1c794d56992750bb0a74227a6fc4ee4297abdbffb14954d8bdb4236447fd0
 EBUILD killbots-20.12.3.ebuild 863 BLAKE2B d00fcd882974cd7bfec593eb8af39487a8a478bc33ed3ac7bb7cc04da67b8fa736317699e08201fd68f6cb90d392d90d36149c8cc10de0e64a905ccd460f959d SHA512 68929f05998e7d5dcb490d832526384610d52219b7bf4b85b0c9ab553539939086c2c1f3a6f7fb966982627dd76cfcc9fb72cc63c342b974f39edccc1d249ef7
-EBUILD killbots-21.04.3.ebuild 866 BLAKE2B 32cb1ef152a43b3874a6e789d01a871701234bd24d73556c070fd78e025abd65b09b1bddd076b3117e2a0252dc2d5f07ec5b980eaaace7d852450fe4ea89eade SHA512 d0bdbbf30b1de2a31ebcd4d610a8323516731ee934297955f450fef90200b284c528cb5daa3616f716bd5b7b8aadf09b52f3810f3ac892c43af00f0a088acd3b
+EBUILD killbots-21.04.3.ebuild 864 BLAKE2B 9e17868fabef19de0f8f2320d95b3f2583093e02bc0aae4622a560e02ad43cf5e3636794359d1d51be6f85ef4255e9f719bbca0ff198cf73fd5dfbda2fb784c9 SHA512 ed66b21c75effe5ff421c863efd094ff5ef8dd48097b9bee3888565c69f597389c495430924b2ad90580770986e92ee20583a8179acc5ed8d040166c99cc66d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-21.04.3.ebuild b/kde-apps/killbots/killbots-21.04.3.ebuild
index 88211b1dad9f..73ca801a1bde 100644
--- a/kde-apps/killbots/killbots-21.04.3.ebuild
+++ b/kde-apps/killbots/killbots-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/killbots/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index cc940bf1c7e7..8b5ff5938ed6 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,5 @@
 DIST kimagemapeditor-20.12.3.tar.xz 1079008 BLAKE2B 7490e8e548b2d2d0f22f45f2c3a61bb8b75e53e2ffdd920e3dad8fcc609989c35ef134ba3251f7f0104ccd9e2c29658f521955a08bd93149986d820e62f068db SHA512 5bc03c0c4aecdb18582fbbf3e1365b3bfce9eca171d5769a5f39234643903dbf4724a9725d95dfaca6a01a03ebaa2c9646597de3d7b4032cf4037e8b993d32f6
 DIST kimagemapeditor-21.04.3.tar.xz 1088644 BLAKE2B 489db08c580c85f912c1674aa7f56cd6c1b2b309ced1c32a9cc713615a7ffa15f26af87dfc473a42cea1acd2db13a1b35197b840972228b78c8449485362c9dc SHA512 8dd80e4df949a8716f000edb2b8932de36913b9d577babf6e19a5de9f67e30509461847bbbd4fa571998510e6b4857dfc30ae92e49ea3924b5e7759917186b27
 EBUILD kimagemapeditor-20.12.3.ebuild 927 BLAKE2B 2dea86b9fdc57bb03a99be4a8aa9d2b8eda2ce5b4a927faeb75031ec1951ed6db7ae7a904d6a390c9ed2385f61c81e29453018948ff78309b6408ae718e62608 SHA512 d6dc6baa5718bedb6255eba4fd3e3c916af937f070705d46b5ae0e0d5842eba239f14913d73de6675fb5798e9ed36a1848ea1f0494a0129e4877ff1474bb3d6d
-EBUILD kimagemapeditor-21.04.3.ebuild 930 BLAKE2B a6767e7493ecab026a28230f4f0360b5ab25fb26ebe97a0dd7977aa6b62408e110bc26140bbeb301b35b62ac89c7bae241a9fd5e17c4b7c569eddc20bcd92171 SHA512 40e6ec29a32d28c79890551c06966ea9f17858382f1381cbe1c3a071f9c82f8f237730064b34bcacb447455c0b4115334304a6b960689257add92df8101f6447
+EBUILD kimagemapeditor-21.04.3.ebuild 928 BLAKE2B 64ae6b2b35c3daeff50eaedb49a7d27be936cd34956259792d1aab7686c82293855e6aadb073dc2131549b166efe8007e06492f5f9cf344eaa624fb9aee607c9 SHA512 7d73075a5f4bd1504ffceccc5e68f60516a2a5c346e1c01aeabed93a88c1029ab6c6ad224393fff04f3d05cc9097f44eeb6e8d79f610a5599f4c168fba3b9753
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-21.04.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-21.04.3.ebuild
index 3618a35ed7e7..84ed2107aeeb 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-21.04.3.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kimagemapeditor/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index ffb5a7e3113b..86cba4e8340b 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,5 @@
 DIST kimap-20.12.3.tar.xz 124676 BLAKE2B 3557b87d9afd1738a32fb7f62dbf11012a5043bba923fd712721c266add76d6cfed7da75a4ddcd68bcaf99839eed6b88c78930ca4e1319e278b501b5cbcc4615 SHA512 dc64e972c7955e64e5aea1b141d2c48b76e2074946c4048eada4c647f0089fb051bfd505578461fbf0cf7925b334c49c8de3abb898fc7ad97401276d4a16c5c3
 DIST kimap-21.04.3.tar.xz 128564 BLAKE2B 11b775fbb697989e27e1b3c2c41520b8be0745730f3d6a9ee2d5e3cc6f12734a3f527600dc376c26b00719981ef8c8fb37559432662cc5a192541a5fcbe486db SHA512 4b8cb4d2268c7e03dd8aaa1ecd6ce45f3c2a4ec2594585238102d0933d2540805f0ede1763f5e68ee156498870b402af3556e7b5509a406651dda674ad7aeebe
 EBUILD kimap-20.12.3.ebuild 850 BLAKE2B 8cebcfec989d3bb53396234813daff6341744887fc0467d16b38c17cd81d700cd06092b8d4d205b6c2bed2ac323894ae474bce8878add2afa3bd2d49be01e923 SHA512 5e4d2a23d4f676163d16a325137580eab6ca162b7c1418dc5e8e92f7719c54fb6f13d383310e74094e9f6a2d6936b5e722673dfefd9f754cf1dd12c8b195fcc1
-EBUILD kimap-21.04.3.ebuild 853 BLAKE2B 6355d89af4902316dd382ed9835f6182710631c4bbdb522769fdf562a84e1a2bc2a4eac19e063cfa6c14317662f97075f639141b6121826b6b1795e52f32f508 SHA512 a4402e8cbb4bbdcd8faeb07a047c2e4f05e53841467d7157163aa91d9cb84408563b2a993dcc52f1c9f4ad3b7d55978013bb185c2e0d8deb858b4451471452a1
+EBUILD kimap-21.04.3.ebuild 851 BLAKE2B 5c7ddb98153577330f18580930e3524f760cfdfb65db1d19ceb5aa61313cfc60174e228c80ba9b6bda3c0801fb152d95246dbec8431457045992ca25c76b1077 SHA512 49d04eadc1416b2b63b01c9ff0e4966f8b5b06bec7cbe36425fcd95a818c2785a34a3b1288f92a0bac3a3bdb7660dd1a8b379584eabf0a87b1ace74e0ac87a2d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-21.04.3.ebuild b/kde-apps/kimap/kimap-21.04.3.ebuild
index 01b0dc112581..fac2e588dafa 100644
--- a/kde-apps/kimap/kimap-21.04.3.ebuild
+++ b/kde-apps/kimap/kimap-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 0e4faabb6fc5..aa33a3ec844f 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -2,5 +2,5 @@ AUX kio-extras-20.12.3-thumbnail-check-shm-size.patch 1945 BLAKE2B 07318d918a264
 DIST kio-extras-20.12.3.tar.xz 636012 BLAKE2B c5145871443ab7bfb562ac935462eb5dfdeb7caab63c123c53a929af9d41f3780bf03ac9f16153434854f785122455e1767573ce84b88bef196a01c62fc2e609 SHA512 a419f7fa92ff876802e8b53eef9b5756108dd3f30fee4f1e1d25f4c8f4468181b9565a92ec07c832aa175368763adcd512f7732666f09a4e534e8d1af6abd13e
 DIST kio-extras-21.04.3.tar.xz 663328 BLAKE2B a509513732dbacc2f63a162cef49f297b5ee83a1d4bcd436aee474571d4aad8ff5b34710ca23d590b87c9cef8b58add2be507692648e61abc197befc478effb7 SHA512 98cdf33a73b9321c127cb3174f5ffc243e51222c2c4572afc7b51a949a41c85e8758aafaca5db613b11109af693eb6de061d78bcf1138c12fbaebf3b5dc82da9
 EBUILD kio-extras-20.12.3-r1.ebuild 2701 BLAKE2B f9e5ac55c51b8d9e8c098efdd379c3f9501ccbe7b752be1ed3b152d7c31c7dec239374e43747a20b8662ae3523ff5d75e24cbe859bb9c4fee9f46712843258b1 SHA512 c13f91a704042b8c81a749793667a0317986a6412d04135d7aa4a29845169cd92f407c72d06305f67341d7ed1c6dd609ae9b7b37b6a2ead23b18338b5deae349
-EBUILD kio-extras-21.04.3-r2.ebuild 2705 BLAKE2B f26a7fd787830c185aaf23ef523d5e0bfb5a188ec04e60463cbd836a7dab44e7d8d60b0773b59f57e80a886957e964e5f2609858b2394483c719b3c987319f97 SHA512 986b78edf2025b5bf04de89bd651aaa75686d57cc296e65c0c4e1e633c32a543edb5ae478cc2ad3756442932886f53ac9be1089464bdb00eb4847a0ceb760f0e
+EBUILD kio-extras-21.04.3-r2.ebuild 2703 BLAKE2B 0cfd30a0c52024ad73f699e1cc222e5d3969baad08a10ce65bf7906014749dc91157f3eb8a9c41e91f1ca95636fda8b999080c113a95206ff616eebcc2441b61 SHA512 02947e4fdefcd3a6b8c9cdf3aff557763bab9434ded3eee4cc9810ab9e0640d3444732e3a2a3dd0914ae0bcb762db1e928d917f615c9e64eccad41480e9f8875
 MISC metadata.xml 840 BLAKE2B cba33bb5b6c15b2cd116fdf241f91adf13b96d7402bb863cbfa6a8fbb8a5c7524c5704c4ccc3eb1350262eb55ce5d3130e5f0fda078c66ef597bbed0425b8b7e SHA512 678501971728b966bcc286242477f6bab4be9244a9cdad765be5d50c43c1c5fd08102c03bc4b5e9a2d46c5e92d594b95609da26d47b2a923339fa7e1d500f7c2
diff --git a/kde-apps/kio-extras/kio-extras-21.04.3-r2.ebuild b/kde-apps/kio-extras/kio-extras-21.04.3-r2.ebuild
index cef7b17a3b27..73c2516bc60d 100644
--- a/kde-apps/kio-extras/kio-extras-21.04.3-r2.ebuild
+++ b/kde-apps/kio-extras/kio-extras-21.04.3-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/network/kio-extras"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
 
 # requires running Plasma environment
diff --git a/kde-apps/kipi-plugins/Manifest b/kde-apps/kipi-plugins/Manifest
index 7bf51f23028c..2b420c7a3861 100644
--- a/kde-apps/kipi-plugins/Manifest
+++ b/kde-apps/kipi-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST kipi-plugins-20.12.3.tar.xz 1644852 BLAKE2B 5b2e298b34d12508910ff005f525cd457c2865a553f07089df33144eb8f3acf06bee9b761e388ac1474929bc4df558ef772981b1345e40fc3de6df90ac5e4be5 SHA512 8e5cf2ea81facc7ab5eed509be71b0dc57e93ce06237c805211493e345805f82b3aa3f8994d0def3b81dec97261409acb9bc51616b85eebf10a98c43369b4992
 DIST kipi-plugins-21.04.3.tar.xz 1654288 BLAKE2B 32660d84e939f54ff95a9076d2d92fef2d2896139e37b52ab4cd6f78dfb7aa3ab786d20f17494c6d0aa7751cf96a3ba7c3af085ca2a72da5e547e41f404e228d SHA512 b845c94415409f21cbc95d6d4f16a8a628e8ae217c180148d8e0a259a8f15f00b7cffbb6bf75be8c35efe180049feac46f0a2549cc89a263f1037bbd0866f675
 EBUILD kipi-plugins-20.12.3.ebuild 1475 BLAKE2B 3042d038c11b4524cc55cae7634c9b385423a3662fdf8ea09502f6839ff64b0f200a1c19e65be3cec0e0d9a01b03115a0c71bd0f49da2bfe9871fef60a766eb5 SHA512 b9cc12a574d3499eba8bb6d634c69a21db27bda0238d1d5776c93179fd997e775947319de61aac578b0e51ff71e893ae96f5f8491ce32f04ee93c4e2fbee2f78
-EBUILD kipi-plugins-21.04.3-r1.ebuild 1349 BLAKE2B e07661b5bdd6422c2bf914e0de0148aa5f3b4af9321104784c106becb59e4d3378c56502eac1db49ba8498b9bafd229c743dc7631e8b789d924f6b2e50e378e2 SHA512 ac1573226acc6365045a4f4c53aae41a453f37996c1a0efb31868a7f491a77ce1fcf64fdb78f4dbca1a992e45c9515f0f762ee552f0481a1be17ad389c57ad57
+EBUILD kipi-plugins-21.04.3-r1.ebuild 1347 BLAKE2B 09085b6667948a18a2294ef7e835d98c35d3e1fa7565c7496978e9261ecc0d367560d877e3b61bdd2a283bab0c5a06a4c62441d2bec6a4f89579d52111a3e0ea SHA512 3b32764cc8ecaa48d5785bcd2cd97de7f89ac459e5d9b3b63070889dde86102a746e45cac660923cb1426938687ad38a27afccb1933486f5b8596f4c2650c475
 MISC metadata.xml 625 BLAKE2B cd63f210400e6238f574fbae4a33d2b299aa3c46c9264e21521255a3af9918805ba8905156629a676e3375009c873208a843a0d82f8a260689ef854321d55cdf SHA512 4f61eb0e78808875c77cbafd1c95fa7c8fde0e6b05b539308d5130f5ed5b7116ce54e1444e30c88ae3d295185442c99fa1f0db03b533aac15efeb06613b91f79
diff --git a/kde-apps/kipi-plugins/kipi-plugins-21.04.3-r1.ebuild b/kde-apps/kipi-plugins/kipi-plugins-21.04.3-r1.ebuild
index 1d4039b5fde9..21fb8a2e843c 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-21.04.3-r1.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-21.04.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kipi_plugins/ https://userbase.kde.org/KIPI"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="mediawiki +remotestorage"
 
 RDEPEND="
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 081dfc6c1b1d..2146a484c720 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,5 @@
 DIST kiriki-20.12.3.tar.xz 378704 BLAKE2B d58599bd2b25346bf58033139299da3d7ab9fef6a6e43a7422873b266ed0f8464d3bcfd31e59c2ce0790422b8cd5427d78d0210fda376eab0b7ec8af9bc26715 SHA512 52615d3de4ba76e3e80450c8ae90dafb9fbd123954c9e703d44167be78ef4b3ce85fc51fe90a811621e5a8beb79ddc95499ce0b5d91003e9726705f9e4a0f9b5
 DIST kiriki-21.04.3.tar.xz 379640 BLAKE2B 26f1afe922c5602cc79d55653bf98fbfee03e579d51d6a0b25944f671ea1beeb38b4c8cef1fb0ca3789e234f1d707ecebc8a2775ed979ef93aaf9fe7457c62da SHA512 92e29859d6037b30605a3da54ee2e780c81c5515f28e0a03270812eda6597181ab5e413e02c1b0bb4710e9a4c3404cf7fa3c87cb991841b0baf991345556fb4f
 EBUILD kiriki-20.12.3.ebuild 923 BLAKE2B 27ae1ba51dd047db8ccbd83a044a6ee010f9b68ebd5970017063721decf5bd5322463a6ef9a05c64620b9363d0514cd31cb3278d3757aa5e22841b0c8bb02559 SHA512 2f4837e03717fb07e8f08765977b41d00a34feed02454e19a08f7f2c307c31395417091e786b282d40adbfc6325f4390f3d1c11cd409b958a2e0bd1f90135c13
-EBUILD kiriki-21.04.3.ebuild 926 BLAKE2B 9b60428d89c20fa1a948af944776fe671724092a671cda9e92d6b0a6031e12b3ad5bb54561740bcdcddb350cf4afdec962fdb76fe9d20d422b80d9a97ab65254 SHA512 ef28f718afdb81e5fa218c6c39423fa5cd6d8baf8994f3cfba5bc7f3d4cb4a120eb1d939eea95979d9ecd2b7b092b58349dd2e95664d6dd64f8f0db911470bfb
+EBUILD kiriki-21.04.3.ebuild 924 BLAKE2B 61766af6bf6f904a3d89986d3affce45a93f395aa71f81159ffaddc81e55dce7a00f632363e588c334be0aa986907ee2a75f279898cc286adc17257a5cc393b1 SHA512 bc4043942b8d4a70edc4f8a5bfbb0f2acb90732c332852daa6bd339ec659eae734859304493c3c62e01494e89701e5d066e503efd5d75cfc75de3d8306895504
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-21.04.3.ebuild b/kde-apps/kiriki/kiriki-21.04.3.ebuild
index 77c260b9e7e5..59c5cbfbfbc1 100644
--- a/kde-apps/kiriki/kiriki-21.04.3.ebuild
+++ b/kde-apps/kiriki/kiriki-21.04.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kiriki/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index 0bcb29cda6b0..31cd15641c8f 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
 DIST kiten-20.12.3.tar.xz 11298492 BLAKE2B 04cb5f59e13abd4da7083ad609268f20f49dec40185c7188c85f7a01c1e9328ec45ddb7961a17c33ead52fdf4782640526102322199895ebada66714ca670e1d SHA512 f9801aa1bb8eb5a7021f6ee8a5daff3a4b3cfa9e36166e4a4b4ab5407ed7557b3a75fc1cba4e79f80fb1b0f93633f1066116129f2250adcd9756b98745fd9209
 DIST kiten-21.04.3.tar.xz 11312220 BLAKE2B 4d1a781a37cae93f088c49b4a5a996921b9c742feac8e4ea6761c544880243462d1b7d9db076a7ea62ac9dba556bf7a42d7aa92ac295b42e8955a37d987e1195 SHA512 22ae9b0ead5f6a8c30cff5fd5d29c7273c5e0844d0494b136d82245dc60d0d4635f9a83b61b94136554f545a7c3ddd51342c4072def2ba8050ef7a73f60da695
 EBUILD kiten-20.12.3.ebuild 1076 BLAKE2B c5ef0f44efb6574e728ba6c3dc4ef25c61c7327acdc83e7acb209564d4f6fecdbdc69e5b3dab0f052a5e67c30443fab643fe48829320824671df004f62d9a3bd SHA512 16b06fef12f5650fbbc4729b3ed241dd8bf0e2aaa0edc82625c07db778776a50ab24c9fb45fa1944af7b7c51fa4d2d398bb92b73259bc2290d3aedbd215dee54
-EBUILD kiten-21.04.3.ebuild 1079 BLAKE2B 93903c4ac9aa903b91367d47acdd1fbce98196d083fd12deb6bc4a1fcbee83d8d0c22f287f5b49fa834f6559932b8935b4b8a68eb9f211dd66f699a63677c142 SHA512 027084dd07432174845cd2191cb2004f6eb3b1e9d55f1f36989f922be79b263c10508567d0047812b023a2923c6c3fc891b79bbd1489ff009b41bf58421baad4
+EBUILD kiten-21.04.3.ebuild 1077 BLAKE2B ea44ca2d07b1886a18e83568a71d8fbc2d9f13abf3cd850db31d6937c2e375f2bf03c51e6e9aa733453a5ed4098ad8c6df157990a97024bf261c94b9687a91b1 SHA512 6d1115bed964f9220fa5c58800d21e727ade29843317175c09ece982b0a5a05af1c1cb68cee9ccfce42ac14851eea5b4eacc2636e50e689ed225215e64fdce03
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-21.04.3.ebuild b/kde-apps/kiten/kiten-21.04.3.ebuild
index be5837519e9d..795e263380ab 100644
--- a/kde-apps/kiten/kiten-21.04.3.ebuild
+++ b/kde-apps/kiten/kiten-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kiten/ https://edu.kde.org/kiten/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index e7bd810d5482..04518331b8d5 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,5 +1,5 @@
 DIST kitinerary-20.12.3.tar.xz 1808996 BLAKE2B e1aca401696ce7aa01bff4c7d38eedd7af90b6ff4cf6246a22084bee64d130ed099b9dea98512df347c7516a55f78ef1a97795124f71f1944a87e30365ab7c8c SHA512 9216dde20f1941b933327fc37382af620e29c660d6ffebe84b0087c660df75b030056f4142a75afa857e339fa7d56ab146d6905065f341894ccd07c2e295e541
 DIST kitinerary-21.04.3.tar.xz 1823296 BLAKE2B 0c572472cbec27b0fa72042114c231a5e014008c1e51be1882ab68596e6260421b2831a169b592a998e9130ed0afe337de3cecfc42723fc531ba8d3223c0b430 SHA512 9fd0270c7c4f423e90aa103e2347e0a5caa2d60ee06c86ef245a83adf58ea22259d683472af5416c10e67245d65b845abedcd1e807c9981349adf5bb0df6a10c
 EBUILD kitinerary-20.12.3.ebuild 1006 BLAKE2B a1fcfa474565517c27444a64c7cd8ed1b37965c508b8e197336eed790b2b19a1456e4f7a7d0990e7165b95184f62605a609c795cadbe490da93bd492957a7343 SHA512 ac0e9681bb4faa0326c4176906560be274d6f5cd8d05e8b52221660f7d8b50457be3af98a8a9e67906678551f873f4cd7a836bdfc0e815d747a6d24d07b2823b
-EBUILD kitinerary-21.04.3.ebuild 1009 BLAKE2B 80c440d5092af7a12222586078665043eeebd06bb33188c174e0d223c955bcf8d24027a861f60e5db6905503cc158d816ac66d86fce7e202b9dd2152566072c3 SHA512 5efa7854554540e3030078f168371e940457e8214549d8942f7e5754ce6b9601f33697c843b76b8a90e2890cfe072b933395c7ae2245ce449c9b149a51758235
+EBUILD kitinerary-21.04.3.ebuild 1007 BLAKE2B 9eae9bec5c3033c828ad93b9e4d78bb83c727ea6b6ddb109c1fc46b0876168fa0f5ae7025f376d7483963757d754b034359bea098c54ab755c9fb4f8293187d9 SHA512 066f345da1adb3645e37173f73b9f5c74cb1556b8ee3aadf09c2693aed51407fabdb09ca464a5cb4ff3d7d823cf22eff57589903ce6c16943e32dbd17a8c897e
 MISC metadata.xml 385 BLAKE2B 3831c360aacb09127cbaf52b779ff5b17708424dcbdc59d3c40739cae4742c9d22a95222aae7cbf188e74ddffd22ac58275440ede013b6c18c2f6b8a148bde5f SHA512 3bca0a73900f8dbdd9baf83b3e108d73e074d5713abfbfb5d4ec2923104096f516f409501e05fe9c42c59a949eac333d36ecb1e31b370a2810d7eeec515e86b5
diff --git a/kde-apps/kitinerary/kitinerary-21.04.3.ebuild b/kde-apps/kitinerary/kitinerary-21.04.3.ebuild
index daaf523b6336..94bf79c831fc 100644
--- a/kde-apps/kitinerary/kitinerary-21.04.3.ebuild
+++ b/kde-apps/kitinerary/kitinerary-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+barcode pdf"
 
 REQUIRED_USE="test? ( pdf )"
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index 56092ee1d2d5..ba2c3fd5d304 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,5 @@
 DIST kjumpingcube-20.12.3.tar.xz 290892 BLAKE2B b0fe75d866889a9259daa4fa3c500eef1c93d077e0a6247a3bf7b1718435b721f4558ffd042ee7b2e6eb218ea888d5ee42dc30b2fb98ab7d910c1a0b65869fd1 SHA512 c4df393cf74c18b090d0cf97c04ab28579f75dc2f140921634a6250952747db0bec415a7516031eeda7ce731e15188062a57d652d0b5533193adfcdab48edc9b
 DIST kjumpingcube-21.04.3.tar.xz 295460 BLAKE2B 7ea47f5899c5f0bb9775edc9166b8194cc9434ad54529fef362c1324dbfb6f6cfdd5b43813484aa93782d2b19d9d3ea94a819d498a08bfecada0cdcbded46ce1 SHA512 5f82f9debad4b0136166a8427b3c58ca39658f194edbdcccadb47c848082e5c7364fc5f80a93628ec30f4cdaa2c127dc3ce5023bbb3aab9f3314972d7cb68588
 EBUILD kjumpingcube-20.12.3.ebuild 913 BLAKE2B 1e1e32d6bac666ae4ab95d0dd355fcda74562afb53ee4a2becea311defc260c6d1fdcf08829a4c5590b113b3cb60a814ce944934ef5cb7c364093c4da21e514d SHA512 2c729c96c84d5602d3eb428c4c8bb5afde2242d412751a69631eaa159fcc40ce121d4b3b6ba48c29bf02a10668a8d535e313fad3afc5053b856e90a405cd0cd6
-EBUILD kjumpingcube-21.04.3.ebuild 916 BLAKE2B 249b8f81a705c484f207ea28ef5afbd07d70d94c73a0be1b1d757e7fa51ce1dfaca1d27485b4a496ca1af5f5791594a815440f4408df3d04e567168216cf88d9 SHA512 bcae4bc3c4a366bf9944b048e46d793edd7b6956c1ebacd0fd1edc1ceead683212c99d51c3157a87d5981c542993c518d810d5e6eff66e42e189c0e95bad3ec6
+EBUILD kjumpingcube-21.04.3.ebuild 914 BLAKE2B 40dc622c3f36c93ce33f038a4f492e5d5a7e2323a67440576a3bd224bcad6e94cddc435ea7355b8714c898a4258a44325fb398c8e03d2ccbe3112d9b8e23e220 SHA512 60cd2e7171e8a320e74f42553b8f1ba11953b6236fa0e748a7dc80d759d80f0882d452da030f773b54402555ba6a54c53429607cf17fcec58bda04e0d68aa1cd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-21.04.3.ebuild b/kde-apps/kjumpingcube/kjumpingcube-21.04.3.ebuild
index a9e7e4ba3804..3652b844e743 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-21.04.3.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-21.04.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kjumpingcube/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index f79b76857d7c..b1c81d8f1042 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,5 @@
 DIST kldap-20.12.3.tar.xz 164652 BLAKE2B 35c8f03a96616b125f7df264ad060753ae306b2503c350a90efe37884ae661f786b3e5a98078eec1fa9169872ea688faebb3b6847bc992499e5c57181e63491c SHA512 d1220afdd157de224fd65306f1b77f80c1adbe195307bea51c6de5234e9a94122b2c24d38e050ad5dd1a9597b5f7f0f65ea5de73a38c4a309d5692691ed09d54
 DIST kldap-21.04.3.tar.xz 172864 BLAKE2B 50ebba423914a59fb48535890d58196fd12a15a7c7022a4f8465e1964d79c16d217ceb36808502764171fd2f9827bd0a841d0acb3f4589520df4bb4d83c8547c SHA512 01e9a36e212d912f86c43c1a6af9b56f48c5ae041b17e282bd2b3d913257a757e6b43bda756507fe50068b3ded17506e3427df0bed2a9114d327fb808dca3e15
 EBUILD kldap-20.12.3.ebuild 663 BLAKE2B 388c2498b74bf8094d3ddfd4c77c6d2aa74100666869d6d1a88a7c79a421f090039d1290a3d737163bde4563ae51967e851dff1ef6d556b4633db6e7d4ddc758 SHA512 16cd24268b8c058a4eb1c9899d19ec60492b03f5e5f195d0efb97337488b57da340d426c7dea38a9effef7c59bb2e51fe68b7aa67355c6eb6ed3274e63420984
-EBUILD kldap-21.04.3.ebuild 652 BLAKE2B 6f6d34813c3da5edf3393154afda644830023fed4f1712f27e2db94673b53724f0dbed7c1df1e30ae60d5cb16ec99cb47c55e11ac19caff7798c710329705555 SHA512 23bae1ce2d1568036847e2b52b8db8ce4e9bedde5e2eab0d02124a486aa6264f297e25a247a4c1dfdfdfec1aa3bd9856dadd41a0883e702a2e42c413c5628db1
+EBUILD kldap-21.04.3.ebuild 650 BLAKE2B c0830953318657737707367e21038bfec2033068bdd4d5aba8bf13f3e6338c72c5cd035246e3dc63b3eddbe0001d5d9ce9a404e000b7e1ff7af16525b2311273 SHA512 6555908fa19a28c30218fee66fa6525abfb9bf88abb9f888a899cc38b0140adc340debf3ace381830a09ac5db70791376f24ddefc2d215170eedf207c359efa5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-21.04.3.ebuild b/kde-apps/kldap/kldap-21.04.3.ebuild
index d144da6de3f9..59872441ca99 100644
--- a/kde-apps/kldap/kldap-21.04.3.ebuild
+++ b/kde-apps/kldap/kldap-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 6cf171b7313b..62c3421b510c 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
 DIST kleopatra-20.12.3.tar.xz 2001196 BLAKE2B 2bab317762becfff6f44d8fecd1ae25a9425c30b492ad201cf51e249d26bfc145bdb0dc06bb52b6511e131ffe9f26b9b1628b6915dd415d223786e950c533ee4 SHA512 8f27930714988d53622c0d8e5e5e3cd82e58eaf6582ed150f4a7326f61837c44fbb6dee2881934bdea1a0d8976b7173ef5d580154ccfeb84e75e3b0c38019433
 DIST kleopatra-21.04.3.tar.xz 2119036 BLAKE2B b4690d2760ab814e36a80ef36a0584fde1c2edd97e1dea1f939ac7d3cddd4c8b7b9210f0ba58d83cd680a080131c6d61cad2bdc5eb66bbeee3aa365b6a547d37 SHA512 4cc6298b992d1c917226caba4f3e6592cabd33eaf9164e94fb58ecdc6c939417fcf88e018b0867e6d5baa8eddc5de6b64d9a7bb137ad641085ddf8b8511bb5d3
 EBUILD kleopatra-20.12.3.ebuild 1473 BLAKE2B e149567fd9b5a27042ccd9fee14f7cb5a9e6ce6f02966efda6b7c5ee3ed73cb2ad2f375adbecb089e95bf160ee038eebf96d2e2a2fe22616f445a672176dd896 SHA512 a8bc8ab9e5e4205e700da23eb2d3c55d71e1c3fca14c14778e8464afd7528ce4e1121db5b4068a55d07218a19bae97130df9354824e9c9eabe6d623be515bd09
-EBUILD kleopatra-21.04.3.ebuild 1476 BLAKE2B e2205932a9bbc88339714410bdb1dd9fcf9dce517158ececaf7f1b21e435d788eb2f2dd02b70b9bb68c735ea16e8da5b7ca21a1e1772bd2d847d4237cb8d458a SHA512 8600ba96153d73839f6cb38d875e4b92142f667a0129390274c559820537527ffaea85c14101e57ca2d2c66fc85715290d63baa51f31aec30005d2f95e3151be
+EBUILD kleopatra-21.04.3.ebuild 1474 BLAKE2B 7fdb77e552e9b541de73b086ac04e24d650126531602fda53df702446f8b178e8b06ca543c8318af7b898d3f6611ee3e90ea941a91c3076c85b6e3b1c84406ae SHA512 45781df197508f7c715e4b19b9fcc3e2a68af86ae56c0b8b6c8829c9bcd4a4903b8770f370e2a3226170a4123cf95efa8b5b335e95aebeac217586bb9ddf8633
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-21.04.3.ebuild b/kde-apps/kleopatra/kleopatra-21.04.3.ebuild
index 67ffb80aa5c3..86a7903b5ba8 100644
--- a/kde-apps/kleopatra/kleopatra-21.04.3.ebuild
+++ b/kde-apps/kleopatra/kleopatra-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kleopatra/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index ed7b7472b5d9..fdbce2b6ea20 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
 DIST klettres-20.12.3.tar.xz 47059092 BLAKE2B f4f55c6e9f3895042f6bff7aaf5d764d902ac4c35018b8ff277dfb1d01e1dd541ad03fa3a208b7ef74479da6dc8912e4497aaa3e29daf69e10a94462b4dc7381 SHA512 89e3b72f07f3594b83909e0cfb719a074d999a4ffc253d340d018ab3523293b41605d66fa3f0474974d9a9f0aab57c7bd443cbf58968495ccb69598e6f0da094
 DIST klettres-21.04.3.tar.xz 47137188 BLAKE2B f62f524b5987428bbf1d65fb73c57150749e3f5ff629f1f9a80002c6e67a82e48e8af5a5fc3c0b599fbfc9b821a5c5eeabd9b27381d7be71fabc78f5c00be3be SHA512 33cf32acf0be7e62429e36f12bb84e04b67770bc07a238de8959c719c0fd6aba9515c56eada2e6004144e2311ad3f899040f8775d494c6434fea9482cada104d
 EBUILD klettres-20.12.3.ebuild 865 BLAKE2B e7b897204cef064638f7a74a8081a089a42938fe86f76f43235dd49a30bfee444704c6b6514da385bfd151ad559dde7d92bfd4461d2b3241e6f2fa4ed2c67d7b SHA512 1694523d5af22da7e8ff2b007a848978bc802242638013689abe5c2748051e4489cdae94cd2eba3f120f50948223e2de2db60bb1979d8840ac278a7738ba9ca6
-EBUILD klettres-21.04.3.ebuild 868 BLAKE2B e1a5a19203b85f1cd5320ca80d4e7a332cb942d30302b80d9b0d5efe1635bf54b67f4ce0d4cfd460d3a30a32fd4d404b4d160215bd71f0a2145fd447be8dbad5 SHA512 ea7a38791eba126c9f79264e34b0ea72dba9a3f936964bb5fd0bf5fa9ef4d78ef1890e46987983b6596e88bf1df234e2179863279d43e51344e2148a224f7f3e
+EBUILD klettres-21.04.3.ebuild 866 BLAKE2B 125fe8e6ea591a702c283a4f4af5a5bfc2daec5cd00a11776862feee1b25e63f609df9d0e0762e6ac230ba4cb70336bf6db6799d6cbb484cad1a4aaa599049e2 SHA512 29b976476fe42d7c74407ef9cdee00388fc37a5f93948854d85c21afcbc40f9b2a74fe8bd52567ee765a8fb6129c95f8677aca5add61b3c93b3225d50d81f9fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-21.04.3.ebuild b/kde-apps/klettres/klettres-21.04.3.ebuild
index 8b45e2297579..917f5e40da3a 100644
--- a/kde-apps/klettres/klettres-21.04.3.ebuild
+++ b/kde-apps/klettres/klettres-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/klettres/ https://edu.kde.org/klettres/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index 9ac4fff343d0..ff5f22030798 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
 DIST klickety-20.12.3.tar.xz 1394852 BLAKE2B 47dd866e470b8041d2c41b7bf7052661fa4bf5beaf17c932497b2c231446fbd72799a7157cea21f38427d40f03b4c8ef3276bffa1d8967c3c12e81aea53d7ce8 SHA512 6fd26ee6d83e70f01911c31b17fbf398f718a54d26997174792c75884d0cd97f935caf7b25730ef1a9f6f1bc6daa78396449c19412c07936e630b5a7d42bf9f5
 DIST klickety-21.04.3.tar.xz 1394232 BLAKE2B 6f8b255261734bbcf3d5958309239b083ba5751eaf75579ba1f350ae913a7c30c3d3681d9ef7c7529a49fcd6922ca2604fe8ed5bbc36276e3ed260165dc0f592 SHA512 115d6aa0ffeb0d606c746f5cd9e4f455335c12250663a034efd00fa4d08abca547ba4de355bc79f70bc7accf8648d5c155cfeac4ae0c50e6d338118125b55422
 EBUILD klickety-20.12.3.ebuild 1013 BLAKE2B 5143410baa8028d924abd360b6abb4d5140238654bee85fdc16a6581249183a0d6dcb314d348f161e15b5255f68099dd4c37f23f92323c2f5810da7dcc926590 SHA512 1741353ccdad251a522a900e098920221dc39e3a84eadae81735f0f7ab3fde754f139d5ffeb2bd1e071981198de38f3b1ebb07e37cd0b292d7ddb784af68550c
-EBUILD klickety-21.04.3.ebuild 1016 BLAKE2B 8ff8453446a6a08a47c357c4d4ba076b8798848e1d63e998c470687fda444080a5cf96f2e63ac23c129fee36618ed4ea7b410550cfa89294fc48abd9f23095af SHA512 884c17a42da5a8e0b69e4580eb079af6b99d7145fd6dd28941c0e2eabd33f228ee3cd402f5ec56e58119aa2e3108b6143ae7cadd8d95ec374356a7b9858a216b
+EBUILD klickety-21.04.3.ebuild 1014 BLAKE2B 9ca2e84a37ead3c440b5774c5ed8cbcdd8538cb7693bbac1b7f8d92e8bfe5bb90ad0f84f8bedcc41d2820858445690964bdefba0f18c7569db51490a2eec3b9e SHA512 81cd371f2915d160123fca3183968ffa6035067bdb499d9585d3ee813047f0271c036abeed671fd534a332bdc9bfc41a00a5ea66d74abcdf926676808a31632a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-21.04.3.ebuild b/kde-apps/klickety/klickety-21.04.3.ebuild
index 540445ffa5a5..29f9aff3fa51 100644
--- a/kde-apps/klickety/klickety-21.04.3.ebuild
+++ b/kde-apps/klickety/klickety-21.04.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/klickety/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index c6f265fbd77a..ba888d81c8cf 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +1,5 @@
 DIST klines-20.12.3.tar.xz 1790320 BLAKE2B 78ed389575599fbdbc94bd2ede84e09108f4a98b7df94fcbb8aac7d4031bda5c5b5b247da2ed1dadc8c91018d3dfbccebe8465c6927701e9de0cfbd298d5aff3 SHA512 8e580603b78e405c52dea0d7c9c122d47018898d6c6a9999f1945c43c2afbb97e38fdcf35d5782ed38549843d1fff9f00b1bed62e4fad529a9cb55aa64d2b83a
 DIST klines-21.04.3.tar.xz 1794180 BLAKE2B 848edaade703f411936ce644b29790a3f9ee6b19f36c676855d3f0d78e15b3fcff06bb51a6cb2e6d055eb585373d6e511113bd6b7c002cada5dd1c392e877080 SHA512 1d7d04c1e11b3e33a95749ec8516459bd6c6399e6d08f1065aaf50499b8a778256c826ea9c8107c264acc08622834aaf65d817e90ca12d3fd4b4cb033c2e4b0b
 EBUILD klines-20.12.3.ebuild 917 BLAKE2B a76ed337bba04cffe5fd8614696c75d75789317106c7181eb49373e87e75e4e205f161cb610370fbf91fb1d4768b51a9ff11ce23b9297afd065277845474f6cb SHA512 5fdc4ed805775ff19fc97d26ac3613e72bd71083fb6d59c7fe4e909396b984caa367b821764cd315d750ef832329ddde28d6665f27893a64cda061061c8e4e95
-EBUILD klines-21.04.3.ebuild 920 BLAKE2B 6aa316cddc814ae04926fedda7ae5778238963f318a059723b8b13dd1ac40db5504f865c04e8181e9556de84d2f98464b2caca8428eb8983185eab259f760bdc SHA512 2edb994a038e332f3c6350573c081abbd7607eeca62236680118454f4acae3ddee6b26d88652b19bbbdef3b8bc42aa2628c87fcc419cb71c8055974e158711e1
+EBUILD klines-21.04.3.ebuild 918 BLAKE2B 94b640b1e541de59299a6a959c4758fc7119a58bedba1470d0895c6919dada09071e0dbaf5c00c07e7f778a3b1b1ed8aa451a2ccb1c2a7953282a034d264f801 SHA512 481bcb42e73c1921d943619b90f92109dae0b4b7cddd58cc2f0895ea9e2373a3294d833923949b162ba3d3a5f548c87b8db06a20afc26b425a9fc83256ee1e6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-21.04.3.ebuild b/kde-apps/klines/klines-21.04.3.ebuild
index ac465596b431..a9142c4fc693 100644
--- a/kde-apps/klines/klines-21.04.3.ebuild
+++ b/kde-apps/klines/klines-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/klines/ https://games.kde.org/games/klines/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index f97e56ed1b7c..884a29c9a820 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
 DIST kmag-20.12.3.tar.xz 700412 BLAKE2B d4abdc75fc6960fc9e6a6b2ab1f8ca35c6a1aec204e774e6a1610423758ab3f89066b30e6c811d374a89a671b8a6ee852703972f12e295e9adb5aadc7e80ac86 SHA512 6c80bbb0ef4e54ad9f4cd6275da7cdfb878d93f8826e78ea68d1330ca75e438474b0f288a676f544feac144a8190fcace37e53f94752ab40fdf93373c1aa1be0
 DIST kmag-21.04.3.tar.xz 705548 BLAKE2B 0a2c353317189e41e09d40ea091e6f075a6145a7090ca3da8bda379ef75ec9905aff7f0f7c146fd1650662b95e686de58935293c8f7bbc09adbd31554219910b SHA512 b8893a9ebae7c0c2f15b27e0219f51992a3670783c5d84caf9b371b72cf0ec8d80580e067d2dd0d1b6ed86b80d71cb5eb383cd45f31dbd27809e6d73fa5668fa
 EBUILD kmag-20.12.3.ebuild 938 BLAKE2B b517195e4d06c555550f2cfbaf6ddebb57532d13fd70db179ad5788b065257140d84b616147c4a68228c94edc26655a40f4e7172aff047de3fb2f05b7d366afa SHA512 5ee83fc4fe508916cc5348797d81e8a69cf001f65691d751986514d632c350e0d4a0cd216fd5b8f7176c5cb49328e08885b49d866fa88fad964ad7910ef4958b
-EBUILD kmag-21.04.3.ebuild 941 BLAKE2B cfd2b527435bdb758f474d7b42011f5e5123f6bb577eefaa3314624c1dc629b732d30d5c185ca731e5b04e8ab0423ddbc79ec09ad7f07b9ea52f5a7434b6b162 SHA512 7e166e6eb11a7a27207774800d726da937a008570b437c19732962782cc9f2a435b88b3134b461a729b634077bbd5fbb1227a5ff158129a885e82fab860d839a
+EBUILD kmag-21.04.3.ebuild 939 BLAKE2B 324fe5258810e61272e0f987e174b1bf196c28cd8f7d551c5c1d403fc0a833db7483b52552742f740c33e22f6798fdf58015e28d8161a027a6472276dbf79235 SHA512 9e7dc07cb19ebd2727f81abb54a7dd23b40e428dd197372347afa754493216bf4bca6938c0bd6d394360244db2ccf66b02db541179ac40e7d07693688f0c045a
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-21.04.3.ebuild b/kde-apps/kmag/kmag-21.04.3.ebuild
index 0471ee4b760c..62089a06f1b4 100644
--- a/kde-apps/kmag/kmag-21.04.3.ebuild
+++ b/kde-apps/kmag/kmag-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmag/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="keyboardfocus"
 
 DEPEND="
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index 43ced7996c87..0fbd4ccfd49c 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST kmahjongg-20.12.3.tar.xz 3435208 BLAKE2B d8df800bbf58181592f4db16b97bae69811570aef89a922cd097a297556d1aa0493f5e422b243314d292bf41e2b224e531def326a51e7d8546628c2b8915bacc SHA512 f9c021e00f2c1a0be6acc589eb3cc6eed6541864d30e46a39d96a4b08f04ea497d1a2d3eec6706f66d0e3539ee571663415e12d666a972b21a412a061f3ce703
 DIST kmahjongg-21.04.3.tar.xz 3440632 BLAKE2B dd700d9bd0d3a7e1211df6abb63d829058e52e88c0f965048511abf16fa1820606d42c7dc9be9cf8a4fe1426bba3db79c007a284b5aa393d9a5003289f5a493d SHA512 bb485cf00db8fe910dcc8784949b2320d58b0d6ef0f9c22f4367d15959369172bdbfadfcb869b2fa62815004d5da9acb97fe661c39af697fb5b12b90c0ebe41f
 EBUILD kmahjongg-20.12.3.ebuild 1077 BLAKE2B 96b95a9f4467ff7af19554ad30a5f18149e14adfd0b0107e0802e83e0def7d3a01b3591cd3f56201977a220fbb678265748767bcd455b60620435e71946a128c SHA512 51b299001b30cc80836f184b0bbf6f4bdbbefb430a9caf913b6f65153e17a6566301efd482f5f923480f2487cd399772078d3ba169318b52b31a91753eb32497
-EBUILD kmahjongg-21.04.3.ebuild 1080 BLAKE2B fe929fb204cd35962140cbd24ce830eba22e9910275521770edc112ae2c6ae2b671bd3b3ef780a894888dd326485417b92a43d92ef3be1918982f848049eff5e SHA512 b3ad84a6ce187c3955357de51b4742493894b3b5570a292702395de944cc250b0e51bbf6f71aaf795107c37547a5096d228b4742de9043eaa93822bc0d3769fb
+EBUILD kmahjongg-21.04.3.ebuild 1078 BLAKE2B 88de594fa1db89f2aa22e1068c1d313f36e9079738592583988d5a3b8416e66aaa47349623bf337552355c9202f68f09d9ec96f4b7a81d4328e294f686aa33c3 SHA512 686c231bfa53cfc591da24af4e39f230396937bd0e9ea8ddad0eae7d18ef929d3147aaa8396ed1877fe0dba54a8d1e0b5ad6139a786cf87eac5aa2bb30aa4d91
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-21.04.3.ebuild b/kde-apps/kmahjongg/kmahjongg-21.04.3.ebuild
index 9c53086021b5..07c5d73fb82d 100644
--- a/kde-apps/kmahjongg/kmahjongg-21.04.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-21.04.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kmahjongg/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 2032c52360a6..1fd2112f9419 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-account-wizard-20.12.3.tar.xz 160704 BLAKE2B 2cd23f83f6200027953a78eb1a108ac20f406881d72bf6969b58c4f4176cbca5a7618b490f32ad1ec0c9c89499f296d411bc45fb8dff3a86353f40bb3ab00e64 SHA512 08508bd5e28ee20953dac413f56a62cef49b4d5d8ce5c14cb8482feb9b5c9f2abd65473923b5035977112bfce320b1da466d98bb64f931dbb435406327b57ed5
 DIST kmail-account-wizard-21.04.3.tar.xz 166524 BLAKE2B e57c7dc5d649d491b7d4105e32bcc90f8db3cbd1c011c639a044c6de512c2618b03a4567251f308a237eed15cfc70c2a6fa639da1605730df7bbe30fac49e153 SHA512 075131a68dd02d61311107a8e3050044e095188b52915f493a2038fa384855de22823aca284f3aa856b388bf1acc03df2fcc3e4700581656925c2f079aaf3bc6
 EBUILD kmail-account-wizard-20.12.3.ebuild 1586 BLAKE2B 6447853c5087029c32f02f9e64fc8f48851c46e11038b41b8a54b0cfae076e67d8c7431f41ab606fb788aa1995911492339cfccf1bcb01b3553066a0ba181452 SHA512 207a5895a033c0616d6be993a45d460e1ff2cee466792d63a2edca4bb4920f5fbe81bfec6bfde8a08bf1d0d4924e9d21342668271bf153779827a7882bfa2075
-EBUILD kmail-account-wizard-21.04.3.ebuild 1612 BLAKE2B 9a48615732cd59aa1c11ed3ec99bc82b9e5e6bfd31e6bdaa31c6aedaedaa43006863e4f700c3a42fc3a95627e8d7612cd186651b4d6e2a9560146bd8286032a4 SHA512 f16c284f08179f67215d9707a4e93c46f06732c9b6d9b2bd93c2605c09884be500a8a87c3a6ee8effaa2bb74de5cae73f60f81337f98cde7b8c50bc91c981223
+EBUILD kmail-account-wizard-21.04.3.ebuild 1610 BLAKE2B f19d784622a571cd04ab0c53c0be31acc654588f585e18b4dc3f0938048cc6e979af7285665c757948bbe612c1cbd28b2608df93ae8b4b1b860e6471f84bdc90 SHA512 00b8e9c730dacb95280158f520741c8ce14adaae499de75dbd12f5af4b8d963df38d0054b7247ba3cd8c742857fe30b48117bee3c3ee92be42aedcf0e3d983f8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-21.04.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-21.04.3.ebuild
index 90a11b294b98..84a930524daa 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-21.04.3.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 7c44b8398c96..e50ea059864e 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-20.12.3.tar.xz 4671256 BLAKE2B a6cc830c5fb0f3612c990462fb8dff0fdb33ef81a7909f47c4165da2c4d8b2e4dbc9ccd06f2d8511fb0e3248aad14877bb7c78abf82d792308939b330c35c2a9 SHA512 ddb05673fb8d8a11a4aaf8b8cb5cc7fcdc74d2ab26482ebd61f426d12d5247518f3a4fedd74d78812bbacdeca83cc24db9b749efd40bf8caece4bcb2f77902c8
 DIST kmail-21.04.3.tar.xz 6485408 BLAKE2B f2c1a1de707dbd9c8c2d2567670d9abec49378d847128ca1465e251ffb5e25a5a054247586ad33037925dfaf9ea014db01b7a1b1baa6b35fd689e7fdd0b888fa SHA512 348d67ad825b4e2a4066736a58b71301353258be5cee1c2252ce0789866f294e4145c4556f79f918c47ffea015e4cbed42270964b7cd1002feafd54fed8a9895
 EBUILD kmail-20.12.3.ebuild 3396 BLAKE2B 02c449cc99acffc1804b02cb5fad19781d0a59233083662b3acb11308c0c6a6216e6bdcfe40811511aa039a6ef5ee29105db14f2d70ee149630aa4ade3d55567 SHA512 7b7eead522ffbadcd4112607a49f058fdc8d8f592b162ef77ac1d3ea0b8223815e55c5766b47c0850fd1270764b87d2080f1d351f4dcb30b58791205d3d64393
-EBUILD kmail-21.04.3.ebuild 3406 BLAKE2B 1c592fb6e2c077c9feff98c032cc21533d65becaad5eadf521ef8eacdde9931a7e1b21e4fadd312f4df3a54c2deed759635145bf6926642b3de0bd84ec8e9894 SHA512 e1c182e923bcf25244be4f9c840171840f3c29d27a57b0e073467f5190bea6c19ff9a684a802cee7a854b210b3c4bcd07872e1330dfd7c7259a6072262ba728d
+EBUILD kmail-21.04.3.ebuild 3404 BLAKE2B 5fde7c9c6281841c94662d1b5f9ea27eb7d8306724a38a900bcd0143def3ce88f3851402483ed18875aba12da25051ad46bdc3d6f10d85c03b3f7b634fc54380 SHA512 e651ac827c6375cc540ed495550e7aac522f0e9f7cd6daa9a4ed6dd0e0894143cc880d39b86b85a985d6c42679733f6a94586362d672c6caa396c1040b6852cd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-21.04.3.ebuild b/kde-apps/kmail/kmail-21.04.3.ebuild
index d121d8cc0e16..add9853533b0 100644
--- a/kde-apps/kmail/kmail-21.04.3.ebuild
+++ b/kde-apps/kmail/kmail-21.04.3.ebuild
@@ -17,7 +17,7 @@ https://kontact.kde.org/components/kmail.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="pch telemetry"
 
 RESTRICT+=" test" # bug 616878
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 96d162bfd0e0..b58c93835fb7 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,5 +1,5 @@
 DIST kmailtransport-20.12.3.tar.xz 168148 BLAKE2B e3a5c99810fefc41088f8934e1a651b615281fda2bc1ff3eee2fef08d53871d99a752a9e773312ecc4b2b3beb3f6996e71c90d23164af44247708ab70c27aeba SHA512 7f270ee8d6695dac72611ff3f092a84ebd36bc8b4e373e04f8e80bce04080fec9f8f4eb0d88e968a641b62f7b860a7758b168ad992d5b849f6c18334a3e716a7
 DIST kmailtransport-21.04.3.tar.xz 174100 BLAKE2B e356305570376df2c147e7c2e768f427237c05b56f2325d89774a067620c9d5162dfddeb7d50f7c5cb84b7270d338016967541c2fc67a52d06716cbc990a1228 SHA512 aa4afb187969faee3b6fc5567595232ac5aa74aebfa2e407e0ad10245f4bb26da4fb8beae17b2a2a3d3d8b676198e1eedc694f4ba669927b3a6eb50be6703c30
 EBUILD kmailtransport-20.12.3.ebuild 1035 BLAKE2B fc9b58af02bf40342b2c0f3a37d3ad1af3089fe680b6e6380d04cb5e7faeca8f3c3b49c374dc1c3182e171bb213b9ead8551cd383798322741d5ac1ae6da2e0c SHA512 13261b79e4af534f8997c411d835df4ec6a7810dcecd4f5d05352e7633d25618b249a30dd199af343faa5be4485793ff18c0d69caf1a990562cc184ba2bc5087
-EBUILD kmailtransport-21.04.3.ebuild 1157 BLAKE2B 7ba5ffccbafba87132e1121fbbc60b5b13cf6181f8adf62eb6e45c0df53ad9d84da0c3e369970c48c53ef0a05bec2e8716f163c9b60aa267fd45c716c452e386 SHA512 9f0e0b5829e43c7dde0a537ca6eebadc40b3955e850ca626704320e02a66780cd4f02939d1fb263e8be6e9defcf0c603c5c581369d7110262404c964a6bf3dd4
+EBUILD kmailtransport-21.04.3.ebuild 1155 BLAKE2B e84a4005f713d570663c087539d99fe133bba94d77c8b94445c6f6f81dfd1372ffcf016f50ddcb2ea8d8dd550befe75a023289a66aa1a43f658d35fa674cb966 SHA512 a9211d4058c3a1ddfd46d82c02a915cda7205c0fe7ef973704b64c35e8bc8fb3f5f1e65091d8e79f861f66aeabac5358927cec982c009f66539e696e1152dcc6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-21.04.3.ebuild b/kde-apps/kmailtransport/kmailtransport-21.04.3.ebuild
index 2a0f914c9436..52b4ba0ebc63 100644
--- a/kde-apps/kmailtransport/kmailtransport-21.04.3.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-21.04.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Mail transport service"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT+=" test"
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 773caa269b0e..7feb44c141a4 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,5 @@
 DIST kmbox-20.12.3.tar.xz 24792 BLAKE2B aa1607ebb99149450ee7fd17f87b8083e0567d61a96de0b378bd55f309f49e6b69812bcc395f2f9886dfec7d4267621ed2ffc985397f9937a05606e308209811 SHA512 6df398ec30bb0d892ef6f29586de345400bfa8bad4f5888d1aa2ce9b71c99e59dc96778bfbf4d08085aabaf32f0c8cd374afabe079b9956a13134c69b49d1fd1
 DIST kmbox-21.04.3.tar.xz 28472 BLAKE2B 6c00164df8631306af367a508bb42881cd62c0b94fb4634989c585159e9f2e947ac36052302b8a1f145f131573e206ba2d1dc018a2db1137c42fa15b88d2a4c1 SHA512 272a0bcd99ce38ca57a0f33a0faaa691f05632ff00e6df04be2890b2352af12d7a6c81bb678d37d2cefd84ebd51b6ba1f247f337f764000eca98958b709f202c
 EBUILD kmbox-20.12.3.ebuild 360 BLAKE2B 4c2888b908bb267a9d28ba6cd701e4a6d8f8c3c46bd7890bbc5ec006d59ce451d125f1f60efc548c6ae7b5ca789c06b918aec8177f18d1b65b392fc2e39646aa SHA512 131268e0cb8d89323fe3b10dec5594ef60436bb1b3e65fd929f87fa92a58c007b3c8a92827dfa96605b3b690c0b772cd0f3c97ec504732fd8296d45084ea1733
-EBUILD kmbox-21.04.3.ebuild 363 BLAKE2B 79da5c18e82ab856ef60a7da3bd1d6f850d8be3753ab2379b9cb8440405e57ca33061dd95e9acafd92a9c69cf4c9636c1b73a9c65285ad4b9e33169a2efebdac SHA512 7d77f92a817dc6769d49b268571baa61af39b0788a9c0847d4a2d3ef014b66bd7e181f0137ffea35e74e9e5488ae1b9bcaa89e02b4d02526861ae018769696c7
+EBUILD kmbox-21.04.3.ebuild 361 BLAKE2B ae4225f93d753772a02e1da58662520a33941fe0d3750839f657f4e6e71f9e68e5ce97b1405ba5bde0b482074874fda705200b280d9a82904120a6d9baca498a SHA512 6b988446d690743048cd0099933aaa44d885f4cbe31120706866a0195da1839a2c00ed0988c5137a3503d767feec640812ee1fb071b3eb06a438f46eb7978135
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-21.04.3.ebuild b/kde-apps/kmbox/kmbox-21.04.3.ebuild
index 60d5ff84f72b..31305eec0650 100644
--- a/kde-apps/kmbox/kmbox-21.04.3.ebuild
+++ b/kde-apps/kmbox/kmbox-21.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library for accessing MBox format mail storages"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=kde-apps/kmime-${PVCUT}:5"
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index f906af4b1583..976a620027e7 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,5 @@
 DIST kmime-20.12.3.tar.xz 150872 BLAKE2B 8e9339304d2fe7bcdca5fcef459c253d91ea15206554e04e01f7a9a12e798370f468f72422179b83afc64f97e74acb55df8f5434e5d13f3e16e7dbd6006138e4 SHA512 8c472b64ec4633a31a53dc35f6609802cc9d15ebe035c64b162a0a1839d4ecc6a7252be380d5125039cea5b10ffaac67f30e2d1a35c005b81f57505505a00cea
 DIST kmime-21.04.3.tar.xz 155264 BLAKE2B ae0d257a7d0ad2f1aaa0f76e5f09af2b7e80d6263ead74db026fd6b5bce3c62c8474d3a2a91a8e1e57230c88b62c6f6d521bc142dfe5e562f1db539f3f2f7cec SHA512 4b563a50ef19434310bf717cf585423ca2324432d388ace49df43e24e70158e4b9280084a7bcc2cbcf21fea6a7b11df4789cfbd99bb9dcb559a38ea7cb60d6c8
 EBUILD kmime-20.12.3.ebuild 407 BLAKE2B c730aceb1d5852a8c93d916975ac08d5338ed213532d89ead9ad3249cbee78119bef13115426a54feb2c972f442e0e36c593983ec055ed711f6329ab6eb409c2 SHA512 8a05e1e6247e92f9d24e23fedb93ab7b6333f529ab7c27fda2948852ab3fc139a42d390be12e9b097c7461a18a50506d6570050d5476a4f799f6a82992cc2f7f
-EBUILD kmime-21.04.3.ebuild 410 BLAKE2B 8aa0c4026bf18fb0a6d073a335acf7458557ab8bb00665fb5559a5c18ddeaa4767663874d2c28cb9ec162eeaf74151923acadf6f7615efa5ad57dc01bc930268 SHA512 8b6fb0cbea44c65096d60c1c99c0fa3485f6730cbdd15d97b9bcb194d7b43375a230cc5cf4fe410e17126aac7f084c43813974f3dbb636132bbf10adedfd3333
+EBUILD kmime-21.04.3.ebuild 408 BLAKE2B 67cf7161026df15fb28cb9fd385ff2ed4c728e8f6ce9671de9df9446cb918060fa52acbfe1a2375be23e1ede1019af49b34fd6815ba7719ce57596a66f26ce78 SHA512 7ec22290d7667df16de9175f8cc0d2e9872603af15f5463cdedad824ad9e229980a1ee3051655419282707c5472b5a472e2cb319c79ed4e5b745c30d78ec0162
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-21.04.3.ebuild b/kde-apps/kmime/kmime-21.04.3.ebuild
index b7f50be49663..f347d41be97c 100644
--- a/kde-apps/kmime/kmime-21.04.3.ebuild
+++ b/kde-apps/kmime/kmime-21.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Libary for handling mail messages and newsgroup articles"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index 59f054f68378..e0459dd6ab07 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,5 @@
 DIST kmines-20.12.3.tar.xz 959492 BLAKE2B 6b155ddd86c7ea27c37b2e3acf0bb6b3ae176a14325545a82da5abe380605082dd7576e88b74ff6eb928b76434c10f43c857c7a722a0d48a44fb86f356293099 SHA512 ba714171e9b58a4c997e98c35463dbc679673990d2ec8769b8007cea1164d512273e3d40ef94484c3034be935d5406ab386bb70e4e5739727a615d8c0f9cc22d
 DIST kmines-21.04.3.tar.xz 965464 BLAKE2B 6a059e71bba7b76dcb8904a0264037fa9d15c5892724878b6200077af096087b31429a91a4e3bb3c4f709691fbeb9e3513f95a0a9092f45f0c669dce26271353 SHA512 25c73e9a578746e3f449bde1b77479713e7bb4a52845d975962e7c1a4d4929f1a97a0be5f6140c701e06749794564a1076d81e291a7536f91880e7cd6088a45b
 EBUILD kmines-20.12.3.ebuild 910 BLAKE2B 7175e6b495b0af5831b5ee43a073271558eb67fb27bbcbe6a6fd5ed3314a7b2b949bc44657fd7e0193387ad3b65acb9dd81a1016dd5a50f57607181a850c3ee0 SHA512 848553a9a142e7b7bf51d8d9534b2360bb3df95eef11d4daae9da6e976f78e4c528c8a309d48153b12b53e8f14d8459e6da5cd8094e88b00ee159593eb44381d
-EBUILD kmines-21.04.3.ebuild 913 BLAKE2B b92ee9655adce59128692da0ed7261f342e1ad99ea4311d7325a2ba233fe456d4ce5fa01597d6a455a95bde0c33efde4425e8e186a45853fd472b73292a7fe58 SHA512 800ee7d47537c7f9ba837845ab6a61c7e43a4b99c2ba90968adc0ca09c0c8f9a15621e34bea60b17188bc1b26e93cedd9f98294077f5a37900dade6b036b30a1
+EBUILD kmines-21.04.3.ebuild 911 BLAKE2B 8198b5b4fb1f5868bacd55c5b583b2de66a495e3e06defecbd50cbb5ccba18d3e04c80b7c9559f8e7c189f45adbce948f7c7621aaf5c4ae22b1b6d554dd89f6a SHA512 8849a8f6a462f75cce1e91fafdd7dbcb9bf1d162f362772bbface3c8d37b920c8a69fcb3bad3ae4857ae5d72eadedc81a6a66cf592f1ff7eac39440585b9b74c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-21.04.3.ebuild b/kde-apps/kmines/kmines-21.04.3.ebuild
index 93a89258f6ed..224219204f25 100644
--- a/kde-apps/kmines/kmines-21.04.3.ebuild
+++ b/kde-apps/kmines/kmines-21.04.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kmines/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 153a38304a1a..1b82ab396913 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
 DIST kmix-20.12.3.tar.xz 1150476 BLAKE2B 1c5bd4f3ecaa1a58b2ee43c31993e1bfd02d69c6f1173a79e3ccec8cd9a215a7f0524d7c5c5e78b4dc692cfa27dd7b4e458a687515c210058770d8aae4b75ebd SHA512 cd261b9b42e81187136366a8cfcce7296d576553e8ec541785b5d53f9529cfd570af43c952dc0c36a5d3ad22abc56b02dbe040b7aebf5e9353b0ea3e670a6480
 DIST kmix-21.04.3.tar.xz 1161920 BLAKE2B 2b59ed9ae41daedf1a3e581e98bee02cda4b6499cbbdeca3431f68e79119b6cfe88686a02af06009e24ad1894c9e49aca00415b5beee784211c6caa45b106971 SHA512 9577c5e9de3dc34e9301d52ec1ec436fdf4856d89fbb5ba735f83d3ea2af57ef308884ba5e18e7b989b503e3f73bb87428d9873d9034778d6d7fcbf47750b8e6
 EBUILD kmix-20.12.3.ebuild 1434 BLAKE2B 9bd7d90c1831791abfeef3c2f645d3252606a468103e77d44fe1df1ef4faa4a59b194979f8d089cb4d08d99077b32e732a5dc8f7f6b3f7a444996f0bce051eb0 SHA512 352fb8fd08095a38be04f2e838e3697f670d43a7b9455c6a8b8ddbe90bbe65d1ab66cc5590ed1cfb4134865a143d65ebeac06464f72ec509a7fadd590847cf2f
-EBUILD kmix-21.04.3.ebuild 1428 BLAKE2B c0b8def181fb0918dc2925ad80dc64c429089fc157a3419f63f3c329cf367337f3150c861e0c5681928c616a63bb2649050c09ba16ff02888a5701d1c12e9829 SHA512 ea4e31a16768b6ae9370eae8d7ffecaf77e058c8b7ae3ef4c7bdd4b06d1c1f56ea832b9bc183391a1967bc3847f650e68e6d92dd269717273dc888582640c126
+EBUILD kmix-21.04.3.ebuild 1426 BLAKE2B 91253cd75bb0e511187084159885a3559bcd17e822340dc66c6c7246bcf5284d606acf68723e67f59a857b173160325f9344af2f35b892f410e6074ec60e96ac SHA512 8bb991f3fc43ff14bc4ff6878e40e257515b1d90e1e57b4ecb81be0a66e977ab8d792f6b31ddd645f59c675ffa702338412d12395e29e063311f386024c43ec6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-21.04.3.ebuild b/kde-apps/kmix/kmix-21.04.3.ebuild
index 617eaaab9f69..20c8224dd635 100644
--- a/kde-apps/kmix/kmix-21.04.3.ebuild
+++ b/kde-apps/kmix/kmix-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kmix/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="alsa plasma pulseaudio"
 
 DEPEND="
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index e54cc35afc2f..346066438ced 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
 DIST kmousetool-20.12.3.tar.xz 116760 BLAKE2B af0cade62b7409719274b377c62e33504927597d4204434a4e02e7665260cfbeeb40ea0cf7177dbb513804c1f3cce520bfa2977c2025fcd237dd659728df285a SHA512 8b0d7a4c9a83a4b4c0fdc97016356f1aca195c6728802b182491421a71fb9dedf41bf4f8e5c4e0f2042cd46d972fa07492911844251117fc821a37ad03663c1d
 DIST kmousetool-21.04.3.tar.xz 120804 BLAKE2B e66aa46e1681aa234fa7be0a754fb90e48f678570598d09c7d58fdea9db0abbca199a25478c59f88a772c1de9a97cb3da33981bc6ac6e1bcce1469f494712808 SHA512 4c9f4530f61950fe0bc94dc20baa3d9d958c677139f3b8d06248fd071ccc1d9b2dcf1de69bf2a434c4ae634f46062c77c5041407afe929dbdda9fbe3e11de42d
 EBUILD kmousetool-20.12.3.ebuild 857 BLAKE2B 51eb5788b301197588317f8dc1ec9046e16de6317e1d1c70dee5f8ca83f540c084cee9dadb3d18918e901f4fa9a1a4562359c661541f4d12afc5d1f5efc6004a SHA512 45190dffdbd1fa9d11473ae0a31555628eea106e0990c53af076f96836425065165c995405aaf2d843eb9b668ee2bae7d0d7d80a63671b65fa8df482f380a5b2
-EBUILD kmousetool-21.04.3.ebuild 860 BLAKE2B 4a187e7a4e8505621f6d109830ffdb684386874d7ff95f115ff67163a8aa3cd7e367c3864f5f427c1b460ef6db34b4ecebab3676407c887e5d48114a69f9284d SHA512 c8fed262185370ee40ee025d3e3d2714287f0c723a39df40312152685aee0ddacab313733b5ff8f08334dd2daac5bcf3bdd4b0dc922f5ca6464accc74cd5d01e
+EBUILD kmousetool-21.04.3.ebuild 858 BLAKE2B 6d128f4d7908f2bf04c1be08516f2efd0e560811403831fa072dd4da8e9f475ac23043c9f2ab5ca15a17a2c12b6b676ecf1e42d9f273a82ebb3e8a0b01974387 SHA512 7733e88a435ce6754cb6c99dc127ca0e95b6f7c386a8dd56e0660c8ebcfea87d457bb25d22b8ea1c7e119d4ee3431275afca9c5b7f787a6ff30e75bf36da8544
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-21.04.3.ebuild b/kde-apps/kmousetool/kmousetool-21.04.3.ebuild
index 6656a8d09abd..e320640ed170 100644
--- a/kde-apps/kmousetool/kmousetool-21.04.3.ebuild
+++ b/kde-apps/kmousetool/kmousetool-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmousetool/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index 9623d3f5815e..0f434ba18b2c 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
 DIST kmouth-20.12.3.tar.xz 2086596 BLAKE2B b74a6bf5d09fe4257ca29dce765e5d8e0976fff225ddf7d34df029e8b834bfb550c215d8bad3aae633f8c8b0c50b1c866ec54f81a4b1211c439984d49a82b035 SHA512 2e9966dc0aee562bca227570b2f27789f1b15b41bec581f4fff99de43b9dc01ba088d9dd54968c9b4331c0977de67f8328eb40651ab02262db2ec61022a170b4
 DIST kmouth-21.04.3.tar.xz 2100112 BLAKE2B a1ec149775757575e571737add5e74e2a4ccb72de419a27a3936f783b6f442c5b99c2b02fd90677e20156e7ba319aa76d1842acbfca8f7f9f560ed130e0ad217 SHA512 f4d807ea015ed03240acd2a031ecfaec613c74f6f0939bac74c8b48ccc82ff5f6a7ce0be6789bd8dc30cec8a6958b1b7cc1f7a6aece4910d394f6eb8b36313c3
 EBUILD kmouth-20.12.3.ebuild 886 BLAKE2B ec900c70f61417f43fddc1f67cadf62dfa22b7e72dd761f5dca814cf0cbdb8098e837ffa851d6e819d8e16c06e9af857c311026349df2b17e8b9a0f085969564 SHA512 f16beee087e7b2c0c453df928a3a8b3c168ab8b2ea0ea6529a8ca73ed3a586736a1d34e7a63d029d7d06c15647a52e9a3a781b43cf53fc7d982198f5719f18ff
-EBUILD kmouth-21.04.3.ebuild 889 BLAKE2B eb1ff86f2c8a6eceda8dcc512145949d16113c85b543d262668f3e027b7003a2a7dee3c568cbbbd8e5307e384109ffaefcde19a59536ad5d38516e5b0b6d3f6f SHA512 96fe780fff9ab1be854e1898bbf6359901c0086f7149544ad81d25928bc7625b7b88983b899641e83dd96f63dbbfd0a2de4f57186c80a89600cd0bcc4ed1b4a9
+EBUILD kmouth-21.04.3.ebuild 887 BLAKE2B f239fd167cbba6cfdac489d32b23c4fceba800cad644a749b9f7339a59dccb837d5fd6b69cb57016a4d11b9b666f07c2983cb738bfd11645fb1495c193179021 SHA512 4384b1b59f9f825a0f3f12f85711c0169ded4ca928077575824cd8c782f2d36050158851ac8d2fed25218ad441e227c766379d5cfd68b3240c78ce2eb87830f5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-21.04.3.ebuild b/kde-apps/kmouth/kmouth-21.04.3.ebuild
index b841f6b80afb..6e6e9439ec56 100644
--- a/kde-apps/kmouth/kmouth-21.04.3.ebuild
+++ b/kde-apps/kmouth/kmouth-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmouth/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index ef0aa3da2ccc..0d70a92e6b07 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
 DIST kmplot-20.12.3.tar.xz 3055808 BLAKE2B ac61b5ef1d14696e3d0cd328a2212d03faa7e4ecbe2e6376d286c797e7b3e5a0bae4f9852268168438492108e273ac92f0423b96a70428598629aeb64942de7d SHA512 438ef6cb8c76ab943d517fb177bed8d28874a6a1696fffa8b15f8dc9992c61279ebfa583f3fdc20d4b1bd48ba120f0ba9800e693a58319feb5dce154d950b3bd
 DIST kmplot-21.04.3.tar.xz 3043960 BLAKE2B 2123ec11b1ef05bc9d744f37095a7df4d5171cf87609eac45e405b7b11323c7ca4788b19ea092a15042250a35e01ec877b26ba06091886674585395d31590252 SHA512 80ceb936b6cb41ff3976fd7b4859ff9e54d0ab24a6d8d90690751b114749d55b70e2e1c07a7440addf8bc88c6a9fbc42d8cbab9aff49b70e808edeceaa8ee8f4
 EBUILD kmplot-20.12.3.ebuild 1055 BLAKE2B 482264f934aa713150601dc75d172a6b489f40250be25bf6437e04c06649b56c09452d0bd055ffde78f0ad0d36510f89f975d54209f0006d5fa5febf3916198e SHA512 0b8f6bba82e275280db58a8e9972db2c2fdfc17cb04cc7246d1bb1a7bd0378b3d2b9a406d2d5d28a5f44a555c5e989b650ea892a7ecec61da2d95f2130df4a4a
-EBUILD kmplot-21.04.3.ebuild 1058 BLAKE2B f490b6ddf3234e1911c9d8102245081c2f1c5d558009c39c25dc02bdbdf7b618755b2072eccb1656f684c1d359a28c654b11cbcb99ebe69d205e09b1d9a4bf6c SHA512 4a1c5ee8248d3edb96e858c84ae7f6feb048cb3d891802bbeb7e350d222de098ba7bf2be4a713e2e915ea948368a98d6caadfb03b65cc13b1dfabd2764ae1f96
+EBUILD kmplot-21.04.3.ebuild 1056 BLAKE2B 34fbfb65d8ebf1519dd50bb0bbd2a553d359d2b8ceea38a0d28ba425dc8e4525686a184d6011a5329e860dead15cfae42ba2cb0ff8c8ddf674b52f362fa54193 SHA512 3e476c765856f61e95cf23f3fec84ccc6bfa40d6f54255565a39d8740e3e32c50fa5785bcc4a98b7ff701e27dd51a8e2843c16b557bc41d0c7771baeba7957da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-21.04.3.ebuild b/kde-apps/kmplot/kmplot-21.04.3.ebuild
index 5c724c5ff1a4..c049f4aa963e 100644
--- a/kde-apps/kmplot/kmplot-21.04.3.ebuild
+++ b/kde-apps/kmplot/kmplot-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmplot/ https://edu.kde.org/kmplot/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index 2d0cabd35c28..6fe7008809d4 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
 DIST knavalbattle-20.12.3.tar.xz 1290248 BLAKE2B 5180a33e3bef947122a5ce26935f2e87c52b5882408e270531e148e72f7c389e86f34c810909b4387b7655d3eeee01ae46a196ac4c43c640ee24b62dad3d0bf2 SHA512 015414551b0b365234243b8dc1b250513aede658d62908fe85b6d370dd471d10bc65e79c5f31ff1d03f9e05d6ea2387c116d1808df106097ab0bc21eaeb8cac8
 DIST knavalbattle-21.04.3.tar.xz 1376012 BLAKE2B 9c03729c90e9a77bb53ffbca8709d8d61f92675c76134410da12301de8adc50df604e7846f524b7d3e9477572d2001a1cded0b9d15f5e9c56658e68dbfdad5c4 SHA512 db33484ea656badda4bd95e3f47618c50e5a6e4cb91433f9958024f8f6b3bfb874133096f68dc7d060aa7a56a6d5dab495ffbf4903038d737e5c8a8fd565b7e3
 EBUILD knavalbattle-20.12.3.ebuild 1028 BLAKE2B 1fdc2fd021731cebcae3ccdaa1ffefee012a348e9599298173974758b9ca2be7f1f4b5979999eaf0a83e80071f14da9d0c1374192f7765bee6a08b0b6a2c4f2e SHA512 2dfed8b2e41dcbb07bf5661a40059341822a42e640548c1d9281ed057887d4c3e615f0862444f80972d43cf6566a16e52bdc1921691b95a95e38e9efd48d39de
-EBUILD knavalbattle-21.04.3.ebuild 1031 BLAKE2B 290b150d71fbd538ed746696529bd5a88e719470c0340c8d29b7940979a3cf2df18ee54d56595fb5d817aca080baa12f3bd182e9f4ce70e52b17f852a39cffaf SHA512 6051826f22c7d91c26bcbe9859ff1cd19f97c5be9a5b0bf221f2af1c6c8ec68ac84b3cf1713e2e01e98a2862137d7766ae66ac32b96ff40099bd305a9bc5b19d
+EBUILD knavalbattle-21.04.3.ebuild 1029 BLAKE2B 782cca9733cabf27f774d76cfac657c63d2caa8785179057d92707ce35f12b396770ff3b96a62d3435038474807d6360b0ebcae23267c1a36bf5af832ae2bdac SHA512 34ff61b8c45bedea9c43ef859c587132f3bf46aaefb6959a7c26347e3fff1c28809010da71fb441164be1af9c504ad11a08e29d532196ef0561e2848d0bd999e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-21.04.3.ebuild b/kde-apps/knavalbattle/knavalbattle-21.04.3.ebuild
index e5c22c10849a..77809b2c0f69 100644
--- a/kde-apps/knavalbattle/knavalbattle-21.04.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-21.04.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kbattleship/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index 942bc92a837c..c0aef084f543 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,5 @@
 DIST knetwalk-20.12.3.tar.xz 1267580 BLAKE2B 1ebb98fae97a56cd77633055d24c71a1395f58629f3ff0762d273f24307e62265f363280646ca2aac784b5f1f9f099e90761dc02d93e402703b5e64fdb9dd0ec SHA512 510ca6b0a7de58cbcd2e51cc3ec12c3ceac13e7cf03d1f1f0399a3d91b92deac4ebdba1528a62a0d7401b2bd60b2eae2b540727209d3bfed868d11a2ca1201c9
 DIST knetwalk-21.04.3.tar.xz 1270964 BLAKE2B 19b54421be0f7bb7a812518f8794d1500fa8ba7c9718858b9db265dbd09e26c619d026e72fbf2a3597bd490e2395e954c00bf61d4766f89a219f2ae125b862f9 SHA512 40ed5e31d458f1243ac19215fd2b22d87a811ace7e9cf8dd443efa334225e2a12a54865d3fc6173f4879a58520b9d486d50eacb1b86c2c66898659ec46159791
 EBUILD knetwalk-20.12.3.ebuild 1007 BLAKE2B 754d99f81b7f9e69eb4c8fec2c710af8e822d18690714e2cb2143c5891dfc9d8e12916755196d74b50c73ee3c477c6d4287267cd900f479733d37eec8f897e94 SHA512 b50ada76a71f5c288ddd714c17326e86edcb3d4bd1cc38c933a0c5a7c0239aa4b00d7df50b1d7f8aa98aad51854e689b0beb2310a37b972d444d802c12f54c4b
-EBUILD knetwalk-21.04.3.ebuild 1010 BLAKE2B ea086889ab659105c511d75878fd747757e9d7ac741a80dde9bd054050e73a83623ecee65cfc2b00250b2a3f4c440e9d4933c8a991e8c3afe6e23ee5f5579ba0 SHA512 2e0f195cfe4223e0c732844c58ba14522a1577b5a657621ca73cf59a00dc198cb575526685842449f20ea72bd77f050ad4b4b27ea9b73d985f7ff8c069909ea1
+EBUILD knetwalk-21.04.3.ebuild 1008 BLAKE2B 25a8e728614a1133cb219a5a11de1d425cbcb0a2ef1e66f3be84147a1f85c9dee00ab5a5160dd77888ad68ddc014c9c7b687ada6dfa69e9f63718f42dff44eda SHA512 5a5e7bdd903ea401f9f80c97335082adbc181a654953c30bf858513cad4709f71c6248723b727c2139b9b46e8ce4a1d415887ddb79bd58323ab5c59529d6e78a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-21.04.3.ebuild b/kde-apps/knetwalk/knetwalk-21.04.3.ebuild
index 9eda90ba9cab..9b9be67a4c77 100644
--- a/kde-apps/knetwalk/knetwalk-21.04.3.ebuild
+++ b/kde-apps/knetwalk/knetwalk-21.04.3.ebuild
@@ -17,7 +17,7 @@ https://games.kde.org/games/knetwalk/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knights/Manifest b/kde-apps/knights/Manifest
index 6e578d17d67f..885420d456c9 100644
--- a/kde-apps/knights/Manifest
+++ b/kde-apps/knights/Manifest
@@ -1,5 +1,5 @@
 DIST knights-20.12.3.tar.xz 3535008 BLAKE2B 662a432ca348246efbd286f4c033cfa9202fd0df6c4fc05042ae8296afff74f0e87eef39949839d981924e145e4a307cec5558f88bc9f5c4ad953f1b58ad616d SHA512 d2db270091dec8079976e2c31b11ebb9eaa113d734528f2d8fea0aa58ff0efd467ec8e67d528bb32ea038fcc1429cbff15c8193bbcfd493e3d5725609ce5d4f6
 DIST knights-21.04.3.tar.xz 3536384 BLAKE2B 1d0aaa50d0b1cce7968db0bdafb8529f19b172742a316c6ec3a1074009c018677509300c54b092fa4a2005d57b4319185edf25c7edc082bab3267b5a88639fe8 SHA512 1f9136e85730cae9085b152b720475dd64dd53cec98f9d20eb67f1b68aea851b86c6781f87127bbc0ff3f385db907bd1566534bc05f3013317f33ea0b35b438b
 EBUILD knights-20.12.3.ebuild 1446 BLAKE2B fc2e0b62276aa650e792c22858249a30a95034ce442c3c02dbf867cdca609e4aabc0111c7429d8e5878017fe06affd68671312d9e752a3b952eae3c5cc9a94a1 SHA512 0daacacef24f154cd7fa9ebfa751ba2ebfaf131f479f8f117b40b29cced0b6f2fd49fbc1026b9ef82cef9eb2765ba50c659d980d5bb3ad74b8b507d3300d1aea
-EBUILD knights-21.04.3.ebuild 1449 BLAKE2B ec3f49f15df0a23d9c0529afaad51c148585e273f3348c62c703aac751db82a07b6349f3c0b2e5e3707507f81672c9eb2c23a79faa82255ae9340069db483cb1 SHA512 81848d23b273a7f159d2abe6c595b8be1bc904f9610bca68e3b4177874356a6006c06e5dd8d751a55ca4779626a8dc8b09c9ff493cde817a9698869252e1fef6
+EBUILD knights-21.04.3.ebuild 1447 BLAKE2B 047d857d5876e8322aaff26f1090c795eb4c60f2b3a80038e8d22ba0d49a3d866a275c95a0cb0820ca9a6333a94ff5422882f341b2338e9a29cace6627b1289d SHA512 dd48bd96aa48fe612661770a273a3744b674eaa6ebd712846bd19ddeab1934cee34c1d94fc1690028bdf79580e4814eb3a1cc45908b9fa9b4d69cb0a3c88acc4
 MISC metadata.xml 437 BLAKE2B 9c89e54279e181045c5bfdd8cf6586306d84fc37e5f087ba3f3e2db62430ee6654cdc0181c3690105a6ecb33ad584f827e96585314a25e0b5016b1ed51d43885 SHA512 89b588c23e621805fab8a15724dc03ae8eeed23957fe19415c9846ad027ac80a1cebfaafaea0e6fbf2a27c785c4e6dfb81892bcdee1b40ac6af7cb5f8350e0d5
diff --git a/kde-apps/knights/knights-21.04.3.ebuild b/kde-apps/knights/knights-21.04.3.ebuild
index ea821a2a28df..d1ab3bdfb04c 100644
--- a/kde-apps/knights/knights-21.04.3.ebuild
+++ b/kde-apps/knights/knights-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/knights/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index b51a1dc9b7fa..f44933786026 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,5 @@
 DIST knotes-20.12.3.tar.xz 329536 BLAKE2B db0c7e87a7f9295bad77877fb1d6b8c0cf80f27fd55d4560ccd18149a903b9adc02a66ff92604e829b53144d196ba5e93f0ca3bfbec2c20e8c08d3543115d80a SHA512 077cee2df4165c619a12ab05f2d6289e750a54606a62d09dc2747a45a97e336acdc908e84b81968b983963c712b3597e5da3a9c60a26cab488912a5420dede14
 DIST knotes-21.04.3.tar.xz 343488 BLAKE2B 3d4abcc0d9e13da80e3b438fcd7f7744ea2c60ed464353dd297c3d2df60979e9f4ef839b433e94b1d9e743e53151324ef10cf79d6dc23db4ad4969c2a2118ca2 SHA512 e01a26ef6352466226e944cc502f54889999417e1b6f1f0195643222ff8aee067d59aea44f2593a2290dc8f6ca7bcb526c372730a6c257405dd86eef7931d15e
 EBUILD knotes-20.12.3.ebuild 2139 BLAKE2B fd87be095de1faa787653a578e32e702070d6293da7591e26b7d999ebf801ac5dbc6872b2f06175c1abaafc6bff44f3c19a4ab616c3942eea2d49db2c2bb8a35 SHA512 5ff757abe3c9d8d9b4346f1ab7a279492991f625a654532838dfbf79c0fdea9270e3e6cd0a24fab88eaa7a3a5941d17c687a1bdfa0e5d31fa783fcad3f3650ea
-EBUILD knotes-21.04.3.ebuild 2142 BLAKE2B 0c99f1b963180632931094574733aada6b40784f6c2f3ca29011dfa1e2d30ed5e0ebf4db411acb2fa255c89d7aec6f17a6f88b0fc6b0c6988b7f8e909e5f00c7 SHA512 5f922a91c8c51c414ed2d7cfafebe8e3ec0737bca4fc532758abe6b9fa5458138a6526e9e49a906054d5a2f232d8901cec8c3fd0b241d10ca4ecaaaef6ee8776
+EBUILD knotes-21.04.3.ebuild 2140 BLAKE2B 2a66d9a7a3557a52975ebe91277a96dd61b3a638cba1977601a908dd21b80502201fbd259a6ec2c554b35da73e03415e30464d00fb058096afbbaa7a9074983c SHA512 0313f432b3dce9733b07e60767cf209f86ab4736b3d7c6061e070a6a3e6c63373742b856111d94bfc76b6bce765d79219db781abf5d8464183be937f63514762
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-21.04.3.ebuild b/kde-apps/knotes/knotes-21.04.3.ebuild
index 3619bdb1fa86..7b2747e53411 100644
--- a/kde-apps/knotes/knotes-21.04.3.ebuild
+++ b/kde-apps/knotes/knotes-21.04.3.ebuild
@@ -17,7 +17,7 @@ https://kontact.kde.org/components/knotes.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index 3c5abd03e0e7..e2ee513e045d 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
 DIST kolf-20.12.3.tar.xz 1029796 BLAKE2B 8627a1be35d72670dce3ca3727ea7768f9f9225962aac9b22f3beb97e2cebd89a3c5fa909d4284a9815b561026f76642346b7addc6c390b8f6c0e124762575ca SHA512 63f78174da9aa76bed51128b44900e52b314daf2caaf22e1f7bf2233b58e999a34e508354c46b20b26ba95908eb690d3cbe20a425ad6e2661a8ee5fd373acb63
 DIST kolf-21.04.3.tar.xz 1040508 BLAKE2B bf79a31795d26bf3ae5c5a8082d0ecb6901aa74f517df68bfcc1e14dbe8184fb8a2b1dd0122562f9c36bc61a8bad8207a9cf16a80ab46d67ebf42206a955d575 SHA512 cc242339776a2d891a0dba5ff1e92226d2db425251ce3643fca146fb20e17ab124ef9f04bef4c3c21f2fe547cef32fc2c10915acfff0eb4c1c21cd237032370d
 EBUILD kolf-20.12.3.ebuild 983 BLAKE2B eba4678c495d360167234a2123c579bc9aeaaef7b0500463631adb966f842e46b3967e2940d6dc7df69aaeac578348f5a2368792887269de1e14230250bc5b78 SHA512 08578d79134932dca01327eff7078b79759cc6a3ed652eeb6be3ea5ae9477e2dec1a5cd99084ca538deeaaa9454834792d20b061b0e36a8a5172d8a9c4c5775b
-EBUILD kolf-21.04.3.ebuild 986 BLAKE2B b617a152628173e5d59b7cbd70c8332069c6ac4063bbece95e6d34284b3fd0b75aba6ef66179fab672675b3afce595c516a77cc9d3bf21fa6ba7155507fe68c2 SHA512 33dafd45d9f082f259dd6f1da41f5d4a0546658d1ff8ae4954ff3c65014ba0567dbc659e7bc0b320b7458cdd3ee0e5be585cff147d55a794903dc21a7ebb6677
+EBUILD kolf-21.04.3.ebuild 984 BLAKE2B 38f66526a01323a0627026055d77001c9303e055009413c4dadad8d7818f44f076f1c1b5c76b67c07a0271740307bde570d79912c01b422590b46f1dfc7dd1d4 SHA512 37719c07e431f15a8d2b7588ae7a39b9c73f04d9ccc13fc95083d507161e9b466afd81e55737362dbf1b51759156d721aaf7df5ca0fac929fc6b6fa05af6e113
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-21.04.3.ebuild b/kde-apps/kolf/kolf-21.04.3.ebuild
index ffca7f4a57f8..01feae314a1f 100644
--- a/kde-apps/kolf/kolf-21.04.3.ebuild
+++ b/kde-apps/kolf/kolf-21.04.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kolf/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index c8768d62b276..3a31deb10367 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +1,5 @@
 DIST kollision-20.12.3.tar.xz 290660 BLAKE2B 4848aa71659269218966bfae9dadfb3a20ad7ba48f6908cfcddb3ac39234f2d55688e1039eb8833c138f37c32f8184af05dd7aefe7d7213611948bd276c1f8af SHA512 e1c019efd9fbc99abd67fb70d81ef12f2846e6d7c2e2c8283a78bce7e96ca9b70ff430fb9556a7a7c26ad8fffffe8989311df1285a34b39c74a394112aec8fe4
 DIST kollision-21.04.3.tar.xz 290640 BLAKE2B 4cd2ef55162967ad959e62f04f52ee0c22fec7419874912c49a1fa612b7b48edfb195973c8d06ab820732e18af589f57c0d5e48be9f606192c2bd4ca48b49d7e SHA512 cf7296b0bc725c5fed42b34ce7ac3a5abd5a5c00d18b2f5e4756eeba9ff229850f4d6559f32289a05a661084babf29e4404ab62708c24d5be5e7b32419ea5530
 EBUILD kollision-20.12.3.ebuild 802 BLAKE2B c60d65d77aac17f1b2aabc7646f8ccf23a1f70569ae397bd7c3a2e54f72cbfb555eb3cfddd9efe6c3055d16001fa8475dcf00d8a3a1e2afa647f58db469ef931 SHA512 a6e590c0a1fae6141158eb9f0504220c30539f9ddfc1ab105c779910294aa190f3dffaa77abf4de8e9ad879ae44f28c49cc7be0795a3be4547f6661cf6a3668c
-EBUILD kollision-21.04.3.ebuild 805 BLAKE2B b8ccb3541426f20880ff23590b625ce116455b09d019ea4ff991be71e91dc9034b7d0a161a614c5c1ed3a9c4bfca2f407a64334d6dc62a525ddadd20f0ad13b6 SHA512 07a8052b71ca0ac02ccb559b2768ec8b63e14c6f397c4080bd18c3721a39b2232689a9dea5d7e7760e9ce8f6976fa5969113f1affcb1bcc662077b0aad2a762a
+EBUILD kollision-21.04.3.ebuild 803 BLAKE2B 4f9cb546df71c5192d52d94bfc36f59c9ab3fa81d89762454ad69ceecbd1f4f46a2e8eff8e85235bba89765aa09b1bd273229152604ba181dbd75aea77a0aea4 SHA512 7d14db393b5b2be60aedd1de309f028c00b79afb9e371b795154f1192c42aa0d4f308b357e3a1923cd72e21ebd017604c16a8b66db6cb4a13d758decbadbfa9e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-21.04.3.ebuild b/kde-apps/kollision/kollision-21.04.3.ebuild
index 5a57360d5d8a..beda83bf35bd 100644
--- a/kde-apps/kollision/kollision-21.04.3.ebuild
+++ b/kde-apps/kollision/kollision-21.04.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/kollision/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index 01cfb5d31008..b7450423d1a5 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
 DIST kolourpaint-20.12.3.tar.xz 5686472 BLAKE2B ea2def24c9b10f0513786022ce9b4b5a804777551e94591ed6a2e5048c4e3e6f8ca30523a63b5013ea20c2f6163637a2002206f39d6c20900ed2ffe68a59948a SHA512 03a2312932fbbb0a22bc2291b12af639c4cf2895068d25efed4f2307fcc124ce6d22f5580eb3ddcb4501c18dbfbf4c88572cce106c9795196afc117099157fc5
 DIST kolourpaint-21.04.3.tar.xz 5714920 BLAKE2B e8fb4d34ab677eb1dab5c8fd80a7930a30f42aea79626daa67abea9fa4fa688ad5ac60c5e2cb31c25942a695a8848827b73efb7ed0089f10acaffd6986f355d3 SHA512 9ab0242752bc051d12413772c2d4a0a38525c5b98283c58ea64802b649c6887ddd865dfc9a19abf93871d08d0017c7dd1daa1c555741e61b777340e6415cfe81
 EBUILD kolourpaint-20.12.3.ebuild 1143 BLAKE2B e517238229d8817252fce0b1d8a835fd702fa6a9358d807d8ad6ad982ea3c63d8255c65ccc787aae969c78d0c5656c5f4ce9c9fe8e2b4735b0e0b947c4b21aa5 SHA512 04dd072f8ecd9b0c7c13cf9a15637fea3ee47734425859538d604823872750f1f0b483776c825acfe0dfef9dad0de4f2ad432d1b76b9ecaee13ee2ec0c68eb7f
-EBUILD kolourpaint-21.04.3.ebuild 1146 BLAKE2B fc0126f06d107338845bd8dfd7e7180c9f0ec7af216cb416f93ea0e483f9bcef39148d353673a8c8b9f21270fc2bae5aa5521ed963742da51b02168efce8e6a5 SHA512 48cd6891777744e85302ae35faf591b78433918a734b132500dc83ec2d6c5fa93eb51d778b3b873fc76a4027069bcb94a6231ad8cc07b4297ef271fbef83810e
+EBUILD kolourpaint-21.04.3.ebuild 1144 BLAKE2B 22924c1c27bf26e1d7544edca442b0064598defaf6678d12e6060e4df527cdbeeedadd76b97984434e7a1adb69ee6d70e69f082ce3cb0f4e16010d9f969440c7 SHA512 e2d1fcab92f51f80a1f36091faa0af05fa138ac743234ba6fcb6bfbb635129a7fdfef8e2066b666145fb3e36f0d52d47eed6a9e5c86d2d7c999472c7a5d620c9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-21.04.3.ebuild b/kde-apps/kolourpaint/kolourpaint-21.04.3.ebuild
index 0c20e900796e..e6ee00e2dd1e 100644
--- a/kde-apps/kolourpaint/kolourpaint-21.04.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kolourpaint/"
 
 LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="scanner"
 
 DEPEND="
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index 50f303d2fa9f..9d88336f24e0 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,5 @@
 DIST kompare-20.12.3.tar.xz 929648 BLAKE2B 14c2dbf52dc4075d4a57a39ab1f2c56b18d155abd24eb14f685fb2db365c1e2230287c8eebfb681f23b1700eee214a4dbef3f760283e2c096ce4a77454817f87 SHA512 0da525fd73629d3d092b0a61c8cae610989981ed3cf6ec5d47b94ee1a3a443ac37ec18e8c56f1888b03a480fe6a127e9711bf0f5a983febed3126dcd8787386d
 DIST kompare-21.04.3.tar.xz 950868 BLAKE2B dec23547a505ca487e55ccb1f2fc7c91b95f43d8d5c20c77a692b1c685d3e86d5bf7f2666c64967ff9f89278a935a6da3a90a7de1f922248e1f089c03a676755 SHA512 762a2017f942933fb25a264a9291e455b3de24aa4879b4600096c80ddbdb75b0423596ad7ddc10c0d60df337c4bf18b9bbe3818a5c66997672f8b21fd353e44c
 EBUILD kompare-20.12.3.ebuild 1099 BLAKE2B 73c77d6f6bc07df2be4fddfc2eef3bea31306cf6c9a16564ac91d9a8eee0e3ead449265afcd5ce6ea6a7a363d938a28a0a006c7d79e8d778f8789aad4a406966 SHA512 648e54a3f136b7fe8627fa9a94aebb95033beb4345c550e49b21082c65d11c75722086e5562a5ad59c7d43c0eaf55f36159458dc4f99aa0e8efaf432302138c9
-EBUILD kompare-21.04.3.ebuild 1102 BLAKE2B e8a3834b23d66c9b0b73fb339edd1bfd2300a55360f6db4ca7bb5a074346d8ac3067c5a41baa0aa436ab555ae4dda5b051d5e6429332242bac0b10395d91163b SHA512 d6583a2431e77b2d903d44cc422abe4a8f11d4b3aa1c4d1e3e6ed8a008e489930f0b07aa22baf63ffd49255d5bdb506f07b21535f341ce6c9c95cd84babf4363
+EBUILD kompare-21.04.3.ebuild 1100 BLAKE2B 41f4ec275e087e9a32c58dc27e75f638cda02f378b6209f9412f3c493b6e2df7c1a5d3471f1ec8daa5bee87e35ce595be23ef2e63ddad67409f9563f66300ebe SHA512 f8d8811588a052402c1a9c9806e7cb678c51b49d4fdcf5484115677a74f7a420aba01e1fe698e9491bf4bb230aaa6740c4d44f8709dc28bcd99342c2ead904eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-21.04.3.ebuild b/kde-apps/kompare/kompare-21.04.3.ebuild
index 82c0eb605451..d1d08f69998d 100644
--- a/kde-apps/kompare/kompare-21.04.3.ebuild
+++ b/kde-apps/kompare/kompare-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kompare/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index cfd3145200a7..b385a3dc1bd0 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -2,5 +2,5 @@ AUX konqueror-20.12.3-use-new-QComboBox-signal.patch 3328 BLAKE2B 3e4ed3fab89a3a
 DIST konqueror-20.12.3.tar.xz 7241896 BLAKE2B 0fd3e4fffe57cbd56bd953901617fee15d264ba4d4c709d2866ee01516cb00d15a2888e8e174592245a35f58fa5c4b7c10391c450506a23a4851e72dd2a3c4fc SHA512 38008dbecd9a22ff9658cb6b72092245b408288388b4c3f8077cc958d0a1dd5be62f24e05f3802eb5aed718ea7d5f902e3c6e15a52846661e3ffdd41c0fc7370
 DIST konqueror-21.04.3.tar.xz 7410612 BLAKE2B 0640bd4d7c8cc877e511652e4ab35885fee88a1558d1c9d4f7692b64c4f6929876f437a7dab5da457ff76aca11774c9d60952243548e90f43307ef19353da03b SHA512 60a396633ba87605225e2e791d8b8a429ddd8081fc0db45227d31a550b00fb2197735f110eb0d9ea48199dcbb19525890d04470beb20c1a49bfc3fb545125104
 EBUILD konqueror-20.12.3-r1.ebuild 2526 BLAKE2B ec322c053681a3c83e14ca7f8537fa5f6548cff4f2240778a2ae9d3dc1aa84468dde2c06b5d3b3eb7af7f3616e53fd2652cc266c7cbe9f0117a36c896dc1c05d SHA512 dd4320a4b8d74d0473b614533d64b7f1c78dab9cddf9fc8b385e3e00d23f844dc5426af026085091ca84f1e2d407afe5253e428c9e5da65acd07d7f99189bfdd
-EBUILD konqueror-21.04.3.ebuild 2449 BLAKE2B bae852f2debc23fab2a84f6f6d2ae141aa144e8a85155fe7d5962ab6c9b7f94fad84f26b37c087c5c8772f7940f4dc9c4325711664dc4d9ff786cf0586d4b95e SHA512 7a0cee39f999ae616b5293e6794fe2e88da695a8d738dc24a876c461f070daf3308485cd66fb97a46c0e22110f4620b1ed31db7c0a02ed328e0e5b69d392ba74
+EBUILD konqueror-21.04.3.ebuild 2447 BLAKE2B a12799d443002e30fac7cd3f9985235872bed5d4ca4385e22cfbfe534e64b9989cf9bc32f7100bef90d883426b56140c4581900bd79404a87ff726b14471b146 SHA512 6af51f9bdd64de461e4bc5e05c2ae96aa27ab883d8ab7c5c43a661ae70151d23cc13832909f27a500caf0529957c69384ee5d9bca56d254eda6541754ecb8cab
 MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955
diff --git a/kde-apps/konqueror/konqueror-21.04.3.ebuild b/kde-apps/konqueror/konqueror-21.04.3.ebuild
index 01cc100cb5a4..dfc64040d870 100644
--- a/kde-apps/konqueror/konqueror-21.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konqueror/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="activities speech X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index 24452522d19f..948d97524f58 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
 DIST konquest-20.12.3.tar.xz 666152 BLAKE2B 4e376170a0284c791a14ac14c369056515449fe3a7bd041e07fc4838f5ffe59caca54749fc38925931e47ebd172e14285bae5b0368762b81ccf9598bbfea43fc SHA512 331571276a7318bc5ed04f0860d2918d5c9b0461bef66ba8185d1be2a09e3606e02bcf46479ba24e3cabf35c834c687fb195d4d347b90b5f72903395aedce113
 DIST konquest-21.04.3.tar.xz 671704 BLAKE2B e4ab1c0685063a8028a9d62e3bac65b80865e6a404150886b8d2f7eebad0b929a4168fb925bc71bf14d12361e8741de28b632330ba128e8eff0126d43202a385 SHA512 27221b09a8f5f57c481d95fbda90550998bf1dd8d94283f576403b438cb094ed4984893541fa2d252a2b9eb05177eaf292339f8f812867a1879d3b9036d62bba
 EBUILD konquest-20.12.3.ebuild 896 BLAKE2B 123b6dc1df6e3ec86e5cc53a6077ed6de46d9cbf2c17fbf6a5606ce3611ff52116cb2ea0aae08dbb2b1f96791babd5afeb228d10e241add8273c9572c71703a7 SHA512 476240c30edfdcf8e7b62d669049bc864fb4cbbcf545c19740e07dd49c6214a65974619421b9f1f095c6f6c40570b482f9ff793bb7dec89dc80f05a1533047cc
-EBUILD konquest-21.04.3.ebuild 899 BLAKE2B 497f1c10ac54e03831dff0e9fdefe21588548dbe69c7ba5fbd43f7a08d6e8fc98f310409deadbf1b9c23ef4f67858791a9ab5301d2d00051d4f4712c276d08bb SHA512 8a7b819e4f697bd22b50fd86ef17ff7d670384ace1014082a709af5d614dc9fd2bfd9ecfb8652c1a813ad27a45abfb9aa7325b31888c2120ff9b15b0c737f7f6
+EBUILD konquest-21.04.3.ebuild 897 BLAKE2B e60d31af8323654d53fb7741f84e78c04aefd5be496d0e0cbdbe79203d661711c56cc006be6870c3496668e887c8e3a9927ccd79027cc7bbb448052203dbdb2a SHA512 b2ba68905883e2de73e05478955052f3452802598364affd720d0b23f1642f02a760d249dc85c02efd9055bed0cac4564ddf18bb565061fcaff09eaf80641a81
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-21.04.3.ebuild b/kde-apps/konquest/konquest-21.04.3.ebuild
index 19eb18754098..8d9672eb86a1 100644
--- a/kde-apps/konquest/konquest-21.04.3.ebuild
+++ b/kde-apps/konquest/konquest-21.04.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/konquest/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 6e2e581724a7..9e49c9a7a5e3 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,5 +1,5 @@
 DIST konsole-20.12.3.tar.xz 1250536 BLAKE2B 83d4af770e42feb9fe96dcebc2cddc6889d98a7d6ce637fde6f8665ce845430e2118b3fcb34ca6448025a397826f14804442a590f1ff4ca62383768af7007a30 SHA512 a48eaa0080b26369f5f163f3ae345bca7f35aa06d581ecc0bbeca54fee2e9b900a4b648f940a67f506ecb00dba971220f1c1c7a699efcbb6e27ee0932c27e37a
 DIST konsole-21.04.3.tar.xz 1336960 BLAKE2B 2cbcdb3edaae0fec913d82dd0eb2ca80aca70e2b9d749ae1c22512946df8bf5e99aa8444996e41b7bc162727119c8f9216b28b5b15051dd0c6a89221fcbbd355 SHA512 490271a51304d5a64111f6ae74422a6b3143a5349359e55af0845c04a6e6d405fadd1f300dc4d866b7730c0cb852bebfddbb33b0ca9e68d22f264e379d1868e8
 EBUILD konsole-20.12.3.ebuild 1766 BLAKE2B 88c9959d519e25f987e7caa8dbb9a2369110eb852c59ab418c165bf5c46129c85841d0633331cf99c41dec20fabc0f87673fe9a5639d08c7572a46472b6a4e04 SHA512 7c79943e58bd422df01fbf26b1a2ed5f863a64bd4f038402fdad75a9e815d4ff0841b87be08272fc190ecee0b7d729308ce08fd1516a214c6f8eaa96e7bb06dd
-EBUILD konsole-21.04.3.ebuild 1799 BLAKE2B 5aa2860b516faa9e27b1f29173a906eeb5ee86e3be9ba96d10efb32a35ea834fa6fcb5acfbfe5d4715b4d3ee94a11aaa404325d2b451ca8d8821879005568de0 SHA512 e0a682683b6150f351bf4b2841ea110bb83d11e1629b33a07d9fbef88498c81b16df607d77ab2be7468b200cce630abed61691b6b12e3b999657f318442aa0c9
+EBUILD konsole-21.04.3.ebuild 1797 BLAKE2B 095faaa2406941909747fa9578eb38c50c98a56ba0eea3636ce2813cb1027d3ee29e11711b60cb1848beef7c335a0853ad8d91d80ef73fddb6631293070dc9ea SHA512 7cbf587c49dde6cf70bc43f10434e3023179c029f7cddd57df2a09cd806ff9ed70615086bb3233e7f069f869aa74853d7ee74c81117db29c050f9e40196bdc45
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-21.04.3.ebuild b/kde-apps/konsole/konsole-21.04.3.ebuild
index 11c37b893583..ec0cde30b94c 100644
--- a/kde-apps/konsole/konsole-21.04.3.ebuild
+++ b/kde-apps/konsole/konsole-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index d190e58c354b..cff20d4e3816 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-20.12.3.tar.xz 224860 BLAKE2B 0f03e653c6cde40a1288fe24d92d612e238768fe38f9c10e7ddf0a20c18cdc8ce44c85e416a0535bf45a8730dee33358a8027a2c7a67442e98d65066de5c3109 SHA512 5890454e49f4cfb04e3edb4895eb4f4f7abfba691185ccc9b9b3c3efc3d675cfe8c7b493b3378143d5da552ff784a391fd194c7107e4ddd11434aa3c130e5d56
 DIST akonadi-calendar-tools-21.04.3.tar.xz 236956 BLAKE2B 96ff649f343c240dff36c80dcf538a2d8f6dcdca678ca8b24a13e1fcd95f513ba1066ceabf8aefe9b5ed00059b797e1944155e8ff4123c29a5d92d681409ce49 SHA512 c2c7d856aa3805b44beac964212fe20a8c63f0e2950e9111d93270a05e48b37ac39339b94067bc3558d2651d5617c82d34433f0741722fbd16b8661e1f02ef3e
 EBUILD konsolekalendar-20.12.3.ebuild 988 BLAKE2B 54dcb262eecb185862eb4d649f8769c3876c5ac22f1dd34e660475ee9aa2db549811fe85c0d1d576a51a10710a1d21537c37ed5c2450ecd2da8e124017486664 SHA512 48e91613ddab34df79224278efe0ae758d8c1b53b94d7565e8d44687471f31e26f98405c4000b2da76e247a0dd892d83fe7e348249ea6395cabe82d81acb38c1
-EBUILD konsolekalendar-21.04.3.ebuild 991 BLAKE2B 27495fbfdfca956a8e625e8ab94a9506a03635d4efe3bcf01deeb1727e5bc4112f2348b7428449a73cadeaff682e2b7e883f15bb1688d0ee3e4a79abb7ffc8a2 SHA512 d2b66906f9b578f6c4b261eae849642215e377bb24649c717e2aa3c18c2925c459296e5cffca5825b816d40d84bf7762f68da9249fed9051a3f5ce2643ad98b9
+EBUILD konsolekalendar-21.04.3.ebuild 989 BLAKE2B 52d2cc547f4988d087feee3bc405df5b6248e28551e10de9c1df3dc941f16681f8ca9682a4804741d9a9866156b818aa0ca4bfa54f6a0c74cf277da7a2b62c50 SHA512 19ac2a607ec520ebe89999b4f1cd3d2e07b167d2f90ad8e35f29c4278b919d52137aad5771a39ccd93eb0b65b54c838343032e68c0a622a211c32d682c8a0aee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-21.04.3.ebuild b/kde-apps/konsolekalendar/konsolekalendar-21.04.3.ebuild
index 706a5c6fb40d..b2ea1a440e38 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-21.04.3.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 5af0e501e054..10b0bd404478 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
 DIST kontact-20.12.3.tar.xz 791076 BLAKE2B 1f0e9fe2abb9486049a9aaac9d0c70d51e10a80e32e2be2ef5ca42d3a97c1e63c4d57a28e167e4452577d088ad99e86cb0c20ce93eaae06afd6c7b40721ab489 SHA512 a957917a175b2fbf33bd15788e1c9e93520e13fc7f9204b91d317e9c99ef03a76bfa71a5e1651b24f24d3cf8ac663e74b964362f65515073170d55ac335eb23a
 DIST kontact-21.04.3.tar.xz 810052 BLAKE2B 4eb66bfa6dd21ad0158d87d9165e65355167727b6194acd929ac76413d7607ad39fc887729f34856cef8caa2bf674d9b70eab7acf1ad34e140be41e6ab0775d0 SHA512 18b489ddf4c79414eaee8a5b2a3f7c3739999f97138ac9900c095dd35571ced70fa4aa3d197057d74b2591e1b8a08b84e553bbca3b223015642e4bb48eb9dce0
 EBUILD kontact-20.12.3.ebuild 1444 BLAKE2B 397946ab46b8ddacf28fd9e548ded90aa5c3fa19f1371326fb6c1ca8ef9e58788300995a8768a94df0e37219f89b286a1c2ec59dcb73d5ffb89216376fae82dd SHA512 2c08284d1b226ae6c7cdd0c4c11344f204954dce164d794b9f47a60750d44bc73879695e0a849f81a13d68186ea9e93f731b7ebf97131b1eced0f9ea6bd97464
-EBUILD kontact-21.04.3.ebuild 1447 BLAKE2B 5847cec289fb570b3d691aa2b232fa3c48e862bd05879c44190c85b4a5434a3e2056ef4cb01b16f8a08854a73bff9d00b40fe17a22d2d58c1f2980c67db22c31 SHA512 7d4c468bd17651bf6fc4af4ccee114f56f3c4b97293c39a03ce4d9242e21d2e39dfbf42b51f777ff77a9cc6a3d11017b1f198db3c7058cecf48c8f8311d806c5
+EBUILD kontact-21.04.3.ebuild 1445 BLAKE2B b07777fa246fa906424d534da5da04aa14c00494f8481992ad2e402dfd19e17d93d97a1d60c763d5332a25724a6733114f26ec505fac3d6d6996723e5aedc7cd SHA512 018e29ffc5f67ef8fe437d76ded57db15843391a398fc0f3f5de222d11f11dd81a17d6d436adef50b755aedce08d8fd9c219cc8917dc0da2de65d409c7296867
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-21.04.3.ebuild b/kde-apps/kontact/kontact-21.04.3.ebuild
index 7e0af0e3d369..a9583fdbc03a 100644
--- a/kde-apps/kontact/kontact-21.04.3.ebuild
+++ b/kde-apps/kontact/kontact-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kontact.kde.org/ https://apps.kde.org/kontact/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index a8a281a0f0d3..7864f58eb952 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
 DIST kontactinterface-20.12.3.tar.xz 36056 BLAKE2B 0e8c31f1c7a0efca3f8e77b1cc577098aaf64ef21e50eca96dd292347ec9dc5eb2306313b30a8d210dbac4dcc29a32366c8259da1d985fc94dcf5a084f154724 SHA512 619b68a856e14795241e814cd148660477c320a10ee26f198aff83f0828861b718dec542cc28c161de0a771c5b36c4241585d2e67c17959ad04def346438b71b
 DIST kontactinterface-21.04.3.tar.xz 40136 BLAKE2B 8d2775ca21d400009844772134d059b50d28a3797f373aaf392fc0d127e88e9d1cb97e3601978ca1faf0eb66de12c44906e986f6d652542b287e7340715ac516 SHA512 e01fce2675cce7885f9167aab9fc4ae6d167e8c58aa6e4cb8fe9f714f35f02ee81700d5b86663f28fb9db802d877d2aac546e25ab9d23358a5e6c8ba3bf1f18d
 EBUILD kontactinterface-20.12.3.ebuild 711 BLAKE2B f04847cf4d4c9a276c73cd02e455b66c9f201680afd9139bc86bcdd2303f0af9ff77bcb1dfe8faf09ad526bad33b178882fe47e1b00501a5a28aaf210386173d SHA512 5afc7c99e78f422ad273ca56b07502f0cad91f92164751b928c8fa0b7bc1f5e4936fa27f6b378e2a78e4bd2f5388d8a3c0be6888771684c5f08839492e79f8df
-EBUILD kontactinterface-21.04.3.ebuild 714 BLAKE2B dd88ac0db1c0f5b7acc23c14c5f19e2a8c95a631f1f8cd31454cd8b6b052067517579bcba0e740cd3e47953177601809c4ffcb42ca11d27393961ca2cc7333fa SHA512 fe2878841663a10dd8b2facfc2d90b2334ebe371a0033ae08345dfc919bb2cb6b05165ccdc1fd8bf52943d2e1d95d7972c32308db9061e4c8bd26c9094cdbe55
+EBUILD kontactinterface-21.04.3.ebuild 712 BLAKE2B b7f331c9a5b81d75d4634bcdf3a1799bc5fbe83b370944e5261437f738cb0663029db5fa35074b3988edf757dab1ebbc16e6eb1e44acb5e804ba7f02a0855330 SHA512 e194af891016e443b566e172fe659bf22db87a8efd69d80b8770dc9ece1026a9e78944de96b2b46378d7a39f94c938cdc17e2ebe313e1529fd8065db3229e91f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-21.04.3.ebuild b/kde-apps/kontactinterface/kontactinterface-21.04.3.ebuild
index 16443cfc72a7..7ad7cc26acf6 100644
--- a/kde-apps/kontactinterface/kontactinterface-21.04.3.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-21.04.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index 0bbef02e7d79..1cc211b6fafb 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,5 +1,5 @@
 DIST kopete-20.12.3.tar.xz 9380060 BLAKE2B c9d1f648a924920984f9ddfd8e5d174f034d3621ecd0468debd3689ae3261da32de2beb297513064bbe23477dc4d395371e02761c287302854f582096eaa2984 SHA512 0948547b0e67e67bce1165beb8099ba4c57e3803dfcb37fd6d547e132a449a484bf523f3312aca8cb4477cae8e8c984859313bf0b72bd70799d46e40e510c9fd
 DIST kopete-21.04.3.tar.xz 9663696 BLAKE2B e76dc4c38ceebd7433eb75d1c04a0d137dd7e38f1ceda36446d07d6585bed11af07106670b53df9f7bb01454d1da967498000b997d9529c72b3be8320ac79780 SHA512 fa6ec2a8f40278061d3d07aa5bd82b6c36ca302bdf30b27cfb3271c66a27422f0df964b3e15e72ba8c7699a1459ee7ae23d8f0193d1cd395ff6ea27aeeb08656
 EBUILD kopete-20.12.3.ebuild 4595 BLAKE2B 79f7265ab6b3f82f7a6ecd8bc39d6c2e81a213aac9a886ca30e54a19d46c70573fdd494c4383fe094e4af9525b5bb3b405ee5690dd332e8f6fa27ea954fca555 SHA512 f4f6676fdf9f55aecf7e5c6ef0010f386aa3ef224ffad1e9f482432f8a67737bc64d8e98a17e2075b10bff4970739fef87eae0eab9fd39f081f94f6410891885
-EBUILD kopete-21.04.3.ebuild 4385 BLAKE2B 55f9686ddbbf216863be5119e6c59de0e7a27c3673f53ac4b530f24c991c71e1e71f3e5008197f02b89ca722784e5822f24f92468515480744afc281960a2f50 SHA512 740ef4021dc158994f2855170e877714f7eb31335efe6a97b660cc1f8c47e3948cc4bbca5e40232778072aff11ea0278452e7736c0cbe8221694afe6eb022a0b
+EBUILD kopete-21.04.3.ebuild 4383 BLAKE2B e629fa7d5a90dca6f5aea33460e21d9a9890aa57ee628f72e4efb32263b81f0ecb97468f06801627939385e435526d5d67d961e24c15218ff50b0bcd761b9eac SHA512 dec6915ba77ebb1214ad3e3a3d24aa6ad801b5c292dfd4cef9c85e9cfd261798f220f195c5a9642048e84eab9af7a41346f7aa60b4e597c131b3241236bf9e3c
 MISC metadata.xml 2102 BLAKE2B 8d82dc772819389b671c1661ad0be0f97703668a6a940c2e142163f4f6e06c110e6d6146144d12ef04b37fb6eb06c57d0bdb766f2c8155848174529111933f2a SHA512 5ca6a22e974c0cb1a24d0dba5ae3f5ff2a860354d653b800655640679c179b90331f436b4ab62338e22e01e145b7c7df2cb9bba82ad8d02436dbbd044d1bfef8
diff --git a/kde-apps/kopete/kopete-21.04.3.ebuild b/kde-apps/kopete/kopete-21.04.3.ebuild
index 94e44086b9f4..8326d9063c75 100644
--- a/kde-apps/kopete/kopete-21.04.3.ebuild
+++ b/kde-apps/kopete/kopete-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kopete/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="ssl v4l"
 
 # Available plugins
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 5807fb088b4b..150f3de2d1e8 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
 DIST korganizer-20.12.3.tar.xz 2246496 BLAKE2B 7235c2cfaecd2368ce555c24d3742c8ea406b94bd53e642791d4ff7121bf0d1156e581f186d57daa11c40d4d3357ef7c44d1aaa3d9535ca33f9289df04f821d8 SHA512 3b8b7026704acb1afcdf83d3a0c8e0ea01ae4a2ed6f3667a7e2fc504cc2189395b6967b7b7ae36dcd0b92ab88451c6ad5e786a9b5f5cdee594cc03a9a328f974
 DIST korganizer-21.04.3.tar.xz 2408368 BLAKE2B 084c118b0502f7aee7cc6b016eabf0410974c31ce2b79ad36611896b1de6c850bf57fe55f4a323e7d672c3166f639be4e9b4e5eea3eea153bb672c297d0bc25e SHA512 fc57dc668bd2aa96c4b2668f7d4a232ef277601c5ce54f452fbb0174cb099dfe75b0416b9728bbaf030c72f588446fbc98901879631804861936ede1e8edbbad
 EBUILD korganizer-20.12.3.ebuild 2795 BLAKE2B 9424f987b77672ae121f68120e34198be2d667e92448cd79b3cc4ffcd223bc79ef0d772fe445cff5fd8ffabd79fe539465a62e798e1a5e6246a9a6507763720c SHA512 a3dae6b9da132fcb29c6f92dbdd03a532f6984670e90dfc3f04a0df2d69e408a7ce35fe2438dcbfee5b1e5aaad48c2211cb7912ffb5e3ceb23cb1b851d76d9ff
-EBUILD korganizer-21.04.3.ebuild 2798 BLAKE2B 5f9b6429ef0da83f44628d9a86f6a0e7699f8074df167e33bbefd56d58dfc7b79fa40695b5bb9cfb0ce3caa7053f8a27e55d745a3b9db32391886ef9fcbde68e SHA512 dbef68574941f04da1607fe686e5a4a440aef7668bbc28e2779ccd98deed93c5f4c53ac433cc4960174594b74421195bc05d27d0572b9eb431ed3aa9203d76e9
+EBUILD korganizer-21.04.3.ebuild 2796 BLAKE2B b1007422de98c48e20024b8b1e90aa1d1b82239af60b85dce6a69763ff9352e14748c83314ad8b15758b381a42e090ac59f2bfec908b53de861766ad5a1325f9 SHA512 7c907f8a4d4722e22dba3890c5fa57cc34a013d9a8636df93987cc29e7a8648ce03a840203a129eb48dad65584b6d0e1f04ef3a23b7f204883e3f30f938f41ba
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-21.04.3.ebuild b/kde-apps/korganizer/korganizer-21.04.3.ebuild
index 909d2701781d..05f5c166fe0b 100644
--- a/kde-apps/korganizer/korganizer-21.04.3.ebuild
+++ b/kde-apps/korganizer/korganizer-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/korganizer/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="telemetry X"
 
 BDEPEND="
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index aec166e4e6f3..e239d18da586 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,5 +1,5 @@
 DIST kpat-20.12.3.tar.xz 3584892 BLAKE2B 89f8c74adc23a7b11ae34a790caad61f12939d2dcefbb7e9d7ebc162e8331e78082e2809171704647c0bf7739e8623f7f2b2e3f61cb13a745787da91aeade85b SHA512 d299fa951e171aeb45ca2b543e2eeabbd8451311446e685573c8306f5e8a34c0caba7017f2523c7286106a48f51f9f19f3723d71a2df8a19d9d51c21cfdaf23a
 DIST kpat-21.04.3.tar.xz 3657800 BLAKE2B a5481118c0080af0d0a68b280597f847550e736d6551737d300cda235c7035f669de6f4d2a570c623fcd9d32a6e8e36ec435297c2d0ed6c14ff15ceb1264dc7f SHA512 1e2f8eae3cac9877f9cd495c9b430070148188f99a759c0e4d22c900c822f944052bdbc7e5c7e86ce278afbf6351e2af100aa3482518c79e6d993f3954de375c
 EBUILD kpat-20.12.3.ebuild 1246 BLAKE2B bb01c645349f074182c69cd5984c6d29f4da94fbc252a88865832ab3dd95d79806d01ba6e29ceda5dfbf0680493ce5ff9cc481dfb8bf70c6c913e9f0835c43f7 SHA512 98bd6814aa2ff0521361df0ec56cc9ad83c2328bf56871f473098b3272cc86f4e26d143991c9d8132cdd9f85b71f270b192b6d2e523b75a4a299e5fe16579d15
-EBUILD kpat-21.04.3.ebuild 1249 BLAKE2B 89a44b2a222eda4dd4c2142de89952a04b6bf6726e1137db00c2297d598a60d1ac34535f22f0a53f6c5be2175e3a8e00b229c9cb15f3860d06e0ab3b60278d27 SHA512 0fd04c2b57d631233c4302c0724098192b13209c29d0416bbd8441c750bb1333ca83b5641e789e709c7ef475bd13d28b6c4dcaf9ad14110a1c633a86506b6be5
+EBUILD kpat-21.04.3.ebuild 1247 BLAKE2B 1aabaed2b95956c150fa47e3e2a3f1a8d51d7493172a0c824b533040e97024471504dda518aec23682896c54f692df8b4e32287905f90fe18d00c01d0966895c SHA512 5d7524ea23d69adc566ce2763436087655d84c3b99037f6cc1201211259cfbdd860ce260a4de9e3856e14033d27ec682ba6f3cd1a5f289a0851bb59be9e6b1f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/kpat-21.04.3.ebuild b/kde-apps/kpat/kpat-21.04.3.ebuild
index 84444bd389fd..3843701b4da0 100644
--- a/kde-apps/kpat/kpat-21.04.3.ebuild
+++ b/kde-apps/kpat/kpat-21.04.3.ebuild
@@ -18,7 +18,7 @@ https://games.kde.org/games/kpat/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 1483cf87d4a9..eac5224c4c5a 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
 DIST kpimtextedit-20.12.3.tar.xz 201292 BLAKE2B ec0e0e1b22f2f061ce7bb21dd26ba7015cb85f1cee39af8d4ebc62bcb92a06ece7a803c4a865b3fba0b0f9b501c274651e53ef2b63d83dfff0835886cf68cb29 SHA512 8a62f79e909d4d434766151b5a53f024252fd6feca94bead809ed5f2a5b81a544563bff15afdcc3c9b280ba51e7f96bd643b490d88c0e28dd7fa378168cb1469
 DIST kpimtextedit-21.04.3.tar.xz 206168 BLAKE2B 4fbe9798841d7f3bca7dd9dc9869b6ad464e1582fc0275f95985dc83b244463e9c773e1fe4bc913f748559d503b9e848413a30565d7dbcba590fbb81166d7fb2 SHA512 ebf436506faaa5cfb9f0eb5d3b18ea8d7bdb525e3a2bd0bba1e89ba81fdaf546cd8e92af1e012c549b2724efc7f350db44de946cff8d11775ebfedcae8dcd428
 EBUILD kpimtextedit-20.12.3.ebuild 1023 BLAKE2B 1ee0d8f23b0957a3add29afcb5ce9d77ae15f2bcdbca5ee0233c67d2861935e1bbfb35147b8f92f9f8105f937cbcf212d255c2eedda08db35790038fc447d2c8 SHA512 f4e16496e37087fea8b7819af5a5f13f551bcde337dfbab1c8be3b157aadf5511a5da7d3ead9846c56d2d6f9b71eda01de2fa1c5971ed33ab5bb9d56683c7021
-EBUILD kpimtextedit-21.04.3.ebuild 989 BLAKE2B 79772323ec3512f0f417143e8f6b1d4ef82247b808763ebd2d48fa5163d3239064e0974cc2e5f8145f68416a4e4e6a5cd6a541ad78398ae8d5fe0592badbe164 SHA512 b63fc2d79065cff544fd5b388f751714dd4a8e2d28cd7952df6924cb825bbd2760aecc2deef705ddf450dc0f289a2164e7d37f30b042feffe605984398f5d9fb
+EBUILD kpimtextedit-21.04.3.ebuild 987 BLAKE2B b4b3f953ab04c0c53b5074bc547283adc09064a9829f5f633d598d60f704523a26feb8b6c99a9247c98d08b9de11bd175a43681e5e72f96313d672e82fcc2b00 SHA512 fb136dbe5ed8dbf3716d2cdcc4037838a755dc72fdc8c506aba2c7123a9ed6df57a1d14f6b958ec5f812cfc65859c323a02c72c4c08339be18f65418a1dbd534
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/kpimtextedit/kpimtextedit-21.04.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-21.04.3.ebuild
index 2b835be9ecbf..44d65eb51722 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-21.04.3.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-21.04.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Extended text editor for PIM applications"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT+=" test"
diff --git a/kde-apps/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index df93843cb4d8..474691c7bb6d 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,5 +1,5 @@
 DIST kpkpass-20.12.3.tar.xz 23448 BLAKE2B bbc558cf7429e171bb60cc754aba324f9efa43749c0f03a8f00aac78eab1a1f05d03782098c17531edbc7ca6db9ab1545bbccd739178230c35e4db0019a2747d SHA512 3a2b1e82e0078a99ff171502d38195e8366b665db3d927c385319a5faf5f1c3bf5d2dee9c8791acdf73e06a52a06e59a2e1d9deacadde767271f6cd37f6c00bd
 DIST kpkpass-21.04.3.tar.xz 27364 BLAKE2B 2563eb0d375e593f659214bb3aa3993c4eb7f8186d9437ab8b4f57f3e119c0bffed42f0c758517f47c9533771e9fcd26bc1fe2bfbf9594b424bda6a193b5cdc6 SHA512 c5bd2621dfee0e518e46fb7f0fff61594cabaa6ab5b3c58c682478f99ff85028729bdf03cfe41e0073d86b5fc841a10156d9817cf26b86dcc6ee7dcaa8547e71
 EBUILD kpkpass-20.12.3.ebuild 470 BLAKE2B 7b0fbfb19ea094629bb5bea278e12ab46269b6b504ca2bf0261f4b0bbc06169e956d42cb9976a96137183b3352d93f6bc0bb473e4e8333cfc0f235d1a438fe8a SHA512 367badf9f45c8d1639d45d0f3b6a62ea3c6bac4f4c2f5b8f38d32f1e885ba3b36fee3674887aeaf61a86ea3d4d7123bec18d0c971e88cf1acc24a08406e98005
-EBUILD kpkpass-21.04.3.ebuild 473 BLAKE2B 4a7030aa4533e5cfd95d7f966e173e4aae2a68bcce5341c018460b05ad0b49997f6f0839098afe672368b116972dcd80e7d412ee2544d0bbf3a4a989ecb93209 SHA512 4bdf4c0d872bc74f1d23054a739b81ef98ffd026be99e35741b9d2210942d2d8119f996163cabbc6a865f1392bdb1c94a32b9f525ab293d8b69c1e22ec4d47cb
+EBUILD kpkpass-21.04.3.ebuild 471 BLAKE2B bcc955fd9c7d9f55c5c292746e460fbab12911b295f2ba2476f4336352ec4180b0bddf213d0f35bcddb1bbabf320843de2269856f4a615212e87ddbca5f0604f SHA512 73fc03aa9b91e997317da9aeb3a2d76c0f6765db947644aeaaee63211e183adf4fc250d4dfb18bdb8dcb28b14ebf202fcc62d43e8b31d4cab16eddd68b0a4ebf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpkpass/kpkpass-21.04.3.ebuild b/kde-apps/kpkpass/kpkpass-21.04.3.ebuild
index d7c9e1b7b537..726238c0aa53 100644
--- a/kde-apps/kpkpass/kpkpass-21.04.3.ebuild
+++ b/kde-apps/kpkpass/kpkpass-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index f4d4ccf14282..4b3f5baa2ff5 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kqtquickcharts-20.12.3.tar.xz 30080 BLAKE2B b3ea86c409806c8024fb27beb6aaf3d2760ab02d3e449bcb8d0ec45f473020606dc3f9e38b22e8e36ee2e0e617d178e7f69a95dc168348c2ff7a62c3be17ab4a SHA512 e3b02ac20b20c9c2d85f3006efb654af42154baf2d215373296bac1377aee889350cdcc2c6d0642d419285433352923fc280e72d6375127d3646d681ae3276cf
 DIST kqtquickcharts-21.04.3.tar.xz 29932 BLAKE2B 6fa241f9371341d62d7bf739e6e27c8568e425482ab5b71247784e368a4f98c67fd915aa38bda3551f11b2fff778797f3b1ee7e130ff49d374659c4feba82bf1 SHA512 5e6115cfb12aa1d1d376467b168ea171e4254dc66125e33c248e2bd7edcbe1a2d942190c800d8659c292cf07f7e824ff57569fc6e8e685c10eedb125f87b1bf9
 EBUILD kqtquickcharts-20.12.3.ebuild 383 BLAKE2B 31a11a843ae6e87a5ec739efb0de0d319b67fde33781a981dcfbde59643cdc7ddd92c4bacea531f7d93ee477f30edcadf8098a1e228015f7f6e9256fb61c1009 SHA512 b70044f5f988742e3770929fea6e4eb32629d4bbb12d4efd0c86dee187e2f3d457d58d4964e1d7731c5f24ccf4536f2e77d9e75fc1198364efdb1ecb8e837beb
-EBUILD kqtquickcharts-21.04.3.ebuild 386 BLAKE2B f582910247b3b26af8122ab57d8559846976924e2343bb0d1c9b5a3749f1d623e67d085e36f461feb0092a12dff1285e84d959ae5d4c3eeece9c987f32ff138e SHA512 1b18b7b4fb6d0b4bac6d687c4e74e79fa777173e84504976f782e9ffa5c38fd327d47c6ea77eef80c8fa0d8849314bc6fd7f2165be05977dd29c7dfe2c55a7d1
+EBUILD kqtquickcharts-21.04.3.ebuild 384 BLAKE2B 235742ad994a6d736b0823eb87fc7a9bcec8ceb956234d3c999282b12b267b1eba5dafb8f19abd65192a600eb2e376d5011b812c3fdcd063e4cfa2d7f9c790c7 SHA512 ff306848ca32f13ed896fa4dbaa0a4fba9285a77e6e889381a8a85384318e721a77c9c55a6a92fddb5a7d4d124b2e9833705b5605b1bc05bbbfb6480991bcaaa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-21.04.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-21.04.3.ebuild
index 85d519acf2d0..d180597642eb 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-21.04.3.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-21.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index 5ed44ef3593a..65baa4176a41 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,5 @@
 DIST krdc-20.12.3.tar.xz 1564652 BLAKE2B a98c021fcaff3b654a2da6c8c80eae0b6876273085aa78e774bf9470d3608a55f6cb7c5b841c49aa4080bb5aa2769fcb7cf80d396546b5191aa91a2c276d79be SHA512 bdf9fd7fd0be6925e6a547d2473ec78d073cfd252595996715f1216d1ff86a2792c995e708aecc4d9273dd605463bd769edffaf6543d0dffc0af910174789e4f
 DIST krdc-21.04.3.tar.xz 1585088 BLAKE2B b155432330257a79ad8e334eb9d9a5a23841c5e2284c379a0cfc7aab10648125a7161c63378b5430ae4f4f24f57e6b8ee6c4b4132e8fd02ec0e89abebc4544cc SHA512 f58c53a9bc851b27a2eaea9ca3119ffc87eaa832af52dd47539308d56ee853343ad4e8e33eb0a955c0d813a582725c8a00a9a35e2eca1626208ded241934a17a
 EBUILD krdc-20.12.3.ebuild 1398 BLAKE2B 2db31f2efd8e6fab7a040eadcd6a0a049a2a55d7bb496b367087238b5d6b65703da2385ada52f5f95b4d9570a8f9e4cf6cf13ac009c7abac3266f05c4587cd62 SHA512 78611a44bd0973ed79579c60d12bf4421afaa30cd8d39683ec89957b9c6d50cd4992d853b10f4c9e70cbf971f57b8a28a0ade9d4519d739a2ecc10da0c451fa1
-EBUILD krdc-21.04.3.ebuild 1401 BLAKE2B 4d321534f277d658b4109bad9ce0212ee82b35c7b8571718d48c1ae3c8a6b3cc10cd0e315cad7516914fc46dc369f1788e68fb8b1584e1a7d79f39b85219e118 SHA512 af544cb6ebcb80d81928aa44709720683c64c66e5c0fac9aca1bc4aa8954d8ca7784b4553f26cb4e72e97227507a90ec2b09e68542674d02a2e0fe4a975a30d8
+EBUILD krdc-21.04.3.ebuild 1399 BLAKE2B 699272c04baede5dde78d29c59bf1fa0d7069fa78aef833fe6929a80d04f68243a52be8b7fe867bd056c3656df01add066153051f92b631eb9d16d92f74e32a7 SHA512 f0a7f704d1c7deb455a69771adff70411573be3aa4f2677c5abc6e370cd1d29e1e36c0226e7de51660bf183d30c68bad4cba370c4d75b13381b1d7bc077bd05a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-21.04.3.ebuild b/kde-apps/krdc/krdc-21.04.3.ebuild
index 092baba543cc..0973a890a9f8 100644
--- a/kde-apps/krdc/krdc-21.04.3.ebuild
+++ b/kde-apps/krdc/krdc-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/krdc/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+rdp +vnc"
 
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index 595a94efab5a..d1c62a4c4a33 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,5 @@
 DIST kreversi-20.12.3.tar.xz 953588 BLAKE2B 6147c4e529ea3be0f678b24767c8d2c29b4db4c711923f350f8c31e2251b0359e4a9e311f7e48c05a4e549f6256027f84b791675bf3f638f72199480730101c8 SHA512 300704489db887d3738491a7dc0b62bf6d7056c803c778ea48bbb086c71b4c57a46517fe4350379982c2b6effd8fa8bfe109e506957905f168c341eb51e0dcd2
 DIST kreversi-21.04.3.tar.xz 961740 BLAKE2B 45f882d1ad08d6fa6d14f5c32bad438604855a1349afca84206ba1203949b3d8c112d1930007a3b3e4ca4d61929ea48cf8649d4300476679d6da17934226d064 SHA512 805d45bc80e7a534f255d2aaac77da3e3b521711eed7a8e04b494e81b6b255247b1d2b28ff5eda5defcbb40b98c668e8b47845d7eaaf16ea0f7e8293169e310e
 EBUILD kreversi-20.12.3.ebuild 1069 BLAKE2B 845e757015e5831f521a844a684bfc9deb1ec41aca661e31a971511dc3155634abc86e4dfb6154639d6cf6edbdc3e03b9a29060711cf8f171f9e67a819031a5c SHA512 7699d6ec09a8d80e1f27a7a20d4859eed32b2eaaeae19e172651af42c3c49f7fe6d81c49110b29b9cfed00538215fc6b0f40cf1df31e9ca86a87da9999a1e45e
-EBUILD kreversi-21.04.3.ebuild 1072 BLAKE2B ef525b19673c9316b9e6455601f433d09e89464cb0fd72ba68ad406cdaf335845fb86e17d1935050dc436f610f0bd19b06d03754b01fe54dec5e879b81545391 SHA512 05349b2c28f9726ecd1814d269c0cb9bfdc0cb99fb3e99cbd29121a2100c33b126fc8e3ede606461deeed9d39966e3c0276f7d10d38bd4620fcb46a8d80d80c8
+EBUILD kreversi-21.04.3.ebuild 1070 BLAKE2B 3825a4cdf2162a889b924763f32c9248fbf8d8062d4c2ced53ab62f4994602dc87ef9bfd7cbfff823a6c7070083f6be42f8da11365623252e976eb28bc287811 SHA512 641619940ffea331e1f5fa44aefe890189263e493831da364c925a821f74d40d81a7c7f47e2449cc8acc96ef7fa1b03e5d6e74f418974a3658368149d4bfc9df
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-21.04.3.ebuild b/kde-apps/kreversi/kreversi-21.04.3.ebuild
index 89c698d88fea..a033e98f5367 100644
--- a/kde-apps/kreversi/kreversi-21.04.3.ebuild
+++ b/kde-apps/kreversi/kreversi-21.04.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kreversi/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 9233b4f6d3a6..30ada2bb7491 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,5 @@
 DIST krfb-20.12.3.tar.xz 1280912 BLAKE2B ddb95577a65c5b8071a6caf8537c8e2986b36582d8c9ac369d3f514f62484392dd612f38c1e23866f38ff2d040d4150952419788dbed731f4b617518e9abca2e SHA512 f66948288fbf78adf893c9c53c76acd6eb36e805d6603d912e4cd5d7ecd6fd7dedfa421a072aff989b51b312041793b4a6c3d2a16dbef50a9a1f7014c558b5ab
 DIST krfb-21.04.3.tar.xz 1293036 BLAKE2B 351693552e19b0e173c2d7d3fa208866a6650df1ce110ead4aa505848d3ce917b9f504932f10b2a6e7e0d31710ee5b41f97887ca2e6edd5bd845759c495d991d SHA512 3066fa25a405195922d962d0906d48e69bbc93d1a17d6f84b2c0a584b48d3758ec39d9e302debdee936c81998a81a75fff9faf1ee823b9a39169dcd7cd51a6ed
 EBUILD krfb-20.12.3.ebuild 1385 BLAKE2B db4b7a89e66d9969901b91cdad5c4b877f30d47d8d5f73d7fca61ef6e52bfec7a833afce823d3d3090e2fe0f47b4cf75cbf1ac08869cc2bebc313cb0423ae515 SHA512 313446f0f23a5134ae9991826530f1e5863237a20e1220d2dd60b4ee985c65e262ded54dd5fc523f01bc4c4933b80844b8c7025b3553752d5ad3aafff784a6c5
-EBUILD krfb-21.04.3.ebuild 1388 BLAKE2B a761805446ec4f1ec3c52352c64fddbf0563de0123c18148dbd9b44afb7bc47e47b18920124cb26a22478796e8f3df574c762bd89c0ca062860fa1ddc1090f32 SHA512 2b739c8b950c0767bf1193a1370435104ee3561eb0c55f1e9a817d082a03397bc6364aa2e10de17fa6ef27cd087fda20cf8b9fd6f77a2da3ee0c8b952ed3e50c
+EBUILD krfb-21.04.3.ebuild 1386 BLAKE2B 29cd30ddde3d6e4fee1a06121b291db193911db725a974319f937a3ecd131010c6c8e4f2adb9d1af2be225eaae96d4d30c3a11a3001c3956a333e2b5b8eda259 SHA512 6685c60b2894c4aff26f123cbb4da9ef8e8b478a6005d82b96943bc88c87f4ae110c2b80dc3545fcbdbe9be8ea1823f5cb67cc3b608223fa27d8264b05e94bd0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-21.04.3.ebuild b/kde-apps/krfb/krfb-21.04.3.ebuild
index 100e5beb39f5..3c935c52186d 100644
--- a/kde-apps/krfb/krfb-21.04.3.ebuild
+++ b/kde-apps/krfb/krfb-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/krfb/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="wayland"
 
 DEPEND="
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index 2a8706922a11..7da08e67e36a 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,5 @@
 DIST kross-interpreters-20.12.3.tar.xz 151292 BLAKE2B 71fe7ac36c989a24a1a8121b41ed46406aa95792a92f2fa6b91a837d4b81c5c6ddbc1e47218660d914282dce7828ea3ad37539614b69df2c8ab1865c467934cf SHA512 5b2017c32779315cb3b726d36ee508d3fb56e4ad69e7ff675388f5d9819eb255afde74810796b8493df06c7073e5d284ba58776567449d323e3e5bd2af42f215
 DIST kross-interpreters-21.04.3.tar.xz 151580 BLAKE2B cb73044d83e31ed9937605263815d328a6bb86e7a72224dd9bf64a6491ed001ae9bc87aa079c0ed1f4836695ac8100fa7ee97f879948e90957a602dea684703c SHA512 cf289e923b0c212e0a6c973795c6afa264d0fcf1b126debf6fa738ab326e0e7ee50a487ecdf59155214ea075777e6fb905621f7784e1e3e61132e8856050a462
 EBUILD kross-interpreters-20.12.3.ebuild 611 BLAKE2B 8fe0e2794553110b548eb89a4b984d5c7d58b2d3b9d1441d6a56b395b8a9e39bcc95d906c5eea258509e24e518d6efae21bae4d448fd54305d82e56e11e48563 SHA512 b8d6231beee10eabfd83c3646d3776e0ab0cf2efdfede1d8d77668e3c6e97ea9edaa932fb553c9cf873fda70393a63d9fc15b62d2925b716c3d3842c757331d9
-EBUILD kross-interpreters-21.04.3.ebuild 614 BLAKE2B ac1de5cc190a9f3ad9ffd4b9db07b107a6a6d5a31c1dc451d8da2ef835b79147e4c1859fb6f9bcbd9af09390f36cd52e9613c357b2ece5ff21627fd80241a6a3 SHA512 2e4596291a6e9f8da9d64bdcae0032cb0ff25b43af7d3589200f4a1849588fdcdba13a05dbd87afc79bb5c117b4a79587ecd3aebb34d1639bb406221a75a28e4
+EBUILD kross-interpreters-21.04.3.ebuild 612 BLAKE2B 8b07444db56bfb9f96f8ea290030e2eeee0c71bf27f47277dead2beeb5eda942a8dd58dc161e4f4731bd168bffc282d34c81f960d4860313209ec6336c0c5934 SHA512 a61ad9334e444b4467dfed1448082824a4db1a95f67829f092c3da159e9573a05da00aeb90a7c223a0c026da84620b03952885937cd1d3c4ed6dad76f1e68e6a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-21.04.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-21.04.3.ebuild
index d0aaf1cc3b66..f3f7fa884a5d 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-21.04.3.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-21.04.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Kross interpreter plugins for programming languages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 65e130a26b27..00833111e141 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +1,5 @@
 DIST kruler-20.12.3.tar.xz 272396 BLAKE2B cc0c6cbcfe1ae2d4445175ee5019800e9ee9f1e1db1c8fe91ed7e7a6e0be8167663ca8a18662c1d36532567eaa87f0a77f4f0163d274828f552d962985b9cdf1 SHA512 2facf88204295321235b65975a1147b1e8e1d1f1ab9219bea635807bd9e6d3d060adc5a0e44d074132aea4a39cd0aeb4647b4f19692950484bd2b3516ca57b01
 DIST kruler-21.04.3.tar.xz 275880 BLAKE2B f12f45353cb7fa9fc0253b94dcc302578c94d1fe2faa91451d13b065e6172e5a1065dd25492474383cd1666581f7126e9d2a8a28990a5b5d5889e21a111dd3a1 SHA512 e5ee427bcc1de89115eb7f8492c0da7c5d2dc0939b619f344c81ce79119ace6520565312321f48e584db5142dc5c7cb3d5ad05b1606ba060d76a54202c395360
 EBUILD kruler-20.12.3.ebuild 934 BLAKE2B b746823667fbea97e1be16339e801b61c46657cf6c1076c2169a72f752adf9bf72c35587429341ac87426db2d2438e93124ce78f82040cf8b589b1a5d82e6151 SHA512 ebae2436cca2c94e6d4a7cfc3fcc41934d4a4b2118e0ed587833ec5736d2b61664ee9c1301c64a5f7d3a5bb8e56de3653a3ab995c4ab28d85ad01c03164aa966
-EBUILD kruler-21.04.3.ebuild 937 BLAKE2B 696d4c90b61b38bcf9fd6c3f26b857ce794ee00f92d3a75e852ea1f100098a775ebdf2d7251970d424f242ff641601695ed67aec9d0cf9993638663f74d44f78 SHA512 f9beb4aa1dc9213e917873bcd8cf9f146570d65861e9ede21817ae02e788a236923a5780dc4f30da7da5b4eb41be68323ebc6035ed21b0136ba58c99697c7bd9
+EBUILD kruler-21.04.3.ebuild 935 BLAKE2B a1a4ba1ce16daa4314d5c1b9b85b686755ee6dee355ced01f429098538aeb8140f678fbdd63aeca19894a82d9fe32f85829c03785e329e7bcb2cf9e115130553 SHA512 959c405a9b92b636b173a5b02e14dd938a85ee965052bb1aae54dc8c4a6264581dedbb3ca2b2c53eb7645160b42e7365720c30983bbcc62d311a706bbcd7cc46
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-21.04.3.ebuild b/kde-apps/kruler/kruler-21.04.3.ebuild
index 2242fc75010d..bb21ea59a95b 100644
--- a/kde-apps/kruler/kruler-21.04.3.ebuild
+++ b/kde-apps/kruler/kruler-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kruler/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 47cfca63dadf..85cf5d875f2d 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,5 @@
 DIST kshisen-20.12.3.tar.xz 827336 BLAKE2B 1f587496f98b1989985b9c7c48c21b1738dc1258768bdbd0ef89296540243a6882f5ca59ed3062c637742d522f278535975140e9e2d367a543085924df0d7475 SHA512 32cf664a6c4c5bf20abf9d025398d45a4e37eb3693df337677ae23dc92f508862332f992c2d4a318af42fcc12abc4dcf2068c44633135ef66a7683cecbfe1581
 DIST kshisen-21.04.3.tar.xz 831604 BLAKE2B 3e0adbe0459259feb4ee626a3118019dc44248e66c5650851eb0f88071b846c1881088ba56aaaaddf537f014c4120ef4c45fcc54a150ce1776ff304cd852712d SHA512 e161efb845bed0b63b6ddd8ff1c1f9f8ed8518ff2caf9ff9aa9030fcc207494a167ce5b369c9f8ad0dc57de987363c59687c9bb9bc27923247e595ee60f5762b
 EBUILD kshisen-20.12.3.ebuild 947 BLAKE2B d2cafd30ce3e51056f3482c805b218826e56d5f15249868e2a37110c2ecdf103e5c3ab478b9af9068fd8e9962314d07e294381e4d4d3baf0bcf1659a11e379a2 SHA512 0d02ff8da6af9e0353d38c42875f011a2ef35c3a8d6d7e980b2775c7bed258f9b6a6decadb9eeb7ba447b36b6f343923358cf36a7de35d6715dd6b6e05d83750
-EBUILD kshisen-21.04.3.ebuild 950 BLAKE2B 933ff90010856f16985b7cd68868110c7cadbbae62a1f58a00ad5872d06b41446be9e9c1184d74fa819386624dec1607e2125ffd42b5b40d2c732290d31f663f SHA512 8d8b4677dce56b5dd11d5f11166ddb66564b5ea8527df3da9cc774008bbc3566de0cb4a95de089af077b8cab00bf581232b59b27f3a3ae8effe0b852ca4168b4
+EBUILD kshisen-21.04.3.ebuild 948 BLAKE2B 557b1e2bc8d5179a134442b2c71039cd0ba4068f0df92fe6504243d327a8e86e2047f552955dc155f0e4bf1277bdf2103283e6b4d37a0244060abc391881b554 SHA512 ecfdb080fbbb703113c89c8bec737b7490cd069a6e590b353f343bf37f7f86623a760ea6071b08a1fec762b92d076715877a6fa46e412cb273c584260fd630c2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-21.04.3.ebuild b/kde-apps/kshisen/kshisen-21.04.3.ebuild
index 30d59d170e5d..cec3d79f5046 100644
--- a/kde-apps/kshisen/kshisen-21.04.3.ebuild
+++ b/kde-apps/kshisen/kshisen-21.04.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kshisen/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index b6bd65715f4f..7bf805d55237 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
 DIST ksirk-20.12.3.tar.xz 6993564 BLAKE2B d20e6828af332a1decd1bd79c4277cf5e05ffa75facad0350c03420f0bc0dcea7226ca1fc47b29e3be0915fcef68c8cb67b5e72c183e8081f7a5d53879c89dea SHA512 f45d4ba82435f9e76349ca1f6218e3d1cc6e1d3025f86db4bfe0ee724129ad96bd71e9b0b6d21bf60a5e19f460e1b9b7c9a3d7c6c0f229e9d5cf4600bff18672
 DIST ksirk-21.04.3.tar.xz 6997516 BLAKE2B 9659a07afd5d10efc61a7e26dfc6f9eefda7bab18a7384f34edcf07e55b5cb446a11bc550e64a4238ee3cade78f492f400d90c9be08ab8bd4eaa6ff596155ea1 SHA512 7936f9d6a633bc86666e04a4b971f5203acfb6f7db0a01419fd4ef064d16cce6bbd39d6278d1ab908eb1161269bef6c6e604e854573beecda45e1014905149a3
 EBUILD ksirk-20.12.3.ebuild 1103 BLAKE2B ecaefc5546b7c1540b713d677c598cea240c55a6aff4ad2235fb30b29486814bc236763ee4dc1f34ce9c325c707e3b6cd522ed6b0c01f29d989649c34a0fe580 SHA512 d4b7bb816ee2654118eabffbd7a58b8d521486e2b8b1cd2f1c01f61ec3fd8fb36f16f6b3552472ac7646b7bdac310b6e1d8e912eca8bf3f156534c8133380167
-EBUILD ksirk-21.04.3.ebuild 1106 BLAKE2B e9347232e3823cc2b5df175f5a9cb130967d5b609ee25b1f4f4c22b09195ce25f17d1ce95fcb436525c668a7397a021e0bc986465e4ecfab5379006875686451 SHA512 d85d2b083f7d30127f6127f8e550fb62f7602561da048f144f906fabb444b589a04e927423a17191d320489dd9a94449f3294b8f9601483c7d66fa3ca268cd13
+EBUILD ksirk-21.04.3.ebuild 1104 BLAKE2B 7b8ccb739fd3d6daa2f32ca92add33cd404e7f6fd800508128dd390d43e0b9d28672ee3a4e917ad07035fa2ee6f6bb8db421d6b0aec0fe86f5dd229b3387c50e SHA512 aa3362ecd69bee7ae6ef368132998592eb22456c5559d5c93b28b1e621f00b146e992846cfd4f6ea43facbb622a38b98b3e0dd78740a611d081f30caf5534035
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-21.04.3.ebuild b/kde-apps/ksirk/ksirk-21.04.3.ebuild
index 391cdbcc0330..9201bcf7d588 100644
--- a/kde-apps/ksirk/ksirk-21.04.3.ebuild
+++ b/kde-apps/ksirk/ksirk-21.04.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/ksirk/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 2abfcc3ce99d..d75e0ab3669a 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,5 @@
 DIST ksmtp-20.12.3.tar.xz 43124 BLAKE2B d4c6e1a50a98ebbd1387f98b0c5b6d4397af533898093cf5a5bb1718ae8d575e2c78c1a7de52d64b019ff4a831bb3d2c82c2ccd8529dac256d564c124e6ecdfe SHA512 813b742471f35a9ceb851e3b4fecdce578532b0754b45afd9e1ba1cd1c33b5ad06f40399488f65a9753af61af674c3c6ce9956307b61be5f2661ddabb53937fb
 DIST ksmtp-21.04.3.tar.xz 47680 BLAKE2B b1cea8d68e19c2512a7045231cd76b269f1b006278867770a1877a2707d01f06dbc5d5bced386baa412ad62ea49507b6245e2722cc5510a9450dc94049bc28d9 SHA512 b29e18e6b6b489e60fc100b8570ccc056babc2e6863e47d1f811e99bac1423b269939189763fd46b55ff8e8c31c9b219c30850e284de629a5b3bd6e61f3f9805
 EBUILD ksmtp-20.12.3.ebuild 602 BLAKE2B 1b7bc60db3ff905f7ef2db18dc0660ad4cd00b9314f527b6c20fb2c62c62e8bb344da5ab59e9ed48672bb8a41f6e709bf4dba2cd227a9a4042142890284bf6cc SHA512 5a6c566bb18c06d9650f12b1efc505688cc69a39bd1925fc634e916bbb99f9f347874a51f1158930d86a0fdb99ea668241537149f1752e1b4d374412ff9be3a6
-EBUILD ksmtp-21.04.3.ebuild 605 BLAKE2B cf4e7ce42eb4f0db5187aa7e55c82c3b5d1404b5230df9046c167a9dac70a9ddc312bd846473c8810d9920a97f941edd58b94a288f03f741504bc993ae490dc5 SHA512 849c0199daf584b98bd20a2098aaeb7c2c1393d19214ff8c75c1d71a0eb1d903511886f397b3a0b59fd200c025a685affcc7ce883100a5f8aa522b2c128d52aa
+EBUILD ksmtp-21.04.3.ebuild 603 BLAKE2B 96d150476ab862ed0ffb19a62a7433c82237f783696e6ea45b4942561624b18f1b51c65e82503975a6fda26e85790770db6d7fc4158a704f6d4878b0a8095d89 SHA512 c75c30fa8484706d38762e15db369808fd8430b470484e3e038f205ff9bae2e59857941c7fa31c5a13ded831e6b82c3e525056db535c20c0e86c1dab886d9eca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-21.04.3.ebuild b/kde-apps/ksmtp/ksmtp-21.04.3.ebuild
index d52f49c95d86..a65355289686 100644
--- a/kde-apps/ksmtp/ksmtp-21.04.3.ebuild
+++ b/kde-apps/ksmtp/ksmtp-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index 365c1234e3ff..199add420270 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,5 @@
 DIST ksnakeduel-20.12.3.tar.xz 544212 BLAKE2B abcb3622d923aab7bfb53940e1679b143f1a9c5bbada1cbec1bc87f4acb6169e1e1767d09e49d9590deebfe8911909ffea8f192bedbad320cd06aa06abd0a411 SHA512 6915dbb658b85bcc647a70ee45a99bb07437424966256cac4efdb2d3dbee625a832f0ebeae1ee6f6138356d1c0baca42cca7fa2a80c668686480634fb350b5cf
 DIST ksnakeduel-21.04.3.tar.xz 544476 BLAKE2B b4983ae31c9c2fe2ebf61e9f4f5257dc47903401751f47c2175b0eb208e93932acc0c0a5121adf8de87acde90085130553a3fb718cf99495a7720b1eb811d84d SHA512 b5128f729ec5a46f808b6e623df7bfe59a988d8843cefdb0349b59578a256fef48211a4733b8fae3e9beb418a4e1227a49940b185db89a80488fe8f86066c831
 EBUILD ksnakeduel-20.12.3.ebuild 932 BLAKE2B 1527b5f6b20bf3c72d553684a24891261a126164a72cbc60aed9581a7547e2e03c5a7c44bcbd18d11af57f9fce5fd0325fcb92583a0cfcbc17c6993e8a9f3b3a SHA512 fd0ae7a1ac34261efd9e42828063fcbb55d512d92ff3ca9ca05cd1eec88335aa7910a539b81ed41cc7b8499d0bfd6acfa6495be56327146ac770e79dc627cefe
-EBUILD ksnakeduel-21.04.3.ebuild 935 BLAKE2B 617182ccb47d4f8bf3bc74e7bda58081c3a3ddddff25d99259ed1ceaed0abd45e830084f274c2d0a1f85fbc9519f5b3174c41d91237f2f758253e576729c2b04 SHA512 ac3af5bc7acfd8daba1dbd53e8a9403b258b529e012f8a6eb480ebfe1cf2f6063f85af92557c482f07eeb9b84bc65309b6ea2d0a323e11a1b117095d47c21232
+EBUILD ksnakeduel-21.04.3.ebuild 933 BLAKE2B 6c6dbf380ea6e0134b4a23f85bdcca5b1a4a932ee32c92d0575a1783d3510b3cc82d069ae4e82619a218ac16edd5a849499450f27d4ee8d7b4c5c1de0e72b615 SHA512 ff5e90e554d9de0e32a459b95fecfce750d5926f0fafacb44b9e1809c745d0410d7f3fc3239ae311599d5f3656da1214a48bf6c1790fa29e3ee3d69028cb6c3f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-21.04.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-21.04.3.ebuild
index cb5e496cd0ec..2358bd78c8c4 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-21.04.3.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/ksnakeduel/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index bd6fd4440e8d..b22eab64c9e9 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,5 @@
 DIST kspaceduel-20.12.3.tar.xz 618104 BLAKE2B bd4f091b37751e74e589b98350ebb6d35f2da8223075b0808ba28f49178bf59b5e521224ebd1fdead79129c4c5b70c64a242191eeefed68615c6e9c70f6ab8b6 SHA512 87c42bba9bc7c677e72ec62ad1255723ccca9b1acd6c840e83ed355ace40c95e605fedda6279b9946088fe94d0727760ee29b810e6fc9c0c353d2f357e453f3d
 DIST kspaceduel-21.04.3.tar.xz 621660 BLAKE2B 989b63bab8eef5cfd72ba7f4d4c53f45896e85bf8fce82236383152009986a5bc0291f08cba1f0bdfdf982322f70a027a75b0c2902260717a316656afa823f64 SHA512 8288da4071439a22613f20877175c11042e5b0d589f08a0f0edf881ca8256b8ec2a3abce5822180af96f8d2ad25ca7119c4a658783ee70b37ccf1944b6ede86a
 EBUILD kspaceduel-20.12.3.ebuild 851 BLAKE2B 1a93333358f45b5a5ff89830d294ce3d473d95f807eb597b4d183181eb5e60bdb6d161e4ac9a45a5aa3c8d8f09718e903edfbbe499d8a6d058af2f95f58851ac SHA512 10e5eff63e811ec4f7e5d7b5c61270f5f7590237b3cbc7dbd207e963c0f30724f755367cc6bd50f8334808caa18bfaa3de03e6ccb4958c0b074dee54fffb621f
-EBUILD kspaceduel-21.04.3.ebuild 854 BLAKE2B d4f27aee717856fc12e308f521c0ff8cddd4bcf297d542c25518b6076e2320da38ab72cf529ec335e280d90f7518eb6ed1877fd37566c44d0bc4d7975c5eafe9 SHA512 5f9761020c03a2e7456ac5acf9093f06ca6ce9cfbfd4e1557ee5c861c09d1c4621d9eb6f008ebaebfd1a4e3e9b90b9f5108621d5ff1c998e15cac8c85cccc969
+EBUILD kspaceduel-21.04.3.ebuild 852 BLAKE2B be7a1964fafcfb49b4aafb9c3b29ad1444fbb25bb9c830f0dcc70d767d205227613e40e61a1ca0719e9fc6c263ed372a8faeb2de41c72666d9742473ee3f4eb1 SHA512 49150151579a202808bb316836b530da1a1af06d7f8eadb0ebedee9e6ba4fbc6e7e3666a2bc77b4b864f36683edb1df38f2f786867435649d6f6d4f6e93bb2c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-21.04.3.ebuild b/kde-apps/kspaceduel/kspaceduel-21.04.3.ebuild
index 2482cfb4d16c..a93e94dbab8a 100644
--- a/kde-apps/kspaceduel/kspaceduel-21.04.3.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-21.04.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/kspaceduel/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index d211d8896047..c4048a03b6f5 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,5 @@
 DIST ksquares-20.12.3.tar.xz 266692 BLAKE2B c2db15eecdf68d41c9c31f67240326e7a165e122826d67e8c4b412254bb06402b2c46c5dd812699a36586417c7157fc2ef34a7a10d1fcc1fd25f16a73168dbc6 SHA512 a2b89b21e463bebd1951cf13502640fcd35967a74526bded57883a64ee408fb2eddfe47ae6bcb171c7f4f1d8dc7adc6d81dfc94de99eed7e3cb3e0b5612d23c9
 DIST ksquares-21.04.3.tar.xz 267464 BLAKE2B 025e5de4458a2e4ca6923148edaf0e7f12df9151cb59a1ffafff90e584f814dc828a43583940b42510dcd590a0ea8a30149a5c6af6feee3a5fe537bcf7c3b4a1 SHA512 14fb00ca7ad528d60a07415eb096f4e6dc9c06e6c1bdc2b358781a0f8be7339c6321c1245b829f9f81d0776d6ec60e93c5df3ca3445bb1566d5e39aaf1cf8e77
 EBUILD ksquares-20.12.3.ebuild 890 BLAKE2B e311c4e8be56083fc3267b43a5c7c3e3cd6d6de362e4c690a366d211b802a0caf96b51991d6b80d5c346ddcab05e5dc2b6b45fac8ae3a3d32bf52e6c2350dc10 SHA512 b16a8edd14d49ff923b5f4aad84c33924739252c5dcd142c2ca9f326c12fe83f46549195e95253b8aa77e3225d86a30cc5b812f2d07927ac2474e0b1546de99e
-EBUILD ksquares-21.04.3.ebuild 893 BLAKE2B b1587c4d3899dc5bc594ec6b65d189905c910193353624194d08327f236ac1fb125a096886c57349c4be0cef5353798857bb334c87163ab2234261801230993f SHA512 a11471872389291c19e46128f7fd9590b224a60845c899789c75410517471e8097abda5faa62b6a4fdf727d9fb5182db69394202af48548e8c7d45e0287e4258
+EBUILD ksquares-21.04.3.ebuild 891 BLAKE2B f07c592bcb1d0780237581d6cf144767816c5aaa1b0c282cae33753c814c7cf84d839058bb107f8d4358d60e393b99bfac7f9d534cce6276f10e46bbf4fff8b0 SHA512 38f0cd570ff3797e17d2e2a1b3dad638f98b84017066da54d311af78a1746c0fe5b3109806b2fad01b31823c69b03ac81860b7e54b6e3b349e6474671f319668
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-21.04.3.ebuild b/kde-apps/ksquares/ksquares-21.04.3.ebuild
index 848f85e5131d..424cf1d40d10 100644
--- a/kde-apps/ksquares/ksquares-21.04.3.ebuild
+++ b/kde-apps/ksquares/ksquares-21.04.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/ksquares/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index fc371693c21e..176ae5a1f044 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,5 @@
 DIST ksudoku-20.12.3.tar.xz 1676484 BLAKE2B 1c105623303cb7f6ddbc5f4edf080eccb961c2563973237a79a23fc9dc54f74eba27f43ca75698c87697435c09aab52ae8b00d8f52ebc75223db5971953da030 SHA512 3ee16844478ea8e70b606eda689279ae428423ffc758ea6876fb78ee3ad43795a44345c1314f0db0cbe8f98029f48bfeed9dbba1548d3160bf9f34e294e8c550
 DIST ksudoku-21.04.3.tar.xz 1679420 BLAKE2B 2cbafa922d9eca71fbea9225b27e23a40317e97e02200380042152ac399aef65a5b3bd1ae031398a425f690f1a3a4115e232aefbb52247143fa4f5e9a4e3126f SHA512 0a1867e11a4210d1e7e49c532b7422bf4f0124b712ae9264ce4bca8c03e511c6c331da79a2947b8302a76ebb181fd3d1068166c907a44f57989b314eaebd6eb1
 EBUILD ksudoku-20.12.3.ebuild 1318 BLAKE2B 78196dc06ecaf49ed44a1562b9d8015e37a501be69e30ab22521e8fa343b358da7cf08ed0d8e1f5073a20bd0c5a8a1ec7693325366f8d9639dfa5e9e2b53ffdf SHA512 746e44d825b72fb8a32fe68d14c3bde4e2cfe9cfe569a14c61c3457643c14dea37c882b5a473b561b3aa401328dc14ea742b7802b5dd713c653dc522d2cb7e22
-EBUILD ksudoku-21.04.3.ebuild 1321 BLAKE2B f9736c2cbc66d80dbabe7bdfe66bc25dc00bc4f319f50ea6fa8eab67c2aaf8f0d7969d4aa4ee0571a1e56af141b9c9e296db7d2fe23f9b341d3d1e5311c90672 SHA512 8f3dc0af61cb38bd75df2da43b4bf43ef171ea5f71d2c5cdc3bba537dd045a0f83263860ed12cc0d68c5b2bc5c481f52d95874b812a6da181f913bdf92979200
+EBUILD ksudoku-21.04.3.ebuild 1319 BLAKE2B a40686e59165a7a7d180a556bb80e54f0c820cfc074da6b5928e2edc63a23b37e47c101748658a576420141bae63f1c2e6566619c63a8f1e3a6181ba7b2e4cf4 SHA512 52b0df108268cea546e9ce3b18f216be4f1916a770f83cfd89bb1662c4f7d5a1a5b38996939e1d8e9b137e70a1377327bcdf9fccce9ca5384f15815fcd97b687
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-21.04.3.ebuild b/kde-apps/ksudoku/ksudoku-21.04.3.ebuild
index ccfbdf1c2936..099dbfb80c1e 100644
--- a/kde-apps/ksudoku/ksudoku-21.04.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-21.04.3.ebuild
@@ -15,7 +15,7 @@ https://games.kde.org/games/ksudoku/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="opengl"
 
 DEPEND="
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 1efe8c255850..80b998e46060 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
 DIST ksystemlog-20.12.3.tar.xz 1938596 BLAKE2B 9d3e36fa65e73b370cc174b7b1c47946b567d9f7350a03929d458f32845cc270fa8010b5ecc9b1781a4d394b2b88c32468fd6b460bc95f1dd93e69daa348d6bb SHA512 a7b7d5bdeb7c118469888adcf5c0856758e0a0802d76f6bc8b3afafa7df2de7df7810f0ba73d8867b4bd55003b6c042a6b76e3292f28f1387247fd5e6adc5faa
 DIST ksystemlog-21.04.3.tar.xz 1958088 BLAKE2B 67a9be05e3525ca65be0eb10cd4bb1e1992eda8f55b487f64ef43691848c6a20ceb32be9585992dacea7cf41b8ef7c46d9ab25bcb20503e49c68eabf4d4f68c0 SHA512 c0af661b2898fbcb4cb81b46906bd09df86bebf3759a493d435b489500ee65b035207339340beec372e416485389ee093fd9187ab9c5f35cc71e1d94f31add2b
 EBUILD ksystemlog-20.12.3.ebuild 1566 BLAKE2B ec9c1c6dcf58e874fd876a26f090095f54798c8d2bbc26922d8774b370d671955637845c7f964aaf192973c49319cbad2a261ddea9c4eeaa86a90a622cbe3717 SHA512 2cee2eb805605d87ab7d13c6fb508e76fae3dca724fd9ca6f6349ef4ebe54daee1f4f5c57f2f18b2dd64f0fa16238ad139c120191f80b5a27c8ea0f5edfa9ce7
-EBUILD ksystemlog-21.04.3.ebuild 1605 BLAKE2B 0e91bfff757f9d5d2f9fdb4a8424b4575c626b56a1ba68471e133485b0a47e130577bc56f7ed1048797acdf7023622b847504436d7ebf3c97c44d33de835eebd SHA512 d87377239733a5533bacba6b349b9a9c217213921fa5bb24eae86b165b6d1293f5c8d903abce6791ff92491cc01a02cd0669b3871741052770ef83cb38b2a825
+EBUILD ksystemlog-21.04.3.ebuild 1643 BLAKE2B 39853b7733f53d404df7658ccdb780842c9213640838075dcf2e29a7c7f0f9635b1254dd788613b926a9048092907dc3e9a2055892d7364a347514661e243965 SHA512 b22707bb1e15c3e2989a36a8e4359e29618601d5e4087eb1e0d73626de6f7948f258b29bf6514879ff2f4e46fb80bf85e18c41bf61258534d2617d4583e0992e
 MISC metadata.xml 357 BLAKE2B 2004a9f41fec27cb3e4f75c4248fbc4b46a4ab7c52f2d23fbcaa3085e1580b0dfe9ad9980c2b7af0670a7b56860111235fbc21298a2647d5bafa0d2be0bf95c0 SHA512 ba2d8f62d75eee5e8edf3368ad54c0d4b347b92279c2de5a4d326536bf670c82e419490a3972731b698bff84ff10908c939ba7a416f4ce4de335eb914df4a701
diff --git a/kde-apps/ksystemlog/ksystemlog-21.04.3.ebuild b/kde-apps/ksystemlog/ksystemlog-21.04.3.ebuild
index 39ce902065ce..34db71dc2b1a 100644
--- a/kde-apps/ksystemlog/ksystemlog-21.04.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/ksystemlog/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="audit kdesu systemd"
 
 DEPEND="
@@ -51,6 +51,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package audit Audit)
 		$(cmake_use_find_package systemd Journald)
 	)
 	ecm_src_configure
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index fe2f31fa84fa..4cd7128e2913 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
 DIST kteatime-20.12.3.tar.xz 294280 BLAKE2B 541c8ac13046080fff0c729b3ecace678d5a6d185c64473af35e61f6296886410bca2e591f8816f49f25b3fe7d4dcd396b1ff9d50eccf54be29535217c57b990 SHA512 98d6e376b4ffd156ff0b88d1b1f5574361cb9f92ce4365df62adc408a85c38aa965455db5088a86505a7139af690e9a3fcab4d06d5827470f28ce05e1da82eeb
 DIST kteatime-21.04.3.tar.xz 298404 BLAKE2B e5be1c1a3988947c7b5cc00b48cec815605e922092374ff1ca0ece66ff10847e5fd95d0148608ace48259a79da3edc5152c0feb218656f39945c9ff02840810d SHA512 68775870910e90d9c462fec3b10c79d5396ab0710296ea55651534a3f3f224463f29a2e7a61841c2dca20d2f778b178148acf12d30b762bd362a37a6c6a3eb36
 EBUILD kteatime-20.12.3.ebuild 856 BLAKE2B 2f219de94a43ae72fc266a575d7883fc890d58c3e7a1ea13d3751cc741008c6723bb683ed18cf13ffb8dc70648f94db4ef355090a0a5f4aebe18c5904e7348f7 SHA512 808f8d99f3a1a44d7b98ddfcad9e0e15804b68df356c891a6a12e04c63cc206d1e50811b85ff458640ab6a84548847a62490af8d326f36cc268b53f352517662
-EBUILD kteatime-21.04.3.ebuild 859 BLAKE2B 5eaae8e55b208c79924a6e7bce9e5b123c8950ad7040ca64d7539656f003489f633a23d8679417475c58209eaaec9cd7f4e406288d2a34e22ca4eee3bb8c8eb5 SHA512 ae9ebb6ba5bb27b0fe80dd4fa624b547f3d7dee7fa0bd14866004ce78e37fc4fe7ac00c770342ce4626d5ed3bc60c4b173c987ffc3705fea0dd6456e273177a5
+EBUILD kteatime-21.04.3.ebuild 857 BLAKE2B 74b3a216b60767e4a2a571dfc9d61bcf3464edfa76e0170c428439a269cf744c7c72f7aafe22f8b03e791015b1fbc0ca2ca265c9ff176c11a26dd7189649bd40 SHA512 6a8df69d3c9cd9f4ace66e51b1bab37a1eda6cf6a1dbdd26618e3ba81a183821bfe8acba207278fd45481c3d4ce6e18285be08053a06d966bdf287600fa535ea
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-21.04.3.ebuild b/kde-apps/kteatime/kteatime-21.04.3.ebuild
index 60290ffa2999..08ac9b996f66 100644
--- a/kde-apps/kteatime/kteatime-21.04.3.ebuild
+++ b/kde-apps/kteatime/kteatime-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kteatime/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 4661a4218287..01746858cb5b 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
 DIST ktimer-20.12.3.tar.xz 386444 BLAKE2B c1feaa5a4a2aa8b13c24d1328985dbdf8b3903fea3ee571da4832c2dddfa6f87222f42851077c41fb7c9d77bcecc7ebe62c2f9d3eb7ed7426c893a00b16ede82 SHA512 3c278640bf5ce1340941f957ae7ab9050a9ba7b93a25ac9111f73cc01bec49b49a872363a6ceab03d0e893c65ad8228309903fbb993baead896a81ec389ed93b
 DIST ktimer-21.04.3.tar.xz 388044 BLAKE2B fdcb2780a8ecbe654c7438aa909c4d14ae338f04f3c314e5633c3b61e2838ee9dfcedc03a194d02696c8a7d2c370c8434c566dc648ed27099c446b6917a8cd83 SHA512 3cf8a0387174202ffaab9e901cc4e6bf851403b21d8b34df6b437f13d310a7bd657438fb1c10eb0b238d3d6407334987db4b94433d27187d1cfaacf23c09bc2d
 EBUILD ktimer-20.12.3.ebuild 821 BLAKE2B 7100fbfded4263204795eb7b04a6611893638771d503b958b68dfbfa5160af0329c988630f040c98bf140fe5c810836e298f9adbbead47edccfd2657b4ba9ac2 SHA512 f76f258af2d2cfd73f5c0bfe9aa3944639bbbbaf19938095014a464fd5fc094c5ff35daf37f46e965d0fac2b44c455ce4cf153ccbf9a4383ac9d87d5a3779c75
-EBUILD ktimer-21.04.3.ebuild 824 BLAKE2B fc29b58b7c1b32d6fc84974d05fd952cfcdb0cddec963eda2b5071d6166b8888cf6fa5dc372a668c39b1fb1d3c3445ebe468794a142efa929acbb6f961e2d670 SHA512 012bf7fb22a51ad81be7974bd4b87aa9fc6140710d0f2099a2c14e1d47cc451096bf67990a29892d4145b93c6e87d7a16e581c2b88538cc410ace3ce85513230
+EBUILD ktimer-21.04.3.ebuild 822 BLAKE2B 34b3975a5eec2689e7c49f3ff654c92c1e5499b11acb4315d96bcc86a6cd0be01b8108260a2ff45b9893318841a1d7198d21964e82e92ee4e6cb136609be65ff SHA512 2b8c4b31ee4ae99c53b6e91ddba87b356fafe492653979eca0299ff3bb293f5bd44c6a261f973c7c7adce7349148f914ac862c4e7109e0149232a32ca177142b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-21.04.3.ebuild b/kde-apps/ktimer/ktimer-21.04.3.ebuild
index c724a7791370..cbca585701cc 100644
--- a/kde-apps/ktimer/ktimer-21.04.3.ebuild
+++ b/kde-apps/ktimer/ktimer-21.04.3.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/ktimer/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 79521e57657c..c7d65cba6c64 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
 DIST ktouch-20.12.3.tar.xz 4942444 BLAKE2B ee1d5c0fe9836d6725eab0ac73d242b2340616f8c2247b841c0cc2bc9ffab58cc848b668c3600f97d57cf3f7efd83761cb529961e8d35f3d86ee6a54236e5040 SHA512 33041f31a910182969f20c98e33393cb53142e0ae69fb5717d1d235a3006ee931734a50a77f9d0336b801984ae0ba3e7295f46de82ffda90fa3003a0634ba968
 DIST ktouch-21.04.3.tar.xz 4963192 BLAKE2B b17d75adef8d30bb0f1a27138e1397ee041bcea3ec046b9887e4f5333f75459ad578dc0b6f6a81f42e6c3f36c0d907d5c6cc4ef7148e3287df33c7c2b80d9432 SHA512 5d5cf00581518315736e5f52040f8487731e2899438ed5e78356755d22dfcbf890889a4510922cffa6e2b8460c4d092f86583060195eaf6214fcdc830da2bb97
 EBUILD ktouch-20.12.3.ebuild 1589 BLAKE2B 6d348b5a103ba6184eb7da4229c63a219ead306fddba9542b58761f78799102eedd077f7163d6e7c0ae6b908ce80224b7282363be620593625d698c37e19c2b7 SHA512 2efa0694de896f848e06a9367597cb4677279d52f48861120069253d8b48d8060107b3481928915e1b0e786dcb01b9be73e6cb6be8e45df5175c81ffb8052faf
-EBUILD ktouch-21.04.3.ebuild 1592 BLAKE2B 6a0fa2627074dc59489acb60f221fed916c9d7f4bcab5b7d3f387081c99df3deb2f14ddaed64f45f53dbec847fe9b5322873b37324efc23a3f6d95aef0a5369e SHA512 80db3b7635b59b3d2a4fad750a05749465611d673d77804c1b028b0a3803f21fd020d868f447e0c2c795be680f66c091d4cbe526bf4a3ebb695e8e85fa29ebe5
+EBUILD ktouch-21.04.3.ebuild 1590 BLAKE2B be64d79f93a4206f58bc1aaf676a6c4a4fec0d2ab0c3d8f7c458e7fa132ded9193e624abf1d72f7e808d586b61b06331296bb8e8fd0ba6c2aa642ed1fe3b8424 SHA512 164977b306beb8526ae70b28c0b9dca1766e7ad00d54819bac93170b43011434653d5b338a094838eb8a8d8e0285c70a688a343a2e5545501a0ae4dd8404b4f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-21.04.3.ebuild b/kde-apps/ktouch/ktouch-21.04.3.ebuild
index 2896b4f0c095..4a0cc98e097e 100644
--- a/kde-apps/ktouch/ktouch-21.04.3.ebuild
+++ b/kde-apps/ktouch/ktouch-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/ktouch/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 922959b42117..25a37260b14e 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-accounts-kcm-20.12.3.tar.xz 262196 BLAKE2B 6e2d421babf2c3210ff17944e365c40cd02210cca4c9032fcc10d8664cbab27b759332576cb1dd157fb6543beb01339f765ebb96708d2fa368f7051901d8282f SHA512 97bcc25bea0b680b25b8874fb66eb916dbde8ea4d8e16159cf8ed80f715245863d62cedd73f6969369d70efa8c0635ad7b72945e4e1fae1bea746b6410d63c4c
 DIST ktp-accounts-kcm-21.04.3.tar.xz 266056 BLAKE2B f52493a6f2787d031d27ebe1f30bafa714d2fc086ec456e0566724b0ff012a481c295efa4d2fb906fe975a501f1a151247d66cc4f225c5e01351044f8e788ad0 SHA512 a69a19054e8f709d2728cc89ccb7e4dbb0ff1dd3dab76470945479aa405f3cc22991dd1d5ea95cee0eed6ad7e1fcda097b9f9225155c32fcba9ed9bad00058f3
 EBUILD ktp-accounts-kcm-20.12.3.ebuild 1598 BLAKE2B 2916a451ca4b3f4a2ad3043d09e7dae9745d182bae8c4736caab80db4541cbb029e38bcdc759d668b5db0a37cdb219f9d5b46aebd897116ec84fb12895adca03 SHA512 4437d0c018c29755e17fe0cbee7e45322d0a9e7a712ef1c5136f895bf712ad1b87c1e7f1117c48874242ee9e7c766e537bf13f7de7f022166148a9f51e3ab31f
-EBUILD ktp-accounts-kcm-21.04.3.ebuild 1601 BLAKE2B 40943f36ffb53734be9917da9a4dc74e438820a91bdf27decffed86ca7abf5f3116bf37de4ed331a5bf64077a93e10626ff33a91c42772369bff6bdabb09a363 SHA512 462b5d632a1a902638467e9a7b2cc5f90228775ee1af2baaec359edb568ae65f0e111749235c11b1515b9048cf4d8920ad3cfab87ea1e1b4b919c11d6c8538d8
+EBUILD ktp-accounts-kcm-21.04.3.ebuild 1599 BLAKE2B ac6eca4defcc62177531874ce630a140890539c6e84c79be1a172369a38e17baa0d164c0d1ca0fbb6c81c6518cffec7e5bb6d155388131b0e522f95a70d392bf SHA512 4a998099c4b1848de1cce5030d15a00704a9be8ff28aa96e24a44dccc11c75916ea716eee82764cc493fb8afc26be7ff422023e96d12e193f6f703d0fd55031b
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.04.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.04.3.ebuild
index e6b034a0a4a0..6e0be5017972 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.04.3.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="experimental"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index 3819356220d7..6bac83e88a5e 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-approver-20.12.3.tar.xz 37304 BLAKE2B 7ec4406f026fdd8c8b9d49a21449309af8675605a88d057144941475373206fbcfe0e7349fadf760aba45b7fb75bdcc895a395735e587f2145e0cc17db4f66ed SHA512 0f7c578a69ff8820cc1447ea311842385c1678561b4881bd3bcc2dc988fe12a812d499d0714b123599906e3b75d5eac4f2102ddf309b037b5614935bc41ea0f1
 DIST ktp-approver-21.04.3.tar.xz 38120 BLAKE2B 7ccb94e36f4b41f33da7744a2a468cf608bfc107d7e62fcb605b7d4afdf0578e1d3f6bc08e60ed996b56d71014f778384dc2a9a73a306cc0c723545667588e13 SHA512 44f13cc1b323f84848669f89e54bb3fb2439925a5cc7ad7523b0ed22d0bf323eae47a94f098465f4efc9ff0ee16f555fd4ad5f4af38583d7fac6cb88c0eb0f2c
 EBUILD ktp-approver-20.12.3.ebuild 761 BLAKE2B 10a415be8c5ba6037e47f49d4ad99c5ac882e089ceaec50d49c76b54475f00b46529c0886d17c4d852883c06a96ac8ccdc273750e2c4459cb788105c4b189564 SHA512 847b8e724d7f5a115da598a523fddfc1b1381e4e8290ada33ebf5009be7c448244437c1c13dd9890029695591233422b9b30b9c50efcd0e755563a6b290c79bc
-EBUILD ktp-approver-21.04.3.ebuild 764 BLAKE2B 09391e9cfe1d3cef204e2a30b5d134abaaa6e6bc5ae80e1c6f6de6b0452c7e851f70558d1dbdefb07f9150f591dcc63ad4aeba39d4409cd81c9008215f46f6e2 SHA512 bc508058e3a89030de9437e7c6ffd56f3f5d65066f0498ff0c0d59699c10bdc2d36596d73a4be9040a64e184368aaca4a3d04735e03f66ef90353ee2c26dea98
+EBUILD ktp-approver-21.04.3.ebuild 762 BLAKE2B 56ec743d21b611722ac416f29a61ae53bd7b9e53bba053be34fd15f851e9eef44344999cc6a13d75ca057e953924ecdee0bef6265da2ca95a48c19eab574395b SHA512 e3075824cc13d18b36ea308ef4b932ef0f71b4dfdcede43a8b3c61a2a25d391a78eefaed215312a38ef02cf596e76f2d47532fe0f240f5f654d5d4a5cf3fa2cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-21.04.3.ebuild b/kde-apps/ktp-approver/ktp-approver-21.04.3.ebuild
index e9de69ff368e..4d43f9b2451f 100644
--- a/kde-apps/ktp-approver/ktp-approver-21.04.3.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index db4e35e25f5c..9474b3a2ca9b 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-auth-handler-20.12.3.tar.xz 46328 BLAKE2B b34383d810f38bd428f604160cbefdf1bb809c955e6333d9e3c01329e628dcc70dde1215fa3217c7da83ee57238f400e9b28433cef44fe5a98289b29bd755abd SHA512 226f101d6d947d5d29e749336c9f5ed084ea416a534eaefcda4df888960eed1841189317e93c8b2ec05558a68a57be75f6afd31256bea97ddbf8257d542f68d9
 DIST ktp-auth-handler-21.04.3.tar.xz 47824 BLAKE2B 21446323d72ed739c900a59a9137276ae5649615e3d5098a7ea7752296d362d41586e72ba3de80f581569d8b227c838710af266d9bf88404e337311c0120a68d SHA512 45fed49e564a98d6630bdb5aa13e0bbb641965241b0936c22b8ab9f7f5696a377a5217fdef3079f70008f4932ea0b00c8f857ab2d3727892ed180f7b24a1da08
 EBUILD ktp-auth-handler-20.12.3.ebuild 929 BLAKE2B 8ce4fa3c6217a8dd560182d9ca0c9ce4d2552fa800876759ce449e3e364a8892755de73dcaf2d8706d98a7e8070a38e7f0e201524741b7da06e5cfab02db4769 SHA512 c162a9bca3a88e3dce1b92ef6440f5a4d4564de0b9cb56837503711b23f9611d9cd07d2031c6cf513cdf6d1a9033fe8573c8034411cd1e18248ae488caa196a3
-EBUILD ktp-auth-handler-21.04.3.ebuild 932 BLAKE2B dae10210ba2ed97986057d97dc2ef987361e44ec2d569a69a2f9c2e4ea542cea6a9e369a589840510379e7f20ac8d4c3de9ef4de70be42571c2526d78301bdb9 SHA512 27a1f26a636b91c6c8183d55fc2f43b1ca103de10448e9471db3efe6b2cef85435970239e0585272268ef871ca543e9d8379030c84de108752d8757ad4b2b3db
+EBUILD ktp-auth-handler-21.04.3.ebuild 930 BLAKE2B 770b99c330f35c308db64b2c1d2410d42857d7e3e9f4fa3e05e3a718eee08c53cb500b12c308f35a2cc7cee3451dd9759ccfa507e458d967535dcea1ce1225b5 SHA512 94185d79d1649eac68c6483897ed91d9426b361b38bb43c6925088287f4f25b7f3c1032f250e7f33a0a6daf17192b0975d26737db3886faaf4b6e6751791a7c2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-21.04.3.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-21.04.3.ebuild
index bd7112963f26..6579ed947e3d 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-21.04.3.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index de0ded56642b..6caecab927f6 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-common-internals-20.12.3.tar.xz 449572 BLAKE2B 5f7d28a9b0ff22dffe2f6670dd4a2821f0d305741e5334ef88960907e4571e1053e4b6ef5f4d897751ec6fe4e356c2a7535326e5d63a8d7e5613c003cba4d465 SHA512 217a4ec724f0a6918254637546367ecd52f5f0688bf754e582b6e8596a58a120e5e19a9933af5d0f4d4d2cac207edce4b55a602f8e3ab1493a21e071ca135b49
 DIST ktp-common-internals-21.04.3.tar.xz 450692 BLAKE2B f4363ada9a971b3417f48e5750d02b10f57debcd653a652ecd65d646dcb40be5242b7f119beb534954e138ca3f4325fa5120f0c12c55ca39b9770da3e9aaad88 SHA512 4df1dd074f0e6330c28aedd8c9ef3ea1f17888de3f0dff63174a1221c4f08027179e282982f5e6f9e47b3e5ec34d1dc8d86a1586908267cf97dc0a51dcf9aaa4
 EBUILD ktp-common-internals-20.12.3.ebuild 1711 BLAKE2B dc4ecaf546efcc29c09a7ec060d5d2640bc3772bbc4e8a3f44ebdeb7215cf721f98e3d8127a3435d17b13a45dab422aa28198b951ac138a16bf27c30760f310a SHA512 d34105ed351cf2e698ca0767d72c7f6044c49ecac811ad2be9cff7381494aecbca6ba98f11a1bfae5f750bfd0ca2d0bfe6ce262520d2212b2ea40fa07dbcb95f
-EBUILD ktp-common-internals-21.04.3.ebuild 1714 BLAKE2B 4c71beed06c62a0c9d86967e1a686cd4d4e716ad7302595214698c16f98b26321f41c971456821469e573f78d16f737968edf90ed7728610571d4427e514d4da SHA512 ad657665ea022b339a5c9dfba754051c92fca2524f636cadcfaae129c9591e627e2223f6e711ceffddc14c6065e0ed2f596db084202b7ad7016e55edba4c5ce0
+EBUILD ktp-common-internals-21.04.3.ebuild 1712 BLAKE2B ff73f833d2713ca2af4fe823997c836e52650f3681e54e2e2f2dcb11208737d166554700c938a0cb091633dcb8d394ccffac38cb65fdbf799c0f52f8858aa69c SHA512 141788caf17aa634120644f6643d79ec88e3f9add1e694ac11aafe3b07535d51fd470452d25f048e59c796fb89bb322d44bd674206d7ef27262f226ccf75d0a3
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-21.04.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-21.04.3.ebuild
index 3c5b725d5448..48d6c2ec9c0a 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-21.04.3.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="otr +sso"
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index 85efd3a8c2de..d1cc1e6a52ff 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-list-20.12.3.tar.xz 150320 BLAKE2B 9bd482ee79600f6dc37c224a6901ccaf8b31d924b1ff63f6a304f4b92454e12d869c271c16d003812876eccaf6f9b2d0037aae1271098ca07a3b0d5b22ae52a5 SHA512 54e946c452bf0a7f22c4b1c679d99f76024f39e13c49bd6c52365178b6a1a1df8c76d6e223e1191def79ca36140b6f5e683c35320705e4854c9c09099f8e2da0
 DIST ktp-contact-list-21.04.3.tar.xz 153064 BLAKE2B 117aacd5ea9f0aa051b37b7d3d8876696dc7fc9133524c7a960623aaef54c61f8ef5b2212ff8dbca7c75fbe2a2fd9dbb0def66799827dea61cf800a3131253dc SHA512 9d010ec63e53cba531896a855ccf7f50b5717da3b69543c6afba52dfa39e7cbbae4289b05245c8cdeff86cfbbe99ef83e7892e68b321d7cf90fe71cc8bafc642
 EBUILD ktp-contact-list-20.12.3.ebuild 1183 BLAKE2B 6b5b7583564d49636db380e8e2b3cab258a208e84b1ad5a60bb5eb025e6ed5267558f9dd68eaac02e9c4de724766204881d294d3cb8d0b5bebcddb2dee724ea9 SHA512 f25ddaf9900326c0cbe6f3be9bb2f66f98f7c60a2d7a568d82dac063e398beff2835d60ff354bc2f702db954df909f497340570107013100b3374671dfd3fb59
-EBUILD ktp-contact-list-21.04.3.ebuild 1186 BLAKE2B e39e6866a14514007a1afcf828e392b44f0d4e27ee43cb85b7f96b8f51e536298558fcf4a45bd370706a0403fad4fed7cd172758691831d541d045ca59ad7321 SHA512 9653a993245873b16e0458e576b063e2ac6dcca757b2462dc0067d4a3d87d4d45fd2838ae8dddcc3661e76c8ba98be647761d5399366e6f087ec32e5ff82ce8c
+EBUILD ktp-contact-list-21.04.3.ebuild 1184 BLAKE2B 2828b12bfa7d90855b54ae621eb1564c8283de3edff59f1a37b11ee8e4bfe152267d94b439afed98281f5680eed5c6afe0ec4b4d168d0f8cf03dffc4f9a77b19 SHA512 ca0c06491844284975148808db84e3c94709a28c28f47778599fa983a427935fd9d9459ebdcd6f10e577011aa7d2846a55975a4049a7805bfbfa76d550e95ae0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-21.04.3.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-21.04.3.ebuild
index 70e60446a67f..9cf7b0a2a74f 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-21.04.3.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index ab01b5a4471a..c7222df05aa5 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-runner-20.12.3.tar.xz 43084 BLAKE2B daae9c0c2fd9898df4797ab0bd09daf903915a46a8f3d2544330f58f889a3a7d2f8582a5a500aa9baa8585c13d6e5d6ba5f024050c4a68918239ef9fb5543923 SHA512 e714c2d7f9274d1f5689f140a0609ddb5bd1e9a0d3760b3f04e656c74b97a9b32090044940a49689801a2fa749ccb33b79ba58ef413be6a7a22343432305c6c0
 DIST ktp-contact-runner-21.04.3.tar.xz 43852 BLAKE2B bd91afdf1d7573a6ff5f3971b6544d218ad94a3db16185fc4a7b95567682988082e680694e224fee8f4eaeb5810842c609883cb6914b5295877b1a857ce75f17 SHA512 e48bbf85ed2022f539055b8518e216cddf64fda168fae1738c963ee7fe8920835df816354fa0741fea6152a42dfff289d12b0656b7a68ebbba275d63e2ae158c
 EBUILD ktp-contact-runner-20.12.3.ebuild 675 BLAKE2B 1390d899eb948e06fde044f6f13e448ccb1f65a87701dd6a05808e63da8f4f96fa4d6e914e2c47ebf5f254220f606b899fd471201a8cf87c3b61c26b13f5a0e8 SHA512 7842edfbc83e6337071db386364e8afb86e3184aa7b760174c68a43b334fc56f46f7fc0f14280852feb21b786286fb53a7e8d3356b4d76b6527f4fc3c0e7f66b
-EBUILD ktp-contact-runner-21.04.3.ebuild 678 BLAKE2B f4db1f79809eefac306a53aa232354c196ef6f866706ec939902259cb610e591c73ccb667cc03542ec29dca6d5c5cd163cf00b6a264f7aabb51e7998044a90fa SHA512 02418b36fa500fed8cbe5392aef0c77fe2a37a948f34b01a05c940332996ac031c60ac8b4e7d7a98f612b70d9b86b37f88e922ea5572dd21777d1dd0b570dbbc
+EBUILD ktp-contact-runner-21.04.3.ebuild 676 BLAKE2B adf9bde4c868fa907962be1e78ca62245cc74a0da168cf8f16b0b5f4643808b38b742b70eab009aa23c78cbffa30e80c1d7ba2201e057cd6612c99bba9c80e2f SHA512 882084efc7fb3ee58869183bc7b5cd2cec96daef3784bcd0ef5bce70764f4ddad7452571f5c0e368898ad0fd9960466bbfe20f2d8f3038ed2cc8208ee4f9ffd3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-21.04.3.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-21.04.3.ebuild
index 3f8279df76d3..cc2cfc084116 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-21.04.3.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index 03d73f75415a..a175eac3fbe5 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-desktop-applets-20.12.3.tar.xz 43704 BLAKE2B 90d8304eb8cdd20635359b947f91774ad28668aa917571d9ca1f616b06c5a1f3d63876497b0c500e989c907b53f542114eac3926e5a19bc900eb0ab1139cb93d SHA512 ef99274d65cb0bbbe1796402230472f243f331285ee69e316394c6a37fa87939c8a803b65ec68357328f39226517103c98f270258c5c7c9d3470865ef97dc325
 DIST ktp-desktop-applets-21.04.3.tar.xz 44396 BLAKE2B 958cef9d866997a4313fa13e425248d511eaf2fb94043f86c1dcdcf600a5d09b6c2b8dd61bfe8e712c00ebb513961a045b3381b42ab7e8e0455550670e92134b SHA512 50802cd5176e85a440113920bb3b6103067009608ed4f0a9115647daf7297d17d37cd705c124165c3855bfc331fbc398dd07243c2e234de038a1394b7c4ac39c
 EBUILD ktp-desktop-applets-20.12.3.ebuild 615 BLAKE2B 7202371c37ac36aab9998de03a38c113531b822d63e3ccccdd29623e6e8716f21950b236574612ac0ad4448c9a607da37a9d6f46d163486cb8e60135a9fd3689 SHA512 3ac835b24e15222f2c4028ba7a680f96f893593daabf934c1455401cab8e2ace114561464fae8959c1014850fb0f3db401c90f72d43d993ec53ccf84ea53ad43
-EBUILD ktp-desktop-applets-21.04.3.ebuild 618 BLAKE2B 9390935c582a285186613a3f78e602876d7690437f163bdc0cc434b490a82628eeff4b590f5a032168a3f871d321dc284e5cb5992718660c5710b336ca457e8d SHA512 cf2d885f8d64dbe1a57f5374400a4c26d2c4f38164d4b792ac6ffe9e848da1b7c87fe964478a1251c11fe2fbd449e54f0cc55cfb67e3dfe2d442613c0d14d097
+EBUILD ktp-desktop-applets-21.04.3.ebuild 616 BLAKE2B d531e31cce75c53335c8488224776d22732f0c27b4308556a9b640f3f3e6112dca5cbeaa968c471def6e0bff206f9a583f2bc655e554a7bf15cd1d8c0ccf1d24 SHA512 0fca79d7236f3b47e0e12b1f7da9aa7bea608fcaeffdf3566c83270b18f3c6d135acd474c1b17e323efd12356bbc759a229d4533aefb881d4b38ea6309dad1d7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.04.3.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.04.3.ebuild
index 830c362ca307..584a9ab2419a 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.04.3.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.04.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index a4f72cf488b7..cb6656c2e1ff 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-filetransfer-handler-20.12.3.tar.xz 46208 BLAKE2B 341e042981ee093125dd31152e5f65a8f83b94dd626a8f905799e0128f5687f068f4d1e15cbd52e65b0a3b22422c78d1449f48e4b14a5f68a9290b907210fcaa SHA512 b1482eaa8e18d3a0238d3e885d3f6d3398487f772944239bc807ee0309adb4ee1bed010dafd7a9bc149eab39085e4689c6f75d97bc5ce43ad17bf1b38453091c
 DIST ktp-filetransfer-handler-21.04.3.tar.xz 46436 BLAKE2B 6a52d84bcc8106946cfb839dff9871a3fa6ed082046e306b3041e87a517f638400cfb71cf419568b621ee27d54bcc9f5119bf2aed4a6500c9dfac730a3cf7fc6 SHA512 40811483b2e8748f259b7612bc40e978a5de931e37c10f3e494a3c048396298be70d1d5e82e75b6c3f44bccf8d5e9738da9aea2ba3c4ff5994667c15fb02a952
 EBUILD ktp-filetransfer-handler-20.12.3.ebuild 691 BLAKE2B 99ea8fe27c2db16a888df4a2dda9873469af198a98157c664e505e172b721e3e37325032bb7f0bfb9e37b86c6f84798b2fde1f226cfbc0ea22551b8e04ddfcb7 SHA512 c816edd3d7efda2e3172e469e878f75804182636daa8ee93292186adfddac2f4c412b25324de7b325e5ea69182f2ca877f224cfe995ce51e9b51077501a46ef1
-EBUILD ktp-filetransfer-handler-21.04.3.ebuild 694 BLAKE2B ec5c88ad08577f849e766994fcceda93f47b6cf34af7016128be09195c4aad7b55143a91970501ec2405496c5554bcadecefffa754ac3ef4ef97144c19cf63ac SHA512 a22824bf6030502a73817b11fd6dcc6dbb37a16ce5238481ff61e6d86251bdf949269ed2a267f917dafb6c235db7e33dacb75445d09680c7d92e2d256988ecab
+EBUILD ktp-filetransfer-handler-21.04.3.ebuild 692 BLAKE2B b296728240544aace45fb130ab5e1159496479e7c177320787b13a80f1807db61134b2b533b927af6f8e5861170f3d126fa484c003ddfb436a6fdb8ca72f9279 SHA512 0843ca34e256a413999a85bdb6626c5c8f2f39d8ebfbe71ef7bdb7d339d1b523df8c96f0a27bb26f507855e85fda43f1f1e0d65d9c57137b782c63e4db8b6f64
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.04.3.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.04.3.ebuild
index e1c864299142..715216dc62bc 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.04.3.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index d7e986e5752e..5c2a65f1bdb4 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-kded-module-20.12.3.tar.xz 98312 BLAKE2B 70951217e2881c48af5862ce876df74dcc9a4ceba519c0f88bf9ae0a99b4bf5923f9d68950a84270206988a3a19913ad69526b43a724c15c879b6c16749515c5 SHA512 17ba3d45ce0931f42de09cfa4b693e88e77ef67f08ae35faf56f5d4d7fdefe28501be554c7ea279d6b1183ecbd46a99552e7316b19e2e85a3ec5906a2c285b3d
 DIST ktp-kded-module-21.04.3.tar.xz 99128 BLAKE2B 3e9bdee280cf476c81ea428c519c0183fe2a01cac7449f03d49146dd987c763bc56b5ee2a049192a733053df7b28f4bfd8af45ea38c0d7c1d7b56839491fc833 SHA512 f8ec2b4e55a7b78ae208ae9a2f8a77aa5bbec8eef52b7a7671975846858955a6ed84b3a042ad2d35e90c74c72b65ca251e7938145dc16332a8c397e0952f12f6
 EBUILD ktp-kded-module-20.12.3.ebuild 1107 BLAKE2B a6d24f1fbbf5629aca6e497c2643031d6b0f5d7b32e590298ecd031c7c948a90feeda6a430012f4c218e14064657e8730429a26e6182c807d88e571d9c946903 SHA512 00c5f481635216b5fb6262108e9c5e3a481b25f727a5d11e455b6b84d6390b3888d390e11810168b26716d92c58e2b9898db2b609120c0876b01cf2811a1b725
-EBUILD ktp-kded-module-21.04.3.ebuild 1110 BLAKE2B b6eb1a5031e6699b8142c220ad052f7e4bc16d10d3ea12e3ee8a7af2f25949a1ed6da2472b2bfd5d99b2c019c4aab1fbb173551b9d86a19e41f97e3c0acb136a SHA512 4b48405bb90d67f5d9cfe1a92981cc07266184c9c6b4532f30870217ff69598d0f430e0703ee4fcbb81b330d25f3553b894b592e15c3e3daee464aec610cab39
+EBUILD ktp-kded-module-21.04.3.ebuild 1108 BLAKE2B 7f7d2c6be018245a922a20ece58714cb0d3e84971cc77b38380757dcb10fcca70743ebcbbadc08bb77b578633996e72ffde89124e1536309c76313af5f64f8bc SHA512 8eabf3d4b0dc7ee9cce31378088478f37a421331cfed126b60bd0678c320bc1caa65a9e4a6cc0c621dcf0712a86b6e4f59bdce053f8dc59944b5f1d2feb46f2f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-21.04.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-21.04.3.ebuild
index c102eff6d523..4b506ed863fb 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-21.04.3.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index 4fcd082a65d8..025afd60a21f 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-send-file-20.12.3.tar.xz 27816 BLAKE2B ff30f0d69d4a9c9bfcacd226c3261dfc9df7d998ab5e265eb2a6cdf183ad3c0797ad55469384df69f9c2e7b3bfabd551d3937c3cadbee90d22e670db0d20453b SHA512 4b5766f38cc4c83a61f0d7dc8acc112e844eb3159b4998bfc9deca8df7020182273e5fcaf25bd0543c451d38ab8cd9345906ac8de5e9cd2f31732f53a7152a80
 DIST ktp-send-file-21.04.3.tar.xz 28700 BLAKE2B 52e73baf0d7193465be660b759ac47702f167e9d94efd7604fe991f1bd87889ebfa0e940e1a6025b688c855a4b2e2174f8db2e5a07b726a50903facd4ba1a844 SHA512 538c9dce9ed232f24fdb4e20e2fda57cfe394d4d6b1c546e3b6b7cb139141c1307328b14f777e0936ed4329229639afe91786fea767fbdfc9a093ea6ff2eb577
 EBUILD ktp-send-file-20.12.3.ebuild 916 BLAKE2B 30a141ed92832c5c5fc339d13b0dc0c5886e43b02817ac0f9d4d50712cf9b76f0e9edd890585950c7436c402bc16564c87c2617d4a3e392982f5501ed12a7f94 SHA512 6fcf4157a59f8bea5ab2ed4272e1f0117f9d34207e496094ddb5be5ecf9baffc6b1e161ae5438dfe5ab8ee50c90343030ba2c9fea9939feb7764841ddbade545
-EBUILD ktp-send-file-21.04.3.ebuild 878 BLAKE2B fc1cd65d8139debd4a59b20132294019a6957bd8d527a3d3d6a307f37e26efc1911f8bea81fb72bad6b20eca8eced4d0b9d476b3c479f4817decfb82d9dce098 SHA512 b10859af0f4ac7b6249532d5fcf2b6e8c0150a738dd5f46d2eea3c1d6b72823522018f2506de6c81bfc9ee38caf227d2443e1d4f5abb9d8115978d2397911655
+EBUILD ktp-send-file-21.04.3.ebuild 876 BLAKE2B 204e3ea1fdabf67513eac4a61cbd7d9349550af8769fcd4a690a142b78f90c76ec685cc2e3f88b929447b51a008177dad7c80255bedf99a8f383ad68c9fdebd7 SHA512 cb8f0c686940f8a531c925c6e70fc59fd697a89b464ed4020901509f871927d8eecad02a56eea99120429634bd6c261239e61bb5e1b518049ddbca09378577bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-21.04.3.ebuild b/kde-apps/ktp-send-file/ktp-send-file-21.04.3.ebuild
index 3c267bc7e3a2..7a9b5b0ea71b 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-21.04.3.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index e04e6f304a4f..9765ea1c8f20 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-text-ui-20.12.3.tar.xz 471704 BLAKE2B b8245e4e791c8ec6eec832bd2f14fe499a5654cf14dd373d2428b168b75caa1cc6e83fa3199e03a23bc65f47fa34eeda5d419dc69c58c0e3a88def0b27d80e8b SHA512 0c2efcfc3497f2ec7f44389d5a10eb601b6fb2616d068ae6e4d99483a34de4f2537fed77ff0c7934561e980267e511213cca30d2bf2da1fb507b4789db944f5a
 DIST ktp-text-ui-21.04.3.tar.xz 474640 BLAKE2B c69dace833198c3295bda2fb5fd3435b0531c87b4f5ffcb6076bb1fac2b3cff1bfb49be7f0206a7c858011b740509c045faeb3970d4fc9f615982a8a405398e9 SHA512 64b837b0f65d314d1e8bf9b471a53692a020c33eb0a70c3504d54a560a41a2f30e0cbb30c2ef8ccad75fce614604959f2aaadd6a02a8c09853842d083ba76641
 EBUILD ktp-text-ui-20.12.3.ebuild 1637 BLAKE2B ab10d20f42e8003945c7d82f67b31c7d5e263ec36f76d7822c6a4cdc5f0bad6826348b5a3e55589160db1fea2b67654b6f2e6eb4d217e3c9ae65f8ca7edcc8df SHA512 41dd2fe72ed72f7469ece1294ee48cce4e2f811e21eaec91caa3a752fc3e6420b7746d435921b1484ee848db3aa964ee2d7f663131f71598218fade4089f23c9
-EBUILD ktp-text-ui-21.04.3.ebuild 1640 BLAKE2B ef0fb88389a967d1637e3323603e02295881be7b173cbba2514fd4659fd55a18c9f0cb2f961971181ef620f087e7a2f36dc377d60f4e22afc12080bbe9e4f3c6 SHA512 aba1a587973f8dd14f3468b8f14bc39521c152dcec80e7cc31e87b7c3cef281093aabdb37880297c029bd8ddff0283f2e63a72f844c07804ff592ae3dead61c7
+EBUILD ktp-text-ui-21.04.3.ebuild 1638 BLAKE2B e664bdf7c0b16208b6444013b203bfee58bd546e27785b24a88b80aa3c888f54701bf66ea1f7e8ae8847412692412396b014cd10ba39adf786d153879cfc8c9f SHA512 245b53f304779032f35a4a57254046f0159e9707c84cbbf81c1fab9915755eb13b20a294b32b6a0d11abf695408f381d6d14dd82a133d960ef3f09ecb65dfc4e
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-21.04.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-21.04.3.ebuild
index 7616abaa249a..ee5a1450671b 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-21.04.3.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 53a68b668c1e..38b7d465d023 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,5 @@
 DIST ktuberling-20.12.3.tar.xz 70712392 BLAKE2B 048618e1acf907ef74787d4ab88edde2badd5f2513ad65829a527e1bda966818b9d74003d91d7dfe57f6ce23b97370f1f87af37e7338c99f9dec187bf9667e15 SHA512 ea6d1dd04f53cdb4bde868ae478b7368e1c1147a73d7e5179133ad47ad2bc9a823d61c11bfd5cd922c26fd169a2ea4c43e4f9fb86e13a6e12f4a92f4974cd8b0
 DIST ktuberling-21.04.3.tar.xz 70755172 BLAKE2B d7820b53e29d645a1149277ae8db6bf86dd0fce6746cda44593fb4f3de5dec9484e588af5753b977dd6d45ce794e3ed5461c3c1ac0bb5a93e5ea3111db7377fc SHA512 3d3ed7a102110207898d3fffbf127cda8be9c2c112692e037c6c067cb517699a8a60ab6044926a976876c6051ff5933481435d45088134abc7b8ff7ec44a7acb
 EBUILD ktuberling-20.12.3.ebuild 1104 BLAKE2B bde732ec4d8ec52cc6904877c71be6f1ab6d6c7f736e44671d0a1d0789c81b6d9bd9a585c779af0f7e6fc67b13bc5bf613646512b3bf792e68fcc7caa1a0190b SHA512 be0c8914b66774d207a11caa4b13990aa728aab24ab43a7bf3b567e00ce68564cd63f2157c172197482ebad9d4b8593444ff800b00a0dee79af17a1ba76cf73f
-EBUILD ktuberling-21.04.3.ebuild 1107 BLAKE2B d2e3cec28692e8938d751409281ba185ff1151313e1fea7b16372ee6c21872f1f74b0ed6fa247e68273ec112dd97d1a3c7059575324ad86936339110446d9ad0 SHA512 4add5fc98f444bf8b371d0e5141ce21a62a04cd99c31cb3963681cf0b5da9b589bd3b6b7435ea514ff6acefa48ecc15ed5060ab8988ecd44cc0cacad8a8fcbc3
+EBUILD ktuberling-21.04.3.ebuild 1105 BLAKE2B c442589c5e35392bfad4c94cb050679ac00881702856ec6f8ac97a1289fb8c43b3acb32072ae708568481650979bcb6f4b67276240042a2c240d34cc66635499 SHA512 f9a3eff94ba4cc7bcd15f85830c43d535696f78af54c75b29df72c626db056cd02c33c9fe80d61647af7d2229e3d54ce22cfccfed060d454c58a53e7638629ad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-21.04.3.ebuild b/kde-apps/ktuberling/ktuberling-21.04.3.ebuild
index cfc746da64f8..e30c9fd6aaee 100644
--- a/kde-apps/ktuberling/ktuberling-21.04.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-21.04.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/ktuberling/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index 3f1f785d7056..cc8b4e3ab2a3 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
 DIST kturtle-20.12.3.tar.xz 1837380 BLAKE2B 6e69a7b42b32e3e81369ad94b3bec0968f588c31c23753466bfff9e54a700c0523d144a4a0bd161f2bf7cb61aa8ad996e00e2d7306bc8f06937ebd34251afd8f SHA512 a24ed68ca908693b76cfac731c39fc51579c3a26eddb08800ec8064091c7a00b5964078546754524d739d89ebcb11966d1246bd0044aef0b6167fc3094c57570
 DIST kturtle-21.04.3.tar.xz 1970952 BLAKE2B 88bb4425fd7d798c9d7d069b61a241adba9bce457f2e3bc804c12572637087feb6cc221c628a4d60c97ea3d292c242bc3339c033217dd14e41f1f6a0ed39b3a2 SHA512 7c7b4ff311a694ebfd29de55f7b74767daac7edd228612496356823a81e9836db6094d1802c3c7ed39540db645901bf3e0ff607d246c9f38b3501ccdeca0b012
 EBUILD kturtle-20.12.3.ebuild 989 BLAKE2B 583576649b922abb9c669157179dc85ca169c8e9bc2dbec2efe91e26cebd60769c30b6c44bc20c3cb36645e0770a4d9f0fa5ef6865bb2bd8ef89c2fd4b6dd3c8 SHA512 c7690ef156205abd2191bb24841bc53f4352fcd872f720c7fe42988b8e4488882fb22f5ab231e38971dbfdd5960decfa8225b819bfbf2eae1d61be89f9e723e9
-EBUILD kturtle-21.04.3.ebuild 1089 BLAKE2B c3410fba7d402e3047e1b55da182963295905986f0f5e32d1538da848b71c350cd5f4bcc52dc310a8fbca83da13142a0a5a5a645bc34aee634ac42039d0c3019 SHA512 2a24adace5031d9d41d13724433094b017dc9a63d346226ee395c608d6e8d2595eed33ade9e7107664904138cde76d6246398e3b403d06313e3943b0ffb95e72
+EBUILD kturtle-21.04.3.ebuild 1087 BLAKE2B e0aa9fda89ad80f771673ea57f47e5ab89c6ec78cf3520caf3c43b15f0eb62f6e972b460bd26e2c22adf07972a58819282e96ddb3d6486a2c9373c15cedb23b2 SHA512 f82215e3002e8261179d984063a3c3df1f9fb965953963e15d35d5381396bcbf4896de127363aeb518382581410e39ff4d762351bd9eca74c4e6c4fb4fbefe56
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-21.04.3.ebuild b/kde-apps/kturtle/kturtle-21.04.3.ebuild
index 57c1c905ec1b..27e875f96941 100644
--- a/kde-apps/kturtle/kturtle-21.04.3.ebuild
+++ b/kde-apps/kturtle/kturtle-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kturtle/ https://edu.kde.org/kturtle/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index 1b985afcc7a1..07cdf7b3b4fd 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
 DIST kubrick-20.12.3.tar.xz 339644 BLAKE2B 7b4a0eb179273765c3532540ff088bc698e9a01ee1384697a0ba40a27c10c1f5e0f36617b48470b2a1af7ea41ef1d781cb2f480921ef9beeeb183c9c8d7f5f2a SHA512 bd0e22fcc299c065d64ec697a248cdefd57dac0e0c2487f5cdbd15c952a87b0873df588fcc7023a68c8f839199d00582fc39621e91746093ea409a83402bb7bc
 DIST kubrick-21.04.3.tar.xz 343208 BLAKE2B 98738b63589ec7e79849b4d9fd4958eba8f8fd25a2820948caa95304777d0fb784d5e82cc6c02fcbec7c1c8f1289a9cab05e5627edbf209c8b2497498d0280ce SHA512 98f18557b86768e970ece7d6e2cc0b52e7cbc35cda4ffd20c4bd217897abf9345033fb97239bec02b4a73c725d6889bd0b1c0206e1a802a36fc60da5b2d2dcc5
 EBUILD kubrick-20.12.3.ebuild 874 BLAKE2B 8f6a7cca546144f8efa2ee10e7a8472d4ee5fdea70954f7d11185fe45ef2b89effb370df3cc13811e538a56d8c93b778b393e1eb5c0dbb5d35f3cacd57ac3bec SHA512 55d6dc787af66f7cebc1af75e77f451bc2af281f8d868f4037bde6cdca017ab8d3ab8db1b7c6330615ba6c95a808e2f3a64121bc03beaff188e31d8f38692193
-EBUILD kubrick-21.04.3.ebuild 877 BLAKE2B 1eedfbf12159c07e3aaeab89b951ceb2f05e277b9f8d9c69573719cd0a0cb5a1604ec63a17f57ecc977f5a9b72106d4b1e25014d02c871b7607006c0a67614f1 SHA512 047f21e81c0fb3597ffc49bff1965ab64b62dcad8221bf3c56f2a0b4a9e816798be8f339238ae4de475d25490947742cfe0763bb97c012d08e6b891d652b6fa4
+EBUILD kubrick-21.04.3.ebuild 875 BLAKE2B cef74480ce203c370ec37eb3ebf692f237695e8afb53a94651f3b81964403a7228c1a5fbe248b17b417b3a13906c91d22787ea50242986c1253399c2cd01a156 SHA512 71cdaf9b573e1a356b6c95ddf0ec6827ff533eccc22b1248b68c096259aa070171e023133600ef0d6093b041e3fbb925cbde710ee44cfb18f20b0376d5ab36e0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-21.04.3.ebuild b/kde-apps/kubrick/kubrick-21.04.3.ebuild
index 7f1c7ec58572..04cd1118f723 100644
--- a/kde-apps/kubrick/kubrick-21.04.3.ebuild
+++ b/kde-apps/kubrick/kubrick-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kubrick/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index b4462239fec0..f627565cb550 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
 DIST kwalletmanager-20.12.3.tar.xz 773840 BLAKE2B d5d9ef32a2033d2bef90452eb77e578dcf3c094777f71bbcdba459cc21f746fe23fd7e5ca03c87755fa5505c3ebd943ac58c89472d903ff046ba786f0e4db4ab SHA512 6cc9cb53813b4dc0e5c7c74a3130fee51dd85c4de9f78e4d3c64d40c4b2ed2b134a24f5fe10d67996077f57c4032a8cf2481e418238c5e5ff73c9f0d9657a6a3
 DIST kwalletmanager-21.04.3.tar.xz 796240 BLAKE2B 65188c28aa97ed7384db63dcd3ca2caf5be143f5b949ec62196dc7fb2c96aadaded2c9333be4f961351cfe33492f341ab9e50c6ace55d0e2e9bad7984fded39b SHA512 89bedce351f0c27c7a0452d087fd0633c40ca82d3fc162bdff06c6ee5eb95b66305aa85b9e4c37c6f01ff54b45c575f6af5d5cf9a6ec7e8836198a9e928203a1
 EBUILD kwalletmanager-20.12.3.ebuild 1408 BLAKE2B 4d3f60ff66d4605b846b680990bcbcf5fdf0363e054d3c54dcf9851a4f8eaaf070e2cee4319fb996acea61d9fb95fa0b02fed1ed61f32e66350c320a5e09f0a6 SHA512 8f3cd0cc32b478aab94489ed655fc6d97321605f15c928964c1c556e4a7f7445f49d41e6a23a09d8b81012264c32120ef3526b8c89badb5be95f3b29e6dabe7b
-EBUILD kwalletmanager-21.04.3.ebuild 1411 BLAKE2B 2d577ead9c2ae7c3ed2871af28b62457b6121f6fc8028c8789c10dd1283b3efbe50f44a5e41238f4f628626a6d48309e045bbbb3fa2babf827a4762a3cd245a8 SHA512 43b0ae547fbbe27916142e614c54ef1c2f53f0aab3a39bce6ad74ce0681e82ff04ee24fc9191d12b6787605e5a8d567b78d586dc4dce4aaebdb9c904588e4770
+EBUILD kwalletmanager-21.04.3.ebuild 1409 BLAKE2B 15f96e62f71002cc544fe4aff5df61880ae44d077be562e3306449e046efb2fb0820ace1fc251bfd3eadb1113256dc0c9fb7d44f0715315aee28a3b9b8234e61 SHA512 e647bfc2076f4c7c62076c77dfb4053c146def11f049274a97e140655e1e497d24d050e791b983b67e2a9529ea98cbfd7b4bf710c40d905e133f51a3381da1d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-21.04.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-21.04.3.ebuild
index 808a653fe3dc..f5324ec9ba90 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-21.04.3.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-21.04.3.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/kwalletmanager/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index b2abf0cdf9bb..8e76ce0d6d7c 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
 DIST kwave-20.12.3.tar.xz 6911104 BLAKE2B 17cc2c5a1b14b8c46548fc3d8c65a37c5f42f49a6656f54cef4549d5b8fbda08f3e491a11a5c46e328c3abc6fbcb4e09dc45529fe14e7a78ab031b1d0937cbdf SHA512 9854836fc328dfded8494c03137d940c8ecfc0409e0f8ea85b34d51fb1f7d077c3f3e9e8e439acdf9da66037de0da65dabe8db7422b5bccbadcbaff599e9893a
 DIST kwave-21.04.3.tar.xz 6899140 BLAKE2B 963b2da276e9c897f6b431a665f880a6346dd9298e6f818b291a6a51c17b015ef3c3e1928caa4ec57d9780c982e58107966d39b618d40c2c75a3263c2e74bc9c SHA512 08a648e75ca3a331025ad84f02be7c04b6ec9e68ba251436fa923add35bb3132765519b9bc9fda44b01a45d8b3a9b85f12ac3eb267a8313593d360eb08161f6b
 EBUILD kwave-20.12.3.ebuild 2074 BLAKE2B b3aff4f79c72766cbe6cac9366fcc09693f15a71e6e5fe4e366e13b406d7460b9ac588c3ea6338b9581d4239a59727a0159e752bc4faf273e7a89e322dab5a15 SHA512 bb4758283da0caf87f0be431cfd628bac64418be1744ee655d593c3d8f3217888d009aafc2b9b92f6dd60532087b6bbc9915b04785afefeac5b8a0ea4107e270
-EBUILD kwave-21.04.3-r1.ebuild 2082 BLAKE2B 841e1ae2a805c853468f6152b20cca1b49b551db736a17db344b78cb9da5354ae95cea80c252fac3e277af3c645cee38f9e3d9237d22b4f813e2d612661e94ed SHA512 13293390ed9b32573c3a361e0263ba04bd1d74dacddcb9f454bbac184334dc44d816e9b51adc2dc66008c80ab0b007a444b0693e9597ca71ec90e7a75e003cae
+EBUILD kwave-21.04.3-r1.ebuild 2080 BLAKE2B b53ee15ea74ce538f101c597c1c579bc08e3144733decbd1a97eb83c0c8819f328780698e48b6b815ff09b232de89ec0f26c7d0c618db08f8c3bc2f06e072fd5 SHA512 44be43ad33ef541c788b5ca877292ddabd4a3a549c39f51ad5a57408779d936200b2d4afffa1820dec0ba8e07eea33e1e4dc639dd313ebf355f9016a697566d0
 MISC metadata.xml 690 BLAKE2B 6ad89adcaf160c4c895ebd8a0e1d4bc388dad90803b16673e66640cd3974bdbf608f64c2f97e7e1144c63372b951cebbc7e168985c3945775f08a300d6cbd177 SHA512 eea8bd3770532b13c64608cf89873c65abfbe31392956fb3e244abbd5675b1e920329f3e13befa9563878e8a2f7fbc52d0178045e5dba9ca76d2fc95fca1c4b7
diff --git a/kde-apps/kwave/kwave-21.04.3-r1.ebuild b/kde-apps/kwave/kwave-21.04.3-r1.ebuild
index a6e7f1280dfb..30d2e0391a2e 100644
--- a/kde-apps/kwave/kwave-21.04.3-r1.ebuild
+++ b/kde-apps/kwave/kwave-21.04.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kwave/"
 
 LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
 RDEPEND="
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index 7800f4485a31..a4595ab49db7 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
 DIST kwordquiz-20.12.3.tar.xz 4187776 BLAKE2B ac3fa74db64f93338ba77064e8223bd3272198d94440569b91f4250f302dff49a9088e70e6d9f7a0281be8c79f467f9c12ac2241a81a2b661f4706a3a43eee45 SHA512 2192c8e0b9bdd9d26ed5b0596baa208450bf31b89855c106c125b63465ec505e61e180bc05d60c36809ac93cc31cc9ef814e3636d8a7833909332755aced3872
 DIST kwordquiz-21.04.3.tar.xz 4208304 BLAKE2B bf226afa6a145a438609de132aec7e4593e203f66b2f94bdb34f9eaa15d35ed7d60e73dc932e28cc704986b1ccbaeb65b0c00e2fe0699a9ed3b039d7d43b16c8 SHA512 5b52aa118b80f846ef4b61b43468438d0597e551a130ab9e2eb8d93a997eb59a3d5c694ccb2e77dc8c6372e3f81561c0e630a9e659bc1c561e448abeeeb46e21
 EBUILD kwordquiz-20.12.3.ebuild 1169 BLAKE2B db1aeefaa302d0752042049bc842010290c954b8828c222935c0b1b3e2492ea2b7f0b512a2b833772edf56597e6450acb31aebecaaad42b34470c0f6146caa3b SHA512 5a0cc86734119c1e5d54830119f75f029d0adf51774ec9c5f1014a9b27d35652dce3e06eb150cf6a086f445604b53fb0af6381ea4695200c07bdae6c04c7b078
-EBUILD kwordquiz-21.04.3.ebuild 1172 BLAKE2B 181698ac88c3aac1f9dee24b606a37a3ab5b412aa47173b9a6d469607972a4a96f5def20e15e38d72e4a42d5420b779cdbefc91dfcc7cab639df1482947be2f1 SHA512 af30946b6a7d6136b95045b76540d6132f94ccf350730a3247504898f25d526c5fe65df2946e18072e149c89975bdead749a9ef955c0049b52405fbf02c982f7
+EBUILD kwordquiz-21.04.3.ebuild 1170 BLAKE2B 64bb08fa8a598dc002337333e7daaebf23bf55f6689c7e2a420bd0e2d52a5d9491ac467c73d6c13473c0b1aab71a1b32d952def2ce74573b4a1c85e9bf6c31bb SHA512 0cdaa635a0f66339a0e494aa48a85b6aa56318cc43cf0a4ba05687e7bd5b0979646d07a9b73dd10a20038777f8fa0e735ca06f4108b3c1126890297897ff5bbc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-21.04.3.ebuild b/kde-apps/kwordquiz/kwordquiz-21.04.3.ebuild
index 73e073bb80cd..c6e65381109c 100644
--- a/kde-apps/kwordquiz/kwordquiz-21.04.3.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kwordquiz/ https://edu.kde.org/kwordquiz/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 6f746b953e04..19d937e1b29f 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,5 +1,5 @@
 DIST kate-20.12.3.tar.xz 5949012 BLAKE2B e35c4da5426772286abe54156babc0de09fbdf8fb5c7505714637ad427e3a694fd541ca7b17e99ebab22f9a19f2a8893d34098cb625fd0e1c0f0b6b920acd62f SHA512 545ec2a48ea6ec737011602b20ac2f60a0f9db0a5e55e0b232f9fd7c10b7e3f54d2a346be7e6341537758a3f8f94868c4083a6d2d10b572568f5c56c9d3aee9c
 DIST kate-21.04.3.tar.xz 7283360 BLAKE2B 9520b6cffb284581aaa9bf70daad08fe5ab4570d433ea785a24d0c9122470c9d9d362026c3ea430924c453828001455a377e05537a83a2a81814df4de5e3cf72 SHA512 51c4023f3915edd348c1aa7ce448475f39c3401649510f89c7e17f9943739b67b09330e52b912794b31d4bbab1f94ed322f96bb45d450f016f84efa010d694bf
 EBUILD kwrite-20.12.3.ebuild 1450 BLAKE2B 9ac559c84eaa5c1fe60565f2b8505956241bcbb50ee563ef22daa2645f9a5a737f02926e510024237850f98fc406d192b913c408ceeade36945af65a25137815 SHA512 5c1aeae80a5c5ab98191072a68bcb2fcad34b58a1abf8c99358140b6582c69d2b5a2081f144edcd10790442c7d62b5f03caec8e88a1beffcb5b8eb31b54ceb5b
-EBUILD kwrite-21.04.3.ebuild 1453 BLAKE2B 3bae64c299103c9e959e5a0b14eced478e3e99916edac58d0377f1564aae451152bb183e1d75df0c26faca6058169d6fe8b405d645455fe3af9c89e26b714541 SHA512 e5a13c77c69d31faafa7fe39b90412a41f2c3ed6b3a4a6aa3f6c1456917b966d50415cce5be1c6406357330df679bf5811026af82dd2725f33b0a885eaff245b
+EBUILD kwrite-21.04.3.ebuild 1451 BLAKE2B 121bfc7bf208d4d1dc8198d9145bc659659f4218862ad63f3f798c105e1b17ba72249477ea7c0ed13a37af644b27577d89d28cecb80502bff180e06611e7c58b SHA512 c9d8a7e419c3581784745d5a21ed36fca116d1c86fe048fca84edec9b6681ecd107d31e24a2ea707ef974d6721142a45ee64e93907ec5b59abe7829123b44890
 MISC metadata.xml 372 BLAKE2B 80ff693fe7c7c67aee3a23b6a658a150e33589f9a42df15e7d1956290947555993789ee023345b585fecda3ae828b9d99107aa72b15a6dbaeaa806d0bc2fc2f0 SHA512 3c9a012ef2f6e23889c5c73b3c418e9e60439ea3e3a58995eb8a8b730bfafa5659c7cdb848d0b340f1456828105d92e85c9cdcf55faf22ac676d2d377a004093
diff --git a/kde-apps/kwrite/kwrite-21.04.3.ebuild b/kde-apps/kwrite/kwrite-21.04.3.ebuild
index 1280b814fa41..11837dda0351 100644
--- a/kde-apps/kwrite/kwrite-21.04.3.ebuild
+++ b/kde-apps/kwrite/kwrite-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kwrite/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="activities"
 
 DEPEND="
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index b45ed8c51f8c..cd550ea5369d 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,5 @@
 DIST libgravatar-20.12.3.tar.xz 31160 BLAKE2B 449a467ccadb3cc01a6ff03ed621e78f7f63f690605205f45677b4907261829221a20b89f8e7eb8ffe05d5ef02d79ccdae9bb8f6e54d8d4835030442601b57f4 SHA512 920e4db3c9c2813cb02b8324772494b600865372ae6fa4ab7e883e013c837c04ce55b2b8cff74e00d89f7afd3eb7120e10e80640a139d06d05d0646be0fd6ee0
 DIST libgravatar-21.04.3.tar.xz 35628 BLAKE2B dee2ac47ada9f791925eb98385ef3d85dbe55f694454aa093572cf8d882efe8f70166f5bb04a70d0c3a5a3861b030a9022f2a07e71300c8deed67f9b55bf2405 SHA512 3477d1884915c0c157e565474d1c61a7ab5bcd3a589c94312e389b3ccb780888aa404d5bf76c6eb9363f1ee30f0f77f748aa0b5a8c835214134675a176daa028
 EBUILD libgravatar-20.12.3.ebuild 822 BLAKE2B 2bffca71e80b8f1b8551ed7466585b2057828a74b4246a9a99b5c466eff2d88829fc2d8c6d28f7c78cd57dfec0d707f7aa1b6a067ba721ccc7ff9a2cc3b59262 SHA512 d23f43dc6d8761a05cb5de7f87c187ab8a470d464f458b1ce02751e0b995b0a4f02452b054357868d97f9411862e0928ed68e082459775d3717d525dcadf34d3
-EBUILD libgravatar-21.04.3.ebuild 825 BLAKE2B fe5ba2687cf76ce3fc75ca620fad56850e8d6dd4505e7fa476237c8f4958891f6c140ef86a94f1506d09682088938cc1120e922e428db7fc208c418de739b3d6 SHA512 84d5348f119b538bd2f6d446d129272e581bb028e4129efc6069e9733a4fdaa2cdf8eb0db2c1fb9c869b40ec99d665ad48175f016fcadf40a1ea734034b6d1ff
+EBUILD libgravatar-21.04.3.ebuild 823 BLAKE2B 0af1404d9befb05afc72152df1e7d3ea413e79e59f18954439481a5fa2791117c56b3b61607370a7f90218fe969d9cfb89f45e71fd6770eba3c7a98e9c2d8a33 SHA512 81e8117c020efdb6bcc30733195eea633fac56c23c22df2abf5972375bb89c6bc3b87056c7c59b9ea551c0368acb15d77e4a776cceb3dcd513f250342b31b864
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-21.04.3.ebuild b/kde-apps/libgravatar/libgravatar-21.04.3.ebuild
index 6f566c67bfef..f03d03f07463 100644
--- a/kde-apps/libgravatar/libgravatar-21.04.3.ebuild
+++ b/kde-apps/libgravatar/libgravatar-21.04.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for gravatar integration"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 3949feef37ca..c47f4de88494 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -2,5 +2,5 @@ AUX libkcddb-20.12.1-unused-dep.patch 1684 BLAKE2B 6089b00f04b370ff3a23b7604da28
 DIST libkcddb-20.12.3.tar.xz 425180 BLAKE2B 5dd7c8c75c505d3eebe4ec0bac3a342779fe4af3db56b7f87cb4ed5b0f8d55d8aafa5b0911f415b2d871df4a6d9b276112853fdde0bed4538893f84eac58ed89 SHA512 7659ccb25555a3c9ae496f7ed695a69bd6ac7df1002c94379f5e637a85673ca1194311b8aa04c2b53a2d3b9f41013e38ecd33403ba5fe66c1afc473cefe08af1
 DIST libkcddb-21.04.3.tar.xz 430108 BLAKE2B 414d6d6fd117aa5e6dceae349280a7920dea4fbcc14d79e01da1849a8da7c2e256cb8aa7eeb19bc5c545ce65ec8f7b3081bc420e9a15ba0ee8775f32ca8b6f70 SHA512 48df1dafd22fc323ab546f927e8a6f4059fdcd2ede5bfceb4b67014ce3d526a9f07a16cc66593c58575196a34a1d68a22882bcc391823ec4deb61af3fe09cd80
 EBUILD libkcddb-20.12.3.ebuild 1129 BLAKE2B 9ef03539de766ab9b235d2a7a41084c5e2b560218a6b61e44a4af5ad250f65ee50f2afb32fb47b8dc17f5e8fc82fbb48ef3228a921ebb7289b2d9560abcb1c61 SHA512 7165f458cfbb4f7b5d892623861685c098b20b32ea8407fe9225e53dbafa437f2f510792d55f21ae50713ebbdd19baa56580b3addbaa7a551905bae8c1615e56
-EBUILD libkcddb-21.04.3.ebuild 1074 BLAKE2B 79122a90899ea433bb5ff82890e19e41cf90c19286dc7d1d5b3e15a34b44f42d1793d8ade0535592ab5fd4c48c79286eada96e8ba8b31ce9766dda8fb76629dd SHA512 ea311defa60d5b36b0597a318ee0b1116ce1af89335107f86f9c9182c9ae22e2afcc06ce5993505a3f9e5b945190ebe20d64d35de4ba320d5b7a325fc45859d6
+EBUILD libkcddb-21.04.3.ebuild 1072 BLAKE2B 8a49b6e485bf28fa417687cf15459ace6de27bf2c7b4013499f0dff3112b81d38168fc94e62c2ed7e16217e5823434651d23506dbadf72692cb7ff743a07a08a SHA512 7a79a8199a99f20353410cf5211ce4eea954482707a543d0da34c19d414af42f7d5f8e23d49e0889a0a4d6ad97dae77fcd75c4690d56c691175d5cf7f2dd7523
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-21.04.3.ebuild b/kde-apps/libkcddb/libkcddb-21.04.3.ebuild
index b014baa69231..7a6ab109879c 100644
--- a/kde-apps/libkcddb/libkcddb-21.04.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-21.04.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE library for CDDB"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="musicbrainz"
 
 DEPEND="
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index c331bc80c33c..381f639c799d 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
 DIST libkcompactdisc-20.12.3.tar.xz 96728 BLAKE2B 2194d8bac9dd07283a6defcc32dcf53ce3a081bd04d8f9e1c174d96cff813519b99e760ae6393bfe1d30b943250b931f1b761c37983bb21a97b47741a8aa5323 SHA512 cc586d297970304bd845ac8948912753e22d9de8a22e039c6f0a25083c8601bfd21ff831d863786f6db58c990a75f942fc3ce3d3c49bdb55e9a47a2dfaa6192c
 DIST libkcompactdisc-21.04.3.tar.xz 97152 BLAKE2B b91e174c465c4492afa703b7fd2f33d31e175690fe9565f845dc2cbe6888c0b5c326d1056b16cd25944af00138094cfd298f5a49e61aee7b93d4d210cec44ed0 SHA512 d41c7782740255ab5e641f22abc3b821506a0999be023cdfbe02faf081227255a4a53c6776463d8f912e268e8dd09a0c99dad20c842a8550085c499fd65caa9c
 EBUILD libkcompactdisc-20.12.3.ebuild 637 BLAKE2B 2b9d6632251a8b3e5ffa438ee206003d4f27661d69ec002ad5f47fb110170419b7fadafc17da866cead42512a7ec59c07d5323e4394ccc6fa0fab954f1762bb2 SHA512 737bcda4b8622cba9b740ddc74ec8a08fcd827002156a80bf88ecee98cd427b2ad9b079c6dc2706d309d453526b812ac57af22dfa75be0bad0931cecb92b4957
-EBUILD libkcompactdisc-21.04.3.ebuild 599 BLAKE2B 812033d1cf320bcc516258c635d26851c83849476a203213b20124cd0d364e9e3ac3fc010ca9cce6a42b1b5821d9c606f3d42be2dedf405bde59150471e7754f SHA512 68baccc39571db5c4b0d59de5ec0dfd900d3d45accc9d4dd371a70ad925277855b5d2d22d9339e6f5c5f0b274b00b46ed357229dcfd39984f8d18af563fd98e9
+EBUILD libkcompactdisc-21.04.3.ebuild 597 BLAKE2B de69564625cbee8087b6e2977607aef59b026cf4425de378660c2045d32f2146c180e78d26b57e99eb4024b4221b52eda093d877192f50aa86ccb6ddf0a5fafe SHA512 a835fcda47af53d50c01c2aab2126e7627e134689b78d8735051b696cfd2874728777a0b53b050e700e8eebcbd68eeed73339dab34d2e43e8e79b97e000262e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-21.04.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-21.04.3.ebuild
index 3bc6c48ff948..b79f23af2a98 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-21.04.3.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-21.04.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for playing & ripping CDs"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="alsa"
 
 DEPEND="
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index bfa972c15f71..e35f6e73011d 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,5 @@
 DIST libkdcraw-20.12.3.tar.xz 41956 BLAKE2B a8923c7430bfc0d309abaf3381edb55905921c205e3dcb736b56d7ef54f9249d8bff49b3724fe3a4ca51863ae257ffd6541a3cae1712b59bc887c8cb8aebdb69 SHA512 a1b89a1c4732958c4432830e5b0ff10cf447c702740d43d70a0530e04d5ca8efc3638a41dc74d7280357af867a0443e35c0ab758e1ed6fee22695aa4551ea039
 DIST libkdcraw-21.04.3.tar.xz 37196 BLAKE2B 22ba77fcd4c2e645bbcf9271f63271be34fc33b6e35210dce5532be32ce59789b31b171dd56a2b0ede86ea783265a9cc273cc76c5beb1a4a473a863536f21824 SHA512 a319fa7cb1b06054bd43201faddc251f9a35bc0c10d71c06c0e1dea8db90847c68ec20653373e69df9c2fde7f899d0ad62ef3635ded3aba8bb379594862fc611
 EBUILD libkdcraw-20.12.3.ebuild 358 BLAKE2B 5c10569ee6c391389ed343beb5d26c64ffefb91eee8970f75d2469e247b7dbfd4075279b9d828d0057078680d8f0d6a0f46e3e3fb0719825b81eebf3a2b7ec3c SHA512 1e09358a49a44381be56393567f13c3e3263442c3db985c27ea4df851c4cff3839965571c965cd1d7d54e142ea691c458f37f8a80db183f4cdeaa707cde0da47
-EBUILD libkdcraw-21.04.3.ebuild 361 BLAKE2B d6a5712461a844854768149e6e83e231e9e36e6a0b624721d89c1862de0a1ec2ad3bd3654ad2879fc7d536f17965b610561d8b595f6009c885416699c60cd2a0 SHA512 ddcdd22116999a5328f2f51af1149981229a2d91b390af96c4db6aafbb5c8ada9c699110b98b7a81bb3209fc92b2718154857e305961363ac7486e0a07ca5de9
+EBUILD libkdcraw-21.04.3.ebuild 359 BLAKE2B 4f5bd834dbfae81dc8e1fb923d1647ba0032999e741e79d39a23741cc675a4169961450d3afd8f82c841a83d956cc74e2a39d349a28ebb2e5a3404b1578de0c1 SHA512 0b93b03b9bb32e8f421457f4716d4613b21d82afdca043a66a7e9fea766583697c53f9609893ef74f0d0f8a62c5f8b264cb83e05c89475b5fdf96109623b01fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-21.04.3.ebuild b/kde-apps/libkdcraw/libkdcraw-21.04.3.ebuild
index 0a3e859dbc8a..9bf5dd39002c 100644
--- a/kde-apps/libkdcraw/libkdcraw-21.04.3.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-21.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Digital camera raw image library wrapper"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index 1e3d58ba966e..1802d3d444bb 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,5 +1,5 @@
 DIST libkdegames-20.12.3.tar.xz 6389576 BLAKE2B 9d7be68bc6509b99abc5b4a2b06edfaf89737fc589c5503f255560b9cbbf8c00862fdd10bc1d3cb557644b52a0b251ddab81a3104b996e092a2656f171f115fe SHA512 a9b02c395b8e025f68b43f7bb5219cc3407ce6bbf9342c1542c53bf80881354f5410820f3f97dc496cdbc7dbbfd8c72e15b0fd07ea504235f40c9e3cd4123756
 DIST libkdegames-21.04.3.tar.xz 6403228 BLAKE2B b6b14dfcfee44ad65a58c1ab5bcd975289b86bc8dc7e5cb7867f5d0c0b8e508b620a568840dc2548b65c33c2e81b76a32ff3e411ffa669ac6bd9cdd79c2aadce SHA512 f50b20e9c62f80ab76e87ade191ab45da06fe4113fd2f6a431b926a7d6d0fd6f111258ceeb793dd2f6831f88f2ed436355911d7ed6ce6935d2de65f56cb82111
 EBUILD libkdegames-20.12.3.ebuild 1470 BLAKE2B 0b82045f8fd46874203a5017798bdacbdb43c8b0035b7e46bbf6001c43d277fefe2f6551688a3e72da2683f44e1c27d1eff75fdc02673893758178a589647b84 SHA512 edfbb4550e1b6d4173307e8425df5285e733e901e4a4dd13838479a09837192b3324f698f56630dec7f35bc65078e0621ca4a8013b2c01f6c63f8afc319b5301
-EBUILD libkdegames-21.04.3.ebuild 1473 BLAKE2B 887478cc6bceede1de0a587ffca30cdc5a9e88496a06b71f815411cc3a8b167cfd2b40c84429f055f8311acac048cae2e854c7d1a1441ecc9ba089e8f2d3da67 SHA512 dab8a4eeec25e692286306ce385ea6bd2de2588ed2fd090d6b22212221e9659e19a9d1152e58df14e2f78a689780e53fda81bf43da07eac55ba6f82778bc0b79
+EBUILD libkdegames-21.04.3.ebuild 1471 BLAKE2B 991ebe8b63fe14cf6418642baf9ccaf72b62b023865be0f8076c795ec6173f20f773704a3f1fce735b1526c5ed6f7aaf9b570b4cf3459cddbf2814282a0fa56f SHA512 584272f218ed93d6413fe1b247288cecf8eabba484ab177ce75984c9acf08b165afd7e43dadb67a0443cf91f340e8178572e7ee3e79526a6dae18e9b3a4ecc38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-21.04.3.ebuild b/kde-apps/libkdegames/libkdegames-21.04.3.ebuild
index f654013665a9..8584f7cffb08 100644
--- a/kde-apps/libkdegames/libkdegames-21.04.3.ebuild
+++ b/kde-apps/libkdegames/libkdegames-21.04.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Base library common to many KDE games"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 586186eb1fbe..5a5a02d746e1 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -2,5 +2,5 @@ AUX libkdepim-20.12.1-unused-dep.patch 1208 BLAKE2B bf799fc0c6fae2c87761a02a3c3f
 DIST libkdepim-20.12.3.tar.xz 238528 BLAKE2B 4187e09fd31348d4c0d8feffa72e394d7777af6897cf80605cea7d3672acaf651fd0646378c9b9c87469a66cfb9475ef2a06f5395e28a9cc5a0e2a9697f97b06 SHA512 9d491c72cc5ab5745380b3381b50a7d2e94dc6c5b8d52fa36f26d8ba7666635a97b412294211f7dc032d5aba5bb4ce97d499e22218f11cd6f723d051e452fd74
 DIST libkdepim-21.04.3.tar.xz 253924 BLAKE2B 13324c2e931d81ccf8a4970551f636654c9ebbadff353ea33c5308c61838d6575cf5924a693f65c984bdad66c4d78fd6e73e1ec5100665f5b5e565843f090848 SHA512 79cfe0aa5095246d407d697e05916878a74cc021368f4385ecbd4c92dc87a43b8b001ace84b3f40752d549de1940f65acfe709da4171e2a3a21a9c335c090bac
 EBUILD libkdepim-20.12.3.ebuild 901 BLAKE2B 1668c8e957ea6ef12a6dfb96b8db7d21fd0ee8910334c06f2610dcb09f6a72473ffe422ace04d8b413929a6e2525adf0617bdc05e853ab10ac87e87280623167 SHA512 9bc5216a70ed4309a47cb4e8a31e8423449312ab26fab8e80e0b48021c5af02ec6a26fbc61110dc01804bf8718dbab4ffd1d948fb1ac3384e6abb33a5ddf2564
-EBUILD libkdepim-21.04.3.ebuild 846 BLAKE2B 3c7624d98703c106b33a6dde17c0ccf0200945f7ae057cebfb291315373f234c6c7abdd2ace6112f10ce5b24775c527e97d455a649902e0ce2183b5b0c816f3a SHA512 5bc2b75f21b0d8519f6f3230aaf90667a5cc4e594ec1958ce22562725a8530f4f506167b026335d4490db3feea29a137a3ee42c5ce7fdc6c05d78fb15ffea3a4
+EBUILD libkdepim-21.04.3.ebuild 844 BLAKE2B 757a2b7ee549cdce977ed6ad9c28e45e83fe6efcc5efebab19049dbf8a009b92d719c0665c2837b40923a9b1682313eafa0d418c725d8c356c66cf12e8313676 SHA512 07e239396065085ee702096c1be0bb7fef2e5ad5fdb132b4df7443e7cb85e44fd25847133b350e4fdb6cebe2d41f5385b2c732d0cd052bc41eb965b91b4df68a
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-21.04.3.ebuild b/kde-apps/libkdepim/libkdepim-21.04.3.ebuild
index 9bd22162aeee..0f68ac8b0c42 100644
--- a/kde-apps/libkdepim/libkdepim-21.04.3.ebuild
+++ b/kde-apps/libkdepim/libkdepim-21.04.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index 66a45f8a67a3..0d3e8c7baddd 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
 DIST libkeduvocdocument-20.12.3.tar.xz 211096 BLAKE2B 64b89f8f1741632d96bb6455133c2c513a46a1870f5feb6679a22e37a7f760133320f074d5916a17f2bec31faff42908ae5df5ae5ff393540a47c8b512c399c2 SHA512 6ae7dfe1e22c0d412efe3c2d10f879b2fa9f853c4f9bcc41a86f4ad0d6031a8be57423cfb7b8badd666cff7666cfff535017882231d589e00d1ceddca6c59684
 DIST libkeduvocdocument-21.04.3.tar.xz 217404 BLAKE2B 5751b9c6ed0cb7242d4a3494b3746c5c02bbafa5c63338c7ff6395e58d8eae5035687b3690e28ff34b9642c43280229c0012f24c5a60a3799d4770e1dff45bcb SHA512 24362a485cbd4348a40b2d96c51756ce7f962ab7e3c156d68fe1026f83e70a23f6c52907fc10a4bd74d4eac0ff7f2a9163bc03139d820a61c142e40855ff31b3
 EBUILD libkeduvocdocument-20.12.3.ebuild 505 BLAKE2B 99872f55f95ba8cace7444ba387e4785e3edb0fd4a82289e512522a13bc142c873e5a3bfe6a34b17adfe3a10546ff1727634d11a0b9afc1a4a92d442c386eb92 SHA512 bd8b6d8f9cf32a745e231b4d4d0c64bf08a59e7890384e278728c7eadc0fc1ac5d5f32073dbd4dc6bbdb759811fecafd9c50d25244ae818f8fd340a9cc2a977d
-EBUILD libkeduvocdocument-21.04.3.ebuild 508 BLAKE2B 9500bb0eb0c0f13eac498090e0582d5f3f685d3410550a7e0f5881f9159bf822c16a23e82028313349a7e5dfdd652c522473778cfedf829347111da278dc163a SHA512 6e140c6197c26cb3049b33f2c7c97bad4644af840bbac8a99bc7e1152eefb7010395b32878d8f79a3c367549e485b14318b319034bdc02d6f2d208bf0b6fd3e0
+EBUILD libkeduvocdocument-21.04.3.ebuild 506 BLAKE2B 03c07c232de9dd1c6cea5f022548d3d2e62382351c05f52a1316db70ea457ca434743025e8898e650914f4da1b38e51b5cb903244f36b646d3ff742770bf3cef SHA512 94d263fdff23051588640cd23e3bde73ba130a638d9636e75372a0fa854e46f9491919e047aa471d56c1c667f07e00a799eb4ba8cdcc4473ae9f2a584e808dd9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-21.04.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-21.04.3.ebuild
index f231af33dda1..feaa995e2ff6 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-21.04.3.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-21.04.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for reading/writing KVTML"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 6b8da12dce86..84f6cec48b83 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,5 @@
 DIST libkexiv2-20.12.3.tar.xz 64724 BLAKE2B 1534d240592d3ef545e48c4d1f00acb40a556966dedfbade2a683d2b4f53a1d7b943cf623b64746c90fedd36bc8f650e0c80f2427d44fc68d57fcc4dd1884069 SHA512 35fc12b5f1dbe8aa533370627529eb46aec05085c71cd5dc2858fa9b52413afd5d706c099ec2e74e7827bd7f5fdfda323e1475b599ab67fe78a4a5831240e217
 DIST libkexiv2-21.04.3.tar.xz 60268 BLAKE2B 1f6210e20a701d87250b465658360cd5fadbda006b9604844c5af76b841a2b25618712c66d934d964695cc83952c346a4f9c2439a976ef03b1c7767ae3945a45 SHA512 0295c1b88744f350846ded713943733de6a0e1d4b2d92a09e1a44af57bb94a62e63420b9c911dcf0e3ca89e7df22a3424981ee38d8f4a299cdd437ea3f12bf6c
 EBUILD libkexiv2-20.12.3.ebuild 354 BLAKE2B 58e5e1fd50812ee00c510086a5d6cbdb6ed59b72b7ba62b18740528225fbb4dd0de719e0d0d28949f6b9c8def55b2472c78d27c01f452fa956125ba4faa6475c SHA512 ab11ef2335831ee5d900e9325ca9221b506e1785dbcf5b72851d069983ff67cae4f301e6dc56bf2c18c227a97543089f8262bd02ad249fe9b8498dd54b8ea52b
-EBUILD libkexiv2-21.04.3.ebuild 357 BLAKE2B 1e0eca09926de3a29ddcebce0415932861933095171666626addda7fbe327fcdbbc0b77b1defe833db88d122209aaedb4adf5dbf578432a76dda83ce7585c3ba SHA512 9788378312a7335e69df548700ff41fce5d8c64e05e05e8562874e6c8f2902546317dfdc3f13c0ded7bb9a3358c6b017c16b94202b0352e4480f7a2af10faf0f
+EBUILD libkexiv2-21.04.3.ebuild 355 BLAKE2B 8282b345fc5fc66c8a10e9f74a04e3a0de341b1513564b02f2e84723969b55ed57c428b64ec3bebc018b85ab516d6053ae9c979ea353a036e50491b47cafbeae SHA512 bc3ade8e20f49f8cdec5cba9bc28b1f80c216ce4ccca2bd5a1c77babbd75fd3f386c484ab76caff32d3c1eab43cb83f98d72c959811422c28b5565ece4b28963
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-21.04.3.ebuild b/kde-apps/libkexiv2/libkexiv2-21.04.3.ebuild
index a816779c1252..f0878c17c60d 100644
--- a/kde-apps/libkexiv2/libkexiv2-21.04.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-21.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wrapper around exiv2 library"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+xmp"
 
 DEPEND="
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 078e042d0f7f..12c7dad4f2a2 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,5 @@
 DIST libkgapi-20.12.3.tar.xz 246100 BLAKE2B 8032ac37f983c14e16c37279bbe14718cbf3ff5123db01dcaaeef2fc5b67454ea638df44b668f92f9c00a3ee8578d9b5dcaa00604ecca32b0b5ce14d8a81015a SHA512 5376773bdaad0970abc1a9fd43fc904eaf39601c56fc626f2d08fed5b2b48ee0df79c18a33d9426913efde048642b4ced59a29cb5532a0e4661e565beb30283d
 DIST libkgapi-21.04.3.tar.xz 249512 BLAKE2B 06a43e967073057914a7a5d679b2c3c3bb3fd9171a49f773ba3b4d75a71807869766f5aeb6003d1d797f22fd0c0b7be4dcd95f580228d6909f05158206706d4f SHA512 24653e1fa0b5c31378d69a5a3e59d83c82d4e3d12469a062318a4140474a555a71b873291edf6313acf995cadf46ad2581cb8017abd2223b125d31c9a124bf8f
 EBUILD libkgapi-20.12.3.ebuild 760 BLAKE2B 9d3b7ba26dec2806dfbbc083eb5ef4924b900aac5d25b9b297bf96b121f6d0f3065cebe1e5fa93e6912cc9d474145a4aa97559ed066020b6a58f02ba320a5f06 SHA512 f2e578e67177d5fee67e91a762c8edb318f7784a525454e4f365c54a19fa27f325a13345e1e4c2b22f034facbdfd39fac63d42d07bf9c69ab6f5324cc5162497
-EBUILD libkgapi-21.04.3.ebuild 763 BLAKE2B 54da50c1037dda477ed5ffcc4d7e5ec92773e5646851a17bb9c6e320676d3556651c1559d855513fa902807693383c35b9c73244d38d36e1c4c763ee8dcfb356 SHA512 613dd0c36357fcf9992a9ce359c5ca2f10908e46e3eb6b8395b832d01a82c9cd0d60bcd8343696f0b5dd1198f75e8d50cce9e6dde28f97bf8cee3800bf756a91
+EBUILD libkgapi-21.04.3.ebuild 761 BLAKE2B 814d5d6b5601906c2d0c6f8c850aabed2c3adbab317108308af753f4035ac99ffd6e54eb3dc3abc678d4bf4cb371a1a60aed1c6fe8818e9ccb6804da99e8c890 SHA512 1317705757f2550393746f43c4168bd3bc8111be88e5471f426a1286e79d61f238734091717001918e0912f6ff9b083051319e9d12479f5270070d3064d8ada6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-21.04.3.ebuild b/kde-apps/libkgapi/libkgapi-21.04.3.ebuild
index f5c38dfc608c..1ca1dc0fdd6d 100644
--- a/kde-apps/libkgapi/libkgapi-21.04.3.ebuild
+++ b/kde-apps/libkgapi/libkgapi-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index e7a2a53c5b75..c73aca3cb2e1 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,5 @@
 DIST libkipi-20.12.3.tar.xz 103628 BLAKE2B 72861287160fab80538784cc1ced1ce90a5907776aee917723d38565a3101d2480db7894f884b2d69372a985a14c72681c5659bdeb61909850feb91dc673963d SHA512 fde2b5026423b39a55e182a85ac0f1c8ab187ee24a68bd5840f1acb9ce16cb6b8fd633572f017b2f8416db598679f0b2022338a91c3a027f918fd59928f55368
 DIST libkipi-21.04.3.tar.xz 103416 BLAKE2B 9459a2d9d2054ca53e2ff224334c4eedc5601b23c84b150a6dff6e4f88b25285315eeb9a2cc1d4e844c95d545368e2e98ba10d9f614ada9b4f206fe9e3abcf66 SHA512 5f94cf57da4578d2be02947b7e67d7e8b580757d78ce7de5fc08698c9a8dda2879af3486d0f40504a25b40b51bf18658f39b3ff38e4ebff33aaa18a249983a71
 EBUILD libkipi-20.12.3.ebuild 569 BLAKE2B aaa6a7c01a40ceb33e41bf7997c6d9bd153489947bd0625de2d12ebd712eff2b55d3375de815bb1b19b7db9bd0143ff5097102a4320f51667d978af979bd664c SHA512 9183639803c519e77117224655dcc4538b515c90ad4aaf6f1f2b715efd57424516f022d212451e90842606ad54f2c89a3c9445b085f7087bcdefe5cecb3028ad
-EBUILD libkipi-21.04.3.ebuild 572 BLAKE2B 37680df8559dc294621feac1f0cb3563582cec63828c4a5462fb827e2e83495ce139e3ff83868339457eecdb7697207cde767f2a8b3cae35092f0a72af7e9ad5 SHA512 6b8f29dd196104bfe35591bd95192e7a20e764098e76da0e566a787c96d3545cb6b3984edda44c15039e54873960cdcb5520f10f01065714b7d020fdf7dc4753
+EBUILD libkipi-21.04.3.ebuild 570 BLAKE2B 4c357d0e2f1ea236e16be0fc3142adec3320700fdaa4df4486a38ef50c896c86795f2ee36b3c289d88e8d216a73eee65d934e58330429f68f95d9a32ce02e303 SHA512 336620321fe38cd73e2f4db87dfea311bfd4d126f7ff8c9e1c47f2012d8578dfc3dd23fc826cde4991ab62f1b14a14134a535898427c7b78781d33cfff21421b
 MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/libkipi-21.04.3.ebuild b/kde-apps/libkipi/libkipi-21.04.3.ebuild
index 07e21570c664..fa0307ed9570 100644
--- a/kde-apps/libkipi/libkipi-21.04.3.ebuild
+++ b/kde-apps/libkipi/libkipi-21.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A library for image plugins accross KDE applications"
 
 LICENSE="GPL-2+"
 SLOT="5/32"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index fe0d03abc104..6169579edae5 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,5 @@
 DIST libkleo-20.12.3.tar.xz 358540 BLAKE2B 393da453f558670d448304f79f381ff948664422bfc49f89e706fe4e70b0b2ebc46eeb3b5039718c1822e0815d0fc08628ec50327d3e408077351d8f675f8a43 SHA512 006b6074f6e77fff1e95be7ea209042306b5dfbea6e99ee0502e78cf37709e1d8e4e02deb3011a434712dd98d62b2f1fdb5bf9140913def8075ca45e67e45623
 DIST libkleo-21.04.3.tar.xz 384252 BLAKE2B 7ce806619ca1f83f3fda727d219e58d34234afadbca38ad8540c0fc298632202627167a6feb446f0e658428f3db3a914e92f05500f9593a4c8a6cd5f802e94a6 SHA512 3f302d11ff884901c880d9732a06128ddd22cf525b0ce9f3a3da179cd9543b8b3878fb508863fb4aa80f8591120485da08e5b55f7de4da9faa0ea50ba7d1628e
 EBUILD libkleo-20.12.3.ebuild 960 BLAKE2B e712e645d3daeaff62bba6ae1f933c4fc0dcb18cde123379e16bb0dbd79a11b21a266b3ce0f54208416b846762917bc2315c16bafd798565560695354a4ccb53 SHA512 aa13eb3f1e40d070e447324a17052a6051ecd5576234dcbac90a85ebc6cd2200fdd686ca525b7245aae793987f95b5e6af15a193e6629c1a7f6ac02c75c4dddb
-EBUILD libkleo-21.04.3.ebuild 963 BLAKE2B d7160023edb697767c5f8e6e5475431cfd17664747e45a9ce59f16a591b0d580accdc582dd757e3bc5f8b9c250576da622a6aea5859ea8b15ebf49af1ceb3fe2 SHA512 53e591f4714fdd2fcc9f01227096de735052255da3d39f54a5c73dffe37b792f2fbab223811eaaaf033c5318c4b10ec8489c5a35f0e9c290685d26789d201034
+EBUILD libkleo-21.04.3.ebuild 961 BLAKE2B 6be5fb8769490a646b1c9ce03e18673e3a3e46b1fff1acf016befbab9ddfcffb2507389c94b1566374224c50f71de350d4c0a2baa2eecd613430c6c69aeb2a81 SHA512 ebd83ad2a841b0d8e27bcbcb94489cb73e838fae42fd37137cee4a9c901b9366201a876b71697de50b6c280cf793366673b446636f50f8fc2cefe0f9508fd7b5
 MISC metadata.xml 368 BLAKE2B 971372ca098974cb69299f52e0b44e479517a0fb2f70b6c23fe762d93675674d62e46d5d4faea403edba12828ffc0c32fa274d287d1c71ff499df69d2e52a2d3 SHA512 dbef1e7970af1f4cc05ea180f5beecab9288d5502c365d2dcbdc418a67868baa9245bae8ae0c9d637ddcb3f88a03061285fe144a3a117c722654045fd7a4a58d
diff --git a/kde-apps/libkleo/libkleo-21.04.3.ebuild b/kde-apps/libkleo/libkleo-21.04.3.ebuild
index 46f818e5afda..fd4fcb262f8b 100644
--- a/kde-apps/libkleo/libkleo-21.04.3.ebuild
+++ b/kde-apps/libkleo/libkleo-21.04.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for encryption handling"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+fancyviewer"
 
 RDEPEND="
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index e7fab06dc6ca..eafbc2e54f3c 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST libkmahjongg-20.12.3.tar.xz 1691308 BLAKE2B 0d845abaf8878a09ecd00f2cef0a89861f3bbf09f4ad793fb1316c8bbe570ac23ced668e3b8ff1a0c0f5a39cd3146e15c64e4539e85d55bc1638c9ca914c741e SHA512 c4e35ec5f60ab6c401ba278e69ff2d46ccf16fd6a5f88b1dd1fa4914c030c52c7a055e473a9fb14e87ce0ca9ba36d2229ff57fe985bb9fdff29285d43e98df0e
 DIST libkmahjongg-21.04.3.tar.xz 1682112 BLAKE2B 284c3595edbd06bbb693d3cce2b068d8e722df348c83e423d599dcb1df2b057b2d47f0720ba9bab1a4388f966ab8ada77d820f5406971be51f10a565ad7a3810 SHA512 30b8a488f2dc50538ce0177807d5982826be121cf36fb5134bd94e9df66babdeb532f80a50abf2caa250252531fe3877c599f28c660c6fd674a8cecf655971ba
 EBUILD libkmahjongg-20.12.3.ebuild 652 BLAKE2B afea68c16ce20b31b5253d6b2b6d6e09089fb9164facc9337fcc2e84e587520563ea0782243ad753304f0c8ce6142a74f6d056f24234a49346eaf473207c9827 SHA512 b3ac9074e836ea56aa6fcd5a9b858d0f68b378b00c66ab0cd6de165953f900c41d7f759cfdc23680b4d1c34241f974bd4ac0807e8768cee37d580d2a2d8b41fb
-EBUILD libkmahjongg-21.04.3.ebuild 655 BLAKE2B b03ede3faf8a019b812a0189d16ba9e835fda57ed9b5281f43a887d97acd968fbaeeff27f8fa8fd233eab7098227892a8d99f515e6f079de3ccc08eb259b915d SHA512 68fbfb2a5acb3ed6862164277684263c8154cb29fa5db7ac181159ae5cb233edc12f2496e58e4a60f41957fb72cfab83775e9b97621e90b0bd392d24d9dc8df0
+EBUILD libkmahjongg-21.04.3.ebuild 653 BLAKE2B d954733b0429c4cf70dea79a71dd2e21fd5be72ef5471f1450539e23339196957f70729c4abf74183e1642ffeb874e78e638e89e8080b3343e87330d9389d27e SHA512 1b6d3763a859d8cdb459755be8fff15981988759fd123264b132d6b14c920258a9310c5eb378402c0efda4d1521f79ddead6db591f029c15caf829eed2dfbefe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-21.04.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-21.04.3.ebuild
index 40d7c1e58a09..b5e84ff6948e 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-21.04.3.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-21.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index 80ff2fc44896..faece23fd983 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,5 @@
 DIST libkomparediff2-20.12.3.tar.xz 159344 BLAKE2B 47c64009b1e401cb762e249468934a49be28663041bd6d37fab1db11224aeeb82e09581b53d819677808bfc7957c783c120b59998041c61397e3346b283f5d85 SHA512 5b790d2c0ce5a73f3b87711df7ee501122e5672f4985487436968791e6bcc8a771093e755c7cb58fb4e589e50422be9b404438ab706c60e5bd88edddfa289618
 DIST libkomparediff2-21.04.3.tar.xz 172344 BLAKE2B 91fb20a0dbb69b3468092fc04026edbe86e0cad1c921638b6cbb2a05696c1fbf79e9b91844e492a7b2d14b3451f569ed39fbcbf5b6725fd0af7fbd0c647995a8 SHA512 51b7f092c154ee557a512045a43fa83229da5586911ee5c6cafbcb679a69d74d2fd76079ae91145465e6ed52559cfc70a22cfde0043db4a14f890d8a2818dc7d
 EBUILD libkomparediff2-20.12.3.ebuild 660 BLAKE2B 650e1ce37f9ef64f19f017120d5f75857e459fe2b6ee7d2183b4f5fdf1a0f55a864abd81a21d7bc06b51f0b89469509a0a2d68d19e3d32d3ac56ea7a3617f242 SHA512 48d4075753d4065bc5727f774ba424c771abae636c9f6f8cd881ad83c9d2a89be3997e538016f15569b5ca1449fd67c46ced07e390d1bd294cdb13592eda23b4
-EBUILD libkomparediff2-21.04.3.ebuild 663 BLAKE2B 9bf3a3db9625e9501e2243e20d8a661a0bcbb020d92968db3bd88a8dcbc846a2355718449ce87b180854981c21d85f97d2b207aa495b9c47e193b2c53bd4c618 SHA512 bccb72d519b6cca731b992a0248aa925f31521533ae50bf6edeecd8fd73576cfc255d80713b08dbc546608bc3767ba36679e34ed557a16655a4bd0e2e4b742ea
+EBUILD libkomparediff2-21.04.3.ebuild 661 BLAKE2B 1d1e23bfe687691f67c10ce5a163fe6f8b32ee1065709843cbd3200b99ad936a5da4160355d06f1c15648c36b1d2c7263d8cc4f8eea3b7aeb3f64c767ac17d2c SHA512 a86c142a5fad6878b831a94475c977818fa3ae230407206ffad2f832b1b8973e7587a21645c87bacb4747ce0adedbf32018e5cdbf3a21b6834eeeee7826289c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-21.04.3.ebuild b/kde-apps/libkomparediff2/libkomparediff2-21.04.3.ebuild
index d77d042bdaaa..4d726f88c600 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-21.04.3.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-21.04.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE library to compare files and strings"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 892004b61b71..332cf6c13818 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
 DIST libksane-20.12.3.tar.xz 145464 BLAKE2B ba3cd3dc9120e16b340be16ef9657375ea8ee0e6957b8e4bec0fbc6d137a05f384e7f82148d410aa55604258e6b533018893610c9db4d3d98beb4909ba48b292 SHA512 c0fa893cd8e18bfb9c9372b43378a4cf384984359f92c5a433e0ab78c56c17a7a68927e0492155ed376e82e52127ee8cf077bb36a7feb5473aefbeb2dc62f9f0
 DIST libksane-21.04.3.tar.xz 145304 BLAKE2B 0b6a44aa21591051395a135c37e7635fa54eeb65bb7aee6757db0978da10ceeedc71c6eee0ed881deaa34f01a2c123488ae15f1e528873d086cb0c0183ce6845 SHA512 33676207ceedd6e855c797cb8f2fe35ac920869f4a9e8a76ce4a278f24db32e3c7481071d09ca535c5ddf9641d20a04d8a1899521985c6d25b30b78b7d9c0923
 EBUILD libksane-20.12.3.ebuild 709 BLAKE2B e53b47361df067940dfb8c4a2b038ea0abff201c81d86b915986bf89394a7ee06b3cfd650e294f08d64bfcee104734c53574fd7d8b481255f6339ab525f2d5aa SHA512 f7209bfce602f6947b978626c1e5cd90583ac645e2f5a6dcbe52c3c5f372deb2eca6a4407f50e2abb8468ccb8dfd61cb4c92cc978bfe73c537695829b227b776
-EBUILD libksane-21.04.3.ebuild 712 BLAKE2B 675ca910123c9b1fc7397f97a9702afc1734d27eda18f1dd3f41a032d71903fc031c389a8d4e7068b2b1a1b76ca9301c08fdfb767e474b608b07899786e7107a SHA512 696a94e7c7d8dc1d1b2488eea41ebbc38568bd747466a69b8b27d6a753446b51617b1f8f8b08a315fc2b2a24739163a972b92726a76fb17b380924214e21ec81
+EBUILD libksane-21.04.3.ebuild 710 BLAKE2B 02a82fc42d53e6ece49e0612d8d3c28d95efc9e73a0cad82bfc6a83ba3f06609ce93f3640a426b15c613327d8118a4a6c2003f809713bfbe230c70c1e5457787 SHA512 4330fbaf4258603f770b5dd583a412caf3d609c7c13e0bb53f4fa3e37e266a642327974f6efe514749e26b5c9c7951c662b126503d30d4587d7707a4dad730a8
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/kde-apps/libksane/libksane-21.04.3.ebuild b/kde-apps/libksane/libksane-21.04.3.ebuild
index 9fcf807b7f3e..58a08b8d2546 100644
--- a/kde-apps/libksane/libksane-21.04.3.ebuild
+++ b/kde-apps/libksane/libksane-21.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="SANE Library interface based on KDE Frameworks"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="kwallet"
 
 DEPEND="
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index e44affff3cc5..6c8c60843285 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,5 @@
 DIST libksieve-20.12.3.tar.xz 558368 BLAKE2B 8bec3f84661050bbe67ced76e3cc40d0fd9e05516042c31d3985f8805c2e38f9525bafec684baa6fcd4fc4bed9e56ed012a85968facee49622dabef7d5d7e4e7 SHA512 0782de6b15000e97194c111e6b692721eb89e0414b4e854f8ad9bf989ad03b6792b4ae9af39549521db2f4d4c69ee07508c283f666c74d64ab5a7c51eea3091a
 DIST libksieve-21.04.3.tar.xz 572768 BLAKE2B 1c27c5187a443d1f27301e677a8832a0999d16faeeca84960c4f7188cb7964f4153a6c90b226f69306a3e723c01c7c6eafede7377b17335f142f02b87c9bada6 SHA512 e4780a17b47fb17a338320a6ab7edf078cf0cfb21709e5ca7c32fe78048ee0dde588039e8fb1dc93f97170d14f7ddafcc3eb50fc59300240773d567ce2390bb0
 EBUILD libksieve-20.12.3.ebuild 1406 BLAKE2B 1aaf734485b7847fcb0082a7fd20cd8fcaa4bd74818e383c602b175b3dfaf60989503e47b846d1eca245895397ac9b4bbcf218cc76ec480bb8ea5f8aa1700230 SHA512 eb534ecbf15581046eb789e8a1c00d05efb639e797712ee82031b166bc8c065ca62eff92e794f90e3e14d4a2ec4d3d8aa0db4397437c5330cd8efb05123422e3
-EBUILD libksieve-21.04.3.ebuild 1409 BLAKE2B 4a1a5582cc1a832df6c8c97fcb3da1cd9f3a98777c5a0f289cfa2ce1a612e3b614b118292e429ef5a61df31494274ccc0cec369cb719673ae687a399226eaaca SHA512 c78c1391716db1f66a9a2b3d173a00ccc7db090f2865490279b6e6f81db8511f1efc0406896778602d420684ad6f1ce15994a6e5d3e82c5881fbd6bbd38245b2
+EBUILD libksieve-21.04.3.ebuild 1407 BLAKE2B 0971705fb514a7714f629329e2404537c0ea092aeeca176ee059fcee53ec0248ec886fa9fc901ed13dab53fc6b1e39786ee1ed0882f079f5ab00ae138e71677f SHA512 cc7f84201b419185520bdd8d467611d353b27e316b3a1577285c608bfda680e60e56ace22a43a55ac267fec6420d78b6503a7ed9206e0a96f39c8e18df0fbd9c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-21.04.3.ebuild b/kde-apps/libksieve/libksieve-21.04.3.ebuild
index b74bf26bb410..e4ebd101285c 100644
--- a/kde-apps/libksieve/libksieve-21.04.3.ebuild
+++ b/kde-apps/libksieve/libksieve-21.04.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index ac6b676bb9be..384d67616a07 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
 DIST ktnef-20.12.3.tar.xz 299852 BLAKE2B 3ca027e7a7156215b4399f4e0e41c725c481802ecaa980b801e619447c59820b5d15f950bf6c4478daf1f5e389f1956d60a6b475695ebea05e9af86e1d3be61b SHA512 b6173d2db8e76060c470bd1cf4679d1763d586dad5d84de88a64b744c499901322f09548efa6cafd857680a491d18a83912c80da3ebc1d349a683793368418ec
 DIST ktnef-21.04.3.tar.xz 306380 BLAKE2B 5749d419c1c765f6a47903cec11df336797c1b20c22b72649d3814975cf2c79567eef891223679f8c20ec8b58b652416f544b246f607d87e3396d46f704c229d SHA512 e2d13dcf5ec40f777b88a662c85cccccbebb7a7fe24c980d4faa2ff4e1a9a1129dd59b6e05b2564c6884552541a53f4a3de5456ed1c51574753c2306c70daa60
 EBUILD libktnef-20.12.3.ebuild 545 BLAKE2B 899c524c366a750f1cbd1d1c0437919bc126d2fb7f320537030d45fa128245f9a81b54108647a2c7f7d38d530e3198d401b529b1828020e35f1295905b86eb74 SHA512 d21804eaffabc888b4add33d9ae58bcccd079f7b4ffb91ad6ba06a84baf33f0f6ede16d7482b5af8e9d72d72a2f0cf8bfa09d3daaafabdbbb24d45f2840206d9
-EBUILD libktnef-21.04.3.ebuild 548 BLAKE2B 008f3cf53f7aecaa9624d1bda5b12c756c0604c5f7cf4c97fb046ba51ef4d9bd84e5a92e898794da2839dc5b9f0f2493ad50ad2f7fa5454ade3a8d144f80f49f SHA512 1a49b1c76f543a18882bc835af2a596f834f8d4939f4b2e5498b26922983eca1a423b2737aa12cf6ed84e1b43e9de6405073cadb1d3c0d096125d661e22bb18f
+EBUILD libktnef-21.04.3.ebuild 546 BLAKE2B f5f3b3cfd5d3e82722487ceb4aab3972c89d202411d92a308a5d723f08c7147320ab92f10acfe31f7b540a70115b2b9838b8a135fd863e50ea1a61ec63ab4d21 SHA512 7ed99b6626af603f848c4176ee6877c3a3d8bfd897da2a1ae9e5e2e67c64a09d64b181af4fcbb1604110002de77e150d51cb7514ce7b143d00505570e896ea6b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-21.04.3.ebuild b/kde-apps/libktnef/libktnef-21.04.3.ebuild
index 2917e8f138b9..35cecd980ca1 100644
--- a/kde-apps/libktnef/libktnef-21.04.3.ebuild
+++ b/kde-apps/libktnef/libktnef-21.04.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for handling TNEF data"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index 430cd4e9e856..75fade01b45d 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -2,5 +2,5 @@ AUX lokalize-21.04.3-unused-dep.patch 847 BLAKE2B aaa6d5deb07d844f0c25a5d42f8fb3
 DIST lokalize-20.12.3.tar.xz 1995860 BLAKE2B 1d53d6e99936d284567f48439fc84a95edcc8c971f4732711ea5c45f39bc4a698ba5f7883ad0411e1e069a08d35630f37957e92e1ba11aedc7fb643b4c217102 SHA512 dd12526cbade8a71d0c0a395ebaba50b00a5357c3cdc68779520da1aec7a0dc2d87f29504f45315ccf5108346b60ab0df235a80c000ece9d9f5d434b91829cdf
 DIST lokalize-21.04.3.tar.xz 2023364 BLAKE2B 8b8790e72e1b4a6e7389adf9577ed1d392693ec14072d314d8c3d0e269a6d40c11acf22537bc328831de9a8e28a6b948fc02ac4956a325b887172e78fa56f9bd SHA512 b336fe464c123b60e4de4ba8bda0f34e2ba5eaf7708879179b9671bc33d8b031f81d595d089c24b4275ea56032e9867653cd98bf21c3d0c3db125564c057e21d
 EBUILD lokalize-20.12.3.ebuild 1965 BLAKE2B aa9b32239be3b55fd1e52d77e93394eae8f536fa8eb5b0a55f2f480e6fced9212954e2ec482b43b31b453dd37aeb41918cc1d2d5b77d74594b5a0d8d143e057c SHA512 f49f9b9973d3ffa64a8feca59ce5ac1b0c991fbd83e395f135de458118f3de4aa00ad994b76d6864e6ec25a06f380df54324d434c4efb0abf8311d6a066dee57
-EBUILD lokalize-21.04.3-r1.ebuild 1987 BLAKE2B 6c63a3c8e87cc62da92ddb2378fea0741c0687b337f0514a167d71f6fef6786a75d0aa710d5bd6b5aaf2bfca2b842e269c58606e9f20251ae4e27192fa4dc3bf SHA512 125ee2a33555a0e80b398e7f0eaae18fe1dfabaa1bc0fff7b7c135d30a1d1b3c25c29799a95998c1ee5d186f80a90f1e8ca19a887fe9c77c8482410d12406979
+EBUILD lokalize-21.04.3-r1.ebuild 1985 BLAKE2B 435c46f36e5f4fbc70a9d3139c12db8d7c09844c372b4e02d81802cfcb881b72a868bc242b4feda392c070d98bd4ff91888481c301a0ff8372e334cc620f4351 SHA512 77ccbd04b1ffcf738d22187435cf90adcc733f65694acd50cbc3e010a98d5d1c06bcd582e86666e58954c81f6e7c64d6c5b4fc472ce61889c33dd66a69076cc0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild b/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild
index f2f3f4ac0158..c6683738c665 100644
--- a/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild
+++ b/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index 8e83900b8bda..b23b4309e35f 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +1,5 @@
 DIST lskat-20.12.3.tar.xz 1225308 BLAKE2B 5648d5a4a9c6d34c03c19b2eebd36b62c659b3606c15a04d5dcfdd37dfd6d9f86ecc707c4a86cf1cc15ae29aa2795f8c9dab605c346ca153e3d4c207417a27a0 SHA512 8e06137de8ad315cd0c885c382de0e7f85d76ace3d99a110e7d3f17e9a03011ebfe392c6236a9ca8523079d635421d4fc9fa1bcc0865807fad8a65b1d8093759
 DIST lskat-21.04.3.tar.xz 1229296 BLAKE2B f274535cf19d9238fcb751e72a0162c81a888381957c25181cef15bfb7c17345c262a7ebb051dafa4a05e4c9523f7a6a73ebd8c022adce35a058fa825f55e203 SHA512 d15a94b083d553ffc1f87eca582ededa76d5bc0c8ca5e2cc730c912271e384a3a7a361a3a260a782583e69f835b00c93446cc21c28254339851d57e77b0be7c7
 EBUILD lskat-20.12.3.ebuild 839 BLAKE2B 19d0071774f66dcaf60c7a7f81a98c873f8a5a8b12dcf3416d6664018942e633f6e1d151146221297af77103122534cc5c1f65770cc2076876dfad9be93b7ce4 SHA512 a17bbfa371109f50ff3d00394e6ee424d370784746944dff99dc7ce815660e2ad48fe3e7d72ac4dc8ef5c0f52a8e89165363df0ebbfd62d546177791758d8016
-EBUILD lskat-21.04.3.ebuild 842 BLAKE2B a43ba6362cf1fab4b2a26a463d39cfe07276c9810b0299b1a53048fcacecd8dea69459f6e8ac53bc7798d699a1fba98ca33a7e39969cdc3a951ff5ab47d70188 SHA512 90cad918a1a074068f7ef2adfe29c7e7bccb2ad04309789ac625c9837b24f46c025417214732d14967a0194d8c0af774f700bf339926dc7f10fd635b03dbc960
+EBUILD lskat-21.04.3.ebuild 840 BLAKE2B 9dbed2c6925fee46087ab55a1e0b9a44e48ad9f8a70ab561d1ef30882eb198ca31f2502fd775bbfd7ac029c179c96a3c2042cc5601e35dc35aefb7e107ab2a8a SHA512 a7882724347dc238803aea71ff23c99853bc2c2e06b46dba0b3888f2a42ed7cdf61b54787c98c78371a14b6881c50fa8c92b313ca15de128d5f089b94f3bab0a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-21.04.3.ebuild b/kde-apps/lskat/lskat-21.04.3.ebuild
index c58afc1e275f..75d8b5f1ea46 100644
--- a/kde-apps/lskat/lskat-21.04.3.ebuild
+++ b/kde-apps/lskat/lskat-21.04.3.ebuild
@@ -16,7 +16,7 @@ https://games.kde.org/games/lskat/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 8a8d70246c90..dceff411c49d 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
 DIST mailcommon-20.12.3.tar.xz 723876 BLAKE2B b2c2ea308d5861af066d0d00e46ca50981b2d572e89be48c50b953bbe6009ca1c107f25211d40c843060006a0651eeb443516cb3c2c4eacb17514cb617892d64 SHA512 348c8ed4db7e4db234adbb1eeadccb2cbc85e59d47fca607b834ead5b6f65a0c62b9c1396bd34ee4eae91cdb95b5fc52b9caedf3b23d5ffbd9efbafd6e56ed32
 DIST mailcommon-21.04.3.tar.xz 730556 BLAKE2B 12a4ff5b41258c852fa6f6842b58b083b9cfa689b358cb3cf8c39424b0937f78797ff102ee06699106e883ac770d012babd0f8783def087949d8a2876416557a SHA512 4d64a0eaa7668a17487edbc1d5b92c82e73e0b84bc424a43666268fbbbfb62822c9f01ac7a3ac1ceb2a16887431c4c1f94633ca740a87eb20d37601b8201e0cd
 EBUILD mailcommon-20.12.3.ebuild 1759 BLAKE2B 4764c15c24799ef9c0b56a7b57a8ef9f3d7fe6024ae83911bdc15b78ba37207d8f3b1fe13f63ca8ee215e25583584729dcad813dd4408b64406640d2e332f8bd SHA512 4316da53ffaf88ab8be02a98bdfbe48007da715487a6aa927b61531d6232a64352dd40f660df0e564c45439455290f2a85a06a5dda85002f109ef9c1e4300fc0
-EBUILD mailcommon-21.04.3.ebuild 1722 BLAKE2B 681f51a14680d0d7e09083c220c2ad4603d2b549eac9cf6af09fcbf7787a44d89e2668f1cb399c8e90d21f5eab45a75bd2e6d5b697b06c05aa241f858b754106 SHA512 caa9ff948dfd56fb9fb814a3fbcc16591f9350eae82e536b5622974aeac6d9434fe59fe59aa39f32429f0150e836c0263a54ccfc8bc4290bfce4de827e94436e
+EBUILD mailcommon-21.04.3.ebuild 1720 BLAKE2B 51e183bddf3baa95b7af0b047170181211ca15f7e2a8466f2ac92e192ccf0bdd9980846ab2cff6a3bf0800a81f98d249a0d7f761616abca92de58d9c8b9693f1 SHA512 c19c20386f476e300899269e22921ca627c6d17fffd1671ba18c372fe96d288d76eb6822c3316b32656c6d7b434b83841c5309ffd30ed1da8c233920c0addf69
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-21.04.3.ebuild b/kde-apps/mailcommon/mailcommon-21.04.3.ebuild
index c8241fff27a0..5816ec451898 100644
--- a/kde-apps/mailcommon/mailcommon-21.04.3.ebuild
+++ b/kde-apps/mailcommon/mailcommon-21.04.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common mail library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT+=" test"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 939fc01c575a..17493f88f612 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
 DIST mailimporter-20.12.3.tar.xz 548588 BLAKE2B 1bde81c122b311ea5859b21e0f2ab8f2020db6325c5ce904260764999781c3cdc404759cd25b92dfc28ccfa9b21d33fe49da1945ec1fdcf5b09fce5e0fcf9a6b SHA512 2952c7f7bba61dc7e36bc877516aa6d46c5ec75b998f2f080a5d40d7f95ee553c97b8cc950a36b03929a57063b7c9899dc997e3397fd574c0278b01ffe2b4994
 DIST mailimporter-21.04.3.tar.xz 559468 BLAKE2B 97bfc4b8b3518131575e83e2a6dbdcbee49eb0bf178e03891be0aea4775c0331540970a1ea15cdf273112a3493b31ba47748d18c19002e4c91c4cd0f27e4acd2 SHA512 a90350b3c88fe7153b6b3058cbbb10dd4ed3667d1d36f9f57c7534da16f788e63e568e7c0400dd71d68e6641a189b939ea408145043025e2bd2e5e65aacb8e71
 EBUILD mailimporter-20.12.3.ebuild 789 BLAKE2B 243ba38c8341e5afa99a02ba62c3379077cfb7e1e369aa938ed2b36b504189f47f5c970cd10ec161e2544455a137314450fb07abccaba44fe2b47ca254dc0e21 SHA512 8d7680e0e006de44140e7f5305428bc9787d6acc243d43742980c5ceedf3557401de29cb4361c8e90b8732145737cc2390fa0f0de2511c4c1b9d319fcd8a0cfb
-EBUILD mailimporter-21.04.3.ebuild 792 BLAKE2B b926110b90ca3e690152e87eacee41f1d931eff8511efd3bb1b3ea97ef758b2886c6658c6f09746f1e27ad08b982b2bb8b8fafbda86180fa5a16283e2d8eed09 SHA512 ee4ea1df369cf16d2276ec0f5d034b8204ab95dab33cd25097fbd8e118a70f8b2ed700dec04ab98b452551931906a2c92555209d240cc74c3dab7df890920b89
+EBUILD mailimporter-21.04.3.ebuild 790 BLAKE2B b0533d7793d686d2ed480201911c4dca7bfa0724c5235601dc6b948fb9968d18e4e6867e1e0b81fb7fd31fbdb74de2b158f938706bc24d894de7afe93738c2e7 SHA512 c401e5ff9215ab23479e5c5d2b5095b94fa13fe6aa2f0e6e5a4338db6f45c1118a18fdc919f35a05e670bd1718c366e4a1fca4150e7a9569179fc233eeb8728e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-21.04.3.ebuild b/kde-apps/mailimporter/mailimporter-21.04.3.ebuild
index a92dde7f6100..4834a0f41eba 100644
--- a/kde-apps/mailimporter/mailimporter-21.04.3.ebuild
+++ b/kde-apps/mailimporter/mailimporter-21.04.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library to import mail from various sources"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index f05fcdba795f..fe0a5d4fd7a2 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
 DIST marble-20.12.3.tar.xz 52242116 BLAKE2B 70d16d5d9e2e51fbdc8c9331e55ac1efa85fbb11e79443f8a977ccb804184afbed8ddcb7e7358ee41f61201036bcb9553f1f578be51401e118d928ec5bdf9263 SHA512 0dc69ce2dafac196d3b494bd29a268f879e8bd14ae916454682289822024d58e077e4972588cc6d51284459f2fc9aceacd4e1e8a8302f987556e20a7acaf172a
 DIST marble-21.04.3.tar.xz 52386284 BLAKE2B a23a326e7c181046f03c896fb49d2d39156bce060cdf643d92e98a1d2fc44000a7e1367dbe1e00a939cf78a9d1b07d47152735f3e528126dbda85594f1e5b5b9 SHA512 db926120fd275e0803cf176137c32463de784dd54f16b1d2d7e20e6ae750e6d6b373ef2fd51d1e31a0bee219d8e7c278ede8e83bdbe753edd32d138098855b8c
 EBUILD marble-20.12.3.ebuild 2697 BLAKE2B 59bac185fead02c46f56d402b2283cb0e32afba0add2c78f9836949490093d662093c98b5b42cae28567ee2fe09a0d24a8c2e1cc928827c250b606eccd41f01e SHA512 2cb9e241a4ffb1402a6dd7a5046e2a636bc5b29489e24439c72be94e03b4959fe4482e211ecc5267a6bfab581664760132fdca544c570e67ba13da6b5f2690ce
-EBUILD marble-21.04.3.ebuild 2700 BLAKE2B e89142db07919d788491301bb8865447766583abab248af0eeb16b679351bed32b0997b9c02341f899d15bef560996e8e35a9e3a56427a9ea88acaf44bf4568f SHA512 34aed2b6f84f2be67e5f290bd4bcd4f469ec51ff509676e93f6d598801f9782c68fa66b389433dd9743e7913d5ae24c9bd04920ccfc497cc0c676ea0ec820a15
+EBUILD marble-21.04.3.ebuild 2698 BLAKE2B b457f4442b9d10af9e78c194a2c5c3720a2f67a34bbc0590814a25e7e8dac8fbd74dab691ffc11a8fc32c0bedfbdc7e038d3315b5125ee3d015b83db1a5e9267 SHA512 1791b067f55d1e857285071c60fd4b2ee8bbd3e19e442daf81707d27b7f5a70ae26506418151ed5f4776af26845019446495597e44535d9f21d719f10a53bd32
 MISC metadata.xml 841 BLAKE2B 8dbc10f99d3de79755bf67d12e5ab9e18a56f4207385161754f89265a71ee9da5ec276fb3aee431a91294b917f0031c736f86668d17cd9e9e9e45352fd5f48c3 SHA512 4f1557cef7ca36f318e628a72efb68e2916608f1cda895e140d9b87253dd55402bf6ebf170daba715d3195d89b6224214e6e3b9fff9c4df707565aba13467703
diff --git a/kde-apps/marble/marble-21.04.3.ebuild b/kde-apps/marble/marble-21.04.3.ebuild
index 898a19e57325..89f3a0659fe8 100644
--- a/kde-apps/marble/marble-21.04.3.ebuild
+++ b/kde-apps/marble/marble-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://marble.kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine"
 
 # FIXME (new package): libwlocate, WLAN-based geolocation
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 6c8b2a293868..d26449a831ca 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
 DIST mbox-importer-20.12.3.tar.xz 24760 BLAKE2B c02d7e11f575624c83462e746017c400f4f9378eb2b817289bb344e83a4ebc5ed2547994de0223c9f55089a6c8bd541e131dabc231bcbbc402ebdeefda75b16e SHA512 0907a158a2830eb08455270dc52ccb03c24c595435b372eae58291f36b92270ff6069391264100db13b1da8bea642858ac88b7a0540989ee6e1888ba8ddbf237
 DIST mbox-importer-21.04.3.tar.xz 28656 BLAKE2B 529b6d833655ee8d77b0cb080afe0191d1199abea68a2797041594c76d88df1807770ca60e7c669c441619e1c99854a615748a4082befe91969d2df5694ae3ba SHA512 6f92c052876b9bb0ac39ff1a3a3f1c96a8ef676c280cb915a0a9c472a25ff86573196b059035096bfe82d570d28483a092a8ef147099c1eaae82dacb50c45554
 EBUILD mbox-importer-20.12.3.ebuild 922 BLAKE2B 2ba955427a1761935817104b74a057310220f7bfe560ee34f30e465452bd4c08e5adcc90fde430e1cd4c7c4162bf4c477e9cfb4e269f9fbbab2e06cd6bdbd060 SHA512 c902f3abdc2a65a150a0c3d01987c37cac65df2ef37f041cfb808f91974a451a0f775a7e954c3894e942450b7b563daa8fb874f4da789cb54f7369f31e422c7f
-EBUILD mbox-importer-21.04.3.ebuild 925 BLAKE2B 5786cdcfa9787f747e1cffdf20ad5cf87894bcccee25895f3f85b8ac721735ee2cdba92e4c3ea6a717fa3cef01db129ab5dbfedce39df702f7cbf0f5ab12f5ab SHA512 a508acf3051d409be5bcc04ab8d5938a5c1c0fc17ff01b13a9e55596a66eb9246ed89a3dbce23a6499203c61e41de222b41054ae1345a200ce86eb57f9786e16
+EBUILD mbox-importer-21.04.3.ebuild 923 BLAKE2B b37d7016270eac6837ae441afd6cf6eb684124c9f688767c60f34a8ba1d747d558864c4a0eab4c57429b2f1996c7d0150d4636246a9cc03d2cffa598c45f82c9 SHA512 5e8404cc344cb943e5cc5fa68f199d6bf729556fe5b520dbf68283f925993ed45d31c78fdbde0de9df3b27b7566c704f7503c92f7d0605c231d943cfd52d942e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-21.04.3.ebuild b/kde-apps/mbox-importer/mbox-importer-21.04.3.ebuild
index 8b3a86dba250..7dedfb2d8da7 100644
--- a/kde-apps/mbox-importer/mbox-importer-21.04.3.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-21.04.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Import mbox email archives from various sources into Akonadi"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index f81da938aa0f..4194fe4e2ce3 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,5 @@
 DIST messagelib-20.12.3.tar.xz 10527968 BLAKE2B b7d1b33232ee5e24392f2c66b5179b7e536e5aa0bc511c81af15500666fd15ab92645733e56797741e06caf1c08ac9af2bf0951d05aff1a1b73424c09901e335 SHA512 bd7fbab82cc53d141e27e6148a9b957603beef508ed10786fe3052df94e27d23f424ea3cdf8a6c1aa412ecb999ec21c3b61705dcc29d85ece2ccfdf4c4ff159e
 DIST messagelib-21.04.3.tar.xz 10795852 BLAKE2B b83dcd2fa1e76058ada2cb95ed4c6fc8700be4dfdb7a75fefc7e29f1f72fcde85962b1a7aff130f894fa456b544513ea202c9f618e6293c54a45873a030d740e SHA512 5820278f486d061081590cb2742a56fc5374048b8880d921f6fb7e4f7021dc09ca1921282228560d75b90aa451a6fbffa8b1ccf6a869c17e90703e7300d8151a
 EBUILD messagelib-20.12.3.ebuild 2169 BLAKE2B aa49250a74f94c9505225ff92ba5d1334a4b1bb49db228f143138e6ecfd5210c688ae71a21d0a1179d70a63b8551bed28ad20409ee82af9fe3eed95e1283247c SHA512 73327a50f583f8a5ddd679f0b692587305225c869698f775956d62885daccbcdf5917f4358e59950b7b5146421b89e23a606731cea678782d7bc71863807cdb1
-EBUILD messagelib-21.04.3.ebuild 2172 BLAKE2B c533800778f80594ce3dfed83644039fbefa5208fea84e50e4b79ca6cb3d044c6709c29e8ecce8424b118b338bb3be0baf4d3aedaa2dfc302c263dec5fc572df SHA512 173a34b33fb98bdfc2c5150e985514954480f85cde998e879d1b23e38486e76900f3eba4c6fe545f7da4963b513b97c6c4a952353318e1957374f98961a559f2
+EBUILD messagelib-21.04.3.ebuild 2170 BLAKE2B ec622425fe143920e1b1a438f9f8fccaf16a4ec39fc40a092fe5c7d6d5b011faa5fe490f15a2fabc5313a081b2aaa945df3b765f5f777dfb0a55c30b0ea3929b SHA512 ddd039297efbd8c518efb5dd49883a151dde4edb965a47ad0068da4a5dd3421b028616b21a499371bb2e00ac47ccd17df08be4c0645e830acdea65dcdcbc103e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-21.04.3.ebuild b/kde-apps/messagelib/messagelib-21.04.3.ebuild
index f16d4a7a38a1..5d90a6bd33e8 100644
--- a/kde-apps/messagelib/messagelib-21.04.3.ebuild
+++ b/kde-apps/messagelib/messagelib-21.04.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Libraries for messaging functions"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 29c054c50499..c965a42aa2e5 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,5 @@
 DIST minuet-20.12.3.tar.xz 27731932 BLAKE2B c1638c069161f9ace3f4515ea5260f138b03e13f591e8e4eeaeb8c2daff5a754f3b516dc952fca74d784134940aa08dfeb55ae78620b781ee54c5fda42d83227 SHA512 17c92dd49e729f075eb37b205990c098931b2fce56b200ede20293c0df7ff833bb7492b7bf629e7de408984f7cad6986efe060a02577b11c07abde407b462a6e
 DIST minuet-21.04.3.tar.xz 27726656 BLAKE2B c986771fba76acfd54095819fa817a51a69f68add00267d044d5e2a2176ffa6a0213c5541539ee46fa2905e14ee612e940b02f855bbabfb3a2b9785893e85fed SHA512 0513c9074c4505a0f83899b340dd122c7c5861325fa5e27b18ce11d1195069d0066b47861f8ab3eb540d3a5e89c6134cab9016680709c650a322ff4599bb35de
 EBUILD minuet-20.12.3.ebuild 673 BLAKE2B dd512ec6e2a26d11e4c78fa975c330b34511c449ee146c2e17b59e99e731ac936526af8e7a37190bfbb4da4ee61a9e50781291cdf8ef2554db7bda12635d6d2d SHA512 6995cce97718b2fad9fffa9cd5744946ad5d2f3b99f57f44140650acc6a76998ee962162983a4d495d835a34c0424814c613930455de8541d7f00f1624182794
-EBUILD minuet-21.04.3.ebuild 676 BLAKE2B 678f8cf452d711ddece08e1b48b407df0d551b17fc0a8ced433d2b61ae298a86afefa0005212dfa377cc86cf82cf84e5a71f9bc09b05358ce806f1de08bc74d6 SHA512 ffd6bbfabc65169a595235bfc4da5da6b01a940286da5e8a9c6600ae069ed6146d152a45c40e82c3b4cbbf40d9152ac5e5f2d020b7ead8f3b4489ee9b1c81c13
+EBUILD minuet-21.04.3.ebuild 674 BLAKE2B e8b4f53ea3dad641d8b420ea513a8979b4b1a702d2fdcb46a0b1783ae9cb43b5239e7120a7a4a485536eb4e04381ceb57ccc0721a9d3c2235667f6e10e35b9d3 SHA512 1d1a818645117641ff505b5fe4da5bba6a0f526bc678558e2adf03978974ed9bc21209b30905c12be1c37ec1bfe40080fbfc7ace27bdb4108775e3ca148dcb02
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-21.04.3.ebuild b/kde-apps/minuet/minuet-21.04.3.ebuild
index aba9ebe37637..f352bc841838 100644
--- a/kde-apps/minuet/minuet-21.04.3.ebuild
+++ b/kde-apps/minuet/minuet-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://minuet.kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index fb9fbde90dee..67c764fbb493 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -4,5 +4,5 @@ AUX okular-21.04.3-fix-fictionbook-support.patch 1074 BLAKE2B 16f98c1ba248ed2ba0
 DIST okular-20.12.3.tar.xz 7884780 BLAKE2B 8ff44f3f60ea6f9c8b0b2357727a56aae9cd77fd408c60cf8282b41f2e286420747c11bb669e3bf52192481ad56dc3ee9125ba2f777432b423b6217249d31c7f SHA512 f64eca81bdbd163b2780037026c330259d5dd7fed7a175b06601742bc6b98c25f26463d72764e5b77878b3c36df4f4657d4cd5349f389786a45df1a5fa9cda45
 DIST okular-21.04.3.tar.xz 8052500 BLAKE2B d0bcd358f9da6c0a19c30d036e73736c06e67730d30be6fca64c33a188adbe8bc1f15efba2c62739e88fc3a4dfe4100a9c3588e077f689176f1a0a2ad2f6b59b SHA512 21f34dcef50d15a8816d3898a002133e068ba239d1730892e0d71e58e6196b493544792fa5c06de689fdf1fe7f853586578f3963a64e46a9797484f983814c22
 EBUILD okular-20.12.3.ebuild 3153 BLAKE2B fde78aeb5bd969230d787b6d325da910fe2b7c7ad403d8f084fae91674a7d0c2a4009ce4f6c56733828e8940c395fa9e0634d2f0a49bdb9974cf9eaaf0c40879 SHA512 79dd69de245670d9508a58b2ceab924b980d8218a592bdca8a7429bb557e3d4a6d01d286ec20e684f8751ceaab2c698f1d5f3273c7f81acfd5225bec921c2308
-EBUILD okular-21.04.3-r2.ebuild 3304 BLAKE2B 989d43c0c6be32a10237fa70e6e77424a37a82a43fd13d8a4c0ca0772a375a0d84c5985734f411dc7283cee2d3376400f3a31994c86d7d47d00a252ae9041343 SHA512 9a94017f08c5c3d4950327b3919446d0b3a93b8f234f7cf6db17361c03a0445ec2b670151a1dcbba1bd6e3ab8878555523fff8b7ba761469d8cf10985e6c42ee
+EBUILD okular-21.04.3-r2.ebuild 3302 BLAKE2B 0287055d842473dc75ce84f535ccc843250064831a288d43672e814edb8a3c05b50bb9342198c24c136d414e46051d9645aa005b18ef8ff698eb8830372c5ba2 SHA512 dde8990aaf99702f3dc58e8c90227e671ca5b848112f78da213ce2fad5fce46b7c86fa691e175fa9267804f23d01e6398cfd2e40dbab7438f690c899749eb8a6
 MISC metadata.xml 930 BLAKE2B db4164556c6c5f69c136f226dd436e813a8095196d468cbbbfd2052086c6d1d4b29a9908f85b49838ad44046a3446cb073a45887defdf2ff509b49c4688dac00 SHA512 570c388b5f08484354a15000a1f098ed327b5f5fb40d78801fa746d09fe28eb3b63bb3b735549ae6e6ef7abdcac94652946c45e9b26acd6bf9ebc4058d41759f
diff --git a/kde-apps/okular/okular-21.04.3-r2.ebuild b/kde-apps/okular/okular-21.04.3-r2.ebuild
index d0d9c84c3733..8c2e81e97766 100644
--- a/kde-apps/okular/okular-21.04.3-r2.ebuild
+++ b/kde-apps/okular/okular-21.04.3-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 9be39765d236..93a0c24a3428 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,5 @@
 DIST palapeli-20.12.3.tar.xz 2078720 BLAKE2B 18952513649553814abf17d45580251057dfa528c7cf142382ad6c90eba5bab9227b1cdfe7c818bdc71b93cbee3b2cb28b74cb0241d74a893feafcf3ae6b7e44 SHA512 f26efc3e724afdaba0826495cb14f8aff913dc6a6922e6a4734bf4177f572ef286a5d5c2c0926e2804a3c7429b64b07ee8b48917272af0be018f023cd7ec6a02
 DIST palapeli-21.04.3.tar.xz 2076828 BLAKE2B f6aa798c3bfd2affa8656412fcc599ae59f1ad46334fd7bdb286ef8eec33c835c41723e448d1e98143a7ec8a8b9441b978d4d7b029d91c54be8afef4aa93eaf3 SHA512 bc2f147e0a819ee6f6c08f83522ce2a61e1fe642cfe2d93ab1831e2d9e89ba878e62912c358b3a9b4a336e5abe6cc69abfae1e872efd32392afcd41966ce42e9
 EBUILD palapeli-20.12.3.ebuild 1058 BLAKE2B 0d5dd122505a65a5db8a38b2c215866951d3b3cea2f8d4b0ac335d9a16fe61190f2991ec08cba383981710fe514e81ae1287eb3659adc3ebfdf966949e34eed3 SHA512 e0f88c99068550514c2137e1bd12be30860a0267fb1f3f44d5a82d17e61cb2258056f914ddb692a2d663da0ede12766893387ab0bc1414805d0b3bf12923e234
-EBUILD palapeli-21.04.3.ebuild 1031 BLAKE2B 022e77fbcaf38c7c293d4e275b6f69df835171e9b45d8b24eb3b8efbddedd6088b18f6e8830666f0474f97fa3e5e369f3a4060b33836b2d91d0f8fc561b23237 SHA512 d215a59dafd56042ee005b26ab8e6049a321c884ef8b2ec7a75776e474fa4366f54fff8f8f70d8c61d45036cefe635c6f6975ea6526bf2efc9d77d7d1750160e
+EBUILD palapeli-21.04.3.ebuild 1029 BLAKE2B 610f86ef48766b29f9a62851641bd4cfe582f46d9dff7b15617b540d5cc34c2b7a3138411b641611911977437c5215724feafc4d2166f61994fe8e3e62a82dfb SHA512 32505b65dc937e7bdb7dc4022af6f83fc20589cfa396965e2150efed956ccc894d0f6c703fadfb648b6c884f1ffde2444363bd8225034e5a1e4485519588f5e6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/palapeli-21.04.3.ebuild b/kde-apps/palapeli/palapeli-21.04.3.ebuild
index ca998f92007d..4a8c6b883962 100644
--- a/kde-apps/palapeli/palapeli-21.04.3.ebuild
+++ b/kde-apps/palapeli/palapeli-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/palapeli/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 75628b513110..f2d6d58ea927 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
 DIST parley-20.12.3.tar.xz 8842064 BLAKE2B 178a714610b9b68c2a993937b7109e4d82bbd173f90de9b3836ce7e8620f17cb46c0964e50e47f621d867e5ca83ee6994501119d98f33af1ee279c1ae1530ec3 SHA512 60623069078a2944e7a83798293a78ed7fac7feb5f37527cb978fc4a8a63ba613737ed0d8a24972ed92393476fa9e83ec83d3c41f6d879797243d966d6784d87
 DIST parley-21.04.3.tar.xz 8890316 BLAKE2B f3ca83e72e6ad616151111d2f1cb0df79c086829d6b51061d6d415d1287cb9b8bd9d045413278da4310f3c48b1fcbbb932f17a52fe134472b6a2262149244983 SHA512 18bebd246eb5a4199322e90040c53d77c31cba770abc566a63d9a26acb9e0066b5d1159156e8e0b533d6bd096be3d8806e75ae4a155b678626aa24b28d4555d1
 EBUILD parley-20.12.3.ebuild 1632 BLAKE2B 2c7a967e28e8daab02566d7ed1f4dbc7cff0b0dc703fd55584fe9a4095200edb4c85ce06199fc88aea49f2a8d5797cd7418efa73137e2b24aec1ddf40f309b72 SHA512 eee75143b9b16973ab1b56c3679862181d786e7cde3858945edcb420d6f85d96b1189e333b145c1d197a26079f03a32d9940eaa33c2e651698236e285edfc856
-EBUILD parley-21.04.3.ebuild 1635 BLAKE2B 07a8b59cff6919d0be83babb805723fece6509a2e2777c3f8fc0982dc955b368953f89e074dd2004cc92e8cbc009dd9e031a9eb8f5e6d918b02ad0ca75afdc02 SHA512 412885534b9ec160f5b8ff8e471a8409e1a05b39c57ce706a0566ed4964f403aaea2f94974669e94c214758e5d67a5c7326bb6661295f95070a6110fce38fc12
+EBUILD parley-21.04.3.ebuild 1633 BLAKE2B 50de9e6a93ec3f73a4f914dfc51dc6139f2c861d874e10840f5d3cb8f7ec1869356e689c8d348df5e1bc8df738052d2ccadc2a1a0c4b27386675d1e204e8e142 SHA512 9a519419b22771e62e8dc16d7249a9d95e5e933171abb4ac7649b9e74db599f373911b4906bcdb57eda70254d003da0c14acc6917673248887a1dfa57c05a9ee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-21.04.3.ebuild b/kde-apps/parley/parley-21.04.3.ebuild
index 96a0dbe3ae33..9ebaf357e709 100644
--- a/kde-apps/parley/parley-21.04.3.ebuild
+++ b/kde-apps/parley/parley-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/parley/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index 8cc341bd468f..2fa732645a17 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,5 @@
 DIST picmi-20.12.3.tar.xz 1367556 BLAKE2B 258171a75184c9c6c4e8e7ad978bb5bf295e3d9ac8d111487555fbd3e01aae27b737aa74eed0b21f570b2d592a4a190d9869167eb0dca87d7f35477606d8a4db SHA512 46b269212a425a62fabe97d06f272bbc050ae7b288629ef4ad0597282a0fe8481016aeadd94e6b9971cd90317308032a6241d8f95bdb1c24a6b6601375aa64c8
 DIST picmi-21.04.3.tar.xz 1369196 BLAKE2B 294ddf72382001d4a44355225d794a24aad14bddf1f8abdbb7faff6dae54b745c2c0f3060fc6b5a7dd38cf16a2e371d5cd519d33a9daaa8b6502ae6c47389c71 SHA512 8d2a27d8a1652407750f0d74ddceb6fb3d252c29d5691dea96153ccf0e685d0c5134ed204170d77148000e6209a9251fddef02fcb5a1179b0b04e652f6c34c4a
 EBUILD picmi-20.12.3.ebuild 1056 BLAKE2B 71899361ee4b7c44f1cc99789dfa873b2948bca57c5e2e6f02e0411a5ccd59bdf3bb5e0f562a92c2f020aef13ac7d7a2dc5842455736f8fb9647f3337201135b SHA512 efec76516324b317b2cae8d2fc7f6db36f87d8b7c8978ad44d662a66f7da25a8c09987e8cb5730f2e3655d495ed22948db9b818e68bb2172778513041d72512a
-EBUILD picmi-21.04.3.ebuild 1059 BLAKE2B a287ffdc8a5472d38bf19c766fe58f3b90a9926168d69f6b629f4de4b613cf238ffe7b38272d5018388557c9a41572cac07ad2d26e121b28b3c9cf7239cf1edd SHA512 ee1fd25344efdd8952462a5375e6a729f1a79c41fa7a42bc72fc6cd2ab03e26121460b2488c0a0661cad017dbc1e6bb91f17d93f8929df223480cd4bab24874a
+EBUILD picmi-21.04.3.ebuild 1057 BLAKE2B 3f5a571151bcb6958b3bc9243c4c2724fb96b9a2b68dfa476232f2dbf860472b52b5757b241febb16d8ffa2b76901d191e2f582680c6c5fb3ed7129ab55f458f SHA512 0f87a4726fe933914fd61a299dd3e3592c918d258690bbdbacfe8b17993e03bfb5fb064b1706b97f66f1430c7f1421c98c2c04efda82a7f46a2dfe873a6826db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-21.04.3.ebuild b/kde-apps/picmi/picmi-21.04.3.ebuild
index 9a7e95560fea..36cd9c1c44b8 100644
--- a/kde-apps/picmi/picmi-21.04.3.ebuild
+++ b/kde-apps/picmi/picmi-21.04.3.ebuild
@@ -17,7 +17,7 @@ https://games.kde.org/games/picmi/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 62c637a736f6..6508940d3a20 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
 DIST pim-data-exporter-20.12.3.tar.xz 401632 BLAKE2B e86bfc2b2d49a5525bdc75e43d455ff40e36dabf1bc1677cdd673991613d39c19d2cd2b1aea200dc1e409b0b29c0f7b3e62a181d4fb22cc8a2719b79291659c2 SHA512 d9b96081967f6271908624b303fcb358ebabf90fad2aa731f2c0e67e421921f47dfbc054d59fbdea875c3719407a717c40fd708fe915baef179dbe22c3242129
 DIST pim-data-exporter-21.04.3.tar.xz 398624 BLAKE2B 18c1009482a351dcbd54f0db1623642a22944edd2faa1db54621abd2910c66c1807a7e001b373829a440df398219bfe97120a27f25447f2eebe34926d7612464 SHA512 fc700846b5af72e4b20a07be106200843ab3f7f16e15012c91d2a9364b18dedf5cadf3dc36aa9f11f15b676794d61194534c1a63173b4453ad1ee98ad90f933d
 EBUILD pim-data-exporter-20.12.3.ebuild 1648 BLAKE2B 66babea1822fda3a2817bb70db60b57742e9e45c7f529e738c6b58d66f9f4f6adf5f2fe01df7ad9a394448b17f9fe8d3f4d1f98b73ed1e355201126ba8098555 SHA512 028dcb3c19feb337006dd41f6644c9245d37b84df1ced32c0d2458e23e3a20f070cca16ca01c69a0680da8c6163f026eb9bef9e8b55e6e45ece78f9df8d4899d
-EBUILD pim-data-exporter-21.04.3.ebuild 1651 BLAKE2B cae0a76ee467b2836bd07e300b7e8e1a1e6f4cbd74f2ef759f034806a570de63b15d530b36987d27625b13739b81091f9e6014b11af66d335ea67f20693235e8 SHA512 8345fb32140a8200e2226b259428fa5f37e96868dce3600ded901e1b2bf73c02f375e7e065c9656a6bd3466e2034d2e24a354421c797ee24b0194cdb3c6a6002
+EBUILD pim-data-exporter-21.04.3.ebuild 1649 BLAKE2B 34fbdfec26a012c3ad480b34016af2b98178b9c222f389142e242c6aaf39c55719c4ea2048f8a7c1934ebd35addebfe9429656eddb9ba6516ad9b538f4a18eac SHA512 a44861030bfb0a54439bfe957989ee66a9b554c2d87adc2ab3493df0318000689967dac79bb4c23908a15862d2dc4fef516eb0e2fa46c782b88c88756b3273bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-21.04.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-21.04.3.ebuild
index 10a09caad62a..b1a71383253c 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-21.04.3.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-21.04.3.ebuild
@@ -17,7 +17,7 @@ https://userbase.kde.org/KMail/Backup_Options"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 2b406fa06d57..15aa52e0a5ee 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
 DIST pim-sieve-editor-20.12.3.tar.xz 455152 BLAKE2B a4a28aeaf3a1ef2b612ae69f4503d1456f44af0e005eb3b36b99e4b75e7e394ac4386915ead419646277f106b57e6f889cb3fe86c3e1e79eef3bbe0abd57b6e4 SHA512 27270916ec2c41e2222ed1f5248091b19e6569564f82ff56d75204c81a6ad1ea7c0d6dbc907e2dc4d1a02f032162ecc443915f936f1577b0245f1b40d52166e9
 DIST pim-sieve-editor-21.04.3.tar.xz 458072 BLAKE2B cc1edb9e6720b83cb910c85e8df647cc4e1e59e20146824f57dfa37aea4e657ec4227bfdb47f58e37beb436d997f5b092aa4ae4319d22ef3e7d2d4dce572a8d8 SHA512 017f6825ae373ca8201be593f11f61ef2c26b5490776d3278ba77c61e961e25746e79a405caffef0e8c7c9218161a6b28ec09e195df1a193ae8a72c348a6ee74
 EBUILD pim-sieve-editor-20.12.3.ebuild 1460 BLAKE2B 77bcb9e6d9350c953497b38d3df53ee4b19c1b2dd8b93e80220c277ef82c5294c0e6f7b25b78d4f6614c9a180f13a8783474cd30b31fb652caa11882ff05cb43 SHA512 c706c453440dda3b286be108b1b383e624a7817cbc6e87417e50905c13fb1931702c757510c2e746148d146289e31803042e0fe1696ea96cc2cbe5954a022f96
-EBUILD pim-sieve-editor-21.04.3.ebuild 1449 BLAKE2B 85e205adcd577eaa4072d78f89b67d47548d249cb71be24d015dfe81cad7ab8b10da44520dbed63761f9d5c52f4bf37e37bc83de9415480e9505033ffc4f3a5b SHA512 b148be9a2d7a0a6cd6148225b7f1d0d7f1e9be67460bf3e7f74272ce5a2b26b3040940c89cc06296a2320892479c11be2aaaf1770c6305705f3cda55c7bf886c
+EBUILD pim-sieve-editor-21.04.3.ebuild 1447 BLAKE2B c778bfaf5690df828cce9be8bf8f96c2453b87096d4b4e3a6f359a1faff0657af59009df5fcfa6071bc70854f2e4ef5cc30734729405468a858848b706c0abfc SHA512 3634836bb5d91c9527781e4845e76fef2dde6da90f40d0885aca9901e31f117dce87998f888249db717caaceb36b2431b5a97205b1b51d4a2208dd255917e522
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.3.ebuild
index f32fa623f8b2..da3531cc8a72 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.3.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-21.04.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Assistant for editing IMAP Sieve filters"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 3a575d01a76e..9076305405d7 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,5 @@
 DIST pimcommon-20.12.3.tar.xz 364304 BLAKE2B ce571e9b57089b34caddfab9bac4f26916238b98c2853d5b69656fb56b0fdf656f4e81e7a479571c687a25027764be854c868705ea8fc2ec0844c826cd2a22f1 SHA512 f016b68ca9f768b7e3c506034f2d9d8e13e2325aa3291ded274cb8d71abcea521051180342a9b6ee4488ad54715da729adf48c0f2ab562030622dcc64de96df0
 DIST pimcommon-21.04.3.tar.xz 369372 BLAKE2B 4f378ae377b664839e7e7e6bc7d00565fb7ba24371582277575c23e989fd722945f0c78f187e7fcf931a26b417380e3244bddb682a23677f032a6f8faffaaa41 SHA512 b2ff1ff7942e49676aedfbe923e3a3bfa26e170007b58d2ee07d80da466b4d701fbf0707720cdc10304c7c41381c3503781993e83f88414546e605896817b320
 EBUILD pimcommon-20.12.3.ebuild 1724 BLAKE2B 333abe758556fc07efddbec1f3000ce1eb5ec469edf3bdd3caa37f38932c7cb363d1a1295b9e13e7174df12ec5f9f57c6ff4743fb9f5de4cecaac52251925d7f SHA512 2a3c4778bf94b3ecc75e91d0d723bd8af83f8741f97b5cf89e30e4b823b4d6ce8818aa1cceb4f786904ee861e0c5ab5dbcd94a6efcf85925b468f4ca900fe0f7
-EBUILD pimcommon-21.04.3.ebuild 1727 BLAKE2B 452e163de6dec2c93ba949aa664756614d816f262e139434275a99e5f801e453323badc68f33fd4f26ca46c4f558120a3640d31409b6f44452d7e86537a65cae SHA512 a4a811247fc02639b4d95457ca3ea5afb3ea432909d8ddc1a11fee31ae93ef7231ce08a66c139b57487968cc83acbceb36cca6180ff32adcbb84d95ae52b6b01
+EBUILD pimcommon-21.04.3.ebuild 1725 BLAKE2B c71ec0b025a913c29a715018aa09518c88770b89c5c639f74779cf3d10326ae90d85cc5b8ae79d7fea6c34c36c15ac6b731546e3a285ae3702e02e8c859c6e7a SHA512 b451ffec98b13c07b6d75dbd28b1a7ef521d7a0e00a83d46c078c76b0c34cd19dcf57781b36a7b9ee7aad8529fdd25e15d5aa6ca58718815198d870093d60d46
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/pimcommon-21.04.3.ebuild b/kde-apps/pimcommon/pimcommon-21.04.3.ebuild
index 2f11c0bae237..ef7f768b7932 100644
--- a/kde-apps/pimcommon/pimcommon-21.04.3.ebuild
+++ b/kde-apps/pimcommon/pimcommon-21.04.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index 5d2f35ed3e93..599649d619a9 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-telepathy-meta-20.12.3.ebuild 919 BLAKE2B eac14f096d35e38d013f3ce0e9c22d6789ed4c9283c091d6649be5eb3c988d3a18d9e3d22ba2b2d09428092bba6dd541147a0790658be73a53a28c724e81c0e1 SHA512 16d5447f93f7be39ed619da5ac843fbb8a58b342def5cc60f225102c8d28007ef1eb57848944ab1c4a28270ec6dab8dab56b15dde16a43824b354d5eaad66a84
-EBUILD plasma-telepathy-meta-21.04.3.ebuild 922 BLAKE2B 2d73d322b061cd9b9685089340e946773ce49efcdc5e35b4c93e53a0f8d867a94f5dd5b988b141552c2213e77eabd954ac34c1a074b74135bcfce449aa39ba27 SHA512 70424b1aed5e86fa90e8f3c0b61bffbf9cc383900e4d12e3d5bb9d82f9c3d3bfd49947d04448e948a3772b4d30a4f8da2cf2cf8cc0067abeedcad3f9fdcc20ca
+EBUILD plasma-telepathy-meta-21.04.3.ebuild 920 BLAKE2B 2b5865c607cd0b48c4ee6deee2a8b606da1a1f4c244929ba468570dc7a9351a1855ae542f58a1b8de5b4ebcdb53010cc6173eb90bb0c16105aa90ceaeb9af8ea SHA512 1a49ae9ca252f5b43925bca460673cb522808b36c7cf9dbfba7af1f6b0d60a15b070eb479dd702678428853bdd328d773a329f961d04b795af476fe3b7944cf2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.04.3.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.04.3.ebuild
index bd57c061107a..ed65cae12799 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.04.3.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-21.04.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index aea151883476..13e95b621df9 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
 DIST poxml-20.12.3.tar.xz 43224 BLAKE2B 348b9a0ac90b2865befb840453448072a78bb661bc33f1d01f593ef50c4895f58db3253a7d8f638bfdd3d23df91a2b03d531c2df3770a54303cb64fda5bd1a0c SHA512 b96c21440018d3adbad0d8acb1a054e147b167398e98238cde90a27337891fa0092304c2cbfce786ba473a7eeaec44c9010911dd55763626ecefdd7377ee9e8f
 DIST poxml-21.04.3.tar.xz 43540 BLAKE2B 97c42e772625c82d1d2f6f994228eb8159130875450580d8e292fedd2f1b048d8672987929c256e07b5ae3d6735f602930917993d3c21738d32936cd4c8558df SHA512 52647f1574790e7f0c444e4a0ade0789da6034db0e68f8a9b92606c8511ca06c7f317ead23b4cb72db5330cf1e41e58646b98eb2c3bec47c6b8c813c60969df8
 EBUILD poxml-20.12.3.ebuild 409 BLAKE2B e44956fb6f363ab6ee88a386442587d7f35ed73a05f280886ec45170a79b7bf3691516127a64fa72d67e3475bcea1bf9bc7f006c35150dadb037af9a52d952b1 SHA512 f29398570744814b07ac3dc9a738f2c99f937407bf53a9fcb9c215fe48ef6c11dd2959dd4b2ffcffc9f9437c668635f0a0980d011292f2f1778dfb8d204312bd
-EBUILD poxml-21.04.3.ebuild 412 BLAKE2B fdd503cedbd21e297c3d5546c446908f0cffb87a79b18686c7de816adbc6e481b6a2d47b7cb5abc6f55ca27238ed2e1277431955a00a5a92f067e19d5bcc398f SHA512 6debe28fe0121346bd8805fb66fa9bd609d22580eff4502d4903567d3338e8f2aeb56c127e7daae0d4bf81bae3ff24aeaca1d5338fe65863ec69b81abed1f3a4
+EBUILD poxml-21.04.3.ebuild 410 BLAKE2B c83dea87cda1be497f73ba1dd36a5761c791a17336e8a5e4e5cfef09e71f238fbd61c8a5077647fda1405f8590b99978d45bbb497e2fe6d5ab44072a8adf697a SHA512 34a8702ed69e85c5b44e0000ef7e5a7e38f91d8182f9112324007d67f3cbb4ea18b03e054f14db0e3d929800fe45035cddd2e70d2934f5fe4315217f98420205
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-21.04.3.ebuild b/kde-apps/poxml/poxml-21.04.3.ebuild
index 75837ed709a3..db9d59c87928 100644
--- a/kde-apps/poxml/poxml-21.04.3.ebuild
+++ b/kde-apps/poxml/poxml-21.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index d7e5b8110e30..2147190455b7 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,5 @@
 DIST print-manager-20.12.3.tar.xz 258640 BLAKE2B db91464792bcc41781a73b2ae34f6a5b2df74f525367dd7668e0ba5b9261edadd8860bb9a1db38fede2313c5e18597481574fc06bd752fe3b7a887079e7d6590 SHA512 21030ecd3951cd1889ff4eb5a4998fc12f148d481bb66b8b7808fbcc5f38b1129e41e7e6d51ddd0ed2207c255be4c483d8960e05b02aed3f7691df85a7d1ba86
 DIST print-manager-21.04.3.tar.xz 263964 BLAKE2B 9e2646b618bd4b64d811ae920880414ca11b78dcdd74a815194499929d453649bc08d0a9b3043d472cedeef10ff66acdd64f63e499c6d68ced24cfda4abcc898 SHA512 6ee679f46301213dcccc15212f78c23aff173d9fab2f26a492cc7e07e95c5f1fa98a2feea5a42d3f0460ac3b7ce8147f5624cdc36c4def74f15dd2b924f9412b
 EBUILD print-manager-20.12.3.ebuild 1823 BLAKE2B 79355eaadd1efbc9c59942d0fab690436c89bea43c3a17fa695c9eb4c2839a1e5fc5a4a627e9e5c6c88d224c9252577efbf5a10fce434534ff183dee230474a0 SHA512 060501be5ae7c08ffafece05f9f14843631e6b7af46ef46e3a5a6c976b38e67d0994a14e40a783c09a44e09727ceaafb2eceb7d07691267d67918fa727a1f8ef
-EBUILD print-manager-21.04.3.ebuild 1827 BLAKE2B 2738bb4b6b366498db523fc5fe48b338032297bdfbb5edf61e1edf03a1544bbfbff26389fe662c167267e40d743832f6f5de2a1dde20b4aeff8d9a140a748b2d SHA512 b4302e5843f8f1f1b77d7f87664689dbdb15b38f88c153356c9eb02ccb770b414f0d9ea4980d78f4ab4d14d30494621e84c180e90d93d64fcd42307d1606f895
+EBUILD print-manager-21.04.3.ebuild 1825 BLAKE2B b42ae513590b5b00bc71f7c088011d9daa34d9dd5ad6ec273fa2c41ddcb40e0f77ba4c155004acfbfeea91cc5831abc65f1f4fbf0cea48bc571d800b03cbf96a SHA512 9a95d682e824e859ccd40ed7a83826ad9a4b3c9a1a4ec5841b9115bbb28345bb28701bf5ad157e24b691bcf84d8f03c5fafeff1a4bc8924a917347f63868fe65
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-21.04.3.ebuild b/kde-apps/print-manager/print-manager-21.04.3.ebuild
index abe7a41c6a5d..fb528f7454c5 100644
--- a/kde-apps/print-manager/print-manager-21.04.3.ebuild
+++ b/kde-apps/print-manager/print-manager-21.04.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Manage print jobs and printers in Plasma"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+gtk"
 
 DEPEND="
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index ff4cded2b8da..7bcb22f87aa7 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
 DIST rocs-20.12.3.tar.xz 1492376 BLAKE2B a751c79a0766b1d0534c76b2fa635a1458796d6188162601ee0f4b586115a82760cf6adf699e4e4824e6e0a4a67fd9cdc6ec721f9373f17ff23a2b2bfa1acde6 SHA512 12bd3c8c7c7e46a9da630fe722a2ac1db58a03a8686c2d6c5a852da204d84e9ca071d2a812caeab0915214983d755175bee592c712cf2f0fcdbcf57be29cf8a3
 DIST rocs-21.04.3.tar.xz 1547728 BLAKE2B 7088fa48653da5a5f4fc2f8dff9fc38233e15701a1139934ae06660e257a579db0c7a442305daf75129cf968a872b45a564ca563609e67ad31f6133d11b114d1 SHA512 f097157f7664a637448055a2b9142dcb4b0fada3a811f8efa1f37c3f23f486b613aac367f4248db8efc3fbe6ca8c350b5c280c3e382b8bbc331e2659a32fb1fd
 EBUILD rocs-20.12.3.ebuild 1299 BLAKE2B e2bbae71b8aebb247e0e0ab769a8eee5a20892142c22997768610bf2155681fb791c92fcf0522c84f90d919ff718b55bf8c74cc03536aefabc8fd2f44f657e35 SHA512 de9f6cce0cbac87b87cd96dbd5087ba2a54bc7cce043f9d7bd9654e38b6d193d447b51fc18a6315c7abb8f76ca8f5f349ffcdfb5562d0d242f9c245296896912
-EBUILD rocs-21.04.3.ebuild 1302 BLAKE2B f4208674671afdae1c88b24ad2e74a6ad01e47aeaf9b41cf1e4040da377e923bc1c7b0ed7b7debab1a6bd6432b7919bf290cf8df091d9d06722441b28269a750 SHA512 706a1d54ab407e010314346f841cc849bad101f2b270fab4106912229212d21c5a01481f6fa61f360582e862a58b2deb8b243f62437f3958d6678085f16914eb
+EBUILD rocs-21.04.3.ebuild 1300 BLAKE2B 8dd67fb0fce94e4d59ea235c1fbcc70b9ce6d97f2d7b73a2ce9f9a721f8767b6511ff5ab5c2a8efd79878d4585c46f5366aae04d8f2adbd6017306e5234e4dde SHA512 73716e5da476ff00f9aa0a584d89795335110a03cfde5f98b232bc7d47baecc6b5e414a2d93c36ab3c2d9bb4ea6ea544e76d89f1798412f3759154456c53bfcf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-21.04.3.ebuild b/kde-apps/rocs/rocs-21.04.3.ebuild
index 0a89496dabfa..d0f2b57258cd 100644
--- a/kde-apps/rocs/rocs-21.04.3.ebuild
+++ b/kde-apps/rocs/rocs-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/rocs/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index ab89299a42dd..2638ece051dd 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
 DIST signon-kwallet-extension-20.12.3.tar.xz 10700 BLAKE2B 3cc19c19e472e4a14c12513bce10e79beedc8c7d9714c0dd589f7f4f6b3ebe4710a12257a646b450c217f0a25319687f3cc292bde86851c49ff9ef4b0ba53802 SHA512 ab8789755435dd7263cb780169bab0b9f562b33ecf948d46a513713c54b301584287493dff4a07f73584eb089ad498fdef62252a28154686a307b05138f5f5f3
 DIST signon-kwallet-extension-21.04.3.tar.xz 10780 BLAKE2B 1253500a0317054d2a965facf965d903e62f09eb37c7d23fdd99338d72aa03b43e321c78de47f0cf09f6fe098776b2225b21d73223f6bb5c506af058c5836135 SHA512 26ead682a111548b1f6c4cb6c9c9dbe53613bfaea81c835a3c30d1af2eee0f571f0dd179e8a837d719893f482dd22479c413e23c6f212c7615484be816224136
 EBUILD signon-kwallet-extension-20.12.3.ebuild 375 BLAKE2B b72243b6328828cf9777d5ea3af3dab651ed0f3cb8ed26b1416472f005faeb765dfc665f740518335f2e5b340132031226edaa9018622626803d5a193fb078ac SHA512 6bc5534301e8cf98a39753ccdb04fe4749f62c2596abcc39973857b48b6021c023891c83f46bad861f6f715e69bc8130eeaa7ae3e8fe1ea7c90e741603879707
-EBUILD signon-kwallet-extension-21.04.3.ebuild 378 BLAKE2B c3c6230f8f000c981947149d876ad47cc834d4c3f434e90b065ccc7aeee1cea2e85a7dce82ab4734e84ac4cb71bc0ed1be41725f77eb3498f395120a3c931635 SHA512 97e4ab04bf76fee617bea3cb75cadbbc2ae9192aed47881a3794fdd4dc389299501134e7650a060ebe8c7e149e805171e01fea18634a0726205db6dec5198fae
+EBUILD signon-kwallet-extension-21.04.3.ebuild 376 BLAKE2B 0eabe6cb1caabd410929e1e5a6b63925689a27b6a2577112fe72d334eeb2a4ebd21d1668c29b51185f592a830454876730b293d7257b815219426a5a230f3245 SHA512 c249d62d4ef19b2eed248de8dabb604714ae143eb24d3bc4d1a61122696089359c804f81e5bf7a28f8bf4e1cd789f2b58017f7cd5acbe95aaef00937ebdead5c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.04.3.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.04.3.ebuild
index 950f53cb38db..8b5e649a5426 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.04.3.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.04.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://accounts-sso.gitlab.io/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=kde-frameworks/kwallet-${KFMIN}:5
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index b9ce8635eee8..c78b753ec5fc 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -3,5 +3,5 @@ AUX spectacle-21.04.0-implicit-dep.patch 1179 BLAKE2B 62bd639d12a32b6faea6136081
 DIST spectacle-20.12.3.tar.xz 1170540 BLAKE2B 865c4f7a2b8a3edf727f551c64ce35847a880023773b72531ea324addf5f0ac327261a87e35cdea6ec1f7eb4b75d2f8b86c3d1b7fc7719959623653ebe542a93 SHA512 4749916ff1557d89c3a8aeae06ce2da4e3f5bbbc3495a588209d797453b265447a857266889a81178f33b12631f6ec29be7a65a3f98f27de604c198e997795dc
 DIST spectacle-21.04.3.tar.xz 1175024 BLAKE2B 00d5ca9bf905b889e1ebbd510efc7d86571533e53206c5c65130d8b018d9e1941e283b698baab497928c6e3255d067ae6b4fde279945c0d56ed7ab7e9f226e83 SHA512 86af85d322c8d1231c4c47edaf886077dcfd1b20a33d6022ef5a8a543261e3d9f8c7b33957140d32f346c3dbaa87e13c9bed25b391771185468b4994e7ca3841
 EBUILD spectacle-20.12.3-r1.ebuild 2073 BLAKE2B 505e238d82c9c7f7f771323c84125adeea52304a3a04ffc1dfe0d9a5e1e9b78e6cf75c1992c8c8f47aee1019517e61f48b2a9c2511838850a2c43ab8887e2beb SHA512 4a19ab0200c248a33142e42bc86879b9289658b6a05fe34f8eac8a4fb2a485dbfed7c625dc223a53bd3c5e6ad1e67ded49216069be27a52e57002cf917c014af
-EBUILD spectacle-21.04.3.ebuild 2083 BLAKE2B 87e4773b60f7e8711e34aeaa3b3000661658649d4bcf1c86543fcb55ec66d5d1ccbb479b911da317769f6f6b5feee660db012c8eed1bd8d02452786b9ad3984d SHA512 6d7d782a9ecbc714ad4ad361e525782762e4a2a61b495c554fc8524248346a07ae93265e3756c2e158c714b1534eca74fada0cc5362e0fcde996bb4d46473272
+EBUILD spectacle-21.04.3.ebuild 2081 BLAKE2B 9afb5a2d4b11deadbdc7900e77dde77a7fa262739097e5e171af7f655018f4ef7088bc59b72179f614a9d5743f64496bf4f842d4bda5e202af862d97ceea5611 SHA512 45f31d10ddf998fd3c68f7667da83ba22b8cf123a4314e0b864d513f113b1140801d1033245c20fac82e5a458dfcd0e24f7050c2bf66714ce979cda5df86b128
 MISC metadata.xml 558 BLAKE2B 304071c16927d1f17fb0b30c3bc71ac9cf707a9cb06816957a8382b3eaac9083d3456b142bc3e0dc745588f14641e461c20b13840258997c85b84bbdaa5659e8 SHA512 0cc62fa4faa18491636dd37eea421cfc880e8997101420e15a876e070c6c14369063f6785d1f0474b3d79fc42860455fe4ffcb90db9f7a61e0492500d19aaa44
diff --git a/kde-apps/spectacle/spectacle-21.04.3.ebuild b/kde-apps/spectacle/spectacle-21.04.3.ebuild
index aae20e31f195..06fd63852a4f 100644
--- a/kde-apps/spectacle/spectacle-21.04.3.ebuild
+++ b/kde-apps/spectacle/spectacle-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/spectacle/"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+annotate kipi share"
 
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index 7efa4d42b300..ac93322eecd4 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
 DIST step-20.12.3.tar.xz 958852 BLAKE2B c233e726bc208e4aafb38dde481d7154781894d6112c3d3133f7a4cc8280cb2d21f474a0e9cedfea7683b4f4bb25f9dbafa115def4e6dc002418edf2c4833387 SHA512 d5971012711b3e8c0e9a85844babf26db983efdfee77dc112f419979d9f8fca9374c81fc8612511928b1bc4cd7b3a385ff821739fb6e80f77c60d37194bc78a2
 DIST step-21.04.3.tar.xz 979172 BLAKE2B ab734e21dfa406be1686632f0f10376354a8a3d633a3c539b266814a5a14b9d98db7b9a11652fc9490e0a1419cd0220b066274a46ad18baed198de116925318c SHA512 273c5424321a1508a715c4553c954914dbd8b0a42b8ca0872d61ed0d272f252262f6794daa64d5764366f406678004c51cf0224541da1a813d99bd7502af1898
 EBUILD step-20.12.3.ebuild 1436 BLAKE2B b232e72e69a44419216160553f05dbeaefb02aa8097e3d883f09de32705374e95e941d060e6c8bb5bb0daf0004d6a910925f074d2a311d16327dd6b3ed262b10 SHA512 654a0f6699358f4aec3fb21285b0b96d83d2d228fa81c9dc08d2d366fb70b0e99ebf6f2f5b5429b930e918e2608a0706924f671a2a805fddc576f04f1afdbf24
-EBUILD step-21.04.3.ebuild 1439 BLAKE2B df403d0fdb1f2c7fa8dc6dc80eb70c74440c0c23075185c64bfb10ddfc8938d6b94e32cfea23e3dbeed69264f5f555caf35c4be3406f867ca32457ed507d9447 SHA512 6d3fcfc077255e2422ee5e20dbece5433e141ccdaade44cb414a76f5a1c46333605ebb57750118456c0d18019173b042586e98026bb7254d6d59c8bc41256e2e
+EBUILD step-21.04.3.ebuild 1437 BLAKE2B d85b9e08a91204a235923ca50d32f3941af68c3ae20f3e57dab0a2d80b6266a7a04fcc70b3a4a1fb222e5163d789ebf0deaba86002a2c7e1f8cacb217a23a268 SHA512 ef8df114f36b9ac72baddd59b355cb5d030455c6529ab6f0e72ddcde9f8fb47ccc8b134f18a0cd1cf2f040fc876d3a103fbe7b8695a21d99ab036fe69266104d
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-21.04.3.ebuild b/kde-apps/step/step-21.04.3.ebuild
index 208718a97732..2db6b9052010 100644
--- a/kde-apps/step/step-21.04.3.ebuild
+++ b/kde-apps/step/step-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/step/ https://edu.kde.org/step/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+gsl nls +qalculate"
 
 BDEPEND="
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index bf6b3aeb37a7..ecd096a0b65c 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
 DIST svgpart-20.12.3.tar.xz 23348 BLAKE2B 90603213def1786b0f75b5b987612f66c0bbdba70d931eb7b16b6fade1058e38e6df7118fb225041409751d769915c6be2ffd4089e60d040d2dcc1d6637f21c9 SHA512 4c7dfc802a4a24d376d18c749743f1e8e248dd26f7794dc482952a9fc969c7c547ddb5462ec5dfdba9229e1f56f4c0886417b3422819beb9ae911ab75d4a4558
 DIST svgpart-21.04.3.tar.xz 24600 BLAKE2B 06216a156a15abe07303ad937418a048c3c6e4a4889878e92f2089b8c5ae7de548f900da32f783796a3d52edf3d40e4d778e3cc092bae9345a4b77e87b958332 SHA512 ca0507eb3e0b95462161cf3f883970d32ca1dc266b319e7f959db1ec06da5a593c7aa71b8185cc8af226e5e86c6c5e3238c6607048877e546cf7eadc0970743b
 EBUILD svgpart-20.12.3.ebuild 576 BLAKE2B 014c0e414a49ec0da999f78838d4b8450c2b043af0d54d625a8563f548c76ec851d12f065f32865df24e778a9b7e7ec3f0eccebd20f83a8beb6a976989d53939 SHA512 8ee555f716cb37c49368de3f1b5e95d4b5152dfd3374061ab3d10b61c82bccda15742a63893d5758a2c421ebdb642564109b12e72df8797fe10496795be5feb2
-EBUILD svgpart-21.04.3.ebuild 579 BLAKE2B ee651a3d8f9c100fce62ef48179d504bca435576561ccb96bf03d7ca140b4d5f36d27d8b3db4ce0fd47d3e68fe9319c16ba7de17ed8c00b62b1e83e8c2a0be5b SHA512 8089a946b496e6bd0b44a3aa94113fd5fe12aae6c7e294b750d8f9bf0a8c275ff6f19965647e1510d335d34a81b8828a28811cb9777aa25173bb1adb81b2c35d
+EBUILD svgpart-21.04.3.ebuild 577 BLAKE2B 6b7ce2b8cd64f3bcd5dccc742acfbd483a536b855fac0fae6f98b6575aee25ce2bf25edfc147a8382c6ca63cef81e6e5624f40323bf0fa1acc77accec6034430 SHA512 6ca9b5a011585f03592b1351b023a7db1a52b22b0c71dba2ca32030a9f4577a5b8d169ac92e4265721f4061acf0b9f66fc19331601ca3f0bad82624d1970d889
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-21.04.3.ebuild b/kde-apps/svgpart/svgpart-21.04.3.ebuild
index e383e448ffbf..97f2371f6439 100644
--- a/kde-apps/svgpart/svgpart-21.04.3.ebuild
+++ b/kde-apps/svgpart/svgpart-21.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Kpart for viewing SVGs"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index d12bea81d2eb..5c8e2bbd182f 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
 DIST sweeper-20.12.3.tar.xz 372484 BLAKE2B 18ced322ef1864c2870bd0b15bddd8eade04edfd3d8bd1b8fee43acba2ea1d1c09969907258ecbd746b2a6b48fe04f3942c5c8b944574ee366eda5ca2448f5c6 SHA512 0bcdbb48f89d6ca0b5d034c85c8e05afc79299af39363a057b107208c06ebf71f9b9adfe498af028078dfa36c9dc3229fe95b2c123b698d9c0a3e9830d825148
 DIST sweeper-21.04.3.tar.xz 376440 BLAKE2B c22d1caeb59126157381961a8fdaeda9504010f1c0732280d2b3a031eb35467baf961703f17e4d9c177c53cc4c52f377b06ec2d42cac2aae11a23de72251da81 SHA512 b500294b708275aa6744c4d2db6aaaf306c939de337d878d9f5a00318a7d76b3e1597b8f87402953a90a4b3188d643a53d41fd85848a4aa56336b0dd76846eb0
 EBUILD sweeper-20.12.3.ebuild 1010 BLAKE2B 6227a6792cf69e8f0d126212637b125055ebdf57a7c89d392701df1c1ec00d0a8aefc181aa58e2892c99101a42d0513db9eae4e8e3dbb80ffd0dd788183720d7 SHA512 0aecf92185cb04a469b06fb81212919a855ec7695236b50ed4df10f558f4b45b512f47756decf8ec2129b6f00ca6d4f1a64fe839623e564382fb31aa0a0cdae8
-EBUILD sweeper-21.04.3.ebuild 1013 BLAKE2B 57c63bb7873a2e51b30a1cc8778bf9b2d17d0c7984f275d81f2762ccda575aa1065f7e4ce20916004afe6960f5229d76c16d553091def9b6d1f2a871053e8d96 SHA512 593118f3cc7b353fbeaa2b31c57bf5988194c5b7a113f7745040d901b03919f11a96c4b462f95ec057cde65ff368fde2258f78088a16f742f7a16ef77fa34d6c
+EBUILD sweeper-21.04.3.ebuild 1011 BLAKE2B 20473e6a1c6c6530c0e58b089d8faf5b7c966173af767a3434debc0e2a7504d816cebfc9e84696712c667d7a533a15bf10a4c9da8ceee5e4ad8a1230e43940fe SHA512 83ff198e924d042b5ec03983accb8a9754ef6791e8eab3d855cfb6abaa1d09cb08cfe09503404be6f21cea5881b8c5a13f2d2ed666f98fb3dd152fbe80346748
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-21.04.3.ebuild b/kde-apps/sweeper/sweeper-21.04.3.ebuild
index 63553fafd988..8c51dc8dc2d0 100644
--- a/kde-apps/sweeper/sweeper-21.04.3.ebuild
+++ b/kde-apps/sweeper/sweeper-21.04.3.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/sweeper/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index ee61fe321cf7..17ccaae2d234 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-thumbnailers-20.12.3.tar.xz 47048 BLAKE2B 3744e6f2db37ca480e2e63d9895f207c0a45219650e40f0c2748158b4ac39773f5c153163a2eb190cd818b5c77ca5f2a1414736be8b3704abdbe0efb3a1cf2dd SHA512 f6f31b3ff14f81a9b7d8e25ba7be4c6def72815cf113c0f6d78b5f9568f5fc31d707950d10ec314406bf92ab94284492277046d0d476a8a94542b76b6b0f927a
 DIST kdegraphics-thumbnailers-21.04.3.tar.xz 47152 BLAKE2B 8d5b4ff3f5a2cde19df7a55dbbf118f01ced761086942c89e9833ed09c72a02faefe5314d019d52b2296fb128f38302e99f9d9ff20aad9319e19c320271b1206 SHA512 3534c79f21d7f61ddb15a59ca08c22cab335c478e00c7a1dd0190c7e0ede69abe21c0ff795f39ad6459bbbc7b7589268511d668a0be3a28c508e252bbfc26823
 EBUILD thumbnailers-20.12.3.ebuild 711 BLAKE2B f68011ed58ab43ba8b82521ded210e5878b9271266a5e7da7617a6e35556be53e137e8641893d206cf036eb974eb88d11819722317454014754d5e1bf5b8e291 SHA512 0c097fe2180a249fe1c237ee7c0b410615eabe58340c2c8cff32957458ea6e5e15aa0caf19344ba86414eba38f7d3a7ac3115c6a05eb37f5d8c32375d358a04c
-EBUILD thumbnailers-21.04.3.ebuild 714 BLAKE2B f55cd05cb4d1561a37a27bda8668aa87f240716f0e7addcc2620185b5416e14b646dd5a7cf011e64052d7fd814c14c9f2cde1d24884517828fea19d6f4b9a302 SHA512 16b0bb9596d512af230de795b3a2df6418ea84cce0ab909983163e59b1054d010c7c1f7c606ecdf9bac5c13708dfb90226b7d36c7e38bb721e7037a03b17201b
+EBUILD thumbnailers-21.04.3.ebuild 712 BLAKE2B 81e5f1fb20d91abcfaa7e57031087c01e1cf935fa523d5d2c1ac2a6d81b606570ac610c7f8a37d9c0818bcea576c5f7e9fc2c04918fde33d799a3c29c36e7c10 SHA512 b4b70e2dfa96682b7dd6f34760dd3180c17cb5684d5aaf2275669d04027e3d6782602448544ac903c232b9dcb2d554ad0b9bc8d0e6742666b3757f60612b0b59
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-21.04.3.ebuild b/kde-apps/thumbnailers/thumbnailers-21.04.3.ebuild
index f87257dabb2f..a1f591664f19 100644
--- a/kde-apps/thumbnailers/thumbnailers-21.04.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-21.04.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="raw"
 
 DEPEND="
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 885aea411710..922241efa196 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -3,5 +3,5 @@ AUX umbrello-20.08.3-no-qtwebkit.patch 3168 BLAKE2B f3908ac2755b70b611182b9b92bf
 DIST umbrello-20.12.3.tar.xz 5555804 BLAKE2B a923d4f4d952dbbfc8166b2ca2bff990a4ad8652762277c3f16d4c37ffd26c1761a3480d45640c2821b0e85633158a90d82358afedc11fae98b2d5e58d0e7f57 SHA512 619d83ffd307be57fc8f3dc935dde6bdeffc60186ab675b8f2e530bb6a125ec1e03fccc49772c6d4cc120b3280e56f28344cba2627c3b955f9cd338cd071da6a
 DIST umbrello-21.04.3.tar.xz 5650032 BLAKE2B b306695798eb2791968b9b4ad98b34825c8712800fbf2a87a2f6398768cf9bcee1e94dd1efa8d513f2cb8f07f683ee880c8e655236d88b96c3c1bcc98929af6d SHA512 f4f632bf37f4170ebf6c1d776b70b058ded1c8a1a9626adea1c9b63e7d7cf45c0afaf77c4c9bf778c601265b9d819f5a898813ac32b58bcf29d7ab94c753d73d
 EBUILD umbrello-20.12.3.ebuild 2043 BLAKE2B cf0a07b193d6bf640ed0d114fdf82dbda393ac43c07cba0f23743e1362afea682f9ad5586fdef6eff0727755a9b6441708a5fd1b5f6497c4788e91a1b6b82c45 SHA512 8f006c081a1b0a15e658ee0fc0250e47a9dad746b858c392808f0b70ab2cd532e4eb040e523aecd86dd80c5f22fb8b1efe6d25110183493248310993d1d76d65
-EBUILD umbrello-21.04.3.ebuild 1996 BLAKE2B 4dd16b6c38de8d1cbd66c596862468c2ac712bb007b17f098e23cc62113e4b3945426c75e6e130d4f2540a097be550e80337695fbe107c393a7b601e5e3b2cfc SHA512 2ca9412fb16886a17ca7890a739bde239a75251bce99a26ee7e37ddc545df30a19f0dcc2118122a2b87509563c20d30134fb8aa8eb9c824e74eba15f0b1d42da
+EBUILD umbrello-21.04.3.ebuild 2050 BLAKE2B 13dc50763a7f4af31870f8289ad5ceb7829c51597c7eccac05a196010f0cdeddc05945bc894c1ebf9d3bc212102bc0a937f05b1577daf7c4845632574ca4f70e SHA512 2597b05b28ff5dfd3760ff328eff3047fcbb86bf810688fda5717d8a1add96baa019a51b2ba3c9cef0fc1a76c7de17da4205a361ca231627f547d64f54c43735
 MISC metadata.xml 390 BLAKE2B c631566eb3c7fa8c1826b91e33c209ac431b66508b21e457166e291d15cdd6c5ca45203f148f011926625fb1a1daea875b696c2b7088b5d568e7292c63e74ac1 SHA512 cfce84a2844d675cbfd3a9546b1f95bc2aec863f2bef680d8c6fa8ef2323614d7e678e3ab411ed33d0b072e3820d44ef1e343d3570c4ebb0fd8e492dd82e4813
diff --git a/kde-apps/umbrello/umbrello-21.04.3.ebuild b/kde-apps/umbrello/umbrello-21.04.3.ebuild
index 6ece79a34400..3a606946f8aa 100644
--- a/kde-apps/umbrello/umbrello-21.04.3.ebuild
+++ b/kde-apps/umbrello/umbrello-21.04.3.ebuild
@@ -16,9 +16,11 @@ HOMEPAGE="https://apps.kde.org/umbrello/ https://umbrello.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="php"
 
+RESTRICT+=" test" # no-qtwebkit.patch lacks test fixes
+
 RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index 46af0cd9264e..8ce1239cc8a9 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,5 +1,5 @@
 DIST yakuake-20.12.3.tar.xz 382104 BLAKE2B 36d10ac7193b0be54d24d1bdcb751a8c6d09efe82408ffd2a2e6acc33df11858afce9f649a270fa22bac55f34761d9bcac7eaa94b1a5394e5a461e4aead9826e SHA512 d4cd8a58744b20c5183b8683fea38d4df319864d9ced6b8c1acd1a46f1a3beae38f157562966d43ed136d23083eeffd89949c92ec3813d93b187ae61689c4781
 DIST yakuake-21.04.3.tar.xz 393052 BLAKE2B dae07678875d05e73ffb8cebd9cd09457f00a53542e001e7c6e70027824c2fde9f1f84a397546afb41a3ab1208718c426cb7c60ebb9295149b0484f326163ad4 SHA512 d4f651bfcc9db787f8b53c7237e4c19db33a7c2cd4c337ed271b639886a1453e562236be589644896de0fd82cbdc7adc41a3e16a20c8d6d7fadb4232849ef5c7
 EBUILD yakuake-20.12.3.ebuild 1543 BLAKE2B baff01e1da502db0d954b3142e1d01911f0eddc6d2b38cffa821efc8d91b74bd240c9099e4e368eec9f72f88eeb30f33fde4c4bee5e9c5979fc57a9d664b48fa SHA512 a76eb12365938c6aaa34b6453b18203e588ff6062f0ebbd5cd4edebb96f7dd5c1b4628ecede6f780482a480a349f39c503972e328526624d25eaa4acfbab1a2a
-EBUILD yakuake-21.04.3.ebuild 1546 BLAKE2B de98c4201862ccf0e7e2e83e4cb2cd574b9877c546b15ece83d47ded2d4065bb7895662225dc6173fa501084efe0d4d50f7d9867b794b50a8b1a2f8683c8ecdc SHA512 dbce16ebe4442f3fbe19289df3a9986173e3f59dde9e2d67b1988152c7a51619534d321631f5c06bbe600ef3330c4f9e0bb7f9a4f7df5f063e17ce4f27d08ddf
+EBUILD yakuake-21.04.3.ebuild 1544 BLAKE2B 23c53f5185b35151e2966490254158d016b6b1563f06d2c57bd5c219713b78c2e3ab80d3e378c5418fa9bf06f92cb5ec573346ad1411b2ff7bd8576a3a73e9f7 SHA512 c7deedb9a89f7edea9aec711023a0fc68c4871be857e5e7cc84b68486eb59a7eb6d5d7e3cff8e830a420a29d5da5205b30383c4f3a473aed722bbe79b88ef5d9
 MISC metadata.xml 661 BLAKE2B c0ff7bbfa76614ec0d6ed52ca7af363bf4c441cc06343c613ba6100a68269915d71dea39329d02fc95384ce71331bb367d4cddfdc0c560ea2748843ea7c31c8a SHA512 a842fdcbb48892a13e74eacd0aca111cbba02bd4c43fb9544ed4e4a9c72d122a3190f0090e8b7f63cceba1d449fb7bf629954a9e60dd541e40908818478fcb13
diff --git a/kde-apps/yakuake/yakuake-21.04.3.ebuild b/kde-apps/yakuake/yakuake-21.04.3.ebuild
index 8a0f3c4d4fbb..2ded8b73e840 100644
--- a/kde-apps/yakuake/yakuake-21.04.3.ebuild
+++ b/kde-apps/yakuake/yakuake-21.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/yakuake/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="absolute-position X"
 
 DEPEND="
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index de62f6a016ea..6a5e59213747 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,5 @@
 DIST zeroconf-ioslave-20.12.3.tar.xz 43424 BLAKE2B 17f3af54ac1d8214ccfdda23455ff8b559b848250b11abd1f1edb8f2e367e3f4c1fce34cfcdfe7604f8061b0e41038de5b4cde6c8815ffc363cc6ea50432e653 SHA512 ea2588ec08910364811c6aa2c7169e13fca3d822f04277d99b662d3a55476002928138c64d803e9768ddf24e8d266934e457d510f3b1628b9c2e9383646a85d8
 DIST zeroconf-ioslave-21.04.3.tar.xz 44568 BLAKE2B be644a9eada31122efd3eec54f9140c4e526180312abc33d00099c13f21fb88572632553fafa978d59a3d6e2103b8eae9631e20debef5a33e3968201a5c990ba SHA512 b1b24cf39193102db3f521a8f5ae15e9bfb6b1a60a69da01e5434460e1597abccc55c904016a04957a72e988ee94da55bd5750a483efbc9ffac5ec0b0c66e6f8
 EBUILD zeroconf-ioslave-20.12.3.ebuild 577 BLAKE2B 6bf3c4e38d92f05b4c90fd8eea2f2256430eb743f371ef01f13c975594303a240d07b7c5ccfc2d9378338432caac4baadb63e000a88511184b760d2fb4f5293b SHA512 d7594deef186ff0933107bdbbbcbcbf18c78de1dfd315566212c3b046cd491a3a4a7d6fdacda86307796c7b2ea5169e35ab6621b7e209aad2bb99626a52b0258
-EBUILD zeroconf-ioslave-21.04.3.ebuild 580 BLAKE2B 47f5c047484d6926fa47e5d5c782044493c91a84b16bde3adf581f792284bb43086e445a10d7f532ab6fc7bae98b00537d040b53a381e5b1d17d0f1bbf5bdf60 SHA512 1e7564405286265e470d7298182a8c6e54591584ae5115d57edfee1838edeb3c576ca37de0eac1e26c1f9f2a1f71ee5d0da3883afd581cced3454dd64cd68f90
+EBUILD zeroconf-ioslave-21.04.3.ebuild 578 BLAKE2B 51bc1151dbdcadf4209bf477d189160a6664af982df9e1599e3130660e75cde2957b612a604686d2efc8e731ff1c9641bcccde4a0fdb171fe50c9ae96b7b1f00 SHA512 d26e66e75476587c07d2a63cff3f38de3719365c389f59f8dd37727f366622243e29c3be7e354ef01fbdd4c40f069f3d4c354fa1736a07dcb24c46d156b4a230
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.04.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.04.3.ebuild
index d1a692a5b1cb..441dd43a82f9 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.04.3.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 40c93de62a76..d90371baa65c 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index a4c72fe03048..9f2de257392f 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,5 +1,5 @@
 DIST kdeconnect-kde-20.12.3.tar.xz 551780 BLAKE2B 5bffabba63f40d6e1210f393c36d82796fe216163f175a596c271b7ec713ad2369bbb777b866a151ce2d823301b36c8a5a4e3931e56e5f2403a4fb01dc1ca1a4 SHA512 ad40aba6cb879353ecc369b727ef5181aab89d6e645f7997eeb3751913c47ac2ebef82e68efc56837f154508b049bf15511717d314612440f3824d004b9e425c
 DIST kdeconnect-kde-21.04.3.tar.xz 567512 BLAKE2B 5cfa3140b5b40ee7b9c78688b1d8289ad9d0b2bc78781883021a2678096412c8ebe1c09172d945ffd5c2111fc3573637735cc0c70512da3c62ea7a868b770415 SHA512 5f2104424c5ddf56eb27bfa0cb3425db6ceb9ecab8844fabfc263e8f0bb165b68077c302df5c06106c15b82836925a730951bada3e0ef09aee1aa99936341f07
 EBUILD kdeconnect-20.12.3.ebuild 2299 BLAKE2B bb235e13d7ea0226419daad7323e0ce1241cd7869d3e436a2f0a2e39d005d5bbecc29d67016e5d3590fcf4bed9e2595d0752953cdb5cee4468c680715e3b29cf SHA512 42398be059eef0f3c2facf8682f094502e6a61640066734d281e977cfad4d771fe08b9835643f77db89d69603421ad83571513f60a292a5ca876ce990381d513
-EBUILD kdeconnect-21.04.3.ebuild 2291 BLAKE2B 2dce23e6864431402f2165a0626c11c76ae77102435cdaa8620ded1280ff571ddf02acb5cd1fd1d3a5dcfb7f03b0362cd3593ca02685f9667007f1fa10f01908 SHA512 f4adcf237c78ce177394c6fbd5e0c12024dded2238368703db2be037a0fd726516fa3da50486f83da131dd451eee2629d89512a51bd32965c353975567ff8e15
+EBUILD kdeconnect-21.04.3.ebuild 2289 BLAKE2B f8de27974c58d9303270506b15292447293d5ecb46d5c4a1ba01bb928f1826eea18b34f64e2f8e5228b5961b0922f40110baaee46e9a6d79696469269fe27d1d SHA512 6c80dc65745be1f61df03fb7264b0f80e12f62dff33120c831a65b3a5c5bc2e8a991154d11c7118083f0ca8eb6ca1b9d87249d7eb37e01c19f57f443e954fe78
 MISC metadata.xml 577 BLAKE2B 4a7b31db0d4e48ab09de42119a36b7733603d2b3f85f7cbf36b61713f2f87488f4fe1223d2dc2ef7460b41525eb59fe5e43196df54f8f454241e56518ad73855 SHA512 faf6e262a0f0d020bbaf4372c8f5c308de1fae0cee4f37cdf9509b585ead0706ba06109f27e691cbd0ebceadb7c352b0d335dc29e87baee13ac3dda5eca11a5c
diff --git a/kde-misc/kdeconnect/kdeconnect-21.04.3.ebuild b/kde-misc/kdeconnect/kdeconnect-21.04.3.ebuild
index 0b673a31fad7..eb0891a0a198 100644
--- a/kde-misc/kdeconnect/kdeconnect-21.04.3.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-21.04.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect.kcm/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="bluetooth pulseaudio wayland X"
 
 RESTRICT+=" test"
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 2a4cf474004f..bfae79bf8c17 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,5 +1,5 @@
 DIST kio-gdrive-20.12.3.tar.xz 64532 BLAKE2B 8814a0b4c4eb47e69621c6a3bdf751a2491f44dd2a548b0e1ebad27f41d71955171264773eda0ebd5e76a0c5d7c138d4710d22fe69f20b35cef28209b782fec4 SHA512 d341e4af25b38859e0ec61dbdb4166982b107cf88eeb7dcc4b90cdeb2303dab6294f9aadbec3388a254352ba5bd3221bbde8f31d4b5d688aa7156f505bdff2a4
 DIST kio-gdrive-21.04.3.tar.xz 68220 BLAKE2B ec8998ee779774cb2915e6021e9e5f25fb310a138c43f2aa0bb2240168086bd1a67272a9ec3d885916f5ed1f84b4f9057f8933aac85a760590b36ac108f163af SHA512 3e5ade6573375662161160b963120d4e09e315cf6318a47c0175f48353e5cfb3596e3e3ff2544817a5539a1d22f20370404ae5de1494227c77a6b565476182db
 EBUILD kio-gdrive-20.12.3.ebuild 1105 BLAKE2B a53ea18109901b805db3c2a79228543ad110e8bc58c81f36b4a9d965f1128d595bc49dc9e4214860345842e09747b81e4c1e1120604e5dafdf0036d51fdeb85d SHA512 9f79e761a312dc75dc89933fb66c3bccb2119855b4afa7a36ed04354e9ce363bcb0b00feab64e4f4988b02bc7e09fe17efb3b0784ae15815734935835de38d31
-EBUILD kio-gdrive-21.04.3.ebuild 1152 BLAKE2B d1d64acebe953500cc999ae9017783a00c038dc26411725f9dd798e8f489b37a92aaf1669b64c07cb86b23c5810dbf38ad6a8aea748e2c7edf100b015b4402e7 SHA512 2c69f3353d075c20c1ee55ae7dbbe7d4ea11e5db444f222a446a670c8686fe905fbc3f9478d09a1adf667859d6e2e1aaa83ee015b0491ce535d7036be443272b
+EBUILD kio-gdrive-21.04.3.ebuild 1150 BLAKE2B 95d873f651dc53d581a6d846a279324d1c060d21cacb6766a9363fec770c4c62829eaed2181bc8d416669cc06db8181ff44159a5e51241484ddda4c96a5126c3 SHA512 5091c7b66d315c5de4a68174e3f3a3789f0fb6f64409c84a04bc969daea869287ec0e204133726fcdffc5fbdebd5dee28949381191b4674afe11012eb46ed2e1
 MISC metadata.xml 502 BLAKE2B 95ecce641754a55e79c1f538be2456249521c93364cceaeb4f1bf294a8d8de741a01468104d3cd79f6a5e416d56501aa0dd277816f8d222dd315a8ccfc906649 SHA512 27f14ba58189b06808d64166ffb62116ae7aed51f0e893c0f103b5829f7dd17b162fe2db207f7fbefa733e8fba324fb4fa638d50ca6afe0bc0720c6b15aa3995
diff --git a/kde-misc/kio-gdrive/kio-gdrive-21.04.3.ebuild b/kde-misc/kio-gdrive/kio-gdrive-21.04.3.ebuild
index 6d48209f0558..5e12b3c8ea18 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-21.04.3.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kio_gdrive/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+kaccounts +share"
 
 BDEPEND="dev-util/intltool"
diff --git a/kde-misc/markdownpart/Manifest b/kde-misc/markdownpart/Manifest
index 38259a665004..99c8a3a47b02 100644
--- a/kde-misc/markdownpart/Manifest
+++ b/kde-misc/markdownpart/Manifest
@@ -1,5 +1,5 @@
 DIST markdownpart-20.12.3.tar.xz 26720 BLAKE2B f382c532c3fa88ea4a9c6f318ca1e8df1cd546a46b7f59a8b757000279cb908ba5694397be5a761ee1ee6e9db52c6e216e725d7f90dce61ffceda325abd95bdf SHA512 48f1ab4faf2ff006c98a5aefc6958fc6701abe43b95af5550ba378ea24390b3fa5a4d9b3f3a5ddc319bff1d170f8e073ee505acc8a9797df7b485d87b0efea49
 DIST markdownpart-21.04.3.tar.xz 28232 BLAKE2B 8d84bfc7a53a7b3ccdce5547f6bb19b7f0e492c4c12ca085acb9d1e4988d357dee30d963b06e7d8e5db92a4f8af0ea5310788062858f0cae76f93bda5b7c202b SHA512 c32f5b74e3dc0874a8513f3cc48a09358486f206d80c952b0ccb33ffa37ac22fafc61868d1fd643432c5a6a64c2263f426e78d5c34fb434e35b766c7cdd6fcb6
 EBUILD markdownpart-20.12.3.ebuild 715 BLAKE2B 0f4466e5008c59b61a5a204755235a98cb6b1224b25fd853d02c2a54ce224e1e6559a9c825a2afdc6499884d858dc919459fcd1b5fd05736e787a28b7afaf6a9 SHA512 2a890c407458bc20d445491bee03a697a751d515372ccdb4f0635a5d418023730fa603e9acf22a96b895e6b7c59558f747bbbb00a2ec7e5499b260b815c101e0
-EBUILD markdownpart-21.04.3.ebuild 707 BLAKE2B 46f8abdac186f974d4db1b23b37caca8a62409a77ee9db2ee5b7b8ed045cfe441acdf7437ab0f5b55846b55198b7b4a5380b14c7f0166759a0426e99892dcf2c SHA512 9045e862d978b011803d6d09d2817f892bb5e387cd33e4547e9d70a96d1470d0ceed7a63ccab8defe51e55b74f9e68a7a61695cbb763840bd487b7d8d57bd1fc
+EBUILD markdownpart-21.04.3.ebuild 705 BLAKE2B 3feafa5ae5eaa638ec9bea785cd8ba45165d47f07ea839e9e8baa61782f9ef346f9fcad6d1e94224800341a39eb12bc1526295a045b404f6febd91c4f4bfbc99 SHA512 58e354aef4689cce533bb14b448c287684b2719fbf655a96e1222be4d81810b9b6de951c039d2fbd75faa5db1bbd9a2f10786ad14e5823938eb0c33c0213485b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/markdownpart/markdownpart-21.04.3.ebuild b/kde-misc/markdownpart/markdownpart-21.04.3.ebuild
index 01f8b8802d15..96b4ad0c64d0 100644
--- a/kde-misc/markdownpart/markdownpart-21.04.3.ebuild
+++ b/kde-misc/markdownpart/markdownpart-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/markdownpart/"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-misc/rsibreak/Manifest b/kde-misc/rsibreak/Manifest
index f61b84139fbb..c6821d0d0584 100644
--- a/kde-misc/rsibreak/Manifest
+++ b/kde-misc/rsibreak/Manifest
@@ -1,5 +1,3 @@
-DIST rsibreak-0.12.13.tar.xz 550544 BLAKE2B fc3380e7ae9036c072f93cc46ef0f074f0a1b2777019a25615ae9cf183979985781b7254e8041d1f5a31a0ed404ed34a399d1fb0b675540860d49145fcbbddcd SHA512 dc1411221828afab1c8f3ee89238be44d9fd3784cb5cce4f5a50ce063e14d1683257bffa1b24509d7009e74d0be16f1c788754690b503490fb8be1bedc9657fd
 DIST rsibreak-0.12.14.tar.xz 562176 BLAKE2B 1c0a687c3df8eba116eba64ed502a52ab66f5e77183a31fbb18b8ac3e1bc6ff43e8bb1e50303bcdd78536d415b61730b2dc561c72bc92544dd5855f5a937e317 SHA512 10de87ce892b0320dc6f5115985125c1e1e156022d6d0159dc64721ba2f4dbfdea0f8d2138d450fbfef8c11bedcd564df850cbeb7900dc480c94d44bf15ae997
-EBUILD rsibreak-0.12.13.ebuild 1356 BLAKE2B 990136e5883df2c50df5a719ee490084716ca648ed1d79954f6a14524e0abfcbe5f6801a2c123d931e1b03300db67294d894f92aee9f69243d9a429e0c0c4685 SHA512 e4591c4104b316deb65b666a9fd8bcd7c5bfd88f90e2baedd1b99d63c65162d3a288100b671e9902a9752de0050fb401703e05f4c2721e96dee0e47c7228559e
-EBUILD rsibreak-0.12.14.ebuild 1316 BLAKE2B 99da713e32d948bd2243f628158aab4d0075cf3e7b3444e1b5b6e3f79681d64d748f09749800a89cd4c38543a9fa8bfc787138ea6fad58220df05ad591bd54a5 SHA512 9777fd0efa9cb53edf026a41fd7a5651d77f7d0fa0e808c4aec9b9a420290b8306b9aa26dcfa9c6aaa583ddc5c99796596c35757d822fd8aa656974056279df5
+EBUILD rsibreak-0.12.14.ebuild 1315 BLAKE2B 8c4fe2998628f2699f6650eb1c707c07e1d37dd7341b6c4eacd763010ffafaac641eba285a7836f918f608c188028940966e3d0134f931b980ed6cf646e6ca96 SHA512 f252fb9c6bbb0b72a77276f0e30033f72a9103ca4d65fe202ebc9180141a7dcf25f2a8a547beeff9c4540feeffac2be006d05688377698d4c1526386e8868803
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/rsibreak/rsibreak-0.12.13.ebuild b/kde-misc/rsibreak/rsibreak-0.12.13.ebuild
deleted file mode 100644
index 14734afc6ab3..000000000000
--- a/kde-misc/rsibreak/rsibreak-0.12.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Small utility which bothers you at certain intervals"
-HOMEPAGE="https://apps.kde.org/rsibreak/ https://userbase.kde.org/RSIBreak"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-IUSE=""
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-# bug 587170 for frameworkintegration
-RDEPEND="${DEPEND}
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-"
diff --git a/kde-misc/rsibreak/rsibreak-0.12.14.ebuild b/kde-misc/rsibreak/rsibreak-0.12.14.ebuild
index 20fc1e2001f5..5a652a89162a 100644
--- a/kde-misc/rsibreak/rsibreak-0.12.14.ebuild
+++ b/kde-misc/rsibreak/rsibreak-0.12.14.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/rsibreak/ https://userbase.kde.org/RSIBreak"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 7ad15990c5f5..66f9b1566f9c 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 3fb365eaaa6a..1cb8bc72616b 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -2,6 +2,6 @@ AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8c
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
 DIST kwin-5.21.5.tar.xz 6394220 BLAKE2B 8a0b1ba6e1393ccd721ef8dcb925739a91ba08528ac2f61a5908b37372ade83496b3fe2dbbd9093727a12ffca35d5aac607d8888454519d33b0c924c9d030bd1 SHA512 b749892b12b027b306836bbd7b770602bff80c0ce6840db3345585a1215b415fe24fb823bbcb399f76999232f100bb2e1898d460160e1a762ea10fd24d6cf63c
 DIST kwin-5.22.4.tar.xz 6454932 BLAKE2B fb8a45124d28daff1011995c0e9a29365309afb4c2b6a42d9f9a65e24f5672adf160e0b06a2084d04130fe5ce42ac3fecdfb36e8d02f18eadd916f6d9e69636c SHA512 3be48794b8a6ae1c8b932f1b1e7db74138bd5e1edc32aa86bb6a1f51a109d20d72449d30fddcdca9d026a4c99be564a06a0a5064a51124b8073542ad5c3df8e4
-EBUILD kwin-5.21.5.ebuild 3982 BLAKE2B f311f212416378470e03db3f66ae92e3f714eaf93c7ae1ea5d9b4e5c02452efe7159cd73622f18249ef1d5be66f742442300699397ac3402f5bb249b8a79597c SHA512 9a86af01a4fcfe940114f594ce02486916c0ffb05e2a185fd9390a48b044e5ad29590795552fe3e474f838481e62ecc31e2b0a82b200ce75d8c6000156fd8a6d
-EBUILD kwin-5.22.4.ebuild 3970 BLAKE2B f2085c87ea0d549e016750ff85a30ed4a116403745e90c89948454903e7581188580364b5f413fe030e8d3c48e98db6bf5f1d584690f6be1deb7e4788303c214 SHA512 f3c5279c53a951a9f8bb7e30db3db05b6e215aa746d1b11cc001458f13ac0b95d42c5dc2eb2eb61339d4fbe0bd2d8dbd2e6da74382326ac1ead1753c6c66139b
+EBUILD kwin-5.21.5-r1.ebuild 4046 BLAKE2B cbc52cf5c4fed84cf36b94041882e03390ffb66585879a11fa394de755dd9dce84a5181205660a3b1807ee3517f9cb3c27fea5e45201ee2f69dccc6bd6c30928 SHA512 2315787b1363d4177da611f45973a115a033e672a68098fffd56bb83b32c17c44d6d8758bbf84b1ef372c84f518cbaf4370b90ba367fc66ad0b2e97dde16b333
+EBUILD kwin-5.22.4-r1.ebuild 4034 BLAKE2B 2dc700e014d6acadadc5d98d6e96f787e7e5961c452e6f7c506da59aa955dd99d40c831b8aef5fd46d6194add7402663d3506af39a3f9aca8048bad24615d7d3 SHA512 49e46d75e26eab00448b38011cac90e04547bee97db49bfd9da59bd55f273a5052e9d8356493ef48a9556a257f85b21f5803f1145f2bf56ac7cc0cbb1d9d02ca
 MISC metadata.xml 443 BLAKE2B e972639d031b3e32681af007b9d5daa44167bdbcb9b83ff557e7bcde84b588403240021f8880eb1cc852fbae37d9e8c5ffb392fa1aff19f2075d32876f5082af SHA512 cf0743ac8f3ed8a2ec354653cfbec6bbd5ef191227e46d5d56119f7c0b3ac5a388cfef44f7ce5f2ba9079f3eee897b29b52b726f4e99ee50e29cbb584ed19b3c
diff --git a/kde-plasma/kwin/kwin-5.21.5-r1.ebuild b/kde-plasma/kwin/kwin-5.21.5-r1.ebuild
new file mode 100644
index 000000000000..0398bf46dd8f
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.21.5-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.82.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+IUSE="accessibility caps gles2-only multimedia plasma screencast"
+
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	>=dev-libs/libinput-1.14
+	>=dev-libs/wayland-1.2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5=
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwayland-server-${PVCUT}: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-${KFMIN}:5 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+"
+# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	|| (
+		x11-base/xwayland
+		x11-base/xorg-server[wayland(-)]
+	)
+	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+	test? (
+		>=dev-libs/wayland-protocols-1.19
+		>=dev-qt/qtwayland-${QTMIN}:5
+	)
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" \
+			-i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package accessibility QAccessibilityClient)
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package plasma KF5Runner)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	optfeature "color management support" x11-misc/colord
+	elog
+	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
+	elog "windows to the end of the list was changed so that it remains in the"
+	elog "original order. To revert to the well established behavior:"
+	elog
+	elog " - Edit ~/.config/kwinrc"
+	elog " - Find [TabBox] section"
+	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
+}
diff --git a/kde-plasma/kwin/kwin-5.21.5.ebuild b/kde-plasma/kwin/kwin-5.21.5.ebuild
deleted file mode 100644
index 9340cfb8534d..000000000000
--- a/kde-plasma/kwin/kwin-5.21.5.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="accessibility caps gles2-only multimedia plasma screencast"
-
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	>=dev-libs/libinput-1.14
-	>=dev-libs/wayland-1.2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwayland-server-${PVCUT}: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-${KFMIN}:5 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-"
-# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-	test? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-qt/qtwayland-${QTMIN}:5
-	)
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" \
-			-i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package accessibility QAccessibilityClient)
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package plasma KF5Runner)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	optfeature "color management support" x11-misc/colord
-	elog
-	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
-	elog "windows to the end of the list was changed so that it remains in the"
-	elog "original order. To revert to the well established behavior:"
-	elog
-	elog " - Edit ~/.config/kwinrc"
-	elog " - Find [TabBox] section"
-	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
-}
diff --git a/kde-plasma/kwin/kwin-5.22.4-r1.ebuild b/kde-plasma/kwin/kwin-5.22.4-r1.ebuild
new file mode 100644
index 000000000000..6961f1ed9b88
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.22.4-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.82.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="accessibility caps gles2-only multimedia plasma screencast"
+
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	>=dev-libs/libinput-1.14
+	>=dev-libs/wayland-1.2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5=
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwayland-server-${PVCUT}: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-${KFMIN}:5 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+"
+# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	|| (
+		x11-base/xwayland
+		x11-base/xorg-server[wayland(-)]
+	)
+	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+	test? (
+		>=dev-libs/wayland-protocols-1.19
+		>=dev-qt/qtwayland-${QTMIN}:5
+	)
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" \
+			-i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package accessibility QAccessibilityClient)
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package plasma KF5Runner)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	optfeature "color management support" x11-misc/colord
+	elog
+	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
+	elog "windows to the end of the list was changed so that it remains in the"
+	elog "original order. To revert to the well established behavior:"
+	elog
+	elog " - Edit ~/.config/kwinrc"
+	elog " - Find [TabBox] section"
+	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
+}
diff --git a/kde-plasma/kwin/kwin-5.22.4.ebuild b/kde-plasma/kwin/kwin-5.22.4.ebuild
deleted file mode 100644
index 44d95b984762..000000000000
--- a/kde-plasma/kwin/kwin-5.22.4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="accessibility caps gles2-only multimedia plasma screencast"
-
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	>=dev-libs/libinput-1.14
-	>=dev-libs/wayland-1.2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwayland-server-${PVCUT}: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-${KFMIN}:5 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-"
-# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-	test? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-qt/qtwayland-${QTMIN}:5
-	)
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" \
-			-i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package accessibility QAccessibilityClient)
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package plasma KF5Runner)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	optfeature "color management support" x11-misc/colord
-	elog
-	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
-	elog "windows to the end of the list was changed so that it remains in the"
-	elog "original order. To revert to the well established behavior:"
-	elog
-	elog " - Edit ~/.config/kwinrc"
-	elog " - Find [TabBox] section"
-	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
-}
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index f51c74ded9be..6c09601c3d86 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,3 +1,3 @@
 DIST layer-shell-qt-5.22.4.tar.xz 17620 BLAKE2B bcf8d1b0e56c2ad6d757d4632bbc3034bbb3fac81b876b84793ce4d1419fc61fa85efb7723c6826170163f2dee2e5b76a552d2ad8d49bedf99e325382d30eb13 SHA512 5786493195f524068ab55258a252d7d4cac2ef92d074ac9a57346ddebdf259a33959ba7093cd9ad1caf06cab52bae362054999e16fff48485c3daa418507afc2
-EBUILD layer-shell-qt-5.22.4.ebuild 609 BLAKE2B 3946cc53fb4db09f8d0160e1addb8f81460d9376f0582032b43895dc6b070c926df93dffc4f129ebf1d2693c95ee5de807eafaf54274c90ff8648f081b35e80b SHA512 daa0f91e10d7cf084f3e07debca99200fd6b23752a182a4124d701f256054f006d5fdc1c5e547f47a9fe1865450027fb1afb66124f297f13ebb45bb12b5d6a00
+EBUILD layer-shell-qt-5.22.4-r1.ebuild 594 BLAKE2B d2f90173fe903788afc7919a511bfcb9323acd5e1b4c06dbac57ec06d39bc0c0d86d6178159733d3be3097d302ccf76c8a12615b11514f8f91d9e37ee6a350c4 SHA512 d9af94bbbff931e1e0be043037c6dc349abb0c5dd4d85ec8387d8717cfc8f26244e5120feeb5638f560a8926222255b9111fb7508faccc17d6973dbe10c70ad9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.4-r1.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.4-r1.ebuild
new file mode 100644
index 000000000000..79902f136700
--- /dev/null
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.4-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-shell protocol"
+
+LICENSE="LGPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[X]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	x11-libs/libxkbcommon
+"
+DEPEND="${RDEPEND}
+	dev-libs/wayland-protocols
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.4.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.4.ebuild
deleted file mode 100644
index bb5a21f13cb1..000000000000
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-shell protocol"
-
-LICENSE="LGPL-3+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/wayland-1.15
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[X]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	x11-libs/libxkbcommon
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.1.1
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 7e00a8b32186..d3c67ee15b44 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 6bc60b5dd28a..7f89ec8f32d4 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -3,5 +3,5 @@ DIST roundcubemail-1.4.11-complete.tar.gz 7048262 BLAKE2B aaf5e6ce5b07577f687788
 DIST roundcubemail-1.5-rc-complete.tar.gz 7683911 BLAKE2B e67bbb8ad3d5ffa69091c18b519f78a3dc6d4cc1783921aab9de3c86351d2946cbf784267f5db69434da25413ad1f961161289b47408f14d9e6fa26d8b1e0999 SHA512 4e49e91bb53546e6ac348e33e64019afeee2ce6b78caa4375148fc6fac5abbe8e5db42670c5527e3678abe838ddf349275353e7919584d751bf4c321a62fe795
 EBUILD roundcube-1.4.11.ebuild 2272 BLAKE2B ff467e66c84492af33462c4f26b896344b43ae10585ad551afc105e8fe76e0878bac85b98adf17c0fed649509e3cb2c77e5670a4589510364cdecfe97085d606 SHA512 2a8d669a627042f377f61ee1b742e39a59cf2e3b65f3f8497106624970a5e3a1001b5d1d4d57cf0e7a2a1224244da58eb228c04d29c371b310cc34612320f5d6
 EBUILD roundcube-1.5_rc.ebuild 2337 BLAKE2B 5e2f9c8fbacc0ad8130170a4c6cf63de55608cc714b1e3d7539b92a0ac1dc0c9a16fce52c8b25b0398ea4aa7313d52d7f87442cacb46f824ee55ec7fe708815b SHA512 1cb7e351fcd9537f4201aa31128eb8db02ea27398068978b33bc6b602f97a361e885b88e6a3c799afe66a55e6a615a6fdad9a38dfe7f10115a5cdcf3fee7a15a
-EBUILD roundcube-9999.ebuild 2337 BLAKE2B 5e2f9c8fbacc0ad8130170a4c6cf63de55608cc714b1e3d7539b92a0ac1dc0c9a16fce52c8b25b0398ea4aa7313d52d7f87442cacb46f824ee55ec7fe708815b SHA512 1cb7e351fcd9537f4201aa31128eb8db02ea27398068978b33bc6b602f97a361e885b88e6a3c799afe66a55e6a615a6fdad9a38dfe7f10115a5cdcf3fee7a15a
+EBUILD roundcube-9999.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 MISC metadata.xml 1117 BLAKE2B 261adf82c703e6eb1c00a5313642fc14679de68fa6c5ec67b5ef3b7ec0fd1b420dfb3ced2076a1d6cbf51eca705b6b58254575f9282f04dc0808ad5a8aebbeb0 SHA512 2a1d7529fb775b156fc26e27214ed0204a740a5514280864933591f6647705d4ffb949c1a708d0a5348436ece35131fb7d3aa3a6fe864e20c76a553037b1ab4e
diff --git a/mail-client/roundcube/roundcube-9999.ebuild b/mail-client/roundcube/roundcube-9999.ebuild
index 9052cdcb124f..e63578dfa2c6 100644
--- a/mail-client/roundcube/roundcube-9999.ebuild
+++ b/mail-client/roundcube/roundcube-9999.ebuild
@@ -59,6 +59,7 @@ src_unpack() {
 	if [[ "${PV}" == *9999* ]]; then
 		git-r3_src_unpack
 		pushd "${S}" > /dev/null || die
+		rm Makefile || die
 		mv composer.json-dist composer.json || die
 		composer install --no-dev || die
 		./bin/install-jsdeps.sh || die
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index f1677aa518de..b251a1d2afb1 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index fcc55205abb9..ddfaa46db9fb 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -7,9 +7,11 @@ DIST courier-1.0.14.tar.bz2 7541652 BLAKE2B 5ddaabcfc49d5681b884311187eae04e492e
 DIST courier-1.0.17.tar.bz2 7644893 BLAKE2B c31a5f9b27119b0affc7fe3b66da8d35534f519c8ade77b5e59e0b08f92f143b54d519ef0f726b1e68f900e8f330811befb7f2d626de041ebee53be25e089bbe SHA512 588415d1062581ba7fef64eb884c129e4802d90f6e6bf583e249c6e83e62ec90dbc7ccc0e6e9ce4697c00a4c66b10b84bfc6121854fa7abacd613010f34936d6
 DIST courier-1.0.5.tar.bz2 7465054 BLAKE2B 55e9ba2a85889e7210652475149f4d3e687fd63a27b44a5a16c888b2f60bb18c4156e3344792585fed2ee3d81770e79c55ce5791842c255b8701bad5d2f8af4e SHA512 99a8e98633da99abd1f6f4e24328d4655526d51dc9fc03ffcb9c1e0cce0e608dedb2ac9511829af4487ff5af4618500d6fbbee26568f2a05e3c9d3cf3b48b2a5
 DIST courier-1.1.2.tar.bz2 7652292 BLAKE2B 3d5ded14e3972532abd86bdd9d2a144dc907d6e0d1300dcc5395fcc36984bc619453e612c4c2b504fd06cdbea44ce9cd70227e5b122445704df3ba852cdc5594 SHA512 e0267acae90e792a8813b189296a599c4e27337bd5952d311cc99b068b628d4c0c6e0ae4c6ccb03fd6ada4d0a9cb362c59a7a21833177301a830fcb4c437abfd
+DIST courier-1.1.5.tar.bz2 7654159 BLAKE2B 7ad09b4b3c8ec201ea275851aec4efb34861a2881c765228b58063d26f17580fbe8ffe4e882d43b74ed048c3bf711e0eb08cb45eb1ba25ab2073a8c411a6cd4f SHA512 6b7040a73b09a4fc0ad4d93c576d7d7026aa743e5bbfe3ae14d2474dd9cffdb3419eceb14000cc0beeae40886796d9973e9f8611a7ea925cf2e0ab928904038a
 EBUILD courier-1.0.13.ebuild 9224 BLAKE2B 5208e68e759506bc292dbb588c9dfeaaa1f461b69e3c41758e6c91373fdf12f6897b49f0edbd2a3eb085fef1f7996eb68458295a0595e0628fc3d0fb86b50657 SHA512 3cc51f382bcc84f75c12bcb7c76742f8a2546f3c7dd56c20fc87b56e2c60b2715f29cebac5e998497fdc086bfe361b5e96d2dbcb09db9d5b6aa5d8bad8986375
 EBUILD courier-1.0.14.ebuild 9218 BLAKE2B 44fabea536a2b64fa88047a074cbbf30c04c071182c6551f3fa969deb875b000fb764810204d1f73dfe8c6d6edca77e2b04d933ac3d038f40102d0a538d6ed42 SHA512 4644d80a601ce95d8b0127353ae24f4434d7701c3da1916640f5e878354e11f6982544e9d3e70d0c40ed470a15d244c76b7e436e723c51ae702f43fe3ddd93f2
 EBUILD courier-1.0.17.ebuild 9226 BLAKE2B 6bc83cef3ea12abe29323d742022584ce7b8024a29eebe8c1e1a280d47d88f89da2bb000203a9146d54b7c52aa11480b8e7116de63152c8f3238059784b9f886 SHA512 9f6d36c6019a16d59c6825de7991cf22afe38e288b02884f33488738ce289a10fdbba9a493fc7a2a790fdbcc7ea9340b2fdedeb52b8ebda37e0ecfb08f0e23d7
 EBUILD courier-1.0.5.ebuild 9443 BLAKE2B 4db42a5ec6807d65df7e5f552fd9fa4723fd55ffc3e48cb10928e455194c09dfdbce92d61caa988db66e18209bfda36d06f4fe641d96ccf1e9b9f37b17d444d8 SHA512 f19f078f7f7567285cf2cfbd86b16e38532f0b51519283b642f0acac30b2b7c4a49322792d7359adabee73d55fa5368a286d1402df44c4019c91c9cb248cb2ff
 EBUILD courier-1.1.2.ebuild 9233 BLAKE2B da6ab9db691a408a4f5aebbaa4134100fccfe8fea11b7e690625f182c5720e5ca5ad98e64ed99e1aa175dd3d1f957d1aec61f61778b4de533657ce7d1d701ce9 SHA512 34254604b8859573c96c04f365cc145b6d5816dd63ca0e2e5847794f7014544f87880b33318c2a8bfdfafebdf88c466584a1385a1f2acf399ff1f7706d128f55
+EBUILD courier-1.1.5.ebuild 9228 BLAKE2B 0b6b73361f4138c733f88f372b95f3de6308185e0c9604e1144340d0fd4396cc27421fc4c4b5d00589838d46449bd06a47500b77a5732d82b59649af3ba2bff6 SHA512 7df3da54ec803631bc5171d23585241f0e50c833b847bdedbb74d4a5f35942295833ff6b6059c68a2a9ffad883c5a56b6999e3b8124ac1e952791daf3fbddbd7
 MISC metadata.xml 755 BLAKE2B 8ec0dd31ad59193d95585ab88f0bac6ced87132444a4136b2c2f80458a11f5296c42283574c3b56c26a31dad25fff530ebbfbf1ef467a1b824d11afe93a6da31 SHA512 de15af05e98deba4d3b297b4301439d892c3ba0d8af30ca459fcac72bf0179de87bf11260b8bfdb3827dd1f0e5123d68817766ffe037cece9c30adb3e8bd8b06
diff --git a/mail-mta/courier/courier-1.1.5.ebuild b/mail-mta/courier/courier-1.1.5.ebuild
new file mode 100644
index 000000000000..f013aaaa1aa6
--- /dev/null
+++ b/mail-mta/courier/courier-1.1.5.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.71.3
+	>=net-libs/courier-unicode-2.2.3
+	net-dns/libidn:=
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=sys-libs/gdbm-1.8.0
+	dev-libs/libpcre
+	app-misc/mime-types
+	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
+	pam? ( sys-libs/pam )
+	mysql? ( dev-db/mysql-connector-c )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( dev-db/postgresql:= )
+	spell? ( app-text/aspell )
+	fam? ( virtual/fam )
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+	!mail-mta/opensmtpd
+	!net-mail/dot-forward
+	!sys-apps/ucspi-tcp
+	"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	sys-process/procps"
+
+# get rid of old style virtual/imapd - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap"
+
+PDEPEND="pam? ( net-mail/mailbase )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+src_prepare() {
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	filter-flags '-fomit-frame-pointer'
+
+	local myconf
+	myconf=""
+
+	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+
+	econf ${myconf} \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with spell ispell) \
+		$(use_with ldap ldapaliasd) \
+		$(use_enable ldap maildroldap) \
+		$(use_with gnutls) \
+		--with-notice=unicode \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--localstatedir=/var/lib/courier \
+		--with-piddir=/var/run/courier \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-paranoid-smtpext \
+		--with-db=gdbm \
+		--disable-autorenamesent \
+		--cache-file="${S}/configuring.cache" \
+		--host="${CHOST}" debug=true || die "./configure"
+	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
+}
+
+src_compile() {
+	default
+}
+
+etc_courier() {
+	# Import existing /etc/courier/file if it exists.
+	# Add option only if it was not already set or even commented out
+	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
+	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
+			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
+	grep -q "${word}" "${D}/etc/courier/${file}" || \
+		echo "${2}" >> "${D}/etc/courier/${file}"
+}
+
+etc_courier_chg() {
+	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
+	[ -z "${section}" ] && section="${2}"
+	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
+	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+}
+
+src_install() {
+	local f
+	diropts -o mail -g mail
+	keepdir /var/lib/courier/tmp
+	keepdir /var/lib/courier/msgs
+	make install DESTDIR="${D}" || die "install"
+	make install-configure || die "install-configure"
+
+	# init script takes care of this
+	rm -rf "${D}/var/run"
+
+	# Get rid of files we dont want
+	if ! use webmail ; then
+		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
+			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
+			"${D}/usr/share/courier/sqwebmail/" \
+			"${D}/usr/sbin/webmaild" \
+			"${D}/usr/sbin/webgpg" \
+			"${D}/etc/courier/webmail.authpam" \
+			"${D}/var/lib/courier/webmail-logincache" \
+			"${D}"/etc/courier/sqwebmaild*
+	fi
+
+	if ! use web ; then
+		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
+			"${D}/etc/courier/webadmin"
+	fi
+
+	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
+		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
+	done
+
+	newinitd "${FILESDIR}/courier-init-r4" "courier"
+	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
+
+	cd "${D}/etc/courier"
+	if use webmail ; then
+		insinto /etc/courier
+		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
+	fi
+
+	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
+	if use ldap ; then
+		[ -e ldapaliasrc ] &&  ( chown root:mail ldapaliasrc ; chmod 640 ldapaliasrc )
+	else
+		rm -f ldapaliasrc
+	fi
+
+	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
+		> "${D}/etc/courier/sizelimit"
+	etc_courier maildroprc ""
+	etc_courier esmtproutes ""
+	etc_courier backuprelay ""
+	etc_courier locallowercase ""
+	etc_courier bofh "opt BOFHBADMIME=accept"
+	etc_courier bofh "opt BOFHSPFTRUSTME=1"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
+	etc_courier bofh "opt BOFHSPFFROM=all"
+	etc_courier bofh "opt BOFHSPFMAILFROM=all"
+	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
+	etc_courier esmtpd "BOFHBADMIME=accept"
+	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
+	etc_courier esmtpd-msa "BOFHBADMIME=accept"
+
+	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
+	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
+
+	# Fix for a sandbox violation on subsequential merges
+	# - ticho@gentoo.org, 2005-07-10
+	dosym ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+	cd "${S}"
+	cp imap/README README.imap
+	use nls && cp unicode/README README.unicode
+	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
+	dodoc libs/tcpd/README.couriertls
+	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
+
+	if use webmail ; then
+		insinto /usr/$(get_libdir)/courier/courier
+		insopts -m 755 -o mail -g mail
+		doins "${S}/courier/webmaild"
+	fi
+
+	if use web ; then
+		insinto /etc/courier/webadmin
+		insopts -m 400 -o mail -g mail
+		doins "${FILESDIR}/password.dist"
+	fi
+
+	# avoid name collisions in /usr/sbin, make webadmin match
+	cd "${D}/usr/sbin"
+	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
+	if use web ; then
+		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
+			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
+			|| ewarn "failed to fix webadmin"
+		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
+			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
+			|| ewarn "failed to fix webadmin"
+	fi
+
+	# users should be able to send mail. Could be restricted with suictl.
+	chmod u+s "${D}/usr/bin/sendmail"
+
+	dosym ../bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		emake -j1 check
+	else
+		einfo "make check skipped, can't run as root."
+		einfo "You can enable it with FEATURES=\"userpriv\""
+	fi
+}
+
+pkg_postinst() {
+	use fam && elog "fam daemon is needed for courier-imapd" \
+		|| ewarn "courier was built without fam support"
+}
+
+pkg_config() {
+	mailhost="$(hostname)"
+	export mailhost
+
+	domainname="$(domainname)"
+	if [ "x$domainname" = "x(none)" ] ; then
+		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
+	fi
+	export domainname
+
+	if [ "${ROOT}" = "/" ] ; then
+		file="${ROOT}/etc/courier/locals"
+		if [ ! -f "${file}" ] ; then
+			echo "localhost" > "${file}";
+			echo "${domainname}" >> "${file}";
+		fi
+		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
+		if [ ! -f "${file}" ] ; then
+			echo "${domainname}" > "${file}"
+			/usr/sbin/makeacceptmailfor
+		fi
+
+		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
+		if [ ! -f "${file}" ]
+		then
+			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
+			do
+				i=1
+				net=""
+				TIFS="${IFS}"
+				IFS="."
+				for o in "${netmask}"
+				do
+					if [ "${o}" == "255" ]
+					then
+						[ "_${net}" == "_" ] || net="${net}."
+						t="$(echo "${network}" | cut -d " " -f ${i})"
+						net="${net}${t}"
+					fi
+					i="$((${i} + 1))"
+				done
+				IFS="${TIFS}"
+				echo "doing configuration - relay control for the network ${net} !"
+				echo "${net}	allow,RELAYCLIENT" >> ${file}
+			done
+			/usr/sbin/makesmtpaccess
+		fi
+	fi
+
+	echo "creating cert for esmtpd-ssl:"
+	/usr/sbin/mkesmtpdcert
+	echo "creating cert for imapd-ssl:"
+	/usr/sbin/mkpop3dcert
+	echo "creating cert for pop3d-ssl:"
+	/usr/sbin/mkimapdcert
+}
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 0634af17e386..73bfdf949bf9 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -5,5 +5,5 @@ AUX nullmailer-2.2-disable-smtp-auth-tests.patch 2383 BLAKE2B 07f2fc7517df280fac
 AUX nullmailer-2.2-fix-test-racecondition.patch 890 BLAKE2B 7d12af8a9b6071f11e70c6aedbe0471f042c2c2e611eedf768071715b7f42a94b2b41e814a87dd87777810cbb823d20138d40f6aa3aba93ebaec89ebb6d9e2f3 SHA512 10873e538dbc89e8899047e732515d30108b25fd0ff6bb2fc695f5790a94ac32629f41c470a2fec951357169fead36ee4512f543ad0e02c52f09799334b815c7
 AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354
 DIST nullmailer-2.2.tar.gz 257740 BLAKE2B 18821caa1a377a899e3fedc84530d7c672f345cafb627da05e6c7bcd7d2708d54fc4ff4b761a6a23b2ddbabe73514473a5ec2abf3182dce2f5d3d4fbe3618fed SHA512 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268
-EBUILD nullmailer-2.2-r2.ebuild 4279 BLAKE2B 0f2e399e92a484037fb23f2a1207300d7badc0de1ae86235294666eb1044dc8fe6b666e9e7208e765da3ff5432974a8ab5d5fe3a6586e9b5ac528f65ef2637b8 SHA512 14fbea561658b5a61b2c2e32700b92cb4713745f38adeaadef0dae3d2a8d5c6a7e6671ca3ce13881d17ec6a7238069d0b03fd2da60f08412a3970455636fe585
+EBUILD nullmailer-2.2-r2.ebuild 4286 BLAKE2B cf611cb6d863235cce976cece7f89b06a6f0b97e104387d0355e0f506892bd4f5b7fc4bd8efc40f7fcb7a57d60b624f579401a9834ac4e9cb84c0aca0fdfad48 SHA512 361b2aa95cdb159094f3e3ed8cdae3a60b9283c9ee8048cf7e548dc465c2fef04ead6a183641690a089b03a0fd07a6d87b3127ffb712095809625a1d7cf7050b
 MISC metadata.xml 342 BLAKE2B ac05adbff1c06a41efb8b6c01995d7061302e3e829fa07008538aef00de9ef00e8e665a2d45e51e0886d092a9f492ac1cb194f9ab614b944147f9a8235608c71 SHA512 bde55b4d0d452321cab14b1f38dcf2f27caa6586acc1748b9be1cb6981c0e4e90e909129d3700f49a7405f8baba80c3182d6ce84c75260a87019e8be593bc091
diff --git a/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild b/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild
index f063565fe0b3..0abff5963ff0 100644
--- a/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild
+++ b/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86 ~x64-cygwin"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~x64-cygwin"
 IUSE="ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 99bcd8d29490..89fd87cedc7a 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -2,20 +2,10 @@ AUX postfix.rc6.2.7 2107 BLAKE2B 4ea7006a381b76d5926a7d1794ab45e30d4829a17acfa0f
 AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d38f195227190b73cf0fb41cd68a86e97cfe844cc7f9f095cba0a17afe9ce7c8697e0aa30f5faecde6 SHA512 04b475040b153f488a9358567ff9ee2eb8f263c619dadc23c837d17c19106041296e3652bcaded2be0c7c8b9eee7fd5f2ad55bed3e7f9b3a4bf9655f4762d563
 AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
-DIST postfix-3.5.10.tar.gz 4621130 BLAKE2B 32a0ef43131c1bff319fb8a159e78a4fd81aba85aa2c8aab3020d575e6216a1e5fb4612a4aa3693b62de5825a29bf5ea1c1870835f033569a5d2d3e494306ef1 SHA512 5845701d3dcdaaea376a44810a84dbe908e96e5ff54921cd40fd2d5c5643ed8e4add5936e149237fea4cb69c1ffb4ceb4171d1e779be096aa21a6e5021b604da
-DIST postfix-3.5.11.tar.gz 4621709 BLAKE2B 8c6ed5047790f121b1e248a3c8985c04a95a4071a960376c9a1b31cabdbb6a8b0ee9a378fb813061442c7aad98956ed4917e92155ed3b7ea10369a41eec20d58 SHA512 a1fb3ef8114fc044e9e51af115ffce8c3b3668c1c7123915f728b2b2dadc4418d07af520377512733214e3aae2490d608fd2776de86c5e9300bb29ab92348d6e
-DIST postfix-3.5.8.tar.gz 4614733 BLAKE2B 13166e854f70987f981bb5e7e5dabfaa73b3170ab16fc1ff8f70f6b98a0697ac980bdf74bbfb39fdfd1972f922a31a28882b1575b79fd8f01d81e08e68d756bc SHA512 0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b
-DIST postfix-3.5.9.tar.gz 4620852 BLAKE2B 66a7bd71e7f74c8f25963ed8d41f04f1f95e060fd23c848065a0e947e766efe058e6593ed8ce1f69528f5b2e9868756d0ea0622b3d77486852882622dd3bb872 SHA512 9ff3a33cdd5811e470d5c6cfa896fa76e4d3257b139deec5f420d18e34232f327b7c8496c5d13566c6f9ae1fdf8719feb9981372b2869b0208a2eb3a1daaeadd
-DIST postfix-3.6.0.tar.gz 4748506 BLAKE2B f4692500cb78e82cede48d750eb86db61dc67ba1d69d220d24c965b57941402a5bf157b4a69d65133d37ce3d9e1341260d07ebd4477184b3caa56b22fd13b4f5 SHA512 af326472333935de111d7f7025af53a1dfd84382c2d2891e91624ce665c258831f28d92fd73d1ab68f82192d9848025bd30d16eb48b3912b46e3fb50dbf194bf
 DIST postfix-3.6.1.tar.gz 4748754 BLAKE2B c64d8f4c12cd7cb39bd15c371c20db4aa61b39120b6c078eda7c48c94d65e181b51ac8f74f3231791fc3ad6c0d04f74975f50776f984ffa9b9f8a4c5c99cbade SHA512 6f83a6aa55bd442fe005b35c7470483ff5ba6781121f783b07ef454580354fc5c85d0d5106936810d6bef0f5592937f0863eec3b82e138caac7694e2a3bb7bc3
 DIST postfix-3.6.2.tar.gz 4749530 BLAKE2B 349f3eb2995fe72c89e374a2f95cbb09d4a4f5a5c896e340a2a166ffcb2c498ba514022a59a17d2731807f6dadc03f804a3d4b16127dd2d6addb825558b7ffd6 SHA512 464ce9ec77e637ede91123472a0383b2bfda52102f9e9852c7191016d4fda2e14f302f2db9793887c182688c2a14dde6eeda728523196a627a8028f99555a4d9
 DIST postfix-3.7-20210717.tar.gz 4750293 BLAKE2B 59eb90f451790db9f398da79736a23c3ce64a3da2978a597b57ca8df5480739a20a7eb68a100342465b5af3764acaab46b5863207e50e5ba07553777ffd40f51 SHA512 8166c5f2a5d17e042723dbe51c128fa9ba0109de1c29a562cef8a9dbb3517ac2ac0e936467e7877e2c27ac0ef6012a4fa0159d1670ee49f6177a7702f59e9a3c
-EBUILD postfix-3.5.10.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
-EBUILD postfix-3.5.11.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
-EBUILD postfix-3.5.8-r1.ebuild 8693 BLAKE2B e0ca3baeabcb4b0e703115c6839b4b0e0d75c789421c8fbd0aaeccff22630f797f11e5b8cc5ae1f09d21773f257a5edc117392b377d9c743e5de62cf42289540 SHA512 7ff76d64ab024375f4d015634898f1f8475d349ed9718c40e02ffad2abddfb32676b076168bc0bdb35f78b4e95df596d1fd286b95b9d5a7fb57d4c8188dd46b2
-EBUILD postfix-3.5.9-r1.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
-EBUILD postfix-3.6.0.ebuild 7984 BLAKE2B 30ccb9c5339e0cf795b97e6228a5190d0bbce455d1a254b536fc684f767e82ed54d80f3291847ea0dc52f5c05d9c0e5e0309f5f4fad05bc8fa49de98c48c3e11 SHA512 5cefa9c8a1a6b83f0158e704f69fd2f6a9633c801e3051c5abe6fcff5c4213c514b93629c0f620823d0166c329126967b10fb51206e43b0cda03e0f145966634
-EBUILD postfix-3.6.1.ebuild 7979 BLAKE2B 907b1753f88fc5fd0f13302df01e193c77dcc8f3c5256f094184cacf31a28fc06fd075157c6ffe9e0cee09d80ef854d233c3d728a92cddaaeefeeda288c1ddda SHA512 69cc8459317bfc97b3b4fd204f760d45cf52a750580032650763144f56a302d667b045136415a6763a5f0423e90b5e3788717cea45b0ad7a8f3a21d5523415b1
+EBUILD postfix-3.6.1.ebuild 7978 BLAKE2B 66c865d94f250d4ef3ae2c3dc24a0fb184f85cc67cb5e461c8bf46178415b649e80c6b936dd6e85e02adab33e7ef2b6a5e451500dea66967b97f32f0bd17d107 SHA512 368f073d877c9d49e4b38f5c603b30e99c23505c2bce1262b0152a03dfb4bfafeb2d43dc6cdc67e2c4cd4ac4559ebaec61df21d674eba026c27a38c386d14ff0
 EBUILD postfix-3.6.2.ebuild 7917 BLAKE2B 58ccfe215e40993ce6dcc20646a3083d2e4ec8c7e6575b65facf3060a15d4ea7184e2ae6130336099ad908b8283eef8947c0fc4db5532801f77c930082b8b5b5 SHA512 aabb59f03bef2d4a8e917c102da12f510b33dd148fa25cd8306c06bb7bd9aafef0d1b41f8e87f768b4927b33c6ebe82290cf3293bd0e0a32739489dab1a8b10d
 EBUILD postfix-3.7_pre20210717.ebuild 7917 BLAKE2B 504cae64c2c323d844e355600f1d5daee40524a940b54d2a4d28e3a870a0d3628be5cbb1cb1c471544764cc1db4ab49378bc54feb1f9c84214aca1c3a0b28ed1 SHA512 f0011add1c12ae383a03ac9f3989509cbc86aa820680151854e0f783ec387fc571345a0f1a2b78966838bfbdb2f225584d5ee3303bbc33f84729053fd08b25f7
 MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/postfix-3.5.10.ebuild b/mail-mta/postfix/postfix-3.5.10.ebuild
deleted file mode 100644
index e68677152aa4..000000000000
--- a/mail-mta/postfix/postfix-3.5.10.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic pam systemd toolchain-funcs
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND="
-	acct-group/postfix
-	acct-group/postdrop
-	acct-user/postfix
-	>=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-
-RDEPEND="${DEPEND}
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!mail-mta/ssmtp[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-src_prepare() {
-	default
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
-	AUXLIBS_PCRE="$(pcre-config --libs)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			AUXLIBS_CDB="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles shared=yes dynamicmaps=no pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install() {
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape, posttls-finger and collate
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-	dobin auxiliary/collate/collate.pl
-	newdoc auxiliary/collate/README README.collate
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02755 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	keepdir /etc/postfix/postfix-files.d
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	# postfix set-permissions expects uncompressed man files
-	docompress -x /usr/share/man
-
-	if use pam; then
-		pamd_mimic_system smtp auth account
-	fi
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	if has_version mail-mta/postfix; then
-		# let the sysadmin decide when to change the compatibility_level
-		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
-	if has_version '<mail-mta/postfix-3.4'; then
-		elog
-		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
-		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
-		elog "Before backing out to an older Postfix version, edit the master.cf"
-		elog "file and remove the postlog entry."
-		elog
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions
-
-	# configure tls
-	if use ssl ; then
-		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
-			elog "To configure client side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
-			elog "To configure server side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-server
-		fi
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.5.11.ebuild b/mail-mta/postfix/postfix-3.5.11.ebuild
deleted file mode 100644
index e68677152aa4..000000000000
--- a/mail-mta/postfix/postfix-3.5.11.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic pam systemd toolchain-funcs
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND="
-	acct-group/postfix
-	acct-group/postdrop
-	acct-user/postfix
-	>=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-
-RDEPEND="${DEPEND}
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!mail-mta/ssmtp[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-src_prepare() {
-	default
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
-	AUXLIBS_PCRE="$(pcre-config --libs)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			AUXLIBS_CDB="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles shared=yes dynamicmaps=no pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install() {
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape, posttls-finger and collate
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-	dobin auxiliary/collate/collate.pl
-	newdoc auxiliary/collate/README README.collate
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02755 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	keepdir /etc/postfix/postfix-files.d
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	# postfix set-permissions expects uncompressed man files
-	docompress -x /usr/share/man
-
-	if use pam; then
-		pamd_mimic_system smtp auth account
-	fi
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	if has_version mail-mta/postfix; then
-		# let the sysadmin decide when to change the compatibility_level
-		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
-	if has_version '<mail-mta/postfix-3.4'; then
-		elog
-		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
-		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
-		elog "Before backing out to an older Postfix version, edit the master.cf"
-		elog "file and remove the postlog entry."
-		elog
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions
-
-	# configure tls
-	if use ssl ; then
-		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
-			elog "To configure client side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
-			elog "To configure server side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-server
-		fi
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.5.8-r1.ebuild b/mail-mta/postfix/postfix-3.5.8-r1.ebuild
deleted file mode 100644
index 7bc7473a5158..000000000000
--- a/mail-mta/postfix/postfix-3.5.8-r1.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic pam systemd toolchain-funcs
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND="
-	acct-group/postfix
-	acct-group/postdrop
-	acct-user/postfix
-	>=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-
-RDEPEND="${DEPEND}
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!mail-mta/ssmtp[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-src_prepare() {
-	default
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
-	AUXLIBS_PCRE="$(pcre-config --libs)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			AUXLIBS_CDB="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles shared=yes dynamicmaps=no pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install() {
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape, posttls-finger and collate
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-	dobin auxiliary/collate/collate.pl
-	newdoc auxiliary/collate/README README.collate
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02755 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	keepdir /etc/postfix/postfix-files.d
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	# postfix set-permissions expects uncompressed man files
-	docompress -x /usr/share/man
-
-	if use pam; then
-		pamd_mimic_system smtp auth account
-	fi
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	if has_version mail-mta/postfix; then
-		# let the sysadmin decide when to change the compatibility_level
-		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
-	if has_version '<mail-mta/postfix-3.4'; then
-		elog
-		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
-		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
-		elog "Before backing out to an older Postfix version, edit the master.cf"
-		elog "file and remove the postlog entry."
-		elog
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions
-
-	# configure tls
-	if use ssl ; then
-		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
-			elog "To configure client side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
-			elog "To configure server side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-server
-		fi
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.5.9-r1.ebuild b/mail-mta/postfix/postfix-3.5.9-r1.ebuild
deleted file mode 100644
index e68677152aa4..000000000000
--- a/mail-mta/postfix/postfix-3.5.9-r1.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic pam systemd toolchain-funcs
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND="
-	acct-group/postfix
-	acct-group/postdrop
-	acct-user/postfix
-	>=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-
-RDEPEND="${DEPEND}
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!mail-mta/ssmtp[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-src_prepare() {
-	default
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
-	AUXLIBS_PCRE="$(pcre-config --libs)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			AUXLIBS_CDB="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles shared=yes dynamicmaps=no pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install() {
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape, posttls-finger and collate
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-	dobin auxiliary/collate/collate.pl
-	newdoc auxiliary/collate/README README.collate
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02755 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	keepdir /etc/postfix/postfix-files.d
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	# postfix set-permissions expects uncompressed man files
-	docompress -x /usr/share/man
-
-	if use pam; then
-		pamd_mimic_system smtp auth account
-	fi
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	if has_version mail-mta/postfix; then
-		# let the sysadmin decide when to change the compatibility_level
-		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
-	if has_version '<mail-mta/postfix-3.4'; then
-		elog
-		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
-		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
-		elog "Before backing out to an older Postfix version, edit the master.cf"
-		elog "file and remove the postlog entry."
-		elog
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions
-
-	# configure tls
-	if use ssl ; then
-		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
-			elog "To configure client side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
-			elog "To configure server side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-server
-		fi
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.6.0.ebuild b/mail-mta/postfix/postfix-3.6.0.ebuild
deleted file mode 100644
index 96598ffacec1..000000000000
--- a/mail-mta/postfix/postfix-3.6.0.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit pam systemd toolchain-funcs
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND="
-	acct-group/postfix
-	acct-group/postdrop
-	acct-user/postfix
-	>=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	"
-
-RDEPEND="${DEPEND}
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!mail-mta/ssmtp[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-src_prepare() {
-	default
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
-	AUXLIBS_PCRE="$(pcre-config --libs)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			AUXLIBS_CDB="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles shared=yes dynamicmaps=no pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install() {
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape, posttls-finger and collate and tlstype
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-	dobin auxiliary/collate/collate.pl
-	newdoc auxiliary/collate/README README.collate
-	dobin auxiliary/collate/tlstype.pl
-	dodoc auxiliary/collate/README.tlstype
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02755 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	keepdir /etc/postfix/postfix-files.d
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	# postfix set-permissions expects uncompressed man files
-	docompress -x /usr/share/man
-
-	if use pam; then
-		pamd_mimic_system smtp auth account
-	fi
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	if has_version mail-mta/postfix; then
-		# let the sysadmin decide when to change the compatibility_level
-		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions
-
-	# configure tls
-	if use ssl ; then
-		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
-			elog "To configure client side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
-			elog "To configure server side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-server
-		fi
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.6.1.ebuild b/mail-mta/postfix/postfix-3.6.1.ebuild
index 658ac683bd4a..3ae2ed817ecd 100644
--- a/mail-mta/postfix/postfix-3.6.1.ebuild
+++ b/mail-mta/postfix/postfix-3.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND="
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 10e44a897a14..c219497f36a4 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/caja-admin/Manifest b/mate-extra/caja-admin/Manifest
index f5e92206a5a9..12449f7dc92a 100644
--- a/mate-extra/caja-admin/Manifest
+++ b/mate-extra/caja-admin/Manifest
@@ -1,4 +1,6 @@
 DIST caja-admin-0.0.2_p20200328.tar.gz 27087 BLAKE2B 1d8ce82026249cff4dc3360cedffb79079e6608414a7718f265a19fce1a579d7f1fc4dadf3b05dd5ef19dbd12a92a61f90c04736cc9196d2dd5d4230c8c31784 SHA512 6a134e1d53bbdbf1a617582de67f7ddba7c7e0193a714246993092dd1c96c2ccc05afdb2da5cd2dfd974f7ab95e0aeedab244f2fa1335fd157ce45b4404a1f90
-EBUILD caja-admin-0.0.2_p20200328.ebuild 1092 BLAKE2B e62e9b08f21f26bc1351f056d59e3b8f2874126088f85ad75ee84d8e856aeaf86b87c3f8799bdee8fe6fcdd47d7dd8f7bba26460019d7f0e952305dde969adaf SHA512 0a4180d0b76ebedd7ab68a86891b0ac166734866d105cb8c28e32ea907cc35a680592c1138fdb2045a1fb224dd58fbebcdcf2c0f453240728344ab2b5d517ce3
-EBUILD caja-admin-9999.ebuild 1094 BLAKE2B 3c7c44ca4c0225d434ad4559cb9bd73318b9d01f545d3e83b14f6ff55046ff1697e3e8c128b67207be45a0fce8c1a5ff77c0f2077efaa0bfddcbb44e3b71c43c SHA512 51fe5e16e3e235d8a12bfe691b5d01eeb550799f44bbb9e14a56b58236051db1c61910c084807c1c67da4540cfcf384a92238d3f7e7ac1ec3174bcde52f948a5
+DIST caja-admin-0.0.4.tar.gz 28095 BLAKE2B 1f3d89e2c7f9815eb088694105eb6eba2b3da2f2ceabde8e468b5baec4a351cc7602ecb85b241c664bee9ff394aa9155a8dcfd569f9ec888cf5cacf4ae167f85 SHA512 2aaa9c745e0532e2d1727382c89bfd679d5ae61e1aba78a41694f3c5c804d9f88424b60a2c412bb940b4df9a056bb73b195fc59dfc48827763dc7fb3678a0ac1
+EBUILD caja-admin-0.0.2_p20200328.ebuild 1101 BLAKE2B 947a296cddc9fb81bf07670fff2fcc6dff8727ca2c04e19b8ccfd21eabd9b0b58487549739d82d01ddf7e690a32f7298764487b44b4d085a4b5a423e2662eb8c SHA512 9f08c0efcbbd78ef020fe0ffa424e394317a9e5d5093f890fa3e97806ede2d1c958ae757338f662bfe24702eacf9e0ebcb42a4f9ce3d3119199ec904c96d90ae
+EBUILD caja-admin-0.0.4.ebuild 883 BLAKE2B 89a6e34456f838f4844a398a4c1b0a063df3c647987ce744ea468af23028a6fbaee443c972c6e7c1e29ce1f288c1efd17f0b9c3eee3bf9a4d9cedca9f557c7d2 SHA512 cc56a307387b95216535627ac0f730ea7be39fce36e10246952fecf5de10111acc605d99708d514b98e844e6730467f65317135fe28758071e22fe450e02f538
+EBUILD caja-admin-9999.ebuild 883 BLAKE2B 89a6e34456f838f4844a398a4c1b0a063df3c647987ce744ea468af23028a6fbaee443c972c6e7c1e29ce1f288c1efd17f0b9c3eee3bf9a4d9cedca9f557c7d2 SHA512 cc56a307387b95216535627ac0f730ea7be39fce36e10246952fecf5de10111acc605d99708d514b98e844e6730467f65317135fe28758071e22fe450e02f538
 MISC metadata.xml 576 BLAKE2B 58ee67d8ab8d6d88fc88c26f67ab9e7df19c560d693de2212389768bfb936717ff979234e420998656c1f66cc09e6c751a5096bb99ef4e3a6ffcfd971d9e52fa SHA512 d620037387d28caeee09881c6335b244d50a778713dacd3598725e14db7bb35b1c5f3e0ac5ed671b2d5d8f6dcc8d37b5fe1bdd355c874d1e62c9e9096c57f426
diff --git a/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild b/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild
index bc977df39c33..fe11a584be54 100644
--- a/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild
+++ b/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.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
@@ -16,7 +16,7 @@ else
 	KEYWORDS="amd64 x86"
 fi
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
 
 inherit meson python-single-r1
 
diff --git a/mate-extra/caja-admin/caja-admin-0.0.4.ebuild b/mate-extra/caja-admin/caja-admin-0.0.4.ebuild
new file mode 100644
index 000000000000..b4284dbdb57c
--- /dev/null
+++ b/mate-extra/caja-admin/caja-admin-0.0.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/infirit/caja-admin"
+else
+	SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
+
+inherit meson python-single-r1
+
+DESCRIPTION="Caja Admin Extension"
+HOMEPAGE="https://github.com/infirit/caja-admin"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}"
+RDEPEND="${COMMON_DEPEND}
+	app-editors/pluma
+	dev-python/python-caja[${PYTHON_SINGLE_USEDEP}]
+	sys-auth/polkit
+	x11-terms/mate-terminal
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+BDEPEND=""
+
+src_install() {
+	meson_src_install
+	python_optimize "${D}/usr/share/caja-python/extensions"
+}
diff --git a/mate-extra/caja-admin/caja-admin-9999.ebuild b/mate-extra/caja-admin/caja-admin-9999.ebuild
index 07b3fd3ec2ec..b4284dbdb57c 100644
--- a/mate-extra/caja-admin/caja-admin-9999.ebuild
+++ b/mate-extra/caja-admin/caja-admin-9999.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
@@ -6,17 +6,12 @@ EAPI=7
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/infirit/caja-admin"
-elif [[ ${PV} =~ _p[0-9]{8,} ]]; then
-	SHA="b20de2dd2e1ef74db66705965fd7480e2bf98153"
-	SRC_URI="https://github.com/infirit/${PN}/archive/${SHA}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${SHA}"
 else
 	SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
 
 inherit meson python-single-r1
 
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index 311618639e30..e476390fefe8 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,3 +1,3 @@
 DIST caja-dropbox-1.24.0.tar.xz 309024 BLAKE2B 2ae560dcd6e744fe96d9e0fcd876a899c22ad06b8238c2ad9e5394cf80aa8844cd634431dc6bb245396e6d919da857645488214880947e5b90413c254cd4c6a2 SHA512 64d699b4c3957d5996ef69936b4b2746641bc2db4efb7b23535febf5eed3ee767330927aeeda67747c0d72e0f052a2979ae2160ffaaf01e4fd82aff68a5f27bf
-EBUILD caja-dropbox-1.24.0-r1.ebuild 1834 BLAKE2B db46ed147558ee4c38a659e9d9d1262bcb3409798cbfcc5ff6262f07734126b0d00f4106d1a066c0e6c696cc11de9e3791a6c5eff032b165ea3a90d12040658c SHA512 ea6eba4ffb27b99c09e28cb299e58e723a9db2b262cac3f2211537ec7e3d3edfbf73194cbc4ac7ae0136d825c45b0d42da76d80a709c2be8220c355e356c5bf4
+EBUILD caja-dropbox-1.24.0-r1.ebuild 1843 BLAKE2B ba60c03db008ff52a343cb8f66eea4aa8ffa94a029f5b5631b870429af8faac57dea531078a55e2e5d48879fa6cb8c52f3b41bc486e79d5e0c54b39b73f5d5a2 SHA512 fe7a8894418d61ee67c8da61a263e2d8b0909ba21095b55290964bd9c4ace0c3a06a5681d4c246313f56c967652a0eff2d46ff222dc9bb407116e141fa871137
 MISC metadata.xml 341 BLAKE2B b530aa03ccd9e514d43bd1014500548a5931fcd30e288bdc9b6c56e9b4fa8dc42dd4a31074efe3b8ecb5f2f55aab3da8e7edd30fa5f3c1645cc088e594da7761 SHA512 3ef87b907e90f2093cece194a580099964f434ec7a1d43e961f0c00adeaeca085fc6e141f25f4ef7da0399e71093b4e2c12f52d0c29cd2aa3768354380ec1c37
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild
index a6f1b5507d59..f7ff19043bf5 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 MATE_LA_PUNT="yes"
 
 inherit eapi7-ver mate python-single-r1 linux-info
diff --git a/mate-extra/caja-hide/Manifest b/mate-extra/caja-hide/Manifest
index 5fc820164131..330c1562dd9c 100644
--- a/mate-extra/caja-hide/Manifest
+++ b/mate-extra/caja-hide/Manifest
@@ -1,4 +1,4 @@
 AUX caja-hide-0.9.0-py3-support.patch 684 BLAKE2B d0288daa9870a00b2d77a865f54567c51809548314c4d9659c270698563f59c4378734ee7f2386e9bd643fe0a7fe0226f5e8693e0d84e19c1c03e72da09a2cad SHA512 eb78fb5495d34b1e5ccf22d39b2cdbe8b482d3f205c5a4dcc42d592c9c18ba7a9aa81a98d27dbfb4331e2d5db79a4c08e121565b206d84898d242500a7c82677
 DIST caja-hide-0.9.0.tar.gz 17487 BLAKE2B 182a4e65745a6c3dbbc40121d95f7b5b34b4660ceb9fcffc60ddd51bdc3949191b7eafa258950b0a6b9a6befd63e4b6842481f20ba31b4bfab0668c261e87470 SHA512 86a3d5a661a731caf740c4086ffc041f9f5cb21f996bc21d92cf5d53df108d6d14b753165ee992f3d5574957850f041d03e4d78447fb4db67bf989f16eb5471c
-EBUILD caja-hide-0.9.0.ebuild 841 BLAKE2B 1ab66a8ee277208df6084261653abf7da35cc434d2de2c852e1413fbe0ceb30b7cfd1e6e52ec97b39fa86a433d023e3d8eca7802dbb8a47a856799320d6bdc0a SHA512 074f4720d9008c38f4f7ed0c5f988d868924283c278d4f3690e85d327aafa261c4fa117502b9ada6edeec6de86cadf33b57ad78aaf1cc8cc2d8d763f0db2dcb5
+EBUILD caja-hide-0.9.0.ebuild 851 BLAKE2B c1f8ca4f6de7d41b983d10122abf9acd800bed4bd9d1fdc524c42ea366a2cbb8485ded44f8c1d7511b25040e3ecbc1de6dd8098850c5c469b9092efc6d02dabf SHA512 1ccb9c078dd07eb6c63bd4bbedc1f3b29541ba06204132b0a1606c12edf28fbf0f24d6845bfaa6eb1d264639d8d8e8c9dafa75e712b3291ed36a758f9797656b
 MISC metadata.xml 338 BLAKE2B 58a272cb80dfc7bb6754fa3d8d92cc2c807a0db4aa78c993e6da77ae12a7be263743e4dd98daac68b885f6aee6fc6eddf5b60d8f5a17cc5df00828b9971b2f31 SHA512 9ae48d0c41a99e1c2138005137963e10963afba5cf274244a23267076eca0faffc3b4ec87dab5d1c71d6526d6c88d1b7665248a7bbfe51b2990123ebf2cdc92b
diff --git a/mate-extra/caja-hide/caja-hide-0.9.0.ebuild b/mate-extra/caja-hide/caja-hide-0.9.0.ebuild
index d46c9b8feadc..b58383794063 100644
--- a/mate-extra/caja-hide/caja-hide-0.9.0.ebuild
+++ b/mate-extra/caja-hide/caja-hide-0.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 inherit python-single-r1
 
 MY_PN="Caja-hide"
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index 1b576f464677..8ac6580a95d4 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,4 +1,6 @@
 AUX mate-power-manager-1.24.1-libsecret.patch 10306 BLAKE2B cf9789f62117c3aded2ce2d73027393bb5c19364f847fbbddeaa7b3b9be1bccdff3b2b1de28198965d65d4f906994c7f91bbb45448cedad0515a8a35aef12e22 SHA512 8646269729d01287cdf213a2a20a262fb658ba95fac47b521dd727ac8a4c3b81776cd24f6d9a3afc9311a4ebf2fe5cacece1db9487ba74f6cb04f008fdbf6238
 DIST mate-power-manager-1.24.2.tar.xz 6194976 BLAKE2B 6f533f9d6cbe99e9acf6e0fe9deb641e771d38f80add33b1f51aaa27aff46e2bb77d7da60ee7994908667d34b6f05c868472283cf9fd52c251467482c7c64bb3 SHA512 edbad37f41e67219790dfe704936be6fcf1d727cdff3b51cb43234b0d48f53666361d0f048704a594a594b5e124d7d8ea9d626c560cbc23ba4de3dcaafbd55ff
+DIST mate-power-manager-1.24.3.tar.xz 6199712 BLAKE2B 21eb92d6b0bc8f97c3f13847e877d6df7d8782ca90cae20e414d38c18ec9345b4b6a65cc72ed23010aec65d764381e66ac01a77a60b698c43764f2c3eb6c5229 SHA512 6aad5c5346e563ce0fbc4e72bccce49323843e3b12738b9e45040dd804f962344a1dbc8f26d518b28fc35ca9ec87a2068f81731eb0c094be114378f2f93a2a8c
 EBUILD mate-power-manager-1.24.2.ebuild 1622 BLAKE2B ea09d2a0d2ae88b78b2073a5fa300eb6f519a60e8c887daf48b4e2e84faec1bdc96dd12c1c30411aee2a17a02e76c8ebe8df7e893cc4e97c8bcfd03f57f19a9b SHA512 7dd686e2f90da5caaffcc9d9586be3c3211ecd24173e975e14df45cedc73e47c5a21c0402b1ef13746ac8e4e8823ef7dbd0fbfa39c4a39f410bc6cc18b5cc960
+EBUILD mate-power-manager-1.24.3.ebuild 1624 BLAKE2B 4ac44e3eb8c3c4502dee039781872f533815b97470fc9b33c0057d4eeb2d25ac4eda5fbabe9cdd5b27a02c0f859d6a3bdf8d8867749449f5975b7c7054601735 SHA512 8c4574a588656670b242776c91fbf14e49b2721e1d2e78be4b9730a58b1af0c8bdfb703b10ffc98716b769d0069ffd91dee8e21b890678fb8e74c5784baff566
 MISC metadata.xml 521 BLAKE2B f8f0c058645f6820653cc71154b94e7a8e0b0c221e18c6c50c53176f11ba0d7cfee37665bc7d138d81b44a6b80baf8266221b6a519ecc6ca129d604545ff9f75 SHA512 0bbcf48a03fde54a8b12ebfa3991ccb2e930a10496a39999c36640a971e4fb87acbc39fe88f1a72803ddaa10638ff4b1a9009858ca4ac2220529ce06b485a517
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.24.3.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.24.3.ebuild
new file mode 100644
index 000000000000..84d486ddbe5c
--- /dev/null
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.24.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
+
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+applet elogind libsecret policykit systemd test"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+# Interactive testsuite.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.70
+	>=dev-libs/glib-2.50:2
+	>=media-libs/libcanberra-0.10:0[gtk3]
+	>=sys-apps/dbus-1
+	>=sys-power/upower-0.99.8:=
+	>=x11-apps/xrandr-1.3
+	>=x11-libs/cairo-1
+	>=x11-libs/gdk-pixbuf-2.11:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/pango
+	applet? ( >=mate-base/mate-panel-1.17.0 )
+	libsecret? ( >=app-crypt/libsecret-0.11 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	policykit? ( >=mate-extra/mate-polkit-1.6 )
+	systemd? ( sys-apps/systemd )
+	elogind? ( sys-auth/elogind )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-libs/libxml2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.24.1-libsecret.patch" )
+
+src_configure() {
+	mate_src_configure \
+		--enable-compile-warnings=minimum \
+		$(use_with libsecret) \
+		$(use_enable applet applets) \
+		$(use_enable test tests)
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	dbus-launch Xemake check || die "Test phase failed"
+}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index bba680bbbd02..6562d9465dc5 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/cascadia-code/Manifest b/media-fonts/cascadia-code/Manifest
index 2af6b2293d15..f1d9e56657a3 100644
--- a/media-fonts/cascadia-code/Manifest
+++ b/media-fonts/cascadia-code/Manifest
@@ -1,5 +1,3 @@
-DIST cascadia-code-2102.25.zip 8666729 BLAKE2B 86e11e003fcad686f0ad9ee38af488447fd0a6c95b0f9a89e945ca173c44385af0090a50e26b355ea8019c7e33ca45edcdfa7cfddcc0734fe224c96c8d941acf SHA512 4b0b1168bf3f1adbff362ed2d7fa1f548643e5c9506866e12dc26aefb8e807b7515e0c49705f03faf1a44c037d414ba3ab3f2189d29491711d6e802035914002
-DIST cascadia-code-2105.24.zip 18708244 BLAKE2B e9055e55642a7f5b43364f0cd1d800ebb3bebb8bc1f2e726d2e200b211fb495560754ce0d54e5579a98b8f067b372709dad4d391ca6602ee917c2597adb82c42 SHA512 22d317a41d491945210f0d6051c136264d0dda2eab24bc92b1034d10703b1fe462b0dd667ff56637fdb222cc1fbd78ecc7cadc022e7f03c5ea59b4b67d2c59da
-EBUILD cascadia-code-2102.25.ebuild 522 BLAKE2B e67bf6cd8b3d10db3a7852d7dd89fda8d3fe0f01bdfcb65da6a4742682b9a6fcaeb2bf2737710e76c0040cbcdda1a1a788c42abc4a09b9839cff69396baad43e SHA512 4a55ade8cde8df2c498b613642a37ef2403319cb18e89abae6a50a759d92587c6eff4470aa9fadac3b94260a74a3a290fa6459d79a5918ad9d2a1afb583f76c3
-EBUILD cascadia-code-2105.24.ebuild 522 BLAKE2B e67bf6cd8b3d10db3a7852d7dd89fda8d3fe0f01bdfcb65da6a4742682b9a6fcaeb2bf2737710e76c0040cbcdda1a1a788c42abc4a09b9839cff69396baad43e SHA512 4a55ade8cde8df2c498b613642a37ef2403319cb18e89abae6a50a759d92587c6eff4470aa9fadac3b94260a74a3a290fa6459d79a5918ad9d2a1afb583f76c3
+DIST cascadia-code-2106.17.zip 24865338 BLAKE2B a2f756c035e6a28a5e78d0cc1c311266c2db695a21ef733ba844c3f8b08d77e6c97ec05ca244ee3a63998144fc273204f40d7ec33c534de676ca3d5df5d45f0b SHA512 3fb898636eb43467e4c95a37f65d126a6c217c1e7c1cb7d40ebb0d529c575c914f657e503e494d8c8462e65e125a502834b50c163d57299a69adab44c9a9fb82
+EBUILD cascadia-code-2106.17.ebuild 522 BLAKE2B e67bf6cd8b3d10db3a7852d7dd89fda8d3fe0f01bdfcb65da6a4742682b9a6fcaeb2bf2737710e76c0040cbcdda1a1a788c42abc4a09b9839cff69396baad43e SHA512 4a55ade8cde8df2c498b613642a37ef2403319cb18e89abae6a50a759d92587c6eff4470aa9fadac3b94260a74a3a290fa6459d79a5918ad9d2a1afb583f76c3
 MISC metadata.xml 672 BLAKE2B 08b9d480c2c90dc663a0150d8d0ab4d8025fc8557488e3fa1361961817c6ec70b08e43f035f806726e0d68f19a2b8dc39f6c36e8fe0a63451628b04e0f5ae80c SHA512 8c8f161c846a81a82a1169c67b9d8e9fcd5696918f7e59d334b13f4903f0e0feb21bd3fe21b523ef3ab618fe813aca82ee7ebcca7b1d5b114bf2f7ee6d3a8183
diff --git a/media-fonts/cascadia-code/cascadia-code-2105.24.ebuild b/media-fonts/cascadia-code/cascadia-code-2105.24.ebuild
deleted file mode 100644
index 3726a28cc6c9..000000000000
--- a/media-fonts/cascadia-code/cascadia-code-2105.24.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 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"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/ttf"
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/cascadia-code/cascadia-code-2102.25.ebuild b/media-fonts/cascadia-code/cascadia-code-2106.17.ebuild
index 3726a28cc6c9..3726a28cc6c9 100644
--- a/media-fonts/cascadia-code/cascadia-code-2102.25.ebuild
+++ b/media-fonts/cascadia-code/cascadia-code-2106.17.ebuild
diff --git a/media-fonts/jetbrains-mono/Manifest b/media-fonts/jetbrains-mono/Manifest
index e607577e3fdf..a326265228e4 100644
--- a/media-fonts/jetbrains-mono/Manifest
+++ b/media-fonts/jetbrains-mono/Manifest
@@ -1,3 +1,5 @@
 DIST jetbrains-mono-2.225.zip 2981614 BLAKE2B 5ac8dff566378da7e9ac23218cdd696be8ff612a7f9b4f87668400c0c0bfb3a1fcff2a2a813a1c7527e1a105125c493e80abe4daefdbcd837ef59492d7bb3e5b SHA512 ce72c2d2a2f769c6b8a9ad70e7e09b82cf66a0928534f18556238e36fec690737c89077f6521a67850bfb0dc79bb2260b5c86ae4134d76b2210755d5053ade0f
+DIST jetbrains-mono-2.242.zip 4099695 BLAKE2B 814dc53be8a57d2d9abef06ac4ff81025225891fc0ac1889e34325c607eda410e91c4aae7fce914ce3df751cf109205172a52171ba2aa93f32fbd99856e081ed SHA512 03c08a2cf5603103baaeed4fcef8aa7bdfced92fdc71b207caa7f913eea49dbe178d020f15a3396b11417f9b906778cc8bc8483f4eff2b04f25163fa373186a2
 EBUILD jetbrains-mono-2.225.ebuild 462 BLAKE2B 4a343b0a4007fb60d7fde1a30019997cab6b6c7c3385b23c8bf011b9ef7be3b3e16d9de0933de0610e0566968b336aeaac305cf820ab10dcbc8d22da5411257b SHA512 8880b260ac815942deebc91fe1c48dc15197d0b90399409a55d58b2b4108ce607d96a93cbfcb0be740458ed227ea8d0eda55fc525694b51b091f85f40ec4d16c
+EBUILD jetbrains-mono-2.242.ebuild 464 BLAKE2B 3d95970258e6dd8a05a4cc0a682c7d876dc68f78905d6baad2539666d44708803657d65178f344d092c91f8625c89e42b115eab127f0f16f1e0e52ddffb0fbbe SHA512 ad9097dafe28bcd4a08821df6ebbd5a05c6ba143625e988117c4ee7106cd0e389123a4c5ddff95c0d93b05f1b24113e0a8a41e4f587850add600cc422cbebf65
 MISC metadata.xml 476 BLAKE2B 3e8b8232486e28e3cd56fee7ab7b55e3522380d81bc15af748962d1a9c8ec3beda3c3a33172090c666ab57dbce98644973259cacb163a16a53940db168b5141b SHA512 56a235caee2582b1181a0889b87299a6669fb6fb81e502ac976938745858404e173abbd091eab220959901bc18062aae938c7a55ba45aa7462f5750a458cd101
diff --git a/media-fonts/jetbrains-mono/jetbrains-mono-2.242.ebuild b/media-fonts/jetbrains-mono/jetbrains-mono-2.242.ebuild
new file mode 100644
index 000000000000..2c294a87a4a2
--- /dev/null
+++ b/media-fonts/jetbrains-mono/jetbrains-mono-2.242.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="A free and open-source typeface for developers"
+HOMEPAGE="https://www.jetbrains.com/lp/mono/"
+SRC_URI="https://github.com/JetBrains/JetBrainsMono/releases/download/v${PV}/JetBrainsMono-${PV}.zip -> ${P}.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/fonts/ttf"
+FONT_SUFFIX="ttf"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d84ecd0bf633..d750faf4a31f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 9bb9afb8164d..8c44d14e45c5 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -2,5 +2,5 @@ AUX argyllcms-2.1.2-fno-common.patch 5132 BLAKE2B 5398d60a364a36ea24d6cce682330d
 DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06
 DIST Argyll_V2.2.0_src.zip 14020205 BLAKE2B e278f31de2c09e7d736d13b0ada01a6ff8b0641dcbef2e82ba83987f7835d3cfbe71e479314c76be91725698dbdff8f5a77b607dbdda340a9c583c82477cc9d0 SHA512 42552ebd10280df16ec419e3c7ce6700db2c290e26ab4ab62296bf92abc90dd50265aef04b5b8f0a5bee735d485760bab4278e38d27b2a245c5a3122cbf2ba88
 EBUILD argyllcms-2.1.2-r1.ebuild 2109 BLAKE2B 613f7e41d8f53956e534b962f21f8c0ac95ce5658fc63228b75bc9610a13bfa73c25e18b8c5c0cfaa49af53105a6389ebd2b926337b73cf732bf072dca448db2 SHA512 a2b8af905f634fbebf45073fa5fd7f9885b483e2e9c16015c701b79bdb7802840d5f3fa4ce67fee29c801448efaa7947160a808b9a4e229de56ea4b881d62aac
-EBUILD argyllcms-2.2.0.ebuild 2063 BLAKE2B ca400bdaf37855a91be60897240dacebb6172d42ca39370b88a584295bc5f082d5dd3a21880a6d2399d48fd7ed63700dc0064e938eba27c02c0e644eaec479fa SHA512 0d0a40dc03f4f2564335136eda66b6410ee109f6833f9be5285994c68b39fa580c81acc0a16fdb4379a50c7687e2295fdc861d998371e0ad9f402d28e0b663c7
+EBUILD argyllcms-2.2.0.ebuild 2070 BLAKE2B 96061849cc2b8601111b30ab9f301216fbe0a7e90da29e04f628ecb631c9e062a30df128857f583fc70bbf40ee5400497b4c0f331ea3bfb7d6ae9263abab2d15 SHA512 601dbe59b9e94f45cc0f2cdac3156c77bcaa97672a018d664de88e998a0021bc9eb7f700d6d4da61cd1505994dc7be2c8a82c81164d103f54818f2a31b16d948
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/media-gfx/argyllcms/argyllcms-2.2.0.ebuild b/media-gfx/argyllcms/argyllcms-2.2.0.ebuild
index a61fa86e9d2b..d4e795b9baee 100644
--- a/media-gfx/argyllcms/argyllcms-2.2.0.ebuild
+++ b/media-gfx/argyllcms/argyllcms-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 39840073e9da..29d8978e6735 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -4,9 +4,13 @@ AUX blender-2.83.6-fix_opevdb_abi.patch 587 BLAKE2B 90f22c522f2626442b68e2cb89e6
 AUX blender-2.83.6-libmv_eigen_alignment.patch 6777 BLAKE2B 5a7cc33dc599a58f15fcda2110d1c7be9dd3bab4427f5f0ab09a5645248e4585b4e183dcd38e5a39b0827a8ef529e74e59126bc7dcecf2c208b428b5ad264e26 SHA512 8b52ab1bdeaa585b2211aa4b3e9e9c2384867e4011ac20cc1fa712b3c8823c5f42359d5728a094e509a7f40cc166f308cd020da1d35f9e2b0bc20e7bb7e5a461
 DIST blender-2.83.1-tests.tar.bz2 266633785 BLAKE2B 8d8102c3107480de95dfd9ef9dabba1cd82893aad553af2ff5ef1afadc831dc5ccf5553c41466511ecb2a1435bc79c936ad64a78bdd4375e3e30af85b69807c6 SHA512 3ffba6fa8401bba3e2bdbccf7067761114d516371c7778a2f6604a243fd8610e26a30b88a32728c26f7e6274182d298752f32b5e76abf8216be0ec4b3ce38cd9
 DIST blender-2.83.15.tar.xz 39125740 BLAKE2B 687097b45b76b474b1c172c9b8ccf5da1bfc24539d0db894d04c7837572b16c1f552757fd1482219d58afa56c573229878fb43bbecd95e3d61314f2ab05efafa SHA512 2836533691bae0a7942197e67232b396b892cd95c0f07ab561f7de8458b354fe4045453855585484dd533ae76588ea3888f880763b042a264fb813a43933fc25
+DIST blender-2.83.16.tar.xz 39135184 BLAKE2B 2515822373f6a9343c760ad656de732094ee58a9354423e0f3d7bf1042220fc54af7e1d9f5b59a170a23e8b1b57a4b7f09867a000a57a6e4e820ff5c6cdd47b6 SHA512 ef78278387ae981972942ee4724abcb11ca19da2b88a3c8bbe1e9aafb93f28d84d4c79d01542e11218bd58bfec80fcfdbffdfd28896d146edd34181a7439dbd5
 DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513 SHA512 0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe
 DIST blender-2.93.0.tar.xz 42967016 BLAKE2B 1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3 SHA512 660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d
-EBUILD blender-2.83.15.ebuild 11453 BLAKE2B e95cfea18c8cf7ca90bc3608fca0b279f595d44bb15f22347cde1c4ce5fd0eee63247fdc0b4455b245981c1140f9a1097faf991e5b331c94f6d1958353340d6b SHA512 6bacb4102f897590c214436dd6fe1625abd8ef8ebfa445cdb13d90ea91d8a8626ef7853f587f58a7385f20e24c06ab1238b39956ccb16baf9b0f2bff224d5705
-EBUILD blender-2.93.0.ebuild 11609 BLAKE2B c0f39d9ebabef9ac788d3e8ae5303b90048b17d4b32b5f49e9cadbac66ff8ff127d669049246f78c44966ccaadcf4c90583ad7b917f95367902f551b270c5879 SHA512 071cafc9d4f3ff0548de6f1ece1bfd7ef2ad6fc736eeec5d1a8ca27efaa650225d3b46c7ce39e7daa2ad8e9e6eb9d79c20595aa60dcaf20bdfe19b1fd59427da
-EBUILD blender-9999.ebuild 11663 BLAKE2B 4402772729d606cdb63eb468c9d06235b8ab00f75ca8e465f7501e14d620cc375d890beafdc953b2d269741ae89f16a4185a2d5e42b3950c0da23b61d5f21b2a SHA512 09cafd404aec69c9bbcbc8527e3ef1b3c3eac9ed45a65348ae584f512b517e3bfc4be3fe7d571002955d071fa84d0a6c435026fa17738ac81b15ed7335bfb681
-MISC metadata.xml 2959 BLAKE2B 943ad3fcee54211bbf5a18bfe52229820559b16728a3bc162d55dbf9c142970e918355b68bef7e894115cb1c8ff8f3e0cc0be0dfaa0102667d9c93f43bd32963 SHA512 a1c334bdc815bb1459adc5c2fe55b445f1dd6d92a860d53f06c93f22ca10bf62e4b6e8f6eab9b1221b0e239675a2782e11aa4da977d33fd5ee9da1ac2af351d5
+DIST blender-2.93.1.tar.xz 42960100 BLAKE2B eda0a8c0414d1f7c89d21e34ba238b0cbe337ea755d6f10792e7c3bd5e15934184d3bd853ed636764776095ce1e3f081d63386b7c13fb7ac666580bf9eeb43c8 SHA512 b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1
+EBUILD blender-2.83.15.ebuild 11648 BLAKE2B b2cc50214b9430bb0692978eb3e6d593b50902047201c085154e6b821300f139b6c06979adc8cccdafb2b2ab7e1a8c852fbbd57c69b12ad2d3e743676a1662ad SHA512 df5e0e10f6f43d80f1fe9e1e4aaf6ded4fcc3f70d283c962ff6f340adfe36c43db00499555a8fd4990197bdb115bb47ac3e1231b4567cc86375724a1c71c220d
+EBUILD blender-2.83.16.ebuild 11648 BLAKE2B b2cc50214b9430bb0692978eb3e6d593b50902047201c085154e6b821300f139b6c06979adc8cccdafb2b2ab7e1a8c852fbbd57c69b12ad2d3e743676a1662ad SHA512 df5e0e10f6f43d80f1fe9e1e4aaf6ded4fcc3f70d283c962ff6f340adfe36c43db00499555a8fd4990197bdb115bb47ac3e1231b4567cc86375724a1c71c220d
+EBUILD blender-2.93.0.ebuild 11804 BLAKE2B 18040f539463ff3e853f998bb2ae0c5597b1b1181765c9d29ac84ba0f0f0b0d29ec39559c2c6cac44a17b43b1644aeef394f3dfa4f3d38f49071d9602dd6fcdd SHA512 2aa637e5833c7d9081aedd75cda876a40280e4c0071cbed07b1c66ef0d1f0c9489a4c52eae64429049d52460bf09951fe16839597a6dc59580764562ea5b1cf0
+EBUILD blender-2.93.1.ebuild 11804 BLAKE2B 18040f539463ff3e853f998bb2ae0c5597b1b1181765c9d29ac84ba0f0f0b0d29ec39559c2c6cac44a17b43b1644aeef394f3dfa4f3d38f49071d9602dd6fcdd SHA512 2aa637e5833c7d9081aedd75cda876a40280e4c0071cbed07b1c66ef0d1f0c9489a4c52eae64429049d52460bf09951fe16839597a6dc59580764562ea5b1cf0
+EBUILD blender-9999.ebuild 11795 BLAKE2B 1d72da32cd5ffbf4f79bb0a54a532a45d8a15ed72a26521aab7d9ee08818d28676537d0252ff12afc566be194dfcfe881f40611ef5a72b52e83c319c17484962 SHA512 db9cd23d97310bfdb2d48040896da916ce7df418fa1e2666e9917cf6c00e752a0aa9a16306200ad78cc242ffa0f4aaccc369df61bece896533c4072159d4fadc
+MISC metadata.xml 3162 BLAKE2B d414c213587d6c831a64931151eae8998c9ea93a20f1bda916e9b3caa041b90857865952b8b47c2a1999659f00a1fbf5ad4ae56e77cb5905bc7fbadd6d656744 SHA512 6b8abc0bdbd41e518d810d96780b2f11fd2e0d72db7642d17299254ea7d5af3cd7c59c4c2e78c9ff2eb89fed66bf7c03ed67bee4ea40569159b10c488251fa84
diff --git a/media-gfx/blender/blender-2.83.15.ebuild b/media-gfx/blender/blender-2.83.15.ebuild
index ccb67825bbd5..f7382f1c719e 100644
--- a/media-gfx/blender/blender-2.83.15.ebuild
+++ b/media-gfx/blender/blender-2.83.15.ebuild
@@ -15,7 +15,8 @@ if [[ ${PV} = *9999* ]] ; then
 	EGIT_REPO_URI="https://git.blender.org/blender.git"
 else
 	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
-	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.83.1-tests.tar.bz2 )"
+	TEST_TARBALL_VERSION=2.83.1
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -153,8 +154,8 @@ src_unpack() {
 	fi
 
 	if use test; then
-		mkdir -p lib/tests || die
-		mv "${WORKDIR}"/blender*tests* lib/tests || die
+		mkdir -p lib || die
+		mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
 	fi
 }
 
@@ -320,15 +321,20 @@ src_install() {
 
 	cmake_src_install
 
-	# fix doc installdir
-	docinto "html"
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	# Fix doc installdir
+	docinto html
 	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
 	rm -r "${ED}"/usr/share/doc/blender || die
 
 	python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
 	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
 
-	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}"
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
 }
 
 pkg_postinst() {
@@ -368,7 +374,7 @@ pkg_postrm() {
 
 	ewarn ""
 	ewarn "You may want to remove the following directory."
-	ewarn "~/.config/${PN}/<blender version>/cache/"
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
 	ewarn "It may contain extra render kernels not tracked by portage"
 	ewarn ""
 }
diff --git a/media-gfx/blender/blender-2.83.16.ebuild b/media-gfx/blender/blender-2.83.16.ebuild
new file mode 100644
index 000000000000..f7382f1c719e
--- /dev/null
+++ b/media-gfx/blender/blender-2.83.16.ebuild
@@ -0,0 +1,380 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.blender.org/blender.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	TEST_TARBALL_VERSION=2.83.1
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
+	alembic collada +color-management cuda cycles \
+	debug doc ffmpeg fftw headless jack jemalloc jpeg2k \
+	man ndof nls openal opencl openimageio openmp opensubdiv \
+	openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	fluid? ( tbb )
+	opencl? ( cycles )
+	openvdb? ( tbb )
+	osl? ( cycles )
+	standalone? ( cycles )
+	test? ( color-management osl )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( <media-libs/opencolorio-2.0.0 )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	opencl? ( virtual/opencl )
+	openimageio? ( >=media-libs/openimageio-2.2.13.1:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+	openvdb? (
+		>=media-gfx/openvdb-7.0.0
+		dev-libs/c-blosc:=
+	)
+	osl? ( <media-libs/osl-1.11.0 )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}/blender-2.83.6-libmv_eigen_alignment.patch"
+	"${FILESDIR}/blender-2.83.6-constraints_test.patch"
+	"${FILESDIR}/blender-2.83.6-fix_opevdb_abi.patch"
+	"${FILESDIR}/blender-2.83.13-ffmpeg-4_4.patch"
+)
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	# Add period.
+	BV=${BV:0:1}.${BV:1}
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+
+	if use test; then
+		mkdir -p lib || die
+		mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
+	mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die
+	mv release/bin/blender-thumbnailer.py release/bin/blender-${BV}-thumbnailer.py || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	# Without this the floating point math will differ when for example
+	# "-march=native" is set. This will make automated tests fail and we will
+	# not match the behaviour of some operators/modifiers with the official
+	# builds.
+	append-flags -ffp-contract=off
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+	)
+	if ! use debug ; then
+		append-flags  -DNDEBUG
+	else
+		append-flags  -DDEBUG
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	cmake_src_install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+	export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+	# NOTE: The 'modifiers' test will fail if opensubdiv was compiled with -march=native
+	# This this is fixed in blender version 2.92 and up."
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr ${ED}/* || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	if use standalone; then
+		dobin "${BUILD_DIR}"/bin/cycles
+	fi
+
+	if use doc; then
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+
+	elog "You are building Blender with a newer python version than"
+	elog "supported by this version upstream."
+	elog "If you experience breakages with e.g. plugins, please download"
+	elog "the official Blender LTS binary release instead."
+	elog "Bug: https://bugs.gentoo.org/737388"
+	elog
+
+	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
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-2.93.0.ebuild b/media-gfx/blender/blender-2.93.0.ebuild
index 8a23be813239..56fe343c940d 100644
--- a/media-gfx/blender/blender-2.93.0.ebuild
+++ b/media-gfx/blender/blender-2.93.0.ebuild
@@ -15,7 +15,8 @@ if [[ ${PV} = *9999* ]] ; then
 	EGIT_REPO_URI="https://git.blender.org/blender.git"
 else
 	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
-	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.93.0-tests.tar.bz2 )"
+	TEST_TARBALL_VERSION=2.93.0
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
 	KEYWORDS="~amd64"
 fi
 
@@ -159,8 +160,8 @@ src_unpack() {
 	fi
 
 	if use test; then
-		mkdir -p lib/tests || die
-		mv "${WORKDIR}"/blender*tests* lib/tests || die
+		mkdir -p lib || die
+		mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
 	fi
 }
 
@@ -328,15 +329,20 @@ src_install() {
 
 	cmake_src_install
 
-	# fix doc installdir
-	docinto "html"
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	# Fix doc installdir
+	docinto html
 	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
 	rm -r "${ED}"/usr/share/doc/blender || die
 
 	python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
 	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
 
-	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}"
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
 }
 
 pkg_postinst() {
@@ -378,7 +384,7 @@ pkg_postrm() {
 
 	ewarn ""
 	ewarn "You may want to remove the following directory."
-	ewarn "~/.config/${PN}/<blender version>/cache/"
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
 	ewarn "It may contain extra render kernels not tracked by portage"
 	ewarn ""
 }
diff --git a/media-gfx/blender/blender-2.93.1.ebuild b/media-gfx/blender/blender-2.93.1.ebuild
new file mode 100644
index 000000000000..56fe343c940d
--- /dev/null
+++ b/media-gfx/blender/blender-2.93.1.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_9 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.blender.org/blender.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	TEST_TARBALL_VERSION=2.93.0
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
+	KEYWORDS="~amd64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
+	alembic collada +color-management cuda +cycles \
+	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+	man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \
+	+openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	fluid? ( tbb )
+	opencl? ( cycles )
+	openvdb? ( tbb )
+	osl? ( cycles )
+	standalone? ( cycles )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( >=media-libs/opencolorio-2.0.0 )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( >=media-libs/embree-3.10.0[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	opencl? ( virtual/opencl )
+	oidn? ( >=media-libs/oidn-1.3.0 )
+	openimageio? ( >=media-libs/openimageio-2.2.13.1:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+	openvdb? (
+		>=media-gfx/openvdb-7.1.0
+		dev-libs/c-blosc:=
+	)
+	osl? ( >=media-libs/osl-1.11.10.0 )
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb )
+	test? ( dev-vcs/subversion )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and strip last number (300 -> 3.0)
+		BV=${BV:0:1}.${BV:1:1}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+
+	if use test; then
+		mkdir -p lib || die
+		mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
+	mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die
+	mv release/bin/blender-thumbnailer.py release/bin/blender-${BV}-thumbnailer.py || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+		-DWITH_CYCLES_EMBREE=$(usex embree)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=OFF
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+		-DWITH_XR_OPENXR=OFF
+	)
+	if ! use debug ; then
+		append-flags  -DNDEBUG
+	else
+		append-flags  -DDEBUG
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	cmake_src_install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+	export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr ${ED}/* || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	if use standalone; then
+		dobin "${BUILD_DIR}"/bin/cycles
+	fi
+
+	if use doc; then
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+
+	if ! use python_single_target_python3_9; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_9 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	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
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index 801ddf0af3a3..7b72a280eb4b 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -328,15 +328,20 @@ src_install() {
 
 	cmake_src_install
 
-	# fix doc installdir
-	docinto "html"
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	# Fix doc installdir
+	docinto html
 	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
 	rm -r "${ED}"/usr/share/doc/blender || die
 
 	python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
 	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
 
-	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}"
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
 }
 
 pkg_postinst() {
@@ -378,7 +383,7 @@ pkg_postrm() {
 
 	ewarn ""
 	ewarn "You may want to remove the following directory."
-	ewarn "~/.config/${PN}/<blender version>/cache/"
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
 	ewarn "It may contain extra render kernels not tracked by portage"
 	ewarn ""
 }
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 16d447e56348..88115ad6aa1c 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -5,6 +5,10 @@
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>darkdefende@gmail.com</email>
+		<name>Sebastian Parborg</name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
@@ -58,7 +62,7 @@
 			through <pkg>media-libs/opensubdiv</pkg>.
 		</flag>
 		<flag name="openvdb">
-			Add GPU preview rendering. Only works with nVidia cards.
+			Enable openvdb for volumetric processing, like the voxel remesher. Also enables volumetric GPU preview rendering for Nvidia cards.
 		</flag>
 		<flag name="osl">
 			Add support for OpenShadingLanguage scripting.
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 7da8a3f91e44..527955cdaa6d 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,4 +1,6 @@
 AUX digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch 1560 BLAKE2B dd2d9995787593f736f406566131af29573df097801f2c9b9eec12947838bf748c697bf6ab75d69f72359a1783d18fde994b4899861065d4d10dab100e0edf44 SHA512 eb1d1c4bff3dcc7e1d03069591ad8d48a3947ee962757baccf70e2e6c7577f6d52a4ae527af20d88aa24b66c0b1705367f67b7e3da70b19825a57def7371420a
 DIST digikam-7.2.0.tar.xz 255278796 BLAKE2B 5ccc6c6d1f3ce8d83746a1022dcf22b11b87af354f93f0b872a713f438d1bd2ee3f8e59d6206cd83dbbcaf1a8f2568ad0920d887b11d65864802f7eb2b02ba90 SHA512 2908a802fda84caf6b398a5dc328d2e9c00ab68776bde4620db1cb981995879e89d590520bf855471c968f065951280f863620641ccf945c43704e6cf3c0abd7
+DIST digikam-7.3.0.tar.xz 256985340 BLAKE2B 9eb9802340f4d071a8378019eba007a25f1e5eeaf9d6acfa9b062c5ecf308a4e59408e078e53cea4d4ed3624d73181f3bb7973622512167bcc44748e063b13ed SHA512 71cb07de32fb9b07e0f9989a718b2a307618eaaeba6566dc6802b79e48c61f3ab00ca44e12c3971c2efc41448192a2e5a652d2cfd09be058d2bc98f40b5ebaad
 EBUILD digikam-7.2.0-r1.ebuild 4065 BLAKE2B 034fc3c95d581820b0df33dd88a98a80dc781d156d339ad0afa360f1add02fe42fb571d45039a0f408a514d128aab0ef2e57dd38e24ca43513146e6dacd2de32 SHA512 b7d9e49414c02e40c9f0c66e74f4a4830653b499e5d29a84018e7a3df1acdbcc3969a79c08c5c00bd1e91c1ca4311408d8e669752accf95874d8a30ba73a71ed
+EBUILD digikam-7.3.0.ebuild 4004 BLAKE2B 30c2e400d8963da4038da84ea51485bc4a66c0e465156b9bf1d03870ad0ae5b616735b0f2ea7313e4e2cb6bba7f24001bbc9ab9c67b79ce544d9e87a9439d067 SHA512 d6e9e1ee8b975ab685c4b3494660030b57bf67edad00037ae6cf7c348e80ea48dfd8f5bc5eaa90ac69183dbb480dc4319c6f374710fc664acc07b92564c2e19c
 MISC metadata.xml 1097 BLAKE2B 1870f4bef0643db48fa2e6241f25d33c718010556b79bb54339f4ff9a13d7d005cea8e358e83d54ee94860b191969c834b9e5fd8152a17d7a5cc464a6813000e SHA512 25c2fcb533b644cf4aa376518a77f35bab0676c6f8853998f50e1eebbb2de20ca49e02fc110b1d6f55d2502f4e353803f12a2b336b98d85321b891a42ba16ccd
diff --git a/media-gfx/digikam/digikam-7.3.0.ebuild b/media-gfx/digikam/digikam-7.3.0.ebuild
new file mode 100644
index 000000000000..bd4f749f819d
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.3.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+QTMIN=5.15.2
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	MY_P=${PN}-${PV/_/-}
+	if [[ ${PV} =~ rc[0-9]*$ ]]; then
+		SRC_URI="mirror://kde/unstable/${PN}/"
+	else
+		SRC_URI="mirror://kde/stable/${PN}/${PV}/"
+	fi
+	SRC_URI+="${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
+
+# bug 366505
+RESTRICT+=" test"
+
+BDEPEND="
+	>=dev-util/cmake-3.14.3
+	sys-devel/gettext
+	panorama? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[mysql?]
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=media-gfx/exiv2-0.27:=
+	media-libs/lcms:2
+	media-libs/liblqr
+	media-libs/libpng:0=
+	>=media-libs/opencv-3.3.0:=[contrib,contribdnn]
+	media-libs/tiff:0
+	virtual/jpeg:0
+	addressbook? (
+		>=kde-apps/akonadi-contacts-19.04.3:5
+		>=kde-frameworks/kcontacts-${KFMIN}:5
+	)
+	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	heif? ( media-libs/x265:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	lensfun? ( media-libs/lensfun )
+	marble? (
+		>=dev-qt/qtconcurrent-${QTMIN}:5
+		>=kde-apps/marble-19.04.3:5
+		>=kde-frameworks/kbookmarks-${KFMIN}:5
+	)
+	mediaplayer? (
+		media-libs/qtav[opengl(+)]
+		media-video/ffmpeg:=
+	)
+	opengl? (
+		>=dev-qt/qtopengl-${QTMIN}:5
+		virtual/opengl
+	)
+	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+	scanner? ( >=kde-apps/libksane-19.04.3:5 )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost[threads(+)]
+"
+RDEPEND="${COMMON_DEPEND}
+	mysql? ( virtual/mysql[server(+)] )
+	panorama? ( media-gfx/hugin )
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF # bug 698192
+		-DENABLE_APPSTYLES=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		-DENABLE_QWEBENGINE=ON
+		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+		$(cmake_use_find_package calendar KF5CalendarCore)
+		$(cmake_use_find_package gphoto2 Gphoto2)
+		$(cmake_use_find_package heif X265)
+		$(cmake_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package lensfun LensFun)
+		$(cmake_use_find_package marble Marble)
+		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
+		$(cmake_use_find_package mediaplayer QtAV)
+		-DENABLE_MYSQLSUPPORT=$(usex mysql)
+		-DENABLE_INTERNALMYSQL=$(usex mysql)
+		$(cmake_use_find_package opengl OpenGL)
+		$(cmake_use_find_package panorama KF5ThreadWeaver)
+		$(cmake_use_find_package scanner KF5Sane)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/fbgrab/Manifest b/media-gfx/fbgrab/Manifest
index 9aa101330f89..a3148357f8d5 100644
--- a/media-gfx/fbgrab/Manifest
+++ b/media-gfx/fbgrab/Manifest
@@ -2,6 +2,6 @@ DIST fbgrab-1.3.3.tar.gz 36332 BLAKE2B 446b3b8e7cf80fae784e6e7f9b49c881b43f1b96a
 DIST fbgrab-1.3.tar.gz 13027 BLAKE2B 57acd93432b01befd99c73e45337bd2eecfdb18b9b5d98106e1a433b48bb03ef05cc5d3a99e0a34f501bb4d0731c8d6c92bcd8b145dd5f503632b63d41d902d5 SHA512 2d1166890f41d7de813a6c9b722db148980fcc802da38dea1a42d1f150cbdc16d0dd6757bc334586402f109b382e5039d44b03f9f19024f546958bdf21ca5d52
 DIST fbgrab-1.5.tar.gz 37010 BLAKE2B aff706ef46664216ac1846d0e8fe37646fcb900cce1d451560d024edf3aab4c1817739cb26cae4d9491ae98c5e2d3fda96509f539514b701b7c7ae54ee9a8d02 SHA512 475d377480b9e67f618e19967d4bae5890a78aa00236583914b4ac81f468d8282e1767d85009101f6b03ddc091da8416dcbae451b191a79013e1632d91155c23
 EBUILD fbgrab-1.3.3.ebuild 653 BLAKE2B b808aa1924511be53daa83a5f811b0470d7693cdf6a95c9df5dc6e5a164914d4bc6008ab40fbc3b7d6c00f14c9e3d573a28bed90af077a66f46e03096896e0ec SHA512 80736c5ff941a3d26e800b8f7c21c6f1dce453563c6042f6a9d50fb9a3b7b61b5dfcf05756d5df7cf9a353a2e516096be8af27898a69bc14afb2ad1c5806be36
-EBUILD fbgrab-1.3.ebuild 620 BLAKE2B 9887492e98ac3b8b5e5d2b3a8457bda96a864e1fbecee3910763417f9a630677a73807ab6a8ec530b8033c80cf84c80db289e13d2041b2463e4bad011f74c3cd SHA512 868993681397921644907eb33485c7a9a5dc1005c4486380a17441e39fb86fc6d7d7470a3352acf8852d29ab3b2fba4cd727fde8c6b2a071bcf3b5fb60efe20a
+EBUILD fbgrab-1.3.ebuild 619 BLAKE2B 512daf5643daf2c76c6a58ad9b2cc49a14687613ce05a08a2884900e76cddcc672c1a7436ed958badd8c18bfb588c23261299a0f3fa14702e67c6780f57c76ba SHA512 2b82b7264791fe99fbdff9a526b6aa7408927bb8faefb38817f9da6402d62dd046ba47487f26f2b15a677c50f746eb293f984b5e8f1b3f1cb0ac5db1eb55fa22
 EBUILD fbgrab-1.5.ebuild 688 BLAKE2B a3f1dc823db6e45615e8c150cf8f30a2a7249dbcac381a4836175ea324bb7fed9e3e788f698c97b151ef3e7e616e594813465f435ebbfd209906654125387d3d SHA512 e84dbb9b98e400c054912b5e65a223b51404608cc2b6f285b9d6a2b2b681423579790e93ecb5d1b934ab5d880e5c4245f8bcbefc880676150955e65c7ba99c48
 MISC metadata.xml 331 BLAKE2B 216c9dcffa209d75dd0d9d2f516b5ae81ca6bf8445df52a1c974fb1781e0ce4bda2031797bf55f8938caecb886899212f01e7fa744924e03e638fd469a228cf5 SHA512 49f65e06f0a40a592b395b3f2971f7aecd4046c16569eb7110caa20e765464ae021c58af9ff36b1581b65e058b91c6a7d44e0ee6162abdc375594060f6393155
diff --git a/media-gfx/fbgrab/fbgrab-1.3.ebuild b/media-gfx/fbgrab/fbgrab-1.3.ebuild
index 07d7f5e68fb5..56cfdaecadcb 100644
--- a/media-gfx/fbgrab/fbgrab-1.3.ebuild
+++ b/media-gfx/fbgrab/fbgrab-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://fbgrab.monells.se/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/libpng:=
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 52c5268d37c3..cdbb85ed49ac 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,6 +1,8 @@
 AUX fotoxx-21.40-documentation.patch 1511 BLAKE2B da0443a6b1ff8684e43005239f0184c742cd59727e3c55460713680b14b5d39ba528b7a17a87b893a9585824f1e402b5f46bbe45451dd8888b62d1752524db44 SHA512 d0f79f986b605c3f981de99c533f57a60aac47844d1434482e507a7e7e4d2be2b581419e211f034213c7c23db0e56f4fe5d789f39624a33aee283c8b8a489509
 DIST fotoxx-21.41.tar.gz 8619224 BLAKE2B 28ec5fef8780001a023527c0859b58e1b3347b91b607269add3e0152fa6dff1347caf12f8e36a528100d5c6f538dce388bb4cbd22d03e2d15ff6904d5fdff626 SHA512 df7b3f424c9a1e2773171f9c036b30c34bd902dad41d3ce51eee5a20e86ce6afe5bcae4147baf40ea35bb9755900d9efcca20e026e12a1f540884b113011bce8
 DIST fotoxx-21.44.tar.gz 8670703 BLAKE2B e3c1a0d68ab530345048833c5c33ababa1f3ef27e99379888c748297a2d69a248eb64b6881b53bcdde759f53aea75292d3c205ca11d9ed291465514bf294d323 SHA512 06446fbd0c44a632d5525acec155f8d51ee9ffd66dc9ba97a01bb30f4a8e4b9355650ea50967a537cbf077062898def227c46b07dd7d6d2c6ab8af3f4654c490
+DIST fotoxx-21.50.tar.gz 8693590 BLAKE2B d3bed82c3e856d6ce2433e0357955f32d462d0dfcf8de673a7c0fbe8aeeea766711c2617730c6a83501b07bd5f5ab60c9d56caeacd6ea938428758a39b5a75b3 SHA512 018735ff4b1fc99a64eccb05af05e9858f9dfce3c6925704f1739c22a49d3209f66d668b21cb6030d971bbe116c978c5d491aaba033683d5ed5268ee0e46ff9e
 EBUILD fotoxx-21.41.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
 EBUILD fotoxx-21.44.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
+EBUILD fotoxx-21.50.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
 MISC metadata.xml 850 BLAKE2B 463cae7d8df56ad93adaf7fbb4cf31f2838452e1349e61175c9981db4e95cc506b992cba2876885f8e949061808300752ef5806e9a096647f769bca654cca8e9 SHA512 e5c38d8602a52ae25bf90990136a98b57f69701cea70d4762f6102dc791f97b134853f7321894d1fbbbfdd353cebad7afa27cb56373f256d9497c3600d66d19e
diff --git a/media-gfx/fotoxx/fotoxx-21.50.ebuild b/media-gfx/fotoxx/fotoxx-21.50.ebuild
new file mode 100644
index 000000000000..12a78336fe75
--- /dev/null
+++ b/media-gfx/fotoxx/fotoxx-21.50.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature xdg-utils
+
+DESCRIPTION="Program for improving image files made with a digital camera"
+HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
+SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# For required dependencies read doc/README, for required tools read
+# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
+# alternative to firefox and chromium-browser. `grep '"which ' * -R`
+# is helpful to report some required tools run via the shell.
+
+DEPEND="
+	media-libs/clutter
+	media-libs/clutter-gtk
+	media-libs/lcms:2
+	media-libs/libpng:0
+	media-libs/tiff:0
+	media-libs/libchamplain[gtk]
+	virtual/jpeg
+	x11-libs/gtk+:3"
+RDEPEND="
+	${DEPEND}
+	media-gfx/dcraw
+	media-libs/exiftool
+	x11-misc/xdg-utils
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-21.40-documentation.patch" )
+
+DOCS=()
+HTML_DOCS=()
+
+src_prepare() {
+	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
+	default
+}
+
+src_install() {
+	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
+	# and README, changelog, copyright, license, etc. must not be compressed.
+	emake DESTDIR="${D}" install
+	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
+	docompress -x /usr/share/doc
+}
+
+pkg_postinst() {
+	optfeature "HEIC file support" media-libs/libheif
+	optfeature "additional RAW file support" media-gfx/rawtherapee
+	optfeature "additional RAW file support" media-gfx/darktable
+	optfeature "video thumbnails & playback" media-video/ffmpeg
+	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
+	optfeature "additional panorama support" media-gfx/hugin
+	optfeature "WEBP file support" media-libs/libwebp
+
+	elog
+	elog "Please read the Help > User Guide for details. The source location is"
+	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
+	elog "be placed at /home/<user>/.fotoxx/userguide."
+	elog
+	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
+	elog
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 612972b0bea9..d8fcbb58fcc4 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,15 +1,13 @@
 AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
-AUX test-exitcode.patch 1077 BLAKE2B 7e270c939a421d8c709d7e24b9628c69ec03f72431b6d783043e904ea92bba1938207d08d9275ac1b90825149c92ed48d466fd5edc03fa694fc57465ef474db7 SHA512 703fc73ea3829a8d5c6f64d0573439570300635d3543437983359afea0522c95da6c8b0f2cba3736d0f22f939aad72b4b27c648d166feed96ec6447a68f33b75
-AUX upnpc.patch 1032 BLAKE2B ffbd89511731d5e71a9568fb9578888152af50d18e443871ffde0eb0cad65a98c7561587cc4c9b288c6de158263ef4f172477ee836ab07c4a72d419521872f20 SHA512 7dec34031545e238388134166dd11ca1bf65975caab46ea308a9e36daaf1eeda71c70d260409ed3a64f277a2d65c9f1441c5af02fefa33e263906c386482e98e
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-444.tar.gz 38817103 BLAKE2B f9eb3dc346a1a7b8d45558ee69b0b9d2a7dbbb7018734680e9953f20ebd56209cc1874213ecf5515835f1022bf571a99543154843f7dc2b9375116db8ba080a0 SHA512 f5bc28e43a5218fce15bc9d197ebcc1f4eb47856a741ad79f59d1da2413a3e7e220381a4d8208fe880fa507e023f9c03050e46ab5214ef310d105df0d85a9682
 DIST hydrus-445.tar.gz 38823389 BLAKE2B 3cd07a3e30e60bd8507fd58c027e5c5a96745163bd5982198448a65b957ff8f4308c9bc0ee73b883fa275689c900dff07f497634c07f4b2f7fe579e1e3d6f378 SHA512 6735468bd531786fef9a861a81ee1e34595c362450027a0c011593465ed77dc85a304a314dcb7031e30b2e90548b2497bb4f01932dc1f04e814b7dd5ae70617c
 DIST hydrus-446.tar.gz 38830223 BLAKE2B 5ab44f9cfbd15eb10144135eb4cc1d8493c20f2a931db4332a61aa186fddff96cb3a3b29eb2b210f070bb4be8210d552beb2578a7287a169a7364f02363e05f4 SHA512 bdbcd1177c3bf6ee85089e1a653587bae41c524bc2313bb5d481dee074c7da1c533a91957dc3b03d1c0b515e705809887e290ac71b866a51664f2a9a34bbfb6b
 DIST hydrus-447.tar.gz 38833157 BLAKE2B 8d7cf37a1419ef40fa7816958a01421ecc335d2a8c975fcf16d3ea5dfbdb76d872e4e597bdbade28eff7727914de5de7fb6ffcc7ecc27a712410031efa8433fe SHA512 85eaab40f192f2414be828545464811af2590b55e1a2fea7bbf64f27e4bb9a8b6c6c86cb25c1f7e9f48449173f079dcd749ea25ed22559bebb11adddce62da94
-EBUILD hydrus-444.ebuild 4096 BLAKE2B 38d338d034c353723481cc8daf2bb8f99ca6443242ba8692cda6cfc663271e763b9b53aff7f3dc2e407676586eede2895fa669aaf19be2d2e95b2dac2e6c5823 SHA512 c722905f3ca2b6097cd3c50848dec6c0d7279765fd5792947eec7b405ff62770bc29e62e38076eebfbe18347724d8b58b7b719165c18b7cd477a27c83282e680
-EBUILD hydrus-445.ebuild 4034 BLAKE2B 77e62b1cccc18c669c446dc705982c3012ccc769f6307a60771c7341bf7d463f7c13681c76fb24aea23540d98f64d03fe06622865ff89619fb03ac88a22825dd SHA512 4da0299ae93ad7736f15942bcd94a841f17ec6df2f02fc51fca6992dd03aff69db7cb1dd906a58b08c1ecd866975686f5723a7c370d73303eb41b811594e4769
-EBUILD hydrus-446.ebuild 4034 BLAKE2B 77e62b1cccc18c669c446dc705982c3012ccc769f6307a60771c7341bf7d463f7c13681c76fb24aea23540d98f64d03fe06622865ff89619fb03ac88a22825dd SHA512 4da0299ae93ad7736f15942bcd94a841f17ec6df2f02fc51fca6992dd03aff69db7cb1dd906a58b08c1ecd866975686f5723a7c370d73303eb41b811594e4769
-EBUILD hydrus-447.ebuild 4034 BLAKE2B 77e62b1cccc18c669c446dc705982c3012ccc769f6307a60771c7341bf7d463f7c13681c76fb24aea23540d98f64d03fe06622865ff89619fb03ac88a22825dd SHA512 4da0299ae93ad7736f15942bcd94a841f17ec6df2f02fc51fca6992dd03aff69db7cb1dd906a58b08c1ecd866975686f5723a7c370d73303eb41b811594e4769
-EBUILD hydrus-9999.ebuild 4034 BLAKE2B 77e62b1cccc18c669c446dc705982c3012ccc769f6307a60771c7341bf7d463f7c13681c76fb24aea23540d98f64d03fe06622865ff89619fb03ac88a22825dd SHA512 4da0299ae93ad7736f15942bcd94a841f17ec6df2f02fc51fca6992dd03aff69db7cb1dd906a58b08c1ecd866975686f5723a7c370d73303eb41b811594e4769
+DIST hydrus-448.tar.gz 38851906 BLAKE2B 2b60174ffea3dd0c3816afef12378546582dfc39f80406534fa8b868c33052dc8497fa750ed724388467fd9ed4f1a7245b7ef91745750b9ede834a94e2da9638 SHA512 a16879dfd3417a784ca900b6cdab5fb4079d8ca4179224ac69e37321e165f35483d476b40994f2445c846998b2f154498da3cbd9c695a9d96b71f187e788b7b3
+EBUILD hydrus-445.ebuild 4153 BLAKE2B af53ea19c4e57bef37cf32b2b20a3b92e57728ca7ee493851e70c97dcce631160c429b282a0367fbf680a1e03f64ab099267bcb7ca8899accd8e3b8b2c87d7eb SHA512 11fd24be29eb7ab185f560e3a5df9f59a7ba2bad72a94e82ca412c011164ac0f5b66f0ca42cca50e20a2b70651c804f004fd9af95efb6284b32f8930f43d5547
+EBUILD hydrus-446.ebuild 4153 BLAKE2B af53ea19c4e57bef37cf32b2b20a3b92e57728ca7ee493851e70c97dcce631160c429b282a0367fbf680a1e03f64ab099267bcb7ca8899accd8e3b8b2c87d7eb SHA512 11fd24be29eb7ab185f560e3a5df9f59a7ba2bad72a94e82ca412c011164ac0f5b66f0ca42cca50e20a2b70651c804f004fd9af95efb6284b32f8930f43d5547
+EBUILD hydrus-447.ebuild 4153 BLAKE2B af53ea19c4e57bef37cf32b2b20a3b92e57728ca7ee493851e70c97dcce631160c429b282a0367fbf680a1e03f64ab099267bcb7ca8899accd8e3b8b2c87d7eb SHA512 11fd24be29eb7ab185f560e3a5df9f59a7ba2bad72a94e82ca412c011164ac0f5b66f0ca42cca50e20a2b70651c804f004fd9af95efb6284b32f8930f43d5547
+EBUILD hydrus-448.ebuild 4153 BLAKE2B af53ea19c4e57bef37cf32b2b20a3b92e57728ca7ee493851e70c97dcce631160c429b282a0367fbf680a1e03f64ab099267bcb7ca8899accd8e3b8b2c87d7eb SHA512 11fd24be29eb7ab185f560e3a5df9f59a7ba2bad72a94e82ca412c011164ac0f5b66f0ca42cca50e20a2b70651c804f004fd9af95efb6284b32f8930f43d5547
+EBUILD hydrus-9999.ebuild 4153 BLAKE2B af53ea19c4e57bef37cf32b2b20a3b92e57728ca7ee493851e70c97dcce631160c429b282a0367fbf680a1e03f64ab099267bcb7ca8899accd8e3b8b2c87d7eb SHA512 11fd24be29eb7ab185f560e3a5df9f59a7ba2bad72a94e82ca412c011164ac0f5b66f0ca42cca50e20a2b70651c804f004fd9af95efb6284b32f8930f43d5547
 MISC metadata.xml 1168 BLAKE2B 6480f7938566059342a4b8eef89ee26e4f3843faab9b8c937f74e71a1a27b63630bc6e64482b7ff5ebc647c1247a030e62635a4c3a5bc42d6df87209e35ffb53 SHA512 9bb31694a8d1ce56741340431e82b0e7f35866d90dd1359062703809be331192e5ba4acca94b8c0fc146cbb6199335e724345924687c904795c3c2d0d917acb3
diff --git a/media-gfx/hydrus/files/test-exitcode.patch b/media-gfx/hydrus/files/test-exitcode.patch
deleted file mode 100644
index d61d341ee1ef..000000000000
--- a/media-gfx/hydrus/files/test-exitcode.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/hydrus/hydrus_test.py b/hydrus/hydrus_test.py
-index 3504c9c..7f95af8 100644
---- a/hydrus/hydrus_test.py
-+++ b/hydrus/hydrus_test.py
-@@ -91,6 +91,9 @@ def boot():
-         if sys.stdin.isatty():
-             
-             input( 'Press any key to exit.' )
-+        else:
-             
-+            success = 0 if controller.was_successful else 1
-+            sys.exit(success)
-         
-     
-diff --git a/hydrus/test/TestController.py b/hydrus/test/TestController.py
-index 0c43440..7e6c5ef 100644
---- a/hydrus/test/TestController.py
-+++ b/hydrus/test/TestController.py
-@@ -168,7 +168,6 @@ only_run = None
- class Controller( object ):
-     
-     def __init__( self, win, only_run ):
--        
-         self.app = win
-         self.win = win
-         self.only_run = only_run
-@@ -827,8 +826,7 @@ class Controller( object ):
-         def do_it():
-             
-             try:
--                
--                runner.run( suite )
-+                self.was_successful = runner.run( suite ).wasSuccessful()
-                 
-             finally:
-                 
diff --git a/media-gfx/hydrus/files/upnpc.patch b/media-gfx/hydrus/files/upnpc.patch
deleted file mode 100644
index ea78f2b70b63..000000000000
--- a/media-gfx/hydrus/files/upnpc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/hydrus/core/networking/HydrusNATPunch.py b/hydrus/core/networking/HydrusNATPunch.py
-index c959753..6792d89 100644
---- a/hydrus/core/networking/HydrusNATPunch.py
-+++ b/hydrus/core/networking/HydrusNATPunch.py
-@@ -3,6 +3,7 @@ import socket
- import subprocess
- import threading
- import traceback
-+import shutil
- 
- from hydrus.core import HydrusConstants as HC
- from hydrus.core import HydrusData
-@@ -18,7 +19,7 @@ if HC.PLATFORM_WINDOWS:
-     
- else:
-     
--    possible_bin_filenames = [ 'upnpc-static', 'upnpc-shared', 'miniupnpc' ]
-+    possible_bin_filenames = [ 'upnpc', 'upnpc-static', 'upnpc-shared', 'miniupnpc' ]
-     
-     if HC.PLATFORM_LINUX:
-         
-@@ -42,7 +43,17 @@ for filename in possible_bin_filenames:
-         
-         UPNPC_PATH = possible_path
-         
--    
-+        break
-+
-+    maybe_in_path = shutil.which( filename )
-+
-+    if maybe_in_path:
-+        
-+        UPNPC_PATH = maybe_in_path
-+        
-+        break
-+
-+
- EXTERNAL_IP = {}
- EXTERNAL_IP[ 'ip' ] = None
- EXTERNAL_IP[ 'time' ] = 0
diff --git a/media-gfx/hydrus/hydrus-444.ebuild b/media-gfx/hydrus/hydrus-444.ebuild
deleted file mode 100644
index d09faedb63c2..000000000000
--- a/media-gfx/hydrus/hydrus-444.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 desktop optfeature
-
-DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-else
-	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-# hydrus itself is WTFPL
-# icons included are CC-BY-2.5
-LICENSE="WTFPL-2 CC-BY-2.5"
-SLOT="0"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
-
-		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_USEDEP}]
-			dev-python/python-mpv[${PYTHON_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
-				dev-python/PySocks[${PYTHON_USEDEP}] )
-		)
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		test? (
-			dev-python/httmock[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/upnpc.patch"
-	"${FILESDIR}/userpath-in-local-share.patch"
-	"${FILESDIR}/test-exitcode.patch"
-)
-
-src_prepare() {
-	default
-
-	# Contains pre-built binaries for other systems and a broken swf renderer for linux
-	rm -r bin/ || die
-	# Build files used for CI, not actually needed
-	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
-	# Python requirements files, not needed
-	rm requirements_*.txt || die
-}
-
-src_compile() {
-	python_optimize "${S}"
-}
-
-src_test() {
-	# The tests use unittest, but are run with a custom runner script.
-	# QT_QPA_PLATFORM is required to make them run without X
-	local -x QT_QPA_PLATFORM=offscreen
-	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
-}
-
-src_install() {
-	local doc="${EPREFIX}/usr/share/doc/${PF}"
-	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${doc}/html/help/index.html"
-	elog "or accessed through the hydrus help menu."
-
-	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
-
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
-	einstalldocs
-
-	# Files only needed for testing
-	rm test.py hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ static/testing/ || die
-
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
-
-	insinto /opt/hydrus
-	doins -r "${S}"/.
-
-	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
-					   "AudioVideo;FileTools;Graphics;Network;"
-}
-
-pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
-}
diff --git a/media-gfx/hydrus/hydrus-445.ebuild b/media-gfx/hydrus/hydrus-445.ebuild
index c735f0ac9e1f..ff24bd7b24a3 100644
--- a/media-gfx/hydrus/hydrus-445.ebuild
+++ b/media-gfx/hydrus/hydrus-445.ebuild
@@ -25,11 +25,15 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
 
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -123,14 +127,14 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
+	dosym "${doc}/html/help" help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
 
 	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
 
 	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
 					   "AudioVideo;FileTools;Graphics;Network;"
diff --git a/media-gfx/hydrus/hydrus-446.ebuild b/media-gfx/hydrus/hydrus-446.ebuild
index c735f0ac9e1f..ff24bd7b24a3 100644
--- a/media-gfx/hydrus/hydrus-446.ebuild
+++ b/media-gfx/hydrus/hydrus-446.ebuild
@@ -25,11 +25,15 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
 
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -123,14 +127,14 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
+	dosym "${doc}/html/help" help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
 
 	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
 
 	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
 					   "AudioVideo;FileTools;Graphics;Network;"
diff --git a/media-gfx/hydrus/hydrus-447.ebuild b/media-gfx/hydrus/hydrus-447.ebuild
index c735f0ac9e1f..ff24bd7b24a3 100644
--- a/media-gfx/hydrus/hydrus-447.ebuild
+++ b/media-gfx/hydrus/hydrus-447.ebuild
@@ -25,11 +25,15 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
 
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -123,14 +127,14 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
+	dosym "${doc}/html/help" help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
 
 	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
 
 	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
 					   "AudioVideo;FileTools;Graphics;Network;"
diff --git a/media-gfx/hydrus/hydrus-448.ebuild b/media-gfx/hydrus/hydrus-448.ebuild
new file mode 100644
index 000000000000..ff24bd7b24a3
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-448.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
+else
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+# - Depends on use flags
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg )
+		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+		mpv? (
+			media-video/mpv[libmpv,${PYTHON_USEDEP}]
+			dev-python/python-mpv[${PYTHON_USEDEP}]
+		)
+		socks? (
+			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
+				dev-python/PySocks[${PYTHON_USEDEP}] )
+		)
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/userpath-in-local-share.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	dosym "${doc}/html/help" help
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+}
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index c735f0ac9e1f..ff24bd7b24a3 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -25,11 +25,15 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
 
+# RDEPEND is sorted as such:
+# - No specific requirements
+# - Specific version or slot
+# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -123,14 +127,14 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	ln -s "${doc}/html/help" help || die
+	dosym "${doc}/html/help" help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
 
 	exeinto /usr/bin
-	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
-	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die)
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die)
 
 	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
 					   "AudioVideo;FileTools;Graphics;Network;"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 592e74769319..78320a762253 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,8 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.12-17.tar.xz 9172828 BLAKE2B 87724cfad2b11fa3901dcffb243c314efe303de6f6f17382b82fbbd05b963b70394f17f68b1d87cc53eb7a12233a62241145d4f7f9e48ce8b1fedb9be3dda981 SHA512 c966524b82fd667b2eea45a78d4c4f62745f744889ca15c4b0a5bf390f47c801fff926ecd54e48b42b6142637ff95babaa1464fb8eb401c615fcc000166f46b7
 DIST ImageMagick-6.9.12-19.tar.xz 9183520 BLAKE2B 144a31c9f5a0e3489d362bf42a0ba5b3835f3d3e6b85d8573a9ca5188f04e0c5e6c16bd59510621805b2941331df412d845a0650d19a05bc97dac1e0c06b8e1b SHA512 1175d6330cd9c4dc8f4b7c1dc178a4654a9fcb17e209c10dc8eb776cb64233a8fa1c512d72ded50f0588ec35a13979d30e37e966ddce27fbd175f48698946b88
-DIST ImageMagick-7.1.0-2.tar.xz 10312288 BLAKE2B 0c79b02a84c883e8016856bd5543a036228e9febab0160525737ab1105d3af52595959412b36d6120c52a11efb7a0f4c0638aa04d11b8dc3774fe655c347e929 SHA512 e9b38ccc56ad6936c59adbd934148aeca441f41015be8d2d4b7dd4106a120748aff8cba0239d8ada4288d679a19931696a0bec5ae05681eba7d3078fa119ad0a
 DIST ImageMagick-7.1.0-4.tar.xz 10310828 BLAKE2B f7504d47e95be57b5b2f02f0ac8ea526c0b6f60cd0e3ace3445e6d52cc7cf9d4287e1cb24d4451587807809e671f459c107b1dfcb3a99436d112591a32fa5365 SHA512 21bd565227eef40bf967a23061e799dc0cb767c226717a66135ecc07a812495fe62c0d36c38b5c801356c63a9e4bf5a48b04fc56fcf6c0f5e37c2ccf52fce855
-EBUILD imagemagick-6.9.12.17.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12
-EBUILD imagemagick-6.9.12.19.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
-EBUILD imagemagick-7.1.0.2.ebuild 7396 BLAKE2B e824e8d1c9b1b1561bcfe59e6bfa2fd6770508453c1a4246b88cdd671470f35a5576d0c0a76803501d76bb31768d87c5066c92f1f9f786ed6d01e77e5792f96e SHA512 bdfeb146f22e581bcab707407229a31debf6623b7861141d8fec50cea8d134232fe83066a9898a2136553edf946bf727d7a8e5724a7f979c0bac39868356b191
-EBUILD imagemagick-7.1.0.4.ebuild 7404 BLAKE2B 2a92a400e6b41a28bd9ff356ad4a40656c61df367ec298c685b663a22463cbc090fb368f12aae33a75dda7ade766464822d0293bc302ad11db790b7b3c7a4a8d SHA512 758697ee60c9d674ea02c32d1e997466809f515bd7ea361aaa5ef77528b9705eccb16d906cc548c0df9a3d0054e8a7615be665797cb6d9cb3eab6d06510c5dcf
+EBUILD imagemagick-6.9.12.19.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12
+EBUILD imagemagick-7.1.0.4.ebuild 7396 BLAKE2B e824e8d1c9b1b1561bcfe59e6bfa2fd6770508453c1a4246b88cdd671470f35a5576d0c0a76803501d76bb31768d87c5066c92f1f9f786ed6d01e77e5792f96e SHA512 bdfeb146f22e581bcab707407229a31debf6623b7861141d8fec50cea8d134232fe83066a9898a2136553edf946bf727d7a8e5724a7f979c0bac39868356b191
 EBUILD imagemagick-9999.ebuild 7397 BLAKE2B 9845d38817e2dbcfbc3c970d6ed508588caf22adc844178de2c2fae9f12c12cee60e7c97db29b99393720675a9401d1175e2114b8f5c3bee664335bdd4703823 SHA512 8832088aa61e5c7f6293d970f4460dbc629c2a7a0a9b70a44b8e7de9473823b7ee156e0f40981eb327eb222a9b604e21f3bbffb41ffff580b036c67d7da996b8
 MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.17.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.17.ebuild
deleted file mode 100644
index 69de151f32bc..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.17.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.19.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.19.ebuild
index d17773f5081b..69de151f32bc 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.19.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.2.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.2.ebuild
deleted file mode 100644
index aee829b4dd8d..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.1.0.2.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.1.0-0"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zip? ( dev-libs/libzip:= )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zip)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.4.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.4.ebuild
index 42e594451118..aee829b4dd8d 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.0.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.4.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index f471f48cb6a2..0396bb5d691f 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,6 +1,8 @@
 AUX imv-4.2.0-add-string-inc.patch 275 BLAKE2B 40e46bd1e7531477d6701ac14013405ee37562305286223a4b5800f3f644f63d366bb1ae08a0ee575b088351013605c9ecaf0356a046976d6a520d55dcaaf2c0 SHA512 2ef9ae3e8a6543476000a2e19fee4f383e01a25b5ed6ffb674f12f843761f9d8fa6ae394e2043260ba88d88fa300ebe3bb03027a02aa3afde5d4cdf897174958
 AUX imv-4.2.0-wayland-roundtrip-after-scale.patch 583 BLAKE2B b71b428bc7c3fd566ab9fa650cb714a2abc455df0512aa7372f82e1c331530bf8515cd0f005d54aa9d20de2156eddf7a0fb3b892775825a4a8af64a0bc66735a SHA512 c081fa2656d2611ef78df072826718ccca56fc376860277f74a9248e0b9771547af28e9379dbf820c4e67f33ffad021c10b5e178f1da2c309e33d25692a38218
 DIST imv-4.2.0.tar.gz 77809 BLAKE2B a0c8aeb4d50d252818f4a4bedc145a8e2ffffa3ae14d888ef4623fe17a714bd17397399064019b32a48e6ebe3613f592428b075988ed533166c06c2b885d245b SHA512 7b64c6d4e5e484fd2ef4e28e2ba5cc74e4d28f8e2fa329ae7c744bd77ce8a345123f9cc3c77e015ff780938d5add97cfe9ed4e5a3a52b03a91b7bb6bb50e7115
+DIST imv-4.3.0.tar.gz 79031 BLAKE2B f620e1d05827f93eae03a01f62cbb1426a623b4ef2e758a5fea2539193292fada0b8bf34276443d787b5a1537e92cd66e94b574a646319c3c37fbf2557bda4eb SHA512 1735c03c48888004b11b3aaf0215a9530c035468a8efdb210d856551ebb75030c906eee2b6ab80e5d3646206e6051a73a8c5e15c010dd09bca7f9e90f9b0e34b
 EBUILD imv-4.2.0.ebuild 1934 BLAKE2B 923576182f4d8756bd7d9afc2c718674fbd9c95a386b99d2bac370a87c9cc03558f8e1f8833ccefa735fc0299984dd3d7f2823be51a1fa0ad915756a87d2c6a5 SHA512 ba9014b318ecc18b2473dfe92b25c208b6f8ce4cd329f0482c925e3fd86b3cab7aef43a71ccaa89e01294b5d877ba42617b70b7dc27d7f7da21e90648418faa8
-EBUILD imv-9999.ebuild 1810 BLAKE2B e3601453c416eb35d202cfef4916bd8a6e078ed3a6c9aec7a1871b3ba70522f35a67356842b164ed3f721298ee0c9bf9bf63237ca5f777188d7d0a1677b18bbc SHA512 b618911f0c0797be3cacc06474b4d87ffb975aec79b9439f7530dbcd127db01a110fffdc539c666aaccbcbe71c66d09623745027168f489fe01cbda461f6e046
+EBUILD imv-4.3.0.ebuild 1878 BLAKE2B 2f77f1bec8b37018ef3c5d6187248568041694230b39ba8ad0b545f10f4ac078beb32144832f10d7fa6f50ff8cab8f34a27cbed79eff3801543cd67442d35956 SHA512 72280fd22dbeb2b315c0013b4faf52a60b0a91107cc4a8780c388abcb9f9ade23ec16243a87ee379c3d1e3e7cb58f508abbcfd818bf169096e7cc365be07a798
+EBUILD imv-9999.ebuild 1878 BLAKE2B 2f77f1bec8b37018ef3c5d6187248568041694230b39ba8ad0b545f10f4ac078beb32144832f10d7fa6f50ff8cab8f34a27cbed79eff3801543cd67442d35956 SHA512 72280fd22dbeb2b315c0013b4faf52a60b0a91107cc4a8780c388abcb9f9ade23ec16243a87ee379c3d1e3e7cb58f508abbcfd818bf169096e7cc365be07a798
 MISC metadata.xml 487 BLAKE2B 75fef8f34eea6c032dd6d31b3b185b18acf2c38d15a47a5aea71f7b50d3604b53242f1750ad88bc6e07e3ab4b73ef3ea6d1a60fcb71e484ac9f0595ae0e1c7ef SHA512 6da579aec4f921665773f8163e40a5151954176a4d4004432bcaa51ec48b1d5c808cbb541e99e247d3775f8a592159294a9b7011b017bfede3ab9df0ec0746a5
diff --git a/media-gfx/imv/imv-4.3.0.ebuild b/media-gfx/imv/imv-4.3.0.ebuild
new file mode 100644
index 000000000000..73b075d4566b
--- /dev/null
+++ b/media-gfx/imv/imv-4.3.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
+else
+	SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Minimal image viewer designed for tiling window manager users"
+HOMEPAGE="https://github.com/eXeC64/imv/"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland"
+REQUIRED_USE="|| ( X wayland )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/icu:=
+	dev-libs/inih
+	media-libs/libglvnd[X?]
+	x11-libs/cairo
+	x11-libs/libxkbcommon[X?]
+	x11-libs/pango
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb:=
+	)
+	freeimage? ( media-libs/freeimage )
+	gif? ( media-libs/libnsgif )
+	heif? ( media-libs/libheif:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:= )
+	svg? ( >=gnome-base/librsvg-2.44 )
+	tiff? ( media-libs/tiff )
+	wayland? ( dev-libs/wayland )
+	!sys-apps/renameutils"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	test? ( dev-util/cmocka )"
+BDEPEND="
+	app-text/asciidoc
+	wayland? ( dev-util/wayland-scanner )"
+
+src_prepare() {
+	default
+
+	# if wayland-only, don't automagic on libGL and force libOpenGL
+	if ! use X; then
+		sed -i "/dependency('gl'/{s/'gl'/'opengl'/;s/false/true/}" meson.build || die
+	fi
+
+	# glu isn't used by anything
+	sed -i "/dependency('glu')/d" meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature freeimage)
+		$(meson_feature gif libnsgif)
+		$(meson_feature heif libheif)
+		$(meson_feature jpeg libjpeg)
+		$(meson_feature png libpng)
+		$(meson_feature svg librsvg)
+		$(meson_feature test)
+		$(meson_feature tiff libtiff)
+		-Dwindows=$(usex X $(usex wayland all x11) wayland)
+	)
+
+	meson_src_configure
+}
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index 9b3b3c026ab9..73b075d4566b 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-HOMEPAGE="https://github.com/eXeC64/imv"
+HOMEPAGE="https://github.com/eXeC64/imv/"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
@@ -23,9 +23,11 @@ REQUIRED_USE="|| ( X wayland )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	dev-libs/glib:2
 	dev-libs/icu:=
 	dev-libs/inih
 	media-libs/libglvnd[X?]
+	x11-libs/cairo
 	x11-libs/libxkbcommon[X?]
 	x11-libs/pango
 	X? (
@@ -43,6 +45,7 @@ RDEPEND="
 	!sys-apps/renameutils"
 DEPEND="
 	${RDEPEND}
+	X? ( x11-base/xorg-proto )
 	test? ( dev-util/cmocka )"
 BDEPEND="
 	app-text/asciidoc
@@ -51,9 +54,9 @@ BDEPEND="
 src_prepare() {
 	default
 
-	# allow building with libglvnd[-X]
+	# if wayland-only, don't automagic on libGL and force libOpenGL
 	if ! use X; then
-		sed -i "/dependency('gl')/s/gl/opengl/" meson.build || die
+		sed -i "/dependency('gl'/{s/'gl'/'opengl'/;s/false/true/}" meson.build || die
 	fi
 
 	# glu isn't used by anything
@@ -61,10 +64,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local windows=all
-	use X || windows=wayland
-	use wayland || windows=x11
-
 	local emesonargs=(
 		$(meson_feature freeimage)
 		$(meson_feature gif libnsgif)
@@ -74,7 +73,8 @@ src_configure() {
 		$(meson_feature svg librsvg)
 		$(meson_feature test)
 		$(meson_feature tiff libtiff)
-		-Dwindows=${windows}
+		-Dwindows=$(usex X $(usex wayland all x11) wayland)
 	)
+
 	meson_src_configure
 }
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 490843dc9753..79a405174499 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
+EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1225 BLAKE2B 1ca1ce4ddafd127b63751bcfb4dc394872e39c8b5135837aae9314f0aff1eaffa61353aa2d79f9a1dfd646b2e051a1947dcf908841f5d17871b2b1772599e632 SHA512 2f92a260ab14351803837361dc559d8a0f4245e1ce3348af60119a1ad3c205e12835583f78e9f5a9e6acd05f7e6e808917035bb676769a7d5d6a6157346fc92e
 MISC metadata.xml 373 BLAKE2B dae0358240c22b0e32527d07c38c88b46d48e7e2d54993484bdbb50fccbc6c45e9ef9ef0ec03740ac0d1bb00a4080183be59cc791076fd69ddb067b858e6e721 SHA512 90aee2eb26b919c8e6dd18874a65b6e22994a1d8bb3058ca4fe1df604f7dd6e0cac1b22bbf3d5410c97b6604a913f7327deeef43cf0ecccf46d8df1fc25d974e
diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index 35793f715a14..43f217aba10d 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 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 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="examples gif"
 RESTRICT="test"
 
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 5ba7388f8934..2558f8d8a407 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -10,5 +10,5 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298 SHA512 d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
-EBUILD sane-backends-1.0.31-r2.ebuild 8547 BLAKE2B 547791d93b480363954d3cdb9caccf85b1f2aa20049d804414be8aa2cffefae28bfff477255cc7853c9d262dcdd7cc279b42315a066b9cfc5a107f6aef91bc66 SHA512 3405c7bc68efcb086b58311de1295ffeba8744cd52335c2d163fa218a702811edb79583b990bcf85a5123639c42afcbe30b588ed4e83097a1d4f266854f96096
+EBUILD sane-backends-1.0.31-r2.ebuild 8554 BLAKE2B 20ef534583a3052e699693472bca958e49426353f6f1cf8e721690657c657e1411fcbf7c49ed28a84367afbd5e1f40a70bf3551a06d3d0e169b3dbdf6d89075e SHA512 690006aef47beaaad149199cef5ee694a6fa74913e30dc61d14aedd1558ef8e14f238e88d71c316a4c38f29f4e6a069f9ccd8508f5ec536864d192eb504105cf
 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
index 0e3cb32ecc8d..fd7cd87c6000 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 # python-any-r1 required for a script in
 # backends/pixma/scripts/
@@ -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 ~riscv ~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-libs/Manifest.gz b/media-libs/Manifest.gz
index 169e794fbf87..f6bd6f5fed6b 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index 889278f8e941..f90d3781f115 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -1,5 +1,9 @@
 AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch 16825 BLAKE2B 4a732a2b461e81016d0d3e165d998b19904fbd9a77af4cc041b29a6c785beaedec109fe33ddcc6cb05c08f3001231b1e832a687dfccf96fbef70c4e517737fb0 SHA512 53df4449eb0acca2f20a42cf9945870e580de3be6be416c52428e300aca1833eda081d6fc17024aa61f1ecd0886098958d187249a9189fb6d1e62c82d0964afb
+AUX ctl-1.5.2-fix-to-build-with-gcc-11.patch 599 BLAKE2B a6251fcaf30b7e716968612cfcfe2efec308f77cd49b34940526e9de1ed2faa81551ed6464835836cffa3df5ec6b51dcf70a35ab6f76e3b6e0527cdcd5010a1d SHA512 3e8dbc56ba1db7d6c0bd880cabcc02e2ea44592e1099dd33f51fa22a8220643cc9ef08b83a75b22a3ff3df65e9d51bbb9989323de1cf2bc33e5266d828433e76
+AUX ctl-1.5.2-fix-unit-tests.patch 1863 BLAKE2B 7fab88b476d9e5468d4195e8dc3f9c9c3781eeb728a674edf930f4e2e3e3bfc0747a5dfe2cc33891698ce86b23839fc3a472ed2f5d2ffc323e06ff08f777a989 SHA512 e5d994fac97da2e94ba5f9ef2542546e880d2d2ec1c61624f85249f6e75e3f4d19dcfa91158166c77d6d0c1aaec90832ff55bf88264bd987bb6fa851d6d05cd8
+AUX ctl-1.5.2-install-dpx-library.patch 565 BLAKE2B 234ba1ca74575a0babcf080c74052ce433a7698afa86b4991d67fe29c51c2eb42ad8a2748a5c1187c6c865e1860695d11736da788f41be919334bd119456a66c SHA512 bcf3ee6e44193436f1e70f0fef739dee74f83d814cfac1ad7b652a908934f73bc9f00f83ed4327e82d917f8579b9b476416e68e523a747ba9e5bbf8bc82d0bec
 AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
 EBUILD ctl-1.5.2-r1.ebuild 706 BLAKE2B 5750dfbd0b0d60de4002e06d908bd1ee00faf689cf4e20748d8909a72dbc2673f08977cb00b9640ced231d7b2169c142665d52ebf6d0a029606bf73abd3a43c3 SHA512 e3b36bc318a3bcfee03902122dc654d693c8ed0f5fc529596a2e7a6a9b34103684b8c30756bbfb92a812c47215b8ce7652918a1116323d3833bc491b56f58958
+EBUILD ctl-1.5.2-r2.ebuild 975 BLAKE2B 556b5fbb8d4162a7cf79a9f4892d38306ea219c1af64d1e80052f8172d3b1179741fb16f5c9487b27aa29b743eafc5950f622c9905e5d4deead10caab6db603e SHA512 a140089091ba258c36c64aacc373c9084ee85ba2e339b02cde8f66903cde0d1dbe26e777981b04badc59079ae43343cc782af2dbdc118881b5d527064beb19ea
 MISC metadata.xml 297 BLAKE2B 773f2836e68b0405f210dc51fac01e9c40845d34e4d7ed036916af8f8d63bebcd91bbd672bf84e4dac6ab84135915db85914c07a8bdecdb1ce3c3ff1b5f6408b SHA512 e437384a215b9cd38ecc3e4721bb47c6acf9b8c17d6bc348ddb1272b899428cf7835371a3fca39e6b66f49f1760996fccc336bf15f6d4e36783bd12db84afe49
diff --git a/media-libs/ctl/ctl-1.5.2-r2.ebuild b/media-libs/ctl/ctl-1.5.2-r2.ebuild
new file mode 100644
index 000000000000..31d4f99a3543
--- /dev/null
+++ b/media-libs/ctl/ctl-1.5.2-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="AMPAS' Color Transformation Language"
+HOMEPAGE="https://github.com/ampas/CTL"
+SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz"
+S="${WORKDIR}/CTL-ctl-${PV}"
+
+LICENSE="AMPAS"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="media-libs/ilmbase:=
+	media-libs/openexr:0=
+	media-libs/tiff:=
+	!media-libs/openexr_ctl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch"
+	"${FILESDIR}/${P}-openexr-2.3.patch"
+	"${FILESDIR}/${P}-fix-to-build-with-gcc-11.patch"
+	"${FILESDIR}/${P}-install-dpx-library.patch"
+	"${FILESDIR}/${P}-fix-unit-tests.patch"
+)
+
+mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
+
+src_test() {
+	pushd ${BUILD_DIR} >/dev/null || die
+	eninja check
+	popd >/dev/null || die
+}
diff --git a/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch b/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch
new file mode 100644
index 000000000000..47b4cb538676
--- /dev/null
+++ b/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch
@@ -0,0 +1,25 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 30 Jul 2021 17:33:47 +0200
+Subject: [PATCH] fix to build with gcc-11
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ lib/dpx/dpx.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/dpx/dpx.hh b/lib/dpx/dpx.hh
+index 02ae833..5639aaa 100644
+--- a/lib/dpx/dpx.hh
++++ b/lib/dpx/dpx.hh
+@@ -297,7 +297,7 @@ struct dpx {
+ 		compliance_e current_compliance;
+ 		endian_mode_e current_endian_mode;
+ 
+-		std::istream::streampos header_start;
++		std::streampos header_start;
+ 
+ 	public:
+ 		virtual ~dpx();
+-- 
+2.32.0
+
diff --git a/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch b/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch
new file mode 100644
index 000000000000..56fa35de7a2a
--- /dev/null
+++ b/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch
@@ -0,0 +1,65 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 30 Jul 2021 18:40:27 +0200
+Subject: [PATCH] fix unit tests
+
+Add cstring #include where necessary and drop segfaulting test
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ unittest/CMakeLists.txt               | 1 -
+ unittest/IlmCtl/testExamples.cpp      | 1 +
+ unittest/IlmCtl/testVarying.cpp       | 1 +
+ unittest/IlmCtl/testVaryingReturn.cpp | 1 +
+ 4 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
+index 553b553..1cfbc9b 100644
+--- a/unittest/CMakeLists.txt
++++ b/unittest/CMakeLists.txt
+@@ -3,7 +3,6 @@ enable_testing()
+ 
+ add_custom_target( check COMMAND ${CMAKE_CTEST_COMMAND} )
+ 
+-add_subdirectory( IlmCtl )
+ add_subdirectory( IlmCtlMath )
+ add_subdirectory( IlmImfCtl )
+ add_subdirectory( ctlrender )
+diff --git a/unittest/IlmCtl/testExamples.cpp b/unittest/IlmCtl/testExamples.cpp
+index ccd2183..180b7d3 100644
+--- a/unittest/IlmCtl/testExamples.cpp
++++ b/unittest/IlmCtl/testExamples.cpp
+@@ -56,6 +56,7 @@
+ #include <CtlFunctionCall.h>
+ #include <CtlType.h>
+ #include <assert.h>
++#include <cstring>
+ 
+ 
+ using namespace Ctl;
+diff --git a/unittest/IlmCtl/testVarying.cpp b/unittest/IlmCtl/testVarying.cpp
+index 90ab05d..4079ca6 100755
+--- a/unittest/IlmCtl/testVarying.cpp
++++ b/unittest/IlmCtl/testVarying.cpp
+@@ -62,6 +62,7 @@
+ #include <assert.h>
+ #include <sstream>
+ #include <limits>
++#include <cstring>
+ #include <half.h>
+ #include <testVarying.h>
+ 
+diff --git a/unittest/IlmCtl/testVaryingReturn.cpp b/unittest/IlmCtl/testVaryingReturn.cpp
+index eb91d31..d7ab083 100644
+--- a/unittest/IlmCtl/testVaryingReturn.cpp
++++ b/unittest/IlmCtl/testVaryingReturn.cpp
+@@ -62,6 +62,7 @@
+ #include <assert.h>
+ #include <sstream>
+ #include <limits>
++#include <cstring>
+ #include <half.h>
+ #include <testVarying.h>
+ 
+-- 
+2.32.0
+
diff --git a/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch b/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch
new file mode 100644
index 000000000000..96e8b268f49b
--- /dev/null
+++ b/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch
@@ -0,0 +1,21 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 30 Jul 2021 17:54:15 +0200
+Subject: [PATCH] install dpx library
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ lib/dpx/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt
+index 918890e..2ed69d1 100644
+--- a/lib/dpx/CMakeLists.txt
++++ b/lib/dpx/CMakeLists.txt
+@@ -12,3 +12,4 @@ add_library( ctldpx
+ )
+ 
+ target_link_libraries( ctldpx ${IlmBase_LIBRARIES} )
++install( TARGETS ctldpx DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+-- 
+2.32.0
+
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index ddf3d15e18f2..ccc07df15d98 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,8 +1,10 @@
 DIST dav1d-0.8.0.tar.bz2 668627 BLAKE2B 6f45c6b0011acb74bb26fa201e667b16dbf8b691a2bc5d2043517381ca58132fa29ee828841609762737ac8637948b2bd4bac9e2c1d2ca23b1d3ad23f5883875 SHA512 906481ce5b9ce99cef2723c4c2466ba762095b9f88caccd42dcabfd4800964d7cd142736de1bf2ef25b631ee01eb26f7f1ac1754fc161b8fb7192e104df10e28
 DIST dav1d-0.8.2.tar.bz2 695931 BLAKE2B cfe7667e583e05f8fd84b226a26ea23a901336fd8cf62900b47cd6b3bf92f8fe58d14224d1e063cc3bf7abdb17da437d291dc3f604cb68e99fc0615619f76880 SHA512 73335594950b08596356a1950213abf57c6d48060da37149e700565f9689ca82b7427e320040bf43b2e97eff7b6da7116a6aca77cb717f7ce140039ebdae5595
 DIST dav1d-0.9.0.tar.bz2 771739 BLAKE2B 9cf24b142a1148200766a1a20010ff14d1baec507a7ecb477117826784b668178ba753049abf316aacbe1b957340c157f960f748ab8e6f74caf567edba2be3a9 SHA512 cfbfa4cb4508e1b975d7247bf0fa09d3b7adfd224adcf181153365677237b98a6d53b0b7bb91055a26e5668d58b3dcda5f675f68aceb1b020d14b53c4488575e
+DIST dav1d-0.9.1.tar.bz2 810641 BLAKE2B 6ad40f6a339a71bc2bf79c508bc7a8a58cda98c6814981d252a3a40ae8df1cc5ad120c42fc881cb560c84e01186ca3daa09cbb5f6152d7da475d9479aa306f2c SHA512 b688f4743106ceed5f450978a9c265391c0ee906dd5adb8632e563378b316ffb3a7098fb6ea2ef4b160ca880fc03c16e3e3b9d8aa3c90ee7341dd0cbfccecc46
 EBUILD dav1d-0.8.0.ebuild 1060 BLAKE2B 9aab861019f4d4b7ab09d3f67a40ecfa3305a3f6057e60ff607b295572fa147e1dbae99f15b748cab8eb5ce668e0b36353e56f2003c816d4c4a4f86db999f6d4 SHA512 1930d6aa4218d5940ed0483d27accae81f94ff9aa18a7f3a5ed4f50fe2e3b6042332faba9dfcbb61883e7489ef44807a9d85b5abd4e9d87bc41d70d6677af936
 EBUILD dav1d-0.8.2.ebuild 1140 BLAKE2B dc06909be0c6b8b10dcf967ab561e0b463433c21e342c629738023ef59f225f7e212c751eebfc0eddf21c25c1af50f87083bbc23c5dafd57468bd36b1b73509b SHA512 314b53ee0a37c017aa0d16507148a8935f2aa2a505cb87c12c8a69d3d849cbe39860cfd36d6863d61d585a0584c47436a2a06edb5fcdcb3fa00dc07b5d7dcb4c
-EBUILD dav1d-0.9.0.ebuild 1146 BLAKE2B b9992fd8921597ba6bb3a70234ea0474340a1b364b205580b818fc1842945f9f0302976c70b568701b8bb5d90d47b5cbf1a8ff684a8e727f15ccc34af4309e45 SHA512 d7550556ce6aeedb98224500a86b1129dad0ab080be2f9d1b381b83fb1d5767734d93d0ddca2af3beca7b1a94ad5f91878ebf10a33de0ccd0d532ad6e8f4c5c4
-EBUILD dav1d-9999.ebuild 1146 BLAKE2B b9992fd8921597ba6bb3a70234ea0474340a1b364b205580b818fc1842945f9f0302976c70b568701b8bb5d90d47b5cbf1a8ff684a8e727f15ccc34af4309e45 SHA512 d7550556ce6aeedb98224500a86b1129dad0ab080be2f9d1b381b83fb1d5767734d93d0ddca2af3beca7b1a94ad5f91878ebf10a33de0ccd0d532ad6e8f4c5c4
+EBUILD dav1d-0.9.0.ebuild 1153 BLAKE2B 34a0271631ec34a0acbcab9e43443c512485485abfa93d704514508658516ca0171dfcac7047bff3ed35a9f1c5ea51865f5ca790e46d6f0c686f454cf5a00389 SHA512 50368d81e65450bf69b755a3db09d07d593ff4c3aa9c3336266cee324cb8f944bb7fffe57cb0719d8579806d2c6f274f9b0e998498c541d285dc4b51d8da34f7
+EBUILD dav1d-0.9.1.ebuild 1153 BLAKE2B bc17badb10454b0eddfe95e890c9e7d4939ca830fc02077a4af9acef5397626efe18c05538af2c7cb3ce41cf1246cae4d110493042578a090e7a51f0eb08d534 SHA512 1e90ec0f7fe82150cdc45849d349bd2c9dd3200983a323ac953511b3911665a3812c76a41dd00e5b9c2545678b2d802fd7517a4827f3c4f64c974348ee2e047b
+EBUILD dav1d-9999.ebuild 1153 BLAKE2B bc17badb10454b0eddfe95e890c9e7d4939ca830fc02077a4af9acef5397626efe18c05538af2c7cb3ce41cf1246cae4d110493042578a090e7a51f0eb08d534 SHA512 1e90ec0f7fe82150cdc45849d349bd2c9dd3200983a323ac953511b3911665a3812c76a41dd00e5b9c2545678b2d802fd7517a4827f3c4f64c974348ee2e047b
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.9.0.ebuild b/media-libs/dav1d/dav1d-0.9.0.ebuild
index e8fc5114e038..ae26cc566f30 100644
--- a/media-libs/dav1d/dav1d-0.9.0.ebuild
+++ b/media-libs/dav1d/dav1d-0.9.0.ebuild
@@ -8,7 +8,7 @@ if [[ "${PV}" == "9999" ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/media-libs/dav1d/dav1d-0.9.1.ebuild b/media-libs/dav1d/dav1d-0.9.1.ebuild
new file mode 100644
index 000000000000..850f1843db9a
--- /dev/null
+++ b/media-libs/dav1d/dav1d-0.9.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [[ "${PV}" == "9999" ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+else
+	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit ${SCM} meson-multilib
+
+DESCRIPTION="dav1d is an AV1 Decoder :)"
+HOMEPAGE="https://code.videolan.org/videolan/dav1d"
+
+LICENSE="BSD-2"
+SLOT="0/5"
+IUSE="+8bit +10bit +asm"
+
+ASM_DEPEND=">=dev-lang/nasm-2.14.02"
+BDEPEND="asm? (
+		abi_x86_32? ( ${ASM_DEPEND} )
+		abi_x86_64? ( ${ASM_DEPEND} )
+	)"
+
+DOCS=( README.md doc/PATENTS THANKS.md )
+
+multilib_src_configure() {
+	local -a bits=()
+	use 8bit  && bits+=( 8 )
+	use 10bit && bits+=( 16 )
+
+	local enable_asm
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
+		enable_asm=false
+	else
+		enable_asm=$(usex asm true false)
+	fi
+
+	local emesonargs=(
+		-D bitdepths=$(IFS=,; echo "${bits[*]}")
+		-D enable_asm=${enable_asm}
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		meson_src_test
+	fi
+}
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index e8fc5114e038..850f1843db9a 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -8,8 +8,8 @@ if [[ "${PV}" == "9999" ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 inherit ${SCM} meson-multilib
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index 1e82bbc6dba3..581da6c2f229 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,3 +1,3 @@
 DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f
-EBUILD embree-3.13.0.ebuild 3465 BLAKE2B b5e4e31760538f51c50ba1526ee29eebdab8c5ee720267ec65457d31112ac481c45fc76413460bb327975a79e7c89023b8d3c40bd14855e994d6bf3aabbeba11 SHA512 a9fee50a34340c78b0c21c6128fcb53f1f59e351557ede13bea0e9f2b54641b639911b2850c707f2248357bbcc54bb00b712af07263f17f7f2276a9bbe4d42a2
-MISC metadata.xml 1613 BLAKE2B 916b6146240c4615a8baa634e74b5548bc9bb3951754e29fcc1c7bbde5e0bf149b78aa188ae90f96e6f5635c849bdcddb53c71207f5404f3b13f919824026129 SHA512 0b12bb93ffa005da30ee1c7106d2adffd82fafe66d5fded8b199ab77392773db03cd88e380a2b861bcf502275deb1e2467c7637b7548356c8487387b532cb7e1
+EBUILD embree-3.13.0-r1.ebuild 3651 BLAKE2B 65fa6bda49493f6eef10eb47ebbff48aa04a2d0215db0c3d3b804bf463100c3f5d8eaab8ae2f1ef5957ac503d97ea425d51530b0829d4e20be8efa978336b850 SHA512 9dcfcc5703680ca291495205dd66f911d4c708e5cbf665c08579a6afc63de43074bc092c1bcd5565ed3a1fdb02ad3089031824da4b735684eb44ee393c9baa4f
+MISC metadata.xml 1704 BLAKE2B badfdc7f376750baf3cf4b6857651f0ef86c90a6acd1046694e49b2d641e53d6b31855a7326b66cc7f5473dd747da26c202d8433adb5ab7380269578ee46d6b1 SHA512 3bbe4c5d05bc4d5d7fde27bbd51ed9292fed45c03e72a6bdcbf163bfdadd3738249ac76c292bf4751e19b248dd4438e49fa5af0b78221d8cb0da2078bf0d5a87
diff --git a/media-libs/embree/embree-3.13.0-r1.ebuild b/media-libs/embree/embree-3.13.0-r1.ebuild
new file mode 100644
index 000000000000..f77d5a1eb87c
--- /dev/null
+++ b/media-libs/embree/embree-3.13.0-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree"
+SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
+CPU_FLAGS=( ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial static-libs ${CPU_FLAGS[@]%:*}"
+RESTRICT="mirror"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=media-libs/glfw-3.2.1
+	virtual/opengl
+	ispc? ( dev-lang/ispc )
+	tbb? ( dev-cpp/tbb )
+	tutorial? (
+		>=media-libs/libpng-1.6.34:0=
+		>=media-libs/openimageio-1.8.7:0=
+		virtual/jpeg:0
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+pkg_setup() {
+	CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+	WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+	linux-info_pkg_setup
+
+	if ! ( cat /proc/cpuinfo | grep sse2 > /dev/null ) ; then
+		die "You need a CPU with at least sse2 support"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# disable RPM package building
+	sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	# NOTE: You can make embree accept custom CXXFLAGS by turning off
+	# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
+	# any "march" compile flags. This is because embree builds modules for the
+	# different supported ISAs and picks the correct one at runtime.
+	# "march" will pull in cpu instructions that shouldn't be in specific modules
+	# and it fails to link properly.
+	# https://github.com/embree/embree/issues/115
+
+	filter-flags -march=*
+
+	local mycmakeargs=(
+		# Currently Intel only host their test files on their internal network.
+		# So it seems like users can't easily get a hold of these and do
+		# regression testing on their own.
+		-DBUILD_TESTING:BOOL=OFF
+		-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+		-DEMBREE_BACKFACE_CULLING=OFF	   	# default
+		-DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+		-DEMBREE_FILTER_FUNCTION=ON			# default
+		-DEMBREE_GEOMETRY_CURVE=ON			# default
+		-DEMBREE_GEOMETRY_GRID=ON			# default
+		-DEMBREE_GEOMETRY_INSTANCE=ON	   	# default
+		-DEMBREE_GEOMETRY_POINT=ON			# default
+		-DEMBREE_GEOMETRY_QUAD=ON			# default
+		-DEMBREE_GEOMETRY_SUBDIVISION=ON	# default
+		-DEMBREE_GEOMETRY_TRIANGLE=ON		# default
+		-DEMBREE_GEOMETRY_USER=ON			# default
+		-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+		-DEMBREE_IGNORE_INVALID_RAYS=OFF	# default
+		-DEMBREE_MAX_ISA:STRING="NONE"		# Set to NONE so we can manually switch on ISAs below
+		-DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
+		-DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
+		-DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+		-DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
+		-DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
+		-DEMBREE_ISPC_SUPPORT=$(usex ispc)
+		-DEMBREE_RAY_MASK=$(usex raymask)
+		-DEMBREE_RAY_PACKETS=ON				# default
+		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
+		-DEMBREE_STATIC_LIB=$(usex static-libs)
+		-DEMBREE_STAT_COUNTERS=OFF
+		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+		-DEMBREE_TUTORIALS=$(usex tutorial) )
+
+	# Disable asserts
+	append-cppflags -DNDEBUG
+
+	if use tutorial; then
+		mycmakeargs+=(
+			-DEMBREE_ISPC_ADDRESSING:STRING="64"
+			-DEMBREE_TUTORIALS_LIBJPEG=ON
+			-DEMBREE_TUTORIALS_LIBPNG=ON
+			-DEMBREE_TUTORIALS_OPENIMAGEIO=ON )
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-libs/embree/embree-3.13.0.ebuild b/media-libs/embree/embree-3.13.0.ebuild
deleted file mode 100644
index 7fb5564741fa..000000000000
--- a/media-libs/embree/embree-3.13.0.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 cmake flag-o-matic linux-info toolchain-funcs
-
-DESCRIPTION="Collection of high-performance ray tracing kernels"
-HOMEPAGE="https://github.com/embree/embree"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="3"
-X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
-CPU_FLAGS=( ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
-IUSE="+compact-polys ispc +raymask ssp +tbb tutorial static-libs ${CPU_FLAGS[@]%:*}"
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	ispc? ( dev-lang/ispc )
-	>=media-libs/glfw-3.2.1
-	tbb? ( dev-cpp/tbb )
-	tutorial? (
-		>=media-libs/libpng-1.6.34:0=
-		>=media-libs/openimageio-1.8.7
-		virtual/jpeg:0
-	)
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-RESTRICT="mirror"
-DOCS=( CHANGELOG.md README.md readme.pdf )
-
-pkg_setup() {
-	CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
-	WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
-	linux-info_pkg_setup
-
-	if ! ( cat /proc/cpuinfo | grep sse2 > /dev/null ) ; then
-		die "You need a CPU with at least sse2 support"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# disable RPM package building
-	sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	# NOTE: You can make embree accept custom CXXFLAGS by turning off
-	# EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
-	# any "march" compile flags. This is because embree builds modules for the
-	# different supported ISAs and picks the correct one at runtime.
-	# "march" will pull in cpu instructions that shouldn't be in specific modules
-	# and it fails to link properly.
-	# https://github.com/embree/embree/issues/115
-
-	filter-flags -march=*
-
-	local mycmakeargs=(
-		-DBUILD_TESTING:BOOL=OFF
-		-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
-		-DEMBREE_BACKFACE_CULLING=OFF	   	# default
-		-DEMBREE_COMPACT_POLYS=$(usex compact-polys)
-		-DEMBREE_FILTER_FUNCTION=ON			# default
-		-DEMBREE_GEOMETRY_CURVE=ON			# default
-		-DEMBREE_GEOMETRY_GRID=ON			# default
-		-DEMBREE_GEOMETRY_INSTANCE=ON	   	# default
-		-DEMBREE_GEOMETRY_POINT=ON			# default
-		-DEMBREE_GEOMETRY_QUAD=ON			# default
-		-DEMBREE_GEOMETRY_SUBDIVISION=ON	# default
-		-DEMBREE_GEOMETRY_TRIANGLE=ON		# default
-		-DEMBREE_GEOMETRY_USER=ON			# default
-		-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
-		-DEMBREE_IGNORE_INVALID_RAYS=OFF	# default
-		-DEMBREE_MAX_ISA:STRING="NONE"		# Set to NONE so we can manually switch on ISAs below
-		-DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
-		-DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
-		-DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
-		-DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
-		-DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
-		-DEMBREE_ISPC_SUPPORT=$(usex ispc)
-		-DEMBREE_RAY_MASK=$(usex raymask)
-		-DEMBREE_RAY_PACKETS=ON				# default
-		-DEMBREE_STACK_PROTECTOR=$(usex ssp)
-		-DEMBREE_STATIC_LIB=$(usex static-libs)
-		-DEMBREE_STAT_COUNTERS=OFF
-		-DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
-		-DEMBREE_TUTORIALS=$(usex tutorial) )
-
-	# Disable asserts
-	append-flags  -DNDEBUG
-
-	if use tutorial; then
-		mycmakeargs+=(
-			-DEMBREE_ISPC_ADDRESSING:STRING="64"
-			-DEMBREE_TUTORIALS_LIBJPEG=ON
-			-DEMBREE_TUTORIALS_LIBPNG=ON
-			-DEMBREE_TUTORIALS_OPENIMAGEIO=ON )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-libs/embree/metadata.xml b/media-libs/embree/metadata.xml
index 9fb89375a782..dcaede1dd583 100644
--- a/media-libs/embree/metadata.xml
+++ b/media-libs/embree/metadata.xml
@@ -20,15 +20,16 @@
 		<flag restrict="&gt;=media-libs/embree-3.12.2" name="compact-polys">
 			Enables double indexed poly layout.
 		</flag>
-		<flag restrict="&gt;=media-libs/embree-3.12.2" name="ssp">
-			When enabled, Embree compiles with stack protection against return address overrides.
-		</flag>
 		<flag restrict="&gt;=media-libs/embree-3.12.2" name="ispc">
 			Build Embree with support for ISPC applications.
 		</flag>
 		<flag restrict="&gt;=media-libs/embree-3.12.2" name="raymask">
 			Enables ray mask support.
 		</flag>
+		<flag restrict="&gt;=media-libs/embree-3.12.2" name="ssp">
+			When enabled, Embree compiles with stack protection against return address overrides.
+			Stack protection will wield a minor performance decrease in return for higher security.
+		</flag>
 		<flag restrict="&gt;=media-libs/embree-3.12.2" name="tbb">
 			Use TBB instead of the built-in Embree tasking system.
 		</flag>
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index ea97edd479d7..fc18c2bc5b6d 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -3,5 +3,5 @@ AUX gst-plugins-base-1.18.4_wayland_registry_remove.patch 2041 BLAKE2B 88830f067
 DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75
 DIST gst-plugins-base-1.18.4.tar.xz 3169512 BLAKE2B 8b5a7a08641532631842e2ec02379b116ae0f08cda7654d123dbb2d56f97667b94ffc716b389a14ad034d0edb36587d8edc2c4f53782135c53def248fa60d0a3 SHA512 c750d68404462807ff03f441e232c4d98752a9bceeec3038fb37a105942f25499bde0660ca688b6f3204c58eb6a2e3f33671e979018c8bd829e7591455961a6a
 EBUILD gst-plugins-base-1.16.3.ebuild 5954 BLAKE2B 744b3bec6a4d7b6c1ad44276a6641ae960b21d3ee3b5be92a739f0798ff468564a2e776f135e16c67be42d325d6ce2806ffbce6a24b477f27bfbd50b24127006 SHA512 9ec447c3176369f521829a3b2882f73f579f1b608c4bb3c54eb9d290f9200b39f0679ab4ec5ec8d2180821f55efe7c4d89132fe7c968a51b6f1457051a3cd2ca
-EBUILD gst-plugins-base-1.18.4.ebuild 5718 BLAKE2B a70a9b46e6471263455c049bdf7c8a887c66ed0d50f23fc1e3faa8a4abfc32ab98df4f8484362d696c2041c92c0f95430a05476d526635709914e99dc5072521 SHA512 f42a746757febf46af978caa95ae51eb10ee2b3379f294cc5f48d086ea85408777c56b18cf4768472658fc674f3c17e07e08f368723b8fe6c79e4c823adf9186
+EBUILD gst-plugins-base-1.18.4.ebuild 5725 BLAKE2B 8f68c475ec71a6964db00cd1dbba5a4b11f11c4bbbfbeeb197b1df00e0ea1503d2d67f6739d9d39bcc3824aa51752c1e118bacae41525db75087f6faf398b01f SHA512 afc79eed90e324bab56c9984a64323cad7ba64aca6af21d348da544cbce28086cb3160cb47a2e7dde149c8f106c5fa6a6d5c5559d4d5d62abf0cf1d6cf363958
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild
index a158631adf0a..1c069c4398d7 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 72c10c2c83dc..4bf0b7279260 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,5 +1,5 @@
 DIST gstreamer-1.16.3.tar.xz 3338692 BLAKE2B 79eb08bc446073fadf881adea0f60a2caf6384836df975f80ce0e57db6469e6a016cab38413d3de00d11b491a0281f95dcbcd1f782b31f2d1a07b866c1ed7dd5 SHA512 4a879e71f65c89609c2e106dc79222853e6f37830638d5b9624c436fc9d8974cc6474d399eff02cdc13ff7189fcd13e9450450d36c3a6092aa53cb97056f5854
 DIST gstreamer-1.18.4.tar.xz 2703948 BLAKE2B b11be1309e7a6ad0aff24aa99b10b1c16df4b1720b821421a72ec9d9b20087488901bb4667e797d32ef616f909c3aefd301fac6be9c4c4120ec9e4af3acc7b48 SHA512 5312c621fc354b35cc81f53b4ec65c661ad2c22acef2640bc27860234243d06e00e3aaf41c93d379d8424c0ecdf2ae06096dec0d0313215426348ffa0afb3c4a
 EBUILD gstreamer-1.16.3.ebuild 2854 BLAKE2B a573111c26ab04f84025d4a83e7c8f4827fec79d0e8e21b92f1fe6851c97f11b1267b0ed7baff1a910ca644fde428bc1cf3f3396aca689f0e74c721b47ac4843 SHA512 a2d2b8a8ffd4d1772c54bf1571748d0cf2150fab5442081f39de141ceaf7d5c0c17db70a2e889ba51d33586716c7ed9d0e66d0d217807ebf42ae9c39ae16a05b
-EBUILD gstreamer-1.18.4.ebuild 1922 BLAKE2B f3e4ec09155b677dce89b6a39220380f7bf0cf04fd1da86e13aa9738ed1c3078e4203173163cac4a7e04b514d59bee3a23f7902d4adaf7c9a2cb901e17dc0afb SHA512 105cdbf7d06e5ed35f2def0f8be2cf7753bf83deafdb1735b770f0531b96e9887d664bbf333d49cb85ffa35205d23f0c1c46aa8c188dba6b76c111540c4b5580
+EBUILD gstreamer-1.18.4.ebuild 1929 BLAKE2B d6483412659ff14cd6c741757f059f1e06c39a550506a21f52944a02f2414cff7febcfde49e7423b5224fc0035bb55e5fc54f63a8a112ac204872c73b6f86fb3 SHA512 3bb1276bdb35edce25f526f43b6a0409d7d7dc6571b6f36705ad02256c753b790202001bb7e19a3259d46c9a1b8c9f23ca1c64ee4dfec0787a151b13e49d37fa
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.18.4.ebuild b/media-libs/gstreamer/gstreamer-1.18.4.ebuild
index 02d997439af9..1685855ab71f 100644
--- a/media-libs/gstreamer/gstreamer-1.18.4.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.18.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection +orc unwind"
 
 RDEPEND="
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 7f26b3b180cc..b30729f8aa05 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,5 +1,5 @@
 DIST hamlib-4.1.tar.gz 2260629 BLAKE2B e53249f476005f3ec8afcbba6d875d913cdc45eb741fdb8b8718c1c5bda9cf8d50087165b72055600bc9ff364117f7d72235a3d68a9fb0882a77a6fdbf366605 SHA512 a5fca5dc89a7408628bc77fe22c6d8c77474b3dabee7b2b6d0b280becb6cb63f5619e4a620ad11aeb81b8412145b0f8cb0291a2d4cd3751c643cb1709b2dfa78
 DIST hamlib-4.2.tar.gz 2311775 BLAKE2B 4fe8d3e6d489369aede1a4cd59f01be44a7787ca71c21c5b92d436666c67de68013f488834d0f57238e6a947c24cd5b4c6c667397dec30392f1cccd695df252e SHA512 08ccf4e592fbae938ae1aaa5afede7e2e6ec7d23b449a65b00e093502f4aeb36930624f055d9802349f77df9dd2b7b983aa44d83f8c62a6de5789e7df627f804
 EBUILD hamlib-4.1.ebuild 2057 BLAKE2B cfc7560c85e7c826ffe23a87393a1eafc96805d5a2c0efd40ac538869bf5b66fe9ede92f3317421e5f84e516bc1556c52d4584df264f1dbc050b58a2fc37e5e4 SHA512 8fc1a8b6ce0943fcb8f53b341e39fd927fe108001f59e89ff45dd036c1213697a3044becf1ecf0ae821e17f45d629e2b0f235a45e57567171a83646fa78e7853
-EBUILD hamlib-4.2.ebuild 2061 BLAKE2B 40a91c8e73c98777f912854454f5421854b36dc4bb583f82b0ecae91246521146e9cdb7da4f627d01feebac0fd0e44345a54874b573301314666aa256b45757e SHA512 a8d3bd260b343b77fd96800aad6a9c53ab7e4c1f323d38dcafd959f2cd05767b8f5c983d7b4ff4fc64aae6a5a19eb808fd0edc899b043c293eb5207f04c3178e
+EBUILD hamlib-4.2.ebuild 2059 BLAKE2B bf20a9cf50751f9c569838e4e8e23a9f88b5fe2c2b8768c7dca910b7bd9e6f65ea5f81dda22df0e4aaf2c4e8851b179a184594a6a88debb53f7e2c1a2945560f SHA512 3d6caa23d7cf43e9744eb88aaee4ec978331bb02dedee767ddcdce81a7f02419a34f2bec2ffd91dd0757e934af4903879ad3485b70784aace027340ceebd4002
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-4.2.ebuild b/media-libs/hamlib/hamlib-4.2.ebuild
index a1babce2a0e4..c26283d90ea6 100644
--- a/media-libs/hamlib/hamlib-4.2.ebuild
+++ b/media-libs/hamlib/hamlib-4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0/4.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 9ffbb45cfd23..c7834cbd4696 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -2,5 +2,5 @@ AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e5
 DIST ilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 DIST ilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
 EBUILD ilmbase-2.5.6.ebuild 1080 BLAKE2B 6d186c002551cde60e7c6d2642bbea2087e247a6619cbb625558130bb7c743b3c4d9dae94c7078165eb78be1c51d4f02301706a67cb71b63e111403eb80a871e SHA512 1431d949d5687df526a45d8bc41e0e6c958c15d4e0c873e82548ab5f22414fcfedd5a12a59fee6a105b92813c14decc4271cba7c6e68acf2fe4017b675525359
-EBUILD ilmbase-2.5.7.ebuild 1090 BLAKE2B c7bb12c40a49c20ed403985f85d50b27f8da9d68bf5682ee09e766bbcb3072fdf112f00724d3ba2f316856d619cab9110c69a253b0169d304d529411e89e66a8 SHA512 e57f77c2d2fded932af373aa3e1d29696cd4184ae6a6354b8c04b1a14eb5c14b3506fbac0fb18d79e618881b0631f97d42e7c2a625ac62e36f17b97e86333255
+EBUILD ilmbase-2.5.7.ebuild 1089 BLAKE2B 3be2d25a4f410fa55508396bb8aeee554f6747f61b9edb130d99ba2576fe533cef6b5f41e1af58efdecb8d0c7da8e06972257877b111041855d201163ac5e415 SHA512 fead430fb6a6ea5e906ed37a391ae5aaadff56f065aa494f7d3aefdd2f9dcd72635817de87df4247977af2e3ae3d059af9c53d772ec05ed7fec77fb7ee4ff2f0
 MISC metadata.xml 691 BLAKE2B 9c6c8f6eb00b3959cbae60225c3d094b9abcb55b0c755dff4906a4d81c1b87bc38fff9e5d306a20a82c8fbd8419e203e0c89889f3be7b1486594527183ab5143 SHA512 2adb19e5ae0e25184c26b0787aa7275e8707dd79609f5d4b6f6723cc2f64e64fec4954296d2bfefd3edff341b3c0a22b60da6069ddb636a422110b157af353c6
diff --git a/media-libs/ilmbase/ilmbase-2.5.7.ebuild b/media-libs/ilmbase/ilmbase-2.5.7.ebuild
index f4151651546a..9b78d8f34758 100644
--- a/media-libs/ilmbase/ilmbase-2.5.7.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/openexr-${PV}/IlmBase"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="large-stack static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index a37724090828..ebd8377ecb62 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,4 +1,5 @@
+AUX intel-mediasdk-20.3.0-missing-limits-include.patch 751 BLAKE2B a43734984dad9be29ae79677c05d20c245e704d6cef9c6d69d06d38973eb2dadae34cbcba74a120061dfeef6bc10a5ca76fd9a252d35c25025158aaf251bc122 SHA512 a5a681d43613a20b9c8cd1549d6b4fa4288c401716cd95ab08e314855fea01acc24d4fc0f5c687a002ca2440b7eb4f14c64c727b2b0382ca9c99ab8981e051b3
 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
+EBUILD intel-mediasdk-20.3.0-r1.ebuild 975 BLAKE2B 89348fe099e7cc04aca1cf0783db27a23db5c4b38bcbb01608c7127d9ca3e276818b13dd3f56335dd2e19f0c277059de25d8874e5ae04aa08dbac606ba3bf7d5 SHA512 86f3a0092e8108bf824e7d66d4060e65444140728a3937bd0490ee3fd5d6c8ec7cae901b0a2ca01ebdb9c1f0dcfdf03d2345dbebd1811461fcac24dadf073b8d
+EBUILD intel-mediasdk-9999.ebuild 905 BLAKE2B 6d20e929400fa7bbdfa328167d1bb77630ff1f0db2c429689759d3684ef7bdd6a98abc35abc2afc296fcee22f6db40ea85f4e8227658790ad8ed2a7c209d7bef SHA512 0a1111fd1d60b63b922322d89f308ea5cf4e999425cc679e11e5e2a852fd684b6780a08be98023005026979677dbbe3dca9a603769169a3d9e995641aff4ff1e
 MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3
diff --git a/media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch b/media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch
new file mode 100644
index 000000000000..a3a5c1e06ec4
--- /dev/null
+++ b/media-libs/intel-mediasdk/files/intel-mediasdk-20.3.0-missing-limits-include.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/789726
+
+From fb9829058e35405081c8b361fb402eeaa6b78ed9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 4 Aug 2021 21:47:49 +0100
+Subject: [PATCH] Add missing limits include
+
+---
+ _studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp b/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp
+index 5774702..ed1c1b7 100644
+--- a/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp
++++ b/_studio/mfx_lib/mctf_package/mctf/src/mctf_common.cpp
+@@ -44,6 +44,7 @@
+ #include <algorithm>
+ #include <climits>
+ #include <cmath>
++#include <limits>
+ #include "cmrt_cross_platform.h"
+ 
+ using std::min;
+-- 
+2.32.0
+
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild
new file mode 100644
index 000000000000..2849dead015e
--- /dev/null
+++ b/media-libs/intel-mediasdk/intel-mediasdk-20.3.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
+# bug #805224
+DEPEND="
+	>=x11-libs/libva-intel-media-driver-${PV}
+	x11-libs/libdrm[video_cards_intel]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.3.0-missing-limits-include.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENCL=OFF
+	)
+
+	cmake_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
deleted file mode 100644
index 930261567424..000000000000
--- a/media-libs/intel-mediasdk/intel-mediasdk-20.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=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 930261567424..33349a103358 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
@@ -25,10 +25,12 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 
+# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
+# bug #805224
 DEPEND="
 	>=x11-libs/libva-intel-media-driver-${PV}
+	x11-libs/libdrm[video_cards_intel]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index 1aba1def8b84..5888849ff273 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,6 +1,5 @@
 AUX libao-1.2.2-automagic_sndio_oss.patch 1407 BLAKE2B 8a67faac3b2d4a617683af689bb66b7abcd93552a6a87aed0a8677c5d1352944071f3621b6298d27bcad0e02dfe54c2abf386396e71fae2b923747dae5999684 SHA512 8aae4dc353f6299e7790743694d7c67ddaba1cc02a8cba81a36962112f3a0ecbf4e078ef27d5d3c28bf779fbfdc6e5c3935ca5437ccfcf84b3e2e5ed5cba1f63
 AUX libao-1.2.2-implicit.patch 530 BLAKE2B 085b0782f7ba13088cac1d063183d6c0a6b5bf784e9ba90d1e2d1587579d78a6d58b5754733e2e2749815562513b0be0898f0709719eb6f7f55d5389040165bb SHA512 fac9d6628ad132215935190ba0d55f5837c638572988426996e3fb91053fed06739dbd57bea2518e11459af4f6e941e45d46bc3094aa2919318386dd93a448c8
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
-EBUILD libao-1.2.2-r1.ebuild 1523 BLAKE2B c5234b18ee4fee0d71c12f22fb6143b0426dea17282d2b6fae84550a6707101316080d2cf8fdcd89f55e7bd40d88e6a50ff5d508da30bfdee62a371fa6720ff7 SHA512 c1823efe1bebe94ff7c5ee1352db03b1f07aaa47d849db9bc4a089679115c8e8f75ade6e6ff07a64db9ab192d0be2655b35e7eb3881efdb4fcc6f79566f63780
-EBUILD libao-1.2.2-r2.ebuild 1673 BLAKE2B e9cb19b6edca77165583e62ffdee238c6c95e223612fedb1fe77b84a064bdc1007398b0b837ce5204a2e592f20c757d8fcf105f4ed6d733516b468eacbd61711 SHA512 91dc0f1606e0e17e435db638a53dc6ec88629cfaeeb035051f0f77f87ccb291d140b60bfb32b3fa0d1ce37bf5b450d9f68fcf8b6cea7490651a7d27e44f62f18
+EBUILD libao-1.2.2-r2.ebuild 1672 BLAKE2B 957ccd681083dd4eb55e648bb41f73938401033d2a0383ec7814fa310ac4a044cc47fb6acda5b50f8b1dd9edd8074351c15552ef994d2bafeda365ded6fe0359 SHA512 bd0e334eeec769b7af6ff087e7eaba9c93ea49c8830603c567d020a41a3f0f9f823cbd42b9860c12dd17c5a6e7d729c957b4e0a3d178e250668d90f10d6a6973
 MISC metadata.xml 334 BLAKE2B 31591836828157d48ba8a49c8b44fee8a42b0a78f0c95c451fa0dc347c36b1508115bbc14abb0b84246edda5da8b733d9d126fdf2850cc35c54620e105e76e8d SHA512 f3d4066c208ef45f754e0fc0c30e895c7cb06ee8a2fa21265d09d90b3937917d0ed156e88f7d75b9441361282677171980112c3e1a088442abf20bf66fb3d813
diff --git a/media-libs/libao/libao-1.2.2-r1.ebuild b/media-libs/libao/libao-1.2.2-r1.ebuild
deleted file mode 100644
index dda461774e57..000000000000
--- a/media-libs/libao/libao-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib multilib-minimal
-
-DESCRIPTION="The Audio Output library"
-HOMEPAGE="https://www.xiph.org/ao/"
-#SRC_URI="https://downloads.xiph.org/releases/ao/${P}.tar.gz"
-#SRC_URI="https://git.xiph.org/?p=libao.git;a=snapshot;h=refs/tags/${PV};sf=tgz -> ${P}.tar.gz"
-SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="alsa nas mmap pulseaudio"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-implicit.patch
-)
-
-src_prepare() {
-	default
-	sed -i "s:/lib:/$(get_libdir):g" ao.m4 || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-arts
-		--disable-esd
-		--disable-static
-		$(use_enable alsa alsa)
-		$(use_enable mmap alsa-mmap)
-		$(use_enable nas)
-		$(use_enable pulseaudio pulse)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS CHANGES README TODO
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/libao/libao-1.2.2-r2.ebuild b/media-libs/libao/libao-1.2.2-r2.ebuild
index eb03b8bb5fad..da2b67d21cd9 100644
--- a/media-libs/libao/libao-1.2.2-r2.ebuild
+++ b/media-libs/libao/libao-1.2.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio sndio"
 
 RDEPEND="
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 443dbe3df31a..060600c3113e 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -12,6 +12,6 @@ EBUILD libaom-1.0.0-r2.ebuild 2585 BLAKE2B 6be258a02782560bf5fd8ac982e710a90f51a
 EBUILD libaom-2.0.0.ebuild 2309 BLAKE2B 58f2c55f85387c62abe184863c934979033c63f0b966664a11e13bddf4abf22ead334a94a645bb1cc28ae05ae58f9398cb462e9384f7b087e1ec1983257d1870 SHA512 6fa8b6e03dd556b84abebb271047c58b3936eb7e9479360d87f6f2f4b3bb7815911e43a10de03c4acc431a60897457a39de65ce4e2087ec238bf3afdfd8c285e
 EBUILD libaom-2.0.1.ebuild 2319 BLAKE2B 072057d02485e70a557be99c7e0eb0d52b8382a3cd11afd9c6ac375b830965cb1291488e7a599e4226d4fc553287b618b50ae1cfea27c2e935ce259c2870431a SHA512 4b284f8049d487a178b280c9bb18bfd757f4e8a9f0b673c4cda337085c0fb7192632b46540081967fd03dd9c982cd488155751bb008cc114d4d38f5e98cc8c35
 EBUILD libaom-3.0.0.ebuild 2304 BLAKE2B c2daa55289a3dd1f716b6e7b13e62ce179c4e48f1b27b4668803821b06454d6b6e61782947d54f04f0e2245fdd9ec23b658906d1dc162435298ca48f8aa35c69 SHA512 0932c96e70ed7456b0db2ea8091a27c8914ca9f2eef2bbf20371e94d9cbc9fa225b38aecbea70f1d64e0e77a76aa1f3f1373cf311bed9a3edf36510bfaa50e0a
-EBUILD libaom-3.1.1.ebuild 2321 BLAKE2B bf027ec5967d22a8adeeec00371b7e012c6c56b84ad9dea44796682655db131d8b5f9644b1ad0f70c0ce2400ada0ab8a079fc16e63457c73bdcd4bb5a06de087 SHA512 e95482c75610c84ca3a9b64cdff171ee63a069c8812e389d51d0d8a55a0ac96db061cfccdd52a3e15a33a25b5c74cedbad79751da2b8b97bef8bc585e5ab5ebb
+EBUILD libaom-3.1.1.ebuild 2328 BLAKE2B be9c7b100dcad9afb4413eab3396bb83abf7ee958fe9f08c1716bf20159f24556e50322c3031f120b66d2419a0d707c3d2e5e7ab021a45084c4acf42882ec5fb SHA512 09fbf070bef621b010c7c33a04a2d1776d28866504080c192439f6a93c0bd8731518519913f0bea65dc42650803bb36e61eda8faae3d8bfc613a6c43804ec136
 EBUILD libaom-9999.ebuild 2304 BLAKE2B c2daa55289a3dd1f716b6e7b13e62ce179c4e48f1b27b4668803821b06454d6b6e61782947d54f04f0e2245fdd9ec23b658906d1dc162435298ca48f8aa35c69 SHA512 0932c96e70ed7456b0db2ea8091a27c8914ca9f2eef2bbf20371e94d9cbc9fa225b38aecbea70f1d64e0e77a76aa1f3f1373cf311bed9a3edf36510bfaa50e0a
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-3.1.1.ebuild b/media-libs/libaom/libaom-3.1.1.ebuild
index ec2266a2d2d6..32590cb16b0a 100644
--- a/media-libs/libaom/libaom-3.1.1.ebuild
+++ b/media-libs/libaom/libaom-3.1.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
 	S="${WORKDIR}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index 8629b3cd62f0..118bdc320ad4 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -6,6 +6,6 @@ DIST libavif-0.9.2.tar.gz 1987058 BLAKE2B a734014945498d29121d64e54f34b367582688
 EBUILD libavif-0.8.4.ebuild 1696 BLAKE2B 330cf5554d5d3290dc41d90df4b574a4142e4ad941b0b61aedd2241d4e5fd5d8b2b44adfc53a9c0e8e233a2e001f5dca0a22e336a8fb5b7110f5873d0011e4aa SHA512 2725900f3f0974efc152aea05ad53dec427d142be91aab3a1fb6b9f9e1dd92dd98f4c46fef8ca71aa3bba6d900b2cc3e5bb11439879740a474ad0f5a45c390f6
 EBUILD libavif-0.9.0-r2.ebuild 2723 BLAKE2B 897b538c7b198edd03168c70877eff541327ab439fac2f844b45dc97070e85caa2cf1cc58217225624ca0c2dd81c649f932b7cd0be05a41e23ca56ef50b0dbb7 SHA512 2e334002bbf2bba95a8182b2091ebab4a1f7ff1695cc0e098a16b56641310cddb1a0d74f28c35e258de52ece7a66fc99676db7562303ce9a21eb4f6a878632ef
 EBUILD libavif-0.9.1.ebuild 2676 BLAKE2B f7bc18c5ff496903a50754a83aa5389726a6758879e978f602221770a952b6d0e9dfc8f2642e9782325bbe9041d2c13ed4eb77e712461f2e73d6a95c794dc0e1 SHA512 bf7780568db50757782179613174d49eb89b5a9ad6f02d68ce99adb84e36e83b5543220d49dc491152b13f9457a2de850d045fa6965c803112f854b3e647916a
-EBUILD libavif-0.9.2.ebuild 2678 BLAKE2B c724ac6686d1ee86235450acb49dd6511c7db25bdc55d426f1572435bc56a8de01c7abdc2aa423902b0179d1ef052aaff148fa77b065aacb8eef502d03098172 SHA512 a894a1042468be7fab7a8cde9612bef7613a41f96419a186f5edc1e6c6a717db2ed70b6fddfe957d947c5002836e8e086852a2f265d55d02e35758d50264925d
+EBUILD libavif-0.9.2.ebuild 2685 BLAKE2B b5fd74a300dd3167c34ea9f871a35406884c9112cf27d708029099bd5b5bf42ce0521b0a4fcd31e738d8ed649962905413155eda86ddeb79047c7c5fc6a7548d SHA512 1087e0d6b53ec58c8ed480b04698effb05d21023ab61c46721926cc964398e76434db47c34605ff1d2d16a1874992b4cd4917d36e098b9963b80770139cb3f25
 EBUILD libavif-9999.ebuild 2598 BLAKE2B 30eb997ed8776849fe1a6c075b93169da72ac416ca84e7d0c6a4b8ea6a83eff005a1586eabe28955a8bc453161953dda15f9a90ba94340f239f41b819b0eb9d6 SHA512 f4b650f6ddd67b4a230d4560311f2419c4b8c5c8efc0811350631dfd08f43fced574dc522a36426164fe43a8f77ad6b956c0f25d2c149a067fd7b1d678c25961
 MISC metadata.xml 873 BLAKE2B 076f55198ed293b3a61d5fb312e6c0b5769f3e01118ab481b6902cc6b5412298b05e23d20d2063dcdec5514c804b02249f24e433194910741688cba8a51e56c2 SHA512 0ca9b65794748bba0c92034b531b5bb2e3e6f87ba362073954b8c8689cf115f20f0de3b19bdec9189a2b54ac1c5a33c77b426fb1d907b35ff35ff3b71dd86ee7
diff --git a/media-libs/libavif/libavif-0.9.2.ebuild b/media-libs/libavif/libavif-0.9.2.ebuild
index 1aae436f27eb..4a9f25f041f9 100644
--- a/media-libs/libavif/libavif-0.9.2.ebuild
+++ b/media-libs/libavif/libavif-0.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
 
 REQUIRED_USE="|| ( aom dav1d )"
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 43ffd8bc16ae..ab0a16e64841 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,5 +1,5 @@
 AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6be396b1cb9d4d4690c43cb85cf6c21f64cde98e01b52551216612cf349f2fe74d59252b99a202cce7041d3c2b6a33dde SHA512 34b6efa56943e50d76c21e6911afff9c45e97d5608cfa5d3a53432bf2bf40f4fc6873d8c426b1a714542a6468670be2a710190191e5e1fe01c5e7dedf75f567c
 DIST libde265-1.0.8.tar.gz 381963 BLAKE2B 0577623de2ef86e1122b5b5c3642a750bb222c4988a996168e060e8ffd9f5c0787d31331cc8738362d3fc3fb31e8eb659629cab068f0ff1c71de9d15ed1f2ceb SHA512 0007138cb5da0d4cad1e118c01de249580f39c387a11f490d1e1f63ad0968ee2f7951e54580f298b3dbe31e5a3d1a7fa04454e11cbb82beaf8a9aaf56f5532ed
-EBUILD libde265-1.0.8.ebuild 2351 BLAKE2B 1846ded7d2ac6d8caff86bc6141dcabf309c05d2cfec1ee41155cd4ccf4bd05047a7624222732cbe82a618a12c41d1c8d0a332a55649f9b0b75e7be960e6c9b1 SHA512 c5cec886324f8a0bacac396dc26109104fe228299d5a1e05a45be8c95c40cd91b6553f14b9b935adabf2108cd176d98d47300a04bf187363e28adf22250df00a
+EBUILD libde265-1.0.8.ebuild 2358 BLAKE2B 903784edcca458ade518c4d1868d00f590c174651168c02f0b68067711fc1f871ecb4402cbdc1adedafbf837819fb8dd724ebf9017a2c4014f839a09a2a43809 SHA512 1d9ae549e55e1dcc0ecb2825736d2fd2c6cca3581ae3a987ab29c8a00d44c5fba18285954ddbfbfa177b5d87bb355aee9b96c12c585141bf0af6cbea5ea37bd6
 EBUILD libde265-9999.ebuild 2355 BLAKE2B 2b0701a6f2c9c2bb24e08fe76844c613befdc9bf16c81695b3ae2e4dc8db3bf58225ad5897e5072ad1ad3e30126e89ca829338812decd31c663ca0530b501d82 SHA512 2605125ee6c33605f6a03282e3c51b1577eb9bc124e348f8a9b197a5dfb5a4698fa3752baec7baf44c592f998b48bcc8125423a83d45e648a577ab8f2505c337
 MISC metadata.xml 660 BLAKE2B ad29eca8291fd1d09bc3964b23fcadb61d952be12dc54ea451e1b420ce158cc05b97a549bc2d98e62747d3d26765785be1e3249cfc86838fe04f2a62553ab335 SHA512 bd446c5bc5317e7ecce0a0f910d23efc65fe61f6ee81d13e7c2a813e09c773e2d35b3d8deb57b89ee171feb88b86e64251c4680010461313f9e135f7af95cac3
diff --git a/media-libs/libde265/libde265-1.0.8.ebuild b/media-libs/libde265/libde265-1.0.8.ebuild
index d532ac429877..a8e64d68e746 100644
--- a/media-libs/libde265/libde265-1.0.8.ebuild
+++ b/media-libs/libde265/libde265-1.0.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Open h.265 video codec implementation"
diff --git a/media-libs/libdvbcsa/Manifest b/media-libs/libdvbcsa/Manifest
index 9e485bcb3dcb..6620d0da395b 100644
--- a/media-libs/libdvbcsa/Manifest
+++ b/media-libs/libdvbcsa/Manifest
@@ -1,5 +1,5 @@
 AUX altivec.patch 1627 BLAKE2B 306742b8fea3fcbf21bf7839c05252284c4d05f33022f1f5655a633b421b1e3ae5db165dc870d4c1f2706620d6c0618bae8ca7a730da453332d4641610a4dbeb SHA512 290ac3aa86a932923c3332b7bcc910907e07dfc5a401d28ca8918b3b90b3d40a24724d8ffc18ead1ed6c5b9fa4cc2c886bcbea78f4528fb2e18fc7cf113ee6f2
 DIST libdvbcsa-1.1.0.tar.gz 345487 BLAKE2B ff5d9347f4255ca2c4e62477771715a7d8fcfca6eeb3a2e6cfdfcd903c9927a35d9049d18ec5a9d458328d6a3712d6cf81633e7ddc7c67d1a8099b8d56b2fd68 SHA512 f336bc90711261bb86bb42f897d5207a71da5a384bfb7d641de7e1fb3a43d20aeec250e9a5ceaf0b20f1e4335ccda70055675256c6889873bf1bfff55005a015
-EBUILD libdvbcsa-1.1.0-r1.ebuild 1174 BLAKE2B f0f20496b3eaf1cab744f9aa8825194881f84c58e3123aea957a528a1549a8ea974464a767c7a3e905b8325dcf680d9fc228938d0d6d9fe0dee30a049e2fde48 SHA512 182d76d45d559fd7c5fe64771270249da3fa701cfa1d05026f475d3ccd93821dfa0013da62c55e8d3ba491931b32389580bcfc8eb1876cd0f7ca0bfc4d27c8d5
+EBUILD libdvbcsa-1.1.0-r1.ebuild 1173 BLAKE2B 368991aa45ecb8577ee47dd9fcbb0e1202bd7b5f47537cc2de5edb735dad9243355877bb81fcd220c5749ac8cd277879ce328f9601a6729fbd3ee989bfc591a3 SHA512 c3c753669d857d9637a7dd460e66d7f0205be5660f288387a07a4d689d3b70d304b0b2e6e41ccee9d3f44ecac7c5b67358c51e0ae736dba5eb89044cadc1c535
 EBUILD libdvbcsa-1.1.0.ebuild 806 BLAKE2B cb24d42c44474bc57e207a5e7736303be510ecf33bb33f9d8d733e4eb580def21e132b4d7b15865000e81a610317b51a5177c3bbd81332fd037fa6e883abb15c SHA512 5c12338d1abaa400e3eaac194d7d3263af90cf9beb87daddbefb5a692107cd67492ee3b1a653713a52358c2629ce7520c7599de77229585a2d25759ecf86255c
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild b/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
index f57c4314130e..bc96ad4de4b6 100644
--- a/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
+++ b/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse2 debug"
 
 # https://github.com/buildroot/buildroot/blob/master/package/libdvbcsa/
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index 45790f15dec3..cb7a00d58b87 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -2,5 +2,5 @@ AUX 20190621-use_shared_library.patch 524 BLAKE2B 51fa3fa3e8be71ce255b714f4c542e
 DIST libhdhomerun_20190621.tgz 50817 BLAKE2B 7d4293e38be5283fba5d46cb162ee19d90c30ed63481cd94445a055fa0f80597fdacedd59e35ba4edfb53934ce339e967eb0c42d0ae72289ce7d39eb1f91cd50 SHA512 d15c5b0703bf8ca1f3979a8cad93fc33d87c1309367ad5117354c60112a5505d90e80d4bf9055d16b0eef2b892015c5f4886e6544178090b3550c3a8dbd86576
 DIST libhdhomerun_20200521.tgz 51014 BLAKE2B bca7c09afd16dae9177cf8b8c828827818acf8bc24eff404591178519bd1b568bb8689721b452bf23ae5b37143cf85aa6fbce52177fcfbafcd5e30e6f1ceafce SHA512 ac253923b531a8e1f714b7fb98da5a2a062144c045117a63e5bb16b33a49ccafcffd24f5520d412d15ca55bc1810fc0ecb9ad05e2d7f5a196b5439b4e28d5c23
 EBUILD libhdhomerun-20190621.ebuild 742 BLAKE2B 4b318d87d60e18826d853bc92451f2d4659af5ed915aeb3c596f7fa33e17cb6e7a0ea2b45d53e2f9ed4237b2ddcfeb05a19afe882166c4596ccdf5c531838275 SHA512 d3ae13a413af9e8ad508d1f5834295dfedadfe1047b65fd360d4997c7b58d6c3e533bc66c09738e57261698c1c5630df463e4a063a92bc649acc7a6420d5e72e
-EBUILD libhdhomerun-20200521.ebuild 743 BLAKE2B 4d0c8729a70f1a3d4d3ab8a5c469dea3f650e9778160458f1eafa8b7a92fb569563f792a36598c41d024979f08519522ae26a5f9b51ca5d54294e0d630d3b2b6 SHA512 12ea5a2751e9f82e7bfc848d1532a91f86a19831f4834492a537711b5206a97f1e27bf94da8d6329717c9f4be7c24d64d6952fdf2adf1f6286974609d5451f5d
+EBUILD libhdhomerun-20200521.ebuild 742 BLAKE2B bc67df4970091743232dacd42215b137c13a1a4f9fca12f9e86dbd286d1df28bc6c12b04a3a57eb61872377c89b12024b904b29fa6f53c75354877e3656b5848 SHA512 d45dcf9259225696ea7660a88ff0a5e57309ed84e1b3044d3f7f150acc153ccb1cd521efa76885d37193aa5c4ed9705d0c5f3d66b51bdd8ead50c5b3fd65d6de
 MISC metadata.xml 411 BLAKE2B 75f777e333bd3226a4fa56e247c2a1a9470b3d9f8a75b03fa54c6d5d286c48ca6f139f9d40deefd95516eed1c29a6d90d490a82b1614c93042efc284cd4d1fe2 SHA512 5a494427f6131f779b27d6296673dc2448bd66116a9d668d3a3814f868bf0a951cd853ec2de514083b68e0b85e99ddffed5d99b8a5c1140569c546734466da5f
diff --git a/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild b/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
index a47b92cd0696..ba9622a7b375 100644
--- a/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
+++ b/media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 PATCHES=(
 	"${FILESDIR}/20190621-use_shared_library.patch"
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index bf8ad8933482..0c325bc9e257 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,6 +1,6 @@
 DIST libheif-1.11.0.tar.gz 1680855 BLAKE2B a85ed643bd05cd59a34e9e42c0b8690fc779c06d01aa4925b177c1a36e7a4d11c9dfa798295c9b8215f45802e80119f2a8f5c3876103818c5436358416d97dd8 SHA512 1a5d54a09a5dc581a054052bac4299f7c96ca121650e9238312c426d5261247ce6af1840088b8717c5a53d212b7ec17bfaa109b9245abfaebf1603eaeb77b0ed
 DIST libheif-1.12.0.tar.gz 1684355 BLAKE2B 6d84678b39476f2d797d586c6dcaabc9a82351fe3bad536cd90edab16dabf91cbdcdb291195ff45061c7b0ad164748c53f87cbb2dc1e318b2cd458fcba74f644 SHA512 9e6f74dd52841a33b6021a1581ab28c56123d927caa7972acd284444e90888bbdae983b6d847d20eac7651dacea2193d27eb8df45928cb0774229ef8eea23294
 EBUILD libheif-1.11.0.ebuild 1829 BLAKE2B 79717765460165bad32b30e4e6ad000cc5436b516c62415e1b4d8d885fa03f894394f5b2e9e60114f2b0d3edfed335ee5c5de1ceb01f09bd2fbeb2cc3e29bc5e SHA512 cec879361ba3869c151da18a27059055d17466fb49bcb3d88121c8aa940b36bcd08e4ad2c9c684cfcb87db1800af23b61dbaca3d02ecdbf39a1843056c96a496
-EBUILD libheif-1.12.0.ebuild 1831 BLAKE2B d4dcb3a09dc6031152a89f01cf9ef58e9a3a8f9cb8b9dee77834cab99b0e3cb9d6badefa619b8696d45478461b7dbc31128ab6ca0dc67d2248ba473c51992f2f SHA512 12004e9b44197701e8322184321c9074112c63b277e96f68456f614aed8dfc57c824ffdebf943a40c52104f3a0ae7347b7fb1cd573e8e5802bde690d54f76413
+EBUILD libheif-1.12.0.ebuild 1837 BLAKE2B c6c87a75d91519617af899d80ade1fdcd6801e359df5c43d562c6166e935ea168cd135d9d0b37f8b5dd3f9ec791714c36357b7b2eccda929ac9fb89cf8bf07ab SHA512 71a2f4f35a4c62ddd4ac2588ddc36a53a544f0c0cf3ffa6afa71d224138d10788f18c32f55f797512cc0d9801560e5e8b5502ce3f950b0d68b154b665acaac8f
 EBUILD libheif-9999.ebuild 1833 BLAKE2B 2049ab3555555fe927b1ebdaf5d9bb2bc29d160c836be1f346814b05f861a5c60ee8e9dad3077c59e689156dc61db57f90b2455f6ac1593aa59e11ddc155b28d SHA512 164ed6c60d44737d6915770a728e87a4bb53e58c4a6b7cd648661b6b406754aa909011066b8ba7c6a785f7f20884798c516b4c3a767f12fad015586d1f2a87b7
 MISC metadata.xml 1038 BLAKE2B c04c4e8ef4df16a22ab34e87ab9142f00243aec2e471a17645ae74b9159ab7092c396cb65131c762ab5b102bf510b3859f4a9e36870cb10d254614ba8fcdce95 SHA512 fad35ef040ebf936350bf75195aae4a8ceb42472f5243b5e3e6afa170a5a9d4c4f2e6fb93d6674c13e27051261f210f24b155f6f666f3a9af896726906280d31
diff --git a/media-libs/libheif/libheif-1.12.0.ebuild b/media-libs/libheif/libheif-1.12.0.ebuild
index 7189425c7796..432f1f81e29d 100644
--- a/media-libs/libheif/libheif-1.12.0.ebuild
+++ b/media-libs/libheif/libheif-1.12.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index 2cf4bdcbef75..dfb46875cd4b 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,4 +1,3 @@
 DIST libtgvoip-2.4.4_p20210302.tar.gz 1097895 BLAKE2B 36551fb915ee5b5895d8ea68196be5a910739e46886c879bd9f932fa2294a94c22ec3215a94d9bad05a5d24519291676a686c594b74f513f594eb063c83de012 SHA512 d8e27be18e521f367a30c63665300496dbd8fe250261fddf5576325afc27d855e280ee31e46d5fcc2294d79a91c4003732e22f2bfb6db0472e357508b5053d29
-EBUILD libtgvoip-2.4.4_p20210302-r1.ebuild 1436 BLAKE2B c1f235d61390dadda14abf70a615591b1d9bb8a0dd913fad5557062191062e963e292244f328cf1a5db8401046573251d826aec61876cf7eb2dd6ac75d1e58f6 SHA512 59cf755a6e123466c8379c00623dada86d0cca48de15f6e89ac212c4e0be593fef6e45b7e5be3223315e5f89ed6f33476a2171b45c8f10ccb47571e12f4413ed
-EBUILD libtgvoip-2.4.4_p20210302-r2.ebuild 1438 BLAKE2B f5543fcdd2bf3cf87261ae68419e857823727644df0bd850f46b6938fa28a2fa5cbbdcb7a19f4489446ee0ad7ae425ffc906fcbb82d2475c3df17ace1da2e98a SHA512 61e29e8589f9abc1e3e3ab8c3fd51a89ff0f80dab462e094b3ce3fc9da9ec78622aef135539306dacd965e6a0059ad71526171c1160db6ad2f242960a015b0c2
+EBUILD libtgvoip-2.4.4_p20210302-r2.ebuild 1437 BLAKE2B 09e583c81ae311569e4efa058e8ef191c293a093b5c28fd340b4802577d5625cebe2306f20d0d89e6fdb8ad5925f6728b6472c355637c40686acf113cfeb3e1d SHA512 5517782545491e9813bb6141f1f02bcd18a0f629e0290bc621c45bd68be316262678ae0fcaee20669962dd4c1b5ffe1154665bddda1cd39b53b773f14e84d9fd
 MISC metadata.xml 542 BLAKE2B ddf38189857cb4216e85e9a958daa176e8d030b907735f9d57e25ce5b71d0a6179300bb9064960e4a82532dedf329fc85ee98025faf0494b17b74a00fcb8d056 SHA512 e455e7c38f6171064d6c3923fa04373bd6e902e40d6e2c63f7a1ca8adc8245b93ef5b67051ee3fd3986a3efd0868c3c631b7ae36613f7978eba7441322711c72
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild
deleted file mode 100644
index 63e5f5b38f12..000000000000
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic autotools
-
-LIBTGVOIP_COMMIT="0c0a6e476df58ee441490da72ca7a32f83e68dbd"
-
-DESCRIPTION="VoIP library for Telegram clients"
-HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
-SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dsp +alsa pulseaudio"
-
-DEPEND="
-	media-libs/opus:=
-	alsa? ( media-libs/alsa-lib )
-	dsp? ( media-libs/tg_owt )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-"
-
-S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
-
-src_prepare() {
-	# Will be controlled by us
-	sed -i -e '/^CFLAGS += -DTGVOIP_NO_DSP/d' Makefile.am || die
-	default
-	# https://bugs.gentoo.org/717210
-	echo 'libtgvoip_la_LIBTOOLFLAGS = --tag=CXX' >> Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--disable-dsp  # WebRTC is linked from tg_owt
-		$(use_with alsa)
-		$(use_with pulseaudio pulse)
-	)
-	if use dsp; then
-		append-cppflags '-I/usr/include/tg_owt'
-		append-cppflags '-I/usr/include/tg_owt/third_party/abseil-cpp'
-		append-libs '-ltg_owt'
-	else
-		append-cppflags '-DTGVOIP_NO_DSP'
-	fi
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r2.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r2.ebuild
index 96b273ee47fb..99fafdec5f31 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r2.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+dsp +alsa pulseaudio"
 
 DEPEND="
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 582af43d60e6..8c4670203a5a 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,4 +1,4 @@
 AUX libv4l-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
-EBUILD libv4l-1.20.0.ebuild 1509 BLAKE2B 723c9051eac7841dbfee921ebd77688c55f58070087dd3775fb18f5aa4f841d645f8b0fc38c6a6cf8ccc9dcc13aef2059d3efe463253f5d1748db46de040534b SHA512 941fd642e4ba5116aaa95a2dcee8a6907d1f75a2211cd5c9944afa22f7114917edd3e680fb8aa90f0921361493dc246961875924b1d64e5b564ce5b471665bd0
+EBUILD libv4l-1.20.0.ebuild 1516 BLAKE2B 9c9efeeb9d02ea98df998efc4a0996fb64a60837941cc4095a1bd3ff7c03d57cc21c68796fef729281d782095c14ce4bfaa429c59aa99dd647062da31291700c SHA512 d857040a48458d67154d08ef5d70b55a25a192b41278a1f098f215f025a098b35d8d69391b14b855dd6b989a2afec56c0437056843082318c8bdcc8d73213147
 MISC metadata.xml 1116 BLAKE2B 0a5c579aaa12eda3c043a7684a41ef17b8c7ed7411c2639fa3c0df6466f34ad01fa9d18fff1edd65b2bb4b9bf429e1a7c0ef120d75cbae8ea9dcbdbaa5e4b372 SHA512 8bf11a27222e9672c3662a6d807cfda13b5935618289b7acc259db7bfd9a13095b57d881170b7354fa8e971a87e15592e92f8853be18415618df38672a684c41
diff --git a/media-libs/libv4l/libv4l-1.20.0.ebuild b/media-libs/libv4l/libv4l-1.20.0.ebuild
index c00574fbf535..653db36f66ce 100644
--- a/media-libs/libv4l/libv4l-1.20.0.ebuild
+++ b/media-libs/libv4l/libv4l-1.20.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dvb jpeg"
 
 RDEPEND="
diff --git a/media-libs/libzmf/Manifest b/media-libs/libzmf/Manifest
index fe4ca2f38214..a29d1b1f63fd 100644
--- a/media-libs/libzmf/Manifest
+++ b/media-libs/libzmf/Manifest
@@ -1,4 +1,4 @@
 DIST libzmf-0.0.2.tar.xz 320952 BLAKE2B 0fb3a88da7e37f32c46a8c5d388e235ffdb61edaa9dfbd810fe88160c5a19be78a32c537d4953f8b86dd250d4f753c3d7c472bb74613291873f6dee452d546f6 SHA512 ad4a8e65e85434e43caa239ff2a3f358c6db6411235c4bb73d8d2aa1527a4f411433370706db391f8f8110a36759249ee19b27be75bae5f361c491006d1b9aa2
 EBUILD libzmf-0.0.2.ebuild 1045 BLAKE2B 5007b0ccc92ce90a80477557c2bf4ff0b3a74fb3ec006be97d63db78af7aa67887387fd4bbffa0942c3ae75e8d53b635beea19150f2b163672fec31fdc23d476 SHA512 3eef2082d76da8f828e88e15b1f011773d65cbff393fc9b4b3e66b592fc462bd4ab6cb49e35e8b29158cfb91e79b2cd9476dcf4bf001689185f359e44de4e837
-EBUILD libzmf-9999.ebuild 1038 BLAKE2B 59ff70c72dde0cbd532f574b09b088e4e6b39a842d351ea8369d8e99e5e1b5064c786d8de449791152de2bbebce9adb30c24dec5bd9ea44ccd98ae3236c64c20 SHA512 599b94e7651b8f64aab01e2ef78af5ff79197f2c252ab43d2de160a8658a65c29150bdd8b774f83b72070619a8a92c70835c9357117d1b87de3169238e438513
+EBUILD libzmf-9999.ebuild 1067 BLAKE2B ab5d5058ac4d0621fb946575660abebbb7b38b6a40e81ccc47eaffb24a91669a0d4317f36fc86a86ad222aac96097a2fecd5317c4ef272624a3249d2703a084d SHA512 1feffc1087522b915ae254e4a80f257adc0bdfbfd77ad66d85124914b036a723babeaf9e7fdd58fa28dd258cccb2ae544882e9bf2b3b11abf29cb6b331b55798
 MISC metadata.xml 321 BLAKE2B 845e098f8136b178e62b70bb06d8ce26ed7e2b9aec93358180d36cc8de5d4436501fa13521dcc7b4a7f8e311603b25c9d30d23db216008d3d96af5e462611a9a SHA512 a9d2208bf93a05e3406aee66412b46e731ce5a858e3e5e4a6668568b3ccba863d540f3e6224bc7e5ed8c6ad22d330fc0e30ecc90df2f8a866280bb138040fc12
diff --git a/media-libs/libzmf/libzmf-9999.ebuild b/media-libs/libzmf/libzmf-9999.ebuild
index f58ce3535bde..5979e0f48940 100644
--- a/media-libs/libzmf/libzmf-9999.ebuild
+++ b/media-libs/libzmf/libzmf-9999.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-EGIT_REPO_URI="git://gerrit.libreoffice.org/libzmf"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.libreoffice.org/libzmf"
+	inherit git-r3 autotools
+else
+	SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
 
 DESCRIPTION="Library for parsing Zoner Callisto/Draw documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libzmf"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
 IUSE="debug doc test tools"
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -26,25 +28,27 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	doc? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )
 "
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	default
-	[[ ${PV} == 9999 ]] && eautoreconf
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with doc docs) \
-		$(use_enable test tests) \
+	local myeconfargs=(
+		--disable-werror
+		$(use_enable debug)
+		$(use_with doc docs)
+		$(use_enable test tests)
 		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 78a1d4459ec0..6b4318c561a7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,12 @@
 DIST mesa-21.1.4.tar.xz 15254812 BLAKE2B 7ec6177ad4fb6f053553b634c9ff03c5d618d0212fd77c2fda8803197bef529c74ccf3c3ae75a810ba1d57862f08405c6df702e41f6cb0fd202833ce7b9efef0 SHA512 1f4e2d8ba2c3c02bad5468687752d7e87d6e79c4a0e6ec4b2741a57fb270d18ae4712aaa07a9e09a2d3348540f5a26cdbe05464cd52adb8df1e2e28a581b2b53
 DIST mesa-21.1.5.tar.xz 15286704 BLAKE2B 3cf5577e3c47e07ad52460383843e2f9147b76128301c7e993e71d0e84b39b0d968dbb4176b13c283f0e9c9f18823ec001ea39a874e0a5b077c9d573a05486bf SHA512 d9e0e1b6a1d717febee2aa67b06620c9a21e061ea7e594be5b4c382db1ed6f5acf5d13a75a9f2bba9c32621466ebc816708606e16e8b34700d987158fd8f0b7b
+DIST mesa-21.1.6.tar.xz 15371108 BLAKE2B fb44778cc552d96bcc4e73c82c28a2a763be99d67e2d8cdea36e7b8e589b36afc2315ec0f984003c52bd27956baf2d6ddf787f34beae41c4944d95fc6cbcb05c SHA512 5daf389aad4fe7ab3574f6af3aabc62ba8b3034004a0a0853dcc18ef6c8003d2f2195cc377dc57b30863ae4cf158149e3156247445ca2b11e401700011cb878c
 DIST mesa-21.2.0-rc2.tar.xz 15599008 BLAKE2B 546ea33262b5349f3267ae68f9e2dfb636573ef962c636669241c904f0756187a4caf8cd4150307d2d7243f7bf3e0aa723571f36b7387635fe717363f62d105d SHA512 1701489fa56731170c9ef1ba209498f5c6219cfcc6a1a55c3c387497df997c089d17c66ce621609f6346bfc1b3b3c836280f448a3233ac35eef60b4b5a48424b
+DIST mesa-21.2.0.tar.xz 15678224 BLAKE2B 75630a00ac0fcb0e0600a00f51bbe4b5e8be8c95520dea89e157b7a555585b205b266595c0bf0838931f9c6dbb406257d690ccf65d2bc7564c9068510bbb3a85 SHA512 14323ac474bbcf178177506b5a68976238d2e7bdbdcdf4d1355dd43f5bd551c6cdebed76558c34f49ed057477ec88775306b7b8484b437325e4cb4a77e16127e
 EBUILD mesa-21.1.4.ebuild 14933 BLAKE2B 9f7e8cc4f522d6a7b1fbd65e2e12010a7c4132cd403674aaef2170af7247a642b1dc61ca14bf4cb1595c6f14ac94f383a602d7320836b6ee5d0d26ef17886951 SHA512 ef20ed369384d62a639045bd60faffecf7583df00fc67ba5aa88df2263d5bb47ea753b21074194f81b7ab051acb8eedbcad09c5508c662dd50ebcc0fc3a75f24
 EBUILD mesa-21.1.5.ebuild 14940 BLAKE2B 9f807ce55721b04414263282a07b055520f4dc6f56da01271ae2c9f3e8f837f6fb056f4ac1073cf382ff2aa713d0782d7b60f9217f424f593dcc76e447c33efd SHA512 ab0dc007520319f7cc591b784d59e315785691ab081d00a1ae5e8658011e2e1fe293cacece60850217f13a1493dd49d83e8ecb71cece3a6790025f4d66f3a392
+EBUILD mesa-21.1.6.ebuild 14940 BLAKE2B 9f807ce55721b04414263282a07b055520f4dc6f56da01271ae2c9f3e8f837f6fb056f4ac1073cf382ff2aa713d0782d7b60f9217f424f593dcc76e447c33efd SHA512 ab0dc007520319f7cc591b784d59e315785691ab081d00a1ae5e8658011e2e1fe293cacece60850217f13a1493dd49d83e8ecb71cece3a6790025f4d66f3a392
+EBUILD mesa-21.2.0.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
 EBUILD mesa-21.2.0_rc2.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
 EBUILD mesa-9999.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
 MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-21.1.6.ebuild b/media-libs/mesa/mesa-21.1.6.ebuild
new file mode 100644
index 000000000000..2849134b7198
--- /dev/null
+++ b/media-libs/mesa/mesa-21.1.6.ebuild
@@ -0,0 +1,556 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	osmesa? ( gallium )
+	vulkan? ( dri3
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_v3d? ( gallium )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="12"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:12[${MULTILIB_USEDEP}]
+		sys-devel/llvm:11[${MULTILIB_USEDEP}]
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=disabled)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_feature xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=disabled)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable -- swrast
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		$(meson_feature dri3)
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature zstd)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-21.2.0.ebuild b/media-libs/mesa/mesa-21.2.0.ebuild
new file mode 100644
index 000000000000..e3fd921bbaa0
--- /dev/null
+++ b/media-libs/mesa/mesa-21.2.0.ebuild
@@ -0,0 +1,552 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
+	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	osmesa? ( gallium )
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_v3d? ( gallium )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+	zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="12"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:12[${MULTILIB_USEDEP}]
+		sys-devel/llvm:11[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	gallium? (
+		llvm? (
+			opencl? (
+				video_cards_r600? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${CLANG_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${CLANG_DEPSTR}
+						)
+					)
+				)
+			)
+			!opencl? (
+				video_cards_r600? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+				!video_cards_r600? (
+					video_cards_radeonsi? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeonsi? (
+						video_cards_radeon? (
+							${LLVM_DEPSTR_AMDGPU}
+						)
+					)
+				)
+				!video_cards_r600? (
+					!video_cards_radeon? (
+						!video_cards_radeonsi? (
+							${LLVM_DEPSTR}
+						)
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_i965 &&
+		   ! use video_cards_iris &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_i965 ||
+	   use video_cards_iris ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use gallium && use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use X || use egl; then
+		emesonargs+=(-Dglvnd=true)
+	else
+		emesonargs+=(-Dglvnd=false)
+	fi
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_feature llvm)
+			$(meson_feature lm-sensors lmsensors)
+			$(meson_feature unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=disabled)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_feature xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=disabled)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_feature xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=disabled)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_v3d ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable -- swrast
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_v3d v3d
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable zink zink
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		$(meson_feature egl)
+		$(meson_feature gbm)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature zstd)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index a2700ace775a..c74b35526f5d 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,6 +1,9 @@
 AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
 AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd
 AUX mlt-6.26.1-fix-crash-w-ogg-album-art.patch 2476 BLAKE2B f11ae9637e014313499691431863cffd4b87aa9ee06b21a557b63cef3166d73b977acb9818267b0b21335929aa72c2444ec52b935faffe44e31f043cc2fc6acc SHA512 0961298be7798af4a4618224ed9b7d36d3ab0e5f976d087c01c455fce3220e282e03bef53cdb7532ff84ca64fab1d23cb1c4c2179c85d0a1475f4597ac963426
+AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec816b16c458300964fe31ff30f8f2cc64d8f25a795773fd64db7249b031a164c350b55b6326c4d07d73ffd27f8786a911 SHA512 6deb458c3a89f800b4770460330c1e545c22d3a7304f0713b7ae214145d1413a3061c7c026ab2f6fc44801d1d7505352f03c0da7034e817b684e0ebb25d9a94f
 DIST mlt-6.26.1.tar.gz 1366022 BLAKE2B f5b7e733090ae60cb55556893775ab4a68847705e215b85c90d901d72022f5b57c08122cd8c08c1ba51b71eedc5341adaaad2ad002af76724a2d2cf6a7379974 SHA512 6a3ef572cddee48c3089b19b2920de84936aa913a3f35b6f06e4bece2dc7a5a168daecfbaa8111c799b5316f967c37b09d485c000a4eba69af4f7ee3dc8db9e4
+DIST mlt-7.0.1.tar.gz 1181298 BLAKE2B 90547ebeeb90b5ab20ec39e3fa97454e9c502af08981f20e433deafc5bbbb45caeea485c18b4229821fcdcef2ed7767e8936af273200a233f18251fa8bc73dd0 SHA512 9268889f0fbe69180651a592ac0b328d18f8b60c7d83f9d6c506dc21254afcb2281662f4d19faf3520976ae100600d00cd6eb2aa42c83880fa4c4c36e760c68a
 EBUILD mlt-6.26.1-r1.ebuild 5385 BLAKE2B 64c6779bf90e459905f1b93c28d7f21b4974a1fa8d7b0df205fb6ffe32d57b8516cf43968fc9af140cfdeafa9dce1a85d1b93411ad2f83587a7e837383af6579 SHA512 3f33ed0fd4d22fe7df7a53ed8810f296c1b4829410b7ddde3424bc55e6a321597dc80537488541490bc3536bf8f3de6d995a740f1adb7b65a99c3af74a701a84
+EBUILD mlt-7.0.1.ebuild 4811 BLAKE2B 2ae0c88a932abbb81e18666bb1ff1c363065212c737262798e058cd41e7ac11c9b2e176b49eb278736b9a2e09060cff73e0c0765f808ea5cf4f5716530bc97a9 SHA512 357119e172a6c259326a7920b7053047996448e48e37ad310a3af48edd2cdd5166a326e3bddbdf94d26cac942a9c1a5f1dd19c7c61a6681e17cd99abe22b4627
 MISC metadata.xml 1536 BLAKE2B eeec58dc42f229c4dfbb41841d82d2b3035bee6a07f42a08b0a396b2f4dfd498d85bfaf34a73d6b3d03c7109033b9158f930a0da531466ca81a0bb03dbc2a475 SHA512 34236fad3d304e6798f50f9bdbc7e2d6bb261ededa9fbde09ba535850ec908f6fefde2e4c717187d7b50fe195f2c8795f7d0ac8ccff1fabb70943a594e7348a1
diff --git a/media-libs/mlt/files/mlt-7.0.1-cmake-symlink.patch b/media-libs/mlt/files/mlt-7.0.1-cmake-symlink.patch
new file mode 100644
index 000000000000..c36e0c20ab52
--- /dev/null
+++ b/media-libs/mlt/files/mlt-7.0.1-cmake-symlink.patch
@@ -0,0 +1,14 @@
+Fully respect DESTDIR.
+
+https://bugs.gentoo.org/796557#c1
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -436,7 +436,7 @@
+ if(UNIX AND NOT APPLE)
+   install(FILES docs/melt.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 RENAME melt-${MLT_VERSION_MAJOR}.1)
+   install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink melt-${MLT_VERSION_MAJOR}.1 melt.1 \
+-                                WORKING_DIRECTORY ${CMAKE_INSTALL_FULL_MANDIR}/man1)"
++                                WORKING_DIRECTORY \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_MANDIR}/man1)"
+   )
+ endif()
+ 
diff --git a/media-libs/mlt/mlt-7.0.1.ebuild b/media-libs/mlt/mlt-7.0.1.ebuild
new file mode 100644
index 000000000000..c2028151188d
--- /dev/null
+++ b/media-libs/mlt/mlt-7.0.1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit lua python-single-r1 cmake toolchain-funcs
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/"
+SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug ffmpeg frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml"
+# TODO: swig bindings for java perl php tcl
+
+# Needs unpackaged 'kwalify'
+RESTRICT="test"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+#	ruby? ( ${SWIG_DEPEND} )
+BDEPEND="
+	virtual/pkgconfig
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+"
+# rtaudio will use OSS on non linux OSes
+DEPEND="
+	>=media-libs/libebur128-1.2.2:=
+	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gtk? (
+		media-libs/libexif
+		x11-libs/pango
+	)
+	jack? (
+		>=dev-libs/libxml2-2.5
+		media-libs/ladspa-sdk
+		virtual/jack
+	)
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	lua? ( ${LUA_DEPS} )
+	opencv? ( >=media-libs/opencv-4.5.1:= )
+	opengl? ( media-video/movit )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		media-libs/libexif
+		sci-libs/fftw:3.0=
+		x11-libs/libX11
+	)
+	rtaudio? (
+		>=media-libs/rtaudio-4.1.2
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	rubberband? ( media-libs/rubberband )
+	sdl? (
+		media-libs/libsdl2[X,opengl,video]
+		media-libs/sdl2-image
+	)
+	vidstab? ( media-libs/vidstab )
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )"
+#	java? ( >=virtual/jre-1.5 )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	ruby? ( ${RUBY_DEPS} )
+#	sox? ( media-sound/sox )
+#	tcl? ( dev-lang/tcl:0= )
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
+	"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
+	"${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
+	local x
+	for x in python lua; do
+		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/${x}/build || die
+	done
+
+	use python && python_fix_shebang src/swig/python
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DGPL=ON
+		-DGPL3=ON
+		-DBUILD_TESTING=$(usex test)
+		-DMOD_KDENLIVE=ON
+		-DMOD_SDL1=OFF
+		-DMOD_SDL2=$(usex sdl)
+		-DMOD_AVFORMAT=$(usex ffmpeg)
+		# TODO: does anything need plus?
+		# plus or qt
+		#$(use_enable fftw plus)
+		-DMOD_FREI0R=$(usex frei0r)
+		-DMOD_GDK=$(usex gtk)
+		-DMOD_JACKRACK=$(usex jack)
+		-DMOD_RESAMPLE=$(usex libsamplerate)
+		-DMOD_OPENCV=$(usex opencv)
+		-DMOD_MOVIT=$(usex opengl)
+		-DMOD_QT=$(usex qt5)
+		-DMOD_RTAUDIO=$(usex rtaudio)
+		-DMOD_RUBBERBAND=$(usex rubberband)
+		-DMOD_VIDSTAB=$(usex vidstab)
+		-DMOD_XINE=$(usex xine)
+		-DMOD_XML=$(usex xml)
+		-DMOD_SOX=OFF
+	)
+
+	# TODO: We currently have USE=fftw but both Qt and plus require it, removing flag for now.
+	# TODO: rework upstream CMake to allow controlling MMX/SSE/SSE2
+	# TODO: add swig language bindings
+	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
+
+	local swig_lang=()
+	# Not done: java perl php ruby tcl
+	# Handled separately: lua
+	for i in python; do
+		# bug #806484 wrt capitalisation
+		use ${i} && mycmakeargs+=( -DSWIG_${i^^}=ON )
+	done
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use lua; then
+		# Only copy sources now to avoid unnecessary rebuilds
+		lua_copy_sources
+
+		lua_compile() {
+			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
+
+			sed -i -e "s| mlt_wrap.cxx| $(lua_get_CFLAGS) mlt_wrap.cxx|" build || die
+			./build || die
+
+			popd > /dev/null || die
+		}
+		lua_foreach_impl lua_compile
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	#
+	# Install SWIG bindings
+	#
+
+	docinto swig
+
+	if use lua; then
+		lua_install() {
+			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
+
+			exeinto "$(lua_get_cmod_dir)"
+			doexe mlt.so
+
+			popd > /dev/null || die
+		}
+		lua_foreach_impl lua_install
+
+		dodoc "${S}"/src/swig/lua/play.lua
+	fi
+
+	if use python; then
+		dodoc "${S}"/src/swig/python/play.py
+		python_optimize
+	fi
+
+	# Not done: java perl php ruby tcl
+}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 9b7c37ace5bc..8d4ceb855b6f 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -7,6 +7,6 @@ DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e8
 DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
 DIST openexr-3.0.5.tar.gz 25060148 BLAKE2B 24b5601e27342eeff831219f75416797c30afb1ca28ae0a0692d97169297584da503d016c6dda80f63bd5bb9c9a31dc7f91d7713e6fc217a2760af2c662406f0 SHA512 7a0f83320ad5e1d8f8414b5175a64eef3c6b06a7ccd7d66d0aa21472ea22146e2617ff10c20e04203fc2a3326d8bac2d95023bec315badb03e6a006596b64595
 EBUILD openexr-2.5.6.ebuild 1690 BLAKE2B eab42b0f5ce389e642e80fc4a53a3721d883d22332f5e773a86aa19ae85cf0f0002b38e9cc0266f2dc00c1b8aac722957a987e266efbdb304dda674fcc958e9a SHA512 100e7b271952985f3e576aca1965345a7ed5dfbbef070cb22ba1d8907a22de436a57b2eeb2500707c11db1ed2e1179778e75820b651309557ef5d20cc73da87c
-EBUILD openexr-2.5.7.ebuild 2120 BLAKE2B c31fbd571fc53343e733419e90f84ad1648506acb8bd66d87bf239bbe1e22c588c0e0cd906ac43c27f82936e1c42c33e990619655961220e9e7219aaae0d00c1 SHA512 56db8658cde7e044056949d4a4704435ce4f8fea3519e3d1c823f92cd2579d29a2a6c6ca2e3393ced9a77628e36962b35303ef01be06dc491dbcd5eea5ed7b7b
+EBUILD openexr-2.5.7.ebuild 2119 BLAKE2B 2859ee7c6f2e23540602129626218829275be14f45104f4bc3e1c712303cc1d1d1c79e109712a49406a890024bbd346355901e5b0654e75d2fee96c05275437f SHA512 c62b232f81eab0d2ace75e0616f91a04ac926e4e0d83c49b1aa87b489860b5060bd0f61dcf8dfc0e4c5792fcc4a570d8bf720caf0657f9aa234a34cb9cbf34a4
 EBUILD openexr-3.0.5.ebuild 2147 BLAKE2B 4620226043268d73a1e290003849584d46604e42b04e18cf67ed918a41cb376b5951387a485cef227295ee4630d3e137a829081baf7c16ab53d701ec96bac88c SHA512 198c920c8457c94148a9880c7ab4c843bb3cedad6c60b6d42305962e251885ef2ea81c3ef0f584d42f663584832e448e65d6c971bfd2184fc27e77e10683d6dd
 MISC metadata.xml 796 BLAKE2B dacf5230d89550bae31517f5babc9cf7ea99ef94ab223e4acf1abb39d1042d146e71352f4b55a6bebff88689f32efc3d098f5d7ac04a207211f784a9b5e2ed30 SHA512 3deb6a5e83a03fabbbfce2845529a7c2f1aacdc6038ffb4a35ed16bd3f93521ea490ff0fc1576291b5e1d84d19dc4d4123aecf228e270e6b55b01c09ea2a6b56
diff --git a/media-libs/openexr/openexr-2.5.7.ebuild b/media-libs/openexr/openexr-2.5.7.ebuild
index d9bb63b65698..241131a5bc3a 100644
--- a/media-libs/openexr/openexr-2.5.7.ebuild
+++ b/media-libs/openexr/openexr-2.5.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P}/OpenEXR"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index 3ca1736e5524..ff4aabecd62c 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,9 +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 pa_stable_v190700_20210406.tgz 1462695 BLAKE2B 2e00cc0f7bfccf732bd3256b4379007fc1be57282309e36ed54396f6b30621d626c54ff136b259e6594a299bea7689b668df3885321612f7f653697b6895f810 SHA512 77393bf0628ad9c9d5fb1b0d9b1732d403e23513b1332553964bdafcc80878b2798141011d2615688150d753a594285e718cf716e990b2396f1d8dea7babd02d
-DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5
 DIST portaudio-19.07.00-audacity.patch.bz2 2750 BLAKE2B 479cdc76615b60e454a6712c26bd4ac9d9e577f83d4c11a8f3e75c0a1c13ab0a443c91441a57da8cd2b9656649bd53ee0d2e23c23fd788ba7f95c67985b941c6 SHA512 d0e40b5df2b498ce3d9c56b0c7a896cd22ac3dd79b4ab3ebac151a82a824f7e74d62c3848c3ad0f3c499c9d1262b9c1f9cbfc2c5fdd0a5f20e9570357b7670b2
-EBUILD portaudio-19.06.00-r3.ebuild 1686 BLAKE2B 6dce2932001d865f65a4c84eb143666b33f6ffc5205b9e4e5d9a1a3eed980cb849b856600d60f311696751c463494641ce83a766be94738ffbc45720423fcefe SHA512 40d0ffea3bee3e14d09cf05c762a4a9a783817d0128bca890160df9a23012a8eb9770d873bfef6c5eebf00b051fe6719a9bb61068e9328e7e4031a12e1834b72
-EBUILD portaudio-19.07.00-r2.ebuild 1733 BLAKE2B b72a08dc0f2af54176d4a7924a01bc7c0ad2923dc1c11bcd271ebbf229721eaab67c8d9fde92e28ee3b8500bba37d0d61466521f725ee7ae63c58af03b256d6c SHA512 2185eddc45eb0e43b05ed668edc223d14699903b3a5fe93c6a85be169d3a74d507e0883c16aef154d758449e3e8697d1420630b0ae68169b6f85b702516e007a
+EBUILD portaudio-19.07.00-r2.ebuild 1732 BLAKE2B 58de4eb956bcc0ea3e6c0caf57ef8d5211c54be66433768b4888286cb00f0ed4791568b30cccd34a3edc597d50c5a0bf455f73e9fc309f6028d2d1514766b29f SHA512 8ed85452fe0c5b5b2394cc9d23e50bcca06ceafdde38405d961691a3c8002095564908e1c31feadb93c7fbca65dc3ce2b9e7ac646563b7c083bbbb21721e8408
 MISC metadata.xml 337 BLAKE2B 2cb92258419e17576d907f759334b87c17eadf1402a9fbf73bb781602b7c1e73485a3f3c094d4166ec79d7d8b5b4ab10302da160bef0f66fe00abc1d08d9e363 SHA512 032d3d8605d98fb6b1a3c32647ffd15d2d8600be271628f417100b5e5dc9e751e93b3fe0d9b75699f80db127b1baf5eaa37c534af7637d74ebd8fc06cde19ad9
diff --git a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild b/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
deleted file mode 100644
index d19d45237994..000000000000
--- a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A free, cross-platform, open-source, audio I/O library"
-HOMEPAGE="http://www.portaudio.com/"
-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 -> ${PN}-19.06.00-audacity-portmixer.patch"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alsa +cxx debug doc jack oss static-libs"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}"
-
-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() {
-	default
-
-	eautoconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable debug debug-output)
-		$(use_enable cxx)
-		$(use_enable static-libs static)
-		$(use_with alsa)
-		$(use_with jack)
-		$(use_with oss)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	# workaround parallel build issue
-	emake lib/libportaudio.la
-	emake
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_install_all() {
-	default
-
-	use doc && dodoc -r doc/html
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/portaudio/portaudio-19.07.00-r2.ebuild b/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
index ea0764f96597..33588f85e80d 100644
--- a/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
+++ b/media-libs/portaudio/portaudio-19.07.00-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alsa +cxx debug doc jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index c0c6f98b532f..1061e7380f83 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -2,6 +2,5 @@ AUX 0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch 1197 BLAKE2B
 AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd9db6e89225fcd8cf4c1eed24dff7bb5348d7a0985633a7f9173a5279b04ec277ad0f775a18c52ae33af86b6522a21a3e63123d162d SHA512 28e3137592c14dcf9fc1d8401e6bc58af7f1abcab4886acde42a03dd7b61aa9b176672300951f7b4fcdf5128ce445f12594f7a09444331d1d6c34aaa7a4b9cfc
 AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
-EBUILD raptor-2.0.15-r3.ebuild 1713 BLAKE2B 9c61a997c410dc4600384ec53b8995ea4782dd2169179c49073b0812953ef399a9ce360b8b6c4d626aae7351e80d50763abe76ea2c85eb9c482bbef04817ec6b SHA512 bb56a414bd06bcf3ee8a656e87e1e7171e2e7fd4bf3c690995d97e3aedd7a99418083f19a0ab2da8772ea6d985a888757e8ba393d02a1c9298c1eaabd7f06ad5
-EBUILD raptor-2.0.15-r4.ebuild 1881 BLAKE2B 664cab272ace46c9e3bbfd63599fda487fd80f30f5fed914a8e701a1ff69cd8eec3b5487c277b9aee03329b64fe710deec18698e424f0ef74c40c7c2a044836f SHA512 c3fb47567f101ef6a916739f18743fb9975499a2fec0f360888686d1036c1b9653ca247086bd74ad3c19e88313549ed080354bb80d6f8cc46ee276d22d838094
+EBUILD raptor-2.0.15-r4.ebuild 1880 BLAKE2B 9af0525af3655fc0ff8f22df2aab20b640e29c9b15fb1f8e56261170e8733ccd7d73335442ac1ed80324b09e46dafd7fa5119c4b6f8a49ce72e925a874f42f84 SHA512 b2e484378154b24f902231c5a6b6fae38a6bd8c464027facfede582d4c38b8baa6372c7a7dc485d879d4f52a83c3c712c63148d12f3d7e864af0527a1bb9677f
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r3.ebuild b/media-libs/raptor/raptor-2.0.15-r3.ebuild
deleted file mode 100644
index 1f3f7e84c669..000000000000
--- a/media-libs/raptor/raptor-2.0.15-r3.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 libtool
-
-MY_PN=${PN}2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="The RDF Parser Toolkit"
-HOMEPAGE="http://librdf.org/raptor/"
-SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+curl debug json static-libs unicode"
-
-DEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	curl? ( net-misc/curl )
-	json? ( dev-libs/yajl )
-	unicode? ( dev-libs/icu:= )
-"
-RDEPEND="${DEPEND}
-	!media-libs/raptor:0
-"
-BDEPEND="
-	>=sys-devel/bison-3
-	>=sys-devel/flex-2.5.36
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
-HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html )
-
-PATCHES=(
-	"${FILESDIR}/${P}-heap-overflow.patch"
-	"${FILESDIR}/${P}-dont_use_curl-config.patch" #552474
-	"${FILESDIR}/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf #552474
-	elibtoolize # Keep this for ~*-fbsd
-}
-
-src_configure() {
-	# FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn!
-
-	local myeconfargs=(
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
-		$(usex curl --with-www=curl --with-www=xml)
-		$(use_enable debug)
-		$(use_with json yajl)
-		$(use_enable static-libs static)
-		$(usex unicode --with-icu-config="${EPREFIX}"/usr/bin/icu-config '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/raptor/raptor-2.0.15-r4.ebuild b/media-libs/raptor/raptor-2.0.15-r4.ebuild
index 3917c369d040..da9e0385ac9f 100644
--- a/media-libs/raptor/raptor-2.0.15-r4.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/rnnoise/Manifest b/media-libs/rnnoise/Manifest
index 0ac808b81e87..5044549476bc 100644
--- a/media-libs/rnnoise/Manifest
+++ b/media-libs/rnnoise/Manifest
@@ -1,3 +1,3 @@
 DIST rnnoise-0.4.1_p20210122.tar.gz 173787 BLAKE2B 33ecee81eb54a00e89c6fc0a2c9a3c66250c853cbef420f6b1fc9f7141b3b9862fe34fb31951de407c8912e940ac7e9917f68cb649261117d729b7b380d3476c SHA512 7d16f7d68a0a28ecdaaea098df5482d55adf7948292cab8ed78ae5cc6652ebdfc48e623f193ee356fcf527e54883e9d3938195f2fd52c20dff895fd2515617f3
-EBUILD rnnoise-0.4.1_p20210122.ebuild 944 BLAKE2B 7ec07028a5477c3a3f478c544fb6ec140f00db254c7dbc178f73746d25f246f7227db0d36d0580d47e9943ebb966e5f95f4a7dda0cc976c59a9d2dae0418da60 SHA512 7106750dcab80d1121a94f75cf90c323a408cbb6cda3d42e96ca9cf9bdd1699943fec3d8454716bc0c6a50287d13df25365d0ecac4dc9ac71d0837dc35f0cf61
+EBUILD rnnoise-0.4.1_p20210122.ebuild 943 BLAKE2B 7bec7e530a6436403d81c4dc1de1d81a20abb44b5abf4cff7592f66ae99d3ab5d2ae7d39f7deced1dca2a817efade6c7b485f670140b985a4e35d375993ba1a2 SHA512 5b4f4aa4a3e4b8b6f85be2227f2e13daad9c299ea34126ac47a8a83b8afdb4b87fe9c16b4aa1911f005fbb445b2a45091b6ee42cfbc3e6c1796b05b4c3ef4308
 MISC metadata.xml 409 BLAKE2B 1d4ff3a79885150e6c29f8eda10d9ded0bebf9635033a3e76bbda7f223767cac0627599537faeb2827e8424fa3791eae0244ac1033486900c0bfbf3448f14b79 SHA512 cd254c020f0e32e28d91bf1d404ccb631e837962f9fcbfddb0cea4a0e54d82076d90eea987f3bcdcd9e689fbafe069ee671005f8edf6b8acf45d8ba99a18eae2
diff --git a/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild b/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
index 0397c02dfbc5..0638152a8640 100644
--- a/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
+++ b/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="doc"
 # NOTE: Documentation currently empty (version 0.4.1_p20210122)
 
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 4753b0fe4c83..91fb59cd4a6a 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -4,5 +4,5 @@ DIST shaderc-2020.6_pre20210327.tar.gz 220258 BLAKE2B 5f3321d7bea0a39bec865cf3c6
 DIST shaderc-2021.0.tar.gz 220308 BLAKE2B 7178b99ce726f73e4eee2eb1b81b9575cf5a97a1d29bf0ed6a64ffde1095f91e14ae2c7f62d21f33bf2f7551e94b6d3e3c8fd149446899276a67d7df33a8e679 SHA512 cec230949f98589eef2532b02048e3d1b4a2c07ceff1043bfe5b30cdbd3511cdfcbb625cc115d9cfa52252b20a486e146db7e2e1944d89f9371811d64f9f675c
 EBUILD shaderc-2020.5_pre20201216.ebuild 2155 BLAKE2B b9a0a6025f0c9e3a2b0ef62507691774030e3c231d8bad678aeed53597bd20de3ee4410f858c44ec5503b6b37d5fe542a3ffc57e3665beea30cc909a48d9f01b SHA512 61eaaff97c665286998865ebb1b85287b37b07ef04b0c813d58d2cc0c7519d6ae09f47ed08cf7fd8173c95fba777e17a9bc8a1c334f71f5a32d1f3b05c52765b
 EBUILD shaderc-2020.6_pre20210327.ebuild 2164 BLAKE2B a1ce8d176c93ac883ce5e1992786a40db675c550bfd9356fa4c2c4c7b58f7e0f8fff7ae9890a58b49e9288f67913f3b43669d3a2936f64b29a2c6ce4e62cbce0 SHA512 197e4e7e5f67e8e0d56359d87f4a695d77720a3ca48710420441488a497670cb0091d259cd0420639e46c4e236da837c955826c7fd86d8f41d9ac741f723bcc9
-EBUILD shaderc-2021.0.ebuild 2155 BLAKE2B 0923a326dbb4ade19457254aebb3d245e48c0121675c93cd637e696e88313200bd4b863280fba80da6b3784b1ac06dc0107767399ed2fab162058247a5765418 SHA512 f2a5b2b1c698b42f1cc133dc5c1b3706a49aae36b757f6e8ae2297aece4719d4dc2e44caedaf5309692bcc0f75fc417b1e0c817e29fb657f1b8c5f3d5eac48e9
+EBUILD shaderc-2021.0.ebuild 2152 BLAKE2B a3d9bd6c67b5cc94e30ca130b6b74f565a24544e6678ee05ece37d1c2a958c8159e8d2585c07f1dd1e88e8419fe1b3b4f9faaee1375641a6e9aa4b51e61ff0de SHA512 39bf17ef5ad6c7830bfd92e508cbc0b852fa8cfea649540b2a0657ba6e9a84c75ae5a8b33ff6230527b21738bcbc7cb4ddc1bb1dbe525a8f0d12d84a758927b3
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/shaderc-2021.0.ebuild b/media-libs/shaderc/shaderc-2021.0.ebuild
index 0cd81867acc0..fda813225084 100644
--- a/media-libs/shaderc/shaderc-2021.0.ebuild
+++ b/media-libs/shaderc/shaderc-2021.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index 84aee896b490..260cdc2547ad 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -1,16 +1,17 @@
-AUX smpeg-0.4.4-PIC.patch 9472 BLAKE2B 4b628b59cd0be9ce59194baae5b093fa3b371674ce837d244d4d48efaabf547cfa421c4918cecb8bea2bfd8f9191a8ac5929c391f66d47a38cfb5c3aee88e809 SHA512 39e86f3a227a350bbb2f039d30a44820a63abc6041db906dad7920aec59e822b9a0aa9f0a37b9a1cc055f33aca94bd7d206c7a4c85aecc97974d2c4a5a4463aa
-AUX smpeg-0.4.4-automake.patch 320 BLAKE2B 52477eed96ac6a165ffeffc376f7f9eb3c8bf5da6b55add93beba619e48884e826d61b53dafe6b53f195b1241f54b531edb3d81b406c73bec6b2b2c7d391f3f1 SHA512 ad3ecd69f03c9ea5e746036d56103adcab9d28be0ff40b038b26e6b2cac41d3d05dc0c5dcf09612eca5a805711405aeb33547bdd7f8128782a848dec67b5dea4
-AUX smpeg-0.4.4-config.patch 472 BLAKE2B 957c0baebe62775c030140cd1752188085b7f32b486d606e4d15cad10ca3599d191fee357416712b240f833f3fa456adcebc8fcee150b43b86912a5db39dbbe9 SHA512 f50aa1246d02d209d75d9597f6c5141d3778fadae334ce3e63bccc680caa7fcfacbb637e2754ea91a0e9163768ed8b3e7bf06338d91b91886253b9b63a1a60a2
-AUX smpeg-0.4.4-flags.patch 4576 BLAKE2B 0afc6b8e882dd33ef239dedef2b5e4c3b47af64b9c544f28b238ce8701928a284f3bf4a52fc20eeaa5c3cdd386641c931cf111320864fcbb8007e2fa26ad6697 SHA512 bee56aff1549e6e15d2bef432588682d1fee868fca77385f31e4b194853128201982bb0f678faae9c2b2f1e678919a5564c460af44d3c59ffd4b884bec3550b4
-AUX smpeg-0.4.4-format.patch 284 BLAKE2B 420b78b83d7324d3d50a76572a6eddf93c3a0feb4b3f3459045f7d08c801c0acc217f8194421898a6ac38489c308a7d88172a6a2cd09553505fc197b99137189 SHA512 8d276bb7b3070eb1a87f29f27faed7df23479e5d7938a1b8764f2f229956f64e2255a312410bc37d408ea7a46c4e606a730f59a95b96deb1643a7bbd896b121b
-AUX smpeg-0.4.4-gcc41.patch 1390 BLAKE2B 9f00ef0a80574f029410e22a2de11ec08483c20f3865f61e701080c2f9f64c81538d05dcc110757211aaceb2b51d1a8e6ac4010c3a18cb39e2e7451385127956 SHA512 8d905c0bb5c973979295f8814577c205aed20bf5ee32caa77be5bb66d6653c0a4327be0ef5ede1dd62966d02b68eab2ff06d0c52c98e7667cbd0a04bc243455e
-AUX smpeg-0.4.4-gcc6.patch 893 BLAKE2B 002426a2450a0410f339190fa5b960c5a4e8d9b8a1efc90b308d1314a366e1de18733c43f69c11f4021a1633a455753f2909358e73b86221d3fd5a96b06d857b SHA512 13e5bf10ed81357f06567aec319571f068f63ac4fc0606c8d21f7ed45966ec072182ad30409a0d4f9f5d82bd4f9c7414c793049ec641dcc2a8de270f31d41f78
+AUX smpeg-0.4.4-PIC.patch 9480 BLAKE2B d916b5a6f0c9ebb8806ea66e246687b33b2583441ae6885ab7f04d0cf3979fad87d7fc7171816e8f8bde66d34908ce1a91703910d9b2340ff312ea42323ec765 SHA512 b39d3a66de3dd98bd364b9bac624a0146481fe6d2d850eeaa991ec64b3ee3f18db944ee16ba7f315782f45e3d6dc27b927023f5d5a1a611ae4d15baefdd6f79d
+AUX smpeg-0.4.4-automake.patch 220 BLAKE2B eb3c2ffe20480c37bbf281b82c991f3d19c0ed8260a97c68b067b6c9d6e9acee2db7b24e21b22cb72835efc7cf83ca49168e012bfb8009735356be2370703ee0 SHA512 213f56dd0dacb52772e109f9cceb4e11491bbe4f277a0c72a85f85b4f0968474de080ca0d6dbdf28265dee0a0b08996ee47894167208a8c7455cbeb60e793bd4
+AUX smpeg-0.4.4-config.patch 476 BLAKE2B e676811a0e2dcfa44035eed04f300fff5fcad0075d3cce7f036db8746409e5b9b3065aba9d18400c72b5cd2912273b717d77d380bd63e9c2700ac940b21dbc09 SHA512 a100ef8904f519e940ca585869f4b5b3768e2b09a13d00b428906fd107a69ba74cdb7a5341a38f94af8a78a7e8315e59634d58ec7a72c9a9bdd0905c3205adfc
+AUX smpeg-0.4.4-flags.patch 4476 BLAKE2B 9f447fe75f7f310577c8b2d2e5e293a4c29506f6e74a67bffc9d0060a6ac7832bc22a1bc53b199f0216b9f477f010266abf29232ef744a85ec132878f17c3b86 SHA512 f02937de6a83cca826fb51ca853664ee35860d491bc58ddc9da1545cda2499eec3d5c96e1083cf7f23fe412ecb162f9c5b40b07aeb3cc14af5bb8c15285617b7
+AUX smpeg-0.4.4-format.patch 212 BLAKE2B 053b9461f634f4d3a989e22ea2f9f8258bede20c1c724c7d1f0c85436b9d31b841ffc75c76312dff1875d50e2f6e30caeec3a32cecf7316965676e6414e83cf4 SHA512 2918698768640715247f57e3ec4cfa13ed30f555cb86ceec42ed8910a40e79fb48cd0a736d5f5a39cdcf73f8aa546e398632e4916cd4cca9c4884e0d69664f7f
+AUX smpeg-0.4.4-gcc41.patch 1147 BLAKE2B 0fba7167fe330862f32120e5f519d1bd76bc6306419b7acad30eabd4924c0e4e994c60b41e8f1199c130fa6ff9b670e9eab39c3dc3a700cbfaaaae5e4e21a48a SHA512 0e50e88bc2fd8a9f869a43ec6ec4dac1bf61f931fb0c57c2830af5011d6ffe16fa6bb1ce13b7ace9572217b8d83e5f1359b61fda357290411f89ef6fa898adab
+AUX smpeg-0.4.4-gcc6.patch 821 BLAKE2B aa08bf63d1054cef1a68d88c5ea50109e664ade22810e8cdcad8b170c9d5ea13f1edfa9accf6793b8180e790071ab3e945c523f39854396a4bd21584f8657d57 SHA512 06163946f43674116894ad340a0c3ab75038c4e30ebed38474eda8fe4877f73751e142a41b80c68bf36ebd371e1471937f156c97a08acda8958c68194ca1541d
 AUX smpeg-0.4.4-gnu-stack.patch 955 BLAKE2B e307a7f9c652599f8331b09e35d8b0870d323b3241228cf147889cd489e11b5834d413ef78102593a08b5e6cc36e05dd882ba29d69c911a4794caa3022992eb7 SHA512 5f01ab8ed666deb8fd874c088af910e96b237aa9203e8a9aaf685c8ebe9bcabd9d3ec049fb29e2b55a3e981372de6ed490c06b7cc5d512999d75179ef68c4c94
 AUX smpeg-0.4.4-m4.patch 233 BLAKE2B eb185ba994b1477744072f785deb9144e1f82836afeeb468596fddc5d00db4fb225c08cd1ef01c207c13b9856e0f2cc2af812b11c0ce25923835b4e1f0a07357 SHA512 e5995f87fffbc8ff09953294568dc779f16a2a8d57b7266dd7787734dde4ad6b2c0d447917b508db095d83c50c933052b938e28fe160a9f04ba869d007b02c80
-AUX smpeg-0.4.4-malloc.patch 640 BLAKE2B 458ef7a27cba2ca6e9ddf14f296a7a08f639c40e99df667050201b49994fc31c244995d0474fa52d909111e8a02383d1a2d86f4daffc5baecc3cb92628540715 SHA512 56594c9cc516f8dae5cd487f259116bcbc0d770e33867324b477d6b342a27c671ce9c4c0c4305d5bdd0bb677c1d6e7ae4c20ced516bb3b84af59708dbcd61316
-AUX smpeg-0.4.4-missing-init.patch 266 BLAKE2B 6476eed877a31ff26ff83936e137da8d9d8be23aed9ec81aded49b2806ccc7f84ff47d3157f5b3de8009d8ac9eabb3ad80b59d3cfd385bf4f3350a779002352d SHA512 7aa97924cbd6ccb599190599055ed715a72ea1595d7d2949e9babdeb3315b1bd8fa09e392c6d2d8b2eff96d72593333b8ab780f327c766345ee75b4220f8ee58
-AUX smpeg-0.4.4-mmx.patch 352 BLAKE2B 02e060104c7fa0a817a9929c8a9911b24dd1ae131b26939edc7a1ac752a181e1db3cd0539d33d1548d1766f0a9ca2ecac31f6d0408711f54f04e6ed9ca5a35c5 SHA512 f83a04a6a8edb008dee9b76d96ad45b76e8ffcbb3086e6d97b64ee05ad400778bab97890811548274521504f502a904bc2f13598dfca33a872e6fb8800c0d974
+AUX smpeg-0.4.4-malloc.patch 441 BLAKE2B 1c1f6d54964876bb62b80e86dc51c177e3848dca7ae72e421cc2fbb3947f775390bc99d9042d90990270b3399c48cb003133bd39fd7db7dba0dfdb6455064525 SHA512 6df4fa28c0888322127aeee13a8acea4245a8cb9264319bf201e98750c1953cd2cd6c0dbcfba78e13e225a45ae5d8510ba251e7cbf96026a0b99b0970ed9521a
+AUX smpeg-0.4.4-missing-init.patch 194 BLAKE2B 38082e5d0ebfeb085e1c54ebfa9fa706f0031d2b2f3c062dca2f4b00645b16b5f1993c6ba1494f6cce74abd63a568ef1e8732def1a81c97a54b6b93e8c275edf SHA512 96dc6b65dc4309fb199cf72598cdcd00b67b5d8152b1f65aded9b9496bbffaa23046161f7814752c488cecd81c2fea086c371a5fc5e35675aefb710f8fc7de21
+AUX smpeg-0.4.4-mmx.patch 252 BLAKE2B f5d0761bb38c021996eb19b534122d8fd9e697c5ee8005169494b82f0ae76cdb78b2476a7c6a8115c19fddf6b39d50ab5d01e9b671d31524b704665c00174c08 SHA512 c393fed067e09a9f22311e6b7b87851026f5416cad9c82d0f82428251de76ad0c15456c36d0895143fdc4ad47ad97ae210e7f83b19cf00f9a93147043896db67
 DIST smpeg-0.4.4-gtkm4.patch.bz2 3894 BLAKE2B 0ea9258a057108a462d9c4b9d9bcb21cdff71714507a3d09538f56817b206ec54681b3d2546b64c07f239ea3381f3644d26234853a239a2fe49353ba1c9b2759 SHA512 30370e0edd41767ce260d10de515be0087f47b479ec0085ec186506c93be0b2a404c1bcb1626f9a6a1f575160d9c382708d2769dddfe6dca6236fe0eaa58602d
 DIST smpeg-0.4.4.tar.gz 315054 BLAKE2B 16a7b87a207874deaaad64b5233964d4b0e244d35cc475cf0ed37302529ca4eb044393777fc98c202b5965de420f75bc5fb398ecc3eb0f97992d90e365f8a039 SHA512 d566bb68b0caacecdf61cd766b26e003fd4e153c243d873f7aae33ab69919202bd121bb9c10f494bd9530267ddec2a9e018eb46ee8bb9d502a29cd2de2f1bbfb
 EBUILD smpeg-0.4.4-r10.ebuild 2079 BLAKE2B 93b766c2825d23e4624d1cd8e9c6af891bc0f59d8d007609e311a5e67871f97f790da9dda29010d469e03da60bb103622ba5bccc32b6a4bdf5df9fa48729076c SHA512 36dcdbbbb3c40c987320b7639b50d5ddcb120b5286bad751e2bb16f198530ee002739b9527b5fa9463de474028d824f4f2d1e046548e4dee65e6b7cbaf937c7f
+EBUILD smpeg-0.4.4-r11.ebuild 1705 BLAKE2B 3975d6a5b57cc25ebb469b5cabd5f44ffbebe228cb45a1d3925cbbd70b9391a6d8194eb71bf829b31ac6a1466ebe594dada3b6fc4709007f7311b214e68b2750 SHA512 4450f327c620ddcab539250b4bbd3416bd482f9afdb55a04e93e5e5fd5272c7efd4425da8c8bca09b8a714297963d1be749008a196d00983a1217b2415fc665a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-PIC.patch b/media-libs/smpeg/files/smpeg-0.4.4-PIC.patch
index 88663011713b..b7ef6609cf28 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-PIC.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-PIC.patch
@@ -1,7 +1,7 @@
 Fix PIC issues in mmx routines
 
---- video/mmxflags_asm.S
-+++ video/mmxflags_asm.S
+--- a/video/mmxflags_asm.S
++++ b/video/mmxflags_asm.S
 @@ -1,11 +1,6 @@
  
  #if defined(i386) && defined(USE_MMX)
@@ -34,8 +34,8 @@ Fix PIC issues in mmx routines
  
  cpu_flags.L1: 
          ret
---- video/mmxidct_asm.S
-+++ video/mmxidct_asm.S
+--- a/video/mmxidct_asm.S
++++ b/video/mmxidct_asm.S
 @@ -31,11 +31,6 @@ preSC:  .short  16384,22725,21407,19266,
  x0005000200010001:
  	.long	0x00010001,0x00050002
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-automake.patch b/media-libs/smpeg/files/smpeg-0.4.4-automake.patch
index e541e1950113..3ad592e709ad 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-automake.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-automake.patch
@@ -1,5 +1,3 @@
-Index: smpeg-0.4.4/configure.in
-===================================================================
 --- smpeg-0.4.4.orig/configure.in
 +++ smpeg-0.4.4/configure.in
 @@ -53,6 +53,8 @@ AC_LIBTOOL_WIN32_DLL
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-config.patch b/media-libs/smpeg/files/smpeg-0.4.4-config.patch
index 2175276c351f..1a4726bdbfad 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-config.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-config.patch
@@ -1,7 +1,7 @@
 Only dump -L/-rpath if libdir is non-standard
 
---- smpeg-config.in
-+++ smpeg-config.in
+--- a/smpeg-config.in
++++ b/smpeg-config.in
 @@ -45,11 +45,13 @@
        echo $includes -I@includedir@/smpeg `@SDL_CONFIG@ --cflags`
        ;;
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-flags.patch b/media-libs/smpeg/files/smpeg-0.4.4-flags.patch
index d6b50f30d1bf..98099421769e 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-flags.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-flags.patch
@@ -1,5 +1,3 @@
-Index: smpeg-0.4.4/configure.in
-===================================================================
 --- smpeg-0.4.4.orig/configure.in
 +++ smpeg-0.4.4/configure.in
 @@ -60,7 +60,7 @@ dnl The alpha architecture needs special
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-format.patch b/media-libs/smpeg/files/smpeg-0.4.4-format.patch
index 8503f032286a..c82260a8967d 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-format.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-format.patch
@@ -1,5 +1,5 @@
---- plaympeg.c.old	2014-09-04 08:55:10.646132150 +0200
-+++ plaympeg.c	2014-09-04 08:56:57.465210820 +0200
+--- a/plaympeg.c
++++ b/plaympeg.c
 @@ -262,7 +262,7 @@
        answer[i] = c;
      }
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-gcc41.patch b/media-libs/smpeg/files/smpeg-0.4.4-gcc41.patch
index 4a0eeb4530ae..d06b08ce8945 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-gcc41.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-gcc41.patch
@@ -1,10 +1,5 @@
-Index: MPEGaudio.h
-===================================================================
-RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v
-retrieving revision 1.23
-diff -u -p -r1.23 MPEGaudio.h
---- smpeg/MPEGaudio.h	17 Jul 2001 19:52:24 -0000	1.23
-+++ smpeg/MPEGaudio.h	6 Dec 2005 06:10:43 -0000
+--- smpeg/MPEGaudio.h
++++ smpeg/MPEGaudio.h
 @@ -151,12 +151,6 @@ private:
  /* The actual MPEG audio class */
  class MPEGaudio : public MPEGerror, public MPEGaudioaction {
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-gcc6.patch b/media-libs/smpeg/files/smpeg-0.4.4-gcc6.patch
index 4419bec4e2ee..f4c4a2b6d9cb 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-gcc6.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-gcc6.patch
@@ -1,5 +1,5 @@
---- smpeg-0.4.4/audio/huffmantable.cpp.old	2016-09-21 17:28:34.497031221 -0400
-+++ smpeg-0.4.4/audio/huffmantable.cpp	2016-09-21 17:30:24.346141555 -0400
+--- smpeg-0.4.4/audio/huffmantable.cpp.old
++++ smpeg-0.4.4/audio/huffmantable.cpp
 @@ -550,11 +550,11 @@
  
  const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch b/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch
index be54e58b4d23..c4939e36e939 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch
@@ -1,5 +1,3 @@
-Index: smpeg-0.4.4/glmovie.c
-===================================================================
 --- smpeg-0.4.4.orig/glmovie.c
 +++ smpeg-0.4.4/glmovie.c
 @@ -6,7 +6,6 @@
@@ -10,8 +8,6 @@ Index: smpeg-0.4.4/glmovie.c
  #include <string.h>
  #include <unistd.h>
  #include "glmovie.h"
-Index: smpeg-0.4.4/glmovie-tile.c
-===================================================================
 --- smpeg-0.4.4.orig/glmovie-tile.c
 +++ smpeg-0.4.4/glmovie-tile.c
 @@ -16,7 +16,7 @@
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch b/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch
index 594c5546ebf7..62f260094440 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch
@@ -1,5 +1,5 @@
---- MPEG_old.cpp	2007-01-07 23:24:45.000000000 +0100
-+++ MPEG.cpp	2007-01-07 23:25:11.000000000 +0100
+--- a/MPEG.cpp
++++ b/MPEG.cpp
 @@ -133,6 +133,7 @@
      video = NULL;
      system = NULL;
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-mmx.patch b/media-libs/smpeg/files/smpeg-0.4.4-mmx.patch
index 71db62d055b4..fb0fdc89a476 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-mmx.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-mmx.patch
@@ -1,5 +1,3 @@
-Index: smpeg-0.4.4/configure.in
-===================================================================
 --- smpeg-0.4.4.orig/configure.in
 +++ smpeg-0.4.4/configure.in
 @@ -148,6 +148,7 @@ if test x$enable_mmx = xyes; then
diff --git a/media-libs/smpeg/smpeg-0.4.4-r11.ebuild b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
new file mode 100644
index 000000000000..e79dae9392a0
--- /dev/null
+++ b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="SDL MPEG Player Library"
+HOMEPAGE="https://icculus.org/smpeg/"
+SRC_URI="https://mirrors.dotsrc.org/lokigames/open-source/smpeg/${P}.tar.gz
+	mirror://gentoo/${P}-gtkm4.patch.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cpu_flags_x86_mmx opengl"
+
+RDEPEND="
+	media-libs/libsdl[opengl?,sound,video,${MULTILIB_USEDEP}]
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-automake.patch
+	"${FILESDIR}"/${P}-config.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-gnu-stack.patch
+	"${FILESDIR}"/${P}-m4.patch
+	"${FILESDIR}"/${P}-malloc.patch
+	"${FILESDIR}"/${P}-missing-init.patch
+	"${FILESDIR}"/${P}-mmx.patch
+	"${FILESDIR}"/${P}-PIC.patch
+	"${WORKDIR}"/${P}-gtkm4.patch
+)
+
+src_prepare() {
+	default
+
+	rm acinclude.m4 || die
+	AT_M4DIR="m4" eautoreconf
+}
+
+multilib_src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lnsl -lsocket
+
+	local myeconfargs=(
+		--disable-gtk-player
+		--enable-debug # disabling this only passes extra optimizations
+		--without-x # does not actually use X, only causes a headers check
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable opengl opengl-player)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/smpeg2/Manifest b/media-libs/smpeg2/Manifest
index 24370ad8fc9a..0e1b7705c902 100644
--- a/media-libs/smpeg2/Manifest
+++ b/media-libs/smpeg2/Manifest
@@ -1,5 +1,6 @@
-AUX smpeg2-2.0.0-gcc6.patch 857 BLAKE2B b0e94293db4d4b2389ea6d75c8f958e36a8f503c552bc2255f3169c6d647b839ae4612a7e94f7763b5ccda29d14f0cee00ddb98697f34ec23c4340c03153acf4 SHA512 506a9aa8714927466dcef913d566b1acdd705e3eb8bb8d4e8bfe103428af9a7fc16e71a79ff126328c36a76c6cd2fd727804f5de1c3ae00bd0a7a82aa3a1dfc7
+AUX smpeg2-2.0.0-gcc6.patch 772 BLAKE2B b4eece6aee658b484b65856dfb851c1560af589825b8c99ed387f4a938d607f0c62d801373feee112d7226fa052fea8fbfdcde80c34f961cb66a26b198040ade SHA512 96681218f04db64414a8bc014260686f96817b914bb17f83865a2babc6f476069b12eea71b1b0956edbb3b7e4c776d6de7ebf2f4c87206146a4f2b031d5a9ed4
 AUX smpeg2-2.0.0-smpeg2-config.patch 1022 BLAKE2B a7b81a5c3f5ae886d1ec6e17011b602f25d568f4b781abb0608378ff000e3ce3cbad873fdf4da6d99853c603d83ef07516b19eca68e47ec3b694fdd99da071fa SHA512 1f91228f9e00bd60d2a8cbb04f0d9b9a5fbd4b5a53ded9547ae1d577afa12388b43a662e4c4e15e6b12f4007bd800c4e49b9c88812aef0ecec71a4c666686b05
 DIST smpeg-2.0.0.tar.bz2 311846 BLAKE2B 311de560d367d718eab4e014d4ea196f7bcb4d3e58b8a4002d81f63b76809530dc81a32a4f1163bb5003810fa3cc7257e3b8f94396acca580ac88d619fecfe11 SHA512 3a58ea6a47224b112390c3fe83e5bd59a852a8828ee9b0451d389e3d193499fd3dfb2344abe4d1379248c4fb197e78ee22c6cfb653a2e32e339c030826c06950
 EBUILD smpeg2-2.0.0-r3.ebuild 1351 BLAKE2B d9bbba882d9e765495ce653ed2cb37023f7abe1088c1dcd8e5b19f9b168de0dfb362f3a70062324058a076c7ac89d7008c086f117d305b2e46e1a51bd1199851 SHA512 7e57e72f115bc2d2f779b0dbf41d240577ffb0ec637a65245fc6cdb0b7ae2511252e052424a7bdf5f354f3a12a84b0fb16f313c6c4bddecd0fe826cbde873644
+EBUILD smpeg2-2.0.0-r4.ebuild 1131 BLAKE2B 703aaf59c86bd5140dda05b0b869b7e954198dcf0a160b43e73f0a0292188d4f3bafb0e921375857716c9eebd4ffe14218d77cd3d70444dffa6a163fe33ad332 SHA512 30364d9e187038465dce5b1b14b42e8cba82a4b09862865e6d76594bd625bf96398a000e006d8163940efad1e22eb4852b7e28bf11e76fc28db1caca5c0c6023
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch b/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch
index 4094c61ba432..943b7ed552d9 100644
--- a/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch
+++ b/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch
@@ -2,8 +2,6 @@ gcc-6 is more strict WRT narrowing:
 error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned int’ inside { } [-Wnarrowing]
 
 https://bugs.gentoo.org/594912
-diff --git a/audio/hufftable.cpp b/audio/hufftable.cpp
-index 6bc8e86..5414ae3 100644
 --- a/audio/hufftable.cpp
 +++ b/audio/hufftable.cpp
 @@ -552,3 +552,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
new file mode 100644
index 000000000000..fc1598ddc4aa
--- /dev/null
+++ b/media-libs/smpeg2/smpeg2-2.0.0-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+MY_P="smpeg-${PV}"
+
+DESCRIPTION="SDL MPEG Player Library"
+HOMEPAGE="https://icculus.org/smpeg/"
+SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_mmx"
+
+DEPEND="media-libs/libsdl2[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-smpeg2-config.patch
+)
+
+src_prepare() {
+	default
+
+	# avoid file collision with media-libs/smpeg
+	sed -i -e '/plaympeg/d' Makefile.am || die
+
+	AT_M4DIR="${ESYSROOT}/usr/share/aclocal acinclude" eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-rpath
+		--disable-sdltest
+		--enable-debug # disabling this only passes extra optimizations
+		$(use_enable cpu_flags_x86_mmx mmx)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index 9cbdf6346521..bd7797172799 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -1,5 +1,5 @@
 AUX svt-av1-0.8.6-fix-c-only-build.patch 5078 BLAKE2B c26a13dba8ac62ec2951d43d1419d6cacebbbb185841636845fb20a6aecb1c6fe4cabc1ab53748c3df0a4b2fcb8e25ff7b63447c486655fc8ec23144ed8388d4 SHA512 41f3c400bc6ff0c8df529cc5db125538367bc36468bc000936e76f58bfaff15d3fbf322ec2705ac20281753273ab834a1691e7852ede6baaec003b1d46285e1f
 DIST svt-av1-0.8.6.tar.gz 6416120 BLAKE2B c30d3bfc2dba6d7964625c4505bb135aa335adf195df91ad058fb02496276cabdc651b09854a2d14136352a434e08f4974148e03e7d54bde0924d25a1c4524cd SHA512 07e7353e35bc581b23c71913e65f5fd27566f4bf1d317d474d57d5bb2b82f380f713a00be19bd3f703935da50f81f3abf1d4ae38fbdf253385edf423737c0543
-EBUILD svt-av1-0.8.6.ebuild 1184 BLAKE2B f3ed01e5b0afd5a8651a70d39c379c821da594d8ee20c4eebe2a86a0dc9b6a5832f43bd4883be8af8a04f323b5d39677f9fc3eb711a4682ae9e9ae4528582229 SHA512 502d049655a4ba6b20e83bcb93cfdf5ddae75ff3ea18ae375d896eb62a825e4da3d2ca16e63d5e839293daadbde6d95c5a6a355f0224d01a9a5ab34761ee04f4
+EBUILD svt-av1-0.8.6.ebuild 1191 BLAKE2B 6b0b88fa8b2a1b1dd2510769e0858abe1c468426ee6710f9b42f1850295e86ad8804d95cfc02574adb525f143c61331cb30c60ac87d2aa406057883815dfa46c SHA512 be80ee02629c09ac967f5c371f928e10ba45e2153fab5979027cb3e3a7d99b0cd1f104c3c7814a45beb6f78f8129a99c9799e3377b9c98939b27ed47a60c0079
 EBUILD svt-av1-9999.ebuild 1090 BLAKE2B 130f31f96ac34ec20e237ff7134f09132b98795aaf1a4c94f3e4d12789e21599a8128fbbc12f94903cc9699de97cf769585f891917d32864a63fe2f0af873922 SHA512 0d40431b5fe9f11137499595ae6cf41d86ed05843ed121f01f499208db76814b83577a7ad7b18528a18698d098f098b0865d981b4b6614dea484c72b7c025da2
 MISC metadata.xml 560 BLAKE2B 461a02e90deb5b56feb939e7816accaa73f64b1771b6e3f257a550e12e1530c4523b3faea357ffaa5180dc5245f2e8e3cf62b0718823c7af342742e27b39fc65 SHA512 90b97116c665fa0a020825e00dcda7f14af528e68104867b3106068c2fe80a5f6a7e50d4d30591d45857386e05caec18eb8921bb2347e785ae2e8f6adbd81cdf
diff --git a/media-libs/svt-av1/svt-av1-0.8.6.ebuild b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
index 10541f1ec51c..d2eed5042817 100644
--- a/media-libs/svt-av1/svt-av1-0.8.6.ebuild
+++ b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/AOMediaCodec/SVT-AV1.git"
 else
 	SRC_URI="https://github.com/AOMediaCodec/SVT-AV1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231
 	S="${WORKDIR}/SVT-AV1-${PV}"
 fi
 
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 7d33de0f3b35..f0afc4557592 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,11 +1,8 @@
-AUX Allow-using-packaged-third_party.patch 15523 BLAKE2B c6513ada2654d0c100054c8dc8781e50026681bb315b85a7d7fd906fd5b2d9c29b55bb86d2b8bb9a8fd6eaeb5f97b7e0fcea2c0122f6faa5d048631c6f72c093 SHA512 e89bbde19f3f91037311e67c6effb8b222da769f3b01268f3e11e33a70959c792b1f46cb968363ef26acf70c0d4a45008a7b42444e97668ad7ce9594098f4333
 AUX tg_owt-0_pre20210626-allow-disabling-X11.patch 3969 BLAKE2B fb0cb1f04762ec0ccb6e5f1057a413d380356cccbe394679bb6168a15961e906cf6a6fa025b87ee78d98902314656e0973932c5c952fc6edf8650dc4dd40a6bb SHA512 ca74fb15ad43e6933ccc5d014c9219045fd0be4a0bc5a18e8c8c244455fa1dd72268cd14fa203df66acd411b8d1315339c7f29930da898d80c40e74c6e326fc4
 AUX tg_owt-0_pre20210626-allow-disabling-pipewire.patch 1030 BLAKE2B e81b7fa348a1cfb148f0f64524a18ea48fb5cd01104137edb33e85a86c190418c0b8230564026527bea414c27b1a535415ad31279b705ea777241874ae3c1802 SHA512 8b16e49dad06aa71becb535600d411160e1cbef2c2cdc2258aebc282b4b64d87a0011b4c1ade4209116176965be3c2ee8ab2bf0ad5a33c451f184b32d0a7e77a
 AUX tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch 3322 BLAKE2B 61f04506af251a52f77a5b1289471e6519bc00aab1f0e2b0b703deec094109537506297dac55d6ece747beab889a2509a71ae862683c87e6f0c006573b3dffab SHA512 7c5a4851cfe982b069c1ce752414a7771805ab1edf00a88d16e46b11cda8a85692cc2534e04a562aba1519638e2c128b66b11f24ac93f7b8e3b2b9be6d031d55
 AUX tg_owt-0_pre20210626-expose-set_allow_pipewire.patch 720 BLAKE2B 22c1aacf44dfc9b814c2d7f3dbe186ef9b86473a6cd967357d9a786cbef2734f356e04487a3225e04fcee2282fea61e679787280682dbd339bdc68fcfade8261 SHA512 d163a8c27231ddbf930259c8dd52c1bd304a228cdba1d76bcc77efacae097f1c743de5ab79066d0d4367a783c530fa62169a9d3e09ff5e4498d5d8f3790ed563
 DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
-DIST tg_owt-0_pre20210422.tar.gz 16156802 BLAKE2B 823248e31d7abc91402c32aa0f062f1a77a3d8c4ebf63b4e73a8f290a5691e002a6ec09a5b7ffed1087565b9a419646924030dfb3eb3d0d6aec8cfc51cf1bf73 SHA512 24b66840a54d102b96bc32636dc8b85d31f74b344244985be929db4e14b13ee60f1fbc43269526352064cee8066839c886fae1aff95276089ab60d0a14de9ec6
 DIST tg_owt-0_pre20210626.tar.gz 16264716 BLAKE2B de500e02789516527c814d0aba87cf1d0e772747f06acff7ac9295508c6e6bce1915cd3a703df618ff17ba8e04dc194538a6ef859fa85b301bb63eceab2c339a SHA512 a5d10011c427d8685bcf0743c356ff8c58c3cad6c59ac2409298b30b15cb04233889a5ed0a18107ac5b3477eee96741fdc85176d4330c866e8e3329753be7d73
-EBUILD tg_owt-0_pre20210422.ebuild 2690 BLAKE2B 5142fed528e99f63e0ab0fa3f56cc33c0abe29975e7e5814fd40eeb5c9796a2c745b1b2e2a8569309411585907ba383cf3a581514d9dcd802768bf17bb3d4b61 SHA512 d7d4c545b6026f22c5d4bac967837bf630eca7b1c7aa432526571a5d3be470d71f7fde2e33e1eedc996388d8b36f4c037130fad732ccb5548202835b424e16e3
-EBUILD tg_owt-0_pre20210626.ebuild 2959 BLAKE2B 230b4d41768905517205f9095e0dbd06e255f68900daf9dc69c731fb792a95196afb52a449598410b756a2e479eb91131e45d602a37984fa4102f6466d7985a6 SHA512 678af2e504902f1aa0d8e7ae192d526d12dfffc652e74f9b5ef5ff1115e8a09ae30624edd37d05d117dc2788098ebaf1895728ae30a7b5f9206941f3dc216484
+EBUILD tg_owt-0_pre20210626.ebuild 2958 BLAKE2B 7a965b4ced599c5b06d9b09b8cfd49c9a9a622e9a9d3f2fd9ed4c6900022c9f5028534125b2dcbb036662a1dafcf80c2ec3c1dbda2adfdf67d2d59a476ec76e9 SHA512 69323de9376e97de06506ccc815e71babb04ae8c898f58859e5ee78b203394476b27a0274a55c93bdedb09908baae47a274933e23c6dda3c7be4843e15619dbb
 MISC metadata.xml 545 BLAKE2B 43a53f1c6c985be6e22cf2cd686a20637871b0351b4e5698d4a84abb78ad1e78080d32b295b87de7bc00a59bb49a749dcca562ddeeef8c54f315f26752c3f9d0 SHA512 24d6883333db2468df9529211f984c20a049d728794d43dc9608eb61f8154a7d15a92a4aba0bfcabc309c073947e3fb5fe22d258882c89adb5a1dcfb9889aecc
diff --git a/media-libs/tg_owt/files/Allow-using-packaged-third_party.patch b/media-libs/tg_owt/files/Allow-using-packaged-third_party.patch
deleted file mode 100644
index 17025826a48a..000000000000
--- a/media-libs/tg_owt/files/Allow-using-packaged-third_party.patch
+++ /dev/null
@@ -1,487 +0,0 @@
-From dbfceeea4280412358202d511e02e95a040d0297 Mon Sep 17 00:00:00 2001
-From: mid-kid <esteve.varela@gmail.com>
-Date: Sun, 7 Mar 2021 17:12:34 +0100
-Subject: [PATCH] Allow using packaged third_party
-
-This patch adds support for building tg_owt using system libraries
-instead of bundled third_party modules.
-
-Some libraries haven't been converted for the following reasons:
-- pffft: No stable ABI, patched, and not available in major distributions.
-- rnnoise: All of the remaining files are custom.
-- libsrtp: This project uses private APIs.
-- libyuv: No stable ABI, frequent breaking updates, and not available in major distributions.
-
-Note that: This still installs the system headers for the third_party
-modules (albeit in a convenient sub-directory). I haven't figured out a
-method to avoid this.
----
- CMakeLists.txt                                | 78 +++++++---------
- cmake/external.cmake                          | 91 +++++++++++++++++++
- cmake/libabsl.cmake                           |  2 +-
- cmake/libevent.cmake                          |  5 +-
- cmake/libopenh264.cmake                       | 17 +++-
- cmake/libpffft.cmake                          |  2 +-
- cmake/librnnoise.cmake                        |  2 +-
- cmake/libsrtp.cmake                           |  2 +-
- cmake/libusrsctp.cmake                        |  2 +-
- cmake/libvpx.cmake                            |  2 +-
- cmake/libwebrtcbuild.cmake                    |  4 +-
- cmake/libyuv.cmake                            |  2 +-
- cmake/tg_owtConfig.cmake                      |  5 +
- .../codecs/h264/h264_encoder_impl.cc          |  8 +-
- .../codecs/h264/h264_encoder_impl.h           |  2 +-
- src/rtc_base/task_queue_libevent.cc           |  2 +-
- 16 files changed, 166 insertions(+), 60 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7f8e3bd..3462351 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,7 +60,6 @@ include(cmake/librnnoise.cmake)
- include(cmake/libsrtp.cmake)
- include(cmake/libusrsctp.cmake)
- include(cmake/libvpx.cmake)
--include(cmake/libwebrtcbuild.cmake)
- include(cmake/libyuv.cmake)
- if (NOT WIN32 AND NOT APPLE)
-     include(cmake/libevent.cmake)
-@@ -80,41 +79,19 @@ init_target(tg_owt)
- 
- set_target_properties(tg_owt PROPERTIES SOVERSION 0 VERSION 0.0.0)
- 
-+target_link_libraries(tg_owt
-+PRIVATE
-+    tg_owt::libpffft
-+    tg_owt::librnnoise
-+    tg_owt::libsrtp
-+    tg_owt::libyuv
-+)
-+
- if (is_x86 OR is_x64)
-     target_link_libraries(tg_owt
--    PUBLIC
--        tg_owt::libwebrtcbuild
-     PRIVATE
-         tg_owt::tg_owt_avx2
-         tg_owt::tg_owt_sse2
--        tg_owt::libabsl
--        tg_owt::libopenh264
--        tg_owt::libpffft
--        tg_owt::librnnoise
--        tg_owt::libsrtp
--        tg_owt::libusrsctp
--        tg_owt::libvpx
--        tg_owt::libvpx_mmx
--        tg_owt::libvpx_sse2
--        tg_owt::libvpx_ssse3
--        tg_owt::libvpx_sse4
--        tg_owt::libvpx_avx
--        tg_owt::libvpx_avx2
--        tg_owt::libyuv
--    )
--else()
--    target_link_libraries(tg_owt
--    PUBLIC
--        tg_owt::libwebrtcbuild
--    PRIVATE
--        tg_owt::libabsl
--        tg_owt::libopenh264
--        tg_owt::libpffft
--        tg_owt::librnnoise
--        tg_owt::libsrtp
--        tg_owt::libusrsctp
--        tg_owt::libvpx
--        tg_owt::libyuv
-     )
- endif()
- 
-@@ -131,9 +108,6 @@ PRIVATE
-     ${libopenh264_yasm_objects}
- )
- 
--if (NOT WIN32 AND NOT APPLE)
--    target_link_libraries(tg_owt PRIVATE tg_owt::libevent)
--endif()
- if (APPLE)
-     target_link_libraries(tg_owt PUBLIC tg_owt::libsdkmacos)
- endif()
-@@ -141,6 +115,17 @@ endif()
- link_openssl(tg_owt)
- link_ffmpeg(tg_owt)
- link_opus(tg_owt)
-+link_libabsl(tg_owt)
-+link_libopenh264(tg_owt)
-+link_libusrsctp(tg_owt)
-+link_libvpx(tg_owt)
-+
-+if (NOT WIN32 AND NOT APPLE)
-+    link_libevent(tg_owt)
-+endif()
-+
-+include(cmake/libwebrtcbuild.cmake)
-+target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild)
- 
- function(add_sublibrary postfix)
-     add_library(tg_owt_${postfix} OBJECT)
-@@ -149,9 +134,8 @@ function(add_sublibrary postfix)
-     target_link_libraries(tg_owt_${postfix}
-     PUBLIC
-         tg_owt::libwebrtcbuild
--    PRIVATE
--        tg_owt::libabsl
-     )
-+    link_libabsl(tg_owt_${postfix})
-     target_include_directories(tg_owt_${postfix}
-     PUBLIC
-         $<BUILD_INTERFACE:${webrtc_loc}>
-@@ -2165,7 +2149,7 @@ else()
- endif()
- 
- set(platform_export)
--if (NOT WIN32 AND NOT APPLE)
-+if (NOT WIN32 AND NOT APPLE AND NOT LIBEVENT_FOUND)
-     set(platform_export
-         libevent
-     )
-@@ -2198,14 +2182,9 @@ endif()
- 
- set(export_targets
-     ${tg_owt_export}
--    libabsl
--    libopenh264
-     libpffft
-     librnnoise
-     libsrtp
--    libusrsctp
--    libvpx
--    ${vpx_export}
-     libwebrtcbuild
-     libyuv
-     ${platform_export}
-@@ -2214,6 +2193,19 @@ if (TG_OWT_USE_PROTOBUF)
-     list(APPEND export_targets proto)
- endif()
- 
-+if (NOT absl_FOUND)
-+    list(APPEND export_targets libabsl)
-+endif()
-+if (NOT LIBOPENH264_FOUND)
-+    list(APPEND export_targets libopenh264)
-+endif()
-+if (NOT LIBUSRSCTP_FOUND)
-+    list(APPEND export_targets libusrsctp)
-+endif()
-+if (NOT LIBVPX_FOUND)
-+    list(APPEND export_targets libvpx ${vpx_export})
-+endif()
-+
- export(
-     TARGETS ${export_targets}
-     NAMESPACE tg_owt::
-@@ -2223,7 +2215,7 @@ export(
- configure_file(
-     "cmake/tg_owtConfig.cmake"
-     "${CMAKE_CURRENT_BINARY_DIR}/tg_owtConfig.cmake"
--    COPYONLY
-+    @ONLY
- )
- 
- target_include_directories(tg_owt
-diff --git a/cmake/external.cmake b/cmake/external.cmake
-index 2132546..e09af96 100644
---- a/cmake/external.cmake
-+++ b/cmake/external.cmake
-@@ -105,3 +105,94 @@ function(link_libjpeg target_name)
-         )
-     endif()
- endfunction()
-+
-+# libabsl
-+# HINT: System abseil should be built with -DCMAKE_CXX_STANDARD=17
-+function(link_libabsl target_name)
-+    if (TG_OWT_PACKAGED_BUILD)
-+        find_package(absl)
-+        set(absl_FOUND ${absl_FOUND} PARENT_SCOPE)
-+        if (absl_FOUND)
-+            target_link_libraries(${target_name} INTERFACE absl::strings)
-+        endif()
-+    endif()
-+    if (NOT absl_FOUND)
-+        target_link_libraries(${target_name} PRIVATE tg_owt::libabsl)
-+    endif()
-+endfunction()
-+
-+# libopenh264
-+function(link_libopenh264 target_name)
-+    if (TG_OWT_PACKAGED_BUILD)
-+        find_package(PkgConfig REQUIRED)
-+        pkg_check_modules(LIBOPENH264 openh264)
-+        set(LIBOPENH264_FOUND ${LIBOPENH264_FOUND} PARENT_SCOPE)
-+        if (LIBOPENH264_FOUND)
-+            target_link_libraries(${target_name} PRIVATE ${LIBOPENH264_LIBRARIES})
-+            target_include_directories(${target_name} PRIVATE ${LIBOPENH264_INCLUDE_DIRS})
-+        endif()
-+    endif()
-+    if (NOT LIBOPENH264_FOUND)
-+        target_link_libraries(${target_name} PRIVATE tg_owt::libopenh264)
-+        target_include_directories(${target_name} PRIVATE ${libopenh264_loc}/include)
-+    endif()
-+endfunction()
-+
-+# libusrsctp
-+function(link_libusrsctp target_name)
-+    if (TG_OWT_PACKAGED_BUILD)
-+        find_package(PkgConfig REQUIRED)
-+        pkg_check_modules(LIBUSRSCTP usrsctp)
-+        set(LIBUSRSCTP_FOUND ${LIBUSRSCTP_FOUND} PARENT_SCOPE)
-+        if (LIBUSRSCTP_FOUND)
-+            target_link_libraries(${target_name} PRIVATE ${LIBUSRSCTP_LIBRARIES})
-+            target_include_directories(${target_name} PRIVATE ${LIBUSRSCTP_INCLUDE_DIRS})
-+        endif()
-+    endif()
-+    if (NOT LIBUSRSCTP_FOUND)
-+        target_link_libraries(${target_name} PRIVATE tg_owt::libusrsctp)
-+    endif()
-+endfunction()
-+
-+# libvpx
-+function(link_libvpx target_name)
-+    if (TG_OWT_PACKAGED_BUILD)
-+        find_package(PkgConfig REQUIRED)
-+        pkg_check_modules(LIBVPX vpx>=1.10.0)
-+        set(LIBVPX_FOUND ${LIBVPX_FOUND} PARENT_SCOPE)
-+        if (LIBVPX_FOUND)
-+            target_link_libraries(${target_name} PRIVATE ${LIBVPX_LIBRARIES})
-+            target_include_directories(${target_name} PRIVATE ${LIBVPX_INCLUDE_DIRS})
-+        endif()
-+    endif()
-+    if (NOT LIBVPX_FOUND)
-+        target_link_libraries(${target_name} PRIVATE tg_owt::libvpx)
-+        if (is_x86 OR is_x64)
-+            target_link_libraries(${target_name}
-+            PRIVATE
-+                tg_owt::libvpx_mmx
-+                tg_owt::libvpx_sse2
-+                tg_owt::libvpx_ssse3
-+                tg_owt::libvpx_sse4
-+                tg_owt::libvpx_avx
-+                tg_owt::libvpx_avx2
-+            )
-+        endif()
-+    endif()
-+endfunction()
-+
-+# libevent
-+function(link_libevent target_name)
-+    if (TG_OWT_PACKAGED_BUILD)
-+        find_package(PkgConfig REQUIRED)
-+        pkg_check_modules(LIBEVENT libevent)
-+        set(LIBEVENT_FOUND ${LIBEVENT_FOUND} PARENT_SCOPE)
-+        if (LIBEVENT_FOUND)
-+            target_link_libraries(${target_name} PRIVATE ${LIBEVENT_LIBRARIES})
-+            target_include_directories(${target_name} PRIVATE ${LIBEVENT_INCLUDE_DIRS})
-+        endif()
-+    endif()
-+    if (NOT LIBEVENT_FOUND)
-+        target_link_libraries(${target_name} PRIVATE tg_owt::libevent)
-+    endif()
-+endfunction()
-diff --git a/cmake/libabsl.cmake b/cmake/libabsl.cmake
-index 0cc8920..a82732a 100644
---- a/cmake/libabsl.cmake
-+++ b/cmake/libabsl.cmake
-@@ -1,4 +1,4 @@
--add_library(libabsl OBJECT)
-+add_library(libabsl OBJECT EXCLUDE_FROM_ALL)
- init_target(libabsl)
- add_library(tg_owt::libabsl ALIAS libabsl)
- 
-diff --git a/cmake/libevent.cmake b/cmake/libevent.cmake
-index 0192896..31248fb 100644
---- a/cmake/libevent.cmake
-+++ b/cmake/libevent.cmake
-@@ -1,4 +1,4 @@
--add_library(libevent OBJECT)
-+add_library(libevent OBJECT EXCLUDE_FROM_ALL)
- init_target(libevent)
- add_library(tg_owt::libevent ALIAS libevent)
- 
-@@ -40,7 +40,8 @@ PRIVATE
- )
- 
- target_include_directories(libevent
-+PUBLIC
-+    $<BUILD_INTERFACE:${libevent_loc}>
- PRIVATE
-     ${webrtc_loc}
--    ${libevent_loc}
- )
-diff --git a/cmake/libopenh264.cmake b/cmake/libopenh264.cmake
-index 45ce7c9..7d4742e 100644
---- a/cmake/libopenh264.cmake
-+++ b/cmake/libopenh264.cmake
-@@ -1,4 +1,4 @@
--add_library(libopenh264 OBJECT)
-+add_library(libopenh264 OBJECT EXCLUDE_FROM_ALL)
- init_target(libopenh264)
- add_library(tg_owt::libopenh264 ALIAS libopenh264)
- 
-@@ -207,6 +207,21 @@ set(include_directories
- 
- target_include_directories(libopenh264 PRIVATE ${include_directories})
- 
-+# Create include-able wels/ directory for public use of the library
-+set(GEN_INC ${CMAKE_CURRENT_BINARY_DIR}/openh264_include)
-+add_custom_command(OUTPUT ${GEN_INC}/wels
-+COMMAND ${CMAKE_COMMAND} -E make_directory ${GEN_INC}/wels
-+COMMAND ${CMAKE_COMMAND} -E copy
-+    ${libopenh264_loc}/codec/api/svc/codec_api.h
-+    ${libopenh264_loc}/codec/api/svc/codec_app_def.h
-+    ${libopenh264_loc}/codec/api/svc/codec_def.h
-+    ${libopenh264_loc}/codec/api/svc/codec_ver.h
-+    ${GEN_INC}/wels
-+VERBATIM
-+)
-+target_sources(libopenh264 PRIVATE ${GEN_INC}/wels)
-+target_include_directories(libopenh264 PUBLIC $<BUILD_INTERFACE:${GEN_INC}>)
-+
- if (is_x86)
-     set(yasm_defines X86_32)
- else()
-diff --git a/cmake/libpffft.cmake b/cmake/libpffft.cmake
-index fa2e66f..02c3db4 100644
---- a/cmake/libpffft.cmake
-+++ b/cmake/libpffft.cmake
-@@ -1,4 +1,4 @@
--add_library(libpffft OBJECT)
-+add_library(libpffft OBJECT EXCLUDE_FROM_ALL)
- init_target(libpffft)
- add_library(tg_owt::libpffft ALIAS libpffft)
- 
-diff --git a/cmake/librnnoise.cmake b/cmake/librnnoise.cmake
-index 04f72ae..a3e682e 100644
---- a/cmake/librnnoise.cmake
-+++ b/cmake/librnnoise.cmake
-@@ -1,4 +1,4 @@
--add_library(librnnoise OBJECT)
-+add_library(librnnoise OBJECT EXCLUDE_FROM_ALL)
- init_target(librnnoise)
- add_library(tg_owt::librnnoise ALIAS librnnoise)
- 
-diff --git a/cmake/libsrtp.cmake b/cmake/libsrtp.cmake
-index ce4ff64..4754f13 100644
---- a/cmake/libsrtp.cmake
-+++ b/cmake/libsrtp.cmake
-@@ -1,4 +1,4 @@
--add_library(libsrtp OBJECT)
-+add_library(libsrtp OBJECT EXCLUDE_FROM_ALL)
- init_target(libsrtp)
- add_library(tg_owt::libsrtp ALIAS libsrtp)
- 
-diff --git a/cmake/libusrsctp.cmake b/cmake/libusrsctp.cmake
-index ad41d12..1dc5e5e 100644
---- a/cmake/libusrsctp.cmake
-+++ b/cmake/libusrsctp.cmake
-@@ -1,4 +1,4 @@
--add_library(libusrsctp OBJECT)
-+add_library(libusrsctp OBJECT EXCLUDE_FROM_ALL)
- init_target(libusrsctp)
- add_library(tg_owt::libusrsctp ALIAS libusrsctp)
- 
-diff --git a/cmake/libvpx.cmake b/cmake/libvpx.cmake
-index e6775c4..0fdfbac 100644
---- a/cmake/libvpx.cmake
-+++ b/cmake/libvpx.cmake
-@@ -1,4 +1,4 @@
--add_library(libvpx OBJECT)
-+add_library(libvpx OBJECT EXCLUDE_FROM_ALL)
- init_target(libvpx)
- add_library(tg_owt::libvpx ALIAS libvpx)
- 
-diff --git a/cmake/libwebrtcbuild.cmake b/cmake/libwebrtcbuild.cmake
-index 15f854e..8efd18d 100644
---- a/cmake/libwebrtcbuild.cmake
-+++ b/cmake/libwebrtcbuild.cmake
-@@ -3,9 +3,11 @@ add_library(tg_owt::libwebrtcbuild ALIAS libwebrtcbuild)
- 
- target_link_libraries(libwebrtcbuild
- INTERFACE
--    tg_owt::libabsl
-     tg_owt::libyuv
- )
-+if (NOT absl_FOUND)
-+    target_link_libraries(libwebrtcbuild INTERFACE tg_owt::libabsl)
-+endif()
- 
- target_compile_definitions(libwebrtcbuild
- INTERFACE
-diff --git a/cmake/libyuv.cmake b/cmake/libyuv.cmake
-index 881f9db..143e239 100644
---- a/cmake/libyuv.cmake
-+++ b/cmake/libyuv.cmake
-@@ -1,4 +1,4 @@
--add_library(libyuv OBJECT)
-+add_library(libyuv OBJECT EXCLUDE_FROM_ALL)
- init_target(libyuv)
- add_library(tg_owt::libyuv ALIAS libyuv)
- 
-diff --git a/cmake/tg_owtConfig.cmake b/cmake/tg_owtConfig.cmake
-index d0001ac..e9f4388 100644
---- a/cmake/tg_owtConfig.cmake
-+++ b/cmake/tg_owtConfig.cmake
-@@ -1 +1,6 @@
-+if (@absl_FOUND@)
-+    include(CMakeFindDependencyMacro)
-+    find_dependency(absl REQUIRED)
-+endif()
-+
- include("${CMAKE_CURRENT_LIST_DIR}/tg_owtTargets.cmake")
-diff --git a/src/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/src/modules/video_coding/codecs/h264/h264_encoder_impl.cc
-index ccf0bc5..85ddc90 100644
---- a/src/modules/video_coding/codecs/h264/h264_encoder_impl.cc
-+++ b/src/modules/video_coding/codecs/h264/h264_encoder_impl.cc
-@@ -29,10 +29,10 @@
- #include "system_wrappers/include/metrics.h"
- #include "third_party/libyuv/include/libyuv/convert.h"
- #include "third_party/libyuv/include/libyuv/scale.h"
--#include "third_party/openh264/src/codec/api/svc/codec_api.h"
--#include "third_party/openh264/src/codec/api/svc/codec_app_def.h"
--#include "third_party/openh264/src/codec/api/svc/codec_def.h"
--#include "third_party/openh264/src/codec/api/svc/codec_ver.h"
-+#include <wels/codec_api.h>
-+#include <wels/codec_app_def.h>
-+#include <wels/codec_def.h>
-+#include <wels/codec_ver.h>
- 
- namespace webrtc {
- 
-diff --git a/src/modules/video_coding/codecs/h264/h264_encoder_impl.h b/src/modules/video_coding/codecs/h264/h264_encoder_impl.h
-index 4eb4ad3..98e4c2f 100644
---- a/src/modules/video_coding/codecs/h264/h264_encoder_impl.h
-+++ b/src/modules/video_coding/codecs/h264/h264_encoder_impl.h
-@@ -25,7 +25,7 @@
- #include "common_video/h264/h264_bitstream_parser.h"
- #include "modules/video_coding/codecs/h264/include/h264.h"
- #include "modules/video_coding/utility/quality_scaler.h"
--#include "third_party/openh264/src/codec/api/svc/codec_app_def.h"
-+#include <wels/codec_app_def.h>
- 
- class ISVCEncoder;
- 
-diff --git a/src/rtc_base/task_queue_libevent.cc b/src/rtc_base/task_queue_libevent.cc
-index 38660cd..04bc278 100644
---- a/src/rtc_base/task_queue_libevent.cc
-+++ b/src/rtc_base/task_queue_libevent.cc
-@@ -27,7 +27,7 @@
- #include "absl/strings/string_view.h"
- #include "api/task_queue/queued_task.h"
- #include "api/task_queue/task_queue_base.h"
--#include "base/third_party/libevent/event.h"
-+#include <event.h>
- #include "rtc_base/checks.h"
- #include "rtc_base/logging.h"
- #include "rtc_base/numerics/safe_conversions.h"
--- 
-2.26.3
-
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild b/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild
deleted file mode 100644
index 3e8e01ec1d26..000000000000
--- a/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-TG_OWT_COMMIT="18cb4cd9bb4c2f5f5f5e760ec808f74c302bc1bf"
-LIBYUV_COMMIT="ad890067f661dc747a975bc55ba3767fe30d4452"
-
-DESCRIPTION="WebRTC build for Telegram"
-HOMEPAGE="https://github.com/desktop-app/tg_owt"
-SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://archive.org/download/libyuv-${LIBYUV_COMMIT}.tar/libyuv-${LIBYUV_COMMIT}.tar.gz"
-# Fetch libyuv archive from: https://chromium.googlesource.com/libyuv/libyuv/+archive/${LIBYUV_COMMIT}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-
-# Bundled libs:
-# - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx bundle it)
-# - libsrtp (project uses private APIs)
-# - pffft (no stable versioning, patched)
-# media-libs/libjpeg-turbo is required for libyuv
-DEPEND="
-	dev-cpp/abseil-cpp:=[cxx17(+)]
-	dev-libs/libevent:=
-	dev-libs/openssl:=
-	dev-libs/protobuf:=
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libvpx-1.10.0:=
-	media-libs/openh264:=
-	media-libs/opus
-	media-video/ffmpeg:=
-	net-libs/usrsctp
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}/src/third_party/libyuv" || die
-	unpack "libyuv-${LIBYUV_COMMIT}.tar.gz"
-}
-
-src_prepare() {
-	# https://github.com/desktop-app/tg_owt/pull/55
-	eapply "${FILESDIR}/Allow-using-packaged-third_party.patch"
-
-	# We aren't installing any third_party headers
-	sed -i '/third_party\/libyuv/d' cmake/libyuv.cmake || die
-
-	# libvpx source files aren't included in the repository
-	sed -i '/include(cmake\/libvpx.cmake)/d' CMakeLists.txt || die
-
-	# Remove screen_drawer files that cause linking errors
-	# (not used right now I don't think, maybe in a future version)
-	# https://github.com/desktop-app/tg_owt/issues/58
-	sed -i -e '/desktop_capture\/screen_drawer\.cc/d' \
-		-e '/desktop_capture\/screen_drawer_lock_posix\.cc/d' CMakeLists.txt || die
-
-	# HACK
-	# build/headers don't have ppc64 condition and force SSE2.
-	# sed it out and force C version on ppc64
-	# without this linking tdesktop will fail with undef reference to `webrtc::VectorDifference_SSE2_W32
-	if use ppc64; then
-		sed -i 's/VectorDifference_SSE2_W.*/VectorDifference_C;/g' src/modules/desktop_capture/differ_block.cc || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes
-	# see https://bugs.gentoo.org/754012
-	append-cppflags '-DNDEBUG'
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# Save about 15MB of useless headers
-	rm -r "${ED}/usr/include/tg_owt/third_party" || die
-}
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210626.ebuild b/media-libs/tg_owt/tg_owt-0_pre20210626.ebuild
index e07ba6135d99..6fd83cb3e00f 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20210626.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20210626.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
 
 LICENSE="BSD"
 SLOT="0/${PV##*pre}"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+alsa pulseaudio screencast +X"
 REQUIRED_USE="pulseaudio? ( alsa )"
 
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 12187b8da7c0..0787a6bb06a0 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,10 +1,4 @@
-DIST vulkan-layers-1.2.162.tar.gz 2398927 BLAKE2B febfcc88584cb7d69ac2f2bd95a73921d2dc92524b05f17e7d2a9f99336416260da60eefc560d93ad788d9a185d4dd865881f5bc8faf0dae388bacca59a21b7a SHA512 85eba0e1d07cafad212ef611fb1aef3113b6609361476cda7176a49110fe62d257b815f7c622d6ba959872785242e2231c7245242e7794ff5e60325d10f3061b
-DIST vulkan-layers-1.2.170.tar.gz 2581751 BLAKE2B 968d17e11a21422003c0c922518b121586ebbd4e5375189f38715c52afc24b1bed04b1a4f05e17875b15fee3815492c357ad84316ea0abc359a97026418b490d SHA512 199e64c6d2ca34a604bb611fd231bfccf4608078a777369039597dadc209a23b7e7ea4ce71dc8b48826bd7874a7ea623d8af7dc47945914405fd99ce8bdf8de6
-DIST vulkan-layers-1.2.179.tar.gz 2771214 BLAKE2B ab9ddde54998ae44f6e3400c721c9b51b347d4424d2118b8b7371e9d1160a76257ca8f8295e9c52dfeba386a09e2b048111f242b7c4b912db1e5748e5dea8762 SHA512 e025c8f36f911bf838ec3a57123aecf44ec8d5ac5d170ef0e6d0ef7bd15789360faa89eb00c19edaa8e60503c4a80300448893d5185cd2880dcd817153e9cc4f
 DIST vulkan-layers-1.2.182.tar.gz 2791196 BLAKE2B e4c2a80708b7805425eb58bc360db8aa8ac9a671ef88a261f09887f59cbacb56e1375a868589864c30a9a812c91a7dc2c7d3ebc0eda5afc7cb99dfb7f70af2de SHA512 2c7541d18926507fb7f36193a5901e2d3f864749e5c9e456c32bc8e64bae58e661d01f8871c596a2b05e2e5bf86a4c80c6207d7cc942a51cafab81f052d91805
-EBUILD vulkan-layers-1.2.162.ebuild 1487 BLAKE2B 39f16295cadbfcd4921db6699ffad0acb9006b11fd6d2b73a4d00ea1bfb3d19586e172656610129af32e01125e8d3f8b0ac9d7434976dd09aa43e217f40da183 SHA512 4d4e14abebaebc304004c7256d4f81ee9522d2f46dfc4450d70f935d1d1ecf87b631d13eb7765be8c8a3570ff2ed6b384971939cd37d33fe698c9a54f0a92781
-EBUILD vulkan-layers-1.2.170.ebuild 1484 BLAKE2B a55abcf6025c76230286e85d0ad316695e45273f7200b4d5c85aa9ceb472b3f74345396fd3ca8df2d831733e29406d5d2cb2d671c45a6d9e64bc6859e7fde95d SHA512 a7d29d48fccdad1be28741fe4b788aedfa7c1b948e70b0bea86ad2437de0e351d59e8aa5dcb88e63a096684bc0f292f7151c2c1f6cf93501f1cf9230e025e663
-EBUILD vulkan-layers-1.2.179.ebuild 1534 BLAKE2B 9c39b60f587bdf3e460380fe84f83488e8dff9d8ddca4419145bdd097b1775e2794c3a59d7f953dfe58bd30e9129621862d1c17549f5c7c1cd903dbdeab365fb SHA512 58108bb6284c69313b0b61c977dfacfa8ab52fc4ab476946c5d83faaeb02db9cfb1547ec5ae1f298742858892227deb8fd80cea07ec79665bdfa8437bcc4585b
-EBUILD vulkan-layers-1.2.182.ebuild 1539 BLAKE2B 61485f0d3de3e32298a4c374cda1c3ef4891ab68e58c507481d966710f7de278638f9b79b942312a7b7955c5dac203e672ad1dc8bb38b20121c323686d7e2170 SHA512 b2f1038ef6a2dae26a33c1f6286703a511bcdace6b0bc46749c3aa840b8c4b45013b5fe0b64313e1915d31ec76509ecf2abfb7d9b9578ce2dcba7d7915bf6162
+EBUILD vulkan-layers-1.2.182.ebuild 1533 BLAKE2B 992ec98e7c6d6787254dc7ceb65dbf23bc1eec6035fd1ea70800d578f3b1d16997249482492c9af907a88287571725f3445bdd3ad3f9f1d7ed83fdd6cb6d1518 SHA512 828502e90aac0998009a8def204569b7b87a341656e8dfa353f6447f695b1552023d357223a7ef9834338d435e5a4113347de238137a9de14d1239b763fe28c4
 EBUILD vulkan-layers-9999.ebuild 1505 BLAKE2B 94dfb5ab9dc9195f9501de3a0cdc7679ef517d2747623468c40f20bfb5beef6d41fa860534a46dff043123d6d7702add97cfc68a8603e01ffef0c032fddb910b SHA512 8cc5bcfb36ff94fac0df024b255861c7db2955f2c046ec0086d72bc092033b273b7c8d8bc2b234293e80337ab8cafa3fe34408d2f6f545a4da724fb3c9e317fe
 MISC metadata.xml 440 BLAKE2B 9dd8769693fe4ce6aae2493b4e9f0020da3fec24b35527ccc8a0d2ca014681b3a06019de49d7277286046b23b9b798e84d3c747909e6b7f19eed36d0e2c89012 SHA512 3977758a3f8c9d3648b8a70da5497c4596dfbf28509a84799920c39b6908703353584b01d8264fd39ec2f5fef5d1dba03c239a2848224531f42389de802d14da
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
deleted file mode 100644
index 63373bcbcb50..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/glslang-10.11.0.0_pre20201216:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2020.6:=[${MULTILIB_USEDEP}]
-	>=dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${EPREFIX}/usr/include/spirv"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.170.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.170.ebuild
deleted file mode 100644
index f286c75ea3e1..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.170.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	>=dev-util/glslang-11.2.0:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-2021.0_pre20210327:=[${MULTILIB_USEDEP}]
-	>=dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${EPREFIX}/usr/include/spirv"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
deleted file mode 100644
index 3efb8bf7a9cd..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8,9} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND=">=dev-util/spirv-tools-2021.0_pre20210526:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-cpp/robin-hood-hashing
-	>=dev-util/glslang-11.4.0:=[${MULTILIB_USEDEP}]
-	>=dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuild
index a71fc5a1b174..5766faaceda9 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 3e04757c5fc2..71e25240637c 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,11 +1,4 @@
-AUX vulkan-loader-1.2.162-Fix-pkgconfig.patch 1421 BLAKE2B 6271cbf4b9b91976a2e0e821f0f62a75c556d6fc54482add5c3be7d139013d9971e22ee462e0fed251e4d78a41f94ee3127702aa1052a1a5ff04e9ba036f9d64 SHA512 63309d605f269d7c48c86aff823cf1a17a1ab1e6778ee6fa838eecbc3e439fbd730610753fc64eba19c43ef441ab68dc378f778ef8ff84349fe925ff3be6a321
-DIST vulkan-loader-1.2.162.tar.gz 1421710 BLAKE2B 94b739821c5a12a94a52d8f0a9d79c13055ef3b45b907d53b82325b7be13db52b77d01397534e939bed5629d7a405ff8a09f8da374274a066986b4126fae9863 SHA512 89a99f282b73ec59dde30e4c8c09056b40416185a14ff9b7f7bd496754840e5ac764e7624f1f9a0f11792e786b00f19c3c9e55ccbb22a3c501d8ea9e815d84f9
-DIST vulkan-loader-1.2.170.tar.gz 1422110 BLAKE2B 8903fceee3172970ee4e9c41df7c9ceb3c4d21d380061c9442cf6c3c07412e5568f7d4653591bf53128088b928d7db8050782e9a90441b66e12ba12135e5c242 SHA512 b9512c8b30b68799a6cc2905e7a5593a1c03214edae7a99fd7bc27b1761f17ef70a61f422fc318dd805ac089bbfc6cf18dfe69d1b8a91789a1774ee396058747
-DIST vulkan-loader-1.2.179.tar.gz 1430935 BLAKE2B b12fbbac071560ca0542c26cb72379104fdca1973306bf0ed0c1566a4bbc9daf22817f0e8e8389104072188705c8bf3dd6283fcfd396defe2834d2e1565e6be0 SHA512 3186f5d8f93b28a69e731da505ce4e8cd768c8935eda9e6765b834aaa137d249b5cb4c7d0fb1e1e713c3d02b3c9a71ad8554e2ea239dbd5e4def2b96331cd71d
 DIST vulkan-loader-1.2.182.tar.gz 1469024 BLAKE2B d180154bd0878c45327b1ad06a8efcc637b73fd75ad5ca349740d7f8d6944b2974828cb055a32150c4db4eb94f1b420d94852228d91e46bd8340229fa0ad30fd SHA512 06cf308caae1fd1992b279e8130b8f40bdcc7df44294c73e221d537950c689e552afeda4ae9406645b1d773693fa27c7727ab012daecbcff2793c4995c7f0db0
-EBUILD vulkan-loader-1.2.162-r1.ebuild 1788 BLAKE2B e6b9dbcb8a6ff5cc1d4f1a445f7505a6dd4749eee774ad500eeeb8e4b966308b842e76ecf2e507c4144f9fa852a66f128ff954ecd4d1bb8917bfbf3b73547bfc SHA512 e2fe1e5a4322c8d7896a55551fe3b059cca82fefbe521846d9e8fdfca237876f6da7a9df1ffba1cef446fcac3a1f3e8adc106349eb0f584a5abb6f744a2f170c
-EBUILD vulkan-loader-1.2.170.ebuild 1729 BLAKE2B 85d77609918dc0ad75eea293cfde60a0e9335846f0a830a675494dee107dabf5470aa4433cbd3ec5d1b2103812c606c90a3a026b2e8c140521c130af0d27a572 SHA512 b51620c05c33a040d501a61d09d4d1d4ccbbea20a7f4de0a993a64c8fea360f8843921f195d3eab1e3a03a2af281d2deea2b00faabf7f1d504976ee491d35d90
-EBUILD vulkan-loader-1.2.179.ebuild 1668 BLAKE2B c8ca59fef9eb31bbc22fce91dd6e9d9aea5fc603886d0aab00837c4d6d3b2d69322fa34782873ae6bf9f25494fb86f850c2a4b933c96a835d0b51104c1f8680a SHA512 52cd7b5ea6045a67d35413b02f31d73c53b8c5d69217f3fba5606094e49167d6feec3c5df50d422a82e10afbe2644a506f1c174cefd62b1144d4fcfae24cd3e2
-EBUILD vulkan-loader-1.2.182.ebuild 1673 BLAKE2B 3e45c82125a5395bd3e3f253070c49717f8f7b74b054a507da45e7422afd7a9611ef33dd9cb187b3c26081d639eea8f127a07896827c0dbbf7b15bd19eb6bcb5 SHA512 1a6cd99e950caa5987b9282d80c7323ca08c82fe2697c0c4ff8eec59b8a43586b7624e7f5f30a39f0c77b29fad9b531184ae0e4093e510459c1e2078f1364c53
+EBUILD vulkan-loader-1.2.182.ebuild 1667 BLAKE2B 75d53c06a5e6e626a5bcb760e39906067b90fca29e4ddf8fca11f9f3da90541a7d3fc08fd4975e6a2c106c8473e3ec2fc852b3f2e37bbfc3ba9c33dc9dda7bf3 SHA512 43696cc21f3b86c0a6877e55477f50bc28c98794679b164266a3bd77f16ec98f4db8f0085c4551a698287c384f847a0d2e3cecf2072bb38eead9d3ebf87efe64
 EBUILD vulkan-loader-9999.ebuild 1667 BLAKE2B d38d07a8a692f11f283dee022a248f654ec0e09c989ad4afbc89e44c45ad57ed98973010e41b3481eae25a78f9a30890ec99de644473dbdd39eb319730b90683 SHA512 7e48048f046935cec040935b5a4c28ce454fe91d4bced38e7932d3645319fc6f721e508b46d43609a6ce00e2e30009598bba3e76f9fb7ef24b3e9a5f43e85c66
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch
deleted file mode 100644
index f06f5cffdad3..000000000000
--- a/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d0cfd15c09f1581278317a5c0ece8f213ba5578f Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Wed, 16 Dec 2020 23:38:00 -0500
-Subject: [PATCH] Revert "pkgconfig: Missing lib suffx on win32"
-
-This reverts commit 10c4ebadb9fc41e0abf5a32daa7263c6d1aff575.
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- loader/CMakeLists.txt | 3 ---
- loader/vulkan.pc.in   | 2 +-
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
-index 659511855..f7b9916b2 100644
---- a/loader/CMakeLists.txt
-+++ b/loader/CMakeLists.txt
-@@ -326,9 +326,6 @@ if(PKG_CONFIG_FOUND)
-     foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
-         set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
-     endforeach()
--    if(WIN32)
--        set(LIB_SUFFIX "-1")
--    endif ()
-     configure_file("vulkan.pc.in" "vulkan.pc" @ONLY)
-     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
- endif()
-diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
-index fc17cb1f3..f1588c412 100644
---- a/loader/vulkan.pc.in
-+++ b/loader/vulkan.pc.in
-@@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- Name: @CMAKE_PROJECT_NAME@
- Description: Vulkan Loader
- Version: @VK_API_VERSION@
--Libs: -L${libdir} -lvulkan@LIB_SUFFIX@
-+Libs: -L${libdir} -lvulkan
- Libs.private: @PRIVATE_LIBS@
- Cflags: -I${includedir}
- 
--- 
-2.29.2
-
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
deleted file mode 100644
index ab38465a7c77..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${PN}-${PV}-Fix-pkgconfig.patch" )
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.170.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.170.ebuild
deleted file mode 100644
index d86459f89855..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.170.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
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="${PYTHON_DEPS}
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
deleted file mode 100644
index 5eecd8d168e1..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.179.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
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-inherit flag-o-matic cmake-multilib toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.182.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.182.ebuild
index 10ff6e200be1..3261c3ef4893 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.182.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.182.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 065107d1c328..23e73f8be78e 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -4,6 +4,8 @@ AUX test-ns.patch 14677 BLAKE2B fa48d03bca5d72b7b3eac7f6ac98c93bde12ec845f9eecdd
 AUX tests.patch 650 BLAKE2B 21759b11966e12df1a72a1ed00935ff781ad8b912e734de65cf0872cf92400aef71d4aebbe067dd1059a1d445cd9819cef4dc4b1c7df63ca7b8e97b8e578045e SHA512 a4a3b69fa86e6910ff4f963b9667c8deaea4ff88f3396e8e426e61d036b12cbf550bff7867657da1ba98417f1ccae88db1887b94ea6271604060e01fb8698d79
 AUX x265-3.3-ppc64.patch 590 BLAKE2B bbc6f18b8f192424450d2860e33ea6dbba14b46876f05cf9c499412d491127c877c342b1900bb9d06d66126aca2f383da1a4986ce69670ebc392fec0fe9b59a9 SHA512 bb4ace2c4bc899a0ccdd17fb78e63980354f41ff0f201812d47c5df16b23fea6fcdbde086e737d0efd5d8cb8fa571a131c03433bec31999c71ff51bccd754950
 DIST x265_3.4.tar.gz 1469365 BLAKE2B 1021d9d62779d0cecddea56496b4e46bd8ccfd91fdf292efe412dc82b3c974095a5f9bd095057aa08e77b164555adc594549dea6aef7fbc0c025ae7295df721e SHA512 576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e
-EBUILD x265-3.4.ebuild 6370 BLAKE2B a3c2d028f58871382d8f2f8440bb8b3f4f88acd1573fbf319f7ffe786c4ff2ad007cde5e7ee5500ab297f3a69f3b3c1b0ae8f6f6dcbe599ef32ea5e000b6aa08 SHA512 2431ae3e83a6b35d709517f816b84a46c0141f411a9ff0435ce46073dbd280cbc92b2abeb27046d223ddc35c9f2a218982eafe78e1100387e60be2df6d64f47e
-EBUILD x265-9999.ebuild 6296 BLAKE2B f1f2dfb04c6667c37dfd2681570237364441f73cc7325680376d0aa805581ed722970ea8060b9e4fee7e34b21dabed95da2cdedd62f130cff2a646747a7298a6 SHA512 55b83ca021856960b849dd893ad34d3153acc93f389a2185492cea8377657027f9bd89b0ff12823763f4e34b4d19f6a51b2abe04dc15ab1d70793486262dfe1a
+DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05 SHA512 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997
+EBUILD x265-3.4.ebuild 6377 BLAKE2B 8cc509d9a0d7c8d4b0ed2226f3eae682035f725648d0c43b3083c6db50ae8afb3351855f38204a55bd1b5dd8fec3d6f6e11c5f12a0b3533f051e16983cef10f2 SHA512 d634f733615b5c2abbb3ced26c867e18a997172869e7991066d9f7ca18486f2140ee8195edd2f3584a3479f5a556ddb7e4e428d5a2bf963b56c9fde993853843
+EBUILD x265-3.5.ebuild 6295 BLAKE2B a27b1827080b93140f8a8548633a62682a68aca0b9bb9311306ed2d22dd012020e4ed39882a7d0025f1b31c253d769abedc620fb5889417d8bd44222494377a6 SHA512 4438c74042c8eaa5c9a153344fb28a1ac99b7f07b4d3db763db3904eba10774097c2b56a4892f67ac89ea82b6ab28f12ac84c6d532416e4cda8a5ca1e46dcf85
+EBUILD x265-9999.ebuild 6295 BLAKE2B a27b1827080b93140f8a8548633a62682a68aca0b9bb9311306ed2d22dd012020e4ed39882a7d0025f1b31c253d769abedc620fb5889417d8bd44222494377a6 SHA512 4438c74042c8eaa5c9a153344fb28a1ac99b7f07b4d3db763db3904eba10774097c2b56a4892f67ac89ea82b6ab28f12ac84c6d532416e4cda8a5ca1e46dcf85
 MISC metadata.xml 621 BLAKE2B afdaa9cc6deae7cb65a9b3242abe446201ec8f53f0c19b866f63c8f26011b7f6f0ea5561ff56b0ea2c4832bfc5f6d95c14a8526f4bfaca2d7ee7fa807dfa1db8 SHA512 9862b540eca3b214ad9ba049c9f6721fbb6559bb00b82208eec63e05e81b1805e498357e8689be1b4042c51202030e4c62125599b0736358c4fb7e566dba1809
diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild
index 76b1480fcc04..feab1dee8c84 100644
--- a/media-libs/x265/x265-3.4.ebuild
+++ b/media-libs/x265/x265-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/x265/x265-3.5.ebuild b/media-libs/x265/x265-3.5.ebuild
new file mode 100644
index 000000000000..e956de4eab01
--- /dev/null
+++ b/media-libs/x265/x265-3.5.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
+	S=${WORKDIR}/${P}/source
+else
+	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/199"
+IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+BDEPEND="
+	abi_x86_32? ( ${ASM_DEPEND} )
+	abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}/arm-r1.patch"
+	"${FILESDIR}/neon.patch"
+	"${FILESDIR}/x265-3.3-ppc64.patch"
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/test-ns.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+	fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+	local variants=""
+	use 12bit && variants+="main12 "
+	use 10bit && variants+="main10 "
+	variants+="main"
+	echo "${variants}"
+}
+
+x265_variant_src_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
+
+	local mycmakeargs=( "${myabicmakeargs[@]}" )
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+				-DMAIN12=ON
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm* ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			# disable altivec for 12bit build #607802#c5
+			if [[ ${ABI} = ppc* ]] ; then
+				mycmakeargs+=(
+					-DENABLE_ALTIVEC=OFF
+					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+				)
+			fi
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm* ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			# disable altivec for 10bit build #607802#c5
+			if [[ ${ABI} = ppc* ]] ; then
+				mycmakeargs+=(
+					-DENABLE_ALTIVEC=OFF
+					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+				)
+			fi
+			;;
+		"main")
+			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+				local liblist="" v=
+				for v in "${myvariants[@]}" ; do
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
+					liblist+="libx265_${v}.a;"
+				done
+				mycmakeargs+=(
+					-DEXTRA_LIB="${liblist}"
+					-DEXTRA_LINK_FLAGS=-L.
+					-DLINKED_10BIT=$(usex 10bit)
+					-DLINKED_12BIT=$(usex 12bit)
+				)
+				if [[ ${ABI} = ppc* ]] ; then
+					# upstream uses mix of altivec + power8 vectors
+					# it's impossible to enable altivec without CPU_POWER8
+					# and it does not work on ppc32
+					# so we toggle both variables together
+					mycmakeargs+=(
+						-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
+					)
+				fi
+			fi
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+	cmake_src_configure
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	local myabicmakeargs=(
+		-DENABLE_TESTS=$(usex test ON OFF)
+		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+		-DENABLE_PIC=ON
+		-DENABLE_LIBNUMA=$(usex numa ON OFF)
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	if [[ ${ABI} = x86 ]] ; then
+		# Bug #528202
+		if use pic ; then
+			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+		fi
+	elif [[ ${ABI} = x32 ]] ; then
+		# bug #510890
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	elif [[ ${ABI} = arm ]] ; then
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+		use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+	fi
+
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant cmake_src_compile
+}
+
+x265_variant_src_test() {
+	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
+}
+
+multilib_src_test() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+	# Install only "main" variant since the others are already linked into it.
+	local MULTIBUILD_VARIANTS=( "main" )
+	multibuild_foreach_variant cmake_src_install
+}
+
+multilib_src_install_all() {
+	dodoc -r "${S}/../doc/"*
+
+	# we don't install *.a files for all variants,
+	# so just delete these files instead of pretending
+	# real USE=static-libs support
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 3bd31a5364ce..e956de4eab01 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,16 +10,16 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
 	S=${WORKDIR}/${P}/source
 else
-	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/195"
+SLOT="0/199"
 IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index f19baa934aae..67108c4f161e 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/libvisual-projectm/Manifest b/media-plugins/libvisual-projectm/Manifest
index 81b9eef13701..3234e823b789 100644
--- a/media-plugins/libvisual-projectm/Manifest
+++ b/media-plugins/libvisual-projectm/Manifest
@@ -1,3 +1,3 @@
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
-EBUILD libvisual-projectm-2.1.0-r1.ebuild 637 BLAKE2B 0fa145c0a5dd121776987503b675ae7affc194ab0a4b35d18ae7bf6f962475e1878d8d0b2492cf403a8bfc8559c670cebe9fecbb915d7cd74b74818d2e6a634d SHA512 7e9756d8ef48c094e65a6ec7521f8605378e06c85918f2ab9db18013b2ef52e2e6f58d7310f4a629cc66cc955d3393152fbf9329ca2ca45dd7d4eac3d0d3c4fc
+EBUILD libvisual-projectm-2.1.0-r1.ebuild 641 BLAKE2B 328b9d0f62aed16b891102bf24ef7cf31af3d41e3161faa0da2d955f9d8d51ae3032df397b5ecef0015e07335215c7125e661fce0a24e5ace183e5a609550c5e SHA512 76ca87d605df2666943573e614f21cb044033c04359a49610b749475f44b70e0088f99c0bb3cb05516adeef9146275f7cd2c9babe824ee5c95c278e32e825f2c
 MISC metadata.xml 331 BLAKE2B a0d10fc64d4ccd3f2b0074f00f48827ecf31eb22f9823d9ac43e8c5d0074e90263dd507457d2467ed33d6b2c09d872af2e2f28f733d8ae9600ebc1862f1da60c SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740
diff --git a/media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r1.ebuild b/media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r1.ebuild
index e139994bcb7c..7d5ece8ffe22 100644
--- a/media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r1.ebuild
+++ b/media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
-	>=media-libs/libprojectm-2.1.0
+	>=media-libs/libprojectm-3.1.12:0=
 	media-libs/libsdl
 	=media-libs/libvisual-0.4*
 	virtual/opengl
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index f18a4d54d076..0107257e6f8d 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 6420c462b9d9..f6903fb3cb57 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,5 +1,7 @@
 DIST fldigi-4.1.18.tar.gz 4847091 BLAKE2B 5b5ab773a78370b3c6ea86d63af7631bea97b16c3eacdb3d3b4e1b18dbbe70c727afa2ddf04c1ca7934f483503b2373d5d94bf4fcd896ad52a843c723a7c5cd2 SHA512 4d7fef4d464fcedf075d226bae7fd7134cd7436d737e17b7e21607e5120c957a909d1775900dbfea608c68629409c04eaa70a399bef6cba27b6e12b255696633
 DIST fldigi-4.1.19.tar.gz 4900636 BLAKE2B 1fa8689bc3c0a8fff24514bd306c70815039b8610673e1834f6c2b567ef0c6e9170750ef208efd58c62fc2f872865ae30e64651c57eaeb14abc96896d73d0417 SHA512 68eaeb4879e58f648827d129fad7ccb799062ad220429f29afc6c75fd50794393bf31e130ba03628e409a2703d52598d2a04dfba8780960d32b132306cc177b4
+DIST fldigi-4.1.20.tar.gz 4906451 BLAKE2B ed12be269828a1c8a9b1eeab470981ca95d47a330a9eec098c6ce241e36a18bfaf5d36eecb480542aff128c7b7f6b06d85af1a37f30a9b721ed1712cf90a4df3 SHA512 97c4ae9d0721a3d264af55483e9e3e6dd22e33c879d60f7818489c2e8eb0f0615f8698c67c39fa066b05baccd75c06e1988d9f7ea3dc180158da77ed604a0d0f
 EBUILD fldigi-4.1.18.ebuild 1317 BLAKE2B 0379f8ab2e176ca8fbd888fd906cd406c2f468dcfd9fae1928d4b9e793232a16aea066a9133e20fa4d46216c52ff2b34bb0f12194f582b1445e27328fc490fc8 SHA512 c88c5119577feb09ebbaf5f2133440f19cfa2eff2e6cf9900a4aa75db6bcc517fbbeed11a497d4fb4bb757879e27473ec080b6b882a01d7321c9df2d7deb7d44
 EBUILD fldigi-4.1.19.ebuild 1319 BLAKE2B 806fbc6d193482b178d239ee0eca4e71beb55d968c140cf78de4e423c1ab556fcd433b5d690538e16a8c675221792f33e14f07a396947ebe5a3504938fcc0b5b SHA512 7d5635b933350a67016eecde33ace8d55dd1b8379c52cba5d97764e29fe0b6f0a2819c99fcd41348bbee69cbfa5745dd11b93d8eb05e1909b74e31d04180bbb4
+EBUILD fldigi-4.1.20.ebuild 1319 BLAKE2B 83caeeedf7d36ca6ccf17206e945117c40472c2da8f3975bfdec48487f565d6101b2d2912267e29b774b815497123d7fb861975a82fce9212f2b048e19ef790d SHA512 85904b60c1cc1b120089f1ba411ca4458c28ab02eac213671546bbe103f599c1489bd5de6b38c813ef760a844b1560e8362b4fe74a1a59dfd26d6097c7da1e16
 MISC metadata.xml 495 BLAKE2B 9c6f1b29ffb13a553b74ded93c11d29ffdc5a02336adb8fef55b862800a1856e712cdcb06c4e7d90858712d43aafce79f6cf9a357dc0a3c3ca0fc5cdb0ff770e SHA512 fdd9bc3f065ccb354ed0ad5c6544ca70f2011828870b942f2bf2f7001bf1342f858d60a6031cf005623795d1f1d2ccbc3a42fb54dcbd465c3c73f29a928d9091
diff --git a/media-radio/fldigi/fldigi-4.1.20.ebuild b/media-radio/fldigi/fldigi-4.1.20.ebuild
new file mode 100644
index 000000000000..6c51b6e0442f
--- /dev/null
+++ b/media-radio/fldigi/fldigi-4.1.20.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls pulseaudio"
+IUSE_CPU_FLAGS=" sse sse2 sse3"
+IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
+
+RDEPEND="x11-libs/fltk:1[threads,xft]
+	media-libs/libsamplerate
+	media-libs/libpng:0
+	x11-misc/xdg-utils
+	dev-perl/RPC-XML
+	dev-perl/Term-ReadLine-Perl
+	|| (
+		media-libs/portaudio[oss]
+		media-libs/portaudio[alsa]
+	)
+	hamlib? ( media-libs/hamlib:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	>=media-libs/libsndfile-1.0.10"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	append-cxxflags $(test-flags-CXX -std=c++14)
+	local myconf=""
+
+	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
+	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
+	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
+
+	econf ${myconf} \
+		--with-sndfile \
+		$(use_with hamlib) \
+		$(use_enable nls) \
+		$(use_with pulseaudio) \
+		--without-asciidoc
+}
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index 98999ea94ef2..11ad190a715e 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,7 +1,9 @@
 DIST flrig-1.3.54.tar.gz 891644 BLAKE2B 9bb87c9a0960a3975cf27c67b0850c3d6ad3ac4efd41c5f49857fe9e3c1ea22c2db7e7fabfdaa1aeacb82ee3d712313681c5a0bf08cf790a6f63813d6de9a4e1 SHA512 0f143a2ba5afe766219133d76c398b0a8b3d61cd8313d50a18585f2b1454e4aa5802b9a4995b40e0dc4de3b1e58850f76fa9a5342ebe06be20ea1ace5c187eba
 DIST flrig-1.4.0.tar.gz 885450 BLAKE2B 1ad18c07a4812168653969e7f00c8cf2a865caa7764fbbab755ceabf95e6ccabc133a1d1b607b9ee7db9be2d805e76850864f06de5e01762361aeec54bf3d681 SHA512 2d0ebbc51af784b423fe0bc658bacc99975660ea44e613922847d2acdc072c4b0e89eccd05adb88773364cd96a19e2daf3535aa5313690e999b047acbb472ec8
 DIST flrig-1.4.1.tar.gz 916690 BLAKE2B bd411693145e4b69a0fc07d4412ff1c76be1b1a3507176ecf7676581a931caa9b992d279d27afc32a3fa7441cbedce203805ad9cb3ffd0ea145cb6adb7296287 SHA512 d365ea6c260f97fc6a0fe78b49ed69991fbefb06b7e0f4788eac6b0f959c1a1c511596f5ba950ea7153de9dc6ce65f232de0ba0f960cd7b1f31381bfa5e7c90a
+DIST flrig-1.4.2.tar.gz 918730 BLAKE2B 85c2ac351e833b19dab0e36899df58665c86ac397035e8eabad29bb38018a0d2c822ca73b721f2db938a1f7cf2cd2b3a6878f605d5d65f01608563f3f4a0d89e SHA512 094f50a427cabc5c596a4315e7182ea4040218467f06fac456a0fe8923726f30cf3220379033024449066b4379a3877d48449971afe3f4b46b4307f9a64c3ff8
 EBUILD flrig-1.3.54.ebuild 494 BLAKE2B 18a4362c3b53317561478c01954baffbe8b446143cc28d699a8b07c407ccba3b588052d9fd153e024e9605dc310716fe18c882d5a227537bcbf1150d7c2bea99 SHA512 186692d333262ddcd7454760618d5e075464cf43b7769d38804a38419fe7dc120befa0c687cccb19e3a3fdf732338d3c17a04c5edc36b0c3b51a71af90875e18
 EBUILD flrig-1.4.0.ebuild 496 BLAKE2B 4064896c9153034ae69222521400e4d86cf5569e05470b9676ffd235583ec22700c2a8c9649e749e311fec52fd1a3070b4eb2b8c1c6a536e1d475c69cdaac297 SHA512 a12f538adb54c474e5acb4cfeefd19f432e586aea2be9b8ffb5d2a1b271da98df1c30337d517a8197e7334141ee5a6e295485b31af1d58993d5510b757bda068
 EBUILD flrig-1.4.1.ebuild 496 BLAKE2B 4064896c9153034ae69222521400e4d86cf5569e05470b9676ffd235583ec22700c2a8c9649e749e311fec52fd1a3070b4eb2b8c1c6a536e1d475c69cdaac297 SHA512 a12f538adb54c474e5acb4cfeefd19f432e586aea2be9b8ffb5d2a1b271da98df1c30337d517a8197e7334141ee5a6e295485b31af1d58993d5510b757bda068
+EBUILD flrig-1.4.2.ebuild 496 BLAKE2B 288446102c313e4b8a701ddc330235cbf3046248998d246540b94a7a9bc818d2b611e7261bb47a855f6c527d7530365dcb8f5d9761fccd4ff64a5290adf0bb35 SHA512 b74e2e2aa8cd480ba5d4a8e2c6ebc0d92c06323e213c5f2aa6707df5a80313dd69686df8c74df9e88636a7772eba4deb8457dc94c510fa97527348160d7a745d
 MISC metadata.xml 325 BLAKE2B 5a0f279d13c08ae0f8f26ccab563978f7aaf5b4919bdd1b4eb0e5ef102f40d86ac46802d43f7303e97106ad6fb3f52256b03222623bea4b1ce1f7c5350dcceb1 SHA512 90a892833f50bb0d2c4cf95887f83f0fa2c1afd4f33c498e72e157ab9713677127511b44e13d9c4146b6aedd0876acde69cc89c6b5a80a0a847a00683945ffca
diff --git a/media-radio/flrig/flrig-1.4.2.ebuild b/media-radio/flrig/flrig-1.4.2.ebuild
new file mode 100644
index 000000000000..2e63ec038e5d
--- /dev/null
+++ b/media-radio/flrig/flrig-1.4.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools
+
+DESCRIPTION="Transceiver control program for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
+SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DOCS=(AUTHORS ChangeLog README)
+
+RDEPEND="x11-libs/libX11
+	x11-libs/fltk:1
+	x11-misc/xdg-utils"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
diff --git a/media-radio/qsstv/Manifest b/media-radio/qsstv/Manifest
index 24fae84294bb..ba017be51877 100644
--- a/media-radio/qsstv/Manifest
+++ b/media-radio/qsstv/Manifest
@@ -1,3 +1,5 @@
 DIST qsstv_9.5.3.tar.gz 7466438 BLAKE2B 8d38f106f72e051bf4d100c3c10c6ded15e69dfb33289206cce34bfde9210d5231c4d4ddc695417d5511aa8f33a08866ddb224dd9140863264a7a324cc2ffc2e SHA512 1753bb498163d17c80c3c322eda2725eae3de17c99e07fd99f4223508c3048521547148d69623f16f4192212a754f415e0f12f5fc98527b14bf00afcb3ae7c6d
+DIST qsstv_9.5.8.tar.gz 7468561 BLAKE2B 8bf1fda987b44643d88bdb69f11e723f8fa34a9dac13314d57ecac14c683d219349f1f31081cfd2df69cc67f2a7e5467704a4b78dbad58dc93b51915f84a0c57 SHA512 88e1bb62e3838d94c670397fceced7913ac4675e7fea93d78c2b2799ef172c27baad9ac7f7d119eb1130296d21b641164cdd0f53a93967305f632fa9bb3b4e6a
 EBUILD qsstv-9.5.3.ebuild 1209 BLAKE2B 4f428de13d004c0c8fe957bf18389cc8662bc6060411ab587fde01ddc04096433862905b0442dfc9bf75aaac057153b195ace1f36bff98a0e2d67a3600ffdd50 SHA512 1b50c44d59c28b0400e5bdfbe0ff0c3f52f14d3576a3d2c71b1988a48760be1868f50dc2f06c002dd671cb63a334cdf1616aa07f4788f4ee4bcdedc3d35940ad
+EBUILD qsstv-9.5.8.ebuild 1018 BLAKE2B d95da15cd372ef4aa8fd599ce37d6a268a4a2625781365ef448b68047be9f07bbfaeaaf5203536d249debc1e412fac9465f5a213dc2185a83f0756befcf9f68e SHA512 a765ae4eeb1fd279cefe4f9b89d4229e5a9160d2569039a8249a96b6c545401a81aedad76b9bc4d29339a1126063bc152fb00198979775e0c6521e4a0c48facd
 MISC metadata.xml 344 BLAKE2B e091d6e9d0f8a59216bf966dae15ff5d0e588e71a53b936b3dbf979603334407a5e6b378f7a756cd0b320eb0c1294573ba0f1dd3ae392318f854d6c7b482db76 SHA512 e3a236b5b670bb921dd8c7ef87153d16a15ab3b10e4e039c2de68253d56d1356e57d1491c16fac6249265d68639a280f592c62f47d906f4b680fa5571ba9ec75
diff --git a/media-radio/qsstv/qsstv-9.5.8.ebuild b/media-radio/qsstv/qsstv-9.5.8.ebuild
new file mode 100644
index 000000000000..efd776ff19be
--- /dev/null
+++ b/media-radio/qsstv/qsstv-9.5.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+MY_P=${P/-/_}
+
+DESCRIPTION="Amateur radio SSTV software"
+HOMEPAGE="http://users.telenet.be/on4qz/"
+SRC_URI="http://users.telenet.be/on4qz/qsstv/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/hamlib:=
+	media-libs/openjpeg:2
+	media-libs/alsa-lib
+	media-sound/pulseaudio
+	media-libs/libv4l
+	sci-libs/fftw:3.0="
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	x11-misc/xdg-utils"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	eapply_user
+	# fix docdirectory, install path and hamlib search path
+	sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
+		-e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \
+		qsstv.pro || die
+}
+
+src_configure() {
+	eqmake5 PREFIX="/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.txt
+}
diff --git a/media-radio/tlf/Manifest b/media-radio/tlf/Manifest
index 8570e5098c3c..f8e39a936db9 100644
--- a/media-radio/tlf/Manifest
+++ b/media-radio/tlf/Manifest
@@ -1,5 +1,5 @@
 AUX tlf-1.4.1-zone_nr.patch 468 BLAKE2B b9dc26ba4f2775dbdf2f2aacb763a70acbe4c6331a862f9db43774d0bbdeef9214c48f4cf30b0f52de5ab65b9ac157d160b52a19777a640f3a6d53c22187e74d SHA512 e415d62ed1bbb50bf6eedbe5bc93e06c02152bbb7f4a096f9229b3314a21125eec765255a7ddfbd07a478088a5097daaab5f8702d27c04babd5a29a5db7b4e29
 DIST tlf-1.4.1.tar.gz 708105 BLAKE2B 18cd617a8780293bbfec87875491935d16022e104eed128ab69cbc3824aa5f8ab77dd07728d952e9b932ea74ee1c258522c26b5458b715320d452d58a65cfd3c SHA512 89076ba3b870f65b1469d64a223a9d35f1afd3edc6801446990d7ce197b04dacf141efc40382c69c78935a16f386385df0c7b48a040072cecc311cda56d479b5
-EBUILD tlf-1.4.1-r1.ebuild 860 BLAKE2B b6e341a2dbe1231f20240644f63971fd07c95710bab13407d8029172b4b231bd6b3e3871b7c69970818ee3274514eecc348e7bca209cd5f90fd5e51bb3612460 SHA512 1b9908d4b607af9bb75baaf51a3cc41a9b052ba439a0433b49bc9aa83cc154ff62d15ee1d8d95f4c9ef79a4d555e183413afc47392d33436b9a9b50a07250ae5
+EBUILD tlf-1.4.1-r1.ebuild 859 BLAKE2B e262118aa4c6111ff9ce6a0a17b5fd262c4644876d6b5f5ee554617940c87e4832fbe252190c3e443e802d9c04efce06d4bf80f7c29209a0ff04fdb877eaded7 SHA512 84bf6fb85c428400196e577543be48c63033b494023d02af14d27670225a0218d949cd880cdbab758d2ba51de537a8cc0e44094bcc45a292119b2013345ec4af
 EBUILD tlf-1.4.1.ebuild 677 BLAKE2B 8f970b1886111ace7ca4d8ba2582b602a2239c60f64cf423ef1f9f54935bbd4e4bc994927d37615ef2d89a9cc2b97d0e55bef79cd7f99a1cfc6fc81fa073eaa8 SHA512 92662a2c44cb6bb7c74e76bb791bc4d1901e406b0fcb316c4eaf8e376bd7db96f979ceea0b94981170f3d844587999c0ce5a4450da80a23963f6460d8d7f8d59
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/tlf/tlf-1.4.1-r1.ebuild b/media-radio/tlf/tlf-1.4.1-r1.ebuild
index dcbdd0c0db5f..897ebe600935 100644
--- a/media-radio/tlf/tlf-1.4.1-r1.ebuild
+++ b/media-radio/tlf/tlf-1.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2cd5cc424e80..b50c9a0c29a6 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 9770b3cf0450..bd5bfa14238a 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,5 +1,3 @@
-DIST abcMIDI-2021.05.25.zip 604797 BLAKE2B 78b2d43bb7569aa2eece63f319352aa71b77e9c5219c5f806384f007ffe026741a0852ffffe1e6b6c15b60f69f54e143cb26aa47b54baca41bc2fc231fa5b66a SHA512 57975f7c131855a713fc399c7aa1c7bd94775e7a257f2412d321aa51d0bf95cf9e1410e0819d2ad5cabde9ef996512ccca16058f7267baabc5702a926c173b3f
 DIST abcMIDI-2021.06.27.zip 605658 BLAKE2B b522c96b7f8990f297cc13a3334872763fb2879f5893f09e630d66ab425d1772e0eee64273249d26e8118c6d341dad84129e140d8c309adab160f3120b5a18a2 SHA512 b1e4a7a9b93e6633abe211258995cfa84bb8eaed3870ed20e244aa12353c6cc351ea7e1c842e4e410dad9dd91b2e8c918826138bec39503c56e95062f4a99f37
-EBUILD abcmidi-2021.05.25.ebuild 676 BLAKE2B 916e0595b5c1cbf9dad1ba1c9fd7fdba8010898e12ebbc95ef02bcc725cb22a44e8608bf07ec3dd253128aafa3af728ae3709bb9a8bef786b3e6124cd32ae7c5 SHA512 3f000a5a47de4dcc3da9279dee49e962f526833ec4f85dd7f2d749d54b4c08057a99b53deef3c978f7dd1840ffd96b97d3db875d7bf559e27e18042eb8dc8bc6
-EBUILD abcmidi-2021.06.27.ebuild 677 BLAKE2B 15803d35ed97335c94f3ad9d1a8ed07382af8e3b45de89f733426455572547539361a4da2169bfb2aeee50500a1d04e549a2c8ebd75970f8e18a6aa54d1028b8 SHA512 0f9c098e0766993c099e924609e4b51c76c33d3b0e173c1a919dd848dcec5a5dec4af18391638732635b47f385bf9886562c4cab7680ce0f8ca33a468a3ccefa
+EBUILD abcmidi-2021.06.27.ebuild 676 BLAKE2B 916e0595b5c1cbf9dad1ba1c9fd7fdba8010898e12ebbc95ef02bcc725cb22a44e8608bf07ec3dd253128aafa3af728ae3709bb9a8bef786b3e6124cd32ae7c5 SHA512 3f000a5a47de4dcc3da9279dee49e962f526833ec4f85dd7f2d749d54b4c08057a99b53deef3c978f7dd1840ffd96b97d3db875d7bf559e27e18042eb8dc8bc6
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2021.05.25.ebuild b/media-sound/abcmidi/abcmidi-2021.05.25.ebuild
deleted file mode 100644
index 0245e20b7e80..000000000000
--- a/media-sound/abcmidi/abcmidi-2021.05.25.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 autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	sed -i "s:-O2::" configure.ac || die
-	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2021.06.27.ebuild b/media-sound/abcmidi/abcmidi-2021.06.27.ebuild
index ae3ead85a3f5..0245e20b7e80 100644
--- a/media-sound/abcmidi/abcmidi-2021.06.27.ebuild
+++ b/media-sound/abcmidi/abcmidi-2021.06.27.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index fb8fb4c57d0d..417de8d01c59 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,6 +1,7 @@
+AUX ardour-6.8-metadata.patch 653 BLAKE2B 3929d825fd8de5205d0f5aa8d0172e6374ca9ffd195789386b756ae540e1842a9902592b8b6d74019c52f134e8cb9886085e23277ef022883c4425dc580c5bc9 SHA512 963f3cfcd00a3fb15cb9875f7fc31a8294058898b6fab94feb32f786369643139b1e8787ecc47a4ea6a33dabe6bd90f564b6009e0d6e482d8e5129534c789972
 DIST Ardour-6.7.0.tar.bz2 12135868 BLAKE2B 3b217340187e16d3da9302e3505c499c3bba8da7e3be82ff12e8aa99e1c934d42e71c62ae357d7a1265e668293c933a2192ae2f6d6b97f21a2f7c379caf5e9be SHA512 73cf6fff40c838c42c3b29842e15d2e2b991f1e92d57ef0a8e68ef75b39ec8075906ac3ded322b521f2c5fd9fa9d1b7f9c7770b4cc6deee9efe1796889aeffe2
 DIST Ardour-6.8.0.tar.bz2 12152361 BLAKE2B 9f00a0eeae40fcb1f24e3138a639d1063a9cdbaecae2f17425bce133edee5e34ce4d0a1455be4da00725e52389bc1f9d829825b7ef5c591df2c5b0ce5538f463 SHA512 9f829df99fd6d857d54491e18a5c936b4a9b5e55715d71618454dc7c23fb3aaaaa2878a0ec87035c226a69da604111e27ddb00cd28087e34a46e24810c0ff403
 EBUILD ardour-6.7.ebuild 4793 BLAKE2B 20a909b02a0dcb1fc23bc0111fb6524cde07bda5f01c2adbcf60aa38dbce3f40ca12c882b7cff3888142ead3e922cc39f2089600a94d04ceb91fd72c8a6dfa80 SHA512 a1b9878119a933ed8fd0ba74972457f0a767abdeb90848243baa29eada53088aafdd3a5d26019f165795275e16c6edc6da163deb3fbe5873c14eda83e41860e5
-EBUILD ardour-6.8.ebuild 4795 BLAKE2B ed06f247c0d731c0ca4ecccadc3f026565e8d0d9e22d65a0b98d7e028ece42ac3f7d4dadfb8100e0af1592f4c0e0cfcca1645ce59d493c8b67a41683d2fab7ce SHA512 89a6ac56997b3d70bf1077c9eab801c32e84d0b453d1f774cff66ba62813dede7742bda5b6a12e66679847731cf3b5d4fdaf7a982d10bc14d9595e6af976e108
-EBUILD ardour-9999.ebuild 4795 BLAKE2B ed06f247c0d731c0ca4ecccadc3f026565e8d0d9e22d65a0b98d7e028ece42ac3f7d4dadfb8100e0af1592f4c0e0cfcca1645ce59d493c8b67a41683d2fab7ce SHA512 89a6ac56997b3d70bf1077c9eab801c32e84d0b453d1f774cff66ba62813dede7742bda5b6a12e66679847731cf3b5d4fdaf7a982d10bc14d9595e6af976e108
+EBUILD ardour-6.8-r1.ebuild 4828 BLAKE2B 10d3e8d9873ce86abc74ca5ded714de7dc5f0c40a02e127fbb410891f710f7dc1eda35d68c785f37d3ddbfb255df49f42a5a3fe4dccba002ea2988e9cdf7f4b6 SHA512 0d8b4eca1f5556f84033560a1d59efb2ff74bdd02d742bcb48dcd6d8df476846bc400b619999a72f7fc81a5404729132f46708cd80299465724916a97a8d87bb
+EBUILD ardour-9999.ebuild 4833 BLAKE2B 31b4b2bc2270be509b0c1430490001284e3fbe8b584120120927522f386407b70c7e2a039292d435467d289641ce53dd2e94c64f506a7721b55db74b38c0475d SHA512 26daaed2414da80dd52fb7f238a48ed1ba82557e8e6cb270af1e6f9a4eda3d5db287a85596da7214f49cd92ac3ddcb3c066d8ed58506bf379e48535220f94af8
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.8-r1.ebuild b/media-sound/ardour/ardour-6.8-r1.ebuild
new file mode 100644
index 000000000000..f3108601e729
--- /dev/null
+++ b/media-sound/ardour/ardour-6.8-r1.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE='threads(+)'
+PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
+inherit eutils toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="https://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="6"
+IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
+	dev-libs/boost:=
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/raptor:2
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:1
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	media-libs/suil
+	media-libs/lv2"
+#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	jack? ( virtual/jack )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-metadata.patch"
+)
+
+pkg_pretend() {
+	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
+		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
+}
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+	my_lcmsg() {
+		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
+	}
+	plocale_for_each_disabled_locale my_lcmsg
+}
+
+src_configure() {
+	# avoid bug https://bugs.gentoo.org/800067
+	local -x AS="$(tc-getCC) -c"
+
+	local backends="alsa,dummy"
+	use jack && backends+=",jack"
+	use pulseaudio && backends+=",pulseaudio"
+
+	tc-export CC CXX
+	mkdir -p "${D}"
+	local myconf=(
+		--configdir=/etc
+		--freedesktop
+		--noconfirm
+		--optimize
+		--with-backends=${backends}
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$(usex doc "--docs" '')
+		$(usex nls "--nls" "--no-nls")
+		$(usex phonehome "--phone-home" "--no-phone-home")
+		# not possible right now  --use-external-libs
+	)
+
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	waf-utils_src_compile
+	use nls && waf-utils_src_compile i18n
+}
+
+src_install() {
+	local s
+
+	waf-utils_src_install
+
+	mv ${PN}.1 ${PN}${SLOT}.1 || die
+	doman ${PN}${SLOT}.1
+
+	for s in 16 22 32 48 256 512; do
+		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
+	done
+
+	sed -i \
+		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
+		-e 's/;AudioEditing;/;X-AudioEditing;/' \
+		build/gtk2_ardour/ardour${SLOT}.desktop || die
+	domenu build/gtk2_ardour/ardour${SLOT}.desktop
+
+	insinto /usr/share/mime/packages
+	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/ardour/ardour-6.8.ebuild b/media-sound/ardour/ardour-6.8.ebuild
deleted file mode 100644
index bd4fb59624cd..000000000000
--- a/media-sound/ardour/ardour-6.8.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
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit eutils toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="https://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="6"
-IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	dev-libs/boost:=
-	dev-libs/glib:2
-	dev-libs/libsigc++:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/libsoundtouch
-	media-libs/raptor:2
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:1
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	media-libs/suil
-	media-libs/lv2"
-#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	jack? ( virtual/jack )"
-
-pkg_pretend() {
-	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
-		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
-}
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_src_prepare
-
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-	my_lcmsg() {
-		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
-	}
-	plocale_for_each_disabled_locale my_lcmsg
-}
-
-src_configure() {
-	local backends="alsa,dummy"
-	use jack && backends+=",jack"
-	use pulseaudio && backends+=",pulseaudio"
-
-	tc-export CC CXX
-	mkdir -p "${D}"
-	local myconf=(
-		--configdir=/etc
-		--freedesktop
-		--noconfirm
-		--optimize
-		--with-backends=${backends}
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-		$(usex doc "--docs" '')
-		$(usex nls "--nls" "--no-nls")
-		$(usex phonehome "--phone-home" "--no-phone-home")
-		# not possible right now  --use-external-libs
-	)
-
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	waf-utils_src_compile
-	use nls && waf-utils_src_compile i18n
-}
-
-src_install() {
-	local s
-
-	waf-utils_src_install
-
-	mv ${PN}.1 ${PN}${SLOT}.1 || die
-	doman ${PN}${SLOT}.1
-
-	for s in 16 22 32 48 256 512; do
-		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
-	done
-
-	sed -i \
-		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
-		-e 's/;AudioEditing;/;X-AudioEditing;/' \
-		build/gtk2_ardour/ardour${SLOT}.desktop || die
-	domenu build/gtk2_ardour/ardour${SLOT}.desktop
-
-	insinto /usr/share/mime/packages
-	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-
-	insinto /usr/share/metainfo
-	doins build/gtk2_ardour/ardour${SLOT}.appdata.xml
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index bd4fb59624cd..41b264273ca0 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -71,6 +71,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
 	jack? ( virtual/jack )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-6.8-metadata.patch"
+)
+
 pkg_pretend() {
 	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
 		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
@@ -84,7 +88,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
 	xdg_src_prepare
 
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
@@ -119,6 +122,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# avoid bug https://bugs.gentoo.org/800067
+	local -x AS="$(tc-getCC) -c"
+
 	local backends="alsa,dummy"
 	use jack && backends+=",jack"
 	use pulseaudio && backends+=",pulseaudio"
@@ -166,9 +172,6 @@ src_install() {
 
 	insinto /usr/share/mime/packages
 	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-
-	insinto /usr/share/metainfo
-	doins build/gtk2_ardour/ardour${SLOT}.appdata.xml
 }
 
 pkg_postinst() {
diff --git a/media-sound/ardour/files/ardour-6.8-metadata.patch b/media-sound/ardour/files/ardour-6.8-metadata.patch
new file mode 100644
index 000000000000..fa7b6e121197
--- /dev/null
+++ b/media-sound/ardour/files/ardour-6.8-metadata.patch
@@ -0,0 +1,13 @@
+diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
+index f5d0533..a68cb3f 100644
+--- a/gtk2_ardour/wscript
++++ b/gtk2_ardour/wscript
+@@ -943,7 +943,7 @@ def build(bld):
+         obj.chmod        = Utils.O644
+         obj.dict         = freedesktop_subst_dict
+         set_subst_dict(obj, freedesktop_subst_dict)
+-        bld.install_files (os.path.join (bld.env['PREFIX'], 'share/appdata'), obj.target)
++        bld.install_files (os.path.join (bld.env['PREFIX'], 'share/metadata'), obj.target)
+ 
+         # install desktop icon files
+         bld.install_as('${PREFIX}/share/icons/hicolor/16x16/apps/ardour6.png', 'resources/Ardour-icon_16px.png')
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index c4bb0c438f3f..e6b423de7316 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,4 +1,5 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
+AUX cantata-2.4.2-solid-musl.patch 1035 BLAKE2B 43b0f3312e93f8fe92b56dd488a70c815f448b6907ae1db3418f65aaef394f06ffb82279c483185cc4cde74081b28a0bba3b92c8c5a29f2fff2d3ff5ab510d67 SHA512 eb34e0939500b9176829347329ed508f0ba08e92cf450b949661a103782385cfd9175551cd8f0832799ebcf116c89cca98fad4eaa236729c38c1724b5b981221
 DIST cantata-2.4.2.tar.bz2 2498460 BLAKE2B 82486a644fa90567f2c1c997645817d9adee841b79fb782c4984143a0ef25758e8b6605de86eed1c09b2b63b9d570adc0c647245c5e0e900652c0444671c67a7 SHA512 c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b
-EBUILD cantata-2.4.2.ebuild 3023 BLAKE2B d67a40780e02d9b501c946e3b0a1658b717da096cd8d258c5d4d31d9829429c715d1c94a797ec1305067c60d5c81327e93f21f6b6a737211690b7d161d011d9a SHA512 eaf95a88f371d2fb7085555bf2273605b4c68d8e6a14419005d6975c777a6ecd77c0c32608f61cc967f3f1cb26838b2348e5b3a07f02e27aecfffa04c8ac32c3
+EBUILD cantata-2.4.2.ebuild 3074 BLAKE2B 9b296e832b7436de60c1a7966cdf8e81190eef8558b611e5ca0ef26c16445ab3143cb88d93e25a5f2974aed623911b6ef5f094bff610d8f029fd484db38e7364 SHA512 8f70c086d37c4d708d8013819df44a468efe62e35c017dc5ee381ac7724161528d4d0764ec6d8416553838056012e317448cb8acf1d91ba18166e5d98de3219c
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.4.2.ebuild b/media-sound/cantata/cantata-2.4.2.ebuild
index 3c42d80b49d1..19e2a7c4abd3 100644
--- a/media-sound/cantata/cantata-2.4.2.ebuild
+++ b/media-sound/cantata/cantata-2.4.2.ebuild
@@ -66,7 +66,10 @@ DEPEND="${COMMON_DEPEND}
 # cantata has no tests
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-headers.patch"
+	"${FILESDIR}/${P}-solid-musl.patch" # bug 792555
+)
 
 src_prepare() {
 	remove_locale() {
diff --git a/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch b/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch
new file mode 100644
index 000000000000..6b541536c62e
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch
@@ -0,0 +1,29 @@
+From 835e48074834fb5b888d53b00f84967701d6d78a Mon Sep 17 00:00:00 2001
+From: Michael Pyne <mpyne@kde.org>
+Date: Sun, 23 Jul 2017 11:37:10 -0400
+Subject: [PATCH] Require sys/types.h for dev_t unconditionally.
+
+Fixes a build error with musl libc.  Turns out this is the required
+header for dev_t, and not just for FreeBSD.  That it works without on
+glibc is just an accident.
+
+Differential Revision: https://phabricator.kde.org/D6596
+
+(cherry picked from commit 2382c3f8d3669c473130f4baefb68d244dcb5cbc)
+---
+ 3rdparty/solid-lite/backends/udisks2/udisksblock.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/3rdparty/solid-lite/backends/udisks2/udisksblock.h b/3rdparty/solid-lite/backends/udisks2/udisksblock.h
+index 87c358099a..7b7305d73e 100644
+--- a/3rdparty/solid-lite/backends/udisks2/udisksblock.h
++++ b/3rdparty/solid-lite/backends/udisks2/udisksblock.h
+@@ -24,6 +24,8 @@
+ #include <solid-lite/ifaces/block.h>
+ #include "udisksdeviceinterface.h"
+ 
++#include <sys/types.h> // dev_t
++
+ namespace Solid
+ {
+ namespace Backends
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 903bfc564204..232066c20893 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,6 +1,6 @@
 AUX clementine-1.4.0_rc1-QPainterPath_include.patch 1395 BLAKE2B e95d24a03e8a7ce2ff2465d37615a1b7a5ce2d435af4795a7e22f3550807dd939f21993b3c2fd69318326ab4a07ce9a8125177958d0e5ac307cead3a707db5c5 SHA512 ca8125e10712d06ffdbb28311eca33c914dff0fc34e1edc8be4b06778443d4097aad86315360e9915bcb6829f70e33c652ff0745754e02ef4e44860660beac54
 AUX clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch 3349 BLAKE2B dcea69040e8de44746e7e83d9d8024d1133e68915c110e397b262294239b9a8151784ec13d3d5871553c6ba5e5b43d4638dcd3f69a5599ba22696c4ab8fd42f8 SHA512 60dfe7f5e28ede7e1cc5c91fffb2690cd17407e8a4f59e29008d6025e36e38d8f80eb67d49c1c3f4c982c4eea5821c11bd9760cc8d1dadc4706ae7bcc9232d79
 DIST clementine-1.4.0rc1.tar.xz 5593564 BLAKE2B 894d86903df1ba43fca2f07c83d92bcb5d65a0103a4ecd1b321d44259534930c977f0caeaf0c93446dbec4422937f2ddc7f665daa7cb41e5c183fa7f16571809 SHA512 c74102a3ca4a99c3627b718389478e5ca79ba71ce45eccd232ca2eb3fb60a1632afa62908a2831244d6c35154ad6a8b4fa2b2485b4440b9685a0521bfacaabdb
-EBUILD clementine-1.4.0_rc1.ebuild 4986 BLAKE2B 75c1c04953f50b29f16dd8781b8e4905f37ac8530a0bc7c468256e6b26c9aa41de01b441a95d00114306e326c51a20cf9bf9f2eaac3606e7826f43c9632f6336 SHA512 1c21bb0e590da5abe47d5dfcb8cff8647373f496b021a889665bedf4e1d342cab6ed3a137937e74827dc11968849cd98dfcd527b2afafe3dd160ffc7d92b680a
-EBUILD clementine-9999.ebuild 4820 BLAKE2B 0d5a3e5c2b834b9f0f759cb0393d4910f3959b0873548dfb5c644a494e6bb4ff5d21bdde3e262699bdf492708e019e0b9d5241c8504a41a807f296cf30f8b7bd SHA512 3409a203f8fc6d009b088b273da0547c80523d9627f24969a21e9a57437ac9dc23f31673ab7b2cc2467b8d6165b01d6f46260143d6073c655f9f6d274014cde5
+EBUILD clementine-1.4.0_rc1.ebuild 4988 BLAKE2B a80aeb5d542e72bd762471bcbd8b20d36792f9d3d4aa8fe154da4992f9fbe1390b637138720fa9654f4ba475510c957eaa7851d0ce0e1c3fd62fe5365bc811eb SHA512 d80d92da2256cc0ef44556bd2989627710eab6225d9ee4413514d71eaec02e0e112cb6191d5cb5e142a41ff8a00806c0fc7a26dbfed7a7a5839f7c29dc597b98
+EBUILD clementine-9999.ebuild 4822 BLAKE2B 3ba9856098109037df8bb9e865f8b7ad75fdc287cacdfce03f8e2fdb44224b2ae76dff3c8e97c5dc46425318ddcf7e79440ca3ab666f37ef154726ead960343e SHA512 d56d26c47718a76e2b2a8279f3c537c31887e783dfdb2acecb21317c7ddc0b8d4a4006e6261f5e0f53a7d5cff9751f6befeb1bada031cd40d8a35d906a468eb4
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
index 5de702b16315..20ab0d44c70d 100644
--- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
+++ b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
@@ -77,7 +77,7 @@ COMMON_DEPEND="
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	projectm? (
 		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0:=
+		>=media-libs/libprojectm-3.1.12:0=
 		virtual/opengl
 	)
 "
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 448b740211bf..7043ee826cde 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -77,7 +77,7 @@ COMMON_DEPEND="
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	projectm? (
 		media-libs/glew:=
-		>=media-libs/libprojectm-1.2.0:=
+		>=media-libs/libprojectm-3.1.12:0=
 		virtual/opengl
 	)
 "
diff --git a/media-sound/cmusfm/Manifest b/media-sound/cmusfm/Manifest
index f2eae85b050a..82f2d9c8328b 100644
--- a/media-sound/cmusfm/Manifest
+++ b/media-sound/cmusfm/Manifest
@@ -1,3 +1,5 @@
 DIST cmusfm-0.4.0.tar.gz 41451 BLAKE2B 02fe95079b902c23b594d25c93e99da4ff9a62437a3edb0ff0812db6d490a6320da5e6b5387aa49a55490b02c17b7982d48b3d773687ccffa5d85adee6b54aeb SHA512 dba2ca51953186ca21bd5074367da21c74a371b1ae7578cc851badf3f225274bfe7f3e5f5d7a322c50be9d839af2568339d10fae2d402548e5246a11f6acf9ae
-EBUILD cmusfm-0.4.0.ebuild 826 BLAKE2B bb7d3d59579a71287a91c134d10b3e36085d97deaf0cdd8e49d6c7b028aa02d94aca50bbcfded9b22eeb695da991cc84e7d142cdf5ff73c87fa8b8a511d1e169 SHA512 af62618a187d8b8c96ceeb6182c67b19d6551f614313d9e1d71ac8473ce17d71e77c061dbed755ed72258f1c5d2911a7576e1c825b12defd7c09c2337c2b2ea4
+DIST cmusfm-0.4.1.tar.gz 41960 BLAKE2B 4de96b821c56f64c485dae8ff1e4d342e8f1548650a455ec707f01f53afeb7ca3e333ca62b514e2389a884d9138eb5d228a7376c5a1d5cdd163abc8ab9482608 SHA512 994599675822de5f809b3eedc423c37afe24e88df29fe4474d1834bf1e9573464d2bdbb084181db1d6c3bc0541891ccbb4514afa066c034e39035192ebc95211
+EBUILD cmusfm-0.4.0.ebuild 824 BLAKE2B d545b00c61a8673566bd9441f218eac8a002e13f62d1a36e2372b759c1d319ce66d5709a0d6edfa804fd492c722750e7c3a910bdb22c361d250d3a5da0d56275 SHA512 a81ccf415645833e912156e5da7ad891cfd62cdf2e22b24ee9b1c1b739b534c2ff1d0f516b119418d610d713dec82473045307dbc1588678c515b2714d999448
+EBUILD cmusfm-0.4.1.ebuild 826 BLAKE2B bb7d3d59579a71287a91c134d10b3e36085d97deaf0cdd8e49d6c7b028aa02d94aca50bbcfded9b22eeb695da991cc84e7d142cdf5ff73c87fa8b8a511d1e169 SHA512 af62618a187d8b8c96ceeb6182c67b19d6551f614313d9e1d71ac8473ce17d71e77c061dbed755ed72258f1c5d2911a7576e1c825b12defd7c09c2337c2b2ea4
 MISC metadata.xml 339 BLAKE2B 6a18cee3e017ee1e67fc035e63bcf5248a175a2e116964467f8f021e5b3f49606dbff1cc7aeb472e81d4f44c767e077b24fcd9f533868f0c4332f8d6465ec961 SHA512 78c63eceb28e387d635e34fe4800d0af9e30fd5ba4687955bb5383bd8ff4c9e3573d200ddcb36f3efd16d732cc6d7ca48c59381826ea80f6791a0c31da91d08b
diff --git a/media-sound/cmusfm/cmusfm-0.4.0.ebuild b/media-sound/cmusfm/cmusfm-0.4.0.ebuild
index b2cac96f9c33..efe088bb52b6 100644
--- a/media-sound/cmusfm/cmusfm-0.4.0.ebuild
+++ b/media-sound/cmusfm/cmusfm-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Arkq/cmusfm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libnotify"
 
 DEPEND="
diff --git a/media-sound/cmusfm/cmusfm-0.4.1.ebuild b/media-sound/cmusfm/cmusfm-0.4.1.ebuild
new file mode 100644
index 000000000000..b2cac96f9c33
--- /dev/null
+++ b/media-sound/cmusfm/cmusfm-0.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1
+
+DESCRIPTION="Last.fm scrobbler for cmus music player"
+HOMEPAGE="https://github.com/Arkq/cmusfm"
+SRC_URI="https://github.com/Arkq/cmusfm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+DEPEND="
+	net-misc/curl
+	dev-libs/openssl:0=
+	libnotify? ( x11-libs/libnotify )
+"
+RDEPEND="
+	${DEPEND}
+	media-sound/cmus
+"
+BDEPEND="virtual/pkgconfig"
+
+DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time."
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable libnotify)
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+}
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index b0ff2a38703f..fa408904b05c 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,18 +1,11 @@
 AUX csound-6.13.0-xdg-open.patch 982 BLAKE2B e6643fc554feb8b0fd4cbb4d96e6ca727bf04da998b61df515e090fc0784ce9c2fbe0b67ce45da83d36838cc57de6de5f176d38c322b1586264a527b1b44fe09 SHA512 e141beafdd2a93bbd7bd0a12c71e1dc3ffd2c67558c3e7e47a24298aefe6197bbde179d2bfc7e82e78bdffac1c889d43789a17e364785e9892bd35306fa07c6a
-AUX csound-6.15.0-fix-soname.patch 814 BLAKE2B b288dbb48eff8691ff5a35ca3cb9afff0a7b8213c163055081c46e1c190cebdbab9cd1c9d25763d0ee2ba9d283fa02c7e8a72c09abda127af1c1109e11aaebc5 SHA512 5ca3234911fd59a512047c966ef3478e70df3cd10846ec9f297d4112109563b79f1862ab602a7a1b17a6ddba880cdc240f97ae578889d731d2bf8dcd1f09117b
 AUX csound-6.15.0-lame.patch 737 BLAKE2B 5febfbd58a9f4591f2ac06fbdc311552d18153cec7d3f5923d14319eea02ad69d75277aaa75a06ad02bd23d2d24a9913f7bb9719456ef98c487e93091b841278 SHA512 2e71e5c46b78e8867257ee86e70072f3c2e7f6021e67d0a3381cbc8226cb7deb023b8ffc1d047628ec527da6fc383a55ce310402c5ecc2696ff36250ecf7081d
 AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d218985426e9ba9a808399fb4b8973d9acce3063c968fca561a1429035b01e85588e99c0135521f92ea96c SHA512 fa418daaddcce4f5296596038726720675ad9988f57bbcd943bf2f247fd8368401a193c031ab65bea5753b37274f41cb9bf28dd2b18309bd0cee90b931d2fab1
-DIST Csound6.15.0_manual_html.zip 20674415 BLAKE2B b15b3381f13c7877130dfec60803ba1cdd12e5d2d92e5ea02c4d0dd5c1c70cc2bbec5f76634b385a0ffd20e7397d6c33bbe374128f01345999f34e2e2a0b7dd1 SHA512 cf7df42f3b6d869a5e9f531c64a50287f9385927b26c48ff3c334b2ed95d17334be85a3ef671008504d1a365b1412e2715dcff61a41e3c83b60621df25d67946
-DIST Csound6.15.0_manual_pdf.zip 9360598 BLAKE2B 898da87eb8b10a75f3f6256eeade7aa180ff5e6dd93de8d2bf462d01d1d1cf5f4c5d7c4ed73402aa019674d597ff3fd1b7ac436059d9df39e0d77a15365d529e SHA512 0eca00951708d7064d789bdd0d98534e815ecc275e09b3020cce89d6f6b1009c0347e7d5fd400ed321bd7e05c89d79644f64c18f47b46013bb6b49c88e42fca0
 DIST Csound6.16.0_manual_html.zip 24765630 BLAKE2B 3bf6e2202a42dfa826d39ef41282e1942f26cc3f6a3358e0de3a006f102b686342b4e1824a1c3a48ac37ffed31d9353e6946d948751dcc059819da649d63d9cb SHA512 e550a832e365ab186533045d110259699039d08a85ec2f53d4fe36aa31004725b1dc6732f71d9895fa19b3df5f4ec720af1b4f80856a14b0ffbd844c4ab2dbe3
 DIST Csound6.16.0_manual_pdf.zip 9640644 BLAKE2B 7bb35f806568a80abbd84a4f4988217bea09f3174881d802f6d61505f044c8a26b59036dcb61ead5315e756a4512eb1fb56b2824f27f09899a8fe1664a386754 SHA512 18347ce7080ca7997e98f8addffcc492c7ec5d8e037e71a33bb46fdbc5b58ec26ee42f370689fc228d4150bd9dedc31c7824ec4c19f3243d512977f4380f9490
-DIST csound-6.15.0-distributable.tar.xz 25156784 BLAKE2B f944385256b423d95da2df8da7dc2bcf164ffc469f55650396827bc9da49ef1778039772e149bcbde77c71a363e8ea253ec3103c753cc3916d63d450f571c2a8 SHA512 a0a65805507ac7afd6bcb0fe988cb1bdba0a95a591ac6837a2c31cf3a7aeef56fee44eed7bca14409ccf600412782098a8c2ffb1aecb5eefd703bc270a0ee308
-DIST csound-6.16.0-distributable.tar.xz 25129496 BLAKE2B cecfe82e9d584ac9e453659b617d54d2f899efd3e65243ba38770e5174baec6f12b0fa6c06c8ef2154f7c80faee8b9992bbe0957892a4ba86e142066aea85578 SHA512 243b23fc7cde3f0348953e88856117355b5b7185314045aad1b6dac236e227c558afd3fd8a73d9d760f3e5a30ee50d02cc7fe3d8b4b84fb63fa82c64972ca1ca
 DIST csound-6.16.1-distributable.tar.xz 25142436 BLAKE2B fe29208afe2cfc9740e68da213f269ca909facd452ffdd595e14a6dc14526bd497e8a2bc1832da28b0bbd6c8b9ac8891f79d819abf64cba0a9e1002c42f8e5dd SHA512 2535f16dab6a682e38b8352cb7bb87a65aedf0550c1705cde8a64b3c0112d7fd97e6c366dad18ef9ef5e1baaf7123f2c0032d9a2ab6979c202692c3a4069117e
 DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d SHA512 b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75
-EBUILD csound-6.15.0-r101.ebuild 7400 BLAKE2B 9d711ee4305dbbe74d059f67109aa24a55fa99ec661c20c119cbe3344569904dd4f0888eaafb62bdfff2d178cbbc724bb1222b30a7cfd571a027e2b25f1247a0 SHA512 743d51af0fbc2235cba6968bbee28213b4aebc0b876cf4b820e3034a94b6b7d36b4cbaad1facf5f2a87db1cbdbbd4c6ed634f91f8b5ce3d1406040fca8aedf7c
-EBUILD csound-6.16.0.ebuild 7121 BLAKE2B 37403bd6c1326b4684a43e47d60e01eece0ec35f05b8d883ddec22f2648045388e76afde0f62ae8bc8b3dab5ea1b38a85398c1993a147619e37424ef78398e5a SHA512 1b81cd50e7274ce13f99241915c8070b0918160f9669a6b1cbe9a8a58dfdb62030d5dab990dd9d36f893d1f147fc85d6e906e6813253b7a5e7206cbeee734f4b
-EBUILD csound-6.16.1.ebuild 7134 BLAKE2B db5317b6bee40c4c71beafcfe5a835ed0ca5efdb51ca1ad2efa7bd8ba5d163a2d3b209a6fee0e46e19fdef6c1c758a859372028c83681a26c99e8163fbfad98e SHA512 584f1e398cac005552c18e86bec63e4690eb4282c0f9663c0fac4e632ee2aec737c59d6e24b23d0444eb0b5dc43656cb3b0a5873a708ca51a12606bfdbbdac65
+EBUILD csound-6.16.1.ebuild 7132 BLAKE2B 134d88291b5af94d99a8c2e0b6b421b3a75722db07b204eb0e8e98991365ecc78a260f691ba3fb37191da4b506ec8bd57392174e191a9ed3185b38280c89a882 SHA512 30a822eea460f01ba8b6201c8978d1fc1f40ff9cdea8ebb1fbe99ed7c3b6adac686ab400a5ec1adc9321b978c3919408ad79f22b393fc3d34e003dc860ac987f
 EBUILD csound-6.16.2.ebuild 7134 BLAKE2B db5317b6bee40c4c71beafcfe5a835ed0ca5efdb51ca1ad2efa7bd8ba5d163a2d3b209a6fee0e46e19fdef6c1c758a859372028c83681a26c99e8163fbfad98e SHA512 584f1e398cac005552c18e86bec63e4690eb4282c0f9663c0fac4e632ee2aec737c59d6e24b23d0444eb0b5dc43656cb3b0a5873a708ca51a12606bfdbbdac65
 EBUILD csound-9999.ebuild 6880 BLAKE2B f07b7aff3c721a0115d1edd7e6389ecc7203ff7bb20c4d114516a96490a29af0005837724a1ddeb5ae3ae362fa8a743757c13b6fe16dfc68346089b4e66d837d SHA512 cb74a9452eda7897f5595491d2c974cba029af4609faaed6fadcb2895b850e5c73b0e54c62172bd50919cb46de20aaa9f1a510c8a43298f750ae93cfd34fa256
-MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
+MISC metadata.xml 1243 BLAKE2B 6b712153b62ca450d210ce952be81e8afba4f9d6f28271e906f8ce2e2724d4be0ed5b786c36ef7a446a2afd0650dbdcc7651f3875d2565a288166591e91e2f83 SHA512 55408c022fab06dea586dbb681b54b9582acf13a57e95c2cedd0369010447829eb01d52cd5a0e29e8d59510f43420e6051188d4b886a236e15cb44145d5fe46f
diff --git a/media-sound/csound/csound-6.15.0-r101.ebuild b/media-sound/csound/csound-6.15.0-r101.ebuild
deleted file mode 100644
index d07527f6c9b8..000000000000
--- a/media-sound/csound/csound-6.15.0-r101.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake lua-single python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/csound/csound.git"
-	inherit git-r3
-else
-	DOC_P="Csound${PV}"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-		doc? (
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-		)"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and performance"
-HOMEPAGE="https://csound.github.io/"
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 +image jack java keyboard linear lua mp3 nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
-vim-syntax websocket"
-
-REQUIRED_USE="
-	alsa? ( threads )
-	java? ( cxx )
-	linear? ( double-precision )
-	lua? ( ${LUA_REQUIRED_USE} cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-util/cunit
-		${PYTHON_DEPS}
-	)
-"
-# linear currently works only with sci-mathematics-gmm-5.1
-#   https://github.com/csound/csound/issues/920
-CDEPEND="
-	dev-cpp/eigen:3
-	>=media-libs/libsndfile-1.0.16
-	media-libs/libsamplerate
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dssi? (
-		media-libs/dssi
-		media-libs/ladspa-sdk
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	hdf5? ( sci-libs/hdf5 )
-	image? ( media-libs/libpng:0= )
-	jack? ( virtual/jack )
-	java? ( >=virtual/jdk-1.8:* )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( =sci-mathematics/gmm-5.1* )
-	lua? ( ${LUA_DEPS} )
-	mp3? ( >=media-sound/lame-3.100-r3 )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	stk? ( media-libs/stk )
-	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets:= )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="
-	${CDEPEND}
-	dev-libs/boost
-"
-
-if [[ ${PV} != "9999" ]]; then
-	DEPEND+="doc? ( app-arch/unzip )"
-fi
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
-	"${FILESDIR}/${PN}-6.15.0-lame.patch"
-	"${FILESDIR}/${PN}-6.15.0-fix-soname.patch"
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-
-	if use doc; then
-		local png="${WORKDIR}/html/images/delayk.png"
-		pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
-		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
-		mv -f ${png/.png/fixed.png} ${png} || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BELA=OFF
-		-DBUILD_BUCHLA_OPCODES=ON
-		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_COUNTER_OPCODES=ON
-		-DBUILD_CSBEATS=$(usex beats)
-		-DBUILD_CUDA_OPCODES=OFF
-		-DBUILD_CXX_INTERFACE=$(usex cxx)
-		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		-DBUILD_EMUGENS_OPCODES=ON
-		-DBUILD_EXCITER_OPCODES=ON
-		-DBUILD_FAUST_OPCODES=OFF
-		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DBUILD_FRAMEBUFFER_OPCODES=ON
-		-DBUILD_HDF5_OPCODES=$(usex hdf5)
-		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DBUILD_INSTALLER=OFF
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=$(usex java)
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
-		-DBUILD_MULTI_CORE=$(usex threads)
-		-DBUILD_OPENCL_OPCODES=OFF
-		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DBUILD_P5GLOVE_OPCODES=OFF
-		-DBUILD_PADSYNTH_OPCODES=ON
-		-DBUILD_PLATEREV_OPCODES=ON
-		-DBUILD_PVSGENDY_OPCODE=OFF
-		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DBUILD_PYTHON_OPCODES=$(usex python)
-		-DBUILD_RELEASE=ON
-		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
-		-DBUILD_SELECT_OPCODE=ON
-		-DBUILD_SERIAL_OPCODES=ON
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STACK_OPCODES=ON
-		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
-		-DBUILD_STK_OPCODES=$(usex stk)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_UTILITIES=$(usex utils)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_VST4CS_OPCODES=OFF
-		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-		-DBUILD_WIIMOTE_OPCODES=OFF
-		-DBUILD_WINSOUND=OFF
-
-		-DFAIL_MISSING=ON
-		-DNEW_PARSER_DEBUG=$(usex debug)
-		-DREQUIRE_PTHREADS=$(usex threads)
-
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_ATOMIC_BUILTIN=ON
-		-DUSE_AUDIOUNIT=OFF # Apple specific
-		-DUSE_COMPILER_OPTIMIZATIONS=ON
-		-DUSE_COREMIDI=OFF # Apple specific
-		-DUSE_CURL=$(usex curl)
-		-DUSE_DOUBLE=$(usex double-precision)
-		-DUSE_FLTK=$(usex fltk)
-		-DUSE_GETTEXT=$(usex nls)
-		-DUSE_GIT_COMMIT=ON
-		-DUSE_IPMIDI=ON
-		-DUSE_JACK=$(usex jack)
-		-DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
-		-DUSE_LRINT=ON
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PORTMIDI=$(usex portmidi)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-
-	)
-
-	use java && mycmakeargs+=(
-		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
-	)
-
-	use lua && mycmakeargs+=(
-		-DLUA_H_PATH="$(lua_get_include_dir)"
-		-DLUA_LIBRARY="$(lua_get_shared_lib)"
-		# LUA_MODULE_INSTALL_DIR omitted on purpose, csound Lua module links against liblua
-		# so it must NOT be installed into cmod_dir.
-	)
-
-	use python && mycmakeargs+=(
-		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc -r Release_Notes/.
-
-	# generate env.d file
-	cat > "${T}"/62${PN} <<-_EOF_ || die
-		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
-		CSSTRNGS="${EPREFIX}/usr/share/locale"
-	_EOF_
-	if use stk ; then
-		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
-	fi
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{,csound_}extract || die
-
-	use python && python_optimize
-
-	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
-
-	# install docs
-	if [[ ${PV} != "9999" ]] && use doc ; then
-		dodoc "${WORKDIR}"/*.pdf
-		dodoc -r "${WORKDIR}"/html
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}
diff --git a/media-sound/csound/csound-6.16.0.ebuild b/media-sound/csound/csound-6.16.0.ebuild
deleted file mode 100644
index c21367e524e4..000000000000
--- a/media-sound/csound/csound-6.16.0.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# As upstream (and we aswell) are not allowed to redistribute scansyn,
-# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
-# Reference: https://github.com/csound/csound/issues/1148
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake lua-single python-single-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/csound/csound.git"
-	inherit git-r3
-else
-	DOC_P="Csound${PV}"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
-		doc? (
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
-			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
-		)"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Sound design and signal processing system for composition and performance"
-HOMEPAGE="https://csound.github.io/"
-
-LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
-SLOT="0"
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
-vim-syntax websocket"
-
-REQUIRED_USE="
-	alsa? ( threads )
-	java? ( cxx )
-	linear? ( double-precision )
-	lua? ( ${LUA_REQUIRED_USE} cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
-"
-
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-util/cunit
-		${PYTHON_DEPS}
-	)
-"
-# linear currently works only with sci-mathematics-gmm-5.1
-#   https://github.com/csound/csound/issues/920
-CDEPEND="
-	dev-cpp/eigen:3
-	>=media-libs/libsndfile-1.0.16
-	media-libs/libsamplerate
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	dssi? (
-		media-libs/dssi
-		media-libs/ladspa-sdk
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	hdf5? ( sci-libs/hdf5 )
-	jack? ( virtual/jack )
-	java? ( >=virtual/jdk-1.8:* )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( =sci-mathematics/gmm-5.1* )
-	lua? ( ${LUA_DEPS} )
-	mp3? ( >=media-sound/lame-3.100-r3 )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	stk? ( media-libs/stk )
-	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets:= )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="
-	${CDEPEND}
-	dev-libs/boost
-"
-
-if [[ ${PV} != "9999" ]]; then
-	DEPEND+="doc? ( app-arch/unzip )"
-fi
-
-# requires specific alsa settings
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
-	"${FILESDIR}/${PN}-6.15.0-lame.patch"
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
-		-e '/-O3/d' \
-		-i CMakeLists.txt || die
-
-	if use doc; then
-		local png="${WORKDIR}/html/images/delayk.png"
-		pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
-		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
-		mv -f ${png/.png/fixed.png} ${png} || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BELA=OFF
-		-DBUILD_BUCHLA_OPCODES=ON
-		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_COUNTER_OPCODES=ON
-		-DBUILD_CSBEATS=$(usex beats)
-		-DBUILD_CUDA_OPCODES=OFF
-		-DBUILD_CXX_INTERFACE=$(usex cxx)
-		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		-DBUILD_EMUGENS_OPCODES=ON
-		-DBUILD_EXCITER_OPCODES=ON
-		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DBUILD_FRAMEBUFFER_OPCODES=ON
-		-DBUILD_HDF5_OPCODES=$(usex hdf5)
-		-DBUILD_INSTALLER=OFF
-		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=$(usex java)
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
-		-DBUILD_MULTI_CORE=$(usex threads)
-		-DBUILD_OPENCL_OPCODES=OFF
-		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DBUILD_P5GLOVE_OPCODES=OFF
-		-DBUILD_PADSYNTH_OPCODES=ON
-		-DBUILD_PLATEREV_OPCODES=ON
-		-DBUILD_PVSGENDY_OPCODE=OFF
-		-DBUILD_PYTHON_INTERFACE=$(usex python)
-		-DBUILD_RELEASE=ON
-		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
-		-DBUILD_SELECT_OPCODE=ON
-		-DBUILD_SERIAL_OPCODES=ON
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STACK_OPCODES=ON
-		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
-		-DBUILD_STK_OPCODES=$(usex stk)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_UTILITIES=$(usex utils)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_VST4CS_OPCODES=OFF
-		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-		-DBUILD_WIIMOTE_OPCODES=OFF
-		-DBUILD_WINSOUND=OFF
-
-		-DFAIL_MISSING=ON
-		-DNEW_PARSER_DEBUG=$(usex debug)
-		-DREQUIRE_PTHREADS=$(usex threads)
-
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_ATOMIC_BUILTIN=ON
-		-DUSE_AUDIOUNIT=OFF # Apple specific
-		-DUSE_COMPILER_OPTIMIZATIONS=ON
-		-DUSE_COREMIDI=OFF # Apple specific
-		-DUSE_CURL=$(usex curl)
-		-DUSE_DOUBLE=$(usex double-precision)
-		-DUSE_FLTK=$(usex fltk)
-		-DUSE_GETTEXT=$(usex nls)
-		-DUSE_GIT_COMMIT=ON
-		-DUSE_IPMIDI=ON
-		-DUSE_JACK=$(usex jack)
-		-DUSE_LIB64=$([[ $(get_libdir) == "lib64" ]] && echo "ON" || echo "OFF")
-		-DUSE_LRINT=ON
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PORTMIDI=$(usex portmidi)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-
-	)
-
-	use java && mycmakeargs+=(
-		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
-	)
-
-	use lua && mycmakeargs+=(
-		-DLUA_H_PATH="$(lua_get_include_dir)"
-		-DLUA_LIBRARY="$(lua_get_shared_lib)"
-		# LUA_MODULE_INSTALL_DIR omitted on purpose, csound Lua module links against liblua
-		# so it must NOT be installed into cmod_dir.
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc -r Release_Notes/.
-
-	# generate env.d file
-	cat > "${T}"/62${PN} <<-_EOF_ || die
-		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
-		CSSTRNGS="${EPREFIX}/usr/share/locale"
-	_EOF_
-	if use stk ; then
-		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
-	fi
-	doenvd "${T}"/62${PN}
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use samples && dodoc -r samples
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins installer/misc/vim/csound_{csd,orc,sco}.vim
-		insinto /usr/share/vim/vimfiles/plugin
-		doins installer/misc/vim/csound.vim
-	fi
-
-	# rename extract to csound_extract (bug #247394)
-	mv "${ED}"/usr/bin/{,csound_}extract || die
-
-	use python && python_optimize
-
-	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
-
-	# install docs
-	if [[ ${PV} != "9999" ]] && use doc ; then
-		dodoc "${WORKDIR}"/*.pdf
-		dodoc -r "${WORKDIR}"/html
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "The extract tool is now installed as csound_extract"
-		elog "due to collisions with many other packages (bug #247394)."
-		elog
-	fi
-}
diff --git a/media-sound/csound/csound-6.16.1.ebuild b/media-sound/csound/csound-6.16.1.ebuild
index b8549ffc9aab..58046967e8a0 100644
--- a/media-sound/csound/csound-6.16.1.ebuild
+++ b/media-sound/csound/csound-6.16.1.ebuild
@@ -22,7 +22,7 @@ else
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
 			https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
 		)"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Sound design and signal processing system for composition and performance"
diff --git a/media-sound/csound/files/csound-6.15.0-fix-soname.patch b/media-sound/csound/files/csound-6.15.0-fix-soname.patch
deleted file mode 100644
index 7bac87082565..000000000000
--- a/media-sound/csound/files/csound-6.15.0-fix-soname.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 20daf5f4edbbf7291ad32dd623a335be1de0c54f Mon Sep 17 00:00:00 2001
-From: vlazzarini <victor.lazzarini@mu.ie>
-Date: Tue, 13 Apr 2021 21:04:05 +0100
-Subject: [PATCH] issue #1449
-
----
- interfaces/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
-index d72c4ffdc6..3da25b627a 100644
---- a/interfaces/CMakeLists.txt
-+++ b/interfaces/CMakeLists.txt
-@@ -216,6 +216,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
-             ARCHIVE_OUTPUT_DIRECTORY ${BUILD_LIB_DIR})
-         if(${CMAKE_COMPILER_IS_GNUCC})
-             target_compile_options(_jcsound6 PRIVATE "-Wno-error")
-+             target_link_options(_jcsound6 PRIVATE "-Wl,-soname,lib_jcsound.so.1")
-         endif()
- 
-         install(TARGETS _jcsound6
diff --git a/media-sound/csound/metadata.xml b/media-sound/csound/metadata.xml
index c5216b6e38c5..7b96747a6c9b 100644
--- a/media-sound/csound/metadata.xml
+++ b/media-sound/csound/metadata.xml
@@ -11,7 +11,6 @@
 		<flag name="double-precision">Use double-precision floating point for audio samples</flag>
 		<flag name="dssi">Build the DSSI opcodes</flag>
 		<flag name="fluidsynth">Build the fluidsynth opcodes</flag>
-		<flag name="image">Build the image opcodes</flag>
 		<flag name="keyboard">Build Virtual MIDI keyboard</flag>
 		<flag name="linear">Build the linear algebra Opcodes</flag>
 		<flag name="portmidi">Build the PortMIDI I/O module</flag>
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 27561eba7daf..b4fd8cb1eee8 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,7 +1,5 @@
-DIST drumstick-2.2.1.tar.gz 1976813 BLAKE2B ac27fbcfb92fff2b7d69c70f9ec677343e8d66164997a29f319fbe94e6d12582cb4af67f0ff36126a6102e48bcbe4d4620e9442fdecf07aaaeecf37e9458c590 SHA512 d99c774f33db9d8555efd83adc8968d6d244e56e7976d68f0f90ff89cfda1143b2e07eece6b465fffba354073d4616c5a767f09f2ba282e252ca0955723cadc7
 DIST drumstick-2.3.0.tar.gz 1978608 BLAKE2B ab05030d402c03053bfcf315e8c4e54b73975f0059719cf5e58db64ddac394555b898e3e0008b892901d7395c89a160631ae8eeb9d1cd52c3abd0533c5fdafdb SHA512 b12a39153600b37ef61a31255721466bdae5896b562276860688f9e22259ba4747086abeb828dcfef24c8e1fb7bd371dea1c6d51098cf5e1797e212cde70f46a
 DIST drumstick-2.3.1.tar.gz 1978856 BLAKE2B 47f7c9872964fb267834b23e2d52fc1b10826629fb256dae410161305c3587845ffcaf00f0d30a73df67b4a00849c53f3f1412c0473a52fbf69b106362175b3e SHA512 aaf0080405765878c8d1e164343eff0bb18d4add4a2f67de1ed0e978ae688948b73121f9cb50c52c23fc34b8c57e184d22a5c5aaa29969409071567142685dc7
-EBUILD drumstick-2.2.1.ebuild 1474 BLAKE2B 07193c21cb0472ca1c4a2dd7c7f5aa61000f8c8355a30250fdc02b5dd618db289b74b88bda95fa0f9eff5a182e92b67b5c57891d0cd2b265fc7d968f915674b8 SHA512 e88f66b0013ebf2e6bca1cdbac194a8f8b5363503119bd782b862bbbf7430892f8ed428822220764925a0528c5b4f03f5dec245c93e89d1243bca919a02170da
-EBUILD drumstick-2.3.0.ebuild 1320 BLAKE2B a07f4a8af466bb54ebbb2d77da55503386a0717dd0dfe9d4b63ee2eff1418edad5056092c516e73dc3d6fe40e208e58d612c3ee5a3b26d1de71daa119f8f75be SHA512 4b51e3f56701a6fa8fd5f5f0af28213680c6fa1fd16680381e6a3862c829cd31ec3d771bc7a5daa2e3f0b5b4654c5b1ab8e31da68e64cec116227a24fcf41b38
+EBUILD drumstick-2.3.0.ebuild 1318 BLAKE2B fb184940b7b5bf8bb6054586de8f41cc93f755637199da2692466c427d811d3ba78ac3a255642a335efdd8ba2f47257065178ac301b76f9b0e7816f11fbbb5af SHA512 cedb23d0ca9fed19c41197db463ea1d8c01d78f52e0a1dc00d0d1897979dd57150fd683eaa3a344b3bda6b518f46bc2b218fea553d9d4be1d998f14baabe5cdc
 EBUILD drumstick-2.3.1.ebuild 1320 BLAKE2B a07f4a8af466bb54ebbb2d77da55503386a0717dd0dfe9d4b63ee2eff1418edad5056092c516e73dc3d6fe40e208e58d612c3ee5a3b26d1de71daa119f8f75be SHA512 4b51e3f56701a6fa8fd5f5f0af28213680c6fa1fd16680381e6a3862c829cd31ec3d771bc7a5daa2e3f0b5b4654c5b1ab8e31da68e64cec116227a24fcf41b38
 MISC metadata.xml 598 BLAKE2B 099351919e92e9d8197fe31f09336761f9d886b67582b6dde4ce5b387a44f496e562de9456482d6651d63429955870b8ef8aadc178417d847da2d2e999a4add1 SHA512 16a287bd1c3039970522c09ab0dae6018924a34577692ccfdcde6d80476338eb4cc6576f155882cf96d44bb87d5523ff8df17f3ee8a86b3d1cf2a28c7543b089
diff --git a/media-sound/drumstick/drumstick-2.2.1.ebuild b/media-sound/drumstick/drumstick-2.2.1.ebuild
deleted file mode 100644
index dd7730300b59..000000000000
--- a/media-sound/drumstick/drumstick-2.2.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
-HOMEPAGE="https://drumstick.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc fluidsynth pulseaudio"
-
-BDEPEND="
-	dev-libs/libxslt
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	doc? (
-		app-doc/doxygen[dot]
-		app-text/docbook-xsl-stylesheets
-	)
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	fluidsynth? ( media-sound/fluidsynth )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS readme.md TODO )
-
-RESTRICT="test"
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use fluidsynth ; then
-		sed -e "/pkg_check_modules(FLUIDSYNTH/s/^/# disabled by -fluidsynth/" \
-			-i library/rt-backends/CMakeLists.txt || die
-	fi
-
-	if ! use pulseaudio ; then
-		sed -e "/pkg_check_modules(PULSE/s/^/# disabled by -pulseaudio/" \
-			-i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
-		-DUSE_DBUS=ON
-		-DBUILD_DOCS=$(usex doc)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doxygen
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake_src_install
-}
diff --git a/media-sound/drumstick/drumstick-2.3.0.ebuild b/media-sound/drumstick/drumstick-2.3.0.ebuild
index 8b2d865ce0f9..83eff3ef7dbc 100644
--- a/media-sound/drumstick/drumstick-2.3.0.ebuild
+++ b/media-sound/drumstick/drumstick-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fluidsynth network pulseaudio"
 
 BDEPEND="
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 52314e83f6e7..1fcd137b603c 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -3,5 +3,5 @@ DIST easyeffects-5.0.4.tar.gz 2070912 BLAKE2B 848d2fa6fc1290b6fc25e13c4bbe4d8df9
 DIST easyeffects-6.0.3.tar.gz 1905373 BLAKE2B f423cefd0e6124ee1128bf5a07fb23df03df4ca25a6ebcbcd122032e5768ee68ff3464cdb51263d731fee3e9f5fee180858d96ab627771099808b1194adb78b1 SHA512 eb88f0befb6cf86b7da03137cb7ed6ac833f204d17860d9bd508dc8b007b2a0fb941b63a015b1179cb4da28abd0b3d8a8c53d026fd5a22057fee27e02618035c
 EBUILD easyeffects-5.0.4-r1.ebuild 2267 BLAKE2B af9ad6a20cd77d8400ecf0fd91889795044414787ff96e7213d9a9a23f1269ca3936136506175600b45bdb1e046dbc7249eaa172e8c9de3450193bbd132fbfdf SHA512 601783a228252724fdd157fdfb5ffc7e83d40aae0f8f6eae69b53f5bb073d6f3ef45b80ded69618821496bbe037071f4f6b5b359ed1ca5cc52563d6ce19d4b0e
 EBUILD easyeffects-5.0.4.ebuild 1790 BLAKE2B 5be8a0a80e5ee355ab69ae30cf9553de9b0859dcdd9baaff20373c7aa1e89d95730a3a2ab0f552a4ee37209cfed53871a5e423b8d434d0532673e230c1fbbd56 SHA512 18ef1d69d988aa1d5553f97c48be4bed66e8d9859d22a2764593c9cfb3f7b36b1e784b0f7ddf6c206f99f4d2a534b133472ee4461afb5a66b04a20f9ba5ff6f2
-EBUILD easyeffects-6.0.3.ebuild 1829 BLAKE2B 122c74b13a6669aefbebe0f0f12b93af6596eccad6d9bc70d2d41b7cea5de6c854981c01162227fc19bc0d2f49111aad8ead310c60eb905486546f8225c84c4e SHA512 4ac962f7ff6d91bfb968e49c4fc5b765e5505d97d332f66f458fec3c5b28deade15dc66ba4a5635d1946d6591e5509f39d091407ec15d0155c2b9b21d69e837f
+EBUILD easyeffects-6.0.3.ebuild 1828 BLAKE2B ff0187eefc6d73332ce0aa642e2cf6de01172477f25f93ceab9ecae57c1070626412735e1dfcc198615827aebb60d766f2837280a69ddc8a95bcb8e9ee8847e2 SHA512 92381f22707c0d52537d75fbb85863a06d93c2a823c0913e87b6190fd40d418ef9452bd4a3b6f9478bf855dae5b62e2f2458bad173644d5f8773f319fff9bf23
 MISC metadata.xml 1098 BLAKE2B a64c34f1ecfabe52d954e6f1b9a3e5137c3b68a169166dae3f5cd0b02e22759b1e5e60e530d137e6460407247c1e4ef5c3de59ad959f9467fa296571aa823910 SHA512 303657f7a638668a65c9e17d39de40f46871b0a916ec39198529ab1270b0234705e819ad95a366a127a79fee5243a935d3f99c9daa0bad19ef7bc27f364a0828
diff --git a/media-sound/easyeffects/easyeffects-6.0.3.ebuild b/media-sound/easyeffects/easyeffects-6.0.3.ebuild
index 229d807b1c5c..b227067d1f3c 100644
--- a/media-sound/easyeffects/easyeffects-6.0.3.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.0.3.ebuild
@@ -36,7 +36,7 @@ DEPEND=">=dev-cpp/glibmm-2.68:2.68
 	>=media-libs/zita-convolver-3.0.0
 	>=media-video/pipewire-0.3.31
 	sci-libs/fftw:3.0
-	>=x11-libs/gtk+-4.2.1:4"
+	>=gui-libs/gtk-4.2.1:4"
 RDEPEND="${DEPEND}
 	gnome-extra/yelp
 	>=media-libs/lsp-plugins-1.1.24[lv2]
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 4322492155de..90bde02a6cd7 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-20.12.3.tar.xz 1661968 BLAKE2B 17f7bf9bf589f19d010fa644c54d941647b3ed267c84ffb60b47ffcba27f28f0e639df3211d92ca27556e8887a9e83db3efa92739959c38e2051db79de6b2f4f SHA512 8fcf91c5421596a90e52329ab9d0f47cd5d4432f28ed1cede9f5e0e46f77124dd2cf6e2485fd184437034d3fb0820daeda3f8ad488e24637b97482ac3586c4ee
 DIST elisa-21.04.3.tar.xz 1725896 BLAKE2B 4937403cb1e58c23979ec5525232f227a92f4cfded11127af2cbf62b1f0a72163f39f1a02bec5e9d5acb9c78659f66bb3519a7ab322aaf3a5be7f855975cf365 SHA512 12a83267332f3d36d4906cd9dbc6c46558cd5a3efbf67ccdcfc53156e4e6b3cf334cd05033bc299105ce72df3625852ba8b9dc1438c0b50b7e29798796699ecc
 EBUILD elisa-20.12.3.ebuild 1658 BLAKE2B 4351d92ef0d8902ff9ff6435161f79580327b31a21add05d8a90978a4724e8bc5d6e6720772f46f14c0f0fdb6076ae9f2d86f23e1a21327dd7617481e2ecac52 SHA512 2ff5520e1c11115a4ccdecfbacadefdae94be53155f742e03c579ce1a9daaafc34ac22dd8a898183403788250e9076debdbba82defbdb9a2d69475352a002979
-EBUILD elisa-21.04.3.ebuild 1650 BLAKE2B 452bc1f0bdcd1a345678b2d73cf7e1e9d71f53047d43751a453c9d55339f2ec743c110d251456d2bf0092700387b2ee4e325018fd1f748c20f591acf6cd71b9c SHA512 84f615203f30d22624e476db0db3eebd211475cd6ce06382e31f9b8e4b90de01a529c5bf2789068b7f17b70f53a22facc2afe3a0e32655575b9f12f0b47cb2ff
+EBUILD elisa-21.04.3.ebuild 1648 BLAKE2B 69fc9a7d1c28f717218402cd139245594a6a73848f5768eee6c3552472047e5befd47b91264bc6955d227cfc3b63135526933e891b83b7c3a44f69d93eeab242 SHA512 9bf57d9f6b5a70f93e6b323105511ac954cec8861524174ee56acbc73dd938ef065542760e7338d9b5e940838981b5134904e1d6044a2bc2f2570df674fde9ed
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-21.04.3.ebuild b/media-sound/elisa/elisa-21.04.3.ebuild
index b7ac1e0751d2..3402a54c5196 100644
--- a/media-sound/elisa/elisa-21.04.3.ebuild
+++ b/media-sound/elisa/elisa-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/elisa/"
 
 LICENSE="LGPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="mpris semantic-desktop +vlc"
 
 RESTRICT+=" test"
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index 5d45ab76301a..d1247a00af02 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,5 +1,3 @@
-DIST frescobaldi-3.1.1.tar.gz 6244496 BLAKE2B 0687a608c773d3295197ea7ef117fa099acc2dfcd2de0f7e7ed69ff6ab643007d631f9e3abc1509163503473cc2d95f7cfe7ca87a5d636a796490af8479b8db0 SHA512 b4f65bdbcb5ed1c9837b84f9721b166dbac3d5ed12d03521d91d9f4660ff61af951209071ceae07158da3ad9f7c7152924a4f5ce87deedc8d90decf4b4efa86d
 DIST frescobaldi-3.1.3.tar.gz 6691789 BLAKE2B 88a08240997aad11d9bf31c57a844a42e341e7641649f5cfb52571beb63fa4c29382136eae7758e5fff1cc6a4f8eb2942ca9b09b8217d7243c699041c951081d SHA512 595c4628df1923dffa44987ba858827a50d5415e9a01b45c87def2a6625d22c8b9b2e988c49dec20bba750cfc1ff4512e6f67875c3a2b23e440ef7231856c159
-EBUILD frescobaldi-3.1.1.ebuild 838 BLAKE2B f135fb062dfcdc5f29c64aa4449849b086dcff9289d89d19f3fc00d2756663f24c670019dc1c08353a378998a3af475efa330ff184072bee634309459413121c SHA512 f6520db654c7da55afd8dac96c4685b27afdf6854502548eada5a7c345b57845aa655c8170e10b6e9175e1d91ee31c78e31cc63e8a84f55829113649ee42e352
-EBUILD frescobaldi-3.1.3.ebuild 823 BLAKE2B 76a716edae1ccc0280382715c544b0a83ea103de489fc838294e1672d0b90bda560c81ea39ace4a6bec901165295326854731ea8b5182fe47f0b11b96d0c9fb4 SHA512 9e9a02caa2e5c0d7bf5ae51b59c346655edbec752f3ff9cfa34811628b3b3b70c623e6dc6e3acfcec39e14a82bf9bb1af1ba0b3cebede3f52fc3008ba6351ba0
+EBUILD frescobaldi-3.1.3.ebuild 821 BLAKE2B f1b1abcd1c40034d0bed504b4f0a95059e215b35e72ecbae6c381be5a7a21b0e0a70aca123112b1b4f216691002091f68f38385c49fa32a21817881127102836 SHA512 bbd92b7bc34b3569545ff5a24067ed9b74af99c8cbfb26cdcc826317283c8f708812e5cf5a1bf0d133f156d678000fcc25733ffe26aa40db7a78fbc9e4307c85
 MISC metadata.xml 437 BLAKE2B 5df0dcf6f211964427c34070f126b8a7b65f4341d5ca0edc899e413d112eb3920197086981537847506148b11b58cfcba80213839e5171baf8c16f05781765f6 SHA512 fee7fc00ca40615d9470bcf15ac3df4541864f825f55021c4b8d59891ea1fbec88f4e5133cceef05791cee1d95be320c7405cdfa67446863bdd2b23e86ca2940
diff --git a/media-sound/frescobaldi/frescobaldi-3.1.1.ebuild b/media-sound/frescobaldi/frescobaldi-3.1.1.ebuild
deleted file mode 100644
index a446e22e0a73..000000000000
--- a/media-sound/frescobaldi/frescobaldi-3.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1 xdg
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="https://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/PyQt5[gui,network,printsupport,svg,widgets,${PYTHON_USEDEP}]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/python-ly-0.9.4[${PYTHON_USEDEP}]
-	dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
-	>=media-sound/lilypond-2.14.2"
-RDEPEND="${DEPEND}
-	x11-themes/tango-icon-theme
-"
-
-python_prepare_all() {
-	rm -r frescobaldi_app/icons/Tango || die "failed to remove tango icon theme"
-	distutils-r1_python_prepare_all
-}
diff --git a/media-sound/frescobaldi/frescobaldi-3.1.3.ebuild b/media-sound/frescobaldi/frescobaldi-3.1.3.ebuild
index e600ca8d596b..bde7dad74da6 100644
--- a/media-sound/frescobaldi/frescobaldi-3.1.3.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-3.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index fec95fcedc79..f0904cd41f45 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,7 +1,5 @@
 AUX qjackctl-0.9.1-disable-git.patch 543 BLAKE2B 818b22b94d1869ca59545463382f254458d7707b33a8150fe29f607ffca72f54d599ab00904bb05b10ef61a2b461ca9c94160b257dd679fb00b0ce872298d488 SHA512 d8c01bb983df5507676433c0262e03b33e43396f421ce37761927489bd6e350dc7ec3b8fce673108ea02d5b13d2b4317dc476c43bb4e1fac14af31a2867fd570
-DIST qjackctl-0.9.3.tar.gz 1093889 BLAKE2B e3fdacd8fb287e56d53c1b4afabf69aae89a9c311c1f056ae0f2c0f2c7e994e320a904d9ddd40efd48ed7b15fd7d90ed6ce07adc0db496d133431b1519c83a86 SHA512 bfe1cbd37ebd92409f5dd7e8a28115b9922bb43ad0f38112b140c8635a33cc49614202b9e4f92d57e58ed83a85767f53b538a7e6b69702b159157868081b3435
 DIST qjackctl-0.9.4.tar.gz 1094914 BLAKE2B 61025ecd6695df877802180a95763e5e9d557bc1d36966454cae2638fc5b5439c1ce64b65cd0193e40fd461575a3223b5ef5132905b7d211b75292dbfd5b7299 SHA512 ce808242d8bacadf4e267bdf75c20b53601f54c8a4eb0b5116653afa7bcdd17e99ac4f878d4ec78844194e13623a804850cf8ea7e12430806caad4fe986115c7
-EBUILD qjackctl-0.9.3.ebuild 976 BLAKE2B 197d8a0e50b89ea30322d304ac0393d99166aa2abbe5252ef1a99fc7bc855812559b96311fdce3df05f2a6f5466acbebe06d3fb5f94e197f3290f93cfb92760c SHA512 2ec96bb1ac655ba00f8f7f0ecff8341d1572bbcbd55361547907fc792d8b6bcb283f2548c6d9514b4799bd1159f51ba5a00277bb805a802bc2a848353f4892af
-EBUILD qjackctl-0.9.4.ebuild 978 BLAKE2B 3e2107aef51bac45a53f2a5701a08f32c385626e93ac22b7f5b5657e2a62305b4eea241ae8a8afda524f7b5a339929924da74d79a5f2b6f5cb0a079126f63832 SHA512 e9c90266c949e5edd0b37ce436ae870cbc193aafd96b55658b44084c404243a8e5e7f782bf74900d48e225e1a6af6745a75651e98cd0ab4cd844d854a04d9e3c
+EBUILD qjackctl-0.9.4.ebuild 976 BLAKE2B 197d8a0e50b89ea30322d304ac0393d99166aa2abbe5252ef1a99fc7bc855812559b96311fdce3df05f2a6f5466acbebe06d3fb5f94e197f3290f93cfb92760c SHA512 2ec96bb1ac655ba00f8f7f0ecff8341d1572bbcbd55361547907fc792d8b6bcb283f2548c6d9514b4799bd1159f51ba5a00277bb805a802bc2a848353f4892af
 EBUILD qjackctl-9999.ebuild 920 BLAKE2B 33a4fb30c5fa508b6ff4a09c46d275b00b667fcbfcea612e02f1131e30afc0686515c5bbc29e8bc8bca114352d96f71c5ef086c64e31bf1a65958702f5df8b59 SHA512 a43bec74f96732cc57a86579662fb9ce524340fe3284a66a4c4c5c0e1333363a0eeadf7f04c77dbc16befb605ace0ece9e82e9c4a6fed185073adf3b3cfbc4cd
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/qjackctl-0.9.3.ebuild b/media-sound/qjackctl/qjackctl-0.9.3.ebuild
deleted file mode 100644
index 200a042d00bc..000000000000
--- a/media-sound/qjackctl/qjackctl-0.9.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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/qjackctl/qjackctl-0.9.4.ebuild b/media-sound/qjackctl/qjackctl-0.9.4.ebuild
index 15137741a070..200a042d00bc 100644
--- a/media-sound/qjackctl/qjackctl-0.9.4.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.9.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 91c86fa71569..1694e171224b 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -2,6 +2,6 @@ AUX qsynth-0.9.1-cmake-no-git-version.patch 579 BLAKE2B 561d4fab7495335a98539688
 DIST qsynth-0.9.3.tar.gz 395265 BLAKE2B c19154ba02680ae784ea016bbcb2dcd6c3517d6e810d76cc16919508e2e7310d23a8e8397f45340c138f018340525ecae8d941ce5acf5d4e16295e88d3450069 SHA512 7da5bc0fd8feed6b3b0b048e7ac3fa86937d82ff34528fd0dbb1dd5a05fbff2bb2d8e360e499325660172acec7216964ce1442b75afc10ab0647b91376b2c421
 DIST qsynth-0.9.4.tar.gz 395550 BLAKE2B e25195755c52c63912b03a416878d248712b78ba0014414bc8b1d31cbd5bb75562640de4a0255d2727a40274a6ff3a84b201d39c93674140ff31ccc581bfd254 SHA512 764a90fd86451cd3a12c71f061f4a603cdce54ae80e6543d05fa66a97ea0b7c50bac0350f01f597ec93ed445a5433a9dea6d9c5a43ce385c231aaea8e13675d4
 EBUILD qsynth-0.9.3.ebuild 1411 BLAKE2B 224fb67d8c438ea03f47bdd1b11fd0f17992969582f46cabc67e36da7ec965d70f64b7ea926a29795ed7bf9cf2bf4e2cf40585761eeddf9fd2aceb1aa27a45c8 SHA512 ab5a4cdf1f9c2cd4aae7c6a5f81fc0824a25d8009a95d5495afcb43282a9916333d25c45bc5f8e97e8477d5d6ae2a344a76bc37b64b693cb8f2b19ebe80aa6ab
-EBUILD qsynth-0.9.4.ebuild 1415 BLAKE2B e06b98fe3d4580b90d17488772c0e389df21de7c79a563df10fce3ca7685d6f0f1896cca5ad463f4ba2385417d9088c3ef21f83dc9e15debc5adefa0c3f7503b SHA512 70f46a7a6b807aac1e56c2f3f864b27e4eddb6330c24f73e3a975268790d27b66048cc983075748514b6bbb7c8878aa207a09370b4755cc6e8a38f57c9e1ce5c
+EBUILD qsynth-0.9.4.ebuild 1414 BLAKE2B 766539ffcde920c240cd1102b09df6032d21e5831b2b9f5ee47f79e6f8ed67bb6961abeb1c57fb859ddbca3899d39cb26a0d8d7d6927b46259d0277ee48c7e27 SHA512 485801fa59a98b56dbc1427fb15509ed41a48b8aa4121fbc25dd6743af5a4b1c3826f131611375415d5440a9033d6fbaf774e87de7317a9f52e7fa13b0d22fd6
 EBUILD qsynth-9999.ebuild 1349 BLAKE2B 618267f9db7c94ad2defb4f0f3893cd4844270c3e9e9448c22738fb203f0e41cd83c47ed88354abf4fa215029953f2500c00b01193454ee2d29ced2ae8ff97bc SHA512 ba6afe5ac54f37fd1d4531b8971dc6272b8fb053209380953e0dfb494a91ed3c3783d3d681959a96d31d4f2aecf1b96c42c500707b48b45b3f8e765577354156
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.9.4.ebuild b/media-sound/qsynth/qsynth-0.9.4.ebuild
index 59c6e5666ca2..3d7c45b5ad47 100644
--- a/media-sound/qsynth/qsynth-0.9.4.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ppc ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 875e76237214..7d9ce956f88a 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,10 +1,5 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
-DIST spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb 120102446 BLAKE2B 481686c9e1f7e8d7b68059ec5aad5f71ae1e59af80fa91903941afc2e0a91e2f957860bf96ce3ce4b19884f2548426269a9a2043c2985b4bbc82c5f091f5f2b8 SHA512 af9f1beafe0e4d2313326d1a55675550e8c3fcd5cd2dc0954127094c563048b98f74f669d99a10f0ef6e3b3405856bb9d6a2561644a434ab6bade9c812296963
-DIST spotify-client_1.1.55.498.gf9a83c60_amd64.deb 133771326 BLAKE2B b4f17f3008e23cfc9b1cd7ecd806ae97b846f22b39be5ee25515111e6641b31b1cd6525f0cc6b5540d3bce03adbcc23940db26992642ec3884b46f919f499179 SHA512 395806fc064706cc6b005054ec0f5e0a9b0cebfa073ccb771b7e8cb2f6c8aa300efe9164e492f90f4c83d047a898f6553c44722562d8f3e1462947d811a2e599
 DIST spotify-client_1.1.56.595.g2d2da0de_amd64.deb 134092920 BLAKE2B a1b836a8c7627254203326c6168dd8351d1c0e527a94e26ec96f9437b72196a717e2cc460b4c89da4098d19d5de4c6f7df150b039a32240b9edc978253590d16 SHA512 4a270461d07c339a3fdf49cd0a8728d4fc7300be001a1ba59c74f05bf273b79a61bde6d046c27a6af38dfb6af58963fbd8b8cd7468c91b91e48b0d32b3dcc2b5
 EBUILD spotify-1.0.72-r1.ebuild 3208 BLAKE2B dbe0adc8f45c8c83d2a6734b36439ac0ce67b48ea518ae9153a5006c1ef4e923cd768a983495c35bac8d1469d4e7f5b5c26e73284f43ff9d5d84dd23e80c6740 SHA512 8955f11f24a1a50827b2dc9c37e03ac0c24ad8d352cf91598a3d39c65679f54cd3b8660f21e5a8f1347e408ec1fea8e23a962fd7e2c93b64f034d74a9304ae26
-EBUILD spotify-1.1.26-r1.ebuild 3124 BLAKE2B 72405957d9f30e9d90a4181979eb07700c4765a6c41fbe1ff68a758f74cf5f5cd7d656d11a4958ea420a93487126f0e4181a02a0a7d2170200ff467e0b9c7f95 SHA512 dbccc4571bc39ad80f09ee5e0d5bf966493f6571b5fd690fbc482d3c70d414e27f26cc65dfb65eaf4d16315ed5ba45eada7daad4786471882588d0f96391d816
-EBUILD spotify-1.1.26-r2.ebuild 3380 BLAKE2B 5c196268dfb75eb9acdc558ea0a0e21da0f5549ec6f5ff8f065033e44d1dc60ae101943ff7330dc18822334065bf772d6366b005a6f69a656f6f4cb6990b0b3b SHA512 d2da46d144409a993880a863eba0e7101b1a7b40d446d9a5b7163f572f852b08f1926cc0d5a4ccfbc0d25ad79d9f26149de1d142f497468c2e5660d8bc95b8c3
-EBUILD spotify-1.1.55.ebuild 3443 BLAKE2B 1f860e103bf6b4df1552121bdbeb862a7187368b19900ea3aae2d5f472dcc6db741c0a318f45fcdf2eeb2f195a8319af674f035df1de4ec2958a58dab8ddc044 SHA512 f9ed0da5e0c9e96dc74a971db0544b8ed2d86f708af1d694c51535ffe7ffec56b8cdc1391cbeffc44cd7e67036ad3f19f994d0d0b6938c6f1baec033006fa937
 EBUILD spotify-1.1.56.ebuild 3465 BLAKE2B a4ea3b094b9fe077a20464597f3a405055a748669cccd3ae06fa58c3d30f8ef57b951398e1b87bcc26161c8b926f961b1f7bfa3c97a6d0e1e3417598dbbbc022 SHA512 5af2b45f1816174eb8fbbaa7796b6b86acca2e5bc5c82e7ba576d7323300f4290ef8e23e4000c77f354c6742fa7aafb488b0050028c865b8af27701334cecdc0
 MISC metadata.xml 632 BLAKE2B 48e631444ca05aa703c62720ca7f04e57095f32dcf134a1d8dfbab5276a71efebe3fa9d4ec211cd7a5b0b261186af61f78ecf3512fbb8c6da77d2b3c4e97038c SHA512 64f9f4f073b9f48436b4ea62a4d3d0cfba3057dddaffa986bdaa3ad56cfacfec21ef59618b06389f71d85ed1255bf639a755134dfea111b24e4cb7719d21dd80
diff --git a/media-sound/spotify/spotify-1.1.26-r1.ebuild b/media-sound/spotify/spotify-1.1.26-r1.ebuild
deleted file mode 100644
index 3aa9bba22f4f..000000000000
--- a/media-sound/spotify/spotify-1.1.26-r1.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 desktop pax-utils unpacker xdg
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/download/linux/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="501.gbe11e53b-15"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify systray pax-kernel pulseaudio"
-RESTRICT="mirror strip"
-
-BDEPEND=">=dev-util/patchelf-0.10"
-RDEPEND="
-	dev-libs/nss
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/openssl:0=
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	media-libs/mesa[X(+)]
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-sound/apulse )
-	systray? ( gnome-extra/gnome-integration-spotify )
-	x11-libs/gtk+:2
-	app-accessibility/at-spi2-atk
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax-kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
diff --git a/media-sound/spotify/spotify-1.1.26-r2.ebuild b/media-sound/spotify/spotify-1.1.26-r2.ebuild
deleted file mode 100644
index ece161410aa8..000000000000
--- a/media-sound/spotify/spotify-1.1.26-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop pax-utils unpacker xdg
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/download/linux/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="501.gbe11e53b-15"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify systray pax-kernel pulseaudio"
-RESTRICT="mirror strip"
-
-BDEPEND=">=dev-util/patchelf-0.10"
-RDEPEND="
-	dev-libs/nss
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/openssl:0=
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	media-libs/mesa[X(+)]
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-sound/apulse )
-	systray? ( gnome-extra/gnome-integration-spotify )
-	x11-libs/gtk+:2
-	app-accessibility/at-spi2-atk
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libSM
-	x11-libs/libICE
-"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="
-	opt/spotify/spotify-client/spotify
-	opt/spotify/spotify-client/libEGL.so
-	opt/spotify/spotify-client/libGLESv2.so
-	opt/spotify/spotify-client/libcef.so
-	opt/spotify/spotify-client/swiftshader/libEGL.so
-	opt/spotify/spotify-client/swiftshader/libGLESv2.so
-"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax-kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
diff --git a/media-sound/spotify/spotify-1.1.55.ebuild b/media-sound/spotify/spotify-1.1.55.ebuild
deleted file mode 100644
index 34ff427eb99a..000000000000
--- a/media-sound/spotify/spotify-1.1.55.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop pax-utils unpacker xdg
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/download/linux/"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="498.gf9a83c60"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify local-playback pax-kernel pulseaudio systray"
-RESTRICT="mirror strip"
-
-BDEPEND=">=dev-util/patchelf-0.10"
-RDEPEND="
-	dev-libs/nss
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/openssl:0=
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	media-libs/mesa[X(+)]
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-sound/apulse )
-	local-playback? ( media-video/ffmpeg:0/56.58.58 )
-	systray? ( gnome-extra/gnome-integration-spotify )
-	x11-libs/gtk+:2
-	app-accessibility/at-spi2-atk
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libSM
-	x11-libs/libICE
-"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="
-	opt/spotify/spotify-client/spotify
-	opt/spotify/spotify-client/libEGL.so
-	opt/spotify/spotify-client/libGLESv2.so
-	opt/spotify/spotify-client/libcef.so
-	opt/spotify/spotify-client/swiftshader/libEGL.so
-	opt/spotify/spotify-client/swiftshader/libGLESv2.so
-"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	gunzip usr/share/doc/spotify-client/changelog.gz || die
-	dodoc usr/share/doc/spotify-client/changelog
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		LD_LIBRARY_PATH="/usr/$(get_libdir)/apulse" \\
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax-kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax-kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index f638783baa16..975db6f4495d 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,5 +1,7 @@
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
+DIST upmpdcli-1.5.12.tar.gz 582091 BLAKE2B da3c0826a40e815790fa7f758c7511b5932190f0913295098e9c1fae92f9b0083ffbe2b7e95c97cedf76580cefaea27f4ef1f89326dbb67089314f6ff7f8c181 SHA512 ebe8076e3f99b525df115d11940a46a518725a34dcdfbb42eb763b6e148beb968a8e2015c4dd9e696224f3da2745b7356b3094de68332f50590a3421372f1dfc
 DIST upmpdcli-1.5.7.tar.gz 552203 BLAKE2B fe8e8aa3f4c777925dce2a143aec201462cb2da9e33f604d48848f27acc51fad42e1c626c17b5325918f0d1de1b37c1c456240f811af118b83bc7ce3260e0687 SHA512 ce86b8f9b4e7614433ab542facbf7452426b66bf026bb21ea0e868cde9b492b09a86ee8aa259a9353f2ede6a22d1055987986747aa8e284714c5e60f73a3a55a
+EBUILD upmpdcli-1.5.12.ebuild 1034 BLAKE2B 0caee9f429812affd145864fb0affbe5268f06204ec9935484fe84fe45b6ae9aa198077eaf733b630d4e3a414a3f8b233ff8069d422bbedb202bd47cdc9b6e03 SHA512 034872dbd08edfdbb5a9ed3237d10fdc0c8a1e7843ba3e8e588146f84e05161831b5bd4a79688b5f724852e0bd2700e2e34cc33e657dd8be0876bfd6fe583ce1
 EBUILD upmpdcli-1.5.7.ebuild 1266 BLAKE2B 8e943647e08b7513f9f836a4d8b39a12719722b1480a4ee431c037b424e0b972c6163d99cd7ceafce40adc51d119a2a4988ae6375634766aafaffea5562a40fd SHA512 1357b27d8910b1875da2b1b5957d7b6a5dd1d01b0a8c7444ff12759d96735ebe10963213ce25451da82ccc6a854eec9397ccea70f230b037cf304eecc220a49b
 MISC metadata.xml 323 BLAKE2B 3b9aa1c98130517f1e0d458e9e007330fea3b695192f11a02edb51c2845358353367bcc421a70965abed3996450afdac11d80dd7e54e6b115cbb3c0940830106 SHA512 1f004f9123b7924186183899cdd55ae2fb75a61ab59cd01ac077627a18d28c934716a31f1070e5cd1a2ab6faafd9994079bad87178c6e744093cfcd7d6a7673b
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.12.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.12.ebuild
new file mode 100644
index 000000000000..cd91d0a00939
--- /dev/null
+++ b/media-sound/upmpdcli/upmpdcli-1.5.12.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+LICENSE="GPL-2"
+
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="thirdparty"
+
+DEPEND="
+	dev-libs/jsoncpp
+	media-libs/libmpdclient
+	net-libs/libmicrohttpd
+	net-libs/libupnpp
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/upmpdcli
+	acct-user/upmpdcli
+	app-misc/recoll
+	thirdparty? ( dev-python/requests )
+"
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit systemd/upmpdcli.service
+}
+
+pkg_postinst() {
+	einfo
+	einfo "This package no longer assumes that upmpdcli is driving an"
+	einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)."
+	einfo "Probably it is though, so be sure your mpd is built with"
+	einfo "USE=curl."
+}
diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index b6b7a5afeee1..a701636020e1 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,5 +1,3 @@
-DIST vmpk-0.8.3.tar.bz2 481537 BLAKE2B 985609c3a9ac69b29ac40dd6a71132d0f429d7961d306caf1f77e9e5b510e8b5af8f996febf87df8dfde02ee486cecbb1ef412dd3ba718dc3f793771230e5988 SHA512 829121a9f7bbbe73a9882c9f569204e4096c57c1c7dc7ba22949a35d3fe104028ba7e259fc2163d2711f31f8adfd52c4ec95bfc78ae9b35574835c1b404183ca
 DIST vmpk-0.8.4.tar.bz2 483243 BLAKE2B 12deda1ce752db4a0723e0b54e96a734cfcc11cbd2974a5957d315f1080d7d8b8ab3adf9203c8a25514f708ff6cadec69ab560239cb0f7d1b6859032ff6b976d SHA512 1704d8d39a2750549b524202e46e51507e25aeed00fe5c36202148661af2fc98613d937b2ea36f958706f371608d50ce82a6633b56e344e9cdcfed223892cb9d
-EBUILD vmpk-0.8.3.ebuild 900 BLAKE2B 9cf7402d7127f2a41f0785feb47d4d8b487687433b9c282bbb153a8b9f3b53a7295f8a1d1086c869cde5f1e3b375949f32ec7524098451462f49413317ef53e3 SHA512 c102fcb617f4031687bc89a32fac8fb9328583c3b8b2649b1364891a59ae0c9411237a49601918963b6c7030ab2a32169c9fb53972030fa542e8c1ffccc8fa3b
-EBUILD vmpk-0.8.4.ebuild 908 BLAKE2B 5cd7b39f929e94b44c8160c05de5fc2e192bb38baade70eb883e9f9c54fc4c2d5d43f0eb1ae3baf59c4651fb594e37cc2f1a30ac96bcf9aa6549d0cc595b7c93 SHA512 32770303f4f0f0f5d18895b2b61cf7983e6f960ee5de773a2a0d186e20e8c843f93939e596f2463132f00a9a5e3bea2ad9bc78f42e6d4dc0cd516d607eaadc40
+EBUILD vmpk-0.8.4.ebuild 900 BLAKE2B 9cf7402d7127f2a41f0785feb47d4d8b487687433b9c282bbb153a8b9f3b53a7295f8a1d1086c869cde5f1e3b375949f32ec7524098451462f49413317ef53e3 SHA512 c102fcb617f4031687bc89a32fac8fb9328583c3b8b2649b1364891a59ae0c9411237a49601918963b6c7030ab2a32169c9fb53972030fa542e8c1ffccc8fa3b
 MISC metadata.xml 856 BLAKE2B 53282a0d72578eb72aa6d3ae3704e915626f12b88315be54f0342cd9b97312fed2c3628871fe7c1215d29b6984c9b829b0718d124effa46eeaf52dd6509e35be SHA512 2186fd4b256c33f617fef45833bacba660d536141b77e520ad811c02363d1238765c13ec8bd125cf12b0e77589ad7c4f189747553c956ff9d2590e8a84b345d0
diff --git a/media-sound/vmpk/vmpk-0.8.3.ebuild b/media-sound/vmpk/vmpk-0.8.3.ebuild
deleted file mode 100644
index 7865aa398687..000000000000
--- a/media-sound/vmpk/vmpk-0.8.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Virtual MIDI Piano Keyboard"
-HOMEPAGE="https://vmpk.sourceforge.io/"
-SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus"
-
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-sound/drumstick
-	x11-libs/libxcb
-	dbus? ( dev-qt/qtdbus:5 )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DBUS=$(usex dbus)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodir /usr/share/doc/${PF}/html
-	mv "${D}"/usr/share/vmpk/*.html "${D}"/usr/share/doc/${PF}/html/ || die
-}
diff --git a/media-sound/vmpk/vmpk-0.8.4.ebuild b/media-sound/vmpk/vmpk-0.8.4.ebuild
index 83f0e30a0b6e..7865aa398687 100644
--- a/media-sound/vmpk/vmpk-0.8.4.ebuild
+++ b/media-sound/vmpk/vmpk-0.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus"
 
 BDEPEND="
@@ -25,7 +25,7 @@ DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	>=media-sound/drumstick-2.3
+	media-sound/drumstick
 	x11-libs/libxcb
 	dbus? ( dev-qt/qtdbus:5 )
 "
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 02ef34dd57a2..1943903da0e3 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -10,4 +10,4 @@ AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732
 DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
 EBUILD xmms2-0.8_p20161122-r8.ebuild 8076 BLAKE2B 0f140d493ba41bd33bcaf1e70c8e8483fc72bf88dd42ccc3d181bcbc2509044e5dfd2853194db73796be0eb53bd8c543df22c8f2b401a770489c2172ddd35797 SHA512 db01b170edd8ebc1ed4f8de8302485fed54123884b0527ecc21604d298c6157cf96e5583d8720089dd06fd0ee76130a4fa8015c7f1f251fa9b3c0c4e1a30c7f3
-MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
+MISC metadata.xml 2488 BLAKE2B 81687b26bb6a3143b97f19d90b4486f62e64cc51f993bd124665ac5346cfe9739db9d565b216fb935e740d17454efd970312d348e342ed995abb96c51efbc52b SHA512 5deda32f1c0a44cbf3efa275ca01bcd90db42240b35122b9c7baac88efa4ebffc1ed75a6e730c11154f37a22378da8388ec88bdfcb239effa1bd35c6bb3f7d14
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index 2019a968d215..fa38219f0f16 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
 	</maintainer>
 	<longdescription>
 		It features a client-server model, allowing multiple (even simultaneous!) user
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 95ca319d76e6..a9c15bb731da 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
index 210a609ebcd7..5f3dfcf05c29 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -3,6 +3,6 @@ DIST dtv-scan-tables-2019-09-22-f07bde777d4d.tar.bz2 270211 BLAKE2B 76d5250a8eb7
 DIST dtv-scan-tables-2021-04-30-4181e93a30ab.tar.bz2 272870 BLAKE2B b9672235ad2ed826205278ffd06ed793126f743fe2b0b8af4369c1cb24825662e579f9246a287df1d61efad7985e2e18d59097d359fe84626149464bfc253bc5 SHA512 c15c07937cabefad731f4b3f8b6e9f993e500f7c59b17ef5e5c46f9bb86f9cbdf748f7d875c363c641ed9f3333a03b5033cc7d0272e96323d36be944ea35379d
 EBUILD dtv-scan-tables-0_p20171003.ebuild 737 BLAKE2B 239cd08dda04b32e1090c15edbea043c5319af646256c89389bb28f1dfaf32051365ee54b395932bea67fc31f13b0ed28b66edda834b0884c88bd0c1cbc3c821 SHA512 b75a884494995705e88bd2a5808e0671511487c3e3d9d891816034d24d285b31aad5a0d580e62a990c2ed158226da3f993babe6b75cdc71c10bb1489561610f6
 EBUILD dtv-scan-tables-0_p20190922.ebuild 749 BLAKE2B c8354f3eb9dacaef712d03310899fa9d3f1141f462631a71701c13effbb9266e0441ae2be60b1b6d63ecf344c2e0d7ef50226a5625d48d99e96c5826b76eaecb SHA512 71c288a544feb26a214896dd51a697b4fd93768f03d0e4801e4d66fc5a7d3d2344164ea2f5058eb863eb6cbd723f566ad5a1293a149bd835006daabdad1182ad
-EBUILD dtv-scan-tables-0_p20210430.ebuild 747 BLAKE2B 0e4b91166b318cf66ceb1f19ba5453cb0b2a2ea0dc66eeff3d63acda91578e40f69c355349799e2b967982d105be74869b05b3b9b41018a626a37dfbd7057dd1 SHA512 8fafd50f18522c4efaea9dcd8e60b19dccb5dfdef276f32ad1e51e07f027b631a57a429f66af852e5c1f5ee553b9b54bcadc4fdba297a9ee2d15df6b53bc061c
+EBUILD dtv-scan-tables-0_p20210430.ebuild 746 BLAKE2B 83ba513847bd299ca99387f7f56a0fbcf05ade2c146fd0977491af98acc8baa618c2f23a60a6d270926db0dbcd92dac48d9c362b72f5f195ab737c8dd8daa358 SHA512 ae2d6068e4d2e31213be498fcd6b69fc2a23670b1603276d66e213bd50624109d1e385725268dcc870d1408d86c836281352b6e48b0b7f282f96d333cf7703d5
 EBUILD dtv-scan-tables-9999.ebuild 749 BLAKE2B c8354f3eb9dacaef712d03310899fa9d3f1141f462631a71701c13effbb9266e0441ae2be60b1b6d63ecf344c2e0d7ef50226a5625d48d99e96c5826b76eaecb SHA512 71c288a544feb26a214896dd51a697b4fd93768f03d0e4801e4d66fc5a7d3d2344164ea2f5058eb863eb6cbd723f566ad5a1293a149bd835006daabdad1182ad
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
index 18fe02bfa3f4..b406df7c9116 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="4181e93a30ab"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index 961b5ad3a491..5d72259a603c 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -5,5 +5,5 @@ AUX linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch 413 BLAKE2B 0d66160c487ef9f952e1
 AUX linuxtv-dvb-apps-glibc-2.31.patch 291 BLAKE2B b03833abf623175e9697a2745e9d99c7510b34e3823b42e4a394739d39a534cb4781a076879c85794fc4f9f703ded73778695b8334324186c4bafb3285d0dbb7 SHA512 efd1e8aa91cdcdff7f17856f13bb8689d3eb0288e2ff45c05bc55b44b32a137854c194cb3ee477a243b5377b44f221481e3323c9caa0065eb551cddf37a89c41
 AUX linuxtv-dvb-apps-no-ca_set_pid.patch 1004 BLAKE2B 36ab3817546d5a832473f4d69a2ce97642f3a6d7d8b17cb036d8976398274c4c9e040cb60a909e8f28f1ff25e6cfbb990dfe0b44b4c729b7e8abe30e645704bc SHA512 1cef92aee99ee03255115e1979b0342bbf9b45bd55c6f9ff6a8529edaf6f3a36c172a145c01706341486aae5d6e0a3fde52b535af97e020cb7009d23e0c9cf72
 DIST linuxtv-dvb-apps-1.1.1.20140321.tar.bz2 368759 BLAKE2B 5ef1bc4ee4f0ab167cda8d87a73c83566b40005e16fbaa79525af4fb0b117dec19a4883eedad8bcfedd269c2e295dd7f9e055f905dff5f39dffe1ff052e87547 SHA512 ceb057f760fa0b3902e6824e74b9392be9a7bd3318a1a83f206c99672da17904060ffdc35e84c89d3b8af60ac29d4427acad44e9ae16797baaeb5738e2ab1bf5
-EBUILD linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild 2255 BLAKE2B 0f6ba014c7aaeac0a91bc2fd451d50a71bc07b1ec0c00b7c5323a669f725c35e888ddc3976369c64bb46bfc8017beffdd436f9375d70e7e40f62a44e38e04746 SHA512 cf5b128c399f142099427efb5b7c307f386c726cbb10492fb78b5aa0bdc1d4804ac8a2811f58e6b6d036d0cdcd76e3c63e2e78f2b1edd4d40307cb9b4397c5a9
+EBUILD linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild 2254 BLAKE2B f68ef40fcab238ca6a44a746a8812cb5f1d4d20a0e9bbba7a1471e9e537ad39710e05fa68b355e3cc11e93ff1ebd5cbc93713f7238fe738e8fa85e992094afd8 SHA512 e668cd9b98701ac0af54cb4a5e45dcf1420bd763fa97591ffdddc21426f8583cc0c12055d214cf0b6660b7bb637b493f6924c0712f933d8d587d9bca27e577b7
 MISC metadata.xml 230 BLAKE2B b1572b7d9c8d7cfb1ad670feba63226e05f2aa6d2de71ad3be92798dc2d1a21678aae2f8f9af6314e2a9fdc5fb1ac9fcac993d9b75a9afa457853888c94b0943 SHA512 1aaabf344edf8981ded68904e05257b579370a589c86b1ea8984378ad6a8ed3daf91c5e9069c07d207d47cf1f70a8039c644dbf6108557ed2053cba9769723ed
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
index 821333cff38e..bc87cd4d1982 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
+KEYWORDS="amd64 ~arm arm64 ppc x86"
 IUSE="alevt usb"
 
 RDEPEND="
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 3e3aa3af855f..0e3d327555ed 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -11,6 +11,6 @@ AUX tvheadend.confd 359 BLAKE2B 3b44e47b9216daaa2defa69254700693015619e8b0196060
 AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7
 AUX tvheadend.service 573 BLAKE2B e99853082623ca0522bf83aec4be33f2cdc62ba3e3e09bd22246f93c93d5342180be409ba9ad8f862830aca68ca0dbfafd3da0ecb9033e43d6a7e50a523c0bd8 SHA512 8f8e8f9feed45c20919bca402ef9179208a305cd7b06b47dfbbc368fc85d739c3dca2b53e6964bff10f8581cc4c8091660ac2be3b975d80941dc7a16cbb3fb49
 DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
-EBUILD tvheadend-4.2.8-r2.ebuild 3531 BLAKE2B 1ffb19e513b56df16efd9839b73354b98fb6c464f72217f37b48a39150cc3b964feff7e3230b2bb5802e67de1597e35174bce2441292888f1717cb99e789a548 SHA512 1b068d2b8ede6a49afdb3d319c8d6866819ece5c6e4c6785a24d3e28c94caf8406a39905f890dc4ced86ce36068e748aec65343bcb04b2b5417b258d3d48693c
+EBUILD tvheadend-4.2.8-r2.ebuild 3530 BLAKE2B 4b887b29b81b2ff1ae5b4ff378541f654bdfc8e0631521583df8e7645b88f2d06b5d9c66fef7b858c1d9a17d0e3662a9ece86bedd31ea3d0d3f71ac2c6b317be SHA512 7573fa5a8344f44e6504a6c28b8ac048433bab783dce79da905a3bcc90d885a67d883d0b8bfa5bb508e25dafc5299f11769dbf20a9f5e0da0c03e003d6035c8b
 EBUILD tvheadend-9999.ebuild 4135 BLAKE2B 07f636e118cabae70d477bb09f979932af0ad7769eeaf354801ffbac18951be1387e39beedec3c7631f37bc594120fc8fca878a97ab73e59ecd526c3251056bf SHA512 473f5418b410cd2282596c56e72e47d195a0ce33826a4a025619506bfa3d272bb6edf6c33a149f40fe23045d4d23d574d7863ac4f3a14ce18c0b50efd1b7289d
 MISC metadata.xml 1445 BLAKE2B f71dc280d5fce7c0945939bcaf75d0d7f294aea6055c956b04e9e439199c2a6c107c800be6d18a0c58d154bdf7cdd0cd7d874e5cde5fc93f9b24160f536d21d8 SHA512 e26b94f14a619051e637b018d0f47ce86381821dd5207ba5b34429e0c0f83c55bfa9c37871e722af85719cf3e06322703d4709cbbd771b8f092efb8e85cb5b72
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index d38ebf0d7b8b..dc2993fb7b90 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf zlib"
 
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 0099509002f4..21d087584f42 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,5 +1,5 @@
 DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec020d386182f6fd78f9f8c18821d0dc09077cccb1ad30e6f0583f958210fbf717d356f1e47dcf785e5a85864dc4 SHA512 36dd497dc20d296ca984ad0a1ca19f471c97cac7bfe7c5d4baeaae7faea565c36103bea10e7a7ae813c1cfc35c7ac376299edd2bf01c4c5da981cb5cca13317c
 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 5929 BLAKE2B ab1c87869507b148627744279c8f516e48fd31800ee377586596418480fd26795a613f27fe32819705722b8c08012e812660e873ff2aacb5a00d8c4f823cd60d SHA512 f3ed0a46295375731077293e823037079ef599eda8b78953b0065150e0e2dc0835328e70fc42642d27dde073a2318c8eaad46461d10b90ced7c2c343937dd05f
+EBUILD xmltv-0.6.1.ebuild 5928 BLAKE2B 8333047166f51111ae42dafafff6259ec0588df911932ed142a211b7648d21233b23fa12d34e96893a05e5c71de498e2746af788462bddcf4b48bfc01c9d3b97 SHA512 b44687f3f5cfdf9976c175eec35d179f47788ae3f014e37c4047369447f2a9a371150191fefec166f05397b2b234002417b969de96bf6ca0bd70988ef59fa080
 MISC metadata.xml 2715 BLAKE2B 217df2efea127bf288238afaffc6ce3ba08db1afeafbc84f01625b373bd09cb002f96c47d44d1f6c434ee60a200e262b913b561e0a81376dbd1a777bbe32f090 SHA512 6ae132d5075564c7d32d2230e0b6a029723266507ec9db2b7c756986421753f8ee8519fd0cf0b754250842563a91dc28d284a82ffc930c04c64d141b8e0fedf5
diff --git a/media-tv/xmltv/xmltv-0.6.1.ebuild b/media-tv/xmltv/xmltv-0.6.1.ebuild
index 15e60c1c60f4..ded091d096e2 100644
--- a/media-tv/xmltv/xmltv-0.6.1.ebuild
+++ b/media-tv/xmltv/xmltv-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/XMLTV/xmltv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~x86-linux"
 
 IUSE="ar ch-search dk dtvla eu-dotmedia eu-epgdata eu-xmltvse fi fi-sv fr
 huro il is it na-dd na-dtv na-tvmedia pt-meo pt-vodafone se-swedb se-tvzon tr
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ff51e7874b29..81decac6d6ef 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 805c1723f9fc..0e9fb591a21c 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,7 +1,6 @@
 AUX gaupol-1.8-fix-audio-tracks-order.patch 6462 BLAKE2B 96e09112adf27ece07b65eee4b69d7dd1813c3b882afe790b8e35237e8e3c996809a0e71c00ce64f3c7cd0efbaf325933473f52439db31ba60869035c5a59feb SHA512 f7c001f698650c8c757818d44624201888aefe0d65689ee0fd357d85d45bd712a9f09b57e833a503c5b639ec430a6df2eebf02a40bed03a091abcd0da0bfae69
 DIST gaupol-1.8.tar.gz 558627 BLAKE2B a7243310b97fe7187311585762faaff512364ca043630eb43c1ee99c55fa5400e14698e391b410b67f70f1bc7a741adb0737868d7b40c868bb4c6badacd14fb1 SHA512 a6b65316b5750a4d636b39b75393b0b2f2c44d978f1fc8cc3bd2cd2d2bcf9ba68d0161afb41bdca5b381ec39e5a2e06440f4f4676f344019966b297c4112e691
 DIST gaupol-1.9.tar.gz 579382 BLAKE2B c326e800ebd56bab53757d13e075c7499d9b37c6677a3f2ef710e71ab427bc9d502d1539778e87625e43a6218a358b15dfc3c84fd22b42e95d808fc8495feb43 SHA512 c115409afe68a0981f7c29e5d6d3e23950081f186b74de460045de9976a6c7a674701d316214ee2b91bc59f1dd856fdc9cf999e328aba8abeb8eaf71911c68d2
-EBUILD gaupol-1.8-r1.ebuild 1700 BLAKE2B 323005573b77fdd234adf8cfd9aff2b6f8e8b01b5bdf9cb0ef5158964d4e0e6906af7390a45eeb0f13fc01f9e4ba64b8ba5db327b5425460ce497f2832efd9f4 SHA512 dea6b8f4967eab2ae772d177e03159b845faab2ec80339317a049e2c6cb6aaf9600aea5fa81aadacf04e22feacdab9f5ff9bdbe3052cd92de788c9786990ef8b
 EBUILD gaupol-1.8-r2.ebuild 1731 BLAKE2B b5af853dde513fb149ec2d2e9389caa2cc53c645ac676d832d5200ae6c5b278175de30eeda28639c6602cf27a3e83bf692aac68d21d00e0825ca6c65870b2444 SHA512 442d211c393b5f2613616f15e73a58e253045431190cd9abe6f7f7fc2b6c3b018f29f9516f97bedb05d243b04119661cb15cfd970e6e9ede728ae33486705641
-EBUILD gaupol-1.9.ebuild 1620 BLAKE2B 0b91fd53800b9656d15f07252ea498f7e0efb12ecd58a0441a9ab0aa2560d200f1a19fe58d222a41d242cdea07a081eac6ba02b4f9e810d0499d48e108f17d90 SHA512 3c6e1ca9300345ae61fb146c1d55c02be360e3ab3edfa140d281fa3714565ebbdda4db9bd3ba7b35d29cc29ccd426b0977f8893a5a0fc0ddbc4137e17d9ef21c
+EBUILD gaupol-1.9.ebuild 1618 BLAKE2B e039e80ce001fc413fd6b264d7b776db08944295ef166648b40b50e56de3e8c7bbf8ced7d74e93e22efba13a9346e20c555236db686749c73a828d9d19248cbb SHA512 2f5f6b9c00bfac63deb93f693ca5f17c2b0d974675c4568c67b8c56fa2cddabf60a085d87cadecc514ab54ae8bef41064c5743b63a135895eedb8c6b1c58bb89
 MISC metadata.xml 532 BLAKE2B 47a6663573f3be408acca753a58d90e17f31c17e6e1bfd0413cf63dda7ff7dbc5152e06b657f46db22e86b38fc07514fea249aa62ac5731e9c6a35cf17ca28da SHA512 3acb0780ebd63e6c33dc8b6b5cfd9f1209ff478d4b26bf8fad49d68be9de2f7968b0619c45eb432c6c91255f67c7aa4847889bdfeebbb7f2e296c9109ca2c27b
diff --git a/media-video/gaupol/gaupol-1.8-r1.ebuild b/media-video/gaupol/gaupol-1.8-r1.ebuild
deleted file mode 100644
index 21efffef817e..000000000000
--- a/media-video/gaupol/gaupol-1.8-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="A subtitle editor for text-based subtitles"
-HOMEPAGE="https://otsaloma.io/gaupol/"
-SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-text/iso-codes
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	spell? ( app-text/gspell[introspection] )
-"
-DEPEND="
-	sys-devel/gettext
-	test? (
-		${RDEPEND}
-		app-dicts/myspell-en
-		app-text/enchant[hunspell]
-		app-text/gspell[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
-
-PATCHES=( "${FILESDIR}/${P}-fix-audio-tracks-order.patch" )
-
-python_test() {
-	virtx pytest -vv
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The integrated video player requires media-plugins/gst-plugins-gtk."
-		elog ""
-		elog "External video previewing support requires MPV, MPlayer or VLC."
-		if use spell; then
-			elog ""
-			elog "Spell-checking requires a dictionary, any of app-dicts/myspell-*"
-			elog "or app-text/aspell with the appropriate L10N variable."
-			elog ""
-			elog "Additionally, make sure that app-text/enchant has the correct flags enabled:"
-			elog "USE=hunspell for myspell dictionaries and USE=aspell for aspell dictionaries."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-video/gaupol/gaupol-1.9.ebuild b/media-video/gaupol/gaupol-1.9.ebuild
index 4821a8416563..1bbf9094611d 100644
--- a/media-video/gaupol/gaupol-1.9.ebuild
+++ b/media-video/gaupol/gaupol-1.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 virtualx xdg-utils
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="spell"
 
 RDEPEND="
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 6fc64d2bd049..8ef2a75f498d 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,8 +1,11 @@
 AUX mkvtoolnix-49.0.0-qt5dbus.patch 1442 BLAKE2B 041c33dcb691377b4b50a4c24f1eac528dda0227ccf2baf3732239b481ff6007bf5a8ddd9304dd7c2faff149f1cfbdbfb194eb30a3b19eea0803f10734572421 SHA512 d9a72bb0b8fc7c9915e4efa1e9758d4f9d6b68f1ad6ef9898dd0b5e693c8e1236b37fc97a9786c233f8909417309ea6bb9c1fb71054818f31eeb4c43faa46a06
 AUX mkvtoolnix-56.1.0-optlevel.patch 607 BLAKE2B 62c3ef3717a54030b1acc586e9468f4d8d783755f7762ccebe18b0f8b0214268477a5a218b2fc02f3e2f770664507d43119f13046a31c94f865f01d0000a8a68 SHA512 b8eec05844aa8ef4f27416a78f5231496e34a112126e8ef403d18cab26b94756bd60323b51cf0d59a5a44d7b379bbf09f6b7b1b7e29b9282a0a2e82a5b3f325e
+AUX mkvtoolnix-58.0.0-qt5dbus.patch 1500 BLAKE2B f85f6a50bd4d4f44470ec6f85729cfca22518859b34e2cf6e1dac25a35d58170b626afe3a1f12f41b1f2d34d4763ab3b180139b402675071794a0dcd29503209 SHA512 6c6ffc83f6c4ed482347cc172467189add3662430a029d74e94d1373a1f0e519fced494812691d7b38c054bc010f1c670f1f6be97819fc142c402d5264c3595e
 DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69 SHA512 2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e
 DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
+DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea SHA512 90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
 EBUILD mkvtoolnix-51.0.0.ebuild 2921 BLAKE2B e71d3e988f14a21595f8666f57d5eee063088dc708d787c707bef93e2fe8d8c86614e8c81f2542eb7b8b91203927b04ae44b5d8c95f8710884acde992f0da6bd SHA512 76409b23ca27bd4c9528c153d016c72bb39778c80ee3c487dd6d9f23c228b475df80fbc10b2b37ce10e0f131d4d6a33e6af77117f25488218bf5a3c0057a8e2b
 EBUILD mkvtoolnix-57.0.0.ebuild 2973 BLAKE2B d2c5a209bf16fac4b98a093e3cc5ac7b11f12707e648d5cabed8d90ea6431020cdbeac918a2b3c7d61ddebe6eca42499c038e3c6abfea2332cd4e952c1948370 SHA512 e64b0c432ebf47a4b40d201ff83ebec6723214d44d72d9ac8757ef176319579bfcbc841ba2e595bb8870735e8ef4f846fea8670e59498fc737dacdb0f362bd20
-EBUILD mkvtoolnix-9999.ebuild 2925 BLAKE2B 40784eb4cdade88c122707ee510523023b8542f7a816adbdcd5c7c682433c5b901cdfb699347ffbede8cc9b57e941f37f9dd297ee0e5ed08e5cafc7eaf6920b7 SHA512 26dc8823f158bf7eb5deba4b185645abf210db9b638ef7728e6be8966e8287d31fe202762c21ef31a42663fa0b91ca6da9277acff58912d763c662e9ae8d1505
+EBUILD mkvtoolnix-60.0.0.ebuild 2687 BLAKE2B 97fdbe6d11985f608d996dc43954480ea3a007ad753a610836ad62d04977c319a2ebee16af88d4b1072032a54356088705cac8a4acabad1a7a94045710b6b7c3 SHA512 7e80c992f5bab78ba16a4a8540d5f3a54883d3a9ee58d4690964f2d07cf829d4762cc21941bde4ead37528d81c45f73d72996235bc7137bd7f39493be897818f
+EBUILD mkvtoolnix-9999.ebuild 2687 BLAKE2B 97fdbe6d11985f608d996dc43954480ea3a007ad753a610836ad62d04977c319a2ebee16af88d4b1072032a54356088705cac8a4acabad1a7a94045710b6b7c3 SHA512 7e80c992f5bab78ba16a4a8540d5f3a54883d3a9ee58d4690964f2d07cf829d4762cc21941bde4ead37528d81c45f73d72996235bc7137bd7f39493be897818f
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch
new file mode 100644
index 000000000000..fb94686d27ef
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch
@@ -0,0 +1,37 @@
+Index: mkvtoolnix-58.0.0/ac/qt5.m4
+===================================================================
+--- mkvtoolnix-58.0.0.orig/ac/qt5.m4
++++ mkvtoolnix-58.0.0/ac/qt5.m4
+@@ -98,12 +98,14 @@ check_qt5() {
+       return
+     fi
+ 
+-    if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
+-      PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
+-      if test x"$dbus_found" = xyes; then
+-        with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
+-        AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
+-      fi
++    if test x"$enable_dbus" = xyes; then
++    	if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
++		PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
++		if test x"$dbus_found" = xyes; then
++			with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
++			AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
++		fi
++	fi
+     fi
+ 
+     with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/,/ /g'`"
+@@ -244,6 +246,11 @@ AC_ARG_WITH([qt_pkg_config_modules],
+ AC_ARG_WITH([qt_pkg_config],
+   AC_HELP_STRING([--without-qt-pkg-config], [do not use pkg-config for detecting Qt 5; instead rely on QT_CFLAGS/QT_LIBS being set correctly already]),
+   [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ])
++AC_ARG_ENABLE([dbus],
++  AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]),
++  [],[enable_dbus=yes])
++
++
+ 
+ have_qt5=no
+ 
diff --git a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
new file mode 100644
index 000000000000..cd70327db014
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.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 toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dbus debug dvd nls pch test"
+RESTRICT="!test? ( test )"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+	>=dev-libs/boost-1.66:=
+	>=dev-libs/libebml-1.4.0:=
+	>=dev-libs/libfmt-6.1.0:=
+	dev-libs/libpcre2:=
+	dev-libs/pugixml:=
+	media-libs/flac:=
+	>=media-libs/libmatroska-1.6.3:=
+	media-libs/libogg:=
+	media-libs/libvorbis:=
+	sys-apps/file
+	sys-libs/zlib
+	dvd? ( media-libs/libdvdread:= )
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtmultimedia:5
+	app-text/cmark:0=
+	dbus? ( dev-qt/qtdbus:5 )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-libs/utfcpp
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-ruby/rake
+	virtual/pkgconfig
+	nls? (
+		sys-devel/gettext
+		app-text/po4a
+	)
+"
+
+PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch )
+
+src_prepare() {
+	xdg_src_prepare
+	if [[ ${PV} == *9999 ]]; then
+		./autogen.sh || die
+	fi
+
+	# https://bugs.gentoo.org/692018
+	sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
+
+	eautoreconf
+
+	# remove bundled libs
+	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
+}
+
+src_configure() {
+	# bug 692322, use system dev-libs/utfcpp
+	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(usex pch "" --disable-precompiled-headers)
+		$(use_enable dbus)
+		--disable-qt6
+		--enable-qt5
+		--with-qmake=$(qt5_get_bindir)/qmake
+		$(use_with dvd dvdread)
+		$(use_with nls gettext)
+		$(usex nls "" --with-po4a-translate=false)
+		--disable-update-check
+		--disable-optimization
+		--with-boost="${ESYSROOT}"/usr
+		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	einstalldocs
+	dodoc NEWS.md
+	doman doc/man/*.1
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index d84291b28039..cd70327db014 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-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
@@ -19,34 +19,32 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dbus debug dvd nls pch qt5 test"
+IUSE="dbus debug dvd nls pch test"
 RESTRICT="!test? ( test )"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
 # version requirement updates and other packaging info
 RDEPEND="
-	>=dev-libs/boost-1.60:=
+	>=dev-libs/boost-1.66:=
 	>=dev-libs/libebml-1.4.0:=
 	>=dev-libs/libfmt-6.1.0:=
 	dev-libs/libpcre2:=
 	dev-libs/pugixml:=
 	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.0:=
+	>=media-libs/libmatroska-1.6.3:=
 	media-libs/libogg:=
 	media-libs/libvorbis:=
 	sys-apps/file
 	sys-libs/zlib
 	dvd? ( media-libs/libdvdread:= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtmultimedia:5
-		app-text/cmark:0=
-		dbus? ( dev-qt/qtdbus:5 )
-	)
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtmultimedia:5
+	app-text/cmark:0=
+	dbus? ( dev-qt/qtdbus:5 )
 "
 DEPEND="${RDEPEND}
 	dev-cpp/nlohmann_json
@@ -64,7 +62,7 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch )
+PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch )
 
 src_prepare() {
 	xdg_src_prepare
@@ -89,7 +87,9 @@ src_configure() {
 		$(use_enable debug)
 		$(usex pch "" --disable-precompiled-headers)
 		$(use_enable dbus)
-		$(use_enable qt5 qt)
+		--disable-qt6
+		--enable-qt5
+		--with-qmake=$(qt5_get_bindir)/qmake
 		$(use_with dvd dvdread)
 		$(use_with nls gettext)
 		$(usex nls "" --with-po4a-translate=false)
@@ -99,16 +99,6 @@ src_configure() {
 		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
 	)
 
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myeconfargs+=(
-			--with-moc=$(qt5_get_bindir)/moc
-			--with-uic=$(qt5_get_bindir)/uic
-			--with-rcc=$(qt5_get_bindir)/rcc
-			--with-qmake=$(qt5_get_bindir)/qmake
-		)
-	fi
-
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
index 0c1b7e20efb5..aa491b4adaeb 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -255,6 +255,6 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 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 y4m-0.7.0.crate 12045 BLAKE2B 4f48eb7ad5be2486e0f723b9beb9109cd1b38a0d0c5ac4a64411fce0bd9371d45496e5e0e839d15e7d1616b3888cfc1a0fc1ca364e65ac508306cad9a4ed44a7 SHA512 b85b0dd6df46c9bf125eee3e51ea39545ea1c794a2a097bba0aa31c682532ed3a9ba141745c61915fff13535fc5fff5a490d7c9e731c75bb5ce38a702075467e
-EBUILD rav1e-0.4.1.ebuild 5873 BLAKE2B bff616e320e5e4f563c9c18a2c7cb181629b1816a2f865b8f8bd4108175b3e284ef6f331055e740ba1c9eceff30f0b68f5eb03713a302f8eebe02e026be69b93 SHA512 4504289c24ef9b74f23cc8d21750dac8d465756bd36eb0366402d5aef9cb831f895613ee4ffab1c4512f035c95f83abc21870cf4c146cf26e1789e40d6ad5325
+EBUILD rav1e-0.4.1.ebuild 5878 BLAKE2B b442a9ee660919d6fa23594cd0decbcbd66cd0110c89fd3398cfb2d770bac546bcc12f670da2760f78a469b84051fa70d1742d27e6ae2047b689e90cf59f5837 SHA512 acdccaa1dca40bce032c512195110f8ffee70c998a736b801b08857611a9d1097ef44dfae5506bd203a9636d37bc65484883a26dc833d2be87a42496fdeaf077
 EBUILD rav1e-9999.ebuild 1338 BLAKE2B 458b0b3caeb9f9ca18c35fe09d1cd8f2c9944b3154d150e559009f0cc4ac15833ce97862c2c64520a1164af22ad9c8d902e171e6d588a2a4bfa67af28e035015 SHA512 6bb8b42bc0dbd3265d2b14fc60b73d5aa1f43fc044aff8e205c784d8525f92d5060bb9f40d491f6c619da8db78bcf418af1245e361f93cc078f0b5e8fa7bb012
 MISC metadata.xml 396 BLAKE2B 3f15123aeeca6df02c1b6a886418af6cfd4e4e977a5a93b2cc13301ae8e5a17a918a9e8116e19ae120cc27e42bcdaeb5e6c546f99b0333144bbc4aa9960b862e SHA512 4d650221196a5f48b12f2dcd6ccd3ea56abc7ec205e78d470aae267c7706cf81f03a691ca916d5c2a8c9e09a62c07b0802b5c688bc60bbc09d74ea7a135278ed
diff --git a/media-video/rav1e/rav1e-0.4.1.ebuild b/media-video/rav1e/rav1e-0.4.1.ebuild
index daec6bb06fa2..28899deacae7 100644
--- a/media-video/rav1e/rav1e-0.4.1.ebuild
+++ b/media-video/rav1e/rav1e-0.4.1.ebuild
@@ -272,7 +272,7 @@ else
 		https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		$(cargo_crate_uris ${CRATES})
 		"
-	KEYWORDS="amd64 arm arm64 ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="The fastest and safest AV1 encoder"
@@ -319,7 +319,7 @@ src_install() {
 
 	if use capi; then
 		cargo cinstall $args --target-dir="capi" \
-			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED%/}" \
+			--prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \
 			|| die "cargo cinstall failed"
 	fi
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 29b0283ae910..722a5c4af4ff 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -12,11 +12,11 @@ AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bc
 DIST vlc-3.0-3.0.12.1.tar.gz 34233801 BLAKE2B 0bc571d8f3f8aa40eee93fe8ab13bd1f37e288372d46b13998986899d03bf327b300a98ec5736bb9fe7bb58aae65c1d469786a4dfdb80f4cf8b5bbbb250ee45d SHA512 05b079dcfd4a21cdae7bb19e9d71f2fad33ca846852683c5d2ca6d45f779749ead420d5211b4acce76971d7ec2265d0d07f970f35f647dd446e337dc31aa0ec1
 DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
-EBUILD vlc-3.0.12.1-r102.ebuild 13752 BLAKE2B 74446fb058d6ed5d09be30495edaeeded8b23fb421602712d594165736a13c817c87497ad74ea48bc856802de5233bdbb741eb50e76af4027c99307fe881eae0 SHA512 3d07f4802b011ab0f7a9698331fe20e59177a56653500e853ff8971f0ea0e57ab7fae19996b70e9afdb013fe15476d5f93e700fdfe3c1c381b477bc9e9665a94
-EBUILD vlc-3.0.14-r5.ebuild 13733 BLAKE2B 3143974d5b761a9feb0715ce5b7d6a7b855a5812210f6d79d025c580a136e77efbf7a5242e02c8fc0a39643722d758834ad09888f4de10952e052295416ff9a9 SHA512 317d443c824233441cf41d5917c85a9bac3fae158ca4dbda3bdf10e1b1cf4fef119c7b6f1c1934df026ff4c8c546aa5bec88829dc3006fec26f95c22bbe60b1b
-EBUILD vlc-3.0.14-r6.ebuild 13807 BLAKE2B 08cb1ee444cc1287ffba97c5fd595135c4a77f6195c65cf8fffeef37b98bad5500d151378dbe56accb18b9a804b29e046b5ad5dbf5abec73907e5aebf09fbc3b SHA512 4e4bf7ccbb09c16db596fe8ff1539d71b3be9e285339c0b61382bb82d01e3631cd48ceb1e3af65c91d733662853e94688e2039302d741b3a87606e5e5c7a2f00
-EBUILD vlc-3.0.16-r5.ebuild 13798 BLAKE2B 4edba2ab308353f279529117a8dae90e1ce1f1a19321ad92558cc36ffb167b2445048bce0c878724c575827fe635b745401a7ba6b15fc67fffae966f3db614b7 SHA512 edae0b3ebb10a164566cb57234fccd70dee408c720c9dde04166dd10670ecb82304764cb8b355625035d80c515a657e51648669ec0f501dc0c62a162fd70b1c6
-EBUILD vlc-3.0.16-r6.ebuild 13867 BLAKE2B 775a9d4d3e53d03328e1eb63ba3dc1cf51faed7f70789b6382e68a415ff49b9a3b2cf522d768c8a16eabc293983d27568831c11e7bdaf69f77622ba47a58e581 SHA512 80d98b3b3359224a4f81b0b3c15ab05abf1533d6dec069e81e81132354b267e72b0da0f5281d25065c1ff251b64bef36ecf358168f5026e3adcf2fdb370cabb6
-EBUILD vlc-3.0.9999.ebuild 13475 BLAKE2B 528764a390e3e0e859efb50a2e9db5366ba87a86f01483787a4e3fe2fdb36de18448a95746e58ba5705793b53a4534dd3184efcf24e1576de9f57b7e0fff59e4 SHA512 90f884b1419bb717174dd386c5dc3b99dea13f496c49ebaa89970b5910b730852c109d3942a944531449c1557c6a1ab72a0a7e67c550e50a3ed21af09b561bb0
-EBUILD vlc-9999.ebuild 13496 BLAKE2B 46b7e92d8a69a19156d259e9739871f4dc10c3dc2e4e0de0f427be000ed069e7af0959f30cb5346b03c09468289cf606261db3675a07ac92bf39bb12347f688b SHA512 57ad9586d3b9f65cd78738a0e7c8716371525112e8dbdc0533ea3bb965cc31f05bf5da1097a331ff0c9e0e323f7e330cdaf875d4d952e85bd03a5f35f857fa92
+EBUILD vlc-3.0.12.1-r102.ebuild 13761 BLAKE2B f374707de28935c411e9b02e99073eac296216dc471da4fc74669fc3a81df15165df3d4766a971f3a13c83b99578980db12404ec436ceefa5e2ce7ab547994b3 SHA512 4c7c532455c0e505befc37a411b9e09020ee2c7f8f7f6a58208ac74544510b33a10200a3f1d64b8a2d7ecb691738991527122b77df4292a68eff761adf1b4d58
+EBUILD vlc-3.0.14-r5.ebuild 13742 BLAKE2B 4eb92ef7de92aeeac6ebb217d221a49479ee7457f9497ae66dd8c8740c6474753c553f9c50562750cc925ebdfa5642e22aef080ac5960a4f37ddd13af41cbdc4 SHA512 cebbb15a7d7b9af8ccebad3bae87c1809136a4d4f8f6ee879a3d51822122ac47b92fbd8f07d8b0370179a1584ce150186f40fbe103aa39db8d39a2ea0f50a846
+EBUILD vlc-3.0.14-r6.ebuild 13816 BLAKE2B a41ead803cd22a476a4d3d423326419bb96f7b58c1e5c28bbe2f8bceef53806c675f9dac75e3f65120ce803754c69497040f5c5f494208c2d34b8204dd1ca780 SHA512 3e4a724bca6c870ddc352f66408734b0e701f35674b24750f389623326a7afd3e2ccc5a06de5a74cc6202c8c3f432ef098a70a635999bcd580d6163e663434ce
+EBUILD vlc-3.0.16-r5.ebuild 13807 BLAKE2B c5330aa94a746437244da0b97eab00ae356d54d42997c80ea7e4dd5498ff7f82b737013a9fd72fa42b87df2306dab3f8889f10bd7dca6ebefd00f2034a83cf61 SHA512 d64e09323facd3c670d7a04bd307996056af8ae260e73d3ac3cad7fe1910077cc71d309c82bbc16731b37ac2f3439bf77d1d2b3f9971005442c06b77412a1683
+EBUILD vlc-3.0.16-r6.ebuild 13876 BLAKE2B 20e9ce647c8626fa4c26bda1bb685f54d1c80cf6712c6b99b2681e2645ba532a5f90292489d26f0e3b7d20148d9961a3843e2e47c068c89fc89333c2af949d1d SHA512 91af950f70b883e744d46719dfcbcecc90c90bb6fd854d1a9a63cb0d4d2c525f4fa2481030d52e43d6e8025e099f2c877ba9bf86463ff2a294c754dba6085e32
+EBUILD vlc-3.0.9999.ebuild 13484 BLAKE2B 4af596070d8b9a4f4c22d14540863221725a591d34d26979b1b60c06d24923963dd3f1279c8de4f9adefc90b87bf08a88267d1a42324988099c4d656f2a3f843 SHA512 f5cf094b7eb9ce67b10a71719b476f9a960086587dfdb469d09c58e5c449fc1a06aea8532f479d51478d095dd0b92cb04e015d036752c56ad7e188e1ec8b2ade
+EBUILD vlc-9999.ebuild 13505 BLAKE2B 29f331ef011e705ff842f6c79fe0feb6c91a53ae2a476f36ecc23d7e10f1bb5a17626fd0e808d5aa5e99cb0e19810bdf1c5a926db01875333fbc654f03eec694 SHA512 8393e4cb2b4b6ec1d4d7bba05333ce15306b040eef3812112266cb8d1e32edd18779c3e44ab78d48faaf6c0ef13371f80ee21369fc5267fc1762d5f5901d7f8a
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/vlc-3.0.12.1-r102.ebuild b/media-video/vlc/vlc-3.0.12.1-r102.ebuild
index 95d8346aece2..472f7f61b4eb 100644
--- a/media-video/vlc/vlc-3.0.12.1-r102.ebuild
+++ b/media-video/vlc/vlc-3.0.12.1-r102.ebuild
@@ -158,7 +158,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
diff --git a/media-video/vlc/vlc-3.0.14-r5.ebuild b/media-video/vlc/vlc-3.0.14-r5.ebuild
index 2e16e99f153e..a983b3b93075 100644
--- a/media-video/vlc/vlc-3.0.14-r5.ebuild
+++ b/media-video/vlc/vlc-3.0.14-r5.ebuild
@@ -159,7 +159,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
diff --git a/media-video/vlc/vlc-3.0.14-r6.ebuild b/media-video/vlc/vlc-3.0.14-r6.ebuild
index 08c473c7b881..126e983f6a07 100644
--- a/media-video/vlc/vlc-3.0.14-r6.ebuild
+++ b/media-video/vlc/vlc-3.0.14-r6.ebuild
@@ -159,7 +159,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
diff --git a/media-video/vlc/vlc-3.0.16-r5.ebuild b/media-video/vlc/vlc-3.0.16-r5.ebuild
index 8c556b36dcbb..a21851568cbc 100644
--- a/media-video/vlc/vlc-3.0.16-r5.ebuild
+++ b/media-video/vlc/vlc-3.0.16-r5.ebuild
@@ -160,7 +160,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
diff --git a/media-video/vlc/vlc-3.0.16-r6.ebuild b/media-video/vlc/vlc-3.0.16-r6.ebuild
index 3cb51b38ba34..695200e37de9 100644
--- a/media-video/vlc/vlc-3.0.16-r6.ebuild
+++ b/media-video/vlc/vlc-3.0.16-r6.ebuild
@@ -160,7 +160,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 9de5769c7062..2c90e88cc44a 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -165,7 +165,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 7313dc1dcb86..09a8d54ca6e7 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -167,7 +167,7 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	projectm? (
 		media-fonts/dejavu
-		media-libs/libprojectm:0=
+		>=media-libs/libprojectm-3.1.12:0=
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index 6f78bfdd7d6b..c5f115b0f365 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,3 +1,3 @@
 DIST yle-dl-20210704.tar.gz 65583 BLAKE2B f347bf8198a0e645dc960fa4e7a6bc5f90081b9936f8462d0b13c92fcf7005e31837b01d8a830b17c1f962e6f7b4afbdc18a3227c6caa5d2eb3389f7fcbe66de SHA512 fd91960221476ed4e1d5de79132687da88ff19e66d1f75e940e8aa00e742139ff4b2d0d67b32f86f6b7bd326520d0287f3495607f68a7f1f3634493d63282c55
-EBUILD yle-dl-20210704.ebuild 1414 BLAKE2B 4157eb69cb5642359805db076beda2cdec1ee6329a342d47cb1c05b8862273dae4ae667c24b53042717eb5e2d88225942341db79d0fdb1e4b3bd06400daf00e9 SHA512 3f2b3714ed04f2c76a8f2149c425f4f2a425725e13b3fe348af227676515a1b3c9ccf91570cef601bf11873c5819cbb6e1de784b054c8ab48a9b1365e9d09a24
+EBUILD yle-dl-20210704.ebuild 1415 BLAKE2B e4dd5808cd1d439815164b6749711b828eb14100dfc2b437f26ecf7589dff5b80f74a7727e5fc49bf78f9ede2ab953d7f125fed0f5d1a78c367e08bf678da218 SHA512 6be16afd2cb0ce79f3eda29904160d4acaeef7680d657646c10374d1233fd74e5772741eac37232a790a7e7cff5a78929f4e31d3251890b6f3e7089e547dfce3
 MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/media-video/yle-dl/yle-dl-20210704.ebuild b/media-video/yle-dl/yle-dl-20210704.ebuild
index 9dd81dc7d3b9..143605b1b4cc 100644
--- a/media-video/yle-dl/yle-dl-20210704.ebuild
+++ b/media-video/yle-dl/yle-dl-20210704.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1 optfeature
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index e750dfb31a6d..f533815cfabf 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c4217f2d7aae..83824d5db7d0 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 01 Aug 2021 20:38:55 +0000
+Fri, 06 Aug 2021 22:39:05 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 2376134bfd94..7340f46dc6eb 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 517807 BLAKE2B 2ecdb63e9cfe1a1b71d23ab4fe58b057928be5a410ab9012b87ec1e7c917af227099229248e5b2c7dc5b25edb96e4adad920259d956349d0ecbb204178f8da2c SHA512 4ca9cc06a8ae7d4eefdd8a435b92f1f4e675295b618afdb11cf1d7f45b49f0fd5137f7f0c81b60933a8b942fe25de9928a9f4ffe0d5968bae8eae39c95a7da50
-TIMESTAMP 2021-08-01T20:38:59Z
+TIMESTAMP 2021-08-06T22:39:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEHBmNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmENug1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klByFw//VQE/GAJmecOy06sUbBhuQyxwlzD003HOlNab8HmqtUsUf0uMLe1Cb5k+
-4hvjR8LXo7JTLGqIXibrhJ8bfgQklT5RaxfhmOC6NBVzFP2K6pF4l9HDgB+qMvLW
-zmdqOHqQtpTqhXd7FPivfdM09hwk/N8XopALgq63sYFEewRbIsvqEt0nVUym2JV1
-wEijFQewXBMC1yprGfA2US7UTIhOsDU/mgcU3nyajB4sKtectiH6FUv4p+EscZZj
-TenTPw5Zd4Q16HiPdrC+mvBVJbui4RHokbCUdz/F5yVHvy/JpKju2hxXieIYDbit
-70760B+rdxW/sMf/WIjZxeBe+kKxfSIgsAySYWxzDrfML/wYgF4FqLq03tTL4Fcs
-kDe51gsAvMTa8fZ6m7YtgIy26msUNsuNNAqupxAXOQG5v2PCqUhfKctaicAcnrEE
-jY1nZcX2Rvkt203GeUdT0vpl/w8nzVXlk1uLh98zrYgRG3P5M1dNu1DVkU3jVLjE
-afPsYZCkCy5IAEx7jNA4ssL1ii9MWbvWuEq9no6x5jAcrGpDmeeDi2ZuKvrX1QuF
-tHPGpSbTGyOK5MYxpU7YVvkJnym6DmSLEjTeb/m05/3nR4itYxvJmYzVfNhdg9jz
-jng7pWpxFclu7z9pYiB1ENagqLauBQnxkL0rbg2d03nSZuS2w+Y=
-=dtYS
+klBV4g//Uj0Z1FcNiXvjKZgQ4qLXHYuRimZW8JzV+nU/eD+O5jkctUf48S4G1/CM
+CI3pG5dfoa10JIoUiRnpgpwf+d9AtEreL41I5P1OJUagktwR3BQX17lnC1JrC5fS
+iFRxL409n2BrjLffaCrQVdDnRKS7jkrlQV6xhlRf1raZ/biUSz9TbW+lysJosKRo
+sJYvXDOJtw3JvRtbojWrBnM3+SqYXlkx8KBEs5LNYHGC8xpkaGIj/LF6CStsPhSs
+VbACdGneB9n6s5nlpEnmAuYVpzhH+mwtXyyKuvPhHw/NSe021qyym9FaRFIlwkl9
+kIpG486XkZPZXT3fJGwcePQg63IGy+dt/r1D/9aKBnivL1v5sHfX0CpDlrFfQQut
+gFH6BWC3KZTjrny5XENJ0nquwaP3xrLMaH84iWvS4vLMFRQ/O7Ovxh8wcrwSW5C2
+iAlftTaniBoDnIwtxfkKQTxupMbh/pHdW3lr7eLAObaQUADjOby4cOQy8dlm65+M
+G4vhLMsPNVLniSdz3uw8glJGTnp767rGjpUOgowjGBv/DylOklVIvQHzST/ij3xL
+h9A2zE3VPTEAWx5tKjiUTzP04oiurS/mrYjPXC0Rv/8hem+4a6DbOBJGLqQyhJBi
+XuKNMqBTIN+NT2qL9SpGKO83xn70FB5hN9cl2CYyqfxOE87xzOs=
+=XwNu
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c4217f2d7aae..83824d5db7d0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 01 Aug 2021 20:38:55 +0000
+Fri, 06 Aug 2021 22:39:05 +0000
diff --git a/metadata/install-qa-check.d/60distutils-use-setuptools b/metadata/install-qa-check.d/60distutils-use-setuptools
index 25300fddda90..a7905c3f0b2f 100644
--- a/metadata/install-qa-check.d/60distutils-use-setuptools
+++ b/metadata/install-qa-check.d/60distutils-use-setuptools
@@ -68,18 +68,12 @@ distutils_use_setuptools_check() {
 		[[ ${#expected[@]} -eq 0 ]] && expected=( no )
 		# *+rdepend=rdepend
 		has rdepend "${expected[@]}" && expected=( rdepend )
-
-		if has entry-point "${expected[@]}"; then
-			if [[ ${DISTUTILS_STRICT_ENTRY_POINTS} ]]; then
-				# option for devs to future-proof their packages
-				# please don't let ago enable it
-				expected=( bdepend )
-			else
-				# accept either rdepend or bdepend for the time being
-				# but suggest bdepend as the future-proof option
-				expected=( bdepend rdepend )
-			fi
-		fi
+		# NB: note that expected is overwritten above, so this implies !rdepend
+		# if the package is using entry points, modern versions of setuptools
+		# use built-in importlib.metadata module, so no rdep needed anymore
+		# NB2: this is incorrect for pypy3.7 but we ignore this for the time
+		# being
+		has entry-point "${expected[@]}" && expected=( bdepend )
 
 		if ! has ${DISTUTILS_USE_SETUPTOOLS} "${expected[@]}"; then
 				local def=
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 24953501ef1e..4b682ef7dff5 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 1ae9fb41da21..b1052717ea8d 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/drone-0 b/metadata/md5-cache/acct-user/drone-0
index 7d9cbc998d17..53b7e6aced6b 100644
--- a/metadata/md5-cache/acct-user/drone-0
+++ b/metadata/md5-cache/acct-user/drone-0
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst preinst prerm pretend
 DESCRIPTION=A user for dev-util/drone
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/drone
 SLOT=0
 _eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=188d09a798a313ccd18ce18876c88f80
+_md5_=b101d8dc32e3ab4b73d49f91dd3280f5
diff --git a/metadata/md5-cache/acct-user/karma-0 b/metadata/md5-cache/acct-user/karma-0
new file mode 100644
index 000000000000..3ddbffef9879
--- /dev/null
+++ b/metadata/md5-cache/acct-user/karma-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-apps/karma-bin
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/karma
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=73629794b8664d114c6abd4804aebb7b
diff --git a/metadata/md5-cache/acct-user/trickster-0 b/metadata/md5-cache/acct-user/trickster-0
new file mode 100644
index 000000000000..e2fb15c63284
--- /dev/null
+++ b/metadata/md5-cache/acct-user/trickster-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for www-apps/trickster
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/trickster
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=66e34fa9cec2b5e6560f5714c0a10b14
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 4134ecf39c7a..c11567bab833 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/kontrast-21.04.3 b/metadata/md5-cache/app-accessibility/kontrast-21.04.3
index 6c54e953a864..fa0f21f6b75b 100644
--- a/metadata/md5-cache/app-accessibility/kontrast-21.04.3
+++ b/metadata/md5-cache/app-accessibility/kontrast-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Tool to check contrast for colors to verify they are correctly acces
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kontrast/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kirigami-5.80.0:5 kde-plasma/xdg-desktop-portal-kde || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kontrast-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=97ddb557b9a2c4bf27bcfa9c05c3473f
+_md5_=0b490643350e3b791cf8ed9fa899cea3
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 74d4a9100903..513b5f2ed7d9 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/awscli-1.20.12 b/metadata/md5-cache/app-admin/awscli-1.20.12
new file mode 100644
index 000000000000..5a97ef8e2c08
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.12
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.12.tar.gz -> awscli-1.20.12.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.13 b/metadata/md5-cache/app-admin/awscli-1.20.13
new file mode 100644
index 000000000000..04f7cdf33992
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.13
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.13.tar.gz -> awscli-1.20.13.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.14 b/metadata/md5-cache/app-admin/awscli-1.20.14
new file mode 100644
index 000000000000..c8b362f4cbda
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.14
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.14.tar.gz -> awscli-1.20.14.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.15 b/metadata/md5-cache/app-admin/awscli-1.20.15
new file mode 100644
index 000000000000..a77e4a6204ca
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.15
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.15.tar.gz -> awscli-1.20.15.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/exo-1.37.0 b/metadata/md5-cache/app-admin/exo-1.37.0
deleted file mode 100644
index ded2e8cd934b..000000000000
--- a/metadata/md5-cache/app-admin/exo-1.37.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/go:=
-DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
-EAPI=7
-HOMEPAGE=https://github.com/exoscale/cli
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.37.0.tar.gz -> exo-1.37.0.tar.gz
-_md5_=a638813d2b712f85d21a976d47d1d5b9
diff --git a/metadata/md5-cache/app-admin/exo-1.38.0 b/metadata/md5-cache/app-admin/exo-1.38.0
new file mode 100644
index 000000000000..3764cdc0f10f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/exo-1.38.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/go:=
+DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
+EAPI=7
+HOMEPAGE=https://github.com/exoscale/cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/exoscale/cli/archive/v1.38.0.tar.gz -> exo-1.38.0.tar.gz
+_md5_=a638813d2b712f85d21a976d47d1d5b9
diff --git a/metadata/md5-cache/app-admin/gopass-1.12.6 b/metadata/md5-cache/app-admin/gopass-1.12.6
index b6590bb67b27..5196f562178b 100644
--- a/metadata/md5-cache/app-admin/gopass-1.12.6
+++ b/metadata/md5-cache/app-admin/gopass-1.12.6
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/gopasspw/gopass/archive/v1.12.6.tar.gz -> gopass-1.12.6.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//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.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/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/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/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/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/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.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/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/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/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-github/v33/@v/v33.0.0.zip -> github.com%2Fgoogle%2Fgo-github%2Fv33%2F@v%2Fv33.0.0.zip mirror://goproxy//github.com/google/go-github/v33/@v/v33.0.0.mod -> github.com%2Fgoogle%2Fgo-github%2Fv33%2F@v%2Fv33.0.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgo-querystring%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/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopasspw/pinentry/@v/v0.0.2.zip -> github.com%2Fgopasspw%2Fpinentry%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/gopasspw/pinentry/@v/v0.0.2.mod -> github.com%2Fgopasspw%2Fpinentry%2F@v%2Fv0.0.2.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.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/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/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/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/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/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.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/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/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/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.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//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20210415154028-4f45737414dc.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210415154028-4f45737414dc.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210415154028-4f45737414dc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210415154028-4f45737414dc.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20210415231046-e915ea6b2b7d.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210415231046-e915ea6b2b7d.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210415231046-e915ea6b2b7d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210415231046-e915ea6b2b7d.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-20210413134643-5e61552d6c78.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210413134643-5e61552d6c78.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/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-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210419170143-37df388d1f33.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210419170143-37df388d1f33.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210419170143-37df388d1f33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210419170143-37df388d1f33.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-20210406210042-72f3dc4e9b72.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210406210042-72f3dc4e9b72.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/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-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/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.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//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/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 mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
-_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=748bd3c8d3e3574d553d8c641ddfd02f
diff --git a/metadata/md5-cache/app-admin/gopass-1.12.7 b/metadata/md5-cache/app-admin/gopass-1.12.7
index 2462e5a1183a..c28b31cf1b59 100644
--- a/metadata/md5-cache/app-admin/gopass-1.12.7
+++ b/metadata/md5-cache/app-admin/gopass-1.12.7
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/gopasspw/gopass/archive/v1.12.7.tar.gz -> gopass-1.12.7.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//filippo.io/age/@v/v1.0.0-rc.3.zip -> filippo.io%2Fage%2F@v%2Fv1.0.0-rc.3.zip mirror://goproxy//filippo.io/age/@v/v1.0.0-rc.3.mod -> filippo.io%2Fage%2F@v%2Fv1.0.0-rc.3.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/!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/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/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/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/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/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.12.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.12.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/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/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/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-github/v33/@v/v33.0.0.zip -> github.com%2Fgoogle%2Fgo-github%2Fv33%2F@v%2Fv33.0.0.zip mirror://goproxy//github.com/google/go-github/v33/@v/v33.0.0.mod -> github.com%2Fgoogle%2Fgo-github%2Fv33%2F@v%2Fv33.0.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgo-querystring%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/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopasspw/pinentry/@v/v0.0.2.zip -> github.com%2Fgopasspw%2Fpinentry%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/gopasspw/pinentry/@v/v0.0.2.mod -> github.com%2Fgopasspw%2Fpinentry%2F@v%2Fv0.0.2.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.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/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/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/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/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/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.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.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.13.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.13.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/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/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/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/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.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//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-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-20210415154028-4f45737414dc.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210415154028-4f45737414dc.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210415154028-4f45737414dc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210415154028-4f45737414dc.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20210415231046-e915ea6b2b7d.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210415231046-e915ea6b2b7d.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210415231046-e915ea6b2b7d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210415231046-e915ea6b2b7d.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-20210413134643-5e61552d6c78.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210413134643-5e61552d6c78.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/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-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210419170143-37df388d1f33.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210419170143-37df388d1f33.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210419170143-37df388d1f33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210419170143-37df388d1f33.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-20210406210042-72f3dc4e9b72.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210406210042-72f3dc4e9b72.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/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-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/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.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//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/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 mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
-_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=c0093f878c75ac524e3d79c076fd30bf
diff --git a/metadata/md5-cache/app-admin/hcloud-1.22.1 b/metadata/md5-cache/app-admin/hcloud-1.22.1
deleted file mode 100644
index cdc07827c3d0..000000000000
--- a/metadata/md5-cache/app-admin/hcloud-1.22.1
+++ /dev/null
@@ -1,11 +0,0 @@
-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.22.1.tar.xz
-_md5_=29dfefc2cd248e18df48cae0875c6969
diff --git a/metadata/md5-cache/app-admin/hcloud-1.25.1 b/metadata/md5-cache/app-admin/hcloud-1.25.1
index 162df919af5a..b0e0444c3244 100644
--- a/metadata/md5-cache/app-admin/hcloud-1.25.1
+++ b/metadata/md5-cache/app-admin/hcloud-1.25.1
@@ -3,9 +3,9 @@ DEPEND=dev-lang/go:=
 DESCRIPTION=A command-line interface for Hetzner Cloud
 EAPI=7
 HOMEPAGE=https://github.com/hetznercloud/cli
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ago/distfiles/hcloud-1.25.1.tar.xz
-_md5_=56012406d96b2c878b2bc62b17fa0dac
+_md5_=29dfefc2cd248e18df48cae0875c6969
diff --git a/metadata/md5-cache/app-admin/hcloud-1.26.1 b/metadata/md5-cache/app-admin/hcloud-1.26.1
new file mode 100644
index 000000000000..1b2eab1a9071
--- /dev/null
+++ b/metadata/md5-cache/app-admin/hcloud-1.26.1
@@ -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.26.1.tar.xz
+_md5_=56012406d96b2c878b2bc62b17fa0dac
diff --git a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r29 b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r29
index 723b9306871d..bb5f2552978d 100644
--- a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r29
+++ b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r29
@@ -4,10 +4,10 @@ DESCRIPTION=A simple utility to read the temperature of SMART capable hard drive
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/hddtemp/
 IUSE=network-cron nls selinux
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-hddtemp )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 mirror://gentoo/hddtemp-20080531.db.bz2 mirror://debian/pool/main/h/hddtemp/hddtemp_0.3-beta15-53.diff.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6b2f6ffd08998e371ddd803fe0d5d791
+_md5_=6351f566de525bf76b5d141ca4cdfe67
diff --git a/metadata/md5-cache/app-admin/keepass-2.46 b/metadata/md5-cache/app-admin/keepass-2.46
index f5b535d95029..0e41d5411909 100644
--- a/metadata/md5-cache/app-admin/keepass-2.46
+++ b/metadata/md5-cache/app-admin/keepass-2.46
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
 SLOT=0
 SRC_URI=mirror://sourceforge/keepass/KeePass-2.46-Source.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9b9290ef5e2b58cb3ffbaee0ed5b4a0d
diff --git a/metadata/md5-cache/app-admin/keepass-2.47 b/metadata/md5-cache/app-admin/keepass-2.47
index de6581949b07..63d71fe5312e 100644
--- a/metadata/md5-cache/app-admin/keepass-2.47
+++ b/metadata/md5-cache/app-admin/keepass-2.47
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
 SLOT=0
 SRC_URI=mirror://sourceforge/keepass/KeePass-2.47-Source.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=72df3471f62fcb24abf227cd51e41591
diff --git a/metadata/md5-cache/app-admin/keepass-2.48.1 b/metadata/md5-cache/app-admin/keepass-2.48.1
index cea0ecc848be..311f237a246c 100644
--- a/metadata/md5-cache/app-admin/keepass-2.48.1
+++ b/metadata/md5-cache/app-admin/keepass-2.48.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
 SLOT=0
 SRC_URI=mirror://sourceforge/keepass/KeePass-2.48.1-Source.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=72df3471f62fcb24abf227cd51e41591
diff --git a/metadata/md5-cache/app-admin/kpcli-3.6 b/metadata/md5-cache/app-admin/kpcli-3.6
index f15f44d8b7fa..71661baf844e 100644
--- a/metadata/md5-cache/app-admin/kpcli-3.6
+++ b/metadata/md5-cache/app-admin/kpcli-3.6
@@ -7,5 +7,5 @@ LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Clone dev-perl/Crypt-Rijndael dev-perl/File-KeePass dev-perl/Math-Random-ISAAC dev-perl/Sort-Naturally dev-perl/Sub-Install dev-perl/TermReadKey dev-perl/Term-ReadLine-Gnu dev-perl/Term-ShellUI
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/kpcli/kpcli-3.6.pl
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=977cb61c78bff916acec2e905235b921
diff --git a/metadata/md5-cache/app-admin/passwordsafe-1.12.0-r1 b/metadata/md5-cache/app-admin/passwordsafe-1.12.0-r1
index b1ce6eed4d26..b09e25489aba 100644
--- a/metadata/md5-cache/app-admin/passwordsafe-1.12.0-r1
+++ b/metadata/md5-cache/app-admin/passwordsafe-1.12.0-r1
@@ -11,5 +11,5 @@ RDEPEND=net-misc/curl sys-apps/file sys-apps/util-linux x11-libs/libXt x11-libs/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwsafe/pwsafe/archive/1.12.0.tar.gz -> passwordsafe-1.12.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7e43ec172be425dde5754ef0e6826ab2
diff --git a/metadata/md5-cache/app-admin/passwordsafe-1.13.0 b/metadata/md5-cache/app-admin/passwordsafe-1.13.0
index 07a86a6d8312..370e8a6c5c7b 100644
--- a/metadata/md5-cache/app-admin/passwordsafe-1.13.0
+++ b/metadata/md5-cache/app-admin/passwordsafe-1.13.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0= net-misc/curl sys-apps/file sys-apps/util-linux x11-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwsafe/pwsafe/archive/1.13.0.tar.gz -> passwordsafe-1.13.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3b75b64d9e30e7e48ff2027ae42b350d
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r2 b/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r2
deleted file mode 100644
index 1f76aff8cd8d..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst unpack
-DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet 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[compat] sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 ) virtual/tmpfiles
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.9.0-1focal_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=76b7b6686416b158dfb69e899664b567
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r3 b/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r3
new file mode 100644
index 000000000000..73e4805574b7
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.9.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst unpack
+DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet 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[compat] sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 ) virtual/tmpfiles
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.9.0-1focal_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=34350fbf6223d9870033c8049249ad75
diff --git a/metadata/md5-cache/app-admin/pwman3-0.10.0-r1 b/metadata/md5-cache/app-admin/pwman3-0.10.0-r1
index 0bdef08667a7..ed23d9c65563 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.10.0-r1
+++ b/metadata/md5-cache/app-admin/pwman3-0.10.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwman3/pwman3/archive/v0.10.0.tar.gz -> pwman3-0.10.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8964b3c747bbb4c8b8da81debdda5dc
diff --git a/metadata/md5-cache/app-admin/pwman3-0.11.1 b/metadata/md5-cache/app-admin/pwman3-0.11.1
index 387d869c0b0b..b32642b5d82f 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.11.1
+++ b/metadata/md5-cache/app-admin/pwman3-0.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwman3/pwman3/archive/v0.11.1.tar.gz -> pwman3-0.11.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bf096e9938becafe3e1f4b34958e5b89
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.6.6 b/metadata/md5-cache/app-admin/rasdaemon-0.6.6
deleted file mode 100644
index 17afaff40fd3..000000000000
--- a/metadata/md5-cache/app-admin/rasdaemon-0.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install setup
-DESCRIPTION=Reliability, Availability and Serviceability logging tool
-EAPI=7
-HOMEPAGE=http://www.infradead.org/~mchehab/rasdaemon/
-IUSE=sqlite kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-devel/gettext sys-apps/dmidecode sqlite? ( dev-db/sqlite dev-perl/DBD-SQLite )
-SLOT=0
-SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.6.tar.bz2
-_eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=98a97e68636c886984250739c5ba32c5
diff --git a/metadata/md5-cache/app-admin/sshguard-2.4.2 b/metadata/md5-cache/app-admin/sshguard-2.4.2
index 937467f88739..17cc9abb4570 100644
--- a/metadata/md5-cache/app-admin/sshguard-2.4.2
+++ b/metadata/md5-cache/app-admin/sshguard-2.4.2
@@ -4,10 +4,10 @@ DEPEND=sys-devel/flex
 DESCRIPTION=protects hosts from brute force attacks against ssh
 EAPI=7
 HOMEPAGE=https://www.sshguard.net/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=virtual/logger
 SLOT=0
 SRC_URI=mirror://sourceforge/sshguard/sshguard-2.4.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=97e181d08fcb8b8195b54772c7735736
+_md5_=41dc1d4d62c1267c566c0e87fe1db846
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index ffb767f39fea..5c66d0ccb9af 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/brotli-1.0.9-r1 b/metadata/md5-cache/app-arch/brotli-1.0.9-r1
index b52afd9a2a68..0ea7eec60c78 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r1
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 DESCRIPTION=Generic-purpose lossless compression algorithm
 EAPI=7
 HOMEPAGE=https://github.com/google/brotli
-IUSE=python test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_python3_8 python_targets_python3_9
+IUSE=python test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT python? ( Apache-2.0 )
-RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz
 _eclasses_=cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	cmake-utils	12008d68ebfd61f49a377c49f83558a8	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=905d69ba76da175086aa131672545a8a
+_md5_=cf704ed9d8792e939e0dc73236ffcebb
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.9-r2 b/metadata/md5-cache/app-arch/brotli-1.0.9-r2
index 9fe9b5242401..47b79be44d28 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r2
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 DESCRIPTION=Generic-purpose lossless compression algorithm
 EAPI=7
 HOMEPAGE=https://github.com/google/brotli
-IUSE=python 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 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python 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 python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT python? ( Apache-2.0 )
-RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz
 _eclasses_=cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	cmake-utils	12008d68ebfd61f49a377c49f83558a8	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8723209f3fe45af545430998ea7fc4ac
+_md5_=12a194159e8e8f12bf7550f11d3768af
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.9-r3 b/metadata/md5-cache/app-arch/brotli-1.0.9-r3
index 0fd37ae349e0..b9eaa8c6c2d4 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r3
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 DESCRIPTION=Generic-purpose lossless compression algorithm
 EAPI=7
 HOMEPAGE=https://github.com/google/brotli
-IUSE=python 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 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python 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 python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT python? ( Apache-2.0 )
-RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fde37195396632780c09a1563d17c898
+_md5_=b4d707214e413f1feefbbb774908f790
diff --git a/metadata/md5-cache/app-arch/engrampa-1.24.1 b/metadata/md5-cache/app-arch/engrampa-1.24.1
index b62e94de9783..f33ba5a37e72 100644
--- a/metadata/md5-cache/app-arch/engrampa-1.24.1
+++ b/metadata/md5-cache/app-arch/engrampa-1.24.1
@@ -9,5 +9,5 @@ LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/libSM x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) virtual/libintl !!app-arch/mate-file-archiver
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/engrampa-1.24.1.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	553f2bcf70c72d62970c216e3a74c24d	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	553f2bcf70c72d62970c216e3a74c24d	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f8495f916e3f4987172c08ac52372ef5
diff --git a/metadata/md5-cache/app-arch/gcab-1.4 b/metadata/md5-cache/app-arch/gcab-1.4
index b00ce27a0106..aab61efd4ab2 100644
--- a/metadata/md5-cache/app-arch/gcab-1.4
+++ b/metadata/md5-cache/app-arch/gcab-1.4
@@ -5,7 +5,7 @@ DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/msitools
 IUSE=gtk-doc +introspection test vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.62.0:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gcab/1.4/gcab-1.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c403be1b91f54f449adb8ee5a8e9bff0
+_md5_=525480e6018e96804f8091ed053e288a
diff --git a/metadata/md5-cache/app-arch/makeself-2.4.3 b/metadata/md5-cache/app-arch/makeself-2.4.3
index ecb2eca78722..e6b1a972b419 100644
--- a/metadata/md5-cache/app-arch/makeself-2.4.3
+++ b/metadata/md5-cache/app-arch/makeself-2.4.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/megastep/makeself/archive/refs/tags/release-2.4.3.tar.gz -> makeself-2.4.3.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=7e20de2dfa6528e738298283bdb75610
diff --git a/metadata/md5-cache/app-arch/makeself-2.4.5 b/metadata/md5-cache/app-arch/makeself-2.4.5
index 775df0bc8113..810af35905fb 100644
--- a/metadata/md5-cache/app-arch/makeself-2.4.5
+++ b/metadata/md5-cache/app-arch/makeself-2.4.5
@@ -7,5 +7,5 @@ LICENSE=GPL-2+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/megastep/makeself/archive/refs/tags/release-2.4.5.tar.gz -> makeself-2.4.5.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=7d9e0383d20c17c8ad70089a4a3e3451
diff --git a/metadata/md5-cache/app-arch/p7zip-16.02-r8 b/metadata/md5-cache/app-arch/p7zip-16.02-r8
index 921cd2965560..d82cc14ede92 100644
--- a/metadata/md5-cache/app-arch/p7zip-16.02-r8
+++ b/metadata/md5-cache/app-arch/p7zip-16.02-r8
@@ -11,5 +11,5 @@ RDEPEND=wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] )
 REQUIRED_USE=kde? ( wxwidgets )
 SLOT=0
 SRC_URI=mirror://sourceforge/p7zip/p7zip_16.02_src_all.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8b3dd6ae5dc9647a861aff57a630e21b
diff --git a/metadata/md5-cache/app-arch/pbzip2-1.1.13 b/metadata/md5-cache/app-arch/pbzip2-1.1.13
index 8640c4ff1819..e5cc597f2938 100644
--- a/metadata/md5-cache/app-arch/pbzip2-1.1.13
+++ b/metadata/md5-cache/app-arch/pbzip2-1.1.13
@@ -4,10 +4,10 @@ DESCRIPTION=Parallel bzip2 (de)compressor using libbz2
 EAPI=7
 HOMEPAGE=http://compression.ca/pbzip2/ https://launchpad.net/pbzip2
 IUSE=static symlink
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BZIP2
 RDEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] )
 SLOT=0
 SRC_URI=https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6a96920b62cde12596e02721827dcf10
+_md5_=993f5896c3d1f8282fcd95823369edfe
diff --git a/metadata/md5-cache/app-arch/zstd-1.5.0 b/metadata/md5-cache/app-arch/zstd-1.5.0
index 25400fc2ba7c..1ef346ca1e9f 100644
--- a/metadata/md5-cache/app-arch/zstd-1.5.0
+++ b/metadata/md5-cache/app-arch/zstd-1.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=7
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=lz4 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=51f1cfce77e83dd5b1206f695905f275
+_md5_=6ac66f01cbb38fbfad9853ff9c3fc940
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 7aecefe6bfb0..aa372f6f7317 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/duplicity-0.8.17 b/metadata/md5-cache/app-backup/duplicity-0.8.17
deleted file mode 100644
index d7868149af4c..000000000000
--- a/metadata/md5-cache/app-backup/duplicity-0.8.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_8(-)?] dev-python/setuptools[python_targets_python3_8(-)?] dev-python/setuptools_scm[python_targets_python3_8(-)?] test? ( app-arch/par2cmdline dev-python/mock[python_targets_python3_8(-)?] dev-python/pexpect[python_targets_python3_8(-)?] )
-DESCRIPTION=Secure backup system using gnupg to encrypt data
-EAPI=7
-HOMEPAGE=https://www.nongnu.org/duplicity/
-IUSE=s3 test python_targets_python3_8
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3
-RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_8(-)?] dev-python/paramiko[python_targets_python3_8(-)?] dev-python/future[python_targets_python3_8(-)?] s3? ( dev-python/boto[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://code.launchpad.net/duplicity/0.8-series/0.8.17/+download/duplicity-0.8.17.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=42d87ad05428ae26225e065c193e7706
diff --git a/metadata/md5-cache/app-backup/duplicity-0.8.20 b/metadata/md5-cache/app-backup/duplicity-0.8.20
new file mode 100644
index 000000000000..fdbf899f0000
--- /dev/null
+++ b/metadata/md5-cache/app-backup/duplicity-0.8.20
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( app-arch/par2cmdline dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DESCRIPTION=Secure backup system using gnupg to encrypt data
+EAPI=7
+HOMEPAGE=https://www.nongnu.org/duplicity/
+IUSE=s3 test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-3
+RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] s3? ( dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://code.launchpad.net/duplicity/0.8-series/0.8.20/+download/duplicity-0.8.20.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bd7763531e56858a55e1a1bd57a7138a
diff --git a/metadata/md5-cache/app-backup/rear-2.6 b/metadata/md5-cache/app-backup/rear-2.6
index af11337bf2f6..cd8cdf5a87f6 100644
--- a/metadata/md5-cache/app-backup/rear-2.6
+++ b/metadata/md5-cache/app-backup/rear-2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-cdr/cdrtools app-shells/bash net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/sed sys-apps/util-linux sys-block/parted sys-boot/syslinux udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://github.com/rear/rear/archive/2.6.tar.gz -> rear-2.6.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=ca96468e7c01eca19d07f797f1374b7d
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 8a0b78c4aed8..7c4ebb71d9b3 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/stress-ng-0.12.12 b/metadata/md5-cache/app-benchmarks/stress-ng-0.12.12
index a8439434b7bf..bef2be86ed59 100644
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.12.12
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.12.12
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:=
 SLOT=0
 SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.12.12.tar.xz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=81a5bb717a61dabfd70d57e7ed19fc78
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index ed45d3f63633..3bdb672b0e13 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/dolphin-plugins-mountiso-21.04.3 b/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-21.04.3
index b8fddc6678b4..02f4b4d13d25 100644
--- a/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-21.04.3
+++ b/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Dolphin plugin for ISO loopback device mounting
 EAPI=7
 HOMEPAGE=https://apps.kde.org/dolphin_plugins/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/dolphin-plugins-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7900e64cb40f25a4e43f4ec684d404d5
+_md5_=560f620cf493efabca6c681fed8d2e44
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index dd2aa512a385..08b829563964 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/acme-1.18.0 b/metadata/md5-cache/app-crypt/acme-1.18.0
new file mode 100644
index 000000000000..271af9d0deb4
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-1.18.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.18.0.tar.gz -> certbot-1.18.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=767056dfcb5992304247dcfea222dbf4
diff --git a/metadata/md5-cache/app-crypt/acme-sh-2.9.0 b/metadata/md5-cache/app-crypt/acme-sh-2.9.0
index 949b8cea7784..5b0df77cd12b 100644
--- a/metadata/md5-cache/app-crypt/acme-sh-2.9.0
+++ b/metadata/md5-cache/app-crypt/acme-sh-2.9.0
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/openssl:0 net-misc/curl net-misc/socat
 SLOT=0
 SRC_URI=https://github.com/acmesh-official/acme.sh/archive/2.9.0.tar.gz -> acme.sh-2.9.0.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=21f0793beb84d422b981d7e31225d55d
diff --git a/metadata/md5-cache/app-crypt/acme-sh-9999 b/metadata/md5-cache/app-crypt/acme-sh-9999
index e24d86b2c206..c7a07361384f 100644
--- a/metadata/md5-cache/app-crypt/acme-sh-9999
+++ b/metadata/md5-cache/app-crypt/acme-sh-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/openssl:0 net-misc/curl net-misc/socat
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=ee004e0718575e50827ee7f7b7bec29d
diff --git a/metadata/md5-cache/app-crypt/certbot-1.18.0 b/metadata/md5-cache/app-crypt/certbot-1.18.0
new file mode 100644
index 000000000000..1275092753f6
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-1.18.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-1.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/configargparse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.18.0.tar.gz -> certbot-1.18.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bfd0b42cc8ce95c419718c85b09c572d
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.18.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.18.0
new file mode 100644
index 000000000000..c6cd0a16a2f3
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.18.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-1.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=app-crypt/certbot-1.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-augeas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.18.0.tar.gz -> certbot-1.18.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=43b7e0abef2e10344bd7d7e114d3cb14
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.18.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.18.0
new file mode 100644
index 000000000000..7b2fee2d1733
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.18.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-1.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=app-crypt/certbot-1.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyparsing-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.18.0.tar.gz -> certbot-1.18.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=542022149b4c28accc6a82b487164c43
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.15.1 b/metadata/md5-cache/app-crypt/gpgme-1.15.1
index 02a042965ee1..290b9e18c47b 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.15.1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.15.1
@@ -1,15 +1,15 @@
 BDEPEND=python? ( dev-lang/swig ) >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtcore:5 ) qt5? ( dev-qt/qttest:5 )
+DEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qt5? ( dev-qt/qtcore:5 ) qt5? ( dev-qt/qttest:5 )
 DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=7
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
-IUSE=common-lisp static-libs +cxx python qt5 python_targets_python3_8 python_targets_python3_9
+IUSE=common-lisp static-libs +cxx python qt5 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtcore:5 )
-REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qt5? ( dev-qt/qtcore:5 )
+REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.15.1.tar.bz2
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9b9f1c271bfb43e20404686291c1a98a
+_md5_=3e03027adb4a37d7d1f49b8e4617a134
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.16.0 b/metadata/md5-cache/app-crypt/gpgme-1.16.0
index e249061fa623..337a80227b17 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.16.0
+++ b/metadata/md5-cache/app-crypt/gpgme-1.16.0
@@ -1,15 +1,15 @@
 BDEPEND=python? ( dev-lang/swig ) >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtcore:5 ) qt5? ( dev-qt/qttest:5 )
+DEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qt5? ( dev-qt/qtcore:5 ) qt5? ( dev-qt/qttest:5 )
 DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=7
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
-IUSE=common-lisp static-libs +cxx python qt5 python_targets_python3_8 python_targets_python3_9
+IUSE=common-lisp static-libs +cxx python qt5 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) qt5? ( dev-qt/qtcore:5 )
-REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qt5? ( dev-qt/qtcore:5 )
+REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.16.0.tar.bz2
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8132b5d1355d8d760fd11eb6097308ec
+_md5_=c7797b9e07f7662e417538f4b6f86b33
diff --git a/metadata/md5-cache/app-crypt/md5deep-4.4 b/metadata/md5-cache/app-crypt/md5deep-4.4
index ef020aefaf97..97eecdf968c6 100644
--- a/metadata/md5-cache/app-crypt/md5deep-4.4
+++ b/metadata/md5-cache/app-crypt/md5deep-4.4
@@ -1,11 +1,11 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=install prepare
 DESCRIPTION=Expanded md5sum program with recursive and comparison options
-EAPI=6
+EAPI=8
 HOMEPAGE=http://md5deep.sourceforge.net/
 KEYWORDS=amd64 arm arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain GPL-2
 SLOT=0
 SRC_URI=https://github.com/jessek/hashdeep/archive/release-4.4.tar.gz -> md5deep-4.4.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4d505b27061724f97b717512a53b90e4
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=63dd2e8d2202531eda37603bf4f4604a
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.18.2-r4 b/metadata/md5-cache/app-crypt/mit-krb5-1.18.2-r4
deleted file mode 100644
index 129303244e0e..000000000000
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.18.2-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/yacc cpu_flags_x86_aes? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) ) doc? ( virtual/latex-base ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/tcl:0 dev-util/dejagnu dev-util/cmocka ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.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(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_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/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) lmdb? ( dev-db/lmdb ) 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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) pkinit? ( >=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(-)?] ) xinetd? ( sys-apps/xinetd )
-DESCRIPTION=MIT Kerberos V
-EAPI=7
-HOMEPAGE=https://web.mit.edu/kerberos/www/
-IUSE=cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd abi_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=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
-RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.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(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_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/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) lmdb? ( dev-db/lmdb ) 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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) pkinit? ( >=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(-)?] ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-1.18.2.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3e2fabd701bf73c1f8fa75a7b21f6026
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.18.3-r2 b/metadata/md5-cache/app-crypt/mit-krb5-1.18.3-r2
deleted file mode 100644
index a11a7191c90c..000000000000
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.18.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/yacc cpu_flags_x86_aes? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) ) doc? ( virtual/latex-base ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/tcl:0 dev-util/dejagnu dev-util/cmocka ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.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(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_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/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) lmdb? ( dev-db/lmdb ) 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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) pkinit? ( >=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(-)?] ) xinetd? ( sys-apps/xinetd )
-DESCRIPTION=MIT Kerberos V
-EAPI=7
-HOMEPAGE=https://web.mit.edu/kerberos/www/
-IUSE=cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd abi_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=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
-RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.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(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_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/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) lmdb? ( dev-db/lmdb ) 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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) pkinit? ( >=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(-)?] ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-1.18.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9b15260603f7d2de656ba224f29253e1
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.19.1-r1 b/metadata/md5-cache/app-crypt/mit-krb5-1.19.1-r1
deleted file mode 100644
index 1e9b23661bf3..000000000000
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.19.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/yacc cpu_flags_x86_aes? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) ) doc? ( virtual/latex-base ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/tcl:0 dev-util/dejagnu dev-util/cmocka ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.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(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_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/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) lmdb? ( dev-db/lmdb ) 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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) pkinit? ( >=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(-)?] ) xinetd? ( sys-apps/xinetd )
-DESCRIPTION=MIT Kerberos V
-EAPI=7
-HOMEPAGE=https://web.mit.edu/kerberos/www/
-IUSE=cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
-RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.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(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_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/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) lmdb? ( dev-db/lmdb ) 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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) pkinit? ( >=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(-)?] ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.19/krb5-1.19.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ca7c3ab24076f058352b77e122c54cd1
diff --git a/metadata/md5-cache/app-crypt/qca-2.3.3 b/metadata/md5-cache/app-crypt/qca-2.3.3
index 66a099d8cc2f..07111a1d8b32 100644
--- a/metadata/md5-cache/app-crypt/qca-2.3.3
+++ b/metadata/md5-cache/app-crypt/qca-2.3.3
@@ -5,11 +5,11 @@ DESCRIPTION=Qt Cryptographic Architecture (QCA)
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/QCA
 IUSE=botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( >=dev-libs/openssl-1.1 dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( >=dev-libs/openssl-1.1:0= )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://kde/stable/qca/2.3.3/qca-2.3.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c222daf0f5f3650a183a20743578284b
+_md5_=a85de9c5556665457b7e97b060765986
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.15 b/metadata/md5-cache/app-crypt/trousers-0.3.15
index 346c4649481c..b56047bf5531 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.15
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.15
@@ -5,10 +5,10 @@ DESCRIPTION=An open-source TCG Software Stack (TSS) v1.1 implementation
 EAPI=7
 HOMEPAGE=http://trousers.sf.net
 IUSE=doc selinux kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 arm arm64 ~m68k ~ppc ppc64 ~riscv ~s390 x86
 LICENSE=CPL-1.0 GPL-2
 RDEPEND=acct-group/tss acct-user/tss >=dev-libs/glib-2 >=dev-libs/openssl-0.9.7:0= selinux? ( sec-policy/selinux-tcsd )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.15.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=4e2183a7bf28bdbd82565bb355a6bb0c
+_md5_=c378935374eaeb56d22486f9ceb1bb78
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.24_p8 b/metadata/md5-cache/app-crypt/veracrypt-1.24_p8
index 7bfbf6900fe7..56a519a2f9dd 100644
--- a/metadata/md5-cache/app-crypt/veracrypt-1.24_p8
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.24_p8
@@ -11,5 +11,5 @@ RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.24-Update8_MacOSX.tar.gz -> veracrypt-1.24_p8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
-_md5_=b707ea647c3b3974200dd26cabe53a73
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
+_md5_=5eea6ae79b48aa1b48f333f6f7fc3f53
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 08eb3bc3d0f0..c7b5710724bd 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/gnucash-docs-4.4 b/metadata/md5-cache/app-doc/gnucash-docs-4.4
index 99880e56e302..e171678b79b8 100644
--- a/metadata/md5-cache/app-doc/gnucash-docs-4.4
+++ b/metadata/md5-cache/app-doc/gnucash-docs-4.4
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 FDL-1.1
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/4.4.tar.gz -> gnucash-docs-4.4.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e74eae164bf6539f22ae5c05c0126622
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-4.5 b/metadata/md5-cache/app-doc/gnucash-docs-4.5
index 0a8ff3ced36d..8955ff6044d4 100644
--- a/metadata/md5-cache/app-doc/gnucash-docs-4.5
+++ b/metadata/md5-cache/app-doc/gnucash-docs-4.5
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 FDL-1.1
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/4.5.tar.gz -> gnucash-docs-4.5.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=00874a1b186ca10ceb3e1feead6ff6cb
diff --git a/metadata/md5-cache/app-doc/selflinux-0.13.0 b/metadata/md5-cache/app-doc/selflinux-0.13.0
deleted file mode 100644
index 841dd9c2b57a..000000000000
--- a/metadata/md5-cache/app-doc/selflinux-0.13.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=german-language hypertext tutorial about Linux
-EAPI=5
-HOMEPAGE=http://selflinux.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=FDL-1.1+
-SLOT=0
-SRC_URI=mirror://sourceforge/selflinux/SelfLinux-0.13.0-html.tar.gz
-_md5_=a9d1a45f5c0a16d01cb3ee35e13adcc0
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 396d28ed563e..1a4ea638dd15 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/juffed-0.10_p20160323-r1 b/metadata/md5-cache/app-editors/juffed-0.10_p20160323-r1
deleted file mode 100644
index 64a32a11510b..000000000000
--- a/metadata/md5-cache/app-editors/juffed-0.10_p20160323-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-i18n/enca dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=x11-libs/qscintilla-2.9.4:=[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=QScintilla-based tabbed text editor with syntax highlighting
-EAPI=7
-HOMEPAGE=http://juffed.com/en/
-IUSE=debug
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/enca dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
-SLOT=0
-SRC_URI=https://github.com/Mezomish/juffed/tarball/5ba17f90ec173e773470bc80ea26bca9a3f093fd -> juffed-0.10_p20160323.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b00f698b13d8d360e8f7c46563350dd2
diff --git a/metadata/md5-cache/app-editors/juffed-0.10_p20200103 b/metadata/md5-cache/app-editors/juffed-0.10_p20200103
new file mode 100644
index 000000000000..b266a10492db
--- /dev/null
+++ b/metadata/md5-cache/app-editors/juffed-0.10_p20200103
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-i18n/enca dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[X] dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-libs/qscintilla dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=QScintilla-based tabbed text editor with syntax highlighting
+EAPI=7
+HOMEPAGE=http://juffed.com/en/ https://github.com/Mezomish/juffed
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-i18n/enca dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[X] dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-libs/qscintilla
+SLOT=0
+SRC_URI=https://github.com/Mezomish/juffed/archive/74ab7236a30be17351edc5b83eb3579affd96913.tar.gz -> juffed-0.10_p20200103.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b2eeedc0bc66fb90ed9ea57d3acc2809
diff --git a/metadata/md5-cache/app-editors/micro-2.0.9 b/metadata/md5-cache/app-editors/micro-2.0.9
index 556598da0522..38ebab6f14f2 100644
--- a/metadata/md5-cache/app-editors/micro-2.0.9
+++ b/metadata/md5-cache/app-editors/micro-2.0.9
@@ -8,5 +8,5 @@ LICENSE=MIT Apache-2.0 BSD MPL-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/zyedidia/micro/archive/v2.0.9.tar.gz -> micro-2.0.9.tar.gz mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/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/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dustin/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/gdamore/encoding/@v/v1.0.0.zip -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gdamore/encoding/@v/v1.0.0.mod -> github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/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/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/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/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/p-e-w/go-runewidth/@v/v0.0.10-0.20200613030200-3e1705c5c059.zip -> github.com%2Fp-e-w%2Fgo-runewidth%2F@v%2Fv0.0.10-0.20200613030200-3e1705c5c059.zip mirror://goproxy//github.com/p-e-w/go-runewidth/@v/v0.0.10-0.20200613030200-3e1705c5c059.mod -> github.com%2Fp-e-w%2Fgo-runewidth%2F@v%2Fv0.0.10-0.20200613030200-3e1705c5c059.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.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/robertkrimen/otto/@v/v0.0.0-20191219234010-c382bd3c16ff.zip -> github.com%2Frobertkrimen%2Fotto%2F@v%2Fv0.0.0-20191219234010-c382bd3c16ff.zip mirror://goproxy//github.com/robertkrimen/otto/@v/v0.0.0-20191219234010-c382bd3c16ff.mod -> github.com%2Frobertkrimen%2Fotto%2F@v%2Fv0.0.0-20191219234010-c382bd3c16ff.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/stretchr/objx/@v/v0.1.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip 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.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/xo/terminfo/@v/v0.0.0-20200218205459-454e5b68f9e8.zip -> github.com%2Fxo%2Fterminfo%2F@v%2Fv0.0.0-20200218205459-454e5b68f9e8.zip mirror://goproxy//github.com/xo/terminfo/@v/v0.0.0-20200218205459-454e5b68f9e8.mod -> github.com%2Fxo%2Fterminfo%2F@v%2Fv0.0.0-20200218205459-454e5b68f9e8.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20190206043414-8bfc7677f583.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20190206043414-8bfc7677f583.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20191220021717-ab39c6098bdb.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20191220021717-ab39c6098bdb.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20191220021717-ab39c6098bdb.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20191220021717-ab39c6098bdb.mod mirror://goproxy//github.com/zyedidia/clipboard/@v/v1.0.3.zip -> github.com%2Fzyedidia%2Fclipboard%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/zyedidia/clipboard/@v/v1.0.3.mod -> github.com%2Fzyedidia%2Fclipboard%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/zyedidia/glob/@v/v0.0.0-20170209203856-dd4023a66dc3.zip -> github.com%2Fzyedidia%2Fglob%2F@v%2Fv0.0.0-20170209203856-dd4023a66dc3.zip mirror://goproxy//github.com/zyedidia/glob/@v/v0.0.0-20170209203856-dd4023a66dc3.mod -> github.com%2Fzyedidia%2Fglob%2F@v%2Fv0.0.0-20170209203856-dd4023a66dc3.mod mirror://goproxy//github.com/zyedidia/go-runewidth/@v/v0.0.12.zip -> github.com%2Fzyedidia%2Fgo-runewidth%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/zyedidia/go-runewidth/@v/v0.0.12.mod -> github.com%2Fzyedidia%2Fgo-runewidth%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/zyedidia/go-shellquote/@v/v0.0.0-20200613203517-eccd813c0655.zip -> github.com%2Fzyedidia%2Fgo-shellquote%2F@v%2Fv0.0.0-20200613203517-eccd813c0655.zip mirror://goproxy//github.com/zyedidia/go-shellquote/@v/v0.0.0-20200613203517-eccd813c0655.mod -> github.com%2Fzyedidia%2Fgo-shellquote%2F@v%2Fv0.0.0-20200613203517-eccd813c0655.mod mirror://goproxy//github.com/zyedidia/highlight/@v/v0.0.0-20170330143449-201131ce5cf5.zip -> github.com%2Fzyedidia%2Fhighlight%2F@v%2Fv0.0.0-20170330143449-201131ce5cf5.zip mirror://goproxy//github.com/zyedidia/highlight/@v/v0.0.0-20170330143449-201131ce5cf5.mod -> github.com%2Fzyedidia%2Fhighlight%2F@v%2Fv0.0.0-20170330143449-201131ce5cf5.mod mirror://goproxy//github.com/zyedidia/json5/@v/v0.0.0-20200102012142-2da050b1a98d.zip -> github.com%2Fzyedidia%2Fjson5%2F@v%2Fv0.0.0-20200102012142-2da050b1a98d.zip mirror://goproxy//github.com/zyedidia/json5/@v/v0.0.0-20200102012142-2da050b1a98d.mod -> github.com%2Fzyedidia%2Fjson5%2F@v%2Fv0.0.0-20200102012142-2da050b1a98d.mod mirror://goproxy//github.com/zyedidia/poller/@v/v1.0.1.zip -> github.com%2Fzyedidia%2Fpoller%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/zyedidia/poller/@v/v1.0.1.mod -> github.com%2Fzyedidia%2Fpoller%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/zyedidia/pty/@v/v2.0.0+incompatible.zip -> github.com%2Fzyedidia%2Fpty%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/zyedidia/pty/@v/v2.0.0+incompatible.mod -> github.com%2Fzyedidia%2Fpty%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/zyedidia/tcell/v2/@v/v2.0.6.zip -> github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.6.zip mirror://goproxy//github.com/zyedidia/tcell/v2/@v/v2.0.6.mod -> github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.6.mod mirror://goproxy//github.com/zyedidia/tcell/v2/@v/v2.0.7.zip -> github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.7.zip mirror://goproxy//github.com/zyedidia/tcell/v2/@v/v2.0.7.mod -> github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.7.mod mirror://goproxy//github.com/zyedidia/tcell/v2/@v/v2.0.8.zip -> github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.8.zip mirror://goproxy//github.com/zyedidia/tcell/v2/@v/v2.0.8.mod -> github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.8.mod mirror://goproxy//github.com/zyedidia/terminal/@v/v0.0.0-20180726154117-533c623e2415.zip -> github.com%2Fzyedidia%2Fterminal%2F@v%2Fv0.0.0-20180726154117-533c623e2415.zip mirror://goproxy//github.com/zyedidia/terminal/@v/v0.0.0-20180726154117-533c623e2415.mod -> github.com%2Fzyedidia%2Fterminal%2F@v%2Fv0.0.0-20180726154117-533c623e2415.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190204203706-41f3e6584952.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626150813-e07cf5db2756.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//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/sourcemap.v1/@v/v1.0.5.zip -> gopkg.in%2Fsourcemap.v1%2F@v%2Fv1.0.5.zip mirror://goproxy//gopkg.in/sourcemap.v1/@v/v1.0.5.mod -> gopkg.in%2Fsourcemap.v1%2F@v%2Fv1.0.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//layeh.com/gopher-luar/@v/v1.0.7.zip -> layeh.com%2Fgopher-luar%2F@v%2Fv1.0.7.zip mirror://goproxy//layeh.com/gopher-luar/@v/v1.0.7.mod -> layeh.com%2Fgopher-luar%2F@v%2Fv1.0.7.mod
-_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=go-module	8aabf8812bab7a6f07e7a32958c505ef	optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=a19d74ffb9df63e1184a851a69bffa75
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 c103fa282602..482f4d53ad03 100644
--- a/metadata/md5-cache/app-editors/neovim-0.4.4-r100
+++ b/metadata/md5-cache/app-editors/neovim-0.4.4-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.4.4.tar.gz -> neovim-0.4.4.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=488fe7da4b7bbb6355182b8723f81bc1
diff --git a/metadata/md5-cache/app-editors/neovim-0.5.0 b/metadata/md5-cache/app-editors/neovim-0.5.0
index b7751f6fd88c..93246a7fb8fa 100644
--- a/metadata/md5-cache/app-editors/neovim-0.5.0
+++ b/metadata/md5-cache/app-editors/neovim-0.5.0
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.5.0.tar.gz -> neovim-0.5.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6a8c2b6913b7a875ad2a012911a80ce3
diff --git a/metadata/md5-cache/app-editors/neovim-9999 b/metadata/md5-cache/app-editors/neovim-9999
index 1f582088bea5..7449da629bc1 100644
--- a/metadata/md5-cache/app-editors/neovim-9999
+++ b/metadata/md5-cache/app-editors/neovim-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) 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= dev-libs/tree-sitter:= tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6a8c2b6913b7a875ad2a012911a80ce3
diff --git a/metadata/md5-cache/app-editors/pluma-1.24.1 b/metadata/md5-cache/app-editors/pluma-1.24.1
index bd183b733f58..e99c9fa428c9 100644
--- a/metadata/md5-cache/app-editors/pluma-1.24.1
+++ b/metadata/md5-cache/app-editors/pluma-1.24.1
@@ -3,13 +3,13 @@ DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-l
 DESCRIPTION=Pluma text editor for the MATE desktop
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
-IUSE=+introspection spell test python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=+introspection spell test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libSM-1.0 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.6:= >=app-text/iso-codes-0.35 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[introspection?] virtual/libintl
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libSM-1.0 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.6:= >=app-text/iso-codes-0.35 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[introspection?] virtual/libintl
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/pluma-1.24.1.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	553f2bcf70c72d62970c216e3a74c24d	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f1beed59e445a2d6ed66aef53ec21ccf
+_md5_=84e94091847182d044677474acd98eff
diff --git a/metadata/md5-cache/app-editors/pluma-1.24.2 b/metadata/md5-cache/app-editors/pluma-1.24.2
index 4be6e07a4e2e..5e9463a245f6 100644
--- a/metadata/md5-cache/app-editors/pluma-1.24.2
+++ b/metadata/md5-cache/app-editors/pluma-1.24.2
@@ -3,13 +3,13 @@ DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-l
 DESCRIPTION=Pluma text editor for the MATE desktop
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
-IUSE=+introspection spell test +python_single_target_python3_8 test
+IUSE=+introspection spell test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libSM-1.0 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.6:= >=app-text/iso-codes-0.35 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[introspection?] virtual/libintl
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libSM-1.0 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.6:= >=app-text/iso-codes-0.35 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[introspection?] virtual/libintl
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/pluma-1.24.2.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	553f2bcf70c72d62970c216e3a74c24d	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9180960e4d5bb3ecf990949aa3c113fe
+_md5_=9a98f8b9e7a3fb22ce51a61aa6fc0c4d
diff --git a/metadata/md5-cache/app-editors/retext-7.1.0 b/metadata/md5-cache/app-editors/retext-7.1.0
index c62c8135a9bd..44e699d7533b 100644
--- a/metadata/md5-cache/app-editors/retext-7.1.0
+++ b/metadata/md5-cache/app-editors/retext-7.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/R/ReText/ReText-7.1.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0824207b064200567f14d24308008bf9
diff --git a/metadata/md5-cache/app-editors/retext-7.2.1 b/metadata/md5-cache/app-editors/retext-7.2.1
index 35d6d03f3675..48dc4a571a36 100644
--- a/metadata/md5-cache/app-editors/retext-7.2.1
+++ b/metadata/md5-cache/app-editors/retext-7.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/R/ReText/ReText-7.2.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7be5b92d4bd878327d33b6bd86763cec
diff --git a/metadata/md5-cache/app-editors/retext-9999 b/metadata/md5-cache/app-editors/retext-9999
index cbe9df25cfec..b4f2c2da5161 100644
--- a/metadata/md5-cache/app-editors/retext-9999
+++ b/metadata/md5-cache/app-editors/retext-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=15883466f143b8f61feb4993a825dc2a
diff --git a/metadata/md5-cache/app-editors/vis-0.7 b/metadata/md5-cache/app-editors/vis-0.7
index f0e62fe35129..c333dc842683 100644
--- a/metadata/md5-cache/app-editors/vis-0.7
+++ b/metadata/md5-cache/app-editors/vis-0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martanne/vis/releases/download/v0.7/vis-0.7.tar.gz test? ( https://github.com/martanne/vis-test/releases/download/v0.5/vis-test-0.5.tar.gz )
-_eclasses_=lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e24c495503de8177b64d5b778e19d712
diff --git a/metadata/md5-cache/app-editors/vis-9999 b/metadata/md5-cache/app-editors/vis-9999
index 14cc196b8c46..db442f988dde 100644
--- a/metadata/md5-cache/app-editors/vis-9999
+++ b/metadata/md5-cache/app-editors/vis-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) lua? ( lua_single_t
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ffd5bf87d8774c9306883bce09661f68
diff --git a/metadata/md5-cache/app-editors/wxhexeditor-0.24-r1 b/metadata/md5-cache/app-editors/wxhexeditor-0.24-r1
index eccda15db174..b87ae9e978f7 100644
--- a/metadata/md5-cache/app-editors/wxhexeditor-0.24-r1
+++ b/metadata/md5-cache/app-editors/wxhexeditor-0.24-r1
@@ -8,5 +8,5 @@ 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	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=edcecd06d5f4faf926f70d195c5d39b0
diff --git a/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.1.3-r1 b/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.1.3-r1
index f231cdd469e7..cb09e5c6aa69 100644
--- a/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.1.3-r1
+++ b/metadata/md5-cache/app-editors/xmlcopyeditor-1.2.1.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/aspell dev-libs/libxml2 dev-libs/libxslt dev-libs/xerces-c[icu] dev-libs/libpcre x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/xml-copy-editor/xmlcopyeditor-1.2.1.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5887342a81cc762d26a925eb19e2ec8a
diff --git a/metadata/md5-cache/app-editors/xmlcopyeditor-1.3.0.0 b/metadata/md5-cache/app-editors/xmlcopyeditor-1.3.0.0
index c1011ae04eac..13ecbf01aead 100644
--- a/metadata/md5-cache/app-editors/xmlcopyeditor-1.3.0.0
+++ b/metadata/md5-cache/app-editors/xmlcopyeditor-1.3.0.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/aspell dev-libs/libxml2 dev-libs/libxslt dev-libs/xerces-c[cpu_flags_x86_sse2,icu] dev-libs/libpcre x11-libs/wxGTK:3.0-gtk3[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/xml-copy-editor/xmlcopyeditor-1.3.0.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3337001dc1f6416fe76e484146ab3de0
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 428cded07dcd..f649a065f55f 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/dash-2.19.0 b/metadata/md5-cache/app-emacs/dash-2.19.0
new file mode 100644
index 000000000000..26af9bd67227
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/dash-2.19.0
@@ -0,0 +1,12 @@
+BDEPEND=sys-apps/texinfo >=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=A modern list library for Emacs
+EAPI=8
+HOMEPAGE=https://github.com/magnars/dash.el
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://github.com/magnars/dash.el/archive/2.19.0.tar.gz -> dash-2.19.0.tar.gz
+_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=1739ee2204801795d2803b8cfe844936
diff --git a/metadata/md5-cache/app-emacs/magit-3.2.0 b/metadata/md5-cache/app-emacs/magit-3.2.0
new file mode 100644
index 000000000000..211da6d6e7e9
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/magit-3.2.0
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-25:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=app-emacs/dash-2.18.1 app-emacs/libegit2 >=app-emacs/transient-0.3.6 >=app-emacs/with-editor-3.0.4 sys-apps/texinfo
+DESCRIPTION=A Git porcelain inside Emacs
+EAPI=8
+HOMEPAGE=https://magit.vc/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=app-emacs/dash-2.18.1 app-emacs/libegit2 >=app-emacs/transient-0.3.6 >=app-emacs/with-editor-3.0.4 >=dev-vcs/git-2.0.0 >=app-editors/emacs-25:*
+SLOT=0
+SRC_URI=https://github.com/magit/magit/archive/v3.2.0.tar.gz -> magit-3.2.0.tar.gz
+_eclasses_=elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=01518d51fb8d51bba1b849070aa597bb
diff --git a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618 b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
index 7d48e9e851fb..9d8b07868b1a 100644
--- a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
+++ b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libvterm >=app-editors/emacs-26:*[dynamic-loading] >=app-editor
 SLOT=0
 SRC_URI=https://github.com/akermu/emacs-libvterm/archive/d9dfa624679afdd5db6ad25429ef86d3dd91401e.tar.gz -> vterm-0.0.1_pre20210618.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	b165dc0288d12ab26e86f41c56f03914	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=93472e45029ea47e0ad6653aa57303c4
+_md5_=c166173f7c46a240b71d08ff2319d7fd
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index aca92fec06a8..df1a440771bb 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/crossover-bin-21.0.0 b/metadata/md5-cache/app-emulation/crossover-bin-21.0.0
new file mode 100644
index 000000000000..f703c024b800
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/crossover-bin-21.0.0
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-arch/cpio app-arch/unzip dev-lang/perl dev-util/bbe
+DEFINED_PHASES=install nofetch prepare setup unpack
+DESCRIPTION=Commercial version of app-emulation/wine with paid support
+EAPI=7
+HOMEPAGE=https://www.codeweavers.com/products/
+IUSE=+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CROSSOVER-3
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) !prefix? ( sys-libs/glibc ) !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)] jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] ) media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/openssl dev-util/desktop-file-utils media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-),osmesa?] media-libs/tiff:0[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/libunwind[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-libs/vte:2.91[introspection] || ( sys-libs/glibc[crypt(+)] sys-libs/libxcrypt[compat] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=bindist test
+SLOT=0
+SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-21.0.0.bin
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=4d1aed1fe8d17146e1884a4f4afb29ff
diff --git a/metadata/md5-cache/app-emulation/crun-0.18 b/metadata/md5-cache/app-emulation/crun-0.18
deleted file mode 100644
index 2c5c643cc886..000000000000
--- a/metadata/md5-cache/app-emulation/crun-0.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install setup
-DEPEND=sys-kernel/linux-headers >=dev-libs/yajl-2.0.0 caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=A fast and low-memory footprint OCI Container Runtime fully written in C
-EAPI=7
-HOMEPAGE=https://github.com/containers/crun
-IUSE=+bpf +caps criu +seccomp systemd static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=sys-kernel/linux-headers >=dev-libs/yajl-2.0.0 caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/containers/crun/releases/download/0.18/crun-0.18.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6b0d04aed4be5366a903ad28131dda19
diff --git a/metadata/md5-cache/app-emulation/crun-0.19.1 b/metadata/md5-cache/app-emulation/crun-0.19.1
deleted file mode 100644
index 88c060bb3850..000000000000
--- a/metadata/md5-cache/app-emulation/crun-0.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install setup
-DEPEND=sys-kernel/linux-headers >=dev-libs/yajl-2.0.0 caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=A fast and low-memory footprint OCI Container Runtime fully written in C
-EAPI=7
-HOMEPAGE=https://github.com/containers/crun
-IUSE=+bpf +caps criu +seccomp systemd static-libs
-KEYWORDS=amd64 ~arm ~arm64 ppc64
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=sys-kernel/linux-headers >=dev-libs/yajl-2.0.0 caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/containers/crun/releases/download/0.19.1/crun-0.19.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9bf89df768f8173524f5a9ce05d5408
diff --git a/metadata/md5-cache/app-emulation/crun-0.19.1-r1 b/metadata/md5-cache/app-emulation/crun-0.19.1-r1
new file mode 100644
index 000000000000..5e2ef2f067d7
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/crun-0.19.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=sys-kernel/linux-headers >=dev-libs/yajl-2.0.0 caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=A fast and low-memory footprint OCI Container Runtime fully written in C
+EAPI=7
+HOMEPAGE=https://github.com/containers/crun
+IUSE=+bpf +caps criu +seccomp systemd static-libs
+KEYWORDS=amd64 ~arm ~arm64 ppc64
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=sys-kernel/linux-headers >=dev-libs/yajl-2.0.0 caps? ( sys-libs/libcap ) criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/crun/releases/download/0.19.1/crun-0.19.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a3d205433543fff11f6fcdb933244852
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-3.11.0 b/metadata/md5-cache/app-emulation/diskimage-builder-3.11.0
deleted file mode 100644
index 555afe5bd66c..000000000000
--- a/metadata/md5-cache/app-emulation/diskimage-builder-3.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Golden Disk Image builder.
-EAPI=7
-HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/Babel-2.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !~dev-python/Babel-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/networkx-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-3.11.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3ec39e4f0200ff1a26b3d8024a18e251
diff --git a/metadata/md5-cache/app-emulation/docker-20.10.8 b/metadata/md5-cache/app-emulation/docker-20.10.8
new file mode 100644
index 000000000000..5bf95fd88757
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-20.10.8
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16.6 dev-go/go-md2man virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig >=dev-lang/go-1.10
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=7
+HOMEPAGE=https://www.docker.com/
+IUSE=apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl >=app-emulation/containerd-1.4.9[apparmor?,btrfs?,device-mapper?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20210525 cli? ( app-emulation/docker-cli ) container-init? ( >=sys-process/tini-0.19.0[static] )
+RESTRICT=installsources strip test
+SLOT=0
+SRC_URI=https://github.com/moby/moby/archive/v20.10.8.tar.gz -> docker-20.10.8.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=111d9e3247033e68461aa0beac49b4e6
diff --git a/metadata/md5-cache/app-emulation/docker-cli-20.10.8 b/metadata/md5-cache/app-emulation/docker-cli-20.10.8
new file mode 100644
index 000000000000..e51c7d997d47
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-cli-20.10.8
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.16.6 dev-go/go-md2man >=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=the command line binary for docker
+EAPI=7
+HOMEPAGE=https://www.docker.com/
+IUSE=hardened
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!<app-emulation/docker-20.10.1
+RESTRICT=installsources strip
+SLOT=0
+SRC_URI=https://github.com/docker/cli/archive/v20.10.8.tar.gz -> docker-cli-20.10.8.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=72e2aea733766a854c38cb1776b0822b
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.29.2 b/metadata/md5-cache/app-emulation/docker-compose-1.29.2
index ff372a7038d0..3758048ff50d 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.29.2
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.29.2
@@ -5,7 +5,7 @@ DESCRIPTION=Multi-container orchestration for Docker
 EAPI=7
 HOMEPAGE=https://github.com/docker/compose
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64
+KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cached-property-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/distro-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dockerpty-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dotenv-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PySocks-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/texttable-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/websocket-client-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.29.2.tar.gz -> docker-compose-1.29.2.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6a88eb902592ff87142c7501180bdfc6
+_md5_=c0a15eff619d94763be1db0c4b948d0f
diff --git a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.38.0 b/metadata/md5-cache/app-emulation/libguestfs-appliance-1.38.0
index 4de600acb6f6..a76686aa11ae 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.38.0
+++ b/metadata/md5-cache/app-emulation/libguestfs-appliance-1.38.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!<app-emulation/libguestfs-1.38.0
 SLOT=0
 SRC_URI=https://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8
 _md5_=d75144278b3e88a242806d5dfe32e13e
diff --git a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.40.1 b/metadata/md5-cache/app-emulation/libguestfs-appliance-1.40.1
index ceddf9060b34..ff9503f16cea 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.40.1
+++ b/metadata/md5-cache/app-emulation/libguestfs-appliance-1.40.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!<app-emulation/libguestfs-1.40.1
 SLOT=0
 SRC_URI=https://libguestfs.org/download/binaries/appliance/appliance-1.40.1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8
 _md5_=ada386a7d70c872fa1d8d0dd2e164c7f
diff --git a/metadata/md5-cache/app-emulation/lxc-4.0.10 b/metadata/md5-cache/app-emulation/lxc-4.0.10
index d8554b7c0399..1f58afd80b2b 100644
--- a/metadata/md5-cache/app-emulation/lxc-4.0.10
+++ b/metadata/md5-cache/app-emulation/lxc-4.0.10
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.10.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-4.0.10.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e546f8fc40e32d9aa745a10a0296131
diff --git a/metadata/md5-cache/app-emulation/lxc-4.0.9-r1 b/metadata/md5-cache/app-emulation/lxc-4.0.9-r1
index 7fcee7e65e80..163996e0ee4d 100644
--- a/metadata/md5-cache/app-emulation/lxc-4.0.9-r1
+++ b/metadata/md5-cache/app-emulation/lxc-4.0.9-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap sys-libs/libseccomp virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.9.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-4.0.9.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=932827931ea6840cbef1638999cc7b85
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.6-r1 b/metadata/md5-cache/app-emulation/lxd-4.0.6-r1
index b39aa6fa7c22..2d62f19c8ad0 100644
--- a/metadata/md5-cache/app-emulation/lxd-4.0.6-r1
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.6-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:* sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.6.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.6.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=fc76da6c338016edac3ce2e147bbd6a7
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.7 b/metadata/md5-cache/app-emulation/lxd-4.0.7
index 0defe8798968..0e4b1c0a69f7 100644
--- a/metadata/md5-cache/app-emulation/lxd-4.0.7
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.7
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft[lz4] >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:* sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.7.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.7.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=0e0cf9c4a82d660b7b5731f95b2c5c81
diff --git a/metadata/md5-cache/app-emulation/pcem-17 b/metadata/md5-cache/app-emulation/pcem-17
index a1818f550d35..8fd480d066fd 100644
--- a/metadata/md5-cache/app-emulation/pcem-17
+++ b/metadata/md5-cache/app-emulation/pcem-17
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=alsa? ( media-libs/alsa-lib ) media-libs/libsdl2 media-libs/openal x11-libs/wxGTK:3.0-gtk3[tiff,X]
 SLOT=0
 SRC_URI=https://pcem-emulator.co.uk/files/PCemV17Linux.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=edd865dd9f9de5c888bfb2664140a49f
diff --git a/metadata/md5-cache/app-emulation/virt-what-1.18 b/metadata/md5-cache/app-emulation/virt-what-1.18
deleted file mode 100644
index 8ef58f4604a0..000000000000
--- a/metadata/md5-cache/app-emulation/virt-what-1.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=Detects if the current machine is running in a virtual machine
-EAPI=6
-HOMEPAGE=https://people.redhat.com/~rjones/virt-what/
-IUSE=dmi
-KEYWORDS=amd64 arm ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-shells/bash dmi? ( sys-apps/dmidecode )
-SLOT=0
-SRC_URI=https://people.redhat.com/~rjones/virt-what/files/virt-what-1.18.tar.gz
-_md5_=527597d16abdaff738afb61d25c127b7
diff --git a/metadata/md5-cache/app-emulation/virt-what-1.19 b/metadata/md5-cache/app-emulation/virt-what-1.19
deleted file mode 100644
index 7306ed6330bf..000000000000
--- a/metadata/md5-cache/app-emulation/virt-what-1.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=Detects if the current machine is running in a virtual machine
-EAPI=6
-HOMEPAGE=https://people.redhat.com/~rjones/virt-what/
-IUSE=dmi
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=app-shells/bash dmi? ( sys-apps/dmidecode )
-SLOT=0
-SRC_URI=https://people.redhat.com/~rjones/virt-what/files/virt-what-1.19.tar.gz
-_md5_=6b1336402b135e06b9a018bf37e7cb74
diff --git a/metadata/md5-cache/app-emulation/virt-what-1.20 b/metadata/md5-cache/app-emulation/virt-what-1.20
deleted file mode 100644
index d7380406eb6a..000000000000
--- a/metadata/md5-cache/app-emulation/virt-what-1.20
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=Detects if the current machine is running in a virtual machine
-EAPI=7
-HOMEPAGE=https://people.redhat.com/~rjones/virt-what/
-IUSE=dmi
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=app-shells/bash dmi? ( sys-apps/dmidecode )
-SLOT=0
-SRC_URI=https://people.redhat.com/~rjones/virt-what/files/virt-what-1.20.tar.gz
-_md5_=6c4ed3124da2d3ca5acc9d9c696db3e6
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.26 b/metadata/md5-cache/app-emulation/virtualbox-6.1.26
index 1f6f6d9d5e95..1ac3545169be 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.26
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.26
@@ -12,4 +12,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.26/VirtualBox-6.1.26.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b0ebc2737ecb85fc70b6b34981b74856
+_md5_=113ce0889bdb5df44721f3a7e40c4590
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.0.1 b/metadata/md5-cache/app-emulation/wine-vanilla-6.0.1
index 65935d91ac51..37267affc2b2 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.0.1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchse
 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
+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: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 ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6.0.1
 SRC_URI=https://dl.winehq.org/wine/source/6.0/wine-6.0.1.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7113b7b1cd53b1b5ea9a8bb37bfbaa07
+_md5_=5d1bea00b4c3d1d519371ba1523cded6
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 0309d0298413..73715c5a524e 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-ctags-1.19 b/metadata/md5-cache/app-eselect/eselect-ctags-1.19
new file mode 100644
index 000000000000..f915aa466484
--- /dev/null
+++ b/metadata/md5-cache/app-eselect/eselect-ctags-1.19
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Manages ctags implementations
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=app-admin/eselect-1.2.3
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/eselect-emacs-1.19.tar.xz
+_md5_=f1c782407bedadf01e842912e9759ca9
diff --git a/metadata/md5-cache/app-eselect/eselect-emacs-1.19 b/metadata/md5-cache/app-eselect/eselect-emacs-1.19
new file mode 100644
index 000000000000..fe7930a282d8
--- /dev/null
+++ b/metadata/md5-cache/app-eselect/eselect-emacs-1.19
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Manage multiple Emacs versions on one system
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=app-admin/eselect-1.2.6 ~app-eselect/eselect-ctags-1.19
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/eselect-emacs-1.19.tar.xz
+_md5_=e74ef122306dd2fb38436819c5eaae04
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 2497aaea0a20..9e01fdae5c7c 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-3.12c-r3 b/metadata/md5-cache/app-forensics/aflplusplus-3.12c-r3
index 3360b6009393..e752cf8dc93c 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-3.12c-r3
+++ b/metadata/md5-cache/app-forensics/aflplusplus-3.12c-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/3.12c.tar.gz -> aflplusplus-3.12c.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a70d9f54ce47602d49583607f9b9343
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-3.13c-r1 b/metadata/md5-cache/app-forensics/aflplusplus-3.13c-r1
index ae6bfc74ed49..f9a343030243 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-3.13c-r1
+++ b/metadata/md5-cache/app-forensics/aflplusplus-3.13c-r1
@@ -4,12 +4,12 @@ DESCRIPTION=A fork of AFL, the popular compile-time instrumentation fuzzer
 EAPI=7
 HOMEPAGE=https://github.com/AFLplusplus/AFLplusplus
 IUSE=test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm64
+KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=sys-devel/llvm-10:= || ( sys-devel/clang:10 sys-devel/clang:11 sys-devel/clang:12 ) !app-forensics/afl
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/3.13c.tar.gz -> aflplusplus-3.13c.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d27f18918395a0992fcf4db55176692b
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=da9e23aa9fdc4763f602cf1e44cd3cf1
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1 b/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1
index 0eaa7297c096..7c2dcf04e976 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1
+++ b/metadata/md5-cache/app-forensics/aflplusplus-3.14c-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/3.14c.tar.gz -> aflplusplus-3.14c.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c3fdb0fbbce3de4a90f2c767d0389f3
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 0806461a6aa5..b80690820af6 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/man-pages-l10n-4.10.0 b/metadata/md5-cache/app-i18n/man-pages-l10n-4.10.0
index e9f2f11452f7..67db2c78824a 100644
--- a/metadata/md5-cache/app-i18n/man-pages-l10n-4.10.0
+++ b/metadata/md5-cache/app-i18n/man-pages-l10n-4.10.0
@@ -4,10 +4,10 @@ DESCRIPTION=A somewhat comprehensive collection of man page translations
 EAPI=7
 HOMEPAGE=https://manpages-l10n-team.pages.debian.net/manpages-l10n/
 IUSE=l10n_de l10n_es l10n_fr l10n_it l10n_nl l10n_pl l10n_pt-BR l10n_ro
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=virtual/man l10n_de? ( !app-i18n/man-pages-de ) l10n_fr? ( !app-i18n/man-pages-fr ) l10n_it? ( !app-i18n/man-pages-it ) l10n_nl? ( !app-i18n/man-pages-nl ) l10n_pl? ( !app-i18n/man-pages-pl )
 REQUIRED_USE=|| ( l10n_de l10n_es l10n_fr l10n_it l10n_nl l10n_pl l10n_pt-BR l10n_ro )
 SLOT=0
 SRC_URI=https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v4.10.0/manpages-l10n-v4.10.0.tar.bz2
-_md5_=75c11d3f6e979b548f2fb9ec9cd12411
+_md5_=b0b2c1ec43e61af97fb9da029c5fc4c6
diff --git a/metadata/md5-cache/app-i18n/poedit-2.2.4 b/metadata/md5-cache/app-i18n/poedit-2.2.4
index 16b966ed9948..3a1c4dda3c6e 100644
--- a/metadata/md5-cache/app-i18n/poedit-2.2.4
+++ b/metadata/md5-cache/app-i18n/poedit-2.2.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=app-text/gtkspell:3 x11-libs/gtk+:3 >=dev-cpp/lucene++-3.0.5 >=dev-libs/pugixml-1.9 dev-libs/boost:=[nls] dev-libs/icu:= >=x11-libs/wxGTK-3.0.3:3.0-gtk3[X]
 SLOT=0
 SRC_URI=https://github.com/vslavik/poedit/releases/download/v2.2.4-oss/poedit-2.2.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2e714f72df840c58c822cb32a3515aae
diff --git a/metadata/md5-cache/app-i18n/poedit-2.3.1 b/metadata/md5-cache/app-i18n/poedit-2.3.1
index 688a2ba9d532..0d064640de23 100644
--- a/metadata/md5-cache/app-i18n/poedit-2.3.1
+++ b/metadata/md5-cache/app-i18n/poedit-2.3.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=app-text/gtkspell:3 x11-libs/gtk+:3 >=dev-cpp/lucene++-3.0.5 >=dev-libs/pugixml-1.9 dev-libs/boost:=[nls] dev-libs/icu:= >=x11-libs/wxGTK-3.0.3:3.0-gtk3[X]
 SLOT=0
 SRC_URI=https://github.com/vslavik/poedit/releases/download/v2.3.1-oss/poedit-2.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a04ca9d6d748aa813a8ee8489529ebdb
diff --git a/metadata/md5-cache/app-i18n/translate-shell-0.9.6.11 b/metadata/md5-cache/app-i18n/translate-shell-0.9.6.11
index a17b990d59e0..d49eacf7e89c 100644
--- a/metadata/md5-cache/app-i18n/translate-shell-0.9.6.11
+++ b/metadata/md5-cache/app-i18n/translate-shell-0.9.6.11
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/gawk
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/soimort/translate-shell/archive/v0.9.6.11.tar.gz -> translate-shell-0.9.6.11.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=27dc73f1cb0d95c988515aeee026b41c
diff --git a/metadata/md5-cache/app-i18n/translate-shell-0.9.6.12 b/metadata/md5-cache/app-i18n/translate-shell-0.9.6.12
index 9481f0d35d45..d401588979b2 100644
--- a/metadata/md5-cache/app-i18n/translate-shell-0.9.6.12
+++ b/metadata/md5-cache/app-i18n/translate-shell-0.9.6.12
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/gawk
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/soimort/translate-shell/archive/v0.9.6.12.tar.gz -> translate-shell-0.9.6.12.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=27dc73f1cb0d95c988515aeee026b41c
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 57311b457275..d9a55db7128a 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/laptop-mode-tools-1.74 b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.74
index 982888b10986..dcb21b5480d0 100644
--- a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.74
+++ b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.74
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/ethtool sys-apps/iproute2 sys-apps/which || ( sys-apps/sdparm sys-apps/hdparm ) acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/rickysarraf/laptop-mode-tools/releases/download/1.74/laptop-mode-tools_1.74.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=0fdc6388370e33f39980dc62d1115815
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 9bfb34283615..c276893bde05 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/anki-2.1.15-r1 b/metadata/md5-cache/app-misc/anki-2.1.15-r1
index c489fcbee432..e063aee602a1 100644
--- a/metadata/md5-cache/app-misc/anki-2.1.15-r1
+++ b/metadata/md5-cache/app-misc/anki-2.1.15-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://apps.ankiweb.net/downloads/archive/anki-2.1.15-source.tgz -> anki-2.1.15.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0bc9b89658ffe7b3bf8cb4bcdbe952fb
diff --git a/metadata/md5-cache/app-misc/broot-1.6.3 b/metadata/md5-cache/app-misc/broot-1.6.3
new file mode 100644
index 000000000000..fd6de93cca82
--- /dev/null
+++ b/metadata/md5-cache/app-misc/broot-1.6.3
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/zlib
+DESCRIPTION=A new way to see and navigate directory trees
+EAPI=8
+HOMEPAGE=https://dystroy.org/broot/ https://github.com/Canop/broot
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB
+RDEPEND=sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/Canop/broot/archive/v1.6.3.tar.gz -> broot-1.6.3.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/ahash/0.4.7/download -> ahash-0.4.7.crate https://crates.io/api/v1/crates/ahash/0.7.4/download -> ahash-0.7.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_colours/1.0.4/download -> ansi_colours-1.0.4.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.42/download -> anyhow-1.0.42.crate https://crates.io/api/v1/crates/argh/0.1.5/download -> argh-0.1.5.crate https://crates.io/api/v1/crates/argh_derive/0.1.5/download -> argh_derive-0.1.5.crate https://crates.io/api/v1/crates/argh_shared/0.1.5/download -> argh_shared-0.1.5.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bet/1.0.0/download -> bet-1.0.0.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/bytemuck/1.7.2/download -> bytemuck-1.7.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.69/download -> cc-1.0.69.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/char_reader/0.1.0/download -> char_reader-0.1.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cli-log/0.1.0/download -> cli-log-0.1.0.crate https://crates.io/api/v1/crates/cli-log/2.0.0/download -> cli-log-2.0.0.crate https://crates.io/api/v1/crates/clipboard-win/4.2.1/download -> clipboard-win-4.2.1.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam/0.8.1/download -> crossbeam-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.5/download -> crossbeam-epoch-0.9.5.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.2/download -> crossbeam-queue-0.3.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crossterm/0.19.0/download -> crossterm-0.19.0.crate https://crates.io/api/v1/crates/crossterm/0.20.0/download -> crossterm-0.20.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.7.0/download -> crossterm_winapi-0.7.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.8.0/download -> crossterm_winapi-0.8.0.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/csv2svg/0.1.5/download -> csv2svg-0.1.5.crate https://crates.io/api/v1/crates/custom_error/1.9.2/download -> custom_error-1.9.2.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/deser-hjson/1.0.2/download -> deser-hjson-1.0.2.crate https://crates.io/api/v1/crates/directories/3.0.2/download -> directories-3.0.2.crate https://crates.io/api/v1/crates/directories-next/2.0.0/download -> directories-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/error-code/2.3.0/download -> error-code-2.3.0.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/file-size/1.0.3/download -> file-size-1.0.3.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gif/0.11.2/download -> gif-0.11.2.crate https://crates.io/api/v1/crates/git2/0.13.20/download -> git2-0.13.20.crate https://crates.io/api/v1/crates/glassbench/0.3.0/download -> glassbench-0.3.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashlink/0.6.0/download -> hashlink-0.6.0.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/id-arena/2.2.1/download -> id-arena-2.2.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/image/0.23.14/download -> image-0.23.14.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/instant/0.1.10/download -> instant-0.1.10.crate https://crates.io/api/v1/crates/is_executable/0.1.2/download -> is_executable-0.1.2.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.22/download -> jpeg-decoder-0.1.22.crate https://crates.io/api/v1/crates/lazy-regex/2.2.1/download -> lazy-regex-2.2.1.crate https://crates.io/api/v1/crates/lazy-regex-proc_macros/2.2.1/download -> lazy-regex-proc_macros-2.2.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lfs-core/0.4.2/download -> lfs-core-0.4.2.crate https://crates.io/api/v1/crates/libc/0.2.98/download -> libc-0.2.98.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.21+1.1.0/download -> libgit2-sys-0.12.21+1.1.0.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.20.1/download -> libsqlite3-sys-0.20.1.crate https://crates.io/api/v1/crates/libz-sys/1.1.3/download -> libz-sys-1.1.3.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.4/download -> lock_api-0.4.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/minimad/0.7.1/download -> minimad-0.7.1.crate https://crates.io/api/v1/crates/minimad/0.8.0/download -> minimad-0.8.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.13/download -> mio-0.7.13.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/onig/6.2.0/download -> onig-6.2.0.crate https://crates.io/api/v1/crates/onig_sys/69.7.0/download -> onig_sys-69.7.0.crate https://crates.io/api/v1/crates/open/1.7.1/download -> open-1.7.1.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/pathdiff/0.2.0/download -> pathdiff-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plist/1.2.0/download -> plist-1.2.0.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.28/download -> proc-macro2-1.0.28.crate https://crates.io/api/v1/crates/proc-status/0.1.1/download -> proc-status-0.1.1.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.5.1/download -> rayon-1.5.1.crate https://crates.io/api/v1/crates/rayon-core/1.9.1/download -> rayon-core-1.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.9/download -> redox_syscall-0.2.9.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rusqlite/0.24.2/download -> rusqlite-0.24.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/secular/1.0.1/download -> secular-1.0.1.crate https://crates.io/api/v1/crates/serde/1.0.127/download -> serde-1.0.127.crate https://crates.io/api/v1/crates/serde_derive/1.0.127/download -> serde_derive-1.0.127.crate https://crates.io/api/v1/crates/serde_json/1.0.66/download -> serde_json-1.0.66.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook/0.3.9/download -> signal-hook-0.3.9.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.1/download -> signal-hook-mio-0.2.1.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/siphasher/0.3.6/download -> siphasher-0.3.6.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/splitty/0.1.0/download -> splitty-0.1.0.crate https://crates.io/api/v1/crates/str-buf/1.0.5/download -> str-buf-1.0.5.crate https://crates.io/api/v1/crates/strict/0.1.4/download -> strict-0.1.4.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/svg/0.8.2/download -> svg-0.8.2.crate https://crates.io/api/v1/crates/syn/1.0.74/download -> syn-1.0.74.crate https://crates.io/api/v1/crates/syntect/4.6.0/download -> syntect-4.6.0.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termimad/0.10.3/download -> termimad-0.10.3.crate https://crates.io/api/v1/crates/termimad/0.14.0/download -> termimad-0.14.0.crate https://crates.io/api/v1/crates/terminal-clipboard/0.2.1/download -> terminal-clipboard-0.2.1.crate https://crates.io/api/v1/crates/termux-clipboard/0.1.0/download -> termux-clipboard-0.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.26/download -> thiserror-1.0.26.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.26/download -> thiserror-impl-1.0.26.crate https://crates.io/api/v1/crates/tiff/0.6.1/download -> tiff-0.6.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.3.1/download -> tinyvec-1.3.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/umask/1.0.0/download -> umask-1.0.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/weezl/0.1.5/download -> weezl-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.2/download -> x11-clipboard-0.5.2.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=13b03b29d154d6af02eaf43627ad8d9d
diff --git a/metadata/md5-cache/app-misc/golly-4.0 b/metadata/md5-cache/app-misc/golly-4.0
index 46889e11268c..86b1a1500fe7 100644
--- a/metadata/md5-cache/app-misc/golly-4.0
+++ b/metadata/md5-cache/app-misc/golly-4.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[X,opengl,tiff] pyth
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/golly/golly-4.0-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=21e99835a6999b01d9d921dd0258abb9
diff --git a/metadata/md5-cache/app-misc/graphlcd-base-2.0.2 b/metadata/md5-cache/app-misc/graphlcd-base-2.0.2
index 9660272549c7..2b14399c8455 100644
--- a/metadata/md5-cache/app-misc/graphlcd-base-2.0.2
+++ b/metadata/md5-cache/app-misc/graphlcd-base-2.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libhid net-libs/libvncserver freetype? ( media-libs/freetype:2=
 REQUIRED_USE=?? ( graphicsmagick imagemagick )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/graphlcd-base.git/snapshot/graphlcd-base-2.0.2.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=5d334f691156953722d88acca5004128
diff --git a/metadata/md5-cache/app-misc/neofetch-7.1.0-r1 b/metadata/md5-cache/app-misc/neofetch-7.1.0-r1
index 1d777503d562..8883e4a41259 100644
--- a/metadata/md5-cache/app-misc/neofetch-7.1.0-r1
+++ b/metadata/md5-cache/app-misc/neofetch-7.1.0-r1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~arm64 ~mips ~ppc64 ~x86
 LICENSE=MIT-with-advertising
 SLOT=0
 SRC_URI=https://github.com/dylanaraps/neofetch/archive/7.1.0/neofetch-7.1.0.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	prefix	d04f14b297013ad1410550c0757f14f8
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	prefix	d04f14b297013ad1410550c0757f14f8
 _md5_=1b05c42110c33ce92d06d467c29618ec
diff --git a/metadata/md5-cache/app-misc/neofetch-9999 b/metadata/md5-cache/app-misc/neofetch-9999
index ced84fdd0308..26011a4f4f3f 100644
--- a/metadata/md5-cache/app-misc/neofetch-9999
+++ b/metadata/md5-cache/app-misc/neofetch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/dylanaraps/neofetch
 LICENSE=MIT-with-advertising
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	prefix	d04f14b297013ad1410550c0757f14f8
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	optfeature	30ce9dec2b8943338c9b015bd32bac6a	prefix	d04f14b297013ad1410550c0757f14f8
 _md5_=1b05c42110c33ce92d06d467c29618ec
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.3.2 b/metadata/md5-cache/app-misc/pax-utils-1.3.2
index 1245445109b5..71d1eee93adf 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.3.2
+++ b/metadata/md5-cache/app-misc/pax-utils-1.3.2
@@ -5,11 +5,11 @@ DESCRIPTION=ELF utils that can check files for security relevant properties
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
 IUSE=caps debug kernel_linux python seccomp python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.3.2.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.3.2.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.3.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=896e29e622190f092c7ce3cb4e7c8e07
+_md5_=7a9d823da4fedfdc08247b9333429b99
diff --git a/metadata/md5-cache/app-misc/recoll-1.27.12 b/metadata/md5-cache/app-misc/recoll-1.27.12
index b83b11ff70ac..19bf56e0ad4c 100644
--- a/metadata/md5-cache/app-misc/recoll-1.27.12
+++ b/metadata/md5-cache/app-misc/recoll-1.27.12
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmli
 REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.27.12.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a5f9f0a7e7c073e5d66bdcab8b3b389b
diff --git a/metadata/md5-cache/app-misc/recoll-1.28.5 b/metadata/md5-cache/app-misc/recoll-1.28.5
index bc2d2a488e27..68b18f2077f0 100644
--- a/metadata/md5-cache/app-misc/recoll-1.28.5
+++ b/metadata/md5-cache/app-misc/recoll-1.28.5
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmli
 REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.28.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6e02deb01f07729d77021f6ccebecd1b
diff --git a/metadata/md5-cache/app-misc/recoll-1.29.2 b/metadata/md5-cache/app-misc/recoll-1.29.2
index 61b241d02cfb..8b9fb676e43b 100644
--- a/metadata/md5-cache/app-misc/recoll-1.29.2
+++ b/metadata/md5-cache/app-misc/recoll-1.29.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmli
 REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.29.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6e02deb01f07729d77021f6ccebecd1b
diff --git a/metadata/md5-cache/app-misc/recoll-1.31.0 b/metadata/md5-cache/app-misc/recoll-1.31.0
index be479289feab..e00bdea9be89 100644
--- a/metadata/md5-cache/app-misc/recoll-1.31.0
+++ b/metadata/md5-cache/app-misc/recoll-1.31.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmli
 REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.31.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d84cc7f65a26a28a486fd1c9d576abc0
diff --git a/metadata/md5-cache/app-misc/remind-03.01.15 b/metadata/md5-cache/app-misc/remind-03.01.15
deleted file mode 100644
index 60e111d05082..000000000000
--- a/metadata/md5-cache/app-misc/remind-03.01.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare test
-DESCRIPTION=Ridiculously functional reminder program
-EAPI=5
-HOMEPAGE=http://www.roaringpenguin.com/products/remind
-IUSE=tk
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=tk? ( dev-lang/tk dev-tcltk/tcllib )
-SLOT=0
-SRC_URI=http://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz
-_md5_=bd96117972742d7d164dd123def1f2d0
diff --git a/metadata/md5-cache/app-misc/screenfetch-3.9.1-r1 b/metadata/md5-cache/app-misc/screenfetch-3.9.1-r1
index 369ffef46996..567fda5e8067 100644
--- a/metadata/md5-cache/app-misc/screenfetch-3.9.1-r1
+++ b/metadata/md5-cache/app-misc/screenfetch-3.9.1-r1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://github.com/KittyKatt/screenFetch/archive/v3.9.1.tar.gz -> screenfetch-3.9.1.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=266c70e7986f43b1b78d050628f7569f
diff --git a/metadata/md5-cache/app-misc/screenfetch-9999 b/metadata/md5-cache/app-misc/screenfetch-9999
index 3be221a9cf78..8a2b0ce72b6e 100644
--- a/metadata/md5-cache/app-misc/screenfetch-9999
+++ b/metadata/md5-cache/app-misc/screenfetch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/KittyKatt/screenFetch
 LICENSE=GPL-3+
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=266c70e7986f43b1b78d050628f7569f
diff --git a/metadata/md5-cache/app-misc/tek-1.3.0 b/metadata/md5-cache/app-misc/tek-1.3.0
index 4dc50cd17e6f..934f08018f81 100644
--- a/metadata/md5-cache/app-misc/tek-1.3.0
+++ b/metadata/md5-cache/app-misc/tek-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/wxGTK:3.0=[X] virtual/libusb:1 virtual/udev
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/m-ou-se/tek/archive/v1.3.0.tar.gz -> tek-1.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=b8cb25d7b3fbff5bfaab92fd9ed72f4d
diff --git a/metadata/md5-cache/app-misc/tmate-2.3.1 b/metadata/md5-cache/app-misc/tmate-2.3.1
deleted file mode 100644
index 330a68fe6f64..000000000000
--- a/metadata/md5-cache/app-misc/tmate-2.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?] dev-libs/openssl:0=[static-libs?]
-DESCRIPTION=Instant terminal sharing
-EAPI=7
-HOMEPAGE=https://tmate.io/
-IUSE=debug static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?] dev-libs/openssl:0=[static-libs?]
-SLOT=0
-SRC_URI=https://github.com/tmate-io/tmate/archive/2.3.1.tar.gz -> tmate-2.3.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3a9b3574cdb3f1be09a235c197f6916c
diff --git a/metadata/md5-cache/app-misc/tmate-2.4.0 b/metadata/md5-cache/app-misc/tmate-2.4.0
index b322fcd9d6c8..1fda71a2bd1a 100644
--- a/metadata/md5-cache/app-misc/tmate-2.4.0
+++ b/metadata/md5-cache/app-misc/tmate-2.4.0
@@ -5,10 +5,10 @@ DESCRIPTION=Instant terminal sharing
 EAPI=7
 HOMEPAGE=https://tmate.io/
 IUSE=debug static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=ISC
 RDEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?] dev-libs/openssl:0=[static-libs?]
 SLOT=0
 SRC_URI=https://github.com/tmate-io/tmate/archive/2.4.0.tar.gz -> tmate-2.4.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3a9b3574cdb3f1be09a235c197f6916c
+_md5_=f4e6f20e91512c5ed6e84e68a99ca1fa
diff --git a/metadata/md5-cache/app-misc/ttyload-0.5.3-r1 b/metadata/md5-cache/app-misc/ttyload-0.5.3-r1
new file mode 100644
index 000000000000..5a336aaf2e71
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ttyload-0.5.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=color-coded graph of load averages over time
+EAPI=8
+HOMEPAGE=https://www.daveltd.com/src/util/ttyload https://github.com/lindes/ttyload
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.daveltd.com/src/util/ttyload/ttyload-0.5.3.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=644fe3915f56ac10af847fbac1f7baae
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.2 b/metadata/md5-cache/app-misc/uptimed-0.4.2
index bcd905e5783e..6a1c4e51ace9 100644
--- a/metadata/md5-cache/app-misc/uptimed-0.4.2
+++ b/metadata/md5-cache/app-misc/uptimed-0.4.2
@@ -4,11 +4,10 @@ DEPEND=acct-group/uptimed acct-user/uptimed
 DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
 EAPI=7
 HOMEPAGE=https://github.com/rpodgorny/uptimed/
-IUSE=static-libs
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/uptimed acct-user/uptimed
 SLOT=0
 SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.2.tar.gz -> uptimed-0.4.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=96a394cf41d44933aa724bef3c9f44d8
+_md5_=2636d5128c8fb86b54abf0c9725ff017
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.3 b/metadata/md5-cache/app-misc/uptimed-0.4.3
index c8229a8140ce..bdf5e50374b9 100644
--- a/metadata/md5-cache/app-misc/uptimed-0.4.3
+++ b/metadata/md5-cache/app-misc/uptimed-0.4.3
@@ -4,11 +4,10 @@ DEPEND=acct-group/uptimed acct-user/uptimed
 DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
 EAPI=7
 HOMEPAGE=https://github.com/rpodgorny/uptimed/
-IUSE=static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/uptimed acct-user/uptimed
 SLOT=0
 SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.3.tar.gz -> uptimed-0.4.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b8002996c3503ee09663d532767d46e4
+_md5_=04b764d4a15d88c3429248c82a795e66
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.4 b/metadata/md5-cache/app-misc/uptimed-0.4.4
index 6bb0a3ec3bf9..209b39fd9d7f 100644
--- a/metadata/md5-cache/app-misc/uptimed-0.4.4
+++ b/metadata/md5-cache/app-misc/uptimed-0.4.4
@@ -1,14 +1,13 @@
 BDEPEND=acct-group/uptimed acct-user/uptimed sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
+DEFINED_PHASES=install postinst prepare
 DEPEND=acct-group/uptimed acct-user/uptimed
 DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
 EAPI=8
 HOMEPAGE=https://github.com/rpodgorny/uptimed/
-IUSE=static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/uptimed acct-user/uptimed
 SLOT=0
 SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.4.tar.gz -> uptimed-0.4.4.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=617682f6061255d33b0495f59cbe2082
+_md5_=e875aa7a01b288fa79f73e7a084a38b5
diff --git a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814 b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
index 4d166b81e8e8..0e92db503de2 100644
--- a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
+++ b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
@@ -10,5 +10,5 @@ LICENSE=EPL-1.0 LGPL-3
 RDEPEND=>=virtual/jre-1.8 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update7-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	font	0667878c2b594871023dd1833d05996f	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	font	0667878c2b594871023dd1833d05996f	optfeature	30ce9dec2b8943338c9b015bd32bac6a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4c60592840d8f05b147bd8225c421ff4
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 2c5a8a664022..ad70b21fcce7 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/calligra-3.2.1-r3 b/metadata/md5-cache/app-office/calligra-3.2.1-r3
index c0ff2d0fae19..edcf11a8fcb6 100644
--- a/metadata/md5-cache/app-office/calligra-3.2.1-r3
+++ b/metadata/md5-cache/app-office/calligra-3.2.1-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl >=dev-qt/designer-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/calligra/3.2.1/calligra-3.2.1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3b1d7f4fdc2c29c981fc50db6c67ee42
diff --git a/metadata/md5-cache/app-office/impressive-0.13.0_beta2 b/metadata/md5-cache/app-office/impressive-0.13.0_beta2
index 1f4595db052e..24139feddd7f 100644
--- a/metadata/md5-cache/app-office/impressive-0.13.0_beta2
+++ b/metadata/md5-cache/app-office/impressive-0.13.0_beta2
@@ -9,5 +9,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/impressive/Impressive/0.13.0-beta2/Impressive-0.13.0-beta2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df356fa031301da735dc9fd6ce49302e
diff --git a/metadata/md5-cache/app-office/kmymoney-5.1.1-r1 b/metadata/md5-cache/app-office/kmymoney-5.1.1-r1
deleted file mode 100644
index 88b8085452f3..000000000000
--- a/metadata/md5-cache/app-office/kmymoney-5.1.1-r1
+++ /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.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-db/sqlcipher dev-libs/gmp:0=[cxx(+)] dev-libs/kdiagram:5 dev-libs/libgpg-error dev-libs/libofx:= >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwebengine-5.15.1:5[widgets] >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 activities? ( >=kde-frameworks/kactivities-5.74.0:5 ) addressbook? ( kde-apps/akonadi:5 kde-apps/kidentitymanagement:5 >=kde-frameworks/kcontacts-5.74.0:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-6.0.1 >=sys-libs/gwenhywfar-5.1.2:=[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.74.0:5 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Personal finance manager based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kmymoney.org/
-IUSE=activities addressbook calendar hbci holidays test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-db/sqlcipher dev-libs/gmp:0=[cxx(+)] dev-libs/kdiagram:5 dev-libs/libgpg-error dev-libs/libofx:= >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwebengine-5.15.1:5[widgets] >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 activities? ( >=kde-frameworks/kactivities-5.74.0:5 ) addressbook? ( kde-apps/akonadi:5 kde-apps/kidentitymanagement:5 >=kde-frameworks/kcontacts-5.74.0:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-6.0.1 >=sys-libs/gwenhywfar-5.1.2:=[qt5] ) holidays? ( >=kde-frameworks/kholidays-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/kmymoney/5.1.1/src/kmymoney-5.1.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b5ffa1e4b735183421d2be4116eace87
diff --git a/metadata/md5-cache/app-office/kmymoney-5.1.2 b/metadata/md5-cache/app-office/kmymoney-5.1.2
index 413a5b60fdcb..d4b78de84c7e 100644
--- a/metadata/md5-cache/app-office/kmymoney-5.1.2
+++ b/metadata/md5-cache/app-office/kmymoney-5.1.2
@@ -5,11 +5,11 @@ DESCRIPTION=Personal finance manager based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://kmymoney.org/
 IUSE=activities addressbook calendar hbci holidays test debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-db/sqlcipher dev-libs/gmp:0=[cxx(+)] dev-libs/kdiagram:5 dev-libs/libgpg-error dev-libs/libofx:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 activities? ( >=kde-frameworks/kactivities-5.74.0:5 ) addressbook? ( kde-apps/akonadi:5 kde-apps/kidentitymanagement:5 >=kde-frameworks/kcontacts-5.74.0:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=dev-qt/qtdeclarative-5.15.2:5 >=net-libs/aqbanking-6.0.1 >=sys-libs/gwenhywfar-5.1.2:=[qt5] ) holidays? ( >=kde-frameworks/kholidays-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/kmymoney/5.1.2/src/kmymoney-5.1.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1a133e34d4340f02560cf7a625fef67a
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e3741e1511123513069a8efe52f21532
diff --git a/metadata/md5-cache/app-office/ledger-3.2.1 b/metadata/md5-cache/app-office/ledger-3.2.1
index dbb8c21cf608..5e82a2b80627 100644
--- a/metadata/md5-cache/app-office/ledger-3.2.1
+++ b/metadata/md5-cache/app-office/ledger-3.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger/archive/v3.2.1.tar.gz -> ledger-3.2.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e89c734b886b62c534b42afa16030886
diff --git a/metadata/md5-cache/app-office/libreoffice-7.1.3.2 b/metadata/md5-cache/app-office/libreoffice-7.1.3.2
index 171ef52fb60e..b7ae9a531da0 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.1.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-7.1.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.1.3.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.1.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.1.3//libreoffice-7.1.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.1.3//libreoffice-help-7.1.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.1.3.2/src/libreoffice-7.1.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.1.3.2/src/libreoffice-help-7.1.3.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2d3d8bdcd6f5ed997dc07794c9587a57
diff --git a/metadata/md5-cache/app-office/libreoffice-7.1.5.2 b/metadata/md5-cache/app-office/libreoffice-7.1.5.2
index c89b3f260b53..acadfab044f3 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.1.5.2
+++ b/metadata/md5-cache/app-office/libreoffice-7.1.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.1.5.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.1.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.1.5//libreoffice-7.1.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.1.5//libreoffice-help-7.1.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.1.5.2/src/libreoffice-7.1.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.1.5.2/src/libreoffice-help-7.1.5.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a9cca61b178c5bd3d6f7d1375f5497e0
diff --git a/metadata/md5-cache/app-office/libreoffice-7.1.9999 b/metadata/md5-cache/app-office/libreoffice-7.1.9999
index 48b5bd8a3098..c6dddf805c69 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.1.9999
+++ b/metadata/md5-cache/app-office/libreoffice-7.1.9999
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8d9fb8720104663d061a391e14ac9f3f
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 525b6226e00f..e0bc8aa6d014 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=691bf1fa67b006565c6f686836e62938
diff --git a/metadata/md5-cache/app-office/mdbtools-0.9.4 b/metadata/md5-cache/app-office/mdbtools-0.9.4
new file mode 100644
index 000000000000..4bde8ad592d6
--- /dev/null
+++ b/metadata/md5-cache/app-office/mdbtools-0.9.4
@@ -0,0 +1,14 @@
+BDEPEND=app-text/txt2man sys-devel/flex virtual/pkgconfig virtual/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= virtual/libiconv glib? ( dev-libs/glib:2 ) odbc? ( >=dev-db/unixODBC-2.0 )
+DESCRIPTION=Set of libraries and utilities for reading Microsoft Access database (MDB) files
+EAPI=7
+HOMEPAGE=https://github.com/mdbtools/mdbtools
+IUSE=glib odbc
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= virtual/libiconv glib? ( dev-libs/glib:2 ) odbc? ( >=dev-db/unixODBC-2.0 )
+SLOT=0/3
+SRC_URI=https://github.com/brianb/mdbtools/archive/v0.9.4.tar.gz -> mdbtools-0.9.4.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9082553cf148045d61dac5e6b16afe29
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 383abcd9e6a0..a9b620196b7f 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/eix-0.34.12 b/metadata/md5-cache/app-portage/eix-0.34.12
deleted file mode 100644
index 856e4a419df2..000000000000
--- a/metadata/md5-cache/app-portage/eix-0.34.12
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/xz-utils nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= )
-DESCRIPTION=Search and query ebuilds
-EAPI=7
-HOMEPAGE=https://github.com/vaeth/eix/
-IUSE=debug doc nls sqlite
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips 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=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/vaeth/eix/releases/download/v0.34.12/eix-0.34.12.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6b00153b21474f9c59519c9009003f7b
diff --git a/metadata/md5-cache/app-portage/eix-0.35.0 b/metadata/md5-cache/app-portage/eix-0.35.0
deleted file mode 100644
index cd5d920e6b1e..000000000000
--- a/metadata/md5-cache/app-portage/eix-0.35.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/xz-utils nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= )
-DESCRIPTION=Search and query ebuilds
-EAPI=7
-HOMEPAGE=https://github.com/vaeth/eix/
-IUSE=debug doc nls sqlite
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~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=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/vaeth/eix/releases/download/v0.35.0/eix-0.35.0.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9d5765c1143b032a7de5f391dbc994f0
diff --git a/metadata/md5-cache/app-portage/eix-0.35.1 b/metadata/md5-cache/app-portage/eix-0.35.1
deleted file mode 100644
index 05d750f7699f..000000000000
--- a/metadata/md5-cache/app-portage/eix-0.35.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/xz-utils nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= )
-DESCRIPTION=Search and query ebuilds
-EAPI=7
-HOMEPAGE=https://github.com/vaeth/eix/
-IUSE=debug doc nls sqlite
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~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=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/vaeth/eix/releases/download/v0.35.1/eix-0.35.1.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9d5765c1143b032a7de5f391dbc994f0
diff --git a/metadata/md5-cache/app-portage/eix-0.35.2 b/metadata/md5-cache/app-portage/eix-0.35.2
index e5cabc3b2cbf..534cb0a6383a 100644
--- a/metadata/md5-cache/app-portage/eix-0.35.2
+++ b/metadata/md5-cache/app-portage/eix-0.35.2
@@ -5,10 +5,10 @@ DESCRIPTION=Search and query ebuilds
 EAPI=7
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug doc nls sqlite
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.35.2/eix-0.35.2.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a48ef99777dc759f02b27e5e450bff29
+_md5_=6b00153b21474f9c59519c9009003f7b
diff --git a/metadata/md5-cache/app-portage/elogviewer-3.0-r2 b/metadata/md5-cache/app-portage/elogviewer-3.0-r2
deleted file mode 100644
index 0695f37a9fa3..000000000000
--- a/metadata/md5-cache/app-portage/elogviewer-3.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] >=sys-apps/portage-2.1[python_targets_python3_8(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] )
-DESCRIPTION=Elog viewer for Gentoo
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/elogviewer
-IUSE=+python_single_target_python3_8
-KEYWORDS=amd64 ~arm64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] >=sys-apps/portage-2.1[python_targets_python3_8(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/Synss/elogviewer/archive/v3.0.tar.gz -> elogviewer-3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=929b74ffc4f87c6a51eccef4d9e4ffd7
diff --git a/metadata/md5-cache/app-portage/elogviewer-3.1 b/metadata/md5-cache/app-portage/elogviewer-3.1
deleted file mode 100644
index 655b3c7c5980..000000000000
--- a/metadata/md5-cache/app-portage/elogviewer-3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] >=sys-apps/portage-2.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] >=sys-apps/portage-2.1[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] )
-DESCRIPTION=Elog viewer for Gentoo
-EAPI=7
-HOMEPAGE=https://github.com/Synss/elogviewer
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] >=sys-apps/portage-2.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] >=sys-apps/portage-2.1[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/Synss/elogviewer/archive/v3.1.tar.gz -> elogviewer-3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4be560390fec68f486a6aa2949c2847e
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.6 b/metadata/md5-cache/app-portage/gpyutils-0.6
deleted file mode 100644
index 26a9bf1fcc51..000000000000
--- a/metadata/md5-cache/app-portage/gpyutils-0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Utitilies for maintaining Python packages
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/gpyutils/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/gpyutils/archive/v0.6.tar.gz -> gpyutils-0.6.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=320c4643c7c81efd4f07cd9e1797d9f6
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.6.1 b/metadata/md5-cache/app-portage/gpyutils-0.6.1
index d17d3b35238c..8366db2bfd59 100644
--- a/metadata/md5-cache/app-portage/gpyutils-0.6.1
+++ b/metadata/md5-cache/app-portage/gpyutils-0.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=Utitilies for maintaining Python packages
 EAPI=8
 HOMEPAGE=https://github.com/mgorny/gpyutils/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gpyutils/archive/v0.6.1.tar.gz -> gpyutils-0.6.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=578bf4361cb414d7302ad5398126d52d
+_md5_=9558d862cd3726691b810829304eae01
diff --git a/metadata/md5-cache/app-portage/grs-0.7 b/metadata/md5-cache/app-portage/grs-0.7
index 6ba879812973..53200df84630 100644
--- a/metadata/md5-cache/app-portage/grs-0.7
+++ b/metadata/md5-cache/app-portage/grs-0.7
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Suite to build Gentoo Reference Systems
 EAPI=7
 HOMEPAGE=https://dev.gentoo.org/~blueness/grs
-IUSE=server python_targets_python3_8 kernel_linux
+IUSE=server python_targets_python3_8 python_targets_python3_9 kernel_linux
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=GPL-2
-RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-cdr/cdrtools app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-cdr/cdrtools app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/grs/grs-0.7.tar.gz https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0ee2986c4fab61e09ae10ebc79c1554a
+_md5_=d9b40d9ce7a08b5904d3fcca23ffde34
diff --git a/metadata/md5-cache/app-portage/grs-9999 b/metadata/md5-cache/app-portage/grs-9999
index 23b4287eb0f3..c3d7b4e29f2e 100644
--- a/metadata/md5-cache/app-portage/grs-9999
+++ b/metadata/md5-cache/app-portage/grs-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=Suite to build Gentoo Reference Systems
 EAPI=7
 HOMEPAGE=https://dev.gentoo.org/~blueness/grs
-IUSE=server python_targets_python3_8 kernel_linux
+IUSE=server python_targets_python3_8 python_targets_python3_9 kernel_linux
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-cdr/cdrtools app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-cdr/cdrtools app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=daf4489f488daee93482886eca15245d
+_md5_=757d69185703b21a3ee1edad2a5b67b9
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 4e6bbec63d20..6a81495f3958 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/fzy-1.0-r1 b/metadata/md5-cache/app-shells/fzy-1.0-r1
index 5f96a8617a56..26e4f233d795 100644
--- a/metadata/md5-cache/app-shells/fzy-1.0-r1
+++ b/metadata/md5-cache/app-shells/fzy-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jhawthorn/fzy/releases/download/1.0/fzy-1.0.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=104f6d7a584a6191ef7015f3ab31aaac
diff --git a/metadata/md5-cache/app-shells/fzy-9999 b/metadata/md5-cache/app-shells/fzy-9999
index 03a0b066b06d..8178939d3ba7 100644
--- a/metadata/md5-cache/app-shells/fzy-9999
+++ b/metadata/md5-cache/app-shells/fzy-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=582df4bef5f7f052901fbfd57a1435ee
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 955fd54483ee..182c7a947849 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/ansifilter-2.17 b/metadata/md5-cache/app-text/ansifilter-2.17
deleted file mode 100644
index 21a843a4ecc0..000000000000
--- a/metadata/md5-cache/app-text/ansifilter-2.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Handles text files containing ANSI terminal escape codes
-EAPI=7
-HOMEPAGE=http://www.andre-simon.de/
-IUSE=qt5
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~s390 sparc x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.17.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6756af09de30bb079e22a76dd4e1d0df
diff --git a/metadata/md5-cache/app-text/ansifilter-2.18 b/metadata/md5-cache/app-text/ansifilter-2.18
index 5ec89ff3bf62..a50fccd81a8a 100644
--- a/metadata/md5-cache/app-text/ansifilter-2.18
+++ b/metadata/md5-cache/app-text/ansifilter-2.18
@@ -4,10 +4,10 @@ DESCRIPTION=Handles text files containing ANSI terminal escape codes
 EAPI=7
 HOMEPAGE=http://www.andre-simon.de/
 IUSE=qt5
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 ~s390 sparc x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.18.tar.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=027808f1798972b52f2cdcf4971bbffc
+_md5_=6756af09de30bb079e22a76dd4e1d0df
diff --git a/metadata/md5-cache/app-text/asciidoc-9.0.2-r1 b/metadata/md5-cache/app-text/asciidoc-9.0.2-r1
index df92b9f1bc80..d27881defa93 100644
--- a/metadata/md5-cache/app-text/asciidoc-9.0.2-r1
+++ b/metadata/md5-cache/app-text/asciidoc-9.0.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoc-py/asciidoc-py/releases/download/9.0.2/asciidoc-9.0.2.tar.gz -> asciidoc-9.0.2.new.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d73cced182d73a60ef5a6d037d9b4295
diff --git a/metadata/md5-cache/app-text/asciidoc-9.0.4-r1 b/metadata/md5-cache/app-text/asciidoc-9.0.4-r1
index b3cd59b4c1b3..28649b103213 100644
--- a/metadata/md5-cache/app-text/asciidoc-9.0.4-r1
+++ b/metadata/md5-cache/app-text/asciidoc-9.0.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoc-py/asciidoc-py/releases/download/9.0.4/asciidoc-9.0.4.tar.gz -> asciidoc-9.0.4.new.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d73cced182d73a60ef5a6d037d9b4295
diff --git a/metadata/md5-cache/app-text/asciidoc-9.0.5-r1 b/metadata/md5-cache/app-text/asciidoc-9.0.5-r1
index 74acd9320f37..c7ff50b1e356 100644
--- a/metadata/md5-cache/app-text/asciidoc-9.0.5-r1
+++ b/metadata/md5-cache/app-text/asciidoc-9.0.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoc-py/asciidoc-py/releases/download/9.0.5/asciidoc-9.0.5.tar.gz -> asciidoc-9.0.5.new.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d73cced182d73a60ef5a6d037d9b4295
diff --git a/metadata/md5-cache/app-text/asciidoc-9.1.0 b/metadata/md5-cache/app-text/asciidoc-9.1.0
index 573038aed227..3b4dc97a5449 100644
--- a/metadata/md5-cache/app-text/asciidoc-9.1.0
+++ b/metadata/md5-cache/app-text/asciidoc-9.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoc-py/asciidoc-py/releases/download/9.1.0/asciidoc-9.1.0.tar.gz -> asciidoc-9.1.0.new.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=71891ff213a395cf19ceade729952e2e
diff --git a/metadata/md5-cache/app-text/bibletime-3.0.1 b/metadata/md5-cache/app-text/bibletime-3.0.1
new file mode 100644
index 000000000000..b26e94d653a1
--- /dev/null
+++ b/metadata/md5-cache/app-text/bibletime-3.0.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/boost dev-libs/icu:= dev-qt/linguist-tools:5 dev-qt/qttest:5 net-misc/curl sys-libs/zlib
+DESCRIPTION=Qt Bible-study application using the SWORD library
+EAPI=7
+HOMEPAGE=https://bibletime.info/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
+SLOT=0
+SRC_URI=https://github.com/bibletime/bibletime/releases/download/v3.0.1/bibletime-3.0.1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=46b5da8e674fede72911489e6b876cd0
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.57 b/metadata/md5-cache/app-text/coolreader-3.2.57
index add8b89fed35..f262c789aeef 100644
--- a/metadata/md5-cache/app-text/coolreader-3.2.57
+++ b/metadata/md5-cache/app-text/coolreader-3.2.57
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz dev-libs/libunibreak wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
 SLOT=0
 SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.57.tar.gz -> coolreader-3.2.57.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f2fa81c98d318f8c618b33ef45088db3
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 b983ac93b742..f93ba2d997a7 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
@@ -9,5 +9,5 @@ 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	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=af8d8fc2e6fbf407ea0785a50a7d611f
diff --git a/metadata/md5-cache/app-text/djvu-3.5.27-r2 b/metadata/md5-cache/app-text/djvu-3.5.27-r2
index baeeb2adf5a7..51537304b903 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.27-r2
+++ b/metadata/md5-cache/app-text/djvu-3.5.27-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=https://ajakk.github.io/djvu-3.5.27-a00b7618c22fb35b030582147a4479c4cf41c349.zip -> djvu-3.5.27.zip
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f35b01e31f4ae456366c89e1cc226ddc
diff --git a/metadata/md5-cache/app-text/djvu-3.5.28 b/metadata/md5-cache/app-text/djvu-3.5.28
index 917b7598d55b..57d145b24c6d 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.28
+++ b/metadata/md5-cache/app-text/djvu-3.5.28
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/djvu/djvulibre-3.5.28.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=aaaa23b7c6c13d8c04b12f10fcd1754c
diff --git a/metadata/md5-cache/app-text/djvu-3.5.28-r1 b/metadata/md5-cache/app-text/djvu-3.5.28-r1
index ac0e90a0f366..d3caf0ba438e 100644
--- a/metadata/md5-cache/app-text/djvu-3.5.28-r1
+++ b/metadata/md5-cache/app-text/djvu-3.5.28-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/djvu/djvulibre-3.5.28.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=895080e6e2293fe66e3fb2f2dfccf0bc
diff --git a/metadata/md5-cache/app-text/evince-40.4 b/metadata/md5-cache/app-text/evince-40.4
index ba3dcca2d9b0..6eccf3dbd466 100644
--- a/metadata/md5-cache/app-text/evince-40.4
+++ b/metadata/md5-cache/app-text/evince-40.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.0:1= >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.76.0[cairo] >=app-arch/libarchive-3.2.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
 SLOT=0/evd3.4-evv3.3
 SRC_URI=mirror://gnome/sources/evince/40/evince-40.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=badc34bcab3705c073052504cd1aa14d
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=098ad4d24cb8570181316fe0418c8991
diff --git a/metadata/md5-cache/app-text/htmltidy-0.99.0 b/metadata/md5-cache/app-text/htmltidy-0.99.0
new file mode 100644
index 000000000000..6030ae879f4a
--- /dev/null
+++ b/metadata/md5-cache/app-text/htmltidy-0.99.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Tidy the layout and correct errors in HTML and XML documents
+EAPI=5
+HOMEPAGE=http://tidy.sourceforge.net/
+IUSE=debug doc static-libs
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/tidy-20090325.tar.bz2 mirror://gentoo/tidy-20090325-doc.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ba8298427b4a81cdf4663eca42168d24
diff --git a/metadata/md5-cache/app-text/htmltidy-20090325-r2 b/metadata/md5-cache/app-text/htmltidy-20090325-r2
deleted file mode 100644
index 4c9a58e5a0ba..000000000000
--- a/metadata/md5-cache/app-text/htmltidy-20090325-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tidy the layout and correct errors in HTML and XML documents
-EAPI=5
-HOMEPAGE=http://tidy.sourceforge.net/
-IUSE=debug doc static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/tidy-20090325.tar.bz2 mirror://gentoo/tidy-20090325-doc.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b61f478ff253cc88d2b0d5bc244f5d1b
diff --git a/metadata/md5-cache/app-text/htmltidy-5.8.0-r1 b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
new file mode 100644
index 000000000000..dcbb5aa67349
--- /dev/null
+++ b/metadata/md5-cache/app-text/htmltidy-5.8.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DESCRIPTION=Tidy the layout and correct errors in HTML and XML documents
+EAPI=7
+HOMEPAGE=https://www.html-tidy.org/
+IUSE=deprecated test ruby_targets_ruby26 ruby_targets_ruby27
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD
+RESTRICT=test
+SLOT=0/58
+SRC_URI=https://github.com/htacg/tidy-html5/archive/refs/tags/5.8.0.tar.gz -> htmltidy-5.8.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=81f2152ed26258486b46ae2bcebc3344
diff --git a/metadata/md5-cache/app-text/kchmviewer-8.0 b/metadata/md5-cache/app-text/kchmviewer-8.0
new file mode 100644
index 000000000000..d9fa69cba829
--- /dev/null
+++ b/metadata/md5-cache/app-text/kchmviewer-8.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-libs/chmlib dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Feature rich chm file viewer, based on Qt
+EAPI=7
+HOMEPAGE=https://www.ulduzsoft.com/kchmviewer/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/chmlib dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5
+SLOT=0
+SRC_URI=https://github.com/gyunaev/kchmviewer/archive/refs/tags/RELEASE_8_0.tar.gz -> kchmviewer-8.0.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=08b3fc62d0a9f8c0943de62a9a6f93bb
diff --git a/metadata/md5-cache/app-text/lcdf-typetools-2.108 b/metadata/md5-cache/app-text/lcdf-typetools-2.108
index 5a77725751b9..ccc6a310db98 100644
--- a/metadata/md5-cache/app-text/lcdf-typetools-2.108
+++ b/metadata/md5-cache/app-text/lcdf-typetools-2.108
@@ -5,10 +5,10 @@ DESCRIPTION=Font utilities for eg manipulating OTF
 EAPI=7
 HOMEPAGE=https://lcdf.org/type/#typetools
 IUSE=+kpathsea
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=kpathsea? ( virtual/tex-base dev-libs/kpathsea )
 SLOT=0
 SRC_URI=https://lcdf.org/type/lcdf-typetools-2.108.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4b1390ed5b3e0fdbccacad82d435f0b7
+_md5_=dda9d90e2f6398db8b6ec3663be53d43
diff --git a/metadata/md5-cache/app-text/libpaper-1.1.24_p5 b/metadata/md5-cache/app-text/libpaper-1.1.24_p5
deleted file mode 100644
index 2d6acb06371d..000000000000
--- a/metadata/md5-cache/app-text/libpaper-1.1.24_p5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library for handling paper characteristics
-EAPI=6
-HOMEPAGE=https://packages.debian.org/unstable/source/libpaper
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.24+nmu5.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8cf3913e15ddc1ef2da3e9ecd6e15c7e
diff --git a/metadata/md5-cache/app-text/libpaper-1.1.28 b/metadata/md5-cache/app-text/libpaper-1.1.28
index c7562b0ccd96..794cd41e28f8 100644
--- a/metadata/md5-cache/app-text/libpaper-1.1.28
+++ b/metadata/md5-cache/app-text/libpaper-1.1.28
@@ -4,9 +4,9 @@ DESCRIPTION=Library for handling paper characteristics
 EAPI=7
 HOMEPAGE=https://packages.debian.org/unstable/source/libpaper
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.28.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cc9fcd66560ccf3702de0c06a4f944e8
+_md5_=f497f3503167581dfb86a38b31f1f53a
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.7.40 b/metadata/md5-cache/app-text/master-pdf-editor-5.7.40
deleted file mode 100644
index 16bfb80b783d..000000000000
--- a/metadata/md5-cache/app-text/master-pdf-editor-5.7.40
+++ /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.40-qt5.x86_64.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2d3ce1fd5ac00e4cfb6173e86061bf6b
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.7.90 b/metadata/md5-cache/app-text/master-pdf-editor-5.7.90
new file mode 100644
index 000000000000..6b3891cd0a6d
--- /dev/null
+++ b/metadata/md5-cache/app-text/master-pdf-editor-5.7.90
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A complete solution for viewing and editing PDF files
+EAPI=7
+HOMEPAGE=https://code-industry.net/free-pdf-editor/
+KEYWORDS=~amd64
+LICENSE=master-pdf-editor
+RDEPEND=dev-libs/nss >=dev-qt/qtcore-5.12.9:5 >=dev-qt/qtgui-5.12.9:5 >=dev-qt/qtnetwork-5.12.9:5 >=dev-qt/qtprintsupport-5.12.9:5 >=dev-qt/qtsvg-5.12.9:5 >=media-gfx/sane-backends-1.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://code-industry.net/public/master-pdf-editor-5.7.90-qt5.x86_64.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2d3ce1fd5ac00e4cfb6173e86061bf6b
diff --git a/metadata/md5-cache/app-text/multitail-6.4.2-r1 b/metadata/md5-cache/app-text/multitail-6.4.2-r1
index 2ff40f31834f..84d6755bf67a 100644
--- a/metadata/md5-cache/app-text/multitail-6.4.2-r1
+++ b/metadata/md5-cache/app-text/multitail-6.4.2-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/ncurses:=[unicode(+)?]
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.vanheusden.com/multitail/multitail-6.4.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fb78bc5723ab7667e8de383fde381520
diff --git a/metadata/md5-cache/app-text/pastebinit-1.5.1 b/metadata/md5-cache/app-text/pastebinit-1.5.1
index 52c9b3387b79..01aef94beb72 100644
--- a/metadata/md5-cache/app-text/pastebinit-1.5.1
+++ b/metadata/md5-cache/app-text/pastebinit-1.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=A software that lets you send anything you want directly to a pasteb
 EAPI=7
 HOMEPAGE=https://launchpad.net/pastebinit
 IUSE=crypt python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/configobj[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/configobj[python_targets_python3_9(-)] ) crypt? ( app-crypt/gnupg )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/main/p/pastebinit/pastebinit_1.5.1.orig.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fb98a6e47b61da7a20b121d07d2afe8e
+_md5_=98e6022b108ec0dcf761094a80e07e2a
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.6.2 b/metadata/md5-cache/app-text/pdfarranger-1.6.2
index 9047a936deef..3937eb4e34af 100644
--- a/metadata/md5-cache/app-text/pdfarranger-1.6.2
+++ b/metadata/md5-cache/app-text/pdfarranger-1.6.2
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[introspection,cairo] dev-python/pikepdf[python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jeromerobert/pdfarranger/archive/1.6.2.tar.gz -> pdfarranger-1.6.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ed930a1f13d20051a64da2574afceadd
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.7.0 b/metadata/md5-cache/app-text/pdfarranger-1.7.0
index e9a246dd6490..167f35defdfd 100644
--- a/metadata/md5-cache/app-text/pdfarranger-1.7.0
+++ b/metadata/md5-cache/app-text/pdfarranger-1.7.0
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[introspection,cairo] dev-python/pikepdf[python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jeromerobert/pdfarranger/archive/1.7.0.tar.gz -> pdfarranger-1.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a8e459822356949c29de6e23d1097322
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.7.1 b/metadata/md5-cache/app-text/pdfarranger-1.7.1
index 867c066cce58..89d124132b0d 100644
--- a/metadata/md5-cache/app-text/pdfarranger-1.7.1
+++ b/metadata/md5-cache/app-text/pdfarranger-1.7.1
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[introspection,cairo] dev-python/pikepdf[python_targets_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jeromerobert/pdfarranger/archive/1.7.1.tar.gz -> pdfarranger-1.7.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d4cb739aa46e42b68d4c05b7332335d2
diff --git a/metadata/md5-cache/app-text/pdfjam-2.08-r1 b/metadata/md5-cache/app-text/pdfjam-2.08-r1
index 8158e7d8be9b..c32d94ed5862 100644
--- a/metadata/md5-cache/app-text/pdfjam-2.08-r1
+++ b/metadata/md5-cache/app-text/pdfjam-2.08-r1
@@ -3,9 +3,9 @@ DEPEND=virtual/latex-base
 DESCRIPTION=pdfnup, pdfjoin and pdf90
 EAPI=7
 HOMEPAGE=http://www.warwick.ac.uk/go/pdfjam
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=http://www.warwick.ac.uk/go/pdfjam/pdfjam_208.tgz
-_md5_=6eda12b3e7f81a0ac8b7614765b94afe
+_md5_=d3f67a51659a9f3e3a8d794f0c190841
diff --git a/metadata/md5-cache/app-text/poppler-21.05.0 b/metadata/md5-cache/app-text/poppler-21.05.0
deleted file mode 100644
index 7007993e337f..000000000000
--- a/metadata/md5-cache/app-text/poppler-21.05.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 )
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=7
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
-RESTRICT=test
-SLOT=0/110
-SRC_URI=https://poppler.freedesktop.org/poppler-21.05.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=58fd65dc47f227aad7634e636434df31
diff --git a/metadata/md5-cache/app-text/poppler-21.06.1 b/metadata/md5-cache/app-text/poppler-21.06.1
deleted file mode 100644
index f6cb6e056857..000000000000
--- a/metadata/md5-cache/app-text/poppler-21.06.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) boost? ( dev-libs/boost )
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=7
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
-RESTRICT=test
-SLOT=0/111
-SRC_URI=https://poppler.freedesktop.org/poppler-21.06.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f0c80afee79262007df658d3cf8cf5f0
diff --git a/metadata/md5-cache/app-text/ps2eps-1.68 b/metadata/md5-cache/app-text/ps2eps-1.68
index 04c0dda746d4..b8e772030ccb 100644
--- a/metadata/md5-cache/app-text/ps2eps-1.68
+++ b/metadata/md5-cache/app-text/ps2eps-1.68
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Generate Encapsulated Postscript Format files from one-page Postscript documents
 EAPI=7
 HOMEPAGE=http://www.tm.uka.de/~bless/ps2eps
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl !<app-text/texlive-core-2007-r7
 SLOT=0
 SRC_URI=http://www.tm.uka.de/~bless/ps2eps-1.68.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1ca72a6df03846785062f093634f2d1
+_md5_=5fa37b2a193b0015d3503486ca9c3fb1
diff --git a/metadata/md5-cache/app-text/psutils-1.17-r3 b/metadata/md5-cache/app-text/psutils-1.17-r3
index 044f11b34878..3dec5c1d7348 100644
--- a/metadata/md5-cache/app-text/psutils-1.17-r3
+++ b/metadata/md5-cache/app-text/psutils-1.17-r3
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=PostScript Utilities
 EAPI=6
 HOMEPAGE=http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=psutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/psutils/psutils_1.17.dfsg.orig.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=311781459ebd29d6af035113248bbb3b
+_md5_=bab0f909d77574e36f71f524458d25c0
diff --git a/metadata/md5-cache/app-text/pytextile-4.0.1 b/metadata/md5-cache/app-text/pytextile-4.0.1
index 98bae665a4ed..a44dbcd695c0 100644
--- a/metadata/md5-cache/app-text/pytextile-4.0.1
+++ b/metadata/md5-cache/app-text/pytextile-4.0.1
@@ -1,16 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=A Python port of Textile, A humane web text generator
 EAPI=7
 HOMEPAGE=https://github.com/textile/python-textile
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=BSD
-RDEPEND=dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/textile/python-textile/archive/4.0.1.tar.gz -> pytextile-4.0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f07c3f12de81ef55ecad779e6b5bbc8a
+_md5_=c00219132b7f3e1cae5c0c293aebd0ad
diff --git a/metadata/md5-cache/app-text/t1utils-1.42 b/metadata/md5-cache/app-text/t1utils-1.42
new file mode 100644
index 000000000000..300c718b11bc
--- /dev/null
+++ b/metadata/md5-cache/app-text/t1utils-1.42
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Type 1 Font utilities
+EAPI=7
+HOMEPAGE=http://www.lcdf.org/type/#t1utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=!<media-libs/freetype-1.4_pre20080316
+SLOT=0
+SRC_URI=http://www.lcdf.org/type/t1utils-1.42.tar.gz
+_md5_=305cfa3e4eb439f958e057b5a594cfda
diff --git a/metadata/md5-cache/app-text/texlive-2021 b/metadata/md5-cache/app-text/texlive-2021
index c206e73ca02a..ecdee3de7579 100644
--- a/metadata/md5-cache/app-text/texlive-2021
+++ b/metadata/md5-cache/app-text/texlive-2021
@@ -4,8 +4,8 @@ DESCRIPTION=A complete TeX distribution
 EAPI=7
 HOMEPAGE=http://tug.org/texlive/
 IUSE=cjk context extra games graphics humanities luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X l10n_af l10n_ar l10n_as l10n_bg l10n_bn l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_kn l10n_la l10n_lo l10n_lt l10n_lv l10n_ml l10n_mn l10n_mr l10n_nb l10n_nl l10n_nn l10n_no l10n_or l10n_pa l10n_pl l10n_pt l10n_rm l10n_ro l10n_ru l10n_sa l10n_sco l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tk l10n_tr l10n_uk l10n_vi l10n_zh
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=metapackage
 RDEPEND=>=app-text/texlive-core-2021 app-text/psutils >=dev-texlive/texlive-fontutils-2021 media-gfx/sam2p texi2html? ( app-text/texi2html ) sys-apps/texinfo app-text/t1utils >=app-text/lcdf-typetools-2.92[kpathsea] truetype? ( >=app-text/ttf2pk2-2.0_p20150521 ) app-text/ps2eps png? ( app-text/dvipng ) X? ( >=app-text/xdvik-22.87 ) >=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-fontsrecommended-2021 >=dev-texlive/texlive-latex-2021 luatex? ( >=dev-texlive/texlive-luatex-2021 ) >=dev-texlive/texlive-latexrecommended-2021 >=dev-tex/latex-beamer-3.36 metapost? ( >=dev-texlive/texlive-metapost-2021 ) >=dev-texlive/texlive-plaingeneric-2021 pdfannotextractor? ( dev-tex/pdfannotextractor ) extra? ( app-text/dvisvgm dev-tex/latexdiff >=dev-tex/latexmk-418 >=dev-texlive/texlive-bibtexextra-2021 >=dev-texlive/texlive-fontsextra-2021 >=dev-texlive/texlive-formatsextra-2021 >=dev-texlive/texlive-latexextra-2021 >=dev-tex/glossaries-2.07 ) xetex? ( >=dev-texlive/texlive-xetex-2021 ) graphics? ( >=dev-texlive/texlive-pictures-2021 ) science? ( >=dev-texlive/texlive-mathscience-2021 ) publishers? ( >=dev-texlive/texlive-publishers-2021 ) music? ( >=dev-texlive/texlive-music-2021 ) pstricks? ( >=dev-texlive/texlive-pstricks-2021 ) context? ( >=dev-texlive/texlive-context-2021 ) games? ( >=dev-texlive/texlive-games-2021 ) humanities? ( >=dev-texlive/texlive-humanities-2021 ) tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 ) xml? ( >=dev-texlive/texlive-formatsextra-2021 ) l10n_af? ( >=dev-texlive/texlive-langother-2021 ) l10n_ar? ( >=dev-texlive/texlive-langarabic-2021 ) l10n_fa? ( >=dev-texlive/texlive-langarabic-2021 ) l10n_hy? ( >=dev-texlive/texlive-langeuropean-2021 ) cjk? ( >=dev-texlive/texlive-langcjk-2021 ) l10n_hr? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_bg? ( >=dev-texlive/texlive-langcyrillic-2021 ) l10n_br? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_ru? ( >=dev-texlive/texlive-langcyrillic-2021 ) l10n_uk? ( >=dev-texlive/texlive-langcyrillic-2021 ) l10n_cs? ( >=dev-texlive/texlive-langczechslovak-2021 ) l10n_sk? ( >=dev-texlive/texlive-langczechslovak-2021 ) l10n_da? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_nl? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_en? ( >=dev-texlive/texlive-langenglish-2021 ) l10n_fi? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_eu? ( >=dev-texlive/texlive-langfrench-2021 ) l10n_fr? ( >=dev-texlive/texlive-langfrench-2021 ) l10n_de? ( >=dev-texlive/texlive-langgerman-2021 ) l10n_el? ( >=dev-texlive/texlive-langgreek-2021 ) l10n_he? ( >=dev-texlive/texlive-langother-2021 ) l10n_hu? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_as? ( >=dev-texlive/texlive-langother-2021 ) l10n_bn? ( >=dev-texlive/texlive-langother-2021 ) l10n_gu? ( >=dev-texlive/texlive-langother-2021 ) l10n_hi? ( >=dev-texlive/texlive-langother-2021 ) l10n_kn? ( >=dev-texlive/texlive-langother-2021 ) l10n_ml? ( >=dev-texlive/texlive-langother-2021 ) l10n_mr? ( >=dev-texlive/texlive-langother-2021 ) l10n_or? ( >=dev-texlive/texlive-langother-2021 ) l10n_pa? ( >=dev-texlive/texlive-langother-2021 ) l10n_sa? ( >=dev-texlive/texlive-langother-2021 ) l10n_ta? ( >=dev-texlive/texlive-langother-2021 ) l10n_te? ( >=dev-texlive/texlive-langother-2021 ) l10n_it? ( >=dev-texlive/texlive-langitalian-2021 ) l10n_ja? ( >=dev-texlive/texlive-langjapanese-2021 ) l10n_ko? ( >=dev-texlive/texlive-langkorean-2021 ) l10n_la? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_lt? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_lv? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_mn? ( >=dev-texlive/texlive-langcyrillic-2021 ) l10n_nb? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_nn? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_no? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_cy? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_eo? ( >=dev-texlive/texlive-langother-2021 ) l10n_et? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_ga? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_rm? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_hsb? ( >=dev-texlive/texlive-langother-2021 ) l10n_ia? ( >=dev-texlive/texlive-langother-2021 ) l10n_id? ( >=dev-texlive/texlive-langother-2021 ) l10n_is? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_lo? ( >=dev-texlive/texlive-langother-2021 ) l10n_ro? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_sq? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_sr? ( >=dev-texlive/texlive-langeuropean-2021 >=dev-texlive/texlive-langcyrillic-2021 ) l10n_sl? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_tr? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_pl? ( >=dev-texlive/texlive-langpolish-2021 ) l10n_pt? ( >=dev-texlive/texlive-langportuguese-2021 ) l10n_ca? ( >=dev-texlive/texlive-langspanish-2021 ) l10n_gl? ( >=dev-texlive/texlive-langspanish-2021 ) l10n_es? ( >=dev-texlive/texlive-langspanish-2021 ) l10n_sco? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_sv? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_tk? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_vi? ( >=dev-texlive/texlive-langother-2021 ) l10n_zh? ( >=dev-texlive/texlive-langchinese-2021 )
 SLOT=0
-_md5_=91c91b6402df5dbe064b59cbbe5f29f9
+_md5_=2370f49e68705826bc530ffeec361124
diff --git a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325 b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325
index 2a152767746d..b0725991c91f 100644
--- a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325
+++ b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs
 DESCRIPTION=Freetype 2 based TrueType font to TeX's PK format converter
 EAPI=7
 HOMEPAGE=http://tug.org/texlive/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/texlive/texlive-20210325-source.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6c91467568a0f69232648ca6391ff673
+_md5_=a09f9991c8523bbd01bb684908835107
diff --git a/metadata/md5-cache/app-text/vilistextum-2.6.9-r1 b/metadata/md5-cache/app-text/vilistextum-2.6.9-r1
deleted file mode 100644
index 0e2f95a3f795..000000000000
--- a/metadata/md5-cache/app-text/vilistextum-2.6.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=virtual/libiconv sys-devel/gnuconfig >=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=HTML to ASCII converter programmed to handle incorrect html
-EAPI=5
-HOMEPAGE=https://bhaak.net/vilistextum/
-IUSE=unicode
-KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://bhaak.net/vilistextum/vilistextum-2.6.9.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=14a49480999a03de6d12979c7b1fa81c
diff --git a/metadata/md5-cache/app-text/xchm-1.32 b/metadata/md5-cache/app-text/xchm-1.32
index b59036309129..b9f965619088 100644
--- a/metadata/md5-cache/app-text/xchm-1.32
+++ b/metadata/md5-cache/app-text/xchm-1.32
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0-gtk3[X] nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/rzvncj/xCHM/releases/download/1.32/xchm-1.32.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b9e0cd5d9bf7a7a7684fee0c5fade1b0
diff --git a/metadata/md5-cache/app-text/xchm-9999 b/metadata/md5-cache/app-text/xchm-9999
index fdf26014b345..c92202c79808 100644
--- a/metadata/md5-cache/app-text/xchm-9999
+++ b/metadata/md5-cache/app-text/xchm-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0-gtk3[X] nls? ( virtual/libintl )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5e1d80dfb43fb5f9d76cb8cfe1504a6a
diff --git a/metadata/md5-cache/app-text/xdvik-22.87.03-r2 b/metadata/md5-cache/app-text/xdvik-22.87.03-r2
index 194faab7e86f..338808495ee3 100644
--- a/metadata/md5-cache/app-text/xdvik-22.87.03-r2
+++ b/metadata/md5-cache/app-text/xdvik-22.87.03-r2
@@ -4,10 +4,10 @@ DESCRIPTION=DVI previewer for X Window System
 EAPI=6
 HOMEPAGE=http://xdvi.sourceforge.net/
 IUSE=motif neXt Xaw3d emacs
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( >=app-editors/emacs-23.1:* ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea virtual/latex-base !<app-text/texlive-2007
 SLOT=0
 SRC_URI=mirror://sourceforge/xdvi/xdvik-22.87.03.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b104bcbaf92f88bd5118db4f9ce6140c
+_md5_=449bca305570451a1bc436e3717fd186
diff --git a/metadata/md5-cache/app-text/zathura-0.4.7 b/metadata/md5-cache/app-text/zathura-0.4.7
index 064778b75c24..db6844f9d2fd 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.7
+++ b/metadata/md5-cache/app-text/zathura-0.4.7
@@ -5,11 +5,11 @@ DESCRIPTION=A highly customizable and functional document viewer
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura/
 IUSE=doc +magic seccomp sqlite synctex test test
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwmt/zathura/archive/0.4.7.tar.gz -> zathura-0.4.7.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b39c9b6eea06ff4328a7125df2fac4d9
+_md5_=3ad6395449021b229269acd3907e8390
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index 5f9849b91bcb..8cfecf6e6dfa 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=2fa1f3d0662eb99f3ad59cc2ed9c88ee
+_md5_=755b041890d753c6facca2332194564b
diff --git a/metadata/md5-cache/app-text/zathura-cb-0.1.8 b/metadata/md5-cache/app-text/zathura-cb-0.1.8
index e98d686fc9a6..b29fadcea43f 100644
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.8
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.8
@@ -4,10 +4,10 @@ DEPEND=>=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-cb/
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~riscv x86
 LICENSE=ZLIB
 RDEPEND=>=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/plugins/download/zathura-cb-0.1.8.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8a4e41055f384cc1561165f3b14c90c5
+_md5_=fb4c5e7ba59ae91607c297530df75fff
diff --git a/metadata/md5-cache/app-text/zathura-cb-9999 b/metadata/md5-cache/app-text/zathura-cb-9999
index c0bdc37a85a3..16fb538dc124 100644
--- a/metadata/md5-cache/app-text/zathura-cb-9999
+++ b/metadata/md5-cache/app-text/zathura-cb-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=>=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=939d7c2144620b6a3ab019510caed05a
+_md5_=4ea7c82c191b3c0858527110d8f28382
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 0e44f1143ba6..740a59b7914b 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.9
+++ b/metadata/md5-cache/app-text/zathura-djvu-0.2.9
@@ -4,10 +4,10 @@ DEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x1
 DESCRIPTION=DjVu plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-djvu/
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~riscv x86
 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_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e4c39b7939ef04c559fbce5e5a1c4b6c
+_md5_=6c25799d52d2ac3c3f4ac184baf91b73
diff --git a/metadata/md5-cache/app-text/zathura-djvu-9999 b/metadata/md5-cache/app-text/zathura-djvu-9999
index 9a60e8aec787..1776c4834b48 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-9999
+++ b/metadata/md5-cache/app-text/zathura-djvu-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=80cf3e716aa34bceb852ed1a1c150886
+_md5_=b49172c66fb68e1bfe5f1cb14edba971
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.0 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.0
index 4b9e4e37a2ba..640ba5a18504 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.0
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.0
@@ -4,10 +4,10 @@ DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs
 DESCRIPTION=PDF plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-pdf-poppler
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~riscv ~x86
 LICENSE=ZLIB
 RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
 SLOT=0
 SRC_URI=https://github.com/pwmt/zathura-pdf-poppler/archive/0.3.0.tar.gz -> zathura-pdf-poppler-0.3.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e0c74cb9d6899281a26a53c45bde5e88
+_md5_=de310f0add73ff6a886683522a7e12ad
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999 b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
index a0abecd0b712..ec5ff05bbbab 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=59468750cee85eef2335e0a86adb72f7
+_md5_=f373ebcc5f8dbeb4f4f1e666d73ba284
diff --git a/metadata/md5-cache/app-text/zathura-ps-0.2.6 b/metadata/md5-cache/app-text/zathura-ps-0.2.6
index f67854fb3377..2ee26a82564a 100644
--- a/metadata/md5-cache/app-text/zathura-ps-0.2.6
+++ b/metadata/md5-cache/app-text/zathura-ps-0.2.6
@@ -4,10 +4,10 @@ DEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/gli
 DESCRIPTION=PostScript plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-ps/download/
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=app-text/libspectre >=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/plugins/download/zathura-ps-0.2.6.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=84d69240f4e6963920b8a73cd22bb30f
+_md5_=3ee76e1b5ae75d4d71013fa4f3201b52
diff --git a/metadata/md5-cache/app-text/zathura-ps-9999 b/metadata/md5-cache/app-text/zathura-ps-9999
index 96c37bc43816..d4ba46358fc8 100644
--- a/metadata/md5-cache/app-text/zathura-ps-9999
+++ b/metadata/md5-cache/app-text/zathura-ps-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e68f181c0f400fd743eff4a753d54dba
+_md5_=bfd45a592fe7c7cdc374bb51ef1860df
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 23ecdd6992c2..d73655d99b32 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/nginx-syntax-0.3.3 b/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
index a87ce528c787..641dcd40ec40 100644
--- a/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
+++ b/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Nginx configuration files syntax
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1886
-KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/nginx-syntax-0.3.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/nginx-syntax-0.3.3.tar.bz2
 _eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
-_md5_=1197378fdf6903d0ef3f8e3bad9e5d5e
+_md5_=e3b4dd0d7570c50b989ed6d411af5bd7
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.1-r2 b/metadata/md5-cache/app-vim/pyclewn-2.1-r2
index 1d610792b0cc..a47840217636 100644
--- a/metadata/md5-cache/app-vim/pyclewn-2.1-r2
+++ b/metadata/md5-cache/app-vim/pyclewn-2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=|| ( app-editors/vim app-editors/gvim[netbeans] ) app-arch/vimball || (
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyclewn/pyclewn-2.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
 _md5_=cdbd4ab10c2b8efaebe34e3f1809d459
diff --git a/metadata/md5-cache/app-vim/snipmate-0.87-r1 b/metadata/md5-cache/app-vim/snipmate-0.87-r1
index 8a9d5bc9fac1..1a1e2dc6522d 100644
--- a/metadata/md5-cache/app-vim/snipmate-0.87-r1
+++ b/metadata/md5-cache/app-vim/snipmate-0.87-r1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: TextMate-style snippets
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2540 https://github.com/garbas/vim-snipmate
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=app-vim/vim-addon-mw-utils app-vim/tlib || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/garbas/vim-snipmate/archive/v0.87.tar.gz -> snipmate-0.87.tar.gz
 _eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
-_md5_=72e2488b85df63573c057a5fba01de62
+_md5_=74933c96aa1a0d47e4f2e9e0f623ab43
diff --git a/metadata/md5-cache/app-vim/tlib-1.23 b/metadata/md5-cache/app-vim/tlib-1.23
index f51341921f04..1e24f51911d4 100644
--- a/metadata/md5-cache/app-vim/tlib-1.23
+++ b/metadata/md5-cache/app-vim/tlib-1.23
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a library of utility functions
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tomtom/tlib_vim/archive/1.23.tar.gz -> tlib-1.23.tar.gz
 _eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
-_md5_=d8ad92808353299a63738f97a86ef007
+_md5_=ccd42aea14a8f90bf3d6af65da272389
diff --git a/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105 b/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
index 98b3155544cc..a5ed6cfcec51 100644
--- a/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
+++ b/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: interpret a file by function and cache file automatically
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2940 https://github.com/MarcWeber/vim-addon-mw-utils
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vim-addon-mw-utils-20121105.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-addon-mw-utils-20121105.tar.bz2
 _eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
-_md5_=1997865ebae2174555fef0f154ba614c
+_md5_=c0459fafaac49855452e842c4a4c5365
diff --git a/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2 b/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2
index c2a60648815f..02dceb765cc7 100644
--- a/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2
+++ b/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A comprehensive set of tools to view, edit and compile LaTeX documen
 EAPI=7
 HOMEPAGE=http://vim-latex.sourceforge.net/
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=vim
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) || ( app-editors/vim[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] app-editors/gvim[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) virtual/latex-base !app-vim/vimtex || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vim-latex/vim-latex-1.10.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
-_md5_=65e8248990b7abf53094d3ccfcab7b9f
+_md5_=bf4bae2ba75149d25b0db48248c666b8
diff --git a/metadata/md5-cache/app-vim/vimtex-1.5 b/metadata/md5-cache/app-vim/vimtex-1.5
index 0ecdad3c3d8c..cbbe0a868fea 100644
--- a/metadata/md5-cache/app-vim/vimtex-1.5
+++ b/metadata/md5-cache/app-vim/vimtex-1.5
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a modern vim plugin for editing LaTeX files
 EAPI=7
 HOMEPAGE=https://github.com/lervag/vimtex
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=!app-vim/vim-latex !app-vim/automatictexplugin || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/lervag/vimtex/archive/v1.5.tar.gz -> vimtex-1.5.tar.gz
 _eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
-_md5_=e6f088560ae7d1b2bbe5bc7a6a73eeb6
+_md5_=fcc5271d306b5baf044bf4eecfe5fcb0
diff --git a/metadata/md5-cache/app-vim/vimtex-99999999 b/metadata/md5-cache/app-vim/vimtex-99999999
index d421c737ae55..59a534e68406 100644
--- a/metadata/md5-cache/app-vim/vimtex-99999999
+++ b/metadata/md5-cache/app-vim/vimtex-99999999
@@ -8,4 +8,4 @@ PROPERTIES=live
 RDEPEND=!app-vim/vim-latex !app-vim/automatictexplugin || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
-_md5_=7d792883397e0530e36549189be72672
+_md5_=7a4c74ae2a3bb616e1e25594d731c11c
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index b7cb8a080946..25f2d22ac5d7 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/gstreamermm-1.10.0 b/metadata/md5-cache/dev-cpp/gstreamermm-1.10.0
index a514a46623cd..839e38217393 100644
--- a/metadata/md5-cache/dev-cpp/gstreamermm-1.10.0
+++ b/metadata/md5-cache/dev-cpp/gstreamermm-1.10.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=1.0/1
 SRC_URI=mirror://gnome/sources/gstreamermm/1.10/gstreamermm-1.10.0.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=594dcd0d5219f9ccd1d61f52f059ab88
+_md5_=24665069fe7521bcdee94629a6c6d3ca
diff --git a/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2 b/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2
index 8d90f2bf9a23..729161947938 100644
--- a/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2
+++ b/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20
 EAPI=7
 HOMEPAGE=https://github.com/martinus/robin-hood-hashing
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/martinus/robin-hood-hashing/archive/3.11.2.tar.gz -> robin-hood-hashing-3.11.2.tar.gz
-_md5_=2fd9fe7f3b45daafa2bbd96e5b527e99
+_md5_=b1ab64e801712200adc9b5837c911efa
diff --git a/metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1 b/metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1
index 4a37d7c4f563..ca33a65ef4b4 100644
--- a/metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1
+++ b/metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zaphoyd/websocketpp/archive/0.8.1.tar.gz -> websocketpp-0.8.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8f573a2c5969bb5d0c0fd8f52cc5a78a
+_md5_=bc100f9626dd5176b66ea1aa519c1c7b
diff --git a/metadata/md5-cache/dev-cpp/websocketpp-0.8.2 b/metadata/md5-cache/dev-cpp/websocketpp-0.8.2
new file mode 100644
index 000000000000..54af35bf54e2
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/websocketpp-0.8.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-libs/boost )
+DESCRIPTION=C++/Boost Asio based websocket client/server library
+EAPI=7
+HOMEPAGE=https://www.zaphoyd.com/websocketpp
+IUSE=examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/boost
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/zaphoyd/websocketpp/archive/0.8.2.tar.gz -> websocketpp-0.8.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=afdd1bc1155f9a7b386685171f955bb8
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 8b056a6ed086..eebe178a059e 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/cockroach-19.1.1 b/metadata/md5-cache/dev-db/cockroach-19.1.1
index ee70a17e01bc..e7f10abdb311 100644
--- a/metadata/md5-cache/dev-db/cockroach-19.1.1
+++ b/metadata/md5-cache/dev-db/cockroach-19.1.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Cockroach Apache-2.0
 SLOT=0
 SRC_URI=https://binaries.cockroachdb.com/cockroach-v19.1.1.src.tgz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=0ddcc8c3dedadf84dfee1429c331d89e
diff --git a/metadata/md5-cache/dev-db/cockroach-2.1.5 b/metadata/md5-cache/dev-db/cockroach-2.1.5
index 4a24a87a7d0d..2d80c2f0c586 100644
--- a/metadata/md5-cache/dev-db/cockroach-2.1.5
+++ b/metadata/md5-cache/dev-db/cockroach-2.1.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Cockroach Apache-2.0
 SLOT=0
 SRC_URI=https://binaries.cockroachdb.com/cockroach-v2.1.5.src.tgz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=0ddcc8c3dedadf84dfee1429c331d89e
diff --git a/metadata/md5-cache/dev-db/libiodbc-3.52.15 b/metadata/md5-cache/dev-db/libiodbc-3.52.15
index bbf985f22dc9..56f10ddde6db 100644
--- a/metadata/md5-cache/dev-db/libiodbc-3.52.15
+++ b/metadata/md5-cache/dev-db/libiodbc-3.52.15
@@ -5,10 +5,10 @@ DESCRIPTION=ODBC Interface for Linux
 EAPI=7
 HOMEPAGE=http://www.iodbc.org/
 IUSE=gtk abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( LGPL-2 BSD )
 RDEPEND=gtk? ( x11-libs/gtk+:2[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/openlink/iODBC/archive/v3.52.15.tar.gz -> libiodbc-3.52.15.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1353f91f0254a45f07349ec70b16b83e
+_md5_=d7bde7ca9ce9a0775c2294847bf74998
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.39 b/metadata/md5-cache/dev-db/mariadb-10.2.39
new file mode 100644
index 000000000000..b1f14537ad0a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.39
@@ -0,0 +1,17 @@
+BDEPEND=virtual/yacc || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
+DEPEND=static? ( sys-libs/ncurses[static-libs] ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=7
+HOMEPAGE=https://mariadb.org/
+IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1+
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )
+RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !dev-db/mariadb:10.6 !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) sst-xtrabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=10.2/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.39/source/mariadb-10.2.39.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.2.39-patches-01.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c8dd6721bc6497456f084a6ffeae9d16
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.30 b/metadata/md5-cache/dev-db/mariadb-10.3.30
new file mode 100644
index 000000000000..7801df610408
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.30
@@ -0,0 +1,17 @@
+BDEPEND=virtual/yacc || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
+DEPEND=static? ( sys-libs/ncurses[static-libs] ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=7
+HOMEPAGE=https://mariadb.org/
+IUSE=+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1+
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 !dev-db/mariadb:10.6 !<virtual/mysql-5.6-r11 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=10.3/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.30/source/mariadb-10.3.30.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.3.30-patches-01.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=19d2824e784bbfd593b646afdb93495c
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.20 b/metadata/md5-cache/dev-db/mariadb-10.4.20
new file mode 100644
index 000000000000..3b21b1d881dc
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.20
@@ -0,0 +1,17 @@
+BDEPEND=virtual/yacc || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
+DEPEND=static? ( sys-libs/ncurses[static-libs] ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=7
+HOMEPAGE=https://mariadb.org/
+IUSE=+backup bindist cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl elibc_FreeBSD jdbc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1+
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=selinux? ( sec-policy/selinux-mysql ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.5 !dev-db/mariadb:10.6 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) sys-libs/ncurses:0= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) server? ( backup? ( app-arch/libarchive:0= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) systemd? ( sys-apps/systemd:= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= server? ( galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=10.4/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.20/source/mariadb-10.4.20.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.4.20-patches-01.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=32c2602b364e7839e741069328cabacb
diff --git a/metadata/md5-cache/dev-db/mariadb-10.5.11 b/metadata/md5-cache/dev-db/mariadb-10.5.11
new file mode 100644
index 000000000000..28de534d1a7f
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.5.11
@@ -0,0 +1,17 @@
+BDEPEND=virtual/yacc || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
+DEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy dev-libs/boost:0= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) test? ( acct-group/mysql acct-user/mysql ) ) static? ( sys-libs/ncurses[static-libs] ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=7
+HOMEPAGE=https://mariadb.org/
+IUSE=+backup bindist columnstore cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc test xml yassl elibc_FreeBSD jdbc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1+
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=>=dev-libs/libpcre2-10.34:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= virtual/libcrypt:= !bindist? ( sys-libs/binutils-libs:0= >=sys-libs/readline-4.1:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kerberos? ( virtual/krb5 ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) server? ( app-arch/bzip2 app-arch/xz-utils backup? ( app-arch/libarchive:0= ) columnstore? ( app-arch/snappy dev-libs/boost:0= dev-libs/libxml2:2= ) cracklib? ( sys-libs/cracklib:0= ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) innodb-lz4? ( app-arch/lz4 ) innodb-lzo? ( dev-libs/lzo ) innodb-snappy? ( app-arch/snappy ) mroonga? ( app-text/groonga-normalizer-mysql >=app-text/groonga-7.0.4 ) numa? ( sys-process/numactl ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) systemd? ( sys-apps/systemd:= ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl? ( net-libs/gnutls:0= ) !yassl? ( >=dev-libs/openssl-1.0.0:0= ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1 !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.6 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 selinux? ( sec-policy/selinux-mysql ) server? ( columnstore? ( dev-db/mariadb-connector-c ) extraengine? ( jdbc? ( >=virtual/jre-1.8 ) ) galera? ( sys-apps/iproute2 =sys-cluster/galera-26* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) ) !prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) ) jdbc? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=10.5/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.5.11/source/mariadb-10.5.11.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.5.11-patches-01.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=915fa592ee0616e3cd00f68420b971b7
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.11 b/metadata/md5-cache/dev-db/mongodb-4.2.11
index fa362746e87d..43a527ab7659 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.2.11
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.11
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.11.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d44d3ccd27ebbf7ea318776e1d8f80f2
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.12 b/metadata/md5-cache/dev-db/mongodb-4.2.12
index aa4590390ed3..85ce897b73d2 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.2.12
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.12
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.12.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d98a6f49cd8f889e8d914fc4b2bf147
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.1 b/metadata/md5-cache/dev-db/mongodb-4.4.1
index f097cfcf06c3..c4d208a3c48c 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.1
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.1
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.1.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b8452f370fdc37a26186b6057c366a5
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.2 b/metadata/md5-cache/dev-db/mongodb-4.4.2
index dfe448867e91..808f9a3be4b4 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.2
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.2
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.2.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2fc6fc7e9e16cc961a561a66bbf4dfa8
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.4 b/metadata/md5-cache/dev-db/mongodb-4.4.4
index 68f92dcf5c86..dff31b0634a8 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.4
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.4
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.4.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dbc6e3b6217086c1cfec0d2ab388e73f
diff --git a/metadata/md5-cache/dev-db/myodbc-8.0.26 b/metadata/md5-cache/dev-db/myodbc-8.0.26
new file mode 100644
index 000000000000..ce84f561088d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/myodbc-8.0.26
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile config configure install postinst prepare test
+DEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/mysql-connector-c-8.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=ODBC driver for MySQL
+EAPI=7
+HOMEPAGE=https://dev.mysql.com/downloads/connector/odbc/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/mysql-connector-c-8.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=8.0
+SRC_URI=https://dev.mysql.com/get/Downloads/Connector-ODBC/8.0/mysql-connector-odbc-8.0.26-src.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8d585ea9e53637b08410415690bdf529
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.31 b/metadata/md5-cache/dev-db/mysql-5.7.31
index 8a432fe8235f..9fa8960c1d15 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.31
+++ b/metadata/md5-cache/dev-db/mysql-5.7.31
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.31.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.31.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.31.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.31-patches-01.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d15d3d1b9dfd434a738c4aff96fcea4c
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.32 b/metadata/md5-cache/dev-db/mysql-5.7.32
index 2350cf3f0391..e7eff1841f2b 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.32
+++ b/metadata/md5-cache/dev-db/mysql-5.7.32
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.32.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.32.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.32.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.32-patches-01.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=93cbb781db0ef9e19103d600a18f1327
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.33 b/metadata/md5-cache/dev-db/mysql-5.7.33
index f15bfdd4547d..c11036116f10 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.33
+++ b/metadata/md5-cache/dev-db/mysql-5.7.33
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.33.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.33.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.33.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.33-patches-01.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3c03355b4457e616dc66ceb3abe54950
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.34 b/metadata/md5-cache/dev-db/mysql-5.7.34
index 07fc4638b110..57cdedeb9760 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.34
+++ b/metadata/md5-cache/dev-db/mysql-5.7.34
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.34.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.34.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.34.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.34-patches-01.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e05099239d84c37df74c2dafccb48463
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.34-r1 b/metadata/md5-cache/dev-db/mysql-5.7.34-r1
index 69dedce67302..bdb1b2688de8 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.34-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.7.34-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.34.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.34.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.34.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.34-patches-02.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f659d82b4e587a15a988091ba9ed58e6
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.35 b/metadata/md5-cache/dev-db/mysql-5.7.35
new file mode 100644
index 000000000000..74589e9f7913
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-5.7.35
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/make dev-util/cmake
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=sys-libs/ncurses:0= client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:=[ssl] dev-libs/protobuf:= net-libs/libtirpc:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) dev-libs/protobuf virtual/yacc server? ( dev-libs/libevent:=[ssl] experimental? ( net-libs/rpcsvc-proto ) ) static? ( sys-libs/ncurses[static-libs] ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=7
+HOMEPAGE=https://www.mysql.com/
+IUSE=cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling selinux +server static static-libs systemtap tcmalloc test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=sys-libs/ncurses:0= client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:=[ssl] dev-libs/protobuf:= net-libs/libtirpc:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mysql:0 !dev-db/mysql:8.0 client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= ) selinux? ( sec-policy/selinux-mysql ) server? ( !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts ) )
+REQUIRED_USE=?? ( tcmalloc jemalloc )
+RESTRICT=!test? ( test )
+SLOT=5.7/18
+SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.35.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.35.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.35.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.35-patches-01.tar.xz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fd0c075fb5e1d4a8870fb1d224e4fe39
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.19-r2 b/metadata/md5-cache/dev-db/mysql-8.0.19-r2
index b107e3287a51..a2f0d24e58f4 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.19-r2
+++ b/metadata/md5-cache/dev-db/mysql-8.0.19-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.19.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.19.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.19.tar.gz mirror://gentoo/mysql-extras-20200317-0103Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20200317-0103Z.tar.bz2
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8e089653028db543edaa6004c1cf97cd
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.20-r1 b/metadata/md5-cache/dev-db/mysql-8.0.20-r1
index b16a4cd5a786..0270968ac395 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.20-r1
+++ b/metadata/md5-cache/dev-db/mysql-8.0.20-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.20.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.20.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.20.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.20-patches-01.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4fc16d7a72f0d863fe2eea17ba28d06a
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.21-r1 b/metadata/md5-cache/dev-db/mysql-8.0.21-r1
index bfb74c6eadea..9b9a3bfdf191 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.21-r1
+++ b/metadata/md5-cache/dev-db/mysql-8.0.21-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.21.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.21.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.21.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.21-patches-01.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=bf606a0c17e6d886f6ee28fdaf04c2a1
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.22 b/metadata/md5-cache/dev-db/mysql-8.0.22
index 007da65f13da..66cd5977fc28 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.22
+++ b/metadata/md5-cache/dev-db/mysql-8.0.22
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.22.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.22.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.22.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.22-patches-02.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=480abd8d996f561fd3c73770592d4c66
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.23 b/metadata/md5-cache/dev-db/mysql-8.0.23
index 51c8d30fe36d..09c9ebc4db0e 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.23
+++ b/metadata/md5-cache/dev-db/mysql-8.0.23
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.23.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.23.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.23.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.23-patches-01.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2f7caf4f1c3ed13b81a30790889d7703
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.25 b/metadata/md5-cache/dev-db/mysql-8.0.25
index 3f69fb095409..e6af20f757ae 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.25
+++ b/metadata/md5-cache/dev-db/mysql-8.0.25
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.25.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.25.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.25.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.25-patches-01.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b04af1effbc8559998c80b6f5418ba09
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.25-r1 b/metadata/md5-cache/dev-db/mysql-8.0.25-r1
index 71caca16f512..a90f7a91a92e 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.25-r1
+++ b/metadata/md5-cache/dev-db/mysql-8.0.25-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.25.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.25.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.25.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.25-patches-02.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4d55613f2a11bdb868d53720d9843497
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.26 b/metadata/md5-cache/dev-db/mysql-8.0.26
new file mode 100644
index 000000000000..24ae0e411afe
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-8.0.26
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/make dev-util/cmake
+DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
+DEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=7
+HOMEPAGE=https://www.mysql.com/
+IUSE=cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mysql:0 !dev-db/mysql:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
+REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa? ( server ) profiling? ( server ) router? ( server ) tcmalloc? ( server )
+RESTRICT=!test? ( test )
+SLOT=8.0
+SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.26.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.26.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.26.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.26-patches-01.tar.xz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f966b21d51664f618e6dd14335698245
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.26 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.26
new file mode 100644
index 000000000000..81cae327da64
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.26
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/make dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
+DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
+EAPI=7
+HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
+IUSE=+legacy
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Artistic GPL-2
+RDEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
+SLOT=0
+SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.26-src.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a51afb88d768dd5f606fd91591ba1d18
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.26 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.26
new file mode 100644
index 000000000000..055066c167b1
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.26
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-arch/lz4-0_p131:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=C client library for MariaDB/MySQL
+EAPI=7
+HOMEPAGE=https://dev.mysql.com/downloads/
+IUSE=ldap static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-arch/lz4-0_p131:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-db/mysql-5.6.45-r1 !=dev-db/mysql-5.7.23* !=dev-db/mysql-5.7.24* !=dev-db/mysql-5.7.25* !=dev-db/mysql-5.7.26-r0 !=dev-db/mysql-5.7.27-r0 !<dev-db/percona-server-5.7.26.29-r1
+SLOT=0/21
+SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.26.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f4fbd3ec4c2571830409c9a77406e623
diff --git a/metadata/md5-cache/dev-db/opendbx-1.4.5-r1 b/metadata/md5-cache/dev-db/opendbx-1.4.5-r1
index 98fb15918820..b1beed0a91e8 100644
--- a/metadata/md5-cache/dev-db/opendbx-1.4.5-r1
+++ b/metadata/md5-cache/dev-db/opendbx-1.4.5-r1
@@ -12,4 +12,4 @@ RESTRICT=firebird? ( bindist )
 SLOT=0
 SRC_URI=https://www.linuxnetworks.de/opendbx/download/opendbx-1.4.5.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=73fe1a7ea46dd988ea877165e7ea4c36
+_md5_=ccc6bddc113a37cf122a9778583d6854
diff --git a/metadata/md5-cache/dev-db/opendbx-1.4.6-r2 b/metadata/md5-cache/dev-db/opendbx-1.4.6-r2
index 7d086699796c..02c8dd018118 100644
--- a/metadata/md5-cache/dev-db/opendbx-1.4.6-r2
+++ b/metadata/md5-cache/dev-db/opendbx-1.4.6-r2
@@ -12,4 +12,4 @@ RESTRICT=firebird? ( bindist )
 SLOT=0
 SRC_URI=https://www.linuxnetworks.de/opendbx/download/opendbx-1.4.6.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6d0533d801eed352d57a60f9aa4076b4
+_md5_=81334b2bd89871a7626b22bb69b1f8a2
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.22.13 b/metadata/md5-cache/dev-db/percona-server-8.0.22.13
index 0a4e6771e5d0..0f3be23acdfb 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.22.13
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.22.13
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.22-13/source/tarball/percona-server-8.0.22-13.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.22.13-patches-02.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ac313b5e96d827389acd0cf37b047eca
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.23.14 b/metadata/md5-cache/dev-db/percona-server-8.0.23.14
index 0f3c67b6c647..7a8aa0126278 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.23.14
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.23.14
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.23-14/source/tarball/percona-server-8.0.23-14.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.23.14-patches-01.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ded62c6c6c83b0c32ddf4a822c94f83a
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.25.15 b/metadata/md5-cache/dev-db/percona-server-8.0.25.15
new file mode 100644
index 000000000000..f895a245e2f7
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.25.15
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/make dev-util/cmake
+DEFINED_PHASES=compile config configure install postinst prepare pretend setup test unpack
+DEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/yacc server? ( net-libs/rpcsvc-proto ) test? ( acct-group/mysql acct-user/mysql dev-perl/JSON )
+DESCRIPTION=Fully compatible, enhanced and open source drop-in replacement for MySQL
+EAPI=7
+HOMEPAGE=https://www.percona.com/software/mysql-database/percona-server https://github.com/percona/percona-server
+IUSE=cjk cracklib debug jemalloc latin1 ldap numa pam +perl profiling rocksdb router selinux +server tcmalloc test tokudb tokudb-backup-plugin kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
+RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= net-misc/curl:= cjk? ( app-text/mecab:= ) ldap? ( dev-libs/cyrus-sasl net-nds/openldap ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) pam? ( sys-libs/pam:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster !dev-db/percona-server:0 !dev-db/percona-server:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
+REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa? ( server ) profiling? ( server ) router? ( server ) tcmalloc? ( server )
+RESTRICT=!test? ( test )
+SLOT=8.0
+SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.25-15/source/tarball/percona-server-8.0.25-15.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.25.15-patches-01.tar.xz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4b23fd90479ca7b6bc12852df3363174
diff --git a/metadata/md5-cache/dev-db/wxsqlite3-3.2.1-r1 b/metadata/md5-cache/dev-db/wxsqlite3-3.2.1-r1
index 7a00264a03a2..4d4e7c988c04 100644
--- a/metadata/md5-cache/dev-db/wxsqlite3-3.2.1-r1
+++ b/metadata/md5-cache/dev-db/wxsqlite3-3.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=wxWinLL-3
 RDEPEND=x11-libs/wxGTK:3.0[X] dev-db/sqlite:3
 SLOT=0
 SRC_URI=mirror://sourceforge/wxcode/wxsqlite3-3.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=861b0f6ab5b17ca7d925ec1a6c15036c
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index b960baff3de7..736bdb84f3a2 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/freesolid-2.1.2 b/metadata/md5-cache/dev-games/freesolid-2.1.2
new file mode 100644
index 000000000000..2f3917f42109
--- /dev/null
+++ b/metadata/md5-cache/dev-games/freesolid-2.1.2
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/unzip dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for collision detection of three-dimensional objects
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/freesolid/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://sourceforge/freesolid/FreeSOLID-2.1.2.zip
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=27065156997086f062812dc41d768740
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101
index e80c869bc137..6b1f8ed7c8cb 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101
@@ -11,5 +11,5 @@ RDEPEND=media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-l
 REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) openexr? ( zlib ) sdl2? ( sdl )
 SLOT=0/161
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f7eb92f2ed3e38c025a6232e4a764368
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110
index fc41e7acca97..c12b9882dbbb 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110
@@ -11,5 +11,5 @@ RDEPEND=media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-l
 REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) openexr? ( zlib ) sdl2? ( sdl )
 SLOT=0/161
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d00be8554c8c73905694da706b060093
diff --git a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r101 b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r101
index ee8832ec0e81..4f7f62751c2f 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r101
+++ b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r101
@@ -11,5 +11,5 @@ RDEPEND=!dev-games/openscenegraph media-libs/mesa[egl(+)?] virtual/glu virtual/o
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) sdl2? ( sdl ) openexr? ( zlib )
 SLOT=0/132
 SRC_URI=https://github.com/OpenMW/osg/archive/8b07809fa674ecffe77338aaea2e223b3aadff0e.tar.gz -> openscenegraph-openmw-3.4_p20200425.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e4b1f0d405bc67e144239f847af916a7
diff --git a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20210610 b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20210610
index 1e32931837bb..aefffa7dc8d7 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20210610
+++ b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.6_p20210610
@@ -11,5 +11,5 @@ RDEPEND=!dev-games/openscenegraph media-libs/mesa[egl(+)?] virtual/glu virtual/o
 REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) openexr? ( zlib ) sdl2? ( sdl )
 SLOT=0/162
 SRC_URI=https://github.com/OpenMW/osg/archive/b02abe200c4847e73b887b064a89ea1758a5b733.tar.gz -> openscenegraph-openmw-3.6_p20210610.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c5125660b032484b602f5a0aae3da63a
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 3a264f60d52a..90cbecb34fe9 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/wxc-0.92.3.0-r1 b/metadata/md5-cache/dev-haskell/wxc-0.92.3.0-r1
index 404d6a67b167..d676f3545e91 100644
--- a/metadata/md5-cache/dev-haskell/wxc-0.92.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/wxc-0.92.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=>dev-haskell/split-0:=[profile?] >=dev-haskell/wxdirect-0.90.1.1:3.0-gtk3=[profile?] x11-libs/wxGTK:3.0-gtk3=[X,gstreamer?,opengl] >=dev-lang/ghc-7.6.1:= !!dev-haskell/wxc:3.0
 SLOT=3.0-gtk3/0.92.3.0
 SRC_URI=https://hackage.haskell.org/package/wxc-0.92.3.0/wxc-0.92.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=f6d33289e548969a62cce319d89730fb
diff --git a/metadata/md5-cache/dev-haskell/wxcore-0.92.3.0-r1 b/metadata/md5-cache/dev-haskell/wxcore-0.92.3.0-r1
index f65048180185..2a580ec6a8ff 100644
--- a/metadata/md5-cache/dev-haskell/wxcore-0.92.3.0-r1
+++ b/metadata/md5-cache/dev-haskell/wxcore-0.92.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=dev-haskell/parsec:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/wxc-0.92:3.0-gtk3=[profile?,gstreamer?] >=dev-haskell/wxdirect-0.91:3.0-gtk3=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/wxGTK:3.0-gtk3=[X,gstreamer?,opengl] !!dev-haskell/wxcore:3.0
 SLOT=3.0-gtk3/0.92.3.0
 SRC_URI=https://hackage.haskell.org/package/wxcore-0.92.3.0/wxcore-0.92.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	haskell-cabal	c532267df7d5d305ca17c3d0c5f81bb2	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=2d00e764dd4acf75f427b4f091d294a1
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 191e3bf49991..270d6453a7c4 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/icedtea-3.18.0 b/metadata/md5-cache/dev-java/icedtea-3.18.0
index 7bb2df2315de..ca15409a01fa 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.18.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.18.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/openjdk.tar.xz -> icedtea-3.18-openjdk-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/corba.tar.xz -> icedtea-3.18-corba-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/jaxp.tar.xz -> icedtea-3.18-jaxp-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/jaxws.tar.xz -> icedtea-3.18-jaxws-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/jdk.tar.xz -> icedtea-3.18-jdk-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/hotspot.tar.xz -> icedtea-3.18-hotspot-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/nashorn.tar.xz -> icedtea-3.18-nashorn-3.18.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/langtools.tar.xz -> icedtea-3.18-langtools-3.18.0.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/shenandoah.tar.xz -> icedtea-3.18-shenandoah-3.18.0.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.18.0/aarch32.tar.xz -> icedtea-3.18-aarch32-3.18.0.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=93171dc65c4aa08edc3aa86bbc282a8f
diff --git a/metadata/md5-cache/dev-java/icedtea-3.19.0 b/metadata/md5-cache/dev-java/icedtea-3.19.0
index 81f0cd623ba2..4ed13e235532 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.19.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/openjdk.tar.xz -> icedtea-3.19-openjdk-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/corba.tar.xz -> icedtea-3.19-corba-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/jaxp.tar.xz -> icedtea-3.19-jaxp-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/jaxws.tar.xz -> icedtea-3.19-jaxws-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/jdk.tar.xz -> icedtea-3.19-jdk-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/hotspot.tar.xz -> icedtea-3.19-hotspot-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/nashorn.tar.xz -> icedtea-3.19-nashorn-3.19.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/langtools.tar.xz -> icedtea-3.19-langtools-3.19.0.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/shenandoah.tar.xz -> icedtea-3.19-shenandoah-3.19.0.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.19.0/aarch32.tar.xz -> icedtea-3.19-aarch32-3.19.0.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=93171dc65c4aa08edc3aa86bbc282a8f
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1 b/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
index eee65c407bb3..41ad097ac1fb 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.11-ga.tar.bz2 -> openjdk-11.0.11_p9.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a5047643b0a8a954600ef40894c5775f
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.12_p7 b/metadata/md5-cache/dev-java/openjdk-11.0.12_p7
index cf51662b7bc0..9b03c6bc43dd 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.12_p7
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.12_p7
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.12-ga.tar.bz2 -> openjdk-11.0.12_p7.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=663307081d332907ca8d8747c2949aef
diff --git a/metadata/md5-cache/dev-java/openjdk-8.292_p10 b/metadata/md5-cache/dev-java/openjdk-8.292_p10
index 5b1a6d6183df..77d3798d5a39 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.292_p10
+++ b/metadata/md5-cache/dev-java/openjdk-8.292_p10
@@ -10,5 +10,5 @@ PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=8
 SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u292-ga.tar.bz2 -> openjdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u292-ga.tar.bz2 -> openjdk-corba-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u292-ga.tar.bz2 -> openjdk-hotspot-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u292-ga.tar.bz2 -> openjdk-jaxp-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u292-ga.tar.bz2 -> openjdk-jaxws-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u292-ga.tar.bz2 -> openjdk-jdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u292-ga.tar.bz2 -> openjdk-langtools-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u292-ga.tar.bz2 -> openjdk-nashorn-8.292_p10.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.292_p10.tar.bz2 )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=56de332b7b59352a2eca762e9fa5504a
diff --git a/metadata/md5-cache/dev-java/openjdk-8.302_p08 b/metadata/md5-cache/dev-java/openjdk-8.302_p08
index 8f6f7dec78d2..59d38e050835 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.302_p08
+++ b/metadata/md5-cache/dev-java/openjdk-8.302_p08
@@ -10,5 +10,5 @@ PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=8
 SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u302-ga.tar.bz2 -> openjdk-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u302-ga.tar.bz2 -> openjdk-corba-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u302-ga.tar.bz2 -> openjdk-hotspot-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u302-ga.tar.bz2 -> openjdk-jaxp-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u302-ga.tar.bz2 -> openjdk-jaxws-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u302-ga.tar.bz2 -> openjdk-jdk-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u302-ga.tar.bz2 -> openjdk-langtools-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u302-ga.tar.bz2 -> openjdk-nashorn-8.302_p08.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.302_p08.tar.bz2 )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fd1bedb174eb9aacc21e9e2072b0002d
diff --git a/metadata/md5-cache/dev-java/openjfx-8.1000 b/metadata/md5-cache/dev-java/openjfx-8.1000
index fda1ff9111e6..6f3e94b18865 100644
--- a/metadata/md5-cache/dev-java/openjfx-8.1000
+++ b/metadata/md5-cache/dev-java/openjfx-8.1000
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/9f49e3b6147f.tar.bz2 -> openjfx-8.1000.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/openjfx-8.1000-backports.tar.bz2 https://services.gradle.org/distributions/gradle-4.10.3-bin.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e0e221d14370aa5d9e8c4d55781aad51
+_md5_=1c228c933a3611687b7fd1739443d743
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
deleted file mode 100644
index 78312aaf8211..000000000000
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=dev-java/antlr-2.7.7-r7:0 >=virtual/jdk-1.6 test? ( >=dev-java/junit-4.11:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A Java template engine
-EAPI=5
-HOMEPAGE=https://www.stringtemplate.org/
-IUSE=test elibc_FreeBSD doc source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/antlr/stringtemplate3/archive/3.2.1.tar.gz -> stringtemplate-3.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0644286884435754050998591ab04980
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.6 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.6
deleted file mode 100644
index 7ad816abc7d3..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=5.0
-SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.6/src/apache-tomcat-10.0.6-src.tar.gz
-_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=4b36dad821b9d52f8aa9b794b09c08ac
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.7 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.7
index 80c60ce79ceb..9373003a00cf 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.7
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.7/src/apache-tomcat-10.0.7-src.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=011f8552e125fa3a698dd42eb5fba8d2
+_md5_=4b36dad821b9d52f8aa9b794b09c08ac
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.8 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.8
index 65a1d017eca6..7f55ba7faca6 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.8
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.8/src/apache-tomcat-10.0.8-src.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=77fd539bb8ae0a999f3ea38f455ad5b1
+_md5_=011f8552e125fa3a698dd42eb5fba8d2
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.46 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.46
deleted file mode 100644
index 061499257ecd..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.46
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.46/src/apache-tomcat-9.0.46-src.tar.gz
-_eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=3e1c4341b1005b5e55812eaa88d4fc04
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48
index f4c1cf2b3534..9e75a7a1ff60 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.48
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.48/src/apache-tomcat-9.0.48-src.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=d46a783fc7a67d13ca7e7d74d4a6cd99
+_md5_=3e1c4341b1005b5e55812eaa88d4fc04
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.50 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.50
index cc3f116634a8..64ef726d4e74 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.50
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.50
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.50/src/apache-tomcat-9.0.50-src.tar.gz
 _eclasses_=java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-pkg-simple	f54286e86669dd9944a492f8586e744c	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
-_md5_=5c43d891ab52b7fab53f38a55644b1ce
+_md5_=d46a783fc7a67d13ca7e7d74d4a6cd99
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 79c4b46cab82..d8e37d154aea 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.5-r1 b/metadata/md5-cache/dev-lang/R-4.0.5-r1
index db2f21b20589..fe91a6aaf758 100644
--- a/metadata/md5-cache/dev-lang/R-4.0.5-r1
+++ b/metadata/md5-cache/dev-lang/R-4.0.5-r1
@@ -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.8:* ) 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.5.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f16e09eb670a049fbec4bfe3be100229
+_md5_=57d41bf1ddb1c9ff7995ec1c0983ff66
diff --git a/metadata/md5-cache/dev-lang/cxprolog-0.98.2 b/metadata/md5-cache/dev-lang/cxprolog-0.98.2
index 1f2818bacf17..a45c8a4c91bf 100644
--- a/metadata/md5-cache/dev-lang/cxprolog-0.98.2
+++ b/metadata/md5-cache/dev-lang/cxprolog-0.98.2
@@ -10,5 +10,5 @@ RDEPEND=readline? ( sys-libs/readline:= ) java? ( >=virtual/jdk-1.8:= ) wxwidget
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://ctp.di.fct.unl.pt/~amd/cxprolog/cxunix/cxprolog-0.98.2.src.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=66fa77bcdfd742f9ee644604757b1495
diff --git a/metadata/md5-cache/dev-lang/erlang-23.3.4 b/metadata/md5-cache/dev-lang/erlang-23.3.4
index b3cf45fdce70..a2863febce4f 100644
--- a/metadata/md5-cache/dev-lang/erlang-23.3.4
+++ b/metadata/md5-cache/dev-lang/erlang-23.3.4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/23.3.4
 SRC_URI=https://github.com/erlang/otp/archive/OTP-23.3.4.tar.gz -> erlang-23.3.4.tar.gz http://erlang.org/download/otp_doc_man_23.3.tar.gz -> erlang_doc_man_23.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.3.tar.gz -> erlang_doc_html_23.3.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=fc38eb461b33dc6feec028d6fdb52f71
diff --git a/metadata/md5-cache/dev-lang/erlang-24.0.2 b/metadata/md5-cache/dev-lang/erlang-24.0.2
index b3b6acea252f..fe4e09fab952 100644
--- a/metadata/md5-cache/dev-lang/erlang-24.0.2
+++ b/metadata/md5-cache/dev-lang/erlang-24.0.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/24.0.2
 SRC_URI=https://github.com/erlang/otp/archive/OTP-24.0.2.tar.gz -> erlang-24.0.2.tar.gz http://erlang.org/download/otp_doc_man_24.0.tar.gz -> erlang_doc_man_24.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_24.0.tar.gz -> erlang_doc_html_24.0.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=c0286f0996f315500b8e91bb7d540b50
diff --git a/metadata/md5-cache/dev-lang/gdl-1.0.0_rc3 b/metadata/md5-cache/dev-lang/gdl-1.0.0_rc3
index 316ad5fd2c0f..f87dae560bd7 100644
--- a/metadata/md5-cache/dev-lang/gdl-1.0.0_rc3
+++ b/metadata/md5-cache/dev-lang/gdl-1.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnudatalanguage/gdl/archive/v1.0.0-rc.3.tar.gz -> gdl-1.0.0_rc3.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1787254d09139ba8278f77f0dc2831a3
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.4-r1 b/metadata/md5-cache/dev-lang/ghc-8.10.4-r1
index ea2d9a443b76..46f5eb62d0bb 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.10.4-r1
+++ b/metadata/md5-cache/dev-lang/ghc-8.10.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary )
 RESTRICT=!test? ( test )
 SLOT=0/8.10.4
 SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.4/ghc-8.10.4-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.4/ghc-8.10.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.4-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bd81f0cde59636227fd4ba7528b0937c
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.5-r1 b/metadata/md5-cache/dev-lang/ghc-8.10.5-r1
index 91ced8b27da9..bbaa7c3996db 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.10.5-r1
+++ b/metadata/md5-cache/dev-lang/ghc-8.10.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary )
 RESTRICT=!test? ( test )
 SLOT=0/8.10.5
 SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.5/ghc-8.10.5-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.5/ghc-8.10.5-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.5-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.5-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c73e5c7fec3592c32cace0df5ce0a09e
diff --git a/metadata/md5-cache/dev-lang/ghc-8.8.4-r1 b/metadata/md5-cache/dev-lang/ghc-8.8.4-r1
index f43b113e180e..11ff30611fda 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.8.4-r1
+++ b/metadata/md5-cache/dev-lang/ghc-8.8.4-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary )
 RESTRICT=!test? ( test )
 SLOT=0/8.8.4
 SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-src.tar.xz test? ( https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.4-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c150b2de673091a5959aa61281d6606d
diff --git a/metadata/md5-cache/dev-lang/ghc-9.0.1-r1 b/metadata/md5-cache/dev-lang/ghc-9.0.1-r1
index bc9c776066bb..0a8348d1ffb2 100644
--- a/metadata/md5-cache/dev-lang/ghc-9.0.1-r1
+++ b/metadata/md5-cache/dev-lang/ghc-9.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary )
 RESTRICT=!test? ( test )
 SLOT=0/9.0.1
 SRC_URI=!binary? ( https://downloads.haskell.org/ghc/9.0.1/ghc-9.0.1-src.tar.xz test? ( https://downloads.haskell.org/ghc/9.0.1/ghc-9.0.1-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-9.0.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-9.0.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ghc-package	6344fef4405bc9a6cca6a0a39eee4a32	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=457e5356df70827e10692428c1b9afbd
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r4 b/metadata/md5-cache/dev-lang/lua-5.1.5-r4
deleted file mode 100644
index f3ee682de870..000000000000
--- a/metadata/md5-cache/dev-lang/lua-5.1.5-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( >=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-devel/libtool
-DESCRIPTION=A powerful light-weight programming language designed for extending applications
-EAPI=5
-HOMEPAGE=http://www.lua.org/
-IUSE=+deprecated emacs readline static abi_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 ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=emacs? ( app-emacs/lua-mode )
-RDEPEND=readline? ( >=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(-)?] )
-SLOT=0
-SRC_URI=http://www.lua.org/ftp/lua-5.1.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	portability	d1186f1e621de7b27ddcae82e6253259	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=abd701fede35303c41bbf004aef557ff
diff --git a/metadata/md5-cache/dev-lang/mlton-20180207 b/metadata/md5-cache/dev-lang/mlton-20180207
index 7c6c624a0718..c2a5a482fd79 100644
--- a/metadata/md5-cache/dev-lang/mlton-20180207
+++ b/metadata/md5-cache/dev-lang/mlton-20180207
@@ -9,5 +9,5 @@ LICENSE=HPND MIT
 RDEPEND=dev-libs/gmp:*
 SLOT=0/20180207
 SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20180207.src.tgz ) !bootstrap-smlnj? ( amd64? ( mirror://sourceforge/mlton/mlton-20180207-1.amd64-linux.tgz ) )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	pax-utils	fce6ad998516159787b92e8043167889
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	multibuild	05a584848db4901c97fcd94ae7cc3a97	pax-utils	fce6ad998516159787b92e8043167889
 _md5_=8b77f08003e305274e9aafdaabf2ffe0
diff --git a/metadata/md5-cache/dev-lang/mono-6.12.0.122 b/metadata/md5-cache/dev-lang/mono-6.12.0.122
index af0462860ea4..b713bc8b33c7 100644
--- a/metadata/md5-cache/dev-lang/mono-6.12.0.122
+++ b/metadata/md5-cache/dev-lang/mono-6.12.0.122
@@ -10,5 +10,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ia64? ( sys-libs/libunwind ) !minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) nls? ( sys-devel/gettext ) app-misc/ca-certificates
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-6.12.0.122.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17c6793927baa266e816ef5115ceebb2
diff --git a/metadata/md5-cache/dev-lang/mozart-2.0.1 b/metadata/md5-cache/dev-lang/mozart-2.0.1
index 33cf5af67c7a..8d500b7cd585 100644
--- a/metadata/md5-cache/dev-lang/mozart-2.0.1
+++ b/metadata/md5-cache/dev-lang/mozart-2.0.1
@@ -10,6 +10,6 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/boost:= dev-libs/gmp:0 dev-lang/tcl:0 dev-lang/tk:0 emacs? ( >=app-editors/emacs-23.1:* ) >=dev-java/java-config-2.2.0-r3
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/mozart/mozart2/archive/v2.0.1.tar.gz -> mozart-2.0.1.tar.gz https://dev.gentoo.org/~keri/distfiles/mozart/mozart-2.0.1-gentoo-patchset-1.tar.gz
+SRC_URI=https://github.com/mozart/mozart2/archive/v2.0.1.tar.gz -> mozart-2.0.1.tar.gz https://dev.gentoo.org/~keri/distfiles/mozart/mozart-2.0.1-gentoo-patchset-2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c6ddc0b8ee8c6155d225ac4c0dbf857b
+_md5_=6921b04cc92e7b8a396d4eedd6f64058
diff --git a/metadata/md5-cache/dev-lang/perl-5.30.3 b/metadata/md5-cache/dev-lang/perl-5.30.3
deleted file mode 100644
index a81921115dc0..000000000000
--- a/metadata/md5-cache/dev-lang/perl-5.30.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
-DESCRIPTION=Larry Wall's Practical Extraction and Report Language
-EAPI=6
-HOMEPAGE=https://www.perl.org/
-IUSE=berkdb debug doc gdbm ithreads
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
-SLOT=0/5.30
-SRC_URI=mirror://cpan/src/5.0/perl-5.30.3.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.30.3.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.30.0-patches-1/perl-5.30.0-patches-1.tar.xz mirror://gentoo/perl-5.30.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.30.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.2/perl-cross-1.3.2.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=70ff5181ac1ec0f381673dc0520e678f
diff --git a/metadata/md5-cache/dev-lang/perl-5.30.3-r1 b/metadata/md5-cache/dev-lang/perl-5.30.3-r1
deleted file mode 100644
index c1f0e5b88545..000000000000
--- a/metadata/md5-cache/dev-lang/perl-5.30.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DESCRIPTION=Larry Wall's Practical Extraction and Report Language
-EAPI=6
-HOMEPAGE=https://www.perl.org/
-IUSE=berkdb debug doc gdbm ithreads minimal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-SLOT=0/5.30
-SRC_URI=mirror://cpan/src/5.0/perl-5.30.3.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.30.3.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.30.0-patches-1/perl-5.30.0-patches-1.tar.xz mirror://gentoo/perl-5.30.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.30.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.4/perl-cross-1.3.4.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e49d54001dbbbe18f919951586f3d524
diff --git a/metadata/md5-cache/dev-lang/perl-5.30.3-r2 b/metadata/md5-cache/dev-lang/perl-5.30.3-r2
deleted file mode 100644
index 0bb3a6de9331..000000000000
--- a/metadata/md5-cache/dev-lang/perl-5.30.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DESCRIPTION=Larry Wall's Practical Extraction and Report Language
-EAPI=7
-HOMEPAGE=https://www.perl.org/
-IUSE=berkdb debug doc gdbm ithreads
-LICENSE=|| ( Artistic GPL-1+ )
-PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-SLOT=0/5.30
-SRC_URI=mirror://cpan/src/5.0/perl-5.30.3.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.30.3.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.30.3-patches-1/perl-5.30.3-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.30.3-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.4/perl-cross-1.3.4.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a60128488c8b21693a528b27370b69dc
diff --git a/metadata/md5-cache/dev-lang/perl-5.32.0-r1 b/metadata/md5-cache/dev-lang/perl-5.32.0-r1
deleted file mode 100644
index 0fb9c4f22eb7..000000000000
--- a/metadata/md5-cache/dev-lang/perl-5.32.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DESCRIPTION=Larry Wall's Practical Extraction and Report Language
-EAPI=7
-HOMEPAGE=https://www.perl.org/
-IUSE=berkdb debug doc gdbm ithreads minimal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-SLOT=0/5.32
-SRC_URI=mirror://cpan/src/5.0/perl-5.32.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.32.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.32.0-patches-1/perl-5.32.0-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.32.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.4/perl-cross-1.3.4.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a33927f6566ee23703bafe0d2ff60536
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0_beta4 b/metadata/md5-cache/dev-lang/python-3.10.0_beta4
deleted file mode 100644
index ad0319fad87e..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.10.0_beta4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.10
-SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0b4.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0b4.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.0/Python-3.10.0b4.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e7673cbde5c73a0e11d0e5224f7a5161
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0_rc1_p1 b/metadata/md5-cache/dev-lang/python-3.10.0_rc1_p1
new file mode 100644
index 000000000000..e9fa9cca048a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.10.0_rc1_p1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/
+IUSE=bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.10
+SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0rc1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0rc1_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.0/Python-3.10.0rc1.tar.xz.asc )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=81efd09211b0b3cdc9a36dde4a0d3d90
diff --git a/metadata/md5-cache/dev-lang/python-3.6.13_p5 b/metadata/md5-cache/dev-lang/python-3.6.13_p5
deleted file mode 100644
index 5d925c8427b8..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.6.13_p5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( dev-libs/openssl:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 +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? ( dev-libs/openssl:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.6/3.6m
-SRC_URI=https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.13_p5.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=176f9bb0adb5933bc349c2b033824835
diff --git a/metadata/md5-cache/dev-lang/python-3.6.14 b/metadata/md5-cache/dev-lang/python-3.6.14
index 251cf3c7ae26..0b63bed0904a 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.14
+++ b/metadata/md5-cache/dev-lang/python-3.6.14
@@ -5,11 +5,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 +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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 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? ( dev-libs/openssl:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.14/Python-3.6.14.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.14.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.6.14/Python-3.6.14.tar.xz.asc )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=05f88deea0b13f18af9a080b059f21a5
+_md5_=9c11a94d48143dd7f41d6a9f58cc436e
diff --git a/metadata/md5-cache/dev-lang/python-3.7.10_p6 b/metadata/md5-cache/dev-lang/python-3.7.10_p6
deleted file mode 100644
index 0e82e11e3de8..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.7.10_p6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 +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? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.7/3.7m
-SRC_URI=https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.10_p6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b09a99439df1014111d191dc96c576c8
diff --git a/metadata/md5-cache/dev-lang/python-3.7.11 b/metadata/md5-cache/dev-lang/python-3.7.11
index cca3f78fe079..ae32fba61463 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.11
+++ b/metadata/md5-cache/dev-lang/python-3.7.11
@@ -5,11 +5,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 +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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.11/Python-3.7.11.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.11.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.11/Python-3.7.11.tar.xz.asc )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a9336ffe68e45b63c6b9f52dbc7522c2
+_md5_=370cba4b6fbbb24e921869e83de89ffc
diff --git a/metadata/md5-cache/dev-lang/python-3.8.10_p2 b/metadata/md5-cache/dev-lang/python-3.8.10_p2
deleted file mode 100644
index f820c9ce2071..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.8.10_p2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 +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? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.8
-SRC_URI=https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.10_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d627944e173c44e2ab19a4e5b63928c6
diff --git a/metadata/md5-cache/dev-lang/python-3.8.11 b/metadata/md5-cache/dev-lang/python-3.8.11
index 417bac11a13f..bfb6baa60398 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.11
+++ b/metadata/md5-cache/dev-lang/python-3.8.11
@@ -5,11 +5,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 +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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.11.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tar.xz.asc )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=313a724d69b24467012f54b5ff05269e
+_md5_=c7a697a6ad0e4723c7984e6328471018
diff --git a/metadata/md5-cache/dev-lang/python-3.9.5_p2 b/metadata/md5-cache/dev-lang/python-3.9.5_p2
deleted file mode 100644
index 90b3ac12ad09..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.9.5_p2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 +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? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.5_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2fea652f287fce4f3805c2903c5be5d5
diff --git a/metadata/md5-cache/dev-lang/python-3.9.6 b/metadata/md5-cache/dev-lang/python-3.9.6
deleted file mode 100644
index b43eeadbd922..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.9.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6c05c8fad50fed98148d0fd343877326
diff --git a/metadata/md5-cache/dev-lang/python-3.9.6_p1 b/metadata/md5-cache/dev-lang/python-3.9.6_p1
new file mode 100644
index 000000000000..a36a678c7e02
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.9.6_p1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/
+IUSE=bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.9
+SRC_URI=https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.6_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz.asc )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=727d0c5c753d87761c3b8603a26f74d7
diff --git a/metadata/md5-cache/dev-lang/python-exec-2.4.8 b/metadata/md5-cache/dev-lang/python-exec-2.4.8
index 4942d4e52c1c..ef602fab944a 100644
--- a/metadata/md5-cache/dev-lang/python-exec-2.4.8
+++ b/metadata/md5-cache/dev-lang/python-exec-2.4.8
@@ -4,11 +4,11 @@ DESCRIPTION=Python script wrapper
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/python-exec/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +native-symlinks test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=dev-lang/python-exec-conf !<=dev-lang/python-2.7.18-r3:2.7
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/mgorny/python-exec/releases/download/v2.4.8/python-exec-2.4.8.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b0d7241b1b9e0db57ced71d81b6bdb63
+_md5_=d05d580ce5700844aa9515a5be7cc1b9
diff --git a/metadata/md5-cache/dev-lang/rust-1.52.1 b/metadata/md5-cache/dev-lang/rust-1.52.1
index 7029dd0b6bc6..6304cdfa1a9a 100644
--- a/metadata/md5-cache/dev-lang/rust-1.52.1
+++ b/metadata/md5-cache/dev-lang/rust-1.52.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.52
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.52.1-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.52.1-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.51.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.51.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.51.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.51.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.51.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.51.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.51.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.51.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.51.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.51.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.51.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=207cb5e5ec7adfb853b13b86fdde5477
diff --git a/metadata/md5-cache/dev-lang/rust-1.53.0 b/metadata/md5-cache/dev-lang/rust-1.53.0
index 95b7ff8c1ad1..04cf9a606d88 100644
--- a/metadata/md5-cache/dev-lang/rust-1.53.0
+++ b/metadata/md5-cache/dev-lang/rust-1.53.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.53
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.52.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.52.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.52.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.52.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.52.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=445f960f04471c9573ac12c59670e77c
diff --git a/metadata/md5-cache/dev-lang/rust-1.54.0 b/metadata/md5-cache/dev-lang/rust-1.54.0
new file mode 100644
index 000000000000..7c61fe9c4bf9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.54.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) app-eselect/eselect-rust || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( =dev-lang/rust-1.53* =dev-lang/rust-bin-1.53* =dev-lang/rust-1.54* =dev-lang/rust-bin-1.54* ) ) !system-llvm? ( >=dev-util/cmake-3.13.4 dev-util/ninja ) test? ( sys-devel/gdb ) verify-sig? ( app-crypt/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:12[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:12[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:12[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:12[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:12[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:12[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:12[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:12[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:12[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:12[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:12[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:12[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:12[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:12[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:12[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:12[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:12[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-13:= wasm? ( sys-devel/lld ) ) !!sys-devel/llvm:0
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=7
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rls rustfmt system-bootstrap system-llvm test wasm 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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:12[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:12[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:12[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:12[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:12[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:12[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:12[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:12[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:12[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:12[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:12[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:12[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:12[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:12[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:12[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:12[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:12[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-13:= wasm? ( sys-devel/lld ) ) app-eselect/eselect-rust !<dev-lang/rust-1.47.0-r1 !<dev-lang/rust-bin-1.47.0-r1
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) test? ( 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 ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
+RESTRICT=test
+SLOT=stable/1.54
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.53.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.53.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.53.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.53.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.53.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=05f70494f878a0b40ce053f775369a8e
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.54.0 b/metadata/md5-cache/dev-lang/rust-bin-1.54.0
new file mode 100644
index 000000000000..7e9321b5044b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.54.0
@@ -0,0 +1,14 @@
+BDEPEND=prefix? ( dev-util/patchelf ) verify-sig? ( app-crypt/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm pretend test unpack
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=7
+HOMEPAGE=https://www.rust-lang.org/
+IUSE=clippy cpu_flags_x86_sse2 doc prefix rls rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-eselect/eselect-rust-20190311
+REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
+SLOT=stable
+SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.54.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.54.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.54.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=fcaad7976ab71daa82a1d9964cf629a8
diff --git a/metadata/md5-cache/dev-lang/scala-2.12.10 b/metadata/md5-cache/dev-lang/scala-2.12.10
index 78c20f244016..8801335d0a32 100644
--- a/metadata/md5-cache/dev-lang/scala-2.12.10
+++ b/metadata/md5-cache/dev-lang/scala-2.12.10
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/jline:2 >=virtual/jre-1.8:* app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.12/2.12.10
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.12.10.tar.gz -> scala-2.12.10.tar.gz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.10-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.10-sbt-deps.tar.xz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.12.10-gentoo-binary.tar.xz )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb
 _md5_=2b772209e62a80e67c79d349df29cdce
diff --git a/metadata/md5-cache/dev-lang/scala-2.12.4 b/metadata/md5-cache/dev-lang/scala-2.12.4
index 294e93f1b3be..7c7dae41dda7 100644
--- a/metadata/md5-cache/dev-lang/scala-2.12.4
+++ b/metadata/md5-cache/dev-lang/scala-2.12.4
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/jline:2 >=virtual/jre-1.8 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.12/2.12.4
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.12.4.tar.gz -> scala-2.12.4.tar.gz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.4-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.4-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.12.4-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.12.4-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.12.4-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.12.4-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.12.4-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.12.4-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.12.4-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.12.4-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.12.4-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.12.4-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.12.4-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.12.4-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.12.4-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.12.4-instrumented.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.12.4-gentoo-binary.tar.xz )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=012fc42ee9c48aea31dc3c8f2b4cf7e6
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r5 b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r5
index a56d29dc186f..756d668027ad 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r5
+++ b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.13.1 dev-libs/libffi:= sys-libs/readline:0= >=sys-libs
 RESTRICT=test
 SLOT=60
 SRC_URI=https://dev.gentoo.org/~axs/distfiles/mozjs-60.5.2.tar.bz2 https://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-60.0-patches-04.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mozcoreconf-v5	40bd169844938931a92480a45f07caec	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mozcoreconf-v5	40bd169844938931a92480a45f07caec	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aa52fed085fdd0329d0625bb450113be
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-68.12.0 b/metadata/md5-cache/dev-lang/spidermonkey-68.12.0
index 861c8b8f5e88..3c0e4f110140 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-68.12.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-68.12.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/icu-63.1:= >=dev-libs/nspr-4.21 sys-libs/readline:0= >=sys-li
 RESTRICT=!test? ( test )
 SLOT=68
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/68.12.0esr/source/firefox-68.12.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-15.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-15.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-68.6.0-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-68.6.0-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-68.6.0-patches-04.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4db9772300253d006506766ad24e1561
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.10.1 b/metadata/md5-cache/dev-lang/spidermonkey-78.10.1
index 708271f52547..4310e10dcca8 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.10.1
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.10.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-li
 RESTRICT=!test? ( test )
 SLOT=78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.10.1esr/source/firefox-78.10.1esr.source.tar.xz -> firefox-78.10.1esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-13.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-13.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-13.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ab68193d0c9335fb2418e15273e4937c
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.11.0 b/metadata/md5-cache/dev-lang/spidermonkey-78.11.0
index 7954d49fa704..f4506a5a0171 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.11.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.11.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-li
 RESTRICT=!test? ( test )
 SLOT=78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/source/firefox-78.11.0esr.source.tar.xz -> firefox-78.11.0esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6724f482f208f38d8f0d0ed95597b565
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.12.0 b/metadata/md5-cache/dev-lang/spidermonkey-78.12.0
index 293de3714212..dae1b8f24d09 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.12.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.12.0
@@ -5,11 +5,11 @@ DESCRIPTION=SpiderMonkey is Mozilla's JavaScript engine written in C and C++
 EAPI=7
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
 IUSE=clang cpu_flags_arm_neon debug +jit lto test
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 ~arm arm64 ~mips ~ppc64 ~riscv ~s390 x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-libs/zlib-1.2.3
 RESTRICT=!test? ( test )
 SLOT=78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/source/firefox-78.12.0esr.source.tar.xz -> firefox-78.12.0esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8d8edc8b400deb1f3d8cb6a437321f20
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5bac4bfe37e5570f4af982f0c713364b
diff --git a/metadata/md5-cache/dev-lang/xsb-4.0.0 b/metadata/md5-cache/dev-lang/xsb-4.0.0
index 545efae289d3..71ec7949a224 100644
--- a/metadata/md5-cache/dev-lang/xsb-4.0.0
+++ b/metadata/md5-cache/dev-lang/xsb-4.0.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.8:* ) mariadb? ( dev-db/mariadb-connector-c:= ) 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=mirror://sourceforge/xsb/XSB-4-0-0.tar.gz https://dev.gentoo.org/~keri/distfiles/xsb/xsb-4.0.0-gentoo-patchset-2.tar.gz
+SRC_URI=mirror://sourceforge/xsb/XSB-4-0-0.tar.gz https://dev.gentoo.org/~keri/distfiles/xsb/xsb-4.0.0-gentoo-patchset-3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=64809431ca300f67b9e872dd99e78c2b
+_md5_=d6bcb668b3e2166657de4432cecdcef8
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b7edb2e56f74..c38a1995a236 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/appstream-0.14.4 b/metadata/md5-cache/dev-libs/appstream-0.14.4
index a5a4cd61e64c..127d58c26779 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.14.4
+++ b/metadata/md5-cache/dev-libs/appstream-0.14.4
@@ -5,11 +5,11 @@ DESCRIPTION=Cross-distro effort for providing metadata for software in the Linux
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Distributions/AppStream/
 IUSE=apt doc +introspection qt5 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=dev-db/lmdb:= >=dev-libs/glib-2.58:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer net-misc/curl introspection? ( >=dev-libs/gobject-introspection-1.56:= ) qt5? ( dev-qt/qtcore:5 )
 RESTRICT=test
 SLOT=0/4
 SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.14.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a132c205396034f61ea0c831176236e9
+_md5_=6ddc6fa94a1924b58f0494510afacc95
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 81f3114943e9..9a801c0c3cf9 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=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_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9e18d6dcce9c82d5990823bef1b63c2a
+_md5_=ddad99327f8ca8e7b3687d30d3cdd5b7
diff --git a/metadata/md5-cache/dev-libs/ell-0.41 b/metadata/md5-cache/dev-libs/ell-0.41
index 1cfe5b70a3a2..6d2097b51772 100644
--- a/metadata/md5-cache/dev-libs/ell-0.41
+++ b/metadata/md5-cache/dev-libs/ell-0.41
@@ -4,11 +4,11 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=glib pie test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.41.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d50d598ebfeb80447cebaffa24e8843b
+_md5_=1d108d002a058a70791939595c59c966
diff --git a/metadata/md5-cache/dev-libs/ell-0.42 b/metadata/md5-cache/dev-libs/ell-0.42
new file mode 100644
index 000000000000..7f4018a9ce2b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ell-0.42
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=test? ( sys-apps/dbus )
+DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
+EAPI=7
+HOMEPAGE=https://01.org/ell
+IUSE=pie test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.42.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=54dd8f8ea3bcac5976d6a7f9c61da17a
diff --git a/metadata/md5-cache/dev-libs/ell-9999 b/metadata/md5-cache/dev-libs/ell-9999
index 56ad12e2137c..1cf40b649df1 100644
--- a/metadata/md5-cache/dev-libs/ell-9999
+++ b/metadata/md5-cache/dev-libs/ell-9999
@@ -1,14 +1,13 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( sys-apps/dbus )
+DEPEND=test? ( sys-apps/dbus )
 DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
 EAPI=7
 HOMEPAGE=https://01.org/ell
-IUSE=glib pie test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=pie test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c3d84c3d3663f0511afdde830b10595f
+_md5_=54dd8f8ea3bcac5976d6a7f9c61da17a
diff --git a/metadata/md5-cache/dev-libs/fstrm-0.6.1 b/metadata/md5-cache/dev-libs/fstrm-0.6.1
index 8ddcbd962b99..3c4f57d312f0 100644
--- a/metadata/md5-cache/dev-libs/fstrm-0.6.1
+++ b/metadata/md5-cache/dev-libs/fstrm-0.6.1
@@ -5,10 +5,10 @@ DESCRIPTION=Frame Streams implementation in C
 EAPI=7
 HOMEPAGE=https://github.com/farsightsec/fstrm
 IUSE=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 ~mips ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=utils? ( dev-libs/libevent:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/farsightsec/fstrm/archive/v0.6.1.tar.gz -> fstrm-0.6.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bf48c7c7785000a2e48f725698c329c6
+_md5_=c04242e26cc65cbfbc446e3ce1ea497d
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.5 b/metadata/md5-cache/dev-libs/girara-0.3.5
index 7de4cf046888..33f3352a28ba 100644
--- a/metadata/md5-cache/dev-libs/girara-0.3.5
+++ b/metadata/md5-cache/dev-libs/girara-0.3.5
@@ -5,11 +5,11 @@ DESCRIPTION=UI library that focuses on simplicity and minimalism
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/girara/
 IUSE=doc libnotify test test
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~riscv x86
 LICENSE=ZLIB
 RDEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11-libs/libnotify )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.5.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=a6213c8b59ce35b077d6c851a9008389
+_md5_=c097e68a6786a1bccf5fca3ce4163661
diff --git a/metadata/md5-cache/dev-libs/girara-9999 b/metadata/md5-cache/dev-libs/girara-9999
index ec22c2b1ac05..381e5eaf0c55 100644
--- a/metadata/md5-cache/dev-libs/girara-9999
+++ b/metadata/md5-cache/dev-libs/girara-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 >=x11-libs/pang
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=64703cde2131b8471562d8b74cc9809a
+_md5_=f50a6c0cbcadd7d7fd332dc525970a96
diff --git a/metadata/md5-cache/dev-libs/glib-2.68.3-r1 b/metadata/md5-cache/dev-libs/glib-2.68.3-r1
index f525af9df3c9..28b37ae6d6e3 100644
--- a/metadata/md5-cache/dev-libs/glib-2.68.3-r1
+++ b/metadata/md5-cache/dev-libs/glib-2.68.3-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.68/glib-2.68.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=212a3f33c032c9fc337cdb4368e9e2e5
+_md5_=33bfa252e937a6877187c6906ab64672
diff --git a/metadata/md5-cache/dev-libs/libcbor-0.8.0 b/metadata/md5-cache/dev-libs/libcbor-0.8.0
index d6d430cbfeb2..50a0f5234a85 100644
--- a/metadata/md5-cache/dev-libs/libcbor-0.8.0
+++ b/metadata/md5-cache/dev-libs/libcbor-0.8.0
@@ -1,13 +1,13 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/breathe[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/breathe[python_targets_python3_8(-)] ) ) ) test? ( dev-util/cmocka ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/breathe[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/breathe[python_targets_python3_8(-)] ) ) ) test? ( dev-util/cmocka ) sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CBOR protocol implementation for C and others
 EAPI=7
 HOMEPAGE=https://github.com/pjk/libcbor
 IUSE=+custom-alloc doc test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.8
 SRC_URI=https://github.com/PJK/libcbor/archive/v0.8.0.tar.gz -> libcbor-0.8.0.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=54dccc837ed16943961e3af0b1b8d060
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3ae1c6c53a9a74517f7f572d935218d5
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.8.0 b/metadata/md5-cache/dev-libs/libfido2-1.8.0
index 412013731fda..875f857e088b 100644
--- a/metadata/md5-cache/dev-libs/libfido2-1.8.0
+++ b/metadata/md5-cache/dev-libs/libfido2-1.8.0
@@ -5,10 +5,10 @@ DESCRIPTION=Provides library functionality for FIDO 2.0
 EAPI=7
 HOMEPAGE=https://github.com/Yubico/libfido2
 IUSE=nfc +static-libs kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libcbor:= dev-libs/openssl:0= sys-libs/zlib:0= virtual/libudev:= acct-group/plugdev
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/libfido2/archive/1.8.0.tar.gz -> libfido2-1.8.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=61946df38d90acbcac9c27c6a78b0e81
+_md5_=b7826b54d1760abbcf2bc8809c8e3eb2
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.18.1 b/metadata/md5-cache/dev-libs/libgdata-0.18.1
index 9c1cfae50c43..f65cafd7387e 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.18.1
+++ b/metadata/md5-cache/dev-libs/libgdata-0.18.1
@@ -5,7 +5,7 @@ DESCRIPTION=GLib-based library for accessing online service APIs using the GData
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgdata
 IUSE=+crypt gnome-online-accounts gtk-doc +introspection test vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/libsoup-2.55.90:2.4[introspection?,vala?] crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=mirror://gnome/sources/libgdata/0.18/libgdata-0.18.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d2d1c76b00743fcd2853d241f239835e
+_md5_=109f4c7f4d99f418999232b21992943d
diff --git a/metadata/md5-cache/dev-libs/libgnt-2.14.0 b/metadata/md5-cache/dev-libs/libgnt-2.14.0
deleted file mode 100644
index c0aa6d7715ef..000000000000
--- a/metadata/md5-cache/dev-libs/libgnt-2.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=!<net-im/pidgin-2.14.0 dev-libs/glib:2 dev-libs/libxml2 sys-libs/ncurses:0=
-DESCRIPTION=Pidgin's GLib Ncurses Toolkit
-EAPI=7
-HOMEPAGE=https://keep.imfreedom.org/libgnt/libgnt
-IUSE=doc
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!<net-im/pidgin-2.14.0 dev-libs/glib:2 dev-libs/libxml2 sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/pidgin/libgnt-2.14.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=269776432f3ac2dd20cd3595dd2ef895
diff --git a/metadata/md5-cache/dev-libs/libgnt-2.14.1 b/metadata/md5-cache/dev-libs/libgnt-2.14.1
index 7a4660dc041d..a790d0e9bf96 100644
--- a/metadata/md5-cache/dev-libs/libgnt-2.14.1
+++ b/metadata/md5-cache/dev-libs/libgnt-2.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=Pidgin's GLib Ncurses Toolkit
 EAPI=7
 HOMEPAGE=https://keep.imfreedom.org/libgnt/libgnt
 IUSE=doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!<net-im/pidgin-2.14.0 dev-libs/glib:2 dev-libs/libxml2 sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin/libgnt-2.14.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cd92bd8759144d5524d5e9c13d2ef498
+_md5_=269776432f3ac2dd20cd3595dd2ef895
diff --git a/metadata/md5-cache/dev-libs/libgudev-236-r1 b/metadata/md5-cache/dev-libs/libgudev-236-r1
index 12a50a1aa0cc..1c5c8daa4d24 100644
--- a/metadata/md5-cache/dev-libs/libgudev-236-r1
+++ b/metadata/md5-cache/dev-libs/libgudev-236-r1
@@ -5,11 +5,11 @@ DESCRIPTION=GObject bindings for libudev
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
 IUSE=introspection 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 ~arm64 ~mips ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~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 )
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://download.gnome.org/sources/libgudev/236/libgudev-236.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2f53f685f832a8f64cd635e3daffce8e
+_md5_=52a364d3e5183f99621a28d23395c310
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.3.7 b/metadata/md5-cache/dev-libs/libgusb-0.3.7
index 112f082a382b..a8644e0f3260 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.3.7
+++ b/metadata/md5-cache/dev-libs/libgusb-0.3.7
@@ -5,7 +5,7 @@ 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.7.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=15491f91d212ba16d69f589bce7d95a7
+_md5_=f04774048b7f36662b3597c45e6e0604
diff --git a/metadata/md5-cache/dev-libs/libinput-1.18.1 b/metadata/md5-cache/dev-libs/libinput-1.18.1
new file mode 100644
index 000000000000..cf1c86d706c8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.18.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.9 dev-python/commonmark[python_targets_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/commonmark[python_targets_python3_8(-)] dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_8(-)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev test? ( >=dev-libs/check-0.9.10 )
+DESCRIPTION=Library to handle input devices in Wayland
+EAPI=8
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
+IUSE=doc input_devices_wacom test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
+RESTRICT=!test? ( test )
+SLOT=0/10
+SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.18.1.tar.xz
+_eclasses_=meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=488079d91e5a996ade13b89d3d6f0adb
diff --git a/metadata/md5-cache/dev-libs/libmanette-0.2.6 b/metadata/md5-cache/dev-libs/libmanette-0.2.6
index f53b099570f8..91463062abc4 100644
--- a/metadata/md5-cache/dev-libs/libmanette-0.2.6
+++ b/metadata/md5-cache/dev-libs/libmanette-0.2.6
@@ -5,7 +5,7 @@ DESCRIPTION=Simple GObject game controller library
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/aplazas/libmanette
 IUSE=gtk-doc +introspection +udev +vala test
-KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.50:2 udev? ( dev-libs/libgudev[introspection?] ) dev-libs/libevdev introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libmanette/0.2/libmanette-0.2.6.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=58c03ae5263b136e2ad685fe7886ce23
+_md5_=7775f5774e558c9ea7acb04bb162cd1b
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r4 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r4
new file mode 100644
index 000000000000..3ff2d6519bd4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r4
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
+DESCRIPTION=a C client library to the memcached server
+EAPI=8
+HOMEPAGE=https://libmemcached.org/libMemcached.html
+IUSE=debug hsieh +libevent sasl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bdd8c2ef619c1071938f4947ce6c0cf5
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.45 b/metadata/md5-cache/dev-libs/libpcre-8.45
index 41cfa39d0e56..71c6a2c69284 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.45
+++ b/metadata/md5-cache/dev-libs/libpcre-8.45
@@ -5,11 +5,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=7
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode 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 split-usr
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.45.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre-8.45.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.45.tar.bz2
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=5b4eb88b8937b5ad534e03ad17cdbb51
+_md5_=d2b551962b495844b7cb0a0da3357874
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.7.1 b/metadata/md5-cache/dev-libs/libqtxdg-3.7.1
index 915ebc39cbe5..7ce9c8fc29c2 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.7.1
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.7.1
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxqt/libqtxdg/releases/download/3.7.1/libqtxdg-3.7.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=15bdbf40411b4fc363060c476a029905
diff --git a/metadata/md5-cache/dev-libs/librevenge-9999 b/metadata/md5-cache/dev-libs/librevenge-9999
index ca5c13e7e648..69fd0087f1da 100644
--- a/metadata/md5-cache/dev-libs/librevenge-9999
+++ b/metadata/md5-cache/dev-libs/librevenge-9999
@@ -1,8 +1,8 @@
-BDEPEND=doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost test? ( dev-util/cppunit[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=Helper library for REVerse ENGineered formats filters
-EAPI=7
+EAPI=8
 HOMEPAGE=https://sf.net/p/libwpd/librevenge
 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
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8233c860c760d05c041c29dd01bb1b28
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=680d42af56053e4b6e8599fa98a6e715
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r4 b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r4
deleted file mode 100644
index 4a3d905025b0..000000000000
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-danielveillard ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:= )
-DESCRIPTION=XML C parser and toolkit
-EAPI=7
-HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
-IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:= )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.12-r4-patchset.tar.bz2 test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz ) verify-sig? ( ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz.asc )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=059ebc48daf2d9242d857d81c5c4f975
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r5 b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r5
new file mode 100644
index 000000000000..65cdf4b1971e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-danielveillard ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:= )
+DESCRIPTION=XML C parser and toolkit
+EAPI=7
+HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
+IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~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=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.12-r5-patchset.tar.bz2 test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz ) verify-sig? ( ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz.asc )
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ad5bf29d313c0c0e28abbfb018615232
diff --git a/metadata/md5-cache/dev-libs/libzip-1.8.0 b/metadata/md5-cache/dev-libs/libzip-1.8.0
index f1e6bb6096b4..841e8b96d275 100644
--- a/metadata/md5-cache/dev-libs/libzip-1.8.0
+++ b/metadata/md5-cache/dev-libs/libzip-1.8.0
@@ -5,7 +5,7 @@ DESCRIPTION=Library for manipulating zip archives
 EAPI=7
 HOMEPAGE=https://nih.at/libzip/
 IUSE=bzip2 gnutls lzma mbedtls ssl static-libs test tools
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/xz-utils ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( dev-libs/openssl:0= ) ) )
 REQUIRED_USE=test? ( tools )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://www.nih.at/libzip/libzip-1.8.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=561ab9699eff58c8b932bd69edbf5cb4
+_md5_=5bb8ac47103e1293b05b4e6e7052667b
diff --git a/metadata/md5-cache/dev-libs/msgpack-3.3.0 b/metadata/md5-cache/dev-libs/msgpack-3.3.0
index f3cde8e57c6b..a2e1fd6bd0a8 100644
--- a/metadata/md5-cache/dev-libs/msgpack-3.3.0
+++ b/metadata/md5-cache/dev-libs/msgpack-3.3.0
@@ -5,11 +5,11 @@ DESCRIPTION=MessagePack is a binary-based efficient data interchange format
 EAPI=7
 HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-c/
 IUSE=boost +cxx doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Boost-1.0
 RDEPEND=boost? ( dev-libs/boost[context,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/2
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-3.3.0/msgpack-3.3.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f807d460490cd1990d7f3a4a9f264bb0
+_md5_=73a5c33436f466b2a971391fc922a3cf
diff --git a/metadata/md5-cache/dev-libs/ptexenc-1.3.9_p20210325 b/metadata/md5-cache/dev-libs/ptexenc-1.3.9_p20210325
index d842161ac3d3..0bbc1cc567f2 100644
--- a/metadata/md5-cache/dev-libs/ptexenc-1.3.9_p20210325
+++ b/metadata/md5-cache/dev-libs/ptexenc-1.3.9_p20210325
@@ -1,14 +1,14 @@
 BDEPEND=>=app-portage/elt-patches-20170815
 DEFINED_PHASES=configure install prepare
-DEPEND=iconv? ( virtual/libiconv ) dev-libs/kpathsea
+DEPEND=dev-libs/kpathsea iconv? ( virtual/libiconv )
 DESCRIPTION=Library for Japanese pTeX providing a better way of handling character encodings
 EAPI=7
 HOMEPAGE=http://tutimura.ath.cx/ptexlive/?ptexenc
-IUSE=iconv static-libs
+IUSE=iconv
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=BSD
-RDEPEND=iconv? ( virtual/libiconv ) dev-libs/kpathsea
+RDEPEND=dev-libs/kpathsea iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20210325-source.tar.xz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=274e80802b5a53cc73b00d6a216a7c6b
+_md5_=32d99fede55fd0e4c04dcced69a57390
diff --git a/metadata/md5-cache/dev-libs/sdformat-9.5.0 b/metadata/md5-cache/dev-libs/sdformat-9.5.0
new file mode 100644
index 000000000000..269f000052cf
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/sdformat-9.5.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/ruby:* virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:6=
+DESCRIPTION=Simulation Description Format (SDF) parser
+EAPI=7
+HOMEPAGE=http://sdformat.org/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:6=
+SLOT=0/9
+SRC_URI=http://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-9.5.0.tar.bz2
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2068d81b3643bc0629bcd88b9b322da4
diff --git a/metadata/md5-cache/dev-libs/simdjson-0.9.7 b/metadata/md5-cache/dev-libs/simdjson-0.9.7
new file mode 100644
index 000000000000..c53ef89b7a55
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/simdjson-0.9.7
@@ -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 BSD MIT
+REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
+SLOT=0/8
+SRC_URI=https://github.com/simdjson/simdjson/archive/v0.9.7.tar.gz -> simdjson-0.9.7.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=67eb8aadad0ea88d66cb0ec278ef4f6a
diff --git a/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.6 b/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.6
index afff16b9975d..e376330329e9 100644
--- a/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.6
+++ b/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.6
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.6.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f7c38378a6f366158abefd4deed60e10
+_md5_=e51f4d4a3ea212c5660b0e9ecee8cbea
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.9.5 b/metadata/md5-cache/dev-libs/uriparser-0.9.5
index 933ff7bac54b..98e4c2118f68 100644
--- a/metadata/md5-cache/dev-libs/uriparser-0.9.5
+++ b/metadata/md5-cache/dev-libs/uriparser-0.9.5
@@ -5,11 +5,11 @@ DESCRIPTION=Strictly RFC 3986 compliant URI parsing library in C
 EAPI=7
 HOMEPAGE=https://uriparser.github.io/
 IUSE=+doc qt5 test unicode
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD
 REQUIRED_USE=qt5? ( doc ) test? ( unicode )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.5/uriparser-0.9.5.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e092ed3ca7d3e6f8f82cf29fad0c3944
+_md5_=812bd065cdeca42546aa51b69f5f52e8
diff --git a/metadata/md5-cache/dev-libs/volume_key-0.3.12-r3 b/metadata/md5-cache/dev-libs/volume_key-0.3.12-r3
index 21fbcdb998e5..cd854bc2185a 100644
--- a/metadata/md5-cache/dev-libs/volume_key-0.3.12-r3
+++ b/metadata/md5-cache/dev-libs/volume_key-0.3.12-r3
@@ -5,7 +5,7 @@ DESCRIPTION=Library for manipulating and storing storage volume encryption keys
 EAPI=7
 HOMEPAGE=https://pagure.io/volume_key
 IUSE=test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-crypt/gpgme dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-apps/util-linux sys-fs/cryptsetup:=
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/volume_key/volume_key-0.3.12.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1be85fb89cc232a85354ff2be501d0bf
+_md5_=317f0d4fcb427c2796b54357af11f35b
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 430c42729e60..1541ad305680 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/llvm-ocaml-13.0.0_rc1 b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc1
new file mode 100644
index 000000000000..3bad71e39d5a
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) 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-13.0.0_rc1:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_VE] ) !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-13.0.0_rc1:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc1[llvm_targets_VE] )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE )
+RESTRICT=!test? ( test )
+SLOT=0/13.0.0_rc1
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=70455fb3b56abab41b0b30eba95f80ab
diff --git a/metadata/md5-cache/dev-ml/parmap-1.2.3 b/metadata/md5-cache/dev-ml/parmap-1.2.3
index 50a78f6ddeab..3015bef2bf3d 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.2.3
+++ b/metadata/md5-cache/dev-ml/parmap-1.2.3
@@ -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?] dev-ml/dune:=
 SLOT=0/1.2.3
 SRC_URI=https://github.com/rdicosmo/parmap/archive/1.2.3.tar.gz -> parmap-1.2.3.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=c69b9259249ac1f6f24dd38f8b66e6c1
+_md5_=84ed9018d91e515c4a0f1b624d330e0a
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2
index 6c81c653f0a4..f06a0d3a02a7 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2
@@ -5,10 +5,10 @@ DESCRIPTION=Support Library for type-driven code generators
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= <=dev-ml/ppxlib-0.20.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.2
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.2.tar.gz -> ppx_sexp_conv-0.14.2.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=cf40d2d952a0a8d35061c139d3836cf1
+_md5_=6d73ae7dc9474e3366dd9cb6441fcde3
diff --git a/metadata/md5-cache/dev-perl/Alien-Libxml2-0.170.0 b/metadata/md5-cache/dev-perl/Alien-Libxml2-0.170.0
index 4b43eb314433..96d2511c9514 100644
--- a/metadata/md5-cache/dev-perl/Alien-Libxml2-0.170.0
+++ b/metadata/md5-cache/dev-perl/Alien-Libxml2-0.170.0
@@ -5,11 +5,11 @@ DESCRIPTION=Install the C libxml2 library on your system
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Alien-Libxml2
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Alien-Build-2.120.0 dev-libs/libxml2:2= dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.17.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=99be89cd5f61cc70011539b87a04f8a3
+_md5_=563464f6f13850ff0ce15ab64b105d52
diff --git a/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.690.0-r2 b/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.690.0-r2
index ddb089b9c2b3..f061cfa7bce1 100644
--- a/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.690.0-r2
+++ b/metadata/md5-cache/dev-perl/Alien-wxWidgets-0.690.0-r2
@@ -11,5 +11,5 @@ RDEPEND=>=x11-libs/wxGTK-3:3.0[gstreamer=,opengl=,tiff,X] >=dev-perl/Module-Plug
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=b27bfb82a88d2fee65da4d97924e84d9
diff --git a/metadata/md5-cache/dev-perl/AnyEvent-7.170.0 b/metadata/md5-cache/dev-perl/AnyEvent-7.170.0
index a43914620c03..c3d1868a9a59 100644
--- a/metadata/md5-cache/dev-perl/AnyEvent-7.170.0
+++ b/metadata/md5-cache/dev-perl/AnyEvent-7.170.0
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.17.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=d08b20ffeefb0d43ae179260061cd5db
diff --git a/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.80.0 b/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.80.0
index d178329dea56..15d4db3182be 100644
--- a/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.80.0
+++ b/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.80.0
@@ -5,11 +5,11 @@ DESCRIPTION=Interface to FITS headers
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Astro-FITS-Header
 IUSE=test
-KEYWORDS=~amd64 ~arm ~hppa ~mips ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GS/GSB/Astro-FITS-Header-3.08.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=37393fb1f2802894c94c42658a88a052
+_md5_=91b848e63491416937c74b06dd713490
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0-r1 b/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0-r1
index 345c2c7080d0..f9cfc9feffe9 100644
--- a/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0-r1
+++ b/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Wrap OP check callbacks
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/B-Hooks-OP-Check
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-OP-Check-0.22.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=d1c72cb4878a7623b9cb7b6ab33bca17
+_md5_=ae852a32719ee94835d46661407e207d
diff --git a/metadata/md5-cache/dev-perl/B-Keywords-1.220.0 b/metadata/md5-cache/dev-perl/B-Keywords-1.220.0
index 279360f884b9..2c048d2b5d81 100644
--- a/metadata/md5-cache/dev-perl/B-Keywords-1.220.0
+++ b/metadata/md5-cache/dev-perl/B-Keywords-1.220.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Lists of reserved barewords and symbol names
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/B-Keywords
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.22.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=6941854c01077c17902f58a452d9d2f1
+_md5_=d07cc485f50b452210423f7f88f3b5d3
diff --git a/metadata/md5-cache/dev-perl/Cache-Memcached-1.300.0-r2 b/metadata/md5-cache/dev-perl/Cache-Memcached-1.300.0-r2
index 525cfdfb5f78..57f5cac1cd5d 100644
--- a/metadata/md5-cache/dev-perl/Cache-Memcached-1.300.0-r2
+++ b/metadata/md5-cache/dev-perl/Cache-Memcached-1.300.0-r2
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Perl API for memcached
 EAPI=7
 HOMEPAGE=http://www.danga.com/memcached/ https://metacpan.org/release/Cache-Memcached
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1 )
 RDEPEND=virtual/perl-Encode virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/Cache-Memcached-1.30.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=a6d4459d8ab669db452d8df4544f19c9
+_md5_=b4a4b304a8479aac15ec3991e3f20624
diff --git a/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.1 b/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.1
index be7a5adc0f94..434d1fa09964 100644
--- a/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.1
+++ b/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension to create simple calendars
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Calendar-Simple
 IUSE=minimal test
-KEYWORDS=amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Time-Local !minimal? ( dev-perl/DateTime ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Calendar-Simple-v2.0.1.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=bd0a780c52d7bfc84f4860b531d34b93
+_md5_=e47d15c7b7bd441510de65deb3f760f8
diff --git a/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.130.0 b/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.130.0
index a8cd6bc307a4..3936fcc37fa6 100644
--- a/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.130.0
+++ b/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.130.0
@@ -5,11 +5,11 @@ DESCRIPTION=provides Moose-like method modifiers
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Class-Method-Modifiers
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.13.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=fac122f1701c41db39e4c071a04cfb38
+_md5_=20852ac6cff7ecc4b8f8be67a60c14f1
diff --git a/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0-r2 b/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0-r2
index f15410350e73..170121e49e90 100644
--- a/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0-r2
+++ b/metadata/md5-cache/dev-perl/Class-MethodMaker-2.240.0-r2
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Create generic methods for OO Perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Class-MethodMaker
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.24.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=439275ba64c79208f14a6a1cc273ac4f
+_md5_=77654a58f350e641ec0f786c7c9fe600
diff --git a/metadata/md5-cache/dev-perl/Class-Singleton-1.600.0 b/metadata/md5-cache/dev-perl/Class-Singleton-1.600.0
index c5517c92417c..3b2de0ca2224 100644
--- a/metadata/md5-cache/dev-perl/Class-Singleton-1.600.0
+++ b/metadata/md5-cache/dev-perl/Class-Singleton-1.600.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Implementation of a Singleton class
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Class-Singleton
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.6.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=7063c48219424a41f87ac35b261bbbb2
+_md5_=61d24c7421cc6b2a6480bc4c09545f09
diff --git a/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0 b/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
index e7ee8df7f1bb..a8df873e7c01 100644
--- a/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
+++ b/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
@@ -5,11 +5,11 @@ DESCRIPTION=A module to implement some of AutoConf macros in pure perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Config-AutoConf
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-ExtUtils-CBuilder-0.280.220 dev-perl/File-Slurper virtual/perl-File-Spec virtual/perl-File-Temp >=virtual/perl-Scalar-List-Utils-1.180.0 virtual/perl-Text-ParseWords dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.319.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=bc880c055b7fdf2f61527cccfd9ddecc
+_md5_=d26112898c8bf719a391f87a64da314a
diff --git a/metadata/md5-cache/dev-perl/Crypt-CBC-3.30.0 b/metadata/md5-cache/dev-perl/Crypt-CBC-3.30.0
index 7372da98e40c..d8d01d20a313 100644
--- a/metadata/md5-cache/dev-perl/Crypt-CBC-3.30.0
+++ b/metadata/md5-cache/dev-perl/Crypt-CBC-3.30.0
@@ -5,11 +5,11 @@ DESCRIPTION=Encrypt Data with Cipher Block Chaining Mode
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-CBC
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~mips ~ppc64 ~sparc
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~mips ppc64 ~sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/CryptX dev-perl/Crypt-PBKDF2 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Math-BigInt dev-perl/Math-Int128 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-3.03.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=4daabe44268d5a49433f8bc2726fa687
+_md5_=c95a0818509387373d83a5c167392b25
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.130.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.130.0
index eef7e743b2a2..14b680f4e9e3 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.130.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.130.0
@@ -5,11 +5,11 @@ DESCRIPTION=Guess OpenSSL include path
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-Guess
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec dev-libs/openssl:0= dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.13.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=11184cf3736487587b2628b26542f0f7
+_md5_=0a2b13c939ad3a3970d9fb714786cac4
diff --git a/metadata/md5-cache/dev-perl/Crypt-PBKDF2-0.161.520 b/metadata/md5-cache/dev-perl/Crypt-PBKDF2-0.161.520
index ad2aceb0db5f..42d0e7c757c7 100644
--- a/metadata/md5-cache/dev-perl/Crypt-PBKDF2-0.161.520
+++ b/metadata/md5-cache/dev-perl/Crypt-PBKDF2-0.161.520
@@ -5,11 +5,11 @@ DESCRIPTION=The PBKDF2 password hashing algorithm
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-PBKDF2
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc64 ~sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Digest-1.160.0 >=dev-perl/Digest-HMAC-1.10.0 virtual/perl-Digest-SHA >=dev-perl/Digest-SHA3-0.220.0 virtual/perl-MIME-Base64 dev-perl/Module-Runtime >=dev-perl/Moo-2.0.0 virtual/perl-Scalar-List-Utils >=dev-perl/Try-Tiny-0.40.0 >=dev-perl/Type-Tiny-1.0.5 dev-perl/namespace-autoclean >=dev-perl/strictures-2.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AR/ARODLAND/Crypt-PBKDF2-0.161520.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c64c5153036dce387323e0130281c7cf
+_md5_=b14510f29becf48f0e42a287304a1b85
diff --git a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r4 b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r4
index cf238d2bf885..a8a339ecc68a 100644
--- a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r4
+++ b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0-r4
@@ -5,7 +5,7 @@ DESCRIPTION=OpenSSL support for LWP
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-SSLeay
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Artistic-2
 PDEPEND=dev-perl/libwww-perl >=dev-perl/LWP-Protocol-https-6.20.0
 RDEPEND=>=dev-libs/openssl-0.9.7c:0= virtual/perl-MIME-Base64 dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=0e100b760fff5b82ee7d8e893229933f
+_md5_=0503b5cf87a7e0409b6427742ad26916
diff --git a/metadata/md5-cache/dev-perl/Crypt-Twofish-2.180.0 b/metadata/md5-cache/dev-perl/Crypt-Twofish-2.180.0
index 4716ebe28f6a..eb5c14f258eb 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Twofish-2.180.0
+++ b/metadata/md5-cache/dev-perl/Crypt-Twofish-2.180.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=The Twofish Encryption Algorithm
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-Twofish
-KEYWORDS=~amd64 ~ia64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMS/Crypt-Twofish-2.18.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=73c16438b10401344462c12c43c4710a
+_md5_=27b4d0bac3da5387897d151da20a068a
diff --git a/metadata/md5-cache/dev-perl/CryptX-0.72.0 b/metadata/md5-cache/dev-perl/CryptX-0.72.0
index 2f5b5ebae3d9..3b720b24b100 100644
--- a/metadata/md5-cache/dev-perl/CryptX-0.72.0
+++ b/metadata/md5-cache/dev-perl/CryptX-0.72.0
@@ -5,11 +5,11 @@ DESCRIPTION=Self-contained crypto toolkit
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/CryptX
 IUSE=test minimal
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ ) public-domain
 RDEPEND=!minimal? ( || ( dev-perl/Cpanel-JSON-XS dev-perl/JSON-XS virtual/perl-JSON-PP ) ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIK/CryptX-0.072.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=10a3ca474c95abe3632139561eb4223e
+_md5_=04aac1e3a179b0f713e2013b47a0131a
diff --git a/metadata/md5-cache/dev-perl/DBD-Pg-3.15.0 b/metadata/md5-cache/dev-perl/DBD-Pg-3.15.0
index 668a6cfafa7f..87d66cae38fb 100644
--- a/metadata/md5-cache/dev-perl/DBD-Pg-3.15.0
+++ b/metadata/md5-cache/dev-perl/DBD-Pg-3.15.0
@@ -5,11 +5,11 @@ DESCRIPTION=PostgreSQL database driver for the DBI module
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DBD-Pg
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-version >=dev-perl/DBI-1.614.0 dev-db/postgresql:* dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.15.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=d8ca3ea68b2c4f5a022d15d24171c185
+_md5_=08ea1902d5b76c8cdc4f6a108a954f94
diff --git a/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.690.0 b/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.690.0
index 1cc1c14d453c..45930faa0fd4 100644
--- a/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.690.0
+++ b/metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.690.0
@@ -5,11 +5,11 @@ DESCRIPTION=Encapsulate SQL queries and rows in simple Perl objects
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DBIx-SearchBuilder
 IUSE=test examples
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Cache-Simple-TimedExpiry-0.210.0 dev-perl/Class-Accessor >=dev-perl/Class-ReturnValue-0.400.0 dev-perl/Clone dev-perl/DBI dev-perl/DBIx-DBSchema >=virtual/perl-Encode-1.990.0 virtual/perl-Scalar-List-Utils dev-perl/Want >=dev-perl/capitalization-0.30.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.69.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=9345c78465b12d79ad77dffec7105155
+_md5_=0b57d1b3a4d69e6893a998e01d685474
diff --git a/metadata/md5-cache/dev-perl/Data-HexDump-0.40.0 b/metadata/md5-cache/dev-perl/Data-HexDump-0.40.0
index 5d6c98d49473..8f3689818368 100644
--- a/metadata/md5-cache/dev-perl/Data-HexDump-0.40.0
+++ b/metadata/md5-cache/dev-perl/Data-HexDump-0.40.0
@@ -5,10 +5,10 @@ DESCRIPTION=Hexadecial Dumper
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Data-HexDump
 IUSE=examples
-KEYWORDS=~amd64 ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Data-HexDump-0.04.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=d9e52b33d20f63e36fec2547bfb6f05a
+_md5_=97d71dcc6be33268dab2604b9c8f67f3
diff --git a/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.210.0 b/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.210.0
index 1364bce2bdbc..a7e110df72e4 100644
--- a/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.210.0
+++ b/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.210.0
@@ -5,11 +5,11 @@ DESCRIPTION=Simple, transparent data interface, with caching
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Data-ObjectDriver
 IUSE=test
-KEYWORDS=~amd64 ppc ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-perl/Class-Trigger dev-perl/DBI virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIXAPART/Data-ObjectDriver-0.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=80d86d4ac164f931c33ad4c504eb787c
+_md5_=19047da4ca9084d4cad6389c18614e21
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.300.0 b/metadata/md5-cache/dev-perl/Data-Validate-IP-0.300.0
index 199a603d426e..31fe6b9fd148 100644
--- a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.300.0
+++ b/metadata/md5-cache/dev-perl/Data-Validate-IP-0.300.0
@@ -5,11 +5,11 @@ DESCRIPTION=IPv4 and IPv6 validation methods
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Data-Validate-IP
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter >=dev-perl/NetAddr-IP-4 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.30.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=f992e286ac245684aae82d59f43db170
+_md5_=26b3c2d3963764f96a592fb0d6ff0ef5
diff --git a/metadata/md5-cache/dev-perl/Date-Manip-6.850.0 b/metadata/md5-cache/dev-perl/Date-Manip-6.850.0
index 89c3d50294c8..8cc538347041 100644
--- a/metadata/md5-cache/dev-perl/Date-Manip-6.850.0
+++ b/metadata/md5-cache/dev-perl/Date-Manip-6.850.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl date manipulation routines
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Date-Manip
 IUSE=elibc_musl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode virtual/perl-File-Spec virtual/perl-IO virtual/perl-Storable elibc_musl? ( sys-libs/timezone-data ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.85.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=69210d001fb78c4a49a2321c9839b86f
+_md5_=315648d12d2dac7583e3586034af7e64
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.540.0 b/metadata/md5-cache/dev-perl/DateTime-1.540.0
index c74d22dbcc9b..ca59f29666d6 100644
--- a/metadata/md5-cache/dev-perl/DateTime-1.540.0
+++ b/metadata/md5-cache/dev-perl/DateTime-1.540.0
@@ -5,11 +5,11 @@ DESCRIPTION=A date and time object
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=!<=dev-perl/DateTime-Format-Mail-0.402.0 virtual/perl-Carp >=dev-perl/DateTime-Locale-1.60.0 >=dev-perl/DateTime-TimeZone-2.440.0 >=dev-perl/Dist-CheckConflicts-0.20.0 >=dev-perl/Params-ValidationCompiler-0.260.0 virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.180.0 dev-perl/Try-Tiny virtual/perl-XSLoader >=dev-perl/namespace-autoclean-0.190.0 virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.54.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=02240cf69727097a891dec0851796db8
+_md5_=26d2a1f834acf68287dde97d5852a67b
diff --git a/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.104.0 b/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.104.0
index e46f64bc0cd8..f2deff301242 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.104.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.104.0
@@ -5,11 +5,11 @@ DESCRIPTION=Dates in the Julian calendar
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Calendar-Julian
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.80.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.104.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=a95371dc4ad6d887246d7585c7657c46
+_md5_=0312bdc845a0654140c5f90965ec7d5f
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.830.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.830.0
index c885858883fe..dc03a9f02e5e 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.830.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.830.0
@@ -5,11 +5,11 @@ DESCRIPTION=Create DateTime parser classes and objects
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-Builder
 IUSE=minimal test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.0.0 >=dev-perl/DateTime-Format-Strptime-1.40.0 >=dev-perl/Params-Validate-0.720.0 virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.83.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=cb398a2791c21bfda02f784ed87621a5
+_md5_=d1b0c264aa1486e9e42ffb3f1dd44998
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.140.0 b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.140.0
index afd59ceb42ec..b39f5a0a4af5 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.140.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.140.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parses ISO8601 formats
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-ISO8601
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.450.0 >=dev-perl/DateTime-Format-Builder-0.770.0 >=dev-perl/Params-ValidationCompiler-0.260.0 >=dev-perl/Specio-0.180.0 dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ISO8601-0.14.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=9522395274598f73d43cb474d14bdf80
+_md5_=0bcd022e2709b9c3ff782f438cff8b9d
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.160.0 b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.160.0
index 0c2a8a08c6c5..d4bcc97c6642 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.160.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.160.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parses ISO8601 formats
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-ISO8601
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.450.0 >=dev-perl/DateTime-Format-Builder-0.770.0 >=dev-perl/Params-ValidationCompiler-0.260.0 >=dev-perl/Specio-0.180.0 dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ISO8601-0.16.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=0e41b33b601ecb8b6df3582e989cb045
+_md5_=a58cdeb4990befb90ad69ed3011c4bb6
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.120.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.120.0
index d5b1cde90e92..2d988f8b2e7a 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.120.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Natural-1.120.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parse informal natural language date/time strings
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-Natural
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Clone dev-perl/Date-Calc dev-perl/DateTime dev-perl/DateTime-TimeZone virtual/perl-Exporter virtual/perl-Getopt-Long dev-perl/List-MoreUtils >=dev-perl/Params-Validate-1.150.0 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Term-ReadLine dev-perl/boolean dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.12.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8763b780cc6b7593a9113d09a3944b89
+_md5_=b7d79f09aade3ab389665847c3d15a2a
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0-r1
index 04a08eec3464..d8f09c440879 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Parse and format SQLite dates and times
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-SQLite
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~ppc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.51 >=dev-perl/DateTime-Format-Builder-0.79.01 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/DateTime-Format-SQLite-0.11.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=6632e9c330f97e66dfdeabe15d096949
+_md5_=2ed09a9a8f46fd370804449f8ab7a8c7
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
index c1f7706bc827..280093b23ce5 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
@@ -4,11 +4,11 @@ DESCRIPTION=Parse and Format DateTimes using Strptime
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-Strptime
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1 >=dev-perl/DateTime-Locale-1.50.0 >=dev-perl/DateTime-TimeZone-2.90.0 virtual/perl-Exporter >=dev-perl/Package-DeprecationManager-0.150.0 dev-perl/Params-ValidationCompiler >=dev-perl/Specio-0.330.0 dev-perl/Try-Tiny virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.74.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=04e164cf715c987aa37c2bc3e1294fb0
+_md5_=fcf06ef77b327d4a571cd223806c5030
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.80.0 b/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.80.0
index 5e0a27b2cf73..9bb6264263df 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.80.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.80.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parse and format W3CDTF datetime strings
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-W3CDTF
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DateTime dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.08.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e5ede20063c5442a5c7ae83abf6376fc
+_md5_=c6be9833c1c9df0ea811ae4f0c439ebe
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-1.320.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-1.320.0
index 77ad2bb88bb5..df342f21e37e 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Locale-1.320.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-1.320.0
@@ -5,11 +5,11 @@ DESCRIPTION=Localization support for DateTime
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Locale
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ ) unicode
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/File-ShareDir virtual/perl-File-Spec >=dev-perl/Params-ValidationCompiler-0.130.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Specio-0.150.0 virtual/perl-Storable >=dev-perl/namespace-autoclean-0.190.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.32.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=cd0ee90785e617e78a9bfab796816360
+_md5_=dd1f73cb9a3878e9ce6494aedc72691f
diff --git a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0-r1 b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0-r1
index dbe681f9784d..556e50861352 100644
--- a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0-r1
+++ b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Find memory cycles in objects
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Devel-Cycle
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ec1007a1ca97c075a4aa3be7dfeebad9
+_md5_=34be5afbc0f7412e420057931b51b28f
diff --git a/metadata/md5-cache/dev-perl/Devel-Hide-0.1.400 b/metadata/md5-cache/dev-perl/Devel-Hide-0.1.400
index 165ae4f66dc4..ed87848eee70 100644
--- a/metadata/md5-cache/dev-perl/Devel-Hide-0.1.400
+++ b/metadata/md5-cache/dev-perl/Devel-Hide-0.1.400
@@ -5,11 +5,11 @@ DESCRIPTION=Forces the unavailability of specified Perl modules (for testing)
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Devel-Hide
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Hide-0.0014.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=0f5e6306e474fcb11246a3bdc207ba8f
+_md5_=b163d94729173e7484d7e55bc52dbb3a
diff --git a/metadata/md5-cache/dev-perl/Devel-NYTProf-6.100.0 b/metadata/md5-cache/dev-perl/Devel-NYTProf-6.100.0
index 67b11fc477e7..a746e7c95cb1 100644
--- a/metadata/md5-cache/dev-perl/Devel-NYTProf-6.100.0
+++ b/metadata/md5-cache/dev-perl/Devel-NYTProf-6.100.0
@@ -5,11 +5,11 @@ DESCRIPTION=Powerful feature-rich perl source code profiler
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Devel-NYTProf
 IUSE=test examples
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-Which-1.90.0 virtual/perl-Getopt-Long dev-perl/JSON-MaybeXS virtual/perl-Scalar-List-Utils virtual/perl-XSLoader sys-libs/zlib:0= dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JK/JKEENAN/Devel-NYTProf-6.10.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ffcf0b7f7a8d693689402f52e69cf79f
+_md5_=44d8d3d474208994e0fd1a5de1444908
diff --git a/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.7.0 b/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.7.0
index d16cca9243d4..c86009af5176 100644
--- a/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.7.0
+++ b/metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.7.0
@@ -5,11 +5,11 @@ DESCRIPTION=Introspect overloaded operators
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Devel-OverloadInfo
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 dev-perl/MRO-Compat >=dev-perl/Package-Stash-0.140.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.007.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=69e8ef58b23aed5c55dd16665541249f
+_md5_=cf886f064f65c301ea45191ef3b50c97
diff --git a/metadata/md5-cache/dev-perl/Digest-CRC-0.230.0 b/metadata/md5-cache/dev-perl/Digest-CRC-0.230.0
index a15df4689f3d..32ec3cd9b2dd 100644
--- a/metadata/md5-cache/dev-perl/Digest-CRC-0.230.0
+++ b/metadata/md5-cache/dev-perl/Digest-CRC-0.230.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Generic CRC functions
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Digest-CRC
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLIMAUL/Digest-CRC-0.23.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=18ce088e4bb5edf41465e4f8a91c618b
+_md5_=456f0a108d3acd5aef48925ed17b5771
diff --git a/metadata/md5-cache/dev-perl/Digest-HMAC-1.40.0 b/metadata/md5-cache/dev-perl/Digest-HMAC-1.40.0
index 70b692b9e272..683ae797d51b 100644
--- a/metadata/md5-cache/dev-perl/Digest-HMAC-1.40.0
+++ b/metadata/md5-cache/dev-perl/Digest-HMAC-1.40.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Keyed Hashing for Message Authentication
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Digest-HMAC
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Digest-MD5-2.0.0 >=virtual/perl-Digest-SHA-1.0.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AR/ARODLAND/Digest-HMAC-1.04.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=5139c51b1a16789eceb07e9a1b1b0e7f
+_md5_=9ff67380a6ff5a52383d60da0bcbc1c6
diff --git a/metadata/md5-cache/dev-perl/Digest-SHA3-1.40.0 b/metadata/md5-cache/dev-perl/Digest-SHA3-1.40.0
index 27542044efd0..d94ef6054cc4 100644
--- a/metadata/md5-cache/dev-perl/Digest-SHA3-1.40.0
+++ b/metadata/md5-cache/dev-perl/Digest-SHA3-1.40.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Perl extension for SHA-3
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Digest-SHA3
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc64 sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSHELOR/Digest-SHA3-1.04.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=6c6cc162f65bb3a18dda3a52b8736daf
+_md5_=34ca43b40ae0a3d181c59bd82f91964d
diff --git a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r2 b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r2
index d3cbca476f95..99516ad10c66 100644
--- a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r2
+++ b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Find RFC 822 email addresses in plain text
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-Find
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Email-Valid-0.179.0 dev-perl/MailTools dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Email-Find-0.10.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ff18b0e7ec8e86254665e4f7033259f3
+_md5_=d67b6229f388a623ff22b9c2134d68bf
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0 b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
index 512d18cac0e2..4687bffd6360 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parse a MIME Content-Type Header or Content-Disposition Header
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-MIME-ContentType
 IUSE=test
-KEYWORDS=~alpha ~amd64 ppc ppc64 ~x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ppc ppc64 x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.870.0 >=virtual/perl-Exporter-5.570.0 dev-perl/Text-Unidecode dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.026.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8a9656aaccba2d9b70d0ad6206cf165d
+_md5_=cdf3e817a12aed79b1bca2ea8194c949
diff --git a/metadata/md5-cache/dev-perl/Email-Sender-1.300.35 b/metadata/md5-cache/dev-perl/Email-Sender-1.300.35
index 7d2a8fce1ad9..f16a1b44c33a 100644
--- a/metadata/md5-cache/dev-perl/Email-Sender-1.300.35
+++ b/metadata/md5-cache/dev-perl/Email-Sender-1.300.35
@@ -5,11 +5,11 @@ DESCRIPTION=A library for sending email
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-Sender
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Abstract-3.6.0 dev-perl/Email-Address >=dev-perl/Email-Simple-1.998.0 >=virtual/perl-File-Path-2.60.0 virtual/perl-File-Spec >=virtual/perl-IO-1.110.0 dev-perl/Module-Runtime >=dev-perl/Moo-2.0.0 >=dev-perl/MooX-Types-MooseLike-0.150.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Sub-Exporter >=dev-perl/Throwable-0.200.3 dev-perl/Try-Tiny >=virtual/perl-libnet-3.70.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300035.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c76afbcca4c227a5039a0c4ed62eabf6
+_md5_=81c89939bcbc11187810ca00ed77f929
diff --git a/metadata/md5-cache/dev-perl/Email-Valid-1.202.0 b/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
index 375575efd4bb..e569c93c8aaa 100644
--- a/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
+++ b/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
@@ -4,11 +4,11 @@ DESCRIPTION=Check validity of Internet email addresses
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Email-Valid
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-perl/IO-CaptureOutput virtual/perl-IO dev-perl/MailTools dev-perl/Net-DNS >=dev-perl/Net-Domain-TLD-1.650.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.202.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=184d0ffbd62d39be42b6f09270bb3c78
+_md5_=aa4e47b75cf183317439410602c16f6b
diff --git a/metadata/md5-cache/dev-perl/Event-1.280.0 b/metadata/md5-cache/dev-perl/Event-1.280.0
index 0f4bc70fd375..1ee86a142d2e 100644
--- a/metadata/md5-cache/dev-perl/Event-1.280.0
+++ b/metadata/md5-cache/dev-perl/Event-1.280.0
@@ -5,11 +5,11 @@ DESCRIPTION=Fast, generic event loop
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Event
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ppc ppc64 sparc ~x86 ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/Event-1.28.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=9840a88ec0c6f985dd3f63d456823f48
+_md5_=70335b7749ff16c397d5bf23a60b302f
diff --git a/metadata/md5-cache/dev-perl/Exception-Class-1.450.0 b/metadata/md5-cache/dev-perl/Exception-Class-1.450.0
index daea7485155e..3f9a23a358ac 100644
--- a/metadata/md5-cache/dev-perl/Exception-Class-1.450.0
+++ b/metadata/md5-cache/dev-perl/Exception-Class-1.450.0
@@ -5,11 +5,11 @@ DESCRIPTION=A module that allows you to declare real exception classes in Perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Exception-Class
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Devel-StackTrace-2.0.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.45.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=97c771d5acdc4ffa757832f4ce053724
+_md5_=9bf064c0fc77e1373ec4a06d8f040324
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100 b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100
index 547eac7ead8f..f1b51b3e58a0 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100
@@ -5,11 +5,11 @@ DESCRIPTION=Easily build XS extensions that depend on XS extensions
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/ExtUtils-Depends
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8001.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=f39b74708b6ebd122f88fb0b7b1c34aa
+_md5_=b9d24ebdc7ea3e162fbf12dcbe1a584e
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-F77-1.260.0 b/metadata/md5-cache/dev-perl/ExtUtils-F77-1.260.0
index 93995b1d08c9..bc48b27e165b 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-F77-1.260.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-F77-1.260.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Simple interface to F77 libs
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/ExtUtils-F77
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-Which virtual/perl-Scalar-List-Utils virtual/perl-Text-ParseWords virtual/fortran dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-F77-1.26.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77ba903572dfea166e8f9f28be0fa273
+_md5_=523794a602fa1543fff1de04a1957f70
diff --git a/metadata/md5-cache/dev-perl/FFI-CheckLib-0.280.0 b/metadata/md5-cache/dev-perl/FFI-CheckLib-0.280.0
index 90af496b0324..7453fd341d9d 100644
--- a/metadata/md5-cache/dev-perl/FFI-CheckLib-0.280.0
+++ b/metadata/md5-cache/dev-perl/FFI-CheckLib-0.280.0
@@ -5,11 +5,11 @@ DESCRIPTION=Check that a library is available for FFI
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/FFI-CheckLib
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.330.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.28.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=2d7bc522f45df1a83e8d02a8bcdd8656
+_md5_=3e3cc4e9c3fb2aa2cbc8d82eb338781f
diff --git a/metadata/md5-cache/dev-perl/File-Listing-6.140.0 b/metadata/md5-cache/dev-perl/File-Listing-6.140.0
index e158502eb13a..08e2fbd29b49 100644
--- a/metadata/md5-cache/dev-perl/File-Listing-6.140.0
+++ b/metadata/md5-cache/dev-perl/File-Listing-6.140.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parse directory listings
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Listing
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/HTTP-Date virtual/perl-Time-Local dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/File-Listing-6.14.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8b679625423b87e4088c4b109aac277e
+_md5_=39f19c0f32673fef4f7ec8d64111636e
diff --git a/metadata/md5-cache/dev-perl/File-ReadBackwards-1.60.0 b/metadata/md5-cache/dev-perl/File-ReadBackwards-1.60.0
index 5638653a490a..48d8f8304fc5 100644
--- a/metadata/md5-cache/dev-perl/File-ReadBackwards-1.60.0
+++ b/metadata/md5-cache/dev-perl/File-ReadBackwards-1.60.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Read a file backwards by lines
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-ReadBackwards
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86 ~x86-solaris
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/File-ReadBackwards-1.06.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=81e6a1043943ea8e6ed82596dabdab2a
+_md5_=f56dc9de68c81442451cbb63340e0b3a
diff --git a/metadata/md5-cache/dev-perl/File-Remove-1.600.0 b/metadata/md5-cache/dev-perl/File-Remove-1.600.0
index 2b8b20d75685..5f07cd9a005b 100644
--- a/metadata/md5-cache/dev-perl/File-Remove-1.600.0
+++ b/metadata/md5-cache/dev-perl/File-Remove-1.600.0
@@ -5,11 +5,11 @@ DESCRIPTION=Remove files and directories
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Remove
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ ) || ( CC0-1.0 public-domain MIT )
 RDEPEND=virtual/perl-File-Path >=virtual/perl-File-Spec-3.290.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.60.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=3040fd5e4bcf40e2be66b2a2659a57fd
+_md5_=9bd7595527c8e883ddaa57ad0588a131
diff --git a/metadata/md5-cache/dev-perl/File-ShareDir-1.118.0 b/metadata/md5-cache/dev-perl/File-ShareDir-1.118.0
index 8f08a473d152..0551c4a9cebb 100644
--- a/metadata/md5-cache/dev-perl/File-ShareDir-1.118.0
+++ b/metadata/md5-cache/dev-perl/File-ShareDir-1.118.0
@@ -5,11 +5,11 @@ DESCRIPTION=Locate per-dist and per-module shared files
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-ShareDir
 IUSE=minimal 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 ~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 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/List-MoreUtils-0.428.0 >=dev-perl/Params-Util-1.70.0 ) virtual/perl-Carp >=dev-perl/Class-Inspector-1.120.0 >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.118.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=fdaba8ef573475b3c1ed41b67bcb6d64
+_md5_=24d0aaf56f097c5c033f25a1eb299b05
diff --git a/metadata/md5-cache/dev-perl/File-Slurper-0.12.0 b/metadata/md5-cache/dev-perl/File-Slurper-0.12.0
index 8aa28b7ec1fa..2f48e4ead9b6 100644
--- a/metadata/md5-cache/dev-perl/File-Slurper-0.12.0
+++ b/metadata/md5-cache/dev-perl/File-Slurper-0.12.0
@@ -5,11 +5,11 @@ DESCRIPTION=A simple, sane and efficient module to slurp a file
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Slurper
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~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/PerlIO-utf8_strict virtual/perl-Carp >=virtual/perl-Encode-2.110.0 >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.012.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=9d6cd89fea7e57fa53005421ffc789e0
+_md5_=f2f45d6fca0b497d449737a25f0c6501
diff --git a/metadata/md5-cache/dev-perl/File-Which-1.270.0 b/metadata/md5-cache/dev-perl/File-Which-1.270.0
index dd2c45022a72..435591203458 100644
--- a/metadata/md5-cache/dev-perl/File-Which-1.270.0
+++ b/metadata/md5-cache/dev-perl/File-Which-1.270.0
@@ -5,7 +5,7 @@ DESCRIPTION=Perl implementation of the which utility as an API
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Which
 IUSE=test pwhich
-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+ )
 PDEPEND=pwhich? ( dev-perl/App-pwhich )
 RDEPEND=dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.27.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=627b94083810151965c83707e9794d44
+_md5_=f190b7e9301fbe606018cba1d31cad01
diff --git a/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.200.0 b/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.200.0
index 86a04987f7a6..4abe35475adf 100644
--- a/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.200.0
+++ b/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.200.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-vcs/git virtual/perl-Encode dev-perl/File-Which dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/perl-File-Temp virtual/perl-HTTP-Tiny virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor !app-portage/pram dev-perl/Module-Build-Tiny test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Official tool to merge PRs from the Gentoo Github repository
+DESCRIPTION=Tool to merge PRs from the Gentoo Github repository
 EAPI=6
 HOMEPAGE=https://github.com/monsieurp/Gentoo-App-Pram
 IUSE=test
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MO/MONSIEURP/Gentoo-App-Pram-0.200000.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=f26a207245d666e1d19e5eae09f56d81
+_md5_=1956147632471d15b19f2367bf55a9c0
diff --git a/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.200.0-r1 b/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.200.0-r1
new file mode 100644
index 000000000000..55de661c2052
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.200.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-vcs/git virtual/perl-Encode dev-perl/File-Which dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/perl-File-Temp virtual/perl-HTTP-Tiny virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor !app-portage/pram dev-perl/Module-Build-Tiny dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-vcs/git virtual/perl-Encode dev-perl/File-Which dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/perl-File-Temp virtual/perl-HTTP-Tiny virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor !app-portage/pram test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DESCRIPTION=Tool to merge PRs from the Gentoo Github repository
+EAPI=8
+HOMEPAGE=https://github.com/monsieurp/Gentoo-App-Pram
+IUSE=test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-vcs/git virtual/perl-Encode dev-perl/File-Which dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/perl-File-Temp virtual/perl-HTTP-Tiny virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor !app-portage/pram dev-lang/perl:=
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MO/MONSIEURP/Gentoo-App-Pram-0.200000.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=adf446f35079d9d80272457af01cc0e6
diff --git a/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.109.0 b/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.109.0
index 5b82c0d751ac..4dbc9d037ba0 100644
--- a/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.109.0
+++ b/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.109.0
@@ -5,11 +5,11 @@ DESCRIPTION=Getopt::Long with usage text
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Getopt-Long-Descriptive
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 arm ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/MooseX-Getopt-0.660.0 virtual/perl-Carp >=virtual/perl-Getopt-Long-2.330.0 >=dev-perl/Params-Validate-0.970.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-0.972.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.109.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=3830a01cc0dff7fd7061c81159a84706
+_md5_=9c161e366f7a83b6f3412f471396f581
diff --git a/metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.49.0 b/metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.49.0
index 14d89fd0abef..36e5fa8041bb 100644
--- a/metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.49.0
+++ b/metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.49.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-perl/glib-perl-1.320.0 >=dev-libs/gobject-introspection-1.0 >=dev-l
 DESCRIPTION=Dynamically create Perl language bindings
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Glib-Object-Introspection
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-perl/glib-perl-1.320.0 >=dev-libs/gobject-introspection-1.0 >=dev-libs/libffi-3.0.0:0= >=dev-libs/glib-2.0.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.049.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e96af92547e10d01dd3554d35da7c8b9
+_md5_=2988ce2f9bd8b3c7674462ab1b408e2b
diff --git a/metadata/md5-cache/dev-perl/GnuPG-Interface-1.20.0 b/metadata/md5-cache/dev-perl/GnuPG-Interface-1.20.0
index fd5ac0643294..cffc1d15df0f 100644
--- a/metadata/md5-cache/dev-perl/GnuPG-Interface-1.20.0
+++ b/metadata/md5-cache/dev-perl/GnuPG-Interface-1.20.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl interface to GnuPG
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/GnuPG-Interface
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-crypt/gnupg-1.4 virtual/perl-autodie >=virtual/perl-Math-BigInt-1.780.0 >=dev-perl/Moo-0.91.11 >=dev-perl/MooX-HandlesVia-0.1.4 >=dev-perl/MooX-late-0.14.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPS/GnuPG-Interface-1.02.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=d28c60f657c8a817fa71e0868b3bac6f
+_md5_=006639f8f4588daf1b0a3ce91994caa9
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorNames-3.5.0 b/metadata/md5-cache/dev-perl/Graphics-ColorNames-3.5.0
index abc34bd16213..9fe228949c53 100644
--- a/metadata/md5-cache/dev-perl/Graphics-ColorNames-3.5.0
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorNames-3.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Defines RGB values for common color names
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Graphics-ColorNames
 IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Module-Load-0.100.0 virtual/perl-Module-Loaded dev-perl/Color-Library dev-perl/Tie-Sub dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRWO/Graphics-ColorNames-v3.5.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=33a8642e356818df72827c32545c4ed3
+_md5_=1d9879de2ad051df9153c192a1171a3d
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.140.0 b/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.140.0
index 37a7fe006bbf..5fa2987946be 100644
--- a/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.140.0
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorNames-WWW-1.140.0
@@ -5,11 +5,11 @@ DESCRIPTION=WWW color names and equivalent RGB values
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Graphics-ColorNames-WWW
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Graphics-ColorNames-0.320.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Graphics-ColorNames-WWW-1.14.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c1e33ee1e8b71630b542a5e73ba19b0f
+_md5_=ebca2cc6aa6a776392374efad5b7ef77
diff --git a/metadata/md5-cache/dev-perl/Gtk2-Unique-0.70.0 b/metadata/md5-cache/dev-perl/Gtk2-Unique-0.70.0
index 1d628385e55a..068322fa8f97 100644
--- a/metadata/md5-cache/dev-perl/Gtk2-Unique-0.70.0
+++ b/metadata/md5-cache/dev-perl/Gtk2-Unique-0.70.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl binding for C libunique library
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Gtk2-Unique
 IUSE=examples test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/libunique:1 dev-perl/Gtk2 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gtk2-Unique-0.07.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=b0dde8dde06730ec3a133e60282e84e3
+_md5_=72d5b5839a894c133c55a02d033c6e8a
diff --git a/metadata/md5-cache/dev-perl/Gtk3-0.38.0 b/metadata/md5-cache/dev-perl/Gtk3-0.38.0
index 0d679f0f025b..f40c8a749784 100644
--- a/metadata/md5-cache/dev-perl/Gtk3-0.38.0
+++ b/metadata/md5-cache/dev-perl/Gtk3-0.38.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl interface to the 3.x series of the gtk+ toolkit
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Gtk3
 IUSE=test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/gtk+:3[introspection] >=dev-perl/Cairo-GObject-1.0.0 virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Glib-Object-Introspection-0.43.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.038.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=00399dc48318d106025e96a66feec61d
+_md5_=6568036c6fbfc61448cb040421d7b564
diff --git a/metadata/md5-cache/dev-perl/Gtk3-SimpleList-0.210.0 b/metadata/md5-cache/dev-perl/Gtk3-SimpleList-0.210.0
index ce9559b946ee..ec6d79f92973 100644
--- a/metadata/md5-cache/dev-perl/Gtk3-SimpleList-0.210.0
+++ b/metadata/md5-cache/dev-perl/Gtk3-SimpleList-0.210.0
@@ -5,11 +5,11 @@ DESCRIPTION=A simple interface to GTK+ 3's complex MVC list widget
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Gtk3-SimpleList
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-perl/Gtk3 virtual/perl-Carp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=3e2d0fd15da507f1f9685fa230721662
+_md5_=107dcb571e93725e7de4e1102c36f395
diff --git a/metadata/md5-cache/dev-perl/HTML-Clean-1.400.0 b/metadata/md5-cache/dev-perl/HTML-Clean-1.400.0
index d00c27646b79..f3f32e7ab2ea 100644
--- a/metadata/md5-cache/dev-perl/HTML-Clean-1.400.0
+++ b/metadata/md5-cache/dev-perl/HTML-Clean-1.400.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Cleans up HTML code for web browsers, not humans
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTML-Clean
-KEYWORDS=~alpha ~amd64 ~ia64 ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<app-text/html-xml-utils-5.3 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AZ/AZJADFTRE/HTML-Clean-1.4.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=852baa68d3405918f27ba8c3a423daf8
+_md5_=814c9d725ec3834c327c0c0f34943534
diff --git a/metadata/md5-cache/dev-perl/HTML-Form-6.70.0 b/metadata/md5-cache/dev-perl/HTML-Form-6.70.0
index e66d70db718a..45cdcb9f7c40 100644
--- a/metadata/md5-cache/dev-perl/HTML-Form-6.70.0
+++ b/metadata/md5-cache/dev-perl/HTML-Form-6.70.0
@@ -5,11 +5,11 @@ DESCRIPTION=Class that represents an HTML form element
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTML-Form
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp >=virtual/perl-Encode-2 dev-perl/HTML-Parser >=dev-perl/HTTP-Message-6.30.0 >=dev-perl/URI-1.100.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.07.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=84063b7e1088bc6861ddaf10b8e988b4
+_md5_=9f119cd2c62123b0fcb206e9dd05f99b
diff --git a/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0 b/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
index afeb11233270..a2cec3e10653 100644
--- a/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
+++ b/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
@@ -4,11 +4,11 @@ DESCRIPTION=Convert plain text to HTML
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/HTML-FromText
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Find-0.90.0 >=virtual/perl-Exporter-5.58 >=dev-perl/HTML-Parser-1.260.0 >=virtual/perl-Scalar-List-Utils-1.120.0 >=virtual/perl-Text-Tabs+Wrap-98.112.800 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/HTML-FromText-2.07.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=b7706412c01d75d1e44e0dce4865798d
+_md5_=1aaa6c7e67227c1a0abc9d15599a0e91
diff --git a/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.210.0 b/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.210.0
index 35127de79d5a..04cf3144b05d 100644
--- a/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.210.0
+++ b/metadata/md5-cache/dev-perl/HTML-HTMLDoc-0.210.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl interface to the htmldoc program for producing PDF-Files from H
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTML-HTMLDoc
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-text/htmldoc >=dev-perl/Devel-CheckBin-0.40.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EC/ECHERNOF/HTML-HTMLDoc-0.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=9790c253cfd88e8c11f463c89a79e3dc
+_md5_=9583e9350a09f2f7ff1da572f63bb298
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-1.590.0 b/metadata/md5-cache/dev-perl/HTML-Mason-1.590.0
index 3b29f2e60a7b..6d66260d2a96 100644
--- a/metadata/md5-cache/dev-perl/HTML-Mason-1.590.0
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-1.590.0
@@ -4,11 +4,11 @@ DESCRIPTION=A HTML development and delivery Perl Module
 EAPI=6
 HOMEPAGE=http://www.masonhq.com/ https://metacpan.org/release/HTML-Mason
 IUSE=modperl test modperl
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!modperl? ( >=dev-perl/CGI-2.460.0 ) modperl? ( www-apache/libapreq2 >=www-apache/mod_perl-2 ) >=dev-perl/Cache-Cache-1 >=dev-perl/Class-Container-0.70.0 >=dev-perl/Exception-Class-1.150.0 virtual/perl-File-Spec dev-perl/HTML-Parser >=dev-perl/Log-Any-0.80.0 >=dev-perl/Params-Validate-0.70.0 virtual/perl-Scalar-List-Utils modperl? ( =www-servers/apache-2* ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.59.tar.gz
 _eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=213a57acfa2f37932191a5da0f307461
+_md5_=1b05d878fa872579fcb7e81c48ec72ef
diff --git a/metadata/md5-cache/dev-perl/HTML-Object-2.30 b/metadata/md5-cache/dev-perl/HTML-Object-2.30
index aa0435403482..1f227530119c 100644
--- a/metadata/md5-cache/dev-perl/HTML-Object-2.30
+++ b/metadata/md5-cache/dev-perl/HTML-Object-2.30
@@ -5,10 +5,10 @@ DESCRIPTION=A HTML development and delivery Perl Module
 EAPI=7
 HOMEPAGE=http://htmlobject.sourceforge.net
 IUSE=examples
-KEYWORDS=~amd64 ppc ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Data-FormValidator dev-perl/Date-Manip dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://sourceforge/htmlobject/libhtmlobject-perl-2.30.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=81b355f90cb00b590421ab64f4adcfea
+_md5_=0fae5e4328509f1b75cd1e2887e263b2
diff --git a/metadata/md5-cache/dev-perl/HTML-Parser-3.760.0 b/metadata/md5-cache/dev-perl/HTML-Parser-3.760.0
index b276feb5517d..e638380dd47e 100644
--- a/metadata/md5-cache/dev-perl/HTML-Parser-3.760.0
+++ b/metadata/md5-cache/dev-perl/HTML-Parser-3.760.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parse HTML documents
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTML-Parser
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/HTML-Tagset dev-perl/HTTP-Message virtual/perl-IO dev-perl/URI virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTML-Parser-3.76.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=9ee407457e45f4a12101121ab89d5f7d
+_md5_=4bbd9129c951de8c2f52376c6529d878
diff --git a/metadata/md5-cache/dev-perl/HTML-Scrubber-0.190.0 b/metadata/md5-cache/dev-perl/HTML-Scrubber-0.190.0
index 7d18dc1d25f9..e0c7775c85ea 100644
--- a/metadata/md5-cache/dev-perl/HTML-Scrubber-0.190.0
+++ b/metadata/md5-cache/dev-perl/HTML-Scrubber-0.190.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension for scrubbing/sanitizing html
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTML-Scrubber
 IUSE=test
-KEYWORDS=~amd64 ppc ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-Parser-3.470.0 >=virtual/perl-Scalar-List-Utils-1.330.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NIGELM/HTML-Scrubber-0.19.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=a7ce0fbd7c8db775837ff14e6eb15ef7
+_md5_=4b4a5406da504bd4da29a2a447ada13a
diff --git a/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.304.0 b/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.304.0
index 3e9b4c3727ee..a01187daf29e 100644
--- a/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.304.0
+++ b/metadata/md5-cache/dev-perl/HTML-TableContentParser-0.304.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Do interesting things with the contents of tables
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTML-TableContentParser
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/HTML-Parser dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WY/WYANT/HTML-TableContentParser-0.304.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=32ce10e254c7692492323fd85aea11c3
+_md5_=ebcb686bba876d56b2440e74c6bb263e
diff --git a/metadata/md5-cache/dev-perl/HTML-TableParser-0.430.0 b/metadata/md5-cache/dev-perl/HTML-TableParser-0.430.0
index 584404c59514..44a1401a08a3 100644
--- a/metadata/md5-cache/dev-perl/HTML-TableParser-0.430.0
+++ b/metadata/md5-cache/dev-perl/HTML-TableParser-0.430.0
@@ -5,11 +5,11 @@ DESCRIPTION=Extract data from an HTML table
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTML-TableParser
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-perl/HTML-Parser-3.260.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DJ/DJERIUS/HTML-TableParser-0.43.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=f14bbf258c9962651992860aee33cb16
+_md5_=8f7939acc4cff8ec7e6e73ba9150ff4a
diff --git a/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0 b/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0
index 2e5b9508dd37..02bbfac04e05 100644
--- a/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0
+++ b/metadata/md5-cache/dev-perl/HTML-Tree-5.70.0
@@ -4,11 +4,11 @@ DESCRIPTION=A library to manage HTML-Tree in PERL
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/HTML-Tree
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/HTML-Tagset-3.20.0 >=dev-perl/HTML-Parser-3.460.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/HTML-Tree-5.07.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=fd4f91d133744ed37a05ac38bfef6f64
+_md5_=27a27af4c20f6845d03b25869277e02f
diff --git a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.310.0 b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.310.0
index ed6731e1705f..54875a5e2241 100644
--- a/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.310.0
+++ b/metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.310.0
@@ -5,11 +5,11 @@ DESCRIPTION=Determine Web browser, version, and platform from an HTTP user agent
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTTP-BrowserDetect
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~mips ppc ~x86
+KEYWORDS=amd64 ~hppa ~mips ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-BrowserDetect-3.31.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=a9e3f81256af10bfa909085d4f454904
+_md5_=bee68a8226af81333f42d0641961d724
diff --git a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0 b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
index 79826e61efc9..c87f0836ba50 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
@@ -4,11 +4,11 @@ DESCRIPTION=Cache the result of http get-requests persistently
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/HTTP-Cache-Transparent
 IUSE=test examples
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Storable dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTIASH/HTTP-Cache-Transparent-1.4.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=016aefb2ad19c44232b35708a8fb592d
+_md5_=8667d658dd903f62b988ee1c9f9ed58c
diff --git a/metadata/md5-cache/dev-perl/HTTP-Cookies-6.100.0 b/metadata/md5-cache/dev-perl/HTTP-Cookies-6.100.0
index 652187039b9f..6fffd77984b3 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Cookies-6.100.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Cookies-6.100.0
@@ -5,11 +5,11 @@ DESCRIPTION=Storage of cookies
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTTP-Cookies
 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/libwww-perl-6 virtual/perl-Carp >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Message-6.0.0 virtual/perl-Time-Local dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.10.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=cefba6d944838ed6b05f19b0e427d30c
+_md5_=d42146b102de4456cd1587903f6b4708
diff --git a/metadata/md5-cache/dev-perl/HTTP-DAV-0.490.0 b/metadata/md5-cache/dev-perl/HTTP-DAV-0.490.0
index c72516f5dc96..ee7e28cefc06 100644
--- a/metadata/md5-cache/dev-perl/HTTP-DAV-0.490.0
+++ b/metadata/md5-cache/dev-perl/HTTP-DAV-0.490.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=A WebDAV client library for Perl5
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTTP-DAV
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Temp virtual/perl-Getopt-Long >=dev-perl/libwww-perl-5.480.0 virtual/perl-Scalar-List-Utils dev-perl/URI dev-perl/XML-DOM dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.49.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=673359391e61b88acdd4a76aaf91e79c
+_md5_=612cdef4a50defe898707eb78a7e18e0
diff --git a/metadata/md5-cache/dev-perl/HTTP-Date-6.50.0 b/metadata/md5-cache/dev-perl/HTTP-Date-6.50.0
index cb650821322c..4a772de06752 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Date-6.50.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Date-6.50.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Date conversion for HTTP date formats
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/HTTP-Date
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Exporter >=virtual/perl-Time-Local-1.280.0 dev-perl/TimeDate dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Date-6.05.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=fa4821675aff6505381cac8dbe9a3ba3
+_md5_=d1631d33ef2f80032e59352a3ed5b5e8
diff --git a/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.250.0-r1 b/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.250.0-r1
index bc6c9c969ac5..92a5587987a9 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.250.0-r1
+++ b/metadata/md5-cache/dev-perl/HTTP-Entity-Parser-0.250.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=PSGI compliant HTTP Entity Parser
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTTP-Entity-Parser
 IUSE=+xs test examples
-KEYWORDS=~alpha ~amd64 ~ia64 ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode virtual/perl-File-Temp dev-perl/HTTP-MultiPartParser dev-perl/Hash-MultiValue >=dev-perl/JSON-MaybeXS-1.3.7 virtual/perl-Module-Load dev-perl/Stream-Buffered >=dev-perl/WWW-Form-UrlEncoded-0.230.0 xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.25.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=00befb60053bd30d086e2bcf11d08652
+_md5_=1d740c3445286262e895375f89277806
diff --git a/metadata/md5-cache/dev-perl/HTTP-Message-6.320.0 b/metadata/md5-cache/dev-perl/HTTP-Message-6.320.0
index 5dd0a88be606..2ae8c92eb674 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Message-6.320.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Message-6.320.0
@@ -5,11 +5,11 @@ DESCRIPTION=Base class for Request/Response
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTTP-Message
 IUSE=test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp virtual/perl-Compress-Raw-Zlib >=virtual/perl-Encode-3.10.0 >=dev-perl/Encode-Locale-1.0.0 >=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec >=dev-perl/HTTP-Date-6.0.0 >=virtual/perl-IO-Compress-2.21.0 dev-perl/IO-HTML >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-MIME-Base64-2.100.0 >=dev-perl/URI-1.100.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.32.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=26ab4ab6421bf7c6de9b4c0e4f12919c
+_md5_=7385653628da710be745d31bdeb98870
diff --git a/metadata/md5-cache/dev-perl/Hash-FieldHash-0.150.0-r1 b/metadata/md5-cache/dev-perl/Hash-FieldHash-0.150.0-r1
index 0373eaa3f156..326d7df29710 100644
--- a/metadata/md5-cache/dev-perl/Hash-FieldHash-0.150.0-r1
+++ b/metadata/md5-cache/dev-perl/Hash-FieldHash-0.150.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Lightweight field hash for inside-out objects
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Hash-FieldHash
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-XSLoader-0.20.0 >=virtual/perl-parent-0.221.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/Hash-FieldHash-0.15.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=37e546eb29422ad636a72503e2a75322
+_md5_=dedfa3a837c8ca1131ccfb7727497e27
diff --git a/metadata/md5-cache/dev-perl/Hash-MoreUtils-0.60.0 b/metadata/md5-cache/dev-perl/Hash-MoreUtils-0.60.0
index 307ca89237e7..6ce1ae62e25c 100644
--- a/metadata/md5-cache/dev-perl/Hash-MoreUtils-0.60.0
+++ b/metadata/md5-cache/dev-perl/Hash-MoreUtils-0.60.0
@@ -5,11 +5,11 @@ DESCRIPTION=Provide the stuff missing in Hash::Util
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Hash-MoreUtils
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Hash-MoreUtils-0.06.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=3fec448870d6c393593a17f053f37158
+_md5_=9d06a36edecf3f7f51188c795ca51d7b
diff --git a/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.500 b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.500
index 0094e635e664..35a8ff8939f0 100644
--- a/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.500
+++ b/metadata/md5-cache/dev-perl/IO-CaptureOutput-1.110.500
@@ -5,11 +5,11 @@ DESCRIPTION=Capture STDOUT and STDERR from Perl code, subprocesses or XS
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-CaptureOutput
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-File-Temp-0.160.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/IO-CaptureOutput-1.1105.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=555f490e5c642582712ebcaea1154e9a
+_md5_=c28035bc573cc25f809c45cf0c7f9944
diff --git a/metadata/md5-cache/dev-perl/IO-HTML-1.4.0 b/metadata/md5-cache/dev-perl/IO-HTML-1.4.0
index 2c5cef2f3d38..a975b1f7653f 100644
--- a/metadata/md5-cache/dev-perl/IO-HTML-1.4.0
+++ b/metadata/md5-cache/dev-perl/IO-HTML-1.4.0
@@ -5,11 +5,11 @@ DESCRIPTION=Open an HTML file with automatic charset detection
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-HTML
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.100.0 >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.004.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=9e21a91528412fc4d5c7904a29db681b
+_md5_=42f126fe31b4a429c79b39f351a31d7d
diff --git a/metadata/md5-cache/dev-perl/IO-Handle-Util-0.20.0 b/metadata/md5-cache/dev-perl/IO-Handle-Util-0.20.0
index 23cbd1604976..263b16d8bae4 100644
--- a/metadata/md5-cache/dev-perl/IO-Handle-Util-0.20.0
+++ b/metadata/md5-cache/dev-perl/IO-Handle-Util-0.20.0
@@ -5,11 +5,11 @@ DESCRIPTION=Functions for working with IO::Handle like objects
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Handle-Util
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-String virtual/perl-Scalar-List-Utils dev-perl/Sub-Exporter dev-perl/asa virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/IO-Handle-Util-0.02.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=ab972bd710900cbe17eab9536f6bef44
+_md5_=d0299a41363b57850aacbf4ef7f09805
diff --git a/metadata/md5-cache/dev-perl/IO-Interactive-1.23.0 b/metadata/md5-cache/dev-perl/IO-Interactive-1.23.0
index 0e751d4d1b66..894ef97fa8ba 100644
--- a/metadata/md5-cache/dev-perl/IO-Interactive-1.23.0
+++ b/metadata/md5-cache/dev-perl/IO-Interactive-1.23.0
@@ -5,11 +5,11 @@ DESCRIPTION=Utilities for interactive I/O
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Interactive
 IUSE=test
-KEYWORDS=~amd64 ppc ~riscv ~x86
+KEYWORDS=amd64 ppc ~riscv x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-version-0.780.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.023.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=c3379205e23cf43eb525ba9cc9582d77
+_md5_=bd13a01d547c8a055d0e800febd2415e
diff --git a/metadata/md5-cache/dev-perl/IO-Pager-2.100.0 b/metadata/md5-cache/dev-perl/IO-Pager-2.100.0
index 2749be0e2e26..4e10e58a2ee9 100644
--- a/metadata/md5-cache/dev-perl/IO-Pager-2.100.0
+++ b/metadata/md5-cache/dev-perl/IO-Pager-2.100.0
@@ -5,11 +5,11 @@ DESCRIPTION=Select a pager, optionally pipe it output if destination is a TTY
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Pager
 IUSE=test
-KEYWORDS=~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-perl/File-Which virtual/perl-IO dev-perl/TermReadKey dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-2.10.tgz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=9abdd70fd3037f99c5b9cc6800b0cfd3
+_md5_=86ad3bc673150a68a2427efc75d8a386
diff --git a/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1 b/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
index 57d038c7fe66..584c22611d5b 100644
--- a/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
 DESCRIPTION=Session data support module for SOAP::Lite
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/IO-SessionData
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ceb11b95387f650f99cead65a1711fc5
+_md5_=cc20945ebf2d0052579270b9a1bbdbf6
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.71.0 b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.71.0
index 2de8ab9860e4..e6db0f9d4871 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.71.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.71.0
@@ -5,11 +5,11 @@ DESCRIPTION=Nearly transparent SSL encapsulation for IO::Socket::INET
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Socket-SSL
 IUSE=idn test examples
-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=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Mozilla-CA >=dev-perl/Net-SSLeay-1.460.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN dev-perl/Net-IDN-Encode ) ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.071.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=ebf476b2715bc6ca9ca82e31aa869fe4
+_md5_=2fdab04a35731fa83a65ea925633f0b2
diff --git a/metadata/md5-cache/dev-perl/IO-Stty-0.40.0 b/metadata/md5-cache/dev-perl/IO-Stty-0.40.0
index e68f028c4821..f7804af7fb0e 100644
--- a/metadata/md5-cache/dev-perl/IO-Stty-0.40.0
+++ b/metadata/md5-cache/dev-perl/IO-Stty-0.40.0
@@ -5,11 +5,11 @@ DESCRIPTION=Change and print terminal line settings
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Stty
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IO-Stty-0.04.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=b2489b610f84ba18402f25f5fbfcc64e
+_md5_=069d419b10cedc11b285b901c97243c4
diff --git a/metadata/md5-cache/dev-perl/IO-Tee-0.660.0 b/metadata/md5-cache/dev-perl/IO-Tee-0.660.0
index 880cf2c96bf5..b6d7badf2b12 100644
--- a/metadata/md5-cache/dev-perl/IO-Tee-0.660.0
+++ b/metadata/md5-cache/dev-perl/IO-Tee-0.660.0
@@ -5,11 +5,11 @@ DESCRIPTION=Multiplex output to multiple output handles
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Tee
 IUSE=test
-KEYWORDS=~amd64 ~ia64 ppc sparc ~x86
+KEYWORDS=amd64 ~ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-0.66.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=f09c56687a76c998bddf7fb15f10fe11
+_md5_=bde3368d125cfc53e06f1e5be833e83c
diff --git a/metadata/md5-cache/dev-perl/IO-Tty-1.160.0 b/metadata/md5-cache/dev-perl/IO-Tty-1.160.0
index b7f7ad9634fb..5eb41972868b 100644
--- a/metadata/md5-cache/dev-perl/IO-Tty-1.160.0
+++ b/metadata/md5-cache/dev-perl/IO-Tty-1.160.0
@@ -5,11 +5,11 @@ DESCRIPTION=IO::Tty and IO::Pty modules for Perl
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IO-Tty
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.16.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=a7aec858620da2f158779fdfaefb3568
+_md5_=4e6bdfc7db8d2450a7ad582455bda1fe
diff --git a/metadata/md5-cache/dev-perl/IPC-Run-20200505.0.0 b/metadata/md5-cache/dev-perl/IPC-Run-20200505.0.0
index 1d2fe7db2589..b4e6fea0845b 100644
--- a/metadata/md5-cache/dev-perl/IPC-Run-20200505.0.0
+++ b/metadata/md5-cache/dev-perl/IPC-Run-20200505.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=system() and background procs w/ piping, redirs, ptys
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IPC-Run
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/IO-Tty-1.80.0 dev-perl/Readonly dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20200505.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=354ef7c17a70db9e4af836807afe55de
+_md5_=a679ae12a57b48f45e5e64513f99d780
diff --git a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.300.0 b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.300.0
index e7ae6729f77c..2b570fcaba37 100644
--- a/metadata/md5-cache/dev-perl/IPC-System-Simple-1.300.0
+++ b/metadata/md5-cache/dev-perl/IPC-System-Simple-1.300.0
@@ -5,11 +5,11 @@ DESCRIPTION=Run commands simply, with detailed diagnostics
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/IPC-System-Simple
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.30.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=d804bab7fe8fc25f980266399a646a53
+_md5_=85b5fa75dc4732acfc7f4ef433585d99
diff --git a/metadata/md5-cache/dev-perl/Image-Info-1.420.0 b/metadata/md5-cache/dev-perl/Image-Info-1.420.0
index 55a4c04d9bbc..3fa40a32d8cf 100644
--- a/metadata/md5-cache/dev-perl/Image-Info-1.420.0
+++ b/metadata/md5-cache/dev-perl/Image-Info-1.420.0
@@ -5,11 +5,11 @@ DESCRIPTION=The Perl Image-Info Module
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Image-Info
 IUSE=test examples
-KEYWORDS=~amd64 ~hppa ppc ppc64 sparc ~x86
+KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/IO-stringy-1.01 dev-perl/XML-LibXML dev-perl/XML-Simple dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.42.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=43989cb1aa7f849cb63024b2905b905a
+_md5_=ea1acafcc0623bda405f1998286eded2
diff --git a/metadata/md5-cache/dev-perl/Image-Sane-5.0.0 b/metadata/md5-cache/dev-perl/Image-Sane-5.0.0
index 88adbe19b8af..9bb16d0adc63 100644
--- a/metadata/md5-cache/dev-perl/Image-Sane-5.0.0
+++ b/metadata/md5-cache/dev-perl/Image-Sane-5.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Access SANE-compatible scanners from Perl
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Image-Sane
 IUSE=test test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Exception-Class dev-perl/Readonly >=media-gfx/sane-backends-1.0.19 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RATCLIFFE/Image-Sane-5.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=f8f455d2a3964efffc68e7bb56b1b786
+_md5_=887c84df22c8be8812419f172dea6f71
diff --git a/metadata/md5-cache/dev-perl/Importer-0.26.0 b/metadata/md5-cache/dev-perl/Importer-0.26.0
index 7422fe7ed776..16f3129a5ef3 100644
--- a/metadata/md5-cache/dev-perl/Importer-0.26.0
+++ b/metadata/md5-cache/dev-perl/Importer-0.26.0
@@ -5,11 +5,11 @@ DESCRIPTION=Alternative interface to modules that export symbols
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Importer
 IUSE=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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Importer-0.026.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=297f64375edcbbff9b44d060be26c188
+_md5_=060080454ee0c181c3a8bed87488d2a5
diff --git a/metadata/md5-cache/dev-perl/Inline-0.860.0 b/metadata/md5-cache/dev-perl/Inline-0.860.0
index b6a8e7ffce0c..60135742ca10 100644
--- a/metadata/md5-cache/dev-perl/Inline-0.860.0
+++ b/metadata/md5-cache/dev-perl/Inline-0.860.0
@@ -5,11 +5,11 @@ DESCRIPTION=Write Perl subroutines in other languages
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Inline
 IUSE=test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Inline-0.86.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=17779b48d23562a29c358573e5440b9c
+_md5_=e32a80e5c401cc4987fa631efb9e4f97
diff --git a/metadata/md5-cache/dev-perl/Inline-Files-0.710.0 b/metadata/md5-cache/dev-perl/Inline-Files-0.710.0
index 43856ac60b47..69259404bd15 100644
--- a/metadata/md5-cache/dev-perl/Inline-Files-0.710.0
+++ b/metadata/md5-cache/dev-perl/Inline-Files-0.710.0
@@ -5,11 +5,11 @@ DESCRIPTION=Multiple virtual files in a single file
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Inline-Files
 IUSE=test
-KEYWORDS=~alpha ~amd64 ppc ~x86
+KEYWORDS=~alpha amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/Inline-Files-0.71.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=a133b55b769c24864a27649e80e608ee
+_md5_=5c6d80958a0db98ee8af8b9fe379c43f
diff --git a/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.4.3 b/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.4.3
index 24edf9aae8b5..2fe36511cb38 100644
--- a/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.4.3
+++ b/metadata/md5-cache/dev-perl/JSON-MaybeXS-1.4.3
@@ -5,11 +5,11 @@ DESCRIPTION=Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/JSON-MaybeXS
 IUSE=+xs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-JSON-PP-2.273.0 virtual/perl-Scalar-List-Utils xs? ( || ( >=dev-perl/Cpanel-JSON-XS-2.331.0 >=dev-perl/JSON-XS-3.0.0 ) ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.004003.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=0c89734b9435809ec8214cd0248183ef
+_md5_=4ceac4674ae62e599dbea14fba2c36e0
diff --git a/metadata/md5-cache/dev-perl/JSON-XS-4.30.0 b/metadata/md5-cache/dev-perl/JSON-XS-4.30.0
index 47608c6b52cd..e6ec64744862 100644
--- a/metadata/md5-cache/dev-perl/JSON-XS-4.30.0
+++ b/metadata/md5-cache/dev-perl/JSON-XS-4.30.0
@@ -5,11 +5,11 @@ DESCRIPTION=JSON::XS - JSON serialising/deserialising, done correctly and fast
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/JSON-XS
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Types-Serialiser dev-perl/common-sense !<dev-perl/JSON-2.900.0 !<dev-perl/JSON-Any-1.310.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.03.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=d47db20d6379bad638b1369ccddce580
+_md5_=10951cf9a0fd2ced4d1f1b3d590c1b19
diff --git a/metadata/md5-cache/dev-perl/JavaScript-Minifier-XS-0.140.0 b/metadata/md5-cache/dev-perl/JavaScript-Minifier-XS-0.140.0
index 69d459f2aa4a..c520264aaeb3 100644
--- a/metadata/md5-cache/dev-perl/JavaScript-Minifier-XS-0.140.0
+++ b/metadata/md5-cache/dev-perl/JavaScript-Minifier-XS-0.140.0
@@ -5,11 +5,11 @@ DESCRIPTION=XS based JavaScript minifier
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/JavaScript-Minifier-XS
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.14.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=f72cdea381703ab20bd267d5527868ab
+_md5_=16e226d95c1153ff5359c330ed17e606
diff --git a/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.40.0 b/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.40.0
index 74781294ff5c..7611329ce342 100644
--- a/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.40.0
+++ b/metadata/md5-cache/dev-perl/LWP-MediaTypes-6.40.0
@@ -5,11 +5,11 @@ DESCRIPTION=Media types and mailcap processing
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/LWP-MediaTypes
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/libwww-perl-6 virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/LWP-MediaTypes-6.04.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=4e313e7b5b3fb3f061d8b2ba9a27f042
+_md5_=1c2ecf88a4c6a5834157a4290fc818d2
diff --git a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2 b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
index 8c573942cf76..70ca6e5d20b3 100644
--- a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
+++ b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Does your process have access to the web
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/LWP-Online
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/libwww-perl-5.805.0 >=dev-perl/URI-1.350.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/LWP-Online-1.08.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c061840c6d6af196aa85f1909647f7a8
+_md5_=f45c7f2bb1e0ea15b310df253acf8edd
diff --git a/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.100.0 b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.100.0
index f85c07da3370..e94f7d1bfeb8 100644
--- a/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.100.0
+++ b/metadata/md5-cache/dev-perl/LWP-Protocol-https-6.100.0
@@ -5,11 +5,11 @@ DESCRIPTION=Provide https support for LWP::UserAgent
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/LWP-Protocol-https
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=app-misc/ca-certificates >=dev-perl/IO-Socket-SSL-1.540.0 >=dev-perl/libwww-perl-6.60.0 >=dev-perl/Net-HTTP-6 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.10.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=5b8632132c25ddf9caf9a943f4f89dfd
+_md5_=290c90477086fddc03ff9bf7dc57d3fe
diff --git a/metadata/md5-cache/dev-perl/LWP-UserAgent-Cached-0.80.0 b/metadata/md5-cache/dev-perl/LWP-UserAgent-Cached-0.80.0
index 709aa6814677..1d0fe410e6af 100644
--- a/metadata/md5-cache/dev-perl/LWP-UserAgent-Cached-0.80.0
+++ b/metadata/md5-cache/dev-perl/LWP-UserAgent-Cached-0.80.0
@@ -5,11 +5,11 @@ DESCRIPTION=LWP::UserAgent with simple caching mechanism
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/LWP-UserAgent-Cached
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLEG/LWP-UserAgent-Cached-0.08.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=7bf005615cd0ffdc80b309fb21116f7e
+_md5_=7db842f2ef324364ffa6288536be0c8f
diff --git a/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0 b/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0
index f471c0fd517a..98172076addb 100644
--- a/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0
+++ b/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/libwww-perl virtual/perl-ExtUtils-MakeMaker dev-lang/perl
 DESCRIPTION=A virtual browser that retries errors
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/LWP-UserAgent-Determined
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/LWP-UserAgent-Determined-1.07.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=10539e47ac7dd2e34f3ed5bcc5f1e2c6
+_md5_=d0e375ab8c56d8855d6206f0e8a7546d
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Driver-1.2.0 b/metadata/md5-cache/dev-perl/LaTeX-Driver-1.2.0
index e4135a409d7b..9ccfbb768fca 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Driver-1.2.0
+++ b/metadata/md5-cache/dev-perl/LaTeX-Driver-1.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl encapsulation of invoking the Latex programs
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/LaTeX-Driver
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny dev-perl/Class-Accessor dev-perl/Exception-Class dev-perl/File-Slurp virtual/perl-File-Spec >=virtual/perl-File-Temp-0.230.0 dev-perl/File-pushd virtual/perl-Getopt-Long dev-perl/Log-Any dev-perl/Readonly virtual/perl-parent virtual/latex-base dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EH/EHUELS/LaTeX-Driver-1.2.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=cf9111753c4191e9451dabb6cc3fd576
+_md5_=174c270ff989bdafe5b570c6ae1c114a
diff --git a/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0 b/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
index 9c89bb92233d..14625b3a566a 100644
--- a/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
+++ b/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
@@ -4,11 +4,11 @@ DESCRIPTION=Prevent leakage of lexical hints
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Lexical-SealRequireHints
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/B-Hooks-OP-Check-0.190.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Lexical-SealRequireHints-0.011.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=198319a62dc178f414f26f771915bf8e
+_md5_=138b924c70315657b8d160adc0b99b82
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.905.0 b/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.905.0
index 5f273e03cb75..fcb8cdcc56be 100644
--- a/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.905.0
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-Inflect-1.905.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl module to pluralize English words
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Lingua-EN-Inflect
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.905.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=aa6e2ce4f64947de04cf3a06b2f68480
+_md5_=af71aec4b489a99171f3f84276c5f230
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.380.0 b/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.380.0
index e1bca61407b8..694b21607fa6 100644
--- a/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.380.0
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-NameParse-1.380.0
@@ -5,11 +5,11 @@ DESCRIPTION=Routines for manipulating a person's name
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Lingua-EN-NameParse
 IUSE=test examples
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Parse-RecDescent-1 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KI/KIMRYAN/Lingua-EN-NameParse-1.38.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=f4e82b26b0ad90efa2a72e70495f0a49
+_md5_=db011696ab4b3df28cbf42092bd5eb29
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.50.0 b/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.50.0
index 6d17c9fbcfdf..5906cc1424d5 100644
--- a/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.50.0
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.50.0
@@ -5,11 +5,11 @@ DESCRIPTION=Convert cardinal numbers(3) to ordinal numbers(3rd)
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Lingua-EN-Numbers-Ordinate
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~ia64 ppc sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-Numbers-Ordinate-1.05.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=3a10a69631e9d20266c06ee563d78690
+_md5_=f6d80346d1a23fca515339dbae55a96b
diff --git a/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r2 b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r2
index f91f67a334cb..25884add158d 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r2
+++ b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r2
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Pick a language based on user's preferences
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Lingua-Preferred
-KEYWORDS=amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-2+ )
 RDEPEND=dev-perl/Log-TraceMessages dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Lingua-Preferred-0.2.4.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=d59f3dd7b075784b2bb574d42624ba85
+_md5_=2ac8bc3a98626eb47df4b5457e8d7a8a
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-2.310.0 b/metadata/md5-cache/dev-perl/Lingua-Stem-2.310.0
index a88ab5ad1cee..bf7bdb57f747 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Stem-2.310.0
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-2.310.0
@@ -5,11 +5,11 @@ DESCRIPTION=Stemming of words
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Lingua-Stem
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Snowball-Norwegian dev-perl/Snowball-Swedish dev-perl/Lingua-Stem-Snowball-Da dev-perl/Lingua-Stem-Fr dev-perl/Lingua-Stem-It dev-perl/Lingua-Stem-Ru dev-perl/Lingua-PT-Stemmer dev-perl/Text-German dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-2.31.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=47877af9d7e56746d7a9652b9b4a89b8
+_md5_=98a676193f833ad9e5891813ebc47a85
diff --git a/metadata/md5-cache/dev-perl/List-AllUtils-0.190.0 b/metadata/md5-cache/dev-perl/List-AllUtils-0.190.0
index 9f350a2cace3..e405c6bfb709 100644
--- a/metadata/md5-cache/dev-perl/List-AllUtils-0.190.0
+++ b/metadata/md5-cache/dev-perl/List-AllUtils-0.190.0
@@ -5,11 +5,11 @@ DESCRIPTION=Combines many List::* utility modules in one bite-sized package
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/List-AllUtils
 IUSE=test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/List-SomeUtils-0.580.0 >=virtual/perl-Scalar-List-Utils-1.560.0 >=dev-perl/List-UtilsBy-0.110.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.19.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=e089b161742e41c5c782acaf7e2c2e71
+_md5_=00b2c5e7f93db64044e70984ed2fa8ce
diff --git a/metadata/md5-cache/dev-perl/Log-Agent-1.5.0 b/metadata/md5-cache/dev-perl/Log-Agent-1.5.0
index ac4d475e7049..73a2a78e8508 100644
--- a/metadata/md5-cache/dev-perl/Log-Agent-1.5.0
+++ b/metadata/md5-cache/dev-perl/Log-Agent-1.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=A general logging framework
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Log-Agent
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MR/MROGASKI/Log-Agent-1.005.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=ade8d562ece598db349707a0874f657d
+_md5_=62dbdbec0936869419310afae05af896
diff --git a/metadata/md5-cache/dev-perl/Log-Any-1.709.0 b/metadata/md5-cache/dev-perl/Log-Any-1.709.0
index a8fed2022bb4..35d3a0ad22c5 100644
--- a/metadata/md5-cache/dev-perl/Log-Any-1.709.0
+++ b/metadata/md5-cache/dev-perl/Log-Any-1.709.0
@@ -5,11 +5,11 @@ DESCRIPTION=Bringing loggers and listeners together
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Log-Any
 IUSE=minimal test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-IO virtual/perl-Storable virtual/perl-Sys-Syslog virtual/perl-Test-Simple dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-1.709.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=6305cfb4d53618000faafbe14337a501
+_md5_=2661dc6c9b805f90d98b584389f9c5a7
diff --git a/metadata/md5-cache/dev-perl/Log-Dispatch-2.700.0 b/metadata/md5-cache/dev-perl/Log-Dispatch-2.700.0
index 260e9997306e..e2f53d54fc1a 100644
--- a/metadata/md5-cache/dev-perl/Log-Dispatch-2.700.0
+++ b/metadata/md5-cache/dev-perl/Log-Dispatch-2.700.0
@@ -5,11 +5,11 @@ DESCRIPTION=Dispatches messages to one or more outputs
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Log-Dispatch
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp dev-perl/Devel-GlobalDestruction >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Encode virtual/perl-Exporter virtual/perl-IO dev-perl/Module-Runtime dev-perl/Params-ValidationCompiler virtual/perl-Scalar-List-Utils >=dev-perl/Specio-0.320.0 >=virtual/perl-Sys-Syslog-0.280.0 dev-perl/Try-Tiny dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.70.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=288fdb93b2cb37c26558ad17e04cf8b8
+_md5_=78ddee6f6c76e0d4096851992288f2bf
diff --git a/metadata/md5-cache/dev-perl/Log-Dispatchouli-2.23.0 b/metadata/md5-cache/dev-perl/Log-Dispatchouli-2.23.0
index 254deecb58c8..c954785e5d8c 100644
--- a/metadata/md5-cache/dev-perl/Log-Dispatchouli-2.23.0
+++ b/metadata/md5-cache/dev-perl/Log-Dispatchouli-2.23.0
@@ -5,11 +5,11 @@ DESCRIPTION=a simple wrapper around Log::Dispatch
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Log-Dispatchouli
 IUSE=minimal test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-perl/Log-Dispatch dev-perl/Log-Dispatch-Array dev-perl/Params-Util virtual/perl-Scalar-List-Utils dev-perl/String-Flogger dev-perl/Sub-Exporter >=dev-perl/Sub-Exporter-GlobExporter-0.2.0 >=virtual/perl-Sys-Syslog-0.160.0 >=dev-perl/Try-Tiny-0.40.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.023.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=9e2ffa7d019a3f5f9e53e67c7910b255
+_md5_=ee0e9354848eca22f19fecde9faf19dd
diff --git a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r2 b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r2
index faa9a403552d..f90f54f4b5fb 100644
--- a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r2
+++ b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Logging/debugging aid
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Log-TraceMessages
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-FromText-1.4.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Log-TraceMessages-1.4.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=1883ce1bb593c079f36efa09caad6a3c
+_md5_=6fbc4015317ebff2e7ec4486d904fbc7
diff --git a/metadata/md5-cache/dev-perl/MIME-Lite-3.33.0 b/metadata/md5-cache/dev-perl/MIME-Lite-3.33.0
index f7a23952b7f4..d92ec3daf548 100644
--- a/metadata/md5-cache/dev-perl/MIME-Lite-3.33.0
+++ b/metadata/md5-cache/dev-perl/MIME-Lite-3.33.0
@@ -5,11 +5,11 @@ DESCRIPTION=Low-calorie MIME generator
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/MIME-Lite
 IUSE=minimal test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.280.0 >=dev-perl/MailTools-1.620.0 ) dev-perl/Email-Date-Format virtual/perl-File-Spec dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/MIME-Lite-3.033.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=433a2d2c5719b107fc4f5938f574d325
+_md5_=536a2d9201136e261dbd2e9446b92a7f
diff --git a/metadata/md5-cache/dev-perl/MIME-Types-2.210.0 b/metadata/md5-cache/dev-perl/MIME-Types-2.210.0
index cad5f8a1401e..b5a75ffa5184 100644
--- a/metadata/md5-cache/dev-perl/MIME-Types-2.210.0
+++ b/metadata/md5-cache/dev-perl/MIME-Types-2.210.0
@@ -5,11 +5,11 @@ DESCRIPTION=Definition of MIME types
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/MIME-Types
 IUSE=test
-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=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=c8932c54d951a0542d8a0b2c805e8872
+_md5_=083d1c4a3b44abdf2f939992e4496bd4
diff --git a/metadata/md5-cache/dev-perl/Mail-Box-3.9.0 b/metadata/md5-cache/dev-perl/Mail-Box-3.9.0
index a222ea502f2b..f7bd7b089be2 100644
--- a/metadata/md5-cache/dev-perl/Mail-Box-3.9.0
+++ b/metadata/md5-cache/dev-perl/Mail-Box-3.9.0
@@ -5,7 +5,7 @@ DESCRIPTION=Mail folder manager and MUA backend
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-Box
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=dev-perl/Mail-Box-IMAP4 dev-perl/Mail-Box-POP3
 RDEPEND=virtual/perl-Carp dev-perl/TimeDate >=dev-perl/Devel-GlobalDestruction-0.90.0 >=dev-perl/File-Remove-0.200.0 >=virtual/perl-File-Spec-0.700.0 dev-perl/IO-stringy >=dev-perl/Mail-Message-3.8.0 >=dev-perl/Mail-Transport-3.3.0 >=dev-perl/Object-Realize-Later-0.190.0 >=virtual/perl-Scalar-List-Utils-1.130.0 !!<dev-perl/Mail-Box-3 dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.009.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=b8e2b6322d4cf507598dd1a3216e9875
+_md5_=dbb54875cd2974cba72cdd4545253f0f
diff --git a/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.7.0 b/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.7.0
index 50fe7254c646..50e6a4e5dde1 100644
--- a/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.7.0
+++ b/metadata/md5-cache/dev-perl/Mail-Box-IMAP4-3.7.0
@@ -5,11 +5,11 @@ DESCRIPTION=Mail::Box connector via IMAP4
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-Box-IMAP4
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate dev-perl/Digest-HMAC virtual/perl-Digest-MD5 virtual/perl-File-Spec >=dev-perl/Mail-Box-3 dev-perl/Mail-IMAPClient >=dev-perl/Mail-Message-3 >=dev-perl/Mail-Transport-3 virtual/perl-Scalar-List-Utils !!<dev-perl/Mail-Box-3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-IMAP4-3.007.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=84152475a385bc36c4afbe9700b4b588
+_md5_=186893330c2db49dc54f8202450049d6
diff --git a/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.5.0 b/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.5.0
index 3936500ca345..797620d7061f 100644
--- a/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.5.0
+++ b/metadata/md5-cache/dev-perl/Mail-Box-POP3-3.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Mail::Box connector via POP3
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-Box-POP3
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 virtual/perl-File-Spec virtual/perl-IO >=dev-perl/Mail-Message-3 >=dev-perl/Mail-Box-3 virtual/perl-Scalar-List-Utils virtual/perl-Socket !!<dev-perl/Mail-Box-3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-POP3-3.005.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=a6aab799321bec4ad4e3941c8e472502
+_md5_=2bdd5c89412db501bee96b50a417cd6e
diff --git a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.430.0 b/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.430.0
index bc225f0f5d35..a61672c3465d 100644
--- a/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.430.0
+++ b/metadata/md5-cache/dev-perl/Mail-IMAPClient-3.430.0
@@ -5,11 +5,11 @@ DESCRIPTION=IMAP client module for Perl
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-IMAPClient
 IUSE=test ntlm md5 ssl zlib test examples
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Temp >=virtual/perl-IO-1.260.0 virtual/perl-Scalar-List-Utils virtual/perl-MIME-Base64 >=dev-perl/Parse-RecDescent-1.940.0 ntlm? ( dev-perl/Authen-NTLM ) md5? ( dev-perl/Authen-SASL dev-perl/Digest-HMAC virtual/perl-Digest-MD5 ) ssl? ( dev-perl/IO-Socket-SSL ) zlib? ( virtual/perl-IO-Compress ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.43.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=140e7ea3a68f66ef1d703e560996849b
+_md5_=64e6e4ebc24f5d824b461f27ea01c92e
diff --git a/metadata/md5-cache/dev-perl/Mail-Message-3.10.0 b/metadata/md5-cache/dev-perl/Mail-Message-3.10.0
index 8f3d3e0c1e62..2a7acbf3224f 100644
--- a/metadata/md5-cache/dev-perl/Mail-Message-3.10.0
+++ b/metadata/md5-cache/dev-perl/Mail-Message-3.10.0
@@ -5,11 +5,11 @@ DESCRIPTION=General Message Object for MIME Messsage Handling
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-Message
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate >=virtual/perl-Encode-2.260.0 >=virtual/perl-File-Spec-0.700.0 dev-perl/IO-stringy virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.4.0 >=dev-perl/MailTools-2.170.0 >=virtual/perl-Scalar-List-Utils-1.130.0 >=dev-perl/URI-1.230.0 >=dev-perl/User-Identity-1.0.0 !!<dev-perl/Mail-Box-3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.010.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=53c812b7474e344b629eba9d3d5ad3d7
+_md5_=53899fcbfd223fd1644cce791246d806
diff --git a/metadata/md5-cache/dev-perl/Mail-Transport-3.5.0 b/metadata/md5-cache/dev-perl/Mail-Transport-3.5.0
index ec16506e69a1..cc5d0d8757d9 100644
--- a/metadata/md5-cache/dev-perl/Mail-Transport-3.5.0
+++ b/metadata/md5-cache/dev-perl/Mail-Transport-3.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Base class for Email Message Exchange
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-Transport
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-File-Spec-0.700.0 virtual/perl-IO >=dev-perl/Mail-Message-3 virtual/perl-Scalar-List-Utils virtual/perl-libnet !!<dev-perl/Mail-Box-3 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.005.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=697e6e809f81f824814cfd886127d7e6
+_md5_=c56e48d948ff3fe7b6fb18afac6b98b6
diff --git a/metadata/md5-cache/dev-perl/MailTools-2.210.0 b/metadata/md5-cache/dev-perl/MailTools-2.210.0
index 2208956fbf70..40a6a5f82fb3 100644
--- a/metadata/md5-cache/dev-perl/MailTools-2.210.0
+++ b/metadata/md5-cache/dev-perl/MailTools-2.210.0
@@ -5,11 +5,11 @@ DESCRIPTION=Manipulation of electronic mail addresses
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/MailTools
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate virtual/perl-IO >=virtual/perl-libnet-1.50.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=8c9a62babfdaeb9cb99affad71d79e89
+_md5_=8b45d78625ab445cba153939f49836e6
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index d683b88a26da..ec25e751e3d2 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Math-Int128-0.220.0 b/metadata/md5-cache/dev-perl/Math-Int128-0.220.0
index 12e87b252e87..c6452b832997 100644
--- a/metadata/md5-cache/dev-perl/Math-Int128-0.220.0
+++ b/metadata/md5-cache/dev-perl/Math-Int128-0.220.0
@@ -5,11 +5,11 @@ DESCRIPTION=Manipulate 128 bits integers in Perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Math-Int128
 IUSE=test examples
-KEYWORDS=~alpha amd64 -arm ~arm64 ~ia64 ~mips -ppc ~ppc64 ~sparc -x86
+KEYWORDS=~alpha amd64 -arm ~arm64 ~ia64 ~mips -ppc ppc64 ~sparc -x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter >=dev-perl/Math-Int64-0.510.0 virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Math-Int128-0.22.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=9cb85ec17906b6b990dc45ac51691bac
+_md5_=a3047db701953474d9ce1cb39b93d9de
diff --git a/metadata/md5-cache/dev-perl/Math-Int64-0.540.0 b/metadata/md5-cache/dev-perl/Math-Int64-0.540.0
index 1ca41e735e1a..ea6b9e4b1437 100644
--- a/metadata/md5-cache/dev-perl/Math-Int64-0.540.0
+++ b/metadata/md5-cache/dev-perl/Math-Int64-0.540.0
@@ -5,11 +5,11 @@ DESCRIPTION=Manipulate 64 bits integers in Perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Math-Int64
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc64 sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Math-Int64-0.54.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ff3f131f6c3f69da16dadff54306d006
+_md5_=def132e805c7c69d566eab40b9ac0ca8
diff --git a/metadata/md5-cache/dev-perl/Math-NumSeq-74.0.0 b/metadata/md5-cache/dev-perl/Math-NumSeq-74.0.0
index b1d51816f6f8..edf2cbdc2d5a 100644
--- a/metadata/md5-cache/dev-perl/Math-NumSeq-74.0.0
+++ b/metadata/md5-cache/dev-perl/Math-NumSeq-74.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=number sequences (for example from OEIS)
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Math-NumSeq
 IUSE=examples test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Scalar-List-Utils >=dev-perl/Math-Factor-XS-0.400.0 dev-perl/Math-Libm >=dev-perl/Math-Prime-XS-0.260.0 virtual/perl-Module-Load >=dev-perl/Module-Pluggable-4.700.0 dev-perl/Module-Util >=dev-perl/constant-defer-1.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/Math-NumSeq-74.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=75a95e7d1ab0d3c9a07e25d09613914c
+_md5_=e3571c90abd4c777e18f641526571e48
diff --git a/metadata/md5-cache/dev-perl/Math-PlanePath-129.0.0 b/metadata/md5-cache/dev-perl/Math-PlanePath-129.0.0
index f30694377406..d033388e7505 100644
--- a/metadata/md5-cache/dev-perl/Math-PlanePath-129.0.0
+++ b/metadata/md5-cache/dev-perl/Math-PlanePath-129.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Mathematical paths through the 2-D plane
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Math-PlanePath
 IUSE=gmp test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3+
 RDEPEND=gmp? ( dev-perl/Math-BigInt-GMP ) dev-perl/Math-Libm dev-perl/Math-NumSeq >=dev-perl/constant-defer-5.0.0 virtual/perl-Scalar-List-Utils virtual/perl-Math-BigInt dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-129.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=08bf82ab5f7c5e4cfb199a7e3beb2973
+_md5_=1b42c57994bd6e8a27e0f624561140ef
diff --git a/metadata/md5-cache/dev-perl/Module-Build-0.423.100 b/metadata/md5-cache/dev-perl/Module-Build-0.423.100
index 972b9f374107..3c06c4d99b01 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-0.423.100
+++ b/metadata/md5-cache/dev-perl/Module-Build-0.423.100
@@ -5,11 +5,11 @@ DESCRIPTION=Build and install Perl modules
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Module-Build
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-Meta-2.142.60 virtual/perl-Data-Dumper >=virtual/perl-ExtUtils-CBuilder-0.270.0 virtual/perl-ExtUtils-Install virtual/perl-ExtUtils-Manifest virtual/perl-ExtUtils-MakeMaker >=virtual/perl-ExtUtils-ParseXS-2.210.0 >=virtual/perl-File-Spec-0.820.0 virtual/perl-Getopt-Long >=virtual/perl-Module-Metadata-1.0.2 >=virtual/perl-Perl-OSType-1 >=virtual/perl-Test-Harness-3.290.0 virtual/perl-Text-ParseWords >=virtual/perl-podlators-2.1.0 >=virtual/perl-version-0.870.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=75d9acbe39925b9cd233c4a095ba7ced
+_md5_=d87adf22948c975af58ac92cc0be67a9
diff --git a/metadata/md5-cache/dev-perl/Module-Compile-0.380.0 b/metadata/md5-cache/dev-perl/Module-Compile-0.380.0
index 8600738ecdec..11b3cfd8a924 100644
--- a/metadata/md5-cache/dev-perl/Module-Compile-0.380.0
+++ b/metadata/md5-cache/dev-perl/Module-Compile-0.380.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl Module Compilation
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Module-Compile
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny >=dev-perl/Digest-SHA1-2.130.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Module-Compile-0.38.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=77603bcdf70b6ec0c602fab94d23630d
+_md5_=d6c044034e71a3766b74ab2ddd343a35
diff --git a/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0-r1 b/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0-r1
index 435d7af2ff48..e302dfb963d1 100644
--- a/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Pluggable-5.200.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Automatically give your module the ability to have plugins
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Module-Pluggable
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-3 virtual/perl-if dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=223d367813c6c52feba8730843de9b94
+_md5_=8c3dcc797841f9f0963f3407e72f2deb
diff --git a/metadata/md5-cache/dev-perl/Moo-2.3.3 b/metadata/md5-cache/dev-perl/Moo-2.3.3
index 7e2ca9a773ce..49b8627021b0 100644
--- a/metadata/md5-cache/dev-perl/Moo-2.3.3
+++ b/metadata/md5-cache/dev-perl/Moo-2.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Minimalist Object Orientation (with Moose compatiblity)
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Moo
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Method-Modifiers-1.100.0 >=dev-perl/Devel-GlobalDestruction-0.110.0 >=virtual/perl-Exporter-5.570.0 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Role-Tiny-2.0.4 >=dev-perl/Sub-Quote-2.3.1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Moo-2.003003.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=262f2e9d85169df1e41226fdb74a2b59
+_md5_=e64c88be10aba6f49d3be14fa21ba9a5
diff --git a/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0-r1 b/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0-r1
index 6a0d59226319..4e33f535cb77 100644
--- a/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Current top level domain names including new ICANN additions and ccT
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-Domain-TLD
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Storable dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXP/Net-Domain-TLD-1.75.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=14bdac36ca549dbf7a37cc718664f49f
+_md5_=7fc69d0336bab772a817b632cd5f9f1e
diff --git a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r2 b/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r2
index 1cb030a86d97..fa2a4903c736 100644
--- a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r2
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Jabber Perl library
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Net-Jabber
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-Stream dev-perl/Net-XMPP dev-perl/Digest-SHA1 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REATMON/Net-Jabber-2.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=40433a1e044ff544109846f5d238f243
+_md5_=7a1f922cc475403cba6841c89d46299e
diff --git a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0-r1 b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0-r1
index 1a26b7813107..0e9ee245a89f 100644
--- a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=XMPP Perl Library
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-XMPP
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-perl/Authen-SASL-2.120.0 virtual/perl-Digest-SHA virtual/perl-Scalar-List-Utils >=dev-perl/XML-Stream-1.240.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAPATRICK/Net-XMPP-1.05.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=13b5525fbec194d4f0d22d58179e054f
+_md5_=a4e5b7bc9964da83a88185aafbbdc630
diff --git a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0-r1 b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0-r1
index 8f899efcf8a9..80a124cbc08c 100644
--- a/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0-r1
+++ b/metadata/md5-cache/dev-perl/OLE-StorageLite-0.200.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Simple Class for OLE document interface
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/OLE-Storage_Lite
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.20.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=45e361c917763e707deeb9a85f5fd74f
+_md5_=4732901bd0979ec31be750f2da6e9f48
diff --git a/metadata/md5-cache/dev-perl/POE-1.368.0 b/metadata/md5-cache/dev-perl/POE-1.368.0
index c72dcd2e6331..3754d3fad6c3 100644
--- a/metadata/md5-cache/dev-perl/POE-1.368.0
+++ b/metadata/md5-cache/dev-perl/POE-1.368.0
@@ -5,11 +5,11 @@ DESCRIPTION=A framework for creating multitasking programs in Perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/POE
 IUSE=ipv6 libwww ncurses tk test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-File-Spec-0.870.0 >=virtual/perl-IO-1.240.0 >=dev-perl/IO-Pipely-0.5.0 >=dev-perl/IO-Tty-1.80.0 >=virtual/perl-Storable-2.160.0 >=virtual/perl-Time-HiRes-1.590.0 ipv6? ( >=dev-perl/Socket6-0.14 ) tk? ( >=dev-perl/Tk-800.027 ) libwww? ( >=dev-perl/libwww-perl-5.79 >=dev-perl/URI-1.30 ) ncurses? ( >=dev-perl/Curses-1.08 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/POE-1.368.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c6bc632f007705118498d48fd3e4b8ac
+_md5_=e9332ce633b4977323cb07a2cfd0879c
diff --git a/metadata/md5-cache/dev-perl/PPI-1.270.0-r1 b/metadata/md5-cache/dev-perl/PPI-1.270.0-r1
index 96750547b90c..a1a529079477 100644
--- a/metadata/md5-cache/dev-perl/PPI-1.270.0-r1
+++ b/metadata/md5-cache/dev-perl/PPI-1.270.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Parse, Analyze and Manipulate Perl (without perl)
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/PPI
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Clone-0.300.0 >=virtual/perl-Digest-MD5-2.350.0 virtual/perl-Exporter virtual/perl-File-Spec >=dev-perl/IO-String-1.70.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Params-Util-1.000.0 >=virtual/perl-Storable-2.170.0 dev-perl/Task-Weaken dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.270.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=ecae6004f1848cf5c7de5d0296266278
+_md5_=0691bfc9443cc425669955c1452f57fe
diff --git a/metadata/md5-cache/dev-perl/PPIx-QuoteLike-0.17.0 b/metadata/md5-cache/dev-perl/PPIx-QuoteLike-0.17.0
index f1968a277616..bf1060cd4902 100644
--- a/metadata/md5-cache/dev-perl/PPIx-QuoteLike-0.17.0
+++ b/metadata/md5-cache/dev-perl/PPIx-QuoteLike-0.17.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parse Perl string literals and string-literal-like things
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/PPIx-QuoteLike
 IUSE=test examples examples
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ppc ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=dev-perl/PPI-1.117.0 dev-perl/PPIx-Regexp dev-perl/Readonly virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.017.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=37dea5bec7c0733a768f7b56d26359c1
+_md5_=16848c4b223ecfd343c04f9f11699a04
diff --git a/metadata/md5-cache/dev-perl/PPIx-Regexp-0.80.0 b/metadata/md5-cache/dev-perl/PPIx-Regexp-0.80.0
index fd0a3d584698..adce2aa93d62 100644
--- a/metadata/md5-cache/dev-perl/PPIx-Regexp-0.80.0
+++ b/metadata/md5-cache/dev-perl/PPIx-Regexp-0.80.0
@@ -5,11 +5,11 @@ DESCRIPTION=Represent a regular expression of some sort
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/PPIx-Regexp
 IUSE=test examples examples
-KEYWORDS=~alpha ~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter dev-perl/List-MoreUtils >=dev-perl/PPI-1.117.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.080.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=5ee51d6c65f5feb02d7f353959398bc0
+_md5_=118dfed5fd869361126a60b616fa7427
diff --git a/metadata/md5-cache/dev-perl/Path-Class-0.370.0-r1 b/metadata/md5-cache/dev-perl/Path-Class-0.370.0-r1
index 130fba62707a..61a61ee26774 100644
--- a/metadata/md5-cache/dev-perl/Path-Class-0.370.0-r1
+++ b/metadata/md5-cache/dev-perl/Path-Class-0.370.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Cross-platform path specification manipulation
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Path-Class
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Path >=virtual/perl-File-Spec-3.260.0 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Perl-OSType virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.37.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=92efef4ec2edc5a0946656a698c7c33c
+_md5_=f174871acb7a1a8472f49fde120860d9
diff --git a/metadata/md5-cache/dev-perl/Pegex-0.750.0 b/metadata/md5-cache/dev-perl/Pegex-0.750.0
index 2cf4622cf8c2..dd899cb1ff67 100644
--- a/metadata/md5-cache/dev-perl/Pegex-0.750.0
+++ b/metadata/md5-cache/dev-perl/Pegex-0.750.0
@@ -5,11 +5,11 @@ DESCRIPTION=Acmeist PEG Parser Framework
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Pegex
 IUSE=test test examples
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/File-ShareDir-Install virtual/perl-JSON-PP virtual/perl-Scalar-List-Utils >=dev-perl/XXX-0.350.0 >=dev-perl/YAML-PP-0.19.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Pegex-0.75.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=23fff88c2157a0d4816d3069f1a62afa
+_md5_=aaa9142b10841861880eb41f45c28f1f
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.140.0-r1 b/metadata/md5-cache/dev-perl/Perl-Critic-1.140.0-r1
index e9125941639c..cd587c55db54 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-1.140.0-r1
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-1.140.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Critique Perl source code for best-practices
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Perl-Critic
 IUSE=minimal examples emacs test
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ppc ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2 >=dev-perl/Exception-Class-1.230.0 >=virtual/perl-Exporter-5.630.0 virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-Which virtual/perl-Getopt-Long dev-perl/IO-String >=dev-perl/List-MoreUtils-0.190.0 >=dev-perl/Module-Pluggable-3.100.0 >=dev-perl/PPI-1.265.0 dev-perl/PPIx-QuoteLike >=dev-perl/PPIx-Regexp-0.80.0 >=dev-perl/PPIx-Utilities-1.1.0 dev-perl/Pod-Parser >=dev-perl/Pod-Spell-1 >=dev-perl/Readonly-2 virtual/perl-Scalar-List-Utils >=dev-perl/String-Format-1.180.0 dev-perl/Task-Weaken >=virtual/perl-Term-ANSIColor-2.20.0 >=virtual/perl-Test-Simple-0.920.0 >=virtual/perl-Text-ParseWords-3 dev-perl/Perl-Tidy >=virtual/perl-version-0.770.0 emacs? ( >=app-editors/emacs-23.1:* ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.140.tar.gz
 _eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=17c6da15ef4eba33c972b616a25b6ad6
+_md5_=ef1b5c158c32a429ba86c071376f01ac
diff --git a/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0-r1 b/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0-r1
index 70d29ec1201d..bbab6844671a 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0-r1
+++ b/metadata/md5-cache/dev-perl/PerlIO-gzip-0.200.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=PerlIO layer to gzip/gunzip
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/PerlIO-gzip
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-libs/zlib dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NW/NWCLARK/PerlIO-gzip-0.20.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=feeff436e8caa8d5391ffd516174bdcd
+_md5_=c5c7fd66f69782a7cda0e03313fc784e
diff --git a/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.8.0 b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.8.0
index 384986995f26..112b86c6ea0c 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.8.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.8.0
@@ -5,11 +5,11 @@ DESCRIPTION=Fast and correct UTF-8 IO
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/PerlIO-utf8_strict
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.008.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=517e2d8fb768c06aa6c1db8649f94796
+_md5_=9d2b0bf861828201f460cc50a9c70876
diff --git a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r2 b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r2
index 1b507c04a619..4c387b008874 100644
--- a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r2
+++ b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Convert Pod data to formatted LaTeX
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Pod-LaTeX
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Pod-Parser virtual/perl-if dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=d80d038e56089e636c8e0d3e7c2934eb
+_md5_=08cde4d6034a801345059335e5957983
diff --git a/metadata/md5-cache/dev-perl/Pod-Markdown-Github-0.40.0 b/metadata/md5-cache/dev-perl/Pod-Markdown-Github-0.40.0
index 10521a72c12a..c0a4c261f432 100644
--- a/metadata/md5-cache/dev-perl/Pod-Markdown-Github-0.40.0
+++ b/metadata/md5-cache/dev-perl/Pod-Markdown-Github-0.40.0
@@ -5,11 +5,11 @@ DESCRIPTION=Convert POD to Github's specific markdown
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Pod-Markdown-Github
 IUSE=test
-KEYWORDS=~amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Getopt-Long dev-perl/Pod-Markdown virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.04.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=f74c79c5a93c521e9ea0777fd13828fa
+_md5_=c2d45946a18b3f1e831fda6273f9bda8
diff --git a/metadata/md5-cache/dev-perl/Pod-Readme-1.2.3 b/metadata/md5-cache/dev-perl/Pod-Readme-1.2.3
index bdc5c93d19ae..d1bffb0d6457 100644
--- a/metadata/md5-cache/dev-perl/Pod-Readme-1.2.3
+++ b/metadata/md5-cache/dev-perl/Pod-Readme-1.2.3
@@ -5,11 +5,11 @@ DESCRIPTION=Intelligently generate a README file from POD
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Pod-Readme
 IUSE=minimal test
-KEYWORDS=~amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Pod-Markdown dev-perl/Pod-Markdown-Github dev-perl/Pod-Simple-LaTeX dev-perl/Type-Tiny-XS virtual/perl-podlators ) >=dev-perl/CPAN-Changes-0.300.0 virtual/perl-CPAN-Meta dev-perl/Class-Method-Modifiers dev-perl/File-Slurp dev-perl/Getopt-Long-Descriptive virtual/perl-Module-CoreList dev-perl/Moo dev-perl/MooX-HandlesVia dev-perl/Path-Tiny virtual/perl-Pod-Simple dev-perl/Role-Tiny >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Try-Tiny >=dev-perl/Type-Tiny-1.0.0 dev-perl/namespace-autoclean dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RR/RRWO/Pod-Readme-v1.2.3.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=b606258196e612e9b0838932d9fc7825
+_md5_=4f06ffe55be72a1767b5f96ef639802c
diff --git a/metadata/md5-cache/dev-perl/Quota-1.8.1 b/metadata/md5-cache/dev-perl/Quota-1.8.1
new file mode 100644
index 000000000000..e3dc64c1740b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Quota-1.8.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-fs/quota[rpc] net-libs/libtirpc virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-lang/perl
+DESCRIPTION=Perl interface to file system quotas
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Quota
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sys-fs/quota[rpc] net-libs/libtirpc dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOMZO/Quota-1.8.1.tar.gz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4b2d6dff401bcf36dfd189b99cfc9b07
diff --git a/metadata/md5-cache/dev-perl/REST-Client-273 b/metadata/md5-cache/dev-perl/REST-Client-273
deleted file mode 100644
index e79c7fe13600..000000000000
--- a/metadata/md5-cache/dev-perl/REST-Client-273
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/LWP-Protocol-https dev-perl/libwww-perl dev-perl/URI virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=A simple client for interacting with RESTful http/https resources
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/REST-Client
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/LWP-Protocol-https dev-perl/libwww-perl dev-perl/URI dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KK/KKANE/REST-Client-273.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=4e7ad15bb1522dc066274d29dd9993d0
diff --git a/metadata/md5-cache/dev-perl/REST-Client-273-r1 b/metadata/md5-cache/dev-perl/REST-Client-273-r1
new file mode 100644
index 000000000000..b937b0ca8337
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/REST-Client-273-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/LWP-Protocol-https dev-perl/libwww-perl dev-perl/URI virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/HTTP-Server-Simple virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A simple client for interacting with RESTful http/https resources
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/REST-Client
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/LWP-Protocol-https dev-perl/libwww-perl dev-perl/URI dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KK/KKANE/REST-Client-273.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=3a319086f1cd6de4dc7d67862bb9a052
diff --git a/metadata/md5-cache/dev-perl/RPC-XML-0.820.0 b/metadata/md5-cache/dev-perl/RPC-XML-0.820.0
index f6f31495931b..923d8f69cbfd 100644
--- a/metadata/md5-cache/dev-perl/RPC-XML-0.820.0
+++ b/metadata/md5-cache/dev-perl/RPC-XML-0.820.0
@@ -5,10 +5,11 @@ DESCRIPTION=An implementation of XML-RPC
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/RPC-XML
 IUSE=test examples
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic-2 LGPL-2.1 )
 RDEPEND=virtual/perl-Carp >=dev-perl/HTTP-Daemon-6.120.0 >=dev-perl/HTTP-Message-6.260.0 >=dev-perl/libwww-perl-6.510.0 >=virtual/perl-Module-Load-0.360.0 >=virtual/perl-Scalar-List-Utils-1.550.0 >=dev-perl/XML-Parser-2.460.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.82.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=ed941956d01c699a163c6e83cbed0f30
+_md5_=f8b519b9a85a2ebd6b70c6ff97b4213a
diff --git a/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2 b/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
deleted file mode 100644
index 96407c47004c..000000000000
--- a/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Image-Size dev-lang/perl:=[-build(-)]
-DESCRIPTION=RTF::Writer - for generating documents in Rich Text Format
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/RTF-Writer
-KEYWORDS=~amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Image-Size dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/RTF-Writer-1.11.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9b532c0103d5af689ea85df04e9b03be
diff --git a/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r3 b/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r3
new file mode 100644
index 000000000000..d230c33a7dcb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Image-Size dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=RTF::Writer - for generating documents in Rich Text Format
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/RTF-Writer
+IUSE=test
+KEYWORDS=~amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Image-Size dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/RTF-Writer-1.11.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=d3120237177231ad62a6eaba00a842ad
diff --git a/metadata/md5-cache/dev-perl/Rcs-1.50.0-r2 b/metadata/md5-cache/dev-perl/Rcs-1.50.0-r2
deleted file mode 100644
index 80192684d065..000000000000
--- a/metadata/md5-cache/dev-perl/Rcs-1.50.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-vcs/rcs dev-lang/perl
-DESCRIPTION=Perl bindings for Revision Control System
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Rcs
-IUSE=examples
-KEYWORDS=~amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-vcs/rcs dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CF/CFRETER/Rcs-1.05.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=5ae385f03d6348c325d582b8f940bc0b
diff --git a/metadata/md5-cache/dev-perl/Rcs-1.50.0-r3 b/metadata/md5-cache/dev-perl/Rcs-1.50.0-r3
new file mode 100644
index 000000000000..10b2e3f4efd3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Rcs-1.50.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-vcs/rcs dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-vcs/rcs dev-lang/perl
+DESCRIPTION=Perl bindings for Revision Control System
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Rcs
+IUSE=test examples
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-vcs/rcs dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CF/CFRETER/Rcs-1.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=2b342b780a57ab19555b7a7763f3d00b
diff --git a/metadata/md5-cache/dev-perl/Readonly-2.50.0 b/metadata/md5-cache/dev-perl/Readonly-2.50.0
deleted file mode 100644
index fba5d3a59e9c..000000000000
--- a/metadata/md5-cache/dev-perl/Readonly-2.50.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Module-Build-Tiny-0.35.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Facility for creating read-only scalars, arrays, hashes
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Readonly
-IUSE=test
-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=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SA/SANKO/Readonly-2.05.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=0d1af74b58e5e6a9df03d9a6bd6b9752
diff --git a/metadata/md5-cache/dev-perl/Readonly-2.50.0-r1 b/metadata/md5-cache/dev-perl/Readonly-2.50.0-r1
new file mode 100644
index 000000000000..e9137a2a3107
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Readonly-2.50.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Module-Build-Tiny-0.35.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Facility for creating read-only scalars, arrays, hashes
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Readonly
+IUSE=test
+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=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SANKO/Readonly-2.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=88c595548fa964c0d75e0b2b3fe48792
diff --git a/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1 b/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1
deleted file mode 100644
index 7c8a4120bf86..000000000000
--- a/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Readonly dev-lang/perl:=[-build(-)]
-DESCRIPTION=Companion module for Readonly.pm, to speed up read-only scalar variables
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Readonly-XS
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Readonly dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RO/ROODE/Readonly-XS-1.05.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=624b992afa47e1dbd75a87aab83939c1
diff --git a/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r2 b/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r2
new file mode 100644
index 000000000000..bb0628992aea
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Readonly-XS-1.50.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Readonly dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Companion module for Readonly.pm, to speed up read-only scalar variables
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Readonly-XS
+IUSE=test
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Readonly dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RO/ROODE/Readonly-XS-1.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=901dc289c85746f1ff1f87205a6925f3
diff --git a/metadata/md5-cache/dev-perl/Redis-1.998.0 b/metadata/md5-cache/dev-perl/Redis-1.998.0
index efbe48b4ee32..aab82f89964d 100644
--- a/metadata/md5-cache/dev-perl/Redis-1.998.0
+++ b/metadata/md5-cache/dev-perl/Redis-1.998.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl binding for Redis database
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Redis
 IUSE=test minimal
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/IO-Socket-Timeout-0.290.0 dev-perl/Try-Tiny dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAMS/Redis-1.998.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=b1aa12f0786370e0ff858eb08f950706
+_md5_=cfe67becebd6689d10b25686a8c1e613
diff --git a/metadata/md5-cache/dev-perl/RedisDB-2.570.0 b/metadata/md5-cache/dev-perl/RedisDB-2.570.0
new file mode 100644
index 000000000000..34826bcc34ec
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/RedisDB-2.570.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=virtual/perl-Encode-2.100.0 virtual/perl-IO-Socket-IP >=dev-perl/RedisDB-Parser-2.210.0 dev-perl/Try-Tiny dev-perl/URI dev-perl/URI-redis >=dev-perl/Test-TCP-1.170.0 virtual/perl-Digest-SHA >=virtual/perl-ExtUtils-MakeMaker-6.300.200 test? ( !minimal? ( dev-db/redis ) >=dev-perl/Test-Differences-0.610.0 dev-perl/Test-FailWarnings >=dev-perl/Test-Most-0.220.0 >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
+DESCRIPTION=Perl extension to access redis database
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/RedisDB
+IUSE=minimal test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Encode-2.100.0 virtual/perl-IO-Socket-IP >=dev-perl/RedisDB-Parser-2.210.0 dev-perl/Try-Tiny dev-perl/URI dev-perl/URI-redis >=dev-perl/Test-TCP-1.170.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Z/ZW/ZWON/RedisDB-2.57.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=80ff8774ca3095705b342042ef9a3ac5
diff --git a/metadata/md5-cache/dev-perl/RedisDB-Parser-2.230.0 b/metadata/md5-cache/dev-perl/RedisDB-Parser-2.230.0
new file mode 100644
index 000000000000..7fabe1baed6f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/RedisDB-Parser-2.230.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Encode-2.100.0 dev-perl/Try-Tiny >=virtual/perl-ExtUtils-MakeMaker-6.300.200 >=virtual/perl-ExtUtils-CBuilder-0.270.0 test? ( dev-perl/Test-FailWarnings >=dev-perl/Test-Most-0.220.0 >=virtual/perl-Test-Simple-0.940.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Redis protocol parser for RedisDB
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/RedisDB-Parser
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Encode-2.100.0 dev-perl/Try-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Z/ZW/ZWON/RedisDB-Parser-2.23.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=59f3a591c2b5120a8966101af69d1726
diff --git a/metadata/md5-cache/dev-perl/Ref-Util-0.204.0 b/metadata/md5-cache/dev-perl/Ref-Util-0.204.0
new file mode 100644
index 000000000000..2d204b5b3df4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Ref-Util-0.204.0
@@ -0,0 +1,15 @@
+BDEPEND=xs? ( dev-perl/Ref-Util-XS ) >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtUtils-MakeMaker virtual/perl-Text-ParseWords test? ( >=virtual/perl-CPAN-Meta-2.120.900 >=virtual/perl-Test-Simple-0.960.0 virtual/perl-File-Spec ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Utility functions for checking references
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Ref-Util
+IUSE=+xs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=xs? ( dev-perl/Ref-Util-XS ) >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AR/ARC/Ref-Util-0.204.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=fcb281a888feb69f6e8286f12f452fde
diff --git a/metadata/md5-cache/dev-perl/Ref-Util-XS-0.117.0 b/metadata/md5-cache/dev-perl/Ref-Util-XS-0.117.0
new file mode 100644
index 000000000000..96b9755a4980
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Ref-Util-XS-0.117.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-CPAN-Meta-2.120.900 virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=XS Implementation for Ref::Util
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Ref-Util-XS
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/X/XS/XSAWYERX/Ref-Util-XS-0.117.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=4a451250cb2f1954762b699a1009b3df
diff --git a/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0 b/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0
deleted file mode 100644
index 507abec3fa00..000000000000
--- a/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Regexp ) dev-lang/perl
-DESCRIPTION=Provide commonly requested regular expressions
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Regexp-Common
-IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( Artistic Artistic-2 MIT BSD )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=59ee40e5afe78c6ca6498c4f346413ac
diff --git a/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0-r1 b/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0-r1
new file mode 100644
index 000000000000..25eed6329199
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Regexp ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Provide commonly requested regular expressions
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Regexp-Common
+IUSE=test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic Artistic-2 MIT BSD )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=0e4a83150170969daacc608770681641
diff --git a/metadata/md5-cache/dev-perl/Regexp-Common-net-CIDR-0.30.0 b/metadata/md5-cache/dev-perl/Regexp-Common-net-CIDR-0.30.0
deleted file mode 100644
index 68449e658a57..000000000000
--- a/metadata/md5-cache/dev-perl/Regexp-Common-net-CIDR-0.30.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Regexp-Common >=virtual/perl-ExtUtils-MakeMaker-6.590.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Provides patterns for CIDR blocks
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Regexp-Common-net-CIDR
-IUSE=test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Regexp-Common dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BP/BPS/Regexp-Common-net-CIDR-0.03.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e1e03e3b615bcc90432cb4371a6465d5
diff --git a/metadata/md5-cache/dev-perl/Regexp-Common-net-CIDR-0.30.0-r1 b/metadata/md5-cache/dev-perl/Regexp-Common-net-CIDR-0.30.0-r1
new file mode 100644
index 000000000000..90777ab718e8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Regexp-Common-net-CIDR-0.30.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Regexp-Common >=virtual/perl-ExtUtils-MakeMaker-6.590.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Provides patterns for CIDR blocks
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Regexp-Common-net-CIDR
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Regexp-Common dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BP/BPS/Regexp-Common-net-CIDR-0.03.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=9d896366c9ebda50ffd2fbaed1d950df
diff --git a/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1 b/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1
deleted file mode 100644
index b92e7072853f..000000000000
--- a/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Regular expression for IPv6 addresses
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Regexp-IPv6
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Regexp-IPv6-0.03.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b182e07692f6de7fb5523a032eefa6dd
diff --git a/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r2 b/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r2
new file mode 100644
index 000000000000..0b5ddb012299
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Regexp-IPv6-0.30.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Regular expression for IPv6 addresses
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Regexp-IPv6
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Regexp-IPv6-0.03.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=9f8b442a7a49d24317d658e78bd54b37
diff --git a/metadata/md5-cache/dev-perl/Regexp-RegGrp-2.10.0 b/metadata/md5-cache/dev-perl/Regexp-RegGrp-2.10.0
deleted file mode 100644
index a89f0433dbb7..000000000000
--- a/metadata/md5-cache/dev-perl/Regexp-RegGrp-2.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Groups a regular expressions collection
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Regexp-RegGrp
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/Regexp-RegGrp-2.01.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=6c6ae87637e6cff61b3f88a288817d82
diff --git a/metadata/md5-cache/dev-perl/Regexp-RegGrp-2.10.0-r1 b/metadata/md5-cache/dev-perl/Regexp-RegGrp-2.10.0-r1
new file mode 100644
index 000000000000..e9e0c57d4937
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Regexp-RegGrp-2.10.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Groups a regular expressions collection
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Regexp-RegGrp
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/Regexp-RegGrp-2.01.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=1564eedea3783d4df5d37d3c1225f7b4
diff --git a/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1 b/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1
deleted file mode 100644
index 34904a0d4153..000000000000
--- a/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Regexp::Shellish - Shell-like regular expressions
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Regexp-Shellish
-KEYWORDS=~alpha amd64 ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RB/RBS/Regexp-Shellish-0.93.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f01387696dc843bf9d9acd029a53f442
diff --git a/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r2 b/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r2
new file mode 100644
index 000000000000..48282bd86728
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Regexp-Shellish-0.930.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Regexp::Shellish - Shell-like regular expressions
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Regexp-Shellish
+IUSE=test
+KEYWORDS=~alpha amd64 ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RB/RBS/Regexp-Shellish-0.93.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=0d8c5122e31f4f121d6bc72cbc02aa1c
diff --git a/metadata/md5-cache/dev-perl/Regexp-Util-0.3.0 b/metadata/md5-cache/dev-perl/Regexp-Util-0.3.0
index 304438bb01cf..75ce616bc01e 100644
--- a/metadata/md5-cache/dev-perl/Regexp-Util-0.3.0
+++ b/metadata/md5-cache/dev-perl/Regexp-Util-0.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=General purpose utilities for working with Regular Expressions
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Regexp-Util
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Regexp-Util-0.003.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=9eb6f1b62b93a8ddaad758d6d22b925c
+_md5_=5cdb73547406a95c1e735e962f32161b
diff --git a/metadata/md5-cache/dev-perl/Regexp-Util-0.5.0 b/metadata/md5-cache/dev-perl/Regexp-Util-0.5.0
new file mode 100644
index 000000000000..417e5b294019
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Regexp-Util-0.5.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Exporter-Tiny >=virtual/perl-ExtUtils-MakeMaker-6.170.0 test? ( >=virtual/perl-Test-Simple-0.920.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=General purpose utilities for working with Regular Expressions
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Regexp-Util
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Exporter-Tiny dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Regexp-Util-0.005.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=52d39b613036f8f4f5f5db7f8cb7eefd
diff --git a/metadata/md5-cache/dev-perl/Return-Value-1.666.5 b/metadata/md5-cache/dev-perl/Return-Value-1.666.5
deleted file mode 100644
index 3456e1f22bbf..000000000000
--- a/metadata/md5-cache/dev-perl/Return-Value-1.666.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-CPAN-Meta-2.120.900 virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
-DESCRIPTION=Polymorphic Return Values
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Return-Value
-IUSE=test
-KEYWORDS=amd64 ~mips ppc ppc64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666005.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=6a6f022eda7ad5537108d7d5c7a24c92
diff --git a/metadata/md5-cache/dev-perl/Return-Value-1.666.5-r1 b/metadata/md5-cache/dev-perl/Return-Value-1.666.5-r1
new file mode 100644
index 000000000000..ccfbb5c38463
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Return-Value-1.666.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-CPAN-Meta-2.120.900 virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Polymorphic Return Values
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Return-Value
+IUSE=test
+KEYWORDS=amd64 ~mips ppc ppc64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666005.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=875169d43d0a797f4d38186e0e13ad28
diff --git a/metadata/md5-cache/dev-perl/Role-Basic-0.130.0 b/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
deleted file mode 100644
index b2bd84a64353..000000000000
--- a/metadata/md5-cache/dev-perl/Role-Basic-0.130.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Module-Build test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Just roles. Nothing else
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Role-Basic
-IUSE=test
-KEYWORDS=amd64
-LICENSE=Artistic-2
-RDEPEND=dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=264a295d3b6cd6284045128fef97cc14
diff --git a/metadata/md5-cache/dev-perl/Role-Basic-0.130.0-r1 b/metadata/md5-cache/dev-perl/Role-Basic-0.130.0-r1
new file mode 100644
index 000000000000..c71063a700bd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Role-Basic-0.130.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Module-Build test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Just roles. Nothing else
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Role-Basic
+IUSE=test
+KEYWORDS=amd64
+LICENSE=Artistic-2
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=c10ade0120c3fba79c31d92d25f1038d
diff --git a/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0 b/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0
deleted file mode 100644
index 8576f344c480..000000000000
--- a/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Moose dev-perl/MooseX-Role-Parameterized dev-perl/String-Errf dev-perl/Try-Tiny dev-perl/namespace-clean >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
-DESCRIPTION=a thing with a message method
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Role-HasMessage
-IUSE=test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Moose dev-perl/MooseX-Role-Parameterized dev-perl/String-Errf dev-perl/Try-Tiny dev-perl/namespace-clean dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=3b1c5e35f8dbee7e8abec1eb0efabcb2
diff --git a/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0-r1 b/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0-r1
new file mode 100644
index 000000000000..09febc4aedf9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Role-HasMessage-0.6.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Moose dev-perl/MooseX-Role-Parameterized dev-perl/String-Errf dev-perl/Try-Tiny dev-perl/namespace-clean >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=a thing with a message method
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Role-HasMessage
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Moose dev-perl/MooseX-Role-Parameterized dev-perl/String-Errf dev-perl/Try-Tiny dev-perl/namespace-clean dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=4ee2bc9ed402e7aecd9cd0edeac3c938
diff --git a/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0 b/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0
deleted file mode 100644
index 2b33ee35dad3..000000000000
--- a/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Moose >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
-DESCRIPTION=a thing with a list of tags
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Role-Identifiable
-IUSE=test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Moose dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=a6e0b27b8825ca8e2bc9dd674c3f37f8
diff --git a/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0-r1 b/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0-r1
new file mode 100644
index 000000000000..28c5e312c87f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Role-Identifiable-0.7.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Moose >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=a thing with a list of tags
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Role-Identifiable
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Moose dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=c8b73bada603a4cdfb270bb4a5be815e
diff --git a/metadata/md5-cache/dev-perl/Role-Tiny-2.2.4 b/metadata/md5-cache/dev-perl/Role-Tiny-2.2.4
index f8b789976e25..a0c9c8523888 100644
--- a/metadata/md5-cache/dev-perl/Role-Tiny-2.2.4
+++ b/metadata/md5-cache/dev-perl/Role-Tiny-2.2.4
@@ -5,11 +5,11 @@ DESCRIPTION=Roles: a nouvelle cuisine portion size slice of Moose
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Role-Tiny
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 !<dev-perl/Moo-0.9.14 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.002004.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=82271ea508bd15a2435961690411ee00
+_md5_=9bb166f26376205abe2fcb0606d9a813
diff --git a/metadata/md5-cache/dev-perl/Roman-1.240.0 b/metadata/md5-cache/dev-perl/Roman-1.240.0
deleted file mode 100644
index 326190bcf3f6..000000000000
--- a/metadata/md5-cache/dev-perl/Roman-1.240.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl module for conversion between Roman and Arabic numerals
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Roman
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~s390 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Roman-1.24.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=86a69732f03f88976f71e320942b97fa
diff --git a/metadata/md5-cache/dev-perl/Roman-1.240.0-r1 b/metadata/md5-cache/dev-perl/Roman-1.240.0-r1
new file mode 100644
index 000000000000..72f782fb39e8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Roman-1.240.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl
+DESCRIPTION=Perl module for conversion between Roman and Arabic numerals
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Roman
+IUSE=test
+KEYWORDS=amd64 ~arm ~arm64 ~mips ~s390 x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Roman-1.24.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=54a3ef32e53385fe9502f9db99423f2f
diff --git a/metadata/md5-cache/dev-perl/Router-Simple-0.170.0 b/metadata/md5-cache/dev-perl/Router-Simple-0.170.0
deleted file mode 100644
index 8964ec014a98..000000000000
--- a/metadata/md5-cache/dev-perl/Router-Simple-0.170.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Class-Accessor-Lite virtual/perl-Scalar-List-Utils virtual/perl-parent dev-perl/Module-Build test? ( >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl
-DESCRIPTION=Simple HTTP router
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Router-Simple
-IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-Accessor-Lite virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Router-Simple-0.17.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=f33e01a3cd37e7290d0844722f71d45c
diff --git a/metadata/md5-cache/dev-perl/Router-Simple-0.170.0-r1 b/metadata/md5-cache/dev-perl/Router-Simple-0.170.0-r1
new file mode 100644
index 000000000000..99d737e0d761
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Router-Simple-0.170.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Class-Accessor-Lite virtual/perl-Scalar-List-Utils virtual/perl-parent dev-perl/Module-Build test? ( >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple HTTP router
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Router-Simple
+IUSE=test
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-Accessor-Lite virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Router-Simple-0.17.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=1605a4602648fddfea63cd48ba73b6c9
diff --git a/metadata/md5-cache/dev-perl/SDL-2.548.0 b/metadata/md5-cache/dev-perl/SDL-2.548.0
new file mode 100644
index 000000000000..cd2e3d421c02
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/SDL-2.548.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Alien-SDL-1.446 dev-perl/Capture-Tiny >=virtual/perl-CPAN-1.920.0 >=virtual/perl-ExtUtils-CBuilder-0.260.301 >=dev-perl/File-ShareDir-1.0.0 >=dev-perl/Module-Build-0.400.0 virtual/perl-Scalar-List-Utils dev-perl/Tie-Simple media-libs/libpng:0 media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf media-libs/smpeg media-libs/tiff:0 virtual/glu virtual/jpeg:0 virtual/opengl test? ( >=dev-perl/Test-Most-0.210.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple DirectMedia Layer (SDL) bindings for perl
+EAPI=8
+HOMEPAGE=http://sdl.perl.org/ http://search.cpan.org/dist/SDL/ https://github.com/PerlGameDev/SDL
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2 OFL-1.1
+RDEPEND=>=dev-perl/Alien-SDL-1.446 dev-perl/Capture-Tiny >=virtual/perl-CPAN-1.920.0 >=virtual/perl-ExtUtils-CBuilder-0.260.301 >=dev-perl/File-ShareDir-1.0.0 >=dev-perl/Module-Build-0.400.0 virtual/perl-Scalar-List-Utils dev-perl/Tie-Simple media-libs/libpng:0 media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf media-libs/smpeg media-libs/tiff:0 virtual/glu virtual/jpeg:0 virtual/opengl dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FR/FROGGS/SDL-2.548.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=e17b458b635adffa53487c37e38d1093
diff --git a/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0 b/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
index 6632c85de963..f0d3e9b6b4fb 100644
--- a/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
+++ b/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight interface to the SOAP protocol both on client and server
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/SOAP-Lite
 IUSE=ssl test xmpp examples
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-perl/URI >=dev-perl/XML-Parser-2.230.0 dev-perl/MIME-tools ssl? ( dev-perl/IO-Socket-SSL dev-perl/LWP-Protocol-https dev-perl/Crypt-SSLeay ) xmpp? ( dev-perl/Net-Jabber ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.26.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=1f5756271d8416ddd3f2d0ef93d36230
+_md5_=2f6501c9975bbdad0587a8b378dadaf9
diff --git a/metadata/md5-cache/dev-perl/Safe-Hole-0.140.0 b/metadata/md5-cache/dev-perl/Safe-Hole-0.140.0
new file mode 100644
index 000000000000..b0b94293504b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Safe-Hole-0.140.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-CBuilder >=dev-perl/Module-Build-0.420.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Exec subs in the original package from Safe
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Safe-Hole
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.14.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=1c7ab8c8e1351e639ce3f7d1f5defe93
diff --git a/metadata/md5-cache/dev-perl/Safe-Isa-1.0.10 b/metadata/md5-cache/dev-perl/Safe-Isa-1.0.10
new file mode 100644
index 000000000000..bd6e26d289dc
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Safe-Isa-1.0.10
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Call isa, can, does and DOES safely on things that may not be objects
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Safe-Isa
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000010.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=b798a296c111c4b824f8d578c31b8350
diff --git a/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1 b/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
deleted file mode 100644
index 17e1d059d168..000000000000
--- a/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=run-time properties on scalar variables
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Scalar-Properties
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MA/MARCEL/Scalar-Properties-1.100860.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2f2d18a8d8ee5a4592e66173a45ee558
diff --git a/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r2 b/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r2
new file mode 100644
index 000000000000..83d90163c64b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=run-time properties on scalar variables
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Scalar-Properties
+IUSE=test
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MA/MARCEL/Scalar-Properties-1.100860.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=2f8cad8155fb8f923d53ffc4f729f5f0
diff --git a/metadata/md5-cache/dev-perl/Schedule-At-1.150.0-r2 b/metadata/md5-cache/dev-perl/Schedule-At-1.150.0-r2
deleted file mode 100644
index 44342effbf61..000000000000
--- a/metadata/md5-cache/dev-perl/Schedule-At-1.150.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-process/at dev-lang/perl
-DESCRIPTION=OS independent interface to the Unix 'at' command
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Schedule-At
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=sys-process/at dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JO/JOSERODR/Schedule-At-1.15.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=c2e0b729c1fe5ef571c118e04ed855b3
diff --git a/metadata/md5-cache/dev-perl/Schedule-At-1.150.0-r3 b/metadata/md5-cache/dev-perl/Schedule-At-1.150.0-r3
new file mode 100644
index 000000000000..239e9ad16b6f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Schedule-At-1.150.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=sys-process/at dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=OS independent interface to the Unix 'at' command
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Schedule-At
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sys-process/at dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JO/JOSERODR/Schedule-At-1.15.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=2c1e2b2d4794f8f97bdf490effbe20fc
diff --git a/metadata/md5-cache/dev-perl/Schedule-Cron-Events-1.960.0 b/metadata/md5-cache/dev-perl/Schedule-Cron-Events-1.960.0
new file mode 100644
index 000000000000..52aba9069125
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Schedule-Cron-Events-1.960.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Time-Local dev-perl/Set-Crontab virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Data-Dumper virtual/perl-Test virtual/perl-Test-Simple dev-perl/Test-Deep ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Take a line from a crontab and find out when events will occur
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Schedule-Cron-Events
+IUSE=test examples
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Time-Local dev-perl/Set-Crontab dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AT/ATOOMIC/Schedule-Cron-Events-1.96.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=3656d5ce8df6e37451c3109585d36b22
diff --git a/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0 b/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0
deleted file mode 100644
index d0f08c0d0be9..000000000000
--- a/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Lexically scoped resource management
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Scope-Guard
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=b990b92a41092bafa43c7838087b7679
diff --git a/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0-r1 b/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0-r1
new file mode 100644
index 000000000000..a1376090bbe7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Scope-Guard-0.210.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Lexically scoped resource management
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Scope-Guard
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=9d08bd07148dea3fdb9320dbb6d0b882
diff --git a/metadata/md5-cache/dev-perl/Scope-Upper-0.320.0 b/metadata/md5-cache/dev-perl/Scope-Upper-0.320.0
new file mode 100644
index 000000000000..e228b834d18e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Scope-Upper-0.320.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Act on upper scopes
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Scope-Upper
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.32.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=87ed7f2ce0084eafee06e85f7e763481
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.2 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.2
deleted file mode 100644
index 3a91b5e7b7ff..000000000000
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Devel-Leak ) dev-lang/perl
-DESCRIPTION=Perl XS frontend to the Xapian C++ search library
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Search-Xapian
-IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.2.tar.gz http://oligarchy.co.uk/xapian/1.2.25/Search-Xapian-1.2.25.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=0afc037a29dd843e6851339a94a5d69c
diff --git a/metadata/md5-cache/dev-perl/Sereal-4.18.0 b/metadata/md5-cache/dev-perl/Sereal-4.18.0
new file mode 100644
index 000000000000..189a4c45b098
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Sereal-4.18.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Sereal-Encoder-4.18.0 >=dev-perl/Sereal-Decoder-4.18.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-perl/Test-LongString >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Warn ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Fast, compact, powerful binary (de-)serialization
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Sereal
+IUSE=test
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Sereal-Encoder-4.18.0 >=dev-perl/Sereal-Decoder-4.18.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.018.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=72dbec8558431ef5b698a796d9e1d730
diff --git a/metadata/md5-cache/dev-perl/Sereal-Decoder-4.18.0 b/metadata/md5-cache/dev-perl/Sereal-Decoder-4.18.0
index b02a056d2184..aac2a0e23a81 100644
--- a/metadata/md5-cache/dev-perl/Sereal-Decoder-4.18.0
+++ b/metadata/md5-cache/dev-perl/Sereal-Decoder-4.18.0
@@ -5,11 +5,11 @@ DESCRIPTION=Fast, compact, powerful binary deserialization
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Sereal-Decoder
 IUSE=test
-KEYWORDS=~amd64 ~ia64 ppc ppc64 sparc ~x86
+KEYWORDS=amd64 ~ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader app-arch/zstd:= dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.018.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=051d0202fb40290f4f13bd57daaeef54
+_md5_=628cf5ea3d110e4942f81b9af752a99d
diff --git a/metadata/md5-cache/dev-perl/Sereal-Decoder-4.4.0 b/metadata/md5-cache/dev-perl/Sereal-Decoder-4.4.0
deleted file mode 100644
index bcd2313407a8..000000000000
--- a/metadata/md5-cache/dev-perl/Sereal-Decoder-4.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-XSLoader app-arch/zstd:= >=virtual/perl-ExtUtils-MakeMaker-7.0 >=virtual/perl-ExtUtils-ParseXS-2.210.0 virtual/perl-File-Path test? ( virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-perl/Test-Deep dev-perl/Test-Differences dev-perl/Test-LongString >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Warn ) dev-lang/perl
-DESCRIPTION=Fast, compact, powerful binary deserialization
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Sereal-Decoder
-IUSE=test
-KEYWORDS=amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-XSLoader app-arch/zstd:= dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.004.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=039b6dce579bcaa07277993c1ed85c8e
diff --git a/metadata/md5-cache/dev-perl/Sereal-Encoder-4.18.0 b/metadata/md5-cache/dev-perl/Sereal-Encoder-4.18.0
new file mode 100644
index 000000000000..562bbfb9a83a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Sereal-Encoder-4.18.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-XSLoader app-arch/zstd:= >=virtual/perl-ExtUtils-MakeMaker-7.0.0 >=virtual/perl-ExtUtils-ParseXS-2.210.0 virtual/perl-File-Path test? ( virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-perl/Test-Deep dev-perl/Test-Differences dev-perl/Test-LongString >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Warn ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Fast, compact, powerful binary serialization
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Sereal-Encoder
+IUSE=test
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-XSLoader app-arch/zstd:= dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.018.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=6709b33a6c7a192583ddbd2c2b2561bb
diff --git a/metadata/md5-cache/dev-perl/Server-Starter-0.350.0 b/metadata/md5-cache/dev-perl/Server-Starter-0.350.0
new file mode 100644
index 000000000000..6d66d21ae4fe
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Server-Starter-0.350.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Module-Build-0.400.500 test? ( virtual/perl-IO-Socket-IP dev-perl/Test-Requires dev-perl/Test-SharedFork >=dev-perl/Test-TCP-2.80.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A superdaemon for hot-deploying server programs
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Server-Starter
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.35.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=54817980878287f547dc6184995087d6
diff --git a/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0 b/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0
deleted file mode 100644
index 61d8ebf907f1..000000000000
--- a/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
-DESCRIPTION=Expand crontab(5)-style integer lists
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Set-Crontab
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AM/AMS/Set-Crontab-1.03.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0aca8d4d52d157e4ec487779d7dcb34b
diff --git a/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0-r1 b/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0-r1
new file mode 100644
index 000000000000..e05614b24ed8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Set-Crontab-1.30.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Expand crontab(5)-style integer lists
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Set-Crontab
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AM/AMS/Set-Crontab-1.03.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=ab07203681d2c70dbed7d11a285804d6
diff --git a/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1 b/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
deleted file mode 100644
index 2c8375fda849..000000000000
--- a/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Sets of intervals
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Set-Infinite
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/Set-Infinite-0.65.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ffca66ecee97aeb81105898b0efb0a34
diff --git a/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r2 b/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r2
new file mode 100644
index 000000000000..2bd241a2464a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Sets of intervals
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Set-Infinite
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/Set-Infinite-0.65.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=74ea5e5482d41895f58e54eba63e6fd1
diff --git a/metadata/md5-cache/dev-perl/String-CRC32-1.600.0 b/metadata/md5-cache/dev-perl/String-CRC32-1.600.0
index 8b170380b97c..c27129c33038 100644
--- a/metadata/md5-cache/dev-perl/String-CRC32-1.600.0
+++ b/metadata/md5-cache/dev-perl/String-CRC32-1.600.0
@@ -1,12 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-lang/perl
 DESCRIPTION=Perl interface for cyclic redundancy check generation
-EAPI=6
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/String-CRC32
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=public-domain
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.6.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=f77c6550dfc6833c77cdcc4c48d73a27
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=a65854d696e635b051e426e0f12dece8
diff --git a/metadata/md5-cache/dev-perl/String-Format-1.180.0 b/metadata/md5-cache/dev-perl/String-Format-1.180.0
index d4557ab969a3..523303dabc14 100644
--- a/metadata/md5-cache/dev-perl/String-Format-1.180.0
+++ b/metadata/md5-cache/dev-perl/String-Format-1.180.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=sprintf-like string formatting capabilities with arbitrary format definitions
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/String-Format
-KEYWORDS=~alpha ~amd64 ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/String-Format-1.18.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=8eafaf26b993cbec4fd5df56dd397dce
+_md5_=d954220d2524a7cd73694f3e25babe9f
diff --git a/metadata/md5-cache/dev-perl/Sub-Delete-1.0.20 b/metadata/md5-cache/dev-perl/Sub-Delete-1.0.20
index 433a3187bec6..de21895930fa 100644
--- a/metadata/md5-cache/dev-perl/Sub-Delete-1.0.20
+++ b/metadata/md5-cache/dev-perl/Sub-Delete-1.0.20
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Perl module enabling one to delete subroutines
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Sub-Delete
-KEYWORDS=~amd64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~riscv x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SP/SPROUT/Sub-Delete-1.00002.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=d99b4ec05b5a78dd3c5bd2fed1bb81cf
+_md5_=c02fe7bf08ee3234b9fab130a0700dae
diff --git a/metadata/md5-cache/dev-perl/Sub-Quote-2.6.6 b/metadata/md5-cache/dev-perl/Sub-Quote-2.6.6
index 33c566287e03..8877b5539c8f 100644
--- a/metadata/md5-cache/dev-perl/Sub-Quote-2.6.6
+++ b/metadata/md5-cache/dev-perl/Sub-Quote-2.6.6
@@ -4,11 +4,11 @@ DESCRIPTION=Efficient generation of subroutines via string eval
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Sub-Quote
 IUSE=test minimal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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/Moo-2.3.0 !minimal? ( >=dev-perl/Sub-Name-0.80.0 ) virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.006006.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=a0ac726eb1265564af9efbbb3dce915f
+_md5_=a32cd668e57f842e80d7521eecbb2189
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-7.0.0 b/metadata/md5-cache/dev-perl/Sys-Virt-7.0.0
index b836b7cf9b28..1e3a56403ace 100644
--- a/metadata/md5-cache/dev-perl/Sys-Virt-7.0.0
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-7.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=API for using the libvirt library from Perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Sys-Virt
 IUSE=test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=app-emulation/libvirt-7.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-v7.0.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=591ebe68bb120bf9b7042015c83c8291
+_md5_=cfb491d4b76b8d9504623747ec33b8e0
diff --git a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0 b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0
index 75bcb2de59fe..158de18292ef 100644
--- a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0
+++ b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0
@@ -4,11 +4,11 @@ DESCRIPTION=Provide a progress meter on a standard terminal
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Term-ProgressBar
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Class-MethodMaker-1.20.0 >=dev-perl/TermReadKey-2.140.0 virtual/perl-autodie dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=00594d5725afafa244865b15cef480f1
+_md5_=f4409299edee84086c18f8ce2e4009e6
diff --git a/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.420.0-r1 b/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.420.0-r1
index b0d8941d4d51..6924d01438a3 100644
--- a/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.420.0-r1
+++ b/metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.420.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Perl extension for the GNU Readline/History Library
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Term-ReadLine-Gnu
 IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sys-libs/readline-6.2:0= sys-libs/ncurses:0= dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.42.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=4fc7d0e47b7d68688ea2a98d0e7f89ec
+_md5_=292fc72d302df129b169e9af4538fce5
diff --git a/metadata/md5-cache/dev-perl/Term-Table-0.15.0 b/metadata/md5-cache/dev-perl/Term-Table-0.15.0
index 24230413c4cb..15780ba1b436 100644
--- a/metadata/md5-cache/dev-perl/Term-Table-0.15.0
+++ b/metadata/md5-cache/dev-perl/Term-Table-0.15.0
@@ -5,11 +5,11 @@ DESCRIPTION=Format a header and rows into a table
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Term-Table
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.015.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=b061a97864232c0d0d6b78a34710a7d3
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
+_md5_=20b48c072de32adc5b8a421521451485
diff --git a/metadata/md5-cache/dev-perl/Term-Table-0.8.0 b/metadata/md5-cache/dev-perl/Term-Table-0.8.0
index 1f2c4dbc1c91..23cc2fb7300e 100644
--- a/metadata/md5-cache/dev-perl/Term-Table-0.8.0
+++ b/metadata/md5-cache/dev-perl/Term-Table-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 virtual/perl-Scalar-List-Ut
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.008.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
 _md5_=340de0c2e020ea8e492b0081ea685271
diff --git a/metadata/md5-cache/dev-perl/Test-DiagINC-0.8.0 b/metadata/md5-cache/dev-perl/Test-DiagINC-0.8.0
index 96666bf306d1..366f0494f1a3 100644
--- a/metadata/md5-cache/dev-perl/Test-DiagINC-0.8.0
+++ b/metadata/md5-cache/dev-perl/Test-DiagINC-0.8.0
@@ -5,11 +5,11 @@ DESCRIPTION=List modules and versions loaded if tests fail
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-DiagINC
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-DiagINC-0.008.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=e2703134f343b141133f0c0ad4e9f4c2
+_md5_=a1a8373ea75ac3eb75291cecf13b6a53
diff --git a/metadata/md5-cache/dev-perl/Test-Kit-2.150.0 b/metadata/md5-cache/dev-perl/Test-Kit-2.150.0
index 70f358285c36..c6ed76d82918 100644
--- a/metadata/md5-cache/dev-perl/Test-Kit-2.150.0
+++ b/metadata/md5-cache/dev-perl/Test-Kit-2.150.0
@@ -5,11 +5,11 @@ DESCRIPTION=Build custom test packages with only the features you want
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Test-Kit
 IUSE=test
-KEYWORDS=~amd64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~riscv x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-perl/Hook-LexWrap dev-perl/Import-Into dev-perl/Module-Runtime virtual/perl-Scalar-List-Utils dev-perl/Sub-Delete virtual/perl-Test-Simple dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAORU/Test-Kit-2.15.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=68b7daac6627dc10a9455742e3ce93d0
+_md5_=2782990f49a1322345d0e12318524910
diff --git a/metadata/md5-cache/dev-perl/Test-Memory-Cycle-1.60.0 b/metadata/md5-cache/dev-perl/Test-Memory-Cycle-1.60.0
index c365e5ee9781..7ab5e449b0f1 100644
--- a/metadata/md5-cache/dev-perl/Test-Memory-Cycle-1.60.0
+++ b/metadata/md5-cache/dev-perl/Test-Memory-Cycle-1.60.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Devel-Cycle-1.70.0 virtual/perl-Getopt-Long dev-perl/PadWalker
 DESCRIPTION=Check for memory leaks and circular memory references
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Test-Memory-Cycle
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Devel-Cycle-1.70.0 virtual/perl-Getopt-Long dev-perl/PadWalker >=virtual/perl-Test-Simple-0.620.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Test-Memory-Cycle-1.06.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=71e6932784e6089f6202b2f4903c7d72
+_md5_=666812100919409ce7f0e96fe379d089
diff --git a/metadata/md5-cache/dev-perl/Test-Needs-0.2.9 b/metadata/md5-cache/dev-perl/Test-Needs-0.2.9
index 0034647900fc..e4cc6b3c0a75 100644
--- a/metadata/md5-cache/dev-perl/Test-Needs-0.2.9
+++ b/metadata/md5-cache/dev-perl/Test-Needs-0.2.9
@@ -5,11 +5,11 @@ DESCRIPTION=Skip tests when modules not available
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Needs
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002009.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=4223ea80d5bada329b60e8eff6f58b22
+_md5_=d3699c239cdb09be83b6478786145a38
diff --git a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.140 b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.140
index fc1c28fcec84..2d689f91d564 100644
--- a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.140
+++ b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.140
@@ -5,11 +5,11 @@ DESCRIPTION=A rich set of tools built upon the Test2 framework
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Test2-Suite
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Exporter >=dev-perl/Importer-0.24.0 >=dev-perl/Module-Pluggable-2.700.0 virtual/perl-Scalar-List-Utils dev-perl/Scope-Guard >=dev-perl/Sub-Info-0.2.0 >=dev-perl/Term-Table-0.13.0 >=virtual/perl-Test-Simple-1.302.176 virtual/perl-Time-HiRes dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000140.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=279f6b9f295ce09228fc759fabd4d1f9
+_md5_=eee931efb33acde8f418f488bb79f331
diff --git a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3 b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3
index 951c75c3d205..334d50cc756e 100644
--- a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3
+++ b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Manipulate the mouse cursor programmatically
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Tk-CursorControl
 IUSE=test
-KEYWORDS=amd64 ~ia64 sparc ~x86
+KEYWORDS=amd64 ~ia64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Tk dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DU/DUNNIGANJ/Tk-CursorControl-0.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=00a674bf32f34fd9a461e8b9fa175f5b
+_md5_=81039fb3c994505623564f2764518def
diff --git a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1 b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
index 954ef09bf700..ba28d3c915f3 100644
--- a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
+++ b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
 DESCRIPTION=Perl module for Tk-TableMatrix
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Tk-TableMatrix
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc sparc x86
 LICENSE=Artistic
 RDEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CE/CERNEY/Tk-TableMatrix-1.23.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=57b1f131027381de380ca835a555f1a5
+_md5_=e0a69fc79ae7d4595cec58c40d2fc11f
diff --git a/metadata/md5-cache/dev-perl/Type-Tie-0.9.0 b/metadata/md5-cache/dev-perl/Type-Tie-0.9.0
index e5943150a0a4..65a9926b942f 100644
--- a/metadata/md5-cache/dev-perl/Type-Tie-0.9.0
+++ b/metadata/md5-cache/dev-perl/Type-Tie-0.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Tie a variable to a type constraint
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Type-Tie
 IUSE=test minimal
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Hash-FieldHash ) >=dev-perl/Exporter-Tiny-0.26.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tie-0.009.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e8c20999f3e431916ad70f8b358ec08f
+_md5_=5735bdd70b8cf68954eaacc7d9e19c16
diff --git a/metadata/md5-cache/dev-perl/Type-Tiny-1.2.1 b/metadata/md5-cache/dev-perl/Type-Tiny-1.2.1
index f3d524f27828..f33dbf448c4e 100644
--- a/metadata/md5-cache/dev-perl/Type-Tiny-1.2.1
+++ b/metadata/md5-cache/dev-perl/Type-Tiny-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=tiny, yet Moo(se)-compatible type constraint
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Type-Tiny
 IUSE=test minimal examples
-KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Kavorka-0.13.0 !<dev-perl/Types-ReadOnly-0.1.0 >=dev-perl/Exporter-Tiny-0.26.0 >=virtual/perl-Test-Simple-1.1.10 !minimal? ( >=dev-perl/Devel-LexAlias-0.50.0 dev-perl/Devel-StackTrace >=dev-perl/Ref-Util-XS-0.100.0 >=dev-perl/Regexp-Util-0.3.0 virtual/perl-Scalar-List-Utils dev-perl/Type-Tie >=dev-perl/Type-Tiny-XS-0.11.0 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.002001.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=0f6812409bd5107cd7f5889c42bd05d7
+_md5_=af178aa69b854ad7bc992e6148a0fac0
diff --git a/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.12.0 b/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.12.0
index 3aa440bf1db4..dc81502c921b 100644
--- a/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.12.0
+++ b/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.12.0
@@ -4,11 +4,11 @@ DESCRIPTION=provides an XS boost for some of Type::Tiny's built-in type constrai
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Type-Tiny-XS
 IUSE=test minimal
-KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Type-Tiny ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-XS-0.012.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=34b4a46c162edf4714a36ce5f77d6d4e
+_md5_=8b6ee7234a4af3ed4905c18339ae1b11
diff --git a/metadata/md5-cache/dev-perl/Unicode-String-2.100.0 b/metadata/md5-cache/dev-perl/Unicode-String-2.100.0
index 4d60c7fe78da..10b85003b0fd 100644
--- a/metadata/md5-cache/dev-perl/Unicode-String-2.100.0
+++ b/metadata/md5-cache/dev-perl/Unicode-String-2.100.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-MIME-Base64-2.11 dev-lang/perl
 DESCRIPTION=String manipulation for Unicode strings
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Unicode-String
-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=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-MIME-Base64-2.11 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/GAAS/Unicode-String-2.10.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=a21cd4fbf93449e9616cb26ce4d43691
+_md5_=06d5310852e00d0a38cfb1f9085ba55e
diff --git a/metadata/md5-cache/dev-perl/User-Identity-1.0.0 b/metadata/md5-cache/dev-perl/User-Identity-1.0.0
index bc6d9ff8865e..888b7e186453 100644
--- a/metadata/md5-cache/dev-perl/User-Identity-1.0.0
+++ b/metadata/md5-cache/dev-perl/User-Identity-1.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Maintains info about a physical person
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/User-Identity
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Geography-Countries-1.400.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-1.00.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=619dd4f19531904572edcec152d1ebc5
+_md5_=fe450c1796eff6a0f4fa583dfb113a17
diff --git a/metadata/md5-cache/dev-perl/Wx-0.993.200-r2 b/metadata/md5-cache/dev-perl/Wx-0.993.200-r2
index b85dbe4d1d2a..50f515fffd7c 100644
--- a/metadata/md5-cache/dev-perl/Wx-0.993.200-r2
+++ b/metadata/md5-cache/dev-perl/Wx-0.993.200-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-perl/Alien-wxWidgets-0.690.0-r1 x11-libs/wxGTK:3.0 >=virtual/perl-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=a8d17b8164ab3f57d6e3310f0aae39e9
diff --git a/metadata/md5-cache/dev-perl/Wx-Perl-ProcessStream-0.320.0-r4 b/metadata/md5-cache/dev-perl/Wx-Perl-ProcessStream-0.320.0-r4
index ce3f5461a3fb..1d9938a5d66e 100644
--- a/metadata/md5-cache/dev-perl/Wx-Perl-ProcessStream-0.320.0-r4
+++ b/metadata/md5-cache/dev-perl/Wx-Perl-ProcessStream-0.320.0-r4
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/wxGTK:3.0 >=dev-perl/Wx-0.97.01 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-Perl-ProcessStream-0.32.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=18a2f67a451aeea8e2b6a68ba851773c
diff --git a/metadata/md5-cache/dev-perl/Wx-Scintilla-0.390.0-r4 b/metadata/md5-cache/dev-perl/Wx-Scintilla-0.390.0-r4
index 193edffd568c..94e6bfcca41c 100644
--- a/metadata/md5-cache/dev-perl/Wx-Scintilla-0.390.0-r4
+++ b/metadata/md5-cache/dev-perl/Wx-Scintilla-0.390.0-r4
@@ -11,5 +11,5 @@ RDEPEND=dev-perl/Alien-wxWidgets dev-perl/Wx x11-libs/wxGTK:3.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AZ/AZAWAWI/Wx-Scintilla-0.39.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=9576398e9812b1a3e607a8de2ff6f9d6
diff --git a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.960.0 b/metadata/md5-cache/dev-perl/XML-LibXSLT-1.960.0
index 674858294e21..b833d09bce89 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.960.0
+++ b/metadata/md5-cache/dev-perl/XML-LibXSLT-1.960.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.
 DESCRIPTION=A Perl module to parse XSL Transformational sheets using gnome's libXSLT
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-LibXSLT
-KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.32 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.96.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=3214301e927c8c9a693dc1a38fa85d12
+_md5_=f1e2f2768f9cd5858face40fdcaef12d
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-2.460.0 b/metadata/md5-cache/dev-perl/XML-Parser-2.460.0
index e7261a96a18d..99f679dc77df 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-2.460.0
+++ b/metadata/md5-cache/dev-perl/XML-Parser-2.460.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/expat-1.95.1-r1 dev-perl/libwww-perl dev-lang/perl
 DESCRIPTION=A perl module for parsing XML documents
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/XML-Parser
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-libs/expat-1.95.1-r1 dev-perl/libwww-perl dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7764fca3f22eefd93c789aefa4b04cab
+_md5_=d53ef618c8050e5ad2ad42bb25484637
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0 b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
index ad5b7c453568..6dd5957a119b 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
+++ b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight regexp-based XML parser
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-Parser-Lite
 IUSE=test minimal
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.721.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=eccd366de999741bb2a592be0b8802ed
+_md5_=856cb3749e4d0f21c944be727c6b543e
diff --git a/metadata/md5-cache/dev-perl/XML-Stream-1.240.0-r1 b/metadata/md5-cache/dev-perl/XML-Stream-1.240.0-r1
index 74dca68f67ad..1abae439e875 100644
--- a/metadata/md5-cache/dev-perl/XML-Stream-1.240.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-Stream-1.240.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Creates and XML Stream connection and parses return data
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-Stream
 IUSE=ssl
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=dev-perl/Authen-SASL dev-perl/Net-DNS ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-MIME-Base64 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAPATRICK/XML-Stream-1.24.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=0b579624c2d25a685bfba518f2ea42e2
+_md5_=03dff64b66ccdcc452f5a40a294306a0
diff --git a/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1 b/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1
index 3def6f91efa3..716f5305d2ff 100644
--- a/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/libwww-perl virtual/perl-ExtUtils-MakeMaker dev-lang/perl
 DESCRIPTION=Pure Perl implementation for parsing/writing XML documents
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-TreePP
-KEYWORDS=amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAWASAKI/XML-TreePP-0.43.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=e97c9b6c08f7ccfef6db40adef516cff
+_md5_=cec5283688ee1c9e1cfeb66b1379ddf4
diff --git a/metadata/md5-cache/dev-perl/XML-Writer-0.625.0 b/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
index 282b243be7b5..3c4327478ef1 100644
--- a/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
+++ b/metadata/md5-cache/dev-perl/XML-Writer-0.625.0
@@ -4,11 +4,11 @@ DESCRIPTION=XML Writer Perl Module
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/XML-Writer
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.625.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5c26d065bf3576464cb7f8f1a0811f73
+_md5_=3dab2a4a2460b0c87c102d80dc1de9a5
diff --git a/metadata/md5-cache/dev-perl/XXX-0.370.0 b/metadata/md5-cache/dev-perl/XXX-0.370.0
index 3c684e17efa9..0164159bf6b8 100644
--- a/metadata/md5-cache/dev-perl/XXX-0.370.0
+++ b/metadata/md5-cache/dev-perl/XXX-0.370.0
@@ -5,11 +5,11 @@ DESCRIPTION=See Your Data in the Nude
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/XXX
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/YAML-PP-0.18.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/XXX-0.37.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=552a1584d016bbc35b8ae8ab03b8c85a
+_md5_=4bef7e5ae557e65e0d6f457ce54b2afc
diff --git a/metadata/md5-cache/dev-perl/YAML-PP-0.27.0 b/metadata/md5-cache/dev-perl/YAML-PP-0.27.0
index 0e03982ceaa6..b2bbef10bfd1 100644
--- a/metadata/md5-cache/dev-perl/YAML-PP-0.27.0
+++ b/metadata/md5-cache/dev-perl/YAML-PP-0.27.0
@@ -5,11 +5,11 @@ DESCRIPTION=YAML 1.2 processor in perl
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/YAML-PP
 IUSE=test test
-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=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode virtual/perl-Exporter virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Module-Load >=virtual/perl-Scalar-List-Utils-1.70.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.027.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=1ebb966501f96db9b483c9a09a0ee2e7
+_md5_=9a6f4e22b1039d248d2aafb308213089
diff --git a/metadata/md5-cache/dev-perl/bareword-filehandles-0.7.0-r1 b/metadata/md5-cache/dev-perl/bareword-filehandles-0.7.0-r1
index 3f34efdf8c25..5f28a095d0a5 100644
--- a/metadata/md5-cache/dev-perl/bareword-filehandles-0.7.0-r1
+++ b/metadata/md5-cache/dev-perl/bareword-filehandles-0.7.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Disables bareword filehandles
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/bareword-filehandles
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/B-Hooks-OP-Check virtual/perl-if virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/bareword-filehandles-0.007.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=36f0ad097cf10a45a263059a34efe37c
+_md5_=7434140b47dfd8fe158dc90e31dc4934
diff --git a/metadata/md5-cache/dev-perl/indirect-0.370.0 b/metadata/md5-cache/dev-perl/indirect-0.370.0
index 2681441c6bff..6d5e8281cdfa 100644
--- a/metadata/md5-cache/dev-perl/indirect-0.370.0
+++ b/metadata/md5-cache/dev-perl/indirect-0.370.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lexically warn about using the indirect method call syntax
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/indirect
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/indirect-0.37.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=57a937e5587fd7a6cc388e11d9405576
+_md5_=6e6bf123f7f98d8f5246bc901d1e3c71
diff --git a/metadata/md5-cache/dev-perl/libwww-perl-6.530.0 b/metadata/md5-cache/dev-perl/libwww-perl-6.530.0
index 0e7ea746aad4..78ed44fa9397 100644
--- a/metadata/md5-cache/dev-perl/libwww-perl-6.530.0
+++ b/metadata/md5-cache/dev-perl/libwww-perl-6.530.0
@@ -5,7 +5,7 @@ DESCRIPTION=A collection of Perl Modules for the WWW
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/libwww-perl
 IUSE=ssl test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=ssl? ( >=dev-perl/LWP-Protocol-https-6.20.0 )
 RDEPEND=virtual/perl-Digest-MD5 >=virtual/perl-Encode-2.120.0 dev-perl/Encode-Locale >=dev-perl/File-Listing-6.0.0 >=dev-perl/HTML-Parser-3.340.0 >=dev-perl/HTTP-Cookies-6.0.0 >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Negotiate-6.0.0 >=dev-perl/HTTP-Message-6.0.0 virtual/perl-IO >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-MIME-Base64-2.100.0 >=virtual/perl-libnet-2.580.0 >=dev-perl/Net-HTTP-6.180.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny >=dev-perl/URI-1.100.0 >=dev-perl/WWW-RobotRules-6.0.0 dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.53.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=63194c4fa1a6414a2ff9883e3499e8c5
+_md5_=7fcdc7776f74adf2429cc5164d7bc359
diff --git a/metadata/md5-cache/dev-perl/multidimensional-0.13.0 b/metadata/md5-cache/dev-perl/multidimensional-0.13.0
index 747e99fa489f..f4e975438435 100644
--- a/metadata/md5-cache/dev-perl/multidimensional-0.13.0
+++ b/metadata/md5-cache/dev-perl/multidimensional-0.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=disables multidimensional array emulation
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/multidimensional
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-OP-Check-0.190.0 >=dev-perl/Lexical-SealRequireHints-0.5.0 virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/multidimensional-0.013.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=1e11de2d907bc5ee3d3bb816772c56ad
+_md5_=6d3d0e12378ddb231c49a22d9c233b58
diff --git a/metadata/md5-cache/dev-perl/perl-ldap-0.680.0 b/metadata/md5-cache/dev-perl/perl-ldap-0.680.0
new file mode 100644
index 000000000000..ae9620e607d9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/perl-ldap-0.680.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Authen-SASL dev-perl/Convert-ASN1 dev-perl/IO-Socket-INET6 dev-perl/URI sasl? ( virtual/perl-Digest-MD5 dev-perl/Authen-SASL ) xml? ( dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-SAX-Writer ) ssl? ( >=dev-perl/IO-Socket-SSL-1.26 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl modules which provide an object-oriented interface to LDAP servers
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/perl-ldap
+IUSE=sasl xml ssl test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Authen-SASL dev-perl/Convert-ASN1 dev-perl/IO-Socket-INET6 dev-perl/URI sasl? ( virtual/perl-Digest-MD5 dev-perl/Authen-SASL ) xml? ( dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-SAX-Writer ) ssl? ( >=dev-perl/IO-Socket-SSL-1.26 ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.68.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=f03f4957ae08a76151de170a7e16bdb5
diff --git a/metadata/md5-cache/dev-perl/perl-mozldap-1.5.3 b/metadata/md5-cache/dev-perl/perl-mozldap-1.5.3
deleted file mode 100644
index 786ba36bdc65..000000000000
--- a/metadata/md5-cache/dev-perl/perl-mozldap-1.5.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/nspr-4.0.1 >=dev-libs/nss-3.11.6 net-nds/openldap sys-apps/sed dev-lang/perl
-DESCRIPTION=Mozilla PerLDAP
-EAPI=6
-HOMEPAGE=http://www.mozilla.org/directory/perldap.html
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-1.1
-RDEPEND=>=dev-libs/nspr-4.0.1 >=dev-libs/nss-3.11.6 net-nds/openldap dev-lang/perl:=
-SLOT=0
-SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/directory/perldap/releases/1.5.3/src/perl-mozldap-1.5.3.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=89ca73405c08bb3fe96bb75aacf5cea0
diff --git a/metadata/md5-cache/dev-perl/perl-mozldap-1.5.3-r1 b/metadata/md5-cache/dev-perl/perl-mozldap-1.5.3-r1
new file mode 100644
index 000000000000..5290effa0cd8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/perl-mozldap-1.5.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-libs/nspr-4.0.1 >=dev-libs/nss-3.11.6 net-nds/openldap sys-apps/sed dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/nspr-4.0.1 >=dev-libs/nss-3.11.6 net-nds/openldap dev-lang/perl
+DESCRIPTION=Mozilla PerLDAP
+EAPI=8
+HOMEPAGE=http://www.mozilla.org/directory/perldap.html
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-1.1
+RDEPEND=>=dev-libs/nspr-4.0.1 >=dev-libs/nss-3.11.6 net-nds/openldap dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/directory/perldap/releases/1.5.3/src/perl-mozldap-1.5.3.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=ff75fe5f9a29949d24b1428123ff7457
diff --git a/metadata/md5-cache/dev-perl/prefork-1.50.0 b/metadata/md5-cache/dev-perl/prefork-1.50.0
new file mode 100644
index 000000000000..50b19cde7a4a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/prefork-1.50.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=virtual/perl-Scalar-List-Utils-0.180.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Optimized module loading for forking or non-forking processes
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/prefork
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=virtual/perl-Scalar-List-Utils-0.180.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/prefork-1.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_md5_=02cd56d93250ddd31ef6547ddccbf196
diff --git a/metadata/md5-cache/dev-perl/rename-1.1100.0 b/metadata/md5-cache/dev-perl/rename-1.1100.0
index 0b11642f58a4..bafa72dc197f 100644
--- a/metadata/md5-cache/dev-perl/rename-1.1100.0
+++ b/metadata/md5-cache/dev-perl/rename-1.1100.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=A filename renaming utility based on perl regular expression
 EAPI=7
 HOMEPAGE=https://metacpan.org/source/PEDERST/rename-1.11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEDERST/rename-1.11.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=69f6f91a2db6a51dd912eea0953591e7
+_md5_=bdfc1594040b65d05cf1367ec43ce7fc
diff --git a/metadata/md5-cache/dev-perl/rename-1.900.0 b/metadata/md5-cache/dev-perl/rename-1.900.0
deleted file mode 100644
index 0960df22aab4..000000000000
--- a/metadata/md5-cache/dev-perl/rename-1.900.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=A filename renaming utility based on perl regular expression
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/rename
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PE/PEDERST/rename-1.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d79feb78dc8fd5265f68583d3fddb1ba
diff --git a/metadata/md5-cache/dev-perl/strictures-2.0.3 b/metadata/md5-cache/dev-perl/strictures-2.0.3
index 0c665ed3519c..fc5a91b67b86 100644
--- a/metadata/md5-cache/dev-perl/strictures-2.0.3
+++ b/metadata/md5-cache/dev-perl/strictures-2.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Turn on strict and make most warnings fatal
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/strictures
 IUSE=test minimal
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/bareword-filehandles dev-perl/indirect dev-perl/multidimensional ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/strictures-2.000003.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=d20fb4fcdb9ec96d49fb5ead7f391ead
+_md5_=fde4666e350f5aff0a6484b6dc20253d
diff --git a/metadata/md5-cache/dev-python/Faker-8.11.0 b/metadata/md5-cache/dev-python/Faker-8.11.0
new file mode 100644
index 000000000000..57cfe718e7f6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-8.11.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package that generates fake data for you
+EAPI=8
+HOMEPAGE=https://github.com/joke2k/faker
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Faker/Faker-8.11.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c84b768513e08347afc638daf4125a99
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 4b2dec4d6b05..900dde1e163f 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.15.4-r1 b/metadata/md5-cache/dev-python/PyQt5-5.15.4-r1
index 6d0d30a8e9de..42fb86457680 100644
--- a/metadata/md5-cache/dev-python/PyQt5-5.15.4-r1
+++ b/metadata/md5-cache/dev-python/PyQt5-5.15.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-sip-4.19.25:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtcore-5.15:5 >=dev-qt/qtxml-5.15:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtdbus-5.15:5 ) declarative? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5[ssl=] ) opengl? ( >=dev-qt/qtopengl-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5 ) serialport? ( >=dev-qt/qtserialport-5.15:5 ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5 ) websockets? ( >=dev-qt/qtwebsockets-5.15:5 ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5 ) >=dev-python/sip-4.19.25[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dbus? ( virtual/pkgconfig )
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-sip-4.19.25:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtcore-5.15:5 >=dev-qt/qtxml-5.15:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtdbus-5.15:5 ) declarative? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5[ssl=] ) opengl? ( >=dev-qt/qtopengl-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5 ) serialport? ( >=dev-qt/qtserialport-5.15:5 ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5 ) websockets? ( >=dev-qt/qtwebsockets-5.15:5 ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5 ) >=dev-python/sip-4.19.25:0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dbus? ( virtual/pkgconfig )
 DESCRIPTION=Python bindings for the Qt framework
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro https://pypi.org/project/PyQt5/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQt5/PyQt5-5.15.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0bd1b51f44ca9edc86b89719e3d114e3
+_md5_=63de768a7bb9dd881ac504314fbeebb8
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.15.5_pre2107091435 b/metadata/md5-cache/dev-python/PyQt5-5.15.5_pre2107091435
new file mode 100644
index 000000000000..bc1e9f574ef7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt5-5.15.5_pre2107091435
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/PyQt-builder-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-6.2.0_pre2106291255[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtcore-5.15:5 dbus? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtcore-5.15:5 >=dev-qt/qtxml-5.15:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtdbus-5.15:5 ) declarative? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5[ssl] ) opengl? ( >=dev-qt/qtopengl-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5 ) serialport? ( >=dev-qt/qtserialport-5.15:5 ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5 ) websockets? ( >=dev-qt/qtwebsockets-5.15:5 ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5 )
+DESCRIPTION=Python bindings for the Qt framework
+EAPI=8
+HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/ https://pypi.org/project/PyQt5/
+IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network opengl positioning printsupport sensors serialport speech sql svg testlib webchannel websockets widgets x11extras xmlpatterns python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtcore-5.15:5 >=dev-qt/qtxml-5.15:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtdbus-5.15:5 ) declarative? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5[ssl] ) opengl? ( >=dev-qt/qtopengl-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5 ) serialport? ( >=dev-qt/qtserialport-5.15:5 ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5 ) websockets? ( >=dev-qt/qtwebsockets-5.15:5 ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5 ) >=dev-python/PyQt5-sip-12.9:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~pesa/distfiles/PyQt5-5.15.5.dev2107091435.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=37de6541b0c80c5ce86e7e7a99a1424a
diff --git a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4 b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4
index df997b8697c3..c3fc1a94efc9 100644
--- a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4
+++ b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-5.15[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets] >=dev-python/sip-4.19.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/PyQt5-5.15.4[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets] >=dev-python/sip-4.19.22:0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Python bindings for QtWebEngine
 EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/intro https://pypi.org/project/PyQtWebEngine/
+HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/ https://pypi.org/project/PyQtWebEngine/
 IUSE=debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-5.15[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets]
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/PyQt5-5.15.4[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQtWebEngine/PyQtWebEngine-5.15.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9cb9c8fd58f38088ba6da5e408935da2
+_md5_=529dffed4727fe1d781f73079e0a695d
diff --git a/metadata/md5-cache/dev-python/aesara-2.0.12 b/metadata/md5-cache/dev-python/aesara-2.0.12
index 90b37bfd7bcb..defe0b68cc27 100644
--- a/metadata/md5-cache/dev-python/aesara-2.0.12
+++ b/metadata/md5-cache/dev-python/aesara-2.0.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.0.12.tar.gz -> aesara-rel-2.0.12.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=31b8a5d5625a58a2eb321aac9de37f63
diff --git a/metadata/md5-cache/dev-python/aesara-2.1.2 b/metadata/md5-cache/dev-python/aesara-2.1.2
index eefa44796db8..2e7bb466efef 100644
--- a/metadata/md5-cache/dev-python/aesara-2.1.2
+++ b/metadata/md5-cache/dev-python/aesara-2.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.1.2.tar.gz -> aesara-rel-2.1.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68a4fadb4bfeef3895f4cfefed45df28
diff --git a/metadata/md5-cache/dev-python/aesara-2.1.3 b/metadata/md5-cache/dev-python/aesara-2.1.3
index d2fcdbcbacca..744cc733b817 100644
--- a/metadata/md5-cache/dev-python/aesara-2.1.3
+++ b/metadata/md5-cache/dev-python/aesara-2.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.1.3.tar.gz -> aesara-rel-2.1.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68a4fadb4bfeef3895f4cfefed45df28
diff --git a/metadata/md5-cache/dev-python/agate-1.6.2-r1 b/metadata/md5-cache/dev-python/agate-1.6.2-r1
deleted file mode 100644
index 5628930789c5..000000000000
--- a/metadata/md5-cache/dev-python/agate-1.6.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytimeparse-1.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/Babel-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python data analysis library that is optimized for humans instead of machines
-EAPI=7
-HOMEPAGE=https://github.com/wireservice/agate https://pypi.org/project/agate/
-IUSE=test +xml test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytimeparse-1.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/Babel-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/agate/agate-1.6.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f0f05ff7e1c035a695c1762cae92c304
diff --git a/metadata/md5-cache/dev-python/agate-1.6.3 b/metadata/md5-cache/dev-python/agate-1.6.3
index 380d5d2a39d7..c01b613e92ca 100644
--- a/metadata/md5-cache/dev-python/agate-1.6.3
+++ b/metadata/md5-cache/dev-python/agate-1.6.3
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytimeparse-1.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/Babel-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytimeparse-1.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python data analysis library that is optimized for humans instead of machines
 EAPI=8
 HOMEPAGE=https://github.com/wireservice/agate https://pypi.org/project/agate/
-IUSE=+xml test python_targets_python3_8 python_targets_python3_9
+IUSE=+xml test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytimeparse-1.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/Babel-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytimeparse-1.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/agate/agate-1.6.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e8f0feb87060aedc6484b037be7cea13
+_md5_=8a81d62f8900db3ea676c311599a6a15
diff --git a/metadata/md5-cache/dev-python/agate-dbf-0.2.2 b/metadata/md5-cache/dev-python/agate-dbf-0.2.2
index 8da9746558b3..95db9ad87a25 100644
--- a/metadata/md5-cache/dev-python/agate-dbf-0.2.2
+++ b/metadata/md5-cache/dev-python/agate-dbf-0.2.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dbfread-2.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dbfread-2.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Adds read support for DBF files to agate.
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/wireservice/agate-dbf https://pypi.org/project/agate-dbf/
-IUSE=test +xml test python_targets_python3_8 python_targets_python3_9
+IUSE=+xml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dbfread-2.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dbfread-2.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/agate-dbf/agate-dbf-0.2.2.tar.gz test? ( https://raw.githubusercontent.com/wireservice/agate-dbf/0.2.2/examples/test.dbf -> agate-dbf-0.2.2_examples%2Ftest.dbf https://raw.githubusercontent.com/wireservice/agate-dbf/0.2.2/examples/testdbf_converted.csv -> agate-dbf-0.2.2_examples%2Ftestdbf_converted.csv https://raw.githubusercontent.com/wireservice/agate-dbf/0.2.2/tests/test_table.py -> agate-dbf-0.2.2_tests%2Ftest_table.py )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=30145ecf9cdec59d69f51793e95d0a83
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6afb12ccaaf977af4c10b82d63a90705
diff --git a/metadata/md5-cache/dev-python/agate-excel-0.2.3 b/metadata/md5-cache/dev-python/agate-excel-0.2.3
index 02847661328d..c6d3a09bfbe0 100644
--- a/metadata/md5-cache/dev-python/agate-excel-0.2.3
+++ b/metadata/md5-cache/dev-python/agate-excel-0.2.3
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/openpyxl-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/xlrd-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openpyxl-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Adds read support for Excel files (xls and xlsx) to agate.
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/wireservice/agate-excel https://pypi.org/project/agate-excel/
-IUSE=test +xml test python_targets_python3_8 python_targets_python3_9
+IUSE=+xml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/openpyxl-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/xlrd-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openpyxl-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/agate-excel/agate-excel-0.2.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=84e6bbd2842dadf1c1e58407cdb18b24
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a5b38615408e284146aec3ff9479d118
diff --git a/metadata/md5-cache/dev-python/agate-sql-0.5.6 b/metadata/md5-cache/dev-python/agate-sql-0.5.6
deleted file mode 100644
index 54eb9881f950..000000000000
--- a/metadata/md5-cache/dev-python/agate-sql-0.5.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Adds SQL read/write support to agate.
-EAPI=7
-HOMEPAGE=https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/
-IUSE=test +xml test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/agate-sql/agate-sql-0.5.6.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=08b5b2ef5b88de71278f02e1c2d331d4
diff --git a/metadata/md5-cache/dev-python/agate-sql-0.5.7 b/metadata/md5-cache/dev-python/agate-sql-0.5.7
index 00e3c2699c68..79fbbeb2ebb3 100644
--- a/metadata/md5-cache/dev-python/agate-sql-0.5.7
+++ b/metadata/md5-cache/dev-python/agate-sql-0.5.7
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Adds SQL read/write support to agate.
 EAPI=8
 HOMEPAGE=https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/
-IUSE=+xml test python_targets_python3_8 python_targets_python3_9
+IUSE=+xml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/agate-sql/agate-sql-0.5.7.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6368205e29d0ca7468fa83fa04d2de92
+_md5_=891caa8dbbf763bfc9f53e659ab189e7
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.7.4-r1 b/metadata/md5-cache/dev-python/aiohttp-3.7.4-r1
index 35e0fee86816..65c5e0ecb575 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.7.4-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-3.7.4-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( !!dev-python/pytest-aiohttp app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/async_generator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/gunicorn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/re-assert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/async_timeout-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/multidict-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/yarl-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_10(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_10(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_10(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_10(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_9(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_9(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_9(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_9(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_8(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_8(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_8(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( !!dev-python/pytest-aiohttp app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/async_generator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/gunicorn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/re-assert[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/async_timeout-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_10(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_10(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_10(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_10(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_9(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_9(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_9(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_9(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_8(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_8(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_8(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] >=dev-python/alabaster-0.6.2[python_targets_pypy3(-)] dev-python/sphinxcontrib-asyncio[python_targets_pypy3(-)] dev-python/sphinxcontrib-blockdiag[python_targets_pypy3(-)] dev-python/sphinxcontrib-newsfeed[python_targets_pypy3(-)] dev-python/sphinxcontrib-spelling[python_targets_pypy3(-)] dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx-aiohttp-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=http client/server for asyncio
 EAPI=7
 HOMEPAGE=https://pypi.org/project/aiohttp/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/async_timeout-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/multidict-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/yarl-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/async_timeout-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.7.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7cc69378e5edaa106754040bda629cbe
+_md5_=de7cddc614785345951e3c18f7ba23e1
diff --git a/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0 b/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
deleted file mode 100644
index 3345f75b9f62..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/aiohttp-2.3.9[python_targets_python3_8(-)?] >=dev-python/jinja-2.10[python_targets_python3_8(-)?] dev-python/setuptools[python_targets_python3_8(-)?] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)?] dev-python/sphinx[python_targets_python3_8(-)?] ) test? ( >=dev-python/pytest-3.2.2[python_targets_python3_8(-)?] >=dev-python/pytest-aiohttp-0.3.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DESCRIPTION=jinja2 template renderer for aiohttp.web
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/aiohttp-jinja2
-IUSE=doc test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aiohttp-2.3.9[python_targets_python3_8(-)?] >=dev-python/jinja-2.10[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp-jinja2/aiohttp-jinja2-0.15.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=da1c8d95e686220c4c9e386e281ad1f9
diff --git a/metadata/md5-cache/dev-python/aiohttp-jinja2-1.4.2 b/metadata/md5-cache/dev-python/aiohttp-jinja2-1.4.2
index 48295f973a6e..f5e5b9e3d952 100644
--- a/metadata/md5-cache/dev-python/aiohttp-jinja2-1.4.2
+++ b/metadata/md5-cache/dev-python/aiohttp-jinja2-1.4.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-aiohttp-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aiohttp-2.3.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=dev-python/pytest-aiohttp-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aiohttp-2.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=jinja2 template renderer for aiohttp.web
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/aiohttp-jinja2
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aiohttp-2.3.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/aiohttp-2.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp-jinja2/aiohttp-jinja2-1.4.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a33261c4a1ee7a99da51ffcdb223f8e5
+_md5_=95ff496d4da037f14240fcc61475133c
diff --git a/metadata/md5-cache/dev-python/aiohttp-socks-0.6.0 b/metadata/md5-cache/dev-python/aiohttp-socks-0.6.0
index 5970883cd59d..d3d206bffc39 100644
--- a/metadata/md5-cache/dev-python/aiohttp-socks-0.6.0
+++ b/metadata/md5-cache/dev-python/aiohttp-socks-0.6.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yarl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aiohttp-2.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-socks-1.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/yarl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aiohttp-2.3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-socks-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=SOCKS proxy connector for aiohttp
 EAPI=7
-HOMEPAGE=https://pypi.org/project/aiohttp-socks/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+HOMEPAGE=https://pypi.org/project/aiohttp-socks/ https://github.com/romis2012/aiohttp-socks
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aiohttp-2.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-socks-1.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/aiohttp-2.3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-socks-1.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/romis2012/aiohttp-socks/archive/v0.6.0.tar.gz -> aiohttp-socks-0.6.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70445a3039c244ed19657b19f7087cb5
+_md5_=993bf9431852d1eb0939f54fa09aa335
diff --git a/metadata/md5-cache/dev-python/ament_package-0.12.0 b/metadata/md5-cache/dev-python/ament_package-0.12.0
new file mode 100644
index 000000000000..71f18030b7af
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ament_package-0.12.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DESCRIPTION=Parser for the manifest files in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_package
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_package/archive/0.12.0.tar.gz -> ament_package-0.12.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea2652514d95fd963d367fdf484c5ae3
diff --git a/metadata/md5-cache/dev-python/ament_package-0.9.2 b/metadata/md5-cache/dev-python/ament_package-0.9.2
deleted file mode 100644
index 3ef45c204ee0..000000000000
--- a/metadata/md5-cache/dev-python/ament_package-0.9.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/flake8[python_targets_python3_8(-)?] dev-python/pytest[python_targets_python3_8(-)?] )
-DESCRIPTION=Parser for the manifest files in the ament buildsystem
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_package
-IUSE=test python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_package/archive/0.9.2.tar.gz -> ament_package-0.9.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=918a15f786452ffd11595e3e794dbd58
diff --git a/metadata/md5-cache/dev-python/anyio-3.2.1 b/metadata/md5-cache/dev-python/anyio-3.2.1
index ce115b0ef5e8..9ccee052d524 100644
--- a/metadata/md5-cache/dev-python/anyio-3.2.1
+++ b/metadata/md5-cache/dev-python/anyio-3.2.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/hypothesis-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-mock-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uvloop-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/idna-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sniffio-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/hypothesis-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-mock-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uvloop-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/idna-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sniffio-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Compatibility layer for multiple asynchronous event loop implementations
 EAPI=7
 HOMEPAGE=https://github.com/agronholm/anyio https://pypi.org/project/anyio/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/idna-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sniffio-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/idna-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sniffio-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/anyio/anyio-3.2.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9f20dcee7f4b0db489a6cfb1b909b949
+_md5_=34783f03d938b1a2050ad747c300dcb4
diff --git a/metadata/md5-cache/dev-python/arrow-1.0.3 b/metadata/md5-cache/dev-python/arrow-1.0.3
deleted file mode 100644
index 8a262f7b006a..000000000000
--- a/metadata/md5-cache/dev-python/arrow-1.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/python-dateutil-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Better dates and times for Python
-EAPI=7
-HOMEPAGE=https://github.com/arrow-py/arrow/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/python-dateutil-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/arrow/arrow-1.0.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7db91581c5f523b6775ce7858edb9c36
diff --git a/metadata/md5-cache/dev-python/arrow-1.1.0 b/metadata/md5-cache/dev-python/arrow-1.1.0
deleted file mode 100644
index 5a7585d1f844..000000000000
--- a/metadata/md5-cache/dev-python/arrow-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Better dates and times for Python
-EAPI=7
-HOMEPAGE=https://github.com/arrow-py/arrow/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/python-dateutil-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/arrow/arrow-1.1.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4b08825e45c6e373834ef832ed0da4f2
diff --git a/metadata/md5-cache/dev-python/arrow-1.1.1 b/metadata/md5-cache/dev-python/arrow-1.1.1
index 4f79ae29567a..7146115f85b6 100644
--- a/metadata/md5-cache/dev-python/arrow-1.1.1
+++ b/metadata/md5-cache/dev-python/arrow-1.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Better dates and times for Python
 EAPI=7
 HOMEPAGE=https://github.com/arrow-py/arrow/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-dateutil-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-1.1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c1b2f077182e34d4372823b6ecb5a2b1
+_md5_=4b08825e45c6e373834ef832ed0da4f2
diff --git a/metadata/md5-cache/dev-python/astroid-2.6.6 b/metadata/md5-cache/dev-python/astroid-2.6.6
new file mode 100644
index 000000000000..057fec4a8834
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.6.6
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/astroid/archive/v2.6.6.tar.gz -> astroid-2.6.6.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9c487407c6242f7c3b2de88239d05c23
diff --git a/metadata/md5-cache/dev-python/async_timeout-3.0.1 b/metadata/md5-cache/dev-python/async_timeout-3.0.1
index 02b77b3a840c..c17cc7fac5d6 100644
--- a/metadata/md5-cache/dev-python/async_timeout-3.0.1
+++ b/metadata/md5-cache/dev-python/async_timeout-3.0.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-aiohttp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Timeout context manager for asyncio programs
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/async-timeout
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async-timeout-3.0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d5126a279bbc59db0213a88c31bd5163
+_md5_=e71b569e5a5ebfe986ca34b6f2b70c78
diff --git a/metadata/md5-cache/dev-python/backports-entry_points_selectable-1.1.0 b/metadata/md5-cache/dev-python/backports-entry_points_selectable-1.1.0
index 0c6ea1821cd6..d505ee63d488 100644
--- a/metadata/md5-cache/dev-python/backports-entry_points_selectable-1.1.0
+++ b/metadata/md5-cache/dev-python/backports-entry_points_selectable-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Compatibility shim providing selectable entry points
 EAPI=8
 HOMEPAGE=https://github.com/jaraco/backports.entry_points_selectable/ https://pypi.org/project/backports.entry-points-selectable/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaraco/backports.entry_points_selectable/archive/v1.1.0.tar.gz -> backports.entry_points_selectable-1.1.0.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1b5204a305f4b33c990438a67ca12b3
+_md5_=e62289133935e929f000d651e2f3259b
diff --git a/metadata/md5-cache/dev-python/beniget-0.4.1 b/metadata/md5-cache/dev-python/beniget-0.4.1
new file mode 100644
index 000000000000..037b3a38e7f0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/beniget-0.4.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( =dev-python/gast-0.5*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extract semantic information about static Python code
+EAPI=7
+HOMEPAGE=https://pypi.org/project/beniget/ https://github.com/serge-sans-paille/beniget/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND==dev-python/gast-0.5*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/serge-sans-paille/beniget/archive/0.4.1.tar.gz -> beniget-0.4.1.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b962fb30c7873d549c4e294f8ecffbda
diff --git a/metadata/md5-cache/dev-python/black-20.8_beta1 b/metadata/md5-cache/dev-python/black-20.8_beta1
index 9007f0fcb311..055c794ba4bb 100644
--- a/metadata/md5-cache/dev-python/black-20.8_beta1
+++ b/metadata/md5-cache/dev-python/black-20.8_beta1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/20.8b1.tar.gz -> black-20.8b1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=261589f9b3c1fa008792e5f173129c40
diff --git a/metadata/md5-cache/dev-python/black-21.6_beta0 b/metadata/md5-cache/dev-python/black-21.6_beta0
index 273a7310e759..1befc0ffcc43 100644
--- a/metadata/md5-cache/dev-python/black-21.6_beta0
+++ b/metadata/md5-cache/dev-python/black-21.6_beta0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/21.6b0.tar.gz -> black-21.6b0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e5069c748fa237a35c53c12ee945b02d
diff --git a/metadata/md5-cache/dev-python/black-21.7_beta0 b/metadata/md5-cache/dev-python/black-21.7_beta0
index bba31f022aac..8df0b03bcca4 100644
--- a/metadata/md5-cache/dev-python/black-21.7_beta0
+++ b/metadata/md5-cache/dev-python/black-21.7_beta0
@@ -4,12 +4,12 @@ DESCRIPTION=The uncompromising Python code formatter
 EAPI=7
 HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/21.7b0.tar.gz -> black-21.7b0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7279a2e043bb2dd0ee2d61166034fccd
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0e9d6221a50b461b70466f3c89859e48
diff --git a/metadata/md5-cache/dev-python/bleach-4.0.0 b/metadata/md5-cache/dev-python/bleach-4.0.0
new file mode 100644
index 000000000000..948c718aac9f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bleach-4.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An easy whitelist-based HTML-sanitizing tool
+EAPI=8
+HOMEPAGE=https://github.com/mozilla/bleach/ https://pypi.org/project/bleach/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/bleach/bleach-4.0.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=226ad63d25fd16bf178f92e602d059c2
diff --git a/metadata/md5-cache/dev-python/blockdiag-2.0.1 b/metadata/md5-cache/dev-python/blockdiag-2.0.1
index 6b646e84210d..469fcd55435c 100644
--- a/metadata/md5-cache/dev-python/blockdiag-2.0.1
+++ b/metadata/md5-cache/dev-python/blockdiag-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blockdiag/blockdiag-2.0.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bd7a3fa8563ac2394ca1f98afa4b1ccc
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.12 b/metadata/md5-cache/dev-python/boto3-1.18.12
new file mode 100644
index 000000000000..2e981a4f710f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.12
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.12.tar.gz -> boto3-1.18.12.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.13 b/metadata/md5-cache/dev-python/boto3-1.18.13
new file mode 100644
index 000000000000..9e733931c4b4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.13
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.13.tar.gz -> boto3-1.18.13.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.14 b/metadata/md5-cache/dev-python/boto3-1.18.14
new file mode 100644
index 000000000000..2299d40514dd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.14
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.14.tar.gz -> boto3-1.18.14.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.15 b/metadata/md5-cache/dev-python/boto3-1.18.15
new file mode 100644
index 000000000000..8e3f7ec1e782
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.15
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.15.tar.gz -> boto3-1.18.15.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.12 b/metadata/md5-cache/dev-python/botocore-1.21.12
new file mode 100644
index 000000000000..4343f3b773c0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.12
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.12.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.13 b/metadata/md5-cache/dev-python/botocore-1.21.13
new file mode 100644
index 000000000000..db6e535aa971
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.13
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.13.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.14 b/metadata/md5-cache/dev-python/botocore-1.21.14
new file mode 100644
index 000000000000..6c56b1e270bc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.14
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.14.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.15 b/metadata/md5-cache/dev-python/botocore-1.21.15
new file mode 100644
index 000000000000..759dca85b8fe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.15
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.15.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.19 b/metadata/md5-cache/dev-python/bottle-0.12.19
index b186f787d175..474e6f0d591b 100644
--- a/metadata/md5-cache/dev-python/bottle-0.12.19
+++ b/metadata/md5-cache/dev-python/bottle-0.12.19
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.12.19.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3bf656e4c8f834aacec529b240e9bdb5
diff --git a/metadata/md5-cache/dev-python/bottleneck-1.3.2 b/metadata/md5-cache/dev-python/bottleneck-1.3.2
index 581efe97bef5..b3d6e2936da0 100644
--- a/metadata/md5-cache/dev-python/bottleneck-1.3.2
+++ b/metadata/md5-cache/dev-python/bottleneck-1.3.2
@@ -5,7 +5,7 @@ DESCRIPTION=Fast NumPy array functions written in Cython
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Bottleneck/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kwgoodman/bottleneck/archive/v1.3.2.tar.gz -> bottleneck-1.3.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dca9ebabf9ecfb1aac51d830560ea6bb
+_md5_=b30c6f6446a4bae47680588acd6f43ef
diff --git a/metadata/md5-cache/dev-python/breathe-4.30.0 b/metadata/md5-cache/dev-python/breathe-4.30.0
index f2374e0ae0a8..028230a022de 100644
--- a/metadata/md5-cache/dev-python/breathe-4.30.0
+++ b/metadata/md5-cache/dev-python/breathe-4.30.0
@@ -4,7 +4,7 @@ DESCRIPTION=Sphinx Doxygen renderer
 EAPI=7
 HOMEPAGE=https://breathe.readthedocs.io/en/latest/ https://github.com/michaeljones/breathe/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/michaeljones/breathe/archive/v4.30.0.tar.gz -> breathe-4.30.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e338911788b0beee95a78cde02329f2f
+_md5_=922c051d407ca310355534ff368cde8c
diff --git a/metadata/md5-cache/dev-python/cachelib-0.2.0 b/metadata/md5-cache/dev-python/cachelib-0.2.0
index 84227a29903f..cf90e33c8b36 100644
--- a/metadata/md5-cache/dev-python/cachelib-0.2.0
+++ b/metadata/md5-cache/dev-python/cachelib-0.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of cache libraries in the same API interface. Extracted f
 EAPI=7
 HOMEPAGE=https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachelib/cachelib-0.2.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fe9740626ddd76d82b45a658e88bfaf4
+_md5_=6c20a6071c6f9964cb8ba624e8ff5732
diff --git a/metadata/md5-cache/dev-python/cairocffi-1.2.0 b/metadata/md5-cache/dev-python/cairocffi-1.2.0
index a7a1896d18b8..b5f1518e8850 100644
--- a/metadata/md5-cache/dev-python/cairocffi-1.2.0
+++ b/metadata/md5-cache/dev-python/cairocffi-1.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=CFFI-based drop-in replacement for Pycairo
 EAPI=7
 HOMEPAGE=https://github.com/Kozea/cairocffi
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/xcffib-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-1.2.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=ea5382317321d7f3c7569d0d550dcc94
+_md5_=38be3c0c38317d1d18259cb09e4add7f
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.53.0 b/metadata/md5-cache/dev-python/cfn-python-lint-0.53.0
new file mode 100644
index 000000000000..fb1ffee19cb7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-python-lint-0.53.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-sam-translator-1.38.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.38.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.53.0.tar.gz -> cfn-lint-0.53.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=93ceeebf8f7adb35070738f4d048f3d6
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
index 529974177819..71968c9579aa 100644
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
+++ b/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=The Real First Universal Charset Detector
 EAPI=8
 HOMEPAGE=https://pypi.org/project/charset-normalizer/ https://github.com/ousret/charset_normalizer/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ousret/charset_normalizer/archive/2.0.3.tar.gz -> charset_normalizer-2.0.3.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=07a2cee6558cee437fe9e05336c55a7d
+_md5_=6973600b024ed9baf85be65bcaa380b5
diff --git a/metadata/md5-cache/dev-python/cheetah3-3.2.6 b/metadata/md5-cache/dev-python/cheetah3-3.2.6
index 1f60ed537a6d..71348b14f220 100644
--- a/metadata/md5-cache/dev-python/cheetah3-3.2.6
+++ b/metadata/md5-cache/dev-python/cheetah3-3.2.6
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !dev-python/cheetah python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/cheetah python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python-powered template engine and code generator
 EAPI=7
 HOMEPAGE=https://cheetahtemplate.org/ https://pypi.org/project/Cheetah3/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=MIT
-RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !dev-python/cheetah python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/cheetah python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/CheetahTemplate3/cheetah3/archive/3.2.6.tar.gz -> cheetah3-3.2.6.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e0027165676706981e1e3193e7663f5e
+_md5_=fb8185da42fec75c095b3d6215bb661d
diff --git a/metadata/md5-cache/dev-python/clang-python-12.0.1 b/metadata/md5-cache/dev-python/clang-python-12.0.1
index 8f3da75099bd..e0849656a363 100644
--- a/metadata/md5-cache/dev-python/clang-python-12.0.1
+++ b/metadata/md5-cache/dev-python/clang-python-12.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for sys-devel/clang
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=>=sys-devel/clang-12.0.1:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6a328146d67691e7e22fbb8cefe19338
+_md5_=701585a6dbcf9d66be31f631db831584
diff --git a/metadata/md5-cache/dev-python/clang-python-13.0.0_rc1 b/metadata/md5-cache/dev-python/clang-python-13.0.0_rc1
new file mode 100644
index 000000000000..799e631c9302
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-13.0.0_rc1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-13.0.0_rc1:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=sys-devel/clang-13.0.0_rc1:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=41d28ae1bc14f42321dece68538d0222
diff --git a/metadata/md5-cache/dev-python/cloudscraper-1.2.58 b/metadata/md5-cache/dev-python/cloudscraper-1.2.58
index c6afd7890080..a91e5d2f6ea9 100644
--- a/metadata/md5-cache/dev-python/cloudscraper-1.2.58
+++ b/metadata/md5-cache/dev-python/cloudscraper-1.2.58
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/VeNoMouS/cloudscraper/archive/1.2.58.tar.gz -> cloudscraper-1.2.58.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a216fb111dfcda876cfc732c75bbe7bb
diff --git a/metadata/md5-cache/dev-python/commentjson-0.9.0 b/metadata/md5-cache/dev-python/commentjson-0.9.0
index 7aaca051550e..e5115594ee8b 100644
--- a/metadata/md5-cache/dev-python/commentjson-0.9.0
+++ b/metadata/md5-cache/dev-python/commentjson-0.9.0
@@ -4,7 +4,7 @@ DESCRIPTION=Add Python and JavaScript style comments in your JSON files
 EAPI=7
 HOMEPAGE=https://pypi.org/project/commentjson/ https://github.com/vaidik/commentjson/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/lark-parser[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vaidik/commentjson/archive/v0.9.0.tar.gz -> commentjson-0.9.0.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7c38c80add9a1a1fa6818bdc4d322d0e
+_md5_=d4680df7c1740164ef4f6a3ae48d9bb1
diff --git a/metadata/md5-cache/dev-python/configobj-5.0.6-r1 b/metadata/md5-cache/dev-python/configobj-5.0.6-r1
index 568dc2158257..f6ffa79d2c36 100644
--- a/metadata/md5-cache/dev-python/configobj-5.0.6-r1
+++ b/metadata/md5-cache/dev-python/configobj-5.0.6-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Simple config file reader and writer
 EAPI=7
 HOMEPAGE=http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/DiffSK/configobj/archive/v5.0.6.tar.gz -> configobj-5.0.6.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1ef7a92e431180a082758e7aad379d2b
+_md5_=4893c289980ef3ed6d67e5c531ebccba
diff --git a/metadata/md5-cache/dev-python/csvkit-1.0.5 b/metadata/md5-cache/dev-python/csvkit-1.0.5
deleted file mode 100644
index 9408759a382c..000000000000
--- a/metadata/md5-cache/dev-python/csvkit-1.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/agate-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-excel-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-dbf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-sql-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A suite of utilities for converting to and working with CSV.
-EAPI=7
-HOMEPAGE=https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/
-IUSE=test +xml test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/agate-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-excel-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-dbf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-sql-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/csvkit/csvkit-1.0.5.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=43985b361430417fedb6a6eae07be4cc
diff --git a/metadata/md5-cache/dev-python/csvkit-1.0.6 b/metadata/md5-cache/dev-python/csvkit-1.0.6
index 588be5c5f41e..48293be5ded7 100644
--- a/metadata/md5-cache/dev-python/csvkit-1.0.6
+++ b/metadata/md5-cache/dev-python/csvkit-1.0.6
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/agate-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-excel-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-dbf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-sql-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-excel-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-dbf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-sql-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A suite of utilities for converting to and working with CSV.
 EAPI=8
 HOMEPAGE=https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/
-IUSE=test +xml test python_targets_python3_8 python_targets_python3_9
+IUSE=+xml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/agate-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-excel-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-dbf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/agate-sql-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] xml? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RDEPEND=>=dev-python/agate-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-excel-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-dbf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-sql-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/csvkit/csvkit-1.0.6.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b7eb7c402afd02f28357d6dace7285cf
+_md5_=b28f11b04facdaf3539ba450d1e42d5e
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.23.1 b/metadata/md5-cache/dev-python/dbusmock-0.23.1
index 4c6e71377019..a34e26800044 100644
--- a/metadata/md5-cache/dev-python/dbusmock-0.23.1
+++ b/metadata/md5-cache/dev-python/dbusmock-0.23.1
@@ -4,7 +4,7 @@ DESCRIPTION=Easily create mock objects on D-Bus for software testing
 EAPI=7
 HOMEPAGE=https://github.com/martinpitt/python-dbusmock
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinpitt/python-dbusmock/releases/download/0.23.1/python-dbusmock-0.23.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=902c11dae3a67a50a43b4ae0ae5cc987
+_md5_=b6a6787202c680b29b6e4babf95e72c6
diff --git a/metadata/md5-cache/dev-python/denonavr-0.10.8 b/metadata/md5-cache/dev-python/denonavr-0.10.8
index 526774d980b3..3cc48851c9cc 100644
--- a/metadata/md5-cache/dev-python/denonavr-0.10.8
+++ b/metadata/md5-cache/dev-python/denonavr-0.10.8
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/asyncstdlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netifaces[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/asyncstdlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netifaces[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Automation Library for Denon AVR receivers
 EAPI=7
 HOMEPAGE=https://github.com/scarface-4711/denonavr
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/asyncstdlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netifaces[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/asyncstdlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netifaces[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/denonavr/denonavr-0.10.8.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2518f04030054bc0fa2a2caaf30dd42b
+_md5_=20cbc085171c614d70a261e2e1bfe7d6
diff --git a/metadata/md5-cache/dev-python/django-2.2.24 b/metadata/md5-cache/dev-python/django-2.2.24
index e0abf132c9eb..5a691ddf583c 100644
--- a/metadata/md5-cache/dev-python/django-2.2.24
+++ b/metadata/md5-cache/dev-python/django-2.2.24
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/2.2/Django-2.2.24.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-2.2.24.checksum.txt )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=aa460f2d5d13ca216f9e16564ab083be
diff --git a/metadata/md5-cache/dev-python/django-3.1.13 b/metadata/md5-cache/dev-python/django-3.1.13
index 7007dbeb4e12..3dcf9dc1d318 100644
--- a/metadata/md5-cache/dev-python/django-3.1.13
+++ b/metadata/md5-cache/dev-python/django-3.1.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/3.1/Django-3.1.13.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.1.13.checksum.txt )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=ef6e6af8165fbaeeef1ba5c1b940881c
diff --git a/metadata/md5-cache/dev-python/django-3.2.5 b/metadata/md5-cache/dev-python/django-3.2.5
index 0fbe388d18bd..120c0e00c33c 100644
--- a/metadata/md5-cache/dev-python/django-3.2.5
+++ b/metadata/md5-cache/dev-python/django-3.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/3.2/Django-3.2.5.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.2.5.checksum.txt )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=214b9422c81b0f038163bbe0ecef783a
diff --git a/metadata/md5-cache/dev-python/django-3.2.6 b/metadata/md5-cache/dev-python/django-3.2.6
new file mode 100644
index 000000000000..265aa7d2e91d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-3.2.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext !!<dev-python/ipython-7.21.0-r1 !!=dev-python/ipython-7.22.0-r0 ) verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 ) doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=7
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=>=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/3.2/Django-3.2.6.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.2.6.checksum.txt )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=9a820871487cf7dde7facc5ff0b0507b
diff --git a/metadata/md5-cache/dev-python/dkimpy-1.0.5 b/metadata/md5-cache/dev-python/dkimpy-1.0.5
index 838228ff81ad..6b7749e65192 100644
--- a/metadata/md5-cache/dev-python/dkimpy-1.0.5
+++ b/metadata/md5-cache/dev-python/dkimpy-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dkimpy/dkimpy-1.0.5.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8aad9d4405b7d25304cfd5972dfa2b66
diff --git a/metadata/md5-cache/dev-python/dulwich-0.20.23 b/metadata/md5-cache/dev-python/dulwich-0.20.23
index 650c75388a9c..06e824f31eb8 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.20.23
+++ b/metadata/md5-cache/dev-python/dulwich-0.20.23
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !hppa? ( !ia64? ( dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/geventhttpclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) app-crypt/gpgme[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/fastimport[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( !ia64? ( dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/geventhttpclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) app-crypt/gpgme[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fastimport[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=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_8 python_targets_python3_9
+IUSE=doc examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 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+ Apache-2.0
-RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.20.23.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4893488adde668623c5a75b3ff314320
+_md5_=f1787fe91d41cf2136375c0d81486616
diff --git a/metadata/md5-cache/dev-python/emoji-0.5.4 b/metadata/md5-cache/dev-python/emoji-0.5.4
deleted file mode 100644
index 4d3e0206130e..000000000000
--- a/metadata/md5-cache/dev-python/emoji-0.5.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Emoji for Python
-EAPI=7
-HOMEPAGE=https://github.com/carpedm20/emoji/
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/e/emoji/emoji-0.5.4.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1e78c57c03e9ae7e9756f640e8baf073
diff --git a/metadata/md5-cache/dev-python/emoji-1.2.1 b/metadata/md5-cache/dev-python/emoji-1.2.1
deleted file mode 100644
index 5f79764be6f0..000000000000
--- a/metadata/md5-cache/dev-python/emoji-1.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Emoji for Python
-EAPI=7
-HOMEPAGE=https://github.com/carpedm20/emoji/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/carpedm20/emoji/archive/refs/tags/v.1.2.1.tar.gz -> emoji-1.2.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eb88aecd7364bd0f31836cff4f11b1fb
diff --git a/metadata/md5-cache/dev-python/exam-0.10.6 b/metadata/md5-cache/dev-python/exam-0.10.6
index 504a3e54004c..5adbe4302350 100644
--- a/metadata/md5-cache/dev-python/exam-0.10.6
+++ b/metadata/md5-cache/dev-python/exam-0.10.6
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Helpers for better testing
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/fluxx/exam
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/exam/exam-0.10.6.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=33d7c55c6e2af1a70f530b63e3a1b2ac
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=95bad0f8a232d8d280e79ede29278e87
diff --git a/metadata/md5-cache/dev-python/eyeD3-0.9.6 b/metadata/md5-cache/dev-python/eyeD3-0.9.6
index 154e831b0746..50451cf27677 100644
--- a/metadata/md5-cache/dev-python/eyeD3-0.9.6
+++ b/metadata/md5-cache/dev-python/eyeD3-0.9.6
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pylast[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/filetype[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pylast[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filetype[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Module for manipulating ID3 (v1 + v2) tags in Python
 EAPI=7
 HOMEPAGE=https://eyed3.nicfit.net/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/filetype[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filetype[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0.7
 SRC_URI=https://github.com/nicfit/eyeD3/archive/v0.9.6.tar.gz -> eyeD3-0.9.6.tar.gz test? ( https://eyed3.nicfit.net/releases/eyeD3-test-data.tgz )
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=81c519b01a93005dc24129c6f8de904c
+_md5_=7dd57a5b11b2e70e4cbda297fab3b9bc
diff --git a/metadata/md5-cache/dev-python/fido2-0.9.1 b/metadata/md5-cache/dev-python/fido2-0.9.1
index 68dd95147ed3..4104a09b49c6 100644
--- a/metadata/md5-cache/dev-python/fido2-0.9.1
+++ b/metadata/md5-cache/dev-python/fido2-0.9.1
@@ -5,7 +5,7 @@ DESCRIPTION=Python based FIDO 2.0 library
 EAPI=7
 HOMEPAGE=https://github.com/Yubico/python-fido2
 IUSE=examples python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=Apache-2.0 BSD-2 MIT MPL-2.0
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyscard[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] examples? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/0.9
 SRC_URI=https://github.com/Yubico/python-fido2/releases/download/0.9.1/fido2-0.9.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6fef656edc09848c487d28fa1e5bc3cd
+_md5_=a86df289c4552e9c76b14d13b7263dae
diff --git a/metadata/md5-cache/dev-python/flask-2.0.1-r1 b/metadata/md5-cache/dev-python/flask-2.0.1-r1
index 219839657e4e..3154174dabcc 100644
--- a/metadata/md5-cache/dev-python/flask-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/flask-2.0.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions
 EAPI=7
 HOMEPAGE=https://github.com/pallets/flask/
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~riscv ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/click-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/werkzeug-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask/Flask-2.0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1c6c063aa8c93a66691307dedde7771c
+_md5_=0bccfa44c8101888e00c694746c0eeb5
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1
index d4608bb7715c..dad01419c5c1 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlalchemy-0.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-0.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/pallets-sphinx-themes[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=SQLAlchemy support for Flask applications
-EAPI=7
+EAPI=8
 HOMEPAGE=https://pypi.org/project/Flask-SQLAlchemy/
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
-RDEPEND=>=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlalchemy-0.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-0.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.5.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3380eb7a5d3a6484bfc10cc2778812c2
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=10df875a1accefb90a01b191e4c142b4
diff --git a/metadata/md5-cache/dev-python/fleep-1.0.1 b/metadata/md5-cache/dev-python/fleep-1.0.1
deleted file mode 100644
index 2d3d7a910398..000000000000
--- a/metadata/md5-cache/dev-python/fleep-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=File format determination library for Python
-EAPI=7
-HOMEPAGE=https://github.com/floyernick/fleep-py
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/f/fleep/fleep-1.0.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a38ef5edd8421349b00dc110de2df148
diff --git a/metadata/md5-cache/dev-python/fleep-1.0.1-r1 b/metadata/md5-cache/dev-python/fleep-1.0.1-r1
new file mode 100644
index 000000000000..019bd787b6d8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fleep-1.0.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=File format determination library for Python
+EAPI=8
+HOMEPAGE=https://github.com/floyernick/fleep-py
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/floyernick/fleep-py/archive/994bc2c274482d80ab13d89d8f7343eb316d3e44.tar.gz -> fleep-1.0.1.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fa1b4beddb865d0e1a4a94d6dd6fdef4
diff --git a/metadata/md5-cache/dev-python/fleep-9999 b/metadata/md5-cache/dev-python/fleep-9999
index 1825c70f9df0..c425e097cdd8 100644
--- a/metadata/md5-cache/dev-python/fleep-9999
+++ b/metadata/md5-cache/dev-python/fleep-9999
@@ -1,13 +1,13 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=File format determination library for Python
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/floyernick/fleep-py
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a38ef5edd8421349b00dc110de2df148
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d053ca8176fbab9d912db2029e063a43
diff --git a/metadata/md5-cache/dev-python/fonttools-4.26.1 b/metadata/md5-cache/dev-python/fonttools-4.26.1
new file mode 100644
index 000000000000..f76998d79f18
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fonttools-4.26.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-arch/zopfli ) test? ( >=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
+EAPI=7
+HOMEPAGE=https://github.com/fonttools/fonttools/
+IUSE=test python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=>=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fonttools/fonttools/archive/4.26.1.tar.gz -> fonttools-4.26.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_md5_=f744027b4dbb3ce3b60bd7b2d1b6c0e0
diff --git a/metadata/md5-cache/dev-python/fs-2.4.13 b/metadata/md5-cache/dev-python/fs-2.4.13
index e38e730801d4..5841f80dd556 100644
--- a/metadata/md5-cache/dev-python/fs-2.4.13
+++ b/metadata/md5-cache/dev-python/fs-2.4.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyFilesystem/pyfilesystem2/archive/v2.4.13.tar.gz -> fs-2.4.13.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=002d6c3a19c6c7a1a1935eb4f781a021
diff --git a/metadata/md5-cache/dev-python/gast-0.5.2 b/metadata/md5-cache/dev-python/gast-0.5.2
new file mode 100644
index 000000000000..c6705ad34c25
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gast-0.5.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/astunparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)
+EAPI=8
+HOMEPAGE=https://pypi.org/project/gast/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/gast/gast-0.5.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=da5381d81072ca7682a264fd625b63e7
diff --git a/metadata/md5-cache/dev-python/gevent-21.1.2 b/metadata/md5-cache/dev-python/gevent-21.1.2
index 4805a05f0f3c..cb3c5a6af177 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.10[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0[ssl(+),threads(+)] dev-python/sphinx[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] events? ( dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 DESCRIPTION=Coroutine-based network library
 EAPI=7
 HOMEPAGE=https://www.gevent.org/ https://pypi.org/project/gevent/
-IUSE=doc examples test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=doc events examples test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 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/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] events? ( dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-21.1.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e33b558009da1c7c0cf9a1f29543effd
+_md5_=c12708572105770b8989ffda335ecb1e
diff --git a/metadata/md5-cache/dev-python/google-api-core-1.28.0 b/metadata/md5-cache/dev-python/google-api-core-1.28.0
deleted file mode 100644
index 30388e905d43..000000000000
--- a/metadata/md5-cache/dev-python/google-api-core-1.28.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/googleapis-common-protos[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Core Library for Google Client Libraries
-EAPI=7
-HOMEPAGE=https://github.com/googleapis/python-api-core https://googleapis.dev/python/google-api-core/latest
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/googleapis-common-protos[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/python-api-core/archive/v1.28.0.tar.gz -> google-api-core-1.28.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4919736a4589b8a6f2ff604048b028f3
diff --git a/metadata/md5-cache/dev-python/google-api-core-1.30.0 b/metadata/md5-cache/dev-python/google-api-core-1.30.0
index 3a43a22c307f..54a24585d740 100644
--- a/metadata/md5-cache/dev-python/google-api-core-1.30.0
+++ b/metadata/md5-cache/dev-python/google-api-core-1.30.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_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_8(-)?,python_targets_python3_9(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/googleapis-common-protos[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/python-api-core/archive/v1.30.0.tar.gz -> google-api-core-1.30.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=90a9a8437063563640cd1ed6da27c753
+_md5_=3c89abedf0a0fb3be5082ca65bdcf205
diff --git a/metadata/md5-cache/dev-python/google-api-core-1.31.0 b/metadata/md5-cache/dev-python/google-api-core-1.31.0
deleted file mode 100644
index 980cbca614eb..000000000000
--- a/metadata/md5-cache/dev-python/google-api-core-1.31.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/googleapis-common-protos[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Core Library for Google Client Libraries
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/python-api-core https://googleapis.dev/python/google-api-core/latest
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/googleapis-common-protos[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/python-api-core/archive/v1.31.0.tar.gz -> google-api-core-1.31.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=abc3754ba0384edd579c0f753f49610f
diff --git a/metadata/md5-cache/dev-python/google-auth-1.30.2 b/metadata/md5-cache/dev-python/google-auth-1.30.2
deleted file mode 100644
index 29d3917b3bb5..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-1.30.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=7
-HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/google-auth/google-auth-1.30.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cf49fe0654ee304e6e30fd3e0071347b
diff --git a/metadata/md5-cache/dev-python/google-auth-1.32.1 b/metadata/md5-cache/dev-python/google-auth-1.32.1
index 888e9b771791..43624078cc98 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.32.1
+++ b/metadata/md5-cache/dev-python/google-auth-1.32.1
@@ -4,7 +4,7 @@ DESCRIPTION=Google Authentication Library
 EAPI=8
 HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.32.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c5837684f82d9b7d53526dd7d532653
+_md5_=35aac36ea3b027fc1589314f8c24e25e
diff --git a/metadata/md5-cache/dev-python/google-auth-1.33.0 b/metadata/md5-cache/dev-python/google-auth-1.33.0
deleted file mode 100644
index 3247c2d6c35a..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-1.33.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/google-auth/google-auth-1.33.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c5837684f82d9b7d53526dd7d532653
diff --git a/metadata/md5-cache/dev-python/google-auth-1.33.1 b/metadata/md5-cache/dev-python/google-auth-1.33.1
deleted file mode 100644
index 1277ee610eba..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-1.33.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/google-auth/google-auth-1.33.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c5837684f82d9b7d53526dd7d532653
diff --git a/metadata/md5-cache/dev-python/graph-tool-2.43 b/metadata/md5-cache/dev-python/graph-tool-2.43
index e517f6fea0a0..452af62e3758 100644
--- a/metadata/md5-cache/dev-python/graph-tool-2.43
+++ b/metadata/md5-cache/dev-python/graph-tool-2.43
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://downloads.skewed.de/graph-tool/graph-tool-2.43.tar.bz2
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e856f58e49222d94f390af9143474159
diff --git a/metadata/md5-cache/dev-python/graph-tool-9999 b/metadata/md5-cache/dev-python/graph-tool-9999
index badc8dd98f9c..75f3e633c467 100644
--- a/metadata/md5-cache/dev-python/graph-tool-9999
+++ b/metadata/md5-cache/dev-python/graph-tool-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-libs/boost-1.70:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/expat dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-mathematics/cgal:= dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cairo? ( dev-cpp/cairomm:0 dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e856f58e49222d94f390af9143474159
diff --git a/metadata/md5-cache/dev-python/hiredis-1.1.0 b/metadata/md5-cache/dev-python/hiredis-1.1.0
deleted file mode 100644
index 587427897916..000000000000
--- a/metadata/md5-cache/dev-python/hiredis-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=system-libs? ( dev-libs/hiredis:0/0.14 )
-DESCRIPTION=Python extension that wraps hiredis
-EAPI=7
-HOMEPAGE=https://github.com/redis/hiredis-py/
-IUSE=system-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm x86
-LICENSE=BSD
-RDEPEND=system-libs? ( dev-libs/hiredis:0/0.14 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hiredis/hiredis-1.1.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=82381a1c90135e583bd513f966204d8c
diff --git a/metadata/md5-cache/dev-python/hiredis-2.0.0 b/metadata/md5-cache/dev-python/hiredis-2.0.0
index a00460cfe106..3142e98934fe 100644
--- a/metadata/md5-cache/dev-python/hiredis-2.0.0
+++ b/metadata/md5-cache/dev-python/hiredis-2.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Python extension that wraps hiredis
 EAPI=7
 HOMEPAGE=https://github.com/redis/hiredis-py/
 IUSE=system-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=system-libs? ( dev-libs/hiredis:0/1.0.0 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiredis/hiredis-2.0.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3fee80683b28dee72974675bcd1493ea
+_md5_=94e85bb32201cdcf727661e18368f5cf
diff --git a/metadata/md5-cache/dev-python/httpcore-0.13.6 b/metadata/md5-cache/dev-python/httpcore-0.13.6
index 7c3c14d2029a..f0ab622503b4 100644
--- a/metadata/md5-cache/dev-python/httpcore-0.13.6
+++ b/metadata/md5-cache/dev-python/httpcore-0.13.6
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( =dev-python/anyio-3*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/h11-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/hyper-h2-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( =dev-python/anyio-3*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/h11-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/hyper-h2-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A minimal low-level HTTP client
 EAPI=7
 HOMEPAGE=https://www.encode.io/httpcore/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
-RDEPEND==dev-python/anyio-3*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/h11-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/hyper-h2-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND==dev-python/anyio-3*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/h11-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/hyper-h2-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/httpcore/archive/0.13.6.tar.gz -> httpcore-0.13.6.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6bdfae8f97f49f4138638e9a2a950b6c
+_md5_=414e306d47876f653d6fb10d1d6d1665
diff --git a/metadata/md5-cache/dev-python/httpx-0.18.2 b/metadata/md5-cache/dev-python/httpx-0.18.2
index 046ce511c31b..6b010f2a56c2 100644
--- a/metadata/md5-cache/dev-python/httpx-0.18.2
+++ b/metadata/md5-cache/dev-python/httpx-0.18.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/hyper-h2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/uvicorn[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sniffio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/httpcore-0.13*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rfc3986-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/rfc3986-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hyper-h2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/uvicorn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sniffio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/httpcore-0.13*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rfc3986-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/rfc3986-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Fully-featured HTTP client which provides sync and async APIs
 EAPI=7
 HOMEPAGE=https://www.python-httpx.org/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 sparc x86
 LICENSE=BSD
-RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sniffio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/httpcore-0.13*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rfc3986-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/rfc3986-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sniffio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/httpcore-0.13*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rfc3986-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/rfc3986-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/httpx/archive/0.18.2.tar.gz -> httpx-0.18.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b21948cdda622f6d3b95202525676180
+_md5_=30f54506c895d181c2b533b21e28bfd3
diff --git a/metadata/md5-cache/dev-python/humanize-3.11.0 b/metadata/md5-cache/dev-python/humanize-3.11.0
new file mode 100644
index 000000000000..11f8dbd346d3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/humanize-3.11.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Common humanization utilities
+EAPI=8
+HOMEPAGE=https://github.com/jmoiron/humanize/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/h/humanize/humanize-3.11.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f614b0017c4ca1a10f0696284a1f8ff9
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.14.0-r1 b/metadata/md5-cache/dev-python/hypothesis-6.14.0-r1
index 264abf7d7abe..0d50438633a8 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.14.0-r1
+++ b/metadata/md5-cache/dev-python/hypothesis-6.14.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.14.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9d9c3b1785003b5afbfa20d665f253e1
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.14.2 b/metadata/md5-cache/dev-python/hypothesis-6.14.2
index 97b05eec3c2b..9b8989d14020 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.14.2
+++ b/metadata/md5-cache/dev-python/hypothesis-6.14.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.14.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c17d15ab1989dc38cf3939bb45bd0114
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.14.3 b/metadata/md5-cache/dev-python/hypothesis-6.14.3
index 1d5de117d240..dd7ffbb7ed3c 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.14.3
+++ b/metadata/md5-cache/dev-python/hypothesis-6.14.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.14.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c17d15ab1989dc38cf3939bb45bd0114
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.14.5 b/metadata/md5-cache/dev-python/hypothesis-6.14.5
index 51a333fa178f..212e96ea9d3c 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.14.5
+++ b/metadata/md5-cache/dev-python/hypothesis-6.14.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.14.5.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c17d15ab1989dc38cf3939bb45bd0114
diff --git a/metadata/md5-cache/dev-python/identify-2.2.12 b/metadata/md5-cache/dev-python/identify-2.2.12
new file mode 100644
index 000000000000..d9e07e3af8b9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/identify-2.2.12
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/editdistance-s[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=File identification library for Python
+EAPI=8
+HOMEPAGE=https://github.com/pre-commit/identify
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/editdistance-s[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pre-commit/identify/archive/refs/tags/v2.2.12.tar.gz -> identify-2.2.12.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7c4fcef28f7f81e53a4da71116ec01ce
diff --git a/metadata/md5-cache/dev-python/immutables-0.15-r1 b/metadata/md5-cache/dev-python/immutables-0.15-r1
new file mode 100644
index 000000000000..061ad20aef84
--- /dev/null
+++ b/metadata/md5-cache/dev-python/immutables-0.15-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A high-performance immutable mapping type for Python
+EAPI=7
+HOMEPAGE=https://github.com/MagicStack/immutables
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/MagicStack/immutables/archive/v0.15.tar.gz -> immutables-0.15.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=327ef4a357f2d8e7d0aad19486131a06
diff --git a/metadata/md5-cache/dev-python/importlib_resources-5.1.4 b/metadata/md5-cache/dev-python/importlib_resources-5.1.4
deleted file mode 100644
index 879633d4dbb6..000000000000
--- a/metadata/md5-cache/dev-python/importlib_resources-5.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools_scm-3.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] test? ( python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read resources from Python packages
-EAPI=7
-HOMEPAGE=https://github.com/python/importlib_resources
-IUSE=test doc python_targets_pypy3 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-5.1.4.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=06937cf27137166ac56ca2d349886403
diff --git a/metadata/md5-cache/dev-python/importlib_resources-5.2.0 b/metadata/md5-cache/dev-python/importlib_resources-5.2.0
deleted file mode 100644
index 10fc7d7015d1..000000000000
--- a/metadata/md5-cache/dev-python/importlib_resources-5.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools_scm-3.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] test? ( python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read resources from Python packages
-EAPI=7
-HOMEPAGE=https://github.com/python/importlib_resources
-IUSE=test doc python_targets_pypy3 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-5.2.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e9f86d8f846ed6275d62a97b6c30b91b
diff --git a/metadata/md5-cache/dev-python/importlib_resources-5.2.1 b/metadata/md5-cache/dev-python/importlib_resources-5.2.1
deleted file mode 100644
index 6ee77ac8b999..000000000000
--- a/metadata/md5-cache/dev-python/importlib_resources-5.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools_scm-3.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] test? ( python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read resources from Python packages
-EAPI=8
-HOMEPAGE=https://github.com/python/importlib_resources
-IUSE=test doc python_targets_pypy3 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-5.2.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4048fad37da8ba9a89b026663743c0f5
diff --git a/metadata/md5-cache/dev-python/importlib_resources-5.2.2 b/metadata/md5-cache/dev-python/importlib_resources-5.2.2
index e5cc57782108..16ac4f74aaa5 100644
--- a/metadata/md5-cache/dev-python/importlib_resources-5.2.2
+++ b/metadata/md5-cache/dev-python/importlib_resources-5.2.2
@@ -4,7 +4,7 @@ DESCRIPTION=Read resources from Python packages
 EAPI=8
 HOMEPAGE=https://github.com/python/importlib_resources
 IUSE=test doc python_targets_pypy3 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-5.2.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4048fad37da8ba9a89b026663743c0f5
+_md5_=6bea7eca27b2d4498a8d499ad63ce774
diff --git a/metadata/md5-cache/dev-python/intelhex-2.3.0 b/metadata/md5-cache/dev-python/intelhex-2.3.0
index eeaa5d733303..e4ebd6518bdf 100644
--- a/metadata/md5-cache/dev-python/intelhex-2.3.0
+++ b/metadata/md5-cache/dev-python/intelhex-2.3.0
@@ -1,14 +1,14 @@
 BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library for Intel HEX files manipulations
-EAPI=7
+EAPI=8
 HOMEPAGE=https://pypi.org/project/IntelHex/ https://github.com/python-intelhex/intelhex
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~mips ~x86
+KEYWORDS=amd64 ~arm ~mips ~riscv ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IntelHex/intelhex-2.3.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=55c707290c3cd0cd9cc7c8d87d58c359
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a43cbf0ebc7d270729c9121440b5a7d4
diff --git a/metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1 b/metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1
index 7b9b79e8ecd9..9db62742db8d 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1
+++ b/metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-6.3.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a706c26d53efabf913c69be6dd5f03df
diff --git a/metadata/md5-cache/dev-python/ipython-7.24.1 b/metadata/md5-cache/dev-python/ipython-7.24.1
index c85ca5d77475..61ef7cec27ab 100644
--- a/metadata/md5-cache/dev-python/ipython-7.24.1
+++ b/metadata/md5-cache/dev-python/ipython-7.24.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-7.24.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=f2b7fc32155f65aa044ea414417a1f5b
diff --git a/metadata/md5-cache/dev-python/ipython-7.24.1-r1 b/metadata/md5-cache/dev-python/ipython-7.24.1-r1
index 8c39b31782e0..cb8b95ba0707 100644
--- a/metadata/md5-cache/dev-python/ipython-7.24.1-r1
+++ b/metadata/md5-cache/dev-python/ipython-7.24.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-7.24.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=6666a0d570ae82399ef77095dde0f25d
diff --git a/metadata/md5-cache/dev-python/ipython-7.25.0 b/metadata/md5-cache/dev-python/ipython-7.25.0
index b131a193b83d..0bc351ca1cae 100644
--- a/metadata/md5-cache/dev-python/ipython-7.25.0
+++ b/metadata/md5-cache/dev-python/ipython-7.25.0
@@ -4,7 +4,7 @@ DESCRIPTION=Advanced interactive shell for Python
 EAPI=7
 HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
 IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/widgetsnbextension[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 RDEPEND=dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-7.25.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=cefb418ee5a4973e1b7573e667abd4e2
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_md5_=4432676de9781ab36a13fce6912b9828
diff --git a/metadata/md5-cache/dev-python/ipython-7.26.0 b/metadata/md5-cache/dev-python/ipython-7.26.0
new file mode 100644
index 000000000000..ee315145f810
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipython-7.26.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Advanced interactive shell for Python
+EAPI=7
+HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
+IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/widgetsnbextension[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+RDEPEND=dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipython/ipython-7.26.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_md5_=28044ba1edb3b89ba8255f77fcba246d
diff --git a/metadata/md5-cache/dev-python/isort-5.8.0 b/metadata/md5-cache/dev-python/isort-5.8.0
deleted file mode 100644
index fa119ffe837b..000000000000
--- a/metadata/md5-cache/dev-python/isort-5.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pylama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A python utility/library to sort imports
-EAPI=7
-HOMEPAGE=https://pypi.org/project/isort/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/isort/isort-5.8.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=886ede9b94ab0f973889f209409a0077
diff --git a/metadata/md5-cache/dev-python/isort-5.9.1 b/metadata/md5-cache/dev-python/isort-5.9.1
deleted file mode 100644
index 0d0135fac87e..000000000000
--- a/metadata/md5-cache/dev-python/isort-5.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pylama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A python utility/library to sort imports
-EAPI=7
-HOMEPAGE=https://pypi.org/project/isort/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyCQA/isort/archive/5.9.1.tar.gz -> isort-5.9.1.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4f0e006c2d7f63f534e24a0dc68a68f0
diff --git a/metadata/md5-cache/dev-python/isort-5.9.2 b/metadata/md5-cache/dev-python/isort-5.9.2
index 1a4bb9182e91..4a12590f59f2 100644
--- a/metadata/md5-cache/dev-python/isort-5.9.2
+++ b/metadata/md5-cache/dev-python/isort-5.9.2
@@ -4,7 +4,7 @@ DESCRIPTION=A python utility/library to sort imports
 EAPI=8
 HOMEPAGE=https://pypi.org/project/isort/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/isort/archive/5.9.2.tar.gz -> isort-5.9.2.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f13a75f1ec6889a51a9cbcc7ccbcce05
+_md5_=354b7630ac87e8f0969685d750ed2796
diff --git a/metadata/md5-cache/dev-python/jedi-0.18.0 b/metadata/md5-cache/dev-python/jedi-0.18.0
index f2aca0df4def..1e894285f6ce 100644
--- a/metadata/md5-cache/dev-python/jedi-0.18.0
+++ b/metadata/md5-cache/dev-python/jedi-0.18.0
@@ -4,7 +4,7 @@ DESCRIPTION=Autocompletion library for Python
 EAPI=7
 HOMEPAGE=https://github.com/davidhalter/jedi
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT test? ( Apache-2.0 )
 RDEPEND==dev-python/parso-0.8*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.18.0.tar.gz -> jedi-0.18.0.tar.gz https://github.com/davidhalter/typeshed/archive/jedi_v0.16.0.tar.gz -> typeshed-jedi_v0.16.0.tar.gz https://github.com/davidhalter/django-stubs/archive/v1.5.0.tar.gz -> django-stubs-1.5.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0ccda2183a2768079236026ad7256144
+_md5_=e931dcc01d819e00cbe639f62d82972b
diff --git a/metadata/md5-cache/dev-python/jeepney-0.7.1 b/metadata/md5-cache/dev-python/jeepney-0.7.1
new file mode 100644
index 000000000000..c303819a83cb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jeepney-0.7.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/async_timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/dbus python_targets_python3_8? ( dev-python/pytest-trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/pytest-trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, pure Python DBus protocol wrapper
+EAPI=8
+HOMEPAGE=https://gitlab.com/takluyver/jeepney
+IUSE=examples test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jeepney/jeepney-0.7.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3ef2f006bbe8eaf34ae88f331571883b
diff --git a/metadata/md5-cache/dev-python/jellyfish-0.8.4 b/metadata/md5-cache/dev-python/jellyfish-0.8.4
new file mode 100644
index 000000000000..7254243e50dd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jellyfish-0.8.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/unicodecsv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( dev-python/sphinx ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module for doing approximate and phonetic matching of strings
+EAPI=8
+HOMEPAGE=https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jellyfish/jellyfish-0.8.4.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1ad4d8c49e7e081e4c0cd4ebca812f28
diff --git a/metadata/md5-cache/dev-python/joblib-1.0.1 b/metadata/md5-cache/dev-python/joblib-1.0.1
index 8e040ad6ccd1..683884a120af 100644
--- a/metadata/md5-cache/dev-python/joblib-1.0.1
+++ b/metadata/md5-cache/dev-python/joblib-1.0.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/loky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/threadpoolctl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/loky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/loky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/threadpoolctl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/loky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tools to provide lightweight pipelining in Python
 EAPI=7
 HOMEPAGE=https://joblib.readthedocs.io/en/latest/ https://github.com/joblib/joblib
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=BSD
-RDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/loky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/loky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/joblib/archive/1.0.1.tar.gz -> joblib-1.0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=af29d5fa147316f8cb42f587e2e5c0a9
+_md5_=c3858fd4e48db70248c9fcbda10ce99f
diff --git a/metadata/md5-cache/dev-python/js2py-0.71 b/metadata/md5-cache/dev-python/js2py-0.71
index 5e8478bc34e1..5bfd921f6320 100644
--- a/metadata/md5-cache/dev-python/js2py-0.71
+++ b/metadata/md5-cache/dev-python/js2py-0.71
@@ -4,11 +4,11 @@ DESCRIPTION=JavaScript to Python Translator & JavaScript interpreter in Python
 EAPI=7
 HOMEPAGE=http://piter.io/projects/js2py/ https://github.com/PiotrDabkowski/Js2Py/ https://pypi.org/project/Js2Py/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pyjsparser-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tzlocal-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/PiotrDabkowski/Js2Py/archive/5f665f60083a9796ec33861240ce31d6d2b844b6.tar.gz -> Js2Py-0.71.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c1fea41b4af2e14aefe11e00e4fefd8c
+_md5_=341099ae700d5945904a577c3469e22a
diff --git a/metadata/md5-cache/dev-python/jwcrypto-1.0.0 b/metadata/md5-cache/dev-python/jwcrypto-1.0.0
new file mode 100644
index 000000000000..3994d921fb3b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jwcrypto-1.0.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Implements JWK,JWS,JWE specifications using python-cryptography
+EAPI=8
+HOMEPAGE=https://github.com/latchset/jwcrypto
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/latchset/jwcrypto/archive/v1.0.0.tar.gz -> jwcrypto-1.0.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b35c52620994723cfff81150a045be32
diff --git a/metadata/md5-cache/dev-python/kafka-python-2.0.2 b/metadata/md5-cache/dev-python/kafka-python-2.0.2
new file mode 100644
index 000000000000..97c87db7898d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/kafka-python-2.0.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/snappy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zstandard[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Kafka protocol support in Python
+EAPI=7
+HOMEPAGE=https://github.com/dpkp/kafka-python/ https://pypi.org/project/kafka-python/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dpkp/kafka-python/archive/2.0.2.tar.gz -> kafka-python-2.0.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=979e6027f9354e2e3796c953307dde0a
diff --git a/metadata/md5-cache/dev-python/lark-parser-0.11.3 b/metadata/md5-cache/dev-python/lark-parser-0.11.3
index a90ac4ce1bf9..ef47d1f249ff 100644
--- a/metadata/md5-cache/dev-python/lark-parser-0.11.3
+++ b/metadata/md5-cache/dev-python/lark-parser-0.11.3
@@ -4,7 +4,7 @@ DESCRIPTION=Python module to propose a modern general-purpose parsing library fo
 EAPI=7
 HOMEPAGE=https://github.com/lark-parser/lark
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lark-parser/lark-parser-0.11.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fd1f99dd50e26cbea2703f0add10674c
+_md5_=2c3265260142496a575171eea5ee22c5
diff --git a/metadata/md5-cache/dev-python/leather-0.3.3-r2 b/metadata/md5-cache/dev-python/leather-0.3.3-r2
index 1cf7dad2a775..5ac3f304f19f 100644
--- a/metadata/md5-cache/dev-python/leather-0.3.3-r2
+++ b/metadata/md5-cache/dev-python/leather-0.3.3-r2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( xml? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/cssselect-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( xml? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/cssselect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python charting for 80% of humans.
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/wireservice/leather https://pypi.org/project/leather/
-IUSE=test +xml test python_targets_python3_8 python_targets_python3_9
+IUSE=+xml test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=xml? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/cssselect-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RDEPEND=xml? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/cssselect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wireservice/leather/archive/refs/tags/0.3.3.tar.gz -> leather-0.3.3-src.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=08dfc96da2d94a1210fefa7c16967efe
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d857f4de0e1345ff472bfc87c25fd25a
diff --git a/metadata/md5-cache/dev-python/libarchive-c-3.1 b/metadata/md5-cache/dev-python/libarchive-c-3.1
new file mode 100644
index 000000000000..cc8d002d3638
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libarchive-c-3.1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python interface to libarchive
+EAPI=7
+HOMEPAGE=https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=CC0-1.0
+RDEPEND=app-arch/libarchive python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/l/libarchive-c/libarchive-c-3.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9a153c5b2ada1e092eeff0f7dc3acc09
diff --git a/metadata/md5-cache/dev-python/libcloud-3.3.0 b/metadata/md5-cache/dev-python/libcloud-3.3.0
index d17cd9c85866..a876f4f436c5 100644
--- a/metadata/md5-cache/dev-python/libcloud-3.3.0
+++ b/metadata/md5-cache/dev-python/libcloud-3.3.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/requests-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cryptography-2.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lockfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/cryptography-2.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lockfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Unified Interface to the Cloud - python support libs
 EAPI=7
 HOMEPAGE=https://libcloud.apache.org/
-IUSE=examples test python_targets_python3_8 python_targets_python3_9
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/libcloud/apache-libcloud-3.3.0.tar.bz2
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5de5eb3a051dd88b847125e99432ad71
+_md5_=de852b4f913796f7d1894b9d786e680f
diff --git a/metadata/md5-cache/dev-python/lit-12.0.1 b/metadata/md5-cache/dev-python/lit-12.0.1
index 1fba2749a168..4d0497f4c1f4 100644
--- a/metadata/md5-cache/dev-python/lit-12.0.1
+++ b/metadata/md5-cache/dev-python/lit-12.0.1
@@ -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_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=26d5a8028365bd3f1219b503572d455a
+_md5_=2aa71c894e89d31e64971fcc93f0e2c1
diff --git a/metadata/md5-cache/dev-python/lit-13.0.0_rc1 b/metadata/md5-cache/dev-python/lit-13.0.0_rc1
new file mode 100644
index 000000000000..920d44b3d0cd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-13.0.0_rc1
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/llvm ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A stand-alone install of the LLVM suite testing tool
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=462a67dde2b631dd12fbe4721da9f2f8
diff --git a/metadata/md5-cache/dev-python/lockfile-0.12.2-r2 b/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
index c10f176ef6f6..3a915027e351 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
+++ b/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
@@ -1,15 +1,15 @@
-BDEPEND=>dev-python/pbr-1.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( dev-python/sphinx ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=>dev-python/pbr-1.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( dev-python/sphinx ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Platform-independent file locking module
 EAPI=7
 HOMEPAGE=https://launchpad.net/pylockfile https://pypi.org/project/lockfile/
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lockfile/lockfile-0.12.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0efd90ada00581884acb0e379cf237f7
+_md5_=0dc39a3b889bd258778bfec14c185539
diff --git a/metadata/md5-cache/dev-python/loky-2.9.0 b/metadata/md5-cache/dev-python/loky-2.9.0
index b79dd2c2c278..deff107e04bb 100644
--- a/metadata/md5-cache/dev-python/loky-2.9.0
+++ b/metadata/md5-cache/dev-python/loky-2.9.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Robust and reusable Executor for joblib
 EAPI=7
 HOMEPAGE=https://github.com/joblib/loky
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=BSD
-RDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/loky/archive/2.9.0.tar.gz -> loky-2.9.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7a68d84cb87054e5a96faea4316f84f4
+_md5_=ed794e5705412107186fb21fb467fecd
diff --git a/metadata/md5-cache/dev-python/lxml-4.6.3 b/metadata/md5-cache/dev-python/lxml-4.6.3
index 219089d30722..56d3009fc426 100644
--- a/metadata/md5-cache/dev-python/lxml-4.6.3
+++ b/metadata/md5-cache/dev-python/lxml-4.6.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.6.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd77f7bf3430c0cc9e3dd150c0cc955e
diff --git a/metadata/md5-cache/dev-python/lxml-4.6.3-r1 b/metadata/md5-cache/dev-python/lxml-4.6.3-r1
index f5a445861f73..4f3deb3280bc 100644
--- a/metadata/md5-cache/dev-python/lxml-4.6.3-r1
+++ b/metadata/md5-cache/dev-python/lxml-4.6.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.6.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8d63292d01d5f3b9a1fe1e056df6b27c
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.37.1-r1 b/metadata/md5-cache/dev-python/m2crypto-0.37.1-r1
deleted file mode 100644
index 52275dfd7773..000000000000
--- a/metadata/md5-cache/dev-python/m2crypto-0.37.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/swig-2.0.9 test? ( dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:0=
-DESCRIPTION=A Python crypto and SSL toolkit
-EAPI=7
-HOMEPAGE=https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-libs/openssl:0= python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.37.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=47b7c004188b742fe27981e6e6ae7bd9
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.38.0 b/metadata/md5-cache/dev-python/m2crypto-0.38.0
index ab77cfed9ee0..e4e8623f5fc6 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.38.0
+++ b/metadata/md5-cache/dev-python/m2crypto-0.38.0
@@ -5,7 +5,7 @@ DESCRIPTION=A Python crypto and SSL toolkit
 EAPI=7
 HOMEPAGE=https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/
 IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/openssl:0= python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.38.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=367f30890a3c2a7e9e2afdf26a97b504
+_md5_=e7faaf3536e1318d6693bea820db4324
diff --git a/metadata/md5-cache/dev-python/mako-1.1.4 b/metadata/md5-cache/dev-python/mako-1.1.4
index 6e25112ddf1c..7f3313650ac1 100644
--- a/metadata/md5-cache/dev-python/mako-1.1.4
+++ b/metadata/md5-cache/dev-python/mako-1.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.1.4.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8936fd14b9485c56b7a958edcb49e8fb
diff --git a/metadata/md5-cache/dev-python/minimock-1.3.0 b/metadata/md5-cache/dev-python/minimock-1.3.0
index 09beaca82927..2ff8239b5883 100644
--- a/metadata/md5-cache/dev-python/minimock-1.3.0
+++ b/metadata/md5-cache/dev-python/minimock-1.3.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The simplest possible mock library
 EAPI=7
 HOMEPAGE=https://pypi.org/project/MiniMock/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm ~arm64 ppc x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lowks/minimock/archive/v1.3.0.tar.gz -> minimock-1.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f592cd9deacc803577fe1467e7bbaed5
+_md5_=c9dd2cc65cf2c9d64ac3f29743cd1892
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-7.2.1 b/metadata/md5-cache/dev-python/mkdocs-material-7.2.1
deleted file mode 100644
index 1dbd2f0957dd..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-material-7.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Material Design theme for MkDocs
-EAPI=8
-HOMEPAGE=https://github.com/squidfunk/mkdocs-material https://pypi.org/project/mkdocs-material
-IUSE=python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pymdown-extensions-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-material-extensions-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/7.2.1.tar.gz -> mkdocs-material-7.2.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8850e85cff2c423a89fa284be49a58f8
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-7.2.2 b/metadata/md5-cache/dev-python/mkdocs-material-7.2.2
new file mode 100644
index 000000000000..ba3b6124481a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-material-7.2.2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Material Design theme for MkDocs
+EAPI=8
+HOMEPAGE=https://github.com/squidfunk/mkdocs-material https://pypi.org/project/mkdocs-material
+IUSE=python_targets_python3_8 python_targets_python3_9 doc
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pymdown-extensions-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-material-extensions-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/7.2.2.tar.gz -> mkdocs-material-7.2.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d2569a46fee919f91e8dfd3490039592
diff --git a/metadata/md5-cache/dev-python/mysql-connector-python-8.0.26 b/metadata/md5-cache/dev-python/mysql-connector-python-8.0.26
new file mode 100644
index 000000000000..1fe92c21f7c8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mysql-connector-python-8.0.26
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-libs/protobuf-3.6.1 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-db/mysql-connector-c-8.0 >=dev-python/protobuf-python-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-db/mysql[server(+)] )
+DESCRIPTION=Python client library for MariaDB/MySQL
+EAPI=7
+HOMEPAGE=https://dev.mysql.com/downloads/connector/python/
+IUSE=examples test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-db/mysql-connector-c-8.0 >=dev-python/protobuf-python-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mysql/mysql-connector-python/archive/refs/tags/8.0.26.tar.gz -> mysql-connector-python-8.0.26.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9a3b419ddfec1d0bc3a49546973d8ab4
diff --git a/metadata/md5-cache/dev-python/natsort-7.1.1 b/metadata/md5-cache/dev-python/natsort-7.1.1
index 8360f437807a..2427fc5b67dd 100644
--- a/metadata/md5-cache/dev-python/natsort-7.1.1
+++ b/metadata/md5-cache/dev-python/natsort-7.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Natural sorting for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/natsort/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/natsort/natsort-7.1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bdb1a39d59807b6731d0e35e561d40d2
+_md5_=44d6524ac8cd3c2c4ebac3fd690cfa05
diff --git a/metadata/md5-cache/dev-python/netcdf4-python-1.5.6 b/metadata/md5-cache/dev-python/netcdf4-python-1.5.6
index 708e1fef763f..1d48a41a3d60 100644
--- a/metadata/md5-cache/dev-python/netcdf4-python-1.5.6
+++ b/metadata/md5-cache/dev-python/netcdf4-python-1.5.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/netCDF4/netCDF4-1.5.6.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b753e76053c11f83617ec5b45c7b1014
diff --git a/metadata/md5-cache/dev-python/netcdf4-python-1.5.7 b/metadata/md5-cache/dev-python/netcdf4-python-1.5.7
index c952b6e7a114..9e79f019ec7e 100644
--- a/metadata/md5-cache/dev-python/netcdf4-python-1.5.7
+++ b/metadata/md5-cache/dev-python/netcdf4-python-1.5.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/netCDF4/netCDF4-1.5.7.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=92a6a2ec08d29c67297f17060a5561d1
diff --git a/metadata/md5-cache/dev-python/nltk-data-20200312-r1 b/metadata/md5-cache/dev-python/nltk-data-20200312-r1
index 23ad2b417723..b9bfe49dbe0a 100644
--- a/metadata/md5-cache/dev-python/nltk-data-20200312-r1
+++ b/metadata/md5-cache/dev-python/nltk-data-20200312-r1
@@ -9,5 +9,5 @@ LICENSE=all-rights-reserved
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/comtrans.zip -> nltk-comtrans-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/conll2007.zip -> nltk-conll2007-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/jeita.zip -> nltk-jeita-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/knbc.zip -> nltk-knbc-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/machado.zip -> nltk-machado-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/masc_tagged.zip -> nltk-masc_tagged-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/nombank.1.0.zip -> nltk-nombank.1.0-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/panlex_swadesh.zip -> nltk-panlex_swadesh-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/propbank.zip -> nltk-propbank-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/reuters.zip -> nltk-reuters-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/semcor.zip -> nltk-semcor-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/universal_treebanks_v20.zip -> nltk-universal_treebanks_v20-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/sentiment/vader_lexicon.zip -> nltk-vader_lexicon-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/stemmers/snowball_data.zip -> nltk-snowball_data-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/abc.zip -> nltk-abc-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/alpino.zip -> nltk-alpino-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/brown.zip -> nltk-brown-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/cess_cat.zip -> nltk-cess_cat-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/cess_esp.zip -> nltk-cess_esp-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/chat80.zip -> nltk-chat80-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/city_database.zip -> nltk-city_database-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/cmudict.zip -> nltk-cmudict-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/comparative_sentences.zip -> nltk-comparative_sentences-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/conll2000.zip -> nltk-conll2000-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/conll2002.zip -> nltk-conll2002-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/crubadan.zip -> nltk-crubadan-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/dependency_treebank.zip -> nltk-dependency_treebank-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/dolch.zip -> nltk-dolch-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/europarl_raw.zip -> nltk-europarl_raw-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/floresta.zip -> nltk-floresta-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/framenet_v15.zip -> nltk-framenet_v15-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/framenet_v17.zip -> nltk-framenet_v17-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/gazetteers.zip -> nltk-gazetteers-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/genesis.zip -> nltk-genesis-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/gutenberg.zip -> nltk-gutenberg-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/ieer.zip -> nltk-ieer-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/inaugural.zip -> nltk-inaugural-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/indian.zip -> nltk-indian-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/lin_thesaurus.zip -> nltk-lin_thesaurus-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/mac_morpho.zip -> nltk-mac_morpho-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/movie_reviews.zip -> nltk-movie_reviews-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/mte_teip5.zip -> nltk-mte_teip5-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/names.zip -> nltk-names-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/nonbreaking_prefixes.zip -> nltk-nonbreaking_prefixes-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/nps_chat.zip -> nltk-nps_chat-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/omw.zip -> nltk-omw-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/opinion_lexicon.zip -> nltk-opinion_lexicon-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/pl196x.zip -> nltk-pl196x-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/ppattach.zip -> nltk-ppattach-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/product_reviews_1.zip -> nltk-product_reviews_1-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/product_reviews_2.zip -> nltk-product_reviews_2-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/pros_cons.zip -> nltk-pros_cons-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/ptb.zip -> nltk-ptb-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/qc.zip -> nltk-qc-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/rte.zip -> nltk-rte-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/senseval.zip -> nltk-senseval-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/sentence_polarity.zip -> nltk-sentence_polarity-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/sentiwordnet.zip -> nltk-sentiwordnet-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/shakespeare.zip -> nltk-shakespeare-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/sinica_treebank.zip -> nltk-sinica_treebank-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/state_union.zip -> nltk-state_union-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/stopwords.zip -> nltk-stopwords-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/subjectivity.zip -> nltk-subjectivity-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/swadesh.zip -> nltk-swadesh-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/switchboard.zip -> nltk-switchboard-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/timit.zip -> nltk-timit-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/toolbox.zip -> nltk-toolbox-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/treebank.zip -> nltk-treebank-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/twitter_samples.zip -> nltk-twitter_samples-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/udhr.zip -> nltk-udhr-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/udhr2.zip -> nltk-udhr2-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/verbnet.zip -> nltk-verbnet-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/webtext.zip -> nltk-webtext-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/wordnet.zip -> nltk-wordnet-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/wordnet_ic.zip -> nltk-wordnet_ic-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/words.zip -> nltk-words-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/book_grammars.zip -> nltk-book_grammars-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/large_grammars.zip -> nltk-large_grammars-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/sample_grammars.zip -> nltk-sample_grammars-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/misc/perluniprops.zip -> nltk-perluniprops-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/models/bllip_wsj_no_aux.zip -> nltk-bllip_wsj_no_aux-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/models/moses_sample.zip -> nltk-moses_sample-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/models/wmt15_eval.zip -> nltk-wmt15_eval-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/models/word2vec_sample.zip -> nltk-word2vec_sample-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/stemmers/porter_test.zip -> nltk-porter_test-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/stemmers/rslp.zip -> nltk-rslp-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/taggers/averaged_perceptron_tagger.zip -> nltk-averaged_perceptron_tagger-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/taggers/averaged_perceptron_tagger_ru.zip -> nltk-averaged_perceptron_tagger_ru-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/taggers/universal_tagset.zip -> nltk-universal_tagset-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/tokenizers/punkt.zip -> nltk-punkt-20200312.zip extra? ( https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/chunkers/maxent_ne_chunker.zip -> nltk-maxent_ne_chunker-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/biocreative_ppi.zip -> nltk-biocreative_ppi-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/brown_tei.zip -> nltk-brown_tei-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/kimmo.zip -> nltk-kimmo-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/paradigms.zip -> nltk-paradigms-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/pe08.zip -> nltk-pe08-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/pil.zip -> nltk-pil-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/problem_reports.zip -> nltk-problem_reports-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/smultron.zip -> nltk-smultron-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/unicode_samples.zip -> nltk-unicode_samples-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/verbnet3.zip -> nltk-verbnet3-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/ycoe.zip -> nltk-ycoe-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/basque_grammars.zip -> nltk-basque_grammars-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/spanish_grammars.zip -> nltk-spanish_grammars-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/help/tagsets.zip -> nltk-tagsets-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/misc/mwa_ppdb.zip -> nltk-mwa_ppdb-20200312.zip https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/taggers/maxent_treebank_pos_tagger.zip -> nltk-maxent_treebank_pos_tagger-20200312.zip )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8
 _md5_=15479fb5e7dba8dbfd7d09ffcbc3f91e
diff --git a/metadata/md5-cache/dev-python/notebook-6.4.1 b/metadata/md5-cache/dev-python/notebook-6.4.1
new file mode 100644
index 000000000000..bb1ca75011e3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/notebook-6.4.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-unixsocket[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbconvert-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DESCRIPTION=Jupyter Interactive Notebook
+EAPI=8
+HOMEPAGE=https://jupyter.org
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbconvert-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/notebook/notebook-6.4.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=569e676e35b4c59225cb65645e571ba4
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.11 b/metadata/md5-cache/dev-python/nuitka-0.6.11
index 6bda2b732804..3dac2ae6b506 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.11
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://nuitka.net/releases/Nuitka-0.6.11.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=38762e6590ee492433068cb42f2697c0
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.15 b/metadata/md5-cache/dev-python/nuitka-0.6.15
index 62518cb3aae4..61297a8a9061 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.15
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://nuitka.net/releases/Nuitka-0.6.15.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=38762e6590ee492433068cb42f2697c0
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.15.1 b/metadata/md5-cache/dev-python/nuitka-0.6.15.1
index 38cda1ec5bf1..046c126a440e 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.15.1
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.15.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://nuitka.net/releases/Nuitka-0.6.15.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=38762e6590ee492433068cb42f2697c0
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.15.3 b/metadata/md5-cache/dev-python/nuitka-0.6.15.3
index 6973fd3a5ab7..1d3f135a4391 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.15.3
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.15.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://nuitka.net/releases/Nuitka-0.6.15.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7918f53248cdc0df1d4e5f3e968da238
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.16 b/metadata/md5-cache/dev-python/nuitka-0.6.16
index d7fb5917a7eb..b3ddcfd816b9 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.16
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://nuitka.net/releases/Nuitka-0.6.16.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7918f53248cdc0df1d4e5f3e968da238
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.16.2 b/metadata/md5-cache/dev-python/nuitka-0.6.16.2
index 00f8f088e4c8..9294562b313f 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.16.2
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.16.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://nuitka.net/releases/Nuitka-0.6.16.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7918f53248cdc0df1d4e5f3e968da238
diff --git a/metadata/md5-cache/dev-python/numpy-1.21.1 b/metadata/md5-cache/dev-python/numpy-1.21.1
index 6f66a91e17ba..d3ed04fa84c9 100644
--- a/metadata/md5-cache/dev-python/numpy-1.21.1
+++ b/metadata/md5-cache/dev-python/numpy-1.21.1
@@ -5,7 +5,7 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=7
 HOMEPAGE=https://numpy.org/
 IUSE=doc lapack test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.21.1.zip doc? ( https://numpy.org/doc/1.21/numpy-html.zip -> numpy-html-1.21.1.zip https://numpy.org/doc/1.21/numpy-ref.pdf -> numpy-ref-1.21.1.pdf https://numpy.org/doc/1.21/numpy-user.pdf -> numpy-user-1.21.1.pdf )
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=55a95faf87b063070f6da3f671ec61d6
+_md5_=5f8cb676fe075a47975c5f8cafde4d97
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 fcbe89ba3bba..b7ed5dc58526 100644
--- a/metadata/md5-cache/dev-python/pandas-1.2.3-r1
+++ b/metadata/md5-cache/dev-python/pandas-1.2.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.2.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4e6eb37731b7378d8d1c20caa30c02c
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.4 b/metadata/md5-cache/dev-python/pandas-1.2.4
index 84ada4cec2fc..1c0c0c7275ac 100644
--- a/metadata/md5-cache/dev-python/pandas-1.2.4
+++ b/metadata/md5-cache/dev-python/pandas-1.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.2.4.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cb4b3b0ab7f48e12878d9c509d9101d1
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.5 b/metadata/md5-cache/dev-python/pandas-1.2.5
index f683fbb2a220..973fe90aecee 100644
--- a/metadata/md5-cache/dev-python/pandas-1.2.5
+++ b/metadata/md5-cache/dev-python/pandas-1.2.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.2.5.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a66fe9253c8e0b819f63e584895c594b
diff --git a/metadata/md5-cache/dev-python/pandas-1.3.0 b/metadata/md5-cache/dev-python/pandas-1.3.0
index c38d42864b8b..6c4660af7c82 100644
--- a/metadata/md5-cache/dev-python/pandas-1.3.0
+++ b/metadata/md5-cache/dev-python/pandas-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pandas-dev/pandas/releases/download/v1.3.0/pandas-1.3.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50074ebc0cbff78e0d6f43ee63ad5338
diff --git a/metadata/md5-cache/dev-python/pandas-1.3.1 b/metadata/md5-cache/dev-python/pandas-1.3.1
index c50e5f79af09..436fed19f6dc 100644
--- a/metadata/md5-cache/dev-python/pandas-1.3.1
+++ b/metadata/md5-cache/dev-python/pandas-1.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pandas-dev/pandas/releases/download/v1.3.1/pandas-1.3.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50074ebc0cbff78e0d6f43ee63ad5338
diff --git a/metadata/md5-cache/dev-python/parso-0.7.1-r1 b/metadata/md5-cache/dev-python/parso-0.7.1-r1
index fb7809fad6d4..65f1633e8e14 100644
--- a/metadata/md5-cache/dev-python/parso-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/parso-0.7.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=a python parser that supports error recovery and round-trip parsing
 EAPI=7
 HOMEPAGE=https://github.com/davidhalter/parso https://pypi.org/project/parso/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/parso/archive/v0.7.1.tar.gz -> parso-0.7.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c41f79b6a9dd94b3b318d86c42a95bf3
+_md5_=4a660921c1f30d4501226d0b353c7f84
diff --git a/metadata/md5-cache/dev-python/parso-0.8.2 b/metadata/md5-cache/dev-python/parso-0.8.2
index 11d6711da565..1eec360f9296 100644
--- a/metadata/md5-cache/dev-python/parso-0.8.2
+++ b/metadata/md5-cache/dev-python/parso-0.8.2
@@ -4,7 +4,7 @@ DESCRIPTION=a python parser that supports error recovery and round-trip parsing
 EAPI=8
 HOMEPAGE=https://github.com/davidhalter/parso https://pypi.org/project/parso/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/parso/archive/v0.8.2.tar.gz -> parso-0.8.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=78eeed956647d88926fbe35b408f35d9
+_md5_=c3a6a301fd18ff8320b59e3b3a9d5413
diff --git a/metadata/md5-cache/dev-python/pathtools-0.1.2-r3 b/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
index c7c59290be66..2f2406bb364c 100644
--- a/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
+++ b/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pattern matching and various utilities for file systems paths
 EAPI=7
-HOMEPAGE=https://pypi.org/project/pathtools/
-IUSE=python_targets_python3_8 python_targets_python3_9
+HOMEPAGE=https://pypi.org/project/pathtools/ https://github.com/gorakhargosh/pathtools
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm arm64 ~ppc x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathtools/pathtools-0.1.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=67c1b3d8de22da3dfa32f783c32285a2
+_md5_=4a4a7d4c3d992d1b4a451bc0652b5912
diff --git a/metadata/md5-cache/dev-python/patsy-0.5.1 b/metadata/md5-cache/dev-python/patsy-0.5.1
index 0d9bf5760626..1292e4c9ea69 100644
--- a/metadata/md5-cache/dev-python/patsy-0.5.1
+++ b/metadata/md5-cache/dev-python/patsy-0.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python module to describe statistical models and design matrices
 EAPI=7
 HOMEPAGE=https://patsy.readthedocs.org/en/latest/index.html
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/patsy/patsy-0.5.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cea5443103f45423a0b7cc5622e18c34
+_md5_=c26f4d93d5848ea8bd0947ea2dd04bba
diff --git a/metadata/md5-cache/dev-python/pipenv-2021.5.29-r1 b/metadata/md5-cache/dev-python/pipenv-2021.5.29-r1
new file mode 100644
index 000000000000..166715aec648
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pipenv-2021.5.29-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python Development Workflow for Humans
+EAPI=7
+HOMEPAGE=https://github.com/pypa/pipenv https://pypi.org/project/pipenv/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/pipenv/archive/v2021.5.29.tar.gz -> pipenv-2021.5.29.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ba1adc73ac61221efb2e0a1ba39cf8de
diff --git a/metadata/md5-cache/dev-python/platformdirs-2.0.2 b/metadata/md5-cache/dev-python/platformdirs-2.0.2
index b1704539d4a1..b91e36cf818b 100644
--- a/metadata/md5-cache/dev-python/platformdirs-2.0.2
+++ b/metadata/md5-cache/dev-python/platformdirs-2.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=A small Python module for determining appropriate platform-specific
 EAPI=8
 HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/platformdirs/platformdirs/archive/2.0.2.tar.gz -> platformdirs-2.0.2.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4973a071cf39639b20e5ae2fa1b56743
+_md5_=ee3baae2c289d916ea9b38b9376c141e
diff --git a/metadata/md5-cache/dev-python/plumbum-1.7.0-r1 b/metadata/md5-cache/dev-python/plumbum-1.7.0-r1
index e520d45caace..e0ae5038f4ec 100644
--- a/metadata/md5-cache/dev-python/plumbum-1.7.0-r1
+++ b/metadata/md5-cache/dev-python/plumbum-1.7.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( 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	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=445d086806914f77f4ae5f96d6062504
diff --git a/metadata/md5-cache/dev-python/plyvel-1.3.0 b/metadata/md5-cache/dev-python/plyvel-1.3.0
index 00d097a07db0..f4554336afef 100644
--- a/metadata/md5-cache/dev-python/plyvel-1.3.0
+++ b/metadata/md5-cache/dev-python/plyvel-1.3.0
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) test? ( >=dev-libs/leveldb-1.20:= >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) test? ( >=dev-libs/leveldb-1.20:= >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/leveldb-1.20:=
 DESCRIPTION=Python interface to LevelDB
 EAPI=7
 HOMEPAGE=https://github.com/wbolster/plyvel
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-libs/leveldb-1.20:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-libs/leveldb-1.20:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/plyvel/plyvel-1.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=895f009c45fabcc90d7c96c5ef89f4c3
+_md5_=42a9b114f42502f678eae24ce7429d01
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.21 b/metadata/md5-cache/dev-python/pocketlint-0.21
index d3d17a5a4a31..6d376906d5a0 100644
--- a/metadata/md5-cache/dev-python/pocketlint-0.21
+++ b/metadata/md5-cache/dev-python/pocketlint-0.21
@@ -4,11 +4,11 @@ DESCRIPTION=Shared code for running pylint against rhinstaller projects
 EAPI=7
 HOMEPAGE=https://github.com/rhinstaller/pocketlint
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.21.tar.gz -> pocketlint-0.21.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1c85e1019563ebcb0f98291eb45197e5
+_md5_=31b5a5dc4f4033d34387b52b085fc0c4
diff --git a/metadata/md5-cache/dev-python/polib-1.1.1 b/metadata/md5-cache/dev-python/polib-1.1.1
index b97825f48a27..0ba18ceaa7cf 100644
--- a/metadata/md5-cache/dev-python/polib-1.1.1
+++ b/metadata/md5-cache/dev-python/polib-1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=A library to manipulate gettext files (.po and .mo files)
 EAPI=7
 HOMEPAGE=https://github.com/izimobil/polib https://polib.readthedocs.io/en/latest/
 IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/polib/polib-1.1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e1144673f4769b3dc6c82229785ed140
+_md5_=70aaa6058baf4c949f8fd4f415aec338
diff --git a/metadata/md5-cache/dev-python/priority-2.0.0 b/metadata/md5-cache/dev-python/priority-2.0.0
index b8815a7364ce..c5a30713c159 100644
--- a/metadata/md5-cache/dev-python/priority-2.0.0
+++ b/metadata/md5-cache/dev-python/priority-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=A pure-Python implementation of the HTTP/2 priority tree
 EAPI=7
 HOMEPAGE=https://python-hyper.org/priority/en/latest/ https://github.com/python-hyper/priority https://pypi.org/project/priority/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/priority/priority-2.0.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=31f7fc40c473df5a50778167c38dda33
+_md5_=f64db4e247243c5f366a998b06f95e97
diff --git a/metadata/md5-cache/dev-python/psycopg-2.8.6-r1 b/metadata/md5-cache/dev-python/psycopg-2.8.6-r1
deleted file mode 100644
index 35774efff8c4..000000000000
--- a/metadata/md5-cache/dev-python/psycopg-2.8.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-db/postgresql-8.1[server] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/postgresql-8.1:*
-DESCRIPTION=PostgreSQL database adapter for Python
-EAPI=7
-HOMEPAGE=https://www.psycopg.org https://pypi.org/project/psycopg2/
-IUSE=debug test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=LGPL-3+
-RDEPEND=>=dev-db/postgresql-8.1:* python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.8.6.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=84e5642b68c1691d44775b36789fe678
diff --git a/metadata/md5-cache/dev-python/psycopg-2.9 b/metadata/md5-cache/dev-python/psycopg-2.9
deleted file mode 100644
index 7ee2206aec61..000000000000
--- a/metadata/md5-cache/dev-python/psycopg-2.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-db/postgresql-8.1[server] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/postgresql-8.1:*
-DESCRIPTION=PostgreSQL database adapter for Python
-EAPI=7
-HOMEPAGE=https://www.psycopg.org https://pypi.org/project/psycopg2/
-IUSE=debug test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=LGPL-3+
-RDEPEND=>=dev-db/postgresql-8.1:* python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.9.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eb6378cec2908948c1e3d0963ecb66ed
diff --git a/metadata/md5-cache/dev-python/psycopg-2.9.1 b/metadata/md5-cache/dev-python/psycopg-2.9.1
index 65ca2da24d13..0e6273e0bbd1 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.9.1
+++ b/metadata/md5-cache/dev-python/psycopg-2.9.1
@@ -5,7 +5,7 @@ DESCRIPTION=PostgreSQL database adapter for Python
 EAPI=7
 HOMEPAGE=https://www.psycopg.org https://pypi.org/project/psycopg2/
 IUSE=debug test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=LGPL-3+
 RDEPEND=>=dev-db/postgresql-8.1:* python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.9.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=09b46638b1dcc7efd3a3e20b8cc61230
+_md5_=517e1ea903d3bb0e5cea2c412329a9c3
diff --git a/metadata/md5-cache/dev-python/pybind11-2.7.1 b/metadata/md5-cache/dev-python/pybind11-2.7.1
new file mode 100644
index 000000000000..8499a4d1ba14
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pybind11-2.7.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-cpp/eigen:3 >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-util/ninja dev-util/cmake python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=AST-based Python refactoring library
+EAPI=7
+HOMEPAGE=https://pybind11.readthedocs.io/en/stable/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=dev-cpp/eigen:3 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pybind/pybind11/archive/v2.7.1.tar.gz -> pybind11-2.7.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=58483f3cfc431ff592e3b5b853490f8d
diff --git a/metadata/md5-cache/dev-python/pyclipper-1.3.0 b/metadata/md5-cache/dev-python/pyclipper-1.3.0
index f55828ae3e50..00276c36e42d 100644
--- a/metadata/md5-cache/dev-python/pyclipper-1.3.0
+++ b/metadata/md5-cache/dev-python/pyclipper-1.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Cython wrapper for the C++ translation of the Angus Johnson's Clippe
 EAPI=7
 HOMEPAGE=https://github.com/fonttools/pyclipper
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/pyclipper/archive/1.3.0.tar.gz -> pyclipper-1.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ad93530aee3519a6e8b97cc67c9ee206
+_md5_=15ec99aec605b46a2340767de3f71f8a
diff --git a/metadata/md5-cache/dev-python/pyenchant-3.2.1 b/metadata/md5-cache/dev-python/pyenchant-3.2.1
index 768a8354e4b9..21a2e522fd9d 100644
--- a/metadata/md5-cache/dev-python/pyenchant-3.2.1
+++ b/metadata/md5-cache/dev-python/pyenchant-3.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for the Enchant spellchecking system
 EAPI=7
 HOMEPAGE=https://github.com/pyenchant/pyenchant https://pypi.org/project/pyenchant/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/enchant:* python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyenchant/pyenchant/archive/v3.2.1.tar.gz -> pyenchant-3.2.1.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=09c1db9423a775c5fc1b2ea5ded8d56e
+_md5_=a879699e7af319818153126967ce0c0a
diff --git a/metadata/md5-cache/dev-python/pyhcl-0.4.4 b/metadata/md5-cache/dev-python/pyhcl-0.4.4
index 409344ec7082..01f48217ed3f 100644
--- a/metadata/md5-cache/dev-python/pyhcl-0.4.4
+++ b/metadata/md5-cache/dev-python/pyhcl-0.4.4
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=HCL configuration parser for python
 EAPI=7
 HOMEPAGE=https://github.com/virtuald/pyhcl
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MPL-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/virtuald/pyhcl/archive/0.4.4.tar.gz -> pyhcl-0.4.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=329cb293fdbbbad465c10823b973aac0
+_md5_=48b04ba8485fee4a8a8c01edba45f337
diff --git a/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421 b/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421
index ea1f6b7960e3..cf1dabe97685 100644
--- a/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421
+++ b/metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421
@@ -4,7 +4,7 @@ DESCRIPTION=Fast javascript parser based on esprima.js
 EAPI=7
 HOMEPAGE=https://github.com/PiotrDabkowski/pyjsparser/ https://pypi.org/project/pyjsparser/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PiotrDabkowski/pyjsparser/archive/5465d037b30e334cb0997f2315ec1e451b8ad4c1.tar.gz -> pyjsparser-2.7.1_p20190421.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f81ff26fb55c9c4bc5d835df0889f8d4
+_md5_=e56e415f843d9928a9aa132bea88bbb6
diff --git a/metadata/md5-cache/dev-python/pyjwt-1.7.1-r1 b/metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
index 5a27fa636a76..cf6086af5ceb 100644
--- a/metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
+++ b/metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyJWT/PyJWT-1.7.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4783bcb2c332fb7cd919146ad198c4d7
diff --git a/metadata/md5-cache/dev-python/pyjwt-2.1.0 b/metadata/md5-cache/dev-python/pyjwt-2.1.0
index 9a9ba657165c..0f17b84e8155 100644
--- a/metadata/md5-cache/dev-python/pyjwt-2.1.0
+++ b/metadata/md5-cache/dev-python/pyjwt-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyJWT/PyJWT-2.1.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e124113d12b57c937adc93e4ef23416c
diff --git a/metadata/md5-cache/dev-python/pylatex-1.4.1 b/metadata/md5-cache/dev-python/pylatex-1.4.1
index d3507b2cba3d..7c10b7be0beb 100644
--- a/metadata/md5-cache/dev-python/pylatex-1.4.1
+++ b/metadata/md5-cache/dev-python/pylatex-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JelteF/PyLaTeX/archive/v1.4.1.tar.gz -> pylatex-1.4.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=78fdc6df533dc071bc8cab9b0069971d
diff --git a/metadata/md5-cache/dev-python/pymongo-3.11.0-r1 b/metadata/md5-cache/dev-python/pymongo-3.11.0-r1
index d67eac5a8079..b5d21f973da8 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.11.0-r1
+++ b/metadata/md5-cache/dev-python/pymongo-3.11.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-3.11.0.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=497282f80c7a49468565fb202c15d101
diff --git a/metadata/md5-cache/dev-python/pymongo-3.11.1 b/metadata/md5-cache/dev-python/pymongo-3.11.1
index 43527406abca..01b61fedc94d 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.11.1
+++ b/metadata/md5-cache/dev-python/pymongo-3.11.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-python-driver/archive/3.11.1.tar.gz -> mongo-python-driver-3.11.1.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f3f0aeaab71f2f225a6abe3ef30af4c
diff --git a/metadata/md5-cache/dev-python/pymongo-3.11.2 b/metadata/md5-cache/dev-python/pymongo-3.11.2
index 28f2cb67311c..b385047c9c1d 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.11.2
+++ b/metadata/md5-cache/dev-python/pymongo-3.11.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-python-driver/archive/3.11.2.tar.gz -> mongo-python-driver-3.11.2.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd2b46bc028e304b79e9ba3d8e9d8836
diff --git a/metadata/md5-cache/dev-python/pymongo-3.11.3 b/metadata/md5-cache/dev-python/pymongo-3.11.3
index bea1fbba0632..4a9c7c8e3de7 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.11.3
+++ b/metadata/md5-cache/dev-python/pymongo-3.11.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-python-driver/archive/3.11.3.tar.gz -> mongo-python-driver-3.11.3.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd2b46bc028e304b79e9ba3d8e9d8836
diff --git a/metadata/md5-cache/dev-python/pymongo-3.11.4 b/metadata/md5-cache/dev-python/pymongo-3.11.4
index 0e16f5c80580..319f3ec58822 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.11.4
+++ b/metadata/md5-cache/dev-python/pymongo-3.11.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-python-driver/archive/3.11.4.tar.gz -> mongo-python-driver-3.11.4.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=97fa3f4368b9a5d70c9c083af127a633
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-19 b/metadata/md5-cache/dev-python/pyproject2setuppy-19
new file mode 100644
index 000000000000..f646c36d75f1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-19
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Cheap setup.py hack to install flit & poetry-based projects
+EAPI=8
+HOMEPAGE=https://github.com/mgorny/pyproject2setuppy
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mgorny/pyproject2setuppy/archive/v19.tar.gz -> pyproject2setuppy-19.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ba1a4b0ce35ab7430982c6e8bd9aef45
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.4 b/metadata/md5-cache/dev-python/pypy-exe-7.3.4
index 6fa8e959909d..430e82da4448 100644
--- a/metadata/md5-cache/dev-python/pypy-exe-7.3.4
+++ b/metadata/md5-cache/dev-python/pypy-exe-7.3.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.4
 SLOT=7.3.4
 SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.4-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.4.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5fb64831e440f339d1495e6bd451e696
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.5 b/metadata/md5-cache/dev-python/pypy-exe-7.3.5
index dd4868b35626..c9c830c41c4f 100644
--- a/metadata/md5-cache/dev-python/pypy-exe-7.3.5
+++ b/metadata/md5-cache/dev-python/pypy-exe-7.3.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.5
 SLOT=7.3.5
 SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.5-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.5.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=800dfe76216bf7e48ed245ae2d45130b
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.5_rc3 b/metadata/md5-cache/dev-python/pypy-exe-7.3.5_rc3
index 1a484a918cc5..b27f84654dc7 100644
--- a/metadata/md5-cache/dev-python/pypy-exe-7.3.5_rc3
+++ b/metadata/md5-cache/dev-python/pypy-exe-7.3.5_rc3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.5_rc3
 SLOT=7.3.5_rc3
 SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.5rc3-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.5rc3.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=800dfe76216bf7e48ed245ae2d45130b
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.4 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.4
index 99dca02bc43d..784eb50e14ea 100644
--- a/metadata/md5-cache/dev-python/pypy3-exe-7.3.4
+++ b/metadata/md5-cache/dev-python/pypy3-exe-7.3.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.4
 SLOT=7.3.4
 SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.4-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.7-gentoo-patches-7.3.4.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68eaf39fd1658e288444a3283802496f
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.5 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.5
index 03821607ef34..d813af59627d 100644
--- a/metadata/md5-cache/dev-python/pypy3-exe-7.3.5
+++ b/metadata/md5-cache/dev-python/pypy3-exe-7.3.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.5
 SLOT=7.3.5
 SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.5-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.7-gentoo-patches-7.3.5.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad46932b3913e6cf879b67610836e2f0
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.5_rc3 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.5_rc3
index 4b243d638ba8..261ef104b12e 100644
--- a/metadata/md5-cache/dev-python/pypy3-exe-7.3.5_rc3
+++ b/metadata/md5-cache/dev-python/pypy3-exe-7.3.5_rc3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.5_rc3
 SLOT=7.3.5_rc3
 SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.5rc3-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.7-gentoo-patches-7.3.5rc3.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad46932b3913e6cf879b67610836e2f0
diff --git a/metadata/md5-cache/dev-python/pyquery-1.4.3 b/metadata/md5-cache/dev-python/pyquery-1.4.3
index 6d9e7d397768..48e9303462ca 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.4.3
+++ b/metadata/md5-cache/dev-python/pyquery-1.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.4.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aff1df35544733b68c650e002979335a
diff --git a/metadata/md5-cache/dev-python/pyscard-2.0.1 b/metadata/md5-cache/dev-python/pyscard-2.0.1
index 6c7ddeaf1fee..577852427445 100644
--- a/metadata/md5-cache/dev-python/pyscard-2.0.1
+++ b/metadata/md5-cache/dev-python/pyscard-2.0.1
@@ -5,12 +5,12 @@ DESCRIPTION=Smart card support in python
 EAPI=7
 HOMEPAGE=https://pyscard.sourceforge.io/ https://github.com/LudovicRousseau/pyscard https://pypi.org/project/pyscard/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-apps/pcsc-lite python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyscard/pyscard-2.0.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0483bb911d8443374c4a526b7544cfe4
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dcf6c1e28fba8bce786cd4bbf7fed6a6
diff --git a/metadata/md5-cache/dev-python/pysol_cards-0.10.1 b/metadata/md5-cache/dev-python/pysol_cards-0.10.1
index 3478cdd8c532..7cd8b4872bb6 100644
--- a/metadata/md5-cache/dev-python/pysol_cards-0.10.1
+++ b/metadata/md5-cache/dev-python/pysol_cards-0.10.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/oslotest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=Deal PySol FreeCell cards
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pysol-cards/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 arm64 x86
 LICENSE=Apache-2.0 MIT
 RDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysol_cards/pysol_cards-0.10.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=deef458025f5d46b0b41415b8ee9eae6
+_md5_=1c44d0d0448b32919940c9ae3591ad10
diff --git a/metadata/md5-cache/dev-python/pysol_cards-0.10.2 b/metadata/md5-cache/dev-python/pysol_cards-0.10.2
new file mode 100644
index 000000000000..9d91057dda7f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pysol_cards-0.10.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/oslotest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Deal PySol FreeCell cards
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pysol-cards/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0 MIT
+RDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pysol_cards/pysol_cards-0.10.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6e6f03cc927a8d1d31bfe12bde6e1a85
diff --git a/metadata/md5-cache/dev-python/pysvn-1.9.15 b/metadata/md5-cache/dev-python/pysvn-1.9.15
index f854783a7da7..c4261fa830e4 100644
--- a/metadata/md5-cache/dev-python/pysvn-1.9.15
+++ b/metadata/md5-cache/dev-python/pysvn-1.9.15
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/pysvn/pysvn/V1.9.15/pysvn-1.9.15.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=46b36ae6728ad1387f3cd5a11c568910
+_md5_=e1618d689c67ba62e1c9300669ddb2cb
diff --git a/metadata/md5-cache/dev-python/pytables-3.6.1 b/metadata/md5-cache/dev-python/pytables-3.6.1
index d0a315069712..83883573e0d8 100644
--- a/metadata/md5-cache/dev-python/pytables-3.6.1
+++ b/metadata/md5-cache/dev-python/pytables-3.6.1
@@ -5,7 +5,7 @@ DESCRIPTION=Hierarchical datasets for Python
 EAPI=7
 HOMEPAGE=https://www.pytables.org/
 IUSE=doc examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= dev-libs/lzo:2= >=dev-python/numpy-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/hdf5-1.8.15:0= >=dev-python/numexpr-2.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tables/tables-3.6.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d2178dba6382339913b786580f7ad1d9
+_md5_=7999d12e3bdfb49d699e7c3853d1a67f
diff --git a/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1 b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
index 0b70ed5a50a1..cf28f4922d2c 100644
--- a/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=pytest plugin for aiohttp support
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/pytest-aiohttp/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/aiohttp-0.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/pytest-5.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/aiohttp-0.22.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-aiohttp/pytest-aiohttp-0.3.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bf747ff42af30226ff39166d6680c2fd
+_md5_=f4e10e4378bec6b41d0d57f9c06897ac
diff --git a/metadata/md5-cache/dev-python/pytest-datadir-1.3.1 b/metadata/md5-cache/dev-python/pytest-datadir-1.3.1
index 29b91343edb8..49cbf20ff8e3 100644
--- a/metadata/md5-cache/dev-python/pytest-datadir-1.3.1
+++ b/metadata/md5-cache/dev-python/pytest-datadir-1.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=Pytest plugin for manipulating test data directories and files
 EAPI=7
 HOMEPAGE=https://github.com/gabrielcnr/pytest-datadir
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-datadir/pytest-datadir-1.3.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dbba856c7538e66a01d89e4d30c1312b
+_md5_=b69a990e709d3f0bd02b634e6ce81ff9
diff --git a/metadata/md5-cache/dev-python/pytest-httpx-0.12.0 b/metadata/md5-cache/dev-python/pytest-httpx-0.12.0
index ec1420dc2b23..1587eae54009 100644
--- a/metadata/md5-cache/dev-python/pytest-httpx-0.12.0
+++ b/metadata/md5-cache/dev-python/pytest-httpx-0.12.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( =dev-python/httpx-0.18*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pytest-6*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( =dev-python/httpx-0.18*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/pytest-6*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Send responses to HTTPX using pytest
 EAPI=7
 HOMEPAGE=https://colin-b.github.io/pytest_httpx/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND==dev-python/httpx-0.18*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pytest-6*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND==dev-python/httpx-0.18*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/pytest-6*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Colin-b/pytest_httpx/archive/v0.12.0.tar.gz -> pytest-httpx-0.12.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f7299ef9069b2cc50ed53421538483a
+_md5_=374f65012d6a16e05bf366de73a27c43
diff --git a/metadata/md5-cache/dev-python/pytest-regressions-2.2.0 b/metadata/md5-cache/dev-python/pytest-regressions-2.2.0
index 8461091bba08..06ca728c80bd 100644
--- a/metadata/md5-cache/dev-python/pytest-regressions-2.2.0
+++ b/metadata/md5-cache/dev-python/pytest-regressions-2.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Easy to use fixtures to write regression tests
 EAPI=7
 HOMEPAGE=https://github.com/ESSS/pytest-regressions
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-datadir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-regressions/pytest-regressions-2.2.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=748a0d69f89701a72d0aa188b2218da2
+_md5_=833efd5819e2330a54699f4c27f0bbd5
diff --git a/metadata/md5-cache/dev-python/pytest-rerunfailures-10.1 b/metadata/md5-cache/dev-python/pytest-rerunfailures-10.1
index cfd22798c3f1..8183045166b0 100644
--- a/metadata/md5-cache/dev-python/pytest-rerunfailures-10.1
+++ b/metadata/md5-cache/dev-python/pytest-rerunfailures-10.1
@@ -4,7 +4,7 @@ DESCRIPTION=pytest plugin to re-run tests to eliminate flaky failures
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-rerunfailures/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-rerunfailures/pytest-rerunfailures-10.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=62c644e7d497a594cb5be5487ced03cb
+_md5_=43abdf6d9f035cf7614a7bb05544f91a
diff --git a/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12 b/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
index a63862c515b1..4abecfd7caa5 100644
--- a/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
+++ b/metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-python/pytest-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pytest plugin to support for a predictable and repeatable temporary directory
 EAPI=7
 HOMEPAGE=https://github.com/saltstack/pytest-tempdir
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-tempdir/archive/v2019.10.12.tar.gz -> pytest-tempdir-2019.10.12.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d48fe94fbe263f9f9c2d0211a8d47ee6
+_md5_=a1cb18d3eb59b8e78343caaa2c35e291
diff --git a/metadata/md5-cache/dev-python/python-caja-1.24.0-r2 b/metadata/md5-cache/dev-python/python-caja-1.24.0-r2
index b5fc34983544..91175fe6d4fc 100644
--- a/metadata/md5-cache/dev-python/python-caja-1.24.0-r2
+++ b/metadata/md5-cache/dev-python/python-caja-1.24.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=mate-base/caja-1.17.1[introspection] >=x11-libs/gtk+-3.22:3 dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) >=mate-base/caja-1.17.1[introspection] >=x11-libs/gtk+-3.22:3 dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
 DESCRIPTION=Python bindings for the Caja file manager
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
-IUSE=doc +python_single_target_python3_8
+IUSE=doc python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=mate-base/caja-1.17.1[introspection] >=x11-libs/gtk+-3.22:3
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) >=mate-base/caja-1.17.1[introspection] >=x11-libs/gtk+-3.22:3
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/python-caja-1.24.0.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	553f2bcf70c72d62970c216e3a74c24d	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=61ff1e53800e684484e541bb1babf088
+_md5_=3001f6fc10bca2de289cc0b0af5c056a
diff --git a/metadata/md5-cache/dev-python/python-ctags-1.5.0 b/metadata/md5-cache/dev-python/python-ctags-1.5.0
index 8ba6b95b94c0..06b20e59cc0c 100644
--- a/metadata/md5-cache/dev-python/python-ctags-1.5.0
+++ b/metadata/md5-cache/dev-python/python-ctags-1.5.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-util/ctags:= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-util/ctags:= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Exuberant Ctags indexing python bindings
 EAPI=7
-HOMEPAGE=https://github.com/jonashaag/python-ctags3
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+HOMEPAGE=https://github.com/universal-ctags/python-ctags3
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=dev-util/ctags:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-util/ctags:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ctags3/python-ctags3-1.5.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=609771e58a521eaff736da396840a441
+_md5_=a28d53ffcbd5abf170c6b07ce658fd68
diff --git a/metadata/md5-cache/dev-python/python-docs-3.6.13 b/metadata/md5-cache/dev-python/python-docs-3.6.13
deleted file mode 100644
index fe0fa7b9e8ff..000000000000
--- a/metadata/md5-cache/dev-python/python-docs-3.6.13
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.6
-SRC_URI=https://www.python.org/ftp/python/doc/3.6.13/python-3.6.13-docs-html.tar.bz2
-_md5_=a54000d31bf80f06b0fc88291b156689
diff --git a/metadata/md5-cache/dev-python/python-docs-3.6.14 b/metadata/md5-cache/dev-python/python-docs-3.6.14
index daa18943f958..1324fc0a6730 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.6.14
+++ b/metadata/md5-cache/dev-python/python-docs-3.6.14
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.6
 SRC_URI=https://www.python.org/ftp/python/doc/3.6.14/python-3.6.14-docs-html.tar.bz2
-_md5_=41cfed63b0c57b1b01d02622768e7278
+_md5_=a54000d31bf80f06b0fc88291b156689
diff --git a/metadata/md5-cache/dev-python/python-docs-3.7.10 b/metadata/md5-cache/dev-python/python-docs-3.7.10
deleted file mode 100644
index b2c8726eaf00..000000000000
--- a/metadata/md5-cache/dev-python/python-docs-3.7.10
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.7
-SRC_URI=https://www.python.org/ftp/python/doc/3.7.10/python-3.7.10-docs-html.tar.bz2
-_md5_=a54000d31bf80f06b0fc88291b156689
diff --git a/metadata/md5-cache/dev-python/python-docs-3.7.11 b/metadata/md5-cache/dev-python/python-docs-3.7.11
index 7702c90ad1c2..7a4979736920 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.7.11
+++ b/metadata/md5-cache/dev-python/python-docs-3.7.11
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.7
 SRC_URI=https://www.python.org/ftp/python/doc/3.7.11/python-3.7.11-docs-html.tar.bz2
-_md5_=41cfed63b0c57b1b01d02622768e7278
+_md5_=a54000d31bf80f06b0fc88291b156689
diff --git a/metadata/md5-cache/dev-python/python-docs-3.8.10 b/metadata/md5-cache/dev-python/python-docs-3.8.10
deleted file mode 100644
index d4695288cad7..000000000000
--- a/metadata/md5-cache/dev-python/python-docs-3.8.10
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.8
-SRC_URI=https://www.python.org/ftp/python/doc/3.8.10/python-3.8.10-docs-html.tar.bz2
-_md5_=a54000d31bf80f06b0fc88291b156689
diff --git a/metadata/md5-cache/dev-python/python-docs-3.8.11 b/metadata/md5-cache/dev-python/python-docs-3.8.11
index 27b65f3ca1cb..77f73878f51e 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.8.11
+++ b/metadata/md5-cache/dev-python/python-docs-3.8.11
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/doc/3.8.11/python-3.8.11-docs-html.tar.bz2
-_md5_=41cfed63b0c57b1b01d02622768e7278
+_md5_=a54000d31bf80f06b0fc88291b156689
diff --git a/metadata/md5-cache/dev-python/python-docs-3.9.5 b/metadata/md5-cache/dev-python/python-docs-3.9.5
deleted file mode 100644
index 010aa320f04b..000000000000
--- a/metadata/md5-cache/dev-python/python-docs-3.9.5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/doc/3.9.5/python-3.9.5-docs-html.tar.bz2
-_md5_=a54000d31bf80f06b0fc88291b156689
diff --git a/metadata/md5-cache/dev-python/python-docs-3.9.6 b/metadata/md5-cache/dev-python/python-docs-3.9.6
index 7aab73cb4f70..244e5ccb6976 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.9.6
+++ b/metadata/md5-cache/dev-python/python-docs-3.9.6
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/doc/3.9.6/python-3.9.6-docs-html.tar.bz2
-_md5_=41cfed63b0c57b1b01d02622768e7278
+_md5_=a54000d31bf80f06b0fc88291b156689
diff --git a/metadata/md5-cache/dev-python/python-dotenv-0.18.0-r1 b/metadata/md5-cache/dev-python/python-dotenv-0.18.0-r1
index 3b85494e74bd..d58ae766f40c 100644
--- a/metadata/md5-cache/dev-python/python-dotenv-0.18.0-r1
+++ b/metadata/md5-cache/dev-python/python-dotenv-0.18.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/click-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sh-1.09[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEPEND=test? ( >=dev-python/click-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sh-1.09[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 DESCRIPTION=Manage .env files
 EAPI=7
 HOMEPAGE=https://github.com/theskumar/python-dotenv
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dotenv/python-dotenv-0.18.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=14c99e104d5a0fd2deb5539e97cd5447
+_md5_=0b4eb7a60f325cfdd281134ad12dada2
diff --git a/metadata/md5-cache/dev-python/python-efl-1.25.0 b/metadata/md5-cache/dev-python/python-efl-1.25.0
index 03a9d8bf4c14..95158f2527b3 100644
--- a/metadata/md5-cache/dev-python/python-efl-1.25.0
+++ b/metadata/md5-cache/dev-python/python-efl-1.25.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for Enlightenment Foundation Libraries
 EAPI=7
 HOMEPAGE=https://phab.enlightenment.org/w/projects/python_bindings_for_efl/
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND==dev-libs/efl-1.25* dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/bindings/python/python-efl-1.25.0.tar.xz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=010a31abd750d9963f8a0f46ffc1a1b8
+_md5_=367403afba97e47b725bd1fdc1274df1
diff --git a/metadata/md5-cache/dev-python/python-engineio-4.2.1 b/metadata/md5-cache/dev-python/python-engineio-4.2.1
new file mode 100644
index 000000000000..26d7297b4946
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-engineio-4.2.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python implementation of the Engine.IO realtime server.
+EAPI=8
+HOMEPAGE=https://python-engineio.readthedocs.io/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/miguelgrinberg/python-engineio/archive/v4.2.1.tar.gz -> python-engineio-4.2.1.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d30b0a47d732e43eb8a7796ea234fe48
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.0.1-r1 b/metadata/md5-cache/dev-python/python-lsp-server-1.0.1-r1
index 80b8d7ef243b..b7a31fc049bb 100644
--- a/metadata/md5-cache/dev-python/python-lsp-server-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lsp-server/python-lsp-server-1.0.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=42e5d31742ac0a20c3553ebc4199044c
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.1.0-r1 b/metadata/md5-cache/dev-python/python-lsp-server-1.1.0-r1
index ef2d9c97c7e8..daef6bc1789f 100644
--- a/metadata/md5-cache/dev-python/python-lsp-server-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.1.0-r1
@@ -4,12 +4,12 @@ DESCRIPTION=Python Language Server for the Language Server Protocol
 EAPI=7
 HOMEPAGE=https://github.com/python-lsp/python-lsp-server
 IUSE=all-plugins test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jedi-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lsp-server/python-lsp-server-1.1.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c288abefef1096801afac2d3b1a2bf08
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d7d6bcc63f2532156d302d4470e79319
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.2.1 b/metadata/md5-cache/dev-python/python-lsp-server-1.2.1
new file mode 100644
index 000000000000..ae346c0594b8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.2.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jedi-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python Language Server for the Language Server Protocol
+EAPI=8
+HOMEPAGE=https://github.com/python-lsp/python-lsp-server
+IUSE=all-plugins test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jedi-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-lsp-server/python-lsp-server-1.2.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b1a4bc61c9f6d844816eb9baa1ac887d
diff --git a/metadata/md5-cache/dev-python/python-socks-1.2.4 b/metadata/md5-cache/dev-python/python-socks-1.2.4
index d9cf929bdd7b..20b1e8a6793f 100644
--- a/metadata/md5-cache/dev-python/python-socks-1.2.4
+++ b/metadata/md5-cache/dev-python/python-socks-1.2.4
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/async_timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yarl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/async_timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/async_timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/yarl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/async_timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=SOCKS4, SOCKS5, HTTP tunneling functionality for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/python-socks/ https://github.com/romis2012/python-socks/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/async_timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/async_timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/romis2012/python-socks/archive/v1.2.4.tar.gz -> python-socks-1.2.4.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2581a115be519a7f943e00ef2a2b50ad
+_md5_=499bc56938b7e3b2f3e3fc00fdfc899e
diff --git a/metadata/md5-cache/dev-python/python-xmlsec-1.3.11 b/metadata/md5-cache/dev-python/python-xmlsec-1.3.11
index 37332ba5999e..604046fd083e 100644
--- a/metadata/md5-cache/dev-python/python-xmlsec-1.3.11
+++ b/metadata/md5-cache/dev-python/python-xmlsec-1.3.11
@@ -1,16 +1,16 @@
-BDEPEND=dev-libs/xmlsec:= dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pkgconfig[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-libs/xmlsec:= dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-libs/xmlsec:= dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pkgconfig[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-libs/xmlsec:= dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/xmlsec:=
 DESCRIPTION=Python bindings for the XML Security Library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/mehcode/python-xmlsec
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=dev-libs/xmlsec:= dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
+RDEPEND=dev-libs/xmlsec:= dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mehcode/python-xmlsec/archive/1.3.11.tar.gz -> python-xmlsec-1.3.11.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3029dcac8a95f468d72bad2cdc1b4c97
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e66e60c12dccf18166f3e7a9c567ff05
diff --git a/metadata/md5-cache/dev-python/python-xmlsec-1.3.9 b/metadata/md5-cache/dev-python/python-xmlsec-1.3.9
deleted file mode 100644
index 0d12c07226ed..000000000000
--- a/metadata/md5-cache/dev-python/python-xmlsec-1.3.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/xmlsec:= dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pkgconfig[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-libs/xmlsec:= dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/xmlsec:=
-DESCRIPTION=Python bindings for the XML Security Library
-EAPI=7
-HOMEPAGE=https://github.com/mehcode/python-xmlsec
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/xmlsec:= dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mehcode/python-xmlsec/archive/1.3.9.tar.gz -> python-xmlsec-1.3.9.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2f8d3f2eeef171eac12dbe4a8ff64768
diff --git a/metadata/md5-cache/dev-python/python3-lxc-3.0.4 b/metadata/md5-cache/dev-python/python3-lxc-3.0.4
index 8f8783c3235d..b6181973dd3e 100644
--- a/metadata/md5-cache/dev-python/python3-lxc-3.0.4
+++ b/metadata/md5-cache/dev-python/python3-lxc-3.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for LXC
 EAPI=7
 HOMEPAGE=https://linuxcontainers.org/lxc/
 IUSE=verify-sig python_targets_python3_8 python_targets_python3_9 verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-emulation/lxc python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/python3-lxc-3.0.4.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/python3-lxc-3.0.4.tar.gz.asc )
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=3dfcc6822146f88d73cca2e829a8444d
+_md5_=290ecec85a3c670777d2d038b0792c4f
diff --git a/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1 b/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
deleted file mode 100644
index 3a6005124266..000000000000
--- a/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/orocos_kdl-1.4.0:= <dev-python/sip-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Python bindings for KDL
-EAPI=7
-HOMEPAGE=https://www.orocos.org/kdl
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm
-LICENSE=LGPL-2.1
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/orocos_kdl-1.4.0:= <dev-python/sip-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.4.0.tar.gz -> orocos_kinematics_dynamics-1.4.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=925d393c05450bc815c3f02a3c7f7db2
diff --git a/metadata/md5-cache/dev-python/python_orocos_kdl-1.5.0 b/metadata/md5-cache/dev-python/python_orocos_kdl-1.5.0
new file mode 100644
index 000000000000..0ae1bebf92e1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python_orocos_kdl-1.5.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/orocos_kdl-1.4.0:= dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Python bindings for KDL
+EAPI=7
+HOMEPAGE=https://www.orocos.org/kdl
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm
+LICENSE=LGPL-2.1
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/orocos_kdl-1.4.0:= dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.5.0.tar.gz -> orocos_kinematics_dynamics-1.5.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=52e9eabef160e78bc21474daf8c56a23
diff --git a/metadata/md5-cache/dev-python/python_orocos_kdl-9999 b/metadata/md5-cache/dev-python/python_orocos_kdl-9999
index e0cb272b7789..750857a3db15 100644
--- a/metadata/md5-cache/dev-python/python_orocos_kdl-9999
+++ b/metadata/md5-cache/dev-python/python_orocos_kdl-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/orocos_kdl-1.4.0:= <dev-python/sip-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/orocos_kdl-1.4.0:= dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Python bindings for KDL
 EAPI=7
 HOMEPAGE=https://www.orocos.org/kdl
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/orocos_kdl-1.4.0:= <dev-python/sip-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/orocos_kdl-1.4.0:= dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e19134cf848febb95936610e8b251461
+_md5_=52e9eabef160e78bc21474daf8c56a23
diff --git a/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1 b/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
index d2bb7c0ec4c6..bc4f2b786b96 100644
--- a/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
+++ b/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Python wrapper for HTML Tidy (tidylib)
 EAPI=7
 HOMEPAGE=http://countergram.com/open-source/pytidylib https://github.com/countergram/pytidylib
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=app-text/htmltidy python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytidylib/pytidylib-0.3.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=57b32a2d57ce328d55f9e5d18014d08f
+_md5_=a025c76f32225594aaf2b7226c45d765
diff --git a/metadata/md5-cache/dev-python/pyusb-1.2.1 b/metadata/md5-cache/dev-python/pyusb-1.2.1
index df0119025230..510b85322ee3 100644
--- a/metadata/md5-cache/dev-python/pyusb-1.2.1
+++ b/metadata/md5-cache/dev-python/pyusb-1.2.1
@@ -5,11 +5,11 @@ DESCRIPTION=USB support for Python
 EAPI=8
 HOMEPAGE=https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~x86
 LICENSE=BSD
 RDEPEND=virtual/libusb:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyusb/pyusb-1.2.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0713ceb686d1651715da7c36328317c4
+_md5_=d84147a63833cfb39dbba578c5155639
diff --git a/metadata/md5-cache/dev-python/pyzmq-22.1.0 b/metadata/md5-cache/dev-python/pyzmq-22.1.0
index fdae968ade96..2cc3ee97f20a 100644
--- a/metadata/md5-cache/dev-python/pyzmq-22.1.0
+++ b/metadata/md5-cache/dev-python/pyzmq-22.1.0
@@ -5,7 +5,7 @@ DESCRIPTION=Lightweight and super-fast messaging library built on top of the Zer
 EAPI=7
 HOMEPAGE=https://zeromq.org/languages/python/ https://pypi.org/project/pyzmq/ https://github.com/zeromq/pyzmq/
 IUSE=+draft test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/pyzmq/archive/v22.1.0.tar.gz -> pyzmq-22.1.0.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=35bbcbff9ab9470fd804c725a5fb7e75
+_md5_=8bd70f0eaf82cca90ca8ef3bb8d8e2aa
diff --git a/metadata/md5-cache/dev-python/qdarkstyle-2.8.1 b/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
index 020d73d355ff..312ed3c1a0d4 100644
--- a/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
+++ b/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ColinDuquesnoy/QDarkStyleSheet/archive/v2.8.1.tar.gz -> qdarkstyle-2.8.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fbb3c958c7cb4a7cad1ce2365470da1c
diff --git a/metadata/md5-cache/dev-python/qdarkstyle-3.0.2 b/metadata/md5-cache/dev-python/qdarkstyle-3.0.2
index c85757648012..2a03434bb817 100644
--- a/metadata/md5-cache/dev-python/qdarkstyle-3.0.2
+++ b/metadata/md5-cache/dev-python/qdarkstyle-3.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ColinDuquesnoy/QDarkStyleSheet/archive/v3.0.2.tar.gz -> qdarkstyle-3.0.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=74a17c6902adb494b4629c64c134fae9
diff --git a/metadata/md5-cache/dev-python/qrcode-7.1 b/metadata/md5-cache/dev-python/qrcode-7.1
index 84ef089414eb..c76c814ef111 100644
--- a/metadata/md5-cache/dev-python/qrcode-7.1
+++ b/metadata/md5-cache/dev-python/qrcode-7.1
@@ -4,7 +4,7 @@ DESCRIPTION=QR Code generator on top of PIL
 EAPI=8
 HOMEPAGE=https://pypi.org/project/qrcode/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qrcode/qrcode-7.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7a5a400975d0453b281732e3321131b0
+_md5_=67db848812abd52e3075f5337164aa3c
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.11.5 b/metadata/md5-cache/dev-python/qscintilla-python-2.11.5
deleted file mode 100644
index 61bcb410639f..000000000000
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.11.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PyQt5-5.12[gui,printsupport,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.5:= >=dev-python/sip-4.19.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Python bindings for QScintilla
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
-IUSE=debug python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PyQt5-5.12[gui,printsupport,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.5:=
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.5/QScintilla-2.11.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8169d048f9091255a187a304f98a580c
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.11.6 b/metadata/md5-cache/dev-python/qscintilla-python-2.11.6
index e4a327918d9c..34e0571e454b 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.11.6
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.11.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PyQt5-5.12[gui,printsupport,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.6:= >=dev-python/sip-4.19.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/PyQt5-5.15.5_pre[gui,printsupport,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.6:= >=dev-python/sip-4.19.22:0[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=Python bindings for QScintilla
 EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
+HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/
 IUSE=debug python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PyQt5-5.12[gui,printsupport,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.6:=
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/PyQt5-5.15.5_pre[gui,printsupport,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.6:=
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.6/QScintilla-2.11.6.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7ed73d539851c577452bb99cef8e5c7d
+_md5_=979d5ce201f306dd3451fcaeed92d8fb
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.13.0 b/metadata/md5-cache/dev-python/qscintilla-python-2.13.0
new file mode 100644
index 000000000000..0f1b7af0333d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.13.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/PyQt-builder-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-6.2.0_pre2106291255[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-qt/qtcore:5
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,printsupport,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.13.0:=
+DESCRIPTION=Python bindings for QScintilla
+EAPI=8
+HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/ https://pypi.org/project/QScintilla/
+IUSE=debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,printsupport,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.13.0:= >=dev-python/PyQt5-sip-12.9:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.0/QScintilla_src-2.13.0.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9207033fb8e124ed0f487870cbcf8acc
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.1.0 b/metadata/md5-cache/dev-python/qtconsole-5.1.0
deleted file mode 100644
index 6096fa14b1d1..000000000000
--- a/metadata/md5-cache/dev-python/qtconsole-5.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,svg,testlib] ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_client-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,gui,printsupport,svg] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Qt-based console for Jupyter with support for rich media output
-EAPI=7
-HOMEPAGE=https://jupyter.org
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm64 x86
-LICENSE=BSD
-PDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-RDEPEND=dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_client-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,gui,printsupport,svg] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/q/qtconsole/qtconsole-5.1.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=004f7999efc3a3acaa2f86a8c32fde5b
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.1.1 b/metadata/md5-cache/dev-python/qtconsole-5.1.1
index d28d54f08e02..ee2d41c969ac 100644
--- a/metadata/md5-cache/dev-python/qtconsole-5.1.1
+++ b/metadata/md5-cache/dev-python/qtconsole-5.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Qt-based console for Jupyter with support for rich media output
 EAPI=8
 HOMEPAGE=https://jupyter.org
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=BSD
 PDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,gui,printsupport,svg] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-5.1.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d5cb79213e1a977b11588033133bdbec
+_md5_=13cdff4f8790d0643ea0557a667546aa
diff --git a/metadata/md5-cache/dev-python/re-assert-1.1.0 b/metadata/md5-cache/dev-python/re-assert-1.1.0
index dce2b4e52a59..1f2198e36bf2 100644
--- a/metadata/md5-cache/dev-python/re-assert-1.1.0
+++ b/metadata/md5-cache/dev-python/re-assert-1.1.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/regex[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Show where your regex match assertion failed
 EAPI=7
 HOMEPAGE=https://github.com/asottile/re-assert
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/regex[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asottile/re-assert/archive/v1.1.0.tar.gz -> re-assert-1.1.0.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=92b0d6fe8f2b49216e4d924d92e5aefa
+_md5_=cdaa85dc86754a87b978c08ce15ed174
diff --git a/metadata/md5-cache/dev-python/regex-2021.4.4 b/metadata/md5-cache/dev-python/regex-2021.4.4
index 2d6a445ad331..ad522703ec91 100644
--- a/metadata/md5-cache/dev-python/regex-2021.4.4
+++ b/metadata/md5-cache/dev-python/regex-2021.4.4
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Alternative regular expression module to replace re
 EAPI=7
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2021.4.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b04d4b42cdc3196fe4464fb1277df4ef
+_md5_=a2cdbc0ed959a6795271f96def647a0e
diff --git a/metadata/md5-cache/dev-python/regex-2021.7.1 b/metadata/md5-cache/dev-python/regex-2021.7.1
index a45e8a2400cd..12081a40cab7 100644
--- a/metadata/md5-cache/dev-python/regex-2021.7.1
+++ b/metadata/md5-cache/dev-python/regex-2021.7.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Alternative regular expression module to replace re
 EAPI=8
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2021.7.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=131c19ef2ae44b61bf3683a44d39835c
+_md5_=c215181d822813e87f5b3f57e0288080
diff --git a/metadata/md5-cache/dev-python/regex-2021.7.6 b/metadata/md5-cache/dev-python/regex-2021.7.6
index efb6761cc4bd..e1e3fb9b62a1 100644
--- a/metadata/md5-cache/dev-python/regex-2021.7.6
+++ b/metadata/md5-cache/dev-python/regex-2021.7.6
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Alternative regular expression module to replace re
 EAPI=8
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2021.7.6.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=131c19ef2ae44b61bf3683a44d39835c
+_md5_=c215181d822813e87f5b3f57e0288080
diff --git a/metadata/md5-cache/dev-python/regex-2021.8.3 b/metadata/md5-cache/dev-python/regex-2021.8.3
new file mode 100644
index 000000000000..f56bc0a95b11
--- /dev/null
+++ b/metadata/md5-cache/dev-python/regex-2021.8.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Alternative regular expression module to replace re
+EAPI=8
+HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/regex/regex-2021.8.3.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c215181d822813e87f5b3f57e0288080
diff --git a/metadata/md5-cache/dev-python/reno-3.4.0 b/metadata/md5-cache/dev-python/reno-3.4.0
new file mode 100644
index 000000000000..16c4048cf282
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reno-3.4.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/testtools-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dulwich-0.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-20.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docutils-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Release notes manager, storing release notes in a git repo and building docs
+EAPI=8
+HOMEPAGE=https://pypi.org/project/reno/
+IUSE=test 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_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dulwich-0.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-20.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docutils-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/reno/reno-3.4.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=30ccc44d3bcf8f0497afd09e647aae50
diff --git a/metadata/md5-cache/dev-python/reportlab-3.6.0 b/metadata/md5-cache/dev-python/reportlab-3.6.0
new file mode 100644
index 000000000000..224904fe860f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reportlab-3.6.0
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:=
+DESCRIPTION=Tools for generating printable PDF documents from any data source
+EAPI=8
+HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/reportlab/reportlab-3.6.0.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1c0dd66c56456e4acaf735b34f02fd96
diff --git a/metadata/md5-cache/dev-python/requests-2.26.0 b/metadata/md5-cache/dev-python/requests-2.26.0
index 14711647fabc..27804a4249d7 100644
--- a/metadata/md5-cache/dev-python/requests-2.26.0
+++ b/metadata/md5-cache/dev-python/requests-2.26.0
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library for human beings
 EAPI=8
 HOMEPAGE=https://requests.readthedocs.io/
 IUSE=socks5 test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/idna-4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/urllib3-1.27[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] socks5? ( >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.26.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=968b13268d6a917d3276486a10a4afbd
+_md5_=aca79aeeae3d3531c37ecdf867684cea
diff --git a/metadata/md5-cache/dev-python/resolvelib-0.7.1 b/metadata/md5-cache/dev-python/resolvelib-0.7.1
index 39a82f44706b..88c10b0919e0 100644
--- a/metadata/md5-cache/dev-python/resolvelib-0.7.1
+++ b/metadata/md5-cache/dev-python/resolvelib-0.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=provides a Resolver class that includes dependency resolution logic
 EAPI=7
 HOMEPAGE=https://github.com/sarugaku/resolvelib/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=ISC
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sarugaku/resolvelib/archive/0.7.1.tar.gz -> resolvelib-0.7.1.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7da9afccc2f16f58c1832599a0eae725
+_md5_=5eb374ad8157863aca8e543788ff7113
diff --git a/metadata/md5-cache/dev-python/rich-10.3.0 b/metadata/md5-cache/dev-python/rich-10.3.0
index e37375ce34ce..949b0ce18a55 100644
--- a/metadata/md5-cache/dev-python/rich-10.3.0
+++ b/metadata/md5-cache/dev-python/rich-10.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/willmcgugan/rich/archive/v10.3.0.tar.gz -> rich-10.3.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9b8b334d5e89e03c55d1e02796857353
diff --git a/metadata/md5-cache/dev-python/rich-10.4.0 b/metadata/md5-cache/dev-python/rich-10.4.0
index decf31fac0ee..7de0aa11ea8e 100644
--- a/metadata/md5-cache/dev-python/rich-10.4.0
+++ b/metadata/md5-cache/dev-python/rich-10.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/willmcgugan/rich/archive/v10.4.0.tar.gz -> rich-10.4.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9b8b334d5e89e03c55d1e02796857353
diff --git a/metadata/md5-cache/dev-python/rich-10.5.0 b/metadata/md5-cache/dev-python/rich-10.5.0
index 8445ffb9b8dc..60d5d36e3558 100644
--- a/metadata/md5-cache/dev-python/rich-10.5.0
+++ b/metadata/md5-cache/dev-python/rich-10.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/willmcgugan/rich/archive/v10.5.0.tar.gz -> rich-10.5.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce8a8a5e3b06ada882bd9aebcc46c1b6
diff --git a/metadata/md5-cache/dev-python/rich-10.6.0 b/metadata/md5-cache/dev-python/rich-10.6.0
index 457ddcd730f5..2d851ea75e1e 100644
--- a/metadata/md5-cache/dev-python/rich-10.6.0
+++ b/metadata/md5-cache/dev-python/rich-10.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/willmcgugan/rich/archive/v10.6.0.tar.gz -> rich-10.6.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce8a8a5e3b06ada882bd9aebcc46c1b6
diff --git a/metadata/md5-cache/dev-python/rich-10.7.0 b/metadata/md5-cache/dev-python/rich-10.7.0
new file mode 100644
index 000000000000..72d97926d4b6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rich-10.7.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/commonmark[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python library for renrering rich text, tables, etc. to the terminal
+EAPI=8
+HOMEPAGE=https://github.com/willmcgugan/rich
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/commonmark[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/willmcgugan/rich/archive/v10.7.0.tar.gz -> rich-10.7.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d7e4e310bad34aac72e319f800004cc5
diff --git a/metadata/md5-cache/dev-python/rospkg-1.2.8-r1 b/metadata/md5-cache/dev-python/rospkg-1.2.8-r1
deleted file mode 100644
index e6599f381e95..000000000000
--- a/metadata/md5-cache/dev-python/rospkg-1.2.8-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Standalone Python library for the ROS package system
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rospkg
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.2.8.tar.gz -> rospkg-1.2.8.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=61a8036a82beb14485b939d7ff593cbf
diff --git a/metadata/md5-cache/dev-python/rospkg-1.3.0 b/metadata/md5-cache/dev-python/rospkg-1.3.0
new file mode 100644
index 000000000000..778730bd9657
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rospkg-1.3.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DESCRIPTION=Standalone Python library for the ROS package system
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rospkg
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.3.0.tar.gz -> rospkg-1.3.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=61a8036a82beb14485b939d7ff593cbf
diff --git a/metadata/md5-cache/dev-python/rq-1.8.1 b/metadata/md5-cache/dev-python/rq-1.8.1
deleted file mode 100644
index e54705983d9d..000000000000
--- a/metadata/md5-cache/dev-python/rq-1.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-db/redis dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sentry-sdk[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/click-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/redis-py-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=simple, lightweight library for creating and processing background jobs
-EAPI=7
-HOMEPAGE=https://python-rq.org https://github.com/rq/rq
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/click-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/redis-py-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rq/rq/archive/v1.8.1.tar.gz -> rq-1.8.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=86e4ce71c401d89a16dcf6a7096070aa
diff --git a/metadata/md5-cache/dev-python/rq-1.9.0 b/metadata/md5-cache/dev-python/rq-1.9.0
index 660d6723c7f6..c98936a6bcdc 100644
--- a/metadata/md5-cache/dev-python/rq-1.9.0
+++ b/metadata/md5-cache/dev-python/rq-1.9.0
@@ -4,7 +4,7 @@ DESCRIPTION=simple, lightweight library for creating and processing background j
 EAPI=7
 HOMEPAGE=https://python-rq.org https://github.com/rq/rq
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/click-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/redis-py-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rq/rq/archive/v1.9.0.tar.gz -> rq-1.9.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ba219f435e16e40e36778f5bd50d3566
+_md5_=b10d8c1c7199112bb17e2915feeb5e8d
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.6 b/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.6
index 9b2c6af62229..84784d8e4b9c 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.6
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.6
@@ -4,11 +4,11 @@ DESCRIPTION=C-based reader/scanner and emitter for dev-python/ruamel-yaml
 EAPI=8
 HOMEPAGE=https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ruamel.yaml.clib/ruamel.yaml.clib-0.2.6.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1e8c229219a1dcd72f0c57d125f821f5
+_md5_=6ebd5c2b94d3348da26fc0e9be906146
diff --git a/metadata/md5-cache/dev-python/scipy-1.6.3 b/metadata/md5-cache/dev-python/scipy-1.6.3
index 9403cc560443..9a3848e1969e 100644
--- a/metadata/md5-cache/dev-python/scipy-1.6.3
+++ b/metadata/md5-cache/dev-python/scipy-1.6.3
@@ -5,7 +5,7 @@ DESCRIPTION=Scientific algorithms library for Python
 EAPI=7
 HOMEPAGE=https://www.scipy.org/
 IUSE=doc sparse test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.16.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/fortran python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.6.3.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.6.2/scipy-html-1.6.2.zip https://docs.scipy.org/doc/scipy-1.6.2/scipy-ref-1.6.2.pdf )
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9db79fc0ea9a2d5caed88f223cd1e94f
+_md5_=7f9e49b4ccae527a87f04d0ddb89d379
diff --git a/metadata/md5-cache/dev-python/setuptools-57.4.0-r1 b/metadata/md5-cache/dev-python/setuptools-57.4.0-r1
new file mode 100644
index 000000000000..f1ffa6bca35d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-57.4.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of extensions to Distutils
+EAPI=8
+HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools/setuptools-57.4.0.tar.gz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0rc1.tar.xz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9b18502f1c89664576c455acac9d9d8d
diff --git a/metadata/md5-cache/dev-python/signature_dispatch-0.2.0 b/metadata/md5-cache/dev-python/signature_dispatch-0.2.0
new file mode 100644
index 000000000000..2d2f446b22a6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/signature_dispatch-0.2.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Execute the first function that matches the given arguments
+EAPI=8
+HOMEPAGE=https://github.com/kalekundert/signature_dispatch/ https://pypi.org/project/signature-dispatch/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/typeguard[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/signature_dispatch/signature_dispatch-0.2.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ce3f20af33d267d7c28439d986089179
diff --git a/metadata/md5-cache/dev-python/sip-4.19.25-r1 b/metadata/md5-cache/dev-python/sip-4.19.25-r1
index 006ecf401cf3..afb7bf1f04d4 100644
--- a/metadata/md5-cache/dev-python/sip-4.19.25-r1
+++ b/metadata/md5-cache/dev-python/sip-4.19.25-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings generator for C/C++ libraries
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/sip/
 IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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 GPL-3 SIP )
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0/12
 SRC_URI=https://www.riverbankcomputing.com/static/Downloads/sip/4.19.25/sip-4.19.25.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2896089057590729eb1e1d05d6922fea
+_md5_=7fd9c3730a6c2d837103517dda27695b
diff --git a/metadata/md5-cache/dev-python/sip-6.2.0_pre2106291255 b/metadata/md5-cache/dev-python/sip-6.2.0_pre2106291255
deleted file mode 100644
index 7818e6c63c15..000000000000
--- a/metadata/md5-cache/dev-python/sip-6.2.0_pre2106291255
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings generator for C/C++ libraries
-EAPI=8
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/
-IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=!<dev-python/sip-4.19.25-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !=dev-python/sip-5.5.0-r0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=5
-SRC_URI=https://dev.gentoo.org/~pesa/distfiles/sip-6.2.0.dev2106291255.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=90ebe90f45c7e6080f07997e934bc64f
diff --git a/metadata/md5-cache/dev-python/sip-6.2.0_pre2107131757 b/metadata/md5-cache/dev-python/sip-6.2.0_pre2107131757
new file mode 100644
index 000000000000..7e8017a1ed7c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sip-6.2.0_pre2107131757
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings generator for C/C++ libraries
+EAPI=8
+HOMEPAGE=https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/
+IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 SIP )
+RDEPEND=!<dev-python/sip-4.19.25-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !=dev-python/sip-5.5.0-r0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=5
+SRC_URI=https://dev.gentoo.org/~pesa/distfiles/sip-6.2.0.dev2107131757.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=90ebe90f45c7e6080f07997e934bc64f
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.9.7 b/metadata/md5-cache/dev-python/snakeoil-0.9.7
new file mode 100644
index 000000000000..b202fb05b73e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/snakeoil-0.9.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-6 ) test? ( dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=misc common functionality and useful optimizations
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/snakeoil
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD BSD-2 MIT
+RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.9.7.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0a399f6c3bf682407ce076e08558bb16
diff --git a/metadata/md5-cache/dev-python/snakeoil-9999 b/metadata/md5-cache/dev-python/snakeoil-9999
index e64463fed871..38d629766e94 100644
--- a/metadata/md5-cache/dev-python/snakeoil-9999
+++ b/metadata/md5-cache/dev-python/snakeoil-9999
@@ -1,7 +1,7 @@
 BDEPEND=test? ( >=dev-python/pytest-6 ) dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=misc common functionality and useful optimizations
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/pkgcore/snakeoil
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD BSD-2 MIT
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f44be9101b07f2c2b2adf28284270ff4
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0a399f6c3bf682407ce076e08558bb16
diff --git a/metadata/md5-cache/dev-python/sphinx-4.1.2 b/metadata/md5-cache/dev-python/sphinx-4.1.2
new file mode 100644
index 000000000000..8f5f77f3237f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-4.1.2
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/graphviz ) test? ( dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python documentation generator
+EAPI=8
+HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx
+IUSE=doc latex test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/Sphinx/Sphinx-4.1.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=310a1047517f1852737af0c4bb6ff73c
diff --git a/metadata/md5-cache/dev-python/sphinx-tabs-3.1.0 b/metadata/md5-cache/dev-python/sphinx-tabs-3.1.0
index d9158cbb1f76..9dc434bc43f1 100644
--- a/metadata/md5-cache/dev-python/sphinx-tabs-3.1.0
+++ b/metadata/md5-cache/dev-python/sphinx-tabs-3.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Tabbed views for Sphinx
 EAPI=7
 HOMEPAGE=https://github.com/executablebooks/sphinx-tabs
 IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/executablebooks/sphinx-tabs/archive/v3.1.0.tar.gz -> sphinx-tabs-3.1.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aa977b8ef6d34b9f2dfa54d1df8430b9
+_md5_=77c5fada095cc869236785ac72195b81
diff --git a/metadata/md5-cache/dev-python/spyder-4.2.5-r2 b/metadata/md5-cache/dev-python/spyder-4.2.5-r2
index 8e3e90b52832..00a3db4c7d05 100644
--- a/metadata/md5-cache/dev-python/spyder-4.2.5-r2
+++ b/metadata/md5-cache/dev-python/spyder-4.2.5-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/spyder/archive/v4.2.5.tar.gz -> spyder-4.2.5.tar.gz https://github.com/spyder-ide/spyder-docs/archive/78b25754c69a20643258821146e398ad5535c920.tar.gz -> spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7db6cdf630f316464e38a29a31d30c9d
diff --git a/metadata/md5-cache/dev-python/spyder-5.0.5-r1 b/metadata/md5-cache/dev-python/spyder-5.0.5-r1
index 593c22f88180..35eec63687a8 100644
--- a/metadata/md5-cache/dev-python/spyder-5.0.5-r1
+++ b/metadata/md5-cache/dev-python/spyder-5.0.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/spyder/archive/v5.0.5.tar.gz -> spyder-5.0.5.tar.gz https://github.com/spyder-ide/spyder-docs/archive/5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz -> spyder-docs-5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=23d75cfb7c283e25b26635827dc21b6f
diff --git a/metadata/md5-cache/dev-python/spyder-5.1.1 b/metadata/md5-cache/dev-python/spyder-5.1.1
new file mode 100644
index 000000000000..21f0fb0553c5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-5.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-lazy-fixture[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-ordering[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/pytest-qt-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-panels[python_targets_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-)] dev-python/sphinx-multiversion[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-)] dev-python/sphinx-multiversion[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Scientific Python Development Environment
+EAPI=7
+HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https://pypi.org/project/spyder/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-kernels-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spyder-ide/spyder/archive/v5.1.1.tar.gz -> spyder-5.1.1.tar.gz https://github.com/spyder-ide/spyder-docs/archive/ebf13f362a604c5ac127efcddb74a91610d92f59.tar.gz -> spyder-docs-ebf13f362a604c5ac127efcddb74a91610d92f59.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ebf82df9f46504e8210a1c4ae05dd457
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-2.1.0 b/metadata/md5-cache/dev-python/spyder-kernels-2.1.0
new file mode 100644
index 000000000000..b8a6bd9fedd7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-kernels-2.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipykernel-5.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wurlitzer-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+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_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipykernel-5.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wurlitzer-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spyder-ide/spyder-kernels/archive/v2.1.0.tar.gz -> spyder-kernels-2.1.0-gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=87c60c4333c410ce9a7072376c3d4ef3
diff --git a/metadata/md5-cache/dev-python/spyder-notebook-0.3.2-r1 b/metadata/md5-cache/dev-python/spyder-notebook-0.3.2-r1
deleted file mode 100644
index e2ceed70f082..000000000000
--- a/metadata/md5-cache/dev-python/spyder-notebook-0.3.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-qt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/qdarkstyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Jupyter notebook integration with Spyder
-EAPI=7
-HOMEPAGE=https://github.com/spyder-ide/spyder-notebook
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/qdarkstyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spyder-ide/spyder-notebook/archive/v0.3.2.tar.gz -> spyder-notebook-0.3.2.tar.gz https://dev.gentoo.org/~andrewammerlaan/spyder-notebook-0.3.2-spyder-5.patch
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=4dd4335ff332b5002dd77c4075d2d6ea
diff --git a/metadata/md5-cache/dev-python/spyder-notebook-0.3.2-r2 b/metadata/md5-cache/dev-python/spyder-notebook-0.3.2-r2
new file mode 100644
index 000000000000..93555884adff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-notebook-0.3.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-qt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/qdarkstyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Jupyter notebook integration with Spyder
+EAPI=7
+HOMEPAGE=https://github.com/spyder-ide/spyder-notebook
+IUSE=test python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/qdarkstyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spyder-ide/spyder-notebook/archive/v0.3.2.tar.gz -> spyder-notebook-0.3.2.tar.gz https://dev.gentoo.org/~andrewammerlaan/spyder-notebook-0.3.2-spyder-5.patch
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_md5_=6969378882d4552dfbf87bb8314174fd
diff --git a/metadata/md5-cache/dev-python/spyder-terminal-1.0.0 b/metadata/md5-cache/dev-python/spyder-terminal-1.0.0
deleted file mode 100644
index ef78207c058c..000000000000
--- a/metadata/md5-cache/dev-python/spyder-terminal-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Run system terminals inside Spyder
-EAPI=7
-HOMEPAGE=https://github.com/spyder-ide/spyder-terminal
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/coloredlogs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-5.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/terminado-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/s/spyder-terminal/spyder-terminal-1.0.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b6b39dff0cb838901209400b77f76c4d
diff --git a/metadata/md5-cache/dev-python/spyder-terminal-1.0.0-r1 b/metadata/md5-cache/dev-python/spyder-terminal-1.0.0-r1
new file mode 100644
index 000000000000..a4afa66271b8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-terminal-1.0.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Run system terminals inside Spyder
+EAPI=7
+HOMEPAGE=https://github.com/spyder-ide/spyder-terminal
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/coloredlogs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-5.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/terminado-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/s/spyder-terminal/spyder-terminal-1.0.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=be90a637243e61405174c08c7f167430
diff --git a/metadata/md5-cache/dev-python/spyder-unittest-0.4.1 b/metadata/md5-cache/dev-python/spyder-unittest-0.4.1
deleted file mode 100644
index d2790ef8968c..000000000000
--- a/metadata/md5-cache/dev-python/spyder-unittest-0.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/spyder-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-qt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Plugin for Spyder to run tests and view the results
-EAPI=7
-HOMEPAGE=https://github.com/spyder-ide/spyder-unittest
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/spyder-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spyder-ide/spyder-unittest/archive/v0.4.1.tar.gz -> spyder-unittest-0.4.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=3b198a8dc8a4afba5e1f6b6e85f1e691
diff --git a/metadata/md5-cache/dev-python/spyder-unittest-0.4.1-r1 b/metadata/md5-cache/dev-python/spyder-unittest-0.4.1-r1
new file mode 100644
index 000000000000..75b3e38ef36a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-unittest-0.4.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/spyder-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-qt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DESCRIPTION=Plugin for Spyder to run tests and view the results
+EAPI=7
+HOMEPAGE=https://github.com/spyder-ide/spyder-unittest
+IUSE=test python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/spyder-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spyder-ide/spyder-unittest/archive/v0.4.1.tar.gz -> spyder-unittest-0.4.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_md5_=7f9b9cf8ff15765111a43f958044050e
diff --git a/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026 b/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026
deleted file mode 100644
index 06cb65b9b4ed..000000000000
--- a/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >dev-python/spyder-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-qt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Plugin for Spyder to enable Vim keybindings
-EAPI=7
-HOMEPAGE=https://github.com/spyder-ide/spyder-vim
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>dev-python/spyder-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spyder-ide/spyder-vim/archive/4d0bf821abb193bfd158e2489970e1873a9f1138.tar.gz -> spyder-vim-0_pre20201026.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=46b774e1a6e8d3c0da68f1c80ac85490
diff --git a/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026-r1 b/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026-r1
new file mode 100644
index 000000000000..a3eb518ae7ce
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-vim-0_pre20201026-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >dev-python/spyder-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-qt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DESCRIPTION=Plugin for Spyder to enable Vim keybindings
+EAPI=7
+HOMEPAGE=https://github.com/spyder-ide/spyder-vim
+IUSE=test python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>dev-python/spyder-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spyder-ide/spyder-vim/archive/4d0bf821abb193bfd158e2489970e1873a9f1138.tar.gz -> spyder-vim-0_pre20201026.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_md5_=51484894fa7999e01c8e0021b748fee4
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.24 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.24
index 0241f0ab7105..fe757961263b 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.24
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.24
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.24.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=03b714f7ed983230a3195d2cf700d5d3
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.18 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.18
deleted file mode 100644
index 0ada42dbc50d..000000000000
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python SQL toolkit and Object Relational Mapper
-EAPI=7
-HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
-IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.18.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b351792178e12317f0d6c778b1077cce
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.20 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.20
index 449715896a28..bd1d9cb9efdf 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.20
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.20
@@ -4,12 +4,12 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=7
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.20.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d58e368ec643bb74fb1a0468412475ca
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=00e1343e1ebde4c8232ef072ac751a19
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.22 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.22
index ee7162e9f27b..c1aa6e386600 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.22
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.22
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.22.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8a97f4c527eb86bc28fc38e1515a870d
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.12.2-r1 b/metadata/md5-cache/dev-python/statsmodels-0.12.2-r1
index e50525ca8c9b..e7dc042d27c0 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.12.2-r1
+++ b/metadata/md5-cache/dev-python/statsmodels-0.12.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.12.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49353df366c09aa4228cfad872135102
diff --git a/metadata/md5-cache/dev-python/texttable-1.6.3 b/metadata/md5-cache/dev-python/texttable-1.6.3
index 6fe6538c6d98..c814ffab38d7 100644
--- a/metadata/md5-cache/dev-python/texttable-1.6.3
+++ b/metadata/md5-cache/dev-python/texttable-1.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/foutaise/texttable/archive/v1.6.3.tar.gz -> texttable-1.6.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=935e50b0d8940c5e164f465ba3386617
diff --git a/metadata/md5-cache/dev-python/texttable-1.6.4 b/metadata/md5-cache/dev-python/texttable-1.6.4
index 93c320db5547..94b64ea20fd6 100644
--- a/metadata/md5-cache/dev-python/texttable-1.6.4
+++ b/metadata/md5-cache/dev-python/texttable-1.6.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/foutaise/texttable/archive/v1.6.4.tar.gz -> texttable-1.6.4.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0730d0ae533f464681e57580e0cc4a33
diff --git a/metadata/md5-cache/dev-python/theano-1.0.5-r1 b/metadata/md5-cache/dev-python/theano-1.0.5-r1
index f9ad46458e52..313fe1607fb1 100644
--- a/metadata/md5-cache/dev-python/theano-1.0.5-r1
+++ b/metadata/md5-cache/dev-python/theano-1.0.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/T/Theano/Theano-1.0.5.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8cdbcd226149955572365c2ddbe3625e
diff --git a/metadata/md5-cache/dev-python/theano-pymc-1.1.2-r1 b/metadata/md5-cache/dev-python/theano-pymc-1.1.2-r1
index 81ebdda9e3fc..4866842ca79f 100644
--- a/metadata/md5-cache/dev-python/theano-pymc-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/theano-pymc-1.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pymc-devs/Theano-PyMC/archive/rel-1.1.2.tar.gz -> Theano-PyMC-rel-1.1.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9368d8870ccfaaf9b47184bb63cc5bf0
diff --git a/metadata/md5-cache/dev-python/tomli-1.0.4 b/metadata/md5-cache/dev-python/tomli-1.0.4
index 1e5b9e8bf4ab..fecdb86bb352 100644
--- a/metadata/md5-cache/dev-python/tomli-1.0.4
+++ b/metadata/md5-cache/dev-python/tomli-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A lil' TOML parser
 EAPI=8
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hukkin/tomli/archive/1.0.4.tar.gz -> tomli-1.0.4.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4f5010eac63938b1fae6fb60459f0945
+_md5_=7bdc78727f9f980e128233faa1814dd4
diff --git a/metadata/md5-cache/dev-python/typeguard-2.12.1 b/metadata/md5-cache/dev-python/typeguard-2.12.1
new file mode 100644
index 000000000000..797724a3e11f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/typeguard-2.12.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Run-time type checker for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/typeguard/ https://github.com/agronholm/typeguard/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/agronholm/typeguard/archive/2.12.1.tar.gz -> typeguard-2.12.1.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5317d342652cf7572680403923e90953
diff --git a/metadata/md5-cache/dev-python/uvicorn-0.14.0-r1 b/metadata/md5-cache/dev-python/uvicorn-0.14.0-r1
index a5563cbc535d..cb230065fb85 100644
--- a/metadata/md5-cache/dev-python/uvicorn-0.14.0-r1
+++ b/metadata/md5-cache/dev-python/uvicorn-0.14.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dotenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/websockets-9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wsproto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/h11-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dotenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/websockets-9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wsproto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h11-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Lightning-fast ASGI server implementation
 EAPI=7
 HOMEPAGE=https://www.uvicorn.org/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
-RDEPEND=>=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/h11-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h11-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/uvicorn/archive/0.14.0.tar.gz -> uvicorn-0.14.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d80d2ebaea528f9e8784134bad9189f7
+_md5_=1e6198a8f70f2e6873bf0e11a0a24fa6
diff --git a/metadata/md5-cache/dev-python/uvloop-0.15.2 b/metadata/md5-cache/dev-python/uvloop-0.15.2
index 74ccd3737ee2..0cdb630e3741 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.15.2
+++ b/metadata/md5-cache/dev-python/uvloop-0.15.2
@@ -5,7 +5,7 @@ DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
 EAPI=7
 HOMEPAGE=https://github.com/magicstack/uvloop
 IUSE=doc examples test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.15.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ce416bd8b403ebe7f242833978f238ec
+_md5_=99e208e23692a0c062be2bc13b03cecd
diff --git a/metadata/md5-cache/dev-python/uvloop-0.15.3 b/metadata/md5-cache/dev-python/uvloop-0.15.3
index d0ed38274d0f..de7e2ad029ac 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.15.3
+++ b/metadata/md5-cache/dev-python/uvloop-0.15.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
 EAPI=8
 HOMEPAGE=https://github.com/magicstack/uvloop
 IUSE=doc examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.15.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c1f7ccd575cd27744d14f1810450ee89
+_md5_=54385503f13461ba0bfd6dc1dd7805bd
diff --git a/metadata/md5-cache/dev-python/uvloop-0.15.3-r1 b/metadata/md5-cache/dev-python/uvloop-0.15.3-r1
index 5a00748736d8..d43696a99fab 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.15.3-r1
+++ b/metadata/md5-cache/dev-python/uvloop-0.15.3-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
 EAPI=8
 HOMEPAGE=https://github.com/magicstack/uvloop
 IUSE=doc examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc
 LICENSE=MIT
 RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.15.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=22be2897703422313e086825da8ca32b
+_md5_=2768816977b0c57a7da74030f66fa4d1
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.7.0 b/metadata/md5-cache/dev-python/virtualenv-20.7.0
index ae820d35188d..c2379b0e3d2b 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.7.0
+++ b/metadata/md5-cache/dev-python/virtualenv-20.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=Virtual Python Environment builder
 EAPI=8
 HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/backports-entry_points_selectable-1.0.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.7.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=87c8fc64d09aa6c04a79bc55438d1a42
+_md5_=1c69b5e054a83fe1e15069e0ac61068a
diff --git a/metadata/md5-cache/dev-python/watchdog-1.0.2 b/metadata/md5-cache/dev-python/watchdog-1.0.2
index 28ea21422339..bc5738c55bc4 100644
--- a/metadata/md5-cache/dev-python/watchdog-1.0.2
+++ b/metadata/md5-cache/dev-python/watchdog-1.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v1.0.2.tar.gz -> watchdog-1.0.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c2efe14f6560d1d3be7f4e6f9be4917
diff --git a/metadata/md5-cache/dev-python/watchdog-2.0.3 b/metadata/md5-cache/dev-python/watchdog-2.0.3
index 68e828aa334a..6ad70c38a197 100644
--- a/metadata/md5-cache/dev-python/watchdog-2.0.3
+++ b/metadata/md5-cache/dev-python/watchdog-2.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.0.3.tar.gz -> watchdog-2.0.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd04e03dd8814db784cfd2588177ec01
diff --git a/metadata/md5-cache/dev-python/watchdog-2.1.1 b/metadata/md5-cache/dev-python/watchdog-2.1.1
index 9ffce4158f47..043d32a6b5ff 100644
--- a/metadata/md5-cache/dev-python/watchdog-2.1.1
+++ b/metadata/md5-cache/dev-python/watchdog-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.1.1.tar.gz -> watchdog-2.1.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b604b8fced2ccb2d9099cb5209b1f944
diff --git a/metadata/md5-cache/dev-python/watchdog-2.1.2 b/metadata/md5-cache/dev-python/watchdog-2.1.2
index 87cb3ad24397..f788cadea31b 100644
--- a/metadata/md5-cache/dev-python/watchdog-2.1.2
+++ b/metadata/md5-cache/dev-python/watchdog-2.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.1.2.tar.gz -> watchdog-2.1.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b7a58d83f57098b1804e03cc448dc0c1
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.1.1 b/metadata/md5-cache/dev-python/websocket-client-1.1.1
new file mode 100644
index 000000000000..02c23d573893
--- /dev/null
+++ b/metadata/md5-cache/dev-python/websocket-client-1.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=WebSocket client for python with hybi13 support
+EAPI=8
+HOMEPAGE=https://github.com/websocket-client/websocket-client
+IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=LGPL-2.1+
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/w/websocket-client/websocket-client-1.1.1.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ebb90b875bbc1da2411a0aa4e7e9c7c3
diff --git a/metadata/md5-cache/dev-python/websockets-9.1-r1 b/metadata/md5-cache/dev-python/websockets-9.1-r1
new file mode 100644
index 000000000000..23b8e94fbeff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/websockets-9.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for building WebSocket servers and clients in Python
+EAPI=8
+HOMEPAGE=https://websockets.readthedocs.io/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aaugustin/websockets/archive/9.1.tar.gz -> websockets-9.1-src.tar.gz https://dev.gentoo.org/~sbraz/websockets-9.1-python-3.10-support.patch.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7b1108be964119a9a3feddc41fd27a90
diff --git a/metadata/md5-cache/dev-python/wsproto-1.0.0 b/metadata/md5-cache/dev-python/wsproto-1.0.0
index 45c41441efd3..7a64b7e85777 100644
--- a/metadata/md5-cache/dev-python/wsproto-1.0.0
+++ b/metadata/md5-cache/dev-python/wsproto-1.0.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/h11-0.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/h11-0.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=WebSockets state-machine based protocol implementation
 EAPI=7
 HOMEPAGE=https://github.com/python-hyper/wsproto/ https://pypi.org/project/wsproto/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86
 LICENSE=MIT
-RDEPEND=>=dev-python/h11-0.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/h11-0.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsproto/wsproto-1.0.0.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6a289d1f7325927500aec1e67c8d324f
+_md5_=f54cb5086d557a336bc6b4278a1ece6a
diff --git a/metadata/md5-cache/dev-python/wxpython-4.0.7 b/metadata/md5-cache/dev-python/wxpython-4.0.7
deleted file mode 100644
index 0f56fe58213b..000000000000
--- a/metadata/md5-cache/dev-python/wxpython-4.0.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0 app-doc/doxygen dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=A blending of the wxWindows C++ class library with Python
-EAPI=7
-HOMEPAGE=https://www.wxpython.org/
-IUSE=test webkit python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 ~sparc x86
-LICENSE=wxWinLL-3
-RDEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=4.0
-SRC_URI=mirror://pypi/w/wxPython/wxPython-4.0.7.post2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
-_md5_=bdb2b3e49a9b3fcab94370595ecb032d
diff --git a/metadata/md5-cache/dev-python/wxpython-4.0.7-r1 b/metadata/md5-cache/dev-python/wxpython-4.0.7-r1
index 77d906b49579..1264778d105b 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.0.7-r1
+++ b/metadata/md5-cache/dev-python/wxpython-4.0.7-r1
@@ -5,12 +5,12 @@ DESCRIPTION=A blending of the wxWindows C++ class library with Python
 EAPI=7
 HOMEPAGE=https://www.wxpython.org/
 IUSE=test webkit python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=wxWinLL-3
 RDEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=4.0
 SRC_URI=mirror://pypi/w/wxPython/wxPython-4.0.7.post2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
-_md5_=3481d9b48ae40e4586b041892594fbfc
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
+_md5_=9b8d5b07316371f0d0e1b103a3fbf755
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.7.0 b/metadata/md5-cache/dev-python/xmlschema-1.7.0
new file mode 100644
index 000000000000..06e5012ae9a2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xmlschema-1.7.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/elementpath-2.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An XML Schema validator and decoder
+EAPI=8
+HOMEPAGE=https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/elementpath-2.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.7.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=85455f365f3a786128b2dbede2438b10
diff --git a/metadata/md5-cache/dev-python/xxhash-2.0.2 b/metadata/md5-cache/dev-python/xxhash-2.0.2
index 6106b90297f7..67b359785ff1 100644
--- a/metadata/md5-cache/dev-python/xxhash-2.0.2
+++ b/metadata/md5-cache/dev-python/xxhash-2.0.2
@@ -1,10 +1,11 @@
-BDEPEND=>=dev-libs/xxhash-0.8.0 test? ( >=dev-libs/xxhash-0.8.0 dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=dev-libs/xxhash-0.8.0 dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/xxhash-0.8.0
 DESCRIPTION=Python binding for the xxHash library
 EAPI=7
 HOMEPAGE=https://github.com/ifduyue/python-xxhash https://pypi.org/project/xxhash/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/xxhash-0.8.0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xxhash/xxhash-2.0.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f90c92d5a79b551ec0a5ef220960356c
+_md5_=481d7345fd52c3a7fd2a0ab08bd3203d
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.30.0 b/metadata/md5-cache/dev-python/zeroconf-0.30.0
deleted file mode 100644
index c36edf9f369f..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.30.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=7
-HOMEPAGE=https://github.com/jstasiak/python-zeroconf/ https://pypi.org/project/zeroconf/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jstasiak/python-zeroconf/archive/0.30.0.tar.gz -> python-zeroconf-0.30.0.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ca339eef5507975862af4dce95949eed
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.32.0 b/metadata/md5-cache/dev-python/zeroconf-0.32.0
deleted file mode 100644
index b5c931753b4d..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.32.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=7
-HOMEPAGE=https://github.com/jstasiak/python-zeroconf/ https://pypi.org/project/zeroconf/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jstasiak/python-zeroconf/archive/0.32.0.tar.gz -> python-zeroconf-0.32.0.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1f5b3ef774b60b379c03d5d745da3217
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.32.1 b/metadata/md5-cache/dev-python/zeroconf-0.32.1
index 851b68dccc50..9e34e0357b12 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.32.1
+++ b/metadata/md5-cache/dev-python/zeroconf-0.32.1
@@ -4,7 +4,7 @@ DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi c
 EAPI=8
 HOMEPAGE=https://github.com/jstasiak/python-zeroconf/ https://pypi.org/project/zeroconf/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jstasiak/python-zeroconf/archive/0.32.1.tar.gz -> python-zeroconf-0.32.1.gh.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=917603d492a586a6c96c04118b573d6c
+_md5_=ce1dc3b8e2a204375be044f008c261a1
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.33.0 b/metadata/md5-cache/dev-python/zeroconf-0.33.0
deleted file mode 100644
index be97ba2a0264..000000000000
--- a/metadata/md5-cache/dev-python/zeroconf-0.33.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
-EAPI=8
-HOMEPAGE=https://github.com/jstasiak/python-zeroconf/ https://pypi.org/project/zeroconf/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jstasiak/python-zeroconf/archive/0.33.0.tar.gz -> python-zeroconf-0.33.0.gh.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=917603d492a586a6c96c04118b573d6c
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.33.3 b/metadata/md5-cache/dev-python/zeroconf-0.33.3
new file mode 100644
index 000000000000..7aac5148f7ee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zeroconf-0.33.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
+EAPI=8
+HOMEPAGE=https://github.com/jstasiak/python-zeroconf/ https://pypi.org/project/zeroconf/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jstasiak/python-zeroconf/archive/0.33.3.tar.gz -> python-zeroconf-0.33.3.gh.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=917603d492a586a6c96c04118b573d6c
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 84a103413e0c..a4250fecbc7b 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20200309-r1 b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20200309-r1
index c1e07955420c..b7d38bdea6ea 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20200309-r1
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20200309-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2 dev-libs/libxslt >=dev-q
 REQUIRED_USE=nsplugin? ( X ) qml? ( opengl ) ?? ( gstreamer multimedia )
 SLOT=5/5.212
 SRC_URI=https://github.com/annulen/webkit/releases/download/qtwebkit-5.212.0-alpha4/qtwebkit-5.212.0-alpha4.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7bab3d422e6ae4c494c6a9ad292262db
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index d4502954591f..b6c5d238a136 100644
--- a/metadata/md5-cache/dev-ros/Manifest.gz
+++ b/metadata/md5-cache/dev-ros/Manifest.gz
diff --git a/metadata/md5-cache/dev-ros/actionlib-1.13.2-r1 b/metadata/md5-cache/dev-ros/actionlib-1.13.2-r1
index cc48e47ba437..41ac2061671d 100644
--- a/metadata/md5-cache/dev-ros/actionlib-1.13.2-r1
+++ b/metadata/md5-cache/dev-ros/actionlib-1.13.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads(+)] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads(+)] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib https://github.com/ros/actionlib
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/actionlib/archive/1.13.2.tar.gz -> actionlib-1.13.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aead18a9b8e15fe3f3fd91efd50fdd94
+_md5_=36ee426ae34d6351e76596d267680385
diff --git a/metadata/md5-cache/dev-ros/actionlib-9999 b/metadata/md5-cache/dev-ros/actionlib-9999
index f8a3ae1f4872..041ac9b4c05b 100644
--- a/metadata/md5-cache/dev-ros/actionlib-9999
+++ b/metadata/md5-cache/dev-ros/actionlib-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads(+)] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads(+)] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib https://github.com/ros/actionlib
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aead18a9b8e15fe3f3fd91efd50fdd94
+_md5_=36ee426ae34d6351e76596d267680385
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.0 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.0
deleted file mode 100644
index e79885651416..000000000000
--- a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=The auto-magic functions for ease to use of the ament linters
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_copyright dev-ros/ament_cmake_test
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3b6f3621a302400443dcdaccf8a73501
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.1 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.1
deleted file mode 100644
index 0b9cd532bb69..000000000000
--- a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=The auto-magic functions for ease to use of the ament linters
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_copyright dev-ros/ament_cmake_test
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3b6f3621a302400443dcdaccf8a73501
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.11.2 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.11.2
new file mode 100644
index 000000000000..9c84c6917d9f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.11.2
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=The auto-magic functions for ease to use of the ament linters
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_copyright dev-ros/ament_cmake_test
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3b6f3621a302400443dcdaccf8a73501
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.9.5 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.9.5
deleted file mode 100644
index 63e17857df75..000000000000
--- a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=The auto-magic functions for ease to use of the ament linters
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_copyright dev-ros/ament_cmake_test
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3b6f3621a302400443dcdaccf8a73501
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_core-1.1.4
new file mode 100644
index 000000000000..8a6079ead9eb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/ament_package dev-python/catkin_pkg
+DESCRIPTION=The core of the ament buildsystem in CMake
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/ament_package dev-python/catkin_pkg
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a0b632d6831d1cc03c129f771c596a0f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.11.2 b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.11.2
new file mode 100644
index 000000000000..149194adcda4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.11.2
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=CMake API for ament_cppcheck to perform static code analysis on C/C++
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cppcheck
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=df246eae87e8558dd82d36871eb24848
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.11.2 b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.11.2
new file mode 100644
index 000000000000..6a10d010c581
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.11.2
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=CMake API for ament_cpplint to lint C / C++ code using cpplint
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cpplint
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e6dc7a1f998d6f0bb2f91b0e053c251d
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.1.4
new file mode 100644
index 000000000000..d8438a610c6e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export definitions to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a9af0f2a7965c199d2327c5fe1f30e0c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.1.4
new file mode 100644
index 000000000000..1e76ca055eed
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
+DESCRIPTION=Export dependencies to downstream packages in the ament buildsystem in CMake
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=eb50adc30959016f24916fc405cab850
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.1.4
new file mode 100644
index 000000000000..add11536e347
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.1.4
new file mode 100644
index 000000000000..b507d6dc2382
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
+DESCRIPTION=Export interfaces to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4b7d323e8d414b908a683a940305a347
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.1.4
new file mode 100644
index 000000000000..c1873f16d888
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export libraries to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ad658f8915e93b83ec7eeeb811d8197a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.1.4
new file mode 100644
index 000000000000..be5568016d5e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export link flags to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e50b2451e54958a7c15e926e61489489
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.1.4
new file mode 100644
index 000000000000..831921b7bd83
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
+DESCRIPTION=Export targets to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6544ac7fd951fbc32240f6ed922a5796
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.1.4
new file mode 100644
index 000000000000..137f263b2755
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The ability to add Google mock-based tests in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d2f45cfb8cafae650101a8303fe39401
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.1.4
new file mode 100644
index 000000000000..ce4bf97321e6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The ability to add gtest-based tests in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8a13131443a229063d59fa5a377767d1
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.1.4
new file mode 100644
index 000000000000..add11536e347
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.1.4
new file mode 100644
index 000000000000..7c7e7ee226d2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The functionality to deduplicate libraries in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b394da7853cf2cdef82ee9007a9c774b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.11.2 b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.11.2
new file mode 100644
index 000000000000..9e746f11e878
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.11.2
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] dev-ros/ament_lint_cmake[python_targets_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
+DESCRIPTION=The CMake API for ament_lint_cmake to lint CMake code using cmakelint
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=532d50a884fe2ae31cd91f245e7a6789
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.1.4
new file mode 100644
index 000000000000..ef8ec8ef3331
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The ability to run Python tests using pytest in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=df71a2762b5eea83dd0dc88e81d30eea
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_python-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_python-1.1.4
new file mode 100644
index 000000000000..72a5ab3a6124
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_python-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The ability to use Python in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=20f45428dbde1a86d72c103336a99a0b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.1.4
new file mode 100644
index 000000000000..d60f1d86f4b0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
+DESCRIPTION=Add defs, include dirs and libs to a target in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f375d962c4d4bc0c6d10b5a94384451f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_test-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_test-1.1.4
new file mode 100644
index 000000000000..95d90bae8dc3
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_test-1.1.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
+DESCRIPTION=The ability to add tests in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+IUSE=python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8d545951500d187e21d9da907676ac7f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.11.2 b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.11.2
new file mode 100644
index 000000000000..1949a054464e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.11.2
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=The CMake API for ament_uncrustify to check code against styleconventions
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_uncrustify
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=057cc10de9d07a034cf259126c5d8eaa
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_version-1.1.4 b/metadata/md5-cache/dev-ros/ament_cmake_version-1.1.4
new file mode 100644
index 000000000000..45e868994a24
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_version-1.1.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Override the exported package version in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c3025cc1b78e86f7cc21a1eda50b878e
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.11.2 b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.11.2
new file mode 100644
index 000000000000..7507d4d50c79
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.11.2
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] dev-ros/ament_xmllint[python_targets_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cmake_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=he CMake API for ament_xmllint to check XML file using xmmlint
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_copyright
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ac9bd4649e32f9da3743e29950c96fbc
diff --git a/metadata/md5-cache/dev-ros/ament_copyright-0.10.0 b/metadata/md5-cache/dev-ros/ament_copyright-0.10.0
deleted file mode 100644
index f78338d9d43b..000000000000
--- a/metadata/md5-cache/dev-ros/ament_copyright-0.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?] test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?] dev-ros/ament_pep257[python_targets_python3_8(-)?] dev-python/pytest[python_targets_python3_8(-)?] )
-DESCRIPTION=The ability to check source files for copyright and license information.
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=test test python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b51a35829ca5161511555eb6e2deba79
diff --git a/metadata/md5-cache/dev-ros/ament_copyright-0.10.1 b/metadata/md5-cache/dev-ros/ament_copyright-0.10.1
deleted file mode 100644
index 22cff93e831b..000000000000
--- a/metadata/md5-cache/dev-ros/ament_copyright-0.10.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?] test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?] dev-ros/ament_pep257[python_targets_python3_8(-)?] dev-python/pytest[python_targets_python3_8(-)?] )
-DESCRIPTION=The ability to check source files for copyright and license information.
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=test test python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b51a35829ca5161511555eb6e2deba79
diff --git a/metadata/md5-cache/dev-ros/ament_copyright-0.11.2 b/metadata/md5-cache/dev-ros/ament_copyright-0.11.2
new file mode 100644
index 000000000000..d40e7d02b8e2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_copyright-0.11.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?] test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?] dev-ros/ament_pep257[python_targets_python3_8(-)?] dev-python/pytest[python_targets_python3_8(-)?] )
+DESCRIPTION=The ability to check source files for copyright and license information.
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test test python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b51a35829ca5161511555eb6e2deba79
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0 b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0
deleted file mode 100644
index 6fdac635a78f..000000000000
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The ability to perform static code analysis on C/C++ code using Cppcheck
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-util/cppcheck python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=df32eb776381a45ef38ac0bbfc287a4f
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.1 b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.1
deleted file mode 100644
index 4cc3a20921c4..000000000000
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The ability to perform static code analysis on C/C++ code using Cppcheck
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-util/cppcheck python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=df32eb776381a45ef38ac0bbfc287a4f
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.4 b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.4
index 23c512f1f404..848a6afcb22b 100644
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.4
@@ -1,14 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=test? ( dev-util/cppcheck >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The ability to perform static code analysis on C/C++ code using Cppcheck
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-util/cppcheck python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-util/cppcheck python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=df32eb776381a45ef38ac0bbfc287a4f
+_md5_=c2a0730b2096d27a012b50052cab4aca
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-0.11.2 b/metadata/md5-cache/dev-ros/ament_cppcheck-0.11.2
new file mode 100644
index 000000000000..5594537b5315
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-0.11.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-util/cppcheck >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The ability to perform static code analysis on C/C++ code using Cppcheck
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-util/cppcheck python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c2a0730b2096d27a012b50052cab4aca
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-9999 b/metadata/md5-cache/dev-ros/ament_cppcheck-9999
index d5b21aaa48c6..1a29e1df7265 100644
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-9999
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-9999
@@ -1,13 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-util/cppcheck >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=The ability to perform static code analysis on C/C++ code using Cppcheck
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-util/cppcheck python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-util/cppcheck python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=df32eb776381a45ef38ac0bbfc287a4f
+_md5_=c2a0730b2096d27a012b50052cab4aca
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-0.11.2 b/metadata/md5-cache/dev-ros/ament_cpplint-0.11.2
new file mode 100644
index 000000000000..cefc4d8560cc
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-0.11.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?] dev-ros/ament_flake8[python_targets_python3_8(-)?] dev-ros/ament_pep257[python_targets_python3_8(-)?] dev-python/pytest[python_targets_python3_8(-)?] )
+DESCRIPTION=The ability to check code against the Google style conventions using cpplint
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test test python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d8e2e74b0f783c1dad8e9fc16200d09f
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-0.11.2 b/metadata/md5-cache/dev-ros/ament_flake8-0.11.2
new file mode 100644
index 000000000000..66ccf9c42ff4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_flake8-0.11.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?] dev-python/flake8[python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?] dev-python/flake8[python_targets_python3_8(-)?] test? ( dev-python/pytest[python_targets_python3_8(-)?] )
+DESCRIPTION=The ability to check code for style and syntax conventions with flake8
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test test python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?] dev-python/flake8[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=51b96184539923a242f4d28c1ec0837e
diff --git a/metadata/md5-cache/dev-ros/ament_lint-0.10.0 b/metadata/md5-cache/dev-ros/ament_lint-0.10.0
deleted file mode 100644
index 0c9ae29650bd..000000000000
--- a/metadata/md5-cache/dev-ros/ament_lint-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Common API for ament linter packages
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75b7a1f1ff0f2cda4fed8b028a24db81
diff --git a/metadata/md5-cache/dev-ros/ament_lint-0.10.1 b/metadata/md5-cache/dev-ros/ament_lint-0.10.1
deleted file mode 100644
index 594f2aec4efa..000000000000
--- a/metadata/md5-cache/dev-ros/ament_lint-0.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Common API for ament linter packages
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75b7a1f1ff0f2cda4fed8b028a24db81
diff --git a/metadata/md5-cache/dev-ros/ament_lint-0.10.4 b/metadata/md5-cache/dev-ros/ament_lint-0.10.4
deleted file mode 100644
index 930a749b1cf6..000000000000
--- a/metadata/md5-cache/dev-ros/ament_lint-0.10.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Common API for ament linter packages
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75b7a1f1ff0f2cda4fed8b028a24db81
diff --git a/metadata/md5-cache/dev-ros/ament_lint-0.10.4-r1 b/metadata/md5-cache/dev-ros/ament_lint-0.10.4-r1
new file mode 100644
index 000000000000..2aa9f48665f3
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_lint-0.10.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Common API for ament linter packages
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0267933552a22718cc2a0135d723c762
diff --git a/metadata/md5-cache/dev-ros/ament_lint-0.11.2 b/metadata/md5-cache/dev-ros/ament_lint-0.11.2
new file mode 100644
index 000000000000..5642ec743975
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_lint-0.11.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Common API for ament linter packages
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0267933552a22718cc2a0135d723c762
diff --git a/metadata/md5-cache/dev-ros/ament_lint-0.9.5 b/metadata/md5-cache/dev-ros/ament_lint-0.9.5
deleted file mode 100644
index 482c0e921e0d..000000000000
--- a/metadata/md5-cache/dev-ros/ament_lint-0.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Common API for ament linter packages
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75b7a1f1ff0f2cda4fed8b028a24db81
diff --git a/metadata/md5-cache/dev-ros/ament_lint-9999 b/metadata/md5-cache/dev-ros/ament_lint-9999
index e6be6ccfb382..314784c47319 100644
--- a/metadata/md5-cache/dev-ros/ament_lint-9999
+++ b/metadata/md5-cache/dev-ros/ament_lint-9999
@@ -1,13 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Common API for ament linter packages
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75b7a1f1ff0f2cda4fed8b028a24db81
+_md5_=0267933552a22718cc2a0135d723c762
diff --git a/metadata/md5-cache/dev-ros/ament_lint_auto-0.11.2 b/metadata/md5-cache/dev-ros/ament_lint_auto-0.11.2
new file mode 100644
index 000000000000..1f1cde2e987f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_lint_auto-0.11.2
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
+DESCRIPTION=The auto-magic functions for ease to use of the ament linters
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c9b12264061281ddb67661a479dd747c
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.11.2 b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.11.2
new file mode 100644
index 000000000000..07c2d3f6a54f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.11.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?] dev-ros/ament_pep257[python_targets_python3_8(-)?] dev-ros/ament_copyright[python_targets_python3_8(-)?] dev-python/pytest[python_targets_python3_8(-)?] )
+DESCRIPTION=Lint CMake code using cmakelint and generate xUnit test result files
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test test python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0e4aee9461d30afdc810b97ceb0d63d8
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-0.11.2 b/metadata/md5-cache/dev-ros/ament_pep257-0.11.2
new file mode 100644
index 000000000000..4dd2af3667bc
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_pep257-0.11.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?] dev-python/pydocstyle[python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?] dev-python/pydocstyle[python_targets_python3_8(-)?] test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?] dev-python/pytest[python_targets_python3_8(-)?] )
+DESCRIPTION=Checks code against style conventions in PEP 8 and generate test result files
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test test python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?] dev-python/pydocstyle[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5dcc7a0427086df05d289cd795c6d301
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0 b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0
deleted file mode 100644
index 683c94b1996f..000000000000
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The ability to check code against style conventions using uncrustify
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-util/uncrustify python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eb345c3542943bfa3cc9d2cb13a67295
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.1 b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.1
deleted file mode 100644
index 332f479856b5..000000000000
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The ability to check code against style conventions using uncrustify
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-util/uncrustify python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eb345c3542943bfa3cc9d2cb13a67295
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.4 b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.4
index 224308804a2d..9ced04e1a178 100644
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.4
@@ -1,14 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=test? ( dev-util/uncrustify >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The ability to check code against style conventions using uncrustify
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-util/uncrustify python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-util/uncrustify python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eb345c3542943bfa3cc9d2cb13a67295
+_md5_=c1c739314c35b8a50438d69be9ca796f
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-0.11.2 b/metadata/md5-cache/dev-ros/ament_uncrustify-0.11.2
new file mode 100644
index 000000000000..f91c76a3e4d9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-0.11.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-util/uncrustify >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The ability to check code against style conventions using uncrustify
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-util/uncrustify python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c1c739314c35b8a50438d69be9ca796f
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-9999 b/metadata/md5-cache/dev-ros/ament_uncrustify-9999
index 81d0069ce792..36eb5a1f1e11 100644
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-9999
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-9999
@@ -1,13 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-util/uncrustify >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=The ability to check code against style conventions using uncrustify
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-util/uncrustify python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-util/uncrustify python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eb345c3542943bfa3cc9d2cb13a67295
+_md5_=c1c739314c35b8a50438d69be9ca796f
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-0.11.2 b/metadata/md5-cache/dev-ros/ament_xmllint-0.11.2
new file mode 100644
index 000000000000..f62820f857e1
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-0.11.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?] test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?] dev-ros/ament_flake8[python_targets_python3_8(-)?] dev-ros/ament_pep257[python_targets_python3_8(-)?] dev-python/pytest[python_targets_python3_8(-)?] )
+DESCRIPTION=Checks XML files like the package manifest using xmllint
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test test python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=69f974ff10536a0c1ea9b3279647a084
diff --git a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.15 b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.15
new file mode 100644
index 000000000000..fdf628b65fc1
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.15
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Runs an optimization to estimate the a robot's kinematic parameters
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/calibration_estimation https://github.com/ros-perception/calibration
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.15.tar.gz -> calibration-0.10.15.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9ca459354c8a2ad0e081718d85e07785
diff --git a/metadata/md5-cache/dev-ros/calibration_estimation-9999 b/metadata/md5-cache/dev-ros/calibration_estimation-9999
index cff59f9747fe..96475fa75f03 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-9999
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fa76d91e76e67f399830ed7e5d76f059
+_md5_=9ca459354c8a2ad0e081718d85e07785
diff --git a/metadata/md5-cache/dev-ros/calibration_launch-0.10.14 b/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
deleted file mode 100644
index 6ffb858b5701..000000000000
--- a/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Launch files for configuring the calibration stack to run on your robot
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/calibration_launch https://github.com/ros-perception/calibration
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/roslaunch dev-libs/urdfdom python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b7f19cf72a5d99628726d97812d758f4
diff --git a/metadata/md5-cache/dev-ros/calibration_launch-0.10.15-r1 b/metadata/md5-cache/dev-ros/calibration_launch-0.10.15-r1
new file mode 100644
index 000000000000..aba2b96dd075
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/calibration_launch-0.10.15-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Launch files for configuring the calibration stack to run on your robot
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/calibration_launch https://github.com/ros-perception/calibration
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/roslaunch dev-libs/urdfdom python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.15.tar.gz -> calibration-0.10.15.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=60818e7b898858df110b25a64e878219
diff --git a/metadata/md5-cache/dev-ros/calibration_launch-9999 b/metadata/md5-cache/dev-ros/calibration_launch-9999
index cf120cf91d9c..b70246598e34 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-9999
+++ b/metadata/md5-cache/dev-ros/calibration_launch-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b7f19cf72a5d99628726d97812d758f4
+_md5_=60818e7b898858df110b25a64e878219
diff --git a/metadata/md5-cache/dev-ros/calibration_msgs-0.10.15 b/metadata/md5-cache/dev-ros/calibration_msgs-0.10.15
new file mode 100644
index 000000000000..96b7d0e731fd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-0.10.15
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Messages for storing calibration samples to be used in calibration procedures
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/calibration_msgs https://github.com/ros-perception/calibration
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.15.tar.gz -> calibration-0.10.15.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=427391c1a37483a63a095cd1dabcaf50
diff --git a/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.15 b/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.15
new file mode 100644
index 000000000000..200c87cbbf8b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.15
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Script to generate calibration launch and configurationfiles for your robot
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/calibration_setup_helper https://github.com/ros-perception/calibration
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/calibration_launch python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.15.tar.gz -> calibration-0.10.15.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c2efdffbbaa5e10a329aa2b7cfd289f9
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0-r1 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0-r1
deleted file mode 100644
index 26fcda538fd9..000000000000
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads(+)] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Recovery behavior that attempts reverting the costmaps to the static map
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/clear_costmap_recovery https://github.com/ros-planning/navigation
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads(+)] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8f6be9e77110cc8651468762fb43f0cb
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.1-r1 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.1-r1
index f9926c65cabe..98ad4cc5c491 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.1-r1
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.1-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8f6be9e77110cc8651468762fb43f0cb
+_md5_=ab97fb09c609e730391288a2f8747a1d
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
index 36186c1dd0b7..0bc20d8bab4c 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8f6be9e77110cc8651468762fb43f0cb
+_md5_=ab97fb09c609e730391288a2f8747a1d
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.5 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.5
new file mode 100644
index 000000000000..0ac5c2c9f0c7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Combined Robot HW class
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.5.tar.gz -> ros_control-0.19.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0496b4185e968cd07a0da34070ff235e
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.5 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.5
new file mode 100644
index 000000000000..baf400354efd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Combined Robot HW class tests
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.5.tar.gz -> ros_control-0.19.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b01c755809c7a63b70ab8b3eb22b51eb
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-1.18.2-r1 b/metadata/md5-cache/dev-ros/control_toolbox-1.18.2-r1
index 44ee6b6e1ed1..d83029521dfa 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-1.18.2-r1
+++ b/metadata/md5-cache/dev-ros/control_toolbox-1.18.2-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads(+)] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/realtime_tools dev-libs/boost:=[threads(+)] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Modules that are useful across all controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_toolbox https://github.com/ros-controls/control_toolbox
 IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads(+)] dev-libs/tinyxml python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/realtime_tools dev-libs/boost:=[threads(+)] dev-libs/tinyxml python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/control_toolbox/archive/1.18.2.tar.gz -> control_toolbox-1.18.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2aca56397d30c63d4c31b06bdba1ea4b
+_md5_=0a6da0a476566aa9437483ff321e8d28
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-9999 b/metadata/md5-cache/dev-ros/control_toolbox-9999
index a383ec94d240..39893d52f5b6 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-9999
+++ b/metadata/md5-cache/dev-ros/control_toolbox-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads(+)] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/realtime_tools dev-libs/boost:=[threads(+)] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Modules that are useful across all controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_toolbox https://github.com/ros-controls/control_toolbox
 IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads(+)] dev-libs/tinyxml python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/realtime_tools dev-libs/boost:=[threads(+)] dev-libs/tinyxml python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2aca56397d30c63d4c31b06bdba1ea4b
+_md5_=0a6da0a476566aa9437483ff321e8d28
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.19.5 b/metadata/md5-cache/dev-ros/controller_interface-0.19.5
new file mode 100644
index 000000000000..8c3dc1761c2c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.19.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Interface base class for controllers
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.5.tar.gz -> ros_control-0.19.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e4f1a5e224f8a4d6a72eb8623759add4
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.19.5 b/metadata/md5-cache/dev-ros/controller_manager-0.19.5
new file mode 100644
index 000000000000..91f36828074a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.19.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-libs/boost:= dev-libs/console_bridge:= >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=The controller manager
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.5.tar.gz -> ros_control-0.19.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c25b5ad294b8ac0dd4e5fc9b500c2a2e
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.5 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.5
new file mode 100644
index 000000000000..5ba0472c32e9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=The controller manager
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.5.tar.gz -> ros_control-0.19.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b9ef6df615823d818dee6ed937494132
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
deleted file mode 100644
index 733dd862dd6f..000000000000
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Tests for the controller manager
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bbafac8f035225bb77b456e7b34e69b6
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.2 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.2
deleted file mode 100644
index 2136f9468f3e..000000000000
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Tests for the controller manager
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cb354ea6a2e4972a4c54b3d519e81b82
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.3 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.3
deleted file mode 100644
index 6f9dc771b279..000000000000
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Tests for the controller manager
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.3.tar.gz -> ros_control-0.19.3.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cb354ea6a2e4972a4c54b3d519e81b82
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.4 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.4
deleted file mode 100644
index 1e30e4274410..000000000000
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Tests for the controller manager
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.4.tar.gz -> ros_control-0.19.4.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b65a569a7304c440ffaa4e14aa997032
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.5 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.5
new file mode 100644
index 000000000000..cbfc716ac666
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rosbash ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Tests for the controller manager
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.5.tar.gz -> ros_control-0.19.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=cddc656098be628f90fd9455ac8d6f55
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-9999 b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
index 5d8386ea7488..e82e8b3ec079 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rosbash ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cb354ea6a2e4972a4c54b3d519e81b82
+_md5_=cddc656098be628f90fd9455ac8d6f55
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
deleted file mode 100644
index c57bf92c20f1..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
-DESCRIPTION=Robot-independent Gazebo plugins
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/gazebo_plugins https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD Apache-2.0
-RDEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f0ccc4f7cb1ff2271f58a164612487dc
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.2 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.2
index 4c152f7d9185..f301a5974269 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.2
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.2
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Robot-independent Gazebo plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_plugins https://github.com/ros-simulation/gazebo_ros_pkgs
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.2.tar.gz -> gazebo_ros_pkgs-2.9.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c588caa10d686c329f33708621c9ea38
+_md5_=449d736d1b5998a2de80089879559c7e
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-9999 b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
index 5288a10533b9..bf8ec4ebb802 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Robot-independent Gazebo plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_plugins https://github.com/ros-simulation/gazebo_ros_pkgs
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f0ccc4f7cb1ff2271f58a164612487dc
+_md5_=449d736d1b5998a2de80089879559c7e
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.11 b/metadata/md5-cache/dev-ros/genpy-0.6.11
deleted file mode 100644
index 1df6e2cdf1e6..000000000000
--- a/metadata/md5-cache/dev-ros/genpy-0.6.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Python ROS message and service generators
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/genpy
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0/0.6.11
-SRC_URI=https://github.com/ros/genpy/archive/0.6.11.tar.gz -> genpy-0.6.11.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0dc2e9627c07ac7646f8fb119c8c8210
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.14 b/metadata/md5-cache/dev-ros/genpy-0.6.14
deleted file mode 100644
index d84ce9a0b450..000000000000
--- a/metadata/md5-cache/dev-ros/genpy-0.6.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Python ROS message and service generators
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/genpy
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0/0.6.14
-SRC_URI=https://github.com/ros/genpy/archive/0.6.14.tar.gz -> genpy-0.6.14.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0dc2e9627c07ac7646f8fb119c8c8210
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.16 b/metadata/md5-cache/dev-ros/genpy-0.6.16
new file mode 100644
index 000000000000..214be89c8e63
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/genpy-0.6.16
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Python ROS message and service generators
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/genpy
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0/0.6.16
+SRC_URI=https://github.com/ros/genpy/archive/0.6.16.tar.gz -> genpy-0.6.16.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=017cf4715344a3ebf9077481ca313720
diff --git a/metadata/md5-cache/dev-ros/geodesy-0.5.5 b/metadata/md5-cache/dev-ros/geodesy-0.5.5
deleted file mode 100644
index b1fed48d1dac..000000000000
--- a/metadata/md5-cache/dev-ros/geodesy-0.5.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyproj[python_targets_python3_9(-)] ) dev-libs/boost:= dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Python and C++ interfaces for manipulating geodetic coordinates
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/geodesy https://github.com/ros-geographic-info/geographic_info
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyproj[python_targets_python3_9(-)] ) dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/0.5.5.tar.gz -> geographic_info-0.5.5.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3e545964748af07d52bd5978719c80f3
diff --git a/metadata/md5-cache/dev-ros/geodesy-0.5.6 b/metadata/md5-cache/dev-ros/geodesy-0.5.6
new file mode 100644
index 000000000000..0c1b34e2b80b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/geodesy-0.5.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyproj[python_targets_python3_9(-)] ) dev-libs/boost:= dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Python and C++ interfaces for manipulating geodetic coordinates
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/geodesy https://github.com/ros-geographic-info/geographic_info
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyproj[python_targets_python3_9(-)] ) dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/0.5.6.tar.gz -> geographic_info-0.5.6.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b30aedb578ce6b199e2036177e05a7be
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.6 b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.6
new file mode 100644
index 000000000000..8264e952d6ad
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=ROS messages for Geographic Information Systems
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/geographic_msgs https://github.com/ros-geographic-info/geographic_info
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/0.5.6.tar.gz -> geographic_info-0.5.6.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=79a59513c20485a38a5df7225c2ccc5b
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.2 b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.2
deleted file mode 100644
index cb83b9fda576..000000000000
--- a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Generic definitions of geometric shapes and bodies
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/geometric_shapes https://github.com/ros-planning/geometric_shapes
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.7.2.tar.gz -> geometric_shapes-0.7.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e8cf35d853271fba7ee31b7762bf0023
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.3 b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.3
new file mode 100644
index 000000000000..94a68b13f059
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Generic definitions of geometric shapes and bodies
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/geometric_shapes https://github.com/ros-planning/geometric_shapes
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.7.3.tar.gz -> geometric_shapes-0.7.3.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6663a3af4b694879f518ef8e5aa51f0c
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.19.5 b/metadata/md5-cache/dev-ros/hardware_interface-0.19.5
new file mode 100644
index 000000000000..4d4a45c1d9b0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.19.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Hardware Interface base class
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.5.tar.gz -> ros_control-0.19.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0a75f722d3fb1d83c839e3803f760161
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.5.2 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.5.2
new file mode 100644
index 000000000000..b7d94f93fdfe
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Means for transporting compressed map data through the use of image_transport
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_compressed_map_transport https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6d751238881dd797869ce4bc2aba58f4
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-0.5.2 b/metadata/md5-cache/dev-ros/hector_geotiff-0.5.2
new file mode 100644
index 000000000000..cf4f4795d509
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Saves occupancy grid map, robot trajectory and object data to GeoTiff images
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_geotiff https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=77f0003319233143a564cfedcaf1bcf5
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_launch-0.5.2 b/metadata/md5-cache/dev-ros/hector_geotiff_launch-0.5.2
new file mode 100644
index 000000000000..c0b3f3cac892
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_launch-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Launch files for the hector_geotiff mapper
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_geotiff_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins dev-ros/hector_trajectory_server python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d54b87399eda5ef651c723cc554bc41f
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.2 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.2
new file mode 100644
index 000000000000..6129498f5b12
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_geotiff_plugins https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=762dc2da08aab35167f095e7f23bab02
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.5.2 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.5.2
new file mode 100644
index 000000000000..91866811ae68
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Publish the roll/pitch attitude angles reported via a imu message to tf
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_imu_attitude_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=097236a64da572f4f226b97ab6ea439e
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-0.5.2 b/metadata/md5-cache/dev-ros/hector_imu_tools-0.5.2
new file mode 100644
index 000000000000..da6b9a630f2d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Tools for processing IMU messages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_imu_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f8a21cc233edc91962e2a76e73605a96
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-0.5.2 b/metadata/md5-cache/dev-ros/hector_map_server-0.5.2
new file mode 100644
index 000000000000..e242c8c1c92c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_map_server-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_map_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=981df0031799a063b1b2725fe80bf1c7
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.5.2 b/metadata/md5-cache/dev-ros/hector_map_tools-0.5.2
new file mode 100644
index 000000000000..7c4ac81b07ba
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_map_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4f1a9b7a42c584537195510f906229b7
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.5.2 b/metadata/md5-cache/dev-ros/hector_mapping-0.5.2
new file mode 100644
index 000000000000..82ec134b99b4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads(+)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=SLAM that can be used without odometry and on platforms that exhibit roll/pitch
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_mapping https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads(+)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=417349196d22f9e4e08aea35f539e168
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.2 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.2
new file mode 100644
index 000000000000..4d6dd61c0e4a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Convenience functions for easier publishing of visualization markers
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_marker_drawing https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e6db26598bdd927ab93f4e21a41cfafa
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.5.2 b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.5.2
new file mode 100644
index 000000000000..edc874672c09
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Messages and services used in the hector_slam stack
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_nav_msgs https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5120d8c09439a4c0ce80830857fd4e69
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.5.2 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.5.2
new file mode 100644
index 000000000000..e362d7bb63f6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Launch files for launching hector_slam with different robot scenarios
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_slam_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a94a66f5ba66d8bcb2ec0d0f1f81999e
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.2 b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.2
new file mode 100644
index 000000000000..7b8a3bd5f720
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Keeps track of tf trajectories and makes this data accessible
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_trajectory_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=32b7535850a4b5ed9046f5864d13c85d
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r2 b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r2
deleted file mode 100644
index e0f6d0e876f5..000000000000
--- a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads(+)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-DESCRIPTION=Extracts checkerboard corners from ROS images
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/image_cb_detector https://github.com/ros-perception/calibration
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads(+)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0d87982859d62fd6225cf01c73e216f4
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.15-r1 b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.15-r1
new file mode 100644
index 000000000000..b91fd7d78f2d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.15-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads(+)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Extracts checkerboard corners from ROS images
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/image_cb_detector https://github.com/ros-perception/calibration
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads(+)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.15.tar.gz -> calibration-0.10.15.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0eb0f417dadf6012d43674dc4882c632
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-9999 b/metadata/md5-cache/dev-ros/image_cb_detector-9999
index afb022ec0159..0d1c119a2a25 100644
--- a/metadata/md5-cache/dev-ros/image_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0d87982859d62fd6225cf01c73e216f4
+_md5_=0eb0f417dadf6012d43674dc4882c632
diff --git a/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.3 b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.3
new file mode 100644
index 000000000000..c7de38f10781
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Fuses angular velocities, accelerations, and magnetic readings from an IMU
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/imu_complementary_filter https://github.com/ccny-ros-pkg/imu_tools
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.3.tar.gz -> imu_tools-1.2.3.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=641ca4ab1eb985cf86cb701c9b5147a6
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.3 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.3
new file mode 100644
index 000000000000..0acca4687688
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads(+)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Fuses angular velocities, accelerations, and magnetic readings from an IMU
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/imu_filter_madgwick https://github.com/ccny-ros-pkg/imu_tools
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads(+)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.3.tar.gz -> imu_tools-1.2.3.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=12df61493b2fcebd47202284decbf461
diff --git a/metadata/md5-cache/dev-ros/interval_intersection-0.10.15 b/metadata/md5-cache/dev-ros/interval_intersection-0.10.15
new file mode 100644
index 000000000000..14e0f9082564
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/interval_intersection-0.10.15
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:=[threads(+)] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Tools for calculating the intersection of interval messages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/interval_intersection https://github.com/ros-perception/calibration
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads(+)] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.15.tar.gz -> calibration-0.10.15.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d14dcb499ab99b8d9eec9e4e3ca17b95
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.5 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.5
new file mode 100644
index 000000000000..ad1cafe0916b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Interface for enforcing joint limits
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.5.tar.gz -> ros_control-0.19.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2ba839175ce84182a8f9e0ef466e5f21
diff --git a/metadata/md5-cache/dev-ros/joint_states_settler-0.10.15 b/metadata/md5-cache/dev-ros/joint_states_settler-0.10.15
new file mode 100644
index 000000000000..909a71a4016d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/joint_states_settler-0.10.15
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:=[threads(+)] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/actionlib_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DESCRIPTION=Reports how long a subset of joints has been settled
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/joint_states_settler https://github.com/ros-perception/calibration
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads(+)] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.15.tar.gz -> calibration-0.10.15.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f2b11cc038ea5c4442c2edda76c7c987
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14-r1 b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14-r1
deleted file mode 100644
index 2e88ee557bc6..000000000000
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads(+)] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest media-libs/opencv[png] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-DESCRIPTION=Extracts checkerboard corners from a dense laser snapshot
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/laser_cb_detector https://github.com/ros-perception/calibration
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads(+)] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1c756882f33ff0d2606cec290ebffb95
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.15 b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.15
new file mode 100644
index 000000000000..ac3439378d79
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.15
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:=[threads(+)] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest media-libs/opencv[png] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Extracts checkerboard corners from a dense laser snapshot
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/laser_cb_detector https://github.com/ros-perception/calibration
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads(+)] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.15.tar.gz -> calibration-0.10.15.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=efaf16ea8d47ee5b9380bbc82dc02062
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-9999 b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
index c1603005b4a1..0504df1960a7 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1c756882f33ff0d2606cec290ebffb95
+_md5_=efaf16ea8d47ee5b9380bbc82dc02062
diff --git a/metadata/md5-cache/dev-ros/laser_filters-1.8.11 b/metadata/md5-cache/dev-ros/laser_filters-1.8.11
index 4073bf7df1fe..7cbe47952417 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-1.8.11
+++ b/metadata/md5-cache/dev-ros/laser_filters-1.8.11
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
 IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_filters/archive/1.8.11.tar.gz -> laser_filters-1.8.11.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=234fba8da39dae2beff0c760ef2f4292
+_md5_=b458551cf93a918d431c471d5a11cc0c
diff --git a/metadata/md5-cache/dev-ros/laser_filters-9999 b/metadata/md5-cache/dev-ros/laser_filters-9999
index 7e40f257f386..a1a53860208f 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-9999
+++ b/metadata/md5-cache/dev-ros/laser_filters-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
 IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=234fba8da39dae2beff0c760ef2f4292
+_md5_=b458551cf93a918d431c471d5a11cc0c
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-1.6.6-r1 b/metadata/md5-cache/dev-ros/laser_geometry-1.6.6-r1
deleted file mode 100644
index bb1085b6d12b..000000000000
--- a/metadata/md5-cache/dev-ros/laser_geometry-1.6.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads(+)] dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Class for converting from a 2D laser scan into a point cloud
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/laser_geometry https://github.com/ros-perception/laser_geometry
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads(+)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/laser_geometry/archive/1.6.6.tar.gz -> laser_geometry-1.6.6.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=deabdabe1257f38d1cff4ca21bd8adc8
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-1.6.7 b/metadata/md5-cache/dev-ros/laser_geometry-1.6.7
new file mode 100644
index 000000000000..5b670cf1eceb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/laser_geometry-1.6.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads(+)] dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Class for converting from a 2D laser scan into a point cloud
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/laser_geometry https://github.com/ros-perception/laser_geometry
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads(+)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/laser_geometry/archive/1.6.7.tar.gz -> laser_geometry-1.6.7.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=deabdabe1257f38d1cff4ca21bd8adc8
diff --git a/metadata/md5-cache/dev-ros/libmavconn-1.8.0 b/metadata/md5-cache/dev-ros/libmavconn-1.8.0
new file mode 100644
index 000000000000..b950a33c4f9c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/libmavconn-1.8.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=MAVLink communication library
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/libmavconn https://github.com/mavlink/mavros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-3 LGPL-3 BSD
+RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/1.8.0.tar.gz -> mavros-1.8.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7f8b0a38b4d9fac586d3a69d601484de
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.9.10 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.9.10
deleted file mode 100644
index f7ad4b296e0b..000000000000
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.9.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=MAVLink message marshaling library
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/mavlink-gbp-release https://github.com/mavlink/mavlink-gbp-release
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/noetic/mavlink/2020.9.10-2020.9.10.tar.gz -> mavlink-gbp-release-2020.9.10.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aaa5240aa2874d27cc1890ee7da112f6
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2021.2.2 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2021.2.2
deleted file mode 100644
index eb51539d087d..000000000000
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2021.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=MAVLink message marshaling library
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/mavlink-gbp-release https://github.com/mavlink/mavlink-gbp-release
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/noetic/mavlink/2021.2.2-2021.2.2.tar.gz -> mavlink-gbp-release-2021.2.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ead031205dc530c21dd167bd8019cdec
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2021.7.7 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2021.7.7
new file mode 100644
index 000000000000..4a392cebf9fc
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2021.7.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=MAVLink message marshaling library
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mavlink-gbp-release https://github.com/mavlink/mavlink-gbp-release
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=LGPL-3
+RDEPEND=python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/noetic/mavlink/2021.7.7-2021.7.7.tar.gz -> mavlink-gbp-release-2021.7.7.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ead031205dc530c21dd167bd8019cdec
diff --git a/metadata/md5-cache/dev-ros/mavros-1.2.0 b/metadata/md5-cache/dev-ros/mavros-1.2.0
deleted file mode 100644
index 7896f404d918..000000000000
--- a/metadata/md5-cache/dev-ros/mavros-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.2.0[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=MAVLink extendable communication node for ROS
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=97a87f1d3c66eca22769bea745583b3a
diff --git a/metadata/md5-cache/dev-ros/mavros-1.4.0 b/metadata/md5-cache/dev-ros/mavros-1.4.0
deleted file mode 100644
index 95d56307683e..000000000000
--- a/metadata/md5-cache/dev-ros/mavros-1.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.4.0[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=MAVLink extendable communication node for ROS
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/1.4.0.tar.gz -> mavros-1.4.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fb00de4bc210d67dd2402b4312493b38
diff --git a/metadata/md5-cache/dev-ros/mavros-1.5.2 b/metadata/md5-cache/dev-ros/mavros-1.5.2
index 34c68627764d..d889f0392861 100644
--- a/metadata/md5-cache/dev-ros/mavros-1.5.2
+++ b/metadata/md5-cache/dev-ros/mavros-1.5.2
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.5.2[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.5.2[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.5.2.tar.gz -> mavros-1.5.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5d06a7a33376405f750226463f0faeed
+_md5_=94169ddb4241a1822b840313ac5ec9fa
diff --git a/metadata/md5-cache/dev-ros/mavros-1.8.0 b/metadata/md5-cache/dev-ros/mavros-1.8.0
new file mode 100644
index 000000000000..6b9909bafa7e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavros-1.8.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.8.0[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=MAVLink extendable communication node for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-3 LGPL-3 BSD
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/1.8.0.tar.gz -> mavros-1.8.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=94169ddb4241a1822b840313ac5ec9fa
diff --git a/metadata/md5-cache/dev-ros/mavros-9999 b/metadata/md5-cache/dev-ros/mavros-9999
index acdf05420f41..74580ab2e45f 100644
--- a/metadata/md5-cache/dev-ros/mavros-9999
+++ b/metadata/md5-cache/dev-ros/mavros-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-9999[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-9999[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fb00de4bc210d67dd2402b4312493b38
+_md5_=94169ddb4241a1822b840313ac5ec9fa
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-1.8.0 b/metadata/md5-cache/dev-ros/mavros_extras-1.8.0
new file mode 100644
index 000000000000..6667d337a4a8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavros_extras-1.8.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Extra nodes and plugins for mavros
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mavros_extras https://github.com/mavlink/mavros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-3 LGPL-3 BSD
+RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/1.8.0.tar.gz -> mavros-1.8.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e1e020422c6a906db1260110bb20e4ba
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-1.8.0 b/metadata/md5-cache/dev-ros/mavros_msgs-1.8.0
new file mode 100644
index 000000000000..19953d9497e5
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-1.8.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Messages for MAVROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/1.8.0.tar.gz -> mavros-1.8.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=89e8175e8ace04e1d01a8cd63f1e7d21
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.15.11 b/metadata/md5-cache/dev-ros/message_filters-1.15.11
new file mode 100644
index 000000000000..a226185324a2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/message_filters-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads(+)] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Set of message filters which take in messages and outputs those at a later time
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads(+)] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=53f82687c7bf60a8bba4e0069246471f
diff --git a/metadata/md5-cache/dev-ros/mk-1.15.8 b/metadata/md5-cache/dev-ros/mk-1.15.8
new file mode 100644
index 000000000000..fff861ea3ea4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mk-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=A collection of .mk include files for building ROS architectural elements
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mk https://github.com/ros/ros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospack dev-ros/rosbuild python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.8.tar.gz -> ros-1.15.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f9006661ce4221e02a1cbbd3b09ab5c7
diff --git a/metadata/md5-cache/dev-ros/monocam_settler-0.10.15 b/metadata/md5-cache/dev-ros/monocam_settler-0.10.15
new file mode 100644
index 000000000000..735a1278903e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/monocam_settler-0.10.15
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads(+)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Listens on a ImageFeatures topic, and waits for the data to settle
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/monocam_settler https://github.com/ros-perception/calibration
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads(+)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.15.tar.gz -> calibration-0.10.15.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d3fd661f107b04446c696406df7430eb
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.11.1 b/metadata/md5-cache/dev-ros/moveit_msgs-0.11.1
deleted file mode 100644
index 99ad9af95692..000000000000
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-DESCRIPTION=Messages, services and actions used by MoveIt
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/moveit_msgs https://github.com/ros-planning/moveit_msgs
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.11.1.tar.gz -> moveit_msgs-0.11.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d3ee98710b0c308b3a8bab2054f695e7
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.11.2 b/metadata/md5-cache/dev-ros/moveit_msgs-0.11.2
new file mode 100644
index 000000000000..55c54b607705
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-0.11.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Messages, services and actions used by MoveIt
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/moveit_msgs https://github.com/ros-planning/moveit_msgs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.11.2.tar.gz -> moveit_msgs-0.11.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8d4ff81c403854ba843cda7ba5bbe667
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-1.4.2-r1 b/metadata/md5-cache/dev-ros/openni2_camera-1.4.2-r1
deleted file mode 100644
index c099f0df4122..000000000000
--- a/metadata/md5-cache/dev-ros/openni2_camera-1.4.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads(+)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
-DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/openni2_camera https://github.com/ros-drivers/openni2_camera
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads(+)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/1.4.2.tar.gz -> openni2_camera-1.4.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c8afe35d46025a33105b023e7bf965e9
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-1.5.1 b/metadata/md5-cache/dev-ros/openni2_camera-1.5.1
new file mode 100644
index 000000000000..2dfdc0f00684
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/openni2_camera-1.5.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads(+)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/openni2_camera https://github.com/ros-drivers/openni2_camera
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads(+)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/1.5.1.tar.gz -> openni2_camera-1.5.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c8afe35d46025a33105b023e7bf965e9
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-1.4.2 b/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
deleted file mode 100644
index a53cbd0eb0c7..000000000000
--- a/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Launch files to start the openni2_camera drivers using rgbd_launch
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/openni2_launch https://github.com/ros-drivers/openni2_camera
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/1.4.2.tar.gz -> openni2_camera-1.4.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c50a83e3f7327e2e2c38ca27b6a7d810
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-1.5.1 b/metadata/md5-cache/dev-ros/openni2_launch-1.5.1
new file mode 100644
index 000000000000..b7f97d38d96f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/openni2_launch-1.5.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Launch files to start the openni2_camera drivers using rgbd_launch
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/openni2_launch https://github.com/ros-drivers/openni2_camera
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/1.5.1.tar.gz -> openni2_camera-1.5.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0b296b1e36a63ef73e0195f70d1929b1
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1 b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
deleted file mode 100644
index 0c9ee2dce4e0..000000000000
--- a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Provides conversions from PCL data types and ROS message types
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/pcl_conversions https://github.com/ros-perception/perception_pcl
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.7.1.tar.gz -> perception_pcl-1.7.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=745ff6bb85b4c0dab889f165304329f6
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.2 b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.2
deleted file mode 100644
index 5dcfe2623c0b..000000000000
--- a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Provides conversions from PCL data types and ROS message types
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/pcl_conversions https://github.com/ros-perception/perception_pcl
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.7.2.tar.gz -> perception_pcl-1.7.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=745ff6bb85b4c0dab889f165304329f6
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.2-r1 b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.2-r1
new file mode 100644
index 000000000000..ae58948048b5
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Provides conversions from PCL data types and ROS message types
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/pcl_conversions https://github.com/ros-perception/perception_pcl
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.7.2.tar.gz -> perception_pcl-1.7.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3959e350701be288971ae26c8511e32c
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-1.7.2-r1 b/metadata/md5-cache/dev-ros/pcl_ros-1.7.2-r1
index 52854cd8b2c6..7264a0817e6f 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-1.7.2-r1
+++ b/metadata/md5-cache/dev-ros/pcl_ros-1.7.2-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.7.2.tar.gz -> perception_pcl-1.7.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=92cd60e2cd0beb5ea533df5bc3e39d01
+_md5_=32fb3025952435e940719365ece5bdfa
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-9999 b/metadata/md5-cache/dev-ros/pcl_ros-9999
index 06e67e3a8328..a097deb44ebe 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-9999
+++ b/metadata/md5-cache/dev-ros/pcl_ros-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=92cd60e2cd0beb5ea533df5bc3e39d01
+_md5_=4a249e3a10aeb93c5ac5480f60c3ea62
diff --git a/metadata/md5-cache/dev-ros/poco_vendor-1.2.0 b/metadata/md5-cache/dev-ros/poco_vendor-1.2.0
deleted file mode 100644
index 3b3938921dfb..000000000000
--- a/metadata/md5-cache/dev-ros/poco_vendor-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/poco-1.6.1 dev-libs/libpcre sys-libs/zlib
-DESCRIPTION=CMake shim over the poco library
-EAPI=7
-HOMEPAGE=https://github.com/ros2/poco_vendor
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 Boost-1.0
-RDEPEND=>=dev-libs/poco-1.6.1 dev-libs/libpcre sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/ros2/poco_vendor/archive/1.2.0.tar.gz -> poco_vendor-1.2.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dbff2d50781ba4b78191e465efc1536b
diff --git a/metadata/md5-cache/dev-ros/poco_vendor-1.2.1 b/metadata/md5-cache/dev-ros/poco_vendor-1.2.1
new file mode 100644
index 000000000000..9c99ce9ac484
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/poco_vendor-1.2.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/poco-1.6.1 dev-libs/libpcre sys-libs/zlib
+DESCRIPTION=CMake shim over the poco library
+EAPI=7
+HOMEPAGE=https://github.com/ros2/poco_vendor
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Boost-1.0
+RDEPEND=>=dev-libs/poco-1.6.1 dev-libs/libpcre sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/ros2/poco_vendor/archive/1.2.1.tar.gz -> poco_vendor-1.2.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=dbff2d50781ba4b78191e465efc1536b
diff --git a/metadata/md5-cache/dev-ros/python_cmake_module-0.8.0 b/metadata/md5-cache/dev-ros/python_cmake_module-0.8.0
deleted file mode 100644
index 82d4879885a2..000000000000
--- a/metadata/md5-cache/dev-ros/python_cmake_module-0.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=CMake module with extra functionality for Python
-EAPI=7
-HOMEPAGE=https://github.com/ros2/python_cmake_module
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros2/python_cmake_module/archive/0.8.0.tar.gz -> python_cmake_module-0.8.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7e27f11cf47df671ee202ce8f9aca5a2
diff --git a/metadata/md5-cache/dev-ros/python_cmake_module-0.8.1 b/metadata/md5-cache/dev-ros/python_cmake_module-0.8.1
new file mode 100644
index 000000000000..a153bb4cfc81
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/python_cmake_module-0.8.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=CMake module with extra functionality for Python
+EAPI=7
+HOMEPAGE=https://github.com/ros2/python_cmake_module
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros2/python_cmake_module/archive/0.8.1.tar.gz -> python_cmake_module-0.8.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7e27f11cf47df671ee202ce8f9aca5a2
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3-r1 b/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3-r1
deleted file mode 100644
index fce6556819ea..000000000000
--- a/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.4.3.tar.gz -> python_qt_binding-0.4.3.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8690f843c8469772ca1adc02b252b643
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.4.4 b/metadata/md5-cache/dev-ros/python_qt_binding-0.4.4
new file mode 100644
index 000000000000..da8949fa2126
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-0.4.4
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.4.4.tar.gz -> python_qt_binding-0.4.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=12cb0889883f951547d82dc6fb96d905
diff --git a/metadata/md5-cache/dev-ros/robot_localization-2.7.2 b/metadata/md5-cache/dev-ros/robot_localization-2.7.2
deleted file mode 100644
index 7a4a2ae9c090..000000000000
--- a/metadata/md5-cache/dev-ros/robot_localization-2.7.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-ros/roslint dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-DESCRIPTION=Package of nonlinear state estimation nodes
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/robot_localization https://github.com/cra-ros-pkg/robot_localization
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cra-ros-pkg/robot_localization/archive/2.7.2.tar.gz -> robot_localization-2.7.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f452c82242e79b4596c1058b5c7b0dda
diff --git a/metadata/md5-cache/dev-ros/robot_localization-2.7.3 b/metadata/md5-cache/dev-ros/robot_localization-2.7.3
new file mode 100644
index 000000000000..8ec6b593224e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/robot_localization-2.7.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-ros/roslint dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Package of nonlinear state estimation nodes
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/robot_localization https://github.com/cra-ros-pkg/robot_localization
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cra-ros-pkg/robot_localization/archive/2.7.3.tar.gz -> robot_localization-2.7.3.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3e2566cf43e8b63abba4d1475962eb36
diff --git a/metadata/md5-cache/dev-ros/robot_localization-9999 b/metadata/md5-cache/dev-ros/robot_localization-9999
index 6e847bc75068..ae90d0bf3019 100644
--- a/metadata/md5-cache/dev-ros/robot_localization-9999
+++ b/metadata/md5-cache/dev-ros/robot_localization-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-ros/roslint >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Package of nonlinear state estimation nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_localization https://github.com/cra-ros-pkg/robot_localization
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f452c82242e79b4596c1058b5c7b0dda
+_md5_=3e2566cf43e8b63abba4d1475962eb36
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.15.11 b/metadata/md5-cache/dev-ros/rosbag-1.15.11
new file mode 100644
index 000000000000..c527f3c3f286
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbag-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Set of tools for recording from and playing back to ROS topics
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosbag https://github.com/ros/ros_comm
+IUSE=lz4 python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f69a57cb2804ceabb4b528d248d6b3df
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.11 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.11
new file mode 100644
index 000000000000..d1c33b08b7d5
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Set of tools for recording from and playing back ROS message
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=be2b4df857505e0abeb2fb26d6867948
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.15.8 b/metadata/md5-cache/dev-ros/rosbash-1.15.8
new file mode 100644
index 000000000000..22c28b891642
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbash-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospack python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Assorted shell commands for using ros with bash
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosbash https://github.com/ros/ros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospack python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.8.tar.gz -> ros-1.15.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=71d0375bbe57d735dfec5f6b4d6d240c
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.8 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.8
new file mode 100644
index 000000000000..66f624f04f41
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosboost_cfg https://github.com/ros/ros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.8.tar.gz -> ros-1.15.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=abb43c6ff7482fe4acef0fd7bd2eebe1
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.15.8 b/metadata/md5-cache/dev-ros/rosbuild-1.15.8
new file mode 100644
index 000000000000..523f089665af
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Scripts for managing the CMake-based build system for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosbuild https://github.com/ros/ros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.8.tar.gz -> ros-1.15.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=905dc9a0e307119bcb6edd7cfd41476d
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.15.8 b/metadata/md5-cache/dev-ros/rosclean-1.15.8
new file mode 100644
index 000000000000..1d287a7fcbe6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosclean-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Cleanup filesystem resources (e.g. log files)
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosclean https://github.com/ros/ros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.8.tar.gz -> ros-1.15.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8ad320b838d529f16c0d20b7a56572b9
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.15.11 b/metadata/md5-cache/dev-ros/roscpp-1.15.11
new file mode 100644
index 000000000000..41f51e929049
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roscpp-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DESCRIPTION=C++ implementation of ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roscpp https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ca4f21893334635ec7222c8610909db0
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.15.8 b/metadata/md5-cache/dev-ros/roscreate-1.15.8
new file mode 100644
index 000000000000..aea5f12c2f3d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roscreate-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roscreate https://github.com/ros/ros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.8.tar.gz -> ros-1.15.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=160e5e40d888bb596e4fdf8b0b7b0e05
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.15.11 b/metadata/md5-cache/dev-ros/rosgraph-1.15.11
new file mode 100644
index 000000000000..6b22f6354fbb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Prints information about the ROS Computation Graph
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c94e55405c83a8d6ff4749f59a7f8b47
diff --git a/metadata/md5-cache/dev-ros/roslang-1.15.8 b/metadata/md5-cache/dev-ros/roslang-1.15.8
new file mode 100644
index 000000000000..42317a22fc2b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslang-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Common package for all ROS client libraries
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roslang https://github.com/ros/ros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.8.tar.gz -> ros-1.15.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d77c6dfc6406b9a5f48df7a94db8b1b3
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.11 b/metadata/md5-cache/dev-ros/roslaunch-1.15.11
new file mode 100644
index 000000000000..f1a9fa6f3a5e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Tool for easily launching multiple ROS nodes
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout acct-group/ros acct-user/ros python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=87eba313416f3262435dc2c38d0dd06e
diff --git a/metadata/md5-cache/dev-ros/roslib-1.15.8 b/metadata/md5-cache/dev-ros/roslib-1.15.8
new file mode 100644
index 000000000000..705f7d8fdddb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslib-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads(+)] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Base dependencies and support libraries for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roslib https://github.com/ros/ros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads(+)] dev-ros/rospack dev-ros/ros_environment python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.8.tar.gz -> ros-1.15.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=045919a7e80d08bd38681e4f03f94e45
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.15.11 b/metadata/md5-cache/dev-ros/roslz4-1.15.11
new file mode 100644
index 000000000000..48bad87ec448
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslz4-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/lz4 dev-ros/cpp_common test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=app-arch/lz4 dev-ros/cpp_common python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3e0b581d158722e9949e18f83d0d50a0
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.15.8 b/metadata/md5-cache/dev-ros/rosmake-1.15.8
new file mode 100644
index 000000000000..5582f673a185
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosmake-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=ROS dependency aware build tool
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosmake https://github.com/ros/ros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.8.tar.gz -> ros-1.15.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c23f6e0663d4b69f21a913832ecb2ed5
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.15.11 b/metadata/md5-cache/dev-ros/rosmaster-1.15.11
new file mode 100644
index 000000000000..57270ac567e9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=ROS Master implementation
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0e205dc75b0a56073fed3c1288c618e4
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.15.11 b/metadata/md5-cache/dev-ros/rosmsg-1.15.11
new file mode 100644
index 000000000000..93ca013a52f2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Command-line tools for displaying information about message and services
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0ea1d7c50077f11431ab63ee1f424714
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.15.11 b/metadata/md5-cache/dev-ros/rosnode-1.15.11
new file mode 100644
index 000000000000..682c9a69d5ca
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosnode-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2a4b4d748e32d49ffd046c74de9d70fc
diff --git a/metadata/md5-cache/dev-ros/rosout-1.15.11 b/metadata/md5-cache/dev-ros/rosout-1.15.11
new file mode 100644
index 000000000000..6df05a7ef285
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosout-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9ea485ff62f635b8500ccb41ea5b8d8c
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.15.11 b/metadata/md5-cache/dev-ros/rosparam-1.15.11
new file mode 100644
index 000000000000..086fd5c7d06c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosparam-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e2621e724f434235874d8ae18426e3b8
diff --git a/metadata/md5-cache/dev-ros/rospy-1.15.11 b/metadata/md5-cache/dev-ros/rospy-1.15.11
new file mode 100644
index 000000000000..ffec1c2d8d3c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rospy-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DESCRIPTION=Python client library for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8fe0773b54ce794b8630d1adf97bf984
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.9.2 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.9.2
new file mode 100644
index 000000000000..3421c829d41a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.9.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DESCRIPTION=Libraries and examples for ROSserial usage on Arduino/AVR Platforms
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_arduino https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.2.tar.gz -> rosserial-0.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fcfdb3484ac3a22e571cb74670053fce
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-0.9.2 b/metadata/md5-cache/dev-ros/rosserial_client-0.9.2
new file mode 100644
index 000000000000..9aaa0a67a391
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_client-0.9.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Generalized client side source for rosserial
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_client https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.2.tar.gz -> rosserial-0.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=dd4c17e6ed45a87424c04c8d808f0a99
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.9.2 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.9.2
new file mode 100644
index 000000000000..6a39b151510f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.9.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Libraries and examples for ROSserial usage on Embedded Linux Enviroments
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_embeddedlinux https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.2.tar.gz -> rosserial-0.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=820a4239924300250f37bf00539e328d
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-0.9.2 b/metadata/md5-cache/dev-ros/rosserial_msgs-0.9.2
new file mode 100644
index 000000000000..099c726cfb9c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.9.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DESCRIPTION=Messages for automatic topic configuration using rosserial
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_msgs https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.2.tar.gz -> rosserial-0.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ae16ebf0a6a7d669abc750a32edafe57
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.9.2 b/metadata/md5-cache/dev-ros/rosserial_python-0.9.2
new file mode 100644
index 000000000000..60878d50156b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.9.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=A Python-based implementation of the ROS serial protocol
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_python https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.2.tar.gz -> rosserial-0.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d721b8c318b521a21501c274898b6e71
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.9.2 b/metadata/md5-cache/dev-ros/rosserial_server-0.9.2
new file mode 100644
index 000000000000..061b48e3e90a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_server-0.9.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads(+)] dev-ros/rosserial_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=C++ implementation of the rosserial server side
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_server https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads(+)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.2.tar.gz -> rosserial-0.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8c89cc97ee440b5702e4a28cdbd38314
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.9.2 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.9.2
new file mode 100644
index 000000000000..d25e17848abd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.9.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Definitions for rosserial_client targets for TivaC Launchpad evaluation boards.
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_tivac https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.2.tar.gz -> rosserial-0.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=73a993e7ad5a29501a4625e4b8dc18bb
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.9.2 b/metadata/md5-cache/dev-ros/rosserial_windows-0.9.2
new file mode 100644
index 000000000000..f939f8dfdc97
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.9.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DESCRIPTION=Libraries and examples for ROSserial usage on Windows Platforms
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_windows https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.2.tar.gz -> rosserial-0.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0fa500f3020e80679cc2601329ce58aa
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.9.2 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.9.2
new file mode 100644
index 000000000000..fb9a036ebaec
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.9.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Tools to do communicate between rosserial nodes connected to an xbee
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_xbee https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.2.tar.gz -> rosserial-0.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a9b8fab55998154e69252bdac50600bd
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.15.11 b/metadata/md5-cache/dev-ros/rosservice-1.15.11
new file mode 100644
index 000000000000..7b17e243932e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosservice-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Command-line tool for listing and querying ROS Services
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0e317eb81ea9b47fa74e480cbec5bece
diff --git a/metadata/md5-cache/dev-ros/rostest-1.15.11 b/metadata/md5-cache/dev-ros/rostest-1.15.11
new file mode 100644
index 000000000000..93076b9f17ff
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rostest-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads(+)] test? ( dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads(+)] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Integration test suite based on roslaunch compatible with xUnit frameworks
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads(+)] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d9c908544b1ce2a23a44122f45f261fc
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.15.11 b/metadata/md5-cache/dev-ros/rostopic-1.15.11
new file mode 100644
index 000000000000..06e6d323f092
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rostopic-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a0684bbc1ebda4bb46c6642dd3f0595c
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.15.8 b/metadata/md5-cache/dev-ros/rosunit-1.15.8
new file mode 100644
index 000000000000..8f11775d3d69
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosunit-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Unit-testing package for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosunit https://github.com/ros/ros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.8.tar.gz -> ros-1.15.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d3d73e200093d9566ecaf83155dbdf1a
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.15.11 b/metadata/md5-cache/dev-ros/roswtf-1.15.11
new file mode 100644
index 000000000000..446040482ae2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roswtf-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ros/cmake_modules ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslang[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Tool for diagnosing issues with a running ROS system
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9dd1da9e592b4bca303e7d1b46c0d636
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.15 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.15
deleted file mode 100644
index d898014246e3..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_bag https://github.com/ros-visualization/rqt_bag
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.15.tar.gz -> rqt_bag-0.4.15.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=56be5be194b74b297c61f0d84be69fc2
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.5.1 b/metadata/md5-cache/dev-ros/rqt_bag-0.5.1
new file mode 100644
index 000000000000..ed6514689965
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.5.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_bag https://github.com/ros-visualization/rqt_bag
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.5.1.tar.gz -> rqt_bag-0.5.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=eb99dd28d5888953e6bda1a5e4b8a094
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.15 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.15
deleted file mode 100644
index 0b2dffd04798..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_bag_plugins https://github.com/ros-visualization/rqt_bag
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.15.tar.gz -> rqt_bag-0.4.15.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=efde050257d357297145beb708d3f729
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.5.1 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.5.1
new file mode 100644
index 000000000000..b20124db38dc
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.5.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_bag_plugins https://github.com/ros-visualization/rqt_bag
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.5.1.tar.gz -> rqt_bag-0.5.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=cc2268c610a81a7461a0f589ce79991c
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.5 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.5
new file mode 100644
index 000000000000..526f59d56a73
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=RQT control manager plugin
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.5.tar.gz -> ros_control-0.19.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=da2cba38924b9dfe17775ffd18d29676
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.10 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
deleted file mode 100644
index 298758d95782..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_dep https://github.com/ros-visualization/rqt_dep
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_dep/archive/0.4.10.tar.gz -> rqt_dep-0.4.10.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9331376cee8d83fc91ff6c88239e701f
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.12 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.12
new file mode 100644
index 000000000000..12f367b81814
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.4.12
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_dep https://github.com/ros-visualization/rqt_dep
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_dep/archive/0.4.12.tar.gz -> rqt_dep-0.4.12.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=09b55e374239aefe91889138da56b1e3
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.4.10 b/metadata/md5-cache/dev-ros/rqt_msg-0.4.10
new file mode 100644
index 000000000000..459c99b49d8a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.4.10
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Python GUI plugin for introspecting available ROS message types
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_msg https://github.com/ros-visualization/rqt_msg
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_msg/archive/0.4.10.tar.gz -> rqt_msg-0.4.10.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8eac2f35c31449718f17ada021f7f8e7
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.4.9 b/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
deleted file mode 100644
index 0c4f8f81170e..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Python GUI plugin for introspecting available ROS message types
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_msg https://github.com/ros-visualization/rqt_msg
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_msg/archive/0.4.9.tar.gz -> rqt_msg-0.4.9.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=696f9747a699226d1aa78179a2493721
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10
deleted file mode 100644
index 96c76ef9f197..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyopengl[python_targets_python3_9(-)] ) dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=GUI plugin for visualizing 3D poses
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_pose_view https://github.com/ros-visualization/rqt_pose_view
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyopengl[python_targets_python3_9(-)] ) dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_pose_view/archive/0.5.10.tar.gz -> rqt_pose_view-0.5.10.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=53b5a70d3a6dbb057b02fedb3b7d40a0
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.11 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.11
new file mode 100644
index 000000000000..9e980f3e0956
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyopengl[python_targets_python3_9(-)] ) dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=GUI plugin for visualizing 3D poses
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_pose_view https://github.com/ros-visualization/rqt_pose_view
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyopengl[python_targets_python3_9(-)] ) dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_pose_view/archive/0.5.11.tar.gz -> rqt_pose_view-0.5.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=641f405ebad00cb62d9b1edbaa333e04
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.10 b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.10
new file mode 100644
index 000000000000..e2a34bc95942
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.10
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_publisher https://github.com/ros-visualization/rqt_publisher
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_publisher/archive/0.4.10.tar.gz -> rqt_publisher-0.4.10.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f5056dfc321a539196d22119d0e131ca
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9 b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
deleted file mode 100644
index 5d352b82562b..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_publisher https://github.com/ros-visualization/rqt_publisher
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_publisher/archive/0.4.9.tar.gz -> rqt_publisher-0.4.9.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4ca4ae103b03a0a221e70e7c921c27e0
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.10 b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.10
new file mode 100644
index 000000000000..15a42da4ca03
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.10
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Python GUI plugin providing an interactive Python console
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_py_console https://github.com/ros-visualization/rqt_py_console
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_py_console/archive/0.4.10.tar.gz -> rqt_py_console-0.4.10.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=88f1d2fa19483461d5d7be4c16e05bd3
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.9 b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.9
deleted file mode 100644
index 3cfe6cb8ca6f..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Python GUI plugin providing an interactive Python console
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_py_console https://github.com/ros-visualization/rqt_py_console
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_py_console/archive/0.4.9.tar.gz -> rqt_py_console-0.4.9.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=753094002b8406055cdb156e0f51cecf
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.8 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.8
deleted file mode 100644
index 6cb4a96a656e..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_runtime_monitor https://github.com/ros-visualization/rqt_runtime_monitor
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_runtime_monitor/archive/0.5.8.tar.gz -> rqt_runtime_monitor-0.5.8.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4ad941378a1cf74bb31ef324132edfcc
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.9 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.9
new file mode 100644
index 000000000000..0865f8cd62c7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.9
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_runtime_monitor https://github.com/ros-visualization/rqt_runtime_monitor
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_runtime_monitor/archive/0.5.9.tar.gz -> rqt_runtime_monitor-0.5.9.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7bbaef1195393b105f4db503692df1ed
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1 b/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
deleted file mode 100644
index bf64d84d1ec6..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=GUI plugin embedding RViz
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_rviz https://github.com/ros-visualization/rqt_rviz
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_rviz/archive/0.6.1.tar.gz -> rqt_rviz-0.6.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=35a2aa9428c930af81ee79dc142cccfd
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-0.7.0 b/metadata/md5-cache/dev-ros/rqt_rviz-0.7.0
new file mode 100644
index 000000000000..8d742f4af08e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.7.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=GUI plugin embedding RViz
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_rviz https://github.com/ros-visualization/rqt_rviz
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_rviz/archive/0.7.0.tar.gz -> rqt_rviz-0.7.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7cef42c20bb0b55700740bb341ea4488
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.10 b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.10
new file mode 100644
index 000000000000..a73eb65d7210
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.10
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=GUI plugin for calling arbitrary services
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_service_caller https://github.com/ros-visualization/rqt_service_caller
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_service_caller/archive/0.4.10.tar.gz -> rqt_service_caller-0.4.10.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0ace7970c5396a7e4f50e640dbd7e42c
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.9 b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.9
deleted file mode 100644
index 925b45a0e246..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=GUI plugin for calling arbitrary services
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_service_caller https://github.com/ros-visualization/rqt_service_caller
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_service_caller/archive/0.4.9.tar.gz -> rqt_service_caller-0.4.9.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=61229b35f7b2c28fc2a0f3b18fa25c8c
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-0.4.10 b/metadata/md5-cache/dev-ros/rqt_shell-0.4.10
deleted file mode 100644
index cc8ab6e91266..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_shell-0.4.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=GUI plugin providing an interactive shell
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_shell https://github.com/ros-visualization/rqt_shell
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_shell/archive/0.4.10.tar.gz -> rqt_shell-0.4.10.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=269d72ae6ef97884c12bed51157b84f1
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-0.4.11 b/metadata/md5-cache/dev-ros/rqt_shell-0.4.11
new file mode 100644
index 000000000000..ed749a4ba61c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_shell-0.4.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=GUI plugin providing an interactive shell
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_shell https://github.com/ros-visualization/rqt_shell
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_shell/archive/0.4.11.tar.gz -> rqt_shell-0.4.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ca49cd2dad65be8fdaba104d3dc29110
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-0.4.8 b/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
deleted file mode 100644
index 3d39fe51ae98..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=GUI plugin for introspecting available ROS message types
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_srv https://github.com/ros-visualization/rqt_srv
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_srv/archive/0.4.8.tar.gz -> rqt_srv-0.4.8.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b04275dd5b5283b32d2f88e3d7957294
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-0.4.9 b/metadata/md5-cache/dev-ros/rqt_srv-0.4.9
new file mode 100644
index 000000000000..c92620161f07
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_srv-0.4.9
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=GUI plugin for introspecting available ROS message types
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_srv https://github.com/ros-visualization/rqt_srv
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_srv/archive/0.4.9.tar.gz -> rqt_srv-0.4.9.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0267eb6ca182d909276b4aef7ddb6ea8
diff --git a/metadata/md5-cache/dev-ros/rqt_top-0.4.10 b/metadata/md5-cache/dev-ros/rqt_top-0.4.10
new file mode 100644
index 000000000000..2ba5703dfdbc
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_top-0.4.10
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=RQT plugin for monitoring ROS processes
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_top https://github.com/ros-visualization/rqt_top
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_top/archive/0.4.10.tar.gz -> rqt_top-0.4.10.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d35de77638a7683a1f82e03b9d154b74
diff --git a/metadata/md5-cache/dev-ros/rqt_top-0.4.9 b/metadata/md5-cache/dev-ros/rqt_top-0.4.9
deleted file mode 100644
index cba4078ad313..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_top-0.4.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=RQT plugin for monitoring ROS processes
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_top https://github.com/ros-visualization/rqt_top
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_top/archive/0.4.9.tar.gz -> rqt_top-0.4.9.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4c93ed0908343f114500103c996d8235
diff --git a/metadata/md5-cache/dev-ros/rqt_web-0.4.10 b/metadata/md5-cache/dev-ros/rqt_web-0.4.10
new file mode 100644
index 000000000000..226cc7851784
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rqt_web-0.4.10
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Simple web content viewer for rqt
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rqt_web https://github.com/ros-visualization/rqt_web
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rqt_web/archive/0.4.10.tar.gz -> rqt_web-0.4.10.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6ae697dfbbf8891cb67afdc50595cc25
diff --git a/metadata/md5-cache/dev-ros/rqt_web-0.4.9 b/metadata/md5-cache/dev-ros/rqt_web-0.4.9
deleted file mode 100644
index 1b368cb66b0f..000000000000
--- a/metadata/md5-cache/dev-ros/rqt_web-0.4.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Simple web content viewer for rqt
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rqt_web https://github.com/ros-visualization/rqt_web
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_web/archive/0.4.9.tar.gz -> rqt_web-0.4.9.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=50c2cdbdc2a3e609194674eb0cdabec4
diff --git a/metadata/md5-cache/dev-ros/rviz-1.14.4-r1 b/metadata/md5-cache/dev-ros/rviz-1.14.4-r1
deleted file mode 100644
index dda1cee46a29..000000000000
--- a/metadata/md5-cache/dev-ros/rviz-1.14.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-ros/cmake_modules virtual/pkgconfig sys-devel/make dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads(+)] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
-DESCRIPTION=3D visualization tool for ROS
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads(+)] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rviz/archive/1.14.4.tar.gz -> rviz-1.14.4.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=295cf3588d7e9a6d0b6a4647a134b6d9
diff --git a/metadata/md5-cache/dev-ros/rviz-1.14.8 b/metadata/md5-cache/dev-ros/rviz-1.14.8
new file mode 100644
index 000000000000..502c16d2fc81
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rviz-1.14.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-ros/cmake_modules virtual/pkgconfig sys-devel/make dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:=[threads(+)] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DESCRIPTION=3D visualization tool for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads(+)] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rviz/archive/1.14.8.tar.gz -> rviz-1.14.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=295cf3588d7e9a6d0b6a4647a134b6d9
diff --git a/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.3 b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.3
new file mode 100644
index 000000000000..7e4b403d111d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=RVIZ plugin for IMU visualization
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rviz_imu_plugin https://github.com/ccny-ros-pkg/imu_tools
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.3.tar.gz -> imu_tools-1.2.3.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9dd39f66c2fb95fc527fa93a5384f1b1
diff --git a/metadata/md5-cache/dev-ros/settlerlib-0.10.15 b/metadata/md5-cache/dev-ros/settlerlib-0.10.15
new file mode 100644
index 000000000000..b28a79daa96c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/settlerlib-0.10.15
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Helper functions for creating a settler for a specific sensor channel
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/settlerlib https://github.com/ros-perception/calibration
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.15.tar.gz -> calibration-0.10.15.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=622940b48bb2af6a4b0cdf877027f585
diff --git a/metadata/md5-cache/dev-ros/stage_ros-1.8.0-r1 b/metadata/md5-cache/dev-ros/stage_ros-1.8.0-r1
index 65c1e5297fde..d5e2016f705c 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-1.8.0-r1
+++ b/metadata/md5-cache/dev-ros/stage_ros-1.8.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/stage_ros/archive/1.8.0.tar.gz -> stage_ros-1.8.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=939ff8c9272da0fa455d69d5677e3af4
+_md5_=28c9e9258130eff2d8fe1d44dacf9108
diff --git a/metadata/md5-cache/dev-ros/stage_ros-9999 b/metadata/md5-cache/dev-ros/stage_ros-9999
index d46a1cc9a5e8..5d78abf7de20 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-9999
+++ b/metadata/md5-cache/dev-ros/stage_ros-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=939ff8c9272da0fa455d69d5677e3af4
+_md5_=28c9e9258130eff2d8fe1d44dacf9108
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.15.11 b/metadata/md5-cache/dev-ros/test_rosbag-1.15.11
new file mode 100644
index 000000000000..26aa3a71caa7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads(+)] app-arch/bzip2 dev-ros/rosout python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Unit tests for rosbag
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz http://download.ros.org/data/test_rosbag/constants_gen1.bag -> test_rosbag-1.15.11-constants_gen1.bag http://download.ros.org/data/test_rosbag/constants_gen2.bag -> test_rosbag-1.15.11-constants_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen1.bag -> test_rosbag-1.15.11-converged_gen1.bag http://download.ros.org/data/test_rosbag/converged_gen2.bag -> test_rosbag-1.15.11-converged_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen3.bag -> test_rosbag-1.15.11-converged_gen3.bag http://download.ros.org/data/test_rosbag/converged_gen4.bag -> test_rosbag-1.15.11-converged_gen4.bag http://download.ros.org/data/test_rosbag/convergent_gen1.bag -> test_rosbag-1.15.11-convergent_gen1.bag http://download.ros.org/data/test_rosbag/convergent_gen2.bag -> test_rosbag-1.15.11-convergent_gen2.bag http://download.ros.org/data/test_rosbag/migrated_addsub_gen1.bag -> test_rosbag-1.15.11-migrated_addsub_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen1.bag -> test_rosbag-1.15.11-migrated_explicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen2.bag -> test_rosbag-1.15.11-migrated_explicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen3.bag -> test_rosbag-1.15.11-migrated_explicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen4.bag -> test_rosbag-1.15.11-migrated_explicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen1.bag -> test_rosbag-1.15.11-migrated_implicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen2.bag -> test_rosbag-1.15.11-migrated_implicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen3.bag -> test_rosbag-1.15.11-migrated_implicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen4.bag -> test_rosbag-1.15.11-migrated_implicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen1.bag -> test_rosbag-1.15.11-migrated_mixed_gen1.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen2.bag -> test_rosbag-1.15.11-migrated_mixed_gen2.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen3.bag -> test_rosbag-1.15.11-migrated_mixed_gen3.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen4.bag -> test_rosbag-1.15.11-migrated_mixed_gen4.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen1.bag -> test_rosbag-1.15.11-partially_migrated_gen1.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen2.bag -> test_rosbag-1.15.11-partially_migrated_gen2.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen3.bag -> test_rosbag-1.15.11-partially_migrated_gen3.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen4.bag -> test_rosbag-1.15.11-partially_migrated_gen4.bag http://download.ros.org/data/test_rosbag/renamed_gen1.bag -> test_rosbag-1.15.11-renamed_gen1.bag http://download.ros.org/data/test_rosbag/renamed_gen2.bag -> test_rosbag-1.15.11-renamed_gen2.bag http://download.ros.org/data/test_rosbag/renamed_gen3.bag -> test_rosbag-1.15.11-renamed_gen3.bag http://download.ros.org/data/test_rosbag/renamed_gen4.bag -> test_rosbag-1.15.11-renamed_gen4.bag http://download.ros.org/data/test_rosbag/subunmigrated_gen1.bag -> test_rosbag-1.15.11-subunmigrated_gen1.bag http://download.ros.org/data/test_rosbag/unmigrated_gen1.bag -> test_rosbag-1.15.11-unmigrated_gen1.bag http://download.ros.org/data/rosbag/test_indexed_1.2.bag -> test_rosbag-1.15.11-test_indexed_1.2.bag http://download.ros.org/data/rosbag/chatter_50hz.bag -> test_rosbag-1.15.11-chatter_50hz.bag http://download.ros.org/data/rosbag/test_future_version_2.1.bag -> test_rosbag-1.15.11-test_future_version_2.1.bag http://download.ros.org/data/rosbag/test_rosbag_latched_pub.bag -> test_rosbag-1.15.11-test_rosbag_latched_pub.bag
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6b98dfb62a1088fd62b28d622f796e8c
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.11 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.11
new file mode 100644
index 000000000000..0dfb5d00b7b7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosbag_storage dev-ros/rosbag dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Unit tests for rosbag_storage
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8aa0308acf31852a70c05368f2c453d1
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.15.11 b/metadata/md5-cache/dev-ros/test_roscpp-1.15.11
new file mode 100644
index 000000000000..ea065b275787
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads(+)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Unit tests for roscpp
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f220c7653e48f8aea8e394976fbad048
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.11 b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.11
new file mode 100644
index 000000000000..2c32910c651d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Unit tests for rosgraph
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d5ec0cd6d7ac649d99c21dd046d2fc81
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.11 b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.11
new file mode 100644
index 000000000000..dfeb519c6328
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Unit tests for roslaunch
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d38f6dcc0781238b36494372990a343c
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.11 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.11
new file mode 100644
index 000000000000..d839f15f13f9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=test? ( dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Unit tests for roslib
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1a544e91c28ccf172862adfd1b27be93
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.11 b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.11
new file mode 100644
index 000000000000..1ee33a885d07
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DESCRIPTION=Unit tests for rosmaster
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d7be6188cf0136d537fa2cdfcce199b8
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.15.11 b/metadata/md5-cache/dev-ros/test_rosparam-1.15.11
new file mode 100644
index 000000000000..93dd0d314b08
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DESCRIPTION=Unit tests for rosparam
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0963ae93ba4f06ca0bac13ea1a3242ce
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.15.11 b/metadata/md5-cache/dev-ros/test_rospy-1.15.11
new file mode 100644
index 000000000000..9c7598e47076
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Unit tests for rospy
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f10b7fbd53c7075ed84cdff064407f3a
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.15.11 b/metadata/md5-cache/dev-ros/test_rosservice-1.15.11
new file mode 100644
index 000000000000..f9ef5c66f77e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Unit tests for rospy
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ab4a106114d2b4c730f079dc3a858097
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.7.2-r1 b/metadata/md5-cache/dev-ros/test_tf2-0.7.2-r1
deleted file mode 100644
index f61b3a67caa5..000000000000
--- a/metadata/md5-cache/dev-ros/test_tf2-0.7.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads(+)] dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=TF2 unit tests
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=004025ed1db1e07c7380ae2429466af4
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.7.3-r1 b/metadata/md5-cache/dev-ros/test_tf2-0.7.3-r1
deleted file mode 100644
index 0101d9fdad47..000000000000
--- a/metadata/md5-cache/dev-ros/test_tf2-0.7.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads(+)] dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=TF2 unit tests
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=004025ed1db1e07c7380ae2429466af4
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.7.5-r1 b/metadata/md5-cache/dev-ros/test_tf2-0.7.5-r1
index 28dae8282239..55e1fa3c14b8 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.7.5-r1
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.7.5-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads(+)] dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads(+)] dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=004025ed1db1e07c7380ae2429466af4
+_md5_=0feb35ab3382b926343d90692dce8abe
diff --git a/metadata/md5-cache/dev-ros/test_tf2-9999 b/metadata/md5-cache/dev-ros/test_tf2-9999
index 6a90d9db665e..f8d275176621 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-9999
+++ b/metadata/md5-cache/dev-ros/test_tf2-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads(+)] dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads(+)] dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=004025ed1db1e07c7380ae2429466af4
+_md5_=0feb35ab3382b926343d90692dce8abe
diff --git a/metadata/md5-cache/dev-ros/tf-1.13.2-r2 b/metadata/md5-cache/dev-ros/tf-1.13.2-r2
deleted file mode 100644
index e5a1b6d6abba..000000000000
--- a/metadata/md5-cache/dev-ros/tf-1.13.2-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads(+)] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
-DESCRIPTION=Maintains the relationship between frames in a tree structure over time
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/tf https://github.com/ros/geometry
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads(+)] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/geometry/archive/1.13.2.tar.gz -> geometry-1.13.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dd195798a8ab419dd490be6de7ec6390
diff --git a/metadata/md5-cache/dev-ros/tf-1.13.2-r3 b/metadata/md5-cache/dev-ros/tf-1.13.2-r3
new file mode 100644
index 000000000000..00da5789d213
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf-1.13.2-r3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:=[threads(+)] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DESCRIPTION=Maintains the relationship between frames in a tree structure over time
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/tf https://github.com/ros/geometry
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads(+)] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry/archive/1.13.2.tar.gz -> geometry-1.13.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=083720ecac6960b246f644cbf02754e1
diff --git a/metadata/md5-cache/dev-ros/tf-9999 b/metadata/md5-cache/dev-ros/tf-9999
index b35b35e6b2d7..ac33b0d5998d 100644
--- a/metadata/md5-cache/dev-ros/tf-9999
+++ b/metadata/md5-cache/dev-ros/tf-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads(+)] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-libs/boost:=[threads(+)] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Maintains the relationship between frames in a tree structure over time
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf https://github.com/ros/geometry
 IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads(+)] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+RDEPEND=dev-libs/boost:=[threads(+)] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dd195798a8ab419dd490be6de7ec6390
+_md5_=083720ecac6960b246f644cbf02754e1
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.15.11 b/metadata/md5-cache/dev-ros/topic_tools-1.15.11
new file mode 100644
index 000000000000..690e927ef89a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbash[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Tools for directing, throttling and selecting ROS topics
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=47d44aaf842c46d614bc8c272a0852e7
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.19.5 b/metadata/md5-cache/dev-ros/transmission_interface-0.19.5
new file mode 100644
index 000000000000..ad763412f3c8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.19.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Transmission Interface
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.5.tar.gz -> ros_control-0.19.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=78e3d2a43f6bf50fb8a8c9f6de68b54e
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1-r2 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1-r2
deleted file mode 100644
index 21cd53f6c636..000000000000
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads(+)] media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
-DESCRIPTION=Online automated pattern-based object tracker relying on visual servoing
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/visp_auto_tracker https://github.com/lagadic/vision_visp
-IUSE=python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2
-RDEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads(+)] media-libs/opencv:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=04908931f0eb638d272b6ddc83494a66
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.12.1 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.12.1
new file mode 100644
index 000000000000..17715fe71d21
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.12.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads(+)] media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Online automated pattern-based object tracker relying on visual servoing
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/visp_auto_tracker https://github.com/lagadic/vision_visp
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads(+)] media-libs/opencv:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/lagadic/vision_visp/archive/noetic-0.12.1.tar.gz -> vision_visp-0.12.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=33d22fe1af20d05d514f06a946a213a2
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-9999 b/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
index d1ca59629c0f..81cc5ba43bc3 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=04908931f0eb638d272b6ddc83494a66
+_md5_=33d22fe1af20d05d514f06a946a213a2
diff --git a/metadata/md5-cache/dev-ros/visp_bridge-0.12.1 b/metadata/md5-cache/dev-ros/visp_bridge-0.12.1
new file mode 100644
index 000000000000..18a2687bc2aa
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/visp_bridge-0.12.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Converts between ROS structures and ViSP structures
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/visp_bridge https://github.com/lagadic/vision_visp
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/lagadic/vision_visp/archive/noetic-0.12.1.tar.gz -> vision_visp-0.12.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=dde5da389556b61fbd56b212aeb4727b
diff --git a/metadata/md5-cache/dev-ros/visp_bridge-9999 b/metadata/md5-cache/dev-ros/visp_bridge-9999
index 7135778cc31c..c8a4b57a1551 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-9999
+++ b/metadata/md5-cache/dev-ros/visp_bridge-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=00ebeb1636ad11ff4ccd40191a09d4b1
+_md5_=dde5da389556b61fbd56b212aeb4727b
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-0.12.1 b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.12.1
new file mode 100644
index 000000000000..2e7c2507b785
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.12.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Calibration of cameras using a customizable pattern and ViSP library
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/visp_camera_calibration https://github.com/lagadic/vision_visp
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/lagadic/vision_visp/archive/noetic-0.12.1.tar.gz -> vision_visp-0.12.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5056d50ee2610e4005ea30ebc656c995
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999 b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
index 80b68e54e62c..36019cae5f2e 100644
--- a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=34458dd0a6aa5a824a7f505d3edfa072
+_md5_=5056d50ee2610e4005ea30ebc656c995
diff --git a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.12.1 b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.12.1
new file mode 100644
index 000000000000..c686df789f1e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.12.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Estimates the camera position with respect to its effector using ViSP
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/visp_hand2eye_calibration https://github.com/lagadic/vision_visp
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/lagadic/vision_visp/archive/noetic-0.12.1.tar.gz -> vision_visp-0.12.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2a01bf8368f730c35f570ecbe8995e57
diff --git a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999 b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
index cf5a4433339f..7a2bf20f0391 100644
--- a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e7e7c3f94c2fa300363c271e15607085
+_md5_=2a01bf8368f730c35f570ecbe8995e57
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-0.12.1 b/metadata/md5-cache/dev-ros/visp_tracker-0.12.1
new file mode 100644
index 000000000000..083d9ddeeb8c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/visp_tracker-0.12.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:=[threads(+)] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DESCRIPTION=Wraps the ViSP moving edge tracker provided by the ViSP library
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/visp_tracker https://github.com/lagadic/vision_visp
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:=[threads(+)] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/lagadic/vision_visp/archive/noetic-0.12.1.tar.gz -> vision_visp-0.12.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=076646c973934725941151e8b5c21489
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-9999 b/metadata/md5-cache/dev-ros/visp_tracker-9999
index 0b82d395e884..77af00e33028 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_tracker-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=faaa21e85bb43f6276453b87aba1d56f
+_md5_=076646c973934725941151e8b5c21489
diff --git a/metadata/md5-cache/dev-ros/xacro-1.14.8 b/metadata/md5-cache/dev-ros/xacro-1.14.8
new file mode 100644
index 000000000000..f24b70c7505b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/xacro-1.14.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roslint[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=XML macro language
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/xacro https://github.com/ros/xacro
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roslint[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/xacro/archive/1.14.8.tar.gz -> xacro-1.14.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7ae2445021ff4e4bad6560ca974de14e
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.11 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.11
new file mode 100644
index 000000000000..d6e3005fe6d9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads(+)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=C++ implementation of the XML-RPC protocol
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=be1f0480a49a177b1cda1d053f218e76
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 1aadbbc17ee7..3b2bfb2018fd 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/autoprefixer-rails-10.3.1.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.3.1.0
new file mode 100644
index 000000000000..2b56da78970e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.3.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/execjs[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/execjs[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rspec-rails[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/rspec-rails[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
+EAPI=8
+HOMEPAGE=https://github.com/ai/autoprefixer-rails
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/execjs[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/execjs[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=10
+SRC_URI=https://github.com/ai/autoprefixer-rails/archive/10.3.1.0.tar.gz -> autoprefixer-rails-10.3.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=09453092158ca280c75e92c2527cf90f
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.4 b/metadata/md5-cache/dev-ruby/builder-3.2.4
index dd07195dcfb8..d2bb2e724292 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.4
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.4
@@ -5,7 +5,7 @@ DESCRIPTION=A builder to facilitate programatic generation of XML markup
 EAPI=7
 HOMEPAGE=http://onestepback.org/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://rubygems.org/gems/builder-3.2.4.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=017b23daef30d4b99bba80e9e17074b2
+_md5_=d3063ed78578972e78c45e8fe776bace
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1 b/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
index f215a7482630..0ea0c459a1b1 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A Ruby library for syntax highlighting
 EAPI=7
 HOMEPAGE=http://coderay.rubychan.de/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.3.tar.gz -> coderay-1.1.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=93befb65cabd1bd85ee9417faa576f11
+_md5_=4494e3f5fd666bfd58272c428b6e7721
diff --git a/metadata/md5-cache/dev-ruby/colored-1.2-r1 b/metadata/md5-cache/dev-ruby/colored-1.2-r1
new file mode 100644
index 000000000000..2834a08c0cf5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/colored-1.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Console coloring
+EAPI=8
+HOMEPAGE=https://github.com/defunkt/colored
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/colored-1.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4d71eda6511558b911394a2a4cef754e
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4 b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
index bda10bde2495..262a9ebb994e 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
@@ -5,7 +5,7 @@ DESCRIPTION=Use the McIlroy-Hunt LCS algorithm to compute differences
 EAPI=7
 HOMEPAGE=https://github.com/halostatue/diff-lcs
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MIT Ruby GPL-2 )
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.4.4.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a57914bf9a3599fe78168193cde3d62d
+_md5_=650c392c480756742d7d4666a8457fa6
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.15.3 b/metadata/md5-cache/dev-ruby/ffi-1.15.3
index 9ffec4af9062..523f4f29ba45 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.15.3
+++ b/metadata/md5-cache/dev-ruby/ffi-1.15.3
@@ -5,7 +5,7 @@ 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 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
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=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_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.15.3.tar.gz -> ffi-git-1.15.3.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8b7c68682782f4cd0d763e26c41f0159
+_md5_=02de5452776e0e3b757f9e5b50adac64
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.5.2 b/metadata/md5-cache/dev-ruby/globalid-0.5.2
new file mode 100644
index 000000000000..0aac9c289cf2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/globalid-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/activemodel-5.0[ruby_targets_ruby26(-)] >=dev-ruby/railties-5.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/activemodel-5.0[ruby_targets_ruby27(-)] >=dev-ruby/railties-5.0[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-ruby/activesupport-5.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-5.0:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Reference models by URI
+EAPI=8
+HOMEPAGE=https://github.com/rails/globalid
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/activesupport-5.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-5.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rails/globalid/archive/v0.5.2.tar.gz -> globalid-0.5.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=acc1b5e3a0b07f00cfc2ea8edffc4366
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.21.0 b/metadata/md5-cache/dev-ruby/hoe-3.21.0
index cb5bde025b5c..ecb9da9acf1b 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.21.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.21.0
@@ -5,7 +5,7 @@ DESCRIPTION=Hoe extends rake to provide full project automation
 EAPI=7
 HOMEPAGE=https://www.zenspider.com/projects/hoe.html
 IUSE=doc test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] <dev-ruby/rake-15.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] <dev-ruby/rake-15.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] <dev-ruby/rake-15.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] <dev-ruby/rake-15.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hoe-3.21.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7d952c24dd908f4d2415469ef97cb13b
+_md5_=d8c7bea2c5d9bcb94785e01c0a53c47f
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.3.1 b/metadata/md5-cache/dev-ruby/mime-types-3.3.1
index 38bbdb923aef..563accc4d3ab 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.3.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.3.1
@@ -5,7 +5,7 @@ DESCRIPTION=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-3.3.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dba374499a7e83ec3017b8f4de3dc537
+_md5_=02a2e28735ab83725e518b204b06852b
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0704 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0704
index 4c12f52690bb..226be2040c86 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0704
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0704
@@ -5,7 +5,7 @@ DESCRIPTION=Registry for information about MIME media type definitions
 EAPI=7
 HOMEPAGE=https://github.com/mime-types/mime-types-data
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-data-3.2021.0704.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=406fe03f97ad61cd33b0cda8ddf1e509
+_md5_=dad3cd0f4e9378b0b819f0baeb74734e
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
index acbd1d59a7e0..33f3bd57e7bd 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Bonus assertions for minitest
 EAPI=7
 HOMEPAGE=https://github.com/halostatue/minitest-bonus-assertions
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/minitest-bonus-assertions-3.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2252e7ac9231b33e8006eb218e7717ba
+_md5_=573c5d0355b08c80dba3cd1c3dffa406
diff --git a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0 b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
index 3538fcf3d03e..7f69d1975559 100644
--- a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
+++ b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
@@ -1,10 +1,11 @@
+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? ( 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(-)] ) )
+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=Adds around and before_all/after_all/around_all hooks for Minitest
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/jeremyevans/minitest-hooks
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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 )
@@ -12,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/minitest-hooks-1.5.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2182f1eb06be19209239e003db19a6bc
+_md5_=bd2709a2d966951ea5f46a211964887a
diff --git a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1 b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
index 7bc0ccd9bd5a..80b64bfdebdb 100644
--- a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Pretty-print hashes and arrays before diffing them in MiniTest
 EAPI=7
 HOMEPAGE=https://github.com/adammck/minitest-pretty_diff
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-pretty_diff-0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1ed496c6a205455763eb71eb2c46c1d2
+_md5_=7152497e558dd65043827cf60ef33121
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1 b/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
index 56e14c474af9..e0b55ab909f5 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A uniform interface for Ruby testing libraries
 EAPI=7
 HOMEPAGE=https://cucumber.io/
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/multi_test-0.1.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea1683dcddb2b20e1afb9b2593fc2144
+_md5_=dd3deecff1e0ed6032762b8638ba786c
diff --git a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1 b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
index a7cf928e192f..b27f1535f92c 100644
--- a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Extremely mynymal test framework
 EAPI=7
 HOMEPAGE=https://github.com/mynyml/nanotest
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nanotest-0.9.4.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bc9ecd36b49bb0b879ecf2b7e2058751
+_md5_=1f8e69627c71891beddfdd1dd36f25e9
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.8 b/metadata/md5-cache/dev-ruby/nio4r-2.5.8
new file mode 100644
index 000000000000..fec000a07724
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.8
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A high performance selector API for monitoring IO objects
+EAPI=8
+HOMEPAGE=https://github.com/socketry/nio4r
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT || ( BSD GPL-2 )
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/nio4r-2.5.8.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ad274c3596c9b4cb8b5623afb4f37c9f
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.11.7 b/metadata/md5-cache/dev-ruby/nokogiri-1.11.7
index 4877a574fe7a..ccb71e0cff2f 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.11.7
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.11.7
@@ -5,7 +5,7 @@ DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
 EAPI=7
 HOMEPAGE=https://www.nokogiri.org/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.12:= >=dev-libs/libxslt-1.1.34 sys-libs/zlib virtual/libiconv ruby_targets_ruby25? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.11.7.tar.gz -> nokogiri-1.11.7-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d9d41536a3a45123cc5a25e8c47843e9
+_md5_=f3c6ff8367c1a65b385e65c15f4207bb
diff --git a/metadata/md5-cache/dev-ruby/pastel-0.8.0 b/metadata/md5-cache/dev-ruby/pastel-0.8.0
index 7a59b378c9e5..6d16f65193d0 100644
--- a/metadata/md5-cache/dev-ruby/pastel-0.8.0
+++ b/metadata/md5-cache/dev-ruby/pastel-0.8.0
@@ -5,7 +5,7 @@ DESCRIPTION=Terminal strings styling with intuitive and clean API
 EAPI=7
 HOMEPAGE=https://github.com/piotrmurach/pastel
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/tty-color-0.5:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/tty-color-0.5:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/tty-color-0.5:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/tty-color-0.5:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/pastel/archive/v0.8.0.tar.gz -> pastel-0.8.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b11c77b87025ecb9bb9a6ca5e76c5c71
+_md5_=37f727f5f7b19d5348c4955091996979
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.6 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
index 6dde05078689..4cc812a81cac 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
@@ -5,7 +5,7 @@ DESCRIPTION=A pkg-config implementation by Ruby
 EAPI=7
 HOMEPAGE=https://github.com/rcairo/pkg-config
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.6.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=596a96a4fc449ea49fc5a8ad6e029f65
+_md5_=30423886b6c87d83bc93239a6dde327e
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.16-r1 b/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
index 91937194823c..a369092f3d55 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A LALR(1) parser generator for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/tenderlove/racc
 IUSE=doc test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.4.16.tar.gz -> racc-1.4.16.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5e91b887ea08e7e3c6840cc56ca18922
+_md5_=14be7494d9823bf822fd579325929e03
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 86cb555c52a1..dfafed5ffb5d 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
@@ -5,7 +5,7 @@ DESCRIPTION=Provide a standard and simplified way to build and package Ruby exte
 EAPI=7
 HOMEPAGE=https://github.com/luislavena/rake-compiler
 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
+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_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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.1.tar.gz -> rake-compiler-1.1.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4941672202debaefd24f2e3244743d5f
+_md5_=6487647b02295188611d8a6b74e56f45
diff --git a/metadata/md5-cache/dev-ruby/rbs-1.3.3 b/metadata/md5-cache/dev-ruby/rbs-1.3.3
new file mode 100644
index 000000000000..5cdca88675ee
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbs-1.3.3
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/test-unit[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/test-unit[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/test-unit[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=The language for type signatures for Ruby and standard library definitions
+EAPI=8
+HOMEPAGE=https://github.com/ruby/rbs
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby-BSD BSD-2 )
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/rbs/archive/v1.3.3.tar.gz -> rbs-1.3.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=447353b7f556bf98bd415bc3c350549a
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.7 b/metadata/md5-cache/dev-ruby/rexical-1.0.7
index beda2614adbf..3ca3beea7b43 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.7
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.7
@@ -5,7 +5,7 @@ DESCRIPTION=Rexical is a lexical scanner generator
 EAPI=7
 HOMEPAGE=https://github.com/tenderlove/rexical/tree/master
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=!!app-admin/rex ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rexical-1.0.7.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cb5eb30632fe5a6179bd33438c8e4d00
+_md5_=ce3639c1afb20a4322d9dbdf2bd411ed
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
index b62ac128bfef..58e01b79adaf 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
@@ -1,10 +1,11 @@
+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 )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=~net-analyzer/rrdtool-1.7.2[graph=] test? ( ~net-analyzer/rrdtool-1.7.2[graph] ) ruby_targets_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 )
 DESCRIPTION=Ruby bindings for rrdtool
-EAPI=6
+EAPI=8
 HOMEPAGE=https://oss.oetiker.ch/rrdtool/
 IUSE=graph test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=~net-analyzer/rrdtool-1.7.2[graph=] ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -12,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d68ea862efdd4fb27d4c048985868719
+_md5_=ae0b0cd9b6a0f724bed969630317b974
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-2.99.0
index b13248f5491a..6a531873d7e7 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-2.99.0
@@ -1,15 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby25(-)] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby25(-)] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby26(-)] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby26(-)] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby27(-)] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby27(-)] =dev-ruby/rspec-mocks-2.99*[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(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby25(-)] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby25(-)] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby26(-)] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby26(-)] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby27(-)] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby27(-)] =dev-ruby/rspec-mocks-2.99*[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(-)] ) )
+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 Behaviour Driven Development (BDD) framework for Ruby
-EAPI=5
+EAPI=8
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby25(-)] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby25(-)] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby26(-)] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby26(-)] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby27(-)] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby27(-)] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rspec-2.99.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c86bd0ecb2fed0308d4c154b4beed66f
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2b18a48a397d3e5f32e855e6f484713e
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.10.0 b/metadata/md5-cache/dev-ruby/rspec-3.10.0
index 852f3fddadef..3d90fbf01782 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.10.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.10.0
@@ -5,7 +5,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/rspec/rspec
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby25(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby25(-)] =dev-ruby/rspec-mocks-3.10*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby26(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby26(-)] =dev-ruby/rspec-mocks-3.10*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby27(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby27(-)] =dev-ruby/rspec-mocks-3.10*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/rspec-core-3.10*[ruby_targets_ruby30(-)] =dev-ruby/rspec-expectations-3.10*[ruby_targets_ruby30(-)] =dev-ruby/rspec-mocks-3.10*[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rspec-3.10.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=179689fb1ab6d1958c78df9015f55d53
+_md5_=9d9e6b9e8f4b25ded434c8705b6be3b6
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
index 2a3b6241379d..6ef450364f29 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
@@ -1,15 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25(-)] dev-ruby/syntax[ruby_targets_ruby25(-)] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby25(-)] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby25(-)] dev-ruby/rspec:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby26(-)] dev-ruby/syntax[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby26(-)] dev-ruby/rspec:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby27(-)] dev-ruby/syntax[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-mocks-2.99.0:2[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_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? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25(-)] dev-ruby/syntax[ruby_targets_ruby25(-)] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby25(-)] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby25(-)] dev-ruby/rspec:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby26(-)] dev-ruby/syntax[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-mocks-2.99.0:2[ruby_targets_ruby26(-)] dev-ruby/rspec:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby27(-)] dev-ruby/syntax[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-2.14.0:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-mocks-2.99.0:2[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_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(-)] ) )
+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 Behaviour Driven Development (BDD) framework for Ruby
-EAPI=5
+EAPI=8
 HOMEPAGE=https://github.com/rspec/rspec-core
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.2.tar.gz -> rspec-core-2.99.2-git.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c98e942b73036d696a071227061cb515
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0ad08844c333f9655cd75015d6208b7e
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.10.1 b/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
index 5e7e3aabf411..748775400937 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
@@ -5,7 +5,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/rspec/rspec-core
 IUSE=highlight test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby25(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby26(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby27(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby30(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.10.1.tar.gz -> rspec-core-3.10.1-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fea9cb7ac3bf50ec3b185ddeb2f00bda
+_md5_=02d573b13dcfa435562ed10f860d048e
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
index bad16a791090..a9c62897d1bc 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
@@ -1,15 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-core-2.99.0:2[ruby_targets_ruby25(-)] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-core-2.99.0:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rspec-core-2.99.0:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-mocks-2.14.0: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? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[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? ( ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-core-2.99.0:2[ruby_targets_ruby25(-)] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-core-2.99.0:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-mocks-2.14.0:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rspec-core-2.99.0:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-mocks-2.14.0: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? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[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=ruby_targets_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 Behaviour Driven Development (BDD) framework for Ruby
-EAPI=5
+EAPI=8
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.2.tar.gz -> rspec-expectations-2.99.2-git.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=154f44cd7b7ac0706d18623ba45b420a
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bc78c8d8f28df343f863fc9fb992cb8c
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
index 7769f2cbaf7a..be8044da0608 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
@@ -5,7 +5,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/rspec/rspec-expectations
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25(-)] =dev-ruby/rspec-support-3.10*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26(-)] =dev-ruby/rspec-support-3.10*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] =dev-ruby/rspec-support-3.10*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby30(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby30(-)] =dev-ruby/rspec-support-3.10*[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.10.1.tar.gz -> rspec-expectations-3.10.1-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1fe9e0f19fc3c671da849c580bf71f97
+_md5_=55fc1016d9bda076c9128805127c1364
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
index f37f7886acab..d4fca77eaf1f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.2.tar.gz -> rspec-mocks-2.99.2-git.tgz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=394b55425f0605f1943080303b7a876d
+_md5_=7a0be619a244ce68a3747a429a5d699b
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
index c2ddd2251ae8..34d540c44b24 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
@@ -5,7 +5,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/rspec/rspec-mocks
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby25(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/rspec-support-3.10*[ruby_targets_ruby30(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby30(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.10.2.tar.gz -> rspec-mocks-3.10.2-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6ff391fd06266c01642f3a165197f67b
+_md5_=d510b95abeedf47cccb398e66a297893
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
index 1d46873536e6..270b1524bfe0 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
@@ -5,7 +5,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/rspec/rspec-support
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.10.2.tar.gz -> rspec-support-3.10.2-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ba9b8790d51ca9a68b528c086f7e8457
+_md5_=dcc6b86ad3c80909dd819b0aaed2dca1
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.17.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.17.0
new file mode 100644
index 000000000000..f8d79cef9da2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.17.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/racc[ruby_targets_ruby26(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby26(-)] >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/racc[ruby_targets_ruby27(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby27(-)] >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/racc[ruby_targets_ruby30(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby30(-)] >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-util/unifdef ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A ruby parser written in pure ruby
+EAPI=8
+HOMEPAGE=https://github.com/seattlerb/ruby_parser
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://rubygems.org/gems/ruby_parser-3.17.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e4b39b04140acadc144efbb919ae1e1c
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.2 b/metadata/md5-cache/dev-ruby/syntax-1.2.2
index ddbd44dc92f9..e967ec51193c 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.2
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.2
@@ -1,10 +1,11 @@
+BDEPEND=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? ( 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? ( 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? ( 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(-)] ) )
+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=Syntax highlighting for sourcecode and HTML
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/dblock/syntax
 IUSE=test doc ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 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 )
@@ -12,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dblock/syntax/archive/v1.2.2.tar.gz -> syntax-1.2.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d7422cc7db0cda1ed51ddc80418a3c56
+_md5_=3a9a259c4263dbb3fe89c641c406d96c
diff --git a/metadata/md5-cache/dev-ruby/sys-uname-1.2.2 b/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
index d36f4e196440..d767da20dddf 100644
--- a/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
+++ b/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
@@ -5,7 +5,7 @@ DESCRIPTION=A Ruby interface for getting operating system information
 EAPI=7
 HOMEPAGE=https://github.com/djberg96/sys-uname
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/ffi-1.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/sys-uname-1.2.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c4f53ce51e14f8d5056ac2420027e2f7
+_md5_=29bfcbdfc64387fca4dbe67c425a5fd6
diff --git a/metadata/md5-cache/dev-ruby/thread_order-1.1.1 b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
index 0e1d73ed0157..4b8ff62d24e8 100644
--- a/metadata/md5-cache/dev-ruby/thread_order-1.1.1
+++ b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
@@ -1,10 +1,11 @@
+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? ( 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(-)] ) )
+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=Test helper for ordering threaded code
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/JoshCheek/thread_order
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -12,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/thread_order-1.1.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=475ec7a7ae9b8e4af7ac2b5d64ffa59b
+_md5_=489858a74167653251d90a2c33df8762
diff --git a/metadata/md5-cache/dev-ruby/tty-color-0.6.0 b/metadata/md5-cache/dev-ruby/tty-color-0.6.0
index 4d29a8b00e68..99cf122f05b0 100644
--- a/metadata/md5-cache/dev-ruby/tty-color-0.6.0
+++ b/metadata/md5-cache/dev-ruby/tty-color-0.6.0
@@ -5,7 +5,7 @@ DESCRIPTION=Terminal color capabilities detection
 EAPI=7
 HOMEPAGE=https://github.com/piotrmurach/tty-color
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-color/archive/v0.6.0.tar.gz -> tty-color-0.6.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a1df9b9af5553067fa510e781f43508a
+_md5_=808808344a9e8cc3c7856f79412cffab
diff --git a/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1 b/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
index 1fe7cc0d4947..e7f5b9bedebf 100644
--- a/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
+++ b/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
@@ -5,7 +5,7 @@ DESCRIPTION=Move the terminal cursor around and manipulate text using intuitive
 EAPI=7
 HOMEPAGE=https://github.com/piotrmurach/tty-cursor
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-cursor/archive/v0.7.1.tar.gz -> tty-cursor-0.7.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=25a9d33467b91ea14f348fb283c34a71
+_md5_=6e5ee9b05f7ceaa925d4335ff9387c9a
diff --git a/metadata/md5-cache/dev-ruby/tty-editor-0.7.0 b/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
new file mode 100644
index 000000000000..ba359804e74e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/tty-prompt-0.22[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/tty-prompt-0.22[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Opens a file or text in the user's preferred editor
+EAPI=8
+HOMEPAGE=https://github.com/piotrmurach/tty-editor
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/tty-prompt-0.22[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/tty-prompt-0.22[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/piotrmurach/tty-editor/archive/v0.7.0.tar.gz -> tty-editor-0.7.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=520bee5d1499ba1272914321c97ff862
diff --git a/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1 b/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
index 2ad7d9cc475d..344240a0e3b3 100644
--- a/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
+++ b/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby25(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby26(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby25(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby26(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby30(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=A beautiful and powerful interactive command line prompt
 EAPI=7
 HOMEPAGE=https://github.com/piotrmurach/tty-prompt
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby25(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby26(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby27(-)] ) ruby_targets_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/pastel-0.8:0[ruby_targets_ruby25(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby26(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby30(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-prompt/archive/v0.23.1.tar.gz -> tty-prompt-0.23.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=930f9e3019c6454fcfde255e10e40e6c
+_md5_=bc501fa36b1312aa3306ab0b613f6b19
diff --git a/metadata/md5-cache/dev-ruby/tty-reader-0.9.0 b/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
index b9983dd5496a..3222e74b145d 100644
--- a/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
+++ b/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
@@ -5,7 +5,7 @@ DESCRIPTION=Methods for processing keyboard input in character, line and multili
 EAPI=7
 HOMEPAGE=https://github.com/piotrmurach/tty-reader
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/tty-cursor-0.7:0[ruby_targets_ruby25(-)] >=dev-ruby/tty-screen-0.8:0[ruby_targets_ruby25(-)] =dev-ruby/wisper-2*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/tty-cursor-0.7:0[ruby_targets_ruby26(-)] >=dev-ruby/tty-screen-0.8:0[ruby_targets_ruby26(-)] =dev-ruby/wisper-2*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/tty-cursor-0.7:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-screen-0.8:0[ruby_targets_ruby27(-)] =dev-ruby/wisper-2*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/tty-cursor-0.7:0[ruby_targets_ruby30(-)] >=dev-ruby/tty-screen-0.8:0[ruby_targets_ruby30(-)] =dev-ruby/wisper-2*[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-reader/archive/v0.9.0.tar.gz -> tty-reader-0.9.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f0343a46fbf7f7a5fcf3446393b4215d
+_md5_=d6d2db81b8ebe4108d5d6d9b7b48337b
diff --git a/metadata/md5-cache/dev-ruby/tty-screen-0.8.1 b/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
index 608d901b2df7..78003c69123f 100644
--- a/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
+++ b/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
@@ -5,7 +5,7 @@ DESCRIPTION=Terminal screen size detection which works on Linux, OS X and Window
 EAPI=7
 HOMEPAGE=https://github.com/piotrmurach/tty-screen
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-screen/archive/v0.8.1.tar.gz -> tty-screen-0.8.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2b4f35bf004711439c95afa13944e7e3
+_md5_=389dba45178a9088505687369c9e8696
diff --git a/metadata/md5-cache/dev-ruby/unindent-1.0-r1 b/metadata/md5-cache/dev-ruby/unindent-1.0-r1
index 423d87de8ade..6b949a58b6a1 100644
--- a/metadata/md5-cache/dev-ruby/unindent-1.0-r1
+++ b/metadata/md5-cache/dev-ruby/unindent-1.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby method to unindent strings
 EAPI=7
 HOMEPAGE=https://github.com/mynyml/unindent
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unindent-1.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0976d025fb7458e512e5d8747681fc88
+_md5_=a4e3500de60443bdb995f921c597ce7c
diff --git a/metadata/md5-cache/dev-ruby/wisper-2.0.1 b/metadata/md5-cache/dev-ruby/wisper-2.0.1
index 42ca57f466f3..10b4aa5d84f3 100644
--- a/metadata/md5-cache/dev-ruby/wisper-2.0.1
+++ b/metadata/md5-cache/dev-ruby/wisper-2.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=A micro library providing objects with Publish-Subscribe capabilitie
 EAPI=7
 HOMEPAGE=https://github.com/krisleech/wisper
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/wisper-2.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=098f35b4a79cfd19f3ba0df1e1f27ab9
+_md5_=8957019ce56b201d2ccd94af471d411e
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.26 b/metadata/md5-cache/dev-ruby/yard-0.9.26
index 1e4eed084226..eaea70ac1b05 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.26
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.26
@@ -5,7 +5,7 @@ DESCRIPTION=Documentation generation tool for the Ruby programming language
 EAPI=7
 HOMEPAGE=https://yardoc.org/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.26.tar.gz -> yard-0.9.26-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d75d517b5f36f2765db15081a42684ed
+_md5_=01646ed5581b4bc1d00c1036380963ca
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index d1c1f4a2953f..2b6960b6f87f 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/glossaries-4.46 b/metadata/md5-cache/dev-tex/glossaries-4.46
index b609da7aee76..cd162ae11038 100644
--- a/metadata/md5-cache/dev-tex/glossaries-4.46
+++ b/metadata/md5-cache/dev-tex/glossaries-4.46
@@ -5,10 +5,10 @@ DESCRIPTION=Create glossaries and lists of acronyms
 EAPI=7
 HOMEPAGE=http://www.ctan.org/pkg/glossaries/
 IUSE=doc examples
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LPPL-1.2
 RDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2012 dev-texlive/texlive-plaingeneric virtual/latex-base
 SLOT=0
 SRC_URI=http://mirrors.ctan.org/macros/latex/contrib/glossaries.zip -> glossaries-4.46.zip
 _eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
-_md5_=61545e93afc73f8951aaa7c753685a03
+_md5_=ab72436f928713e357bc73744979d2bd
diff --git a/metadata/md5-cache/dev-tex/latex-beamer-3.62 b/metadata/md5-cache/dev-tex/latex-beamer-3.62
index 5878ef1b8b8d..42a7f815effe 100644
--- a/metadata/md5-cache/dev-tex/latex-beamer-3.62
+++ b/metadata/md5-cache/dev-tex/latex-beamer-3.62
@@ -5,10 +5,10 @@ DESCRIPTION=LaTeX class for creating presentations using a video projector
 EAPI=7
 HOMEPAGE=https://github.com/josephwright/beamer
 IUSE=doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 FDL-1.2 LPPL-1.3c
 RDEPEND=>=dev-tex/pgf-1.10 dev-texlive/texlive-latexrecommended !dev-tex/translator virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/josephwright/beamer/archive/v3.62.tar.gz -> latex-beamer-3.62.tar.gz
 _eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
-_md5_=d911bba28978418455f7032e1d19bfc4
+_md5_=a3a6688fae92b417d539958b3809158d
diff --git a/metadata/md5-cache/dev-tex/latexdiff-1.3.1.1 b/metadata/md5-cache/dev-tex/latexdiff-1.3.1.1
index 5997b41d7347..3b39fe57f0ec 100644
--- a/metadata/md5-cache/dev-tex/latexdiff-1.3.1.1
+++ b/metadata/md5-cache/dev-tex/latexdiff-1.3.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=Compare two latex files and mark up significant differences
 EAPI=7
 HOMEPAGE=https://www.ctan.org/tex-archive/support/latexdiff/ https://github.com/ftilmann/latexdiff/
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/perl-5.8 virtual/latex-base dev-texlive/texlive-plaingeneric dev-perl/Algorithm-Diff
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ftilmann/latexdiff/archive/1.3.1.1.tar.gz -> latexdiff-1.3.1.1.tar.gz
-_md5_=f8fa8b8b41907759f4946f479745c1d6
+_md5_=525f21dd7dfc8a10f49c1b50330b5ef9
diff --git a/metadata/md5-cache/dev-tex/latexdiff-9999 b/metadata/md5-cache/dev-tex/latexdiff-9999
index 0feb4a47bf4a..ae696ec8ff8f 100644
--- a/metadata/md5-cache/dev-tex/latexdiff-9999
+++ b/metadata/md5-cache/dev-tex/latexdiff-9999
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/perl-5.8 virtual/latex-base dev-texlive/texlive-plaingeneric
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=e9ef1ccc2ce7bdf15e32bf3f1b099b68
+_md5_=ab541d318861d87a63c26970d157a5c0
diff --git a/metadata/md5-cache/dev-tex/latexmk-470b b/metadata/md5-cache/dev-tex/latexmk-470b
index ed2746cac77b..cf12da4ca1a6 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 ~riscv ~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	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17cc5d298c649605d642c5945588da57
+_md5_=914d7abc36206df084ce0f27658266d7
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
index 718a7b5cd710..7c8c8f0cf2c5 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
@@ -5,10 +5,10 @@ DESCRIPTION=Converts (La)TeX to (X)HTML, XML and OO.org
 EAPI=7
 HOMEPAGE=http://www.cse.ohio-state.edu/~gurari/TeX4ht/ http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html
 IUSE=doc java elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick dev-libs/kpathsea java? ( >=virtual/jre-1.8:* ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz https://dev.gentoo.org/~ulm/distfiles/tex4ht-texlive-20210603.tar.xz doc? ( https://dev.gentoo.org/~ulm/distfiles/tex4ht-texlive-20210603.doc.tar.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	latex-package	e5f296c98696dd02059bc6a5a03282e2	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e2d879fb3cb8aa9d302186d276d5750e
+_md5_=77a313801083a4a0cfb1b5468ba69e81
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 2a590902d51c..b21dde17a1e4 100644
--- a/metadata/md5-cache/dev-texlive/Manifest.gz
+++ b/metadata/md5-cache/dev-texlive/Manifest.gz
diff --git a/metadata/md5-cache/dev-texlive/texlive-context-2021 b/metadata/md5-cache/dev-texlive/texlive-context-2021
index eec2fa270fad..31798f942032 100644
--- a/metadata/md5-cache/dev-texlive/texlive-context-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-context-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive ConTeXt and packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 GPL-1 GPL-2 GPL-3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-latex-2010 >=app-text/texlive-core-2010[xetex] >=dev-texlive/texlive-metapost-2010 dev-lang/ruby >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-notes-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-notes-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-npp-for-context-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-npp-for-context-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-account-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-account-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-algorithmic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-algorithmic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-animation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-animation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-annotation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-annotation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-bnf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-bnf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-chromato-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-chromato-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cmscbf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cmscbf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cmttbf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cmttbf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-construction-plan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-construction-plan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cyrillicnumbers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cyrillicnumbers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-degrade-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-degrade-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-fancybreak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-fancybreak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-filter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-filter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-fullpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-fullpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-gantt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-gantt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-gnuplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-gnuplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-handlecsv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-handlecsv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-inifile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-inifile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-layout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-layout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-letter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-letter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-lettrine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-lettrine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-mathsets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-mathsets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-rst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-rst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-ruby-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-ruby-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-simplefonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-simplefonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-simpleslides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-simpleslides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-title-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-title-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-transliterator-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-transliterator-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-typearea-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-typearea-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-typescripts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-typescripts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-vim-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-vim-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-visualcounter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-visualcounter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-context-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-context-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-notes-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-notes-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-npp-for-context.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-npp-for-context.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-account.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-account.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-algorithmic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-algorithmic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-animation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-animation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-annotation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-annotation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-bnf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-bnf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-chromato.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-chromato.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cmscbf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cmscbf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cmttbf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cmttbf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-construction-plan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-construction-plan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cyrillicnumbers.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cyrillicnumbers.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-degrade.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-degrade.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-fancybreak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-fancybreak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-filter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-filter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-fullpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-fullpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-gantt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-gantt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-gnuplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-gnuplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-handlecsv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-handlecsv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-inifile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-inifile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-layout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-layout.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-letter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-letter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-lettrine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-lettrine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-mathsets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-mathsets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-rst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-rst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-ruby.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-ruby.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-simplefonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-simplefonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-simpleslides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-simpleslides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-title.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-title.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-transliterator.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-transliterator.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-typearea.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-typearea.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-typescripts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-typescripts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-vim.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-vim.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-visualcounter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-visualcounter.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-visualcounter.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-visualcounter.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=461709d77708026c44b70b37039257d3
+_md5_=6d2336df412ce93743c5fec346a85df9
diff --git a/metadata/md5-cache/dev-texlive/texlive-games-2021 b/metadata/md5-cache/dev-texlive/texlive-games-2021
index d6f79558ddc5..b651a936ed00 100644
--- a/metadata/md5-cache/dev-texlive/texlive-games-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-games-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Games typesetting
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC-BY-SA-4.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bartel-chess-fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bartel-chess-fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess-problem-diagrams-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess-problem-diagrams-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessboard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessboard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessfss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessfss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossword-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossword-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crosswrd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crosswrd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egameps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egameps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gamebook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gamebook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-go-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-go-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanoi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanoi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-havannah-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-havannah-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hexgame-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hexgame-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hmtrump-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hmtrump-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-horoscop-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-horoscop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jigsaw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jigsaw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labyrinth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labyrinth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logicpuzzle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logicpuzzle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musikui-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musikui-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nimsticks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nimsticks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onedown-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onedown-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-othello-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-othello-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-othelloboard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-othelloboard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-crosswords-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-crosswords-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psgo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psgo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realtranspose-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realtranspose-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reverxii-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reverxii-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rubik-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rubik-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schwalbe-chess-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schwalbe-chess-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sgame-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sgame-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skaknew-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skaknew-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soup-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudoku-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudoku-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudokubundle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudokubundle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xskak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xskak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-games-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-games-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bartel-chess-fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bartel-chess-fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess-problem-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess-problem-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessboard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessboard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessfss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessfss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossword.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossword.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crosswrd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crosswrd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egameps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egameps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gamebook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gamebook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-go.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-go.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-havannah.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-havannah.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hexgame.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hexgame.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hmtrump.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hmtrump.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-horoscop.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-horoscop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jigsaw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jigsaw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labyrinth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labyrinth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logicpuzzle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logicpuzzle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musikui.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musikui.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nimsticks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nimsticks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onedown.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onedown.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-othello.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-othello.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-othelloboard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-othelloboard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-crosswords.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-crosswords.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psgo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psgo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realtranspose.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realtranspose.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reverxii.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reverxii.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rubik.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rubik.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schwalbe-chess.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schwalbe-chess.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sgame.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sgame.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skaknew.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skaknew.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soup.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudoku.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudoku.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudokubundle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudokubundle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xskak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xskak.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess-problem-diagrams.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess-problem-diagrams.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessboard.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessboard.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessfss.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessfss.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossword.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossword.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crosswrd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crosswrd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gamebook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gamebook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-go.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-go.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-havannah.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-havannah.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-horoscop.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-horoscop.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nimsticks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nimsticks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onedown.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onedown.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realtranspose.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realtranspose.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rubik.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rubik.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schwalbe-chess.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schwalbe-chess.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soup.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soup.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudoku.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudoku.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudokubundle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudokubundle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xskak.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xskak.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=f819b760049d95f49e6103ec4f09cb19
+_md5_=a3a305e1ec260871f00c12b6d93885f8
diff --git a/metadata/md5-cache/dev-texlive/texlive-humanities-2021 b/metadata/md5-cache/dev-texlive/texlive-humanities-2021
index a50f367ff5be..eba2e1ee8946 100644
--- a/metadata/md5-cache/dev-texlive/texlive-humanities-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-humanities-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Humanities packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c
 RDEPEND=>=dev-texlive/texlive-latex-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adtrees-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adtrees-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-lds-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-lds-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-mouth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-mouth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-parse-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-parse-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-covington-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-covington-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diadia-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diadia-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dramatist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dramatist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvgloss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvgloss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecltree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecltree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edfnotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edfnotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ednotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ednotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledform-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledform-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledmac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledmac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gb4e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gb4e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverse-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverse-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jura-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jura-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juraabbrev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juraabbrev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juramisc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juramisc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurarsp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurarsp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ledmac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ledmac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexikon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexikon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ling-macros-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ling-macros-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linguex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linguex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-liturg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-liturg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metrix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metrix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nnext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nnext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parallel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parallel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parrun-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parrun-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonrule-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonrule-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plari-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plari-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-play-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-play-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poemscol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poemscol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetry-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetry-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetrytex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetrytex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qobitree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qobitree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qtree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qtree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reledmac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reledmac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rrgtrees-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rrgtrees-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtklage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtklage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay-pkg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay-pkg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textglos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textglos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theatre-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theatre-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thalie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thalie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tree-dvips-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tree-dvips-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verse-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verse-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xyling-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xyling-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-humanities-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-humanities-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adtrees.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adtrees.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-lds.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-lds.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-mouth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-mouth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-parse.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-parse.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-covington.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-covington.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diadia.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diadia.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dramatist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dramatist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvgloss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvgloss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecltree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecltree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edfnotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edfnotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ednotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ednotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledform.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledform.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledmac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledmac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gb4e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gb4e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverse.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverse.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jura.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jura.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juraabbrev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juraabbrev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juramisc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juramisc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurarsp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurarsp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ledmac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ledmac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexikon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexikon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ling-macros.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ling-macros.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linguex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linguex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-liturg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-liturg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metrix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metrix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nnext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nnext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parallel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parallel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parrun.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parrun.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonrule.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonrule.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plari.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plari.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-play.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-play.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poemscol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poemscol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetry.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetry.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetrytex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetrytex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qobitree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qobitree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qtree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qtree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reledmac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reledmac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rrgtrees.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rrgtrees.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtklage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtklage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay-pkg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay-pkg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textglos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textglos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theatre.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theatre.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thalie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thalie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tree-dvips.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tree-dvips.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verse.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verse.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xyling.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xyling.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-lds.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-lds.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-mouth.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-mouth.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dramatist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dramatist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvgloss.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvgloss.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edfnotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edfnotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledform.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledform.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledmac.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledmac.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jura.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jura.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juraabbrev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juraabbrev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurarsp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurarsp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ledmac.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ledmac.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-liturg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-liturg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metrix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metrix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nnext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nnext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parallel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parallel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parrun.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parrun.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plari.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plari.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-play.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-play.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poemscol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poemscol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetry.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetry.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetrytex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetrytex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reledmac.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reledmac.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rrgtrees.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rrgtrees.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textglos.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textglos.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thalie.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thalie.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verse.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verse.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=26762445fe127f8a540e8cf10e28b950
+_md5_=833830a177bd82d4ed714005e7b81389
diff --git a/metadata/md5-cache/dev-texlive/texlive-langarabic-2021 b/metadata/md5-cache/dev-texlive/texlive-langarabic-2021
index 883e888fdbc1..d72534193065 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langarabic-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langarabic-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Arabic
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alkalami-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alkalami-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alpha-persian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alpha-persian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amiri-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amiri-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabi-add-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabi-add-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabluatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabluatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidihl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidihl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dad-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dad-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ghab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ghab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvarabic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvarabic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-arabic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-arabic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-farsi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-farsi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imsproc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imsproc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kurdishlipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kurdishlipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-persian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-persian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabidi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabidi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-na-box-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-na-box-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-persian-bib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-persian-bib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simurgh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simurgh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texnegar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texnegar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian-hm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian-hm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langarabic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langarabic-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alkalami.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alkalami.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alpha-persian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alpha-persian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amiri.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amiri.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabi-add.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabi-add.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabluatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabluatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidihl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidihl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dad.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dad.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ghab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ghab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvarabic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvarabic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imsproc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imsproc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kurdishlipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kurdishlipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-persian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-persian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabidi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabidi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-na-box.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-na-box.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-persian-bib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-persian-bib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simurgh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simurgh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texnegar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texnegar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian-hm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian-hm.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabluatex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabluatex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texnegar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texnegar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian-hm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian-hm.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=e5b0901a663d6c3824601a4b552c9630
+_md5_=1dbf823ccdf8cec81adb8eebfaa086b4
diff --git a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2021 b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2021
index 4b45c752c8a8..182027cb4d63 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Czech/Slovak
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-latex-2021 >=app-text/texlive-core-2014[xetex] >=dev-texlive/texlive-luatex-2016 >=dev-texlive/texlive-langenglish-2019 >=dev-texlive/texlive-langeuropean-2019 >=dev-texlive/texlive-langfrench-2019 >=dev-texlive/texlive-langgerman-2019 >=dev-texlive/texlive-langpolish-2019 >=dev-texlive/texlive-langspanish-2019 >=dev-texlive/texlive-langitalian-2019 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-czech-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-czech-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnbwp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnbwp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csbulletin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csbulletin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cslatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cslatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csplain-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csplain-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-czech-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-czech-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-slovak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-slovak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-czech-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-czech-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-slovak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-slovak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-cz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-cz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langczechslovak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langczechslovak-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-czech.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-czech.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnbwp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnbwp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csbulletin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csbulletin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cslatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cslatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-czech.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-czech.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-slovak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-slovak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-cz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-cz.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-czech.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-czech.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovak.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovak.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cslatex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cslatex.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=d10f374c13f3092c6138bc9c034226dd
+_md5_=96af81ceb93cc9c89694fa94b6317a6d
diff --git a/metadata/md5-cache/dev-texlive/texlive-langenglish-2021 b/metadata/md5-cache/dev-texlive/texlive-langenglish-2021
index d5bcfed9d535..2f7f76324b59 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langenglish-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langenglish-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive US and UK English
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC-BY-SA-4.0 FDL-1.1 GPL-1 GPL-2 GPL-2+
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-english-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-english-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-MemoirChapStyles-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-MemoirChapStyles-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Type1fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Type1fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amiweb2c-guide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amiweb2c-guide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscls-doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscls-doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amslatex-primer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amslatex-primer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-around-the-bend-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-around-the-bend-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-chart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-chart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-cheatsheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-cheatsheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-components-of-TeX-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-components-of-TeX-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comprehensive-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comprehensive-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dickimaw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dickimaw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docsurvey-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docsurvey-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxtut-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxtut-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-first-latex-doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-first-latex-doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest-quickstart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest-quickstart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guide-to-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guide-to-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-happy4th-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-happy4th-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intro-scientific-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intro-scientific-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-english-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-english-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-brochure-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-brochure-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-course-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-course-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-doc-ptr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-doc-ptr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-companion-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-companion-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-refsheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-refsheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-veryshortguide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-veryshortguide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-web-companion-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-web-companion-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4wp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4wp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcourse-rug-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcourse-rug-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileinfo-pkgs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexfileinfo-pkgs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-english-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-english-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macros2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macros2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-math-into-latex-4-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-math-into-latex-4-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maths-symbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maths-symbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memdesign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memdesign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metafont-beginners-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metafont-beginners-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-examples-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-examples-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen2-tutorial-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patgen2-tutorial-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictexsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictexsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plain-doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plain-doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-short-math-guide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-short-math-guide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplified-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplified-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-startlatex2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-startlatex2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg-inkscape-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg-inkscape-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamethebeast-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamethebeast-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tds-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tds-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-font-errors-cheatsheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-font-errors-cheatsheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-nutshell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-nutshell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-overview-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-overview-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-refs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-refs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texbytopic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texbytopic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texonly-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texonly-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlc2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlc2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlmgrbasics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlmgrbasics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undergradmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undergradmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualfaq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualfaq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webguide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webguide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langenglish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langenglish-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-MemoirChapStyles.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-MemoirChapStyles.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Type1fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Type1fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amiweb2c-guide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amiweb2c-guide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscls-doc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscls-doc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amslatex-primer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amslatex-primer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-around-the-bend.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-around-the-bend.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-chart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-chart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-cheatsheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-cheatsheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-components-of-TeX.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-components-of-TeX.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comprehensive.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comprehensive.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dickimaw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dickimaw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docsurvey.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docsurvey.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxtut.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxtut.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-first-latex-doc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-first-latex-doc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest-quickstart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest-quickstart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guide-to-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guide-to-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-happy4th.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-happy4th.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intro-scientific.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intro-scientific.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-english.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-english.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-brochure.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-brochure.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-course.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-course.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-doc-ptr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-doc-ptr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-companion.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-companion.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-refsheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-refsheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-veryshortguide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-veryshortguide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-web-companion.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-web-companion.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4wp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4wp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcourse-rug.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcourse-rug.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileinfo-pkgs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexfileinfo-pkgs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-english.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-english.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macros2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macros2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-math-into-latex-4.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-math-into-latex-4.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maths-symbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maths-symbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memdesign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memdesign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metafont-beginners.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metafont-beginners.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-examples.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-examples.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen2-tutorial.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patgen2-tutorial.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictexsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictexsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plain-doc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plain-doc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-short-math-guide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-short-math-guide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplified-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplified-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-startlatex2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-startlatex2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg-inkscape.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg-inkscape.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamethebeast.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamethebeast.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tds.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tds.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-font-errors-cheatsheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-font-errors-cheatsheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-nutshell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-nutshell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-overview.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-overview.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-refs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-refs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texbytopic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texbytopic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texonly.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texonly.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlc2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlc2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlmgrbasics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlmgrbasics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undergradmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undergradmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualfaq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualfaq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webguide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webguide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexref.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileinfo-pkgs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexfileinfo-pkgs.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=df9d8fa6b887dd13c8cda5a2affd9640
+_md5_=22d12576bd4bd07cf4ee49063f1708fe
diff --git a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2021 b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2021
index 14b53bdf0e4a..ff318477466b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Other European languages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-armtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-armtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-albanian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-albanian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bosnian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bosnian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-breton-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-breton-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-croatian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-croatian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-danish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-danish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-dutch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-dutch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-estonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-estonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-finnish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-finnish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-friulan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-friulan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hungarian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hungarian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-icelandic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-icelandic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-irish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-irish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-kurmanji-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-kurmanji-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latvian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latvian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-macedonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-macedonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-norsk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-norsk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-occitan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-occitan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-piedmontese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-piedmontese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romanian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romanian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romansh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romansh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-samin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-samin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-scottish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-scottish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovenian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovenian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-swedish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-swedish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-turkish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-turkish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-welsh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-welsh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss-occitan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss-occitan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrlatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrlatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hulipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hulipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-croatian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-croatian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-danish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-danish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-dutch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-dutch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-estonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-estonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-finnish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-finnish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-friulan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-friulan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-hungarian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-hungarian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-icelandic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-icelandic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-irish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-irish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-kurmanji-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-kurmanji-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-latin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-latin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-latvian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-latvian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-lithuanian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-lithuanian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-macedonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-macedonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-norwegian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-norwegian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-occitan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-occitan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-piedmontese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-piedmontese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-romanian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-romanian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-romansh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-romansh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-slovenian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-slovenian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-swedish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-swedish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-turkish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-turkish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-uppersorbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-uppersorbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-welsh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-welsh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lithuanian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lithuanian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-dutch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-dutch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-estonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-estonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-finnish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-finnish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-slovenian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-slovenian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-turkish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-turkish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nevelok-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nevelok-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rojud-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rojud-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swebib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swebib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turkmen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turkmen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langeuropean-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langeuropean-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-armtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-armtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-albanian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-albanian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bosnian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bosnian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-breton.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-breton.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-croatian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-croatian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-danish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-danish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-dutch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-dutch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-estonian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-estonian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-finnish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-finnish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-friulan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-friulan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hungarian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hungarian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-icelandic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-icelandic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-irish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-irish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-kurmanji.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-kurmanji.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latvian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latvian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-macedonian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-macedonian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-norsk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-norsk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-occitan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-occitan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-piedmontese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-piedmontese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romanian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romanian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romansh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romansh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-samin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-samin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-scottish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-scottish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovenian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovenian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-swedish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-swedish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-turkish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-turkish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-welsh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-welsh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss-occitan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss-occitan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrlatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrlatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hulipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hulipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-hungarian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-hungarian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lithuanian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lithuanian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-dutch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-dutch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-estonian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-estonian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-finnish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-finnish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-slovenian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-slovenian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-turkish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-turkish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nevelok.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nevelok.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rojud.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rojud.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swebib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swebib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turkmen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turkmen.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-albanian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-albanian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bosnian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bosnian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-breton.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-breton.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-croatian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-croatian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-danish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-danish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-dutch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-dutch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-estonian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-estonian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-finnish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-finnish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-friulan.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-friulan.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-icelandic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-icelandic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-irish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-irish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-kurmanji.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-kurmanji.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latvian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latvian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-macedonian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-macedonian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-norsk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-norsk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-occitan.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-occitan.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-piedmontese.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-piedmontese.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romanian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romanian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romansh.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romansh.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-samin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-samin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-scottish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-scottish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovenian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovenian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-swedish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-swedish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-turkish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-turkish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-welsh.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-welsh.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss-occitan.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss-occitan.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrlatex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrlatex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hulipsum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hulipsum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-turkish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-turkish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nevelok.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nevelok.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turkmen.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turkmen.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=77313bcfec7cb9c98ecc3083bce0db7d
+_md5_=eb6733415a9bc7933e4280a0a90c30ba
diff --git a/metadata/md5-cache/dev-texlive/texlive-langfrench-2021 b/metadata/md5-cache/dev-texlive/texlive-langfrench-2021
index e7b4d5e1ff0c..1f21a8f7583a 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langfrench-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langfrench-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive French
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 CC-BY-4.0
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aeguill-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aeguill-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-annee-scolaire-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-annee-scolaire-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apprendre-a-programmer-en-tex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apprendre-a-programmer-en-tex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apprends-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apprends-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-basque-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-basque-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-book-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-book-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-date-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-date-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-droit-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-droit-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-e-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-e-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epslatex-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epslatex-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expose-expl3-dunkerque-2019-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expose-expl3-dunkerque-2019-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formation-latex-ul-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formation-latex-ul-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frenchmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frenchmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frletter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frletter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frpseudocode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frpseudocode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-basque-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-basque-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impnattypo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impnattypo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mafr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mafr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matapli-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matapli-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-profcollege-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-profcollege-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabvar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabvar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdsfrmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdsfrmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-array-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-array-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-dcolumn-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-dcolumn-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-natbib-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-natbib-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-tabbing-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-tabbing-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variations-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variations-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualtikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualtikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langfrench-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langfrench-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aeguill.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aeguill.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-annee-scolaire.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-annee-scolaire.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apprendre-a-programmer-en-tex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apprendre-a-programmer-en-tex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apprends-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apprends-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-basque.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-basque.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-book.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-book.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-date.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-date.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-droit-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-droit-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-e-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-e-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epslatex-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epslatex-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expose-expl3-dunkerque-2019.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expose-expl3-dunkerque-2019.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formation-latex-ul.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formation-latex-ul.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frenchmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frenchmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frletter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frletter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frpseudocode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frpseudocode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impnattypo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impnattypo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mafr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mafr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matapli.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matapli.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-profcollege.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-profcollege.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabvar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabvar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdsfrmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdsfrmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-array-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-array-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-dcolumn-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-dcolumn-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-natbib-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-natbib-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-tabbing-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-tabbing-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variations.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variations.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualtikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualtikz.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-annee-scolaire.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-annee-scolaire.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-basque.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-basque.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-french.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-french.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-book.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-book.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-date.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-date.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-french.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-french.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formation-latex-ul.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formation-latex-ul.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frenchmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frenchmath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-basque.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-basque.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impnattypo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impnattypo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabvar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabvar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdsfrmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdsfrmath.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=e2332eb2f600f57094a50b375dbc2ec6
+_md5_=45962029a2b0dbf289948641ef71f3c7
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgerman-2021 b/metadata/md5-cache/dev-texlive/texlive-langgerman-2021
index 23d761d4ae3d..5e749bbf363e 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgerman-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langgerman-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive German
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT OPL TeX-other-free
 RDEPEND=!~dev-texlive/texlive-xetex-2020 >=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apalike-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apalike-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dehyph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dehyph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dehyph-exptl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dehyph-exptl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dhua-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dhua-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtk-bibliography-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtk-bibliography-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etdipa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etdipa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoolbox-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoolbox-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifinddo-info-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifinddo-info-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-germbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-germbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-germkorr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-germkorr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hausarbeit-jura-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hausarbeit-jura-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-examples-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-examples-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2picfaq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2picfaq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-microtype-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-microtype-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milog-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milog-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-r_und_s-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-r_und_s-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schulmathematik-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schulmathematik-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templates-fenn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templates-fenn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templates-sommer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templates-sommer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipa-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipa-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-arsclassica-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-arsclassica-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-biblatex-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-biblatex-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-chemsym-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-chemsym-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-ecv-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-ecv-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-enumitem-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-enumitem-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-europecv-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-europecv-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-filecontents-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-filecontents-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-moreverb-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-moreverb-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-udesoftec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-udesoftec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhrzeit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhrzeit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umlaute-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umlaute-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-voss-mathcol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-voss-mathcol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langgerman-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langgerman-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apalike-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apalike-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dehyph-exptl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dehyph-exptl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dhua.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dhua.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtk-bibliography.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtk-bibliography.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etdipa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etdipa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoolbox-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoolbox-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifinddo-info.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifinddo-info.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-germbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-germbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-germkorr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-germkorr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hausarbeit-jura.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hausarbeit-jura.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-examples.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-examples.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2picfaq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2picfaq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-microtype-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-microtype-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milog.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milog.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-r_und_s.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-r_und_s.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schulmathematik.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schulmathematik.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templates-fenn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templates-fenn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templates-sommer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templates-sommer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipa-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipa-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-arsclassica-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-arsclassica-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-biblatex-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-biblatex-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-chemsym-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-chemsym-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-ecv-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-ecv-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-enumitem-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-enumitem-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-europecv-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-europecv-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-filecontents-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-filecontents-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-moreverb-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-moreverb-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-udesoftec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-udesoftec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhrzeit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhrzeit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umlaute.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umlaute.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-voss-mathcol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-voss-mathcol.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-german.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-german.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dhua.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dhua.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifinddo-info.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifinddo-info.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-german.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-german.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hausarbeit-jura.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hausarbeit-jura.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal-de.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal-de.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-udesoftec.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-udesoftec.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umlaute.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umlaute.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=535559081834fac9562eba2d4f2c2cf9
+_md5_=c9371664c7f2dabd775c175a79c06521
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgreek-2021 b/metadata/md5-cache/dev-texlive/texlive-langgreek-2021
index c4f52a668f6f..fba76e28bdae 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgreek-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langgreek-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Greek
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LGPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-greek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-greek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-begingreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-begingreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-betababel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-betababel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts-fd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts-fd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsbaskerville-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsbaskerville-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsporson-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsporson-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-fontenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-fontenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-inputenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-inputenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greekdates-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greekdates-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greektex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greektex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greektonoi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greektonoi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-greek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-greek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-ancientgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-ancientgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibycus-babel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibycus-babel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibygrk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibygrk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerkis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerkis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-levy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-levy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkgrkindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkgrkindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-teubner-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-teubner-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yannisgr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yannisgr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langgreek-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-greek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-greek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-begingreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-begingreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-betababel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-betababel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts-fd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts-fd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsbaskerville.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsbaskerville.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsporson.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsporson.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-fontenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-fontenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-inputenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-inputenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greekdates.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greekdates.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greektex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greektex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greektonoi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greektonoi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-greek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-greek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibycus-babel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibycus-babel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibygrk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibygrk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerkis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerkis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-levy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-levy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lgreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lgreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkgrkindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkgrkindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-teubner.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-teubner.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xgreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xgreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yannisgr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yannisgr.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-greek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-greek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-begingreek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-begingreek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts-fd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts-fd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-fontenc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-fontenc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greekdates.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greekdates.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibycus-babel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibycus-babel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-teubner.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-teubner.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xgreek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xgreek.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=05beb5c8fc79f64045bb207f6d352b61
+_md5_=3ebbd82b1ab403ecbd08a120703ee978
diff --git a/metadata/md5-cache/dev-texlive/texlive-langitalian-2021 b/metadata/md5-cache/dev-texlive/texlive-langitalian-2021
index 57fd074976d3..857f30c20dab 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langitalian-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langitalian-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Italian
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 LPPL-1.3c TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antanilipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antanilipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsldoc-it-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsldoc-it-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsmath-it-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsmath-it-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsthdoc-it-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsthdoc-it-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codicefiscaleitaliano-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codicefiscaleitaliano-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhdr-it-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhdr-it-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixltxhyph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixltxhyph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frontespizio-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frontespizio-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-itnumpar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-itnumpar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4wp-it-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4wp-it-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layaureo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layaureo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfrag-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfrag-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-it-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-it-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langitalian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langitalian-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antanilipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antanilipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsldoc-it.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsldoc-it.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsmath-it.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsmath-it.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsthdoc-it.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsthdoc-it.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-italian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-italian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codicefiscaleitaliano.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codicefiscaleitaliano.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhdr-it.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhdr-it.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixltxhyph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixltxhyph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frontespizio.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frontespizio.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-itnumpar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-itnumpar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-italian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-italian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4wp-it.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4wp-it.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layaureo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layaureo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-italian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-italian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfrag-italian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfrag-italian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-it.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-it.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifica.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antanilipsum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antanilipsum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-italian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-italian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codicefiscaleitaliano.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codicefiscaleitaliano.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixltxhyph.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixltxhyph.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frontespizio.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frontespizio.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-itnumpar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-itnumpar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layaureo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layaureo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifica.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifica.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=56ecb3fee7d14aa90ac3c9d19b843c93
+_md5_=d0e3ae3f6b5cc2c0648aa7358fceb6a6
diff --git a/metadata/md5-cache/dev-texlive/texlive-langkorean-2021 b/metadata/md5-cache/dev-texlive/texlive-langkorean-2021
index 830ed7f11e8e..81ccb024851e 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langkorean-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langkorean-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Korean
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-2 LPPL-1.3 LPPL-1.3c OFL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baekmuk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baekmuk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-ko-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-ko-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-oblivoir-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-oblivoir-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-plain-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-plain-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-utf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-utf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-utils-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-utils-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-korean-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-korean-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nanumtype1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nanumtype1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmhanguljamo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmhanguljamo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unfonts-core-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unfonts-core-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unfonts-extra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unfonts-extra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langkorean-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langkorean-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baekmuk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baekmuk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-ko.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-ko.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-oblivoir.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-oblivoir.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-plain.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-plain.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-utf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-utf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-utils.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-utils.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-korean.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-korean.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nanumtype1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nanumtype1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmhanguljamo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmhanguljamo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unfonts-core.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unfonts-core.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unfonts-extra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unfonts-extra.doc-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=86a007b152c0b3645c7811af47033fa3
+_md5_=15f94e79b460a71812448fd460fae657
diff --git a/metadata/md5-cache/dev-texlive/texlive-langother-2021 b/metadata/md5-cache/dev-texlive/texlive-langother-2021
index d3540c62884e..96bc3ba5069f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langother-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langother-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Other languages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC-BY-SA-4.0 GPL-1 GPL-2 GPL-2+
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aalok-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aalok-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akshar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akshar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsldoc-vn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsldoc-vn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aramaic-serto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aramaic-serto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-azerbaijani-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-azerbaijani-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-esperanto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-esperanto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-georgian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-georgian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hebrew-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hebrew-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-indonesian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-indonesian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-interlingua-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-interlingua-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-malay-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-malay-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-sorbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-sorbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-thai-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-thai-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-vietnamese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-vietnamese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bengali-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bengali-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-burmese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-burmese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chhaya-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chhaya-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjhebrew-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjhebrew-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebong-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebong-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop-t1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop-t1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-tlwg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-tlwg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hindawi-latex-template-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hindawi-latex-template-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-afrikaans-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-afrikaans-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-armenian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-armenian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-coptic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-coptic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-esperanto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-esperanto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-ethiopic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-ethiopic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-georgian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-georgian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-indic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-indic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-indonesian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-indonesian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-interlingua-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-interlingua-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-sanskrit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-sanskrit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-thai-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-thai-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-turkmen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-turkmen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-mr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-mr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexbangla-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexbangla-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latino-sine-flexione-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latino-sine-flexione-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-thai-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-thai-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-vietnamese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-vietnamese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marathi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marathi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem-vn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem-vn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padauk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padauk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-bn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-bn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-ur-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-ur-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit-t1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit-t1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaienum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaienum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaispec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaispec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-alphabets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-alphabets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-velthuis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-velthuis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vntex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vntex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-devanagari-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-devanagari-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langother-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langother-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aalok.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aalok.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akshar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akshar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsldoc-vn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsldoc-vn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aramaic-serto.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aramaic-serto.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-azerbaijani.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-azerbaijani.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-esperanto.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-esperanto.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-georgian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-georgian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hebrew.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hebrew.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-indonesian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-indonesian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-interlingua.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-interlingua.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-malay.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-malay.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-sorbian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-sorbian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-thai.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-thai.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-vietnamese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-vietnamese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bengali.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bengali.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-burmese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-burmese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chhaya.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chhaya.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjhebrew.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjhebrew.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebong.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebong.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop-t1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop-t1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-tlwg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-tlwg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hindawi-latex-template.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hindawi-latex-template.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-sanskrit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-sanskrit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-mr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-mr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexbangla.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexbangla.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latino-sine-flexione.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latino-sine-flexione.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-thai.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-thai.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-vietnamese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-vietnamese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marathi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marathi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem-vn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem-vn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padauk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padauk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-bn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-bn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-ur.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-ur.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit-t1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit-t1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaienum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaienum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaispec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaispec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-alphabets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-alphabets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-velthuis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-velthuis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vntex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vntex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-devanagari.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-devanagari.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aalok.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aalok.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akshar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akshar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-azerbaijani.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-azerbaijani.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-esperanto.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-esperanto.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hebrew.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hebrew.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-indonesian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-indonesian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-interlingua.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-interlingua.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-malay.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-malay.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-sorbian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-sorbian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-thai.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-thai.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-vietnamese.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-vietnamese.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bengali.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bengali.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-burmese.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-burmese.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chhaya.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chhaya.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-tlwg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-tlwg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-armenian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-armenian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-ethiopic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-ethiopic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-turkmen.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-turkmen.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marathi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marathi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaispec.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaispec.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vntex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vntex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri-latex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri-latex.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=84b894b7ff4f7c6e6e8e633f5d4d89d8
+_md5_=21b064cf7a15ef8f25be3c1f7afee3ab
diff --git a/metadata/md5-cache/dev-texlive/texlive-langpolish-2021 b/metadata/md5-cache/dev-texlive/texlive-langpolish-2021
index 154161b2521f..52bbc2bea6d1 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langpolish-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langpolish-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Polish
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX
 RDEPEND=>=dev-texlive/texlive-latex-2021 >=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-polish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-polish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bredzenie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bredzenie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cc-pl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cc-pl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gustlib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gustlib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gustprog-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gustprog-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-polish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-polish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-polish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-polish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwcls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwcls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polski-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polski-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-przechlewski-book-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-przechlewski-book-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qpxqtx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qpxqtx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-virtual-academy-pl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-virtual-academy-pl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-pl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-pl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utf8mex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utf8mex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langpolish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langpolish-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-polish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-polish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bredzenie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bredzenie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cc-pl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cc-pl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gustlib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gustlib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gustprog.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gustprog.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-polish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-polish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwcls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwcls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polski.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polski.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-przechlewski-book.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-przechlewski-book.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qpxqtx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qpxqtx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-virtual-academy-pl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-virtual-academy-pl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-pl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-pl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utf8mex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utf8mex.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-polish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-polish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwcls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwcls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polski.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polski.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=794a5027684e47d1afbf0a284564e396
+_md5_=da2f67a9e2a1f6e694b04f99a4ec4449
diff --git a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2021 b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2021
index ad5d8691b59f..2cceb1876ab4 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Portuguese
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 GPL-2+
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-portuges-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-portuges-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-tut-pt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-tut-pt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cursolatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cursolatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feupphdteses-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feupphdteses-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-portuguese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-portuguese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-via-exemplos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-via-exemplos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-ptbr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-ptbr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-portuguese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-portuguese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberpt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberpt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ordinalpt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ordinalpt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic-tut-pt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic-tut-pt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langportuguese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langportuguese-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-portuges.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-portuges.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-tut-pt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-tut-pt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cursolatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cursolatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feupphdteses.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feupphdteses.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-via-exemplos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-via-exemplos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-ptbr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-ptbr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-portuguese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-portuguese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberpt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberpt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ordinalpt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ordinalpt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic-tut-pt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic-tut-pt.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-portuges.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-portuges.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberpt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberpt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ordinalpt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ordinalpt.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=01401c124fcba56e639f45d39930e94d
+_md5_=e4ba8ae2a6f62f75f36fb6e50ad3d56b
diff --git a/metadata/md5-cache/dev-texlive/texlive-langspanish-2021 b/metadata/md5-cache/dev-texlive/texlive-langspanish-2021
index 1589d4fb0732..1928ecec4cc4 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langspanish-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langspanish-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Spanish
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-catalan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-catalan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-galician-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-galician-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-es-tex-faq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-es-tex-faq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-catalan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-catalan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-galician-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-galician-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-esmx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-esmx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-es-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-es-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langspanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langspanish-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-catalan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-catalan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-galician.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-galician.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-es-tex-faq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-es-tex-faq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-esmx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-esmx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-es.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-es.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-catalan.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-catalan.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-galician.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-galician.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-spanish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-spanish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-galician.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-galician.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-spanish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-spanish.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=32ddf4505ce7df355b4c179422377f95
+_md5_=85ca989dbafea40b2bf7ac40b52ad156
diff --git a/metadata/md5-cache/dev-texlive/texlive-music-2021 b/metadata/md5-cache/dev-texlive/texlive-music-2021
index b5f43961fcc9..ec5a91a0c620 100644
--- a/metadata/md5-cache/dev-texlive/texlive-music-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-music-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Music packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 GPL-2+
 RDEPEND=>=dev-texlive/texlive-latex-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autosp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autosp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bagpipe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bagpipe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chordbars-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chordbars-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chordbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chordbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ddphonism-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ddphonism-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figbas-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figbas-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gchords-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gchords-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrcrd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrcrd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitarchordschemes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitarchordschemes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitartabs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitartabs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harmony-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harmony-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leadsheets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leadsheets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4musicians-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4musicians-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lilyglyphs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lilyglyphs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lyluatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lyluatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-m-tx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-m-tx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musical-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musical-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musicography-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musicography-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixguit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixguit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex-fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex-fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtnt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtnt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octave-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octave-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piano-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piano-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmxchords-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmxchords-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpiano-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpiano-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-music-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-music-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autosp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autosp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bagpipe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bagpipe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chordbars.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chordbars.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chordbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chordbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ddphonism.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ddphonism.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figbas.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figbas.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gchords.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gchords.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrcrd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrcrd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitarchordschemes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitarchordschemes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitartabs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitartabs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harmony.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harmony.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leadsheets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leadsheets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4musicians.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4musicians.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lilyglyphs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lilyglyphs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lyluatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lyluatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-m-tx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-m-tx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musical.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musical.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musicography.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musicography.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixguit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixguit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtnt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtnt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octave.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octave.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piano.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piano.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmxchords.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmxchords.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpiano.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpiano.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lilyglyphs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lilyglyphs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songbook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songbook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpiano.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpiano.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=7e912eafe665ce4d53d11f4c007abc9d
+_md5_=e25942a35b2317d2225a0bceb5b918ea
diff --git a/metadata/md5-cache/dev-texlive/texlive-publishers-2021 b/metadata/md5-cache/dev-texlive/texlive-publishers-2021
index 693f4a34e638..8364a334b670 100644
--- a/metadata/md5-cache/dev-texlive/texlive-publishers-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-publishers-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Publisher styles, theses, etc.
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD GPL-2 CC0-1.0
 RDEPEND=>=dev-texlive/texlive-latex-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEconf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEconf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEtran-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEtran-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aastex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aastex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abnt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abnt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abntex2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abntex2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmconf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmconf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-active-conf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-active-conf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfathesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfathesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afparticle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afparticle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aguplus-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aguplus-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aiaa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aiaa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ametsoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ametsoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonymous-acm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonymous-acm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anufinalexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anufinalexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aomart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aomart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa7-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa7-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arsclassica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arsclassica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-articleingud-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-articleingud-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asaetr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asaetr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascelike-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascelike-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asmeconf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asmeconf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asmejour-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asmejour-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aucklandthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aucklandthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorcsthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorcsthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bath-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bath-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-FUBerlin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-FUBerlin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-verona-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-verona-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beilstein-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beilstein-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bgteubner-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bgteubner-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-br-lex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-br-lex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-dissertation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-dissertation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-problemset-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-problemset-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascadilla-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascadilla-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cesenaexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cesenaexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chem-journal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chem-journal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chifoot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chifoot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chs-physics-report-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chs-physics-report-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cje-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cje-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classicthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classicthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleanthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleanthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmpj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmpj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-confproc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-confproc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cquthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cquthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dccpaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dccpaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dithesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dithesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebsthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebsthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecothesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecothesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ejpecp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ejpecp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekaia-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekaia-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elbioimp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elbioimp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-els-cas-templates-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-els-cas-templates-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elsarticle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elsarticle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elteikthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elteikthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emisa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emisa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erdc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erdc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-estcpmm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-estcpmm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etsvthor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etsvthor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture-belge-simple-sans-tva-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture-belge-simple-sans-tva-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbithesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbithesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcavtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcavtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcltxdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcltxdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fei-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fei-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftc-notebook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftc-notebook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gaceta-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gaceta-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gammas-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gammas-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatech-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatech-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradstudentresume-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradstudentresume-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grant-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grant-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsemthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gsemthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gzt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gzt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-h2020proposal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-h2020proposal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hagenberg-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hagenberg-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-har2nat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-har2nat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hecthese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hecthese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hep-paper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hep-paper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hithesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hithesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszbeamer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszbeamer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobete-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobete-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hu-berlin-bundle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hu-berlin-bundle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hustthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hustthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icsv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icsv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ieeepes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ieeepes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijmart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijmart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijsra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijsra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imtekda-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imtekda-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inkpaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inkpaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iodhbwm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iodhbwm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iscram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iscram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jacow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jacow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmlr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmlr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jnuexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jnuexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jpsj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jpsj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kdgdocs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kdgdocs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kluwer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kluwer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ksp-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ksp-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ku-template-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ku-template-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci-avm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci-avm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limecv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limecv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lion-msc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lion-msc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-llncsconf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-llncsconf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lni-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lni-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3mem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3mem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcmthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcmthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mentis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mentis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlacls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlacls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mluexercise-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mluexercise-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnras-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnras-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modeles-factures-belges-assocs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modeles-factures-belges-assocs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msu-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msu-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mucproc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mucproc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mugsthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mugsthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-muling-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-muling-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musuos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musuos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-muthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-muthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mynsfc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mynsfc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nature-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nature-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-navydocs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-navydocs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nddiss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nddiss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ndsu-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ndsu-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-novel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-novel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nwejm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nwejm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nih-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nih-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nihbiosketch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nihbiosketch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nostarch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nostarch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nrc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nrc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onrannual-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onrannual-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opteng-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opteng-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oup-authoring-template-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oup-authoring-template-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philosophersimprint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philosophersimprint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pittetd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pittetd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkuthss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkuthss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-fuberlin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-fuberlin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-tuliplab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-tuliplab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pracjourn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pracjourn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-procIAGssymp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-procIAGssymp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proposal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proposal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prtec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prtec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrbill-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrbill-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantumarticle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantumarticle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resphilosophica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resphilosophica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resumecls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resumecls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4-1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4-1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rutitlepage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rutitlepage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryersonsgsthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryersonsgsthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryethesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryethesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sageep-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sageep-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sapthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sapthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schule-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schule-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrjrnl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrjrnl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scientific-thesis-cover-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scientific-thesis-cover-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sduthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sduthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shortmathj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shortmathj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shtthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shtthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soton-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soton-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphdthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphdthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sr-vorl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sr-vorl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srdp-mathematik-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srdp-mathematik-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stellenbosch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stellenbosch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suftesi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suftesi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sugconf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sugconf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabriz-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabriz-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technion-thesis-template-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technion-thesis-template-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texilikechaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texilikechaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texilikecover-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texilikecover-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-ekf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-ekf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-gwu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-gwu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-qom-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-qom-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-titlepage-fhac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-titlepage-fhac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuaslogos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuaslogos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thucoursework-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thucoursework-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timbreicmc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timbreicmc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlc-article-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlc-article-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topletter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topletter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toptesi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toptesi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tuda-ci-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tuda-ci-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tudscr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tudscr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat-plain-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat-plain-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turabian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turabian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tui-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tui-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uaclasses-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uaclasses-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uafthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uafthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uantwerpendocs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uantwerpendocs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucalgmthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucalgmthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucbthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucbthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucdavisthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucdavisthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucsmonograph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucsmonograph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uestcthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uestcthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhhassignment-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhhassignment-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucredborder-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucredborder-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulthese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulthese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umbclegislation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umbclegislation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umich-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umich-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unam-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unam-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unamth-template-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unamth-template-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unamthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unamthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unifith-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unifith-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitn-bimrep-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitn-bimrep-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-univie-ling-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-univie-ling-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unizgklasa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unizgklasa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unswcover-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unswcover-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uothesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uothesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urcls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urcls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uowthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uowthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uowthesistitlepage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uowthesistitlepage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspatent-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspatent-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ut-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ut-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utexasthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utexasthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vancouver-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vancouver-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xduthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xduthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmuthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmuthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsemclassic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsemclassic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yathesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yathesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yazd-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yazd-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-york-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-york-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-publishers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-publishers-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEconf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEconf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEtran.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEtran.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aastex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aastex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abnt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abnt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abntex2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abntex2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmconf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmconf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-active-conf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-active-conf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfathesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfathesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afparticle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afparticle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aguplus.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aguplus.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aiaa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aiaa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ametsoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ametsoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonymous-acm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonymous-acm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anufinalexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anufinalexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aomart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aomart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa7.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa7.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arsclassica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arsclassica.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-articleingud.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-articleingud.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asaetr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asaetr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascelike.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascelike.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asmeconf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asmeconf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asmejour.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asmejour.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aucklandthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aucklandthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorcsthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorcsthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bath-bst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bath-bst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-FUBerlin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-FUBerlin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-verona.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-verona.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beilstein.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beilstein.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bgteubner.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bgteubner.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-br-lex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-br-lex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-dissertation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-dissertation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-problemset.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-problemset.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascadilla.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascadilla.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cesenaexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cesenaexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chifoot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chifoot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chs-physics-report.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chs-physics-report.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cje.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cje.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classicthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classicthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleanthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleanthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmpj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmpj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-confproc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-confproc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cquthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cquthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dccpaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dccpaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dithesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dithesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebsthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebsthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecothesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecothesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ejpecp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ejpecp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekaia.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekaia.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elbioimp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elbioimp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-els-cas-templates.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-els-cas-templates.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elsarticle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elsarticle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elteikthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elteikthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emisa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emisa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erdc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erdc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-estcpmm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-estcpmm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etsvthor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etsvthor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture-belge-simple-sans-tva.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture-belge-simple-sans-tva.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbithesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbithesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcavtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcavtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcltxdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcltxdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fei.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fei.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftc-notebook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftc-notebook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gaceta.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gaceta.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gammas.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gammas.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatech-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatech-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradstudentresume.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradstudentresume.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grant.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grant.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsemthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gsemthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gzt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gzt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-h2020proposal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-h2020proposal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hagenberg-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hagenberg-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-har2nat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-har2nat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hecthese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hecthese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hep-paper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hep-paper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hithesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hithesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszbeamer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszbeamer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobete.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobete.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hu-berlin-bundle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hu-berlin-bundle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hustthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hustthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icsv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icsv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ieeepes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ieeepes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijmart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijmart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijsra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijsra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imtekda.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imtekda.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inkpaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inkpaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iodhbwm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iodhbwm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iscram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iscram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jacow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jacow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmlr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmlr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jnuexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jnuexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jpsj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jpsj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kdgdocs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kdgdocs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kluwer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kluwer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ksp-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ksp-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ku-template.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ku-template.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci-avm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci-avm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limecv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limecv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lion-msc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lion-msc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-llncsconf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-llncsconf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lni.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lni.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3mem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3mem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcmthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcmthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mentis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mentis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlacls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlacls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mluexercise.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mluexercise.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnras.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnras.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modeles-factures-belges-assocs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modeles-factures-belges-assocs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msu-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msu-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mucproc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mucproc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mugsthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mugsthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-muling.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-muling.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musuos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musuos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-muthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-muthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mynsfc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mynsfc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nature.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nature.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-navydocs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-navydocs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nddiss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nddiss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ndsu-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ndsu-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-novel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-novel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nwejm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nwejm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nih.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nih.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nihbiosketch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nihbiosketch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nostarch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nostarch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nrc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nrc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onrannual.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onrannual.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opteng.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opteng.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oup-authoring-template.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oup-authoring-template.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philosophersimprint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philosophersimprint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pittetd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pittetd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkuthss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkuthss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-fuberlin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-fuberlin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-tuliplab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-tuliplab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pracjourn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pracjourn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-procIAGssymp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-procIAGssymp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proposal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proposal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prtec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prtec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrbill.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrbill.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantumarticle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantumarticle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resphilosophica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resphilosophica.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resumecls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resumecls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4-1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4-1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rutitlepage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rutitlepage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryersonsgsthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryersonsgsthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryethesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryethesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sageep.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sageep.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sapthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sapthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schule.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schule.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrjrnl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrjrnl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scientific-thesis-cover.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scientific-thesis-cover.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sduthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sduthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shortmathj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shortmathj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shtthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shtthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soton.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soton.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphdthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphdthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sr-vorl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sr-vorl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srdp-mathematik.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srdp-mathematik.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stellenbosch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stellenbosch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suftesi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suftesi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sugconf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sugconf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabriz-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabriz-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technion-thesis-template.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technion-thesis-template.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-ekf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-ekf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-gwu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-gwu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-qom.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-qom.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-titlepage-fhac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-titlepage-fhac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuaslogos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuaslogos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thucoursework.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thucoursework.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timbreicmc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timbreicmc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlc-article.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlc-article.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topletter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topletter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toptesi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toptesi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tuda-ci.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tuda-ci.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tudscr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tudscr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat-plain.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat-plain.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turabian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turabian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tui.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tui.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uaclasses.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uaclasses.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uafthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uafthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uantwerpendocs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uantwerpendocs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucalgmthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucalgmthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucbthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucbthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucdavisthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucdavisthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucsmonograph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucsmonograph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uestcthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uestcthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhhassignment.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhhassignment.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucredborder.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucredborder.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulthese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulthese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umbclegislation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umbclegislation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umich-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umich-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unam-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unam-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unamth-template.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unamth-template.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unamthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unamthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unifith.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unifith.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitn-bimrep.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitn-bimrep.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-univie-ling.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-univie-ling.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unizgklasa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unizgklasa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unswcover.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unswcover.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uothesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uothesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urcls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urcls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uowthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uowthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uowthesistitlepage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uowthesistitlepage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspatent.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspatent.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ut-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ut-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utexasthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utexasthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vancouver.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vancouver.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xduthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xduthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmuthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmuthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsemclassic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsemclassic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yathesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yathesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yazd-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yazd-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-york-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-york-thesis.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEconf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEconf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmconf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmconf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-active-conf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-active-conf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfathesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfathesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afparticle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afparticle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aiaa.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aiaa.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aomart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aomart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6e.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6e.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa7.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa7.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-articleingud.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-articleingud.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorcsthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorcsthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorexam.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorexam.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bath-bst.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bath-bst.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beilstein.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beilstein.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bgteubner.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bgteubner.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-dissertation.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-dissertation.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-thesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-thesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cesenaexam.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cesenaexam.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-confproc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-confproc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cquthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cquthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dccpaper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dccpaper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebsthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebsthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ejpecp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ejpecp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekaia.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekaia.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elbioimp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elbioimp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elsarticle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elsarticle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emisa.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emisa.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erdc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erdc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-estcpmm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-estcpmm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbithesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbithesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcltxdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcltxdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fei.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fei.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grant.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grant.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsemthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gsemthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gzt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gzt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hecthese.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hecthese.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hep-paper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hep-paper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hithesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hithesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszbeamer.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszbeamer.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hu-berlin-bundle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hu-berlin-bundle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hustthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hustthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icsv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icsv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijmart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijmart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imtekda.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imtekda.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmlr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmlr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kdgdocs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kdgdocs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kluwer.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kluwer.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci-avm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci-avm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limecv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limecv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lni.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lni.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lps.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lps.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3mem.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3mem.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcmthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcmthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mentis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mentis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlacls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlacls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mluexercise.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mluexercise.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mucproc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mucproc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mugsthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mugsthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-muling.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-muling.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musuos.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musuos.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mynsfc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mynsfc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-navydocs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-navydocs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nddiss.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nddiss.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nwejm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nwejm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nostarch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nostarch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nrc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nrc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philosophersimprint.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philosophersimprint.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pittetd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pittetd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pracjourn.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pracjourn.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proposal.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proposal.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrbill.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrbill.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resphilosophica.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resphilosophica.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resumecls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resumecls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4-1.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4-1.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rutitlepage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rutitlepage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryethesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryethesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sageep.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sageep.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrjrnl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrjrnl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scientific-thesis-cover.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scientific-thesis-cover.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sduthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sduthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sr-vorl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sr-vorl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stellenbosch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stellenbosch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suftesi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suftesi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-ekf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-ekf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-titlepage-fhac.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-titlepage-fhac.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thucoursework.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thucoursework.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timbreicmc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timbreicmc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topletter.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topletter.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toptesi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toptesi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tudscr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tudscr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uaclasses.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uaclasses.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uantwerpendocs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uantwerpendocs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucdavisthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucdavisthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucsmonograph.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucsmonograph.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhhassignment.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhhassignment.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucredborder.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucredborder.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulthese.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulthese.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uothesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uothesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ut-thesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ut-thesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xduthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xduthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmuthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmuthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsemclassic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsemclassic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yathesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yathesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-york-thesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-york-thesis.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=96759f07f369d06c1a5ca3a8dc4814d7
+_md5_=010ccbfb71f196fffa3e7f4f3310d2c5
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 5eb3e3a3de1a..b5fcca5de9f3 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/android-ndk-11c b/metadata/md5-cache/dev-util/android-ndk-11c
index d4a539efaa88..0b06cc6ca965 100644
--- a/metadata/md5-cache/dev-util/android-ndk-11c
+++ b/metadata/md5-cache/dev-util/android-ndk-11c
@@ -9,5 +9,5 @@ RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 sys-libs/
 RESTRICT=mirror strip installsources test
 SLOT=0
 SRC_URI=https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8
 _md5_=68b53f00aa5293367f7be65e1c4dff10
diff --git a/metadata/md5-cache/dev-util/android-ndk-11c-r1 b/metadata/md5-cache/dev-util/android-ndk-11c-r1
index 45d969b131f7..fc9d45cbc3f8 100644
--- a/metadata/md5-cache/dev-util/android-ndk-11c-r1
+++ b/metadata/md5-cache/dev-util/android-ndk-11c-r1
@@ -9,5 +9,5 @@ RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-
 RESTRICT=mirror strip installsources test
 SLOT=0
 SRC_URI=https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8
 _md5_=3b86a07ce3e8a93d659507c3fecec921
diff --git a/metadata/md5-cache/dev-util/android-ndk-13b b/metadata/md5-cache/dev-util/android-ndk-13b
index cb7370adf56f..b18e7e5f2f7e 100644
--- a/metadata/md5-cache/dev-util/android-ndk-13b
+++ b/metadata/md5-cache/dev-util/android-ndk-13b
@@ -9,5 +9,5 @@ RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-
 RESTRICT=mirror strip installsources test
 SLOT=0
 SRC_URI=https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8
 _md5_=3b86a07ce3e8a93d659507c3fecec921
diff --git a/metadata/md5-cache/dev-util/android-ndk-14b b/metadata/md5-cache/dev-util/android-ndk-14b
index f2e48214b4fd..1828ae41bdae 100644
--- a/metadata/md5-cache/dev-util/android-ndk-14b
+++ b/metadata/md5-cache/dev-util/android-ndk-14b
@@ -9,5 +9,5 @@ RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-
 RESTRICT=mirror strip installsources test
 SLOT=0
 SRC_URI=https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8
 _md5_=96a416094bd36de9b381d0b20eed0715
diff --git a/metadata/md5-cache/dev-util/android-ndk-16b b/metadata/md5-cache/dev-util/android-ndk-16b
index f163a3053910..9993e656c79e 100644
--- a/metadata/md5-cache/dev-util/android-ndk-16b
+++ b/metadata/md5-cache/dev-util/android-ndk-16b
@@ -9,5 +9,5 @@ RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-
 RESTRICT=mirror strip installsources test
 SLOT=0
 SRC_URI=https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8
 _md5_=96a416094bd36de9b381d0b20eed0715
diff --git a/metadata/md5-cache/dev-util/android-ndk-18 b/metadata/md5-cache/dev-util/android-ndk-18
index cbeed1b2c7ee..f12463d85eb4 100644
--- a/metadata/md5-cache/dev-util/android-ndk-18
+++ b/metadata/md5-cache/dev-util/android-ndk-18
@@ -9,5 +9,5 @@ RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 sys-libs/
 RESTRICT=mirror strip installsources test
 SLOT=0
 SRC_URI=https://dl.google.com/android/repository/android-ndk-r18-linux-x86_64.zip
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8
 _md5_=64c2b0dd8785b8d7551e8dd402a0a2a1
diff --git a/metadata/md5-cache/dev-util/aruba-1.1.2-r1 b/metadata/md5-cache/dev-util/aruba-1.1.2-r1
new file mode 100644
index 000000000000..556e14fc7d7d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/aruba-1.1.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( =dev-ruby/bundler-2*[ruby_targets_ruby26(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby26(-)] <dev-ruby/childprocess-5[ruby_targets_ruby26(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby26(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby26(-)] <dev-util/cucumber-7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/bundler-2*[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby27(-)] <dev-ruby/childprocess-5[ruby_targets_ruby27(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby27(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby27(-)] <dev-util/cucumber-7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( sys-devel/bc ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Cucumber steps for driving out command line applications
+EAPI=7
+HOMEPAGE=https://github.com/cucumber/aruba
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( =dev-ruby/bundler-2*[ruby_targets_ruby26(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby26(-)] <dev-ruby/childprocess-5[ruby_targets_ruby26(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby26(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby26(-)] <dev-util/cucumber-7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/bundler-2*[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby27(-)] <dev-ruby/childprocess-5[ruby_targets_ruby27(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby27(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby27(-)] <dev-util/cucumber-7[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/cucumber/aruba/archive/v1.1.2.tar.gz -> aruba-1.1.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2ddfe83f7cefacd4ac52d0a902c6d1b5
diff --git a/metadata/md5-cache/dev-util/aruba-2.0.0 b/metadata/md5-cache/dev-util/aruba-2.0.0
new file mode 100644
index 000000000000..09288d6a0aa7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/aruba-2.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( =dev-ruby/bundler-2*[ruby_targets_ruby26(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby26(-)] <dev-ruby/childprocess-5[ruby_targets_ruby26(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby26(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby26(-)] <dev-util/cucumber-8[ruby_targets_ruby26(-)] !<dev-util/aruba-1.1.2-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/bundler-2*[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby27(-)] <dev-ruby/childprocess-5[ruby_targets_ruby27(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby27(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby27(-)] <dev-util/cucumber-8[ruby_targets_ruby27(-)] !<dev-util/aruba-1.1.2-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( sys-devel/bc ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Cucumber steps for driving out command line applications
+EAPI=8
+HOMEPAGE=https://github.com/cucumber/aruba
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( =dev-ruby/bundler-2*[ruby_targets_ruby26(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby26(-)] <dev-ruby/childprocess-5[ruby_targets_ruby26(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby26(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby26(-)] <dev-util/cucumber-8[ruby_targets_ruby26(-)] !<dev-util/aruba-1.1.2-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/bundler-2*[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-2.0[ruby_targets_ruby27(-)] <dev-ruby/childprocess-5[ruby_targets_ruby27(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby27(-)] <dev-ruby/contracts-0.18:0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby27(-)] <dev-util/cucumber-8[ruby_targets_ruby27(-)] !<dev-util/aruba-1.1.2-r1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/cucumber/aruba/archive/v2.0.0.tar.gz -> aruba-2.0.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1dd75f102e89cf336d65448c94e3ca38
diff --git a/metadata/md5-cache/dev-util/babeltrace-1.5.8 b/metadata/md5-cache/dev-util/babeltrace-1.5.8
index 2bbacfdfc1ab..b2744b142bb8 100644
--- a/metadata/md5-cache/dev-util/babeltrace-1.5.8
+++ b/metadata/md5-cache/dev-util/babeltrace-1.5.8
@@ -4,10 +4,10 @@ DESCRIPTION=A command-line tool and library to read and convert trace files
 EAPI=7
 HOMEPAGE=https://babeltrace.org/
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/popt dev-libs/elfutils sys-apps/util-linux
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.efficios.com/files/babeltrace/babeltrace-1.5.8.tar.bz2
-_md5_=ebc5775cc94a2fc0b81af1ca29d4a078
+_md5_=f79d79fe57b7bc5785f87c301005d4c6
diff --git a/metadata/md5-cache/dev-util/bats-1.3.0 b/metadata/md5-cache/dev-util/bats-1.3.0
index 06c254b9c830..38b946670e03 100644
--- a/metadata/md5-cache/dev-util/bats-1.3.0
+++ b/metadata/md5-cache/dev-util/bats-1.3.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-shells/bash:*
 SLOT=0
 SRC_URI=https://github.com/bats-core/bats-core/archive/v1.3.0.tar.gz -> bats-1.3.0.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=31f9e49a50f1938802e59c06e92adbf2
diff --git a/metadata/md5-cache/dev-util/bats-1.4.1 b/metadata/md5-cache/dev-util/bats-1.4.1
index e7839298d16f..e36934c1faa5 100644
--- a/metadata/md5-cache/dev-util/bats-1.4.1
+++ b/metadata/md5-cache/dev-util/bats-1.4.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-shells/bash:*
 SLOT=0
 SRC_URI=https://github.com/bats-core/bats-core/archive/v1.4.1.tar.gz -> bats-1.4.1.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=865b84af7e2aa0309f1294fa213fb261
diff --git a/metadata/md5-cache/dev-util/byacc-20210619 b/metadata/md5-cache/dev-util/byacc-20210619
index 6c4a916d58f3..299b718ddcdd 100644
--- a/metadata/md5-cache/dev-util/byacc-20210619
+++ b/metadata/md5-cache/dev-util/byacc-20210619
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure
 DESCRIPTION=the best variant of the Yacc parser generator
 EAPI=7
 HOMEPAGE=https://invisible-island.net/byacc/byacc.html
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/byacc/byacc-20210619.tgz
-_md5_=75164ea3da3e5723e9a279ade17dd2e3
+_md5_=5d0efc811e4e1a8d0c232ca77d4ed43e
diff --git a/metadata/md5-cache/dev-util/cargo-c-0.9.0 b/metadata/md5-cache/dev-util/cargo-c-0.9.0
index 567f06b07f7d..da3b9e1f70b8 100644
--- a/metadata/md5-cache/dev-util/cargo-c-0.9.0
+++ b/metadata/md5-cache/dev-util/cargo-c-0.9.0
@@ -5,11 +5,11 @@ DESCRIPTION=Helper program to build and install c-like libraries
 EAPI=7
 HOMEPAGE=https://github.com/lu-zero/cargo-c
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0 MIT
 RDEPEND=dev-libs/openssl:0= net-libs/libssh2 net-misc/curl[ssl] sys-libs/zlib
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/cargo-c/0.9.0+cargo-0.54/download -> cargo-c-0.9.0+cargo-0.54.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.41/download -> anyhow-1.0.41.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.1.0/download -> bitmaps-2.1.0.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/bytesize/1.0.1/download -> bytesize-1.0.1.crate https://crates.io/api/v1/crates/cargo/0.54.0/download -> cargo-0.54.0.crate https://crates.io/api/v1/crates/cargo-platform/0.1.1/download -> cargo-platform-0.1.1.crate https://crates.io/api/v1/crates/cargo-util/0.1.0/download -> cargo-util-0.1.0.crate https://crates.io/api/v1/crates/cbindgen/0.19.0/download -> cbindgen-0.19.0.crate https://crates.io/api/v1/crates/cc/1.0.68/download -> cc-1.0.68.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/crates-io/0.33.0/download -> crates-io-0.33.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crypto-hash/0.3.4/download -> crypto-hash-0.3.4.crate https://crates.io/api/v1/crates/curl/0.4.38/download -> curl-0.4.38.crate https://crates.io/api/v1/crates/curl-sys/0.4.44+curl-7.77.0/download -> curl-sys-0.4.44+curl-7.77.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.8.4/download -> env_logger-0.8.4.crate https://crates.io/api/v1/crates/filetime/0.2.14/download -> filetime-0.2.14.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fwdansi/1.1.0/download -> fwdansi-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/git2/0.13.20/download -> git2-0.13.20.crate https://crates.io/api/v1/crates/git2-curl/0.14.1/download -> git2-curl-0.14.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.8/download -> globset-0.4.8.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/im-rc/15.0.0/download -> im-rc-15.0.0.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.97/download -> libc-0.2.97.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.21+1.1.0/download -> libgit2-sys-0.12.21+1.1.0.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.6+1.43.0/download -> libnghttp2-sys-0.1.6+1.43.0.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.21/download -> libssh2-sys-0.2.21.crate https://crates.io/api/v1/crates/libz-sys/1.1.3/download -> libz-sys-1.1.3.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/opener/0.4.1/download -> opener-0.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.35/download -> openssl-0.10.35.crate https://crates.io/api/v1/crates/openssl-probe/0.1.4/download -> openssl-probe-0.1.4.crate https://crates.io/api/v1/crates/openssl-src/111.15.0+1.1.1k/download -> openssl-src-111.15.0+1.1.1k.crate https://crates.io/api/v1/crates/openssl-sys/0.9.65/download -> openssl-sys-0.9.65.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.9/download -> redox_syscall-0.2.9.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustfix/0.5.1/download -> rustfix-0.5.1.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/semver/0.10.0/download -> semver-0.10.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.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_ignored/0.1.2/download -> serde_ignored-0.1.2.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/shell-escape/0.1.5/download -> shell-escape-0.1.5.crate https://crates.io/api/v1/crates/sized-chunks/0.6.5/download -> sized-chunks-0.6.5.crate https://crates.io/api/v1/crates/socket2/0.4.0/download -> socket2-0.4.0.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/syn/1.0.73/download -> syn-1.0.73.crate https://crates.io/api/v1/crates/tar/0.4.35/download -> tar-0.4.35.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
 _eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=84ddcaf968459eafb996e4450c28ff6f
+_md5_=14253834147b37ef5b505d5909301e19
diff --git a/metadata/md5-cache/dev-util/cargo-ebuild-0.2.0 b/metadata/md5-cache/dev-util/cargo-ebuild-0.2.0
deleted file mode 100644
index a3610b7ce161..000000000000
--- a/metadata/md5-cache/dev-util/cargo-ebuild-0.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=Generates an ebuild for a package using the in-tree eclasses.
-EAPI=7
-HOMEPAGE=https://github.com/cardoe/cargo-ebuild
-IUSE=debug
-KEYWORDS=~amd64 ~ppc64
-LICENSE=|| ( MIT Apache-2.0 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.6/download -> autocfg-0.1.6.crate https://crates.io/api/v1/crates/backtrace/0.3.38/download -> backtrace-0.3.38.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.0/download -> bitflags-1.2.0.crate https://crates.io/api/v1/crates/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/bytesize/1.0.0/download -> bytesize-1.0.0.crate https://crates.io/api/v1/crates/c2-chacha/0.2.2/download -> c2-chacha-0.2.2.crate https://crates.io/api/v1/crates/cargo/0.37.0/download -> cargo-0.37.0.crate https://crates.io/api/v1/crates/cargo-ebuild/0.2.0/download -> cargo-ebuild-0.2.0.crate https://crates.io/api/v1/crates/cc/1.0.45/download -> cc-1.0.45.crate https://crates.io/api/v1/crates/cfg-if/0.1.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/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/crates-io/0.25.0/download -> crates-io-0.25.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.3.9/download -> crossbeam-channel-0.3.9.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/crypto-hash/0.3.4/download -> crypto-hash-0.3.4.crate https://crates.io/api/v1/crates/curl/0.4.25/download -> curl-0.4.25.crate https://crates.io/api/v1/crates/curl-sys/0.4.23/download -> curl-sys-0.4.23.crate https://crates.io/api/v1/crates/env_logger/0.6.2/download -> env_logger-0.6.2.crate https://crates.io/api/v1/crates/failure/0.1.5/download -> failure-0.1.5.crate https://crates.io/api/v1/crates/failure_derive/0.1.5/download -> failure_derive-0.1.5.crate https://crates.io/api/v1/crates/filetime/0.2.7/download -> filetime-0.2.7.crate https://crates.io/api/v1/crates/flate2/1.0.12/download -> flate2-1.0.12.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fwdansi/1.0.1/download -> fwdansi-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.1.12/download -> getrandom-0.1.12.crate https://crates.io/api/v1/crates/git2/0.8.0/download -> git2-0.8.0.crate https://crates.io/api/v1/crates/git2-curl/0.9.0/download -> git2-curl-0.9.0.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.4/download -> globset-0.4.4.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/home/0.3.4/download -> home-0.3.4.crate https://crates.io/api/v1/crates/http/0.1.18/download -> http-0.1.18.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/ignore/0.4.10/download -> ignore-0.4.10.crate https://crates.io/api/v1/crates/im-rc/12.3.4/download -> im-rc-12.3.4.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/jobserver/0.1.17/download -> jobserver-0.1.17.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.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.11/download -> libgit2-sys-0.7.11.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.2/download -> libnghttp2-sys-0.1.2.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.12/download -> libssh2-sys-0.2.12.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/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.3/download -> miniz_oxide-0.3.3.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/opener/0.4.1/download -> opener-0.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.25/download -> openssl-0.10.25.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.51/download -> openssl-sys-0.9.51.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.16/download -> pkg-config-0.3.16.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.5/download -> ppv-lite86-0.2.5.crate https://crates.io/api/v1/crates/proc-macro-error/0.2.6/download -> proc-macro-error-0.2.6.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.5/download -> proc-macro2-1.0.5.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand/0.7.2/download -> rand-0.7.2.crate https://crates.io/api/v1/crates/rand_chacha/0.2.1/download -> rand_chacha-0.2.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustfix/0.4.6/download -> rustfix-0.4.6.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/schannel/0.1.16/download -> schannel-0.1.16.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.101/download -> serde-1.0.101.crate https://crates.io/api/v1/crates/serde_derive/1.0.101/download -> serde_derive-1.0.101.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.41/download -> serde_json-1.0.41.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/sized-chunks/0.1.3/download -> sized-chunks-0.1.3.crate https://crates.io/api/v1/crates/smallvec/0.6.10/download -> smallvec-0.6.10.crate https://crates.io/api/v1/crates/socket2/0.3.11/download -> socket2-0.3.11.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.3/download -> structopt-0.3.3.crate https://crates.io/api/v1/crates/structopt-derive/0.3.3/download -> structopt-derive-0.3.3.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/synstructure/0.10.2/download -> synstructure-0.10.2.crate https://crates.io/api/v1/crates/tar/0.4.26/download -> tar-0.4.26.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/toml/0.5.3/download -> toml-0.5.3.crate https://crates.io/api/v1/crates/typenum/1.11.2/download -> typenum-1.11.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-segmentation/1.3.0/download -> unicode-segmentation-1.3.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url_serde/0.2.0/download -> url_serde-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.7/download -> vcpkg-0.2.7.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.2/download -> wincolor-1.0.2.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=53a9b0c6375b8bda6b0bac08288ad1b0
diff --git a/metadata/md5-cache/dev-util/cargo-ebuild-0.3.0 b/metadata/md5-cache/dev-util/cargo-ebuild-0.3.0
deleted file mode 100644
index 336e3c6635b8..000000000000
--- a/metadata/md5-cache/dev-util/cargo-ebuild-0.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=Generates an ebuild for a package using the in-tree eclasses.
-EAPI=7
-HOMEPAGE=https://github.com/cardoe/cargo-ebuild
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=Apache-2.0 Boost-1.0 MIT
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/bitflags/1.2.0/download -> bitflags-1.2.0.crate https://crates.io/api/v1/crates/cargo-ebuild/0.3.0/download -> cargo-ebuild-0.3.0.crate https://crates.io/api/v1/crates/cargo_metadata/0.9.1/download -> cargo_metadata-0.9.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.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.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/proc-macro-error/0.2.6/download -> proc-macro-error-0.2.6.crate https://crates.io/api/v1/crates/proc-macro2/1.0.5/download -> proc-macro2-1.0.5.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.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/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.101/download -> serde-1.0.101.crate https://crates.io/api/v1/crates/serde_derive/1.0.101/download -> serde_derive-1.0.101.crate https://crates.io/api/v1/crates/serde_json/1.0.41/download -> serde_json-1.0.41.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.3/download -> structopt-0.3.3.crate https://crates.io/api/v1/crates/structopt-derive/0.3.3/download -> structopt-derive-0.3.3.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/unicode-segmentation/1.3.0/download -> unicode-segmentation-1.3.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.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/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2cde69142112737d30578f56bc4dc1cc
diff --git a/metadata/md5-cache/dev-util/cargo-ebuild-0.3.1 b/metadata/md5-cache/dev-util/cargo-ebuild-0.3.1
deleted file mode 100644
index e85132d61f0d..000000000000
--- a/metadata/md5-cache/dev-util/cargo-ebuild-0.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=Generates an ebuild for a package using the in-tree eclasses.
-EAPI=7
-HOMEPAGE=https://github.com/cardoe/cargo-ebuild
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=Apache-2.0 Boost-1.0 MIT
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.31/download -> anyhow-1.0.31.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cargo-ebuild/0.3.1/download -> cargo-ebuild-0.3.1.crate https://crates.io/api/v1/crates/cargo_metadata/0.9.1/download -> cargo_metadata-0.9.1.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.14/download -> hermit-abi-0.1.14.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.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.71/download -> libc-0.2.71.crate https://crates.io/api/v1/crates/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.18/download -> proc-macro2-1.0.18.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.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.112/download -> serde-1.0.112.crate https://crates.io/api/v1/crates/serde_derive/1.0.112/download -> serde_derive-1.0.112.crate https://crates.io/api/v1/crates/serde_json/1.0.55/download -> serde_json-1.0.55.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.15/download -> structopt-0.3.15.crate https://crates.io/api/v1/crates/structopt-derive/0.4.8/download -> structopt-derive-0.4.8.crate https://crates.io/api/v1/crates/syn/1.0.31/download -> syn-1.0.31.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/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8bff26a48a97a91ac0bfb513b3ec9a7d
diff --git a/metadata/md5-cache/dev-util/cargo-ebuild-0.3.3 b/metadata/md5-cache/dev-util/cargo-ebuild-0.3.3
new file mode 100644
index 000000000000..765fb9e1c87c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cargo-ebuild-0.3.3
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Generates an ebuild for a package using the in-tree eclasses.
+EAPI=7
+HOMEPAGE=https://gitweb.gentoo.org/proj/cargo-ebuild.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0 Boost-1.0 MIT
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/cargo-ebuild.git/snapshot/cargo-ebuild-0.3.3.tar.bz2 https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.42/download -> anyhow-1.0.42.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/base-x/0.2.8/download -> base-x-0.2.8.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bumpalo/3.7.0/download -> bumpalo-3.7.0.crate https://crates.io/api/v1/crates/camino/1.0.5/download -> camino-1.0.5.crate https://crates.io/api/v1/crates/cargo-lock/7.0.1/download -> cargo-lock-7.0.1.crate https://crates.io/api/v1/crates/cargo-platform/0.1.1/download -> cargo-platform-0.1.1.crate https://crates.io/api/v1/crates/cargo_metadata/0.14.0/download -> cargo_metadata-0.14.0.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/const_fn/0.4.8/download -> const_fn-0.4.8.crate https://crates.io/api/v1/crates/discard/1.0.4/download -> discard-1.0.4.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.98/download -> libc-0.2.98.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.9.0/download -> phf-0.9.0.crate https://crates.io/api/v1/crates/phf_generator/0.9.0/download -> phf_generator-0.9.0.crate https://crates.io/api/v1/crates/phf_macros/0.9.0/download -> phf_macros-0.9.0.crate https://crates.io/api/v1/crates/phf_shared/0.9.0/download -> phf_shared-0.9.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.28/download -> proc-macro2-1.0.28.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver/1.0.4/download -> semver-1.0.4.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.127/download -> serde-1.0.127.crate https://crates.io/api/v1/crates/serde_derive/1.0.127/download -> serde_derive-1.0.127.crate https://crates.io/api/v1/crates/serde_json/1.0.66/download -> serde_json-1.0.66.crate https://crates.io/api/v1/crates/sha1/0.6.0/download -> sha1-0.6.0.crate https://crates.io/api/v1/crates/siphasher/0.3.6/download -> siphasher-0.3.6.crate https://crates.io/api/v1/crates/standback/0.2.17/download -> standback-0.2.17.crate https://crates.io/api/v1/crates/stdweb/0.4.20/download -> stdweb-0.4.20.crate https://crates.io/api/v1/crates/stdweb-derive/0.5.3/download -> stdweb-derive-0.5.3.crate https://crates.io/api/v1/crates/stdweb-internal-macros/0.2.9/download -> stdweb-internal-macros-0.2.9.crate https://crates.io/api/v1/crates/stdweb-internal-runtime/0.1.5/download -> stdweb-internal-runtime-0.1.5.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.22/download -> structopt-0.3.22.crate https://crates.io/api/v1/crates/structopt-derive/0.4.15/download -> structopt-derive-0.4.15.crate https://crates.io/api/v1/crates/syn/1.0.74/download -> syn-1.0.74.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.2.27/download -> time-0.2.27.crate https://crates.io/api/v1/crates/time-macros/0.1.1/download -> time-macros-0.1.1.crate https://crates.io/api/v1/crates/time-macros-impl/0.1.2/download -> time-macros-impl-0.1.2.crate https://crates.io/api/v1/crates/tinyvec/1.3.1/download -> tinyvec-1.3.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.75/download -> wasm-bindgen-0.2.75.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.75/download -> wasm-bindgen-backend-0.2.75.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.75/download -> wasm-bindgen-macro-0.2.75.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.75/download -> wasm-bindgen-macro-support-0.2.75.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.75/download -> wasm-bindgen-shared-0.2.75.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=91a75570090fef3df5527707a3497b2a
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index 41b9b5ed76a8..83403be43d34 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/snakeoil-0.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/fasteners[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/util-linux[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydecomp-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-arch/lbzip2 app-arch/pixz app-arch/tar[xattr] dev-vcs/git sys-fs/dosfstools sys-fs/squashfs-tools-ng[tools] iso? ( app-cdr/cdrtools dev-libs/libisoburn amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) ia64? ( sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ppc? ( sys-boot/grub:2[grub_platforms_ieee1275] ) ppc64? ( sys-boot/grub:2[grub_platforms_ieee1275] ) sparc? ( sys-boot/grub:2[grub_platforms_ieee1275] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3f9fecc7f1cdf83b7c42fb492e5f61d6
diff --git a/metadata/md5-cache/dev-util/catkin-0.8.10 b/metadata/md5-cache/dev-util/catkin-0.8.10
new file mode 100644
index 000000000000..c16e5a27df9b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/catkin-0.8.10
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/empy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/cmake test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/catkin
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/empy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/cmake
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/catkin/archive/0.8.10.tar.gz -> catkin-0.8.10.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4b69a7067fb12746d4dc792fdb269012
diff --git a/metadata/md5-cache/dev-util/catkin-0.8.9 b/metadata/md5-cache/dev-util/catkin-0.8.9
deleted file mode 100644
index c78254893f95..000000000000
--- a/metadata/md5-cache/dev-util/catkin-0.8.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/empy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/cmake test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/catkin
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/empy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/cmake
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/catkin/archive/0.8.9.tar.gz -> catkin-0.8.9.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bd9b93bee72a06d06415ea883a89e87c
diff --git a/metadata/md5-cache/dev-util/catkin-9999 b/metadata/md5-cache/dev-util/catkin-9999
index c39cefbfe3ae..58253840dd05 100644
--- a/metadata/md5-cache/dev-util/catkin-9999
+++ b/metadata/md5-cache/dev-util/catkin-9999
@@ -1,5 +1,5 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/empy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/cmake test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
 EAPI=7
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bd9b93bee72a06d06415ea883a89e87c
+_md5_=4b69a7067fb12746d4dc792fdb269012
diff --git a/metadata/md5-cache/dev-util/ccache-4.3-r2 b/metadata/md5-cache/dev-util/ccache-4.3-r2
index b6c07f4c60ca..52e7a5993c1a 100644
--- a/metadata/md5-cache/dev-util/ccache-4.3-r2
+++ b/metadata/md5-cache/dev-util/ccache-4.3-r2
@@ -5,11 +5,11 @@ DESCRIPTION=fast compiler cache
 EAPI=7
 HOMEPAGE=https://ccache.dev/
 IUSE=static-c++ test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=app-arch/zstd:0= dev-util/shadowman sys-apps/gentoo-functions
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccache/ccache/releases/download/v4.3/ccache-4.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=70e288abed9e0ba38ee6757ef13198c5
+_md5_=7856dbe5d250ff1d7d67f92ff85beed3
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.21.2 b/metadata/md5-cache/dev-util/checkbashisms-2.21.2
index 722c371b078c..e5236b67170b 100644
--- a/metadata/md5-cache/dev-util/checkbashisms-2.21.2
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.21.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
 EAPI=7
 HOMEPAGE=https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.21.2.tar.xz
-_md5_=2d167535e207b62ec69993220957e803
+_md5_=55e68adaa1727a4f6481404edcfeaf34
diff --git a/metadata/md5-cache/dev-util/cmake-3.13.5 b/metadata/md5-cache/dev-util/cmake-3.13.5
deleted file mode 100644
index 5dfba6e92de2..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.13.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=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 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-DESCRIPTION=Cross platform Make
-EAPI=7
-HOMEPAGE=https://cmake.org/
-IUSE=doc emacs system-jsoncpp ncurses qt5 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=CMake
-RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=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 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.13/cmake-3.13.5.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0eb3eb2d6101aba7927f93abc1231c88
diff --git a/metadata/md5-cache/dev-util/cmake-3.18.5 b/metadata/md5-cache/dev-util/cmake-3.18.5
index 0d8e041a9294..51076947d783 100644
--- a/metadata/md5-cache/dev-util/cmake-3.18.5
+++ b/metadata/md5-cache/dev-util/cmake-3.18.5
@@ -1,4 +1,4 @@
-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 )
+BDEPEND=doc? ( dev-python/requests <dev-python/sphinx-4 ) 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
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.18/cmake-3.18.5.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a0534cb013ea0d4963c4666fe4fefa72
+_md5_=b6e7edee8de7b8938f0ea1972b9c2bc0
diff --git a/metadata/md5-cache/dev-util/cmake-3.19.7 b/metadata/md5-cache/dev-util/cmake-3.19.7
deleted file mode 100644
index f1af0faf523c..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.19.7
+++ /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.7.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2b05dc93551f629b5e16ba64d73aac39
diff --git a/metadata/md5-cache/dev-util/cmake-3.20.5 b/metadata/md5-cache/dev-util/cmake-3.20.5
index ef9a582f173d..c7c3b213f09f 100644
--- a/metadata/md5-cache/dev-util/cmake-3.20.5
+++ b/metadata/md5-cache/dev-util/cmake-3.20.5
@@ -5,11 +5,11 @@ 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
+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.20/cmake-3.20.5.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=229a4c6efbbdb05bdf1c29c74d770397
+_md5_=9bece92da8114e238a3dd4c91e6fdaac
diff --git a/metadata/md5-cache/dev-util/cmake-3.21.0 b/metadata/md5-cache/dev-util/cmake-3.21.0
deleted file mode 100644
index 01b491b5312c..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.21.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Cross platform Make
-EAPI=7
-HOMEPAGE=https://cmake.org/
-IUSE=doc emacs ncurses qt5 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=CMake
-RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.21/cmake-3.21.0.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=229a4c6efbbdb05bdf1c29c74d770397
diff --git a/metadata/md5-cache/dev-util/codeblocks-17.12-r303 b/metadata/md5-cache/dev-util/codeblocks-17.12-r303
index e58855d93e21..7e9cf44d5b86 100644
--- a/metadata/md5-cache/dev-util/codeblocks-17.12-r303
+++ b/metadata/md5-cache/dev-util/codeblocks-17.12-r303
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/zip >=dev-libs/tinyxml-2.6.2-r3 >=dev-util/astyle-3.0.1-r1:0= 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_17.12.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-17.12-fortran.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f5b22e2ca45427578e010fa33b79c0e2
diff --git a/metadata/md5-cache/dev-util/codeblocks-17.12-r304 b/metadata/md5-cache/dev-util/codeblocks-17.12-r304
index 52c92b24646f..335db8d5a356 100644
--- a/metadata/md5-cache/dev-util/codeblocks-17.12-r304
+++ b/metadata/md5-cache/dev-util/codeblocks-17.12-r304
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/zip >=dev-libs/tinyxml-2.6.2-r3 >=dev-util/astyle-3.0.1-r1:0= 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_17.12.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-17.12-fortran.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=61fb44cff41cdd3d5766f0ddbb579638
diff --git a/metadata/md5-cache/dev-util/codeblocks-20.03-r1 b/metadata/md5-cache/dev-util/codeblocks-20.03-r1
index 1c395919a6b7..245605ec01a6 100644
--- a/metadata/md5-cache/dev-util/codeblocks-20.03-r1
+++ b/metadata/md5-cache/dev-util/codeblocks-20.03-r1
@@ -10,5 +10,5 @@ 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	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5bcd16d60b5c93744167ecf419342a9c
diff --git a/metadata/md5-cache/dev-util/codeblocks-20.03-r2 b/metadata/md5-cache/dev-util/codeblocks-20.03-r2
index c36235eb0d08..896a5d1b4746 100644
--- a/metadata/md5-cache/dev-util/codeblocks-20.03-r2
+++ b/metadata/md5-cache/dev-util/codeblocks-20.03-r2
@@ -10,5 +10,5 @@ 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	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b8f846678c35444775d75088b3f185bf
diff --git a/metadata/md5-cache/dev-util/codeblocks-9999 b/metadata/md5-cache/dev-util/codeblocks-9999
index 8590b6e5d8ac..8ebe71aa26d0 100644
--- a/metadata/md5-cache/dev-util/codeblocks-9999
+++ b/metadata/md5-cache/dev-util/codeblocks-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 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
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	c500a1b7795f44153bd96fc2597e3c05	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	c500a1b7795f44153bd96fc2597e3c05	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=33bcc68ac0c5dce7f43aa03616e5260d
diff --git a/metadata/md5-cache/dev-util/cppcheck-2.2 b/metadata/md5-cache/dev-util/cppcheck-2.2
index bf319542b439..a0e447c0d2fd 100644
--- a/metadata/md5-cache/dev-util/cppcheck-2.2
+++ b/metadata/md5-cache/dev-util/cppcheck-2.2
@@ -5,11 +5,11 @@ DESCRIPTION=Static analyzer of C/C++ code
 EAPI=7
 HOMEPAGE=https://github.com/danmar/cppcheck
 IUSE=htmlreport pcre qt5 +z3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 sparc x86
 LICENSE=GPL-3+
 RDEPEND=htmlreport? ( dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp dev-qt/qtprintsupport:5 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/2.2.tar.gz -> cppcheck-2.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=35e937a058d489dd9dbd7840472af2c7
+_md5_=567347afb3aedf30443a6ecc5a243f5e
diff --git a/metadata/md5-cache/dev-util/cucumber-7.0.0 b/metadata/md5-cache/dev-util/cucumber-7.0.0
index 44575d92f76c..16c9ed93c6ff 100644
--- a/metadata/md5-cache/dev-util/cucumber-7.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-7.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Executable feature scenarios
 EAPI=8
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=examples test test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-create-meta-6.0.1:6[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-gherkin-20.0.1:20[ruby_targets_ruby26(-)] >=dev-util/cucumber-html-formatter-16.0.1:16[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-6.0.1:6[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby27(-)] >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-create-meta-6.0.1:6[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-gherkin-20.0.1:20[ruby_targets_ruby27(-)] >=dev-util/cucumber-html-formatter-16.0.1:16[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby27(-)] >=dev-util/cucumber-wire-6.0.1:6[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby27(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v7.0.0.tar.gz -> cucumber-7.0.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=280c1d984a9e784dee1c5120f6473c70
+_md5_=b37f4e802a445e2e4cb8557ef9f6b48e
diff --git a/metadata/md5-cache/dev-util/cucumber-core-10.0.1 b/metadata/md5-cache/dev-util/cucumber-core-10.0.1
index 9bed7f46139b..d5e25d8d314e 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-10.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-10.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Executable feature scenarios
 EAPI=8
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-gherkin-20.0.1:20[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-gherkin-20.0.1:20[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-gherkin-20.0.1:20[ruby_targets_ruby30(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v10.0.1.tar.gz -> cucumber-core-10.0.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6c3f74981c0a19bcf96f5db92b56f3a0
+_md5_=4e6386bef68bfc71f014b31756d66d57
diff --git a/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1 b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1
index ec5af6494124..b191f671f984 100644
--- a/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=HTML formatter for Cucumber
 EAPI=8
 HOMEPAGE=https://cucumber.io/
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/cucumber-create-meta-6.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=24b7affaf3f393e1b77be5f062c535c5
+_md5_=415118ff20ea44f2a20000d3f95c5646
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.1 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.1
index ab2085ef0abf..8b13462ccb95 100644
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.1
@@ -5,7 +5,7 @@ DESCRIPTION=a simpler alternative to Regular Expressions
 EAPI=7
 HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=12
 SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-12.1.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=91c36ae67949d73511c04adc2ee11b37
+_md5_=709924b55ce8a42d58d7401a0468d5e0
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1 b/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1
index fcf3ad6a3772..febe0031d705 100644
--- a/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Fast Gherkin lexer and parser
 EAPI=8
 HOMEPAGE=https://github.com/cucumber/gherkin
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=20
 SRC_URI=https://github.com/cucumber/common/archive/gherkin/v20.0.1.tar.gz -> cucumber-gherkin-20.0.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a1f3ce5cdd7fddc09537aed90dcb7c09
+_md5_=8e4d5ddefdc22ae0fcc3a4cacfd14515
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r1 b/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r1
index aee9f14aa2cb..b18dd7acb66f 100644
--- a/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r1
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=HTML formatter for Cucumber
 EAPI=8
 HOMEPAGE=https://cucumber.io/
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16
 SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-16.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fd1d86a67cd700db7e0b791aa4eb528b
+_md5_=c4a0712e100775df5ffd90a359f748a3
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-17.0.1 b/metadata/md5-cache/dev-util/cucumber-messages-17.0.1
index 4aae1aad6feb..7a1695e285fd 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-17.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-messages-17.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Protocol Buffer messages for Cucumber's inter-process communication
 EAPI=8
 HOMEPAGE=https://github.com/cucumber/cucumber-messages-ruby#readme
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://rubygems.org/gems/cucumber-messages-17.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4254b5e2514bc60c32778f7a41e6d62e
+_md5_=ea5ccd98558a65c7808fd849156edb61
diff --git a/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1 b/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1
index b52cfb222b7f..95e2d340f516 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Cucumber tag expressions for ruby
 EAPI=7
 HOMEPAGE=https://docs.cucumber.io/tag-expressions/
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/cucumber-tag-expressions-3.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2349d8a0ad9d7b12b43cbc6fba3813b8
+_md5_=4cda5455c02910b9f68df82bd8de445f
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-6.0.1 b/metadata/md5-cache/dev-util/cucumber-wire-6.0.1
index 84b210462e78..a408eb4326e6 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-6.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-6.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Executable feature scenarios
 EAPI=8
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/cucumber-wire-6.0.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	ruby-fakegem	3e905d374dad540cd5fbc89cefca91c4	ruby-ng	ab9b21d1b0a24b6afdd489885350e82e	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bdef42b11d6830eb07a1346b50e64f94
+_md5_=756fff850a25f287c5db29cf5c158834
diff --git a/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r1 b/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r1
index c1c6ce9f277b..146b67625069 100644
--- a/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r1
+++ b/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Run executables under a new DBus session for testing
 EAPI=7
 HOMEPAGE=https://launchpad.net/dbus-test-runner
 IUSE=test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/dbus-glib dev-libs/glib:2 python_single_target_python3_8? ( dev-python/dbusmock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbusmock[python_targets_python3_9(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/dbus-test-runner/19.04/19.04.0/+download/dbus-test-runner-19.04.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6df50bee87e58f046aeaa8177d3fb53c
+_md5_=679cd341fda8a407cc6923f9af2e338d
diff --git a/metadata/md5-cache/dev-util/ddd-3.3.12-r5 b/metadata/md5-cache/dev-util/ddd-3.3.12-r5
index 0971c67d4965..961e68d15584 100644
--- a/metadata/md5-cache/dev-util/ddd-3.3.12-r5
+++ b/metadata/md5-cache/dev-util/ddd-3.3.12-r5
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/gdb sys-libs/ncurses:= x11-libs/libX11 x11-libs/libXaw x11-lib
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/ddd/ddd-3.3.12.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=96b90f569fb301b885b458524655defd
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.6.3 b/metadata/md5-cache/dev-util/dejagnu-1.6.3
index 052fc3eebc86..73b322ef4df3 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.6.3
+++ b/metadata/md5-cache/dev-util/dejagnu-1.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for testing other programs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/dejagnu/
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-tcltk/expect
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.3.tar.gz
-_md5_=811db719d3b7a3654458c7e6708afbc9
+_md5_=829df40640ba39787bab8a50a2bba890
diff --git a/metadata/md5-cache/dev-util/diffoscope-180 b/metadata/md5-cache/dev-util/diffoscope-180
new file mode 100644
index 000000000000..d5265d028d3c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-180
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( app-text/docx2txt media-libs/libcaca )
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=8
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-180.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=aba545bcd4e9fb26bfe167f70618ba55
diff --git a/metadata/md5-cache/dev-util/duma-2.5.15-r2 b/metadata/md5-cache/dev-util/duma-2.5.15-r2
index 4052a75bd3ca..d4709b551bf5 100644
--- a/metadata/md5-cache/dev-util/duma-2.5.15-r2
+++ b/metadata/md5-cache/dev-util/duma-2.5.15-r2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/duma/duma_2_5_15.tar.gz mirror://gentoo/duma-2.5.15-GNUmakefile.patch.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=f90b4a92c41b53cb5ed956806d6b29ed
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=085c9b26749af811b23b4238ebdb8fec
diff --git a/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2 b/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2
index 545d16f97e31..69f0db933bb9 100644
--- a/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2
+++ b/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2
@@ -3,9 +3,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=A 100% compatible, enhanced implementation of the make alternative Jam
 EAPI=7
 HOMEPAGE=http://freetype.sourceforge.net/jam/index.html
-KEYWORDS=amd64 arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=perforce GPL-2
 SLOT=0
 SRC_URI=http://david.freetype.org/jam/ftjam-2.5.3rc2.tar.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f1675ce890c02f1b9bf60e3cd3b4ab2f
+_md5_=0c1fe3932a8c93c05924a780f6f0617a
diff --git a/metadata/md5-cache/dev-util/fuzz-0.6-r2 b/metadata/md5-cache/dev-util/fuzz-0.6-r2
new file mode 100644
index 000000000000..44bf8361c878
--- /dev/null
+++ b/metadata/md5-cache/dev-util/fuzz-0.6-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/readline:0=
+DESCRIPTION=Stress-tests programs by giving them random input
+EAPI=7
+HOMEPAGE=http://fuzz.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/readline:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/fuzz/fuzz-0.6.tar.gz mirror://debian/pool/main/f/fuzz/fuzz_0.6-7.3.diff.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9f08d068d2f3a7519bbbe187ea3e0015
diff --git a/metadata/md5-cache/dev-util/gengetopt-2.23 b/metadata/md5-cache/dev-util/gengetopt-2.23
index 920a12d2c5d6..0e0a8957d29c 100644
--- a/metadata/md5-cache/dev-util/gengetopt-2.23
+++ b/metadata/md5-cache/dev-util/gengetopt-2.23
@@ -3,9 +3,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=A tool to write command line option parsing code for C programs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gengetopt/
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gengetopt/gengetopt-2.23.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=837ab12ccae4c69e6fc7fe28939247a6
+_md5_=450ef9149d58864bc88386737731fd7a
diff --git a/metadata/md5-cache/dev-util/glade-3.38.2 b/metadata/md5-cache/dev-util/glade-3.38.2
index eed5b068b310..a9acf1968844 100644
--- a/metadata/md5-cache/dev-util/glade-3.38.2
+++ b/metadata/md5-cache/dev-util/glade-3.38.2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=test
 SLOT=3.10/13
 SRC_URI=mirror://gnome/sources/glade/3.38/glade-3.38.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=77fd04d005a14aac67c076293e324ecd
diff --git a/metadata/md5-cache/dev-util/glslang-11.4.0 b/metadata/md5-cache/dev-util/glslang-11.4.0
index 921f21b0e7ed..4bd9b7536355 100644
--- a/metadata/md5-cache/dev-util/glslang-11.4.0
+++ b/metadata/md5-cache/dev-util/glslang-11.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V gen
 EAPI=7
 HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=!<media-libs/shaderc-2020.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/glslang/archive/11.4.0.tar.gz -> glslang-11.4.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5b2d439c3fe25a6e7de857d9f1bc56e4
+_md5_=265169c5ff486f9c550c540a58e7b8a3
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.40.2 b/metadata/md5-cache/dev-util/gnome-builder-3.40.2
index 25a217d36d54..84dbe1a25749 100644
--- a/metadata/md5-cache/dev-util/gnome-builder-3.40.2
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.40.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-builder/3.40/gnome-builder-3.40.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	llvm	19c0cdeff39b0e08d1454df31b588316	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	llvm	19c0cdeff39b0e08d1454df31b588316	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b9e1cdbb836eac09d92184240b9e99bf
diff --git a/metadata/md5-cache/dev-util/hip-4.1.0 b/metadata/md5-cache/dev-util/hip-4.1.0
index c124739dfa8f..67649f1a1a33 100644
--- a/metadata/md5-cache/dev-util/hip-4.1.0
+++ b/metadata/md5-cache/dev-util/hip-4.1.0
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0/4.1
 SRC_URI=https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-4.1.0.tar.gz -> rocm-hip-4.1.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0245a40a8387ed45af806e5e92ec3d81
+_md5_=6179035c54e7cb0f79e7ad7fa4bdef12
diff --git a/metadata/md5-cache/dev-util/hip-4.1.0-r1 b/metadata/md5-cache/dev-util/hip-4.1.0-r1
new file mode 100644
index 000000000000..750809e0a886
--- /dev/null
+++ b/metadata/md5-cache/dev-util/hip-4.1.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/rocclr:0/4.1 dev-util/rocminfo:0/4.1 =sys-devel/llvm-roc-4.1.0*[runtime]
+DESCRIPTION=C++ Heterogeneous-Compute Interface for Portability
+EAPI=7
+HOMEPAGE=https://github.com/ROCm-Developer-Tools/HIP
+IUSE=debug profile
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/rocclr:0/4.1 dev-util/rocminfo:0/4.1 =sys-devel/llvm-roc-4.1.0*[runtime]
+RESTRICT=strip
+SLOT=0/4.1
+SRC_URI=https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-4.1.0.tar.gz -> rocm-hip-4.1.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=be76d2694e75a0c0f0139c925aeceec8
diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.17 b/metadata/md5-cache/dev-util/howdoi-2.0.17
new file mode 100644
index 000000000000..6176b073533a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/howdoi-2.0.17
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A code search tool
+EAPI=7
+HOMEPAGE=https://pypi.org/project/howdoi/
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cachelib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/keep[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyquery-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.24.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/h/howdoi/howdoi-2.0.17.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3b359a1f1c45deca5209516dd7978707
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.6.2 b/metadata/md5-cache/dev-util/kdevelop-5.6.2
index e9b561fb1540..e46739841283 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.6.2
+++ b/metadata/md5-cache/dev-util/kdevelop-5.6.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/56
 SRC_URI=mirror://kde/stable/kdevelop/5.6.2/src/kdevelop-5.6.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a8c319fbf2730b92d9b553f5f55dd4f3
diff --git a/metadata/md5-cache/dev-util/lcov-1.15 b/metadata/md5-cache/dev-util/lcov-1.15
index e93d8aaaa602..18a899855296 100644
--- a/metadata/md5-cache/dev-util/lcov-1.15
+++ b/metadata/md5-cache/dev-util/lcov-1.15
@@ -7,5 +7,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-lang/perl dev-perl/JSON dev-perl/PerlIO-gzip
 SLOT=0
 SRC_URI=https://github.com/linux-test-project/lcov/releases/download/v1.15/lcov-1.15.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	prefix	d04f14b297013ad1410550c0757f14f8
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	prefix	d04f14b297013ad1410550c0757f14f8
 _md5_=62aee433c845375c9256386e05adb872
diff --git a/metadata/md5-cache/dev-util/lcov-9999 b/metadata/md5-cache/dev-util/lcov-9999
index 739e65a24ed0..f0a2967d61f6 100644
--- a/metadata/md5-cache/dev-util/lcov-9999
+++ b/metadata/md5-cache/dev-util/lcov-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=dev-lang/perl dev-perl/JSON dev-perl/PerlIO-gzip
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	prefix	d04f14b297013ad1410550c0757f14f8
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	optfeature	30ce9dec2b8943338c9b015bd32bac6a	prefix	d04f14b297013ad1410550c0757f14f8
 _md5_=e4b2a0cb05e2b7c48352d3bf9d749c40
diff --git a/metadata/md5-cache/dev-util/lldb-12.0.1 b/metadata/md5-cache/dev-util/lldb-12.0.1
index c70c072a20f0..dad413d17805 100644
--- a/metadata/md5-cache/dev-util/lldb-12.0.1
+++ b/metadata/md5-cache/dev-util/lldb-12.0.1
@@ -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_8 python_single_target_python3_9 python_single_target_python3_10
-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_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) ~sys-devel/clang-12.0.1[xml] ~sys-devel/llvm-12.0.1 !<sys-devel/llvm-4.0
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f2559662519c6e08e2130a976db0ca8b
+_md5_=d6f94849f47e52e931e33e2a3e40b883
diff --git a/metadata/md5-cache/dev-util/lldb-13.0.0_rc1 b/metadata/md5-cache/dev-util/lldb-13.0.0_rc1
new file mode 100644
index 000000000000..36d625d818ea
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-13.0.0_rc1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_8? ( ~dev-python/lit-13.0.0_rc1[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-13.0.0_rc1[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-13.0.0_rc1[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) sys-devel/lld ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) ~sys-devel/clang-13.0.0_rc1[xml] ~sys-devel/llvm-13.0.0_rc1 !<sys-devel/llvm-4.0 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM debugger
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+libedit lzma ncurses +python test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+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_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) ~sys-devel/clang-13.0.0_rc1[xml] ~sys-devel/llvm-13.0.0_rc1 !<sys-devel/llvm-4.0
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=99a26fa58ac93518c816f8979e3d9794
diff --git a/metadata/md5-cache/dev-util/meson-0.58.1 b/metadata/md5-cache/dev-util/meson-0.58.1
index c1e39acc2f5e..907453670a0e 100644
--- a/metadata/md5-cache/dev-util/meson-0.58.1
+++ b/metadata/md5-cache/dev-util/meson-0.58.1
@@ -5,7 +5,7 @@ DESCRIPTION=Open source build system
 EAPI=7
 HOMEPAGE=https://mesonbuild.com/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.58.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=66318f790361e1dd3c9aa91616ff3336
+_md5_=b45cc25c04271425de28060ea0245e32
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r3 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r3
index 5a3dcba1210a..14733ee61577 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r3
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r3
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-9[cxx] >=x11-drivers/nvidia-drivers-440.33.01 debugger? (
 RESTRICT=bindist mirror
 SLOT=0/10.2.89
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
 _md5_=88b6e548c1e3d9f9eb2fce0f8fbd6611
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1-r2
index 444c1bacc014..8befc25591dc 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1-r2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.1.1-r2
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-455.32.00 debugg
 RESTRICT=bindist mirror
 SLOT=0/11.1.1
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda_11.1.1_455.32.00_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
 _md5_=4370cf6bc16f771445333d4eafdcfcfc
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.2.2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.2.2
index f7260023c9fb..21ef98f73fba 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.2.2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.2.2
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-460.32.03 debugg
 RESTRICT=bindist mirror
 SLOT=0/11.2.2
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.2.2/local_installers/cuda_11.2.2_460.32.03_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
 _md5_=8ce50ba2fb6d73dcad60d8f8d957367b
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.3.1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.3.1
index 1648231516bd..8d907e2dce51 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.3.1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.3.1
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-465.19.01 debugg
 RESTRICT=bindist mirror
 SLOT=0/11.3.1
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.3.1/local_installers/cuda_11.3.1_465.19.01_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
 _md5_=8a28a0d95b25baacee79ca09698f5480
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.0 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.0
index 770688d27c8f..461294a58ef3 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.0
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.4.0
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-11_pre[cxx] >=x11-drivers/nvidia-drivers-470.42.01 debugg
 RESTRICT=bindist mirror
 SLOT=0/11.4.0
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.4.0/local_installers/cuda_11.4.0_470.42.01_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
 _md5_=f34485b9ece11b6960f8f067fed31c85
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88-r1
index 693138d49168..57d6d01b82e4 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-9.2.88-r1
@@ -9,5 +9,5 @@ RDEPEND=<sys-devel/gcc-8[cxx] >=x11-drivers/nvidia-drivers-396.26 debugger? ( sy
 RESTRICT=bindist mirror
 SLOT=0/9.2.88
 SRC_URI=https://developer.nvidia.com/compute/cuda/9.2/Prod/local_installers/cuda_9.2.88_396.26_linux -> cuda_9.2.88_396.26_linux.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=725271bf80c37b9d0cb342004ead88a1
diff --git a/metadata/md5-cache/dev-util/ostree-2021.3 b/metadata/md5-cache/dev-util/ostree-2021.3
new file mode 100644
index 000000000000..b46c1792b188
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ostree-2021.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils sys-devel/flex sys-devel/bison virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=archive? ( app-arch/libarchive ) app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/glib:2 dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14 ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( dev-util/gtk-doc )
+DESCRIPTION=Operating system and container binary deployment and upgrades
+EAPI=7
+HOMEPAGE=https://ostreedev.github.io/ostree/
+IUSE=archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=archive? ( app-arch/libarchive ) app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup ) dev-libs/libassuan dev-libs/glib:2 dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14 ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
+REQUIRED_USE=httpd? ( || ( curl soup ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2021.3/libostree-2021.3.tar.xz -> ostree-2021.3.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1b8ae2c7164277c8fac2f51a3979f78a
diff --git a/metadata/md5-cache/dev-util/perf-5.12 b/metadata/md5-cache/dev-util/perf-5.12
index fc322c8388e1..5b31d44d1233 100644
--- a/metadata/md5-cache/dev-util/perf-5.12
+++ b/metadata/md5-cache/dev-util/perf-5.12
@@ -5,11 +5,11 @@ DESCRIPTION=Userland tools for Linux Performance Counters
 EAPI=7
 HOMEPAGE=https://perf.wiki.kernel.org/
 IUSE=audit babeltrace clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib python_targets_python3_8 python_targets_python3_9 kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=audit? ( sys-process/audit ) babeltrace? ( dev-util/babeltrace ) crypt? ( dev-libs/openssl:0= ) clang? ( <sys-devel/clang-10:* <sys-devel/llvm-10:* ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) libpfm? ( dev-libs/libpfm ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) dev-libs/elfutils
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7c0f66e8a3035d0ba2344ad69a88e0b8
+_md5_=7ebcfc246dd5d98d516edd399722f215
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.0 b/metadata/md5-cache/dev-util/pkgcheck-0.10.0
index 945af71a0b5a..af5dfa748899 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.0
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5f66d8826c1135783a856f43e64c1ff4
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.1 b/metadata/md5-cache/dev-util/pkgcheck-0.10.1
index 31bc1f05fcb7..189fd6ad385a 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.1
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7099e98e38a375f44d2aecee406e2b21
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.2 b/metadata/md5-cache/dev-util/pkgcheck-0.10.2
index f8231ad45490..da499cd402a0 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.2
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=419a1119b0e3342c96aa35f86f87934a
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.3 b/metadata/md5-cache/dev-util/pkgcheck-0.10.3
index 2deaf5b03a79..c33fab64180d 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.3
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.3
@@ -4,12 +4,12 @@ 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 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.3.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=11d8c4f42fd4b7390987c49f2513ac9b
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f61c154277b4efa45da61ec210155fa5
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.4 b/metadata/md5-cache/dev-util/pkgcheck-0.10.4
new file mode 100644
index 000000000000..9522ab70b351
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=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 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.4.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=419a1119b0e3342c96aa35f86f87934a
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r2 b/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r2
index 11378c1f22fa..72cf53b58cae 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r2
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.7.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=65498faacf2070d7836a833978b240f5
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r3 b/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r3
index 35b8905e7f64..d4cb29378cce 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r3
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.9.7-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.7.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7c45cae09cf28b3b6f938b53ff1f767e
diff --git a/metadata/md5-cache/dev-util/pkgcheck-9999 b/metadata/md5-cache/dev-util/pkgcheck-9999
index 08219e100071..1d6589f7e9fe 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-9999
+++ b/metadata/md5-cache/dev-util/pkgcheck-9999
@@ -10,5 +10,5 @@ RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=419a1119b0e3342c96aa35f86f87934a
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.6.3 b/metadata/md5-cache/dev-util/pkgconf-1.6.3
deleted file mode 100644
index 95c002158a37..000000000000
--- a/metadata/md5-cache/dev-util/pkgconf-1.6.3
+++ /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.6.3.tar.xz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2d3b20fb503ecadeca047a8e3a97a47b
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.7.4 b/metadata/md5-cache/dev-util/pkgconf-1.7.4
index 10430398de50..de785483e0e5 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.7.4
+++ b/metadata/md5-cache/dev-util/pkgconf-1.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=pkg-config compatible replacement with no dependencies other than AN
 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
+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	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=83dea30a3ddb415bf82e83abb3120d9a
+_md5_=d2c823bc4bf5d49df7e98d57cb9aa02d
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.8.0 b/metadata/md5-cache/dev-util/pkgconf-1.8.0
index 0433d75f5cc2..9ce383b12d94 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.8.0
+++ b/metadata/md5-cache/dev-util/pkgconf-1.8.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://distfiles.dereferenced.org/pkgconf/pkgconf-1.8.0.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f809eebabbcb8edcfa7f02a5580d16d9
+_md5_=2bb358502add9517d4c7761f3bc34d25
diff --git a/metadata/md5-cache/dev-util/pkgconf-9999 b/metadata/md5-cache/dev-util/pkgconf-9999
index 748b96846adb..28bd9d036d89 100644
--- a/metadata/md5-cache/dev-util/pkgconf-9999
+++ b/metadata/md5-cache/dev-util/pkgconf-9999
@@ -10,4 +10,4 @@ RDEPEND=pkg-config? ( !dev-util/pkgconfig )
 RESTRICT=!test? ( test )
 SLOT=0/3
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f8a27760dc684fd243a23177777f0cb3
+_md5_=3b72e4196ec0d71e935bb8200432881e
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.1.9 b/metadata/md5-cache/dev-util/pkgdev-0.1.9
index 2b0a8368685f..c8999bce613e 100644
--- a/metadata/md5-cache/dev-util/pkgdev-0.1.9
+++ b/metadata/md5-cache/dev-util/pkgdev-0.1.9
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of tools for Gentoo development
 EAPI=8
 HOMEPAGE=https://github.com/pkgcore/pkgdev
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc64 ~riscv ~sparc ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.1.9.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c800e52c41eaf363b2cb57bdb8873f66
+_md5_=0e5907ae5941e35d52c7f685d870143d
diff --git a/metadata/md5-cache/dev-util/pkgdev-9999 b/metadata/md5-cache/dev-util/pkgdev-9999
index 5a6bfccd90b2..171334abe39a 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 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c800e52c41eaf363b2cb57bdb8873f66
+_md5_=3047760ea306bbd70c834869a44ccc23
diff --git a/metadata/md5-cache/dev-util/rosdep-0.20.0 b/metadata/md5-cache/dev-util/rosdep-0.20.0
deleted file mode 100644
index db2b937c120b..000000000000
--- a/metadata/md5-cache/dev-util/rosdep-0.20.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rospkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rosdistro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Command-line tool for installing ROS system dependencies
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rosdep
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rospkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rosdistro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://download.ros.org/downloads/rosdep/rosdep-0.20.0.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.20.0.tar.gz -> rosdep-0.20.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3ac53119f9a3c3c8ce612044bbba283c
diff --git a/metadata/md5-cache/dev-util/rosdep-0.21.0 b/metadata/md5-cache/dev-util/rosdep-0.21.0
new file mode 100644
index 000000000000..bde3773b48eb
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rosdep-0.21.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rospkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rosdistro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=Command-line tool for installing ROS system dependencies
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosdep
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/catkin_pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rospkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rosdistro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://download.ros.org/downloads/rosdep/rosdep-0.21.0.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.21.0.tar.gz -> rosdep-0.21.0.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3ac53119f9a3c3c8ce612044bbba283c
diff --git a/metadata/md5-cache/dev-util/sccache-0.2.15 b/metadata/md5-cache/dev-util/sccache-0.2.15
index 2457fb230d82..670b8db8aee1 100644
--- a/metadata/md5-cache/dev-util/sccache-0.2.15
+++ b/metadata/md5-cache/dev-util/sccache-0.2.15
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT U
 RDEPEND=app-arch/zstd dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/openssl:0= ) dist-server? ( sys-apps/bubblewrap )
 SLOT=0
 SRC_URI=https://github.com/mozilla/sccache/archive/v0.2.15.tar.gz -> sccache-0.2.15.tar.gz https://crates.io/api/v1/crates/addr2line/0.14.1/download -> addr2line-0.14.1.crate https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.37/download -> anyhow-1.0.37.crate https://crates.io/api/v1/crates/ar/0.8.0/download -> ar-0.8.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/ascii/0.8.7/download -> ascii-0.8.7.crate https://crates.io/api/v1/crates/assert_cmd/1.0.2/download -> assert_cmd-1.0.2.crate https://crates.io/api/v1/crates/async-channel/1.5.1/download -> async-channel-1.5.1.crate https://crates.io/api/v1/crates/async-executor/1.4.0/download -> async-executor-1.4.0.crate https://crates.io/api/v1/crates/async-global-executor/1.4.3/download -> async-global-executor-1.4.3.crate https://crates.io/api/v1/crates/async-io/1.3.1/download -> async-io-1.3.1.crate https://crates.io/api/v1/crates/async-mutex/1.4.0/download -> async-mutex-1.4.0.crate https://crates.io/api/v1/crates/async-std/1.8.0/download -> async-std-1.8.0.crate https://crates.io/api/v1/crates/async-task/4.0.3/download -> async-task-4.0.3.crate https://crates.io/api/v1/crates/async-trait/0.1.42/download -> async-trait-0.1.42.crate https://crates.io/api/v1/crates/atomic-waker/1.0.0/download -> atomic-waker-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.55/download -> backtrace-0.3.55.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bincode/0.8.0/download -> bincode-0.8.0.crate https://crates.io/api/v1/crates/bincode/1.3.1/download -> bincode-1.3.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/blake3/0.3.7/download -> blake3-0.3.7.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/blocking/1.0.2/download -> blocking-1.0.2.crate https://crates.io/api/v1/crates/boxfnonce/0.1.1/download -> boxfnonce-0.1.1.crate https://crates.io/api/v1/crates/buf_redux/0.8.4/download -> buf_redux-0.8.4.crate https://crates.io/api/v1/crates/bufstream/0.1.4/download -> bufstream-0.1.4.crate https://crates.io/api/v1/crates/bumpalo/3.4.0/download -> bumpalo-3.4.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/bytes/0.5.6/download -> bytes-0.5.6.crate https://crates.io/api/v1/crates/bytes/1.0.0/download -> bytes-1.0.0.crate https://crates.io/api/v1/crates/cache-padded/1.1.1/download -> cache-padded-1.1.1.crate https://crates.io/api/v1/crates/case/0.1.0/download -> case-0.1.0.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/chunked_transfer/0.3.1/download -> chunked_transfer-0.3.1.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/combine/4.5.2/download -> combine-4.5.2.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/conhash/0.4.0/download -> conhash-0.4.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/cookie/0.12.0/download -> cookie-0.12.0.crate https://crates.io/api/v1/crates/cookie_store/0.7.0/download -> cookie_store-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/counted-array/0.1.2/download -> counted-array-0.1.2.crate https://crates.io/api/v1/crates/cpuid-bool/0.1.2/download -> cpuid-bool-0.1.2.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.3/download -> crossbeam-queue-0.2.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/crypto-mac/0.10.0/download -> crypto-mac-0.10.0.crate https://crates.io/api/v1/crates/crypto-mac/0.8.0/download -> crypto-mac-0.8.0.crate https://crates.io/api/v1/crates/daemonize/0.4.1/download -> daemonize-0.4.1.crate https://crates.io/api/v1/crates/derive-error/0.0.3/download -> derive-error-0.0.3.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/directories/3.0.1/download -> directories-3.0.1.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.7/download -> dtoa-0.4.7.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encoding_rs/0.8.26/download -> encoding_rs-0.8.26.crate https://crates.io/api/v1/crates/env_logger/0.8.2/download -> env_logger-0.8.2.crate https://crates.io/api/v1/crates/error-chain/0.12.4/download -> error-chain-0.12.4.crate https://crates.io/api/v1/crates/event-listener/2.5.1/download -> event-listener-2.5.1.crate https://crates.io/api/v1/crates/failure/0.1.8/download -> failure-0.1.8.crate https://crates.io/api/v1/crates/failure_derive/0.1.8/download -> failure_derive-0.1.8.crate https://crates.io/api/v1/crates/fastrand/1.4.0/download -> fastrand-1.4.0.crate https://crates.io/api/v1/crates/filetime/0.2.13/download -> filetime-0.2.13.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.0/download -> form_urlencoded-1.0.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.30/download -> futures-0.1.30.crate https://crates.io/api/v1/crates/futures/0.3.9/download -> futures-0.3.9.crate https://crates.io/api/v1/crates/futures-channel/0.3.9/download -> futures-channel-0.3.9.crate https://crates.io/api/v1/crates/futures-core/0.3.9/download -> futures-core-0.3.9.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/futures-executor/0.3.9/download -> futures-executor-0.3.9.crate https://crates.io/api/v1/crates/futures-io/0.3.9/download -> futures-io-0.3.9.crate https://crates.io/api/v1/crates/futures-lite/1.11.3/download -> futures-lite-1.11.3.crate https://crates.io/api/v1/crates/futures-macro/0.3.9/download -> futures-macro-0.3.9.crate https://crates.io/api/v1/crates/futures-sink/0.3.9/download -> futures-sink-0.3.9.crate https://crates.io/api/v1/crates/futures-task/0.3.9/download -> futures-task-0.3.9.crate https://crates.io/api/v1/crates/futures-util/0.3.9/download -> futures-util-0.3.9.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/gimli/0.23.0/download -> gimli-0.23.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/gloo-timers/0.2.1/download -> gloo-timers-0.2.1.crate https://crates.io/api/v1/crates/h2/0.1.26/download -> h2-0.1.26.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/hmac/0.10.1/download -> hmac-0.10.1.crate https://crates.io/api/v1/crates/http/0.1.21/download -> http-0.1.21.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/http-body/0.1.0/download -> http-body-0.1.0.crate https://crates.io/api/v1/crates/humantime/2.0.1/download -> humantime-2.0.1.crate https://crates.io/api/v1/crates/hyper/0.12.35/download -> hyper-0.12.35.crate https://crates.io/api/v1/crates/hyper-tls/0.3.2/download -> hyper-tls-0.3.2.crate https://crates.io/api/v1/crates/hyperx/0.12.0/download -> hyperx-0.12.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.6.1/download -> indexmap-1.6.1.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.10.0/download -> itertools-0.10.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.3.4/download -> itoa-0.3.4.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/jsonwebtoken/7.2.0/download -> jsonwebtoken-7.2.0.crate https://crates.io/api/v1/crates/js-sys/0.3.46/download -> js-sys-0.3.46.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/kv-log-macro/1.0.7/download -> kv-log-macro-1.0.7.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.82/download -> libc-0.2.82.crate https://crates.io/api/v1/crates/libmount/0.1.15/download -> libmount-0.1.15.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/local-encoding/0.2.0/download -> local-encoding-0.2.0.crate https://crates.io/api/v1/crates/lock_api/0.3.4/download -> lock_api-0.3.4.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/md5/0.3.8/download -> md5-0.3.8.crate https://crates.io/api/v1/crates/md-5/0.9.1/download -> md-5-0.9.1.crate https://crates.io/api/v1/crates/memcached-rs/0.4.2/download -> memcached-rs-0.4.2.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memoffset/0.5.6/download -> memoffset-0.5.6.crate https://crates.io/api/v1/crates/mime/0.2.6/download -> mime-0.2.6.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/1.8.8/download -> mime_guess-1.8.8.crate https://crates.io/api/v1/crates/mime_guess/2.0.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.7/download -> mio-named-pipes-0.1.7.crate https://crates.io/api/v1/crates/mio-uds/0.6.8/download -> mio-uds-0.6.8.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.6/download -> miow-0.3.6.crate https://crates.io/api/v1/crates/multipart/0.15.4/download -> multipart-0.15.4.crate https://crates.io/api/v1/crates/native-tls/0.2.7/download -> native-tls-0.2.7.crate https://crates.io/api/v1/crates/nb-connect/1.0.2/download -> nb-connect-1.0.2.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/nix/0.19.1/download -> nix-0.19.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/num-bigint/0.2.6/download -> num-bigint-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.1.43/download -> num-traits-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/object/0.22.0/download -> object-0.22.0.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.32/download -> openssl-0.10.32.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.60/download -> openssl-sys-0.9.60.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.9.0/download -> parking_lot-0.9.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.6.2/download -> parking_lot_core-0.6.2.crate https://crates.io/api/v1/crates/pem/0.8.2/download -> pem-0.8.2.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.7.24/download -> phf-0.7.24.crate https://crates.io/api/v1/crates/phf_codegen/0.7.24/download -> phf_codegen-0.7.24.crate https://crates.io/api/v1/crates/phf_generator/0.7.24/download -> phf_generator-0.7.24.crate https://crates.io/api/v1/crates/phf_shared/0.7.24/download -> phf_shared-0.7.24.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.11/download -> pin-project-lite-0.1.11.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.1/download -> pin-project-lite-0.2.1.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/polling/2.0.2/download -> polling-2.0.2.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.6/download -> predicates-1.0.6.crate https://crates.io/api/v1/crates/predicates-core/1.0.1/download -> predicates-core-1.0.1.crate https://crates.io/api/v1/crates/predicates-tree/1.0.1/download -> predicates-tree-1.0.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.6/download -> proc-macro-nested-0.1.6.crate https://crates.io/api/v1/crates/publicsuffix/1.5.4/download -> publicsuffix-1.5.4.crate https://crates.io/api/v1/crates/pulldown-cmark/0.0.3/download -> pulldown-cmark-0.0.3.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/1.0.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.5.6/download -> rand-0.5.6.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redis/0.17.0/download -> redis-0.17.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.9.24/download -> reqwest-0.9.24.crate https://crates.io/api/v1/crates/retry/1.2.0/download -> retry-1.2.0.crate https://crates.io/api/v1/crates/ring/0.16.19/download -> ring-0.16.19.crate https://crates.io/api/v1/crates/rouille/3.0.0/download -> rouille-3.0.0.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.18/download -> rustc-demangle-0.1.18.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/security-framework/2.0.0/download -> security-framework-2.0.0.crate https://crates.io/api/v1/crates/security-framework-sys/2.0.0/download -> security-framework-sys-2.0.0.crate https://crates.io/api/v1/crates/selenium-rs/0.1.2/download -> selenium-rs-0.1.2.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.118/download -> serde-1.0.118.crate https://crates.io/api/v1/crates/serde_derive/1.0.118/download -> serde_derive-1.0.118.crate https://crates.io/api/v1/crates/serde_json/1.0.61/download -> serde_json-1.0.61.crate https://crates.io/api/v1/crates/serde_urlencoded/0.5.5/download -> serde_urlencoded-0.5.5.crate https://crates.io/api/v1/crates/sha1/0.6.0/download -> sha1-0.6.0.crate https://crates.io/api/v1/crates/sha-1/0.9.2/download -> sha-1-0.9.2.crate https://crates.io/api/v1/crates/sha2/0.9.2/download -> sha2-0.9.2.crate https://crates.io/api/v1/crates/signal-hook-registry/1.3.0/download -> signal-hook-registry-1.3.0.crate https://crates.io/api/v1/crates/simple_asn1/0.4.1/download -> simple_asn1-0.4.1.crate https://crates.io/api/v1/crates/siphasher/0.2.3/download -> siphasher-0.2.3.crate https://crates.io/api/v1/crates/skeptic/0.4.0/download -> skeptic-0.4.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/0.6.13/download -> smallvec-0.6.13.crate https://crates.io/api/v1/crates/socket2/0.3.19/download -> socket2-0.3.19.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/string/0.2.1/download -> string-0.2.1.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/subtle/2.4.0/download -> subtle-2.4.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/1.0.58/download -> syn-1.0.58.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.12.4/download -> synstructure-0.12.4.crate https://crates.io/api/v1/crates/syslog/5.0.0/download -> syslog-5.0.0.crate https://crates.io/api/v1/crates/tar/0.4.30/download -> tar-0.4.30.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.23/download -> thiserror-1.0.23.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.23/download -> thiserror-impl-1.0.23.crate https://crates.io/api/v1/crates/thread_local/1.1.0/download -> thread_local-1.1.0.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tiny_http/0.6.2/download -> tiny_http-0.6.2.crate https://crates.io/api/v1/crates/tinyvec/1.1.0/download -> tinyvec-1.1.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/0.1.22/download -> tokio-0.1.22.crate https://crates.io/api/v1/crates/tokio/0.2.24/download -> tokio-0.2.24.crate https://crates.io/api/v1/crates/tokio-buf/0.1.1/download -> tokio-buf-0.1.1.crate https://crates.io/api/v1/crates/tokio-codec/0.1.2/download -> tokio-codec-0.1.2.crate https://crates.io/api/v1/crates/tokio-compat/0.1.6/download -> tokio-compat-0.1.6.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.7/download -> tokio-current-thread-0.1.7.crate https://crates.io/api/v1/crates/tokio-executor/0.1.10/download -> tokio-executor-0.1.10.crate https://crates.io/api/v1/crates/tokio-fs/0.1.7/download -> tokio-fs-0.1.7.crate https://crates.io/api/v1/crates/tokio-io/0.1.13/download -> tokio-io-0.1.13.crate https://crates.io/api/v1/crates/tokio-named-pipes/0.1.0/download -> tokio-named-pipes-0.1.0.crate https://crates.io/api/v1/crates/tokio-process/0.2.5/download -> tokio-process-0.2.5.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.12/download -> tokio-reactor-0.1.12.crate https://crates.io/api/v1/crates/tokio-serde/0.1.0/download -> tokio-serde-0.1.0.crate https://crates.io/api/v1/crates/tokio-serde-bincode/0.1.1/download -> tokio-serde-bincode-0.1.1.crate https://crates.io/api/v1/crates/tokio-signal/0.2.9/download -> tokio-signal-0.2.9.crate https://crates.io/api/v1/crates/tokio-sync/0.1.8/download -> tokio-sync-0.1.8.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.4/download -> tokio-tcp-0.1.4.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.18/download -> tokio-threadpool-0.1.18.crate https://crates.io/api/v1/crates/tokio-timer/0.2.13/download -> tokio-timer-0.2.13.crate https://crates.io/api/v1/crates/tokio-udp/0.1.6/download -> tokio-udp-0.1.6.crate https://crates.io/api/v1/crates/tokio-uds/0.2.7/download -> tokio-uds-0.2.7.crate https://crates.io/api/v1/crates/tokio-util/0.3.1/download -> tokio-util-0.3.1.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tower/0.1.1/download -> tower-0.1.1.crate https://crates.io/api/v1/crates/tower-buffer/0.1.2/download -> tower-buffer-0.1.2.crate https://crates.io/api/v1/crates/tower-discover/0.1.0/download -> tower-discover-0.1.0.crate https://crates.io/api/v1/crates/tower-layer/0.1.0/download -> tower-layer-0.1.0.crate https://crates.io/api/v1/crates/tower-limit/0.1.3/download -> tower-limit-0.1.3.crate https://crates.io/api/v1/crates/tower-load-shed/0.1.0/download -> tower-load-shed-0.1.0.crate https://crates.io/api/v1/crates/tower-retry/0.1.0/download -> tower-retry-0.1.0.crate https://crates.io/api/v1/crates/tower-service/0.2.0/download -> tower-service-0.2.0.crate https://crates.io/api/v1/crates/tower-timeout/0.1.1/download -> tower-timeout-0.1.1.crate https://crates.io/api/v1/crates/tower-util/0.1.0/download -> tower-util-0.1.0.crate https://crates.io/api/v1/crates/tracing/0.1.22/download -> tracing-0.1.22.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.11/download -> tracing-attributes-0.1.11.crate https://crates.io/api/v1/crates/tracing-core/0.1.17/download -> tracing-core-0.1.17.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/try_from/0.3.2/download -> try_from-0.3.2.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/twoway/0.1.8/download -> twoway-0.1.8.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.16/download -> unicode-normalization-0.1.16.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/unix_socket/0.5.0/download -> unix_socket-0.5.0.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url/2.2.0/download -> url-2.2.0.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/uuid/0.7.4/download -> uuid-0.7.4.crate https://crates.io/api/v1/crates/uuid/0.8.1/download -> uuid-0.8.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec-arena/1.0.0/download -> vec-arena-1.0.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/version-compare/0.0.11/download -> version-compare-0.0.11.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/want/0.2.0/download -> want-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.69/download -> wasm-bindgen-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.69/download -> wasm-bindgen-backend-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.19/download -> wasm-bindgen-futures-0.4.19.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.69/download -> wasm-bindgen-macro-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.69/download -> wasm-bindgen-macro-support-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.69/download -> wasm-bindgen-shared-0.2.69.crate https://crates.io/api/v1/crates/web-sys/0.3.46/download -> web-sys-0.3.46.crate https://crates.io/api/v1/crates/wepoll-sys/3.0.1/download -> wepoll-sys-3.0.1.crate https://crates.io/api/v1/crates/which/4.0.2/download -> which-4.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/zip/0.5.9/download -> zip-0.5.9.crate https://crates.io/api/v1/crates/zstd/0.6.0+zstd.1.4.8/download -> zstd-0.6.0+zstd.1.4.8.crate https://crates.io/api/v1/crates/zstd-safe/3.0.0+zstd.1.4.8/download -> zstd-safe-3.0.0+zstd.1.4.8.crate https://crates.io/api/v1/crates/zstd-sys/1.4.19+zstd.1.4.8/download -> zstd-sys-1.4.19+zstd.1.4.8.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=89c7c714c056719e7f566f53e503ff48
diff --git a/metadata/md5-cache/dev-util/sccache-9999 b/metadata/md5-cache/dev-util/sccache-9999
index c66513fe4e83..acddb1189845 100644
--- a/metadata/md5-cache/dev-util/sccache-9999
+++ b/metadata/md5-cache/dev-util/sccache-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT U
 PROPERTIES=live
 RDEPEND=app-arch/zstd dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/openssl:0= ) dist-server? ( sys-apps/bubblewrap )
 SLOT=0
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b86b51442f0d792367177e5e3a59315
diff --git a/metadata/md5-cache/dev-util/smem-1.5-r1 b/metadata/md5-cache/dev-util/smem-1.5-r1
index 1e3b344923df..3fc985936bf2 100644
--- a/metadata/md5-cache/dev-util/smem-1.5-r1
+++ b/metadata/md5-cache/dev-util/smem-1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://selenic.com/repo/smem/archive/2ab5040d5633.tar.bz2 -> smem-1.5.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=885ffa631be97fb5963d184773fc8f3e
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.5.4.2_pre20210327 b/metadata/md5-cache/dev-util/spirv-headers-1.5.4.2_pre20210327
deleted file mode 100644
index 866d493a2152..000000000000
--- a/metadata/md5-cache/dev-util/spirv-headers-1.5.4.2_pre20210327
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Machine-readable files for the SPIR-V Registry
-EAPI=7
-HOMEPAGE=https://www.khronos.org/registry/spir-v/
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/75b30a659c8a4979104986652c54cc421fc51129.tar.gz -> spirv-headers-1.5.4.2_pre20210327.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aa99319f5a1776ab0bc0c00d8359e70c
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.5.4.2_pre20210526 b/metadata/md5-cache/dev-util/spirv-headers-1.5.4.2_pre20210526
index 0280290d998a..bbcd59d3c876 100644
--- a/metadata/md5-cache/dev-util/spirv-headers-1.5.4.2_pre20210526
+++ b/metadata/md5-cache/dev-util/spirv-headers-1.5.4.2_pre20210526
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Machine-readable files for the SPIR-V Registry
 EAPI=7
 HOMEPAGE=https://www.khronos.org/registry/spir-v/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/2e1bc6dcd4ff49ed996dc0174d1aec37c2e9ab59.tar.gz -> spirv-headers-1.5.4.2_pre20210526.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=70d00ffe1d507e58e886a4307c7b94ed
+_md5_=851c62114612caf7f8fcb1a19e89293b
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2020.6 b/metadata/md5-cache/dev-util/spirv-tools-2020.6
deleted file mode 100644
index 159ad362d957..000000000000
--- a/metadata/md5-cache/dev-util/spirv-tools-2020.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/spirv-headers-1.5.4.1 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-util/spirv-headers-1.5.4.1
-DESCRIPTION=Provides an API and commands for processing SPIR-V modules
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/v2020.6.tar.gz -> spirv-tools-2020.6.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7a6c1653c5232ef62a4b2e5468cfb04c
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2021.0_pre20210327 b/metadata/md5-cache/dev-util/spirv-tools-2021.0_pre20210327
deleted file mode 100644
index b6b94b02b520..000000000000
--- a/metadata/md5-cache/dev-util/spirv-tools-2021.0_pre20210327
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/spirv-headers-1.5.4.2_pre20210327 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-util/spirv-headers-1.5.4.2_pre20210327
-DESCRIPTION=Provides an API and commands for processing SPIR-V modules
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/1b35745ad1c9a988bc427b976a9a2fe7afd4dada.tar.gz -> spirv-tools-2021.0_pre20210327.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=651fcbb3852f3aec8354ed891b6cbde0
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2021.1 b/metadata/md5-cache/dev-util/spirv-tools-2021.1
index e67c468011da..e7a94b16837e 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-2021.1
+++ b/metadata/md5-cache/dev-util/spirv-tools-2021.1
@@ -5,10 +5,10 @@ DESCRIPTION=Provides an API and commands for processing SPIR-V modules
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/c2d5375fa7cc87c93f692e7200d5d974283d4391.tar.gz -> spirv-tools-2021.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fce2952be6177e73da7e474fdc27f258
+_md5_=986487bab97b25a83165d30965a67187
diff --git a/metadata/md5-cache/dev-util/strace-5.12 b/metadata/md5-cache/dev-util/strace-5.12
index 315c28d5a1b8..4e2891e5bbec 100644
--- a/metadata/md5-cache/dev-util/strace-5.12
+++ b/metadata/md5-cache/dev-util/strace-5.12
@@ -5,11 +5,11 @@ DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=7
 HOMEPAGE=https://strace.io/
 IUSE=aio perl static unwind elfutils
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
 SRC_URI=https://github.com/strace/strace/releases/download/v5.12/strace-5.12.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=71454020df886ca172b3146ac3ca4bdb
+_md5_=df8d5ea76209f65930b6eab7792fcc42
diff --git a/metadata/md5-cache/dev-util/umockdev-0.16.1-r1 b/metadata/md5-cache/dev-util/umockdev-0.16.1-r1
index f727fe38bc4c..51f8b7088d86 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.16.1-r1
+++ b/metadata/md5-cache/dev-util/umockdev-0.16.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Mock hardware devices for creating unit tests
 EAPI=7
 HOMEPAGE=https://github.com/martinpitt/umockdev/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gobject-introspection-1.32:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinpitt/umockdev/releases/download/0.16.1/umockdev-0.16.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=954fb30a55ce09b773263d7189df74d5
+_md5_=5da15679767f9fbf35c2bd87ca3e567d
diff --git a/metadata/md5-cache/dev-util/visualvm-2.0.6 b/metadata/md5-cache/dev-util/visualvm-2.0.6
deleted file mode 100644
index b6096fb5eef1..000000000000
--- a/metadata/md5-cache/dev-util/visualvm-2.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Integrates commandline JDK tools and profiling capabilities
-EAPI=7
-HOMEPAGE=https://visualvm.github.io
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=7
-SRC_URI=https://github.com/oracle/visualvm/archive/2.0.6.tar.gz -> visualvm-2.0.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d4c1b1a9bed7c605b090a084dbd39cb1
diff --git a/metadata/md5-cache/dev-util/visualvm-2.0.7 b/metadata/md5-cache/dev-util/visualvm-2.0.7
index d5ff443a01d6..fed311852d14 100644
--- a/metadata/md5-cache/dev-util/visualvm-2.0.7
+++ b/metadata/md5-cache/dev-util/visualvm-2.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=Integrates commandline JDK tools and profiling capabilities
 EAPI=7
 HOMEPAGE=https://visualvm.github.io
 IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=7
 SRC_URI=https://github.com/oracle/visualvm/archive/2.0.7.tar.gz -> visualvm-2.0.7.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-ant-2	b894c6ee57778b79eaa20e56ece53358	java-pkg-2	37e38ed0662a78bfde9cb4f6d11ed6dc	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8916f5fda7ea473dfbab85d874ab3be5
+_md5_=d4c1b1a9bed7c605b090a084dbd39cb1
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.2.162 b/metadata/md5-cache/dev-util/vulkan-headers-1.2.162
deleted file mode 100644
index 8486e7edd31f..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.2.162
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vulkan Header files and API registry
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.2.162.tar.gz -> vulkan-headers-1.2.162.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=02f09f7542c9c24e8f932507746e515d
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.2.170 b/metadata/md5-cache/dev-util/vulkan-headers-1.2.170
deleted file mode 100644
index beb3a3074157..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.2.170
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vulkan Header files and API registry
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.2.170.tar.gz -> vulkan-headers-1.2.170.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=02f09f7542c9c24e8f932507746e515d
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.2.179 b/metadata/md5-cache/dev-util/vulkan-headers-1.2.179
deleted file mode 100644
index 195c0738349a..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.2.179
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vulkan Header files and API registry
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.2.179.tar.gz -> vulkan-headers-1.2.179.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c3b9e31e1a639135d1be2d1f3748a1b6
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.2.182 b/metadata/md5-cache/dev-util/vulkan-headers-1.2.182
index 16a37ecc761e..49c414aa2c80 100644
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.2.182
+++ b/metadata/md5-cache/dev-util/vulkan-headers-1.2.182
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Vulkan Header files and API registry
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.2.182.tar.gz -> vulkan-headers-1.2.182.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c3b9e31e1a639135d1be2d1f3748a1b6
+_md5_=02f09f7542c9c24e8f932507746e515d
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.2.162 b/metadata/md5-cache/dev-util/vulkan-tools-1.2.162
deleted file mode 100644
index af9dfebfed6a..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.2.162
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.10.2 cube? ( dev-util/glslang:=[abi_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/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=media-libs/vulkan-loader-1.2.162:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] ) >=dev-util/vulkan-headers-1.2.162
-DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
-IUSE=cube wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64
-LICENSE=Apache-2.0
-RDEPEND=>=media-libs/vulkan-loader-1.2.162:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] )
-REQUIRED_USE=!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/v1.2.162.tar.gz -> vulkan-tools-1.2.162.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2f948ff762b8b2c71e885f53af98e64c
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.2.170 b/metadata/md5-cache/dev-util/vulkan-tools-1.2.170
deleted file mode 100644
index 056c8fdbcb6e..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.2.170
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.10.2 cube? ( dev-util/glslang:=[abi_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/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=media-libs/vulkan-loader-1.2.170:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] ) >=dev-util/vulkan-headers-1.2.170
-DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
-IUSE=cube wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64
-LICENSE=Apache-2.0
-RDEPEND=>=media-libs/vulkan-loader-1.2.170:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] )
-REQUIRED_USE=!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/v1.2.170.tar.gz -> vulkan-tools-1.2.170.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2f948ff762b8b2c71e885f53af98e64c
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.2.179 b/metadata/md5-cache/dev-util/vulkan-tools-1.2.179
deleted file mode 100644
index b752cd5b59c3..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.2.179
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.10.2 cube? ( dev-util/glslang:=[abi_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/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=media-libs/vulkan-loader-1.2.179:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] ) >=dev-util/vulkan-headers-1.2.179
-DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
-IUSE=cube wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv
-LICENSE=Apache-2.0
-RDEPEND=>=media-libs/vulkan-loader-1.2.179:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] )
-REQUIRED_USE=cube? ( ^^ ( X wayland ) )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/v1.2.179.tar.gz -> vulkan-tools-1.2.179.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=596df2a37751b5cfecee15b2aed19b80
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.2.182 b/metadata/md5-cache/dev-util/vulkan-tools-1.2.182
index c9ca099875fa..bdc2e4afa828 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.2.182
+++ b/metadata/md5-cache/dev-util/vulkan-tools-1.2.182
@@ -5,11 +5,11 @@ DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
 IUSE=cube wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv
 LICENSE=Apache-2.0
 RDEPEND=>=media-libs/vulkan-loader-1.2.182:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] )
 REQUIRED_USE=cube? ( ^^ ( X wayland ) )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/v1.2.182.tar.gz -> vulkan-tools-1.2.182.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=596df2a37751b5cfecee15b2aed19b80
+_md5_=1050806f6addbd5279f1645d1cbb052d
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index b37e453417d3..9edef7384619 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/tortoisehg-5.8 b/metadata/md5-cache/dev-vcs/tortoisehg-5.8
index f55386129c4c..f649f325a3eb 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-5.8
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-5.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/mercurial/tortoisehg/thg/-/archive/5.8/thg-5.8.tar.gz -> tortoisehg-5.8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=988dc663645aa330dacbb89efb719a79
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.8.1 b/metadata/md5-cache/dev-vcs/tortoisehg-5.8.1
index 39b43adaa1c9..9be440201fec 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-5.8.1
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-5.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/mercurial/tortoisehg/thg/-/archive/5.8.1/thg-5.8.1.tar.gz -> tortoisehg-5.8.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=988dc663645aa330dacbb89efb719a79
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-9999 b/metadata/md5-cache/dev-vcs/tortoisehg-9999
index 81dac0641ea8..a7c3908c52df 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-9999
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-5.7[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	mercurial	d9b8e6c09ecb32dd80eb36f50f27b157	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	mercurial	d9b8e6c09ecb32dd80eb36f50f27b157	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=988dc663645aa330dacbb89efb719a79
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 1fabec0e8f5f..edb63c145d55 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/ceferino-0.97.8-r2 b/metadata/md5-cache/games-arcade/ceferino-0.97.8-r2
deleted file mode 100644
index c6ba0029756d..000000000000
--- a/metadata/md5-cache/games-arcade/ceferino-0.97.8-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=media-libs/libsdl-1.2[video] >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Super-Pang clone (destroy bouncing balloons with your grapnel)
-EAPI=6
-HOMEPAGE=http://www.losersjuegos.com.ar/juegos/ceferino
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=media-libs/libsdl-1.2[video] >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/c/ceferino/ceferino_0.97.8+svn37.orig.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0efa307b5fecb9895b7ee06d5eab4f20
diff --git a/metadata/md5-cache/games-arcade/ceferino-0.97.8-r3 b/metadata/md5-cache/games-arcade/ceferino-0.97.8-r3
new file mode 100644
index 000000000000..ba7177dff890
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/ceferino-0.97.8-r3
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] nls? ( virtual/libintl )
+DESCRIPTION=Super-Pang clone (destroy bouncing balloons with your grapnel)
+EAPI=8
+HOMEPAGE=http://www.losersjuegos.com.ar/juegos/ceferino
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/c/ceferino/ceferino_0.97.8+svn37.orig.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fe27412c91dcdff1470dd6f622aa789f
diff --git a/metadata/md5-cache/games-arcade/circuslinux-1.0.3-r1 b/metadata/md5-cache/games-arcade/circuslinux-1.0.3-r1
deleted file mode 100644
index c7569f91871b..000000000000
--- a/metadata/md5-cache/games-arcade/circuslinux-1.0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
-DESCRIPTION=clone of the Atari 2600 game "Circus Atari"
-EAPI=6
-HOMEPAGE=http://www.newbreedsoftware.com/circus-linux/
-KEYWORDS=~alpha ~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
-SLOT=0
-SRC_URI=ftp://ftp.sonic.net/pub/users/nbs/unix/x/circus-linux/circuslinux-1.0.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=26c02e1c37cfe471986c62c1fe0eab9b
diff --git a/metadata/md5-cache/games-arcade/circuslinux-1.0.3-r2 b/metadata/md5-cache/games-arcade/circuslinux-1.0.3-r2
new file mode 100644
index 000000000000..c5bcc25b7589
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/circuslinux-1.0.3-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
+DESCRIPTION=Clone of the Atari 2600 game "Circus Atari"
+EAPI=8
+HOMEPAGE=http://www.newbreedsoftware.com/circus-linux/
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
+SLOT=0
+SRC_URI=ftp://ftp.tuxpaint.org/unix/x/circus-linux/src/circuslinux-1.0.3.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3cab653e36a6046289b8dbeb58e94a3a
diff --git a/metadata/md5-cache/games-arcade/defendguin-0.0.12-r1 b/metadata/md5-cache/games-arcade/defendguin-0.0.12-r1
deleted file mode 100644
index d360aad4e63e..000000000000
--- a/metadata/md5-cache/games-arcade/defendguin-0.0.12-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/sdl-mixer[mod] media-libs/libsdl[video]
-DESCRIPTION=A clone of the arcade game Defender, but with a Linux theme
-EAPI=6
-HOMEPAGE=http://www.newbreedsoftware.com/defendguin/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/sdl-mixer[mod] media-libs/libsdl[video]
-SLOT=0
-SRC_URI=ftp://ftp.tuxpaint.org/unix/x/defendguin/src/defendguin-0.0.12.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=97777f6bdd7c1baeda452cc1b780c81f
diff --git a/metadata/md5-cache/games-arcade/defendguin-0.0.12-r2 b/metadata/md5-cache/games-arcade/defendguin-0.0.12-r2
new file mode 100644
index 000000000000..f086268fce1b
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/defendguin-0.0.12-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer[mod]
+DESCRIPTION=Clone of the arcade game Defender, but with a Linux theme
+EAPI=8
+HOMEPAGE=http://www.newbreedsoftware.com/defendguin/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer[mod]
+SLOT=0
+SRC_URI=ftp://ftp.tuxpaint.org/unix/x/defendguin/src/defendguin-0.0.12.tar.gz https://dev.gentoo.org/~ionen/distfiles/defendguin.png
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cfdc899b82ef0981c3fc53cfae6341de
diff --git a/metadata/md5-cache/games-arcade/jazz2-0.6.6 b/metadata/md5-cache/games-arcade/jazz2-0.6.6
deleted file mode 100644
index 12e2a0577e6c..000000000000
--- a/metadata/md5-cache/games-arcade/jazz2-0.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-lang/mono
-DEFINED_PHASES=compile install prepare setup
-DESCRIPTION=Open source reimplementation of Jazz Jackrabbit 2
-EAPI=7
-HOMEPAGE=http://deat.tk/jazz2/
-IUSE=gles2-only server
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-lang/mono media-libs/libopenmpt media-libs/libsdl2[video] media-libs/openal gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl )
-SLOT=0/0.6.6
-SRC_URI=https://github.com/deathkiller/jazz2/archive/0.6.6.tar.gz -> jazz2-0.6.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	dotnet	49b0b9d543fd5207322bdcc9aa19f645	mono-env	87888393b1c1b882d0543087e28ec0b0	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=42f0e38bfd5ca8c67998b4afba9760e6
diff --git a/metadata/md5-cache/games-arcade/jazz2-0.6.7 b/metadata/md5-cache/games-arcade/jazz2-0.6.7
new file mode 100644
index 000000000000..cdb5400cd029
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/jazz2-0.6.7
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/mono
+DEFINED_PHASES=compile install prepare setup
+DESCRIPTION=Open source reimplementation of Jazz Jackrabbit 2
+EAPI=7
+HOMEPAGE=http://deat.tk/jazz2/
+IUSE=gles2-only server
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-lang/mono media-libs/libopenmpt media-libs/libsdl2[video] media-libs/openal gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl )
+SLOT=0/0.6.7
+SRC_URI=https://github.com/deathkiller/jazz2/archive/0.6.7.tar.gz -> jazz2-0.6.7.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	dotnet	49b0b9d543fd5207322bdcc9aa19f645	mono-env	87888393b1c1b882d0543087e28ec0b0	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=42f0e38bfd5ca8c67998b4afba9760e6
diff --git a/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0-r1 b/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0-r1
index d93ce5175289..dbc785691a19 100644
--- a/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0-r1
+++ b/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0-r1
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXext x11-lib
 SLOT=0
 SRC_URI=mirror://sourceforge/xgalaga/xgalaga-2.1.1.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=594be9433451570c3a2d31ea0fbd4bb0
+_md5_=f00903c1f8ca9477c0175b8be6d8af19
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 4b9e893ae064..b9efeb4acd0d 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/blokish-0.9.4-r3 b/metadata/md5-cache/games-board/blokish-0.9.4-r3
index 4ba8cd33e228..c1349be00c02 100644
--- a/metadata/md5-cache/games-board/blokish-0.9.4-r3
+++ b/metadata/md5-cache/games-board/blokish-0.9.4-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/wxGTK:3.0[X,opengl] virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/blokish/blokish_v0.9.4.tgz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=e5d2357808a220fbdb57fec998284d71
diff --git a/metadata/md5-cache/games-board/openyahtzee-1.9.3-r1 b/metadata/md5-cache/games-board/openyahtzee-1.9.3-r1
index 2c55692440da..e96805aa86a8 100644
--- a/metadata/md5-cache/games-board/openyahtzee-1.9.3-r1
+++ b/metadata/md5-cache/games-board/openyahtzee-1.9.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/openyahtzee/openyahtzee-1.9.3.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=02741d8e32a17b8bbc1e9039f91c1c7d
diff --git a/metadata/md5-cache/games-board/scid-4.7.0 b/metadata/md5-cache/games-board/scid-4.7.0
index 120cfd33fca6..e512259a48ca 100644
--- a/metadata/md5-cache/games-board/scid-4.7.0
+++ b/metadata/md5-cache/games-board/scid-4.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=scripts? ( ^^ ( python_single_target_python3_8 python_single_target
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/scid/scid-code-4.7.0.zip mirror://sourceforge/scid/scid-4.7.0_x64_linux.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c78f90fee75b3f8faf3549e0ed89fea2
diff --git a/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213 b/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213
index 6f5844f457ba..6ba85b5d20a7 100644
--- a/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213
+++ b/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213
@@ -8,5 +8,5 @@ RDEPEND=~games-board/tablebase-syzygy-0_pre20131213:0
 RESTRICT=fetch
 SLOT=nofetch
 SRC_URI=KQQvKQQ.rtbw KQQvKQQ.rtbz KQQvKQR.rtbw KQQvKQR.rtbz KQQvKQB.rtbw KQQvKQB.rtbz KQQvKQN.rtbw KQQvKQN.rtbz KQQvKQP.rtbw KQQvKQP.rtbz KQQQvKQ.rtbw KQQQvKQ.rtbz KQQQQvK.rtbw KQQQQvK.rtbz KQQQvKR.rtbw KQQQvKR.rtbz KQQQRvK.rtbw KQQQRvK.rtbz KQQQvKB.rtbw KQQQvKB.rtbz KQQQBvK.rtbw KQQQBvK.rtbz KQQQvKN.rtbw KQQQvKN.rtbz KQQQNvK.rtbw KQQQNvK.rtbz KQQQvKP.rtbw KQQQvKP.rtbz KQQQPvK.rtbw KQQQPvK.rtbz KQQvKRR.rtbw KQQvKRR.rtbz KQQvKRB.rtbw KQQvKRB.rtbz KQQvKRN.rtbw KQQvKRN.rtbz KQQvKRP.rtbw KQQvKRP.rtbz KQQRvKQ.rtbw KQQRvKQ.rtbz KQQRvKR.rtbw KQQRvKR.rtbz KQQRRvK.rtbw KQQRRvK.rtbz KQQRvKB.rtbw KQQRvKB.rtbz KQQRBvK.rtbw KQQRBvK.rtbz KQQRvKN.rtbw KQQRvKN.rtbz KQQRNvK.rtbw KQQRNvK.rtbz KQQRvKP.rtbw KQQRvKP.rtbz KQQRPvK.rtbw KQQRPvK.rtbz KQQvKBB.rtbw KQQvKBB.rtbz KQQvKBN.rtbw KQQvKBN.rtbz KQQvKBP.rtbw KQQvKBP.rtbz KQQBvKQ.rtbw KQQBvKQ.rtbz KQQBvKR.rtbw KQQBvKR.rtbz KQQBvKB.rtbw KQQBvKB.rtbz KQQBBvK.rtbw KQQBBvK.rtbz KQQBvKN.rtbw KQQBvKN.rtbz KQQBNvK.rtbw KQQBNvK.rtbz KQQBvKP.rtbw KQQBvKP.rtbz KQQBPvK.rtbw KQQBPvK.rtbz KQQvKNN.rtbw KQQvKNN.rtbz KQQvKNP.rtbw KQQvKNP.rtbz KQQNvKQ.rtbw KQQNvKQ.rtbz KQQNvKR.rtbw KQQNvKR.rtbz KQQNvKB.rtbw KQQNvKB.rtbz KQQNvKN.rtbw KQQNvKN.rtbz KQQNNvK.rtbw KQQNNvK.rtbz KQQNvKP.rtbw KQQNvKP.rtbz KQQNPvK.rtbw KQQNPvK.rtbz KQQvKPP.rtbw KQQvKPP.rtbz KQQPvKQ.rtbw KQQPvKQ.rtbz KQQPvKR.rtbw KQQPvKR.rtbz KQQPvKB.rtbw KQQPvKB.rtbz KQQPvKN.rtbw KQQPvKN.rtbz KQQPvKP.rtbw KQQPvKP.rtbz KQQPPvK.rtbw KQQPPvK.rtbz KQRvKQR.rtbw KQRvKQR.rtbz KQRvKQB.rtbw KQRvKQB.rtbz KQRvKQN.rtbw KQRvKQN.rtbz KQRvKQP.rtbw KQRvKQP.rtbz KQRvKRR.rtbw KQRvKRR.rtbz KQRvKRB.rtbw KQRvKRB.rtbz KQRvKRN.rtbw KQRvKRN.rtbz KQRvKRP.rtbw KQRvKRP.rtbz KQRRvKQ.rtbw KQRRvKQ.rtbz KQRRvKR.rtbw KQRRvKR.rtbz KQRRRvK.rtbw KQRRRvK.rtbz KQRRvKB.rtbw KQRRvKB.rtbz KQRRBvK.rtbw KQRRBvK.rtbz KQRRvKN.rtbw KQRRvKN.rtbz KQRRNvK.rtbw KQRRNvK.rtbz KQRRvKP.rtbw KQRRvKP.rtbz KQRRPvK.rtbw KQRRPvK.rtbz KQRvKBB.rtbw KQRvKBB.rtbz KQRvKBN.rtbw KQRvKBN.rtbz KQRvKBP.rtbw KQRvKBP.rtbz KQRBvKQ.rtbw KQRBvKQ.rtbz KQRBvKR.rtbw KQRBvKR.rtbz KQRBvKB.rtbw KQRBvKB.rtbz KQRBBvK.rtbw KQRBBvK.rtbz KQRBvKN.rtbw KQRBvKN.rtbz KQRBNvK.rtbw KQRBNvK.rtbz KQRBvKP.rtbw KQRBvKP.rtbz KQRBPvK.rtbw KQRBPvK.rtbz KQRvKNN.rtbw KQRvKNN.rtbz KQRvKNP.rtbw KQRvKNP.rtbz KQRNvKQ.rtbw KQRNvKQ.rtbz KQRNvKR.rtbw KQRNvKR.rtbz KQRNvKB.rtbw KQRNvKB.rtbz KQRNvKN.rtbw KQRNvKN.rtbz KQRNNvK.rtbw KQRNNvK.rtbz KQRNvKP.rtbw KQRNvKP.rtbz KQRNPvK.rtbw KQRNPvK.rtbz KQRvKPP.rtbw KQRvKPP.rtbz KQRPvKQ.rtbw KQRPvKQ.rtbz KQRPvKR.rtbw KQRPvKR.rtbz KQRPvKB.rtbw KQRPvKB.rtbz KQRPvKN.rtbw KQRPvKN.rtbz KQRPvKP.rtbw KQRPvKP.rtbz KQRPPvK.rtbw KQRPPvK.rtbz KQBvKQB.rtbw KQBvKQB.rtbz KQBvKQN.rtbw KQBvKQN.rtbz KQBvKQP.rtbw KQBvKQP.rtbz KQBvKRR.rtbw KQBvKRR.rtbz KQBvKRB.rtbw KQBvKRB.rtbz KQBvKRN.rtbw KQBvKRN.rtbz KQBvKRP.rtbw KQBvKRP.rtbz KQBvKBB.rtbw KQBvKBB.rtbz KQBvKBN.rtbw KQBvKBN.rtbz KQBvKBP.rtbw KQBvKBP.rtbz KQBBvKQ.rtbw KQBBvKQ.rtbz KQBBvKR.rtbw KQBBvKR.rtbz KQBBvKB.rtbw KQBBvKB.rtbz KQBBBvK.rtbw KQBBBvK.rtbz KQBBvKN.rtbw KQBBvKN.rtbz KQBBNvK.rtbw KQBBNvK.rtbz KQBBvKP.rtbw KQBBvKP.rtbz KQBBPvK.rtbw KQBBPvK.rtbz KQBvKNN.rtbw KQBvKNN.rtbz KQBvKNP.rtbw KQBvKNP.rtbz KQBNvKQ.rtbw KQBNvKQ.rtbz KQBNvKR.rtbw KQBNvKR.rtbz KQBNvKB.rtbw KQBNvKB.rtbz KQBNvKN.rtbw KQBNvKN.rtbz KQBNNvK.rtbw KQBNNvK.rtbz KQBNvKP.rtbw KQBNvKP.rtbz KQBNPvK.rtbw KQBNPvK.rtbz KQBvKPP.rtbw KQBvKPP.rtbz KQBPvKQ.rtbw KQBPvKQ.rtbz KQBPvKR.rtbw KQBPvKR.rtbz KQBPvKB.rtbw KQBPvKB.rtbz KQBPvKN.rtbw KQBPvKN.rtbz KQBPvKP.rtbw KQBPvKP.rtbz KQBPPvK.rtbw KQBPPvK.rtbz KQNvKQN.rtbw KQNvKQN.rtbz KQNvKQP.rtbw KQNvKQP.rtbz KQNvKRR.rtbw KQNvKRR.rtbz KQNvKRB.rtbw KQNvKRB.rtbz KQNvKRN.rtbw KQNvKRN.rtbz KQNvKRP.rtbw KQNvKRP.rtbz KQNvKBB.rtbw KQNvKBB.rtbz KQNvKBN.rtbw KQNvKBN.rtbz KQNvKBP.rtbw KQNvKBP.rtbz KQNvKNN.rtbw KQNvKNN.rtbz KQNvKNP.rtbw KQNvKNP.rtbz KQNNvKQ.rtbw KQNNvKQ.rtbz KQNNvKR.rtbw KQNNvKR.rtbz KQNNvKB.rtbw KQNNvKB.rtbz KQNNvKN.rtbw KQNNvKN.rtbz KQNNNvK.rtbw KQNNNvK.rtbz KQNNvKP.rtbw KQNNvKP.rtbz KQNNPvK.rtbw KQNNPvK.rtbz KQNvKPP.rtbw KQNvKPP.rtbz KQNPvKQ.rtbw KQNPvKQ.rtbz KQNPvKR.rtbw KQNPvKR.rtbz KQNPvKB.rtbw KQNPvKB.rtbz KQNPvKN.rtbw KQNPvKN.rtbz KQNPvKP.rtbw KQNPvKP.rtbz KQNPPvK.rtbw KQNPPvK.rtbz KQPvKQP.rtbw KQPvKQP.rtbz KQPvKRR.rtbw KQPvKRR.rtbz KQPvKRB.rtbw KQPvKRB.rtbz KQPvKRN.rtbw KQPvKRN.rtbz KQPvKRP.rtbw KQPvKRP.rtbz KQPvKBB.rtbw KQPvKBB.rtbz KQPvKBN.rtbw KQPvKBN.rtbz KQPvKBP.rtbw KQPvKBP.rtbz KQPvKNN.rtbw KQPvKNN.rtbz KQPvKNP.rtbw KQPvKNP.rtbz KQPvKPP.rtbw KQPvKPP.rtbz KQPPvKQ.rtbw KQPPvKQ.rtbz KQPPvKR.rtbw KQPPvKR.rtbz KQPPvKB.rtbw KQPPvKB.rtbz KQPPvKN.rtbw KQPPvKN.rtbz KQPPvKP.rtbw KQPPvKP.rtbz KQPPPvK.rtbw KQPPPvK.rtbz KRRvKRR.rtbw KRRvKRR.rtbz KRRvKRB.rtbw KRRvKRB.rtbz KRRvKRN.rtbw KRRvKRN.rtbz KRRvKRP.rtbw KRRvKRP.rtbz KRRRvKQ.rtbw KRRRvKQ.rtbz KRRRvKR.rtbw KRRRvKR.rtbz KRRRRvK.rtbw KRRRRvK.rtbz KRRRvKB.rtbw KRRRvKB.rtbz KRRRBvK.rtbw KRRRBvK.rtbz KRRRvKN.rtbw KRRRvKN.rtbz KRRRNvK.rtbw KRRRNvK.rtbz KRRRvKP.rtbw KRRRvKP.rtbz KRRRPvK.rtbw KRRRPvK.rtbz KRRvKBB.rtbw KRRvKBB.rtbz KRRvKBN.rtbw KRRvKBN.rtbz KRRvKBP.rtbw KRRvKBP.rtbz KRRBvKQ.rtbw KRRBvKQ.rtbz KRRBvKR.rtbw KRRBvKR.rtbz KRRBvKB.rtbw KRRBvKB.rtbz KRRBBvK.rtbw KRRBBvK.rtbz KRRBvKN.rtbw KRRBvKN.rtbz KRRBNvK.rtbw KRRBNvK.rtbz KRRBvKP.rtbw KRRBvKP.rtbz KRRBPvK.rtbw KRRBPvK.rtbz KRRvKNN.rtbw KRRvKNN.rtbz KRRvKNP.rtbw KRRvKNP.rtbz KRRNvKQ.rtbw KRRNvKQ.rtbz KRRNvKR.rtbw KRRNvKR.rtbz KRRNvKB.rtbw KRRNvKB.rtbz KRRNvKN.rtbw KRRNvKN.rtbz KRRNNvK.rtbw KRRNNvK.rtbz KRRNvKP.rtbw KRRNvKP.rtbz KRRNPvK.rtbw KRRNPvK.rtbz KRRvKPP.rtbw KRRvKPP.rtbz KRRPvKQ.rtbw KRRPvKQ.rtbz KRRPvKR.rtbw KRRPvKR.rtbz KRRPvKB.rtbw KRRPvKB.rtbz KRRPvKN.rtbw KRRPvKN.rtbz KRRPvKP.rtbw KRRPvKP.rtbz KRRPPvK.rtbw KRRPPvK.rtbz KRBvKRB.rtbw KRBvKRB.rtbz KRBvKRN.rtbw KRBvKRN.rtbz KRBvKRP.rtbw KRBvKRP.rtbz KRBvKBB.rtbw KRBvKBB.rtbz KRBvKBN.rtbw KRBvKBN.rtbz KRBvKBP.rtbw KRBvKBP.rtbz KRBBvKQ.rtbw KRBBvKQ.rtbz KRBBvKR.rtbw KRBBvKR.rtbz KRBBvKB.rtbw KRBBvKB.rtbz KRBBBvK.rtbw KRBBBvK.rtbz KRBBvKN.rtbw KRBBvKN.rtbz KRBBNvK.rtbw KRBBNvK.rtbz KRBBvKP.rtbw KRBBvKP.rtbz KRBBPvK.rtbw KRBBPvK.rtbz KRBvKNN.rtbw KRBvKNN.rtbz KRBvKNP.rtbw KRBvKNP.rtbz KRBNvKQ.rtbw KRBNvKQ.rtbz KRBNvKR.rtbw KRBNvKR.rtbz KRBNvKB.rtbw KRBNvKB.rtbz KRBNvKN.rtbw KRBNvKN.rtbz KRBNNvK.rtbw KRBNNvK.rtbz KRBNvKP.rtbw KRBNvKP.rtbz KRBNPvK.rtbw KRBNPvK.rtbz KRBvKPP.rtbw KRBvKPP.rtbz KRBPvKQ.rtbw KRBPvKQ.rtbz KRBPvKR.rtbw KRBPvKR.rtbz KRBPvKB.rtbw KRBPvKB.rtbz KRBPvKN.rtbw KRBPvKN.rtbz KRBPvKP.rtbw KRBPvKP.rtbz KRBPPvK.rtbw KRBPPvK.rtbz KRNvKRN.rtbw KRNvKRN.rtbz KRNvKRP.rtbw KRNvKRP.rtbz KRNvKBB.rtbw KRNvKBB.rtbz KRNvKBN.rtbw KRNvKBN.rtbz KRNvKBP.rtbw KRNvKBP.rtbz KRNvKNN.rtbw KRNvKNN.rtbz KRNvKNP.rtbw KRNvKNP.rtbz KRNNvKQ.rtbw KRNNvKQ.rtbz KRNNvKR.rtbw KRNNvKR.rtbz KRNNvKB.rtbw KRNNvKB.rtbz KRNNvKN.rtbw KRNNvKN.rtbz KRNNNvK.rtbw KRNNNvK.rtbz KRNNvKP.rtbw KRNNvKP.rtbz KRNNPvK.rtbw KRNNPvK.rtbz KRNvKPP.rtbw KRNvKPP.rtbz KRNPvKQ.rtbw KRNPvKQ.rtbz KRNPvKR.rtbw KRNPvKR.rtbz KRNPvKB.rtbw KRNPvKB.rtbz KRNPvKN.rtbw KRNPvKN.rtbz KRNPvKP.rtbw KRNPvKP.rtbz KRNPPvK.rtbw KRNPPvK.rtbz KRPvKRP.rtbw KRPvKRP.rtbz KRPvKBB.rtbw KRPvKBB.rtbz KRPvKBN.rtbw KRPvKBN.rtbz KRPvKBP.rtbw KRPvKBP.rtbz KRPvKNN.rtbw KRPvKNN.rtbz KRPvKNP.rtbw KRPvKNP.rtbz KRPvKPP.rtbw KRPvKPP.rtbz KRPPvKQ.rtbw KRPPvKQ.rtbz KRPPvKR.rtbw KRPPvKR.rtbz KRPPvKB.rtbw KRPPvKB.rtbz KRPPvKN.rtbw KRPPvKN.rtbz KRPPvKP.rtbw KRPPvKP.rtbz KRPPPvK.rtbw KRPPPvK.rtbz KBBvKBB.rtbw KBBvKBB.rtbz KBBvKBN.rtbw KBBvKBN.rtbz KBBvKBP.rtbw KBBvKBP.rtbz KBBBvKQ.rtbw KBBBvKQ.rtbz KBBBvKR.rtbw KBBBvKR.rtbz KBBBvKB.rtbw KBBBvKB.rtbz KBBBBvK.rtbw KBBBBvK.rtbz KBBBvKN.rtbw KBBBvKN.rtbz KBBBNvK.rtbw KBBBNvK.rtbz KBBBvKP.rtbw KBBBvKP.rtbz KBBBPvK.rtbw KBBBPvK.rtbz KBBvKNN.rtbw KBBvKNN.rtbz KBBvKNP.rtbw KBBvKNP.rtbz KBBNvKQ.rtbw KBBNvKQ.rtbz KBBNvKR.rtbw KBBNvKR.rtbz KBBNvKB.rtbw KBBNvKB.rtbz KBBNvKN.rtbw KBBNvKN.rtbz KBBNNvK.rtbw KBBNNvK.rtbz KBBNvKP.rtbw KBBNvKP.rtbz KBBNPvK.rtbw KBBNPvK.rtbz KBBvKPP.rtbw KBBvKPP.rtbz KBBPvKQ.rtbw KBBPvKQ.rtbz KBBPvKR.rtbw KBBPvKR.rtbz KBBPvKB.rtbw KBBPvKB.rtbz KBBPvKN.rtbw KBBPvKN.rtbz KBBPvKP.rtbw KBBPvKP.rtbz KBBPPvK.rtbw KBBPPvK.rtbz KBNvKBN.rtbw KBNvKBN.rtbz KBNvKBP.rtbw KBNvKBP.rtbz KBNvKNN.rtbw KBNvKNN.rtbz KBNvKNP.rtbw KBNvKNP.rtbz KBNNvKQ.rtbw KBNNvKQ.rtbz KBNNvKR.rtbw KBNNvKR.rtbz KBNNvKB.rtbw KBNNvKB.rtbz KBNNvKN.rtbw KBNNvKN.rtbz KBNNNvK.rtbw KBNNNvK.rtbz KBNNvKP.rtbw KBNNvKP.rtbz KBNNPvK.rtbw KBNNPvK.rtbz KBNvKPP.rtbw KBNvKPP.rtbz KBNPvKQ.rtbw KBNPvKQ.rtbz KBNPvKR.rtbw KBNPvKR.rtbz KBNPvKB.rtbw KBNPvKB.rtbz KBNPvKN.rtbw KBNPvKN.rtbz KBNPvKP.rtbw KBNPvKP.rtbz KBNPPvK.rtbw KBNPPvK.rtbz KBPvKBP.rtbw KBPvKBP.rtbz KBPvKNN.rtbw KBPvKNN.rtbz KBPvKNP.rtbw KBPvKNP.rtbz KBPvKPP.rtbw KBPvKPP.rtbz KBPPvKQ.rtbw KBPPvKQ.rtbz KBPPvKR.rtbw KBPPvKR.rtbz KBPPvKB.rtbw KBPPvKB.rtbz KBPPvKN.rtbw KBPPvKN.rtbz KBPPvKP.rtbw KBPPvKP.rtbz KBPPPvK.rtbw KBPPPvK.rtbz KNNvKNN.rtbw KNNvKNN.rtbz KNNvKNP.rtbw KNNvKNP.rtbz KNNNvKQ.rtbw KNNNvKQ.rtbz KNNNvKR.rtbw KNNNvKR.rtbz KNNNvKB.rtbw KNNNvKB.rtbz KNNNvKN.rtbw KNNNvKN.rtbz KNNNNvK.rtbw KNNNNvK.rtbz KNNNvKP.rtbw KNNNvKP.rtbz KNNNPvK.rtbw KNNNPvK.rtbz KNNvKPP.rtbw KNNvKPP.rtbz KNNPvKQ.rtbw KNNPvKQ.rtbz KNNPvKR.rtbw KNNPvKR.rtbz KNNPvKB.rtbw KNNPvKB.rtbz KNNPvKN.rtbw KNNPvKN.rtbz KNNPvKP.rtbw KNNPvKP.rtbz KNNPPvK.rtbw KNNPPvK.rtbz KNPvKNP.rtbw KNPvKNP.rtbz KNPvKPP.rtbw KNPvKPP.rtbz KNPPvKQ.rtbw KNPPvKQ.rtbz KNPPvKR.rtbw KNPPvKR.rtbz KNPPvKB.rtbw KNPPvKB.rtbz KNPPvKN.rtbw KNPPvKN.rtbz KNPPvKP.rtbw KNPPvKP.rtbz KNPPPvK.rtbw KNPPPvK.rtbz KPPvKPP.rtbw KPPvKPP.rtbz KPPPvKQ.rtbw KPPPvKQ.rtbz KPPPvKR.rtbw KPPPvKR.rtbz KPPPvKB.rtbw KPPPvKB.rtbz KPPPvKN.rtbw KPPPvKN.rtbz KPPPvKP.rtbw KPPPvKP.rtbz KPPPPvK.rtbw KPPPPvK.rtbz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8
 _md5_=0b92a824b8aefacae279bc884a4a78a7
diff --git a/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213-r100 b/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213-r100
index 34104dbf4a12..6d44b82982a5 100644
--- a/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213-r100
+++ b/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213-r100
@@ -8,5 +8,5 @@ LICENSE=public-domain
 PDEPEND=6-pieces? ( ~games-board/tablebase-syzygy-0_pre20131213:nofetch )
 SLOT=0
 SRC_URI=http://tablebase.sesse.net/syzygy/3-4-5/KQvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQQvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQQvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPPvK.rtbz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8
 _md5_=4d10bb561c24b44c8e3262e2bc926978
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 477a66259e64..61d993446ed4 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/pcsx2-1.6.0-r1 b/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r1
index 8afd2e3898bc..ede8e5ea1364 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r1
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] dev-libs/libxml2:2[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] net-libs/libpcap[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:3[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0-gtk3[abi_x86_32(-),X] filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/PCSX2/pcsx2/archive/v1.6.0.tar.gz -> pcsx2-1.6.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=23b4882c8e6c27490716a5db21eb871b
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r2 b/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r2
index 62ca065aa85d..6fa71cf5724f 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r2
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.6.0-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] dev-libs/libxml2:2[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] net-libs/libpcap[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:3[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0-gtk3[abi_x86_32(-),X] filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/PCSX2/pcsx2/archive/v1.6.0.tar.gz -> pcsx2-1.6.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=06cd166e74f5beba236e126ad9bf3693
diff --git a/metadata/md5-cache/games-emulation/pcsx2-9999 b/metadata/md5-cache/games-emulation/pcsx2-9999
index 14a97a8266cb..ec834dad8c0e 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-9999
+++ b/metadata/md5-cache/games-emulation/pcsx2-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-cpp/yaml-cpp:= dev-libs/libaio >=dev-libs/libfmt-7.1.3:= dev-libs/libxml2:2 media-libs/alsa-lib media-libs/libpng:= media-libs/libsamplerate media-libs/libsdl2[haptic,joystick,sound] media-libs/libsoundtouch media-libs/portaudio net-libs/libpcap sys-libs/zlib virtual/libudev virtual/opengl x11-libs/gtk+:3 x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/wxGTK:3.0-gtk3[X] filecaps? ( sys-libs/libcap )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=61f75284db1198e19b87e216398d8ad8
diff --git a/metadata/md5-cache/games-emulation/vbam-2.1.4 b/metadata/md5-cache/games-emulation/vbam-2.1.4
index 14aafbf50b79..6f176fea866b 100644
--- a/metadata/md5-cache/games-emulation/vbam-2.1.4
+++ b/metadata/md5-cache/games-emulation/vbam-2.1.4
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-
 REQUIRED_USE=ffmpeg? ( wxwidgets ) openal? ( wxwidgets ) || ( sdl wxwidgets )
 SLOT=0
 SRC_URI=https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v2.1.4.tar.gz -> vbam-2.1.4.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=40ac38717e306a0537a5a3913f7bff6e
diff --git a/metadata/md5-cache/games-emulation/vbam-9999 b/metadata/md5-cache/games-emulation/vbam-9999
index b7e86fd587f8..b0dd83fabed5 100644
--- a/metadata/md5-cache/games-emulation/vbam-9999
+++ b/metadata/md5-cache/games-emulation/vbam-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( ffmpeg? ( media-video/ffmpeg:= ) openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] )
 REQUIRED_USE=ffmpeg? ( wxwidgets ) openal? ( wxwidgets ) || ( sdl wxwidgets )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b9a48a351dc47839a9da3d88740dd735
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 647c261b2855..f97aee5faf10 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/dMagnetic-0.31 b/metadata/md5-cache/games-engines/dMagnetic-0.31
deleted file mode 100644
index 34677286b981..000000000000
--- a/metadata/md5-cache/games-engines/dMagnetic-0.31
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DESCRIPTION=A Magnetic Scrolls Interpreter for playing a collection of old text adventures
-EAPI=7
-HOMEPAGE=https://www.dettus.net/dMagnetic/
-KEYWORDS=~amd64 ~arm ~m68k ~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://www.dettus.net/dMagnetic/dMagnetic_0.31.tar.bz2
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=01d610f8b97e55bdb2d3164ed865a282
diff --git a/metadata/md5-cache/games-engines/dMagnetic-0.32 b/metadata/md5-cache/games-engines/dMagnetic-0.32
new file mode 100644
index 000000000000..dbefb6e5fd33
--- /dev/null
+++ b/metadata/md5-cache/games-engines/dMagnetic-0.32
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare test
+DESCRIPTION=A Magnetic Scrolls Interpreter for playing a collection of old text adventures
+EAPI=8
+HOMEPAGE=https://www.dettus.net/dMagnetic/
+KEYWORDS=~amd64 ~arm ~m68k ~x86
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://www.dettus.net/dMagnetic/dMagnetic_0.32.tar.bz2
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5e1b4adb1aefa43fa4d364f00bf5c388
diff --git a/metadata/md5-cache/games-engines/odamex-0.9.2 b/metadata/md5-cache/games-engines/odamex-0.9.2
index 472f0ac072fc..48804b4018d8 100644
--- a/metadata/md5-cache/games-engines/odamex-0.9.2
+++ b/metadata/md5-cache/games-engines/odamex-0.9.2
@@ -11,5 +11,5 @@ RDEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video]
 REQUIRED_USE=|| ( client master server )
 SLOT=0
 SRC_URI=mirror://sourceforge/odamex/Odamex/0.9.2/odamex-src-0.9.2.tar.bz2 -> odamex-0.9.2.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=64a0ed3db787db90a1e6bf9a5b399ddc
diff --git a/metadata/md5-cache/games-engines/odamex-0.9.3 b/metadata/md5-cache/games-engines/odamex-0.9.3
index 12139a1047b4..c258da7ddf98 100644
--- a/metadata/md5-cache/games-engines/odamex-0.9.3
+++ b/metadata/md5-cache/games-engines/odamex-0.9.3
@@ -11,5 +11,5 @@ RDEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video]
 REQUIRED_USE=|| ( client master server )
 SLOT=0
 SRC_URI=mirror://sourceforge/odamex/Odamex/0.9.3/odamex-src-0.9.3.tar.bz2 -> odamex-0.9.3.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=04e9ee8131b71940f259cee2660cc35f
diff --git a/metadata/md5-cache/games-engines/scummvm-tools-2.1.0 b/metadata/md5-cache/games-engines/scummvm-tools-2.1.0
index 75ebb2265f3a..10547227f096 100644
--- a/metadata/md5-cache/games-engines/scummvm-tools-2.1.0
+++ b/metadata/md5-cache/games-engines/scummvm-tools-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.32:= sys-libs/zlib x11-libs/wxGTK:3.0-gtk3 flac? ( me
 RESTRICT=test
 SLOT=0
 SRC_URI=http://scummvm.org/frs/scummvm-tools/2.1.0/scummvm-tools-2.1.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=401446bf0aca2819e71d1c50adeb5125
diff --git a/metadata/md5-cache/games-engines/scummvm-tools-2.2.0 b/metadata/md5-cache/games-engines/scummvm-tools-2.2.0
index d0396a3b6d9e..115c7b3fd36b 100644
--- a/metadata/md5-cache/games-engines/scummvm-tools-2.2.0
+++ b/metadata/md5-cache/games-engines/scummvm-tools-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.32:= sys-libs/zlib x11-libs/wxGTK:3.0-gtk3 flac? ( me
 RESTRICT=test
 SLOT=0
 SRC_URI=http://scummvm.org/frs/scummvm-tools/2.2.0/scummvm-tools-2.2.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=4a8f629f07acf61339875f5d17bc588a
diff --git a/metadata/md5-cache/games-engines/stratagus-3.0.0-r100 b/metadata/md5-cache/games-engines/stratagus-3.0.0-r100
index 1bc85e4972d6..cb7f155a2b7f 100644
--- a/metadata/md5-cache/games-engines/stratagus-3.0.0-r100
+++ b/metadata/md5-cache/games-engines/stratagus-3.0.0-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/t
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) theora? ( vorbis )
 SLOT=0/3
 SRC_URI=https://github.com/Wargus/stratagus/archive/v3.0.0.tar.gz -> stratagus-3.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f51ceff10498cea23fec34d717dd4aa1
diff --git a/metadata/md5-cache/games-engines/stratagus-3.1.0 b/metadata/md5-cache/games-engines/stratagus-3.1.0
index 3a6757ff5f5a..97e492b0bc3d 100644
--- a/metadata/md5-cache/games-engines/stratagus-3.1.0
+++ b/metadata/md5-cache/games-engines/stratagus-3.1.0
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/t
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) theora? ( vorbis )
 SLOT=0/3
 SRC_URI=https://github.com/Wargus/stratagus/archive/v3.1.0.tar.gz -> stratagus-3.1.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d99da0f8ba91fde0a167d647ce77eebb
diff --git a/metadata/md5-cache/games-engines/stratagus-3.1.1 b/metadata/md5-cache/games-engines/stratagus-3.1.1
index ff5b3cf2c9fd..afe366bac73e 100644
--- a/metadata/md5-cache/games-engines/stratagus-3.1.1
+++ b/metadata/md5-cache/games-engines/stratagus-3.1.1
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/t
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) theora? ( vorbis )
 SLOT=0/3
 SRC_URI=https://github.com/Wargus/stratagus/archive/v3.1.1.tar.gz -> stratagus-3.1.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d99da0f8ba91fde0a167d647ce77eebb
diff --git a/metadata/md5-cache/games-engines/stratagus-3.1.2 b/metadata/md5-cache/games-engines/stratagus-3.1.2
index dd9e0eb5f781..72403d650a38 100644
--- a/metadata/md5-cache/games-engines/stratagus-3.1.2
+++ b/metadata/md5-cache/games-engines/stratagus-3.1.2
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/t
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) theora? ( vorbis )
 SLOT=0/3
 SRC_URI=https://github.com/Wargus/stratagus/archive/v3.1.2.tar.gz -> stratagus-3.1.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d99da0f8ba91fde0a167d647ce77eebb
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 826e119fcca1..64a828130920 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r2 b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r2
index e2a0445ec5e5..793793c16e9c 100644
--- a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r2
+++ b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl[X,opengl,sound,abi_x86_32(-)] media-libs/smpeg[abi_x86
 RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/sof/sof-1.06a-cdrom-x86.run
-_eclasses_=cdrom	96bb9b81542ce6da0c28603f1b5a98b7	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=cdrom	96bb9b81542ce6da0c28603f1b5a98b7	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f51e2871baa7e08478b5ac9651587d2
diff --git a/metadata/md5-cache/games-fps/urbanterror-data-4.3.4 b/metadata/md5-cache/games-fps/urbanterror-data-4.3.4
index 24311dad6332..247375cd80b4 100644
--- a/metadata/md5-cache/games-fps/urbanterror-data-4.3.4
+++ b/metadata/md5-cache/games-fps/urbanterror-data-4.3.4
@@ -8,5 +8,5 @@ LICENSE=Q3AEULA-20000111 urbanterror-4.2-maps
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://up.barbatos.fr/urt/UrbanTerror43_full_2.zip -> urbanterror-data-4.3.0.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.0-to-4.3.1.zip -> urbanterror-data-4.3.0-to-4.3.1.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.1-to-4.3.2.zip -> urbanterror-data-4.3.1-to-4.3.2.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.2-to-4.3.3.zip -> urbanterror-data-4.3.2-to-4.3.3.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.3-to-4.3.4.zip -> urbanterror-data-4.3.3-to-4.3.4.zip
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8
 _md5_=b56930725e8c578b8301fd618138bcd3
diff --git a/metadata/md5-cache/games-fps/xonotic-0.8.2 b/metadata/md5-cache/games-fps/xonotic-0.8.2
index dac9dd56e58f..7024b1d8d4f3 100644
--- a/metadata/md5-cache/games-fps/xonotic-0.8.2
+++ b/metadata/md5-cache/games-fps/xonotic-0.8.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=sys-libs/zlib virtual/jpeg:0 media-libs/libpng:0 net-misc/curl ~dev-libs/d0_blind_id-1.0 !dedicated? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/libmodplug x11-libs/libX11 x11-libs/libXau x11-libs/libXpm x11-libs/libXext x11-libs/libXdmcp x11-libs/libXxf86dga x11-libs/libXxf86vm virtual/opengl media-libs/freetype:2 alsa? ( media-libs/alsa-lib ) ode? ( dev-games/ode[double-precision] ) sdl? ( media-libs/libsdl2[X,sound,joystick,opengl,video,alsa?] ) )
 SLOT=0
 SRC_URI=https://dl.xonotic.org/xonotic-0.8.2.zip
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f7072a7731d8b17a1b66ebc69b22dfc
diff --git a/metadata/md5-cache/games-kids/Manifest.gz b/metadata/md5-cache/games-kids/Manifest.gz
index 2bd89108d86e..73ed65e56b3f 100644
--- a/metadata/md5-cache/games-kids/Manifest.gz
+++ b/metadata/md5-cache/games-kids/Manifest.gz
diff --git a/metadata/md5-cache/games-kids/tuxmath-2.0.3-r2 b/metadata/md5-cache/games-kids/tuxmath-2.0.3-r2
index ce874ae0ad1a..8a018624d417 100644
--- a/metadata/md5-cache/games-kids/tuxmath-2.0.3-r2
+++ b/metadata/md5-cache/games-kids/tuxmath-2.0.3-r2
@@ -10,5 +10,5 @@ LICENSE=CC-BY-SA-3.0 CC-PD GPL-3+ public-domain
 RDEPEND=>=dev-games/t4k-common-0.1.1-r1[svg?] dev-libs/libxml2:2 media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer media-libs/sdl-net nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/t/tuxmath/tuxmath_2.0.3.orig.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=2d9b309b6542a7400c2e92b04ef68d78
diff --git a/metadata/md5-cache/games-kids/tuxtype-1.8.3-r2 b/metadata/md5-cache/games-kids/tuxtype-1.8.3-r2
index ea397722f64b..1d48318c58ed 100644
--- a/metadata/md5-cache/games-kids/tuxtype-1.8.3-r2
+++ b/metadata/md5-cache/games-kids/tuxtype-1.8.3-r2
@@ -9,5 +9,5 @@ LICENSE=CC-BY-3.0 CC-BY-SA-3.0 GPL-3+ public-domain
 RDEPEND=acct-group/gamestat media-libs/libsdl[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer media-libs/sdl-pango
 SLOT=0
 SRC_URI=https://github.com/tux4kids/tuxtype/archive/upstream/1.8.3.tar.gz -> tuxtype-1.8.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0691cee14e91d5cb5ab5b9d53e49ebb8
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 1fb039d04577..dbbd9cbcf841 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/sound-of-sorting-0.6.6_pre20151107-r1 b/metadata/md5-cache/games-misc/sound-of-sorting-0.6.6_pre20151107-r1
index 37e9ac3bbfe7..98c83e64b610 100644
--- a/metadata/md5-cache/games-misc/sound-of-sorting-0.6.6_pre20151107-r1
+++ b/metadata/md5-cache/games-misc/sound-of-sorting-0.6.6_pre20151107-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl x11-libs/wxGTK:3.0
 SLOT=0
 SRC_URI=https://github.com/bingmann/sound-of-sorting/archive/05db428c796a7006d63efdbe314f976e0aa881d6.tar.gz -> sound-of-sorting-0.6.6_pre20151107.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=c087f116a273b11a1c5b4d9401150eed
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 6c94903f7775..f603c81a7f81 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3 b/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3
index ed1cc2e40c98..be3807d49275 100644
--- a/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3
+++ b/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pathological/pathological-1.1.3.tar.gz mirror://debian/pool/main/p/pathological/pathological_1.1.3-16.debian.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c13dc9cf135f5849b5e499fcd06938dd
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 692358095ae4..df34acbc73a7 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/stone-soup-0.25.1-r102 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r102
new file mode 100644
index 000000000000..c2bb3ecf0c11
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r102
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=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 ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) app-arch/unzip dev-lang/perl || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/pyyaml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyyaml[python_targets_python3_8(-)] ) ) sys-devel/flex tiles? ( media-gfx/pngcrush sys-libs/ncurses:0 ) virtual/pkgconfig virtual/yacc
+DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
+EAPI=8
+HOMEPAGE=https://crawl.develz.org
+IUSE=debug ncurses sound +tiles lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
+RDEPEND=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 ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )
+SLOT=0.25
+SRC_URI=https://github.com/crawl/crawl/releases/download/0.25.1/stone_soup-0.25.1.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.25.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.25.svg
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8ad86ead5347249fc7065a767e7262a2
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.26.1-r1 b/metadata/md5-cache/games-roguelike/stone-soup-0.26.1-r1
new file mode 100644
index 000000000000..bec3d0f0e628
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.26.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=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 ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) app-arch/unzip dev-lang/perl || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/pyyaml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyyaml[python_targets_python3_8(-)] ) ) sys-devel/flex tiles? ( media-gfx/pngcrush sys-libs/ncurses:0 ) virtual/pkgconfig virtual/yacc
+DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
+EAPI=8
+HOMEPAGE=https://crawl.develz.org
+IUSE=debug ncurses sound +tiles lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
+RDEPEND=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 ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )
+SLOT=0.26
+SRC_URI=https://github.com/crawl/crawl/releases/download/0.26.1/stone_soup-0.26.1.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.26.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.26.svg
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d5677c4ead2bb98b94b9b31a1a54b49e
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.27.0-r1 b/metadata/md5-cache/games-roguelike/stone-soup-0.27.0-r1
new file mode 100644
index 000000000000..b6bae5e3a4cb
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.27.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=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 ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) app-arch/unzip dev-lang/perl || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/pyyaml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyyaml[python_targets_python3_8(-)] ) ) sys-devel/flex tiles? ( media-gfx/pngcrush sys-libs/ncurses:0 ) virtual/pkgconfig virtual/yacc
+DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
+EAPI=8
+HOMEPAGE=https://crawl.develz.org
+IUSE=debug ncurses sound +tiles lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
+RDEPEND=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 ) dev-db/sqlite:3 sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )
+SLOT=0.27
+SRC_URI=https://github.com/crawl/crawl/releases/download/0.27.0/stone_soup-0.27.0.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.27.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.27.svg
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9b41d0e3f572c43871759f91b5cec54f
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index b96eaef8367f..49d6eae3141f 100644
--- a/metadata/md5-cache/games-rpg/Manifest.gz
+++ b/metadata/md5-cache/games-rpg/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/bastion-20161016 b/metadata/md5-cache/games-rpg/bastion-20161016
index c66ead2ee369..7d032b3fcd40 100644
--- a/metadata/md5-cache/games-rpg/bastion-20161016
+++ b/metadata/md5-cache/games-rpg/bastion-20161016
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl2[joystick,opengl,sound,video] media-libs/libvorbis
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=bastion-10162016-bin
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=45c5f4e991d35a0e9b5b285f891fd106
diff --git a/metadata/md5-cache/games-rpg/dungeon-defenders-20130305-r1 b/metadata/md5-cache/games-rpg/dungeon-defenders-20130305-r1
index 268b9a42a732..2eb80f9ee99d 100644
--- a/metadata/md5-cache/games-rpg/dungeon-defenders-20130305-r1
+++ b/metadata/md5-cache/games-rpg/dungeon-defenders-20130305-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl2[abi_x86_32,opengl,video] media-libs/openal[abi_x86_32
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=dundef-linux-03052013.mojo.run
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=54ea1b3d3ba4ff95b4ebca3c60cf09fa
diff --git a/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13-r2 b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13-r2
index dafc5c78b16a..f712220f4896 100644
--- a/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13-r2
+++ b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13-r2
@@ -8,5 +8,5 @@ RDEPEND=dev-libs/atk[abi_x86_32(-)] dev-libs/glib:2[abi_x86_32(-)] media-libs/fo
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=gog_wasteland_2_1.9.0.13.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d907b0d7ed338a3b5e6bb746f0cad5b6
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 78cb0fbe6e5c..72e02c456690 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/ut2004-ded-3369.3-r2 b/metadata/md5-cache/games-server/ut2004-ded-3369.3-r2
index 94bec0dfcc41..d3779b2962c6 100644
--- a/metadata/md5-cache/games-server/ut2004-ded-3369.3-r2
+++ b/metadata/md5-cache/games-server/ut2004-ded-3369.3-r2
@@ -9,5 +9,5 @@ RDEPEND=!games-fps/ut2004 !games-fps/ut2004-data games-fps/ut2004-bonuspack-ece
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=http://ut2004.ut-files.com/Entire_Server_Download/dedicatedserver3339-bonuspack.zip http://ut2004.ut-files.com/Patches/Linux/ut2004-lnxpatch3369-2.tar.bz2 https://dev.gentoo.org/~chewi/distfiles/ut2004-v3369-3-linux-dedicated.7z
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=246cc01e6f4cffed64783aeb84267fbf
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index c431b0285cf7..c62afa332d57 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/corsix-th-0.65.1 b/metadata/md5-cache/games-simulation/corsix-th-0.65.1
new file mode 100644
index 000000000000..35cb2c2b98d7
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/corsix-th-0.65.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] 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-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=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 ) lua_single_target_lua5-1? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-1(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-1(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-2(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-2(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-3(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-3(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-4(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-4(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-4(-)] ) media-libs/libsdl2[opengl,video] sound? ( media-libs/sdl2-mixer[midi?] ) truetype? ( >=media-libs/freetype-2.5.3:2 ) videos? ( >=media-video/ffmpeg-2.2.3:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Open source clone of Theme Hospital
+EAPI=7
+HOMEPAGE=https://corsixth.com
+IUSE=doc +midi +sound +truetype +videos lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=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 ) lua_single_target_lua5-1? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-1(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-1(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-2(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-2(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-3(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-3(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-4(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-4(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-4(-)] ) media-libs/libsdl2[opengl,video] sound? ( media-libs/sdl2-mixer[midi?] ) truetype? ( >=media-libs/freetype-2.5.3:2 ) videos? ( >=media-video/ffmpeg-2.2.3:0= )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
+SLOT=0
+SRC_URI=https://github.com/CorsixTH/CorsixTH/archive/v0.65.1.tar.gz -> corsix-th-0.65.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=02c439b740bb87bbbd1b074787d76561
diff --git a/metadata/md5-cache/games-simulation/gl117-1.3.2-r1 b/metadata/md5-cache/games-simulation/gl117-1.3.2-r1
index c68cf36479f4..4599ed05540f 100644
--- a/metadata/md5-cache/games-simulation/gl117-1.3.2-r1
+++ b/metadata/md5-cache/games-simulation/gl117-1.3.2-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=media-libs/freeglut media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-mixer[mod] virtual/glu virtual/opengl
-DESCRIPTION=An action flight simulator
-EAPI=6
-HOMEPAGE=http://www.heptargon.de/gl-117/gl-117.html
+DEPEND=media-libs/freeglut media-libs/libsdl[joystick,opengl,sound,video] media-libs/sdl-mixer[mod] virtual/glu virtual/opengl
+DESCRIPTION=Action flight simulator
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/gl-117/
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freeglut media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-mixer[mod] virtual/glu virtual/opengl
+LICENSE=GPL-2+
+RDEPEND=media-libs/freeglut media-libs/libsdl[joystick,opengl,sound,video] media-libs/sdl-mixer[mod] virtual/glu virtual/opengl
 SLOT=0
-SRC_URI=mirror://sourceforge/gl-117/gl-117-1.3.2-src.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=71c1f2ff0d2a03776d811719b300d350
+SRC_URI=mirror://sourceforge/gl-117/gl-117-1.3.2-src.tar.bz2 https://dev.gentoo.org/~ionen/distfiles/gl117.png
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=7cc37c9a94114fa2c6721bd6a451d884
diff --git a/metadata/md5-cache/games-simulation/lincity-1.13.1-r1 b/metadata/md5-cache/games-simulation/lincity-1.13.1-r1
deleted file mode 100644
index e451484d0e87..000000000000
--- a/metadata/md5-cache/games-simulation/lincity-1.13.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/libpng:0 x11-libs/libSM x11-libs/libXext nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=city/country simulation game for X and Linux SVGALib
-EAPI=6
-HOMEPAGE=http://lincity.sourceforge.net/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng:0 x11-libs/libSM x11-libs/libXext nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/lincity/lincity-1.13.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=469f863ba8c9894c1afa812c8e3b9ea7
diff --git a/metadata/md5-cache/games-simulation/lincity-1.13.1-r2 b/metadata/md5-cache/games-simulation/lincity-1.13.1-r2
new file mode 100644
index 000000000000..9f71800f2047
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/lincity-1.13.1-r2
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gettext
+DEFINED_PHASES=compile configure install
+DEPEND=media-libs/libpng:= virtual/libintl x11-libs/libXext x11-base/xorg-proto
+DESCRIPTION=City simulation game for X
+EAPI=8
+HOMEPAGE=http://lincity.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libpng:= virtual/libintl x11-libs/libXext
+SLOT=0
+SRC_URI=mirror://sourceforge/lincity/lincity-1.13.1.tar.gz https://dev.gentoo.org/~ionen/distfiles/lincity.png
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=1fd9acc35c2a0b4a74960c577391353e
diff --git a/metadata/md5-cache/games-simulation/lincity-ng-2.9_beta b/metadata/md5-cache/games-simulation/lincity-ng-2.9_beta
index 86ec032b5b4f..2e62df355417 100644
--- a/metadata/md5-cache/games-simulation/lincity-ng-2.9_beta
+++ b/metadata/md5-cache/games-simulation/lincity-ng-2.9_beta
@@ -1,13 +1,13 @@
-BDEPEND=dev-util/ftjam virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=dev-libs/libxslt dev-util/ftjam sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-games/physfs dev-libs/libxml2:2 media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf sys-libs/zlib virtual/opengl
+DEPEND=dev-games/physfs dev-libs/libxml2:2 media-libs/libsdl[joystick,opengl,sound,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf sys-libs/zlib virtual/opengl
 DESCRIPTION=City simulation game
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/lincity-ng/lincity-ng
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 BitstreamVera CC-BY-SA-2.0
-RDEPEND=dev-games/physfs dev-libs/libxml2:2 media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf sys-libs/zlib virtual/opengl
+LICENSE=GPL-2+ BitstreamVera CC-BY-SA-2.0
+RDEPEND=dev-games/physfs dev-libs/libxml2:2 media-libs/libsdl[joystick,opengl,sound,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf sys-libs/zlib virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/lincity-ng/lincity-ng/archive/lincity-ng-2.9-beta.tar.gz -> lincity-ng-2.9_beta.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a6383cb8910c35022ddcfecfe0355162
+_md5_=e1a799cc755aa47924e2ac3a45859f65
diff --git a/metadata/md5-cache/games-sports/Manifest.gz b/metadata/md5-cache/games-sports/Manifest.gz
index 36834bed7ce5..7bde0bf3dbfd 100644
--- a/metadata/md5-cache/games-sports/Manifest.gz
+++ b/metadata/md5-cache/games-sports/Manifest.gz
diff --git a/metadata/md5-cache/games-sports/speed-dreams-2.2.3_rc1 b/metadata/md5-cache/games-sports/speed-dreams-2.2.3_rc1
new file mode 100644
index 000000000000..5c8531042b46
--- /dev/null
+++ b/metadata/md5-cache/games-sports/speed-dreams-2.2.3_rc1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-games/freesolid dev-libs/expat media-libs/libpng:= media-libs/libsdl2[X,haptic,opengl,joystick,video] media-libs/libvorbis media-libs/openal media-libs/plib net-libs/enet:1.3 sys-libs/zlib:= virtual/glu virtual/jpeg virtual/opengl osggraph? ( dev-games/openscenegraph:=[png] ) webstats? ( net-misc/curl ) x11-base/xorg-proto
+DESCRIPTION=Fork of the famous open racing car simulator TORCS
+EAPI=7
+HOMEPAGE=http://www.speed-dreams.org/
+IUSE=debug osggraph webstats
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ BitstreamVera CC0-1.0 Free-Art-1.2 OFL-1.1
+RDEPEND=dev-games/freesolid dev-libs/expat media-libs/libpng:= media-libs/libsdl2[X,haptic,opengl,joystick,video] media-libs/libvorbis media-libs/openal media-libs/plib net-libs/enet:1.3 sys-libs/zlib:= virtual/glu virtual/jpeg virtual/opengl osggraph? ( dev-games/openscenegraph:=[png] ) webstats? ( net-misc/curl )
+SLOT=0
+SRC_URI=mirror://sourceforge/speed-dreams/speed-dreams-src-base-2.2.3-rc1-r7601.tar.xz mirror://sourceforge/speed-dreams/speed-dreams-src-hq-cars-and-tracks-2.2.3-rc1-r7601.tar.xz mirror://sourceforge/speed-dreams/speed-dreams-src-more-hq-cars-and-tracks-2.2.3-rc1-r7601.tar.xz mirror://sourceforge/speed-dreams/speed-dreams-src-wip-cars-and-tracks-2.2.3-rc1-r7601.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=52d66ffd774a77361e0b7243dcbf05a6
diff --git a/metadata/md5-cache/games-strategy/0ad-0.0.24_alpha_pre20210116040036-r2 b/metadata/md5-cache/games-strategy/0ad-0.0.24_alpha_pre20210116040036-r2
index 8f2d5ea535eb..1880a8af87ec 100644
--- a/metadata/md5-cache/games-strategy/0ad-0.0.24_alpha_pre20210116040036-r2
+++ b/metadata/md5-cache/games-strategy/0ad-0.0.24_alpha_pre20210116040036-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libfmt:0= dev-libs/libsodium de
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/0ad/0ad/archive/c7d07d3979f969b969211a5e5748fa775f6768a7.tar.gz -> 0ad-0.0.24_alpha_pre20210116040036.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=99fff00435336cf75b4e8d1093f11002
diff --git a/metadata/md5-cache/games-strategy/0ad-0.0.24b_alpha-r1 b/metadata/md5-cache/games-strategy/0ad-0.0.24b_alpha-r1
index 02d94f2f4bef..59a92318dfaf 100644
--- a/metadata/md5-cache/games-strategy/0ad-0.0.24b_alpha-r1
+++ b/metadata/md5-cache/games-strategy/0ad-0.0.24b_alpha-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libfmt:0= dev-libs/libsodium de
 RESTRICT=test
 SLOT=0
 SRC_URI=http://releases.wildfiregames.com/0ad-0.0.24b-alpha-unix-build.tar.xz https://releases.wildfiregames.com/0ad-0.0.24b-alpha-unix-data.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1d61b9566edc2ceb937831916157da06
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index b1af75253c65..744a85dc369e 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/ja2-stracciatella-data-1-r1 b/metadata/md5-cache/games-strategy/ja2-stracciatella-data-1-r1
index e47b504b146e..bd0150406558 100644
--- a/metadata/md5-cache/games-strategy/ja2-stracciatella-data-1-r1
+++ b/metadata/md5-cache/games-strategy/ja2-stracciatella-data-1-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=SIR-TECH
 PROPERTIES=interactive
 SLOT=0
-_eclasses_=cdrom	96bb9b81542ce6da0c28603f1b5a98b7	check-reqs	97b90bd8fb799993925e6b3a683184e5	portability	d1186f1e621de7b27ddcae82e6253259
+_eclasses_=cdrom	96bb9b81542ce6da0c28603f1b5a98b7	check-reqs	bfb51de63b0462097e40436214dd43c8	portability	d1186f1e621de7b27ddcae82e6253259
 _md5_=6e4621a53b63dc68b50ae0db696e6e9a
diff --git a/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100 b/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
index b86c99c7f018..82b6e7cc8d06 100644
--- a/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
+++ b/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=https://github.com/MegaGlest/megaglest-source/releases/download/3.11.1/megaglest-source-3.11.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a8d22a40be3e34a79d328834a2ce5b6b
diff --git a/metadata/md5-cache/games-strategy/megaglest-3.13.0 b/metadata/md5-cache/games-strategy/megaglest-3.13.0
index 9d9d17e68101..16d9043152a0 100644
--- a/metadata/md5-cache/games-strategy/megaglest-3.13.0
+++ b/metadata/md5-cache/games-strategy/megaglest-3.13.0
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=https://github.com/MegaGlest/megaglest-source/releases/download/3.13.0/megaglest-source-3.13.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c7bbb9d7e22fd126b03d8066e2282d00
diff --git a/metadata/md5-cache/games-strategy/megaglest-data-3.13.0 b/metadata/md5-cache/games-strategy/megaglest-data-3.13.0
index f383542247bc..cdc1de546343 100644
--- a/metadata/md5-cache/games-strategy/megaglest-data-3.13.0
+++ b/metadata/md5-cache/games-strategy/megaglest-data-3.13.0
@@ -9,4 +9,4 @@ LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=https://github.com/MegaGlest/megaglest-data/releases/download/3.13.0/megaglest-data-3.13.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bd155481b6686db83d31368ca1a07fc5
+_md5_=33c03e58ab3f737d85f0f78a470be0c4
diff --git a/metadata/md5-cache/games-strategy/scorched3d-44-r2 b/metadata/md5-cache/games-strategy/scorched3d-44-r2
index 4b38c0735225..0b9588b2d2a3 100644
--- a/metadata/md5-cache/games-strategy/scorched3d-44-r2
+++ b/metadata/md5-cache/games-strategy/scorched3d-44-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat media-fonts/dejavu media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-net sys-libs/zlib virtual/jpeg:0 !dedicated? ( virtual/opengl virtual/glu media-libs/glew:0= media-libs/libogg media-libs/libvorbis media-libs/openal media-libs/freealut x11-libs/wxGTK:3.0[X] media-libs/freetype:2 sci-libs/fftw:3.0= ) mysql? ( virtual/mysql )
 SLOT=0
 SRC_URI=mirror://sourceforge/scorched3d/Scorched3D-44-src.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=2f850080fc8d8dd08a41781398e12ee8
diff --git a/metadata/md5-cache/games-strategy/warzone2100-4.1.2 b/metadata/md5-cache/games-strategy/warzone2100-4.1.2
new file mode 100644
index 000000000000..88c2798aa83b
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/warzone2100-4.1.2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/zip virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-games/physfs-2[zip] >=dev-libs/libsodium-1.0.14 dev-libs/openssl:0= media-libs/freetype:2 media-libs/glew:= media-libs/harfbuzz media-libs/libogg media-libs/libpng:0 media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr nls? ( virtual/libintl ) vulkan? ( media-libs/libsdl2:=[vulkan] ) app-text/asciidoc dev-libs/fribidi media-libs/fontconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=3D real-time strategy game
+EAPI=7
+HOMEPAGE=https://wz2100.net/
+IUSE=debug discord nls videos vulkan
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ CC-BY-SA-3.0 public-domain
+RDEPEND=>=dev-games/physfs-2[zip] >=dev-libs/libsodium-1.0.14 dev-libs/openssl:0= media-libs/freetype:2 media-libs/glew:= media-libs/harfbuzz media-libs/libogg media-libs/libpng:0 media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr nls? ( virtual/libintl ) vulkan? ( media-libs/libsdl2:=[vulkan] ) media-fonts/dejavu
+SLOT=0
+SRC_URI=mirror://sourceforge/warzone2100/releases/4.1.2/warzone2100_src.tar.xz -> warzone2100-4.1.2.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ed6bacebb65f582feda6870802913654
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 331ec5d44405..dc413da5d7f0 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/dfarc-3.14 b/metadata/md5-cache/games-util/dfarc-3.14
index 58618678be59..cd70857f7bd0 100644
--- a/metadata/md5-cache/games-util/dfarc-3.14
+++ b/metadata/md5-cache/games-util/dfarc-3.14
@@ -10,5 +10,5 @@ LICENSE=GPL-3 BZIP2
 RDEPEND=app-arch/bzip2 x11-misc/xdg-utils x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=mirror://gnu/freedink/dfarc-3.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=44e9b6f47263ce705ceb9ec6610063d8
diff --git a/metadata/md5-cache/games-util/linux-wbfs-manager-0.1.12 b/metadata/md5-cache/games-util/linux-wbfs-manager-0.1.12
index 0f9739f3f0ca..1f8fbd1dfdab 100644
--- a/metadata/md5-cache/games-util/linux-wbfs-manager-0.1.12
+++ b/metadata/md5-cache/games-util/linux-wbfs-manager-0.1.12
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 virtual/pkgconfig
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0
 DESCRIPTION=WBFS manager for Linux using GTK+
-EAPI=5
+EAPI=8
 HOMEPAGE=https://code.google.com/p/linux-wbfs-manager/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gnome-base/libglade:2.0
 SLOT=0
-SRC_URI=https://linux-wbfs-manager.googlecode.com/files/linux-wbfs-manager-0.1.12.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=76d508a58447bdff772915bfe6564db7
+SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/linux-wbfs-manager/linux-wbfs-manager-0.1.12.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=06aabb7a6b7335845e6a65ac6c9346a7
diff --git a/metadata/md5-cache/games-util/linux-wbfs-manager-9999 b/metadata/md5-cache/games-util/linux-wbfs-manager-9999
deleted file mode 100644
index 43e797871508..000000000000
--- a/metadata/md5-cache/games-util/linux-wbfs-manager-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare unpack
-DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 virtual/pkgconfig dev-vcs/subversion[http(+)] net-misc/rsync
-DESCRIPTION=WBFS manager for Linux using GTK+
-EAPI=5
-HOMEPAGE=https://code.google.com/p/linux-wbfs-manager/
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=dev-libs/glib:2 gnome-base/libglade:2.0
-SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	c500a1b7795f44153bd96fc2597e3c05	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=76d508a58447bdff772915bfe6564db7
diff --git a/metadata/md5-cache/games-util/slade-3.2.0_beta2 b/metadata/md5-cache/games-util/slade-3.2.0_beta2
index 79aeeb29a76a..4f7d5ecbb8f5 100644
--- a/metadata/md5-cache/games-util/slade-3.2.0_beta2
+++ b/metadata/md5-cache/games-util/slade-3.2.0_beta2
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/sirjuddington/SLADE/archive/3.2.0_b2.tar.gz -> slade-3.2.0_beta2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=009624972a020d4d96d1b07dd2c3ffdc
diff --git a/metadata/md5-cache/games-util/springlobby-0.269 b/metadata/md5-cache/games-util/springlobby-0.269
index 468ec6fb992b..16dfb47b021b 100644
--- a/metadata/md5-cache/games-util/springlobby-0.269
+++ b/metadata/md5-cache/games-util/springlobby-0.269
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/openssl:0= net-misc/curl sys-libs/zlib[minizip] x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/wxGTK:3.0[X] libnotify? ( x11-libs/libnotify ) sound? ( media-libs/alure media-libs/openal )
 SLOT=0
 SRC_URI=https://springlobby.springrts.com/dl/stable/springlobby-0.269.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2c6f9d7aa74c47c27b91e55e77ea3d4f
diff --git a/metadata/md5-cache/games-util/wxchtdecoder-1.5a-r1 b/metadata/md5-cache/games-util/wxchtdecoder-1.5a-r1
index 1802802724fd..c5279ab391bf 100644
--- a/metadata/md5-cache/games-util/wxchtdecoder-1.5a-r1
+++ b/metadata/md5-cache/games-util/wxchtdecoder-1.5a-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=mirror://gentoo/wxchtdecoder-1.5a.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=e0ace8fe550e0fff74c1bfb7a4f49102
diff --git a/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r1 b/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r1
new file mode 100644
index 000000000000..f7aec4178992
--- /dev/null
+++ b/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig || ( ( dev-lang/python:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-util/scons[python_targets_python3_8(-)] ) ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DEPEND=dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libudev:= virtual/libusb:1 x11-libs/libX11
+DESCRIPTION=Userspace Xbox 360 Controller driver
+EAPI=7
+HOMEPAGE=https://xboxdrv.gitlab.io
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libudev:= virtual/libusb:1 x11-libs/libX11
+SLOT=0
+SRC_URI=https://gitlab.com/xboxdrv/xboxdrv/-/archive/v0.8.8/xboxdrv-v0.8.8.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=0fb05663ae9a5e25e0bf7a9d1f00434d
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 846430504c3e..721f6be11eb2 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/librsvg-2.50.7 b/metadata/md5-cache/gnome-base/librsvg-2.50.7
index 3e56b95f6e27..d460bdf154ca 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.50.7
+++ b/metadata/md5-cache/gnome-base/librsvg-2.50.7
@@ -4,7 +4,7 @@ DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
 IUSE=+introspection +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/cairo-1.16.0[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.44.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.50/librsvg-2.50.7.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=34ea5fc9b53e1e36b4a756a482cbcf9b
+_md5_=91893f947e03c6999192d9ab83c17980
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index eb37c67efadc..8a3d6146276a 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-commander-1.12.1 b/metadata/md5-cache/gnome-extra/gnome-commander-1.12.1
index 2d883eb19309..0037c3c22bf7 100644
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.12.1
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.12.1
@@ -11,5 +11,5 @@ RDEPEND=app-text/yelp-tools >=dev-libs/glib-2.62.0:2 >=gnome-base/gnome-vfs-2.0.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-commander/1.12/gnome-commander-1.12.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a7052d52bbe79ca6706c9ef4129b1e2d
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603
index 287a8bbd5881..73f5db1268f4 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40.1
 SLOT=0
 SRC_URI=https://github.com/pop-os/shell/archive/f7cbe060e8d293bfe3b0b759032a85773b542645.tar.gz -> gnome-shell-extension-pop-shell-1.2.0_p20210603.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0e0e0929d28647bde0668bfa1181af37
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210727 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210727
index 11900a11fbf1..58e4c666d9fc 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210727
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210727
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40.1 sys-apps/fd
 SLOT=0
 SRC_URI=https://github.com/pop-os/shell/archive/475b49dc02386e26fbe6b91a559c77515d96caaf.tar.gz -> gnome-shell-extension-pop-shell-1.2.0_p20210727.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4240fedb8f4dc07f19e12985c69c0729
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 4dbde8103d77..fa76cb1e2618 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/slurp-1.3.2 b/metadata/md5-cache/gui-apps/slurp-1.3.2
new file mode 100644
index 000000000000..f1f04d3e8ece
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/slurp-1.3.2
@@ -0,0 +1,14 @@
+BDEPEND=man? ( app-text/scdoc ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon
+DESCRIPTION=Select a region in a Wayland compositor and print it to the standard output.
+EAPI=7
+HOMEPAGE=https://github.com/emersion/slurp
+IUSE=+man
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon
+SLOT=0
+SRC_URI=https://github.com/emersion/slurp/archive/v1.3.2.tar.gz -> slurp-1.3.2.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=feae6bdeff8aa43f8e84b5455661dc9b
diff --git a/metadata/md5-cache/gui-apps/swappy-1.3.1 b/metadata/md5-cache/gui-apps/swappy-1.3.1
index fbc34d7cf6b9..97be3ae96236 100644
--- a/metadata/md5-cache/gui-apps/swappy-1.3.1
+++ b/metadata/md5-cache/gui-apps/swappy-1.3.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango media-fonts/fontawesome[otf]
 SLOT=0
 SRC_URI=https://github.com/jtheoof/swappy/archive/v1.3.1.tar.gz -> swappy-1.3.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cd825a4fc561f64f4bfc673e6c1e7241
diff --git a/metadata/md5-cache/gui-apps/swappy-9999 b/metadata/md5-cache/gui-apps/swappy-9999
index 343e2d24fcd4..1e359559129b 100644
--- a/metadata/md5-cache/gui-apps/swappy-9999
+++ b/metadata/md5-cache/gui-apps/swappy-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango media-fonts/fontawesome[otf]
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=26180502f843f610f233c27a2a0265ec
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 19f09f307edd..71d108ebbd92 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/greetd-0.6.1 b/metadata/md5-cache/gui-libs/greetd-0.6.1
index 5997f1493f21..7ca1d7e7cb95 100644
--- a/metadata/md5-cache/gui-libs/greetd-0.6.1
+++ b/metadata/md5-cache/gui-libs/greetd-0.6.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD Boost-1.0 GPL-3 MIT Unlicense
 RDEPEND=acct-user/greetd sys-auth/pambase sys-libs/pam
 SLOT=0
 SRC_URI=https://git.sr.ht/~kennylevinsen/greetd/archive/0.6.1.tar.gz -> greetd-0.6.1.tar.gz https://crates.io/api/v1/crates/arc-swap/0.4.6/download -> arc-swap-0.4.6.crate https://crates.io/api/v1/crates/async-trait/0.1.31/download -> async-trait-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bytes/0.5.4/download -> bytes-0.5.4.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/enquote/1.0.3/download -> enquote-1.0.3.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.70/download -> libc-0.2.70.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.8/download -> mio-uds-0.6.8.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/pam-sys/0.5.6/download -> pam-sys-0.5.6.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.5/download -> pin-project-lite-0.1.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.12/download -> proc-macro2-1.0.12.crate https://crates.io/api/v1/crates/quote/1.0.5/download -> quote-1.0.5.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/rpassword/4.0.5/download -> rpassword-4.0.5.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/socket2/0.3.12/download -> socket2-0.3.12.crate https://crates.io/api/v1/crates/syn/1.0.21/download -> syn-1.0.21.crate https://crates.io/api/v1/crates/thiserror/1.0.17/download -> thiserror-1.0.17.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.17/download -> thiserror-impl-1.0.17.crate https://crates.io/api/v1/crates/tokio/0.2.11/download -> tokio-0.2.11.crate https://crates.io/api/v1/crates/tokio-macros/0.2.4/download -> tokio-macros-0.2.4.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/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/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-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0a1c98f407b4716ac2f706696b49ad04
diff --git a/metadata/md5-cache/gui-libs/greetd-0.7.0 b/metadata/md5-cache/gui-libs/greetd-0.7.0
index c26bf82b054b..e3a308f9d190 100644
--- a/metadata/md5-cache/gui-libs/greetd-0.7.0
+++ b/metadata/md5-cache/gui-libs/greetd-0.7.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD Boost-1.0 GPL-3 MIT Unlicense
 RDEPEND=acct-user/greetd sys-auth/pambase sys-libs/pam
 SLOT=0
 SRC_URI=https://git.sr.ht/~kennylevinsen/greetd/archive/0.7.0.tar.gz -> greetd-0.7.0.tar.gz https://crates.io/api/v1/crates/arc-swap/0.4.6/download -> arc-swap-0.4.6.crate https://crates.io/api/v1/crates/async-trait/0.1.31/download -> async-trait-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bytes/0.5.4/download -> bytes-0.5.4.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/enquote/1.0.3/download -> enquote-1.0.3.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.70/download -> libc-0.2.70.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.8/download -> mio-uds-0.6.8.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/pam-sys/0.5.6/download -> pam-sys-0.5.6.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.5/download -> pin-project-lite-0.1.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.12/download -> proc-macro2-1.0.12.crate https://crates.io/api/v1/crates/quote/1.0.5/download -> quote-1.0.5.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/rpassword/4.0.5/download -> rpassword-4.0.5.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/socket2/0.3.12/download -> socket2-0.3.12.crate https://crates.io/api/v1/crates/syn/1.0.21/download -> syn-1.0.21.crate https://crates.io/api/v1/crates/thiserror/1.0.17/download -> thiserror-1.0.17.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.17/download -> thiserror-impl-1.0.17.crate https://crates.io/api/v1/crates/tokio/0.2.11/download -> tokio-0.2.11.crate https://crates.io/api/v1/crates/tokio-macros/0.2.4/download -> tokio-macros-0.2.4.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/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/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-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3104f50f8854da847d675f86934d396d
diff --git a/metadata/md5-cache/gui-libs/libwpe-1.10.1 b/metadata/md5-cache/gui-libs/libwpe-1.10.1
index 30adef9bda4d..9a8e7133f3a9 100644
--- a/metadata/md5-cache/gui-libs/libwpe-1.10.1
+++ b/metadata/md5-cache/gui-libs/libwpe-1.10.1
@@ -4,10 +4,10 @@ DEPEND=media-libs/mesa[egl] x11-libs/libxkbcommon
 DESCRIPTION=Platform-agnostic interfaces for WPE WebKit
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=amd64 arm arm64 ~ia64 ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2
 RDEPEND=media-libs/mesa[egl] x11-libs/libxkbcommon
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/libwpe-1.10.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8cb19e7ade67a2bee7e57db19ccb060c
+_md5_=cf9a8658adc9a68c423560678447267b
diff --git a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0 b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0
index 9128555001ae..8dbd1e98f069 100644
--- a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0
+++ b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0
@@ -4,10 +4,10 @@ DEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-li
 DESCRIPTION=WPE backend designed for Linux desktop systems
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=amd64 arm arm64 ~ia64 ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2
 RDEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-libs/libwpe-1.6:1.0
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/wpebackend-fdo-1.10.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b9dd38002ad40ec83b1772645cabfe39
+_md5_=4cfc0359331755568231f0216b059809
diff --git a/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.2.0 b/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.2.0
deleted file mode 100644
index 77ee835f4d0a..000000000000
--- a/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=media-video/pipewire-0.3.2:= >=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.50.0 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=>=media-video/pipewire-0.3.2:= dev-libs/wayland >=dev-libs/wayland-protocols-1.14:= elogind? ( >=sys-auth/elogind-237 ) systemd? ( >=sys-apps/systemd-237 )
-DESCRIPTION=xdg-desktop-portal backend for wlroots
-EAPI=7
-HOMEPAGE=https://github.com/emersion/xdg-desktop-portal-wlr
-IUSE=elogind systemd
-LICENSE=MIT
-RDEPEND=>=media-video/pipewire-0.3.2:= dev-libs/wayland >=dev-libs/wayland-protocols-1.14:= elogind? ( >=sys-auth/elogind-237 ) systemd? ( >=sys-apps/systemd-237 ) sys-apps/xdg-desktop-portal
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=0/9999
-SRC_URI=https://github.com/emersion/xdg-desktop-portal-wlr/releases/download/v0.2.0/xdg-desktop-portal-wlr-0.2.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1ed01e514b24c22ea83242ca8cc44609
diff --git a/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.3.0 b/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.3.0
deleted file mode 100644
index 9706015454fc..000000000000
--- a/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=media-video/pipewire-0.3.2:= >=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.50.0 dev-libs/iniparser:0 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=>=media-video/pipewire-0.3.2:= dev-libs/wayland >=dev-libs/wayland-protocols-1.14:= elogind? ( >=sys-auth/elogind-237 ) systemd? ( >=sys-apps/systemd-237 )
-DESCRIPTION=xdg-desktop-portal backend for wlroots
-EAPI=7
-HOMEPAGE=https://github.com/emersion/xdg-desktop-portal-wlr
-IUSE=elogind systemd
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=media-video/pipewire-0.3.2:= dev-libs/wayland >=dev-libs/wayland-protocols-1.14:= elogind? ( >=sys-auth/elogind-237 ) systemd? ( >=sys-apps/systemd-237 ) sys-apps/xdg-desktop-portal
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=0/9999
-SRC_URI=https://github.com/emersion/xdg-desktop-portal-wlr/releases/download/v0.3.0/xdg-desktop-portal-wlr-0.3.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=675c8f4ce7b7e00654ba72b9e59bd747
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index fec77ad15ae8..d2c6211f314d 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/akonadi-21.04.3 b/metadata/md5-cache/kde-apps/akonadi-21.04.3
index 26bd3f96b5e9..90ae82465719 100644
--- a/metadata/md5-cache/kde-apps/akonadi-21.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-21.04.3
@@ -5,7 +5,7 @@ DESCRIPTION=Storage service for PIM data and libraries for PIM apps
 EAPI=7
 HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
 IUSE=+kaccounts +mysql postgres sqlite tools xml test debug designer test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-arch/xz-utils >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.3:5 net-libs/accounts-qt ) sqlite? ( dev-db/sqlite:3 >=dev-qt/qtsql-5.15.2:5=[sqlite] ) xml? ( dev-libs/libxml2 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/akonadi-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fff3138a1ff01be0d9e6e53c5c68c79b
+_md5_=39a4f2daef47af50f68674b0acf1d481
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-21.04.3 b/metadata/md5-cache/kde-apps/akonadi-calendar-21.04.3
index ecfa17f0b1c2..ec13cd7f5744 100644
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-21.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for akonadi calendar integration
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/kcalutils-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/akonadi-calendar-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=02d93cf26956c1133e2ee26a4531a659
+_md5_=6bd1b7f07d74f6fafdbb8e196c11b951
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-21.04.3 b/metadata/md5-cache/kde-apps/akonadi-contacts-21.04.3
index 62de6a45db35..b0cec93d5c69 100644
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-21.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for akonadi contact integration
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/libkleo-21.04.3:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/prison-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/akonadi-contacts-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=18193640781d3c9e6d8916bbbe8e9370
+_md5_=f9732ae8b57a7f6cc727c1a477857e8c
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-21.04.3 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-21.04.3
index 728307ce8a74..7f7ec1ac3cd5 100644
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-21.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
 EAPI=7
 HOMEPAGE=https://kde.org/ https://userbase.kde.org/KMail/Import_Options
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=dev-libs/qtkeychain:= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/mailcommon-21.04.3:5 >=kde-apps/mailimporter-21.04.3:5 >=kde-apps/messagelib-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/akonadi-import-wizard-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8185ed04c6ea7512cc4307f1c0058ae0
+_md5_=77732742ac0fc2ac74b7880011cbf51d
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-21.04.3 b/metadata/md5-cache/kde-apps/akonadi-mime-21.04.3
index c0921421fefe..c99dde1dfec9 100644
--- a/metadata/md5-cache/kde-apps/akonadi-mime-21.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for akonadi mime types
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/akonadi-mime-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aa6e9fff1c70cdf3aaaa6e2f5b6f040d
+_md5_=10289633b258c4b5950d2982285ecb5b
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-21.04.3 b/metadata/md5-cache/kde-apps/akonadi-notes-21.04.3
index 54063e936865..40d4ed5e8c01 100644
--- a/metadata/md5-cache/kde-apps/akonadi-notes-21.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for akonadi notes integration
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/kmime-21.04.3:5 >=kde-frameworks/ki18n-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/akonadi-notes-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e93da722aca61b7d14adca3edc0d3fcb
+_md5_=7bfd6d265498dd4270beb1c0d39c1dce
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-21.04.3 b/metadata/md5-cache/kde-apps/akonadi-search-21.04.3
index 10b38ef89978..f9397d909103 100644
--- a/metadata/md5-cache/kde-apps/akonadi-search-21.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-search-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Libraries and daemons to implement searching in Akonadi
 EAPI=7
 HOMEPAGE=https://invent.kde.org/pim/akonadi-search
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/xapian-1.3:=[chert(+)] >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/krunner-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/akonadi-search-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0092ca338e9ff44f34725e29bb41e484
+_md5_=1fe1494ef5705608b94c5092e49a30ff
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-21.04.3 b/metadata/md5-cache/kde-apps/akonadiconsole-21.04.3
index 763a2915426c..35bf2d0ac10f 100644
--- a/metadata/md5-cache/kde-apps/akonadiconsole-21.04.3
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Application for debugging Akonadi Resources
 EAPI=7
 HOMEPAGE=https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
 RDEPEND=dev-libs/xapian:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-search-21.04.3:5 >=kde-apps/calendarsupport-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/messagelib-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/akonadiconsole-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b7fa545ff442a491e18acdb5c6b1c081
+_md5_=67eea3042c62d2ce6e3843b90b5284f7
diff --git a/metadata/md5-cache/kde-apps/akregator-21.04.3 b/metadata/md5-cache/kde-apps/akregator-21.04.3
index 0ec9cb47bb12..0c19ce247bab 100644
--- a/metadata/md5-cache/kde-apps/akregator-21.04.3
+++ b/metadata/md5-cache/kde-apps/akregator-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=News feed aggregator
 EAPI=7
 HOMEPAGE=https://apps.kde.org/akregator/
 IUSE=telemetry debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/kontactinterface-21.04.3:5 >=kde-apps/kpimtextedit-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/messagelib-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/syndication-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/akregator-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2a6c90e5bb5bd67f844c122cc7de1a91
+_md5_=e69322e69aa8817c8ec305bde695d3bc
diff --git a/metadata/md5-cache/kde-apps/analitza-21.04.3 b/metadata/md5-cache/kde-apps/analitza-21.04.3
index 05c5a77d259a..3b660c5c6adc 100644
--- a/metadata/md5-cache/kde-apps/analitza-21.04.3
+++ b/metadata/md5-cache/kde-apps/analitza-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=KDE library for mathematical features
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=eigen nls test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[-gles2-only] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 eigen? ( dev-cpp/eigen:3 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/analitza-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3c1cd41b543baaf8d39a5ac91cfd1994
+_md5_=e763b39b33d811bbf0e370304018df24
diff --git a/metadata/md5-cache/kde-apps/ark-20.12.3 b/metadata/md5-cache/kde-apps/ark-20.12.3
index 1be6abe79bda..68df53758f8a 100644
--- a/metadata/md5-cache/kde-apps/ark-20.12.3
+++ b/metadata/md5-cache/kde-apps/ark-20.12.3
@@ -11,5 +11,5 @@ RDEPEND=app-arch/libarchive:=[bzip2,lzma,zlib] >=dev-qt/qtdbus-5.15.2:5 >=dev-qt
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/ark-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7076b63f37272d5008259a63a5b428fc
diff --git a/metadata/md5-cache/kde-apps/ark-21.04.3 b/metadata/md5-cache/kde-apps/ark-21.04.3
index 836a4fdef27b..07049e971520 100644
--- a/metadata/md5-cache/kde-apps/ark-21.04.3
+++ b/metadata/md5-cache/kde-apps/ark-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=File archiver by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/ark/ https://utils.kde.org/projects/ark/
 IUSE=zip test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=app-arch/libarchive:=[bzip2,lzma,zlib] >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ark-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a77a0bb4dd62ee037df072e4c01b7622
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7a99c4ab45f1dfed487a387d02cb16c2
diff --git a/metadata/md5-cache/kde-apps/artikulate-21.04.3 b/metadata/md5-cache/kde-apps/artikulate-21.04.3
index 33047b9e5ef0..a9bd18c5c51b 100644
--- a/metadata/md5-cache/kde-apps/artikulate-21.04.3
+++ b/metadata/md5-cache/kde-apps/artikulate-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Language learning application that helps improving pronunciation ski
 EAPI=7
 HOMEPAGE=https://apps.kde.org/artikulate/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/artikulate-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5d5402945db676940de2a7ad6c51d95b
+_md5_=16fd8896f3bdb40fb29170986e1c5485
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-21.04.3 b/metadata/md5-cache/kde-apps/audiocd-kio-21.04.3
index 590e75a22c09..8a1081897067 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-21.04.3
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=kioslave for accessing audio CDs
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=flac vorbis debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkcddb-21.04.3:5 >=kde-apps/libkcompactdisc-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/audiocd-kio-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=65ef8fcc7efa7abff401175d1dccfa35
+_md5_=484d60885bfcdaf8511cb8747562c388
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-21.04.3 b/metadata/md5-cache/kde-apps/baloo-widgets-21.04.3
index 60454cd3d146..9b9db832cca4 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-21.04.3
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Widget library for baloo
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/baloo-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/baloo-widgets-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e7a138c6eeb31192c5a09c4a21c0000f
+_md5_=2c682a08ce30d4d913b4f49380b74019
diff --git a/metadata/md5-cache/kde-apps/blinken-21.04.3 b/metadata/md5-cache/kde-apps/blinken-21.04.3
index 5ee19746f748..af062a4236da 100644
--- a/metadata/md5-cache/kde-apps/blinken-21.04.3
+++ b/metadata/md5-cache/kde-apps/blinken-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Memory enhancement game based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://apps.kde.org/blinken/ https://edu.kde.org/blinken/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/blinken-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=87b14aca95c2a0fdab9caa1d83661770
+_md5_=06a173183cefa60c41f5f0af29daef4d
diff --git a/metadata/md5-cache/kde-apps/bomber-21.04.3 b/metadata/md5-cache/kde-apps/bomber-21.04.3
index 49798346cc81..686ea57536d4 100644
--- a/metadata/md5-cache/kde-apps/bomber-21.04.3
+++ b/metadata/md5-cache/kde-apps/bomber-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Single player arcade bombing game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/bomber/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 !games-action/xbomber || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/bomber-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9d646c0da5ad2efbabaecf392550f2f8
+_md5_=6320eb88678fa68005b067f64134bc4a
diff --git a/metadata/md5-cache/kde-apps/bovo-21.04.3 b/metadata/md5-cache/kde-apps/bovo-21.04.3
index c313b4013b1e..ee4c4b037049 100644
--- a/metadata/md5-cache/kde-apps/bovo-21.04.3
+++ b/metadata/md5-cache/kde-apps/bovo-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Five-in-a-row Board Game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/bovo/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/bovo-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7b990376e7bd68e872124f42ab66995a
+_md5_=9e7c50fb0574f38c36fa3e5c6a804665
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-21.04.3 b/metadata/md5-cache/kde-apps/calendarjanitor-21.04.3
index c8bb025bf002..d97ecc3a061f 100644
--- a/metadata/md5-cache/kde-apps/calendarjanitor-21.04.3
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Tool to scan calendar data for buggy instances
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-calendar-21.04.3:5 >=kde-apps/calendarsupport-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/akonadi-calendar-tools-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2d00e2bf9a3ca934eaac29d8085093ee
+_md5_=46c8850a89d9d98dde2273105aa86e93
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-21.04.3 b/metadata/md5-cache/kde-apps/calendarsupport-21.04.3
index d94cc19591f1..6f64210f7e50 100644
--- a/metadata/md5-cache/kde-apps/calendarsupport-21.04.3
+++ b/metadata/md5-cache/kde-apps/calendarsupport-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Calendar support library
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/libical >=dev-qt/designer-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-calendar-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/akonadi-notes-21.04.3:5 >=kde-apps/kcalutils-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/calendarsupport-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=91e733547aaf8ec69607dea1fe42ae29
+_md5_=a41e1ad03e658858e6bf7a7f62190a8d
diff --git a/metadata/md5-cache/kde-apps/cantor-20.12.3 b/metadata/md5-cache/kde-apps/cantor-20.12.3
index 14fd27fd98d7..fb7514fb0713 100644
--- a/metadata/md5-cache/kde-apps/cantor-20.12.3
+++ b/metadata/md5-cache/kde-apps/cantor-20.12.3
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/cantor-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=25bdd2c6c2746ba0f28c9bb070701f95
diff --git a/metadata/md5-cache/kde-apps/cantor-21.04.3 b/metadata/md5-cache/kde-apps/cantor-21.04.3
index 90f2128e1f70..c1a6efab6527 100644
--- a/metadata/md5-cache/kde-apps/cantor-21.04.3
+++ b/metadata/md5-cache/kde-apps/cantor-21.04.3
@@ -5,12 +5,12 @@ DESCRIPTION=Interface for doing mathematics and scientific computing
 EAPI=7
 HOMEPAGE=https://apps.kde.org/cantor/ https://edu.kde.org/cantor/
 IUSE=+analitza julia lua postscript python qalculate R debug +handbook test +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/poppler[qt5] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 analitza? ( >=kde-apps/analitza-21.04.3:5 ) julia? ( dev-lang/julia ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-qt/qtdbus-5.15.2:5 ) R? ( dev-lang/R ) !analitza? ( !julia? ( !lua? ( !python? ( !qalculate? ( !R? ( || ( sci-mathematics/maxima sci-mathematics/octave ) ) ) ) ) ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/cantor-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=04204fad96d60afc6ad961e6214a1886
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9ce047611950c99167f61d97fc1bfb36
diff --git a/metadata/md5-cache/kde-apps/cervisia-21.04.3-r1 b/metadata/md5-cache/kde-apps/cervisia-21.04.3-r1
index 95274faff94a..c703e4124193 100644
--- a/metadata/md5-cache/kde-apps/cervisia-21.04.3-r1
+++ b/metadata/md5-cache/kde-apps/cervisia-21.04.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=CVS frontend by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/cervisia/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdesu-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-vcs/cvs || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/cervisia-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cf44bb1591bae8c1d8be07fab23b177c
+_md5_=c23d9d6339285bec07c75264aa49fdcf
diff --git a/metadata/md5-cache/kde-apps/dolphin-20.12.3-r1 b/metadata/md5-cache/kde-apps/dolphin-20.12.3-r1
index 4cbf296ee18d..6a76cda8fc3c 100644
--- a/metadata/md5-cache/kde-apps/dolphin-20.12.3-r1
+++ b/metadata/md5-cache/kde-apps/dolphin-20.12.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/dolphin-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a915ffc651993590c312805dcac7f86b
diff --git a/metadata/md5-cache/kde-apps/dolphin-21.04.3 b/metadata/md5-cache/kde-apps/dolphin-21.04.3
index d50103a8b42c..f04d69c2f12e 100644
--- a/metadata/md5-cache/kde-apps/dolphin-21.04.3
+++ b/metadata/md5-cache/kde-apps/dolphin-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Plasma filemanager focusing on usability
 EAPI=7
 HOMEPAGE=https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin
 IUSE=activities semantic-desktop telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kio-5.80.0:5= >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/phonon-4.11.0 activities? ( >=kde-frameworks/kactivities-5.80.0:5 ) semantic-desktop? ( >=kde-apps/baloo-widgets-21.04.3:5 >=kde-frameworks/baloo-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-apps/kio-extras-21.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/dolphin-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=17fc390288b2103ea8bcf75f41fb2bba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=df1ce270d2922a71696aa9aeb2dc1e6e
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-21.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-21.04.3
index 98665e81b1b1..f9e5502751fb 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-21.04.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Dolphin plugin for Dropbox service integration
 EAPI=7
 HOMEPAGE=https://apps.kde.org/dolphin_plugins/
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.3:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 net-misc/dropbox-cli || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/dolphin-plugins-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=51f5e96ae2722028d86f9b1387191e65
+_md5_=61d4a3067762c7a3da94a062f040ee0b
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-git-21.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-git-21.04.3
index 68fe9aced57d..95edea6f8651 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-git-21.04.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-git-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Dolphin plugin for Git integration
 EAPI=7
 HOMEPAGE=https://apps.kde.org/dolphin_plugins/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 dev-vcs/git || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/dolphin-plugins-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a5f780055c6743f4bd15662dc4f76e35
+_md5_=b98d3cc4ecdaeef7a70dd1d43b4a0465
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-21.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-21.04.3
index fb9eaf1ac0a6..6f3e310037fa 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-21.04.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Dolphin plugin for Mercurial integration
 EAPI=7
 HOMEPAGE=https://apps.kde.org/dolphin_plugins/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 dev-vcs/mercurial || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/dolphin-plugins-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=22cdcbe71ee7f345fb2a391eef48254e
+_md5_=12da983d243b7572ee3f1581af6c74cc
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-21.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-21.04.3
index 6b88f41b70b7..f610f09ddc68 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-21.04.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Dolphin plugin for Subversion integration
 EAPI=7
 HOMEPAGE=https://apps.kde.org/dolphin_plugins/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/dolphin-21.04.3:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 dev-vcs/subversion >=kde-apps/kompare-21.04.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/release-service/21.04.3/src/dolphin-plugins-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=94898d1c9a7734c1a882da4493b364bf
+_md5_=987d6ffcd7b143bc38da36f4d5bfdcee
diff --git a/metadata/md5-cache/kde-apps/dragon-21.04.3 b/metadata/md5-cache/kde-apps/dragon-21.04.3
index f574ea65876e..115e452f93a2 100644
--- a/metadata/md5-cache/kde-apps/dragon-21.04.3
+++ b/metadata/md5-cache/kde-apps/dragon-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Simple video player
 EAPI=7
 HOMEPAGE=https://apps.kde.org/dragonplayer/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/dragon-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=17ec1ace4a0948c38939d1dfe9fc9c07
+_md5_=f5062035faadf7beba6edb412dc6a74c
diff --git a/metadata/md5-cache/kde-apps/eventviews-21.04.3 b/metadata/md5-cache/kde-apps/eventviews-21.04.3
index 7500261daa4d..0eea78ed8f2e 100644
--- a/metadata/md5-cache/kde-apps/eventviews-21.04.3
+++ b/metadata/md5-cache/kde-apps/eventviews-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Calendar viewer for KDE PIM
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/kdiagram:5 dev-libs/libical >=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-calendar-21.04.3:5 >=kde-apps/calendarsupport-21.04.3:5 >=kde-apps/kcalutils-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/eventviews-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=32608da202fbd0d914e5d2374eab34e7
+_md5_=17b0e0e914505ef0365263fe500b7e99
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-21.04.3 b/metadata/md5-cache/kde-apps/ffmpegthumbs-21.04.3
index 261eee7d222f..36331fdba46b 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-21.04.3
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=FFmpeg based thumbnail generator for video files
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 media-libs/taglib media-video/ffmpeg:0= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ffmpegthumbs-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cac70a15ecb8a10e6f407d81faf02794
+_md5_=40cc4106d33a22c368e27fed137af6e0
diff --git a/metadata/md5-cache/kde-apps/filelight-21.04.3 b/metadata/md5-cache/kde-apps/filelight-21.04.3
index c6321e09db74..2db691db116f 100644
--- a/metadata/md5-cache/kde-apps/filelight-21.04.3
+++ b/metadata/md5-cache/kde-apps/filelight-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented r
 EAPI=7
 HOMEPAGE=https://apps.kde.org/filelight/ https://utils.kde.org/projects/filelight/
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/filelight-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c8f7dd0622fbdb40d9b66acaa4d192a9
+_md5_=629fa15963a53bc71d1821941dd7d00f
diff --git a/metadata/md5-cache/kde-apps/granatier-21.04.3 b/metadata/md5-cache/kde-apps/granatier-21.04.3
index ea371b32367e..9dffa8c66f92 100644
--- a/metadata/md5-cache/kde-apps/granatier-21.04.3
+++ b/metadata/md5-cache/kde-apps/granatier-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Bomberman game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/granatier/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/granatier-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4452ef4f738ddb0516259581cd310299
+_md5_=75163457e32ed60d22c6bf4b16a21c78
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-21.04.3 b/metadata/md5-cache/kde-apps/grantlee-editor-21.04.3
index e642203128a5..07eef27f12df 100644
--- a/metadata/md5-cache/kde-apps/grantlee-editor-21.04.3
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/kpimtextedit-21.04.3:5 >=kde-apps/messagelib-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/grantlee-editor-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0d6fe777b4e48890cffcac6d99b2e8ec
+_md5_=4a4c4a7fa051ca8eb9723b0f30eb6674
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-21.04.3 b/metadata/md5-cache/kde-apps/grantleetheme-21.04.3
index b59b9e602f2b..52bd41d670f2 100644
--- a/metadata/md5-cache/kde-apps/grantleetheme-21.04.3
+++ b/metadata/md5-cache/kde-apps/grantleetheme-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for Grantlee plugins
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/grantleetheme-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c12b7a62f32281f4c58cd59372a2e83b
+_md5_=b54bd0e03f078c73aff2b80fc7db4010
diff --git a/metadata/md5-cache/kde-apps/gwenview-20.12.3 b/metadata/md5-cache/kde-apps/gwenview-20.12.3
index be33b645a023..c1a5bb50c4f6 100644
--- a/metadata/md5-cache/kde-apps/gwenview-20.12.3
+++ b/metadata/md5-cache/kde-apps/gwenview-20.12.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtopengl-5.15.2:5 >=dev-qt/qtprintsuppo
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/gwenview-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=367666683d4fb69a50acb75c2b6d0fff
diff --git a/metadata/md5-cache/kde-apps/gwenview-21.04.3 b/metadata/md5-cache/kde-apps/gwenview-21.04.3
index d5640bb2457d..487cb1ce86e4 100644
--- a/metadata/md5-cache/kde-apps/gwenview-21.04.3
+++ b/metadata/md5-cache/kde-apps/gwenview-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Image viewer by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview
 IUSE=activities fits kipi +mpris raw semantic-desktop share X debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= >=media-libs/phonon-4.11.0 media-libs/tiff virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.80.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-21.04.3:5= ) mpris? ( >=dev-qt/qtdbus-5.15.2:5 ) raw? ( >=kde-apps/libkdcraw-21.04.3:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=dev-qt/qtimageformats-5.15.2:5 >=kde-frameworks/kimageformats-5.80.0:5 kipi? ( >=kde-apps/kipi-plugins-21.04.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/release-service/21.04.3/src/gwenview-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=92db8b797051f27f55785aeb0131299f
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b6fbd4bfbb722e4f47db35cf5bb60d63
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-21.04.3 b/metadata/md5-cache/kde-apps/incidenceeditor-21.04.3
index cea1fdd43a7e..a00bdeafcbbe 100644
--- a/metadata/md5-cache/kde-apps/incidenceeditor-21.04.3
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Incidence editor for korganizer
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/kdiagram:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-calendar-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/calendarsupport-21.04.3:5 >=kde-apps/eventviews-21.04.3:5 >=kde-apps/kcalutils-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kldap-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/incidenceeditor-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c55e91b8f4ca2d0f4bb2b0b01924958a
+_md5_=616b1286296f311e2aeaca4a630e80ef
diff --git a/metadata/md5-cache/kde-apps/juk-21.04.3 b/metadata/md5-cache/kde-apps/juk-21.04.3
index 4ae7b848ff0f..fe3117663930 100644
--- a/metadata/md5-cache/kde-apps/juk-21.04.3
+++ b/metadata/md5-cache/kde-apps/juk-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Jukebox and music manager by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/juk/
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 >=media-libs/taglib-1.6 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/juk-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2ac2c041b0f46dbd8514b4942291a118
+_md5_=60c1d15b5e6fbb50d9f54ee55034aedd
diff --git a/metadata/md5-cache/kde-apps/k3b-21.04.3 b/metadata/md5-cache/kde-apps/k3b-21.04.3
index 06c9eab9dbbb..8b834abcd9a0 100644
--- a/metadata/md5-cache/kde-apps/k3b-21.04.3
+++ b/metadata/md5-cache/kde-apps/k3b-21.04.3
@@ -5,7 +5,7 @@ DESCRIPTION=Full-featured burning and ripping application based on KDE Framework
 EAPI=7
 HOMEPAGE=https://apps.kde.org/k3b/ https://userbase.kde.org/K3b
 IUSE=dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkcddb-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5[taglib?] >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) app-cdr/cdrdao app-cdr/cdrtools dev-libs/libburn media-sound/cdparanoia dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/k3b-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4d8dd99248754418382acbfae7ed145d
+_md5_=fe0f45a46fd707f12c9105bd9f1d8cec
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-21.04.3 b/metadata/md5-cache/kde-apps/kaccounts-integration-21.04.3
index 04fe009e5125..fab30fc7f31f 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-21.04.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Administer web accounts for the sites and services across the Plasma
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21:= net-libs/signond dev-util/intltool || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kaccounts-integration-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fd5f8a1c734ed5d3222c33b2a547ad72
+_md5_=d071f115de6f5a8ee2f87571d35fdd8d
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-21.04.3 b/metadata/md5-cache/kde-apps/kaccounts-providers-21.04.3
index ebd85367c860..5c258cb1cf95 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-21.04.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE accounts providers
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=+webengine debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/kaccounts-integration-21.04.3:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kpackage-5.80.0:5 webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) net-libs/signon-oauth2 net-libs/signon-ui || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kaccounts-providers-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=876c23a41d7bfd3f75f28e4730dc78c0
+_md5_=51dba82fd67324850fd9126f68db8613
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-20.12.3 b/metadata/md5-cache/kde-apps/kaddressbook-20.12.3
index 1062e5fb7ded..2c14c90bafe3 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-20.12.3
+++ b/metadata/md5-cache/kde-apps/kaddressbook-20.12.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 >=dev-qt/qtdbus-5.
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/kaddressbook-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e57ee4abe4f2f5151f0302f7b0925242
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-21.04.3 b/metadata/md5-cache/kde-apps/kaddressbook-21.04.3
index 0520fcbd281b..00d7e8ad0d59 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-21.04.3
+++ b/metadata/md5-cache/kde-apps/kaddressbook-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Address book application based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kaddressbook/
 IUSE=telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-search-21.04.3:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/kontactinterface-21.04.3:5 >=kde-apps/libgravatar-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/libkleo-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/prison-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-apps/kdepim-runtime-21.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kaddressbook-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3725709241c88c23960a2ab6e2a02d04
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8562a9d82685ce57d7a4f54267920626
diff --git a/metadata/md5-cache/kde-apps/kajongg-21.04.3 b/metadata/md5-cache/kde-apps/kajongg-21.04.3
index de20e240e552..c29fa0fe7eda 100644
--- a/metadata/md5-cache/kde-apps/kajongg-21.04.3
+++ b/metadata/md5-cache/kde-apps/kajongg-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Classical Mah Jongg for four players
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kajongg/
 IUSE=python_single_target_python3_8 python_single_target_python3_9 debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-db/sqlite:3 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 python_single_target_python3_8? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_8(-)] >=dev-python/twisted-16.6.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_9(-)] >=dev-python/twisted-16.6.0[python_targets_python3_9(-)] ) >=kde-apps/libkmahjongg-21.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kajongg-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=43a562a0ec655c0a18f9adab50ab2b83
+_md5_=20664c4f9f3ae02ba46706ba5406b348
diff --git a/metadata/md5-cache/kde-apps/kalarm-21.04.3 b/metadata/md5-cache/kde-apps/kalarm-21.04.3
index 9c7c26dc59a5..f9804ced42f9 100644
--- a/metadata/md5-cache/kde-apps/kalarm-21.04.3
+++ b/metadata/md5-cache/kde-apps/kalarm-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Application to manage alarms and other timer based alerts for the de
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm
 IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/kalarmcal-21.04.3:5 >=kde-apps/kcalutils-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/kontactinterface-21.04.3:5 >=kde-apps/kpimtextedit-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kauth-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kidletime-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=kde-apps/kdepim-runtime-21.04.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/release-service/21.04.3/src/kalarm-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=62c569235d4e96003566cc1ea8389e0a
+_md5_=71dce2a9271d5326501397a83b4f30d0
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-21.04.3 b/metadata/md5-cache/kde-apps/kalarmcal-21.04.3
index 6a3d0f762c21..b9856e98eef6 100644
--- a/metadata/md5-cache/kde-apps/kalarmcal-21.04.3
+++ b/metadata/md5-cache/kde-apps/kalarmcal-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Client library to access and handling of KAlarm calendar data
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/kcalutils-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kalarmcal-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aa00e73fc90e60ae5b84c9f770a30b7b
+_md5_=c7e55806d1c7ec0f3a6c73da6be16ead
diff --git a/metadata/md5-cache/kde-apps/kalgebra-21.04.3 b/metadata/md5-cache/kde-apps/kalgebra-21.04.3
index ddfeda676815..15803767fd96 100644
--- a/metadata/md5-cache/kde-apps/kalgebra-21.04.3
+++ b/metadata/md5-cache/kde-apps/kalgebra-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=MathML-based 2D and 3D graph calculator by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kalgebra/ https://edu.kde.org/kalgebra/
 IUSE=readline debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/analitza-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 readline? ( sys-libs/readline:0= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kalgebra-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=48ea2072f1abdc9049e3bd8bf04be8d9
+_md5_=3b495cd788f8509cb8acafc55e4d4b09
diff --git a/metadata/md5-cache/kde-apps/kalzium-21.04.3 b/metadata/md5-cache/kde-apps/kalzium-21.04.3
index 56d9e56ec94a..63bc8a3cbffb 100644
--- a/metadata/md5-cache/kde-apps/kalzium-21.04.3
+++ b/metadata/md5-cache/kde-apps/kalzium-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Periodic table of the elements
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kalzium/ https://edu.kde.org/kalzium/
 IUSE=editor solver debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kplotting-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kunitconversion-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 editor? ( dev-cpp/eigen:3 >=dev-qt/qtopengl-5.15.2:5 >=kde-frameworks/knewstuff-5.80.0:5 sci-chemistry/openbabel:= >=sci-libs/avogadrolibs-1.93[qt5] ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kalzium-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d1ce996b4c686df9be7758b7cbd58ceb
+_md5_=df2d5a4cf2185eb8a1339979a1cfcfb4
diff --git a/metadata/md5-cache/kde-apps/kamera-21.04.3 b/metadata/md5-cache/kde-apps/kamera-21.04.3
index 2dbbf0d076ed..b22562a5dde2 100644
--- a/metadata/md5-cache/kde-apps/kamera-21.04.3
+++ b/metadata/md5-cache/kde-apps/kamera-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Plasma integration for gphoto2 cameras
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kamera/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 media-libs/libgphoto2:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kamera-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dc70b33f2744f573f1eb161f1f7c8c0b
+_md5_=f18be77336a0f2d2ea3f62d752f2d21a
diff --git a/metadata/md5-cache/kde-apps/kamoso-21.04.3 b/metadata/md5-cache/kde-apps/kamoso-21.04.3
index e7894e3722dd..0e37c9c5c061 100644
--- a/metadata/md5-cache/kde-apps/kamoso-21.04.3
+++ b/metadata/md5-cache/kde-apps/kamoso-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Application to take pictures and videos from your webcam by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kamoso/ https://userbase.kde.org/Kamoso
 IUSE=test debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/purpose-5.80.0:5 media-libs/gst-plugins-base:1.0 virtual/opengl >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.80.0:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kamoso-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c1892af56bfa60a33671219930b89e4f
+_md5_=eff7e441f5294dec22ee6167642fd8ea
diff --git a/metadata/md5-cache/kde-apps/kanagram-21.04.3 b/metadata/md5-cache/kde-apps/kanagram-21.04.3
index 19723ecc008d..675e8380db65 100644
--- a/metadata/md5-cache/kde-apps/kanagram-21.04.3
+++ b/metadata/md5-cache/kde-apps/kanagram-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Game based on anagrams of words
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kanagram/ https://edu.kde.org/kanagram/
 IUSE=speech debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkeduvocdocument-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=media-libs/phonon-4.11.0 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) >=dev-qt/qtmultimedia-5.15.2:5[qml] >=dev-qt/qtquickcontrols-5.15.2:5 >=kde-apps/kdeedu-data-21.04.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/release-service/21.04.3/src/kanagram-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0af8d1e60d4c7b1b3d1f4475d7b7f741
+_md5_=9bb2606412ab2961aff209ffefc3bbd3
diff --git a/metadata/md5-cache/kde-apps/kapman-21.04.3 b/metadata/md5-cache/kde-apps/kapman-21.04.3
index 961fe102b394..78adba64f212 100644
--- a/metadata/md5-cache/kde-apps/kapman-21.04.3
+++ b/metadata/md5-cache/kde-apps/kapman-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Pac-Man clone by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kapman/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kapman-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dfd6ba64f365c8b1860803159a965851
+_md5_=785b012db53240b0cd413240261e9aa8
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-21.04.3 b/metadata/md5-cache/kde-apps/kapptemplate-21.04.3
index 194c4a1de6ec..0c8a19c4e338 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-21.04.3
+++ b/metadata/md5-cache/kde-apps/kapptemplate-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Shell script to create the necessary framework to develop KDE applic
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kapptemplate/
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kapptemplate-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1844343be865d891988fcd3a8ca76727
+_md5_=8ff946cd649984586b4214cb4a28f6e1
diff --git a/metadata/md5-cache/kde-apps/kate-20.12.3-r1 b/metadata/md5-cache/kde-apps/kate-20.12.3-r1
index 5babf96a8e5f..be35a042bfd9 100644
--- a/metadata/md5-cache/kde-apps/kate-20.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kate-20.12.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/kate-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=767596d6ae878a47a05e339d842a1284
diff --git a/metadata/md5-cache/kde-apps/kate-21.04.3 b/metadata/md5-cache/kde-apps/kate-21.04.3
index 0d4ee87b4a3d..af7c5a4aa335 100644
--- a/metadata/md5-cache/kde-apps/kate-21.04.3
+++ b/metadata/md5-cache/kde-apps/kate-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Multi-document editor with network transparency, Plasma integration
 EAPI=7
 HOMEPAGE=https://kate-editor.org/ https://apps.kde.org/kate/
 IUSE=activities +filebrowser lspclient +projects plasma +snippets sql telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 activities? ( >=kde-frameworks/kactivities-5.80.0:5 ) filebrowser? ( >=kde-frameworks/kbookmarks-5.80.0:5 ) lspclient? ( >=kde-frameworks/kitemmodels-5.80.0:5 ) plasma? ( >=kde-frameworks/plasma-5.80.0:5 ) projects? ( >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/threadweaver-5.80.0:5 ) snippets? ( >=kde-frameworks/knewstuff-5.80.0:5 ) sql? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kwallet-5.80.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kate-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=490a5b3b7271b3ffab0d969b3b916004
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ff5840ec99c373ec084127c7a060196f
diff --git a/metadata/md5-cache/kde-apps/katomic-21.04.3 b/metadata/md5-cache/kde-apps/katomic-21.04.3
index 9b4c050f4749..3b7ca9f9d768 100644
--- a/metadata/md5-cache/kde-apps/katomic-21.04.3
+++ b/metadata/md5-cache/kde-apps/katomic-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Atomic Entertainment Game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/katomic/ https://games.kde.org/games/katomic/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/katomic-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0a9060df73878f8982047b2166b0bae2
+_md5_=1446741002795a60780731f8aaf67836
diff --git a/metadata/md5-cache/kde-apps/kbackup-21.04.3 b/metadata/md5-cache/kde-apps/kbackup-21.04.3
index 325985101ccf..a42387eace6b 100644
--- a/metadata/md5-cache/kde-apps/kbackup-21.04.3
+++ b/metadata/md5-cache/kde-apps/kbackup-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Program that lets you back up any directories or files
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kbackup/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kbackup-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=296566853a0d39c06d7ca2a560288fd6
+_md5_=db6478e4e20c3b0f428645426217ec4c
diff --git a/metadata/md5-cache/kde-apps/kblackbox-21.04.3 b/metadata/md5-cache/kde-apps/kblackbox-21.04.3
index 18b7e8cb2b91..a0c30834ca51 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-21.04.3
+++ b/metadata/md5-cache/kde-apps/kblackbox-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Game of hide and seek played on a grid of boxes
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kblackbox/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kblackbox-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=68cfe894c5a9091f7085d5e99c83b1c0
+_md5_=7a3fd78e57589932cddfd786ecc5e4c0
diff --git a/metadata/md5-cache/kde-apps/kblocks-21.04.3 b/metadata/md5-cache/kde-apps/kblocks-21.04.3
index 8968888eb982..ba4b433cb021 100644
--- a/metadata/md5-cache/kde-apps/kblocks-21.04.3
+++ b/metadata/md5-cache/kde-apps/kblocks-21.04.3
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.80.0:5 ) >=kde-frameworks/extra-cmake-modules-5.80.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Single-player Tetris-like KDE game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kblocks/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+IUSE=test debug +handbook test
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kblocks-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=64b9ae74195852d9e81b30a03419a200
+_md5_=6b0408ad30328d6deb3dcf6aebbc612e
diff --git a/metadata/md5-cache/kde-apps/kbounce-21.04.3 b/metadata/md5-cache/kde-apps/kbounce-21.04.3
index fe3d5b9256b7..8c2a29a8e2ec 100644
--- a/metadata/md5-cache/kde-apps/kbounce-21.04.3
+++ b/metadata/md5-cache/kde-apps/kbounce-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Bounce Ball Game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kbounce/ https://games.kde.org/games/kbounce/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kbounce-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=35fed89a19506a8778af22a1590c193b
+_md5_=fce43dfa102edef8246b3392122d7f6c
diff --git a/metadata/md5-cache/kde-apps/kbreakout-21.04.3 b/metadata/md5-cache/kde-apps/kbreakout-21.04.3
index c4a9009bca56..ddafe4e995c2 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-21.04.3
+++ b/metadata/md5-cache/kde-apps/kbreakout-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Breakout-like game by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kbreakout/ https://games.kde.org/games/kbreakout/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kbreakout-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=db8f3046480a8ca651b2fcc26feaa1a0
+_md5_=65d8c6b5914628171ffaa5a653f7d6fc
diff --git a/metadata/md5-cache/kde-apps/kbruch-21.04.3 b/metadata/md5-cache/kde-apps/kbruch-21.04.3
index 739548e58363..eb38bfe281ae 100644
--- a/metadata/md5-cache/kde-apps/kbruch-21.04.3
+++ b/metadata/md5-cache/kde-apps/kbruch-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Educational application to learn calculating with fractions
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kbruch/ https://edu.kde.org/kbruch/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kbruch-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f7099c4b020754c5e31c6138d8b34c54
+_md5_=b34adbcec2041ec1652a807b131fd13d
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-21.04.3 b/metadata/md5-cache/kde-apps/kcachegrind-21.04.3
index f16c303fc19c..bf3a3e05ad14 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-21.04.3
+++ b/metadata/md5-cache/kde-apps/kcachegrind-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Frontend for Cachegrind by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kcachegrind/ https://kcachegrind.github.io/html/Home.html
 IUSE=nls debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 media-gfx/graphviz || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kcachegrind-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=69ec568942870f5dffb1046e2cd99617
+_md5_=ffc3dfca656ff259c0205197a057834e
diff --git a/metadata/md5-cache/kde-apps/kcalc-21.04.3 b/metadata/md5-cache/kde-apps/kcalc-21.04.3
index 2d84696cd970..4cdc3682e6ab 100644
--- a/metadata/md5-cache/kde-apps/kcalc-21.04.3
+++ b/metadata/md5-cache/kde-apps/kcalc-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=KDE calculator
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kcalc/ https://utils.kde.org/projects/kcalc/
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kcalc-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a25bb3171bc262441e2a2c3fea29928f
+_md5_=01a92aa2df2bf160d81f489b6944132e
diff --git a/metadata/md5-cache/kde-apps/kcalutils-21.04.3 b/metadata/md5-cache/kde-apps/kcalutils-21.04.3
index 07112c57fefa..4c661afe8848 100644
--- a/metadata/md5-cache/kde-apps/kcalutils-21.04.3
+++ b/metadata/md5-cache/kde-apps/kcalutils-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library providing utility functions for the handling of calendar dat
 EAPI=7
 HOMEPAGE=https://api.kde.org/kdepim/kcalutils/html/index.html
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kcalutils-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f8b6dcfa0ef289a61bd2931434d6291c
+_md5_=1aefc1ec758d44b623ed3b36c161aa99
diff --git a/metadata/md5-cache/kde-apps/kcharselect-21.04.3 b/metadata/md5-cache/kde-apps/kcharselect-21.04.3
index 4175da3cb004..8c306ecb3948 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-21.04.3
+++ b/metadata/md5-cache/kde-apps/kcharselect-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE character selection utility
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kcharselect/ https://utils.kde.org/projects/kcharselect/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kcharselect-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=58b98a448179dcca3d1487a4b018070c
+_md5_=f5a4985d41292a6979e69204f3d4e057
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-21.04.3 b/metadata/md5-cache/kde-apps/kcolorchooser-21.04.3
index 7f9f3ddbb70e..df48c080a005 100644
--- a/metadata/md5-cache/kde-apps/kcolorchooser-21.04.3
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE color selector/editor
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kcolorchooser/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kcolorchooser-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b318e0bf1856931b2fc6a3208414b8a7
+_md5_=97e57b1ca287a7ddd9d922cb56d5a268
diff --git a/metadata/md5-cache/kde-apps/kcron-21.04.3 b/metadata/md5-cache/kde-apps/kcron-21.04.3
index cf35b9920d4e..40cb94452ee8 100644
--- a/metadata/md5-cache/kde-apps/kcron-21.04.3
+++ b/metadata/md5-cache/kde-apps/kcron-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Task Scheduler
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kcron/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 virtual/cron || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kcron-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2190919daca8defc84c44e513326d7d2
+_md5_=8c909b554695f1890affd1ca53cd7fab
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-21.04.3 b/metadata/md5-cache/kde-apps/kde-apps-meta-21.04.3
index 051b85bb3086..5afedb84b04e 100644
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-21.04.3
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-21.04.3
@@ -3,8 +3,8 @@ DESCRIPTION=Meta package for the KDE Release Service collection
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=accessibility +admin +education +games +graphics +multimedia +network pim sdk +utils
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdecore-meta-21.04.3:5 accessibility? ( >=kde-apps/kdeaccessibility-meta-21.04.3:5 ) admin? ( >=kde-apps/kdeadmin-meta-21.04.3:5 ) education? ( >=kde-apps/kdeedu-meta-21.04.3:5 ) games? ( >=kde-apps/kdegames-meta-21.04.3:5 ) graphics? ( >=kde-apps/kdegraphics-meta-21.04.3:5 ) multimedia? ( >=kde-apps/kdemultimedia-meta-21.04.3:5 ) network? ( >=kde-apps/kdenetwork-meta-21.04.3:5 ) pim? ( >=kde-apps/kdepim-meta-21.04.3:5 ) sdk? ( >=kde-apps/kdesdk-meta-21.04.3:5 ) utils? ( >=kde-apps/kdeutils-meta-21.04.3:5 )
 SLOT=5
-_md5_=79dbf402b21e931d0725000340ec5a15
+_md5_=536478a2bd1e7784a5c2d48f936809d7
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-21.04.3 b/metadata/md5-cache/kde-apps/kde-dev-scripts-21.04.3
index 61529f07ff87..1dc70cec0b3d 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-21.04.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Development Scripts
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kde-dev-scripts-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f31062892942cce0265d27372aec7c6b
+_md5_=7aa59db0c1dc804b709399ff253a5ae5
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-21.04.3 b/metadata/md5-cache/kde-apps/kde-dev-utils-21.04.3
index 8f6227ebc57d..f12981ee30d9 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-21.04.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Development Utilities
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/designer-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kde-dev-utils-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a82cd5285185c10b358e82cd57ab81c7
+_md5_=d0e870a6c650000338cd32e9a8c8fec7
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-21.04.3 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-21.04.3
index b34da0741371..8427e50c004e 100644
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-21.04.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
 EAPI=7
 HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=metapackage
 RDEPEND=>=app-accessibility/kontrast-21.04.3:5 >=kde-apps/kmag-21.04.3:5 >=kde-apps/kmousetool-21.04.3:5 >=kde-apps/kmouth-21.04.3:5
 SLOT=5
-_md5_=531e9cddbd88f7db57a5ec86d097ad78
+_md5_=f18dda38f1a46827a0485a54d4cf0ea2
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-21.04.3 b/metadata/md5-cache/kde-apps/kdeadmin-meta-21.04.3
index 41c4cd569418..3511daecfe82 100644
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-21.04.3
@@ -3,8 +3,8 @@ DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derive
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+cron
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ksystemlog-21.04.3:5 cron? ( >=kde-apps/kcron-21.04.3:5 )
 SLOT=5
-_md5_=c7cb2327377889463316203f7013266e
+_md5_=bb2ee0446814a932716dfb4a15b89f9d
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-21.04.3 b/metadata/md5-cache/kde-apps/kdebugsettings-21.04.3
index 17c95c5fb46b..853eb5ee7748 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Application to enable/disable qCDebug
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kdebugsettings/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdebugsettings-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=46393a4242b9e1b295e6d9a3dc3adc94
+_md5_=0e8b86001a4cc9251266ced11def85ba
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-21.04.3 b/metadata/md5-cache/kde-apps/kdecore-meta-21.04.3
index 8452cdcf453c..fce6e6738b0b 100644
--- a/metadata/md5-cache/kde-apps/kdecore-meta-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-21.04.3
@@ -3,8 +3,8 @@ DESCRIPTION=kdecore - merge this to pull in the most basic applications
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+handbook +share +thumbnail +webengine
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-21.04.3:5 >=kde-apps/kdialog-21.04.3:5 >=kde-apps/keditbookmarks-21.04.3:5 >=kde-apps/kfind-21.04.3:5 >=kde-apps/konsole-21.04.3:5 >=kde-apps/kwrite-21.04.3:5 handbook? ( >=kde-apps/khelpcenter-21.04.3:5 ) webengine? ( || ( www-client/falkon >=kde-apps/konqueror-21.04.3:5 ) ) share? ( kde-frameworks/purpose:5 ) thumbnail? ( >=kde-apps/ffmpegthumbs-21.04.3:5 >=kde-apps/thumbnailers-21.04.3:5 )
 SLOT=5
-_md5_=f5935b38b2bf993d02e19202c18098c8
+_md5_=2d02f6a435b7cbb5c376b7519fb2c45d
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-21.04.3 b/metadata/md5-cache/kde-apps/kdeedu-data-21.04.3
index 7c17d8e6dd83..9bbc051b50fe 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-21.04.3
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install nofetch prepare test unpack
 DESCRIPTION=Shared icons, artwork and data files for educational applications
 EAPI=7
 HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdeedu-data-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e5acda8dcc55775603addcf641b6f573
+_md5_=b8765d6c813eff729c94744a2867ff28
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-21.04.3 b/metadata/md5-cache/kde-apps/kdeedu-meta-21.04.3
index 095d5417020f..8e71303910c1 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-21.04.3
@@ -3,8 +3,8 @@ DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived pack
 EAPI=7
 HOMEPAGE=https://edu.kde.org
 IUSE=+webengine
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/analitza-21.04.3:5 >=kde-apps/artikulate-21.04.3:5 >=kde-apps/blinken-21.04.3:5 >=kde-apps/cantor-21.04.3:5 >=kde-apps/kalzium-21.04.3:5 >=kde-apps/kanagram-21.04.3:5 >=kde-apps/kbruch-21.04.3:5 >=kde-apps/kdeedu-data-21.04.3:5 >=kde-apps/kgeography-21.04.3:5 >=kde-apps/khangman-21.04.3:5 >=kde-apps/kig-21.04.3:5 >=kde-apps/kiten-21.04.3:5 >=kde-apps/klettres-21.04.3:5 >=kde-apps/kmplot-21.04.3:5 >=kde-apps/kqtquickcharts-21.04.3:5 >=kde-apps/ktouch-21.04.3:5 >=kde-apps/kturtle-21.04.3:5 >=kde-apps/kwordquiz-21.04.3:5 >=kde-apps/libkeduvocdocument-21.04.3:5 >=kde-apps/marble-21.04.3:5 >=kde-apps/minuet-21.04.3:5 >=kde-apps/rocs-21.04.3:5 >=kde-apps/step-21.04.3:5 webengine? ( >=kde-apps/kalgebra-21.04.3:5 >=kde-apps/parley-21.04.3:5 )
 SLOT=5
-_md5_=08d5dc8f27b12e73adbda08d05213a0d
+_md5_=41f29b350fb1326188499a42601d18e3
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-21.04.3 b/metadata/md5-cache/kde-apps/kdegames-meta-21.04.3
index 95759cc57575..fcb2b1719a01 100644
--- a/metadata/md5-cache/kde-apps/kdegames-meta-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-21.04.3
@@ -3,8 +3,8 @@ DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
 EAPI=7
 HOMEPAGE=https://games.kde.org/
 IUSE=opengl python
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/bomber-21.04.3:5 >=kde-apps/bovo-21.04.3:5 >=kde-apps/granatier-21.04.3:5 >=kde-apps/kapman-21.04.3:5 >=kde-apps/katomic-21.04.3:5 >=kde-apps/kblackbox-21.04.3:5 >=kde-apps/kblocks-21.04.3:5 >=kde-apps/kbounce-21.04.3:5 >=kde-apps/kbreakout-21.04.3:5 >=kde-apps/kdiamond-21.04.3:5 >=kde-apps/kfourinline-21.04.3:5 >=kde-apps/kgoldrunner-21.04.3:5 >=kde-apps/kigo-21.04.3:5 >=kde-apps/killbots-21.04.3:5 >=kde-apps/kiriki-21.04.3:5 >=kde-apps/kjumpingcube-21.04.3:5 >=kde-apps/klickety-21.04.3:5 >=kde-apps/klines-21.04.3:5 >=kde-apps/kmahjongg-21.04.3:5 >=kde-apps/kmines-21.04.3:5 >=kde-apps/knavalbattle-21.04.3:5 >=kde-apps/knetwalk-21.04.3:5 >=kde-apps/knights-21.04.3:5 >=kde-apps/kolf-21.04.3:5 >=kde-apps/kollision-21.04.3:5 >=kde-apps/konquest-21.04.3:5 >=kde-apps/kpat-21.04.3:5 >=kde-apps/kreversi-21.04.3:5 >=kde-apps/kshisen-21.04.3:5 >=kde-apps/ksirk-21.04.3:5 >=kde-apps/ksnakeduel-21.04.3:5 >=kde-apps/kspaceduel-21.04.3:5 >=kde-apps/ksquares-21.04.3:5 >=kde-apps/ktuberling-21.04.3:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-apps/libkmahjongg-21.04.3:5 >=kde-apps/lskat-21.04.3:5 >=kde-apps/palapeli-21.04.3:5 >=kde-apps/picmi-21.04.3:5 opengl? ( >=kde-apps/ksudoku-21.04.3:5 >=kde-apps/kubrick-21.04.3:5 ) python? ( >=kde-apps/kajongg-21.04.3:5 )
 SLOT=5
-_md5_=0566e9acfe33742b47489bc829c238d0
+_md5_=3dd2dda4467128037497cf1ba62c2820
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-21.04.3 b/metadata/md5-cache/kde-apps/kdegraphics-meta-21.04.3
index dac023e4535c..2d066e0a1f05 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-21.04.3
@@ -3,8 +3,8 @@ DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
 EAPI=7
 HOMEPAGE=https://apps.kde.org/graphics/
 IUSE=scanner
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/gwenview-21.04.3:5 >=kde-apps/kamera-21.04.3:5 >=kde-apps/kcolorchooser-21.04.3:5 >=kde-apps/kdegraphics-mobipocket-21.04.3:5 >=kde-apps/kipi-plugins-21.04.3:5 >=kde-apps/kolourpaint-21.04.3:5 >=kde-apps/kruler-21.04.3:5 >=kde-apps/libkdcraw-21.04.3:5 >=kde-apps/libkexiv2-21.04.3:5 >=kde-apps/libkipi-21.04.3:5 >=kde-apps/okular-21.04.3:5 >=kde-apps/spectacle-21.04.3:5 >=kde-apps/svgpart-21.04.3:5 >=kde-apps/thumbnailers-21.04.3:5 scanner? ( >=kde-apps/libksane-21.04.3:5 )
 SLOT=5
-_md5_=69a3aafae800140854cb827739fe7c96
+_md5_=7a28b4620517a5f5322244902a77924c
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-21.04.3 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-21.04.3
index a0d5c1676027..aa601ff4f93a 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Library to support mobipocket ebooks
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+thumbnail debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 thumbnail? ( >=kde-frameworks/kio-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdegraphics-mobipocket-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=90db920e4c1e95b4839d1c7a16fb133f
+_md5_=b2c970d5774e84a5c14c4ccd13992228
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-21.04.3 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-21.04.3
index bc9e9728a45f..14c60134eb76 100644
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-21.04.3
@@ -3,8 +3,8 @@ DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived pack
 EAPI=7
 HOMEPAGE=https://apps.kde.org/multimedia/ https://multimedia.kde.org/
 IUSE=+cdrom +ffmpeg gstreamer
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dragon-21.04.3:5 >=kde-apps/juk-21.04.3:5 >=kde-apps/kdenlive-21.04.3:5 >=kde-apps/kmix-21.04.3:5 >=kde-apps/kwave-21.04.3:5 >=media-sound/elisa-21.04.3:5 cdrom? ( >=kde-apps/audiocd-kio-21.04.3:5 >=kde-apps/k3b-21.04.3:5 >=kde-apps/libkcddb-21.04.3:5 >=kde-apps/libkcompactdisc-21.04.3:5 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-21.04.3:5 ) gstreamer? ( >=kde-apps/kamoso-21.04.3:5 )
 SLOT=5
-_md5_=482b16e6e6ddf1a6baa6932138d4fea9
+_md5_=d9d57104c13383163ba65389bdcf1463
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-21.04.3 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-21.04.3
index 9d5f7a5cba06..13a2d8ec1b39 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Samba filesharing plugin for file properties
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kdenetwork_filesharing/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.80.0:5 net-fs/samba || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdenetwork-filesharing-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2b24b25f57b82a9c5bbc91f7f3b29465
+_md5_=e172cb2121ee7a6e1d2d61dc8bb98f40
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-21.04.3 b/metadata/md5-cache/kde-apps/kdenetwork-meta-21.04.3
index 162874398174..6c11d6c52a83 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-21.04.3
@@ -3,8 +3,8 @@ DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+bittorrent dropbox samba +webengine
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kget-21.04.3:5 >=kde-apps/kopete-21.04.3:5 >=kde-apps/krdc-21.04.3:5 >=kde-apps/krfb-21.04.3:5 >=kde-apps/zeroconf-ioslave-21.04.3:5 >=kde-misc/kdeconnect-21.04.3:5 >=kde-misc/kio-gdrive-21.04.3:5 >=net-irc/konversation-21.04.3:5 bittorrent? ( >=net-libs/libktorrent-21.04.3:5 >=net-p2p/ktorrent-21.04.3:5 ) dropbox? ( >=kde-apps/dolphin-plugins-dropbox-21.04.3:5 ) samba? ( >=kde-apps/kdenetwork-filesharing-21.04.3:5 ) webengine? ( >=kde-apps/plasma-telepathy-meta-21.04.3:5 )
 SLOT=5
-_md5_=d2a3d2a07ed55570025f43f2b6afdede
+_md5_=c1a4537f91a4578d33daacb3975bd357
diff --git a/metadata/md5-cache/kde-apps/kdenlive-21.04.3-r1 b/metadata/md5-cache/kde-apps/kdenlive-21.04.3-r1
index e91d316a38f1..fe1039afdb9d 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-21.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kdenlive-21.04.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Non-linear video editing suite by KDE
 EAPI=7
 HOMEPAGE=https://kdenlive.org/en/
 IUSE=gles2-only semantic-desktop share v4l test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtnetworkauth-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/mlt-6.26.0[ffmpeg,frei0r,qt5,sdl,xml] <media-libs/mlt-7 semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.80.0:5 ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtquickcontrols-5.15.2:5 media-video/ffmpeg[encode,sdl,X] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdenlive-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4b7f34bb06128f3cc2e701a22c8d04d0
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=67b0ea048a8672320501310aac5d9066
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-20.12.3 b/metadata/md5-cache/kde-apps/kdepim-addons-20.12.3
index 4e2068cd00b4..64e5810fca7a 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-20.12.3
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-20.12.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-libs/grantlee-5.2.0:5 >=dev-qt/q
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/kdepim-addons-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=efffa6e1ed6515f38c9397ff33afe008
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-21.04.3 b/metadata/md5-cache/kde-apps/kdepim-addons-21.04.3
index 96edf1d277ef..6cf9a70441c9 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Plugins for KDE Personal Information Management Suite
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kontact/
 IUSE=importwizard markdown test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-notes-21.04.3:5 >=kde-apps/calendarsupport-21.04.3:5 >=kde-apps/eventviews-21.04.3:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/incidenceeditor-21.04.3:5 >=kde-apps/kaddressbook-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kimap-21.04.3:5 >=kde-apps/kitinerary-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/kontactinterface-21.04.3:5 >=kde-apps/kpkpass-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/libkleo-21.04.3:5 >=kde-apps/libksieve-21.04.3:5 >=kde-apps/libktnef-21.04.3:5 >=kde-apps/mailcommon-21.04.3:5 >=kde-apps/messagelib-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/prison-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 importwizard? ( >=kde-apps/akonadi-import-wizard-21.04.3:5 ) markdown? ( app-text/discount ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdepim-addons-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e04997bd329871b525f34f1f7a5cd11c
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=06bc669031189b9977f44eeecebef421
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-21.04.3 b/metadata/md5-cache/kde-apps/kdepim-meta-21.04.3
index 2bc76851e23e..ee96b8650f93 100644
--- a/metadata/md5-cache/kde-apps/kdepim-meta-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-21.04.3
@@ -3,8 +3,8 @@ DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kontact/
 IUSE=bogofilter clamav spamassassin
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadiconsole-21.04.3:5 >=kde-apps/akonadi-calendar-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-import-wizard-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/akonadi-notes-21.04.3:5 >=kde-apps/akonadi-search-21.04.3:5 >=kde-apps/akregator-21.04.3:5 >=kde-apps/calendarjanitor-21.04.3:5 >=kde-apps/calendarsupport-21.04.3:5 >=kde-apps/eventviews-21.04.3:5 >=kde-apps/grantlee-editor-21.04.3:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/incidenceeditor-21.04.3:5 >=kde-apps/kaddressbook-21.04.3:5 >=kde-apps/kalarm-21.04.3:5 >=kde-apps/kalarmcal-21.04.3:5 >=kde-apps/kcalutils-21.04.3:5 >=kde-apps/kdepim-addons-21.04.3:5 >=kde-apps/kdepim-runtime-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kimap-21.04.3:5 >=kde-apps/kitinerary-21.04.3:5 >=kde-apps/kldap-21.04.3:5 >=kde-apps/kleopatra-21.04.3:5 >=kde-apps/kmail-21.04.3:5 >=kde-apps/kmail-account-wizard-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/kmbox-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/knotes-21.04.3:5 >=kde-apps/konsolekalendar-21.04.3:5 >=kde-apps/kontact-21.04.3:5 >=kde-apps/kontactinterface-21.04.3:5 >=kde-apps/korganizer-21.04.3:5 >=kde-apps/kpimtextedit-21.04.3:5 >=kde-apps/kpkpass-21.04.3:5 >=kde-apps/ksmtp-21.04.3:5 >=kde-apps/libgravatar-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/libkgapi-21.04.3:5 >=kde-apps/libkleo-21.04.3:5 >=kde-apps/libksieve-21.04.3:5 >=kde-apps/libktnef-21.04.3:5 >=kde-apps/mailcommon-21.04.3:5 >=kde-apps/mailimporter-21.04.3:5 >=kde-apps/mbox-importer-21.04.3:5 >=kde-apps/messagelib-21.04.3:5 >=kde-apps/pim-data-exporter-21.04.3:5 >=kde-apps/pim-sieve-editor-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 bogofilter? ( mail-filter/bogofilter ) clamav? ( app-antivirus/clamav ) spamassassin? ( mail-filter/spamassassin )
 SLOT=5
-_md5_=1d4cb1a40a477c9c48b988baa173c209
+_md5_=b30163550b5cd602619e8ac265118694
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-21.04.3 b/metadata/md5-cache/kde-apps/kdepim-runtime-21.04.3
index c19cec76aedb..8e0dcf8a5d31 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kontact/
 IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=app-crypt/qca-2.3.0:2 dev-libs/cyrus-sasl:2 dev-libs/libical:= dev-libs/qtkeychain:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtnetworkauth-5.15.2:5 >=dev-qt/qtspeech-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-calendar-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/akonadi-notes-21.04.3:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/kalarmcal-21.04.3:5 >=kde-apps/kcalutils-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kimap-21.04.3:5 >=kde-apps/kldap-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/kmbox-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/libkgapi-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdav-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdepim-runtime-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4df79ef3c0fa88a5be31ef6d21fb0447
+_md5_=5867785cbd3d55c5fd652d15209ec258
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-21.04.3 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-21.04.3
index 580af82af4a7..b99d857bee20 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=kioslaves from kdesdk package
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdesdk-kioslaves-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9bf61a0aace5cbe7db31c0b8f8183eb5
+_md5_=3074f8ba82851a4cbfaf4d224e55ff30
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-21.04.3 b/metadata/md5-cache/kde-apps/kdesdk-meta-21.04.3
index 0716c214be46..853875eeb22e 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-21.04.3
@@ -3,8 +3,8 @@ DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
 EAPI=7
 HOMEPAGE=https://apps.kde.org/development/
 IUSE=cvs git mercurial python ruby subversion
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kapptemplate-21.04.3:5 >=kde-apps/kcachegrind-21.04.3:5 >=kde-apps/kde-dev-scripts-21.04.3:5 >=kde-apps/kde-dev-utils-21.04.3:5 >=kde-apps/kdesdk-kioslaves-21.04.3:5 >=kde-apps/kdesdk-thumbnailers-21.04.3:5 >=kde-apps/kompare-21.04.3:5 >=kde-apps/libkomparediff2-21.04.3:5 >=kde-apps/poxml-21.04.3:5 >=kde-apps/umbrello-21.04.3:5 cvs? ( >=kde-apps/cervisia-21.04.3:5 ) git? ( >=kde-apps/dolphin-plugins-git-21.04.3:5 ) mercurial? ( >=kde-apps/dolphin-plugins-mercurial-21.04.3:5 ) python? ( >=kde-apps/lokalize-21.04.3:5 ) ruby? ( >=kde-apps/kross-interpreters-21.04.3:5 ) subversion? ( >=kde-apps/dolphin-plugins-subversion-21.04.3:5 )
 SLOT=5
-_md5_=aa4c5d54cf60159abfe04bdd18c74ef9
+_md5_=38879ca601397dcccbd2ba8b8adc1158
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-21.04.3 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-21.04.3
index 6d4cd1439a5c..fbe8569364c7 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Thumbnail generator for PO files
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdesdk-thumbnailers-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=99fd6fd9cd4b66ac350110531501c00f
+_md5_=8badcb7729fff5f231e207d22597bb46
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-21.04.3 b/metadata/md5-cache/kde-apps/kdeutils-meta-21.04.3
index 9a7740d2dd6e..67514ac74c27 100644
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-21.04.3
@@ -3,8 +3,8 @@ DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
 EAPI=7
 HOMEPAGE=https://apps.kde.org/utilities/ https://utils.kde.org
 IUSE=7zip cups floppy gpg lrz rar +webengine
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=metapackage
 RDEPEND=>=app-cdr/dolphin-plugins-mountiso-21.04.3:5 >=kde-apps/ark-21.04.3:5 >=kde-apps/filelight-21.04.3:5 >=kde-apps/kate-21.04.3:5 >=kde-apps/kbackup-21.04.3:5 >=kde-apps/kcalc-21.04.3:5 >=kde-apps/kcharselect-21.04.3:5 >=kde-apps/kdebugsettings-21.04.3:5 >=kde-apps/kdf-21.04.3:5 >=kde-apps/kteatime-21.04.3:5 >=kde-apps/ktimer-21.04.3:5 >=kde-apps/kwalletmanager-21.04.3:5 >=kde-apps/sweeper-21.04.3:5 >=kde-apps/yakuake-21.04.3:5 >=kde-misc/markdownpart-21.04.3:5 >=sys-block/partitionmanager-21.04.3:5 >=sys-libs/kpmcore-21.04.3:5 cups? ( >=kde-apps/print-manager-21.04.3:5 ) floppy? ( >=kde-apps/kfloppy-21.04.3:5 ) gpg? ( >=kde-apps/kgpg-21.04.3:5 ) webengine? ( >=kde-apps/kimagemapeditor-21.04.3:5 ) 7zip? ( app-arch/p7zip ) lrz? ( app-arch/lrzip ) rar? ( || ( app-arch/rar app-arch/unrar app-arch/unar ) )
 SLOT=5
-_md5_=4bb5b94d83e005e9a1c807eec5dc0404
+_md5_=102941ab841ab548dc0672569f86d3a7
diff --git a/metadata/md5-cache/kde-apps/kdf-21.04.3 b/metadata/md5-cache/kde-apps/kdf-21.04.3
index 81c37fc492c3..0c3c69f48080 100644
--- a/metadata/md5-cache/kde-apps/kdf-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdf-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE free disk space utility
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kdf/ https://utils.kde.org/projects/kdf/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdf-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=83aa49cc28bc69f24724f7882effdb31
+_md5_=ee45cc966ba8100841c591833763bc0b
diff --git a/metadata/md5-cache/kde-apps/kdialog-21.04.3 b/metadata/md5-cache/kde-apps/kdialog-21.04.3
index b4bc830f1b2a..3ebc91a650e2 100644
--- a/metadata/md5-cache/kde-apps/kdialog-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdialog-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kdialog/
 IUSE=X debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdialog-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3e9b88e87abeacb40f9c921093b5ecc2
+_md5_=c8709b62fdce4b7317fea9387a9fd11d
diff --git a/metadata/md5-cache/kde-apps/kdiamond-21.04.3 b/metadata/md5-cache/kde-apps/kdiamond-21.04.3
index 448a7b71050d..2270e2132342 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-21.04.3
+++ b/metadata/md5-cache/kde-apps/kdiamond-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Single player three-in-a-row game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kdiamond/ https://games.kde.org/games/kdiamond/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdiamond-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d9677ed9d2c43f632a4c779534f085d9
+_md5_=d20d8add5bac2c447096db91ce3c2daa
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-21.04.3 b/metadata/md5-cache/kde-apps/keditbookmarks-21.04.3
index d1569403181a..86be157a2643 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-21.04.3
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Bookmarks editor based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+man test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/keditbookmarks-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=54609f20b714a326c51492b43cb88409
+_md5_=eb3053d8ae7b67c6b8050c313a15d1b1
diff --git a/metadata/md5-cache/kde-apps/kfind-21.04.3-r1 b/metadata/md5-cache/kde-apps/kfind-21.04.3-r1
index 0e3be77b5df9..eea02af7e672 100644
--- a/metadata/md5-cache/kde-apps/kfind-21.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kfind-21.04.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=File finder utility based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kfind/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kfind-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b7a8ea1f00ee012292a0bfb2a164590a
+_md5_=78525a2aeaceace25cc16f45402df26a
diff --git a/metadata/md5-cache/kde-apps/kfloppy-21.04.3 b/metadata/md5-cache/kde-apps/kfloppy-21.04.3
index a9c02466d9bf..ca3cf7fd680a 100644
--- a/metadata/md5-cache/kde-apps/kfloppy-21.04.3
+++ b/metadata/md5-cache/kde-apps/kfloppy-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Straightforward graphical means to format 3.5" and 5.25" floppy disk
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kfloppy/ https://utils.kde.org/projects/kfloppy/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kfloppy-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=560905ad289c57b48a94d936f754431d
+_md5_=ea3b18a294492a8bb58786632f8395ea
diff --git a/metadata/md5-cache/kde-apps/kfourinline-21.04.3 b/metadata/md5-cache/kde-apps/kfourinline-21.04.3
index eadd7eab39e8..931775493825 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-21.04.3
+++ b/metadata/md5-cache/kde-apps/kfourinline-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE four-in-a-row game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kfourinline/ https://games.kde.org/games/kfourinline/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kfourinline-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=84a255022aab05b2cf160639fa38c2c6
+_md5_=05298481a59f7946c740d4e3df85aed7
diff --git a/metadata/md5-cache/kde-apps/kgeography-21.04.3 b/metadata/md5-cache/kde-apps/kgeography-21.04.3
index f5e4ce8d2fd9..cd4884791bb3 100644
--- a/metadata/md5-cache/kde-apps/kgeography-21.04.3
+++ b/metadata/md5-cache/kde-apps/kgeography-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Geography learning tool
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kgeography/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kgeography-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7d8c069c472e6bc15eb0cab731a535ef
+_md5_=32502c485b5e76b389cb252843fe0085
diff --git a/metadata/md5-cache/kde-apps/kget-21.04.3 b/metadata/md5-cache/kde-apps/kget-21.04.3
index 6a40340ce349..e90ab184955e 100644
--- a/metadata/md5-cache/kde-apps/kget-21.04.3
+++ b/metadata/md5-cache/kde-apps/kget-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Advanced download manager by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kget/
 IUSE=bittorrent gpg kde mms sqlite test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdelibs4support-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( kde-plasma/libkworkspace:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kget-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=993a5b1ba70bb5f2dda61041b25df4b3
+_md5_=ef69b02ed8389d02739f4ad9b0b2be93
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-21.04.3 b/metadata/md5-cache/kde-apps/kgoldrunner-21.04.3
index 05b2fddcd80b..f86dc3bc2a84 100644
--- a/metadata/md5-cache/kde-apps/kgoldrunner-21.04.3
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Game of action and puzzle solving by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kgoldrunner/ https://games.kde.org/games/kgoldrunner/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 media-libs/libsndfile media-libs/openal >=dev-qt/qtsvg-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kgoldrunner-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bde7fb9ca11e3963c22d4b0918502a24
+_md5_=5052980972da1c253b47bf16c34d3215
diff --git a/metadata/md5-cache/kde-apps/kgpg-21.04.3 b/metadata/md5-cache/kde-apps/kgpg-21.04.3
index f9792ce7da5b..c9eaf5343de6 100644
--- a/metadata/md5-cache/kde-apps/kgpg-21.04.3
+++ b/metadata/md5-cache/kde-apps/kgpg-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kgpg/ https://utils.kde.org/projects/kgpg/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 app-crypt/gnupg || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-gpg )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kgpg-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3c67a2032f958c9b7944e2163f95f847
+_md5_=2f3307841d73d33508ed9413bf56805d
diff --git a/metadata/md5-cache/kde-apps/khangman-21.04.3 b/metadata/md5-cache/kde-apps/khangman-21.04.3
index 0f1e4227af7c..dd527c2b0fdd 100644
--- a/metadata/md5-cache/kde-apps/khangman-21.04.3
+++ b/metadata/md5-cache/kde-apps/khangman-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Classical hangman game by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/khangman/ https://edu.kde.org/khangman/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkeduvocdocument-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=kde-apps/kdeedu-data-21.04.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/release-service/21.04.3/src/khangman-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=30f0145d3b4954c6498a5293b4ad0b83
+_md5_=b9a5c8ba983416d729bb7ece9355c8a4
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-21.04.3 b/metadata/md5-cache/kde-apps/khelpcenter-21.04.3
index 000fdebcc40a..4fdb022fa961 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-21.04.3
+++ b/metadata/md5-cache/kde-apps/khelpcenter-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Application to read documentation for KDE Plasma, Applications, Util
 EAPI=7
 HOMEPAGE=https://apps.kde.org/help/ https://userbase.kde.org/KHelpCenter
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdoctools-5.80.0:5 >=kde-frameworks/khtml-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/khelpcenter-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=559e65e66fe7ea70cb023de0e10d6eb7
+_md5_=3fef13f068e2557bd842c7f1c395537e
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-21.04.3 b/metadata/md5-cache/kde-apps/kidentitymanagement-21.04.3
index d352973d398d..4cc341c063fb 100644
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-21.04.3
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for managing identitites
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kpimtextedit-21.04.3:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kidentitymanagement-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7fb603a087e5ab807c4363781c785f73
+_md5_=08947eb7dd2d92e59e2a7c4540e2dce0
diff --git a/metadata/md5-cache/kde-apps/kig-21.04.3 b/metadata/md5-cache/kde-apps/kig-21.04.3
index 0a7424307365..c1da18d22d99 100644
--- a/metadata/md5-cache/kde-apps/kig-21.04.3
+++ b/metadata/md5-cache/kde-apps/kig-21.04.3
@@ -5,7 +5,7 @@ DESCRIPTION=KDE Interactive Geometry tool
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kig/ https://edu.kde.org/kig/
 IUSE=geogebra scripting python_single_target_python3_8 python_single_target_python3_9 debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.15.2:5 ) scripting? ( python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kig-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e9a6ef61ca24bb1324628738e05d8ec0
+_md5_=3ee33af6566fda6d7d08f01e37593c2e
diff --git a/metadata/md5-cache/kde-apps/kigo-21.04.3 b/metadata/md5-cache/kde-apps/kigo-21.04.3
index a62ebe726ea8..ccc2b064d908 100644
--- a/metadata/md5-cache/kde-apps/kigo-21.04.3
+++ b/metadata/md5-cache/kde-apps/kigo-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Go game by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kigo/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 games-board/gnugo || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kigo-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6df516701a4cfee1529b6a02eb5006fb
+_md5_=a9f604a1037849db31317b8ad0397fa9
diff --git a/metadata/md5-cache/kde-apps/killbots-21.04.3 b/metadata/md5-cache/kde-apps/killbots-21.04.3
index 98b97b85e38c..f3bf9c6fd28a 100644
--- a/metadata/md5-cache/kde-apps/killbots-21.04.3
+++ b/metadata/md5-cache/kde-apps/killbots-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Kill the bots or they kill you!
 EAPI=7
 HOMEPAGE=https://apps.kde.org/killbots/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/killbots-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5055d1351f5218375e067de2eeb36e20
+_md5_=edfa8cb46cceb2de7f0653b0e280ee6f
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-21.04.3 b/metadata/md5-cache/kde-apps/kimagemapeditor-21.04.3
index 491ee82d5d6f..c921ae4368b9 100644
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-21.04.3
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Generator of HTML image maps
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kimagemapeditor/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kimagemapeditor-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3be64e53f6d1d543fbb1d6aa7af67717
+_md5_=fc5231d471ce1ffe7cb512dfb6512a20
diff --git a/metadata/md5-cache/kde-apps/kimap-21.04.3 b/metadata/md5-cache/kde-apps/kimap-21.04.3
index 16f8f693a794..c7195359b7e3 100644
--- a/metadata/md5-cache/kde-apps/kimap-21.04.3
+++ b/metadata/md5-cache/kde-apps/kimap-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for interacting with IMAP servers
 EAPI=7
 HOMEPAGE=https://api.kde.org/kdepim/kimap/html/index.html
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.15.2:5 >=kde-apps/kmime-21.04.3:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kimap-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bfa000cbf3b6bc9370d5213f7733c1ad
+_md5_=3c13bec8865c09dbd01440516caebdab
diff --git a/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r2 b/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r2
index c51a2ce66607..f0fb8e1381b8 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r2
+++ b/metadata/md5-cache/kde-apps/kio-extras-21.04.3-r2
@@ -5,11 +5,11 @@ DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
 EAPI=7
 HOMEPAGE=https://invent.kde.org/network/kio-extras
 IUSE=activities +man mtp nfs openexr phonon samba +sftp taglib X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 activities? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/kactivities-stats-5.80.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:* ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap:= net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) >=kde-frameworks/kded-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kio-extras-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=75e2bb63cad9249eeaf3ffb7da46e83c
+_md5_=59c14cc96533b1580fb11c1889015f3d
diff --git a/metadata/md5-cache/kde-apps/kipi-plugins-21.04.3-r1 b/metadata/md5-cache/kde-apps/kipi-plugins-21.04.3-r1
index 9ea849045e04..fe91aa447072 100644
--- a/metadata/md5-cache/kde-apps/kipi-plugins-21.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kipi-plugins-21.04.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Plugins for the KDE Image Plugin Interface
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kipi_plugins/ https://userbase.kde.org/KIPI
 IUSE=mediawiki +remotestorage debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-apps/libkipi-21.04.3:5= >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kipi-plugins-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c361fad311b459a3ff44aa278637e70f
+_md5_=e7f15daf9646bc66a6bce7e2b632bfae
diff --git a/metadata/md5-cache/kde-apps/kiriki-21.04.3 b/metadata/md5-cache/kde-apps/kiriki-21.04.3
index b3eae3f0ec7f..b148e3f7176a 100644
--- a/metadata/md5-cache/kde-apps/kiriki-21.04.3
+++ b/metadata/md5-cache/kde-apps/kiriki-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=An addictive and fun dice game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kiriki/ https://games.kde.org/games/kiriki/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kiriki-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0141f05ac740eee131caac6afeb668b0
+_md5_=2ce5fe1b5a9864ca0b523ada57d53701
diff --git a/metadata/md5-cache/kde-apps/kiten-21.04.3 b/metadata/md5-cache/kde-apps/kiten-21.04.3
index e5302e4f9d5b..715869cb98b0 100644
--- a/metadata/md5-cache/kde-apps/kiten-21.04.3
+++ b/metadata/md5-cache/kde-apps/kiten-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Japanese dictionary and reference
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kiten/ https://edu.kde.org/kiten/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 media-fonts/kanjistrokeorders || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kiten-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1c254b4b7d0171e62a01b5dfd5c629ed
+_md5_=7334b79e5232cfb7dca906bb19073eff
diff --git a/metadata/md5-cache/kde-apps/kitinerary-21.04.3 b/metadata/md5-cache/kde-apps/kitinerary-21.04.3
index 433dd44bf06a..9c5a3539e6b7 100644
--- a/metadata/md5-cache/kde-apps/kitinerary-21.04.3
+++ b/metadata/md5-cache/kde-apps/kitinerary-21.04.3
@@ -5,7 +5,7 @@ DESCRIPTION=Data Model and Extraction System for Travel Reservation information
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kontact/
 IUSE=+barcode pdf test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/kpkpass-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 sys-libs/zlib barcode? ( >=media-libs/zxing-cpp-1.1.0 ) pdf? ( app-text/poppler:=[qt5] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=test? ( pdf )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kitinerary-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6c52c89088100ceffe78610caca483e3
+_md5_=0bfcaa12149b3df2409d356cfd58c678
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-21.04.3 b/metadata/md5-cache/kde-apps/kjumpingcube-21.04.3
index 8b69aec9121b..6618741ae0e9 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-21.04.3
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Tactical one or two player game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kjumpingcube/ https://games.kde.org/games/kjumpingcube/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kjumpingcube-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=37ad2bfb949d95e4b6f3563126903b20
+_md5_=fdaebaf43e9ba86255034c335bfe4869
diff --git a/metadata/md5-cache/kde-apps/kldap-21.04.3 b/metadata/md5-cache/kde-apps/kldap-21.04.3
index c2615253f93a..afc43825d617 100644
--- a/metadata/md5-cache/kde-apps/kldap-21.04.3
+++ b/metadata/md5-cache/kde-apps/kldap-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for interacting with LDAP servers
 EAPI=7
 HOMEPAGE=https://api.kde.org/kdepim/kldap/html/index.html
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/cyrus-sasl dev-libs/qtkeychain:= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 net-nds/openldap || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kldap-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=564514013ddba2457d1fde39da9545dc
+_md5_=39cd1bb3ace82dfc8643925efd931498
diff --git a/metadata/md5-cache/kde-apps/kleopatra-21.04.3 b/metadata/md5-cache/kde-apps/kleopatra-21.04.3
index 8714f721e8e7..862b97b44782 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-21.04.3
+++ b/metadata/md5-cache/kde-apps/kleopatra-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kleopatra/
 IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=app-crypt/gpgme-1.13.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/libkleo-21.04.3:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=app-crypt/gnupg-2.1 app-crypt/paperkey || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kleopatra-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8d901e04b068f47d2151da36005f963f
+_md5_=cce069ea5c2566ffacb12adc7f60fe7b
diff --git a/metadata/md5-cache/kde-apps/klettres-21.04.3 b/metadata/md5-cache/kde-apps/klettres-21.04.3
index da68ea5be307..7ae7575f4dbf 100644
--- a/metadata/md5-cache/kde-apps/klettres-21.04.3
+++ b/metadata/md5-cache/kde-apps/klettres-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Alphabet learning application
 EAPI=7
 HOMEPAGE=https://apps.kde.org/klettres/ https://edu.kde.org/klettres/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/klettres-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8ed5f6f0fc8e7026a6defc300c8e7bef
+_md5_=fb6f74bb179ed5f36556e2d51a43de9d
diff --git a/metadata/md5-cache/kde-apps/klickety-21.04.3 b/metadata/md5-cache/kde-apps/klickety-21.04.3
index d35140cfc4ab..2e78744325ab 100644
--- a/metadata/md5-cache/kde-apps/klickety-21.04.3
+++ b/metadata/md5-cache/kde-apps/klickety-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=An adaptation of the Clickomania game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/klickety/ https://games.kde.org/games/klickety/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/klickety-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=983ddd7886aab8fc46e9d687c4a89192
+_md5_=867b977be0a051c8da059ea7b70d7270
diff --git a/metadata/md5-cache/kde-apps/klines-21.04.3 b/metadata/md5-cache/kde-apps/klines-21.04.3
index 1a8ea03cfef6..1fbe556c4de5 100644
--- a/metadata/md5-cache/kde-apps/klines-21.04.3
+++ b/metadata/md5-cache/kde-apps/klines-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=A little KDE game about balls and how to get rid of them
 EAPI=7
 HOMEPAGE=https://apps.kde.org/klines/ https://games.kde.org/games/klines/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/klines-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=24217d908f42eb72465e1a0968eaabf7
+_md5_=bccd1ef08037ffe850b7a37e0a0d12f8
diff --git a/metadata/md5-cache/kde-apps/kmag-21.04.3 b/metadata/md5-cache/kde-apps/kmag-21.04.3
index 3cb5ff191826..5be06b530527 100644
--- a/metadata/md5-cache/kde-apps/kmag-21.04.3
+++ b/metadata/md5-cache/kde-apps/kmag-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE screen magnifier
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kmag/
 IUSE=keyboardfocus debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kmag-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7c2adc7c40332d993743282e0e065e7c
+_md5_=9411376643fabbd05e92d51132ba9112
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-21.04.3 b/metadata/md5-cache/kde-apps/kmahjongg-21.04.3
index 73b0369318bd..768d1c5c67eb 100644
--- a/metadata/md5-cache/kde-apps/kmahjongg-21.04.3
+++ b/metadata/md5-cache/kde-apps/kmahjongg-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=A tile matching game for one or two players
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kmahjongg/ https://games.kde.org/games/kmahjongg/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-apps/libkmahjongg-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kmahjongg-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5c60faa2cc8517bf21da79d6cecf090c
+_md5_=904fda1600c577cb38131aaba48a7106
diff --git a/metadata/md5-cache/kde-apps/kmail-20.12.3 b/metadata/md5-cache/kde-apps/kmail-20.12.3
index 2815eea54ee6..e5bfa779362d 100644
--- a/metadata/md5-cache/kde-apps/kmail-20.12.3
+++ b/metadata/md5-cache/kde-apps/kmail-20.12.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdb
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/kmail-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3d4428f329a15f2d6076913a57e25696
diff --git a/metadata/md5-cache/kde-apps/kmail-21.04.3 b/metadata/md5-cache/kde-apps/kmail-21.04.3
index 8feb34259f82..4a34c8a0dc12 100644
--- a/metadata/md5-cache/kde-apps/kmail-21.04.3
+++ b/metadata/md5-cache/kde-apps/kmail-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kmail2/ https://kontact.kde.org/components/kmail.html
 IUSE=pch telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/akonadi-search-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/kontactinterface-21.04.3:5 >=kde-apps/kpimtextedit-21.04.3:5 >=kde-apps/libgravatar-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/libkleo-21.04.3:5 >=kde-apps/libksieve-21.04.3:5 >=kde-apps/libktnef-21.04.3:5 >=kde-apps/mailcommon-21.04.3:5 >=kde-apps/messagelib-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) >=kde-apps/kdepim-runtime-21.04.3:5 >=kde-apps/kmail-account-wizard-21.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kmail-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=08769839191a7acfe25490237283d298
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e4e1787e2dc4df72c029dfd3a542c902
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-21.04.3 b/metadata/md5-cache/kde-apps/kmail-account-wizard-21.04.3
index a8f2689b49ea..dd30be7254a2 100644
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-21.04.3
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Assistant for KMail accounts configuration
 EAPI=7
 HOMEPAGE=https://kde.org/ https://userbase.kde.org/KMail/Account_Wizard
 IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=dev-libs/qtkeychain:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kldap-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/libkleo-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kmail-account-wizard-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eaa1ca520cb8c81e5244f19683bd69ab
+_md5_=432a99940b97d6e25078cf559f6a3f48
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-21.04.3 b/metadata/md5-cache/kde-apps/kmailtransport-21.04.3
index 8585f824b3f2..e4052b1e9df1 100644
--- a/metadata/md5-cache/kde-apps/kmailtransport-21.04.3
+++ b/metadata/md5-cache/kde-apps/kmailtransport-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Mail transport service
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/qtkeychain:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/ksmtp-21.04.3:5 >=kde-apps/libkgapi-21.04.3:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kmailtransport-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=893f5aebf9a099f4c6c586b52eecab8b
+_md5_=7187430dd31ba0d43c64091f71d2a912
diff --git a/metadata/md5-cache/kde-apps/kmbox-21.04.3 b/metadata/md5-cache/kde-apps/kmbox-21.04.3
index 1705fc562413..b9c6078ea4a0 100644
--- a/metadata/md5-cache/kde-apps/kmbox-21.04.3
+++ b/metadata/md5-cache/kde-apps/kmbox-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for accessing MBox format mail storages
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-apps/kmime-21.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kmbox-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aafc5f1d1a498f8a9c6b9a27f5d3664a
+_md5_=11c5aa3aabf7bf9f6cdcc3be429bc2b6
diff --git a/metadata/md5-cache/kde-apps/kmime-21.04.3 b/metadata/md5-cache/kde-apps/kmime-21.04.3
index 239ba2af8910..cb7ff3f61a63 100644
--- a/metadata/md5-cache/kde-apps/kmime-21.04.3
+++ b/metadata/md5-cache/kde-apps/kmime-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Libary for handling mail messages and newsgroup articles
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kmime-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c5adbb1cb91c48056479d063745d7a31
+_md5_=16fa6ab2d38ed18fd34120fb04775c87
diff --git a/metadata/md5-cache/kde-apps/kmines-21.04.3 b/metadata/md5-cache/kde-apps/kmines-21.04.3
index e4f21d2e14d0..80e3415dbac0 100644
--- a/metadata/md5-cache/kde-apps/kmines-21.04.3
+++ b/metadata/md5-cache/kde-apps/kmines-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Classic mine sweeper game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kmines/ https://games.kde.org/games/kmines/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kmines-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2b4fac541c19871d8352b5f94550ff24
+_md5_=9b48d976aa566705bf1ec82dff7f23be
diff --git a/metadata/md5-cache/kde-apps/kmix-21.04.3 b/metadata/md5-cache/kde-apps/kmix-21.04.3
index c258b953e724..e089444dcdda 100644
--- a/metadata/md5-cache/kde-apps/kmix-21.04.3
+++ b/metadata/md5-cache/kde-apps/kmix-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Volume control gui based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kmix/
 IUSE=alsa plasma pulseaudio debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) plasma? ( >=kde-frameworks/plasma-5.80.0:5 ) pulseaudio? ( media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) kde-plasma/kde-cli-tools:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kmix-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d31422acde9a375876ff525bdf38f370
+_md5_=fc3dbff7e23883bc1ae85a1d5f39b910
diff --git a/metadata/md5-cache/kde-apps/kmousetool-21.04.3 b/metadata/md5-cache/kde-apps/kmousetool-21.04.3
index 3e5e190ec467..b7b56f0a63df 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-21.04.3
+++ b/metadata/md5-cache/kde-apps/kmousetool-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE program that clicks the mouse for you
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kmousetool/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXtst || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kmousetool-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=98e124829ceb8bd794c47b0b995d4470
+_md5_=53a9341b749f763bd412eba98a3e6973
diff --git a/metadata/md5-cache/kde-apps/kmouth-21.04.3 b/metadata/md5-cache/kde-apps/kmouth-21.04.3
index 0aade825e66a..bf60e501381c 100644
--- a/metadata/md5-cache/kde-apps/kmouth-21.04.3
+++ b/metadata/md5-cache/kde-apps/kmouth-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Text-to-speech synthesizer front end
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kmouth/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtspeech-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kmouth-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c188c0620d752bf06e99bac0bf19a4dc
+_md5_=58ab49189a986290a57ea21d6bf7549a
diff --git a/metadata/md5-cache/kde-apps/kmplot-21.04.3 b/metadata/md5-cache/kde-apps/kmplot-21.04.3
index 335ebd89aa72..3816156e900a 100644
--- a/metadata/md5-cache/kde-apps/kmplot-21.04.3
+++ b/metadata/md5-cache/kde-apps/kmplot-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Mathematical function plotter
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kmplot/ https://edu.kde.org/kmplot/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kmplot-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ed9d9dadcb8b22c63c02eca29e490db9
+_md5_=4061ac58de80495a1c89f83d6698f60c
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-21.04.3 b/metadata/md5-cache/kde-apps/knavalbattle-21.04.3
index 3edd18faa474..a2b1be9176d0 100644
--- a/metadata/md5-cache/kde-apps/knavalbattle-21.04.3
+++ b/metadata/md5-cache/kde-apps/knavalbattle-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Battleship clone by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/knavalbattle/ https://games.kde.org/games/kbattleship/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/knavalbattle-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2612fd24063f59fd1f054fdef632c039
+_md5_=c8a58b546adf1edce9817e2eaf99f639
diff --git a/metadata/md5-cache/kde-apps/knetwalk-21.04.3 b/metadata/md5-cache/kde-apps/knetwalk-21.04.3
index 35b721fa4abf..ac5aa2d24f51 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-21.04.3
+++ b/metadata/md5-cache/kde-apps/knetwalk-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=KDE version of the popular NetWalk game for system administrators
 EAPI=7
 HOMEPAGE=https://apps.kde.org/knetwalk/ https://games.kde.org/games/knetwalk/
 IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/knetwalk-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=58dabb3875715df7a0d9de913a6acf4b
+_md5_=586389d323ddded60c6375968da8a72f
diff --git a/metadata/md5-cache/kde-apps/knights-21.04.3 b/metadata/md5-cache/kde-apps/knights-21.04.3
index 0c419358fd8c..8d3c6efb4c28 100644
--- a/metadata/md5-cache/kde-apps/knights-21.04.3
+++ b/metadata/md5-cache/kde-apps/knights-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Simple chess board based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://apps.kde.org/knights/
 IUSE=speech debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kplotting-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/plasma-5.80.0:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) || ( games-board/gnuchess games-board/crafty games-board/stockfish games-board/sjeng ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/knights-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=775fbcbb030924562dea3482b2340cbd
+_md5_=d299faacbf7be2e54908d0b2e5a76ebb
diff --git a/metadata/md5-cache/kde-apps/knotes-21.04.3 b/metadata/md5-cache/kde-apps/knotes-21.04.3
index d14b7b058c6f..1b278d4bfd7b 100644
--- a/metadata/md5-cache/kde-apps/knotes-21.04.3
+++ b/metadata/md5-cache/kde-apps/knotes-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Note taking application
 EAPI=7
 HOMEPAGE=https://apps.kde.org/knotes/ https://kontact.kde.org/components/knotes.html
 IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=dev-libs/grantlee:5 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-notes-21.04.3:5 >=kde-apps/akonadi-search-21.04.3:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/kcalutils-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/kontactinterface-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 x11-libs/libX11 >=kde-apps/kdepim-runtime-21.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/knotes-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dd4d7dfa5cf51ac7704ce47f8c8df907
+_md5_=b237c6577dfa14493d6ac7edfb3e8311
diff --git a/metadata/md5-cache/kde-apps/kolf-21.04.3 b/metadata/md5-cache/kde-apps/kolf-21.04.3
index 7c7376a34475..6e14d1ea67ac 100644
--- a/metadata/md5-cache/kde-apps/kolf-21.04.3
+++ b/metadata/md5-cache/kde-apps/kolf-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Minigolf game by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kolf/ https://games.kde.org/games/kolf/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kolf-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0af516ff490dca72ccce92e0fa4eb182
+_md5_=9686268731699375de1c662922d71805
diff --git a/metadata/md5-cache/kde-apps/kollision-21.04.3 b/metadata/md5-cache/kde-apps/kollision-21.04.3
index 96828a7b4ad5..5059314e6986 100644
--- a/metadata/md5-cache/kde-apps/kollision-21.04.3
+++ b/metadata/md5-cache/kde-apps/kollision-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Simple ball dodging game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kollision/ https://games.kde.org/games/kollision/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kollision-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b2a526245c7b6a9cd4cbfdb1a76668ee
+_md5_=b9d49c88332ef15097f01aa034682db0
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-21.04.3 b/metadata/md5-cache/kde-apps/kolourpaint-21.04.3
index 054309be37e4..b9aefb8b25b1 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-21.04.3
+++ b/metadata/md5-cache/kde-apps/kolourpaint-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Paint Program by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kolourpaint/
 IUSE=scanner debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 scanner? ( >=kde-apps/libksane-21.04.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/release-service/21.04.3/src/kolourpaint-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=296bda2c7b39a74295e78f5cfac470de
+_md5_=8ec99c5268c8435da4609f7e258bdb5b
diff --git a/metadata/md5-cache/kde-apps/kompare-21.04.3 b/metadata/md5-cache/kde-apps/kompare-21.04.3
index 4815c6f8ab91..73180e5b9665 100644
--- a/metadata/md5-cache/kde-apps/kompare-21.04.3
+++ b/metadata/md5-cache/kde-apps/kompare-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=A program to view the differences between files
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kompare/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkomparediff2-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kompare-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dd740ad5876bffa00fd860283bb99b98
+_md5_=2cde59345e95a51491a14a311e88b0d5
diff --git a/metadata/md5-cache/kde-apps/konqueror-20.12.3-r1 b/metadata/md5-cache/kde-apps/konqueror-20.12.3-r1
index aa75cf0222c7..7f0f9b985ee1 100644
--- a/metadata/md5-cache/kde-apps/konqueror-20.12.3-r1
+++ b/metadata/md5-cache/kde-apps/konqueror-20.12.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/konqueror-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b49e6aa5a9486473958f5746166e6c4d
diff --git a/metadata/md5-cache/kde-apps/konqueror-21.04.3 b/metadata/md5-cache/kde-apps/konqueror-21.04.3
index c075e175ec39..d8ab82deab11 100644
--- a/metadata/md5-cache/kde-apps/konqueror-21.04.3
+++ b/metadata/md5-cache/kde-apps/konqueror-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Web browser and file manager based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://apps.kde.org/konqueror/
 IUSE=activities speech X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdesu-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) kde-apps/kfind:5 kde-plasma/kde-cli-tools:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/konqueror-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4ece51f22bed02aed0649e627702bf09
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=59b3b7a9988f58f2006f81aef87c7bb1
diff --git a/metadata/md5-cache/kde-apps/konquest-21.04.3 b/metadata/md5-cache/kde-apps/konquest-21.04.3
index 2bfeaf466458..7f2f879bdc2a 100644
--- a/metadata/md5-cache/kde-apps/konquest-21.04.3
+++ b/metadata/md5-cache/kde-apps/konquest-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Galactic Strategy KDE Game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/konquest/ https://games.kde.org/games/konquest/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/konquest-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=438d833847c01e6beab5a6139c4cbda4
+_md5_=536f587e7f4980ee9108da3bae45c090
diff --git a/metadata/md5-cache/kde-apps/konsole-21.04.3 b/metadata/md5-cache/kde-apps/konsole-21.04.3
index 5bab6e478eaa..5e49a704e50a 100644
--- a/metadata/md5-cache/kde-apps/konsole-21.04.3
+++ b/metadata/md5-cache/kde-apps/konsole-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=KDE's terminal emulator
 EAPI=7
 HOMEPAGE=https://apps.kde.org/konsole/ https://konsole.kde.org
 IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kinit-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/konsole-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ad015da6f351d11e182bca792808a3d7
+_md5_=a6da83e0e699acbc78d6a0b8494c994f
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-21.04.3 b/metadata/md5-cache/kde-apps/konsolekalendar-21.04.3
index e8f6494f0f1d..ff7d6a673964 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-21.04.3
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Command line interface to KDE calendars
 EAPI=7
 HOMEPAGE=https://kde.org/ https://userbase.kde.org/KonsoleKalendar
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-calendar-21.04.3:5 >=kde-apps/calendarsupport-21.04.3:5 >=kde-apps/kcalutils-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/akonadi-calendar-tools-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f707bfa49d9267fad491f58d37a510d8
+_md5_=f22a71635d1ed1311542ddca2174c7ac
diff --git a/metadata/md5-cache/kde-apps/kontact-21.04.3 b/metadata/md5-cache/kde-apps/kontact-21.04.3
index 0d3656dd2543..78223e042d81 100644
--- a/metadata/md5-cache/kde-apps/kontact-21.04.3
+++ b/metadata/md5-cache/kde-apps/kontact-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Container application to unify several major PIM applications within
 EAPI=7
 HOMEPAGE=https://kontact.kde.org/ https://apps.kde.org/kontact/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/kontactinterface-21.04.3:5 >=kde-apps/kpimtextedit-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/mailcommon-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kontact-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3b1f5b124c6b2d9990dd0945ec13be63
+_md5_=f24a12d4a0a6177cbd7a3766d0261d0f
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-21.04.3 b/metadata/md5-cache/kde-apps/kontactinterface-21.04.3
index f5aeec4315a5..17ae458ddf4a 100644
--- a/metadata/md5-cache/kde-apps/kontactinterface-21.04.3
+++ b/metadata/md5-cache/kde-apps/kontactinterface-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Library for embedding KParts in a Kontact component
 EAPI=7
 HOMEPAGE=https://api.kde.org/kdepim/kontactinterface/html/index.html
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kontactinterface-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bb48d062ced6eee8d41df047e656858e
+_md5_=87d6c8fe862ed1df84ba4903402ea254
diff --git a/metadata/md5-cache/kde-apps/kopete-21.04.3 b/metadata/md5-cache/kde-apps/kopete-21.04.3
index e2fd80430a12..f2b10928783a 100644
--- a/metadata/md5-cache/kde-apps/kopete-21.04.3
+++ b/metadata/md5-cache/kde-apps/kopete-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kopete/
 IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=app-crypt/gpgme[cxx,qt5] dev-libs/libpcre >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/libkleo-21.04.3:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdelibs4support-5.80.0:5 >=kde-frameworks/kemoticons-5.80.0:5 >=kde-frameworks/khtml-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( >=app-crypt/qca-2.3.0:2 ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( >=app-crypt/qca-2.3.0:2 net-dns/libidn:0= sys-libs/zlib ) zeroconf? ( >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-frameworks/kdnssd-5.80.0:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( >=app-crypt/qca-2.3.0:2[ssl] ) xmpp? ( >=app-crypt/qca-2.3.0:2[ssl?] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kopete-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=192dd97bbc4c8ce24a0e0be10fff23db
+_md5_=72674e3f47e68aab3d0bb525b098b10f
diff --git a/metadata/md5-cache/kde-apps/korganizer-21.04.3 b/metadata/md5-cache/kde-apps/korganizer-21.04.3
index 2779bf374d67..a6fe757ae524 100644
--- a/metadata/md5-cache/kde-apps/korganizer-21.04.3
+++ b/metadata/md5-cache/kde-apps/korganizer-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Organizational assistant, providing calendars and other similar func
 EAPI=7
 HOMEPAGE=https://apps.kde.org/korganizer/
 IUSE=telemetry X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-calendar-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/akonadi-notes-21.04.3:5 >=kde-apps/akonadi-search-21.04.3:5 >=kde-apps/calendarsupport-21.04.3:5 >=kde-apps/eventviews-21.04.3:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/incidenceeditor-21.04.3:5 >=kde-apps/kcalutils-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/kontactinterface-21.04.3:5 >=kde-apps/kpimtextedit-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kholidays-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 telemetry? ( dev-libs/kuserfeedback:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=kde-apps/kdepim-runtime-21.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/korganizer-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=22c60609a8a96bdced23f086ac61838a
+_md5_=84a1ea9e477978e07528156f42b3c478
diff --git a/metadata/md5-cache/kde-apps/kpat-21.04.3 b/metadata/md5-cache/kde-apps/kpat-21.04.3
index 6d4a116baba4..cb654bb194f2 100644
--- a/metadata/md5-cache/kde-apps/kpat-21.04.3
+++ b/metadata/md5-cache/kde-apps/kpat-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=KDE patience game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kpat/ https://games.kde.org/games/kpat/
 IUSE=test debug +handbook test selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-games/freecell-solver >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kpat-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=41c1965130649fc0732faa8aa5a43942
+_md5_=1d5896568550c2004485f6384e82841c
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-21.04.3 b/metadata/md5-cache/kde-apps/kpimtextedit-21.04.3
index 3f876a49a0d7..079cf3759046 100644
--- a/metadata/md5-cache/kde-apps/kpimtextedit-21.04.3
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Extended text editor for PIM applications
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtspeech-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kpimtextedit-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d9fde314f3b40f1acd5e8c7ca81a4b67
+_md5_=ee05d82496c34fda1980654a86dc2af3
diff --git a/metadata/md5-cache/kde-apps/kpkpass-21.04.3 b/metadata/md5-cache/kde-apps/kpkpass-21.04.3
index ce4e3da34255..e04770f191ec 100644
--- a/metadata/md5-cache/kde-apps/kpkpass-21.04.3
+++ b/metadata/md5-cache/kde-apps/kpkpass-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library to deal with Apple Wallet pass files
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kontact/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kpkpass-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cec27d0ef77323d609a295d375977009
+_md5_=ececd44795988f355219f1739aa6a7a4
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-21.04.3 b/metadata/md5-cache/kde-apps/kqtquickcharts-21.04.3
index 24e2c67474ba..bd49f08252b0 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-21.04.3
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kqtquickcharts-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d22119bd1023a8a76252d060b2c44499
+_md5_=ee1eba82564b4cc5ed967c85b3f7d628
diff --git a/metadata/md5-cache/kde-apps/krdc-21.04.3 b/metadata/md5-cache/kde-apps/krdc-21.04.3
index feba04e88129..83c3dccc81da 100644
--- a/metadata/md5-cache/kde-apps/krdc-21.04.3
+++ b/metadata/md5-cache/kde-apps/krdc-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Remote desktop connection (RDP and VNC) client
 EAPI=7
 HOMEPAGE=https://apps.kde.org/krdc/
 IUSE=+rdp +vnc debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/krdc-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1786f39de0a027b76e8899da174df16d
+_md5_=c7bc5aa868ef4fe64e95e13d186b4bdd
diff --git a/metadata/md5-cache/kde-apps/kreversi-21.04.3 b/metadata/md5-cache/kde-apps/kreversi-21.04.3
index f99c38c5f4de..285850c3a262 100644
--- a/metadata/md5-cache/kde-apps/kreversi-21.04.3
+++ b/metadata/md5-cache/kde-apps/kreversi-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Board game by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kreversi/ https://games.kde.org/games/kreversi/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kreversi-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c128cce422e9f53cf283f1a5b967ce83
+_md5_=ec7acca63315d59dcd0ca72c5e90e48f
diff --git a/metadata/md5-cache/kde-apps/krfb-21.04.3 b/metadata/md5-cache/kde-apps/krfb-21.04.3
index f8f40483785d..a20c2b9d9c3b 100644
--- a/metadata/md5-cache/kde-apps/krfb-21.04.3
+++ b/metadata/md5-cache/kde-apps/krfb-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=VNC-compatible server to share Plasma desktops
 EAPI=7
 HOMEPAGE=https://apps.kde.org/krfb/
 IUSE=wayland debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image wayland? ( media-video/pipewire:= ) wayland? ( sys-apps/xdg-desktop-portal[screencast] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/krfb-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1f7c632b686fbc2d5808c582037b7fed
+_md5_=95b750fa617e04f233234a432f88d465
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-21.04.3 b/metadata/md5-cache/kde-apps/kross-interpreters-21.04.3
index 5b3e25950c75..cc4908d2ad9e 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-21.04.3
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Kross interpreter plugins for programming languages
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kross-5.80.0:5 || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kross-interpreters-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9e93f44415d9423e43dd317f94d9fdaf
+_md5_=92894e7fe88bdbf89650480317f76e33
diff --git a/metadata/md5-cache/kde-apps/kruler-21.04.3 b/metadata/md5-cache/kde-apps/kruler-21.04.3
index 13da7d5b71e0..26b83416a7b2 100644
--- a/metadata/md5-cache/kde-apps/kruler-21.04.3
+++ b/metadata/md5-cache/kde-apps/kruler-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Screen ruler for Plasma
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kruler/
 IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kruler-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5408fff879d79dda861269023d02117f
+_md5_=431006555e27a0b66bc98df476651edf
diff --git a/metadata/md5-cache/kde-apps/kshisen-21.04.3 b/metadata/md5-cache/kde-apps/kshisen-21.04.3
index bec5f4cb8fc9..4d6c4ef3f121 100644
--- a/metadata/md5-cache/kde-apps/kshisen-21.04.3
+++ b/metadata/md5-cache/kde-apps/kshisen-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Solitaire-like game played using the standard set of Mahjong tiles
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kshisen/ https://games.kde.org/games/kshisen/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-apps/libkmahjongg-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kshisen-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a9a46cbd3744af0fea85d6e14f46e425
+_md5_=95dfc667ddefeb2088f7028f5ee4ad2d
diff --git a/metadata/md5-cache/kde-apps/ksirk-21.04.3 b/metadata/md5-cache/kde-apps/ksirk-21.04.3
index 39ff6d3d1141..6a8a5788c270 100644
--- a/metadata/md5-cache/kde-apps/ksirk-21.04.3
+++ b/metadata/md5-cache/kde-apps/ksirk-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Port of the board game risk
 EAPI=7
 HOMEPAGE=https://apps.kde.org/ksirk/ https://games.kde.org/games/ksirk/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 sys-libs/zlib || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ksirk-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=85318a1c61592d3e6284a1ba8b888184
+_md5_=2c57646d6b5e8c78cc8ca4609122ef6f
diff --git a/metadata/md5-cache/kde-apps/ksmtp-21.04.3 b/metadata/md5-cache/kde-apps/ksmtp-21.04.3
index fe233522aec4..5e2edd404955 100644
--- a/metadata/md5-cache/kde-apps/ksmtp-21.04.3
+++ b/metadata/md5-cache/kde-apps/ksmtp-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Job-based library to send email through an SMTP server
 EAPI=7
 HOMEPAGE=https://api.kde.org/kdepim/ksmtp/html/index.html
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ksmtp-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4ba38c7a7c8c29a28ab53b6062539446
+_md5_=bc3bdbc5dc5fb8247b280432d70bbf82
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-21.04.3 b/metadata/md5-cache/kde-apps/ksnakeduel-21.04.3
index 49221954e43e..2bc01f625b08 100644
--- a/metadata/md5-cache/kde-apps/ksnakeduel-21.04.3
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Tron game
 EAPI=7
 HOMEPAGE=https://apps.kde.org/ksnakeduel/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ksnakeduel-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=157b4ddce7704a321463cfedfe430e1d
+_md5_=1b2c18f6ea904aa8c574bff4e1924348
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-21.04.3 b/metadata/md5-cache/kde-apps/kspaceduel-21.04.3
index 624ae8a7cc08..cfdddca32b4f 100644
--- a/metadata/md5-cache/kde-apps/kspaceduel-21.04.3
+++ b/metadata/md5-cache/kde-apps/kspaceduel-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Space Game by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kspaceduel/ https://games.kde.org/games/kspaceduel/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kspaceduel-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=30f894a3bf367ce29f9ecc1b9d83f26e
+_md5_=4a978eab56840489d5b2878d92437006
diff --git a/metadata/md5-cache/kde-apps/ksquares-21.04.3 b/metadata/md5-cache/kde-apps/ksquares-21.04.3
index 4bcd7f29a6f1..11ccd444ddf8 100644
--- a/metadata/md5-cache/kde-apps/ksquares-21.04.3
+++ b/metadata/md5-cache/kde-apps/ksquares-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE clone of the game squares
 EAPI=7
 HOMEPAGE=https://apps.kde.org/ksquares/ https://games.kde.org/games/ksquares/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ksquares-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=861ca84144521944abd3eb561115a261
+_md5_=f46732176072796943b6ca52ca09c98a
diff --git a/metadata/md5-cache/kde-apps/ksudoku-21.04.3 b/metadata/md5-cache/kde-apps/ksudoku-21.04.3
index 24f7243aa1b8..eab56c5c4947 100644
--- a/metadata/md5-cache/kde-apps/ksudoku-21.04.3
+++ b/metadata/md5-cache/kde-apps/ksudoku-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Logic-based symbol placement puzzle by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/ksudoku/ https://games.kde.org/games/ksudoku/
 IUSE=opengl debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 opengl? ( >=dev-qt/qtopengl-5.15.2:5 virtual/glu ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ksudoku-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5e7b195225bd60113c800977c6929d8c
+_md5_=02ac8d39501970dc7ef90ed55e73c11b
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-21.04.3 b/metadata/md5-cache/kde-apps/ksystemlog-21.04.3
index 79db59762761..06103f129340 100644
--- a/metadata/md5-cache/kde-apps/ksystemlog-21.04.3
+++ b/metadata/md5-cache/kde-apps/ksystemlog-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=System log viewer by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/ksystemlog/
 IUSE=audit kdesu systemd test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 audit? ( sys-process/audit ) systemd? ( sys-apps/systemd ) kdesu? ( kde-plasma/kde-cli-tools[kdesu] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ksystemlog-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=02b5d9a9d8076780f70d043c65073c25
+_md5_=ecad7a3fdf2498c206e009670dffc3b6
diff --git a/metadata/md5-cache/kde-apps/kteatime-21.04.3 b/metadata/md5-cache/kde-apps/kteatime-21.04.3
index d9f711dba528..3e1990d27096 100644
--- a/metadata/md5-cache/kde-apps/kteatime-21.04.3
+++ b/metadata/md5-cache/kde-apps/kteatime-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE timer for making a fine cup of tea
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kteatime/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kteatime-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d1ece47b2b00c72f1b5ce6efd68f1b79
+_md5_=3c2c28c6323c79249605f465da3e7950
diff --git a/metadata/md5-cache/kde-apps/ktimer-21.04.3 b/metadata/md5-cache/kde-apps/ktimer-21.04.3
index 5e8c1091a302..aefbe9a1bbce 100644
--- a/metadata/md5-cache/kde-apps/ktimer-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktimer-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Little tool to execute programs after some time
 EAPI=7
 HOMEPAGE=https://apps.kde.org/ktimer/ https://utils.kde.org/projects/ktimer/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ktimer-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2382651177ac8d4d6807a9e312023c80
+_md5_=b35ea711e658689cdd6c3393f6cb4253
diff --git a/metadata/md5-cache/kde-apps/ktouch-21.04.3 b/metadata/md5-cache/kde-apps/ktouch-21.04.3
index 490e7c2a6cf9..b65933a9e652 100644
--- a/metadata/md5-cache/kde-apps/ktouch-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktouch-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Program that helps to learn and practice touch typing
 EAPI=7
 HOMEPAGE=https://apps.kde.org/ktouch/
 IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libxkbfile ) >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-apps/kqtquickcharts-21.04.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/release-service/21.04.3/src/ktouch-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=422b8461542bf5c445d4561af097aa67
+_md5_=5a04ac08935d93c025f177571d8b69ed
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-21.04.3 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-21.04.3
index dbb3d4a11117..f1b9a220ce71 100644
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy account management kcm
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=experimental debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kaccounts-integration-21.04.3:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 net-libs/accounts-qt net-libs/signond >=net-libs/telepathy-qt-0.9.8 >=kde-apps/kaccounts-providers-21.04.3:5 net-im/telepathy-connection-managers || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ktp-accounts-kcm-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=20d99c6e243e1735984724d2a39f07f2
+_md5_=bf51f50a3b9d07c36d5cf992c8e4e1de
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-21.04.3 b/metadata/md5-cache/kde-apps/ktp-approver-21.04.3
index 061d38415f65..ee7a33646d36 100644
--- a/metadata/md5-cache/kde-apps/ktp-approver-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-approver-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy notification handler
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-apps/ktp-contact-list-21.04.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/release-service/21.04.3/src/ktp-approver-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ad90541b8f62c4007fd65be37d442b02
+_md5_=b5ad4ede684756fe4ecbb013be5aae20
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-21.04.3 b/metadata/md5-cache/kde-apps/ktp-auth-handler-21.04.3
index 47d9fa08e1e8..34560d98ee50 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy authentication handler
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kaccounts-integration-21.04.3:5 >=kde-apps/ktp-common-internals-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 net-libs/accounts-qt net-libs/signond >=net-libs/telepathy-qt-0.9.8 >=app-crypt/qca-2.3.0:2[ssl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ktp-auth-handler-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9224ecbc17e39a20db301941db7da001
+_md5_=725fdd1f26ae9fe8fa2098a4823535fd
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-21.04.3 b/metadata/md5-cache/kde-apps/ktp-common-internals-21.04.3
index b8a83868f61b..1468ee7809aa 100644
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=KDE Telepathy common library
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=otr +sso debug test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpeople-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.8 otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-21.04.3:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ktp-common-internals-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=62b050afb4b66e5f46c05c933229185a
+_md5_=711342ab05f55f885cf551a29460445b
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-21.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-list-21.04.3
index f39f38d7b3cf..067b14dda30a 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy contact list
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kpeople-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ktp-contact-list-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4c7bea1a30e35edd613bce522fd5d077
+_md5_=5c233c6623ba6986ef040bac53ae3160
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-21.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-runner-21.04.3
index 847b70d79f28..67e13e412900 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy krunner plugin
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.3:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/krunner-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ktp-contact-runner-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=df26a3ab77badf097bd439e621c6ea8c
+_md5_=3e9ed6b5c2162b5ad698d40279b36546
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-21.04.3 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-21.04.3
index c4f8cf369391..ef0ffe7a6eae 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/plasma-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ktp-desktop-applets-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=deea4e138b06e43fae0b3d5add8145b6
+_md5_=7d4062829b2ee9f1a224f9301ad6e89d
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-21.04.3 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-21.04.3
index 8c6636815f16..f6a0b3686bf4 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy file transfer handler
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ktp-filetransfer-handler-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ca7e787b169bf2459ab2a79caf69574d
+_md5_=0919a6670e294c2eb9cf0b365a5d13cd
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-21.04.3 b/metadata/md5-cache/kde-apps/ktp-kded-module-21.04.3
index 6f141757f04f..29b2c64221bf 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy workspace integration
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kidletime-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-apps/signon-kwallet-extension-21.04.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/release-service/21.04.3/src/ktp-kded-module-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=88a87aeb9088e8f78864970e7af0b369
+_md5_=fd6378ccdff669c63032a52d15f2fb02
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-21.04.3 b/metadata/md5-cache/kde-apps/ktp-send-file-21.04.3
index 35b4f6b2d1b4..98c11e2d5f3a 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.3:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-apps/ktp-contact-list-21.04.3:5 >=kde-apps/ktp-filetransfer-handler-21.04.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/release-service/21.04.3/src/ktp-send-file-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=26d6bfcfdf2d92ada9130313b9126d46
+_md5_=0e78142adb203281cea2e0c291bac45d
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-21.04.3 b/metadata/md5-cache/kde-apps/ktp-text-ui-21.04.3
index c10d80204444..110b97f1a43b 100644
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy text chat window
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=speech debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/ktp-common-internals-21.04.3:5[otr] >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kemoticons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kpeople-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=net-libs/telepathy-qt-0.9.8 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) >=kde-apps/ktp-contact-list-21.04.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/release-service/21.04.3/src/ktp-text-ui-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a349b50518d637f89ce81ed0ec7f0e93
+_md5_=a44eb3fdaa946707f90eac4974f08a87
diff --git a/metadata/md5-cache/kde-apps/ktuberling-21.04.3 b/metadata/md5-cache/kde-apps/ktuberling-21.04.3
index 4c0c0584f008..2dc5b69204d9 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-21.04.3
+++ b/metadata/md5-cache/kde-apps/ktuberling-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Potato game for kids by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/ktuberling/ https://games.kde.org/games/ktuberling/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ktuberling-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=422f29ad0d3c0bf81994e695b0ef9e5d
+_md5_=2455f01e771bee75c14aab8aec8cd34c
diff --git a/metadata/md5-cache/kde-apps/kturtle-21.04.3 b/metadata/md5-cache/kde-apps/kturtle-21.04.3
index 63111252c513..6c6d00734e03 100644
--- a/metadata/md5-cache/kde-apps/kturtle-21.04.3
+++ b/metadata/md5-cache/kde-apps/kturtle-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Educational programming environment using the Logo programming langu
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kturtle/ https://edu.kde.org/kturtle/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kturtle-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0e97a9fbe91096d46d961c02e0bc135a
+_md5_=2e1eaca2f5f5d3e3e4ef1067fc1c318f
diff --git a/metadata/md5-cache/kde-apps/kubrick-21.04.3 b/metadata/md5-cache/kde-apps/kubrick-21.04.3
index 3a7706b40773..d537a36c66b1 100644
--- a/metadata/md5-cache/kde-apps/kubrick-21.04.3
+++ b/metadata/md5-cache/kde-apps/kubrick-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kubrick/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtopengl-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 virtual/glu virtual/opengl || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kubrick-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2878685e1b066d0afbbdaa55e5635e06
+_md5_=fbfeff1d653370111770c82355df4270
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-21.04.3 b/metadata/md5-cache/kde-apps/kwalletmanager-21.04.3
index 373e03d01679..f4445236a33e 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-21.04.3
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Tool to manage the passwords on your system using KDE Wallet
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kauth-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kwalletmanager-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=152da36ef9075de26a81f142b261115b
+_md5_=ff8fbcab5585aea80c063e6aeeebfc35
diff --git a/metadata/md5-cache/kde-apps/kwave-21.04.3-r1 b/metadata/md5-cache/kde-apps/kwave-21.04.3-r1
index 8ad1e0553c47..60fa9639fe3b 100644
--- a/metadata/md5-cache/kde-apps/kwave-21.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kwave-21.04.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of a
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kwave/
 IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac[cxx] ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.15.2:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kwave-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=946357839fe991f41e70a3f061570533
+_md5_=e880f99ce580660326523f6d62230ecb
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-21.04.3 b/metadata/md5-cache/kde-apps/kwordquiz-21.04.3
index 1f562fd98c9c..b5a07b1fc356 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-21.04.3
+++ b/metadata/md5-cache/kde-apps/kwordquiz-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Powerful flashcard and vocabulary learning program
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kwordquiz/ https://edu.kde.org/kwordquiz/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkeduvocdocument-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kwordquiz-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6740aa8f839d60beb3961ceb2e11cd2e
+_md5_=9a54ac61b0696f2b6bcb9a0dae06c423
diff --git a/metadata/md5-cache/kde-apps/kwrite-21.04.3 b/metadata/md5-cache/kde-apps/kwrite-21.04.3
index cb5e68262ddb..cf74a70a9b2c 100644
--- a/metadata/md5-cache/kde-apps/kwrite-21.04.3
+++ b/metadata/md5-cache/kde-apps/kwrite-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Simple text editor based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kwrite/
 IUSE=activities debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 activities? ( >=kde-frameworks/kactivities-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kate-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ab729f46f9f254fbed92bf72806db35f
+_md5_=2af2c1b34b860e0eed3a7f61ae82f65f
diff --git a/metadata/md5-cache/kde-apps/libgravatar-21.04.3 b/metadata/md5-cache/kde-apps/libgravatar-21.04.3
index b5c1d8592881..82d3c12a1922 100644
--- a/metadata/md5-cache/kde-apps/libgravatar-21.04.3
+++ b/metadata/md5-cache/kde-apps/libgravatar-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for gravatar integration
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libgravatar-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=04ea5f9b71919e63e6a1fcc3e2c24749
+_md5_=6931bb17c8da752551f3efdb14979a6a
diff --git a/metadata/md5-cache/kde-apps/libkcddb-21.04.3 b/metadata/md5-cache/kde-apps/libkcddb-21.04.3
index d7b7148ebb09..e6a43c235d45 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-21.04.3
+++ b/metadata/md5-cache/kde-apps/libkcddb-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=KDE library for CDDB
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=musicbrainz debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 musicbrainz? ( media-libs/musicbrainz:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libkcddb-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bd920a3c9c1eb99580349e69061e4937
+_md5_=31082520209986d2eedcd18192b68600
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-21.04.3 b/metadata/md5-cache/kde-apps/libkcompactdisc-21.04.3
index 2f49afdc3385..e5c7addd9143 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-21.04.3
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for playing & ripping CDs
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=alsa debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=media-libs/phonon-4.11.0 alsa? ( media-libs/alsa-lib ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libkcompactdisc-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=16f2da4f51c939e0abd7f6f27bff345a
+_md5_=561031be3dda1f3dea046033add6004a
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-21.04.3 b/metadata/md5-cache/kde-apps/libkdcraw-21.04.3
index 6612f3bdf74d..1d9fe58fd75c 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-21.04.3
+++ b/metadata/md5-cache/kde-apps/libkdcraw-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Digital camera raw image library wrapper
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=media-libs/libraw-0.16:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libkdcraw-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ed5fff56d5eefe1e040f96f021b2c593
+_md5_=80dfcb04187953e04a602a2ee5386ef7
diff --git a/metadata/md5-cache/kde-apps/libkdegames-21.04.3 b/metadata/md5-cache/kde-apps/libkdegames-21.04.3
index 208ab2c4ba23..38618feabbdd 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-21.04.3
+++ b/metadata/md5-cache/kde-apps/libkdegames-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Base library common to many KDE games
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 media-libs/libsndfile media-libs/openal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libkdegames-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e22c9badc1ef7fe7fc7f3a44bdabaa25
+_md5_=d986b00c9c98e9907afcda2de02757f5
diff --git a/metadata/md5-cache/kde-apps/libkdepim-21.04.3 b/metadata/md5-cache/kde-apps/libkdepim-21.04.3
index 09b80082a98b..13f89f05f708 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-21.04.3
+++ b/metadata/md5-cache/kde-apps/libkdepim-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Common PIM libraries
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libkdepim-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=21de1d3a29acc2c3b976f51c49458861
+_md5_=e2026f663f6043db21e0abefd2d89903
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-21.04.3 b/metadata/md5-cache/kde-apps/libkeduvocdocument-21.04.3
index 7e985736741a..21d70c17eef9 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-21.04.3
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for reading/writing KVTML
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libkeduvocdocument-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2889deedafe12b561d1208c5cef2c24e
+_md5_=25a7c46425f3fb87375db12e13afcf54
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-21.04.3 b/metadata/md5-cache/kde-apps/libkexiv2-21.04.3
index 5adb6eb40a2b..bf73a85dd02c 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-21.04.3
+++ b/metadata/md5-cache/kde-apps/libkexiv2-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Wrapper around exiv2 library
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+xmp debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=media-gfx/exiv2-0.25:=[xmp=] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libkexiv2-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8aa1661f96ab754bde38cfbbb5392fce
+_md5_=b84ac0fc87cf07b612e354d362db4e6d
diff --git a/metadata/md5-cache/kde-apps/libkgapi-21.04.3 b/metadata/md5-cache/kde-apps/libkgapi-21.04.3
index 016757db1391..6f7e87bf2737 100644
--- a/metadata/md5-cache/kde-apps/libkgapi-21.04.3
+++ b/metadata/md5-cache/kde-apps/libkgapi-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for accessing Google calendar and contact resources
 EAPI=7
 HOMEPAGE=https://api.kde.org/kdepim/libkgapi/html/index.html
 IUSE=nls test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/cyrus-sasl:2 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libkgapi-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=920ab1572084e3bb947c4d0710b3a326
+_md5_=bef5c7da27723ce5d30f0c1ef0068f20
diff --git a/metadata/md5-cache/kde-apps/libkipi-21.04.3 b/metadata/md5-cache/kde-apps/libkipi-21.04.3
index 1be48b69f342..c6d47b57719e 100644
--- a/metadata/md5-cache/kde-apps/libkipi-21.04.3
+++ b/metadata/md5-cache/kde-apps/libkipi-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=A library for image plugins accross KDE applications
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/32
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libkipi-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=32c1e851b4ded22be1e0a9920470133f
+_md5_=d51a378609988aad2007bb8bf6bf232c
diff --git a/metadata/md5-cache/kde-apps/libkleo-21.04.3 b/metadata/md5-cache/kde-apps/libkleo-21.04.3
index 1e7b6509474f..527f4e876217 100644
--- a/metadata/md5-cache/kde-apps/libkleo-21.04.3
+++ b/metadata/md5-cache/kde-apps/libkleo-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Library for encryption handling
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+fancyviewer debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-crypt/gpgme-1.13.1[cxx,qt5] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 fancyviewer? ( >=kde-apps/kpimtextedit-21.04.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/release-service/21.04.3/src/libkleo-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bc63383a604bd6cd2db64c12e639272a
+_md5_=4e6535a8d9bf727bb00aa1220b977bd7
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-21.04.3 b/metadata/md5-cache/kde-apps/libkmahjongg-21.04.3
index 438d486a1db6..e2f9e5c8aa21 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-21.04.3
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libkmahjongg-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a5149c0b71d233478d9395ff2b5675f5
+_md5_=87566ede4088a4ae750b585445338384
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-21.04.3 b/metadata/md5-cache/kde-apps/libkomparediff2-21.04.3
index 047d529f36ee..892b1e53c1a7 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-21.04.3
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=KDE library to compare files and strings
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libkomparediff2-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fb95b475e287a8960180a7e05f8ea932
+_md5_=3f1e398898bb2af2f431e27f5a182c08
diff --git a/metadata/md5-cache/kde-apps/libksane-21.04.3 b/metadata/md5-cache/kde-apps/libksane-21.04.3
index bb869ed93aad..6a5dcc0d3a33 100644
--- a/metadata/md5-cache/kde-apps/libksane-21.04.3
+++ b/metadata/md5-cache/kde-apps/libksane-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=SANE Library interface based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=kwallet debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libksane-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=08384e6cc9bb3ec35b9c4f66603ae329
+_md5_=6c04984b26f460d149fb9273d141eb58
diff --git a/metadata/md5-cache/kde-apps/libksieve-21.04.3 b/metadata/md5-cache/kde-apps/libksieve-21.04.3
index 1b7b76c28117..248be2b558a2 100644
--- a/metadata/md5-cache/kde-apps/libksieve-21.04.3
+++ b/metadata/md5-cache/kde-apps/libksieve-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Common PIM libraries
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/kpimtextedit-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libksieve-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b1a02008270ba6cb61dbbf8271ac67ef
+_md5_=147b7fc124da8dee11a6bae338f64174
diff --git a/metadata/md5-cache/kde-apps/libktnef-21.04.3 b/metadata/md5-cache/kde-apps/libktnef-21.04.3
index 30170d6b8dd5..8409f8d36707 100644
--- a/metadata/md5-cache/kde-apps/libktnef-21.04.3
+++ b/metadata/md5-cache/kde-apps/libktnef-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for handling TNEF data
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kcalutils-21.04.3:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ktnef-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c1ebd2c40f0c005caf04e0cd04afcc19
+_md5_=1d76e953def6082b06833e4d5fece0aa
diff --git a/metadata/md5-cache/kde-apps/lokalize-20.12.3 b/metadata/md5-cache/kde-apps/lokalize-20.12.3
index 2d1809c0a3a0..6db24a4cb341 100644
--- a/metadata/md5-cache/kde-apps/lokalize-20.12.3
+++ b/metadata/md5-cache/kde-apps/lokalize-20.12.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/lokalize-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6a4745fa743107718968c118d627926c
diff --git a/metadata/md5-cache/kde-apps/lokalize-21.04.3-r1 b/metadata/md5-cache/kde-apps/lokalize-21.04.3-r1
index 90f08d0eb9ad..83df97906104 100644
--- a/metadata/md5-cache/kde-apps/lokalize-21.04.3-r1
+++ b/metadata/md5-cache/kde-apps/lokalize-21.04.3-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Localization tool for KDE software and other free and open source so
 EAPI=7
 HOMEPAGE=https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/
 IUSE=python_single_target_python3_8 python_single_target_python3_9 debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 python_single_target_python3_8? ( dev-python/translate-toolkit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/translate-toolkit[python_targets_python3_9(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/lokalize-21.04.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3bec3aab85383aca90802dcfc07bade9
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=85c1be150a1d6a87d6fab3333a4fa6c6
diff --git a/metadata/md5-cache/kde-apps/lskat-21.04.3 b/metadata/md5-cache/kde-apps/lskat-21.04.3
index c66acb882f7d..fee359a31199 100644
--- a/metadata/md5-cache/kde-apps/lskat-21.04.3
+++ b/metadata/md5-cache/kde-apps/lskat-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Skat game by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/lskat/ https://games.kde.org/games/lskat/
 IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/lskat-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3fe7372e21772d2ac046b4756ec0beb2
+_md5_=6c0c0bb2dcd0ce23917d69e07ced64c9
diff --git a/metadata/md5-cache/kde-apps/mailcommon-21.04.3 b/metadata/md5-cache/kde-apps/mailcommon-21.04.3
index d1a754ef921b..7a574bebf874 100644
--- a/metadata/md5-cache/kde-apps/mailcommon-21.04.3
+++ b/metadata/md5-cache/kde-apps/mailcommon-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Common mail library
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/kpimtextedit-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/mailimporter-21.04.3:5 >=kde-apps/messagelib-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/mailcommon-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=55bee28b08cbda9e87a80b9e8d2ee30d
+_md5_=66b5d81e54d2074d3c8cdce417f38ef5
diff --git a/metadata/md5-cache/kde-apps/mailimporter-21.04.3 b/metadata/md5-cache/kde-apps/mailimporter-21.04.3
index 257317847525..e0fcb9a0037f 100644
--- a/metadata/md5-cache/kde-apps/mailimporter-21.04.3
+++ b/metadata/md5-cache/kde-apps/mailimporter-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library to import mail from various sources
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/mailimporter-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f578ff096c9051283f6d764127b97349
+_md5_=1ecfaf4f27e5dfe6f11d5bcea7ef3d3c
diff --git a/metadata/md5-cache/kde-apps/marble-21.04.3 b/metadata/md5-cache/kde-apps/marble-21.04.3
index f39be66d857a..34df4a6cd4b7 100644
--- a/metadata/md5-cache/kde-apps/marble-21.04.3
+++ b/metadata/md5-cache/kde-apps/marble-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
 EAPI=7
 HOMEPAGE=https://marble.kde.org/
 IUSE=aprs +dbus designer +geolocation gps +kde nls +pbf phonon shapefile +webengine test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-libs/zlib aprs? ( >=dev-qt/qtserialport-5.15.2:5 ) dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) designer? ( >=dev-qt/designer-5.15.2:5 ) geolocation? ( >=dev-qt/qtpositioning-5.15.2:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/krunner-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 ) pbf? ( dev-libs/protobuf:= ) phonon? ( >=media-libs/phonon-4.11.0 ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/21.04
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/marble-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b29d8e9e088f58a165c09869df6230dc
+_md5_=fdf5b9d5aafcf0f765ab456a012a6e0a
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-21.04.3 b/metadata/md5-cache/kde-apps/mbox-importer-21.04.3
index fc9dde8824c4..527c92e4a0fb 100644
--- a/metadata/md5-cache/kde-apps/mbox-importer-21.04.3
+++ b/metadata/md5-cache/kde-apps/mbox-importer-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Import mbox email archives from various sources into Akonadi
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/mailcommon-21.04.3:5 >=kde-apps/mailimporter-21.04.3:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/mbox-importer-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9f3c05a0a8dfad572255aa2c6e554738
+_md5_=5abb949b5cf8f7bb27d3cfb6ca6bc1a2
diff --git a/metadata/md5-cache/kde-apps/messagelib-21.04.3 b/metadata/md5-cache/kde-apps/messagelib-21.04.3
index d14edb491ed3..e6086986398d 100644
--- a/metadata/md5-cache/kde-apps/messagelib-21.04.3
+++ b/metadata/md5-cache/kde-apps/messagelib-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Libraries for messaging functions
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=app-crypt/qca-2.3.0:2 >=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/akonadi-search-21.04.3:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/incidenceeditor-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kldap-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/kmbox-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/kpimtextedit-21.04.3:5 >=kde-apps/libgravatar-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/libkleo-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kguiaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=kde-frameworks/syntax-highlighting-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/messagelib-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=70cfa5c06f80ad3f9b0f53c10e030f76
+_md5_=f95ca7172fa3aa0334a3e9017f9031a5
diff --git a/metadata/md5-cache/kde-apps/minuet-21.04.3 b/metadata/md5-cache/kde-apps/minuet-21.04.3
index 6d76a2b2a516..4cd399c7fc27 100644
--- a/metadata/md5-cache/kde-apps/minuet-21.04.3
+++ b/metadata/md5-cache/kde-apps/minuet-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Music Education software by KDE
 EAPI=7
 HOMEPAGE=https://minuet.kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 media-sound/fluidsynth:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/minuet-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c8dbebc63f685f195da99a03888cb606
+_md5_=260228d0feab8e4ef99652685d5e0974
diff --git a/metadata/md5-cache/kde-apps/okular-21.04.3-r2 b/metadata/md5-cache/kde-apps/okular-21.04.3-r2
index d7eabbd20c1d..eb9fd498a603 100644
--- a/metadata/md5-cache/kde-apps/okular-21.04.3-r2
+++ b/metadata/md5-cache/kde-apps/okular-21.04.3-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Universal document viewer based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://okular.kde.org https://apps.kde.org/okular/
 IUSE=chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.80.0:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjs-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kpty-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/threadweaver-5.80.0:5 media-libs/freetype >=media-libs/phonon-4.11.0 sys-libs/zlib chm? ( dev-libs/chmlib dev-libs/libzip:= >=kde-frameworks/khtml-5.80.0:5 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=dev-qt/qtgui-5.15.2:5[gif,jpeg,png] >=kde-apps/libkexiv2-21.04.3:5 ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-21.04.3:5 ) pdf? ( app-text/poppler[nss,qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.80.0:5 ) qml? ( >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/okular-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2d16fa4d4e23d16d80c2fb4de85356ad
+_md5_=a7bba279109dd097ac3a37a287e47ea9
diff --git a/metadata/md5-cache/kde-apps/palapeli-21.04.3 b/metadata/md5-cache/kde-apps/palapeli-21.04.3
index 289b1eb358f2..58ea01c90004 100644
--- a/metadata/md5-cache/kde-apps/palapeli-21.04.3
+++ b/metadata/md5-cache/kde-apps/palapeli-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Jigsaw puzzle game by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/palapeli/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/palapeli-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=29dc84c3c9e75da2f831ea65fb57c2dc
+_md5_=edea25a88a8d5929ff0f2e617da71330
diff --git a/metadata/md5-cache/kde-apps/parley-21.04.3 b/metadata/md5-cache/kde-apps/parley-21.04.3
index d9b66de3e99d..bd1deac7c6f2 100644
--- a/metadata/md5-cache/kde-apps/parley-21.04.3
+++ b/metadata/md5-cache/kde-apps/parley-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=A vocabulary trainer to help you memorize things
 EAPI=7
 HOMEPAGE=https://apps.kde.org/parley/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=kde-apps/libkeduvocdocument-21.04.3:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/sonnet-5.80.0:5 >=kde-apps/kdeedu-data-21.04.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/release-service/21.04.3/src/parley-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=08d67596c1288c649e65d696137ff9b7
+_md5_=b280b6aaa7e23dea5e2a4de30a453b13
diff --git a/metadata/md5-cache/kde-apps/picmi-21.04.3 b/metadata/md5-cache/kde-apps/picmi-21.04.3
index 6c7ff965fb05..cd2c580c9b45 100644
--- a/metadata/md5-cache/kde-apps/picmi-21.04.3
+++ b/metadata/md5-cache/kde-apps/picmi-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Nonogram logic game by KDE
 EAPI=7
 HOMEPAGE=https://apps.kde.org/picmi/ https://games.kde.org/games/picmi/
 IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkdegames-21.04.3:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/picmi-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9cc6814ef4e7cb555e40b85fac5fca7a
+_md5_=0f026c56d0eacea4468a202fec1bf48d
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-21.04.3 b/metadata/md5-cache/kde-apps/pim-data-exporter-21.04.3
index 0860c2f64786..c73809b189a8 100644
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-21.04.3
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Assistant to backup and archive PIM data and configuration
 EAPI=7
 HOMEPAGE=https://apps.kde.org/pimdataexporter/ https://userbase.kde.org/KMail/Backup_Options
 IUSE=telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/grantleetheme-21.04.3:5 >=kde-apps/kidentitymanagement-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/kmime-21.04.3:5 >=kde-apps/kpimtextedit-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-apps/mailcommon-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/pim-data-exporter-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3e943a72d2c45d01630f13e69b014599
+_md5_=14c26e945977d7ba6e424e612d06433e
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-21.04.3 b/metadata/md5-cache/kde-apps/pim-sieve-editor-21.04.3
index d03021d727c2..0a0e96617f31 100644
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-21.04.3
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Assistant for editing IMAP Sieve filters
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=dev-libs/qtkeychain:= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-mime-21.04.3:5 >=kde-apps/calendarsupport-21.04.3:5 >=kde-apps/kmailtransport-21.04.3:5 >=kde-apps/libksieve-21.04.3:5 >=kde-apps/pimcommon-21.04.3:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcalendarcore-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/pim-sieve-editor-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=87747d59a3c3ebf9d4573bf95d212dcf
+_md5_=527fa411c45636070dc8709d43107472
diff --git a/metadata/md5-cache/kde-apps/pimcommon-21.04.3 b/metadata/md5-cache/kde-apps/pimcommon-21.04.3
index 47878854c489..dd9591f61b3b 100644
--- a/metadata/md5-cache/kde-apps/pimcommon-21.04.3
+++ b/metadata/md5-cache/kde-apps/pimcommon-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Common PIM libraries
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/akonadi-21.04.3:5 >=kde-apps/akonadi-contacts-21.04.3:5 >=kde-apps/akonadi-search-21.04.3:5 >=kde-apps/kimap-21.04.3:5 >=kde-apps/kldap-21.04.3:5 >=kde-apps/kpimtextedit-21.04.3:5 >=kde-apps/libkdepim-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcontacts-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemmodels-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/purpose-5.80.0:5 !<kde-apps/libkdepim-20.07.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/pimcommon-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eb58ed5eed25ce817e44a5c5ff15eef1
+_md5_=9d3a0478407e2c7471064fdaa913ded3
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-21.04.3 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-21.04.3
index 24b979f96724..3d28f208d11e 100644
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-21.04.3
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-21.04.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=postinst
 DESCRIPTION=Plasma Telepathy client
 EAPI=7
 HOMEPAGE=https://community.kde.org/KTp
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ktp-accounts-kcm-21.04.3:5 >=kde-apps/ktp-approver-21.04.3:5 >=kde-apps/ktp-auth-handler-21.04.3:5 >=kde-apps/ktp-common-internals-21.04.3:5 >=kde-apps/ktp-contact-list-21.04.3:5 >=kde-apps/ktp-contact-runner-21.04.3:5 >=kde-apps/ktp-desktop-applets-21.04.3:5 >=kde-apps/ktp-filetransfer-handler-21.04.3:5 >=kde-apps/ktp-kded-module-21.04.3:5 >=kde-apps/ktp-send-file-21.04.3:5 >=kde-apps/ktp-text-ui-21.04.3:5
 SLOT=5
-_md5_=6a0034ad9bd4b0fff9e82597fc0e8856
+_md5_=5f812e35f5a6901f0aae0deea8ccf33b
diff --git a/metadata/md5-cache/kde-apps/poxml-21.04.3 b/metadata/md5-cache/kde-apps/poxml-21.04.3
index 087685252d9c..6fb1dbb24c47 100644
--- a/metadata/md5-cache/kde-apps/poxml-21.04.3
+++ b/metadata/md5-cache/kde-apps/poxml-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.15.2:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/poxml-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=28880b61d68014e0fdf178aa0a098c91
+_md5_=5a6f3e096a876271cf726659690622df
diff --git a/metadata/md5-cache/kde-apps/print-manager-21.04.3 b/metadata/md5-cache/kde-apps/print-manager-21.04.3
index 0559ae44aa69..f9c077ff8dbf 100644
--- a/metadata/md5-cache/kde-apps/print-manager-21.04.3
+++ b/metadata/md5-cache/kde-apps/print-manager-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Manage print jobs and printers in Plasma
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+gtk debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/plasma-5.80.0:5 net-print/cups >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 gtk? ( app-admin/system-config-printer ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/print-manager-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e5454d08c3927173942743a51fa13a0e
+_md5_=88ab1a97539b75ba53e32f73c33fe2f2
diff --git a/metadata/md5-cache/kde-apps/rocs-21.04.3 b/metadata/md5-cache/kde-apps/rocs-21.04.3
index f5961f273c9f..9162a995d66a 100644
--- a/metadata/md5-cache/kde-apps/rocs-21.04.3
+++ b/metadata/md5-cache/kde-apps/rocs-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Interface to work with Graph Theory
 EAPI=7
 HOMEPAGE=https://apps.kde.org/rocs/
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5[scripttools] >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=dev-qt/qtquickcontrols-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/rocs-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=77a8f0a098047679cdde7d51a82d6051
+_md5_=1f6c9254529ef545d75265d2a6ff386d
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-21.04.3 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-21.04.3
index 88c9812ce2a6..7ed4e05d3446 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-21.04.3
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=KWallet extension for signond
 EAPI=7
 HOMEPAGE=https://accounts-sso.gitlab.io/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kwallet-5.80.0:5 net-libs/signond || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/signon-kwallet-extension-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3a1030b465c267c49dccce2668c17fb0
+_md5_=264d4e8e9755dccba54cf27bc4a04478
diff --git a/metadata/md5-cache/kde-apps/spectacle-21.04.3 b/metadata/md5-cache/kde-apps/spectacle-21.04.3
index 74da49457299..38d05eb58246 100644
--- a/metadata/md5-cache/kde-apps/spectacle-21.04.3
+++ b/metadata/md5-cache/kde-apps/spectacle-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Screenshot capture utility
 EAPI=7
 HOMEPAGE=https://apps.kde.org/spectacle/
 IUSE=+annotate kipi share debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
 RDEPEND=>=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwayland-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image annotate? ( >=media-libs/kimageannotator-0.4.1 ) kipi? ( >=kde-apps/libkipi-21.04.3:5= ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) kipi? ( >=kde-apps/kipi-plugins-21.04.3:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/spectacle-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=687dd71bb2e539f869e954f037c74c1c
+_md5_=4f16219f5d198900447052badf8e4c85
diff --git a/metadata/md5-cache/kde-apps/step-21.04.3 b/metadata/md5-cache/kde-apps/step-21.04.3
index 5237b27c5c1f..cb069f033407 100644
--- a/metadata/md5-cache/kde-apps/step-21.04.3
+++ b/metadata/md5-cache/kde-apps/step-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Interactive physics simulator
 EAPI=7
 HOMEPAGE=https://apps.kde.org/step/ https://edu.kde.org/step/
 IUSE=+gsl nls +qalculate debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-cpp/eigen-3.2:3 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtopengl-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kplotting-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/step-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=abafea68a1322881683bf55c3eaa0ccc
+_md5_=19f12caebb93c0c98766fc966e46d43e
diff --git a/metadata/md5-cache/kde-apps/svgpart-21.04.3 b/metadata/md5-cache/kde-apps/svgpart-21.04.3
index 43eda9813679..413622f41b2d 100644
--- a/metadata/md5-cache/kde-apps/svgpart-21.04.3
+++ b/metadata/md5-cache/kde-apps/svgpart-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Kpart for viewing SVGs
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/svgpart-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6c480b166bc6bafe71197332340ced05
+_md5_=d763b4a2e9addbf2442c60f1b5c80531
diff --git a/metadata/md5-cache/kde-apps/sweeper-21.04.3 b/metadata/md5-cache/kde-apps/sweeper-21.04.3
index 0e5c80204015..a81de7272e3b 100644
--- a/metadata/md5-cache/kde-apps/sweeper-21.04.3
+++ b/metadata/md5-cache/kde-apps/sweeper-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
 EAPI=7
 HOMEPAGE=https://apps.kde.org/sweeper/ https://utils.kde.org/projects/sweeper/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-stats-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/sweeper-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c3085a0cde86679065223fe41a3e7b01
+_md5_=62ecaef013b7aed8e3725697ac240979
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-21.04.3 b/metadata/md5-cache/kde-apps/thumbnailers-21.04.3
index b0853d86fc32..4c4e00c3bb28 100644
--- a/metadata/md5-cache/kde-apps/thumbnailers-21.04.3
+++ b/metadata/md5-cache/kde-apps/thumbnailers-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=raw debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 raw? ( >=kde-apps/libkdcraw-21.04.3:5 >=kde-apps/libkexiv2-21.04.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/release-service/21.04.3/src/kdegraphics-thumbnailers-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8393bb1780786de3e97fe9d5f84b820d
+_md5_=5567544e27de6a283f1518c3627226da
diff --git a/metadata/md5-cache/kde-apps/umbrello-21.04.3 b/metadata/md5-cache/kde-apps/umbrello-21.04.3
index 94b39f2eacde..94d4a148c988 100644
--- a/metadata/md5-cache/kde-apps/umbrello-21.04.3
+++ b/metadata/md5-cache/kde-apps/umbrello-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=KDE UML Modeller
 EAPI=7
 HOMEPAGE=https://apps.kde.org/umbrello/ https://umbrello.kde.org
 IUSE=php test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdelibs4support-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/ktexteditor-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 php? ( dev-util/kdevelop:5= dev-util/kdevelop-pg-qt:5 dev-util/kdevelop-php:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
+RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/umbrello-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eab7d088c1709b7f77591fbd91667c0a
+_md5_=298b33be4b68e8b39f43648cf8497ba9
diff --git a/metadata/md5-cache/kde-apps/yakuake-21.04.3 b/metadata/md5-cache/kde-apps/yakuake-21.04.3
index 833a654fb07e..82237ec12119 100644
--- a/metadata/md5-cache/kde-apps/yakuake-21.04.3
+++ b/metadata/md5-cache/kde-apps/yakuake-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Quake-style terminal emulator based on konsole
 EAPI=7
 HOMEPAGE=https://apps.kde.org/yakuake/
 IUSE=absolute-position X debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/konsole-21.04.3:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 absolute-position? ( >=kde-frameworks/kwayland-5.80.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/yakuake-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=241c316d8b54ecfd497bf0a96d5e3366
+_md5_=acfbe84f73c726ad1e197f88e8f95a4d
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-21.04.3 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-21.04.3
index ef0e57658ba5..65e24eec99de 100644
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-21.04.3
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kdnssd-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/zeroconf-ioslave-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=661f74aedc282e0bfd94dff3e1f29bd8
+_md5_=939c622e89874387cdec0c57edd92fec
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index bf861da3d13d..57f1d10c53b6 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/kfilemetadata-5.82.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.82.0
index 82159ee40f4e..b9ce180223ac 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.82.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-framewo
 RESTRICT=!test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kfilemetadata-5.82.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=65be9e6468207a4d94c055f129fc75b0
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.84.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.84.0
index ece349b6f010..eeb1637e9305 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.84.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.84.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.84*:5 =kde-framewo
 RESTRICT=!test? ( test ) test
 SLOT=5/5.84
 SRC_URI=mirror://kde/stable/frameworks/5.84/kfilemetadata-5.84.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dd173324c11b61fc83ea115f80f32d9f
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.82.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.82.0
index c5b080196fcf..1a8fe29cc9d5 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.82.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kwallet-5.82.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2a1c15300d719df9c003bf71512cf00b
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.84.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.84.0
index bf3cf0c8b549..1b9a878f95f3 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.84.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.84.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >
 RESTRICT=!test? ( test )
 SLOT=5/5.84
 SRC_URI=mirror://kde/stable/frameworks/5.84/kwallet-5.84.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5135b9479bc90fbd0b61f9148cefd297
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.82.0 b/metadata/md5-cache/kde-frameworks/purpose-5.82.0
index b7e61c698f7a..8411ca2d24ce 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.82.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwo
 RESTRICT=!test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/purpose-5.82.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dcc1ff5dee300dcaf3a1f015876509c8
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.84.0 b/metadata/md5-cache/kde-frameworks/purpose-5.84.0
index a4034c1449fc..e747ed28d0b6 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.84.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.84.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwo
 RESTRICT=!test? ( test ) test
 SLOT=5/5.84
 SRC_URI=mirror://kde/stable/frameworks/5.84/purpose-5.84.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=138d650ef6ec5bcd715041d3eb40743b
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.82.0 b/metadata/md5-cache/kde-frameworks/solid-5.82.0
index 82772a7a63a5..7c20a2aa5974 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.82.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/solid-5.82.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0d8cd83c4edd81d1a59acad6b4dad351
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.84.0-r1 b/metadata/md5-cache/kde-frameworks/solid-5.84.0-r1
index acac7d6d5bbf..367f0e15c103 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.84.0-r1
+++ b/metadata/md5-cache/kde-frameworks/solid-5.84.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.84
 SRC_URI=mirror://kde/stable/frameworks/5.84/solid-5.84.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9b81e8de963f81e716fcbfad7e84d73c
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index b48b8162b314..119769c3dd12 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-21.04.3 b/metadata/md5-cache/kde-misc/kdeconnect-21.04.3
index 18be18e71369..af663b9195d9 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-21.04.3
+++ b/metadata/md5-cache/kde-misc/kdeconnect-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Adds communication between KDE Plasma and your smartphone
 EAPI=7
 HOMEPAGE=https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect.kcm/
 IUSE=bluetooth pulseaudio wayland X debug +handbook test selinux
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-crypt/qca-2.3.0:2[ssl] >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kirigami-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/kpeople-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/plasma-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15.2:5 ) X? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) pulseaudio? ( media-libs/pulseaudio-qt ) wayland? ( >=kde-frameworks/kwayland-5.80.0:5 ) dev-libs/kpeoplevcard >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5[qml] >=kde-frameworks/kdeclarative-5.80.0:5 net-fs/sshfs || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-kdeconnect )
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kdeconnect-kde-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3a79b438a2ee33d50b7c108c895873c5
+_md5_=7b29b137a595694bb0c8ad2de09726ec
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-21.04.3 b/metadata/md5-cache/kde-misc/kio-gdrive-21.04.3
index 11cdda1dbedb..6f6143854fc6 100644
--- a/metadata/md5-cache/kde-misc/kio-gdrive-21.04.3
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=KIO Slave for Google Drive service
 EAPI=7
 HOMEPAGE=https://apps.kde.org/kio_gdrive/
 IUSE=+kaccounts +share debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkgapi-19.08.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-20.08.3:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) share? ( >=kde-frameworks/purpose-5.80.0:5 ) kaccounts? ( >=kde-apps/kaccounts-providers-20.08.3:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kio-gdrive-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d2ee5ea94520fa792f163e6d6871ae52
+_md5_=5fe7feeab1e67bfa6fc1f2efc95f39e7
diff --git a/metadata/md5-cache/kde-misc/markdownpart-21.04.3 b/metadata/md5-cache/kde-misc/markdownpart-21.04.3
index 509d322d6985..80535da6dc29 100644
--- a/metadata/md5-cache/kde-misc/markdownpart-21.04.3
+++ b/metadata/md5-cache/kde-misc/markdownpart-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Markdown viewer KParts plugin based on QTextDocument
 EAPI=7
 HOMEPAGE=https://apps.kde.org/markdownpart/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/markdownpart-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=133c4bd52472da9a3ba945d5de9e223d
+_md5_=9e8931ff38f561de7de673d1ca3c615d
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.13 b/metadata/md5-cache/kde-misc/rsibreak-0.12.13
deleted file mode 100644
index a87e9d85cf06..000000000000
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Small utility which bothers you at certain intervals
-EAPI=7
-HOMEPAGE=https://apps.kde.org/rsibreak/ https://userbase.kde.org/RSIBreak
-IUSE=test debug +handbook
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/frameworkintegration-5.60.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/rsibreak/0.12/rsibreak-0.12.13.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a9dc99a2993945693ab6c99a607057e6
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.14 b/metadata/md5-cache/kde-misc/rsibreak-0.12.14
index 851336284d16..d769886074c3 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.14
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.14
@@ -5,11 +5,11 @@ DESCRIPTION=Small utility which bothers you at certain intervals
 EAPI=7
 HOMEPAGE=https://apps.kde.org/rsibreak/ https://userbase.kde.org/RSIBreak
 IUSE=test debug +handbook
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/frameworkintegration-5.74.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/rsibreak/0.12/rsibreak-0.12.14.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=17880f6afa0a686beb2886482384483f
+_md5_=62ab3dc081989b0e49086f3f22693792
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index fe8eacce6d00..1c1227bf965b 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/kdeplasma-addons-5.21.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.5
index c84d894f3db5..3075bb5123cb 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kdeplasma-addons-5.21.5.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e381e0a7192081cefc9b4e98411fe89c
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.22.4 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.22.4
index 041fbd3db5a7..8393be8a7cc0 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.22.4
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.22.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.22.4/kdeplasma-addons-5.22.4.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=42df799bf202a063f32643a3b3f69c43
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.21.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.21.5
index ec8c5fbb9bb4..0e36d5d4ec97 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.21.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-
 REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kinfocenter-5.21.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ad3fabc3cf45469ad078acde996f50ff
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.22.4 b/metadata/md5-cache/kde-plasma/kinfocenter-5.22.4
index 36b91e620856..4faa27dff966 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.22.4
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.22.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-
 REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.22.4/kinfocenter-5.22.4.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e1314a6646e1aa17361f184fdb48b669
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.21.5 b/metadata/md5-cache/kde-plasma/kwin-5.21.5
deleted file mode 100644
index 34fac92ade9b..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.21.5
+++ /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.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/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.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.21.5:5 >=kde-plasma/kdecoration-5.21.5:5 >=kde-plasma/kscreenlocker-5.21.5:5 >=kde-plasma/kwayland-server-5.21.5: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.82.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.5: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.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.21.5:5 >=kde-plasma/kdecoration-5.21.5:5 >=kde-plasma/kscreenlocker-5.21.5:5 >=kde-plasma/kwayland-server-5.21.5: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.82.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.82.0:5 >=kde-frameworks/kitemmodels-5.82.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.5/kwin-5.21.5.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ce514df546becb639cfcc84bc6caedf5
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.21.5-r1 b/metadata/md5-cache/kde-plasma/kwin-5.21.5-r1
new file mode 100644
index 000000000000..7f4556ba745a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.21.5-r1
@@ -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.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/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.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.21.5:5 >=kde-plasma/kdecoration-5.21.5:5 >=kde-plasma/kscreenlocker-5.21.5:5 >=kde-plasma/kwayland-server-5.21.5: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.82.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.5: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.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.21.5:5 >=kde-plasma/kdecoration-5.21.5:5 >=kde-plasma/kscreenlocker-5.21.5:5 >=kde-plasma/kwayland-server-5.21.5: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.82.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.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5[qml] || ( x11-base/xwayland x11-base/xorg-server[wayland(-)] ) multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.21.5/kwin-5.21.5.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a90fc8f6c12f7612e9d304c0e4c1b591
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.22.4 b/metadata/md5-cache/kde-plasma/kwin-5.22.4
deleted file mode 100644
index 9bd06903b5c4..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.22.4
+++ /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.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.22.4:5 >=kde-plasma/kdecoration-5.22.4:5 >=kde-plasma/kscreenlocker-5.22.4:5 >=kde-plasma/kwayland-server-5.22.4: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.82.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.22.4:5
-RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.22.4:5 >=kde-plasma/kdecoration-5.22.4:5 >=kde-plasma/kscreenlocker-5.22.4:5 >=kde-plasma/kwayland-server-5.22.4: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.82.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.82.0:5 >=kde-frameworks/kitemmodels-5.82.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.22.4/kwin-5.22.4.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ce8a067c9c1295356e9a0b384aac38cb
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.22.4-r1 b/metadata/md5-cache/kde-plasma/kwin-5.22.4-r1
new file mode 100644
index 000000000000..22d8ad166d6c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.22.4-r1
@@ -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.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.22.4:5 >=kde-plasma/kdecoration-5.22.4:5 >=kde-plasma/kscreenlocker-5.22.4:5 >=kde-plasma/kwayland-server-5.22.4: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.82.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.22.4:5
+RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.22.4:5 >=kde-plasma/kdecoration-5.22.4:5 >=kde-plasma/kscreenlocker-5.22.4:5 >=kde-plasma/kwayland-server-5.22.4: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.82.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.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5[qml] || ( x11-base/xwayland x11-base/xorg-server[wayland(-)] ) multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.22.4/kwin-5.22.4.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c777c224ac61ac8ee1639f5f9244fd92
diff --git a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.4 b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.4
deleted file mode 100644
index 24aa4ad87d52..000000000000
--- a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/wayland-scanner virtual/pkgconfig dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[X] >=dev-qt/qtwayland-5.15.2:5 x11-libs/libxkbcommon >=dev-libs/plasma-wayland-protocols-1.1.1 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Qt component to allow applications make use of Wayland wl-layer-shell protocol
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[X] >=dev-qt/qtwayland-5.15.2:5 x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.4/layer-shell-qt-5.22.4.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=62bc1b08518634783c783a26533d8f2a
diff --git a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.4-r1 b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.4-r1
new file mode 100644
index 000000000000..da3685c06fe9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.4-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/wayland-scanner virtual/pkgconfig dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[X] >=dev-qt/qtwayland-5.15.2:5 x11-libs/libxkbcommon dev-libs/wayland-protocols dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Qt component to allow applications make use of Wayland wl-layer-shell protocol
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[X] >=dev-qt/qtwayland-5.15.2:5 x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.22.4/layer-shell-qt-5.22.4.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5419d5cc3be9017f0b5f14ccb4900e37
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.5-r1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.5-r1
index 3054fda021d9..a1b57aff10f7 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdecla
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-desktop-5.21.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=44172fca3b07720abb147ea84fb3ded1
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.22.4 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.22.4
index 61a0f59c9c42..2f8c3dbe7f2b 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.22.4
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.22.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdecla
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.22.4/plasma-desktop-5.22.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7631f15d24f7e26e8d3b3b797dd94110
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.21.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.21.5
index 3da13743437b..c6794d4fba1f 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.21.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.21.5
@@ -10,5 +10,5 @@ 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.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-plasma/libkworkspace-5.21.5:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/systemsettings-5.21.5.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1d25922c5f82f3f80fcdcee05757db06
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.22.4 b/metadata/md5-cache/kde-plasma/systemsettings-5.22.4
index a3717c3ba838..d80900915650 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.22.4
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.22.4
@@ -10,5 +10,5 @@ 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.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-plasma/libkworkspace-5.22.4:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.22.4/systemsettings-5.22.4.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9d92450515e9799cb2cf3fc0ffad4db9
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 89f06b112a7d..ffe1d3fbcd7d 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/mutt-wizard-3.1.1-r1 b/metadata/md5-cache/mail-client/mutt-wizard-3.1.1-r1
index f7403a85eb87..f41868e11872 100644
--- a/metadata/md5-cache/mail-client/mutt-wizard-3.1.1-r1
+++ b/metadata/md5-cache/mail-client/mutt-wizard-3.1.1-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=app-admin/pass mail-client/neomutt[notmuch,sasl] mail-mta/msmtp net-mail/isync[ssl]
 SLOT=0
 SRC_URI=https://github.com/LukeSmithxyz/mutt-wizard/archive/v3.1.1.tar.gz -> mutt-wizard-3.1.1.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=471a32e3e14f28669dea3eddc2956440
diff --git a/metadata/md5-cache/mail-client/mutt-wizard-3.2.1-r1 b/metadata/md5-cache/mail-client/mutt-wizard-3.2.1-r1
index 3c0e271b8656..0d6a021a5eeb 100644
--- a/metadata/md5-cache/mail-client/mutt-wizard-3.2.1-r1
+++ b/metadata/md5-cache/mail-client/mutt-wizard-3.2.1-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=app-admin/pass mail-client/neomutt[notmuch,sasl] mail-mta/msmtp net-mail/isync[ssl]
 SLOT=0
 SRC_URI=https://github.com/LukeSmithxyz/mutt-wizard/archive/v3.2.1.tar.gz -> mutt-wizard-3.2.1.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=888faafc32a3e4912cad39addcd89a63
diff --git a/metadata/md5-cache/mail-client/mutt-wizard-9999 b/metadata/md5-cache/mail-client/mutt-wizard-9999
index eda40bc37fde..672b4ae8fda9 100644
--- a/metadata/md5-cache/mail-client/mutt-wizard-9999
+++ b/metadata/md5-cache/mail-client/mutt-wizard-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=app-admin/pass mail-client/neomutt[notmuch,sasl] mail-mta/msmtp net-mail/isync[ssl]
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=471a32e3e14f28669dea3eddc2956440
diff --git a/metadata/md5-cache/mail-client/roundcube-9999 b/metadata/md5-cache/mail-client/roundcube-9999
index 2771c2e776aa..75f35a07e742 100644
--- a/metadata/md5-cache/mail-client/roundcube-9999
+++ b/metadata/md5-cache/mail-client/roundcube-9999
@@ -11,4 +11,4 @@ RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.5.0[exif
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=9999
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=bccb2850bb571f7ce74091d4b6755c78
+_md5_=922889af0ae175a706d79a9f965e5616
diff --git a/metadata/md5-cache/mail-client/thunderbird-78.12.0 b/metadata/md5-cache/mail-client/thunderbird-78.12.0
index 0af9fcd19e50..bb3941dbcc72 100644
--- a/metadata/md5-cache/mail-client/thunderbird-78.12.0
+++ b/metadata/md5-cache/mail-client/thunderbird-78.12.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >
 REQUIRED_USE=wifi? ( dbus )
 SLOT=0/78
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/source/thunderbird-78.12.0.source.tar.xz -> thunderbird-78.12.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-15.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/af.xpi -> thunderbird-78.12.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ar.xpi -> thunderbird-78.12.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ast.xpi -> thunderbird-78.12.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/be.xpi -> thunderbird-78.12.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/bg.xpi -> thunderbird-78.12.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/br.xpi -> thunderbird-78.12.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ca.xpi -> thunderbird-78.12.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/cak.xpi -> thunderbird-78.12.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/cs.xpi -> thunderbird-78.12.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/cy.xpi -> thunderbird-78.12.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/da.xpi -> thunderbird-78.12.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/de.xpi -> thunderbird-78.12.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.12.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/el.xpi -> thunderbird-78.12.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.12.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.12.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.12.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.12.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/et.xpi -> thunderbird-78.12.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/eu.xpi -> thunderbird-78.12.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/fa.xpi -> thunderbird-78.12.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/fi.xpi -> thunderbird-78.12.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/fr.xpi -> thunderbird-78.12.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.12.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.12.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/gd.xpi -> thunderbird-78.12.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/gl.xpi -> thunderbird-78.12.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/he.xpi -> thunderbird-78.12.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/hr.xpi -> thunderbird-78.12.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.12.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/hu.xpi -> thunderbird-78.12.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.12.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/id.xpi -> thunderbird-78.12.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/is.xpi -> thunderbird-78.12.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/it.xpi -> thunderbird-78.12.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ja.xpi -> thunderbird-78.12.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ka.xpi -> thunderbird-78.12.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/kab.xpi -> thunderbird-78.12.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/kk.xpi -> thunderbird-78.12.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ko.xpi -> thunderbird-78.12.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/lt.xpi -> thunderbird-78.12.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ms.xpi -> thunderbird-78.12.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.12.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/nl.xpi -> thunderbird-78.12.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.12.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.12.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/pl.xpi -> thunderbird-78.12.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.12.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.12.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/rm.xpi -> thunderbird-78.12.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ro.xpi -> thunderbird-78.12.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/ru.xpi -> thunderbird-78.12.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/si.xpi -> thunderbird-78.12.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sk.xpi -> thunderbird-78.12.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sl.xpi -> thunderbird-78.12.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sq.xpi -> thunderbird-78.12.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sr.xpi -> thunderbird-78.12.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.12.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/th.xpi -> thunderbird-78.12.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/tr.xpi -> thunderbird-78.12.0-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/uz.xpi -> thunderbird-78.12.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/vi.xpi -> thunderbird-78.12.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.12.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.12.0-zh-TW.xpi )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d92485b1778eed2cb58e8008e6c0625a
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 620e413476da..eb48f0db332d 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/courier-1.1.5 b/metadata/md5-cache/mail-mta/courier-1.1.5
new file mode 100644
index 000000000000..8045a360402f
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/courier-1.1.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare test
+DEPEND=>=net-libs/courier-authlib-0.71.3 >=net-libs/courier-unicode-2.2.3 net-dns/libidn:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( sys-libs/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta] !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp
+DESCRIPTION=An MTA designed specifically for maildirs
+EAPI=7
+HOMEPAGE=https://www.courier-mta.org/
+IUSE=postgres ldap mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
+LICENSE=GPL-3
+PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
+RDEPEND=>=net-libs/courier-authlib-0.71.3 >=net-libs/courier-unicode-2.2.3 net-dns/libidn:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( sys-libs/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta] !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
+SLOT=0
+SRC_URI=mirror://sourceforge/courier/courier-1.1.5.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=83a47a53f839da670d1e20b7be77b27a
diff --git a/metadata/md5-cache/mail-mta/nullmailer-2.2-r2 b/metadata/md5-cache/mail-mta/nullmailer-2.2-r2
index a0ee4c374e85..6f324837377b 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-2.2-r2
+++ b/metadata/md5-cache/mail-mta/nullmailer-2.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Simple relay-only local mail transport agent
 EAPI=7
 HOMEPAGE=http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer
 IUSE=ssl test
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86 ~x64-cygwin
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~x64-cygwin
 LICENSE=GPL-2
 RDEPEND=acct-group/nullmail acct-user/nullmail virtual/logger sys-apps/shadow ssl? ( net-libs/gnutls:0= ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta(+)] !mail-mta/netqmail !mail-mta/opensmtpd[mta(+)] !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta(+)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-2.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8475e629312a1bc9b331c459b9f91148
+_md5_=f85e1a95e7a5f87d14ce19dcf9fedc7b
diff --git a/metadata/md5-cache/mail-mta/postfix-3.5.10 b/metadata/md5-cache/mail-mta/postfix-3.5.10
deleted file mode 100644
index 06cd0fd7abe8..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.5.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.5.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7227b5555cdc4961335670c0b43ea7d6
diff --git a/metadata/md5-cache/mail-mta/postfix-3.5.11 b/metadata/md5-cache/mail-mta/postfix-3.5.11
deleted file mode 100644
index 97a92a4004d8..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.5.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.5.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7227b5555cdc4961335670c0b43ea7d6
diff --git a/metadata/md5-cache/mail-mta/postfix-3.5.8-r1 b/metadata/md5-cache/mail-mta/postfix-3.5.8-r1
deleted file mode 100644
index 9be26f8e1354..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.5.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.5.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=611ccf3c5c021a49235022c18d2361f9
diff --git a/metadata/md5-cache/mail-mta/postfix-3.5.9-r1 b/metadata/md5-cache/mail-mta/postfix-3.5.9-r1
deleted file mode 100644
index 44b0832a1138..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.5.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.5.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7227b5555cdc4961335670c0b43ea7d6
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6.0 b/metadata/md5-cache/mail-mta/postfix-3.6.0
deleted file mode 100644
index 9dc7f8b8436c..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.6.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=736ab4f146f91a911e59172b5b5cb550
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6.1 b/metadata/md5-cache/mail-mta/postfix-3.6.1
index fac62a54f360..6110ea13d602 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.6.1
+++ b/metadata/md5-cache/mail-mta/postfix-3.6.1
@@ -5,11 +5,11 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=7
 HOMEPAGE=http://www.postfix.org/
 IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.6.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=84f573fcc62575b003e7368507732907
+_md5_=cb999a825c9c2ada0dc450da64549ff4
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index a3ca46313541..1954b30e8947 100644
--- a/metadata/md5-cache/mate-extra/Manifest.gz
+++ b/metadata/md5-cache/mate-extra/Manifest.gz
diff --git a/metadata/md5-cache/mate-extra/caja-admin-0.0.2_p20200328 b/metadata/md5-cache/mate-extra/caja-admin-0.0.2_p20200328
index a77605261aeb..337829b29e8d 100644
--- a/metadata/md5-cache/mate-extra/caja-admin-0.0.2_p20200328
+++ b/metadata/md5-cache/mate-extra/caja-admin-0.0.2_p20200328
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-devel/gettext
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) sys-devel/gettext
 DESCRIPTION=Caja Admin Extension
 EAPI=7
 HOMEPAGE=https://github.com/infirit/caja-admin
-IUSE=+python_single_target_python3_8
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-editors/pluma dev-python/python-caja[python_single_target_python3_8(-)?] sys-auth/polkit x11-terms/mate-terminal
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-editors/pluma dev-python/python-caja[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-auth/polkit x11-terms/mate-terminal
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/infirit/caja-admin/archive/b20de2dd2e1ef74db66705965fd7480e2bf98153.tar.gz -> caja-admin-0.0.2_p20200328.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b302caa6717095db2933fdb8e65f78ab
+_md5_=de1b451a10e210bffe49d1a9f0484b43
diff --git a/metadata/md5-cache/mate-extra/caja-admin-0.0.4 b/metadata/md5-cache/mate-extra/caja-admin-0.0.4
new file mode 100644
index 000000000000..ea21c2e077ce
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/caja-admin-0.0.4
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) sys-devel/gettext
+DESCRIPTION=Caja Admin Extension
+EAPI=7
+HOMEPAGE=https://github.com/infirit/caja-admin
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-editors/pluma dev-python/python-caja[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-auth/polkit x11-terms/mate-terminal
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/infirit/caja-admin/archive/0.0.4.tar.gz -> caja-admin-0.0.4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d595dbc906d2e8c9c70041e0b946aa93
diff --git a/metadata/md5-cache/mate-extra/caja-admin-9999 b/metadata/md5-cache/mate-extra/caja-admin-9999
index fe6897a47925..c1224ba04b65 100644
--- a/metadata/md5-cache/mate-extra/caja-admin-9999
+++ b/metadata/md5-cache/mate-extra/caja-admin-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-devel/gettext
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) sys-devel/gettext
 DESCRIPTION=Caja Admin Extension
 EAPI=7
 HOMEPAGE=https://github.com/infirit/caja-admin
-IUSE=+python_single_target_python3_8
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-editors/pluma dev-python/python-caja[python_single_target_python3_8(-)?] sys-auth/polkit x11-terms/mate-terminal
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-editors/pluma dev-python/python-caja[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-auth/polkit x11-terms/mate-terminal
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=41cde76bb9fa25ad9e7275322ded31f0
+_md5_=d595dbc906d2e8c9c70041e0b946aa93
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1 b/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1
index 4937384597ce..5503ad5eca79 100644
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1
+++ b/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/atk >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=mate-base/caja-1.19.1 mate-extra/caja-extensions media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango dev-python/docutils virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/atk >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) >=mate-base/caja-1.19.1 mate-extra/caja-extensions media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango dev-python/docutils virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
 DESCRIPTION=Store, Sync and Share Files Online
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
-IUSE=debug +python_single_target_python3_8 kernel_linux
+IUSE=debug python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 kernel_linux
 KEYWORDS=amd64 x86
 LICENSE=CC-BY-ND-3.0 GPL-3+ public-domain
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/atk >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=mate-base/caja-1.19.1 mate-extra/caja-extensions media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango net-misc/dropbox
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/atk >=dev-libs/glib-2.50:2 python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) >=mate-base/caja-1.19.1 mate-extra/caja-extensions media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango net-misc/dropbox
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/caja-dropbox-1.24.0.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	553f2bcf70c72d62970c216e3a74c24d	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=00280ba1d54a1df63212cc7ee8225ba4
+_md5_=a1c04e08e9fe290f9109093632bb3904
diff --git a/metadata/md5-cache/mate-extra/caja-hide-0.9.0 b/metadata/md5-cache/mate-extra/caja-hide-0.9.0
index 8cfaac8f0db2..0f98a21f75a9 100644
--- a/metadata/md5-cache/mate-extra/caja-hide-0.9.0
+++ b/metadata/md5-cache/mate-extra/caja-hide-0.9.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 DESCRIPTION=Hide files without renaming them in MATE's Caja
 EAPI=7
 HOMEPAGE=https://github.com/Fred-Barclay/Caja-hide
-IUSE=+python_single_target_python3_8
+IUSE=python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) dev-python/python-caja[python_single_target_python3_8(-)?] x11-misc/xautomation
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) dev-python/python-caja[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] x11-misc/xautomation
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/Fred-Barclay/Caja-hide/archive/v0.9.0.tar.gz -> caja-hide-0.9.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2f6a40256c1c1712dce029ea690965fa
+_md5_=f697375dc526b73d339fa75ae9ad087c
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.24.3 b/metadata/md5-cache/mate-extra/mate-power-manager-1.24.3
new file mode 100644
index 000000000000..58f18d6f2afe
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-power-manager-1.24.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=media-libs/libcanberra-0.10:0[gtk3] >=sys-apps/dbus-1 >=sys-power/upower-0.99.8:= >=x11-apps/xrandr-1.3 >=x11-libs/cairo-1 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr >=x11-libs/libnotify-0.7:0 x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 ) libsecret? ( >=app-crypt/libsecret-0.11 ) app-text/docbook-xml-dtd:4.3 app-text/rarian >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools dev-libs/libxml2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
+DESCRIPTION=A session daemon for MATE that makes it easy to manage your laptop or desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=+applet elogind libsecret policykit systemd test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=media-libs/libcanberra-0.10:0[gtk3] >=sys-apps/dbus-1 >=sys-power/upower-0.99.8:= >=x11-apps/xrandr-1.3 >=x11-libs/cairo-1 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr >=x11-libs/libnotify-0.7:0 x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 ) libsecret? ( >=app-crypt/libsecret-0.11 ) virtual/libintl policykit? ( >=mate-extra/mate-polkit-1.6 ) systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind )
+REQUIRED_USE=^^ ( elogind systemd )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-power-manager-1.24.3.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	553f2bcf70c72d62970c216e3a74c24d	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4b44caab90c6801d689d28a755e2b4cc
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index b6413b7266a7..b544f8835d41 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/cascadia-code-2102.25 b/metadata/md5-cache/media-fonts/cascadia-code-2102.25
deleted file mode 100644
index 86c47ab2586c..000000000000
--- a/metadata/md5-cache/media-fonts/cascadia-code-2102.25
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup
-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	0667878c2b594871023dd1833d05996f
-_md5_=873a6c6fa110c3777d9ae6d6e46c4763
diff --git a/metadata/md5-cache/media-fonts/cascadia-code-2105.24 b/metadata/md5-cache/media-fonts/cascadia-code-2105.24
deleted file mode 100644
index ba348ccf328f..000000000000
--- a/metadata/md5-cache/media-fonts/cascadia-code-2105.24
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup
-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/v2105.24/CascadiaCode-2105.24.zip -> cascadia-code-2105.24.zip
-_eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=873a6c6fa110c3777d9ae6d6e46c4763
diff --git a/metadata/md5-cache/media-fonts/cascadia-code-2106.17 b/metadata/md5-cache/media-fonts/cascadia-code-2106.17
new file mode 100644
index 000000000000..b2cdaaf6b88f
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/cascadia-code-2106.17
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=install postinst postrm setup
+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/v2106.17/CascadiaCode-2106.17.zip -> cascadia-code-2106.17.zip
+_eclasses_=font	0667878c2b594871023dd1833d05996f
+_md5_=873a6c6fa110c3777d9ae6d6e46c4763
diff --git a/metadata/md5-cache/media-fonts/jetbrains-mono-2.242 b/metadata/md5-cache/media-fonts/jetbrains-mono-2.242
new file mode 100644
index 000000000000..89c344a251c4
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/jetbrains-mono-2.242
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=install postinst postrm setup
+DESCRIPTION=A free and open-source typeface for developers
+EAPI=7
+HOMEPAGE=https://www.jetbrains.com/lp/mono/
+IUSE=X
+KEYWORDS=~amd64 ~x86
+LICENSE=OFL-1.1
+SLOT=0
+SRC_URI=https://github.com/JetBrains/JetBrainsMono/releases/download/v2.242/JetBrainsMono-2.242.zip -> jetbrains-mono-2.242.zip
+_eclasses_=font	0667878c2b594871023dd1833d05996f
+_md5_=8352be7d6f9c736970d50955be84e89e
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 254a680fff4a..8528d7c232f6 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/argyllcms-2.2.0 b/metadata/md5-cache/media-gfx/argyllcms-2.2.0
index 020bb53046a5..b1161b73ca82 100644
--- a/metadata/md5-cache/media-gfx/argyllcms-2.2.0
+++ b/metadata/md5-cache/media-gfx/argyllcms-2.2.0
@@ -5,10 +5,10 @@ DESCRIPTION=Open source, ICC compatible color management system
 EAPI=7
 HOMEPAGE=http://www.argyllcms.com/
 IUSE=doc
-KEYWORDS=~amd64 ~arm64 ~hppa ~x86
+KEYWORDS=~amd64 ~arm64 ~hppa ~riscv ~x86
 LICENSE=AGPL-3
 RDEPEND=media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver dev-libs/openssl:0=
 SLOT=0
 SRC_URI=http://www.argyllcms.com/Argyll_V2.2.0_src.zip
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cc99d80a077b9ab0c4bc56d08f5c2d90
+_md5_=b446db715a30648e31571f83ca5d77fb
diff --git a/metadata/md5-cache/media-gfx/blender-2.83.15 b/metadata/md5-cache/media-gfx/blender-2.83.15
index fbe033a721a7..337715990c93 100644
--- a/metadata/md5-cache/media-gfx/blender-2.83.15
+++ b/metadata/md5-cache/media-gfx/blender-2.83.15
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 ) alembic? ( openexr ) cuda? (
 RESTRICT=!test? ( test )
 SLOT=2.83
 SRC_URI=https://download.blender.org/source/blender-2.83.15.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-2.83.1-tests.tar.bz2 )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2b8f1805577b42be85b85301ac35e88f
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=400fe2e85c6d25ee237b9d2208e6eb77
diff --git a/metadata/md5-cache/media-gfx/blender-2.83.16 b/metadata/md5-cache/media-gfx/blender-2.83.16
new file mode 100644
index 000000000000..daccae9f3d7b
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/blender-2.83.16
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( <media-libs/opencolorio-2.0.0 ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-2.2.13.1:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( >=media-gfx/openvdb-7.0.0 dev-libs/c-blosc:= ) osl? ( <media-libs/osl-1.11.0 ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DESCRIPTION=3D Creation/Animation/Publishing System
+EAPI=7
+HOMEPAGE=https://www.blender.org
+IUSE=+bullet +dds +fluid +openexr +system-python +system-numpy +tbb alembic collada +color-management cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl sdl sndfile standalone test tiff valgrind +python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-3 BL )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( <media-libs/opencolorio-2.0.0 ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-2.2.13.1:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( >=media-gfx/openvdb-7.0.0 dev-libs/c-blosc:= ) osl? ( <media-libs/osl-1.11.0 ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=^^ ( python_single_target_python3_8 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) opencl? ( cycles ) openvdb? ( tbb ) osl? ( cycles ) standalone? ( cycles ) test? ( color-management osl )
+RESTRICT=!test? ( test )
+SLOT=2.83
+SRC_URI=https://download.blender.org/source/blender-2.83.16.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-2.83.1-tests.tar.bz2 )
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=400fe2e85c6d25ee237b9d2208e6eb77
diff --git a/metadata/md5-cache/media-gfx/blender-2.93.0 b/metadata/md5-cache/media-gfx/blender-2.93.0
index ba1f8d36966a..fb0429b06dc9 100644
--- a/metadata/md5-cache/media-gfx/blender-2.93.0
+++ b/metadata/md5-cache/media-gfx/blender-2.93.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 ) alembic? ( openexr ) cuda? (
 RESTRICT=!test? ( test )
 SLOT=2.93
 SRC_URI=https://download.blender.org/source/blender-2.93.0.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-2.93.0-tests.tar.bz2 )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=771c1d476689adb8c7864ca863c9ca46
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f8be91004e1b3c9e7e37323b8645ef2f
diff --git a/metadata/md5-cache/media-gfx/blender-2.93.1 b/metadata/md5-cache/media-gfx/blender-2.93.1
new file mode 100644
index 000000000000..50397930b606
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/blender-2.93.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx[latex] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.0.0 ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) oidn? ( >=media-libs/oidn-1.3.0 ) openimageio? ( >=media-libs/openimageio-2.2.13.1:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( >=media-gfx/openvdb-7.1.0 dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.10.0 ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) test? ( dev-vcs/subversion ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) dev-cpp/eigen:=
+DESCRIPTION=3D Creation/Animation/Publishing System
+EAPI=7
+HOMEPAGE=https://www.blender.org
+IUSE=+bullet +dds +fluid +openexr +system-python +system-numpy +tbb alembic collada +color-management cuda +cycles debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind +python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-3 BL )
+RDEPEND=python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/boost:=[nls?,threads(+)] dev-libs/lzo:2= python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) media-libs/freetype:= media-libs/glew:* media-libs/libpng:= media-libs/libsamplerate sys-libs/zlib:= virtual/glu virtual/jpeg virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) color-management? ( >=media-libs/opencolorio-2.0.0 ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) oidn? ( >=media-libs/oidn-1.3.0 ) openimageio? ( >=media-libs/openimageio-2.2.13.1:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( >=media-gfx/openvdb-7.1.0 dev-libs/c-blosc:= ) osl? ( >=media-libs/osl-1.11.10.0 ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) test? ( dev-vcs/subversion ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=^^ ( python_single_target_python3_9 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) opencl? ( cycles ) openvdb? ( tbb ) osl? ( cycles ) standalone? ( cycles ) test? ( color-management )
+RESTRICT=!test? ( test )
+SLOT=2.93
+SRC_URI=https://download.blender.org/source/blender-2.93.1.tar.xz test? ( https://dev.gentoo.org/~sam/distfiles/media-gfx/blender/blender-2.93.0-tests.tar.bz2 )
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f8be91004e1b3c9e7e37323b8645ef2f
diff --git a/metadata/md5-cache/media-gfx/blender-9999 b/metadata/md5-cache/media-gfx/blender-9999
index 01974e2d5e7a..cba14d670a1e 100644
--- a/metadata/md5-cache/media-gfx/blender-9999
+++ b/metadata/md5-cache/media-gfx/blender-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_9 ) alembic? ( openexr ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) fluid? ( tbb ) opencl? ( cycles ) openvdb? ( tbb ) osl? ( cycles ) standalone? ( cycles ) test? ( color-management )
 RESTRICT=!test? ( test )
 SLOT=9999
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	c500a1b7795f44153bd96fc2597e3c05	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a66f213e1ea3bbc4c2f1291fbcee2261
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	c500a1b7795f44153bd96fc2597e3c05	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2c5e95326b8d50f326145c8969cbfc18
diff --git a/metadata/md5-cache/media-gfx/digikam-7.3.0 b/metadata/md5-cache/media-gfx/digikam-7.3.0
new file mode 100644
index 000000000000..d1421ca877b5
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/digikam-7.3.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.14.3 sys-devel/gettext panorama? ( sys-devel/bison sys-devel/flex ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
+DEPEND=dev-libs/expat >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[-gles2-only] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[mysql?] >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=media-gfx/exiv2-0.27:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= >=media-libs/opencv-3.3.0:=[contrib,contribdnn] media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-frameworks/kcontacts-5.74.0:5 ) calendar? ( >=kde-frameworks/kcalendarcore-5.74.0:5 ) gphoto2? ( media-libs/libgphoto2:= ) heif? ( media-libs/x265:= ) imagemagick? ( media-gfx/imagemagick:= ) lensfun? ( media-libs/lensfun ) marble? ( >=dev-qt/qtconcurrent-5.15.2:5 >=kde-apps/marble-19.04.3:5 >=kde-frameworks/kbookmarks-5.74.0:5 ) mediaplayer? ( media-libs/qtav[opengl(+)] media-video/ffmpeg:= ) opengl? ( >=dev-qt/qtopengl-5.15.2:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.74.0:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) dev-cpp/eigen:3 dev-libs/boost[threads(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Digital photo management application
+EAPI=7
+HOMEPAGE=https://www.digikam.org/
+IUSE=addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[-gles2-only] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[mysql?] >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=media-gfx/exiv2-0.27:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= >=media-libs/opencv-3.3.0:=[contrib,contribdnn] media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-frameworks/kcontacts-5.74.0:5 ) calendar? ( >=kde-frameworks/kcalendarcore-5.74.0:5 ) gphoto2? ( media-libs/libgphoto2:= ) heif? ( media-libs/x265:= ) imagemagick? ( media-gfx/imagemagick:= ) lensfun? ( media-libs/lensfun ) marble? ( >=dev-qt/qtconcurrent-5.15.2:5 >=kde-apps/marble-19.04.3:5 >=kde-frameworks/kbookmarks-5.74.0:5 ) mediaplayer? ( media-libs/qtav[opengl(+)] media-video/ffmpeg:= ) opengl? ( >=dev-qt/qtopengl-5.15.2:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.74.0:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) mysql? ( virtual/mysql[server(+)] ) panorama? ( media-gfx/hugin ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/digikam/7.3.0/digikam-7.3.0.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=77429eca10bbe2fdcc82467a4f88af11
diff --git a/metadata/md5-cache/media-gfx/fbgrab-1.3 b/metadata/md5-cache/media-gfx/fbgrab-1.3
index d532f286647c..860f956b5109 100644
--- a/metadata/md5-cache/media-gfx/fbgrab-1.3
+++ b/metadata/md5-cache/media-gfx/fbgrab-1.3
@@ -3,10 +3,10 @@ DEPEND=media-libs/libpng:= sys-libs/zlib
 DESCRIPTION=Framebuffer screenshot utility
 EAPI=7
 HOMEPAGE=https://fbgrab.monells.se/
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:= sys-libs/zlib
 SLOT=0
 SRC_URI=https://fbgrab.monells.se/fbgrab-1.3.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0fa3e3328c45cb68ca87ed4d40b175f2
+_md5_=bf355437735ea51b09b63dbfa27a63a6
diff --git a/metadata/md5-cache/media-gfx/fotoxx-21.41 b/metadata/md5-cache/media-gfx/fotoxx-21.41
index e65c64966dc0..668e7a84ac52 100644
--- a/metadata/md5-cache/media-gfx/fotoxx-21.41
+++ b/metadata/md5-cache/media-gfx/fotoxx-21.41
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] virtual/jpeg x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-21.41.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0956d368f32dc6ba7a1c28cbf005f64a
diff --git a/metadata/md5-cache/media-gfx/fotoxx-21.44 b/metadata/md5-cache/media-gfx/fotoxx-21.44
index 6df0608d3899..0fe2817f6f6c 100644
--- a/metadata/md5-cache/media-gfx/fotoxx-21.44
+++ b/metadata/md5-cache/media-gfx/fotoxx-21.44
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] virtual/jpeg x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-21.44.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4dea35aa773696ef57af1e6798530643
diff --git a/metadata/md5-cache/media-gfx/fotoxx-21.50 b/metadata/md5-cache/media-gfx/fotoxx-21.50
new file mode 100644
index 000000000000..f711735aeeaf
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/fotoxx-21.50
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] virtual/jpeg x11-libs/gtk+:3
+DESCRIPTION=Program for improving image files made with a digital camera
+EAPI=7
+HOMEPAGE=https://kornelix.net/fotoxx/fotoxx.html
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=media-libs/clutter media-libs/clutter-gtk media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 media-libs/libchamplain[gtk] virtual/jpeg x11-libs/gtk+:3 media-gfx/dcraw media-libs/exiftool x11-misc/xdg-utils
+SLOT=0
+SRC_URI=https://kornelix.net/downloads/downloads/fotoxx-21.50.tar.gz
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4dea35aa773696ef57af1e6798530643
diff --git a/metadata/md5-cache/media-gfx/freecad-0.19.2-r3 b/metadata/md5-cache/media-gfx/freecad-0.19.2-r3
index ac9aa27ece62..91ca46417631 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.19.2-r3
+++ b/metadata/md5-cache/media-gfx/freecad-0.19.2-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/refs/tags/0.19.2.tar.gz -> freecad-0.19.2.tar.gz https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ad9ede25b5de64f01f972eeff7a50b64
diff --git a/metadata/md5-cache/media-gfx/freecad-9999 b/metadata/md5-cache/media-gfx/freecad-9999
index 9c6a2baac7ad..7a7202c40fe4 100644
--- a/metadata/md5-cache/media-gfx/freecad-9999
+++ b/metadata/md5-cache/media-gfx/freecad-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) inspection? ( points ) path? ( robot ) ship? ( image plot )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=85f405db388280c4d2be989833026835
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029 b/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
index 5f0bc744a1f9..1c89b6ad3940 100644
--- a/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
+++ b/metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fract4d/gnofract4d/archive/3e3893b0ee381098418d7b28997f6b861c53eff1.tar.gz -> gnofract4d-4.3_p20201029.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=46cb8b11ba30ed7619219d8dc1373fc9
diff --git a/metadata/md5-cache/media-gfx/gscan2pdf-2.11.1 b/metadata/md5-cache/media-gfx/gscan2pdf-2.11.1
index 39eb2ca18786..17e4761bef9f 100644
--- a/metadata/md5-cache/media-gfx/gscan2pdf-2.11.1
+++ b/metadata/md5-cache/media-gfx/gscan2pdf-2.11.1
@@ -11,5 +11,5 @@ RDEPEND=dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/F
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gscan2pdf/gscan2pdf-2.11.1.tar.xz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9a3fd779e1dc5498835cb9f4d043d8f0
diff --git a/metadata/md5-cache/media-gfx/gscan2pdf-2.9.1 b/metadata/md5-cache/media-gfx/gscan2pdf-2.9.1
index 33a0535f8cb2..8309116850b4 100644
--- a/metadata/md5-cache/media-gfx/gscan2pdf-2.9.1
+++ b/metadata/md5-cache/media-gfx/gscan2pdf-2.9.1
@@ -11,5 +11,5 @@ RDEPEND=dev-perl/Config-General dev-perl/Data-UUID dev-perl/Date-Calc dev-perl/F
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gscan2pdf/gscan2pdf-2.9.1.tar.xz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6f5de6397f9343da8b894751b4beb739
diff --git a/metadata/md5-cache/media-gfx/hugin-2020.0.0-r1 b/metadata/md5-cache/media-gfx/hugin-2020.0.0-r1
index 5169069be39c..456249c9c7e3 100644
--- a/metadata/md5-cache/media-gfx/hugin-2020.0.0-r1
+++ b/metadata/md5-cache/media-gfx/hugin-2020.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=med
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/hugin-2020.0.0.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9f7af1545ded7ccc4a2196d0d164c0d0
diff --git a/metadata/md5-cache/media-gfx/hugin-9999 b/metadata/md5-cache/media-gfx/hugin-9999
index bf3dbe55d280..f47688c7fa87 100644
--- a/metadata/md5-cache/media-gfx/hugin-9999
+++ b/metadata/md5-cache/media-gfx/hugin-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	mercurial	d9b8e6c09ecb32dd80eb36f50f27b157	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	mercurial	d9b8e6c09ecb32dd80eb36f50f27b157	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=044ed3f7ed585c69b8f2820e64e1ec4f
diff --git a/metadata/md5-cache/media-gfx/hydrus-444 b/metadata/md5-cache/media-gfx/hydrus-444
deleted file mode 100644
index 3d48a697df13..000000000000
--- a/metadata/md5-cache/media-gfx/hydrus-444
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
-DEFINED_PHASES=compile install postinst prepare setup test
-DESCRIPTION=A booru-like media organizer for the desktop
-EAPI=7
-HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-IUSE=+mpv +ffmpeg +lz4 socks +cloudscraper charts test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
-LICENSE=WTFPL-2 CC-BY-2.5
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v444.tar.gz -> hydrus-444.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8c2c1946f7f41395f09c8f2993f7b8cb
diff --git a/metadata/md5-cache/media-gfx/hydrus-445 b/metadata/md5-cache/media-gfx/hydrus-445
index c71d9e6a29ed..45e9e8898234 100644
--- a/metadata/md5-cache/media-gfx/hydrus-445
+++ b/metadata/md5-cache/media-gfx/hydrus-445
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install postinst prepare setup test
 DESCRIPTION=A booru-like media organizer for the desktop
 EAPI=7
 HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-IUSE=+mpv +ffmpeg +lz4 socks +cloudscraper charts test python_single_target_python3_8 python_single_target_python3_9
+IUSE=+cloudscraper +ffmpeg +lz4 charts socks test +mpv python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64
 LICENSE=WTFPL-2 CC-BY-2.5
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) )
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v445.tar.gz -> hydrus-445.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b447e14f2d6a375bd5b111f056c3ef5a
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=45e93ebdbd0ccab1f96fc30a4d4d9c05
diff --git a/metadata/md5-cache/media-gfx/hydrus-446 b/metadata/md5-cache/media-gfx/hydrus-446
index c32ed9bd69d4..933d93b79a29 100644
--- a/metadata/md5-cache/media-gfx/hydrus-446
+++ b/metadata/md5-cache/media-gfx/hydrus-446
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install postinst prepare setup test
 DESCRIPTION=A booru-like media organizer for the desktop
 EAPI=7
 HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-IUSE=+mpv +ffmpeg +lz4 socks +cloudscraper charts test python_single_target_python3_8 python_single_target_python3_9
+IUSE=+cloudscraper +ffmpeg +lz4 charts socks test +mpv python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64
 LICENSE=WTFPL-2 CC-BY-2.5
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) )
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v446.tar.gz -> hydrus-446.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b447e14f2d6a375bd5b111f056c3ef5a
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=45e93ebdbd0ccab1f96fc30a4d4d9c05
diff --git a/metadata/md5-cache/media-gfx/hydrus-447 b/metadata/md5-cache/media-gfx/hydrus-447
index eb9fe6df1c39..cd844f9cdc04 100644
--- a/metadata/md5-cache/media-gfx/hydrus-447
+++ b/metadata/md5-cache/media-gfx/hydrus-447
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install postinst prepare setup test
 DESCRIPTION=A booru-like media organizer for the desktop
 EAPI=7
 HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-IUSE=+mpv +ffmpeg +lz4 socks +cloudscraper charts test python_single_target_python3_8 python_single_target_python3_9
+IUSE=+cloudscraper +ffmpeg +lz4 charts socks test +mpv python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64
 LICENSE=WTFPL-2 CC-BY-2.5
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) )
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v447.tar.gz -> hydrus-447.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b447e14f2d6a375bd5b111f056c3ef5a
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=45e93ebdbd0ccab1f96fc30a4d4d9c05
diff --git a/metadata/md5-cache/media-gfx/hydrus-448 b/metadata/md5-cache/media-gfx/hydrus-448
new file mode 100644
index 000000000000..0fe29ca99bed
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hydrus-448
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
+DEFINED_PHASES=compile install postinst prepare setup test
+DESCRIPTION=A booru-like media organizer for the desktop
+EAPI=7
+HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
+IUSE=+cloudscraper +ffmpeg +lz4 charts socks test +mpv python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=WTFPL-2 CC-BY-2.5
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v448.tar.gz -> hydrus-448.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=45e93ebdbd0ccab1f96fc30a4d4d9c05
diff --git a/metadata/md5-cache/media-gfx/hydrus-9999 b/metadata/md5-cache/media-gfx/hydrus-9999
index e8dac65894ed..57821436b3c0 100644
--- a/metadata/md5-cache/media-gfx/hydrus-9999
+++ b/metadata/md5-cache/media-gfx/hydrus-9999
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile install postinst prepare setup test unpack
 DESCRIPTION=A booru-like media organizer for the desktop
 EAPI=7
 HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-IUSE=+mpv +ffmpeg +lz4 socks +cloudscraper charts test python_single_target_python3_8 python_single_target_python3_9
+IUSE=+cloudscraper +ffmpeg +lz4 charts socks test +mpv python_single_target_python3_8 python_single_target_python3_9
 LICENSE=WTFPL-2 CC-BY-2.5
 PROPERTIES=live
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b447e14f2d6a375bd5b111f056c3ef5a
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=45e93ebdbd0ccab1f96fc30a4d4d9c05
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.17 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.17
deleted file mode 100644
index 68e6cdb23c99..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/6.9.11-60
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-17.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc2ef5a551779a18c7aa34433ba40bd6
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.19 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.19
index 6c957702e6ce..2f37c5fd54b6 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.19
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.19
@@ -5,7 +5,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6.9.11-60
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-19.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0829eaf775ae9235270afdf62a2f3db3
+_md5_=fc2ef5a551779a18c7aa34433ba40bd6
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.2 b/metadata/md5-cache/media-gfx/imagemagick-7.1.0.2
deleted file mode 100644
index d91e9e18d72a..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] X? ( x11-base/xorg-proto )
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=7
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
-RESTRICT=!test? ( test )
-SLOT=0/7.1.0-0
-SRC_URI=mirror://imagemagick/ImageMagick-7.1.0-2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b86d4a7c194e22e0f51aa5f8db3e4c0f
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.4 b/metadata/md5-cache/media-gfx/imagemagick-7.1.0.4
index 8735134dacfa..d433a9fa5b4d 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.1.0.4
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.1.0.4
@@ -5,7 +5,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7.1.0-0
 SRC_URI=mirror://imagemagick/ImageMagick-7.1.0-4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=98a788e6ec6294d3fba4f460511ca0a0
+_md5_=b86d4a7c194e22e0f51aa5f8db3e4c0f
diff --git a/metadata/md5-cache/media-gfx/imv-4.3.0 b/metadata/md5-cache/media-gfx/imv-4.3.0
new file mode 100644
index 000000000000..7114530e5869
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imv-4.3.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/asciidoc wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/glib:2 dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/cairo x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils X? ( x11-base/xorg-proto ) test? ( dev-util/cmocka ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Minimal image viewer designed for tiling window manager users
+EAPI=7
+HOMEPAGE=https://github.com/eXeC64/imv/
+IUSE=+X +freeimage gif heif jpeg png svg test tiff wayland
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT-with-advertising
+RDEPEND=dev-libs/glib:2 dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/cairo x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils
+REQUIRED_USE=|| ( X wayland )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/eXeC64/imv/archive/v4.3.0.tar.gz -> imv-4.3.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4a451058bcfd33ff3b7bafe88e1b6f45
diff --git a/metadata/md5-cache/media-gfx/imv-9999 b/metadata/md5-cache/media-gfx/imv-9999
index 9941cb33373b..e274891b0612 100644
--- a/metadata/md5-cache/media-gfx/imv-9999
+++ b/metadata/md5-cache/media-gfx/imv-9999
@@ -1,15 +1,15 @@
 BDEPEND=app-text/asciidoc wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils test? ( dev-util/cmocka ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/glib:2 dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/cairo x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils X? ( x11-base/xorg-proto ) test? ( dev-util/cmocka ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Minimal image viewer designed for tiling window manager users
 EAPI=7
-HOMEPAGE=https://github.com/eXeC64/imv
+HOMEPAGE=https://github.com/eXeC64/imv/
 IUSE=+X +freeimage gif heif jpeg png svg test tiff wayland
 LICENSE=MIT-with-advertising
 PROPERTIES=live
-RDEPEND=dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils
+RDEPEND=dev-libs/glib:2 dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] x11-libs/cairo x11-libs/libxkbcommon[X?] x11-libs/pango X? ( x11-libs/libX11 x11-libs/libxcb:= ) freeimage? ( media-libs/freeimage ) gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44 ) tiff? ( media-libs/tiff ) wayland? ( dev-libs/wayland ) !sys-apps/renameutils
 REQUIRED_USE=|| ( X wayland )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e568affbe27cde18d7838e2a321d5bb0
+_md5_=4a451058bcfd33ff3b7bafe88e1b6f45
diff --git a/metadata/md5-cache/media-gfx/prusaslicer-2.3.1-r1 b/metadata/md5-cache/media-gfx/prusaslicer-2.3.1-r1
index 8032ec6f8aa6..83ab0cd863be 100644
--- a/metadata/md5-cache/media-gfx/prusaslicer-2.3.1-r1
+++ b/metadata/md5-cache/media-gfx/prusaslicer-2.3.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( gui )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prusa3d/PrusaSlicer/archive/version_2.3.1.tar.gz -> prusaslicer-2.3.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=114d91dee827d08a5906645cc319124a
diff --git a/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1 b/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1
index a0f46091364f..fdaf8ea62c1e 100644
--- a/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1
+++ b/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Utility to convert raster images to EPS, PDF and many others
 EAPI=7
 HOMEPAGE=https://github.com/pts/sam2p
 IUSE=examples gif
-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 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pts/sam2p/archive/b953f63307c4a83fa4615a4863e3fb250205cd98.tar.gz -> sam2p-0.49.4_p20190718.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d6b6fd1ac87ecddc2267e3d40920b516
+_md5_=d3769ff6bab94ad1d0571859667016b9
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.31-r2 b/metadata/md5-cache/media-gfx/sane-backends-1.0.31-r2
index 94ac2e7a0264..9f1ca6ff81e9 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.31-r2
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.31-r2
@@ -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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 public-domain
 RDEPEND=acct-group/scanner acct-user/saned gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_escl? ( app-text/poppler[cairo] || ( net-dns/avahi[dbus] net-dns/avahi[gtk] ) net-dns/avahi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snmp? ( net-analyzer/net-snmp:0= ) systemd? ( sys-apps/systemd:0= ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sane_backends_escl? ( zeroconf ) sane_backends_kvs40xx? ( threads ) sane_backends_mustek_usb2? ( threads )
 SLOT=0
 SRC_URI=https://gitlab.com/sane-project/backends/-/archive/1.0.31/backends-1.0.31.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7c594e0ff5ba0917dcafcfb7b0c10d25
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3e971c3b9f54f1798e33ec69092a5da8
diff --git a/metadata/md5-cache/media-gfx/tintii-2.10.0-r1 b/metadata/md5-cache/media-gfx/tintii-2.10.0-r1
index f0210b145402..eb2b8849a368 100644
--- a/metadata/md5-cache/media-gfx/tintii-2.10.0-r1
+++ b/metadata/md5-cache/media-gfx/tintii-2.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0-gtk3[X]
 SLOT=0
 SRC_URI=https://www.indii.org/files/tint/releases/tintii-2.10.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=09ead99955b8d11e970f7f0cbdef4007
diff --git a/metadata/md5-cache/media-gfx/tuxpaint-0.9.24 b/metadata/md5-cache/media-gfx/tuxpaint-0.9.24
index a049cd889ca2..7586acd9456e 100644
--- a/metadata/md5-cache/media-gfx/tuxpaint-0.9.24
+++ b/metadata/md5-cache/media-gfx/tuxpaint-0.9.24
@@ -9,5 +9,5 @@ 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.24.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b3176e18405a5c2bb5fef17db1ce8017
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 769773d1c968..cd754a7fa4e7 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/ctl-1.5.2-r2 b/metadata/md5-cache/media-libs/ctl-1.5.2-r2
new file mode 100644
index 000000000000..68c642c89ee1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/ctl-1.5.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/ilmbase:= media-libs/openexr:0= media-libs/tiff:= !media-libs/openexr_ctl virtual/pkgconfig
+DESCRIPTION=AMPAS' Color Transformation Language
+EAPI=7
+HOMEPAGE=https://github.com/ampas/CTL
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=AMPAS
+RDEPEND=media-libs/ilmbase:= media-libs/openexr:0= media-libs/tiff:= !media-libs/openexr_ctl
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ampas/CTL/archive/ctl-1.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=54251adad18c50b3989f5b2d6e88d77c
diff --git a/metadata/md5-cache/media-libs/dav1d-0.9.0 b/metadata/md5-cache/media-libs/dav1d-0.9.0
index 7ab4e7800de1..2f523584c3a0 100644
--- a/metadata/md5-cache/media-libs/dav1d-0.9.0
+++ b/metadata/md5-cache/media-libs/dav1d-0.9.0
@@ -4,9 +4,9 @@ DESCRIPTION=dav1d is an AV1 Decoder :)
 EAPI=7
 HOMEPAGE=https://code.videolan.org/videolan/dav1d
 IUSE=+8bit +10bit +asm abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD-2
 SLOT=0/5
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.9.0/dav1d-0.9.0.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4a8d9fe7a9ab28a5c8fda3dd916ca8b9
+_md5_=0063a44d10ebf61d452628a6496def09
diff --git a/metadata/md5-cache/media-libs/dav1d-0.9.1 b/metadata/md5-cache/media-libs/dav1d-0.9.1
new file mode 100644
index 000000000000..159bbb165baa
--- /dev/null
+++ b/metadata/md5-cache/media-libs/dav1d-0.9.1
@@ -0,0 +1,12 @@
+BDEPEND=asm? ( abi_x86_32? ( >=dev-lang/nasm-2.14.02 ) abi_x86_64? ( >=dev-lang/nasm-2.14.02 ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=dav1d is an AV1 Decoder :)
+EAPI=7
+HOMEPAGE=https://code.videolan.org/videolan/dav1d
+IUSE=+8bit +10bit +asm abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD-2
+SLOT=0/5
+SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.9.1/dav1d-0.9.1.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b663553450e69c80b861e4e5f5c7f595
diff --git a/metadata/md5-cache/media-libs/dav1d-9999 b/metadata/md5-cache/media-libs/dav1d-9999
index d4194211ef86..8267e2262044 100644
--- a/metadata/md5-cache/media-libs/dav1d-9999
+++ b/metadata/md5-cache/media-libs/dav1d-9999
@@ -8,4 +8,4 @@ LICENSE=BSD-2
 PROPERTIES=live
 SLOT=0/5
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4a8d9fe7a9ab28a5c8fda3dd916ca8b9
+_md5_=b663553450e69c80b861e4e5f5c7f595
diff --git a/metadata/md5-cache/media-libs/embree-3.13.0 b/metadata/md5-cache/media-libs/embree-3.13.0
deleted file mode 100644
index e3eff373f54f..000000000000
--- a/metadata/md5-cache/media-libs/embree-3.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ispc? ( dev-lang/ispc ) >=media-libs/glfw-3.2.1 tbb? ( dev-cpp/tbb ) tutorial? ( >=media-libs/libpng-1.6.34:0= >=media-libs/openimageio-1.8.7 virtual/jpeg:0 ) virtual/opengl
-DESCRIPTION=Collection of high-performance ray tracing kernels
-EAPI=7
-HOMEPAGE=https://github.com/embree/embree
-IUSE=+compact-polys ispc +raymask ssp +tbb tutorial static-libs cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512dq kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ispc? ( dev-lang/ispc ) >=media-libs/glfw-3.2.1 tbb? ( dev-cpp/tbb ) tutorial? ( >=media-libs/libpng-1.6.34:0= >=media-libs/openimageio-1.8.7 virtual/jpeg:0 ) virtual/opengl
-RESTRICT=mirror
-SLOT=3
-SRC_URI=https://github.com/embree/embree/archive/v3.13.0.tar.gz -> embree-3.13.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c30acdf85ca8cea4d9b84cbe1fc91f3b
diff --git a/metadata/md5-cache/media-libs/embree-3.13.0-r1 b/metadata/md5-cache/media-libs/embree-3.13.0-r1
new file mode 100644
index 000000000000..efb2a61e6cc5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/embree-3.13.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=media-libs/glfw-3.2.1 virtual/opengl ispc? ( dev-lang/ispc ) tbb? ( dev-cpp/tbb ) tutorial? ( >=media-libs/libpng-1.6.34:0= >=media-libs/openimageio-1.8.7:0= virtual/jpeg:0 )
+DESCRIPTION=Collection of high-performance ray tracing kernels
+EAPI=7
+HOMEPAGE=https://github.com/embree/embree
+IUSE=+compact-polys ispc +raymask ssp +tbb tutorial static-libs cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512dq kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=media-libs/glfw-3.2.1 virtual/opengl ispc? ( dev-lang/ispc ) tbb? ( dev-cpp/tbb ) tutorial? ( >=media-libs/libpng-1.6.34:0= >=media-libs/openimageio-1.8.7:0= virtual/jpeg:0 )
+RESTRICT=mirror
+SLOT=3
+SRC_URI=https://github.com/embree/embree/archive/v3.13.0.tar.gz -> embree-3.13.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=53a2a1989c2eb9748519017c247e566a
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.30 b/metadata/md5-cache/media-libs/gegl-0.4.30
index 8464fe6d9799..32a508ccafd9 100644
--- a/metadata/md5-cache/media-libs/gegl-0.4.30
+++ b/metadata/md5-cache/media-libs/gegl-0.4.30
@@ -12,5 +12,5 @@ REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0.4
 SRC_URI=https://download.gimp.org/pub/gegl/0.4/gegl-0.4.30.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f0f5373aa4c03f259ba0ffe987f8ee7d
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index 477dd79bafe0..fe062d4fc5d9 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.
 REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0.4
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1f9d341871403fcd3ca1f6f60d104a00
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.18.4 b/metadata/md5-cache/media-libs/gst-plugins-base-1.18.4
index 9805eaea45d8..e2b5f770f58d 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.18.4
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.18.4
@@ -5,7 +5,7 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X 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 nls test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[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/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] 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(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[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/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] 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(-)?] ) !<media-libs/gst-plugins-bad-1.15.0:1.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a342268c262236ad14273a3cbbe6577c
+_md5_=f3d31ede2266db97a22fc5225b419af0
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.18.4 b/metadata/md5-cache/media-libs/gstreamer-1.18.4
index dac08b4fff9e..76e7e038fd7f 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.18.4
+++ b/metadata/md5-cache/media-libs/gstreamer-1.18.4
@@ -5,11 +5,11 @@ DESCRIPTION=Open source multimedia framework
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+caps +introspection +orc unwind 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 nls test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=caps? ( 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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_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/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	956686fa43366466d24297919a26ad72	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d0e8785d881b9409fdd48bc541a711f8
+_md5_=a244bfac45eeaa2aa77fedc0ef286b51
diff --git a/metadata/md5-cache/media-libs/hamlib-4.2 b/metadata/md5-cache/media-libs/hamlib-4.2
index 31bcb3cc248a..887e394d6287 100644
--- a/metadata/md5-cache/media-libs/hamlib-4.2
+++ b/metadata/md5-cache/media-libs/hamlib-4.2
@@ -5,7 +5,7 @@ DESCRIPTION=Ham radio backend rig control libraries
 EAPI=7
 HOMEPAGE=https://www.hamlib.org
 IUSE=doc perl python tcl python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2 GPL-2
 RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/4.2
 SRC_URI=mirror://sourceforge/hamlib/hamlib-4.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b7640e1b1f831d5c9cf48f6ae4ee866c
+_md5_=e6728bd3c383800771dff1e1b4cde20a
diff --git a/metadata/md5-cache/media-libs/ilmbase-2.5.7 b/metadata/md5-cache/media-libs/ilmbase-2.5.7
index b8e643193805..d688ed2509a7 100644
--- a/metadata/md5-cache/media-libs/ilmbase-2.5.7
+++ b/metadata/md5-cache/media-libs/ilmbase-2.5.7
@@ -4,10 +4,10 @@ DESCRIPTION=OpenEXR ILM Base libraries
 EAPI=7
 HOMEPAGE=https://www.openexr.com/
 IUSE=large-stack static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.7.tar.gz -> ilmbase-2.5.7.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e46892770921b054350795b818b56800
+_md5_=f9456120d081fc8309ad72e138725640
diff --git a/metadata/md5-cache/media-libs/intel-mediasdk-20.3.0 b/metadata/md5-cache/media-libs/intel-mediasdk-20.3.0
deleted file mode 100644
index 5878179c5104..000000000000
--- a/metadata/md5-cache/media-libs/intel-mediasdk-20.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-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	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7822f6cc7716df0bc9d845b781816420
diff --git a/metadata/md5-cache/media-libs/intel-mediasdk-20.3.0-r1 b/metadata/md5-cache/media-libs/intel-mediasdk-20.3.0-r1
new file mode 100644
index 000000000000..ffa6dce3ef78
--- /dev/null
+++ b/metadata/md5-cache/media-libs/intel-mediasdk-20.3.0-r1
@@ -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 x11-libs/libdrm[video_cards_intel]
+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 x11-libs/libdrm[video_cards_intel]
+SLOT=0
+SRC_URI=https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-20.3.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=03c50f79e78f8cb67ef5f4518028c1ce
diff --git a/metadata/md5-cache/media-libs/intel-mediasdk-9999 b/metadata/md5-cache/media-libs/intel-mediasdk-9999
index 5599a857fd08..8a8a64afe4e4 100644
--- a/metadata/md5-cache/media-libs/intel-mediasdk-9999
+++ b/metadata/md5-cache/media-libs/intel-mediasdk-9999
@@ -1,12 +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
+DEPEND=>=x11-libs/libva-intel-media-driver-9999 x11-libs/libdrm[video_cards_intel]
 DESCRIPTION=Intel Media SDK
 EAPI=7
 HOMEPAGE=http://mediasdk.intel.com
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=x11-libs/libva-intel-media-driver-9999
+RDEPEND=>=x11-libs/libva-intel-media-driver-9999 x11-libs/libdrm[video_cards_intel]
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7822f6cc7716df0bc9d845b781816420
+_md5_=153724e27df4fc33130186f6041748e0
diff --git a/metadata/md5-cache/media-libs/libao-1.2.2-r1 b/metadata/md5-cache/media-libs/libao-1.2.2-r1
deleted file mode 100644
index 3de98700b948..000000000000
--- a/metadata/md5-cache/media-libs/libao-1.2.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=The Audio Output library
-EAPI=7
-HOMEPAGE=https://www.xiph.org/ao/
-IUSE=alsa nas mmap 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
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/xiph/libao/archive/1.2.2.tar.gz -> libao-1.2.2.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=95fa34e05a1616c1625ab3b8883f9ee9
diff --git a/metadata/md5-cache/media-libs/libao-1.2.2-r2 b/metadata/md5-cache/media-libs/libao-1.2.2-r2
index 8d78337f3abf..d5b344218f98 100644
--- a/metadata/md5-cache/media-libs/libao-1.2.2-r2
+++ b/metadata/md5-cache/media-libs/libao-1.2.2-r2
@@ -5,10 +5,10 @@ DESCRIPTION=The Audio Output library
 EAPI=7
 HOMEPAGE=https://www.xiph.org/ao/
 IUSE=alsa nas mmap pulseaudio sndio abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:= )
 SLOT=0
 SRC_URI=https://github.com/xiph/libao/archive/1.2.2.tar.gz -> libao-1.2.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=681050e411b237935a937dac2c16150e
+_md5_=f35df0da98ba980cd62f7c97bca6810e
diff --git a/metadata/md5-cache/media-libs/libaom-3.1.1 b/metadata/md5-cache/media-libs/libaom-3.1.1
index 91b342224fc4..6afba11978f1 100644
--- a/metadata/md5-cache/media-libs/libaom-3.1.1
+++ b/metadata/md5-cache/media-libs/libaom-3.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Alliance for Open Media AV1 Codec SDK
 EAPI=7
 HOMEPAGE=https://aomedia.org
 IUSE=doc examples cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD-2
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0/3
 SRC_URI=https://storage.googleapis.com/aom-releases/libaom-3.1.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=62889c9eac3d4571291c6fd9db01eb97
+_md5_=9f2411cf6a1284b76bf6c3e634f3c222
diff --git a/metadata/md5-cache/media-libs/libavif-0.9.2 b/metadata/md5-cache/media-libs/libavif-0.9.2
index 2c010ae52169..24ad0c3a7f1a 100644
--- a/metadata/md5-cache/media-libs/libavif-0.9.2
+++ b/metadata/md5-cache/media-libs/libavif-0.9.2
@@ -5,11 +5,11 @@ DESCRIPTION=Library for encoding and decoding .avif files
 EAPI=7
 HOMEPAGE=https://github.com/AOMediaCodec/libavif
 IUSE=+aom dav1d examples extras gdk-pixbuf rav1e svt-av1 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=media-libs/libpng[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aom? ( >=media-libs/libaom-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(-)?] ) dav1d? ( media-libs/dav1d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( media-video/rav1e[capi] ) svt-av1? ( >=media-libs/svt-av1-0.8.6 )
 REQUIRED_USE=|| ( aom dav1d )
 SLOT=0
 SRC_URI=https://github.com/AOMediaCodec/libavif/archive/v0.9.2.tar.gz -> libavif-0.9.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2684fb0753a1ab70b45aa41b27a32ff7
+_md5_=59447e0eb7206f8c30442cceb92e2a30
diff --git a/metadata/md5-cache/media-libs/libde265-1.0.8 b/metadata/md5-cache/media-libs/libde265-1.0.8
index e6e40a9287d1..f54788bad4a3 100644
--- a/metadata/md5-cache/media-libs/libde265-1.0.8
+++ b/metadata/md5-cache/media-libs/libde265-1.0.8
@@ -5,10 +5,10 @@ DESCRIPTION=Open h.265 video codec implementation
 EAPI=7
 HOMEPAGE=https://github.com/strukturag/libde265
 IUSE=enc265 dec265 sdl tools debug cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=dec265? ( sdl? ( media-libs/libsdl ) )
 SLOT=0
 SRC_URI=https://github.com/strukturag/libde265/archive/v1.0.8.tar.gz -> libde265-1.0.8.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1c740c1ad23b0ce071f70b28a568fe67
+_md5_=a1ac44855afd9e61da09bea672e1dd53
diff --git a/metadata/md5-cache/media-libs/libdvbcsa-1.1.0-r1 b/metadata/md5-cache/media-libs/libdvbcsa-1.1.0-r1
index cd20e214c260..103b04191a49 100644
--- a/metadata/md5-cache/media-libs/libdvbcsa-1.1.0-r1
+++ b/metadata/md5-cache/media-libs/libdvbcsa-1.1.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Free implementation of the DVB Common Scrambling Algorithm - DVB/CSA
 EAPI=7
 HOMEPAGE=https://www.videolan.org/developers/libdvbcsa.html
 IUSE=cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse2 debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3238c53c21ba010f5ce7f69bcdc56423
+_md5_=695375f56fee0f2747d42784878cafb4
diff --git a/metadata/md5-cache/media-libs/libhdhomerun-20200521 b/metadata/md5-cache/media-libs/libhdhomerun-20200521
index 59b5a0da759a..54e7a1f4bce3 100644
--- a/metadata/md5-cache/media-libs/libhdhomerun-20200521
+++ b/metadata/md5-cache/media-libs/libhdhomerun-20200521
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=SiliconDust HDHomeRun Utilties
 EAPI=7
 HOMEPAGE=https://www.silicondust.com/support/linux/
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://download.silicondust.com/hdhomerun/libhdhomerun_20200521.tgz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b00b83c7791d8f77a8b74b33b51be50a
+_md5_=e4713b2fb78c22d9cc77160e2d2e0317
diff --git a/metadata/md5-cache/media-libs/libheif-1.12.0 b/metadata/md5-cache/media-libs/libheif-1.12.0
index 0e9d48a01af8..fdbd83aac2a5 100644
--- a/metadata/md5-cache/media-libs/libheif-1.12.0
+++ b/metadata/md5-cache/media-libs/libheif-1.12.0
@@ -5,7 +5,7 @@ DESCRIPTION=ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
 EAPI=7
 HOMEPAGE=https://github.com/strukturag/libheif
 IUSE=+aom gdk-pixbuf go libde265 rav1e test +threads x265 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=media-libs/dav1d:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aom? ( >=media-libs/libaom-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(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) libde265? ( media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( media-video/rav1e:= ) x265? ( media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( go libde265 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.12
 SRC_URI=https://github.com/strukturag/libheif/releases/download/v1.12.0/libheif-1.12.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c18d9b8b56fbda1c88460e257adaad2d
+_md5_=58e255c17d557a70e60d958b5b56cede
diff --git a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20210302-r1 b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20210302-r1
deleted file mode 100644
index feebe587b30e..000000000000
--- a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20210302-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/opus:= alsa? ( media-libs/alsa-lib ) dsp? ( media-libs/tg_owt ) pulseaudio? ( media-sound/pulseaudio )
-DESCRIPTION=VoIP library for Telegram clients
-EAPI=7
-HOMEPAGE=https://github.com/telegramdesktop/libtgvoip
-IUSE=+dsp +alsa pulseaudio
-KEYWORDS=amd64 ~ppc64
-LICENSE=Unlicense
-RDEPEND=media-libs/opus:= alsa? ( media-libs/alsa-lib ) dsp? ( media-libs/tg_owt ) pulseaudio? ( media-sound/pulseaudio )
-REQUIRED_USE=|| ( alsa pulseaudio )
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/libtgvoip/archive/0c0a6e476df58ee441490da72ca7a32f83e68dbd.tar.gz -> libtgvoip-2.4.4_p20210302.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f734cad484ffb10ecfcb52a34483ffc4
diff --git a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20210302-r2 b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20210302-r2
index 17dbfb90ee04..5b960f4372b7 100644
--- a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20210302-r2
+++ b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20210302-r2
@@ -5,11 +5,11 @@ DESCRIPTION=VoIP library for Telegram clients
 EAPI=7
 HOMEPAGE=https://github.com/telegramdesktop/libtgvoip
 IUSE=+dsp +alsa pulseaudio
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=Unlicense
 RDEPEND=media-libs/opus:= alsa? ( media-libs/alsa-lib ) dsp? ( media-libs/tg_owt:= ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=|| ( alsa pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/libtgvoip/archive/0c0a6e476df58ee441490da72ca7a32f83e68dbd.tar.gz -> libtgvoip-2.4.4_p20210302.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3bd6338abe1607385cc0d3c2c2ac294d
+_md5_=9a3f69a2cb0674d7188e254220d34781
diff --git a/metadata/md5-cache/media-libs/libv4l-1.20.0 b/metadata/md5-cache/media-libs/libv4l-1.20.0
index f07cae386b91..f31be8e4f6e3 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.20.0
+++ b/metadata/md5-cache/media-libs/libv4l-1.20.0
@@ -5,10 +5,10 @@ DESCRIPTION=Separate libraries ebuild from upstream v4l-utils package
 EAPI=7
 HOMEPAGE=https://git.linuxtv.org/v4l-utils.git
 IUSE=dvb jpeg kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~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=LGPL-2.1+
 RDEPEND=dvb? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !elibc_glibc? ( sys-libs/argp-standalone ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0/0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.20.0.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e8533e27223ff6686f042fb6fbfeef81
+_md5_=df272e05d47d820a7066aa56dedcf2fa
diff --git a/metadata/md5-cache/media-libs/libzmf-9999 b/metadata/md5-cache/media-libs/libzmf-9999
index 89ac76ab9ad9..17e70686646c 100644
--- a/metadata/md5-cache/media-libs/libzmf-9999
+++ b/metadata/md5-cache/media-libs/libzmf-9999
@@ -1,7 +1,8 @@
+BDEPEND=doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/libpng:0= sys-libs/zlib dev-libs/boost doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/libpng:0= sys-libs/zlib dev-libs/boost test? ( dev-util/cppunit )
 DESCRIPTION=Library for parsing Zoner Callisto/Draw documents
-EAPI=6
+EAPI=8
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libzmf
 IUSE=debug doc test tools
 LICENSE=MPL-2.0
@@ -9,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/libpng:0= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=160823f87ce5e44aeeb37f9601ef4381
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fac0a453513156bb2ae3e703d89b07ce
diff --git a/metadata/md5-cache/media-libs/mesa-21.1.6 b/metadata/md5-cache/media-libs/mesa-21.1.6
new file mode 100644
index 000000000000..115b2edf36db
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-21.1.6
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install pretend setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.105[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.105[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.105[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.105[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=7
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.105[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.105[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.105[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.105[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.105[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) vulkan? ( dri3 video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mesa3d.org/mesa-21.1.6.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8f8184f75367677c0999642b0428df02
diff --git a/metadata/md5-cache/media-libs/mesa-21.2.0 b/metadata/md5-cache/media-libs/mesa-21.2.0
new file mode 100644
index 000000000000..d2b5692e0e97
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-21.2.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install pretend setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.107[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=7
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.107[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) )
+REQUIRED_USE=d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mesa3d.org/mesa-21.2.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e24b415d3cc2980a34921ee2f5876e34
diff --git a/metadata/md5-cache/media-libs/mlt-7.0.1 b/metadata/md5-cache/media-libs/mlt-7.0.1
new file mode 100644
index 000000000000..c48c3a72d382
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mlt-7.0.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=media-libs/libebur128-1.2.2:= ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) 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 ) ) opencv? ( >=media-libs/opencv-4.5.1:= ) opengl? ( media-video/movit ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif sci-libs/fftw:3.0= x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) vidstab? ( media-libs/vidstab ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
+DESCRIPTION=Open source multimedia framework for television broadcasting
+EAPI=7
+HOMEPAGE=https://www.mltframework.org/
+IUSE=debug ffmpeg frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=>=media-libs/libebur128-1.2.2:= ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) 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 ) ) opencv? ( >=media-libs/opencv-4.5.1:= ) opengl? ( media-video/movit ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif sci-libs/fftw:3.0= x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) vidstab? ( media-libs/vidstab ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
+REQUIRED_USE=lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=test
+SLOT=0/7
+SRC_URI=https://github.com/mltframework/mlt/releases/download/v7.0.1/mlt-7.0.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua	2afa2308593141ae89672d1c2b96f9e8	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e446fd3f84371a825c847b2029b1bd6b
diff --git a/metadata/md5-cache/media-libs/openexr-2.5.7 b/metadata/md5-cache/media-libs/openexr-2.5.7
index 4bff14368ed7..69f65abc3332 100644
--- a/metadata/md5-cache/media-libs/openexr-2.5.7
+++ b/metadata/md5-cache/media-libs/openexr-2.5.7
@@ -5,11 +5,11 @@ DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
 EAPI=7
 HOMEPAGE=https://www.openexr.com/
 IUSE=cpu_flags_x86_avx doc examples static-libs utils test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=~media-libs/ilmbase-2.5.7:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.7.tar.gz -> openexr-2.5.7.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7a479b226e1aa200cf6195dd1209e5a1
+_md5_=110d7030212900d2844647eb62b2cd6a
diff --git a/metadata/md5-cache/media-libs/portaudio-19.06.00-r3 b/metadata/md5-cache/media-libs/portaudio-19.06.00-r3
deleted file mode 100644
index dd9a294b239c..000000000000
--- a/metadata/md5-cache/media-libs/portaudio-19.06.00-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=A free, cross-platform, open-source, audio I/O library
-EAPI=7
-HOMEPAGE=http://www.portaudio.com/
-IUSE=alsa +cxx debug doc jack oss static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=http://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	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=97579cee7604e0aeddae405eca790920
diff --git a/metadata/md5-cache/media-libs/portaudio-19.07.00-r2 b/metadata/md5-cache/media-libs/portaudio-19.07.00-r2
index 83546121d503..10880a245a56 100644
--- a/metadata/md5-cache/media-libs/portaudio-19.07.00-r2
+++ b/metadata/md5-cache/media-libs/portaudio-19.07.00-r2
@@ -5,10 +5,10 @@ DESCRIPTION=A free, cross-platform, open-source, audio I/O library
 EAPI=7
 HOMEPAGE=http://www.portaudio.com/
 IUSE=alsa +cxx debug doc jack oss static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://files.portaudio.com/archives/pa_stable_v190700_20210406.tgz https://dev.gentoo.org/~sam/distfiles/media-libs/portaudio/portaudio-19.07.00-audacity.patch.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea3aee35bd082c474c1ee98437e58959
+_md5_=3dcb8aef218325ce044a2c57f2737c36
diff --git a/metadata/md5-cache/media-libs/raptor-2.0.15-r3 b/metadata/md5-cache/media-libs/raptor-2.0.15-r3
deleted file mode 100644
index 5433900330a3..000000000000
--- a/metadata/md5-cache/media-libs/raptor-2.0.15-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=sys-devel/bison-3 >=sys-devel/flex-2.5.36 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libxml2 dev-libs/libxslt curl? ( net-misc/curl ) json? ( dev-libs/yajl ) unicode? ( dev-libs/icu:= )
-DESCRIPTION=The RDF Parser Toolkit
-EAPI=7
-HOMEPAGE=http://librdf.org/raptor/
-IUSE=+curl debug json static-libs unicode
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt curl? ( net-misc/curl ) json? ( dev-libs/yajl ) unicode? ( dev-libs/icu:= ) !media-libs/raptor:0
-SLOT=2
-SRC_URI=http://download.librdf.org/source/raptor2-2.0.15.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=185c2c523437d499dec9f3c0d66a29a9
diff --git a/metadata/md5-cache/media-libs/raptor-2.0.15-r4 b/metadata/md5-cache/media-libs/raptor-2.0.15-r4
index 0a70f919e930..0c02751409ae 100644
--- a/metadata/md5-cache/media-libs/raptor-2.0.15-r4
+++ b/metadata/md5-cache/media-libs/raptor-2.0.15-r4
@@ -5,10 +5,10 @@ DESCRIPTION=The RDF Parser Toolkit
 EAPI=7
 HOMEPAGE=http://librdf.org/raptor/
 IUSE=+curl debug json 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=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(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) json? ( dev-libs/yajl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( 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(-)?] ) !media-libs/raptor:0
 SLOT=2
 SRC_URI=http://download.librdf.org/source/raptor2-2.0.15.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8efe58a7082b4ba59d373ddab092c6e9
+_md5_=a0589b9d78c99e08a23cf87ee999241f
diff --git a/metadata/md5-cache/media-libs/rnnoise-0.4.1_p20210122 b/metadata/md5-cache/media-libs/rnnoise-0.4.1_p20210122
index 3b2e62cfdf8e..36f5089820eb 100644
--- a/metadata/md5-cache/media-libs/rnnoise-0.4.1_p20210122
+++ b/metadata/md5-cache/media-libs/rnnoise-0.4.1_p20210122
@@ -4,9 +4,9 @@ DESCRIPTION=Recurrent neural network for audio noise reduction
 EAPI=7
 HOMEPAGE=https://jmvalin.ca/demo/rnnoise/ https://gitlab.xiph.org/xiph/rnnoise
 IUSE=doc
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://gitlab.xiph.org/xiph/rnnoise/-/archive/1cbdbcf1283499bbb2230a6b0f126eb9b236defd/rnnoise-1cbdbcf1283499bbb2230a6b0f126eb9b236defd.tar.gz -> rnnoise-0.4.1_p20210122.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8948b78270b7bf78c0ab4f5154e2aa03
+_md5_=955e59b3223376b118335adcf9070b01
diff --git a/metadata/md5-cache/media-libs/shaderc-2021.0 b/metadata/md5-cache/media-libs/shaderc-2021.0
index 8d1d2ec5447c..5d63800f3330 100644
--- a/metadata/md5-cache/media-libs/shaderc-2021.0
+++ b/metadata/md5-cache/media-libs/shaderc-2021.0
@@ -5,11 +5,11 @@ DESCRIPTION=Collection of tools, libraries and tests for shader compilation
 EAPI=7
 HOMEPAGE=https://github.com/google/shaderc
 IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-util/glslang-11.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-tools-2021.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(-)?]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/shaderc/archive/bdd134d1b7eca01925c1919d2ea05fd3cd6843c7.tar.gz -> shaderc-2021.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=73aa1a2b917fba44c08234ac610b3061
+_md5_=2e30c166992e576bf40e091a62c6ce62
diff --git a/metadata/md5-cache/media-libs/smpeg-0.4.4-r11 b/metadata/md5-cache/media-libs/smpeg-0.4.4-r11
new file mode 100644
index 000000000000..9dfefc4596be
--- /dev/null
+++ b/metadata/md5-cache/media-libs/smpeg-0.4.4-r11
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libsdl[opengl?,sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] )
+DESCRIPTION=SDL MPEG Player Library
+EAPI=8
+HOMEPAGE=https://icculus.org/smpeg/
+IUSE=cpu_flags_x86_mmx 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=media-libs/libsdl[opengl?,sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://mirrors.dotsrc.org/lokigames/open-source/smpeg/smpeg-0.4.4.tar.gz mirror://gentoo/smpeg-0.4.4-gtkm4.patch.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=db4c07c92c97fc2a09ca435a2a230cc4
diff --git a/metadata/md5-cache/media-libs/smpeg2-2.0.0-r4 b/metadata/md5-cache/media-libs/smpeg2-2.0.0-r4
new file mode 100644
index 000000000000..8b01bfcb2d3f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/smpeg2-2.0.0-r4
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)?]
+DESCRIPTION=SDL MPEG Player Library
+EAPI=8
+HOMEPAGE=https://icculus.org/smpeg/
+IUSE=cpu_flags_x86_mmx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=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(-)?]
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/smpeg-2.0.0.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e7b7f275e25e6357b4422a3828155ac3
diff --git a/metadata/md5-cache/media-libs/svt-av1-0.8.6 b/metadata/md5-cache/media-libs/svt-av1-0.8.6
index c26b09d242cc..ffdc3d4e7751 100644
--- a/metadata/md5-cache/media-libs/svt-av1-0.8.6
+++ b/metadata/md5-cache/media-libs/svt-av1-0.8.6
@@ -4,9 +4,9 @@ DEPEND=amd64? ( dev-lang/yasm )
 DESCRIPTION=Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)
 EAPI=7
 HOMEPAGE=https://github.com/AOMediaCodec/SVT-AV1
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc -x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc -x86
 LICENSE=BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT
 SLOT=0
 SRC_URI=https://github.com/AOMediaCodec/SVT-AV1/archive/v0.8.6.tar.gz -> svt-av1-0.8.6.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c47d192c4b45f5a481accdbd50e411d4
+_md5_=34b4b422ea8f96a923725695b65dc7e7
diff --git a/metadata/md5-cache/media-libs/tg_owt-0_pre20210422 b/metadata/md5-cache/media-libs/tg_owt-0_pre20210422
deleted file mode 100644
index 2bdcf8e1803d..000000000000
--- a/metadata/md5-cache/media-libs/tg_owt-0_pre20210422
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-cpp/abseil-cpp:=[cxx17(+)] dev-libs/libevent:= dev-libs/openssl:= dev-libs/protobuf:= media-libs/libjpeg-turbo:= >=media-libs/libvpx-1.10.0:= media-libs/openh264:= media-libs/opus media-video/ffmpeg:= net-libs/usrsctp
-DESCRIPTION=WebRTC build for Telegram
-EAPI=7
-HOMEPAGE=https://github.com/desktop-app/tg_owt
-KEYWORDS=amd64 ~ppc64
-LICENSE=BSD
-RDEPEND=dev-cpp/abseil-cpp:=[cxx17(+)] dev-libs/libevent:= dev-libs/openssl:= dev-libs/protobuf:= media-libs/libjpeg-turbo:= >=media-libs/libvpx-1.10.0:= media-libs/openh264:= media-libs/opus media-video/ffmpeg:= net-libs/usrsctp
-SLOT=0
-SRC_URI=https://github.com/desktop-app/tg_owt/archive/18cb4cd9bb4c2f5f5f5e760ec808f74c302bc1bf.tar.gz -> tg_owt-0_pre20210422.tar.gz https://archive.org/download/libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar/libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2f1431c98653b0a95fbef558bfc848b3
diff --git a/metadata/md5-cache/media-libs/tg_owt-0_pre20210626 b/metadata/md5-cache/media-libs/tg_owt-0_pre20210626
index a330283bb79d..b9144c0fd7aa 100644
--- a/metadata/md5-cache/media-libs/tg_owt-0_pre20210626
+++ b/metadata/md5-cache/media-libs/tg_owt-0_pre20210626
@@ -5,11 +5,11 @@ DESCRIPTION=WebRTC build for Telegram
 EAPI=7
 HOMEPAGE=https://github.com/desktop-app/tg_owt
 IUSE=+alsa pulseaudio screencast +X
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=BSD
 RDEPEND=dev-cpp/abseil-cpp:=[cxx17(+)] dev-libs/libevent:= dev-libs/openssl:= dev-libs/protobuf:= media-libs/libjpeg-turbo:= >=media-libs/libvpx-1.10.0:= media-libs/openh264:= media-libs/opus media-video/ffmpeg:= net-libs/usrsctp alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) screencast? ( dev-libs/glib:2 media-video/pipewire:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst )
 REQUIRED_USE=pulseaudio? ( alsa )
 SLOT=0/20210626
 SRC_URI=https://github.com/desktop-app/tg_owt/archive/91d836dc84a16584c6ac52b36c04c0de504d9c34.tar.gz -> tg_owt-0_pre20210626.tar.gz https://archive.org/download/libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar/libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4d9e84407cbefa2628e5472770717d8c
+_md5_=3b35a0071bffdf1f549d96d235c53ee4
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.2.162 b/metadata/md5-cache/media-libs/vulkan-layers-1.2.162
deleted file mode 100644
index 770a6c4438cf..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.2.162
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/glslang-10.11.0.0_pre20201216:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-tools-2020.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/vulkan-headers-1.2.162 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] )
-DESCRIPTION=Vulkan Validation Layers
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
-IUSE=wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v1.2.162.tar.gz -> vulkan-layers-1.2.162.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1cda22396dd57c5de0a0935b77d27334
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.2.170 b/metadata/md5-cache/media-libs/vulkan-layers-1.2.170
deleted file mode 100644
index 96b59437b389..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.2.170
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/glslang-11.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(-)?] >=dev-util/spirv-tools-2021.0_pre20210327:=[abi_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/vulkan-headers-1.2.170 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] )
-DESCRIPTION=Vulkan Validation Layers
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
-IUSE=wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v1.2.170.tar.gz -> vulkan-layers-1.2.170.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c791e907270761539a9fcda1f32c4887
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.2.179 b/metadata/md5-cache/media-libs/vulkan-layers-1.2.179
deleted file mode 100644
index c4ccd9bca680..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.2.179
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-util/spirv-tools-2021.0_pre20210526:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-cpp/robin-hood-hashing >=dev-util/glslang-11.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/vulkan-headers-1.2.179 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] )
-DESCRIPTION=Vulkan Validation Layers
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
-IUSE=wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv
-LICENSE=Apache-2.0
-RDEPEND=>=dev-util/spirv-tools-2021.0_pre20210526:=[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/KhronosGroup/Vulkan-ValidationLayers/archive/v1.2.179.tar.gz -> vulkan-layers-1.2.179.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a9f510845fc249a74ce949ea3b71133a
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.2.182 b/metadata/md5-cache/media-libs/vulkan-layers-1.2.182
index 53cba9d12534..495832c30f5f 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.2.182
+++ b/metadata/md5-cache/media-libs/vulkan-layers-1.2.182
@@ -5,10 +5,10 @@ DESCRIPTION=Vulkan Validation Layers
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
 IUSE=wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-util/spirv-tools-2021.0_pre20210526:=[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/KhronosGroup/Vulkan-ValidationLayers/archive/v1.2.182.tar.gz -> vulkan-layers-1.2.182.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=265592bdb7d5dcdf02a17833e548f5f1
+_md5_=0fc0837b1522145c59864cfa99b697c7
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.2.162-r1 b/metadata/md5-cache/media-libs/vulkan-loader-1.2.162-r1
deleted file mode 100644
index 8f982888a32f..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.2.162-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) ~dev-util/vulkan-headers-1.2.162 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] )
-DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
-IUSE=layers wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-PDEPEND=layers? ( media-libs/vulkan-layers:=[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/KhronosGroup/Vulkan-Loader/archive/v1.2.162.tar.gz -> vulkan-loader-1.2.162.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8abf2e433ea70532297bed1951d538c1
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.2.170 b/metadata/md5-cache/media-libs/vulkan-loader-1.2.170
deleted file mode 100644
index 77e80f9b6f3f..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.2.170
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) ~dev-util/vulkan-headers-1.2.170 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] )
-DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
-IUSE=layers wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-PDEPEND=layers? ( media-libs/vulkan-layers:=[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/KhronosGroup/Vulkan-Loader/archive/v1.2.170.tar.gz -> vulkan-loader-1.2.170.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=55de25fbbf3840c5aa125c6970a58611
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.2.179 b/metadata/md5-cache/media-libs/vulkan-loader-1.2.179
deleted file mode 100644
index 4cf894efcf2a..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.2.179
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=~dev-util/vulkan-headers-1.2.179 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] )
-DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
-IUSE=layers wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv
-LICENSE=Apache-2.0
-PDEPEND=layers? ( media-libs/vulkan-layers:=[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/KhronosGroup/Vulkan-Loader/archive/v1.2.179.tar.gz -> vulkan-loader-1.2.179.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1cca03cd2f4cb47d4fa6dc1463a147a8
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.2.182 b/metadata/md5-cache/media-libs/vulkan-loader-1.2.182
index 99bf2713c89d..cc7131bb9aa4 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.2.182
+++ b/metadata/md5-cache/media-libs/vulkan-loader-1.2.182
@@ -5,10 +5,10 @@ DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
 IUSE=layers wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 PDEPEND=layers? ( media-libs/vulkan-layers:=[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/KhronosGroup/Vulkan-Loader/archive/v1.2.182.tar.gz -> vulkan-loader-1.2.182.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=26e1897e5a76395c31583176f7ff9cfa
+_md5_=36db96a2dc18b84bc35c5f544b4cf1a2
diff --git a/metadata/md5-cache/media-libs/wxsvg-1.5.11 b/metadata/md5-cache/media-libs/wxsvg-1.5.11
index 6994a79ea068..a4b1583fc422 100644
--- a/metadata/md5-cache/media-libs/wxsvg-1.5.11
+++ b/metadata/md5-cache/media-libs/wxsvg-1.5.11
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3
 RDEPEND=>=dev-libs/expat-2:= media-libs/libexif:= >=dev-libs/glib-2.28:2= dev-libs/libxml2:= media-libs/fontconfig:= media-libs/freetype:2= x11-libs/cairo:= x11-libs/pango:= x11-libs/wxGTK:3.0=[X] >=media-video/ffmpeg-2.6:0=
 SLOT=0/3
 SRC_URI=mirror://sourceforge/wxsvg/wxsvg-1.5.11.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=bc1fa1eaa6e243ccbcb38c1ea20942f6
diff --git a/metadata/md5-cache/media-libs/x265-3.4 b/metadata/md5-cache/media-libs/x265-3.4
index 86280dcd6f7f..9e31e050f8cf 100644
--- a/metadata/md5-cache/media-libs/x265-3.4
+++ b/metadata/md5-cache/media-libs/x265-3.4
@@ -5,11 +5,11 @@ DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
 EAPI=7
 HOMEPAGE=http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home
 IUSE=+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/192
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_3.4.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=540f913fe9b359251303df2f31b18c4c
+_md5_=bbd92966ad2b6b71260842cd6737ae20
diff --git a/metadata/md5-cache/media-libs/x265-3.5 b/metadata/md5-cache/media-libs/x265-3.5
new file mode 100644
index 000000000000..a1c65472bb8b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/x265-3.5
@@ -0,0 +1,15 @@
+BDEPEND=abi_x86_32? ( >=dev-lang/nasm-2.13 ) abi_x86_64? ( >=dev-lang/nasm-2.13 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
+EAPI=7
+HOMEPAGE=http://x265.org/ https://bitbucket.org/multicoreware/x265_git/
+IUSE=+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/199
+SRC_URI=https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=59348ca1bc3ffdaa256f5bd3498dcfb8
diff --git a/metadata/md5-cache/media-libs/x265-9999 b/metadata/md5-cache/media-libs/x265-9999
index f6989a7f300a..1473a3de9310 100644
--- a/metadata/md5-cache/media-libs/x265-9999
+++ b/metadata/md5-cache/media-libs/x265-9999
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
 EAPI=7
-HOMEPAGE=http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home
+HOMEPAGE=http://x265.org/ https://bitbucket.org/multicoreware/x265_git/
 IUSE=+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
-SLOT=0/195
+SLOT=0/199
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a0179b7244c7247ae004c992cf43fa4b
+_md5_=59348ca1bc3ffdaa256f5bd3498dcfb8
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index eb72714d6a59..0cf2b50ea785 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/libvisual-projectm-2.1.0-r1 b/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.0-r1
index 454195839a35..01694aada6b6 100644
--- a/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.0-r1
+++ b/metadata/md5-cache/media-plugins/libvisual-projectm-2.1.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libprojectm-2.1.0 media-libs/libsdl =media-libs/libvisual-0.4* virtual/opengl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=media-libs/libprojectm-3.1.12:0= media-libs/libsdl =media-libs/libvisual-0.4* virtual/opengl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A libvisual graphical music visualization plugin similar to milkdrop
 EAPI=6
 HOMEPAGE=http://projectm.sourceforge.net
 IUSE=debug
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2
-RDEPEND=>=media-libs/libprojectm-2.1.0 media-libs/libsdl =media-libs/libvisual-0.4* virtual/opengl
+RDEPEND=>=media-libs/libprojectm-3.1.12:0= media-libs/libsdl =media-libs/libvisual-0.4* virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/projectm/projectM-complete-2.1.0-Source.tar.gz
 _eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8f86fe139523cf36f7e767c5eb8071ea
+_md5_=e7afe1f46ffc4286e8bfd2a2ee060ccc
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index dcdeaeef7ed2..fb65f1deb65f 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.4.0 b/metadata/md5-cache/media-radio/cqrlog-2.4.0
index 6fb12e1448f9..a44c30b97b04 100644
--- a/metadata/md5-cache/media-radio/cqrlog-2.4.0
+++ b/metadata/md5-cache/media-radio/cqrlog-2.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lazarus-1.8.0 >=dev-lang/fpc-3.0.2 dev-libs/atk dev-libs/glib virtual/mysql[server] 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.4.0.tar.gz -> cqrlog-2.4.0.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=40c1a82aeaeb987dc266112eda8dab12
diff --git a/metadata/md5-cache/media-radio/fldigi-4.1.20 b/metadata/md5-cache/media-radio/fldigi-4.1.20
new file mode 100644
index 000000000000..8002f7bf6759
--- /dev/null
+++ b/metadata/md5-cache/media-radio/fldigi-4.1.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl || ( media-libs/portaudio[oss] media-libs/portaudio[alsa] ) hamlib? ( media-libs/hamlib:= ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10 nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
+EAPI=8
+HOMEPAGE=http://www.w1hkj.com
+IUSE=hamlib nls pulseaudio cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl || ( media-libs/portaudio[oss] media-libs/portaudio[alsa] ) hamlib? ( media-libs/hamlib:= ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10
+SLOT=0
+SRC_URI=mirror://sourceforge/fldigi/fldigi-4.1.20.tar.gz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3ab9c01e82da21878b2f79b5440401b9
diff --git a/metadata/md5-cache/media-radio/flrig-1.4.2 b/metadata/md5-cache/media-radio/flrig-1.4.2
new file mode 100644
index 000000000000..5348c8ce635f
--- /dev/null
+++ b/metadata/md5-cache/media-radio/flrig-1.4.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=-
+DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
+DESCRIPTION=Transceiver control program for Amateur Radio use
+EAPI=8
+HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
+SLOT=0
+SRC_URI=mirror://sourceforge/fldigi/flrig-1.4.2.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3eff9643f93469a54d78c47cd37360a7
diff --git a/metadata/md5-cache/media-radio/qsstv-9.5.8 b/metadata/md5-cache/media-radio/qsstv-9.5.8
new file mode 100644
index 000000000000..bdd340f0023d
--- /dev/null
+++ b/metadata/md5-cache/media-radio/qsstv-9.5.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/hamlib:= media-libs/openjpeg:2 media-libs/alsa-lib media-sound/pulseaudio media-libs/libv4l sci-libs/fftw:3.0= virtual/pkgconfig
+DESCRIPTION=Amateur radio SSTV software
+EAPI=8
+HOMEPAGE=http://users.telenet.be/on4qz/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/hamlib:= media-libs/openjpeg:2 media-libs/alsa-lib media-sound/pulseaudio media-libs/libv4l sci-libs/fftw:3.0= x11-misc/xdg-utils
+SLOT=0
+SRC_URI=http://users.telenet.be/on4qz/qsstv/downloads/qsstv_9.5.8.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=75cc0254dac722109d32983c59e8a977
diff --git a/metadata/md5-cache/media-radio/tlf-1.4.1-r1 b/metadata/md5-cache/media-radio/tlf-1.4.1-r1
index 660dce6a5ad2..0e2e3d908f92 100644
--- a/metadata/md5-cache/media-radio/tlf-1.4.1-r1
+++ b/metadata/md5-cache/media-radio/tlf-1.4.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Console-mode amateur radio contest logger
 EAPI=7
 HOMEPAGE=http://home.iae.nl/users/reinc/TLF-0.2.html
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:= dev-libs/glib:2 media-libs/hamlib:= media-sound/sox dev-libs/xmlrpc-c[curl]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/tlf/tlf-1.4.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=615420cb0a62e111f6d2724a3e038740
+_md5_=45c00e527ec7ac7b255743084f9c6bce
diff --git a/metadata/md5-cache/media-radio/tqsl-2.5.1 b/metadata/md5-cache/media-radio/tqsl-2.5.1
index 2e7e1b74902b..6494e2ae0bfc 100644
--- a/metadata/md5-cache/media-radio/tqsl-2.5.1
+++ b/metadata/md5-cache/media-radio/tqsl-2.5.1
@@ -9,5 +9,5 @@ LICENSE=LOTW
 RDEPEND=dev-libs/expat:= dev-libs/openssl:0= net-misc/curl:= sys-libs/db:= sys-libs/zlib:= x11-libs/wxGTK:3.0=
 SLOT=0
 SRC_URI=https://github.com/rich0/trustedqsl-tqsl/archive/v2.5.1.tar.gz -> tqsl-2.5.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=795e7f99914a7bb0f4e186ae123a3edc
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 43c0f12eadda..6a1be290106d 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/abcmidi-2021.05.25 b/metadata/md5-cache/media-sound/abcmidi-2021.05.25
deleted file mode 100644
index 2f804416a532..000000000000
--- a/metadata/md5-cache/media-sound/abcmidi-2021.05.25
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DESCRIPTION=Programs for processing ABC music notation files
-EAPI=7
-HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2021.05.25.zip
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=99ba473fc477e87c9d9ecde62da02b33
diff --git a/metadata/md5-cache/media-sound/abcmidi-2021.06.27 b/metadata/md5-cache/media-sound/abcmidi-2021.06.27
index 96bf8427b4f8..e4ca9d910e0b 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2021.06.27
+++ b/metadata/md5-cache/media-sound/abcmidi-2021.06.27
@@ -4,9 +4,9 @@ DESCRIPTION=Programs for processing ABC music notation files
 EAPI=7
 HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
 IUSE=examples
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2021.06.27.zip
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=80bec0422105ee6283f6f982e22cad4e
+_md5_=99ba473fc477e87c9d9ecde62da02b33
diff --git a/metadata/md5-cache/media-sound/ardour-6.8 b/metadata/md5-cache/media-sound/ardour-6.8
deleted file mode 100644
index c277e81a4312..000000000000
--- a/metadata/md5-cache/media-sound/ardour-6.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil media-libs/lv2 || ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) dev-util/itstool sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) jack? ( virtual/jack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Digital Audio Workstation
-EAPI=7
-HOMEPAGE=https://ardour.org/
-IUSE=altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil media-libs/lv2
-SLOT=6
-SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/Ardour-6.8.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e6b1de59c7e05a139caf81210adf3119
diff --git a/metadata/md5-cache/media-sound/ardour-6.8-r1 b/metadata/md5-cache/media-sound/ardour-6.8-r1
new file mode 100644
index 000000000000..1eb51d939de9
--- /dev/null
+++ b/metadata/md5-cache/media-sound/ardour-6.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil media-libs/lv2 || ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) dev-util/itstool sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) jack? ( virtual/jack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Digital Audio Workstation
+EAPI=7
+HOMEPAGE=https://ardour.org/
+IUSE=altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil media-libs/lv2
+SLOT=6
+SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/Ardour-6.8.0.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=dc5d8a420f9a6ab3f91b5b55b7294955
diff --git a/metadata/md5-cache/media-sound/ardour-9999 b/metadata/md5-cache/media-sound/ardour-9999
index e337f3011ff1..9310c0f99bf7 100644
--- a/metadata/md5-cache/media-sound/ardour-9999
+++ b/metadata/md5-cache/media-sound/ardour-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil media-libs/lv2
 SLOT=6
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e6b1de59c7e05a139caf81210adf3119
+_md5_=76953bab28f9b1a93af84f52205f9c6f
diff --git a/metadata/md5-cache/media-sound/audacity-2.4.2-r1 b/metadata/md5-cache/media-sound/audacity-2.4.2-r1
index 0ffcf458f24e..00f2b381bef4 100644
--- a/metadata/md5-cache/media-sound/audacity-2.4.2-r1
+++ b/metadata/md5-cache/media-sound/audacity-2.4.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=portmidi? ( portsmf )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/audacity/audacity/archive/Audacity-2.4.2.tar.gz doc? ( https://dev.gentoo.org/~fordfrog/distfiles/audacity-manual-2.4.2.zip )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b52ef3531f2bd6e127f8709b38347042
diff --git a/metadata/md5-cache/media-sound/audiotag-0.19-r1 b/metadata/md5-cache/media-sound/audiotag-0.19-r1
index 0a3eeca6dd0d..a8ae343799eb 100644
--- a/metadata/md5-cache/media-sound/audiotag-0.19-r1
+++ b/metadata/md5-cache/media-sound/audiotag-0.19-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=https://github.com/downloads/Daenyth/audiotag/audiotag-0.19.tar.bz2
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=37bdd7666799fa8204761574d7191a96
diff --git a/metadata/md5-cache/media-sound/beets-1.4.9-r6 b/metadata/md5-cache/media-sound/beets-1.4.9-r6
index 748ba0dd291f..c72ae06a3bb9 100644
--- a/metadata/md5-cache/media-sound/beets-1.4.9-r6
+++ b/metadata/md5-cache/media-sound/beets-1.4.9-r6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/beets/beets-1.4.9.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=009e126ad9b01d05b618eebd9e9f98e4
diff --git a/metadata/md5-cache/media-sound/beets-9999 b/metadata/md5-cache/media-sound/beets-9999
index 913138636e85..aad19bfb2f41 100644
--- a/metadata/md5-cache/media-sound/beets-9999
+++ b/metadata/md5-cache/media-sound/beets-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-python/jellyfish-0.7.1[python_ta
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ce2e64a364e682658a124f87dfbc1c3
diff --git a/metadata/md5-cache/media-sound/cantata-2.4.2 b/metadata/md5-cache/media-sound/cantata-2.4.2
index 7530c2694412..bc53f4f5c631 100644
--- a/metadata/md5-cache/media-sound/cantata-2.4.2
+++ b/metadata/md5-cache/media-sound/cantata-2.4.2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CDrummond/cantata/releases/download/v2.4.2/cantata-2.4.2.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6d02c58f05644518334cb39d2268bd50
+_md5_=675543dfeb82c363f54cd4c71ab6c690
diff --git a/metadata/md5-cache/media-sound/clementine-1.4.0_rc1 b/metadata/md5-cache/media-sound/clementine-1.4.0_rc1
index 324d8b958b98..a83169c71828 100644
--- a/metadata/md5-cache/media-sound/clementine-1.4.0_rc1
+++ b/metadata/md5-cache/media-sound/clementine-1.4.0_rc1
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-cpp/gtest-1.8.0 dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) 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/crypto++:= 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/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 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0:= virtual/opengl ) dev-libs/boost dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++:= 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/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 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-3.1.12:0= virtual/opengl ) dev-libs/boost dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Modern music player and library organizer based on Amarok 1.4 and Qt
 EAPI=7
 HOMEPAGE=https://www.clementine-player.org https://github.com/clementine-player/Clementine
 IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote test
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3
-RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++:= 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/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 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0:= virtual/opengl ) 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 )
+RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++:= 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/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 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-3.1.12:0= virtual/opengl ) 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 ) wiimote? ( dbus )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/clementine-player/Clementine/releases/download/1.4.0rc1/clementine-1.4.0rc1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=03416767a33d101a94915531f1880aef
+_md5_=f032522e2dc7a8be4783edf2dea9874a
diff --git a/metadata/md5-cache/media-sound/clementine-9999 b/metadata/md5-cache/media-sound/clementine-9999
index 5c7d1fb9f4ef..791bcd65ed31 100644
--- a/metadata/md5-cache/media-sound/clementine-9999
+++ b/metadata/md5-cache/media-sound/clementine-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-cpp/gtest-1.8.0 dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++:= 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/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 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0:= virtual/opengl ) dev-libs/boost dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++:= 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/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 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-3.1.12:0= virtual/opengl ) dev-libs/boost dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Modern music player and library organizer based on Amarok 1.4 and Qt
 EAPI=7
 HOMEPAGE=https://www.clementine-player.org https://github.com/clementine-player/Clementine
 IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote test
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++:= 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/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 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0:= virtual/opengl ) 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 )
+RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++:= 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/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 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-3.1.12:0= virtual/opengl ) 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 ) wiimote? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3fc21022ca719ef3f0730991c0453d48
+_md5_=8e8fbe80c2ead5c78ed882fe52cbfd07
diff --git a/metadata/md5-cache/media-sound/cmusfm-0.4.0 b/metadata/md5-cache/media-sound/cmusfm-0.4.0
index 1a2f536091cc..47f3dff9517d 100644
--- a/metadata/md5-cache/media-sound/cmusfm-0.4.0
+++ b/metadata/md5-cache/media-sound/cmusfm-0.4.0
@@ -5,10 +5,10 @@ DESCRIPTION=Last.fm scrobbler for cmus music player
 EAPI=7
 HOMEPAGE=https://github.com/Arkq/cmusfm
 IUSE=libnotify
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=net-misc/curl dev-libs/openssl:0= libnotify? ( x11-libs/libnotify ) media-sound/cmus
 SLOT=0
 SRC_URI=https://github.com/Arkq/cmusfm/archive/v0.4.0.tar.gz -> cmusfm-0.4.0.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=06af4b162ad715190cecd90f35831d1e
+_md5_=f8b54c9de46a647c2792f8db1c190d88
diff --git a/metadata/md5-cache/media-sound/cmusfm-0.4.1 b/metadata/md5-cache/media-sound/cmusfm-0.4.1
new file mode 100644
index 000000000000..e0843aa88845
--- /dev/null
+++ b/metadata/md5-cache/media-sound/cmusfm-0.4.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=net-misc/curl dev-libs/openssl:0= libnotify? ( x11-libs/libnotify )
+DESCRIPTION=Last.fm scrobbler for cmus music player
+EAPI=7
+HOMEPAGE=https://github.com/Arkq/cmusfm
+IUSE=libnotify
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-misc/curl dev-libs/openssl:0= libnotify? ( x11-libs/libnotify ) media-sound/cmus
+SLOT=0
+SRC_URI=https://github.com/Arkq/cmusfm/archive/v0.4.1.tar.gz -> cmusfm-0.4.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=06af4b162ad715190cecd90f35831d1e
diff --git a/metadata/md5-cache/media-sound/csound-6.15.0-r101 b/metadata/md5-cache/media-sound/csound-6.15.0-r101
deleted file mode 100644
index d44eb66c2ebd..000000000000
--- a/metadata/md5-cache/media-sound/csound-6.15.0-r101
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) lua? ( dev-lang/swig ) python? ( dev-lang/swig ) nls? ( sys-devel/gettext ) test? ( dev-util/cunit python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) image? ( media-libs/libpng:0= ) jack? ( virtual/jack ) java? ( >=virtual/jdk-1.8:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= ) dev-libs/boost doc? ( app-arch/unzip )
-DESCRIPTION=Sound design and signal processing system for composition and performance
-EAPI=7
-HOMEPAGE=https://csound.github.io/
-IUSE=+alsa beats chua curl +cxx debug doc double-precision dssi examples fltk +fluidsynth hdf5 +image jack java keyboard linear lua mp3 nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
-RDEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) image? ( media-libs/libpng:0= ) jack? ( virtual/jack ) java? ( >=virtual/jdk-1.8:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= )
-REQUIRED_USE=alsa? ( threads ) java? ( cxx ) linear? ( double-precision ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) cxx ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) cxx )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/csound-6.15.0-distributable.tar.xz doc? ( https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual_html.zip )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fbedbbf9d12c481737a06fd53d494b04
diff --git a/metadata/md5-cache/media-sound/csound-6.16.0 b/metadata/md5-cache/media-sound/csound-6.16.0
deleted file mode 100644
index c2428709d3a4..000000000000
--- a/metadata/md5-cache/media-sound/csound-6.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) lua? ( dev-lang/swig ) python? ( dev-lang/swig ) nls? ( sys-devel/gettext ) test? ( dev-util/cunit python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) jack? ( virtual/jack ) java? ( >=virtual/jdk-1.8:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= ) dev-libs/boost doc? ( app-arch/unzip )
-DESCRIPTION=Sound design and signal processing system for composition and performance
-EAPI=7
-HOMEPAGE=https://csound.github.io/
-IUSE=+alsa beats chua curl +cxx debug doc double-precision dssi examples fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
-RDEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) jack? ( virtual/jack ) java? ( >=virtual/jdk-1.8:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= )
-REQUIRED_USE=alsa? ( threads ) java? ( cxx ) linear? ( double-precision ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) cxx ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) cxx )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/csound-6.16.0-distributable.tar.xz doc? ( https://github.com/csound/csound/releases/download/6.16.0/Csound6.16.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.16.0/Csound6.16.0_manual_html.zip )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5c52edc76e7922fd9c5ef2ec3545ae42
diff --git a/metadata/md5-cache/media-sound/csound-6.16.1 b/metadata/md5-cache/media-sound/csound-6.16.1
index af28af7932fb..052b6cbb1fc3 100644
--- a/metadata/md5-cache/media-sound/csound-6.16.1
+++ b/metadata/md5-cache/media-sound/csound-6.16.1
@@ -5,7 +5,7 @@ DESCRIPTION=Sound design and signal processing system for composition and perfor
 EAPI=7
 HOMEPAGE=https://csound.github.io/
 IUSE=+alsa beats chua curl +cxx debug doc double-precision dssi examples fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
 RDEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) jack? ( virtual/jack ) java? ( >=virtual/jdk-1.8:* ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mp3? ( >=media-sound/lame-3.100-r3 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= )
 REQUIRED_USE=alsa? ( threads ) java? ( cxx ) linear? ( double-precision ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) cxx ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) cxx )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/csound-6.16.1-distributable.tar.xz doc? ( https://github.com/csound/csound/releases/download/6.16.1/Csound6.16.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.16.1/Csound6.16.0_manual_html.zip )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cd0be6b2035b40a858ca9eaff9291715
+_md5_=1df222f7f68a04a823c7f352fb843cac
diff --git a/metadata/md5-cache/media-sound/drumstick-2.2.1 b/metadata/md5-cache/media-sound/drumstick-2.2.1
deleted file mode 100644
index 5a55cd4da890..000000000000
--- a/metadata/md5-cache/media-sound/drumstick-2.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-qt/linguist-tools:5 virtual/pkgconfig x11-misc/shared-mime-info doc? ( app-doc/doxygen[dot] app-text/docbook-xsl-stylesheets ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib fluidsynth? ( media-sound/fluidsynth ) pulseaudio? ( media-sound/pulseaudio ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Qt/C++ wrapper for ALSA sequencer
-EAPI=7
-HOMEPAGE=https://drumstick.sourceforge.io/
-IUSE=doc fluidsynth pulseaudio
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib fluidsynth? ( media-sound/fluidsynth ) pulseaudio? ( media-sound/pulseaudio )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/drumstick/drumstick-2.2.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=274bffbf24e1d199758e4b0b86522642
diff --git a/metadata/md5-cache/media-sound/drumstick-2.3.0 b/metadata/md5-cache/media-sound/drumstick-2.3.0
index 712051613d0f..f9f31ac7778d 100644
--- a/metadata/md5-cache/media-sound/drumstick-2.3.0
+++ b/metadata/md5-cache/media-sound/drumstick-2.3.0
@@ -5,11 +5,11 @@ DESCRIPTION=Qt/C++ wrapper for ALSA sequencer
 EAPI=7
 HOMEPAGE=https://drumstick.sourceforge.io/
 IUSE=doc fluidsynth network pulseaudio
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib fluidsynth? ( media-sound/fluidsynth ) network? ( dev-qt/qtnetwork:5 ) pulseaudio? ( media-sound/pulseaudio )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/drumstick/drumstick-2.3.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=77fb4b118fc56d72795c5a3906cdacd6
+_md5_=e96974edf167842f8a4d7021c5b48123
diff --git a/metadata/md5-cache/media-sound/easyeffects-6.0.3 b/metadata/md5-cache/media-sound/easyeffects-6.0.3
index 569f4dc6267b..96382b8849d4 100644
--- a/metadata/md5-cache/media-sound/easyeffects-6.0.3
+++ b/metadata/md5-cache/media-sound/easyeffects-6.0.3
@@ -1,14 +1,14 @@
 BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/itstool media-libs/libsamplerate sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm pretend test
-DEPEND=>=dev-cpp/glibmm-2.68:2.68 >=dev-cpp/gtkmm-4.2.0:4.0 dev-cpp/nlohmann_json >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-3.0:3 media-libs/libbs2b media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.31 sci-libs/fftw:3.0 >=x11-libs/gtk+-4.2.1:4
+DEPEND=>=dev-cpp/glibmm-2.68:2.68 >=dev-cpp/gtkmm-4.2.0:4.0 dev-cpp/nlohmann_json >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-3.0:3 media-libs/libbs2b media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.31 sci-libs/fftw:3.0 >=gui-libs/gtk-4.2.1:4
 DESCRIPTION=Limiter, auto volume and many other plugins for PipeWire applications
 EAPI=7
 HOMEPAGE=https://github.com/wwmm/easyeffects
 IUSE=calf zamaudio
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-cpp/glibmm-2.68:2.68 >=dev-cpp/gtkmm-4.2.0:4.0 dev-cpp/nlohmann_json >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-3.0:3 media-libs/libbs2b media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.31 sci-libs/fftw:3.0 >=x11-libs/gtk+-4.2.1:4 gnome-extra/yelp >=media-libs/lsp-plugins-1.1.24[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) zamaudio? ( media-plugins/zam-plugins )
+RDEPEND=>=dev-cpp/glibmm-2.68:2.68 >=dev-cpp/gtkmm-4.2.0:4.0 dev-cpp/nlohmann_json >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-3.0:3 media-libs/libbs2b media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.31 sci-libs/fftw:3.0 >=gui-libs/gtk-4.2.1:4 gnome-extra/yelp >=media-libs/lsp-plugins-1.1.24[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) zamaudio? ( media-plugins/zam-plugins )
 SLOT=0
 SRC_URI=https://github.com/wwmm/easyeffects/archive/v6.0.3.tar.gz -> easyeffects-6.0.3.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bb4ec69a9415bae9e07df945ec1358b1
+_md5_=c54f01f7cca02314a54a1a5ae71e7d60
diff --git a/metadata/md5-cache/media-sound/elisa-21.04.3 b/metadata/md5-cache/media-sound/elisa-21.04.3
index ed44998319ef..412c714be883 100644
--- a/metadata/md5-cache/media-sound/elisa-21.04.3
+++ b/metadata/md5-cache/media-sound/elisa-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Simple music player by KDE
 EAPI=7
 HOMEPAGE=https://elisa.kde.org/ https://apps.kde.org/elisa/
 IUSE=mpris semantic-desktop +vlc debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdeclarative-5.80.0:5 >=kde-frameworks/kfilemetadata-5.80.0:5[taglib] >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kirigami-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 mpris? ( >=dev-qt/qtdbus-5.15.2:5 >=kde-frameworks/kdbusaddons-5.80.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.80.0:5 ) vlc? ( media-video/vlc:= ) !vlc? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer] ) >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/elisa-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c2570e0f4a11110a68d09d1603924723
+_md5_=4ebd8601cbc7abfd0f883e4b0a209ceb
diff --git a/metadata/md5-cache/media-sound/flacon-5.5.1 b/metadata/md5-cache/media-sound/flacon-5.5.1
index 8cc36ec24552..f85bdbcbecc3 100644
--- a/metadata/md5-cache/media-sound/flacon-5.5.1
+++ b/metadata/md5-cache/media-sound/flacon-5.5.1
@@ -11,5 +11,5 @@ RDEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flacon/flacon/archive/v5.5.1.tar.gz -> flacon-5.5.1.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=dca4e60c2837b48a79ec7ab556e70184
diff --git a/metadata/md5-cache/media-sound/frescobaldi-3.1.1 b/metadata/md5-cache/media-sound/frescobaldi-3.1.1
deleted file mode 100644
index 0a852747870a..000000000000
--- a/metadata/md5-cache/media-sound/frescobaldi-3.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/PyQt5[gui,network,printsupport,svg,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-ly-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-poppler-qt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=media-sound/lilypond-2.14.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A LilyPond sheet music text editor
-EAPI=7
-HOMEPAGE=https://www.frescobaldi.org/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/PyQt5[gui,network,printsupport,svg,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-ly-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-poppler-qt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=media-sound/lilypond-2.14.2 x11-themes/tango-icon-theme python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/wbsoft/frescobaldi/releases/download/v3.1.1/frescobaldi-3.1.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e8864fd0c029b454f40e26e5d477ad4d
diff --git a/metadata/md5-cache/media-sound/frescobaldi-3.1.3 b/metadata/md5-cache/media-sound/frescobaldi-3.1.3
index 0450965b25b7..ea1f4d060587 100644
--- a/metadata/md5-cache/media-sound/frescobaldi-3.1.3
+++ b/metadata/md5-cache/media-sound/frescobaldi-3.1.3
@@ -5,11 +5,11 @@ DESCRIPTION=A LilyPond sheet music text editor
 EAPI=7
 HOMEPAGE=https://www.frescobaldi.org/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/PyQt5[gui,network,printsupport,svg,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-ly[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-poppler-qt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-sound/lilypond x11-themes/tango-icon-theme python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/wbsoft/frescobaldi/releases/download/v3.1.3/frescobaldi-3.1.3.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=844a10e8b02820040b3cb5ac9d647d1e
+_md5_=a8ab118b986163e074564c968a9acddf
diff --git a/metadata/md5-cache/media-sound/gpodder-3.10.20 b/metadata/md5-cache/media-sound/gpodder-3.10.20
index 259d7e836825..377f61cd1f83 100644
--- a/metadata/md5-cache/media-sound/gpodder-3.10.20
+++ b/metadata/md5-cache/media-sound/gpodder-3.10.20
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gpodder/gpodder/archive/3.10.20.tar.gz -> gpodder-3.10.20.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7cefa96b7bb89c656858564708801825
diff --git a/metadata/md5-cache/media-sound/gpodder-3.10.21 b/metadata/md5-cache/media-sound/gpodder-3.10.21
index 857fce77caa3..654d8b762e73 100644
--- a/metadata/md5-cache/media-sound/gpodder-3.10.21
+++ b/metadata/md5-cache/media-sound/gpodder-3.10.21
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gpodder/gpodder/archive/3.10.21.tar.gz -> gpodder-3.10.21.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7cefa96b7bb89c656858564708801825
diff --git a/metadata/md5-cache/media-sound/guayadeque-0.4.6 b/metadata/md5-cache/media-sound/guayadeque-0.4.6
index 2180813adeaf..688b38e29d01 100644
--- a/metadata/md5-cache/media-sound/guayadeque-0.4.6
+++ b/metadata/md5-cache/media-sound/guayadeque-0.4.6
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-db/wxsqlite3 dev-libs/glib:2 media-libs/flac media-l
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/anonbeat/guayadeque/archive/v0.4.6.tar.gz -> guayadeque-0.4.6.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=882c5be7bd84effa207f7ecb64a52d98
diff --git a/metadata/md5-cache/media-sound/guayadeque-9999 b/metadata/md5-cache/media-sound/guayadeque-9999
index 90b3d7100fa6..2bea454bde6a 100644
--- a/metadata/md5-cache/media-sound/guayadeque-9999
+++ b/metadata/md5-cache/media-sound/guayadeque-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-db/sqlite:3 dev-db/wxsqlite3 dev-libs/glib:2 media-libs/flac media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/taglib net-misc/curl sys-apps/dbus x11-libs/wxGTK:3.0[X] appindicator? ( >=dev-libs/libindicate-0.7 ) ipod? ( media-libs/libgpod ) !minimal? ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-libnice:1.0 media-plugins/gst-plugins-pulse:1.0 media-plugins/gst-plugins-soup:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=19117aa2f8da9718e8c58cb6b8920093
diff --git a/metadata/md5-cache/media-sound/musescore-3.6.2 b/metadata/md5-cache/media-sound/musescore-3.6.2
index f686f02974f1..a001aad0578d 100644
--- a/metadata/md5-cache/media-sound/musescore-3.6.2
+++ b/metadata/md5-cache/media-sound/musescore-3.6.2
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclara
 REQUIRED_USE=portmidi? ( portaudio )
 SLOT=0
 SRC_URI=https://github.com/musescore/MuseScore/archive/v3.6.2.tar.gz -> musescore-3.6.2.tar.gz https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c21143966f0f7bf0e94015b984b55ad9
diff --git a/metadata/md5-cache/media-sound/musescore-9999 b/metadata/md5-cache/media-sound/musescore-9999
index 3ba821cac5b5..a95a5f0feec7 100644
--- a/metadata/md5-cache/media-sound/musescore-9999
+++ b/metadata/md5-cache/media-sound/musescore-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclara
 REQUIRED_USE=portmidi? ( portaudio )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=91eb03d4264a0e5735b88a1dbee914b2
diff --git a/metadata/md5-cache/media-sound/pulseaudio-15.0 b/metadata/md5-cache/media-sound/pulseaudio-15.0
index 3d384c726583..45e18c539db5 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-15.0
+++ b/metadata/md5-cache/media-sound/pulseaudio-15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=alsa-plugin? ( alsa ) bluetooth? ( dbus ) daemon? ( ?? ( elogind sy
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-15.0.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b851dbe8025a143542514be2688c1140
diff --git a/metadata/md5-cache/media-sound/qjackctl-0.9.3 b/metadata/md5-cache/media-sound/qjackctl-0.9.3
deleted file mode 100644
index ff0f3924d514..000000000000
--- a/metadata/md5-cache/media-sound/qjackctl-0.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-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.3.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=125842ef486c033e769164e9dbcd15cd
diff --git a/metadata/md5-cache/media-sound/qjackctl-0.9.4 b/metadata/md5-cache/media-sound/qjackctl-0.9.4
index b4aa00b29ec9..ff02fa87c1fc 100644
--- a/metadata/md5-cache/media-sound/qjackctl-0.9.4
+++ b/metadata/md5-cache/media-sound/qjackctl-0.9.4
@@ -5,10 +5,10 @@ DESCRIPTION=Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer c
 EAPI=7
 HOMEPAGE=https://qjackctl.sourceforge.io/
 IUSE=alsa dbus debug portaudio
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 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.4.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=60191d27e3e51dd5d847b4ec584b9a95
+_md5_=125842ef486c033e769164e9dbcd15cd
diff --git a/metadata/md5-cache/media-sound/qsynth-0.9.4 b/metadata/md5-cache/media-sound/qsynth-0.9.4
index 84bf1f72d0c0..b0f96d218b8e 100644
--- a/metadata/md5-cache/media-sound/qsynth-0.9.4
+++ b/metadata/md5-cache/media-sound/qsynth-0.9.4
@@ -5,11 +5,11 @@ DESCRIPTION=Qt application to control FluidSynth
 EAPI=7
 HOMEPAGE=https://qsynth.sourceforge.io/
 IUSE=+alsa debug jack pulseaudio
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
 REQUIRED_USE=|| ( alsa jack pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/qsynth/qsynth-0.9.4.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=78fc984d2a7ee904a1e547e261786fec
+_md5_=ac230048e2a8030a95d332b26b555a35
diff --git a/metadata/md5-cache/media-sound/sooperlooper-1.7.4 b/metadata/md5-cache/media-sound/sooperlooper-1.7.4
index 332fa87ef6c3..d1eb80b45b4b 100644
--- a/metadata/md5-cache/media-sound/sooperlooper-1.7.4
+++ b/metadata/md5-cache/media-sound/sooperlooper-1.7.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/liblo dev-libs/libsigc++:2 media-libs/libsndfile media-libs/libsamplerate dev-libs/libxml2:2 media-libs/rubberband sci-libs/fftw:3.0= virtual/jack wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 )
 SLOT=0
 SRC_URI=http://essej.net/sooperlooper/sooperlooper-1.7.4.tar.gz mirror://gentoo/sooperlooper-1.6.5-m4.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b2ee1452a7db6ec91348c8a4b1c2bc08
diff --git a/metadata/md5-cache/media-sound/spek-0.8.3-r1 b/metadata/md5-cache/media-sound/spek-0.8.3-r1
index a0196ab081ef..af03c2d12a1e 100644
--- a/metadata/md5-cache/media-sound/spek-0.8.3-r1
+++ b/metadata/md5-cache/media-sound/spek-0.8.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-video/ffmpeg:0= x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=https://github.com/alexkay/spek/archive/0.8.3.tar.gz -> spek-0.8.3.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f432f91b43e4b8f7b9ebccc7ff3054c8
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.26-r1 b/metadata/md5-cache/media-sound/spotify-1.1.26-r1
deleted file mode 100644
index 5ee868f71c31..000000000000
--- a/metadata/md5-cache/media-sound/spotify-1.1.26-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/patchelf-0.10
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Spotify is a social music platform
-EAPI=7
-HOMEPAGE=https://www.spotify.com/download/linux/
-IUSE=libnotify systray pax-kernel pulseaudio
-KEYWORDS=~amd64
-LICENSE=Spotify
-RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? ( x11-libs/libnotify ) dev-libs/openssl:0= media-libs/alsa-lib media-libs/fontconfig media-libs/harfbuzz media-libs/mesa[X(+)] net-misc/curl[ssl] net-print/cups[ssl] pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-sound/apulse ) systray? ( gnome-extra/gnome-integration-spotify ) x11-libs/gtk+:2 app-accessibility/at-spi2-atk x11-libs/libXScrnSaver x11-libs/libXtst
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=10ea72aef1945a2f33eb1fb3f63ed536
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.26-r2 b/metadata/md5-cache/media-sound/spotify-1.1.26-r2
deleted file mode 100644
index 629837ce3ee7..000000000000
--- a/metadata/md5-cache/media-sound/spotify-1.1.26-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/patchelf-0.10
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Spotify is a social music platform
-EAPI=7
-HOMEPAGE=https://www.spotify.com/download/linux/
-IUSE=libnotify systray pax-kernel pulseaudio
-KEYWORDS=~amd64
-LICENSE=Spotify
-RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? ( x11-libs/libnotify ) dev-libs/openssl:0= media-libs/alsa-lib media-libs/fontconfig media-libs/harfbuzz media-libs/mesa[X(+)] net-misc/curl[ssl] net-print/cups[ssl] pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-sound/apulse ) systray? ( gnome-extra/gnome-integration-spotify ) x11-libs/gtk+:2 app-accessibility/at-spi2-atk x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libSM x11-libs/libICE
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.26.501.gbe11e53b-15_amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=28979e0e477399c28ad2a9d7fe756ca1
diff --git a/metadata/md5-cache/media-sound/spotify-1.1.55 b/metadata/md5-cache/media-sound/spotify-1.1.55
deleted file mode 100644
index 04401fb38da4..000000000000
--- a/metadata/md5-cache/media-sound/spotify-1.1.55
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/patchelf-0.10
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Spotify is a social music platform
-EAPI=7
-HOMEPAGE=https://www.spotify.com/download/linux/
-IUSE=libnotify local-playback pax-kernel pulseaudio systray
-KEYWORDS=~amd64
-LICENSE=Spotify
-RDEPEND=dev-libs/nss dev-python/dbus-python dev-python/pygobject:3 libnotify? ( x11-libs/libnotify ) dev-libs/openssl:0= media-libs/alsa-lib media-libs/fontconfig media-libs/harfbuzz media-libs/mesa[X(+)] net-misc/curl[ssl] net-print/cups[ssl] pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-sound/apulse ) local-playback? ( media-video/ffmpeg:0/56.58.58 ) systray? ( gnome-extra/gnome-integration-spotify ) x11-libs/gtk+:2 app-accessibility/at-spi2-atk x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libSM x11-libs/libICE
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.1.55.498.gf9a83c60_amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8a97e632bde978a8f68561d9b6854f16
diff --git a/metadata/md5-cache/media-sound/upmpdcli-1.5.12 b/metadata/md5-cache/media-sound/upmpdcli-1.5.12
new file mode 100644
index 000000000000..0e8abcff4968
--- /dev/null
+++ b/metadata/md5-cache/media-sound/upmpdcli-1.5.12
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst
+DEPEND=dev-libs/jsoncpp media-libs/libmpdclient net-libs/libmicrohttpd net-libs/libupnpp
+DESCRIPTION=UPnP Media Renderer front-end for MPD, the Music Player Daemon
+EAPI=8
+HOMEPAGE=https://www.lesbonscomptes.com/upmpdcli/index.html
+IUSE=thirdparty
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/jsoncpp media-libs/libmpdclient net-libs/libmicrohttpd net-libs/libupnpp acct-group/upmpdcli acct-user/upmpdcli app-misc/recoll thirdparty? ( dev-python/requests )
+SLOT=0
+SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.5.12.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=990ba822ac9b6f3c5785372c6f9e09f7
diff --git a/metadata/md5-cache/media-sound/vmpk-0.8.3 b/metadata/md5-cache/media-sound/vmpk-0.8.3
deleted file mode 100644
index 9a2e1f0911db..000000000000
--- a/metadata/md5-cache/media-sound/vmpk-0.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets 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/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/drumstick x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Virtual MIDI Piano Keyboard
-EAPI=7
-HOMEPAGE=https://vmpk.sourceforge.io/
-IUSE=dbus
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/drumstick x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 ) dev-qt/qtsvg:5
-SLOT=0
-SRC_URI=mirror://sourceforge/vmpk/vmpk-0.8.3.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f139154b5c0478978b8919a2189d1d05
diff --git a/metadata/md5-cache/media-sound/vmpk-0.8.4 b/metadata/md5-cache/media-sound/vmpk-0.8.4
index fce408ac8368..014a76dfca91 100644
--- a/metadata/md5-cache/media-sound/vmpk-0.8.4
+++ b/metadata/md5-cache/media-sound/vmpk-0.8.4
@@ -1,14 +1,14 @@
 BDEPEND=app-text/docbook-xsl-stylesheets 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/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-sound/drumstick-2.3 x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/drumstick x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Virtual MIDI Piano Keyboard
 EAPI=7
 HOMEPAGE=https://vmpk.sourceforge.io/
 IUSE=dbus
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-sound/drumstick-2.3 x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 ) dev-qt/qtsvg:5
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/drumstick x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 ) dev-qt/qtsvg:5
 SLOT=0
 SRC_URI=mirror://sourceforge/vmpk/vmpk-0.8.4.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0eb27c5671e6e70289d34f35f7388699
+_md5_=f139154b5c0478978b8919a2189d1d05
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index a99668d84e1a..e758f20cbc0a 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430 b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
index 7d393dab6b8f..ed3252b07d64 100644
--- a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
+++ b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
@@ -3,8 +3,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Digital TV scan tables in v3 and v5 format
 EAPI=7
 HOMEPAGE=https://linuxtv.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
+KEYWORDS=amd64 ~arm arm64 ~ppc x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2021-04-30-4181e93a30ab.tar.bz2
-_md5_=cb35bb8bb729d7b233ac69563c1c9120
+_md5_=886c59bd4a3f703759d11a86a01044bd
diff --git a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1 b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
index 201828e1c86c..c164a1606f2f 100644
--- a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
+++ b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Small utils for DVB to scan, zap, view signal strength
 EAPI=7
 HOMEPAGE=https://www.linuxtv.org/
 IUSE=alevt usb
-KEYWORDS=amd64 ~arm ~arm64 ppc x86
+KEYWORDS=amd64 ~arm arm64 ppc x86
 LICENSE=GPL-2
 RDEPEND=alevt? ( !media-video/alevt media-libs/libpng:0= media-libs/zvbi[v4l] sys-libs/zlib x11-libs/libX11 ) usb? ( virtual/libusb:0 ) media-tv/dtv-scan-tables
 SLOT=0
 SRC_URI=https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> linuxtv-dvb-apps-1.1.1.20140321.tar.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=aa28777e499ba62e7467e1b9135f79c6
+_md5_=8b6af56187ff5eb4a9df16b1a5144091
diff --git a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2 b/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
index 640990153e00..8cb944e717d8 100644
--- a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
+++ b/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Tvheadend is a TV streaming server and digital video recorder
 EAPI=7
 HOMEPAGE=https://tvheadend.org/
 IUSE=+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf zlib kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-3
 RDEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( media-video/ffmpeg:0= ) hdhomerun? ( media-libs/libhdhomerun ) dev-libs/openssl:0= uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
 REQUIRED_USE=dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )
 SLOT=0
 SRC_URI=https://github.com/tvheadend/tvheadend/archive/v4.2.8.tar.gz -> tvheadend-4.2.8.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=493e6143553324ce20aef0ea7e28a60a
+_md5_=5dc70323a7d69c1c239760d7e76a654d
diff --git a/metadata/md5-cache/media-tv/xmltv-0.6.1 b/metadata/md5-cache/media-tv/xmltv-0.6.1
index 84c562050812..abb5f29fca6d 100644
--- a/metadata/md5-cache/media-tv/xmltv-0.6.1
+++ b/metadata/md5-cache/media-tv/xmltv-0.6.1
@@ -5,10 +5,10 @@ DESCRIPTION=Set of utilities to manage TV listings stored in the XMLTV format
 EAPI=7
 HOMEPAGE=http://wiki.xmltv.org/index.php/XMLTVProject https://github.com/XMLTV/xmltv
 IUSE=ar ch-search dk dtvla eu-dotmedia eu-epgdata eu-xmltvse fi fi-sv fr huro il is it na-dd na-dtv na-tvmedia pt-meo pt-vodafone se-swedb se-tvzon tr tv-check tv-combiner tv-pick-cgi uk-bleb uk-tvguide zz-sdjson zz-sdjson-sqlite
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/File-Slurp dev-perl/JSON dev-perl/libwww-perl dev-perl/Lingua-Preferred dev-perl/PerlIO-gzip dev-perl/Term-ProgressBar dev-perl/TermReadKey dev-perl/XML-Parser dev-perl/XML-TreePP dev-perl/XML-Twig dev-perl/XML-Writer dev-perl/Unicode-String virtual/perl-Memoize virtual/perl-Storable virtual/perl-IO-Compress ar? ( dev-perl/DateTime dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/HTTP-Cookies ) ch-search? ( dev-perl/HTML-Tree dev-perl/HTML-Parser dev-perl/HTTP-Cookies dev-perl/URI ) dk? ( dev-perl/DateTime dev-perl/IO-stringy ) dtvla? ( dev-perl/DateTime dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/HTTP-Cookies ) eu-dotmedia? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy ) eu-epgdata? ( dev-perl/Archive-Zip dev-perl/DateTime dev-perl/DateTime-Format-Strptime dev-perl/HTML-Parser dev-perl/HTTP-Message ) eu-xmltvse? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy ) fi? ( dev-perl/HTML-Tree dev-perl/LWP-Protocol-https dev-perl/URI ) fi-sv? ( dev-perl/DateTime dev-perl/HTML-Tree dev-perl/IO-stringy ) fr? ( dev-perl/DateTime dev-perl/DateTime-TimeZone dev-perl/HTML-Parser dev-perl/HTML-Tree ) huro? ( dev-perl/HTML-Parser dev-perl/HTML-Tree ) il? ( dev-perl/DateTime ) is? ( dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/URI dev-perl/XML-DOM dev-perl/XML-LibXSLT ) it? ( dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/URI ) na-dd? ( dev-perl/SOAP-Lite ) na-dtv? ( dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/URI ) na-tvmedia? ( dev-perl/XML-LibXML ) pt-meo? ( dev-perl/DateTime dev-perl/XML-LibXML ) pt-vodafone? ( dev-perl/DateTime dev-perl/URI dev-perl/XML-LibXML ) se-swedb? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML ) se-tvzon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent ) tr? ( dev-perl/DateTime dev-perl/HTTP-Cache-Transparent dev-perl/HTTP-Cookies dev-perl/URI ) uk-bleb? ( dev-perl/Archive-Zip dev-perl/IO-stringy ) uk-tvguide? ( dev-perl/DateTime dev-perl/HTML-Tree dev-perl/HTTP-Cache-Transparent dev-perl/HTTP-Cookies dev-perl/URI ) zz-sdjson? ( dev-lang/perl dev-perl/DateTime virtual/perl-Digest-SHA dev-perl/HTTP-Message dev-perl/LWP-Protocol-https dev-perl/Try-Tiny ) zz-sdjson-sqlite? ( dev-lang/perl dev-perl/DateTime dev-perl/DateTime-Format-ISO8601 dev-perl/DateTime-Format-SQLite dev-perl/DateTime-TimeZone dev-perl/DBD-SQLite dev-perl/DBI virtual/perl-Digest-SHA dev-perl/File-HomeDir dev-perl/File-Which dev-perl/List-MoreUtils dev-perl/LWP-UserAgent-Determined ) tv-check? ( dev-perl/Tk dev-perl/Tk-TableMatrix ) tv-combiner? ( dev-perl/XML-LibXML ) tv-pick-cgi? ( dev-perl/CGI ) dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/XMLTV/xmltv/archive/v0.6.1.tar.gz -> xmltv-0.6.1.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=1fc8f29d3740f424518fa7e414005349
+_md5_=116bfa48d2642a265abcd434d03b52d2
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 9d2cf4ec2b36..0984504bc791 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/aegisub-3.2.2_p20160518-r102 b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r102
index 7ea9a0f5050a..4b65283a8fc9 100644
--- a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r102
+++ b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit ) || ( alsa openal oss portaudio puls
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Aegisub/Aegisub/archive/b118fe7e7a5c37540e2f0aa75af105e272bad234.tar.gz -> aegisub-3.2.2_p20160518.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3822a61116663e19651b14767f40b23d
diff --git a/metadata/md5-cache/media-video/aegisub-9999 b/metadata/md5-cache/media-video/aegisub-9999
index f49ba8cc5012..6e9b4d96247d 100644
--- a/metadata/md5-cache/media-video/aegisub-9999
+++ b/metadata/md5-cache/media-video/aegisub-9999
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wx
 REQUIRED_USE=^^ ( lua_single_target_luajit ) || ( alsa openal oss portaudio pulseaudio )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9290feed07e02b2d8ded273113ecd770
diff --git a/metadata/md5-cache/media-video/dvdstyler-3.0.4 b/metadata/md5-cache/media-video/dvdstyler-3.0.4
index 67674354ae8c..e18180bc24ed 100644
--- a/metadata/md5-cache/media-video/dvdstyler-3.0.4
+++ b/metadata/md5-cache/media-video/dvdstyler-3.0.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-cdr/cdrtools >=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= >=media-libs/wxsvg-1.5.11:= >=media-video/dvdauthor-0.7.1 >=media-video/ffmpeg-2.6:0=[encode] >=media-video/xine-ui-0.99.7 virtual/jpeg:0 x11-libs/wxGTK:3.0=[gstreamer,X] sys-apps/dbus udev? ( >=virtual/libudev-215:= ) >=app-cdr/dvdisaster-0.72.4 media-video/mjpegtools
 SLOT=0
 SRC_URI=mirror://sourceforge/dvdstyler/DVDStyler-3.0.4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=cf0fcc7a46d09b5e079473cbf496a19e
diff --git a/metadata/md5-cache/media-video/gaupol-1.8-r1 b/metadata/md5-cache/media-video/gaupol-1.8-r1
deleted file mode 100644
index b6c4c3bc0671..000000000000
--- a/metadata/md5-cache/media-video/gaupol-1.8-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=sys-devel/gettext test? ( app-text/iso-codes dev-python/chardet[python_targets_python3_8(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?] x11-libs/gtk+:3[introspection] spell? ( app-text/gspell[introspection] ) app-dicts/myspell-en app-text/enchant[hunspell] app-text/gspell[introspection] dev-python/pytest[python_targets_python3_8(-)?] )
-DESCRIPTION=A subtitle editor for text-based subtitles
-EAPI=7
-HOMEPAGE=https://otsaloma.io/gaupol/
-IUSE=spell test python_targets_python3_8 test
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2+
-RDEPEND=app-text/iso-codes dev-python/chardet[python_targets_python3_8(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?] x11-libs/gtk+:3[introspection] spell? ( app-text/gspell[introspection] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/otsaloma/gaupol/archive/1.8.tar.gz -> gaupol-1.8.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d05bc505e0e972f5f4189deabf44f36e
diff --git a/metadata/md5-cache/media-video/gaupol-1.9 b/metadata/md5-cache/media-video/gaupol-1.9
index 34f82d991838..04fa32e1d50e 100644
--- a/metadata/md5-cache/media-video/gaupol-1.9
+++ b/metadata/md5-cache/media-video/gaupol-1.9
@@ -1,15 +1,15 @@
-BDEPEND=sys-devel/gettext test? ( app-dicts/myspell-en app-text/enchant[hunspell] app-text/gspell[introspection] ) test? ( app-text/iso-codes dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[introspection] spell? ( app-text/gspell[introspection] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=sys-devel/gettext test? ( app-dicts/myspell-en app-text/enchant[hunspell] app-text/gspell[introspection] ) test? ( app-text/iso-codes dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] spell? ( app-text/gspell[introspection] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare test
 DESCRIPTION=A subtitle editor for text-based subtitles
 EAPI=7
 HOMEPAGE=https://otsaloma.io/gaupol/
-IUSE=spell test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~arm64 ~x86
+IUSE=spell test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2+
-RDEPEND=app-text/iso-codes dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[introspection] spell? ( app-text/gspell[introspection] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=app-text/iso-codes dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] spell? ( app-text/gspell[introspection] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/gaupol/archive/1.9.tar.gz -> gaupol-1.9.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aad44a88a470bc393414322bfed22c5f
+_md5_=6bbb9a80d82ce220bd802f9359d8b4a9
diff --git a/metadata/md5-cache/media-video/h264enc-10.4.7-r1 b/metadata/md5-cache/media-video/h264enc-10.4.7-r1
index e4c7d4f9b742..2fb7b1cead96 100644
--- a/metadata/md5-cache/media-video/h264enc-10.4.7-r1
+++ b/metadata/md5-cache/media-video/h264enc-10.4.7-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=media-video/mplayer[encode,x264] sys-apps/coreutils sys-apps/pv sys-devel/bc sys-process/time
 SLOT=0
 SRC_URI=mirror://sourceforge/h264enc/h264enc-10.4.7.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=977c08a50388e35588a2d0cd4f71d64c
diff --git a/metadata/md5-cache/media-video/mediainfo-20.09 b/metadata/md5-cache/media-video/mediainfo-20.09
index 13ffe2c16928..5915236ee965 100644
--- a/metadata/md5-cache/media-video/mediainfo-20.09
+++ b/metadata/md5-cache/media-video/mediainfo-20.09
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=~media-libs/libmediainfo-20.09[curl=,mms=] >=media-libs/libzen-0.4.37 sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:3.0[X] )
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/mediainfo/20.09/mediainfo_20.09.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=082af4ebd23247658aaf8251dab4e1f1
diff --git a/metadata/md5-cache/media-video/mediainfo-20.09-r1 b/metadata/md5-cache/media-video/mediainfo-20.09-r1
index 87d0e74f56a4..dcbfd40187bf 100644
--- a/metadata/md5-cache/media-video/mediainfo-20.09-r1
+++ b/metadata/md5-cache/media-video/mediainfo-20.09-r1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=~media-libs/libmediainfo-20.09[curl=,mms=] >=media-libs/libzen-0.4.37 sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] )
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/mediainfo/20.09/mediainfo_20.09.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a57ff05e2d973798e56a521d7f7a767f
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-60.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-60.0.0
new file mode 100644
index 000000000000..97231ef2c1f2
--- /dev/null
+++ b/metadata/md5-cache/media-video/mkvtoolnix-60.0.0
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-ruby/rake virtual/pkgconfig nls? ( sys-devel/gettext app-text/po4a ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/boost-1.66:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) dev-cpp/nlohmann_json dev-libs/utfcpp test? ( dev-cpp/gtest ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tools to create, alter, and inspect Matroska files
+EAPI=7
+HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
+IUSE=dbus debug dvd nls pch test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/boost-1.66:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-60.0.0.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=63d621fdfa3738bc9804c9b90191775e
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9999 b/metadata/md5-cache/media-video/mkvtoolnix-9999
index cd56ecfa51ff..afc16d55713b 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-9999
+++ b/metadata/md5-cache/media-video/mkvtoolnix-9999
@@ -1,14 +1,14 @@
 BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-ruby/rake virtual/pkgconfig nls? ( sys-devel/gettext app-text/po4a ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/boost-1.60:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.0:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) ) dev-cpp/nlohmann_json dev-libs/utfcpp test? ( dev-cpp/gtest ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/boost-1.66:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) dev-cpp/nlohmann_json dev-libs/utfcpp test? ( dev-cpp/gtest ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Tools to create, alter, and inspect Matroska files
 EAPI=7
 HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
-IUSE=dbus debug dvd nls pch qt5 test
+IUSE=dbus debug dvd nls pch test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=dev-libs/boost-1.60:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.0:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) )
+RDEPEND=>=dev-libs/boost-1.66:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1f20c3a06d8435d259dbb1a0c4313ade
+_md5_=63d621fdfa3738bc9804c9b90191775e
diff --git a/metadata/md5-cache/media-video/mpv-0.33.1-r1 b/metadata/md5-cache/media-video/mpv-0.33.1-r1
index c4d30aeaef07..884d69cf3386 100644
--- a/metadata/md5-cache/media-video/mpv-0.33.1-r1
+++ b/metadata/md5-cache/media-video/mpv-0.33.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.33.1.tar.gz -> mpv-0.33.1.tar.gz https://waf.io/waf-2.0.9
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0a4f52bac9f2d68133dc26659b0b0aa1
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index 9c70aa22a5ec..b45ccd1a088a 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://waf.io/waf-2.0.9
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f692bc51f5601accae4d5acda4c0dfde
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.25-r1 b/metadata/md5-cache/media-video/pipewire-0.3.25-r1
index 6376db26536d..8beaeed648dc 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.25-r1
+++ b/metadata/md5-cache/media-video/pipewire-0.3.25-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) ldac? ( bluetooth )
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.25/pipewire-0.3.25.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=1c28bb9f1d9c1f20d3f11daf47a3726a
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.26-r1 b/metadata/md5-cache/media-video/pipewire-0.3.26-r1
index 1c24d9cf7eb7..1e1ed70ddda7 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.26-r1
+++ b/metadata/md5-cache/media-video/pipewire-0.3.26-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) ldac? ( bluetooth )
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.26/pipewire-0.3.26.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=1bf8bd41a82d797e2f29bf4940112b0d
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.27-r2 b/metadata/md5-cache/media-video/pipewire-0.3.27-r2
index a43baf1b6aec..5972ed0ddd4f 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.27-r2
+++ b/metadata/md5-cache/media-video/pipewire-0.3.27-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) jack-sdk? ( !jack-client ) l
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.27/pipewire-0.3.27.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=b114d80c866a2e8db007b2b57ada4db2
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.28-r1 b/metadata/md5-cache/media-video/pipewire-0.3.28-r1
index c73839461033..fda7c4bf8ab9 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.28-r1
+++ b/metadata/md5-cache/media-video/pipewire-0.3.28-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) jack-sdk? ( !jack-client ) l
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.28/pipewire-0.3.28.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=4b8914321603f69d85740cea3d5355d6
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.29-r1 b/metadata/md5-cache/media-video/pipewire-0.3.29-r1
index 0e8462d9bec2..68d3bd6aa8f2 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.29-r1
+++ b/metadata/md5-cache/media-video/pipewire-0.3.29-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) jack-sdk? ( !jack-client ) l
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.29/pipewire-0.3.29.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=913229d24a746f910d509ea425bad14f
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.30-r2 b/metadata/md5-cache/media-video/pipewire-0.3.30-r2
index 01bc82d3aeb4..0fcb46b4f613 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.30-r2
+++ b/metadata/md5-cache/media-video/pipewire-0.3.30-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=jack-sdk? ( !jack-client )
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.30/pipewire-0.3.30.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=5c29755233cda45183e6e5abf5e2d2a7
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.31-r1 b/metadata/md5-cache/media-video/pipewire-0.3.31-r1
index a8a5e1b4df25..49f6cc58e1b0 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.31-r1
+++ b/metadata/md5-cache/media-video/pipewire-0.3.31-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=jack-sdk? ( !jack-client )
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.31/pipewire-0.3.31.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=a9e2e366c6fd279f8baeb96e0fc5758b
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.32 b/metadata/md5-cache/media-video/pipewire-0.3.32
index 63b26fdaddb1..bdc14aaa12ef 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.32
+++ b/metadata/md5-cache/media-video/pipewire-0.3.32
@@ -12,5 +12,5 @@ REQUIRED_USE=jack-sdk? ( !jack-client )
 RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.32/pipewire-0.3.32.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=8c61e3b60c33387a178d651f46fc40f6
diff --git a/metadata/md5-cache/media-video/pipewire-9999 b/metadata/md5-cache/media-video/pipewire-9999
index c05ed0b6e64f..9c204229c613 100644
--- a/metadata/md5-cache/media-video/pipewire-9999
+++ b/metadata/md5-cache/media-video/pipewire-9999
@@ -11,5 +11,5 @@ RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x8
 REQUIRED_USE=jack-sdk? ( !jack-client )
 RESTRICT=!test? ( test )
 SLOT=0/0.3
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=8c61e3b60c33387a178d651f46fc40f6
diff --git a/metadata/md5-cache/media-video/rav1e-0.4.1 b/metadata/md5-cache/media-video/rav1e-0.4.1
index d15772dde285..a7d6f67cf7c7 100644
--- a/metadata/md5-cache/media-video/rav1e-0.4.1
+++ b/metadata/md5-cache/media-video/rav1e-0.4.1
@@ -4,9 +4,9 @@ DESCRIPTION=The fastest and safest AV1 encoder
 EAPI=7
 HOMEPAGE=https://github.com/xiph/rav1e/
 IUSE=+capi debug
-KEYWORDS=amd64 arm arm64 ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=BSD-2 Apache-2.0 MIT Unlicense
 SLOT=0
 SRC_URI=https://github.com/xiph/rav1e/archive/v0.4.1.tar.gz -> rav1e-0.4.1.tar.gz https://crates.io/api/v1/crates/addr2line/0.14.1/download -> addr2line-0.14.1.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/aom-sys/0.2.2/download -> aom-sys-0.2.2.crate https://crates.io/api/v1/crates/arbitrary/0.4.7/download -> arbitrary-0.4.7.crate https://crates.io/api/v1/crates/arg_enum_proc_macro/0.3.1/download -> arg_enum_proc_macro-0.3.1.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/assert_cmd/1.0.3/download -> assert_cmd-1.0.3.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/av-metrics/0.6.2/download -> av-metrics-0.6.2.crate https://crates.io/api/v1/crates/backtrace/0.3.56/download -> backtrace-0.3.56.crate https://crates.io/api/v1/crates/bindgen/0.56.0/download -> bindgen-0.56.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.1.0/download -> bitmaps-2.1.0.crate https://crates.io/api/v1/crates/bitstream-io/1.0.0/download -> bitstream-io-1.0.0.crate https://crates.io/api/v1/crates/bstr/0.2.15/download -> bstr-0.2.15.crate https://crates.io/api/v1/crates/bumpalo/3.6.1/download -> bumpalo-3.6.1.crate https://crates.io/api/v1/crates/bytemuck/1.5.1/download -> bytemuck-1.5.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytesize/1.0.1/download -> bytesize-1.0.1.crate https://crates.io/api/v1/crates/cargo/0.51.0/download -> cargo-0.51.0.crate https://crates.io/api/v1/crates/cargo-platform/0.1.1/download -> cargo-platform-0.1.1.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cbindgen/0.18.0/download -> cbindgen-0.18.0.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clang-sys/1.1.1/download -> clang-sys-1.1.1.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cmake/0.1.45/download -> cmake-0.1.45.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/console/0.14.1/download -> console-0.14.1.crate https://crates.io/api/v1/crates/console_error_panic_hook/0.1.6/download -> console_error_panic_hook-0.1.6.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/crates-io/0.31.1/download -> crates-io-0.31.1.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/criterion/0.3.4/download -> criterion-0.3.4.crate https://crates.io/api/v1/crates/criterion-plot/0.4.3/download -> criterion-plot-0.4.3.crate https://crates.io/api/v1/crates/crossbeam/0.8.0/download -> crossbeam-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download -> crossbeam-deque-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.3/download -> crossbeam-epoch-0.9.3.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.1/download -> crossbeam-queue-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.3/download -> crossbeam-utils-0.8.3.crate https://crates.io/api/v1/crates/crypto-hash/0.3.4/download -> crypto-hash-0.3.4.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.20/download -> ctor-0.1.20.crate https://crates.io/api/v1/crates/curl/0.4.35/download -> curl-0.4.35.crate https://crates.io/api/v1/crates/curl-sys/0.4.41+curl-7.75.0/download -> curl-sys-0.4.41+curl-7.75.0.crate https://crates.io/api/v1/crates/dav1d-sys/0.3.3/download -> dav1d-sys-0.3.3.crate https://crates.io/api/v1/crates/dcv-color-primitives/0.1.16/download -> dcv-color-primitives-0.1.16.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/env_logger/0.8.3/download -> env_logger-0.8.3.crate https://crates.io/api/v1/crates/fern/0.6.0/download -> fern-0.6.0.crate https://crates.io/api/v1/crates/filetime/0.2.14/download -> filetime-0.2.14.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fwdansi/1.1.0/download -> fwdansi-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/gimli/0.23.0/download -> gimli-0.23.0.crate https://crates.io/api/v1/crates/git2/0.13.17/download -> git2-0.13.17.crate https://crates.io/api/v1/crates/git2-curl/0.14.1/download -> git2-curl-0.14.1.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/half/1.7.1/download -> half-1.7.1.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/idna/0.2.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/ignore/0.4.17/download -> ignore-0.4.17.crate https://crates.io/api/v1/crates/im-rc/15.0.0/download -> im-rc-15.0.0.crate https://crates.io/api/v1/crates/image/0.23.14/download -> image-0.23.14.crate https://crates.io/api/v1/crates/indexmap/1.6.2/download -> indexmap-1.6.2.crate https://crates.io/api/v1/crates/interpolate_name/0.2.3/download -> interpolate_name-0.2.3.crate https://crates.io/api/v1/crates/itertools/0.10.0/download -> itertools-0.10.0.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/js-sys/0.3.50/download -> js-sys-0.3.50.crate https://crates.io/api/v1/crates/lab/0.8.2/download -> lab-0.8.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.92/download -> libc-0.2.92.crate https://crates.io/api/v1/crates/libfuzzer-sys/0.3.5/download -> libfuzzer-sys-0.3.5.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.18+1.1.0/download -> libgit2-sys-0.12.18+1.1.0.crate https://crates.io/api/v1/crates/libloading/0.7.0/download -> libloading-0.7.0.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.6+1.43.0/download -> libnghttp2-sys-0.1.6+1.43.0.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.21/download -> libssh2-sys-0.2.21.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memoffset/0.6.3/download -> memoffset-0.6.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/nasm-rs/0.2.0/download -> nasm-rs-0.2.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/noop_proc_macro/0.3.0/download -> noop_proc_macro-0.3.0.crate https://crates.io/api/v1/crates/num-derive/0.3.3/download -> num-derive-0.3.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/object/0.23.0/download -> object-0.23.0.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/oorandom/11.1.3/download -> oorandom-11.1.3.crate https://crates.io/api/v1/crates/opener/0.4.1/download -> opener-0.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.33/download -> openssl-0.10.33.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-src/111.15.0+1.1.1k/download -> openssl-src-111.15.0+1.1.1k.crate https://crates.io/api/v1/crates/openssl-sys/0.9.61/download -> openssl-sys-0.9.61.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/1.0.5/download -> paste-1.0.5.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plotters/0.3.0/download -> plotters-0.3.0.crate https://crates.io/api/v1/crates/plotters-backend/0.3.0/download -> plotters-backend-0.3.0.crate https://crates.io/api/v1/crates/plotters-svg/0.3.0/download -> plotters-svg-0.3.0.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.7/download -> predicates-1.0.7.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.2/download -> predicates-tree-1.0.2.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.0.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/regex/1.4.5/download -> regex-1.4.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.23/download -> regex-syntax-0.6.23.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust_hawktracer/0.7.0/download -> rust_hawktracer-0.7.0.crate https://crates.io/api/v1/crates/rust_hawktracer_normal_macro/0.4.1/download -> rust_hawktracer_normal_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_proc_macro/0.4.1/download -> rust_hawktracer_proc_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_sys/0.4.2/download -> rust_hawktracer_sys-0.4.2.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.18/download -> rustc-demangle-0.1.18.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustc_version/0.3.3/download -> rustc_version-0.3.3.crate https://crates.io/api/v1/crates/rustfix/0.5.1/download -> rustfix-0.5.1.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scan_fmt/0.2.6/download -> scan_fmt-0.2.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.10.0/download -> semver-0.10.0.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.125/download -> serde-1.0.125.crate https://crates.io/api/v1/crates/serde_cbor/0.11.1/download -> serde_cbor-0.11.1.crate https://crates.io/api/v1/crates/serde_derive/1.0.125/download -> serde_derive-1.0.125.crate https://crates.io/api/v1/crates/serde_ignored/0.1.2/download -> serde_ignored-0.1.2.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/shell-escape/0.1.5/download -> shell-escape-0.1.5.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.3.7/download -> signal-hook-0.3.7.crate https://crates.io/api/v1/crates/signal-hook-registry/1.3.0/download -> signal-hook-registry-1.3.0.crate https://crates.io/api/v1/crates/simd_helpers/0.1.0/download -> simd_helpers-0.1.0.crate https://crates.io/api/v1/crates/sized-chunks/0.6.4/download -> sized-chunks-0.6.4.crate https://crates.io/api/v1/crates/socket2/0.3.19/download -> socket2-0.3.19.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/strum/0.20.0/download -> strum-0.20.0.crate https://crates.io/api/v1/crates/strum_macros/0.20.1/download -> strum_macros-0.20.1.crate https://crates.io/api/v1/crates/syn/1.0.67/download -> syn-1.0.67.crate https://crates.io/api/v1/crates/syn/1.0.68/download -> syn-1.0.68.crate https://crates.io/api/v1/crates/system-deps/2.0.3/download -> system-deps-2.0.3.crate https://crates.io/api/v1/crates/tar/0.4.33/download -> tar-0.4.33.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.16/download -> terminal_size-0.1.16.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.24/download -> thiserror-1.0.24.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.24/download -> thiserror-impl-1.0.24.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinytemplate/1.2.1/download -> tinytemplate-1.2.1.crate https://crates.io/api/v1/crates/tinyvec/1.1.1/download -> tinyvec-1.1.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/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.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version-compare/0.0.11/download -> version-compare-0.0.11.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.73/download -> wasm-bindgen-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.73/download -> wasm-bindgen-backend-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.23/download -> wasm-bindgen-futures-0.4.23.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.73/download -> wasm-bindgen-macro-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.73/download -> wasm-bindgen-macro-support-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.73/download -> wasm-bindgen-shared-0.2.73.crate https://crates.io/api/v1/crates/wasm-bindgen-test/0.3.23/download -> wasm-bindgen-test-0.3.23.crate https://crates.io/api/v1/crates/wasm-bindgen-test-macro/0.3.23/download -> wasm-bindgen-test-macro-0.3.23.crate https://crates.io/api/v1/crates/web-sys/0.3.50/download -> web-sys-0.3.50.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/y4m/0.7.0/download -> y4m-0.7.0.crate
 _eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8d662cbc412f8b2bcf478cbcf39ccc69
+_md5_=5e4cf99eaf0d0d59e5f7a741bb600cc7
diff --git a/metadata/md5-cache/media-video/vidify-2.2.6 b/metadata/md5-cache/media-video/vidify-2.2.6
index 49d96a2f2355..af417bdea906 100644
--- a/metadata/md5-cache/media-video/vidify-2.2.6
+++ b/metadata/md5-cache/media-video/vidify-2.2.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( vlc mpv zeroconf ) || ( python_targets_python3_8 python_target
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vidify/vidify/archive/v2.2.6.tar.gz -> vidify-2.2.6.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5f999d09040413764ae87b57ff394f89
diff --git a/metadata/md5-cache/media-video/vlc-3.0.12.1-r102 b/metadata/md5-cache/media-video/vlc-3.0.12.1-r102
index f8cd3a446a79..4a50e00c48cb 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.12.1-r102
+++ b/metadata/md5-cache/media-video/vlc-3.0.12.1-r102
@@ -1,16 +1,16 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.12.1/vlc-3.0-3.0.12.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5a4c7836573ff368123162e1c5468673
+_md5_=a8dfdd742aff5aaf04752c882d0e946a
diff --git a/metadata/md5-cache/media-video/vlc-3.0.14-r5 b/metadata/md5-cache/media-video/vlc-3.0.14-r5
index 834d12a047a5..468302218426 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.14-r5
+++ b/metadata/md5-cache/media-video/vlc-3.0.14-r5
@@ -1,16 +1,16 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.14/vlc-3.0-3.0.14.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=915c8f80f38435f2f4bb940c60e0453f
+_md5_=2cf115579e5833dac2b1958df96c1ee9
diff --git a/metadata/md5-cache/media-video/vlc-3.0.14-r6 b/metadata/md5-cache/media-video/vlc-3.0.14-r6
index 60d7a68e1cbc..e756f82c7950 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.14-r6
+++ b/metadata/md5-cache/media-video/vlc-3.0.14-r6
@@ -1,16 +1,16 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.14/vlc-3.0-3.0.14.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0e0b9be444598667b413239c33091234
+_md5_=827c0c291d160d9281cad61c69be3026
diff --git a/metadata/md5-cache/media-video/vlc-3.0.16-r5 b/metadata/md5-cache/media-video/vlc-3.0.16-r5
index e46d02687bbe..9f323318f2a9 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.16-r5
+++ b/metadata/md5-cache/media-video/vlc-3.0.16-r5
@@ -1,16 +1,16 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( <media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://get.videolan.org/vlc/3.0.16/vlc-3.0.16.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=22432c43707465bbf592e6c2b798ad6c
+_md5_=163f18d77c52d7cfbc73e4899374fa05
diff --git a/metadata/md5-cache/media-video/vlc-3.0.16-r6 b/metadata/md5-cache/media-video/vlc-3.0.16-r6
index 3185581bd3d6..1996303f773b 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.16-r6
+++ b/metadata/md5-cache/media-video/vlc-3.0.16-r6
@@ -1,16 +1,16 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://get.videolan.org/vlc/3.0.16/vlc-3.0.16.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a48a840983d7997ad39267f3f050afa3
+_md5_=040ed7715bd5400a1171a748fa8f1b45
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index 4c4f6f719352..7c37cd280a6a 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -1,15 +1,15 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
 LICENSE=LGPL-2.1 GPL-2
 PROPERTIES=live
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1f24541afe386ef019a016608b535b6d
+_md5_=1a704ed21e6e6debf11c07921fc2e442
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 09933f60190d..6b901a02e491 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( >=media-libs/dav1d-0.5.0:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) loudness? ( >=media-libs/libebur128-1.2.4:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( >=media-libs/dav1d-0.5.0:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) loudness? ( >=media-libs/libebur128-1.2.4:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate kms libass libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc live loudness lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse lua_single_target_lua5-1 lua_single_target_lua5-2 test
 LICENSE=LGPL-2.1 GPL-2
 PROPERTIES=live
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( >=media-libs/dav1d-0.5.0:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) loudness? ( >=media-libs/libebur128-1.2.4:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu media-libs/libprojectm:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( >=media-libs/dav1d-0.5.0:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) loudness? ( >=media-libs/libebur128-1.2.4:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/12-9
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c9729286a5518c2cbb9f93221d08c0dc
+_md5_=6f5bd9fbac0c7f8796105f2417093330
diff --git a/metadata/md5-cache/media-video/yle-dl-20210704 b/metadata/md5-cache/media-video/yle-dl-20210704
index 9881c7f4186e..7548add0a90b 100644
--- a/metadata/md5-cache/media-video/yle-dl-20210704
+++ b/metadata/md5-cache/media-video/yle-dl-20210704
@@ -1,16 +1,16 @@
-BDEPEND=test? ( media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/configargparse-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/progress[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-video/ffmpeg[gnutls] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/configargparse-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/progress[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configargparse-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/progress[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-video/ffmpeg[gnutls] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configargparse-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/progress[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Download 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_8 python_targets_python3_9
+IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 PROPERTIES=test_network
-RDEPEND=media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/configargparse-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/progress[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configargparse-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/progress[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aajanki/yle-dl/archive/20210704.tar.gz -> yle-dl-20210704.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d966ce96429b535f6d148abcb452317a
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e86f2229cf41fd4ad23bbbf0e81b5d0c
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index f07858e97aff..a07a1890fcdb 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/gvm-10.0.1 b/metadata/md5-cache/net-analyzer/gvm-10.0.1
index 80f8dbfb20a2..06dcd5076c1c 100644
--- a/metadata/md5-cache/net-analyzer/gvm-10.0.1
+++ b/metadata/md5-cache/net-analyzer/gvm-10.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/gvm-libs-10.0.1[extras?,ldap?,radius?] >=net-analyzer/gvmd-8.0.1[extras?] >=net-analyzer/openvas-scanner-6.0.1[cron?,extras?] cli? ( >=net-analyzer/gvm-tools-2.0.0 ) gsa? ( >=net-analyzer/greenbone-security-assistant-8.0.1[extras?] ) ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )
 SLOT=0
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=ed336f73577cb802d0d06cbfbb3a0190
diff --git a/metadata/md5-cache/net-analyzer/gvm-11.0.0 b/metadata/md5-cache/net-analyzer/gvm-11.0.0
index e75234dd5bea..f1335755f6a1 100644
--- a/metadata/md5-cache/net-analyzer/gvm-11.0.0
+++ b/metadata/md5-cache/net-analyzer/gvm-11.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/gvm-libs-11.0.0[extras?,ldap?,radius?] >=net-analyzer/gvmd-9.0.0[extras?] >=net-analyzer/openvas-scanner-7.0.0[cron?,extras?] cli? ( >=net-analyzer/gvm-tools-2.0.0 ) gsa? ( >=net-analyzer/greenbone-security-assistant-9.0.0[extras?] ) ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )
 SLOT=0
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=9748a9530645ef2f6f19dbee379c71ec
diff --git a/metadata/md5-cache/net-analyzer/gvm-20.8.0 b/metadata/md5-cache/net-analyzer/gvm-20.8.0
index 1809de6255f1..2847dbe1051e 100644
--- a/metadata/md5-cache/net-analyzer/gvm-20.8.0
+++ b/metadata/md5-cache/net-analyzer/gvm-20.8.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/gvm-libs-20.8.0[extras?,ldap?,radius?] >=net-analyzer/gvmd-20.8.0[extras?] >=net-analyzer/openvas-scanner-20.8.0[cron?,extras?] cli? ( >=net-analyzer/gvm-tools-20.8.0 ) gsa? ( >=net-analyzer/greenbone-security-assistant-20.8.0[extras?] ) ospd? ( >=net-analyzer/ospd-20.8.0[extras?] )
 SLOT=0
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=9b7d27a001f43e841f6dce973e9be98e
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.13.0 b/metadata/md5-cache/net-analyzer/icinga2-2.13.0
new file mode 100644
index 000000000000..12ad88d41177
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.13.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison >=sys-devel/flex-2.5.35 dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.66.0:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd
+DESCRIPTION=Distributed, general purpose, network monitoring engine
+EAPI=7
+HOMEPAGE=https://icinga.com/
+IUSE=console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.66.0:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) acct-group/nagios
+REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
+SLOT=0
+SRC_URI=https://github.com/Icinga/icinga2/archive/v2.13.0.tar.gz -> icinga2-2.13.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=99c0886f02982c035de1f069a8f09145
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729 b/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
index 5c6898d5b167..62c957d72de1 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
+++ b/metadata/md5-cache/net-analyzer/linkchecker-10.0.0_pre20200729
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linkchecker/linkchecker/archive/a977e4d7129450ba9fda8389724c80c1bde66883.tar.gz -> linkchecker-10.0.0_pre20200729.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fafc131786c70324095aa5c082bc0c7f
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-10.0.1 b/metadata/md5-cache/net-analyzer/linkchecker-10.0.1
index 94ec53c0d8f1..8e51b0f3114b 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-10.0.1
+++ b/metadata/md5-cache/net-analyzer/linkchecker-10.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linkchecker/linkchecker/archive/v10.0.1.tar.gz -> linkchecker-10.0.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9754e534ea8547b7c133cba4ca7cfd64
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9999 b/metadata/md5-cache/net-analyzer/linkchecker-9999
index 2f9f1f868889..daa9b8389459 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-9999
+++ b/metadata/md5-cache/net-analyzer/linkchecker-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/beautifulsoup[python_targets_python3_8(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2fb533cb66ea018208dff010aab40bc4
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.94 b/metadata/md5-cache/net-analyzer/mtr-0.94
index 09868359769c..662880b037a1 100644
--- a/metadata/md5-cache/net-analyzer/mtr-0.94
+++ b/metadata/md5-cache/net-analyzer/mtr-0.94
@@ -5,11 +5,11 @@ DESCRIPTION=My TraceRoute, an Excellent network diagnostic tool
 EAPI=7
 HOMEPAGE=https://www.bitwizard.nl/mtr/
 IUSE=gtk +ipinfo +ipv6 jansson ncurses +filecaps
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson ) ncurses? ( sys-libs/ncurses:0= ) filecaps? ( sys-libs/libcap )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/traviscross/mtr/archive/v0.94.tar.gz -> mtr-0.94.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e9c225a302aaccd334f935b33baec7ce
+_md5_=e147b34df4962f17490fd36b4d322094
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1
index 1ed8cdf0975e..e2494e2210b2 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=7
 HOMEPAGE=http://www.net-snmp.org/
 IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=HPND BSD GPL-2
 RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) rpm? ( bzip2 zlib )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/40
 SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://github.com/net-snmp/net-snmp/archive/refs/tags/v5.9.1.tar.gz -> net-snmp-5.9.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c6076ba20a7dfa85f03bdbf30baa7566
+_md5_=b44acdbe1fed77703a473559f6681c92
diff --git a/metadata/md5-cache/net-analyzer/nsat-1.5-r5 b/metadata/md5-cache/net-analyzer/nsat-1.5-r5
deleted file mode 100644
index f335684de440..000000000000
--- a/metadata/md5-cache/net-analyzer/nsat-1.5-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libmix net-libs/libnsl:0= net-libs/libpcap net-libs/libtirpc net-libs/rpcsvc-proto X? ( dev-lang/tk:* x11-libs/libX11 ) sys-devel/gnuconfig >=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 Security Analysis Tool, an application-level network security scanner
-EAPI=6
-HOMEPAGE=http://nsat.sourceforge.net/
-IUSE=X
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libmix net-libs/libnsl:0= net-libs/libpcap net-libs/libtirpc net-libs/rpcsvc-proto X? ( dev-lang/tk:* x11-libs/libX11 )
-SLOT=0
-SRC_URI=mirror://sourceforge/nsat/nsat-1.5.tgz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8451e58f41b0e725a1cdece6fae31746
diff --git a/metadata/md5-cache/net-analyzer/nsat-1.5-r6 b/metadata/md5-cache/net-analyzer/nsat-1.5-r6
new file mode 100644
index 000000000000..8d7962233ec4
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nsat-1.5-r6
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/libmix net-libs/libnsl:0= net-libs/libpcap net-libs/libtirpc:= net-libs/rpcsvc-proto X? ( dev-lang/tk:* x11-libs/libX11 )
+DESCRIPTION=Network Security Analysis Tool, an application-level network security scanner
+EAPI=7
+HOMEPAGE=http://nsat.sourceforge.net/
+IUSE=X
+KEYWORDS=~amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libmix net-libs/libnsl:0= net-libs/libpcap net-libs/libtirpc:= net-libs/rpcsvc-proto X? ( dev-lang/tk:* x11-libs/libX11 )
+SLOT=0
+SRC_URI=mirror://sourceforge/nsat/nsat-1.5.tgz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=99ddc0e2581038b7661e13a1030dd095
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.6 b/metadata/md5-cache/net-analyzer/wireshark-3.4.6
deleted file mode 100644
index e47e519ee91a..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-3.4.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) || ( dev-lang/python:3.9 dev-lang/python:3.8 )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=7
-HOMEPAGE=https://www.wireshark.org/
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps lua_single_target_lua5-1 lua_single_target_lua5-2
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) plugin-ifdemo? ( plugins )
-RESTRICT=test
-SLOT=0/3.4.6
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.6.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9d9f54fded9147abdf996a154c847168
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 42b63023665d..4554864180c4 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/rp-pppoe-3.14 b/metadata/md5-cache/net-dialup/rp-pppoe-3.14
index 455462885d91..22c433b20ca5 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.14
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.14
@@ -5,10 +5,10 @@ DESCRIPTION=A user-mode PPPoE client and server suite for Linux
 EAPI=7
 HOMEPAGE=https://dianne.skoll.ca/projects/rp-pppoe/
 IUSE=tk
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=net-dialup/ppp:= tk? ( dev-lang/tk:= )
 SLOT=0
 SRC_URI=https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-3.14.tar.gz https://github.com/paulusmack/ppp/archive/ppp-2.4.8.tar.gz https://dev.gentoo.org/~polynomial-c/dist/rp-pppoe-3.14-patches-01.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b14658298c7101830d97aa32fcd1c12e
+_md5_=2a357ce8227edfa40ce136c1a28fe6dc
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index a9825dc6bf87..c3f305c88b06 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/dnsviz-0.8.2-r1 b/metadata/md5-cache/net-dns/dnsviz-0.8.2-r1
index 8c1979fd6448..92a6f1ef7021 100644
--- a/metadata/md5-cache/net-dns/dnsviz-0.8.2-r1
+++ b/metadata/md5-cache/net-dns/dnsviz-0.8.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/dnspython[python_targets_python3_8(-)?] >=dev-python/m2crypto
 REQUIRED_USE=|| ( 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	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8f547834a29bb8a22dd8759a0453b31
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.9.2 b/metadata/md5-cache/net-dns/dnsviz-0.9.2
index 30e4a53c801f..c996fa74457d 100644
--- a/metadata/md5-cache/net-dns/dnsviz-0.9.2
+++ b/metadata/md5-cache/net-dns/dnsviz-0.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.9.2.tar.gz -> dnsviz-0.9.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2bd38a88ca95355e4b247e0e2bfa8e9e
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.9.3 b/metadata/md5-cache/net-dns/dnsviz-0.9.3
index d1291258c215..9cf9c3de40b1 100644
--- a/metadata/md5-cache/net-dns/dnsviz-0.9.3
+++ b/metadata/md5-cache/net-dns/dnsviz-0.9.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( 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	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2bd38a88ca95355e4b247e0e2bfa8e9e
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.4.5 b/metadata/md5-cache/net-dns/pdns-recursor-4.4.5
new file mode 100644
index 000000000000..e8c602f83488
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.4.5
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-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 ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) dev-libs/openssl:= >=dev-libs/boost-1.35:=
+DESCRIPTION=The PowerDNS Recursor
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+IUSE=debug dnstap protobuf snmp sodium systemd 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 ~x86
+LICENSE=GPL-2
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) dev-libs/openssl:= >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1 acct-user/pdns acct-group/pdns
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnstap? ( protobuf )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.4.5.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=658acde1a75197b70b9b68a6eac4ea92
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.5.4 b/metadata/md5-cache/net-dns/pdns-recursor-4.5.4
index f85219576adb..7cfde83c789a 100644
--- a/metadata/md5-cache/net-dns/pdns-recursor-4.5.4
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.5.4
@@ -5,7 +5,7 @@ DESCRIPTION=The PowerDNS Recursor
 EAPI=7
 HOMEPAGE=https://www.powerdns.com/
 IUSE=debug dnstap snmp sodium systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) dev-libs/openssl:= >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1 acct-user/pdns acct-group/pdns
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.5.4.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b3888fa50ebdbf5cc62b38f6896666ef
+_md5_=20ba0221494f0ed6ab712d16663eda13
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.5.5 b/metadata/md5-cache/net-dns/pdns-recursor-4.5.5
new file mode 100644
index 000000000000..89ca9cc1907c
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.5.5
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-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 ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) dev-libs/openssl:= >=dev-libs/boost-1.35:=
+DESCRIPTION=The PowerDNS Recursor
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+IUSE=debug dnstap snmp sodium systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) dev-libs/openssl:= >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1 acct-user/pdns acct-group/pdns
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.5.5.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b3888fa50ebdbf5cc62b38f6896666ef
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 4e06081ea597..f911d39cd66a 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/fwbuilder-6.0.0_pre20200502 b/metadata/md5-cache/net-firewall/fwbuilder-6.0.0_pre20200502
new file mode 100644
index 000000000000..16aa284d022d
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/fwbuilder-6.0.0_pre20200502
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 net-analyzer/net-snmp
+DESCRIPTION=A firewall management GUI for iptables, PF, Cisco routers and more
+EAPI=7
+HOMEPAGE=https://github.com/fwbuilder/fwbuilder
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 net-analyzer/net-snmp
+SLOT=0
+SRC_URI=https://github.com/fwbuilder/fwbuilder/archive/a5e14a966447c63bcf7b52a0202149e76bd5ed4a.tar.gz -> fwbuilder-6.0.0_pre20200502.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0dde7a8b939d93a2bac9de97df010837
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 78a3697c34f2..03f90f2e3ba3 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/samba-4.14.6-r1 b/metadata/md5-cache/net-fs/samba-4.14.6-r1
index 64508b7fda2f..f1ec48472957 100644
--- a/metadata/md5-cache/net-fs/samba-4.14.6-r1
+++ b/metadata/md5-cache/net-fs/samba-4.14.6-r1
@@ -1,16 +1,16 @@
 BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( !riscv? ( sys-libs/libunwind:= ) ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
 DESCRIPTION=Samba Suite Version 4
 EAPI=7
 HOMEPAGE=https://samba.org/
 IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.3.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( !riscv? ( sys-libs/libunwind:= ) ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.14.6.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dbb81cfb8a5b38a687dc16faca225cb9
+_md5_=c584a5e306ac47ae820f7d975eeee93d
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 92b007258199..e464fa6ca036 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.1-r1 b/metadata/md5-cache/net-ftp/filezilla-3.53.1-r1
index c3ec1a74729e..91a9a2c071d1 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.53.1-r1
+++ b/metadata/md5-cache/net-ftp/filezilla-3.53.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.53.1_src.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b22f25fc25ac2fbedff6f2b897f8a64b
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.54.1 b/metadata/md5-cache/net-ftp/filezilla-3.54.1
index e20e3073396e..8d04c7b723db 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.54.1
+++ b/metadata/md5-cache/net-ftp/filezilla-3.54.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.54.1_src.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=55ee00b89dc3b601a1a5cfcefa734ec6
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.55.0 b/metadata/md5-cache/net-ftp/filezilla-3.55.0
index ec7830bbc2e8..05cf1f6b7771 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.55.0
+++ b/metadata/md5-cache/net-ftp/filezilla-3.55.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.55.0_src.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=781a8ec689f5e5d8e950baf90bd75813
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 2a9f25555014..b3de1192e7d1 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/poezio-0.13.1-r2 b/metadata/md5-cache/net-im/poezio-0.13.1-r2
index 95685b858dfd..badc9534f29c 100644
--- a/metadata/md5-cache/net-im/poezio-0.13.1-r2
+++ b/metadata/md5-cache/net-im/poezio-0.13.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/poezio/poezio-0.13.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=97262b7c9c72c910db95d41a0578ae15
diff --git a/metadata/md5-cache/net-im/poezio-9999 b/metadata/md5-cache/net-im/poezio-9999
index b7f59831d476..64495b94e832 100644
--- a/metadata/md5-cache/net-im/poezio-9999
+++ b/metadata/md5-cache/net-im/poezio-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ac57cdea6d95e59ac37b4b6cea7818c6
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.11.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.11.0
deleted file mode 100644
index c106e1fcf11a..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-5.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
-EAPI=7
-HOMEPAGE=https://signal.org/ https://github.com/signalapp/Signal-Desktop
-IUSE=+sound
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/gdk-pixbuf x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.11.0_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e715e69f732d3fd9a6c58536297f7100
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.12.1 b/metadata/md5-cache/net-im/signal-desktop-bin-5.12.1
new file mode 100644
index 000000000000..2950089c6a61
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
+EAPI=7
+HOMEPAGE=https://signal.org/ https://github.com/signalapp/Signal-Desktop
+IUSE=+sound
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/gdk-pixbuf x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.12.1_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e715e69f732d3fd9a6c58536297f7100
diff --git a/metadata/md5-cache/net-im/slack-4.12.2 b/metadata/md5-cache/net-im/slack-4.12.2
index 4bd94dc7cfc0..8bfedd9c1281 100644
--- a/metadata/md5-cache/net-im/slack-4.12.2
+++ b/metadata/md5-cache/net-im/slack-4.12.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.12.2-amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c6d5971000938948d234e829dac103dc
diff --git a/metadata/md5-cache/net-im/slack-4.13.0 b/metadata/md5-cache/net-im/slack-4.13.0
index 44dba1397245..45754ced12d7 100644
--- a/metadata/md5-cache/net-im/slack-4.13.0
+++ b/metadata/md5-cache/net-im/slack-4.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.13.0-amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e42896db4e2ce36893fcda205e510f75
diff --git a/metadata/md5-cache/net-im/slack-4.14.0 b/metadata/md5-cache/net-im/slack-4.14.0
index 79f57c0f016d..22dc759c024a 100644
--- a/metadata/md5-cache/net-im/slack-4.14.0
+++ b/metadata/md5-cache/net-im/slack-4.14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.14.0-amd64.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a5c41cf66c767326e5f36c48689dad9d
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.7.4-r1 b/metadata/md5-cache/net-im/telegram-desktop-2.7.4-r1
deleted file mode 100644
index e7850eb2966b..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-2.7.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?] dev-qt/qtimageformats:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= media-libs/opus:= ~media-libs/libtgvoip-2.4.4_p20210302 media-libs/openal ~media-libs/tg_owt-0_pre20210422 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3* dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-IUSE=+dbus enchant +gtk +hunspell +spell wayland webkit +X
-KEYWORDS=amd64 ~ppc64
-LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
-RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?] dev-qt/qtimageformats:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= media-libs/opus:= ~media-libs/libtgvoip-2.4.4_p20210302 media-libs/openal ~media-libs/tg_owt-0_pre20210422 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= )
-REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) webkit? ( gtk )
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.7.4/tdesktop-2.7.4-full.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f4ad718e5c2913a84722874ebe7e2eca
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.8.1 b/metadata/md5-cache/net-im/telegram-desktop-2.8.1
deleted file mode 100644
index fbc9e1392ede..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-2.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X(-)?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210626 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3* dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-IUSE=+dbus enchant +gtk +hunspell +spell wayland webkit +X
-KEYWORDS=~amd64 ~ppc64
-LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
-RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X(-)?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210626 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= )
-REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) webkit? ( gtk )
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.8.1/tdesktop-2.8.1-full.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=056f1761e1ed9f01b52357b220810b29
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.8.11 b/metadata/md5-cache/net-im/telegram-desktop-2.8.11
deleted file mode 100644
index 97c8d2e8a830..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-2.8.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/jemalloc:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X(-)?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210626 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3* dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-IUSE=+dbus enchant +gtk +hunspell +spell wayland webkit +X
-KEYWORDS=~amd64 ~ppc64
-LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
-RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/jemalloc:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X(-)?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210626 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= )
-REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) webkit? ( gtk ) gtk? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.8.11/tdesktop-2.8.11-full.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=65dc70cc50a50f29e245f07873dcba29
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.8.11-r1 b/metadata/md5-cache/net-im/telegram-desktop-2.8.11-r1
new file mode 100644
index 000000000000..806087ba3f50
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.8.11-r1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/jemalloc:=[-lazy-lock] dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210626 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3* dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official desktop client for Telegram
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+IUSE=+dbus enchant +gtk +hunspell +spell wayland webkit +X
+KEYWORDS=amd64 ~ppc64
+LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
+RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/jemalloc:=[-lazy-lock] dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210626 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= )
+REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) webkit? ( gtk ) gtk? ( dbus )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.8.11/tdesktop-2.8.11-full.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7580e4392ad05af5ff9edc841235be1e
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.9.0-r1 b/metadata/md5-cache/net-im/telegram-desktop-2.9.0-r1
new file mode 100644
index 000000000000..bafadad2dfb0
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.9.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/jemalloc:=[-lazy-lock] dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210626 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3* dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official desktop client for Telegram
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+IUSE=+dbus enchant +gtk +hunspell +spell wayland webkit +X
+KEYWORDS=~amd64 ~ppc64
+LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
+RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/jemalloc:=[-lazy-lock] dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210626 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= )
+REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) webkit? ( gtk ) gtk? ( dbus )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.9.0/tdesktop-2.9.0-full.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b2663744f04912d3072f54919be4b155
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.10 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.10
index 136285d32cd5..7b7bc666032d 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.10
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-2.8.10
@@ -8,5 +8,5 @@ LICENSE=GPL-3-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib virtual/opengl x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.8.10.tar.gz -> tdesktop-2.8.10.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.8.10.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d47dcd3608eb8afa4d0aff9ebac0c42e
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-2.9.0 b/metadata/md5-cache/net-im/telegram-desktop-bin-2.9.0
index 3a09283d9f8a..4aadc328e91c 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-2.9.0
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-2.9.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 media-libs/freetype:2 media-libs/libglvnd[X] >=sys-apps/dbus-1.4.2[X] sys-libs/zlib virtual/opengl x11-libs/libSM x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v2.9.0.tar.gz -> tdesktop-2.9.0.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.2.9.0.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d47dcd3608eb8afa4d0aff9ebac0c42e
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index ab9b8bd7a8dc..e9dd507efcac 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/irker-2.19 b/metadata/md5-cache/net-irc/irker-2.19
index 36ebf766b140..69ca973aba42 100644
--- a/metadata/md5-cache/net-irc/irker-2.19
+++ b/metadata/md5-cache/net-irc/irker-2.19
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[ssl] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=http://www.catb.org/esr/irker/irker-2.19.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=413766e663eaff3180e5bf52821f2357
diff --git a/metadata/md5-cache/net-irc/irssi-1.2.3 b/metadata/md5-cache/net-irc/irssi-1.2.3
index ab0e300010f0..f17cd2fa0255 100644
--- a/metadata/md5-cache/net-irc/irssi-1.2.3
+++ b/metadata/md5-cache/net-irc/irssi-1.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=A modular textUI IRC client with IPv6 support
 EAPI=6
 HOMEPAGE=https://irssi.org/
 IUSE=otr +perl selinux socks5 +proxy
-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=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 dev-libs/openssl:= otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/irssi/irssi/releases/download/1.2.3/irssi-1.2.3.tar.xz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=12f480eca57154be0fe64d0b01880fb3
+_md5_=b72584e9efd4350017786e5af524090d
diff --git a/metadata/md5-cache/net-irc/konversation-21.04.3 b/metadata/md5-cache/net-irc/konversation-21.04.3
index 48056bfe4ec0..9bc717e027fb 100644
--- a/metadata/md5-cache/net-irc/konversation-21.04.3
+++ b/metadata/md5-cache/net-irc/konversation-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=User friendly IRC Client
 EAPI=7
 HOMEPAGE=https://konversation.kde.org https://apps.kde.org/konversation/
 IUSE=+crypt debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kbookmarks-5.80.0:5 >=kde-frameworks/kcodecs-5.80.0:5 >=kde-frameworks/kcompletion-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/kglobalaccel-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kidletime-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/knewstuff-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kservice-5.80.0:5 >=kde-frameworks/ktextwidgets-5.80.0:5 >=kde-frameworks/kwallet-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=media-libs/phonon-4.11.0 crypt? ( >=app-crypt/qca-2.3.0:2 ) >=dev-qt/qtsvg-5.15.2:5 crypt? ( >=app-crypt/qca-2.3.0:2[ssl] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/konversation-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7f43124407fe2eae81ecdae7b6be35df
+_md5_=dd70cf89689da042e446c002f4a3bf33
diff --git a/metadata/md5-cache/net-irc/ngircd-26.1-r1 b/metadata/md5-cache/net-irc/ngircd-26.1-r1
deleted file mode 100644
index a8647ea74133..000000000000
--- a/metadata/md5-cache/net-irc/ngircd-26.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/automake:1.11 test? ( dev-tcltk/expect net-misc/netkit-telnetd ) verify-sig? ( app-crypt/openpgp-keys-alexbarton ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=acct-user/ngircd acct-group/ngircd irc-plus? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( sys-libs/pam ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib )
-DESCRIPTION=An IRC server written from scratch
-EAPI=7
-HOMEPAGE=https://ngircd.barton.de/
-IUSE=debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib verify-sig
-KEYWORDS=amd64 ~arm arm64 x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=acct-user/ngircd acct-group/ngircd irc-plus? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( sys-libs/pam ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.gz verify-sig? ( https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.gz.sig )
-_eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=b812805a85cbb7a94be2cecfca0bace6
diff --git a/metadata/md5-cache/net-irc/ngircd-26.1-r2 b/metadata/md5-cache/net-irc/ngircd-26.1-r2
new file mode 100644
index 000000000000..610c4b44194b
--- /dev/null
+++ b/metadata/md5-cache/net-irc/ngircd-26.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-tcltk/expect net-misc/netkit-telnetd ) verify-sig? ( app-crypt/openpgp-keys-alexbarton ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=acct-user/ngircd acct-group/ngircd irc-plus? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( sys-libs/pam ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib )
+DESCRIPTION=An IRC server written from scratch
+EAPI=7
+HOMEPAGE=https://ngircd.barton.de/
+IUSE=debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib verify-sig
+KEYWORDS=amd64 ~arm arm64 x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=acct-user/ngircd acct-group/ngircd irc-plus? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( sys-libs/pam ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.gz verify-sig? ( https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.gz.sig )
+_eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=fb0535dbfaff751e61cbe86c652043d9
diff --git a/metadata/md5-cache/net-irc/quassel-0.13.1-r2 b/metadata/md5-cache/net-irc/quassel-0.13.1-r2
index f386b1ee6684..60f913481426 100644
--- a/metadata/md5-cache/net-irc/quassel-0.13.1-r2
+++ b/metadata/md5-cache/net-irc/quassel-0.13.1-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity
 EAPI=7
 HOMEPAGE=https://quassel-irc.org/
 IUSE=bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~sparc-solaris
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) dbus ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
 SLOT=0
 SRC_URI=https://quassel-irc.org/pub/quassel-0.13.1.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9597328acdd594a45cd6f8d0b365da21
+_md5_=e9f9a25a73d54e10b192c030ac82cb35
diff --git a/metadata/md5-cache/net-irc/quasselgrep-0_p20200830 b/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
index 75f4e1e8fc67..2603361dabc3 100644
--- a/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
+++ b/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/fish-face/quasselgrep/archive/9b6b0bc1252daa6e574363d87d04eebd981215a5.tar.gz -> quasselgrep-0_p20200830.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4111fb5aa48c2d2c2eef8b1665b4fe9c
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 5d8b243313b0..ecbd461eae4f 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/courier-authlib-0.71.3 b/metadata/md5-cache/net-libs/courier-authlib-0.71.3
new file mode 100644
index 000000000000..1d7cf1bbeb32
--- /dev/null
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.71.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst setup
+DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.2.3 virtual/libcrypt:= gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+DESCRIPTION=Courier authentication library
+EAPI=7
+HOMEPAGE=https://www.courier-mta.org/authlib/
+IUSE=berkdb debug gdbm ldap mysql pam postgres sqlite static-libs
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+LICENSE=GPL-3
+RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.2.3 virtual/libcrypt:= gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+RESTRICT=!berkdb? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/courier/courier-authlib-0.71.3.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4ba3693bda819a98ac63b40365601736
diff --git a/metadata/md5-cache/net-libs/courier-unicode-2.2.3 b/metadata/md5-cache/net-libs/courier-unicode-2.2.3
index 98173d9a5915..f0aa44e035ec 100644
--- a/metadata/md5-cache/net-libs/courier-unicode-2.2.3
+++ b/metadata/md5-cache/net-libs/courier-unicode-2.2.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Unicode library used by the courier mail server
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-unicode-2.2.3.tar.bz2
-_md5_=f6a13bf763c4eb456ea4c8348641a5e1
+_md5_=5f47f19fd807038f30c482a34c3c6b28
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.68.2 b/metadata/md5-cache/net-libs/glib-networking-2.68.2
new file mode 100644
index 000000000000..a80ec6ed5605
--- /dev/null
+++ b/metadata/md5-cache/net-libs/glib-networking-2.68.2
@@ -0,0 +1,15 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( sys-apps/dbus ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.67.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(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-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(-)?] ) >=net-libs/gnutls-3.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(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas ) test? ( net-libs/gnutls[pkcs11] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Network-related giomodules for glib
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/glib-networking
+IUSE=+gnome +libproxy +ssl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.67.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(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-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(-)?] ) >=net-libs/gnutls-3.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(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/glib-networking/2.68/glib-networking-2.68.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b6cec9d8b021abdeca3696a32230cbe3
diff --git a/metadata/md5-cache/net-libs/libktorrent-21.04.3 b/metadata/md5-cache/net-libs/libktorrent-21.04.3
index 61108c1985b1..688e530137ce 100644
--- a/metadata/md5-cache/net-libs/libktorrent-21.04.3
+++ b/metadata/md5-cache/net-libs/libktorrent-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=BitTorrent library based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 !dev-libs/botan[gmp(-)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/libktorrent-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6ae37be9b3fc4371e390c65081ba129c
+_md5_=7809e8c04d158b6fa27543270e8c5a04
diff --git a/metadata/md5-cache/net-libs/libmbim-1.26.0 b/metadata/md5-cache/net-libs/libmbim-1.26.0
new file mode 100644
index 000000000000..e3049667c1f7
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libmbim-1.26.0
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/glib-2.56:2
+DESCRIPTION=Mobile Broadband Interface Model (MBIM) modem protocol helper library
+EAPI=8
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.56:2
+SLOT=0
+SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.26.0.tar.xz
+_md5_=af47398b0726a9cdd33891f62c67d17b
diff --git a/metadata/md5-cache/net-libs/libnpupnp-4.1.4 b/metadata/md5-cache/net-libs/libnpupnp-4.1.4
new file mode 100644
index 000000000000..614754c4b10d
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnpupnp-4.1.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure prepare
+DESCRIPTION=A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp
+EAPI=8
+HOMEPAGE=https://framagit.org/medoc92/npupnp
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/expat net-libs/libmicrohttpd net-misc/curl
+SLOT=0
+SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.1.4.tar.gz
+_md5_=5846c6a687df82d46d486ad9de48c81e
diff --git a/metadata/md5-cache/net-libs/libpcap-1.10.1-r1 b/metadata/md5-cache/net-libs/libpcap-1.10.1-r1
index 7439e768313b..780826afac03 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.10.1-r1
+++ b/metadata/md5-cache/net-libs/libpcap-1.10.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A system-independent library for user-level network packet capture
 EAPI=7
 HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap
 IUSE=bluetooth dbus netlink rdma remote static-libs usb yydebug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez:=[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(-)?] ) netlink? ( dev-libs/libnl: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(-)?] ) remote? ( virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) 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(-)?] )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz -> libpcap-1.10.1-upstream.tar.gz verify-sig? ( https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz.sig -> libpcap-1.10.1-upstream.tar.gz.sig )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=370342041e1c159ce459148e568aa3f2
+_md5_=0ee73a35c480bb4038b0809369a65426
diff --git a/metadata/md5-cache/net-libs/libqmi-1.30.0 b/metadata/md5-cache/net-libs/libqmi-1.30.0
new file mode 100644
index 000000000000..7e77e28f4eef
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libqmi-1.30.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc )
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2.56 >=dev-libs/libgudev-232 mbim? ( >=net-libs/libmbim-1.18.0 )
+DESCRIPTION=Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi
+IUSE=gtk-doc +mbim
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.56 >=dev-libs/libgudev-232 mbim? ( >=net-libs/libmbim-1.18.0 )
+SLOT=0/5.8
+SRC_URI=https://www.freedesktop.org/software/libqmi/libqmi-1.30.0.tar.xz
+_md5_=732ed716bc001b9382a56c71b902107c
diff --git a/metadata/md5-cache/net-libs/libqmi-9999 b/metadata/md5-cache/net-libs/libqmi-9999
index 2743513e7bff..738c58254705 100644
--- a/metadata/md5-cache/net-libs/libqmi-9999
+++ b/metadata/md5-cache/net-libs/libqmi-9999
@@ -1,13 +1,13 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-util/gtk-doc ) dev-util/gtk-doc >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) dev-util/gtk-doc >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-libs/glib-2.48 dev-libs/libgudev mbim? ( >=net-libs/libmbim-1.18.0 )
+DEPEND=>=dev-libs/glib-2.56 >=dev-libs/libgudev-232 mbim? ( >=net-libs/libmbim-1.18.0 )
 DESCRIPTION=Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi
-IUSE=doc +mbim
+IUSE=gtk-doc +mbim
 LICENSE=LGPL-2
 PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.48 dev-libs/libgudev mbim? ( >=net-libs/libmbim-1.18.0 )
-SLOT=0/5.7
+RDEPEND=>=dev-libs/glib-2.56 >=dev-libs/libgudev-232 mbim? ( >=net-libs/libmbim-1.18.0 )
+SLOT=0/5.8
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=537160f7555d5b5153538e16194a768e
+_md5_=732ed716bc001b9382a56c71b902107c
diff --git a/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1 b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
index 91a64db5717d..0db03e3d2f31 100644
--- a/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
+++ b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
@@ -1,8 +1,8 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.16* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=install prepare setup
 DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1
 DESCRIPTION=A simple C language RPC framework
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/haiwen/libsearpc/ http://seafile.com/
 IUSE=python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/haiwen/libsearpc/archive/v3.2.0.tar.gz -> libsearpc-3.2.0.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7d615bd57a8f3bc9a00a4df7ad44b50b
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=47f0eb9a39e2d93b25c1c91879dff31c
diff --git a/metadata/md5-cache/net-libs/libssh-0.9.5 b/metadata/md5-cache/net-libs/libssh-0.9.5
index 2757daea9260..7a03b50806f9 100644
--- a/metadata/md5-cache/net-libs/libssh-0.9.5
+++ b/metadata/md5-cache/net-libs/libssh-0.9.5
@@ -5,7 +5,7 @@ DESCRIPTION=Access a working SSH implementation by means of a library
 EAPI=7
 HOMEPAGE=https://www.libssh.org/
 IUSE=debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=!gcrypt? ( !mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=?? ( gcrypt mbedtls )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://www.libssh.org/files/0.9/libssh-0.9.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eb0d488ef8a2e4b745a94b9999691dde
+_md5_=3083ce10a576928483630abdd28157b5
diff --git a/metadata/md5-cache/net-libs/libupnpp-0.21.0 b/metadata/md5-cache/net-libs/libupnpp-0.21.0
new file mode 100644
index 000000000000..5fbb0279beca
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libupnpp-0.21.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-libs/expat net-libs/libnpupnp net-misc/curl
+DESCRIPTION=The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay
+EAPI=8
+HOMEPAGE=https://www.lesbonscomptes.com/upmpdcli
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat net-libs/libnpupnp net-misc/curl
+SLOT=0
+SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.21.0.tar.gz
+_md5_=6f0e291a515ce0cbf4f1b09f96230a74
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2 b/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2
index 576c498319e8..d694d774aa3f 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2
+++ b/metadata/md5-cache/net-libs/nghttp2-1.43.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=HTTP/2 C Library
 EAPI=7
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.14
 SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.43.0/nghttp2-1.43.0.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=810f8a0580a502c4af3c09514b52344f
+_md5_=080d59b5430de2f051f4d594a40aaed5
diff --git a/metadata/md5-cache/net-libs/nodejs-16.6.0 b/metadata/md5-cache/net-libs/nodejs-16.6.0
deleted file mode 100644
index d1c32b00163e..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-16.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
-RESTRICT=!test? ( test )
-SLOT=0/16
-SRC_URI=https://nodejs.org/dist/v16.6.0/node-v16.6.0.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7a272437154753d69a2f8dcbb2fa0db4
diff --git a/metadata/md5-cache/net-libs/nodejs-16.6.1 b/metadata/md5-cache/net-libs/nodejs-16.6.1
new file mode 100644
index 000000000000..56856851998b
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-16.6.1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0/16
+SRC_URI=https://nodejs.org/dist/v16.6.1/node-v16.6.1.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7a272437154753d69a2f8dcbb2fa0db4
diff --git a/metadata/md5-cache/net-libs/uhttpmock-0.5.3 b/metadata/md5-cache/net-libs/uhttpmock-0.5.3
index acf1d4f5f7a5..d1dc8737428b 100644
--- a/metadata/md5-cache/net-libs/uhttpmock-0.5.3
+++ b/metadata/md5-cache/net-libs/uhttpmock-0.5.3
@@ -5,11 +5,11 @@ 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv 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
+SRC_URI=https://tecnocode.co.uk/downloads/uhttpmock/uhttpmock-0.5.3.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3d3008ed67cbae40c6b97cc4b03ffbf4
+_md5_=b2f2f35fbe569fa615bde8f48322d143
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.32.1 b/metadata/md5-cache/net-libs/webkit-gtk-2.32.1
deleted file mode 100644
index f313d6c555ff..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.32.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 dev-lang/ruby:3.0 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.32 ) geolocation? ( dev-util/gdbus-codegen ) >=dev-util/cmake-3.10 dev-util/ninja dev-util/cmake >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Open source web browser engine
-EAPI=7
-HOMEPAGE=https://www.webkitgtk.org
-IUSE=aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X test
-KEYWORDS=amd64 arm arm64 ppc64 ~sparc x86
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4/37
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.32.1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=04c065807d96fbcd57183724975a3022
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.32.2 b/metadata/md5-cache/net-libs/webkit-gtk-2.32.2
deleted file mode 100644
index 0a9c1f5b1b6c..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.32.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 dev-lang/ruby:3.0 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.32 ) geolocation? ( dev-util/gdbus-codegen ) >=dev-util/cmake-3.10 dev-util/ninja dev-util/cmake >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Open source web browser engine
-EAPI=7
-HOMEPAGE=https://www.webkitgtk.org
-IUSE=aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4/37
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.32.2.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=de1e6a13ea666592d108c383fdc3921a
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.32.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.32.3
index 36c9622367e4..3524499289d7 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.32.3
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.32.3
@@ -5,12 +5,12 @@ DESCRIPTION=Open source web browser engine
 EAPI=7
 HOMEPAGE=https://www.webkitgtk.org
 IUSE=aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X test
-KEYWORDS=amd64 arm arm64 ppc64 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~sparc x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
 REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
 RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.32.3.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d19935ede2cf8199b199a5c7a5d1f58f
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1e96e003625717a94790949e6576da38
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 2416431ca752..be2f8b33d354 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/amavis-logwatch-1.51.04 b/metadata/md5-cache/net-mail/amavis-logwatch-1.51.04
new file mode 100644
index 000000000000..3a5394b72720
--- /dev/null
+++ b/metadata/md5-cache/net-mail/amavis-logwatch-1.51.04
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A log analyzer for amavisd-new
+EAPI=8
+HOMEPAGE=http://michael.orlitzky.com/code/amavis-logwatch.xhtml
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=http://michael.orlitzky.com/code/releases/amavis-logwatch-1.51.04.tar.xz
+_md5_=41e09b7d6ec9bf29fbf3476da8dc3a51
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.19 b/metadata/md5-cache/net-mail/fetchmail-6.4.19
deleted file mode 100644
index cb59e44d11ac..000000000000
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
-DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
-EAPI=7
-HOMEPAGE=https://www.fetchmail.info/
-IUSE=ssl nls kerberos tk socks python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 public-domain
-RDEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) virtual/tmpfiles
-REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.19.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c02876407a3ccce760cdebda106ea9d7
diff --git a/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8 b/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8
deleted file mode 100644
index ec49a5fc1cc8..000000000000
--- a/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
-DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
-EAPI=7
-HOMEPAGE=https://www.fetchmail.info/
-IUSE=kerberos nls +python socks +ssl tk python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 public-domain
-RDEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) virtual/tmpfiles
-REQUIRED_USE=tk? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/fetchmail/fetchmail-7.0.0-alpha8.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5ff3dcbbd90387fc205cb6b0a5c5121c
diff --git a/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha9 b/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha9
new file mode 100644
index 000000000000..c6f69a7411d5
--- /dev/null
+++ b/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha9
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
+DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
+EAPI=7
+HOMEPAGE=https://www.fetchmail.info/
+IUSE=kerberos nls +python socks +ssl tk python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 public-domain
+RDEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) virtual/tmpfiles
+REQUIRED_USE=tk? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/fetchmail/fetchmail-7.0.0-alpha9.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5ff3dcbbd90387fc205cb6b0a5c5121c
diff --git a/metadata/md5-cache/net-mail/mailutils-3.12-r2 b/metadata/md5-cache/net-mail/mailutils-3.12-r2
deleted file mode 100644
index 14394c3202d5..000000000000
--- a/metadata/md5-cache/net-mail/mailutils-3.12-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/libcrypt:= virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm:= ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
-DESCRIPTION=A useful collection of mail servers, clients, and filters
-EAPI=7
-HOMEPAGE=https://mailutils.org/
-IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/libcrypt:= virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm:= ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) servers? ( tcpd ldap )
-SLOT=0
-SRC_URI=mirror://gnu/mailutils/mailutils-3.12.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=050dfed899bb0bfedf3000764a73e5fe
diff --git a/metadata/md5-cache/net-mail/mailutils-3.12-r3 b/metadata/md5-cache/net-mail/mailutils-3.12-r3
index f1369fd7e88a..e6e6d02659d3 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.12-r3
+++ b/metadata/md5-cache/net-mail/mailutils-3.12-r3
@@ -5,11 +5,11 @@ DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=7
 HOMEPAGE=https://mailutils.org/
 IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!mail-filter/libsieve !mail-client/mailx sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/libcrypt:= virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm:= ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.12.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=58c8076bc1554fdcc08bb148782d8eb4
+_md5_=ec47d00aea15f2254f2f8cd91ae406db
diff --git a/metadata/md5-cache/net-mail/mailutils-3.13 b/metadata/md5-cache/net-mail/mailutils-3.13
new file mode 100644
index 000000000000..189e3c6ae1f6
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailutils-3.13
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup
+DEPEND=!mail-filter/libsieve !mail-client/mailx sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/libcrypt:= virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm:= ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
+DESCRIPTION=A useful collection of mail servers, clients, and filters
+EAPI=7
+HOMEPAGE=https://mailutils.org/
+IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=!mail-filter/libsieve !mail-client/mailx sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/libcrypt:= virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm:= ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring:= ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) servers? ( tcpd ldap )
+SLOT=0
+SRC_URI=mirror://gnu/mailutils/mailutils-3.13.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=94cfff2b3698414844d44a429bc5a72c
diff --git a/metadata/md5-cache/net-mail/postfix-logwatch-1.40.04 b/metadata/md5-cache/net-mail/postfix-logwatch-1.40.04
new file mode 100644
index 000000000000..2cdf2306def0
--- /dev/null
+++ b/metadata/md5-cache/net-mail/postfix-logwatch-1.40.04
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=A log analyzer for postfix
+EAPI=8
+HOMEPAGE=http://michael.orlitzky.com/code/postfix-logwatch.xhtml
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=http://michael.orlitzky.com/code/releases/postfix-logwatch-1.40.04.tar.xz
+_md5_=54374e22306107b1376394b0490a4aa4
diff --git a/metadata/md5-cache/net-mail/swaks-20201014.0 b/metadata/md5-cache/net-mail/swaks-20201014.0
index 5a52ed0b9951..8e0b41a50dc7 100644
--- a/metadata/md5-cache/net-mail/swaks-20201014.0
+++ b/metadata/md5-cache/net-mail/swaks-20201014.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-perl/Authen-DigestMD5 dev-perl/Authen-NTLM dev-perl/CGI dev-perl/DBI dev-perl/Email-Send dev-perl/Email-Valid dev-perl/Net-DNS dev-perl/Params-Validate dev-perl/URI virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Time-HiRes virtual/perl-Time-Local
 SLOT=0
 SRC_URI=http://www.jetmore.org/john/code/swaks/swaks-20201014.0.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	perl-functions	fea344a91ebf37efadf172c6a3de5a72
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	perl-functions	fea344a91ebf37efadf172c6a3de5a72
 _md5_=781da15335e526559bf796bcc9bf9f49
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 00ebba5f9362..a929095b9007 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/anydesk-5.5.6-r1 b/metadata/md5-cache/net-misc/anydesk-5.5.6-r1
index d4c7fdf2682a..d1afe2462948 100644
--- a/metadata/md5-cache/net-misc/anydesk-5.5.6-r1
+++ b/metadata/md5-cache/net-misc/anydesk-5.5.6-r1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freety
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.anydesk.com/linux/anydesk-5.5.6-amd64.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-5.5.6-amd64.tar.gz ) x86? ( https://download.anydesk.com/linux/anydesk-5.5.6-i386.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-5.5.6-i386.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1f04a803fcc3a9a22f95737440668f1b
diff --git a/metadata/md5-cache/net-misc/anydesk-6.0.0-r1 b/metadata/md5-cache/net-misc/anydesk-6.0.0-r1
index 265c73287baf..f3df66109b51 100644
--- a/metadata/md5-cache/net-misc/anydesk-6.0.0-r1
+++ b/metadata/md5-cache/net-misc/anydesk-6.0.0-r1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freety
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.anydesk.com/linux/anydesk-6.0.0-amd64.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.0.0-amd64.tar.gz ) x86? ( https://download.anydesk.com/linux/anydesk-6.0.0-i386.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.0.0-i386.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1f04a803fcc3a9a22f95737440668f1b
diff --git a/metadata/md5-cache/net-misc/anydesk-6.0.1 b/metadata/md5-cache/net-misc/anydesk-6.0.1
index e843c878da88..70726880a13c 100644
--- a/metadata/md5-cache/net-misc/anydesk-6.0.1
+++ b/metadata/md5-cache/net-misc/anydesk-6.0.1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freety
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.anydesk.com/linux/anydesk-6.0.1-amd64.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.0.1-amd64.tar.gz ) x86? ( https://download.anydesk.com/linux/anydesk-6.0.1-i386.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.0.1-i386.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2629cbefe20e3e297d224401b26ac52a
diff --git a/metadata/md5-cache/net-misc/anydesk-6.1.0 b/metadata/md5-cache/net-misc/anydesk-6.1.0
index 5c321135b654..ad903a03d056 100644
--- a/metadata/md5-cache/net-misc/anydesk-6.1.0
+++ b/metadata/md5-cache/net-misc/anydesk-6.1.0
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freety
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://download.anydesk.com/linux/anydesk-6.1.0-amd64.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.1.0-amd64.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4206ab59d199d5dd90cbd45b6f2b52fc
diff --git a/metadata/md5-cache/net-misc/anydesk-6.1.1 b/metadata/md5-cache/net-misc/anydesk-6.1.1
index 7068b5255c6e..bc5ff7efc67f 100644
--- a/metadata/md5-cache/net-misc/anydesk-6.1.1
+++ b/metadata/md5-cache/net-misc/anydesk-6.1.1
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freety
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://download.anydesk.com/linux/anydesk-6.1.1-amd64.tar.gz https://download.anydesk.com/linux/generic-linux/anydesk-6.1.1-amd64.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=753bc29f54dfa6f497c690c6cde9471f
diff --git a/metadata/md5-cache/net-misc/buka-3.0.1 b/metadata/md5-cache/net-misc/buka-3.0.1
index a4ea1c391be2..a3746a18672a 100644
--- a/metadata/md5-cache/net-misc/buka-3.0.1
+++ b/metadata/md5-cache/net-misc/buka-3.0.1
@@ -7,5 +7,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-python/beautifulsoup dev-python/requests sys-process/parallel net-misc/curl dev-util/dialog
 SLOT=0
 SRC_URI=https://gitlab.com/drylemon/buka/repository/3.0.1/archive.tar.gz?ref=3.0.1 -> buka-3.0.1.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=dd3ae1ea629b9330fa2dae0d377dbaee
diff --git a/metadata/md5-cache/net-misc/chrome-remote-desktop-91.0.4472.10 b/metadata/md5-cache/net-misc/chrome-remote-desktop-91.0.4472.10
index a0f71c05b4e9..af3bb5b2e65c 100644
--- a/metadata/md5-cache/net-misc/chrome-remote-desktop-91.0.4472.10
+++ b/metadata/md5-cache/net-misc/chrome-remote-desktop-91.0.4472.10
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_91.0.4472.10_amd64.deb )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
 _md5_=aa4e251fe21dd3266048e3e580a1e6b5
diff --git a/metadata/md5-cache/net-misc/dleyna-server-0.7.0-r1 b/metadata/md5-cache/net-misc/dleyna-server-0.7.0-r1
index 6ca6dd8c5960..e73c8e12f358 100644
--- a/metadata/md5-cache/net-misc/dleyna-server-0.7.0-r1
+++ b/metadata/md5-cache/net-misc/dleyna-server-0.7.0-r1
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.36:2 >=net-libs/gssdp-1.2:0= >=net-libs/gupnp-1.2:0= >=net-libs/gupnp-av-0.11.5 >=media-libs/gupnp-dlna-0.9.4:2.0 >=net-libs/libsoup-2.28.2:2.4 >=net-libs/dleyna-core-0.6.0:1.0=
+DEPEND=>=dev-libs/glib-2.36:2 >=net-libs/gssdp-1.2:0= >=net-libs/gupnp-1.2:0= >=net-libs/gupnp-av-0.11.5:= >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-2.28.2:2.4 >=net-libs/dleyna-core-0.6.0:1.0=
 DESCRIPTION=Service that allows to discover and manipulate DLNA Digital Media servers (DMS)
 EAPI=7
 HOMEPAGE=https://github.com/phako/dleyna-server
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.36:2 >=net-libs/gssdp-1.2:0= >=net-libs/gupnp-1.2:0= >=net-libs/gupnp-av-0.11.5 >=media-libs/gupnp-dlna-0.9.4:2.0 >=net-libs/libsoup-2.28.2:2.4 >=net-libs/dleyna-core-0.6.0:1.0=
+RDEPEND=>=dev-libs/glib-2.36:2 >=net-libs/gssdp-1.2:0= >=net-libs/gupnp-1.2:0= >=net-libs/gupnp-av-0.11.5:= >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-2.28.2:2.4 >=net-libs/dleyna-core-0.6.0:1.0=
 SLOT=0
 SRC_URI=https://github.com/phako/dleyna-server/archive/refs/tags/v0.7.0.tar.gz -> dleyna-server-0.7.0.tar.gz https://dev.gentoo.org/~mattst88/distfiles/dleyna-server-0.7.0-r1-patchset.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=01960371531ffffe362ac2a0b06892e7
+_md5_=338b19d7ba70d33d69a85c0f5d3112a5
diff --git a/metadata/md5-cache/net-misc/econnman-1.1-r2 b/metadata/md5-cache/net-misc/econnman-1.1-r2
index fd2a2318ca43..9822fb5fe664 100644
--- a/metadata/md5-cache/net-misc/econnman-1.1-r2
+++ b/metadata/md5-cache/net-misc/econnman-1.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=ConnMan User Interface written with EFL & python
 EAPI=7
 HOMEPAGE=https://phab.enlightenment.org/w/projects/econnman/ https://www.enlightenment.org/
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=LGPL-3
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/efl[X,connman] python_single_target_python3_8? ( dev-python/python-efl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-efl[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python-efl[python_targets_python3_10(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/apps/econnman/econnman-1.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=477b396a9a3b87a3d42630ffb7743e89
+_md5_=1ce47eae5d6ec58052470d7ff28dcb21
diff --git a/metadata/md5-cache/net-misc/electrum-4.1.2-r1 b/metadata/md5-cache/net-misc/electrum-4.1.2-r1
deleted file mode 100644
index 14d899642e48..000000000000
--- a/metadata/md5-cache/net-misc/electrum-4.1.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pyaes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/aiorpcX-0.19*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ncurses? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=User friendly Bitcoin client
-EAPI=7
-HOMEPAGE=https://electrum.org/
-IUSE=cli ncurses qrcode +qt5 test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/aiorpcX-0.19*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ncurses? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spesmilo/electrum/archive/4.1.2.tar.gz -> electrum-4.1.2.gh.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4b0f10c127bc95f49e351ed14e9ace31
diff --git a/metadata/md5-cache/net-misc/electrum-4.1.3 b/metadata/md5-cache/net-misc/electrum-4.1.3
deleted file mode 100644
index 25f6328f5344..000000000000
--- a/metadata/md5-cache/net-misc/electrum-4.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pyaes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/aiorpcX-0.19*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ncurses? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=User friendly Bitcoin client
-EAPI=7
-HOMEPAGE=https://electrum.org/
-IUSE=cli ncurses qrcode +qt5 test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/aiorpcX-0.19*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ncurses? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spesmilo/electrum/archive/4.1.3.tar.gz -> electrum-4.1.3.gh.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=26b78ae418112b117e42a59a42f030e6
diff --git a/metadata/md5-cache/net-misc/electrum-4.1.4 b/metadata/md5-cache/net-misc/electrum-4.1.4
deleted file mode 100644
index bf451cc7fe01..000000000000
--- a/metadata/md5-cache/net-misc/electrum-4.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pyaes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/aiorpcX-0.19*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ncurses? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=User friendly Bitcoin client
-EAPI=7
-HOMEPAGE=https://electrum.org/
-IUSE=cli ncurses qrcode +qt5 test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/aiorpcX-0.19*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ncurses? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spesmilo/electrum/archive/4.1.4.tar.gz -> electrum-4.1.4.gh.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=26b78ae418112b117e42a59a42f030e6
diff --git a/metadata/md5-cache/net-misc/electrum-4.1.5 b/metadata/md5-cache/net-misc/electrum-4.1.5
index df4010c7e19d..5f799ca7bd12 100644
--- a/metadata/md5-cache/net-misc/electrum-4.1.5
+++ b/metadata/md5-cache/net-misc/electrum-4.1.5
@@ -4,7 +4,7 @@ DESCRIPTION=User friendly Bitcoin client
 EAPI=7
 HOMEPAGE=https://electrum.org/
 IUSE=cli ncurses qrcode +qt5 test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/aiorpcX-0.19*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ncurses? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spesmilo/electrum/archive/4.1.5.tar.gz -> electrum-4.1.5.gh.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=26b78ae418112b117e42a59a42f030e6
+_md5_=4b0f10c127bc95f49e351ed14e9ace31
diff --git a/metadata/md5-cache/net-misc/freerdp-2.3.2 b/metadata/md5-cache/net-misc/freerdp-2.3.2
index 5f19d10f9ce7..6afbefb54b94 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.3.2
+++ b/metadata/md5-cache/net-misc/freerdp-2.3.2
@@ -5,11 +5,11 @@ DESCRIPTION=Free implementation of the Remote Desktop Protocol
 EAPI=7
 HOMEPAGE=http://www.freerdp.com/
 IUSE=alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/openssl:0= sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264:0= ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://pub.freerdp.com/releases/freerdp-2.3.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c858dde604e72d2c5e24630892152ef3
+_md5_=c190935e23b7357954d51156eef1d359
diff --git a/metadata/md5-cache/net-misc/freerdp-2.9999 b/metadata/md5-cache/net-misc/freerdp-2.9999
index 7283467ea98c..9beff48ed401 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.9999
+++ b/metadata/md5-cache/net-misc/freerdp-2.9999
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/openssl:0= sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups?
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c858dde604e72d2c5e24630892152ef3
+_md5_=bd499a8068d97028c356b93edaf8c07c
diff --git a/metadata/md5-cache/net-misc/gallery-dl-1.17.5 b/metadata/md5-cache/net-misc/gallery-dl-1.17.5
index 643c114f4260..4442ecfc9361 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-1.17.5
+++ b/metadata/md5-cache/net-misc/gallery-dl-1.17.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mikf/gallery-dl/archive/v1.17.5.tar.gz -> gallery-dl-1.17.5.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=771541f83190d41d1704f9cb9d03163b
diff --git a/metadata/md5-cache/net-misc/gallery-dl-1.18.1 b/metadata/md5-cache/net-misc/gallery-dl-1.18.1
index 0e305e73de4a..5ffbb5eb6c8d 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-1.18.1
+++ b/metadata/md5-cache/net-misc/gallery-dl-1.18.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mikf/gallery-dl/archive/v1.18.1.tar.gz -> gallery-dl-1.18.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=771541f83190d41d1704f9cb9d03163b
diff --git a/metadata/md5-cache/net-misc/gallery-dl-9999 b/metadata/md5-cache/net-misc/gallery-dl-9999
index 3af9fd6b87eb..187af26a82b8 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-9999
+++ b/metadata/md5-cache/net-misc/gallery-dl-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2.11.0[python_targets_python3_8(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=771541f83190d41d1704f9cb9d03163b
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.2.21 b/metadata/md5-cache/net-misc/gns3-server-2.2.21
index 69fdcdb0edaf..581c6d5c5915 100644
--- a/metadata/md5-cache/net-misc/gns3-server-2.2.21
+++ b/metadata/md5-cache/net-misc/gns3-server-2.2.21
@@ -10,5 +10,5 @@ RDEPEND=>=app-emulation/dynamips-0.2.18 >=dev-python/aiofiles-0.5.0[python_targe
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.2.21.tar.gz -> gns3-server-2.2.21.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=52c377cb6dcfa7046c51f677e271e485
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.2.22 b/metadata/md5-cache/net-misc/gns3-server-2.2.22
index be85c0b1f735..fb44258d8cd7 100644
--- a/metadata/md5-cache/net-misc/gns3-server-2.2.22
+++ b/metadata/md5-cache/net-misc/gns3-server-2.2.22
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.2.22.tar.gz -> gns3-server-2.2.22.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e434ce26c3e3d2db2ca1e3e5053a3de4
diff --git a/metadata/md5-cache/net-misc/iperf-3.10.1 b/metadata/md5-cache/net-misc/iperf-3.10.1
index 5ea32f12e862..77c80113e4c9 100644
--- a/metadata/md5-cache/net-misc/iperf-3.10.1
+++ b/metadata/md5-cache/net-misc/iperf-3.10.1
@@ -5,10 +5,10 @@ DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
 EAPI=7
 HOMEPAGE=https://github.com/esnet/iperf
 IUSE=sctp
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0= sctp? ( net-misc/lksctp-tools )
 SLOT=3
 SRC_URI=https://github.com/esnet/iperf/archive/3.10.1.tar.gz -> iperf-3.10.1.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2172f761c4835869b40c87ea554c024f
+_md5_=74ab526da2ba216a582ad60813908479
diff --git a/metadata/md5-cache/net-misc/iperf-3.9-r1 b/metadata/md5-cache/net-misc/iperf-3.9-r1
index ab2e68a3ad61..584511e2ba25 100644
--- a/metadata/md5-cache/net-misc/iperf-3.9-r1
+++ b/metadata/md5-cache/net-misc/iperf-3.9-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
 EAPI=7
 HOMEPAGE=https://github.com/esnet/iperf
 IUSE=sctp static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0= sctp? ( net-misc/lksctp-tools )
 SLOT=3
 SRC_URI=https://github.com/esnet/iperf/archive/3.9.tar.gz -> iperf-3.9.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d9765732e186cc6025925dce41581018
+_md5_=af41ddc468a35fa98802ff31c57fbc95
diff --git a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20210805 b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20210805
new file mode 100644
index 000000000000..3f77550c68a9
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20210805
@@ -0,0 +1,13 @@
+BDEPEND=dev-libs/libxslt test? ( dev-libs/libxml2 ) app-arch/xz-utils
+DEFINED_PHASES=-
+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 ~riscv ~sparc ~x86
+LICENSE=CC-PD
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20210805/mobile-broadband-provider-info-20210805.tar.xz
+_eclasses_=gnome.org	b5c48cddff1da36a205d924d722b28c9
+_md5_=d18489727386144c17ac9fc3f6dab09e
diff --git a/metadata/md5-cache/net-misc/ndisc6-1.0.3 b/metadata/md5-cache/net-misc/ndisc6-1.0.3
index 0d7bb69a0dd5..3df3c517a2ae 100644
--- a/metadata/md5-cache/net-misc/ndisc6-1.0.3
+++ b/metadata/md5-cache/net-misc/ndisc6-1.0.3
@@ -4,8 +4,8 @@ DESCRIPTION=Recursive DNS Servers discovery Daemon (rdnssd) for IPv6
 EAPI=5
 HOMEPAGE=https://www.remlab.net/ndisc6/
 IUSE=debug
-KEYWORDS=amd64 arm ~arm64 x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 x86 ~x64-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.remlab.net/files/ndisc6/ndisc6-1.0.3.tar.bz2
-_md5_=398ac1931af28677c5e5744550c61928
+_md5_=9cc409832ef368d21e6a07a5e96d054d
diff --git a/metadata/md5-cache/net-misc/oidc-agent-4.1.0 b/metadata/md5-cache/net-misc/oidc-agent-4.1.0
deleted file mode 100644
index c3df063d161e..000000000000
--- a/metadata/md5-cache/net-misc/oidc-agent-4.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-libs/check )
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/libseccomp
-DESCRIPTION=Agent and tools for managing OpenID Connect tokens on the command line
-EAPI=7
-HOMEPAGE=https://github.com/indigo-dc/oidc-agent
-IUSE=test
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/libseccomp
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/indigo-dc/oidc-agent/archive/v4.1.0.tar.gz -> oidc-agent-4.1.0.tar.gz
-_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4a6423bef326b7a29f432b31fd8190d5
diff --git a/metadata/md5-cache/net-misc/oidc-agent-4.1.1 b/metadata/md5-cache/net-misc/oidc-agent-4.1.1
new file mode 100644
index 000000000000..797a5bfc9930
--- /dev/null
+++ b/metadata/md5-cache/net-misc/oidc-agent-4.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-libs/check )
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/libseccomp
+DESCRIPTION=Agent and tools for managing OpenID Connect tokens on the command line
+EAPI=7
+HOMEPAGE=https://github.com/indigo-dc/oidc-agent
+IUSE=test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/libseccomp
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/indigo-dc/oidc-agent/archive/v4.1.1.tar.gz -> oidc-agent-4.1.1.tar.gz
+_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4a6423bef326b7a29f432b31fd8190d5
diff --git a/metadata/md5-cache/net-misc/rdate-1.10 b/metadata/md5-cache/net-misc/rdate-1.10
index aabcb28c0d5d..9e8c260419af 100644
--- a/metadata/md5-cache/net-misc/rdate-1.10
+++ b/metadata/md5-cache/net-misc/rdate-1.10
@@ -4,10 +4,10 @@ DEPEND=dev-libs/libbsd
 DESCRIPTION=Use TCP or UDP to retrieve the current time of another machine
 EAPI=7
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/openrdate
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=BSD-4
 RDEPEND=dev-libs/libbsd
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/openrdate/archive/1.10.tar.gz -> rdate-1.10.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e34a31294e18b9ba8cba63f4378a8d5f
+_md5_=b7fda8411a4d1f45417bdbb26f5abb51
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.18 b/metadata/md5-cache/net-misc/remmina-1.4.18
index cbf940c8f99c..cd1e787cc258 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.18
+++ b/metadata/md5-cache/net-misc/remmina-1.4.18
@@ -10,5 +10,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= dev-libs/wayland net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.18/Remmina-v1.4.18.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=24a0673315c013d7fff023681cb34c2a
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.20 b/metadata/md5-cache/net-misc/remmina-1.4.20
index 7987495a9669..03c4c57f7657 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.20
+++ b/metadata/md5-cache/net-misc/remmina-1.4.20
@@ -10,5 +10,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libappindicator:3 dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.20/Remmina-v1.4.20.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9722286c2e694d568875b969cd01ffe8
diff --git a/metadata/md5-cache/net-misc/rygel-0.40.1 b/metadata/md5-cache/net-misc/rygel-0.40.1
index 06940b626dce..5d7d5c5bb7fb 100644
--- a/metadata/md5-cache/net-misc/rygel-0.40.1
+++ b/metadata/md5-cache/net-misc/rygel-0.40.1
@@ -1,15 +1,15 @@
 BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gstreamer-1.12:1.0 >=media-libs/gst-plugins-base-1.12:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/gupnp-dlna-0.9.4:2.0 >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-1.1.0:0=[vala] >=net-libs/gupnp-1.1.0:0=[vala] >=net-libs/gupnp-av-0.12.8 >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( app-misc/tracker:3= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gstreamer-1.12:1.0 >=media-libs/gst-plugins-base-1.12:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/gupnp-dlna-0.9.4:2.0= >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-1.1.0:0=[vala] >=net-libs/gupnp-1.1.0:0=[vala] >=net-libs/gupnp-av-0.12.8:= >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( app-misc/tracker:3= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Rygel is an open source UPnP/DLNA MediaServer
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Rygel
 IUSE=gtk gtk-doc +introspection +sqlite tracker test transcode
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gstreamer-1.12:1.0 >=media-libs/gst-plugins-base-1.12:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/gupnp-dlna-0.9.4:2.0 >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-1.1.0:0=[vala] >=net-libs/gupnp-1.1.0:0=[vala] >=net-libs/gupnp-av-0.12.8 >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( app-misc/tracker:3= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 )
+RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gstreamer-1.12:1.0 >=media-libs/gst-plugins-base-1.12:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/gupnp-dlna-0.9.4:2.0= >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-1.1.0:0=[vala] >=net-libs/gupnp-1.1.0:0=[vala] >=net-libs/gupnp-av-0.12.8:= >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( app-misc/tracker:3= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rygel/0.40/rygel-0.40.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=42decbaae764372d44d6a8aaee64ee6a
+_md5_=ed7e2ebcf6900eea3742c1f8816a27e8
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.1 b/metadata/md5-cache/net-misc/seafile-8.0.1
index 4a4f4f99d07d..54e46af53df0 100644
--- a/metadata/md5-cache/net-misc/seafile-8.0.1
+++ b/metadata/md5-cache/net-misc/seafile-8.0.1
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.16* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare setup
 DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) dev-libs/openssl:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson dev-libs/libevent net-libs/libsearpc[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] net-misc/curl sys-libs/zlib || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 )
 DESCRIPTION=File syncing and sharing software with file encryption and group sharing
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/v8.0.1.tar.gz -> seafile-8.0.1.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=403b8b72bead38d75f78a20136c5df00
+_md5_=afcebb10dd14ebdc824ac510a5239d7e
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.2 b/metadata/md5-cache/net-misc/seafile-8.0.2
index b5c030664b28..66dcb08e984b 100644
--- a/metadata/md5-cache/net-misc/seafile-8.0.2
+++ b/metadata/md5-cache/net-misc/seafile-8.0.2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.16* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare setup
 DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) dev-libs/openssl:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson dev-libs/libevent net-libs/libsearpc[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] net-misc/curl sys-libs/zlib || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 )
 DESCRIPTION=File syncing and sharing software with file encryption and group sharing
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/2493113afb174b1a0e6f860512922b69c05cee69.tar.gz -> seafile-8.0.2.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e35bcde064af231d14cb6e49413a412d
+_md5_=21c68357d60ae06629ff38f1af60e4f5
diff --git a/metadata/md5-cache/net-misc/seafile-8.0.3 b/metadata/md5-cache/net-misc/seafile-8.0.3
index 4edc4fad048d..4bc9d733842a 100644
--- a/metadata/md5-cache/net-misc/seafile-8.0.3
+++ b/metadata/md5-cache/net-misc/seafile-8.0.3
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/303080b54859d0fc55ce693902c95f9620876c1b.tar.gz -> seafile-8.0.3.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5e859a047238fbabb72a743c704f341d
+_md5_=d7e598132e4764753825630bc63158fe
diff --git a/metadata/md5-cache/net-misc/shigofumi-0.3-r1 b/metadata/md5-cache/net-misc/shigofumi-0.3-r1
deleted file mode 100644
index 8adf18d0cf06..000000000000
--- a/metadata/md5-cache/net-misc/shigofumi-0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/confuse:0= dev-libs/libxml2:2 sys-libs/readline:0= >=net-libs/libisds-0.7 xattr? ( sys-apps/attr ) virtual/pkgconfig doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Command line client for ISDS
-EAPI=6
-HOMEPAGE=http://xpisar.wz.cz/shigofumi/
-IUSE=debug doc nls xattr
-KEYWORDS=~amd64 ~mips ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/confuse:0= dev-libs/libxml2:2 sys-libs/readline:0= >=net-libs/libisds-0.7 xattr? ( sys-apps/attr )
-SLOT=0
-SRC_URI=http://xpisar.wz.cz/shigofumi/dist/shigofumi-0.3.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0a4415da852214435aa737474c8c7104
diff --git a/metadata/md5-cache/net-misc/shigofumi-0.9 b/metadata/md5-cache/net-misc/shigofumi-0.9
new file mode 100644
index 000000000000..1e62308bc95a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/shigofumi-0.9
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/confuse:= dev-libs/libxml2:2 net-libs/libisds sys-apps/file sys-libs/readline:=
+DESCRIPTION=Command line client for ISDS
+EAPI=8
+HOMEPAGE=http://xpisar.wz.cz/shigofumi/
+IUSE=debug nls xattr
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/confuse:= dev-libs/libxml2:2 net-libs/libisds sys-apps/file sys-libs/readline:=
+SLOT=0
+SRC_URI=http://xpisar.wz.cz/shigofumi/dist/shigofumi-0.9.tar.bz2
+_md5_=b49041ff047f9c55d9f0a6aa9b50e691
diff --git a/metadata/md5-cache/net-misc/shigofumi-9999 b/metadata/md5-cache/net-misc/shigofumi-9999
index ab01771fe5df..0931c0d8af24 100644
--- a/metadata/md5-cache/net-misc/shigofumi-9999
+++ b/metadata/md5-cache/net-misc/shigofumi-9999
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) app-text/docbook-xsl-stylesheets app-text/po4a dev-libs/libxslt sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
-DEPEND=dev-libs/confuse:0= dev-libs/libxml2:2 sys-libs/readline:0= >=net-libs/libisds-0.7 xattr? ( sys-apps/attr ) virtual/pkgconfig doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/confuse:= dev-libs/libxml2:2 net-libs/libisds sys-apps/file sys-libs/readline:=
 DESCRIPTION=Command line client for ISDS
-EAPI=6
+EAPI=8
 HOMEPAGE=http://xpisar.wz.cz/shigofumi/
-IUSE=debug doc nls xattr
+IUSE=debug nls xattr
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-libs/confuse:0= dev-libs/libxml2:2 sys-libs/readline:0= >=net-libs/libisds-0.7 xattr? ( sys-apps/attr )
+RDEPEND=dev-libs/confuse:= dev-libs/libxml2:2 net-libs/libisds sys-apps/file sys-libs/readline:=
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2ae53855088f6629680b3eb80359ad2c
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b49041ff047f9c55d9f0a6aa9b50e691
diff --git a/metadata/md5-cache/net-misc/smb4k-3.0.6 b/metadata/md5-cache/net-misc/smb4k-3.0.6
deleted file mode 100644
index 9f9535bfcfa8..000000000000
--- a/metadata/md5-cache/net-misc/smb4k-3.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 net-fs/samba[cups] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Advanced network neighborhood browser
-EAPI=7
-HOMEPAGE=https://apps.kde.org/smb4k/ https://sourceforge.net/p/smb4k/home/Home/
-IUSE=plasma debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 net-fs/samba[cups] plasma? ( >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/plasma-5.60.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://sourceforge/smb4k/smb4k-3.0.6.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a7d02c9e81163d12746d4ab7f46dd093
diff --git a/metadata/md5-cache/net-misc/smb4k-3.1.0 b/metadata/md5-cache/net-misc/smb4k-3.1.0
index 39d9dfca466a..b671a6a3379f 100644
--- a/metadata/md5-cache/net-misc/smb4k-3.1.0
+++ b/metadata/md5-cache/net-misc/smb4k-3.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=Advanced network neighborhood browser
 EAPI=7
 HOMEPAGE=https://apps.kde.org/smb4k/ https://sourceforge.net/p/smb4k/home/Home/
 IUSE=+discovery plasma debug +handbook
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-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/qtprintsupport-5.15.2:5 >=dev-qt/qttest-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdnssd-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 net-fs/samba[cups] discovery? ( net-libs/kdsoap net-libs/kdsoap-ws-discovery-client ) plasma? ( >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/plasma-5.74.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://sourceforge/smb4k/smb4k-3.1.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0df84a20424fb3dc9df341c3d76ab2b3
+_md5_=9c941491e561206eefe2a2b9f087e8c8
diff --git a/metadata/md5-cache/net-misc/sslh-1.20-r1 b/metadata/md5-cache/net-misc/sslh-1.20-r1
deleted file mode 100644
index cbdf910aedba..000000000000
--- a/metadata/md5-cache/net-misc/sslh-1.20-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:= dev-lang/perl pcre? ( dev-libs/libpcre:= ) virtual/pkgconfig
-DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
-EAPI=6
-HOMEPAGE=https://www.rutschle.net/tech/sslh/README.html
-IUSE=caps pcre systemd tcpd
-KEYWORDS=amd64 ~arm ~m68k ~mips ~s390 x86
-LICENSE=GPL-2
-RDEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.rutschle.net/tech/sslh/sslh-v1.20.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bfccd250a03858081f1d6c5663492042
diff --git a/metadata/md5-cache/net-misc/sslh-1.20-r2 b/metadata/md5-cache/net-misc/sslh-1.20-r2
new file mode 100644
index 000000000000..d78989395cb4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sslh-1.20-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=caps? ( sys-libs/libcap ) pcre? ( dev-libs/libpcre:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:= dev-lang/perl virtual/pkgconfig
+DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
+EAPI=6
+HOMEPAGE=https://www.rutschle.net/tech/sslh/README.html
+IUSE=caps pcre systemd tcpd
+KEYWORDS=amd64 ~arm ~m68k ~mips ~s390 x86
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) pcre? ( dev-libs/libpcre:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.rutschle.net/tech/sslh/sslh-v1.20.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4d90fd4bf1fb27692788c08c614742fd
diff --git a/metadata/md5-cache/net-misc/sslh-1.21-r1 b/metadata/md5-cache/net-misc/sslh-1.21-r1
deleted file mode 100644
index 5d018d3c2d1d..000000000000
--- a/metadata/md5-cache/net-misc/sslh-1.21-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:= dev-lang/perl pcre? ( dev-libs/libpcre:= )
-DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
-EAPI=7
-HOMEPAGE=https://www.rutschle.net/tech/sslh/README.html
-IUSE=caps pcre systemd tcpd
-KEYWORDS=~amd64 ~arm ~m68k ~mips ~s390 ~x86
-LICENSE=GPL-2
-RDEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/yrutschle/sslh/archive/v1.21.tar.gz -> sslh-1.21.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b0fc823d846d6f4b4ab997b0de61ade6
diff --git a/metadata/md5-cache/net-misc/sslh-1.21-r2 b/metadata/md5-cache/net-misc/sslh-1.21-r2
new file mode 100644
index 000000000000..d972ce9f5664
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sslh-1.21-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=caps? ( sys-libs/libcap ) pcre? ( dev-libs/libpcre:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:= dev-lang/perl
+DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
+EAPI=7
+HOMEPAGE=https://www.rutschle.net/tech/sslh/README.html
+IUSE=caps pcre systemd tcpd
+KEYWORDS=~amd64 ~arm ~m68k ~mips ~s390 ~x86
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) pcre? ( dev-libs/libpcre:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/yrutschle/sslh/archive/v1.21.tar.gz -> sslh-1.21.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c951ad906b3801f5a0013d76ca87b5f4
diff --git a/metadata/md5-cache/net-misc/sslh-1.21b-r1 b/metadata/md5-cache/net-misc/sslh-1.21b-r1
deleted file mode 100644
index 81332832dca9..000000000000
--- a/metadata/md5-cache/net-misc/sslh-1.21b-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:= dev-lang/perl pcre? ( dev-libs/libpcre:= )
-DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
-EAPI=7
-HOMEPAGE=https://www.rutschle.net/tech/sslh/README.html
-IUSE=caps pcre systemd tcpd
-KEYWORDS=~amd64 ~arm ~m68k ~mips ~s390 ~x86
-LICENSE=GPL-2
-RDEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/yrutschle/sslh/archive/v1.21b.tar.gz -> sslh-1.21b.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b0fc823d846d6f4b4ab997b0de61ade6
diff --git a/metadata/md5-cache/net-misc/sslh-1.21b-r2 b/metadata/md5-cache/net-misc/sslh-1.21b-r2
new file mode 100644
index 000000000000..47226b1d8ab4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sslh-1.21b-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=caps? ( sys-libs/libcap ) pcre? ( dev-libs/libpcre:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:= dev-lang/perl
+DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
+EAPI=7
+HOMEPAGE=https://www.rutschle.net/tech/sslh/README.html
+IUSE=caps pcre systemd tcpd
+KEYWORDS=~amd64 ~arm ~m68k ~mips ~s390 ~x86
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) pcre? ( dev-libs/libpcre:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/yrutschle/sslh/archive/v1.21b.tar.gz -> sslh-1.21b.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c951ad906b3801f5a0013d76ca87b5f4
diff --git a/metadata/md5-cache/net-misc/sslh-1.21c-r1 b/metadata/md5-cache/net-misc/sslh-1.21c-r1
deleted file mode 100644
index 8c6ba2b79d99..000000000000
--- a/metadata/md5-cache/net-misc/sslh-1.21c-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:= dev-lang/perl pcre? ( dev-libs/libpcre:= )
-DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
-EAPI=7
-HOMEPAGE=https://www.rutschle.net/tech/sslh/README.html
-IUSE=caps pcre systemd tcpd
-KEYWORDS=~amd64 ~arm ~m68k ~mips ~s390 ~x86
-LICENSE=GPL-2
-RDEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/yrutschle/sslh/archive/v1.21c.tar.gz -> sslh-1.21c.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b0fc823d846d6f4b4ab997b0de61ade6
diff --git a/metadata/md5-cache/net-misc/sslh-1.21c-r2 b/metadata/md5-cache/net-misc/sslh-1.21c-r2
new file mode 100644
index 000000000000..9512eb0a5db2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sslh-1.21c-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=caps? ( sys-libs/libcap ) pcre? ( dev-libs/libpcre:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:= dev-lang/perl
+DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
+EAPI=7
+HOMEPAGE=https://www.rutschle.net/tech/sslh/README.html
+IUSE=caps pcre systemd tcpd
+KEYWORDS=~amd64 ~arm ~m68k ~mips ~s390 ~x86
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) pcre? ( dev-libs/libpcre:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/yrutschle/sslh/archive/v1.21c.tar.gz -> sslh-1.21c.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c951ad906b3801f5a0013d76ca87b5f4
diff --git a/metadata/md5-cache/net-misc/sslh-9999 b/metadata/md5-cache/net-misc/sslh-9999
index 03a3877d407b..d0d793cb8cc8 100644
--- a/metadata/md5-cache/net-misc/sslh-9999
+++ b/metadata/md5-cache/net-misc/sslh-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:= dev-util/conf2struct dev-lang/perl pcre? ( dev-libs/libpcre:= )
+DEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:= dev-libs/libpcre2:= dev-util/conf2struct dev-lang/perl
 DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
 EAPI=7
 HOMEPAGE=https://www.rutschle.net/tech/sslh/README.html
-IUSE=caps pcre systemd tcpd
+IUSE=caps systemd tcpd
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:=
+RDEPEND=caps? ( sys-libs/libcap ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/libconfig-1.5:= dev-libs/libpcre2:=
 RESTRICT=test
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ff0731deeb03152e6b12e14a493b01a2
+_md5_=6dccb19444a3937318fb3c99bdd9458b
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.11.0-r2 b/metadata/md5-cache/net-misc/tigervnc-1.11.0-r2
deleted file mode 100644
index 6d34b98f73a2..000000000000
--- a/metadata/md5-cache/net-misc/tigervnc-1.11.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( sys-libs/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/pixman server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) dev-libs/openssl:0= ) xinerama? ( x11-libs/libXinerama ) nls? ( sys-devel/gettext ) java? ( >=virtual/jdk-1.5 ) x11-base/xorg-proto media-libs/fontconfig x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXft x11-libs/libXi server? ( dev-libs/libbsd x11-libs/libxkbfile x11-libs/libxshmfence virtual/pkgconfig media-fonts/font-util x11-misc/util-macros >=x11-libs/xtrans-1.3.3 opengl? ( >=media-libs/mesa-10.3.4-r1 ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Remote desktop viewer display system
-EAPI=7
-HOMEPAGE=http://www.tigervnc.org
-IUSE=dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( sys-libs/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/pixman server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) dev-libs/openssl:0= ) xinerama? ( x11-libs/libXinerama ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.11.0.tar.gz -> tigervnc-1.11.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.20.0.tar.bz2 )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ccac97e64bd6c2d744395f2bee9f10b9
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1 b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
deleted file mode 100644
index 610c37067102..000000000000
--- a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( sys-libs/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) dev-libs/openssl:0= ) xinerama? ( x11-libs/libXinerama ) nls? ( sys-devel/gettext ) java? ( >=virtual/jdk-1.5 ) x11-base/xorg-proto media-libs/fontconfig x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXft x11-libs/libXi server? ( dev-libs/libbsd x11-libs/libxkbfile x11-libs/libxshmfence virtual/pkgconfig media-fonts/font-util x11-misc/util-macros >=x11-libs/xtrans-1.3.3 opengl? ( >=media-libs/mesa-10.3.4-r1 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Remote desktop viewer display system
-EAPI=6
-HOMEPAGE=http://www.tigervnc.org
-IUSE=dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( sys-libs/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) dev-libs/openssl:0= ) xinerama? ( x11-libs/libXinerama ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.9.0.tar.gz -> tigervnc-1.9.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.20.0.tar.bz2 )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=891778f5e001d2679d74289ca76e5462
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r2 b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r2
index ec8f180ab71f..85ad0dc237dc 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r2
+++ b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Remote desktop viewer display system
 EAPI=7
 HOMEPAGE=http://www.tigervnc.org
 IUSE=dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( sys-libs/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) dev-libs/openssl:0= ) xinerama? ( x11-libs/libXinerama ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.9.0.tar.gz -> tigervnc-1.9.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.20.0.tar.bz2 )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bc0d2adf6a03aaa73b2a549fd25190d9
+_md5_=f4d0d181c798ae069803d6238489ce37
diff --git a/metadata/md5-cache/net-misc/xmrig-6.12.2 b/metadata/md5-cache/net-misc/xmrig-6.12.2
index 178b1db3d3fe..a79b5427e1f2 100644
--- a/metadata/md5-cache/net-misc/xmrig-6.12.2
+++ b/metadata/md5-cache/net-misc/xmrig-6.12.2
@@ -5,10 +5,10 @@ DESCRIPTION=RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner
 EAPI=7
 HOMEPAGE=https://xmrig.com https://github.com/xmrig/xmrig
 IUSE=cpu_flags_x86_sse4_1 donate hwloc +ssl
-KEYWORDS=amd64 ~arm64
+KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0 GPL-3+ MIT
 RDEPEND=dev-libs/libuv:= hwloc? ( sys-apps/hwloc:= ) ssl? ( dev-libs/openssl:= ) !arm64? ( sys-apps/msr-tools )
 SLOT=0
 SRC_URI=https://github.com/xmrig/xmrig/archive/v6.12.2.tar.gz -> xmrig-6.12.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4b689e327c4b203c682bc63380d1808e
+_md5_=e7a05b2e84a1072510c44b77e2e8b74b
diff --git a/metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2 b/metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2
index 2eeefa0b9139..25a052238ea4 100644
--- a/metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2
+++ b/metadata/md5-cache/net-misc/youtube-viewer-3.7.4-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-perl/Data-Dump dev-perl/JSON dev-perl/libwww-perl[ssl] dev-perl/Term
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
 SRC_URI=https://github.com/trizen/youtube-viewer/archive/3.7.4.tar.gz -> youtube-viewer-3.7.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=87e1e7d7e803d3ec0f43b6d1d3f8d588
diff --git a/metadata/md5-cache/net-misc/youtube-viewer-9999 b/metadata/md5-cache/net-misc/youtube-viewer-9999
index ae3b689ec85f..0e7b86c16b23 100644
--- a/metadata/md5-cache/net-misc/youtube-viewer-9999
+++ b/metadata/md5-cache/net-misc/youtube-viewer-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-perl/Data-Dump dev-perl/JSON dev-perl/libwww-perl[ssl] dev-perl/Term-ReadLine-Gnu dev-perl/LWP-Protocol-https virtual/perl-Encode virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Scalar-List-Utils virtual/perl-Term-ANSIColor virtual/perl-Term-ReadLine virtual/perl-Text-ParseWords virtual/perl-Text-Tabs+Wrap gtk? ( gtk2? ( >=dev-perl/Gtk2-1.244.0 ) !gtk2? ( dev-perl/Gtk3 ) dev-perl/File-ShareDir virtual/freedesktop-icon-theme x11-libs/gdk-pixbuf:2[jpeg] ) || ( >=media-video/ffmpeg-4.1.3[openssl] >=media-video/ffmpeg-4.1.3[gnutls] ) || ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) ) dev-lang/perl:=
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fe1a1724462fa80fa227b2a68962ca76
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 22ba4cbc83ef..8a6121a4d60b 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/airdcpp-webclient-2.10.1-r1 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.10.1-r1
deleted file mode 100644
index 44cd757d88ee..000000000000
--- a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.10.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( dev-lang/python:3.9 dev-lang/python:3.8 >=dev-python/pypy3-7.3.0:0 ) dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-user/airdcppd acct-group/airdcppd app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist(-)] net-libs/miniupnpc:= sys-libs/zlib virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
-DESCRIPTION=Cross-platform Direct Connect client
-EAPI=7
-HOMEPAGE=https://airdcpp-web.github.io/
-IUSE=debug nat-pmp +tbb +webui
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-PDEPEND=webui? ( www-apps/airdcpp-webui )
-RDEPEND=acct-user/airdcppd acct-group/airdcppd app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist(-)] net-libs/miniupnpc:= sys-libs/zlib virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
-SLOT=0
-SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.10.1.tar.gz -> airdcpp-webclient-2.10.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2fab0acdad57524ea720ea6ead7664e8
diff --git a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.11.1 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.11.1
new file mode 100644
index 000000000000..8d2ec3aa4562
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.11.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 >=dev-python/pypy3-7.3.0:0 ) dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-user/airdcppd acct-group/airdcppd app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist(-)] net-libs/miniupnpc:= sys-libs/zlib virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
+DESCRIPTION=Cross-platform Direct Connect client
+EAPI=7
+HOMEPAGE=https://airdcpp-web.github.io/
+IUSE=debug nat-pmp +tbb +webui
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+PDEPEND=webui? ( www-apps/airdcpp-webui )
+RDEPEND=acct-user/airdcppd acct-group/airdcppd app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist(-)] net-libs/miniupnpc:= sys-libs/zlib virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
+SLOT=0
+SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.11.1.tar.gz -> airdcpp-webclient-2.11.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=78fa28ef0c55dc53d4fc69c0070bc20f
diff --git a/metadata/md5-cache/net-p2p/amule-2.3.3 b/metadata/md5-cache/net-p2p/amule-2.3.3
index b7cc096332d9..3d728d5675f3 100644
--- a/metadata/md5-cache/net-p2p/amule-2.3.3
+++ b/metadata/md5-cache/net-p2p/amule-2.3.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/boost:= dev-libs/crypto++:= sys-libs/binutils-libs:0= sys-libs/readline:0= sys-libs/zlib >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X?] daemon? ( acct-user/amule ) geoip? ( dev-libs/geoip ) nls? ( virtual/libintl ) remote? ( acct-user/amule media-libs/libpng:0= ) stats? ( media-libs/gd:=[jpeg,png] ) upnp? ( net-libs/libupnp:0 )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/amule/aMule-2.3.3.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=78b394ee3dc3aee6404b44f5c54c0b20
diff --git a/metadata/md5-cache/net-p2p/amule-9999 b/metadata/md5-cache/net-p2p/amule-9999
index 05fcc140c45e..3a9cd3e55d2a 100644
--- a/metadata/md5-cache/net-p2p/amule-9999
+++ b/metadata/md5-cache/net-p2p/amule-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-libs/crypto++:= sys-libs/binutils-libs:0= sys-libs/readline:0= sys-libs/zlib >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X?] daemon? ( acct-user/amule ) geoip? ( dev-libs/geoip ) nls? ( virtual/libintl ) remote? ( acct-user/amule media-libs/libpng:0= ) stats? ( media-libs/gd:=[jpeg,png] ) upnp? ( net-libs/libupnp:0 )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8e6fbfb7df064a96d0ccf2f1ec3213f6
diff --git a/metadata/md5-cache/net-p2p/ktorrent-21.04.3 b/metadata/md5-cache/net-p2p/ktorrent-21.04.3
index 070d725fa417..f32b4e26822c 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-21.04.3
+++ b/metadata/md5-cache/net-p2p/ktorrent-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Powerful BitTorrent client based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://apps.kde.org/ktorrent/
 IUSE=+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcmutils-5.80.0:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kiconthemes-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/knotifications-5.80.0:5 >=kde-frameworks/knotifyconfig-5.80.0:5 >=kde-frameworks/kparts-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kwindowsystem-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=kde-frameworks/solid-5.80.0:5 >=net-libs/libktorrent-21.04.3:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.80.0:5 >=kde-frameworks/kitemviews-5.80.0:5 >=kde-frameworks/kross-5.80.0:5 ) mediaplayer? ( >=media-libs/phonon-4.11.0 >=media-libs/taglib-1.5 ) rss? ( >=dev-qt/qtwebengine-5.15.2:5 >=kde-frameworks/syndication-5.80.0:5 ) shutdown? ( kde-plasma/libkworkspace:5 ) stats? ( >=kde-frameworks/kplotting-5.80.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.80.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.80.0:5 ) ipfilter? ( app-arch/bzip2 app-arch/unzip kde-apps/kio-extras:5 >=kde-frameworks/ktextwidgets-5.80.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/ktorrent-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c200147b0b700ed3ef818363d01a579c
+_md5_=c20a2461b6049fb0f7ed162e3b45bfb7
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.18.0 b/metadata/md5-cache/net-p2p/syncthing-1.18.0
deleted file mode 100644
index b26c0ea77168..000000000000
--- a/metadata/md5-cache/net-p2p/syncthing-1.18.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm prepare test unpack
-DESCRIPTION=Open Source Continuous File Synchronization
-EAPI=7
-HOMEPAGE=https://syncthing.net
-IUSE=selinux tools
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 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.18.0.tar.gz -> syncthing-1.18.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.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-20210511165305-e9aaf99ab213.zip -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20210511165305-e9aaf99ab213.zip mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.0-20210511165305-e9aaf99ab213.mod -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20210511165305-e9aaf99ab213.mod mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.6.zip -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.6.mod -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.6.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/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!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/kong/@v/v0.2.16.zip -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.16.zip mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.16.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.16.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/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.3.zip -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/ccding/go-stun/@v/v0.1.3.mod -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.1.3.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-20210429200110-83314bf6d27c.zip -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20210429200110-83314bf6d27c.zip mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20210429200110-83314bf6d27c.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20210429200110-83314bf6d27c.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/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/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/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/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/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.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.3.zip -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.3.zip mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.3.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.3.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.3.0.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.3.0.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.3.0.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-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.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-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-20210331224755-41bb18bfe9da.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.5.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.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.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/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.7.0.zip -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/greatroar/blobloom/@v/v0.7.0.mod -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.7.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/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/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.7.zip -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.7.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.7.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.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/cpuid/v2/@v/v2.0.4.mod -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/klauspost/cpuid/v2/@v/v2.0.6.zip -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.6.zip mirror://goproxy//github.com/klauspost/cpuid/v2/@v/v2.0.6.mod -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.6.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/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.10.1.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/lib/pq/@v/v1.10.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.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/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.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.4.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.4.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.6.1.zip -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/maruel/panicparse/@v/v1.6.1.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/maruel/panicparse/v2/@v/v2.1.1.mod -> github.com%2Fmaruel%2Fpanicparse%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-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/maxbrunsfeld/counterfeiter/v6/@v/v6.3.0.zip -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.3.0.zip mirror://goproxy//github.com/maxbrunsfeld/counterfeiter/v6/@v/v6.3.0.mod -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.3.0.mod 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.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/v1.0.0.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v1.0.0.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv1.0.0.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-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/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/oklog/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.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/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.5.0.zip -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/oschwald/geoip2-golang/@v/v1.5.0.mod -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.8.0.zip -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.8.0.mod -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.8.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/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.10.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.10.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.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.18.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.18.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/prometheus/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.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20201227073835-cf1acfcdf475.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20201227073835-cf1acfcdf475.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20201227073835-cf1acfcdf475.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20201227073835-cf1acfcdf475.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.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/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/sclevine/spec/@v/v1.4.0.zip -> github.com%2Fsclevine%2Fspec%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/sclevine/spec/@v/v1.4.0.mod -> github.com%2Fsclevine%2Fspec%2F@v%2Fv1.4.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.21.4.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.21.4.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.21.4.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.21.4.mod mirror://goproxy//github.com/shurcoo!l/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.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/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.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/syncthing/notify/@v/v0.0.0-20210308121556-f45149b04939.zip -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20210308121556-f45149b04939.zip mirror://goproxy//github.com/syncthing/notify/@v/v0.0.0-20210308121556-f45149b04939.mod -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20210308121556-f45149b04939.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.1.zip -> github.com%2Fthejerf%2Fsuture%2Fv4%2F@v%2Fv4.0.1.zip mirror://goproxy//github.com/thejerf/suture/v4/@v/v4.0.1.mod -> github.com%2Fthejerf%2Fsuture%2Fv4%2F@v%2Fv4.0.1.mod mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.4.mod -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.1.mod -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/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.5.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.mod mirror://goproxy//github.com/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/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/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.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-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-20210421170649-83a5a9bb288b.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210421170649-83a5a9bb288b.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210421170649-83a5a9bb288b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210421170649-83a5a9bb288b.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/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20201006153459-a7d1128ccaa0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201006153459-a7d1128ccaa0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201026091529-146b70c837a4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201026091529-146b70c837a4.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-20210428140749-89ef3d95e781.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210428140749-89ef3d95e781.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.mod mirror://goproxy//golang.org/x/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/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/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-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-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-20200724161237-0e2f3a69832c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200724161237-0e2f3a69832c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-20201231184435-2d18734c6014.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201231184435-2d18734c6014.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210217105451-b926d437f341.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210217105451-b926d437f341.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210309074719-68d13333faf2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210309074719-68d13333faf2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-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-20210220033141-f8bda1e9f3ba.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-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-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-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-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-20201023174141-c8cfbd0f21e6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201023174141-c8cfbd0f21e6.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//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.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.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-20200902074654-038fdea0a05b.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/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	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=92b1ffd70f9ff14635a3b420c28e2d18
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.18.1 b/metadata/md5-cache/net-p2p/syncthing-1.18.1
new file mode 100644
index 000000000000..caf0cf0e2385
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/syncthing-1.18.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm prepare test unpack
+DESCRIPTION=Open Source Continuous File Synchronization
+EAPI=8
+HOMEPAGE=https://syncthing.net
+IUSE=selinux tools
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 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.18.1.tar.gz -> syncthing-1.18.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-20210511165305-e9aaf99ab213.zip -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20210511165305-e9aaf99ab213.zip mirror://goproxy//github.com/!audrius!butkevicius/pfilter/@v/v0.0.0-20210511165305-e9aaf99ab213.mod -> github.com%2F!audrius!butkevicius%2Fpfilter%2F@v%2Fv0.0.0-20210511165305-e9aaf99ab213.mod mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.6.zip -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/!audrius!butkevicius/recli/@v/v0.0.6.mod -> github.com%2F!audrius!butkevicius%2Frecli%2F@v%2Fv0.0.6.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/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!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/kong/@v/v0.2.16.zip -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.16.zip mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.16.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.16.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/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.3.zip -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/ccding/go-stun/@v/v0.1.3.mod -> github.com%2Fccding%2Fgo-stun%2F@v%2Fv0.1.3.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-20210429200110-83314bf6d27c.zip -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20210429200110-83314bf6d27c.zip mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20210429200110-83314bf6d27c.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20210429200110-83314bf6d27c.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/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/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/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/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/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.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.3.zip -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.3.zip mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.3.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.3.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.3.0.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.3.0.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.3.0.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-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.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-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-20210331224755-41bb18bfe9da.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.5.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.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.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/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.7.0.zip -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/greatroar/blobloom/@v/v0.7.0.mod -> github.com%2Fgreatroar%2Fblobloom%2F@v%2Fv0.7.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/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/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.7.zip -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/jackpal/gateway/@v/v1.0.7.mod -> github.com%2Fjackpal%2Fgateway%2F@v%2Fv1.0.7.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.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/cpuid/v2/@v/v2.0.4.mod -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/klauspost/cpuid/v2/@v/v2.0.6.zip -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.6.zip mirror://goproxy//github.com/klauspost/cpuid/v2/@v/v2.0.6.mod -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.6.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/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.10.1.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/lib/pq/@v/v1.10.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.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/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.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.4.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.4.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/maruel/panicparse/@v/v1.6.1.zip -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/maruel/panicparse/@v/v1.6.1.mod -> github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/maruel/panicparse/v2/@v/v2.1.1.mod -> github.com%2Fmaruel%2Fpanicparse%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-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/maxbrunsfeld/counterfeiter/v6/@v/v6.3.0.zip -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.3.0.zip mirror://goproxy//github.com/maxbrunsfeld/counterfeiter/v6/@v/v6.3.0.mod -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.3.0.mod 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.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/v1.0.0.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v1.0.0.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv1.0.0.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-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/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/oklog/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.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/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.5.0.zip -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/oschwald/geoip2-golang/@v/v1.5.0.mod -> github.com%2Foschwald%2Fgeoip2-golang%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.8.0.zip -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/oschwald/maxminddb-golang/@v/v1.8.0.mod -> github.com%2Foschwald%2Fmaxminddb-golang%2F@v%2Fv1.8.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/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.10.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.10.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.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.18.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.18.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/prometheus/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.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20201227073835-cf1acfcdf475.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20201227073835-cf1acfcdf475.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20201227073835-cf1acfcdf475.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20201227073835-cf1acfcdf475.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.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/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/sclevine/spec/@v/v1.4.0.zip -> github.com%2Fsclevine%2Fspec%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/sclevine/spec/@v/v1.4.0.mod -> github.com%2Fsclevine%2Fspec%2F@v%2Fv1.4.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.21.4.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.21.4.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.21.4.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.21.4.mod mirror://goproxy//github.com/shurcoo!l/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.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/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.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/syncthing/notify/@v/v0.0.0-20210308121556-f45149b04939.zip -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20210308121556-f45149b04939.zip mirror://goproxy//github.com/syncthing/notify/@v/v0.0.0-20210308121556-f45149b04939.mod -> github.com%2Fsyncthing%2Fnotify%2F@v%2Fv0.0.0-20210308121556-f45149b04939.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.1.zip -> github.com%2Fthejerf%2Fsuture%2Fv4%2F@v%2Fv4.0.1.zip mirror://goproxy//github.com/thejerf/suture/v4/@v/v4.0.1.mod -> github.com%2Fthejerf%2Fsuture%2Fv4%2F@v%2Fv4.0.1.mod mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.4.mod -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.1.mod -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/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.5.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.mod mirror://goproxy//github.com/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/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/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.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-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-20210421170649-83a5a9bb288b.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210421170649-83a5a9bb288b.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210421170649-83a5a9bb288b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210421170649-83a5a9bb288b.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/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-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-20201006153459-a7d1128ccaa0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201006153459-a7d1128ccaa0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201026091529-146b70c837a4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201026091529-146b70c837a4.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-20210428140749-89ef3d95e781.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210428140749-89ef3d95e781.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.mod mirror://goproxy//golang.org/x/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/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/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-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-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-20200724161237-0e2f3a69832c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200724161237-0e2f3a69832c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-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-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-20201231184435-2d18734c6014.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201231184435-2d18734c6014.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210217105451-b926d437f341.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210217105451-b926d437f341.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210309074719-68d13333faf2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210309074719-68d13333faf2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-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-20210220033141-f8bda1e9f3ba.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-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-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-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-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-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-20201023174141-c8cfbd0f21e6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201023174141-c8cfbd0f21e6.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//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.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.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-20200902074654-038fdea0a05b.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/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	8aabf8812bab7a6f07e7a32958c505ef	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=78dbc7b1625e88859139bc5546c83342
diff --git a/metadata/md5-cache/net-p2p/tremc-0.9.2-r1 b/metadata/md5-cache/net-p2p/tremc-0.9.2-r1
index 701be8fa6e0d..b0146ee1de29 100644
--- a/metadata/md5-cache/net-p2p/tremc-0.9.2-r1
+++ b/metadata/md5-cache/net-p2p/tremc-0.9.2-r1
@@ -9,5 +9,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[ncurses] >=dev-lan
 REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tremc/tremc/archive/0.9.2.tar.gz -> tremc-0.9.2.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d57af7e8763772c8c138f2659aabb50e
diff --git a/metadata/md5-cache/net-p2p/tremc-0.9.2_p20201101 b/metadata/md5-cache/net-p2p/tremc-0.9.2_p20201101
index ddadcd435d87..990211215562 100644
--- a/metadata/md5-cache/net-p2p/tremc-0.9.2_p20201101
+++ b/metadata/md5-cache/net-p2p/tremc-0.9.2_p20201101
@@ -9,5 +9,5 @@ RDEPEND=python_single_target_python3_9? ( dev-lang/python:3.9[ncurses] >=dev-lan
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/tremc/tremc/archive/8b6b29163295e5cf12d9d874e80203c5906619c8.tar.gz -> tremc-0.9.2_p20201101.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d33ca84e23090650aeaedbf036983324
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 2f6e86200a37..b41a3da7ea2b 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.3.90 b/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.3.90
new file mode 100644
index 000000000000..bddd34c3154a
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.3.90
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gdbus-codegen >=sys-devel/gettext-0.19 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.2:= gtk? ( >=app-crypt/libsecret-0.18 media-libs/harfbuzz >=net-libs/libnma-1.2.0 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.4:3 x11-libs/pango ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=NetworkManager Fortinet SSLVPN compatible plugin
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=gtk
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=net-dialup/ppp >=net-vpn/openfortivpn-1.2.0
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager-fortisslvpn/1.3/NetworkManager-fortisslvpn-1.3.90.tar.xz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=67cb2a98bc399368dcc8fa2082a39ec8
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.14 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.14
new file mode 100644
index 000000000000..8f928834d50c
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.14
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libxml2:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.7.0 >=x11-libs/gtk+-3.4:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=NetworkManager OpenVPN plugin
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=gtk test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libxml2:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.7.0 >=x11-libs/gtk+-3.4:3 ) acct-group/nm-openvpn acct-user/nm-openvpn
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.14.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bc51b1052d80a1bcd04e5ca341340854
diff --git a/metadata/md5-cache/net-vpn/ocserv-1.1.1-r1 b/metadata/md5-cache/net-vpn/ocserv-1.1.1-r1
deleted file mode 100644
index f75b70b7a753..000000000000
--- a/metadata/md5-cache/net-vpn/ocserv-1.1.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( net-libs/gnutls[tools(+)] net-libs/socket_wrapper net-vpn/openconnect sys-libs/nss_wrapper sys-libs/uid_wrapper ) virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/libnl:3= dev-libs/libev:0= >=dev-libs/nettle-2.7:0= dev-libs/pcl:0= dev-libs/protobuf-c:0= >=net-libs/gnutls-3.3.0:0= net-libs/http-parser:0= sys-libs/readline:0= sys-libs/talloc:0= virtual/libcrypt:= geoip? ( dev-libs/geoip:0= ) kerberos? ( virtual/krb5 ) lz4? ( app-arch/lz4:0= ) otp? ( sys-auth/oath-toolkit:0= ) pam? ( sys-libs/pam:0= ) radius? ( net-dialup/freeradius-client:0= ) seccomp? ( sys-libs/libseccomp:0= ) systemd? ( sys-apps/systemd:0= ) tcpd? ( sys-apps/tcp-wrappers:0= )
-DESCRIPTION=Openconnect SSL VPN server
-EAPI=7
-HOMEPAGE=https://ocserv.gitlab.io/www/index.html
-IUSE=geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libnl:3= dev-libs/libev:0= >=dev-libs/nettle-2.7:0= dev-libs/pcl:0= dev-libs/protobuf-c:0= >=net-libs/gnutls-3.3.0:0= net-libs/http-parser:0= sys-libs/readline:0= sys-libs/talloc:0= virtual/libcrypt:= geoip? ( dev-libs/geoip:0= ) kerberos? ( virtual/krb5 ) lz4? ( app-arch/lz4:0= ) otp? ( sys-auth/oath-toolkit:0= ) pam? ( sys-libs/pam:0= ) radius? ( net-dialup/freeradius-client:0= ) seccomp? ( sys-libs/libseccomp:0= ) systemd? ( sys-apps/systemd:0= ) tcpd? ( sys-apps/tcp-wrappers:0= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=ftp://ftp.infradead.org/pub/ocserv/ocserv-1.1.1.tar.xz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=11506b3afba61f97999b2d7b267bd0d2
diff --git a/metadata/md5-cache/net-vpn/ocserv-1.1.3 b/metadata/md5-cache/net-vpn/ocserv-1.1.3
new file mode 100644
index 000000000000..44713b017ec8
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/ocserv-1.1.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( net-libs/gnutls[tools(+)] net-libs/socket_wrapper net-vpn/openconnect sys-libs/nss_wrapper sys-libs/uid_wrapper ) virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/libnl:3= dev-libs/libev:0= >=dev-libs/nettle-2.7:0= dev-libs/pcl:0= dev-libs/protobuf-c:0= >=net-libs/gnutls-3.3.0:0= net-libs/http-parser:0= sys-libs/readline:0= sys-libs/talloc:0= virtual/libcrypt:= geoip? ( dev-libs/geoip:0= ) kerberos? ( virtual/krb5 ) lz4? ( app-arch/lz4:0= ) otp? ( sys-auth/oath-toolkit:0= ) pam? ( sys-libs/pam:0= ) radius? ( net-dialup/freeradius-client:0= ) seccomp? ( sys-libs/libseccomp:0= ) systemd? ( sys-apps/systemd:0= ) tcpd? ( sys-apps/tcp-wrappers:0= )
+DESCRIPTION=Openconnect SSL VPN server
+EAPI=7
+HOMEPAGE=https://ocserv.gitlab.io/www/index.html
+IUSE=geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libnl:3= dev-libs/libev:0= >=dev-libs/nettle-2.7:0= dev-libs/pcl:0= dev-libs/protobuf-c:0= >=net-libs/gnutls-3.3.0:0= net-libs/http-parser:0= sys-libs/readline:0= sys-libs/talloc:0= virtual/libcrypt:= geoip? ( dev-libs/geoip:0= ) kerberos? ( virtual/krb5 ) lz4? ( app-arch/lz4:0= ) otp? ( sys-auth/oath-toolkit:0= ) pam? ( sys-libs/pam:0= ) radius? ( net-dialup/freeradius-client:0= ) seccomp? ( sys-libs/libseccomp:0= ) systemd? ( sys-apps/systemd:0= ) tcpd? ( sys-apps/tcp-wrappers:0= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=ftp://ftp.infradead.org/pub/ocserv/ocserv-1.1.3.tar.xz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=11506b3afba61f97999b2d7b267bd0d2
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 89cae51f9752..14b21eb0dcc2 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/b43-fwcutter-019 b/metadata/md5-cache/net-wireless/b43-fwcutter-019
index 23c2f4365374..11182cae0f71 100644
--- a/metadata/md5-cache/net-wireless/b43-fwcutter-019
+++ b/metadata/md5-cache/net-wireless/b43-fwcutter-019
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=Firmware tool for Broadcom 43xx-based wireless devices using mac80211
 EAPI=7
 HOMEPAGE=https://bues.ch/b43/fwcutter/
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://bues.ch/b43/fwcutter/b43-fwcutter-019.tar.bz2
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f5d25a8bf57f5ca028e7c8f62e978f67
+_md5_=217877aa46606ed112314e05e68d6a04
diff --git a/metadata/md5-cache/net-wireless/iwd-1.15 b/metadata/md5-cache/net-wireless/iwd-1.15
index f46e4408cf21..7c46faf69702 100644
--- a/metadata/md5-cache/net-wireless/iwd-1.15
+++ b/metadata/md5-cache/net-wireless/iwd-1.15
@@ -5,10 +5,10 @@ DESCRIPTION=Wireless daemon for linux
 EAPI=7
 HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
 IUSE=+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 standalone systemd kernel_linux
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.41 net-wireless/wireless-regdb crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.15.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b2584f4602332fa882cddc2055cc9ce3
+_md5_=ee04a3f624dbbfa62641eef606dad1c3
diff --git a/metadata/md5-cache/net-wireless/iwd-1.16 b/metadata/md5-cache/net-wireless/iwd-1.16
new file mode 100644
index 000000000000..ce37ab5a40d3
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/iwd-1.16
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.42
+DESCRIPTION=Wireless daemon for linux
+EAPI=7
+HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
+IUSE=+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 standalone systemd kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.42 net-wireless/wireless-regdb crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.16.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ae6536051c6432648242cfc415dbc90d
diff --git a/metadata/md5-cache/net-wireless/limesuite-19.04.0 b/metadata/md5-cache/net-wireless/limesuite-19.04.0
index 507adc688761..84f1e4c9667b 100644
--- a/metadata/md5-cache/net-wireless/limesuite-19.04.0
+++ b/metadata/md5-cache/net-wireless/limesuite-19.04.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=x11-libs/fltk x11-libs/wxGTK:3.0-gtk3 net-wireless/soapysdr:= virtual/opengl virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/myriadrf/LimeSuite/archive/v19.04.0.tar.gz -> limesuite-19.04.0.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=31af4fedc4eb6c94ccdfcc9432c288a7
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802 b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802
index 088acc5d3a4f..965af8570d97 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802
@@ -5,10 +5,10 @@ DESCRIPTION=turns your Realtek RTL2832 based DVB dongle into a SDR receiver
 EAPI=7
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/rtl-sdr
 IUSE=+zerocopy
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/osmocom/rtl-sdr/archive/ed0317e6a58c098874ac58b769cf2e609c18d9a5.tar.gz -> rtl-sdr-0.6.0_p2020802.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bd242021493905ba01b46da91c5503a6
+_md5_=09cd9c6f2a4208f0db2ffa843c74b022
diff --git a/metadata/md5-cache/net-wireless/srslte-20.10.1-r2 b/metadata/md5-cache/net-wireless/srslte-20.10.1-r2
index 74d86113cce9..0dd7133cc11c 100644
--- a/metadata/md5-cache/net-wireless/srslte-20.10.1-r2
+++ b/metadata/md5-cache/net-wireless/srslte-20.10.1-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/srsLTE/srsLTE/archive/release_20_10_1.tar.gz -> srslte-20.10.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2a7fdb9df6cf3baa02c3d0019d661440
+_md5_=3a43795dd721d26c3fddc4b680c9a2dd
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index eede1a00aa1d..8b1441ebfb46 100644
--- a/metadata/md5-cache/perl-core/Manifest.gz
+++ b/metadata/md5-cache/perl-core/Manifest.gz
diff --git a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.560.0 b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.560.0
index 356b2daeb700..3e1862fa5ba4 100644
--- a/metadata/md5-cache/perl-core/Scalar-List-Utils-1.560.0
+++ b/metadata/md5-cache/perl-core/Scalar-List-Utils-1.560.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Common Scalar and List utility subroutines
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Scalar-List-Utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.56.tar.gz
 _eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d
-_md5_=f51feaafa9d622c74f37417141e4a63d
+_md5_=aa902fcdb4bcd584d77dbb75291960bd
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index cdbac66f7a90..154931789d64 100644
--- a/metadata/md5-cache/ros-meta/Manifest.gz
+++ b/metadata/md5-cache/ros-meta/Manifest.gz
diff --git a/metadata/md5-cache/ros-meta/ament_cmake-1.1.4 b/metadata/md5-cache/ros-meta/ament_cmake-1.1.4
new file mode 100644
index 000000000000..e63f4f097629
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/ament_cmake-1.1.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_definitions dev-ros/ament_cmake_export_dependencies dev-ros/ament_cmake_export_include_directories dev-ros/ament_cmake_export_interfaces dev-ros/ament_cmake_export_libraries dev-ros/ament_cmake_export_link_flags dev-ros/ament_cmake_export_targets dev-ros/ament_cmake_libraries dev-ros/ament_cmake_python dev-ros/ament_cmake_target_dependencies dev-ros/ament_cmake_test[python_targets_python3_8(-)?] dev-ros/ament_cmake_version python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] dev-python/ament_package[python_targets_python3_8(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?] dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_definitions dev-ros/ament_cmake_export_dependencies dev-ros/ament_cmake_export_include_directories dev-ros/ament_cmake_export_interfaces dev-ros/ament_cmake_export_libraries dev-ros/ament_cmake_export_link_flags dev-ros/ament_cmake_export_targets dev-ros/ament_cmake_libraries dev-ros/ament_cmake_python dev-ros/ament_cmake_target_dependencies dev-ros/ament_cmake_test[python_targets_python3_8(-)?] dev-ros/ament_cmake_version python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] dev-python/ament_package[python_targets_python3_8(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?]
+DESCRIPTION=The entry point package for the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+IUSE=python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_definitions dev-ros/ament_cmake_export_dependencies dev-ros/ament_cmake_export_include_directories dev-ros/ament_cmake_export_interfaces dev-ros/ament_cmake_export_libraries dev-ros/ament_cmake_export_link_flags dev-ros/ament_cmake_export_targets dev-ros/ament_cmake_libraries dev-ros/ament_cmake_python dev-ros/ament_cmake_target_dependencies dev-ros/ament_cmake_test[python_targets_python3_8(-)?] dev-ros/ament_cmake_version python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] dev-python/ament_package[python_targets_python3_8(-)?] dev-python/catkin_pkg[python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.4.tar.gz -> ament_cmake-1.1.4.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=66b26ecba7778bb6c0ec24b1a11d18d6
diff --git a/metadata/md5-cache/ros-meta/calibration-0.10.15 b/metadata/md5-cache/ros-meta/calibration-0.10.15
new file mode 100644
index 000000000000..d831fb2d3cd3
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/calibration-0.10.15
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Provides a toolchain running through the robot calibration process
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/calibration https://github.com/ros-perception/calibration
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/calibration_estimation dev-ros/calibration_launch dev-ros/calibration_msgs dev-ros/calibration_setup_helper dev-ros/image_cb_detector dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/settlerlib python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.15.tar.gz -> calibration-0.10.15.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=af1c5bda0cff9f54b0e4fa897c936a72
diff --git a/metadata/md5-cache/ros-meta/geographic_info-0.5.6 b/metadata/md5-cache/ros-meta/geographic_info-0.5.6
new file mode 100644
index 000000000000..f1043ee6e851
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/geographic_info-0.5.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Geographic information metapackage
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/geographic_info https://github.com/ros-geographic-info/geographic_info
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/0.5.6.tar.gz -> geographic_info-0.5.6.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a7c9fb25888417e9d4aaf7b9fbde1164
diff --git a/metadata/md5-cache/ros-meta/hector_slam-0.5.2 b/metadata/md5-cache/ros-meta/hector_slam-0.5.2
new file mode 100644
index 000000000000..7166aece5ab1
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/hector_slam-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=hector_mapping and related packages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_slam https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/hector_compressed_map_transport dev-ros/hector_geotiff_plugins dev-ros/hector_imu_tools dev-ros/hector_map_server dev-ros/hector_marker_drawing dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_launch dev-ros/hector_imu_attitude_to_tf dev-ros/hector_mapping dev-ros/hector_map_tools dev-ros/hector_nav_msgs dev-ros/hector_slam_launch python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.2.tar.gz -> hector_slam-0.5.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5405bfb05f0383b8b31ef9a15cf734b5
diff --git a/metadata/md5-cache/ros-meta/imu_tools-1.2.3 b/metadata/md5-cache/ros-meta/imu_tools-1.2.3
new file mode 100644
index 000000000000..6af67611b22e
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/imu_tools-1.2.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Various tools for IMU devices
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/imu_tools https://github.com/ccny-ros-pkg/imu_tools
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rviz_imu_plugin python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.3.tar.gz -> imu_tools-1.2.3.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7d19a24797aa3b0d0fe694844eeac248
diff --git a/metadata/md5-cache/ros-meta/mavros-1.8.0 b/metadata/md5-cache/ros-meta/mavros-1.8.0
new file mode 100644
index 000000000000..1548c0dd2b67
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/mavros-1.8.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=dev-ros/mavros_msgs dev-ros/libmavconn dev-ros/mavros dev-ros/mavros_extras
+DESCRIPTION=Metapackage for mavros packages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mavros
+KEYWORDS=~amd64 ~arm
+LICENSE=metapackage
+RDEPEND=dev-ros/mavros_msgs dev-ros/libmavconn dev-ros/mavros dev-ros/mavros_extras
+SLOT=0
+_md5_=0e95546fd6079e3965722ddfcb3f06f9
diff --git a/metadata/md5-cache/ros-meta/ros-1.15.8 b/metadata/md5-cache/ros-meta/ros-1.15.8
new file mode 100644
index 000000000000..67b43d81a606
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/ros-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=ROS packaging system
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/ros https://github.com/ros/ros
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate dev-ros/rosmake dev-ros/rosunit dev-ros/mk dev-ros/rosbuild dev-ros/roslang dev-ros/roslib python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.8.tar.gz -> ros-1.15.8.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b9d6b948e4e221466c76167e55481c61
diff --git a/metadata/md5-cache/ros-meta/ros_comm-1.15.11 b/metadata/md5-cache/ros-meta/ros_comm-1.15.11
new file mode 100644
index 000000000000..986ef360eb10
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/ros_comm-1.15.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=ROS communications-related packages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/ros_comm https://github.com/ros/ros_comm
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters dev-ros/rosbag dev-ros/rosbag_storage dev-ros/rosgraph dev-ros/roslaunch dev-ros/rosmaster dev-ros/rosmsg dev-ros/rosnode dev-ros/rosout dev-ros/rosparam dev-ros/rosservice dev-ros/rostest dev-ros/rostopic dev-ros/topic_tools dev-ros/roscpp dev-ros/rospy dev-ros/test_rosbag dev-ros/test_rosbag_storage dev-ros/test_roscpp dev-ros/test_rosgraph dev-ros/test_roslaunch dev-ros/test_roslib_comm dev-ros/test_rosmaster dev-ros/test_rosparam dev-ros/test_rospy dev-ros/test_rosservice python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.11.tar.gz -> ros_comm-1.15.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7060d240592be0aeb3fcb9ed94835689
diff --git a/metadata/md5-cache/ros-meta/ros_control-0.19.5 b/metadata/md5-cache/ros-meta/ros_control-0.19.5
new file mode 100644
index 000000000000..29a96eeb6a7f
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/ros_control-0.19.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Controller interfaces, managers, transmissions, control_toolbox
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/ros_control https://github.com/ros-controls/ros_control
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/controller_interface dev-ros/controller_manager dev-ros/controller_manager_msgs dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/joint_limits_interface dev-ros/rqt_controller_manager dev-ros/transmission_interface python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.5.tar.gz -> ros_control-0.19.5.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=71376d1d990624bcc6b82078ba0f8061
diff --git a/metadata/md5-cache/ros-meta/rosserial-0.9.2 b/metadata/md5-cache/ros-meta/rosserial-0.9.2
new file mode 100644
index 000000000000..9b796832a40b
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/rosserial-0.9.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_embeddedlinux dev-ros/rosserial_msgs dev-ros/rosserial_python dev-ros/rosserial_server dev-ros/rosserial_tivac dev-ros/rosserial_windows dev-ros/rosserial_xbee python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Metapackage for core of rosserial
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_embeddedlinux dev-ros/rosserial_msgs dev-ros/rosserial_python dev-ros/rosserial_server dev-ros/rosserial_tivac dev-ros/rosserial_windows dev-ros/rosserial_xbee python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.2.tar.gz -> rosserial-0.9.2.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0623dd6e804875e1f94a99ac9a9977e1
diff --git a/metadata/md5-cache/ros-meta/vision_visp-0.12.1 b/metadata/md5-cache/ros-meta/vision_visp-0.12.1
new file mode 100644
index 000000000000..9fbed8e99a2d
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/vision_visp-0.12.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DESCRIPTION=Virtual package providing ViSP related packages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/vision_visp https://github.com/lagadic/vision_visp
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=dev-ros/visp_auto_tracker dev-ros/visp_bridge dev-ros/visp_camera_calibration dev-ros/visp_hand2eye_calibration dev-ros/visp_tracker python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/lagadic/vision_visp/archive/noetic-0.12.1.tar.gz -> vision_visp-0.12.1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=dc3601b80d9b3f4c7027de491245eb40
diff --git a/metadata/md5-cache/ros-meta/vision_visp-9999 b/metadata/md5-cache/ros-meta/vision_visp-9999
index cc00eaa89538..64497ab17477 100644
--- a/metadata/md5-cache/ros-meta/vision_visp-9999
+++ b/metadata/md5-cache/ros-meta/vision_visp-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	ros-catkin	87ffdbb6e8879f4936524cc8575e76d5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3f316fe7dffe34861c706ddbc996bcb3
+_md5_=dc3601b80d9b3f4c7027de491245eb40
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index a9072b9bc3d8..34441b1ffbe6 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.5.2 b/metadata/md5-cache/sci-astronomy/kstars-3.5.2
index 855574214b5d..51361767c528 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-3.5.2
+++ b/metadata/md5-cache/sci-astronomy/kstars-3.5.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdatavis3d-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclar
 REQUIRED_USE=indi? ( fits )
 SLOT=5
 SRC_URI=mirror://kde/stable/kstars/kstars-3.5.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=915dee603d6cebad4e9fb858532f593d
diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.5.3 b/metadata/md5-cache/sci-astronomy/kstars-3.5.3
index 5c4826275b9d..638a22069428 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-3.5.3
+++ b/metadata/md5-cache/sci-astronomy/kstars-3.5.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdatavis3d-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclar
 REQUIRED_USE=indi? ( fits )
 SLOT=5
 SRC_URI=mirror://kde/stable/kstars/kstars-3.5.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=af7fb3d25d7db627e200c0f77b6f7ac2
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index cf91a93ac012..df6b6cdba7e1 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/biopython-1.77 b/metadata/md5-cache/sci-biology/biopython-1.77
index 30f6568a917c..44c4a878a7a5 100644
--- a/metadata/md5-cache/sci-biology/biopython-1.77
+++ b/metadata/md5-cache/sci-biology/biopython-1.77
@@ -11,5 +11,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/biopython/biopython-1.77.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f5250b5ff62ae5ff155616d0b65204b
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 fd73b54dcb66..c91580df8bd7 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
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot:= sys-libs/zlib mysql?
 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	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	emboss-r2	93f4f6ac626ed63f042344dd76574b41	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bbce91d6a8900865a446cb3dea302ccf
+_md5_=a8689fa9b1b33a787474fc8f11e65998
diff --git a/metadata/md5-cache/sci-biology/treeviewx-0.5.1-r3 b/metadata/md5-cache/sci-biology/treeviewx-0.5.1-r3
index 6168e7e6fc53..5bf1acd1a253 100644
--- a/metadata/md5-cache/sci-biology/treeviewx-0.5.1-r3
+++ b/metadata/md5-cache/sci-biology/treeviewx-0.5.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/download/0.5/tv-0.5.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=14493f936bb599dd7faec748cece70f3
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 4d77bd427b28..a4078796cf0a 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/openbabel-2.4.1-r1 b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
index 6d4288d2644e..8e1deef0f67c 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sci-libs/inchi sys-libs/zlib wxwidget
 RESTRICT=!test? ( test )
 SLOT=0/5.0.0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.4.1.tar.gz https://openbabel.org/docs/dev/_static/babel130.png -> openbabel.png
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cb30029ea1d45388cf4bdde7fb713e8e
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r2 b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r2
index 36af9c88aeed..171e5f28c49c 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r2
+++ b/metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sci-libs/inchi sys-libs/zlib wxwidget
 RESTRICT=!test? ( test )
 SLOT=0/5.0.0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.4.1.tar.gz https://openbabel.org/docs/dev/_static/babel130.png -> openbabel.png
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3a992bb89238d294de9962799041a415
diff --git a/metadata/md5-cache/sci-chemistry/pymol-2.4.0-r1 b/metadata/md5-cache/sci-chemistry/pymol-2.4.0-r1
index e0b754cf8a70..acff15faf7e6 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-2.4.0-r1
+++ b/metadata/md5-cache/sci-chemistry/pymol-2.4.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/pymol/pymol-1.8.4.0.png.xz https://github.com/schrodinger/pymol-open-source/archive/v2.4.0.tar.gz -> pymol-2.4.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7cfcb3356ddc87975cb0d589bf782adf
diff --git a/metadata/md5-cache/sci-chemistry/pymol-2.5.0 b/metadata/md5-cache/sci-chemistry/pymol-2.5.0
index d70b75e221dc..6b94c406f645 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-2.5.0
+++ b/metadata/md5-cache/sci-chemistry/pymol-2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/pymol/pymol-1.8.4.0.png.xz https://github.com/schrodinger/pymol-open-source/archive/v2.5.0.tar.gz -> pymol-2.5.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c7ffea6e164d1fd0a5649c6eb3a85da0
diff --git a/metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1 b/metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1
index de7bfbfcaa81..6406e6d56b32 100644
--- a/metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1
+++ b/metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/glew:0= media-libs/mesa[X(+)] x11-libs/wxGTK:3.0[X,opengl]
 SLOT=0
 SRC_URI=https://wxmacmolplt.googlecode.com/files/wxmacmolplt-7.5.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=79066879c49f635ae7f6925ca500e74a
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index b88106ca05db..b2b8e0d48786 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/gazebo-11.7.0 b/metadata/md5-cache/sci-electronics/gazebo-11.7.0
new file mode 100644
index 000000000000..9f69166a64d5
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/gazebo-11.7.0
@@ -0,0 +1,15 @@
+BDEPEND=app-text/ronn app-arch/gzip virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)] dev-qt/qttest:5 x11-apps/mesa-progs test? ( dev-libs/libxslt )
+DESCRIPTION=A 3D multiple robot simulator with dynamics
+EAPI=7
+HOMEPAGE=http://gazebosim.org/
+IUSE=cpu_flags_x86_sse2 test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)]
+RESTRICT=!test? ( test )
+SLOT=0/11
+SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.7.0.tar.bz2
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6d22afc3a04935ddeb531eb3e6ec654b
diff --git a/metadata/md5-cache/sci-electronics/gspiceui-1.1.0 b/metadata/md5-cache/sci-electronics/gspiceui-1.1.0
index d0daef74e109..03e7ca81eea6 100644
--- a/metadata/md5-cache/sci-electronics/gspiceui-1.1.0
+++ b/metadata/md5-cache/sci-electronics/gspiceui-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/wxGTK:3.0[X] sci-electronics/electronics-menu || ( sci-electronics/ngspice sci-electronics/gnucap ) waveform? ( sci-electronics/gwave ) schematics? ( sci-electronics/geda )
 SLOT=0
 SRC_URI=mirror://sourceforge/gspiceui/gspiceui-v1.1.00.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=99879ee64094028efe839649e8a1456c
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.10-r1 b/metadata/md5-cache/sci-electronics/kicad-5.1.10-r1
index 4044d6a34b1c..faa571af9abb 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.10-r1
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.10-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads(+)] media-libs/freeglut medi
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/5.1.10/kicad-5.1.10.tar.bz2
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d214711d5847e67f2453662bfbef0432
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.10 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.10
index 1fd8ceb5e240..ff66b67e6f5e 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.10
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.10
@@ -10,5 +10,5 @@ RDEPEND=>=sci-electronics/kicad-5.1.0[occ=,oce=]
 REQUIRED_USE=|| ( occ oce )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/5.1.10/kicad-packages3D-5.1.10.tar.bz2 -> kicad-packages3d-5.1.10.tar.bz2
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8fbe8d50d971c5704d44acc3ac9caa85
diff --git a/metadata/md5-cache/sci-geosciences/GeographicLib-1.50.1 b/metadata/md5-cache/sci-geosciences/GeographicLib-1.50.1
deleted file mode 100644
index 61765c472c49..000000000000
--- a/metadata/md5-cache/sci-geosciences/GeographicLib-1.50.1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=doc? ( >=app-doc/doxygen-1.8.7 )
-DEFINED_PHASES=configure install
-DESCRIPTION=C++ classes for performing conversions between geographic coordinates
-EAPI=7
-HOMEPAGE=https://geographiclib.sourceforge.io/
-IUSE=doc
-KEYWORDS=~amd64 ~arm
-LICENSE=MIT
-SLOT=0/19
-SRC_URI=mirror://sourceforge/geographiclib/GeographicLib-1.50.1.tar.gz
-_md5_=96f4e7afd5471f41e25a614e62492f48
diff --git a/metadata/md5-cache/sci-geosciences/GeographicLib-1.51 b/metadata/md5-cache/sci-geosciences/GeographicLib-1.51
deleted file mode 100644
index 7d697343a6f0..000000000000
--- a/metadata/md5-cache/sci-geosciences/GeographicLib-1.51
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=doc? ( >=app-doc/doxygen-1.8.7 )
-DEFINED_PHASES=configure install
-DESCRIPTION=C++ classes for performing conversions between geographic coordinates
-EAPI=7
-HOMEPAGE=https://geographiclib.sourceforge.io/
-IUSE=doc
-KEYWORDS=~amd64 ~arm
-LICENSE=MIT
-SLOT=0/19
-SRC_URI=mirror://sourceforge/geographiclib/GeographicLib-1.51.tar.gz
-_md5_=57b4aeb031233217ee4d88a087b09caa
diff --git a/metadata/md5-cache/sci-geosciences/GeographicLib-1.51-r1 b/metadata/md5-cache/sci-geosciences/GeographicLib-1.51-r1
deleted file mode 100644
index 2084dec7bbb2..000000000000
--- a/metadata/md5-cache/sci-geosciences/GeographicLib-1.51-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( >=app-doc/doxygen-1.8.7 >=dev-lang/perl-5.26.1-r1 >=dev-python/sphinx-1.6.3-r2 >=sys-apps/util-linux-2.31 ) test? ( python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=C++ library for converting geographic coordinate systems
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/geographiclib/
-IUSE=doc examples python test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm
-LICENSE=MIT
-RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) || ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0/19
-SRC_URI=mirror://sourceforge/geographiclib/GeographicLib-1.51.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=726e25b69ddecbb7bee1719b55dd64cf
diff --git a/metadata/md5-cache/sci-geosciences/GeographicLib-1.52 b/metadata/md5-cache/sci-geosciences/GeographicLib-1.52
new file mode 100644
index 000000000000..b4c3fa25925f
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/GeographicLib-1.52
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( >=app-doc/doxygen-1.8.7 >=dev-lang/perl-5.26.1-r1 >=dev-python/sphinx-1.6.3-r2 >=sys-apps/util-linux-2.31 ) test? ( python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DESCRIPTION=C++ library for converting geographic coordinate systems
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/geographiclib/
+IUSE=doc examples python test doc python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) || ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0/19
+SRC_URI=mirror://sourceforge/geographiclib/GeographicLib-1.52.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e562485773563b6ba589c9252f5a7638
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index f3323b5c1bf3..6f7e888eb9ba 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/folium-0.12.1 b/metadata/md5-cache/sci-geosciences/folium-0.12.1
index eff8afb6da8a..167eb31b993c 100644
--- a/metadata/md5-cache/sci-geosciences/folium-0.12.1
+++ b/metadata/md5-cache/sci-geosciences/folium-0.12.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( sci-libs/branca[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( sci-libs/branca[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/branca[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEPEND=sci-libs/branca[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=Python Data, Leaflet.js Maps
 EAPI=7
 HOMEPAGE=https://github.com/python-visualization/folium
 IUSE=test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=sci-libs/branca[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+RDEPEND=sci-libs/branca[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-visualization/folium/archive/refs/tags/v0.12.1.tar.gz -> folium-0.12.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b1f091d1afcc7fb18bdd18a6508b1297
+_md5_=efe3b761725e679702aa4921c1469a91
diff --git a/metadata/md5-cache/sci-geosciences/grass-7.8.5 b/metadata/md5-cache/sci-geosciences/grass-7.8.5
index 7095140e98f5..de28da4a6acb 100644
--- a/metadata/md5-cache/sci-geosciences/grass-7.8.5
+++ b/metadata/md5-cache/sci-geosciences/grass-7.8.5
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) opengl? ( X )
 SLOT=0/7.8.0
 SRC_URI=https://grass.osgeo.org/grass78/source/grass-7.8.5.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0ee00b328ddaebcb3778f1f566eb357d
diff --git a/metadata/md5-cache/sci-geosciences/grass-9999 b/metadata/md5-cache/sci-geosciences/grass-9999
index d288c7cd1ab0..6f4dd6f84183 100644
--- a/metadata/md5-cache/sci-geosciences/grass-9999
+++ b/metadata/md5-cache/sci-geosciences/grass-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-admin/eselect-1.2 python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sci-libs/proj sci-libs/xdrfile sys-libs/zlib media-libs/libglvnd media-libs/glu blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) lapack? ( virtual/lapack[eselect-ldso(+)] ) liblas? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:4.0 x11-libs/cairo[X,opengl] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0/7.9
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4fa7c3b504912f404615f7b5be0f4aa7
diff --git a/metadata/md5-cache/sci-geosciences/josm-bin-18004 b/metadata/md5-cache/sci-geosciences/josm-bin-18004
new file mode 100644
index 000000000000..e5a2e6f38c26
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/josm-bin-18004
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Java-based editor for the OpenStreetMap project
+EAPI=7
+HOMEPAGE=https://josm.openstreetmap.de/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 GPL-2+ GPL-3
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://josm.openstreetmap.de/download/josm-snapshot-18004.jar
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=41043f84c4f82875db0459ecce1dca19
diff --git a/metadata/md5-cache/sci-geosciences/josm-bin-18118 b/metadata/md5-cache/sci-geosciences/josm-bin-18118
new file mode 100644
index 000000000000..4200b56ac2ce
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/josm-bin-18118
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Java-based editor for the OpenStreetMap project
+EAPI=7
+HOMEPAGE=https://josm.openstreetmap.de/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 GPL-2+ GPL-3
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://josm.openstreetmap.de/download/josm-snapshot-18118.jar
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=41043f84c4f82875db0459ecce1dca19
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-5.0.0 b/metadata/md5-cache/sci-geosciences/opencpn-5.0.0
index dde459c6833b..84e88199ef0e 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-5.0.0
+++ b/metadata/md5-cache/sci-geosciences/opencpn-5.0.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2 lzma? ( app-arch/xz-utils ) dev-libs/tinyxml media-libs/freetype:2 media-libs/portaudio net-misc/curl sys-libs/zlib opengl? ( virtual/opengl ) x11-libs/gtk+:2 x11-libs/wxGTK:3.0[X] !sci-geosciences/opencpn-plugin-wmm
 SLOT=0
 SRC_URI=https://github.com/OpenCPN/OpenCPN/archive/v5.0.0.tar.gz -> opencpn-5.0.0.tar.gz doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/opencpn/+files/opencpn-doc_4.8.2.0.orig.tar.xz )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b82b5c63ab4a5e6c6e2bf61f13c75b0b
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-2.1 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-2.1
index e7605150a9cd..ee25436cd313 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-2.1
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/canboat/BR24radar_pi/archive/v2.1.tar.gz -> opencpn-plugin-br24radar-2.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=59cf9606fc2f7f4c36266df2f05ebb02
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-9999
index 75e01dd85378..8a5c11c669e2 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-br24radar-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=59cf9606fc2f7f4c36266df2f05ebb02
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-1.0.20180316 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-1.0.20180316
index 85894d74221c..7095be0549ec 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-1.0.20180316
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-1.0.20180316
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/mschiff/climatology_pi/archive/v1.0.20180316.tar.gz -> opencpn-plugin-climatology-1.0.20180316.tar.gz mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> opencpn-plugin-climatology-1.0-CL-DATA.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f738137e07b6c273c7d70bf76a2f1425
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-9999
index ba261fc80086..683b16593f04 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-climatology-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> opencpn-plugin-climatology-1.0-CL-DATA.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f738137e07b6c273c7d70bf76a2f1425
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-1.1 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-1.1
index 78ae96087e24..511dd260ec6d 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-1.1
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/Rasbats/DR_pi/archive/V1.1.tar.gz -> opencpn-plugin-dr-1.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f63fd300a0f6b45cd42c690a6755c98d
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-9999
index 8d151fc19791..8b52a4f255b9 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-dr-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f63fd300a0f6b45cd42c690a6755c98d
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-1.1007 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-1.1007
index 2f1fb24c0bb3..f952fc0b9012 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-1.1007
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-1.1007
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/ptulp/FindIt_pi/archive/v1.1007.tar.gz -> opencpn-plugin-findit-1.1007.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=24051c67df516b4d8fe66f84252c1be5
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-9999
index 1de2d12ac171..1de7e4b4ad69 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-findit-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=24051c67df516b4d8fe66f84252c1be5
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-1.1 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-1.1
index 8cb4b9c0649b..6a4418626ca1 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-1.1
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/trudK45/gxradar_pi/archive/v.1.1.tar.gz -> opencpn-plugin-gxradar-1.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=321a7e3ce592e9e3f7e9f0b6e18c4fa2
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-9999
index 9722f756ea46..f08622c9da68 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-gxradar-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=321a7e3ce592e9e3f7e9f0b6e18c4fa2
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-0.9 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-0.9
index 52e1729855c5..c0e3e82dcd9a 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-0.9
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/nohal/iacfleet_pi/archive/v0.9.tar.gz -> opencpn-plugin-iacfleet-0.9.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c57d768708eb7bae89bfb83c75965bef
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-9999
index 45e93a4d562e..b92243b9bdca 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-iacfleet-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c57d768708eb7bae89bfb83c75965bef
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-1.1 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-1.1
index 6473dd1477cd..6ac8ea3c0b45 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-1.1
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/nohal/launcher_pi/archive/v1.1.tar.gz -> opencpn-plugin-launcher-1.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b14389523c2db97e521dead16f13adcb
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-9999
index a3d31fafe293..cdc14fbd0679 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-launcher-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b14389523c2db97e521dead16f13adcb
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-1.3002 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-1.3002
index 471a21ef0e66..3f3a81ac9963 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-1.3002
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-1.3002
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/delatbabel/LogbookKonni-1.2/archive/v1.3002.tar.gz -> opencpn-plugin-logbookkonni-1.3002.tar.gz https://github.com/delatbabel/LogbookKonni-1.2/releases/download/v1.3002/LogbookKonni_Layouts.zip -> opencpn-plugin-logbookkonni-1.3002_Layouts.zip
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e445e6fdfcc0f6fbecead8aac6352eeb
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-9999
index c74071f8e9ab..f6ca55217d1f 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e445e6fdfcc0f6fbecead8aac6352eeb
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-0.7 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-0.7
index fa4cded4d82a..0db91cf13af4 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-0.7
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/nohal/objsearch_pi/archive/v0.7.tar.gz -> opencpn-plugin-objsearch-0.7.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4d9d62da80a00cf73476c86417dbdf6e
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-9999
index 920a7f42c065..38254478de07 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4d9d62da80a00cf73476c86417dbdf6e
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-1.3.14 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-1.3.14
index f32396d7c0aa..5ba56268fd23 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-1.3.14
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-1.3.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/jongough/ocpn_draw_pi/archive/V1.3.14.tar.gz -> opencpn-plugin-ocpn_draw-1.3.14.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e60e3e36e203fcb4a642ad187119a73d
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-9999
index 9eee2297ea43..ebe1b9fcde91 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpn_draw-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e60e3e36e203fcb4a642ad187119a73d
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-1.3 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-1.3
index 007dd91a8b76..8d32dc2b411d 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-1.3
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/nohal/ocpndebugger_pi/archive/v1.3.tar.gz -> opencpn-plugin-ocpndebugger-1.3.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=85b2fae74970da4527307f80c5924ffe
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-9999
index 2a0d3a517800..d2f582635d3a 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-ocpndebugger-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=85b2fae74970da4527307f80c5924ffe
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-1.6.0 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-1.6.0
index 788fea53ea64..bd9b25ed5330 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-1.6.0
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-1.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/mschiff/oesenc_pi/archive/v1.6.0.tar.gz -> opencpn-plugin-oesenc-1.6.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4c15a590635c6c027f40ab5d273edfb8
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-9999
index 24a8f02ca218..4fc351467f3e 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-oesenc-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4c15a590635c6c027f40ab5d273edfb8
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-1.2 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-1.2
index ed01f08464f0..075252e282cb 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-1.2
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/Rasbats/otcurrent_pi/archive/v1.2.tar.gz -> opencpn-plugin-otcurrent-1.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5b57206cbf1752f0efae1635a38ee461
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-9999
index 91d8668dec89..ef96cc806d82 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-otcurrent-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5b57206cbf1752f0efae1635a38ee461
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-1.1007 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-1.1007
index f6933299f7a2..3dac8f10e74e 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-1.1007
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-1.1007
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/ptulp/polar_pi/archive/v1.1007.tar.gz -> opencpn-plugin-polar-1.1007.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=210f6a36493d12ae947c1c9a3dd82425
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-9999
index 81a263db7ab5..4cd3eb161baf 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-polar-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=210f6a36493d12ae947c1c9a3dd82425
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-0.98 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-0.98
index cdfbd8456c61..546e7d61224a 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-0.98
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-0.98
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/Verezano/radar_pi/archive/aisradar_pi-0.98.tar.gz -> opencpn-plugin-radar-0.98.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c3cb8fbc697547bca001bb7f02448fa3
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-9999
index 9b261c159e3f..cc80ededb566 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-radar-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c3cb8fbc697547bca001bb7f02448fa3
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-1.2 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-1.2
index 5550a9097762..680c32d20c9d 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-1.2
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/SaltyPaws/route_pi/archive/v1.2.tar.gz -> opencpn-plugin-route-1.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cb4bd410dfdc995c3a26d63ea0e6fa5c
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-9999
index a9d6939910ac..40443c96d2a6 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-route-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cb4bd410dfdc995c3a26d63ea0e6fa5c
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-0.7 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-0.7
index 8e36b6e5ea8a..d5f393f3033a 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-0.7
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
 SRC_URI=https://github.com/mauroc/squiddio_pi/archive/0.7.tar.gz -> opencpn-plugin-squiddio-0.7.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ba4c3afbd215da4e4e4eeb7255c52b99
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-9999
index d199def8d1f4..f358446cb3a5 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-squiddio-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0 sys-devel/gettext
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ba4c3afbd215da4e4e4eeb7255c52b99
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-0.5.20180316 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-0.5.20180316
index c7a7241d8b02..c7ebba043fbd 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-0.5.20180316
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-0.5.20180316
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/mschiff/statusbar_pi/archive/v0.5.20180316.tar.gz -> opencpn-plugin-statusbar-0.5.20180316.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f36c15ed6fa7c929cd97a986cfe6458a
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-9999
index 523f244a8ec7..dbb7779804b1 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-statusbar-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f36c15ed6fa7c929cd97a986cfe6458a
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-1.9.051 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-1.9.051
index f66147f24c1b..61e9b68837df 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-1.9.051
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-1.9.051
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/seandepagnier/watchdog_pi/archive/v1.9.051.tar.gz -> opencpn-plugin-watchdog-1.9.051.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=bc4c7f579674e50ec35335284f03b8c6
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-9999
index 587c592e1ec9..2b14e465f5b3 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-watchdog-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=bc4c7f579674e50ec35335284f03b8c6
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-1.10.1 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-1.10.1
index 43d6b5a7e357..3eefa0c2c213 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-1.10.1
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-1.10.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/seandepagnier/weather_routing_pi/archive/v1.10.1.tar.gz -> opencpn-plugin-weather_routing-1.10.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9ea325201ad7af3177d8cf091a7488a3
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-9999
index e6413ac094bb..32ab0fccc7c6 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9ea325201ad7af3177d8cf091a7488a3
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-1.3.20180316 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-1.3.20180316
index e847f5c15e9f..f9ff580d4c39 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-1.3.20180316
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-1.3.20180316
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
 SRC_URI=https://github.com/mschiff/weatherfax_pi/archive/v1.3.20180316.tar.gz -> opencpn-plugin-weatherfax-1.3.20180316.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=beaa68ff1859dbd74b287108c5e21c02
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-9999 b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-9999
index 64a773fd30c7..87074035dce2 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-9999
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=x11-libs/wxGTK:3.0 >=sci-geosciences/opencpn-4.2.0
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=beaa68ff1859dbd74b287108c5e21c02
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 4adebfd79dbf..3b1d41b199c3 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/branca-0.4.2 b/metadata/md5-cache/sci-libs/branca-0.4.2
index 2b18d9346b7e..df4e27a652dd 100644
--- a/metadata/md5-cache/sci-libs/branca-0.4.2
+++ b/metadata/md5-cache/sci-libs/branca-0.4.2
@@ -1,6 +1,6 @@
 BDEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 DESCRIPTION=spinoff from folium, host the non-map-specific features.
 EAPI=7
 HOMEPAGE=https://github.com/python-visualization/branca
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-visualization/branca/archive/refs/tags/v0.4.2.tar.gz -> branca-0.4.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4346433892aa5e7397c796d01e89d144
+_md5_=cffee0769d25f7729c7d731c824d03f2
diff --git a/metadata/md5-cache/sci-libs/camd-2.4.6-r1 b/metadata/md5-cache/sci-libs/camd-2.4.6-r1
index edf1a9172e84..babe09873203 100644
--- a/metadata/md5-cache/sci-libs/camd-2.4.6-r1
+++ b/metadata/md5-cache/sci-libs/camd-2.4.6-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 IUSE=doc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/camd-2.4.6.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=78539d20346f1b12258a6e96381f6f7b
+_md5_=95169c71f725a1e60c4d2e5b0aac6a61
diff --git a/metadata/md5-cache/sci-libs/cdd+-077a b/metadata/md5-cache/sci-libs/cdd+-077a
index 6969cc86b485..4c5cd9238f7e 100644
--- a/metadata/md5-cache/sci-libs/cdd+-077a
+++ b/metadata/md5-cache/sci-libs/cdd+-077a
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile install
 DEPEND=dev-libs/gmp:0=
 DESCRIPTION=Another implementation of the double description method
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.ifor.math.ethz.ch/~fukuda/cdd_home/
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0=
 SLOT=0
 SRC_URI=ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/cdd+-077a.tar.gz
-_eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e9864b59cd9c71c35fd174caa3a6cb2e
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=00df97f9f2505d6d0e0fd9a75386e31b
diff --git a/metadata/md5-cache/sci-libs/ceres-solver-2.0.0 b/metadata/md5-cache/sci-libs/ceres-solver-2.0.0
new file mode 100644
index 000000000000..fa6ebb235d58
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/ceres-solver-2.0.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-cpp/eigen-3.3.4:3 lapack? ( virtual/pkgconfig ) doc? ( dev-libs/mathjax ) dev-util/ninja dev-util/cmake doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-cpp/glog[gflags?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cxsparse? ( sci-libs/cxsparse ) lapack? ( virtual/lapack ) sparse? ( sci-libs/amd sci-libs/camd sci-libs/ccolamd sci-libs/cholmod[metis(+)] sci-libs/colamd sci-libs/spqr )
+DESCRIPTION=Nonlinear least-squares minimizer
+EAPI=7
+HOMEPAGE=http://ceres-solver.org/
+IUSE=cxsparse examples gflags lapack openmp +schur sparse 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=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )
+RDEPEND=dev-cpp/glog[gflags?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cxsparse? ( sci-libs/cxsparse ) lapack? ( virtual/lapack ) sparse? ( sci-libs/amd sci-libs/camd sci-libs/ccolamd sci-libs/cholmod[metis(+)] sci-libs/colamd sci-libs/spqr )
+REQUIRED_USE=test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=http://ceres-solver.org/ceres-solver-2.0.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8eb58b0de3e09781f32f977c67793ec1
diff --git a/metadata/md5-cache/sci-libs/coinor-bcp-1.4.4 b/metadata/md5-cache/sci-libs/coinor-bcp-1.4.4
index 7e8b85d9c4e5..f47da90264e3 100644
--- a/metadata/md5-cache/sci-libs/coinor-bcp-1.4.4
+++ b/metadata/md5-cache/sci-libs/coinor-bcp-1.4.4
@@ -11,4 +11,4 @@ RDEPEND=sci-libs/coinor-clp:= sci-libs/coinor-osi:= sci-libs/coinor-utils:= sci-
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/coin-or/Bcp/archive/releases/1.4.4.tar.gz -> coinor-bcp-1.4.4.tar.gz
-_md5_=13fae926193be1ac2a560419806d0561
+_md5_=e0fdb9f82595582985ef98e98a23ae47
diff --git a/metadata/md5-cache/sci-libs/gsl-2.7 b/metadata/md5-cache/sci-libs/gsl-2.7
index 7ce5cbb078a8..271518f0d0a9 100644
--- a/metadata/md5-cache/sci-libs/gsl-2.7
+++ b/metadata/md5-cache/sci-libs/gsl-2.7
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU Scientific Library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gsl/
 IUSE=cblas-external +deprecated static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas:= )
 SLOT=0/25
 SRC_URI=mirror://gnu/gsl/gsl-2.7.tar.gz https://dev.gentoo.org/~sam/distfiles/sci-libs/gsl/gsl-2.7-cblas.patch.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=70772a965a28648b452a0832b0e5edeb
+_md5_=29f516abcc29abec3bc9e8151110b105
diff --git a/metadata/md5-cache/sci-libs/indilib-1.9.1-r1 b/metadata/md5-cache/sci-libs/indilib-1.9.1-r1
index d10ce53a0a91..82e26b371b5e 100644
--- a/metadata/md5-cache/sci-libs/indilib-1.9.1-r1
+++ b/metadata/md5-cache/sci-libs/indilib-1.9.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=INDI Astronomical Control Protocol library
 EAPI=7
 HOMEPAGE=https://www.indilib.org/
 IUSE=ogg rtlsdr test websocket
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-libs/libnova:= sys-libs/zlib virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora ) rtlsdr? ( net-wireless/rtl-sdr ) websocket? ( dev-libs/boost:= )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/indilib/indi/archive/v1.9.1.tar.gz -> indilib-1.9.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=76c61f3cd28fbe46fe2c1f8baa5e64a5
+_md5_=704d56472138414458ac1f45b43af5a0
diff --git a/metadata/md5-cache/sci-libs/libint-2.6.0-r5 b/metadata/md5-cache/sci-libs/libint-2.6.0-r5
index 553a97e693f4..ed30f6cfdad0 100644
--- a/metadata/md5-cache/sci-libs/libint-2.6.0-r5
+++ b/metadata/md5-cache/sci-libs/libint-2.6.0-r5
@@ -5,10 +5,10 @@ DESCRIPTION=Matrix elements (integrals) evaluation over Cartesian Gaussian funct
 EAPI=7
 HOMEPAGE=https://github.com/evaleev/libint
 IUSE=static-libs doc
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+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	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=547a187482e19b8c279320c224f45f84
+_md5_=481ea5d2c02b9080abaecea361936cc4
diff --git a/metadata/md5-cache/sci-libs/libqalculate-3.19.0 b/metadata/md5-cache/sci-libs/libqalculate-3.19.0
index 9b4bb26a2d4c..45a5e842e027 100644
--- a/metadata/md5-cache/sci-libs/libqalculate-3.19.0
+++ b/metadata/md5-cache/sci-libs/libqalculate-3.19.0
@@ -5,10 +5,10 @@ DESCRIPTION=A modern multi-purpose calculator library
 EAPI=7
 HOMEPAGE=https://qalculate.github.io/
 IUSE=curl icu gnuplot readline
-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=GPL-2
 RDEPEND=dev-libs/gmp:0= dev-libs/libxml2:2 dev-libs/mpfr:0= virtual/libiconv curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) gnuplot? ( >=sci-visualization/gnuplot-3.7 )
 SLOT=0/21
 SRC_URI=https://github.com/Qalculate/libqalculate/releases/download/v3.19.0/libqalculate-3.19.0.tar.gz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f2f35046f5323aab3a813c0774854e52
+_md5_=75b532f57616d138793dafa0cbeade61
diff --git a/metadata/md5-cache/sci-libs/libsc-2.2-r100 b/metadata/md5-cache/sci-libs/libsc-2.2-r100
deleted file mode 100644
index d728093ef747..000000000000
--- a/metadata/md5-cache/sci-libs/libsc-2.2-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare pretend setup
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] ) virtual/pkgconfig
-DESCRIPTION=Support for parallel scientific applications
-EAPI=7
-HOMEPAGE=http://www.p4est.org/
-IUSE=debug examples mpi openmp romio static-libs threads lua_single_target_lua5-1 lua_single_target_lua5-2
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
-REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) romio? ( mpi )
-SLOT=0
-SRC_URI=https://github.com/cburstedde/libsc/archive/v2.2.tar.gz -> libsc-2.2.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e15087fd7d75027baf01aec757af2e52
diff --git a/metadata/md5-cache/sci-libs/libsc-2.3.1 b/metadata/md5-cache/sci-libs/libsc-2.3.1
deleted file mode 100644
index 90e89124a9aa..000000000000
--- a/metadata/md5-cache/sci-libs/libsc-2.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare pretend setup
-DEPEND=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 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] ) virtual/pkgconfig
-DESCRIPTION=Support for parallel scientific applications
-EAPI=7
-HOMEPAGE=http://www.p4est.org/
-IUSE=debug examples mpi openmp romio static-libs threads lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=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 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
-REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
-SLOT=0
-SRC_URI=https://github.com/cburstedde/libsc/archive/v2.3.1.tar.gz -> libsc-2.3.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=26e6202df00657d2ac4a1ba3016f9538
diff --git a/metadata/md5-cache/sci-libs/libsc-2.3.1-r1 b/metadata/md5-cache/sci-libs/libsc-2.3.1-r1
new file mode 100644
index 000000000000..6d6b35c0cc13
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libsc-2.3.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare pretend setup
+DEPEND=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 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
+DESCRIPTION=Support for parallel scientific applications
+EAPI=7
+HOMEPAGE=http://www.p4est.org/
+IUSE=debug examples mpi openmp romio threads lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=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 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
+SLOT=0
+SRC_URI=https://github.com/cburstedde/libsc/archive/v2.3.1.tar.gz -> libsc-2.3.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c5c1c2b2ad99162b7a5c64d3a1f75d1f
diff --git a/metadata/md5-cache/sci-libs/libsc-9999 b/metadata/md5-cache/sci-libs/libsc-9999
index a4b78e5c8185..83d40fe9d1f6 100644
--- a/metadata/md5-cache/sci-libs/libsc-9999
+++ b/metadata/md5-cache/sci-libs/libsc-9999
@@ -1,14 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare pretend setup unpack
-DEPEND=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 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] ) virtual/pkgconfig
+DEPEND=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 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
 DESCRIPTION=Support for parallel scientific applications
 EAPI=7
 HOMEPAGE=http://www.p4est.org/
-IUSE=debug examples mpi openmp romio static-libs threads lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+IUSE=debug examples mpi openmp romio threads lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
 LICENSE=LGPL-2.1+
 PROPERTIES=live
 RDEPEND=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 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d0bd523b37765b314d3ae4dfff112879
+_md5_=c36969892c91f61e06a8e039d903f95b
diff --git a/metadata/md5-cache/sci-libs/mathgl-2.4.4-r1 b/metadata/md5-cache/sci-libs/mathgl-2.4.4-r1
index 4d6c501c8bf3..48dd78dfc5ca 100644
--- a/metadata/md5-cache/sci-libs/mathgl-2.4.4-r1
+++ b/metadata/md5-cache/sci-libs/mathgl-2.4.4-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut
 REQUIRED_USE=mpi? ( hdf5 ) openmp? ( !threads ) png? ( zlib ) pdf? ( png )
 SLOT=0/7.5.0
 SRC_URI=mirror://sourceforge/mathgl/mathgl-2.4.4.tar.gz mirror://sourceforge/mathgl/STIX_font.tgz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cedabd04922648ff77b7c22b2d8db32b
diff --git a/metadata/md5-cache/sci-libs/oce-0.18.3-r2 b/metadata/md5-cache/sci-libs/oce-0.18.3-r2
index f63144ca6b5d..890055303388 100644
--- a/metadata/md5-cache/sci-libs/oce-0.18.3-r2
+++ b/metadata/md5-cache/sci-libs/oce-0.18.3-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/ti
 REQUIRED_USE=?? ( openmp tbb )
 SLOT=0.18.3
 SRC_URI=https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=67aaafb733643cff8de531177b5658cd
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.4.0-r4 b/metadata/md5-cache/sci-libs/opencascade-7.4.0-r4
index b5540f38d504..f0d3338e4aec 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.4.0-r4
+++ b/metadata/md5-cache/sci-libs/opencascade-7.4.0-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=inspector? ( qt5 ) qt5? ( examples ) ?? ( optimize tbb )
 RESTRICT=test
 SLOT=7.4.0
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_4_0;sf=tgz -> opencascade-7.4.0.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ecbb8965942417c53c7ecd644a597e56
diff --git a/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0-r2 b/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0-r2
deleted file mode 100644
index 58d981f9beac..000000000000
--- a/metadata/md5-cache/sci-libs/orocos_kdl-1.4.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] ) test? ( dev-util/cppunit ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3
-DESCRIPTION=Kinematics and Dynamics Library (KDL)
-EAPI=7
-HOMEPAGE=https://www.orocos.org/kdl
-IUSE=doc examples models test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-cpp/eigen:3
-REQUIRED_USE=examples? ( models )
-RESTRICT=!test? ( test )
-SLOT=0/14
-SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.4.0.tar.gz -> orocos_kinematics_dynamics-1.4.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=236ecd175a53a67d99abd9121d1b0c39
diff --git a/metadata/md5-cache/sci-libs/orocos_kdl-1.5.0 b/metadata/md5-cache/sci-libs/orocos_kdl-1.5.0
new file mode 100644
index 000000000000..26e180751097
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/orocos_kdl-1.5.0
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] ) test? ( dev-util/cppunit ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-cpp/eigen:3
+DESCRIPTION=Kinematics and Dynamics Library (KDL)
+EAPI=7
+HOMEPAGE=https://www.orocos.org/kdl
+IUSE=doc examples models test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-cpp/eigen:3
+REQUIRED_USE=examples? ( models )
+RESTRICT=!test? ( test )
+SLOT=0/15
+SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.5.0.tar.gz -> orocos_kinematics_dynamics-1.5.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b2108dad7e5f72e092c96949ff56e7d3
diff --git a/metadata/md5-cache/sci-libs/orocos_kdl-9999 b/metadata/md5-cache/sci-libs/orocos_kdl-9999
index 0b58697f58ad..3b7170161e74 100644
--- a/metadata/md5-cache/sci-libs/orocos_kdl-9999
+++ b/metadata/md5-cache/sci-libs/orocos_kdl-9999
@@ -10,6 +10,6 @@ PROPERTIES=live
 RDEPEND=dev-cpp/eigen:3
 REQUIRED_USE=examples? ( models )
 RESTRICT=!test? ( test )
-SLOT=0/14
+SLOT=0/15
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ab431928d7c37f5fd213ccc3abd1a955
+_md5_=b2108dad7e5f72e092c96949ff56e7d3
diff --git a/metadata/md5-cache/sci-libs/p4est-2.2-r100 b/metadata/md5-cache/sci-libs/p4est-2.2-r100
deleted file mode 100644
index 212094f026bc..000000000000
--- a/metadata/md5-cache/sci-libs/p4est-2.2-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare pretend setup
-DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ~sci-libs/libsc-2.2[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] ) sys-devel/automake:1.11 virtual/pkgconfig
-DESCRIPTION=Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees
-EAPI=7
-HOMEPAGE=http://www.p4est.org/
-IUSE=debug doc examples mpi openmp romio static-libs threads +vtk-binary lua_single_target_lua5-1 lua_single_target_lua5-2
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ~sci-libs/libsc-2.2[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
-REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) romio? ( mpi )
-SLOT=0
-SRC_URI=https://github.com/cburstedde/p4est/archive/v2.2.tar.gz -> p4est-2.2.tar.gz https://github.com/cburstedde/libsc/archive/v2.2.tar.gz -> libsc-2.2.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5b9d80a2c39cd47b0a752b0d15230e9d
diff --git a/metadata/md5-cache/sci-libs/p4est-2.3.1 b/metadata/md5-cache/sci-libs/p4est-2.3.1
deleted file mode 100644
index 21117acd2a1b..000000000000
--- a/metadata/md5-cache/sci-libs/p4est-2.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare pretend setup
-DEPEND=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 ) ~sci-libs/libsc-2.3.1[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,lua_single_target_lua5-3(-)?,mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] ) sys-devel/automake virtual/pkgconfig
-DESCRIPTION=Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees
-EAPI=7
-HOMEPAGE=http://www.p4est.org/
-IUSE=debug doc examples mpi openmp romio static-libs threads +vtk-binary lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=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 ) ~sci-libs/libsc-2.3.1[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,lua_single_target_lua5-3(-)?,mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
-REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
-SLOT=0
-SRC_URI=https://github.com/cburstedde/p4est/archive/v2.3.1.tar.gz -> p4est-2.3.1.tar.gz https://github.com/cburstedde/libsc/archive/v2.3.1.tar.gz -> libsc-2.3.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=96c1a8828f76ff229a4a81ff95e033b7
diff --git a/metadata/md5-cache/sci-libs/p4est-2.3.1-r1 b/metadata/md5-cache/sci-libs/p4est-2.3.1-r1
new file mode 100644
index 000000000000..821f26d3478c
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/p4est-2.3.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare pretend setup
+DEPEND=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 ) ~sci-libs/libsc-2.3.1[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,lua_single_target_lua5-3(-)?,mpi=,openmp=,romio=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
+DESCRIPTION=Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees
+EAPI=7
+HOMEPAGE=http://www.p4est.org/
+IUSE=debug doc examples mpi openmp romio threads +vtk-binary lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=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 ) ~sci-libs/libsc-2.3.1[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,lua_single_target_lua5-3(-)?,mpi=,openmp=,romio=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
+SLOT=0
+SRC_URI=https://github.com/cburstedde/p4est/archive/v2.3.1.tar.gz -> p4est-2.3.1.tar.gz https://github.com/cburstedde/libsc/archive/v2.3.1.tar.gz -> libsc-2.3.1.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ccfdd8ee820e82d398480c8a9d2a39e3
diff --git a/metadata/md5-cache/sci-libs/p4est-9999 b/metadata/md5-cache/sci-libs/p4est-9999
index 140120283bc4..b0360070a22a 100644
--- a/metadata/md5-cache/sci-libs/p4est-9999
+++ b/metadata/md5-cache/sci-libs/p4est-9999
@@ -1,14 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare pretend setup unpack
-DEPEND=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 ) ~sci-libs/libsc-9999[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,lua_single_target_lua5-3(-)?,mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] ) sys-devel/automake:1.11 virtual/pkgconfig
+DEPEND=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 ) ~sci-libs/libsc-9999[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,lua_single_target_lua5-3(-)?,mpi=,openmp=,romio=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
 DESCRIPTION=Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees
 EAPI=7
 HOMEPAGE=http://www.p4est.org/
-IUSE=debug doc examples mpi openmp romio static-libs threads +vtk-binary lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+IUSE=debug doc examples mpi openmp romio threads +vtk-binary lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=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 ) ~sci-libs/libsc-9999[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,lua_single_target_lua5-3(-)?,mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
+RDEPEND=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 ) ~sci-libs/libsc-9999[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,lua_single_target_lua5-3(-)?,mpi=,openmp=,romio=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5b68577f1ef9b64ea8812ad1ff1d03ba
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ccfdd8ee820e82d398480c8a9d2a39e3
diff --git a/metadata/md5-cache/sci-libs/pcl-1.11.1-r1 b/metadata/md5-cache/sci-libs/pcl-1.11.1-r1
deleted file mode 100644
index 510e6825a814..000000000000
--- a/metadata/md5-cache/sci-libs/pcl-1.11.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads(+)] dev-cpp/eigen:3 opengl? ( virtual/opengl media-libs/freeglut ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtopengl:5 ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) !!dev-cpp/metslib test? ( >=dev-cpp/gtest-1.6.0 )
-DESCRIPTION=2D/3D image and point cloud processing
-EAPI=7
-HOMEPAGE=https://pointclouds.org/
-IUSE=cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads(+)] dev-cpp/eigen:3 opengl? ( virtual/opengl media-libs/freeglut ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtopengl:5 ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-REQUIRED_USE=openni? ( usb ) openni2? ( usb ) tutorials? ( doc )
-RESTRICT=!test? ( test )
-SLOT=0/1.11
-SRC_URI=https://github.com/PointCloudLibrary/pcl/archive/pcl-1.11.1.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a19a8a293e1bd8d689d8578a7e453ae2
diff --git a/metadata/md5-cache/sci-libs/pcl-1.12.0 b/metadata/md5-cache/sci-libs/pcl-1.12.0
new file mode 100644
index 000000000000..08ed62a472d2
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/pcl-1.12.0
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen ) tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink ) virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads(+)] dev-cpp/eigen:3 opengl? ( virtual/opengl media-libs/freeglut ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtopengl:5 ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) !!dev-cpp/metslib test? ( >=dev-cpp/gtest-1.6.0 )
+DESCRIPTION=2D/3D image and point cloud processing
+EAPI=7
+HOMEPAGE=https://pointclouds.org/
+IUSE=cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads(+)] dev-cpp/eigen:3 opengl? ( virtual/opengl media-libs/freeglut ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtopengl:5 ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
+REQUIRED_USE=openni? ( usb ) openni2? ( usb ) tutorials? ( doc )
+RESTRICT=!test? ( test )
+SLOT=0/1.12
+SRC_URI=https://github.com/PointCloudLibrary/pcl/archive/pcl-1.12.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4a002fcd64525504e745b2bb44768c7b
diff --git a/metadata/md5-cache/sci-libs/pcl-9999 b/metadata/md5-cache/sci-libs/pcl-9999
index c8286bf231ca..864d04d5f0ca 100644
--- a/metadata/md5-cache/sci-libs/pcl-9999
+++ b/metadata/md5-cache/sci-libs/pcl-9999
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen ) tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=doc? ( app-doc/doxygen ) tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads(+)] dev-cpp/eigen:3 opengl? ( virtual/opengl media-libs/freeglut ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtopengl:5 ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) !!dev-cpp/metslib test? ( >=dev-cpp/gtest-1.6.0 )
 DESCRIPTION=2D/3D image and point cloud processing
@@ -10,6 +10,6 @@ PROPERTIES=live
 RDEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads(+)] dev-cpp/eigen:3 opengl? ( virtual/opengl media-libs/freeglut ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtopengl:5 ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
 REQUIRED_USE=openni? ( usb ) openni2? ( usb ) tutorials? ( doc )
 RESTRICT=!test? ( test )
-SLOT=0/1.11
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a19a8a293e1bd8d689d8578a7e453ae2
+SLOT=0/1.12
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4a002fcd64525504e745b2bb44768c7b
diff --git a/metadata/md5-cache/sci-libs/plplot-5.15.0-r102 b/metadata/md5-cache/sci-libs/plplot-5.15.0-r102
index 0bfeea1d978b..0e0963c8e36d 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.15.0-r102
+++ b/metadata/md5-cache/sci-libs/plplot-5.15.0-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test ) octave? ( test )
 SLOT=0/14
 SRC_URI=mirror://sourceforge/plplot/plplot-5.15.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8039714da2790eeeea5566850e208150
diff --git a/metadata/md5-cache/sci-libs/qd-2.3.22-r1 b/metadata/md5-cache/sci-libs/qd-2.3.22-r1
new file mode 100644
index 000000000000..6c092a8b7200
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/qd-2.3.22-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
+DEFINED_PHASES=configure install prepare setup
+DEPEND=fortran? ( virtual/fortran )
+DESCRIPTION=Quad-double and double-double float arithmetics
+EAPI=7
+HOMEPAGE=https://www.davidhbailey.com/dhbsoftware/
+IUSE=cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=fortran? ( virtual/fortran )
+SLOT=0
+SRC_URI=http://crd.lbl.gov/~dhbailey/mpdist/qd-2.3.22.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9f0c6742bf07da29e9ab59539f2a7316
diff --git a/metadata/md5-cache/sci-libs/rocFFT-4.0.0-r1 b/metadata/md5-cache/sci-libs/rocFFT-4.0.0-r1
index 38040fcbe243..a2211f5c5025 100644
--- a/metadata/md5-cache/sci-libs/rocFFT-4.0.0-r1
+++ b/metadata/md5-cache/sci-libs/rocFFT-4.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND==dev-util/hip-4.0*
 SLOT=0
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-4.0.0.tar.gz -> rocFFT-4.0.0.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c4ae9dcf330abd2bbb3b17bd5d274fc3
diff --git a/metadata/md5-cache/sci-libs/rtabmap-0.20.13 b/metadata/md5-cache/sci-libs/rtabmap-0.20.13
new file mode 100644
index 000000000000..8137e16b1819
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rtabmap-0.20.13
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
+DESCRIPTION=Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)
+EAPI=7
+HOMEPAGE=http://introlab.github.io/rtabmap/
+IUSE=examples ieee1394 openni2 qt5
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
+SLOT=0
+SRC_URI=https://github.com/introlab/rtabmap/archive/0.20.13-rolling.tar.gz -> rtabmap-0.20.13.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9d7bfe18db7c1c704d2283aa17d8c8de
diff --git a/metadata/md5-cache/sci-libs/rtabmap-0.20.3 b/metadata/md5-cache/sci-libs/rtabmap-0.20.3
deleted file mode 100644
index a3dc8d1d2a0a..000000000000
--- a/metadata/md5-cache/sci-libs/rtabmap-0.20.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
-DESCRIPTION=Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)
-EAPI=7
-HOMEPAGE=http://introlab.github.io/rtabmap/
-IUSE=examples ieee1394 openni2 qt5
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
-SLOT=0
-SRC_URI=https://github.com/introlab/rtabmap/archive/0.20.3.tar.gz -> rtabmap-0.20.3.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6e98a1795fdb839aa4398bd51fb9bb82
diff --git a/metadata/md5-cache/sci-libs/rtabmap-9999 b/metadata/md5-cache/sci-libs/rtabmap-9999
index 7d595ebf0584..1bffd518352d 100644
--- a/metadata/md5-cache/sci-libs/rtabmap-9999
+++ b/metadata/md5-cache/sci-libs/rtabmap-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
 DESCRIPTION=Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)
@@ -9,5 +9,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
 SLOT=0
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=381247e0df2e52cf24bbd0dd038e959f
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9d7bfe18db7c1c704d2283aa17d8c8de
diff --git a/metadata/md5-cache/sci-libs/scikit-image-0.17.2 b/metadata/md5-cache/sci-libs/scikit-image-0.17.2
index 0c221b4a805d..59317819a495 100644
--- a/metadata/md5-cache/sci-libs/scikit-image-0.17.2
+++ b/metadata/md5-cache/sci-libs/scikit-image-0.17.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/imageio[python_targets_python3_8(-)?,python_targets_python3_9
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.17.2.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d1dd8962234086e216ab2a8c2948ff9f
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.4.0 b/metadata/md5-cache/sci-libs/tensorflow-2.4.0
index 290ad92c998c..037c2092fc3a 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.4.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.4.0
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.4.0.tar.gz -> tensorflow-2.4.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.4.0.tar.bz2 https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://gitlab.com/libeigen/eigen/-/archive/011e0db31d1bed8b7f73662be6d57d9f30fa457a/eigen-011e0db31d1bed8b7f73662be6d57d9f30fa457a.tar.gz https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz -> llvm-f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/google/ruy/archive/5bb02fbf90824c2eb6cd7418f766c593106a332b.zip -> ruy-5bb02fbf90824c2eb6cd7418f766c593106a332b.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip cuda? ( https://github.com/nvidia/nccl/archive/195232556936b39b01cc908296e1650b80d4a3e9.tar.gz -> nvidia-nccl-195232556936b39b01cc908296e1650b80d4a3e9.tar.gz https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	bfb51de63b0462097e40436214dd43c8	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3f706c82f71850c2ffbe56bbc4cc90b3
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.5.0 b/metadata/md5-cache/sci-libs/tensorflow-2.5.0
index c768f2026221..2e269f32c201 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.5.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.5.0
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.5.0.tar.gz -> tensorflow-2.5.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.5.0.tar.bz2 https://github.com/abseil/abseil-cpp/archive/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz -> abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip -> ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz -> llvm-1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/oneapi-src/oneDNN/archive/v2.2.tar.gz -> oneDNN-v2.2.tar.gz https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/tensorflow/toolchains/archive/v1.1.10.tar.gz -> tensorflow-toolchains-v1.1.10.tar.gz https://gitlab.com/libeigen/eigen/-/archive/f612df273689a19d25b45ca4f8269463207c4fee/eigen-f612df273689a19d25b45ca4f8269463207c4fee.tar.gz cuda? ( https://github.com/NVIDIA/cudnn-frontend/archive/360d6e7164dfb7c802493fd1c0464f0d815b852a.zip -> cudnn-frontend-360d6e7164dfb7c802493fd1c0464f0d815b852a.zip https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip https://github.com/nvidia/nccl/archive/v2.8.3-1.tar.gz -> nvidia-nccl-v2.8.3-1.tar.gz ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	bfb51de63b0462097e40436214dd43c8	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d15dae7073531439e979d3dc5170660
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.5.0-r1 b/metadata/md5-cache/sci-libs/tensorflow-2.5.0-r1
index 8311a882c984..4c69f480d218 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.5.0-r1
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.5.0-r1
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.5.0.tar.gz -> tensorflow-2.5.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.5.0-r1.tar.bz2 https://github.com/abseil/abseil-cpp/archive/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz -> abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip -> ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz -> llvm-1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/oneapi-src/oneDNN/archive/v2.2.tar.gz -> oneDNN-v2.2.tar.gz https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/tensorflow/toolchains/archive/v1.1.10.tar.gz -> tensorflow-toolchains-v1.1.10.tar.gz https://gitlab.com/libeigen/eigen/-/archive/f612df273689a19d25b45ca4f8269463207c4fee/eigen-f612df273689a19d25b45ca4f8269463207c4fee.tar.gz cuda? ( https://github.com/NVIDIA/cudnn-frontend/archive/360d6e7164dfb7c802493fd1c0464f0d815b852a.zip -> cudnn-frontend-360d6e7164dfb7c802493fd1c0464f0d815b852a.zip https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip https://github.com/nvidia/nccl/archive/v2.8.3-1.tar.gz -> nvidia-nccl-v2.8.3-1.tar.gz ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	97b90bd8fb799993925e6b3a683184e5	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	bfb51de63b0462097e40436214dd43c8	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=10efa1d4dabffaab17a1f7d5a3d42a9f
diff --git a/metadata/md5-cache/sci-libs/vtk-9.0.1 b/metadata/md5-cache/sci-libs/vtk-9.0.1
index 74bf45b136c2..a97907aa32f5 100644
--- a/metadata/md5-cache/sci-libs/vtk-9.0.1
+++ b/metadata/md5-cache/sci-libs/vtk-9.0.1
@@ -8,9 +8,9 @@ IUSE=+X all-modules boost cuda doc examples ffmpeg gdal imaging java +json kits
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2
 RDEPEND=app-arch/lz4 app-arch/xz-utils dev-db/sqlite dev-cpp/eigen[cuda?,openmp?] dev-libs/double-conversion:= dev-libs/expat dev-libs/icu:= dev-libs/libxml2:2 dev-libs/pugixml media-libs/freetype media-libs/libogg media-libs/libpng media-libs/libtheora media-libs/tiff sci-libs/hdf5:=[mpi=] sci-libs/kissfft[openmp?] sci-libs/netcdf:=[mpi=] sys-libs/zlib virtual/jpeg all-modules? ( sci-geosciences/liblas[gdal] ) boost? ( dev-libs/boost:=[mpi?] ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:= ) gdal? ( sci-libs/gdal:= ) java? ( >=virtual/jdk-1.8:* ) json? ( dev-libs/jsoncpp:= ) mpi? ( sci-libs/h5part sys-cluster/openmpi[cxx,romio] ) mysql? ( dev-db/mariadb-connector-c ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 ) rendering? ( media-libs/freeglut media-libs/glew:= sci-libs/proj:= virtual/opengl x11-libs/gl2ps ) tbb? ( dev-cpp/tbb ) tk? ( dev-lang/tk:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) views? ( x11-libs/libICE x11-libs/libXext ) web? ( >=app-admin/webapp-config-1.50.15 ) python_single_target_python3_8? ( python? ( boost? ( dev-libs/boost:=[mpi?,python?,python_targets_python3_8(-)] ) gdal? ( sci-libs/gdal:=[python?,python_targets_python3_8(-)] ) mpi? ( dev-python/mpi4py[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( python? ( boost? ( dev-libs/boost:=[mpi?,python?,python_targets_python3_9(-)] ) gdal? ( sci-libs/gdal:=[python?,python_targets_python3_9(-)] ) mpi? ( dev-python/mpi4py[python_targets_python3_9(-)] ) ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=all-modules? ( boost ffmpeg gdal imaging mysql odbc postgres qt5 rendering theora views ) cuda? ( X ) java? ( rendering ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) qt5? ( X rendering ) tk? ( X rendering python ) web? ( python )
+REQUIRED_USE=all-modules? ( boost ffmpeg gdal imaging mysql odbc postgres qt5 rendering theora views ) cuda? ( X video_cards_nvidia ) java? ( rendering ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) qt5? ( X rendering ) tk? ( X rendering python ) web? ( python )
 RESTRICT=!test? ( test )
 SLOT=0/9.0
 SRC_URI=https://www.vtk.org/files/release/9.0/VTK-9.0.1.tar.gz https://www.vtk.org/files/release/9.0/VTKData-9.0.1.tar.gz doc? ( https://www.vtk.org/files/release/9.0/vtkDocHtml-9.0.1.tar.gz ) examples? ( https://www.vtk.org/files/release/9.0/VTKLargeData-9.0.1.tar.gz ) test? ( https://www.vtk.org/files/release/9.0/VTKLargeData-9.0.1.tar.gz )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	webapp	cd327e73cdb307ceb80dcca6b8ad8b52	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=73350057c0ca226a4389833f8e7b5b12
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	c9d8408eceaa8e56c729df071dd8cb57	java-utils-2	bd56fb0d459d0bad9d07fa32febe53cb	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	webapp	cd327e73cdb307ceb80dcca6b8ad8b52	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d7708df408ca742a2fac2fb7386f6b14
diff --git a/metadata/md5-cache/sci-libs/xylib-1.6 b/metadata/md5-cache/sci-libs/xylib-1.6
index 98bfa0f80cfa..e850ee456b6e 100644
--- a/metadata/md5-cache/sci-libs/xylib-1.6
+++ b/metadata/md5-cache/sci-libs/xylib-1.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) gui? ( x11-libs/wxGTK:3.0-gtk3 ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/wojdyr/xylib/releases/download/v1.6/xylib-1.6.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=8a07ef35e377f3028cb285a6dbd4f7df
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 68b0b25ab69d..9e4e49ad2395 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/flint-2.7.1-r1 b/metadata/md5-cache/sci-mathematics/flint-2.7.1-r1
index 6bee31a08cc8..de68b5bb6137 100644
--- a/metadata/md5-cache/sci-mathematics/flint-2.7.1-r1
+++ b/metadata/md5-cache/sci-mathematics/flint-2.7.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Fast Library for Number Theory
 EAPI=7
 HOMEPAGE=http://www.flintlib.org/
 IUSE=doc ntl test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= ) virtual/cblas
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=http://www.flintlib.org/flint-2.7.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a7e148f761fa9ffc51ee0a6158647611
+_md5_=f27954be2852639b898658d991a9b442
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.7.2 b/metadata/md5-cache/sci-mathematics/rkward-0.7.2
index d00b6ae483c6..e358503e9117 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.7.2
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.7.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2
 RDEPEND=dev-lang/R dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/knotifications:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 kde-frameworks/ktexteditor:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui: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/rkward/0.7.2/src/rkward-0.7.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2721d7155274635f05fff5ba23ae668f
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-20.12.2 b/metadata/md5-cache/sci-mathematics/wxmaxima-20.12.2
index 8932c43c1943..3984f2d0c2b2 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-20.12.2
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-20.12.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
 SLOT=0
 SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-20.12.2.tar.gz -> wxmaxima-20.12.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5081022d100b00d2d646664e8fe694d6
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-21.01.0 b/metadata/md5-cache/sci-mathematics/wxmaxima-21.01.0
index f864ce225b3a..cf9507f8828b 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-21.01.0
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-21.01.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 media-fonts/jsmath sci-visual
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-21.01.0.tar.gz -> wxmaxima-21.01.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9e42ea693fac3a48a4e149c8b8d0363f
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-21.04.0 b/metadata/md5-cache/sci-mathematics/wxmaxima-21.04.0
index aca026b80d24..848a8f2387be 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-21.04.0
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-21.04.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 media-fonts/jsmath sci-visual
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-21.04.0.tar.gz -> wxmaxima-21.04.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9e42ea693fac3a48a4e149c8b8d0363f
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-21.05.1 b/metadata/md5-cache/sci-mathematics/wxmaxima-21.05.1
index a89b83f53759..5b18b152b666 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-21.05.1
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-21.05.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 media-fonts/jsmath sci-visual
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-21.05.1.tar.gz -> wxmaxima-21.05.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9e42ea693fac3a48a4e149c8b8d0363f
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-21.05.2 b/metadata/md5-cache/sci-mathematics/wxmaxima-21.05.2
index cdf123b1d25e..2b7714cb83bb 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-21.05.2
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-21.05.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3 media-fonts/jsmath sci-visual
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-21.05.2.tar.gz -> wxmaxima-21.05.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=9e42ea693fac3a48a4e149c8b8d0363f
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.10-r1 b/metadata/md5-cache/sci-mathematics/z3-4.8.10-r1
deleted file mode 100644
index c354e0b3c78e..000000000000
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.10-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 )
-DESCRIPTION=An efficient theorem prover
-EAPI=7
-HOMEPAGE=https://github.com/Z3Prover/z3/
-IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0/4.8
-SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.10.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8c9f2f5e34609cc6f9e0f5ff21abaf4d
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.11-r1 b/metadata/md5-cache/sci-mathematics/z3-4.8.11-r1
deleted file mode 100644
index 189118bdc7d2..000000000000
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.11-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 )
-DESCRIPTION=An efficient theorem prover
-EAPI=7
-HOMEPAGE=https://github.com/Z3Prover/z3/
-IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0/4.8
-SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.11.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bb58374f468767ee79039226048e6f9b
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.11b b/metadata/md5-cache/sci-mathematics/z3-4.8.11b
index f95a1c832650..2d0dff7a4453 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.11b
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.11b
@@ -5,11 +5,11 @@ DESCRIPTION=An efficient theorem prover
 EAPI=7
 HOMEPAGE=https://github.com/Z3Prover/z3/
 IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/4.8
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.11b.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d59f7ec3f79daffd0e141196ff69670d
+_md5_=af345887507eecf3733afdad75da8b31
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 96749b8a3e4f..68e39bbf6eea 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/boinc-7.16.16 b/metadata/md5-cache/sci-misc/boinc-7.16.16
index 21e54a66b7b8..375be4a9746f 100644
--- a/metadata/md5-cache/sci-misc/boinc-7.16.16
+++ b/metadata/md5-cache/sci-misc/boinc-7.16.16
@@ -11,5 +11,5 @@ RDEPEND=acct-group/boinc acct-user/boinc >=app-misc/ca-certificates-20080809 cud
 REQUIRED_USE=^^ ( curl_ssl_gnutls curl_ssl_openssl )
 SLOT=0
 SRC_URI=X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif ) https://github.com/BOINC/boinc/archive/client_release/7.16/7.16.16.tar.gz -> boinc-7.16.16.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=69ebc5f96bc58198495495473bc51db8
diff --git a/metadata/md5-cache/sci-misc/boinc-7.16.17 b/metadata/md5-cache/sci-misc/boinc-7.16.17
index 2ef33e2bd45d..124f7192d35c 100644
--- a/metadata/md5-cache/sci-misc/boinc-7.16.17
+++ b/metadata/md5-cache/sci-misc/boinc-7.16.17
@@ -11,5 +11,5 @@ RDEPEND=acct-group/boinc acct-user/boinc >=app-misc/ca-certificates-20080809 cud
 REQUIRED_USE=^^ ( curl_ssl_gnutls curl_ssl_openssl )
 SLOT=0
 SRC_URI=X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif ) https://github.com/BOINC/boinc/archive/client_release/7.16/7.16.17.tar.gz -> boinc-7.16.17.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=773d97cec7832b085e518fbcdd9c873a
diff --git a/metadata/md5-cache/sci-misc/boinc-9999 b/metadata/md5-cache/sci-misc/boinc-9999
index a910bbdb98cd..390c36ba4db0 100644
--- a/metadata/md5-cache/sci-misc/boinc-9999
+++ b/metadata/md5-cache/sci-misc/boinc-9999
@@ -11,5 +11,5 @@ RDEPEND=acct-group/boinc acct-user/boinc >=app-misc/ca-certificates-20080809 cud
 REQUIRED_USE=^^ ( curl_ssl_gnutls curl_ssl_openssl )
 SLOT=0
 SRC_URI=X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=917fad3bc673c756e26e98632f62cbbb
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 1ace79265df1..af13f6bb1925 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/bullet-3.17 b/metadata/md5-cache/sci-physics/bullet-3.17
index 2c79cfd151b1..cf214ce12897 100644
--- a/metadata/md5-cache/sci-physics/bullet-3.17
+++ b/metadata/md5-cache/sci-physics/bullet-3.17
@@ -5,7 +5,7 @@ DESCRIPTION=Continuous Collision Detection and Physics Library
 EAPI=7
 HOMEPAGE=https://www.bulletphysics.com/
 IUSE=doc double-precision examples extras openmp tbb test +threads
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=virtual/opengl media-libs/freeglut tbb? ( dev-cpp/tbb )
 REQUIRED_USE=openmp? ( threads ) tbb? ( threads )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/3.17
 SRC_URI=https://github.com/bulletphysics/bullet3/archive/3.17.tar.gz -> bullet-3.17.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a395b588ccd3d1e0533d76c7793b0c2e
+_md5_=68b9976860111691cf8b997fd0eca96c
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 784f339b15e8..d2c94494f9c1 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/epix-1.2.11-r3 b/metadata/md5-cache/sci-visualization/epix-1.2.11-r3
deleted file mode 100644
index 6519eef11dc6..000000000000
--- a/metadata/md5-cache/sci-visualization/epix-1.2.11-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended emacs? ( >=app-editors/emacs-23.1:* ) sys-devel/gnuconfig >=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=2- and 3-D plotter for creating images (to be used in LaTeX)
-EAPI=5
-HOMEPAGE=https://mathcs.holycross.edu/~ahwang/current/ePiX.html
-IUSE=doc emacs examples
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended emacs? ( >=app-editors/emacs-23.1:* )
-SLOT=0
-SRC_URI=https://mathcs.holycross.edu/~ahwang/epix/epix-1.2.11_withpdf.tar.bz2
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a665940ab76946366dbefb2fecfdf4f0
diff --git a/metadata/md5-cache/sci-visualization/fityk-1.3.1-r102 b/metadata/md5-cache/sci-visualization/fityk-1.3.1-r102
index 55af2c78c221..a62ffa1b86e9 100644
--- a/metadata/md5-cache/sci-visualization/fityk-1.3.1-r102
+++ b/metadata/md5-cache/sci-visualization/fityk-1.3.1-r102
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/wojdyr/fityk/releases/download/v1.3.1/fityk-1.3.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d8673b8247be6d3792e317baae9493e3
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1 b/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
index aa03b0856377..f02104f79fbe 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
@@ -11,5 +11,5 @@ RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.4.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=ca3d483e634884770c772817bc0096f9
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r2 b/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r2
index e5b7aeb775c4..e493cb40e564 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r2
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Command-line driven interactive plotting program
 EAPI=7
 HOMEPAGE=http://www.gnuplot.info/
 IUSE=aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gnuplot
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.4.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
-_md5_=e2df9ff1fcc7cd804b3baab971004da8
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
+_md5_=efc931442b97c94f4ee1d39113cdf584
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.4.2 b/metadata/md5-cache/sci-visualization/gnuplot-5.4.2
new file mode 100644
index 000000000000..4a5df1fe7f29
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.4.2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-langgreek app-text/ghostscript-gpl ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-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 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
+DESCRIPTION=Command-line driven interactive plotting program
+EAPI=8
+HOMEPAGE=http://www.gnuplot.info/
+IDEPEND=latex? ( virtual/latex-base )
+IUSE=aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=gnuplot
+RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-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 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.4.2.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
+_md5_=1df020f406c7bf2dab49070c66ddbd66
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1 b/metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1
index 0e0de7ff179f..b6db8e4dbc7e 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1
@@ -1,14 +1,15 @@
-BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-langgreek app-text/ghostscript-gpl ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-langgreek app-text/ghostscript-gpl ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
+DEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-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 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
 DESCRIPTION=Command-line driven interactive plotting program
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.gnuplot.info/
-IUSE=aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+IDEPEND=latex? ( virtual/latex-base )
+IUSE=aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=gnuplot
 PROPERTIES=live
-RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
+RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-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 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
-_md5_=0b68d4b73cda70e8a4292515f215df6d
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
+_md5_=51185d014e021a63440170be4056bddc
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index e9939bb73ae7..6d3556fc3344 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/bolt-0.9-r3 b/metadata/md5-cache/sys-apps/bolt-0.9-r3
deleted file mode 100644
index b9564083149b..000000000000
--- a/metadata/md5-cache/sys-apps/bolt-0.9-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=>=dev-libs/glib-2.56.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd ) doc? ( app-text/asciidoc )
-DESCRIPTION=Userspace system daemon to enable security levels for Thunderbolt 3
-EAPI=7
-HOMEPAGE=https://gitlab.freedesktop.org/bolt/bolt
-IUSE=doc systemd kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.56.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd ) doc? ( app-text/asciidoc )
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.9/bolt-0.9.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4fec23c32290af59643caa39e0a17f4e
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.8 b/metadata/md5-cache/sys-apps/diffutils-3.8
new file mode 100644
index 000000000000..57af45ea1ee1
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/diffutils-3.8
@@ -0,0 +1,12 @@
+BDEPEND=nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure
+DESCRIPTION=Tools to make diffs and compare files
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/diffutils/
+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.8.tar.xz https://alpha.gnu.org/gnu/diffutils/diffutils-3.8.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c1fed253395dc524cb474cb2a18569f4
diff --git a/metadata/md5-cache/sys-apps/edac-utils-0.18 b/metadata/md5-cache/sys-apps/edac-utils-0.18
index d0d593b044b7..6b96a682ee0b 100644
--- a/metadata/md5-cache/sys-apps/edac-utils-0.18
+++ b/metadata/md5-cache/sys-apps/edac-utils-0.18
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install postinst prepare
 DEPEND=sys-fs/sysfsutils
 DESCRIPTION=Userspace helper for Linux kernel EDAC drivers
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/grondo/edac-utils
 IUSE=debug
 KEYWORDS=amd64 ~arm64
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/sysfsutils sys-apps/dmidecode
 SLOT=0
 SRC_URI=https://github.com/grondo/edac-utils/archive/0.18.tar.gz -> edac-utils-0.18.tar.gz
-_md5_=1e6f173441373024dbad2d804e195ac2
+_md5_=b691b3269f4e7151cf1490f2d6802bc7
diff --git a/metadata/md5-cache/sys-apps/edac-utils-0.18-r1 b/metadata/md5-cache/sys-apps/edac-utils-0.18-r1
new file mode 100644
index 000000000000..fd3fb72a5d6b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/edac-utils-0.18-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-fs/sysfsutils
+DESCRIPTION=Userspace helper for Linux kernel EDAC drivers
+EAPI=7
+HOMEPAGE=https://github.com/grondo/edac-utils
+IUSE=debug
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2
+RDEPEND=sys-fs/sysfsutils sys-apps/dmidecode
+SLOT=0
+SRC_URI=https://github.com/grondo/edac-utils/archive/0.18.tar.gz -> edac-utils-0.18.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0cf781f9c005d49bbe32613287029a2f
diff --git a/metadata/md5-cache/sys-apps/exa-0.10.1 b/metadata/md5-cache/sys-apps/exa-0.10.1
index 51e008aa6f1f..e84c77268cf2 100644
--- a/metadata/md5-cache/sys-apps/exa-0.10.1
+++ b/metadata/md5-cache/sys-apps/exa-0.10.1
@@ -5,10 +5,10 @@ DESCRIPTION=A modern replacement for 'ls' written in Rust
 EAPI=7
 HOMEPAGE=https://the.exa.website/
 IUSE=+git man debug
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 MIT Unlicense
 RDEPEND=git? ( dev-libs/libgit2:= )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/datetime/0.5.2/download -> datetime-0.5.2.crate https://crates.io/api/v1/crates/env_logger/0.8.3/download -> env_logger-0.8.3.crate https://crates.io/api/v1/crates/exa/0.10.1/download -> exa-0.10.1.crate https://crates.io/api/v1/crates/git2/0.13.17/download -> git2-0.13.17.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/idna/0.2.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/iso8601/0.4.0/download -> iso8601-0.4.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.93/download -> libc-0.2.93.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.18+1.1.0/download -> libgit2-sys-0.12.18+1.1.0.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/locale/0.2.2/download -> locale-0.2.2.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/openssl-src/111.15.0+1.1.1k/download -> openssl-src-111.15.0+1.1.1k.crate https://crates.io/api/v1/crates/openssl-sys/0.9.61/download -> openssl-sys-0.9.61.crate https://crates.io/api/v1/crates/pad/0.1.6/download -> pad-0.1.6.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/quick-error/2.0.1/download -> quick-error-2.0.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_termios/0.1.2/download -> redox_termios-0.1.2.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/termion/1.5.6/download -> termion-1.5.6.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/ucd-util/0.1.8/download -> ucd-util-0.1.8.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.4/download -> utf8-ranges-1.0.4.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.3/download -> wincolor-1.0.3.crate https://crates.io/api/v1/crates/zoneinfo_compiled/0.5.1/download -> zoneinfo_compiled-0.5.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cebf279fbcc8f589b873cd51a17b05c6
+_md5_=7493e85af0243a9eb5df61e346f44fcb
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.6.2 b/metadata/md5-cache/sys-apps/fwupd-1.6.2
new file mode 100644
index 000000000000..58f92b1e3a74
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwupd-1.6.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
+EAPI=7
+HOMEPAGE=https://fwupd.org
+IUSE=agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection ) spi? ( lzma ) synaptics? ( gnutls ) uefi? ( gnutls )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fwupd/fwupd/archive/1.6.2.tar.gz -> fwupd-1.6.2.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0c5d134d9b0d4854447d4691b53741cd
diff --git a/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1 b/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1
index a68d8bab5262..67419ff55ce2 100644
--- a/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1
+++ b/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1
@@ -7,5 +7,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-lang/perl dev-perl/Digest-SHA1 net-misc/curl sys-apps/dmidecode sys-apps/edid-decode sys-apps/hwinfo sys-apps/pciutils sys-apps/smartmontools sys-apps/usbutils virtual/perl-Data-Dumper
 SLOT=0
 SRC_URI=https://github.com/linuxhw/hw-probe/archive/1.6-beta.tar.gz -> hw-probe-1.6_beta2.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
 _md5_=4bcda92675bc8731fe2180f366e28a6f
diff --git a/metadata/md5-cache/sys-apps/hwinfo-21.76 b/metadata/md5-cache/sys-apps/hwinfo-21.76
new file mode 100644
index 000000000000..f6cbe7169cef
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hwinfo-21.76
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/rpm2targz
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=amd64? ( dev-libs/libx86emu ) x86? ( dev-libs/libx86emu ) sys-devel/flex >=sys-kernel/linux-headers-2.6.17
+DESCRIPTION=Hardware detection tool used in SuSE Linux
+EAPI=7
+HOMEPAGE=https://www.opensuse.org/
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=amd64? ( dev-libs/libx86emu ) x86? ( dev-libs/libx86emu )
+SLOT=0
+SRC_URI=http://download.opensuse.org/tumbleweed/repo/src-oss/src/hwinfo-21.76-1.1.src.rpm
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	97566c1a256d07b00848aa767e38a352	rpm	142025d51eac82f782a2dcb4f04a4b12	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0eb86f43bc5c3aa1d4f07c4fefb39a8a
diff --git a/metadata/md5-cache/sys-apps/lsd-0.20.1 b/metadata/md5-cache/sys-apps/lsd-0.20.1
index 31d21df6c8ea..6bc3ae8dc295 100644
--- a/metadata/md5-cache/sys-apps/lsd-0.20.1
+++ b/metadata/md5-cache/sys-apps/lsd-0.20.1
@@ -4,9 +4,9 @@ DESCRIPTION=A modern ls with a lot of pretty colors and awesome icons
 EAPI=7
 HOMEPAGE=https://github.com/Peltoche/lsd
 IUSE=debug
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 BSD-2 ISC MIT
 SLOT=0
 SRC_URI=https://github.com/Peltoche/lsd/archive/0.20.1.tar.gz -> lsd-0.20.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/assert_cmd/1.0.1/download -> assert_cmd-1.0.1.crate https://crates.io/api/v1/crates/assert_fs/1.0.0/download -> assert_fs-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/bstr/0.2.13/download -> bstr-0.2.13.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.15/download -> chrono-0.4.15.crate https://crates.io/api/v1/crates/chrono-humanize/0.1.1/download -> chrono-humanize-0.1.1.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/3.0.1/download -> dirs-3.0.1.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.6/download -> dtoa-0.4.6.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/globwalk/0.7.3/download -> globwalk-0.7.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.16/download -> hermit-abi-0.1.16.crate https://crates.io/api/v1/crates/human-sort/0.2.2/download -> human-sort-0.2.2.crate https://crates.io/api/v1/crates/ignore/0.4.16/download -> ignore-0.4.16.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lock_api/0.4.2/download -> lock_api-0.4.2.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/lscolors/0.7.1/download -> lscolors-0.7.1.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.2/download -> parking_lot_core-0.8.2.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.9/download -> ppv-lite86-0.2.9.crate https://crates.io/api/v1/crates/predicates/1.0.5/download -> predicates-1.0.5.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-argon2/0.8.2/download -> rust-argon2-0.8.2.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.117/download -> serde-1.0.117.crate https://crates.io/api/v1/crates/serde_derive/1.0.117/download -> serde_derive-1.0.117.crate https://crates.io/api/v1/crates/serde_yaml/0.8.13/download -> serde_yaml-0.8.13.crate https://crates.io/api/v1/crates/serial_test/0.5.1/download -> serial_test-0.5.1.crate https://crates.io/api/v1/crates/serial_test_derive/0.5.1/download -> serial_test_derive-0.5.1.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.48/download -> syn-1.0.48.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/terminal_size/0.1.13/download -> terminal_size-0.1.13.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wild/2.0.4/download -> wild-2.0.4.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xdg/2.1.0/download -> xdg-2.1.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.4/download -> yaml-rust-0.4.4.crate
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0e56b5624e196c9cfaa432951680d310
+_md5_=5793343e4796e9dbc95a3f590982b921
diff --git a/metadata/md5-cache/sys-apps/man-pages-5.11-r1 b/metadata/md5-cache/sys-apps/man-pages-5.11-r1
index c874c4bb5f0b..7919b57fbee7 100644
--- a/metadata/md5-cache/sys-apps/man-pages-5.11-r1
+++ b/metadata/md5-cache/sys-apps/man-pages-5.11-r1
@@ -5,9 +5,9 @@ HOMEPAGE=https://www.kernel.org/doc/man-pages/
 IUSE=l10n_de l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_zh-CN
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=man-pages GPL-2+ BSD
-PDEPEND=l10n_de? ( app-i18n/man-pages-l10n[l10n_de] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] ) l10n_it? ( app-i18n/man-pages-it ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] ) l10n_pt-BR? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_pt-BR] ) l10n_ro? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_ro] ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) sys-apps/man-pages-posix
+PDEPEND=l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) sys-apps/man-pages-posix
 RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-5.11.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-5.11.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=b3588e059f0cafd70d5f09f9f00edb4e
+_md5_=ab477ba809a72f5f4d70b6c5a7e409d9
diff --git a/metadata/md5-cache/sys-apps/man-pages-5.12-r2 b/metadata/md5-cache/sys-apps/man-pages-5.12-r2
index ab5a2db14966..0bff1f0b3a3b 100644
--- a/metadata/md5-cache/sys-apps/man-pages-5.12-r2
+++ b/metadata/md5-cache/sys-apps/man-pages-5.12-r2
@@ -5,9 +5,9 @@ HOMEPAGE=https://www.kernel.org/doc/man-pages/
 IUSE=l10n_de l10n_es l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_zh-CN
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=man-pages GPL-2+ BSD
-PDEPEND=l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_it? ( || ( app-i18n/man-pages-l10n[l10n_it(-)] app-i18n/man-pages-it ) ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) sys-apps/man-pages-posix
+PDEPEND=l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) sys-apps/man-pages-posix
 RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-5.12.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-5.12.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=b4a71c243c968a3d8dc09d8a2444c205
+_md5_=a1f1cb7353a6ddd32eebc0444e8fdb32
diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200120 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200120
index 58a5e6aa7bb8..050016b13404 100644
--- a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200120
+++ b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200120
@@ -3,10 +3,10 @@ DEPEND=app-eselect/eselect-awk
 DESCRIPTION=An (often faster than gawk) awk-interpreter
 EAPI=7
 HOMEPAGE=https://invisible-island.net/mawk/mawk.html
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-awk
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/mawk/mawk-1.3.4-20200120.tgz
 _eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=99c09b81201938783f0f299c3cd9917d
+_md5_=085a456e0e882facc8c4bcb0a7ee5096
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.2 b/metadata/md5-cache/sys-apps/pkgcore-0.12.2
new file mode 100644
index 000000000000..9b52a1dac49f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.12.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=a framework for package management
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/pkgcore
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.12.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=72a68a246454720ff489cdc880aa373c
diff --git a/metadata/md5-cache/sys-apps/pkgcore-9999 b/metadata/md5-cache/sys-apps/pkgcore-9999
index a660e8c6bb67..9d827b2b201d 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-9999
+++ b/metadata/md5-cache/sys-apps/pkgcore-9999
@@ -1,14 +1,14 @@
-BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=a framework for package management
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/pkgcore/pkgcore
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD MIT
 PROPERTIES=live
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=>=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=04bfd7e9b8c974d88c83723fa15bb37e
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=72a68a246454720ff489cdc880aa373c
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.13 b/metadata/md5-cache/sys-apps/rng-tools-6.13
deleted file mode 100644
index a3b84b58af70..000000000000
--- a/metadata/md5-cache/sys-apps/rng-tools-6.13
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/openssl:0= jitterentropy? ( app-crypt/jitterentropy:= ) nistbeacon? ( dev-libs/jansson dev-libs/libxml2:2= net-misc/curl[ssl] ) pkcs11? ( dev-libs/libp11:= ) elibc_musl? ( sys-libs/argp-standalone )
-DESCRIPTION=Daemon to use hardware random number generators
-EAPI=7
-HOMEPAGE=https://github.com/nhorman/rng-tools
-IUSE=jitterentropy nistbeacon pkcs11 selinux
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:0= jitterentropy? ( app-crypt/jitterentropy:= ) nistbeacon? ( dev-libs/jansson dev-libs/libxml2:2= net-misc/curl[ssl] ) pkcs11? ( dev-libs/libp11:= ) elibc_musl? ( sys-libs/argp-standalone ) selinux? ( sec-policy/selinux-rngd )
-SLOT=0
-SRC_URI=https://github.com/nhorman/rng-tools/archive/v6.13.tar.gz -> rng-tools-6.13.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e2285f9bcfed388fb3c4b318d3d3622a
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.13-r1 b/metadata/md5-cache/sys-apps/rng-tools-6.13-r1
new file mode 100644
index 000000000000..02cf63a75709
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/rng-tools-6.13-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/openssl:0= jitterentropy? ( app-crypt/jitterentropy:= ) nistbeacon? ( dev-libs/jansson dev-libs/libxml2:2= net-misc/curl[ssl] ) pkcs11? ( dev-libs/libp11:= ) elibc_musl? ( sys-libs/argp-standalone )
+DESCRIPTION=Daemon to use hardware random number generators
+EAPI=7
+HOMEPAGE=https://github.com/nhorman/rng-tools
+IUSE=jitterentropy nistbeacon pkcs11 selinux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl:0= jitterentropy? ( app-crypt/jitterentropy:= ) nistbeacon? ( dev-libs/jansson dev-libs/libxml2:2= net-misc/curl[ssl] ) pkcs11? ( dev-libs/libp11:= ) elibc_musl? ( sys-libs/argp-standalone ) selinux? ( sec-policy/selinux-rngd )
+SLOT=0
+SRC_URI=https://github.com/nhorman/rng-tools/archive/v6.13.tar.gz -> rng-tools-6.13.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f39909e70f54146250909fa042e5186a
diff --git a/metadata/md5-cache/sys-apps/shadow-4.9-r1 b/metadata/md5-cache/sys-apps/shadow-4.9-r1
index 2d0a30043904..c05835ff26e7 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.9-r1
+++ b/metadata/md5-cache/sys-apps/shadow-4.9-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( cracklib pam )
 SLOT=0
 SRC_URI=https://github.com/shadow-maint/shadow/releases/download/v4.9/shadow-4.9.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=530c05a94581b3fc7beca2a7f228cb8f
+_md5_=9d5012ced98fa0ba67fd77b6ce81a223
diff --git a/metadata/md5-cache/sys-apps/systemd-248.6 b/metadata/md5-cache/sys-apps/systemd-248.6
index 58c58060beff..8fac96890335 100644
--- a/metadata/md5-cache/sys-apps/systemd-248.6
+++ b/metadata/md5-cache/sys-apps/systemd-248.6
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext sys-devel/m4 virtual/pkgconfig test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext sys-devel/m4 virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
 DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
 DESCRIPTION=System and service manager for Linux
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v248.6/systemd-stable-248.6.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=64738168ce99f3bd9903990034d5a6d9
+_md5_=41e486f72545908868300dfeb8753874
diff --git a/metadata/md5-cache/sys-apps/systemd-249.2 b/metadata/md5-cache/sys-apps/systemd-249.2
index f58250906314..d8f3071d73f5 100644
--- a/metadata/md5-cache/sys-apps/systemd-249.2
+++ b/metadata/md5-cache/sys-apps/systemd-249.2
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( dev-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( dev-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
 DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
 DESCRIPTION=System and service manager for Linux
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.2/systemd-stable-249.2.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=960cae35c1bcfe55afe33ee0d08a0862
+_md5_=c364abebc12558bdccd53cda08b2ba6d
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index cb506dca5c2a..76029b8444a5 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( dev-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( dev-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
 DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
 DESCRIPTION=System and service manager for Linux
@@ -13,4 +13,4 @@ REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality?
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4abecfc9eff5df02ae1170080cb0202f
+_md5_=eca846edd8a9ce4fb6f75a54ce292805
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-248.3 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-248.3
deleted file mode 100644
index 5861bef25cc1..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-tmpfiles-248.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext sys-devel/m4 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) !sys-apps/opentmpfiles !sys-apps/systemd >=sys-kernel/linux-headers-3.11
-DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and directories
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=selinux test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT public-domain
-RDEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) !sys-apps/opentmpfiles !sys-apps/systemd
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v248.3.tar.gz -> systemd-stable-248.3.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-tmpfiles-248.3-musl.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=51775029e010d10685fbdf9d74e13cbe
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.2 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.2
new file mode 100644
index 000000000000..a59e52902205
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.2
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) !sys-apps/opentmpfiles !sys-apps/systemd >=sys-kernel/linux-headers-3.11
+DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and directories
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=selinux test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT public-domain
+RDEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) !sys-apps/opentmpfiles !sys-apps/systemd
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.2.tar.gz -> systemd-stable-249.2.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-249.1-r1.tar.xz https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-249.1-r1.tar.xz )
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b3df0431578c256006d579fa9c080773
diff --git a/metadata/md5-cache/sys-apps/tas-1.6.0.200601 b/metadata/md5-cache/sys-apps/tas-1.6.0.200601
index 4ad7fe6363aa..3f6e367be15b 100644
--- a/metadata/md5-cache/sys-apps/tas-1.6.0.200601
+++ b/metadata/md5-cache/sys-apps/tas-1.6.0.200601
@@ -10,5 +10,5 @@ RDEPEND=net-misc/networkmanager sys-apps/ethtool sys-apps/net-tools sys-apps/sma
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://www.supermicro.com/wftp/utility/TAS/TAS_1.6.0_build.200601.zip
-_eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8de67d64297ad343216b6e0424bd5ad5
diff --git a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18 b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
index 0276c7eff82b..8633f281f9cc 100644
--- a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
+++ b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
@@ -3,11 +3,11 @@ DESCRIPTION=Collection of tools for managing UNIX services
 EAPI=7
 HOMEPAGE=https://cr.yp.to/ucspi-tcp.html
 IUSE=ipv6 qmail-spp selinux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=public-domain
 RDEPEND=!app-doc/ucspi-tcp-man selinux? ( sec-policy/selinux-ucspitcp )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz mirror://qmail/ucspi-rss.diff http://smarden.org/pape/djb/manpages/ucspi-tcp-0.88-man.tar.gz http://xs3.b92.net/tomislavr/ucspi-tcp-0.88-rblspp.patch ipv6? ( https://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff19.bz2 )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qmail	5e8c0b723a0dd58e095f12233aa9d00c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7652314ebbf80ea28540c181f147b398
+_md5_=e4c2a74485a125b44be083113bcda408
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.36.2-r1 b/metadata/md5-cache/sys-apps/util-linux-2.36.2-r1
index 1ead0098992d..50abbc9ebd6c 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.36.2-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.36.2-r1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
+DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
 DESCRIPTION=Various useful Linux utilities
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
 IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
+RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-2.36.2.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4fad999b7d8b684916a2a1af2473c8ce
+_md5_=b2610b9001d921ab6f3eb918f416b3de
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.37-r1 b/metadata/md5-cache/sys-apps/util-linux-2.37-r1
index 005014db57cb..598d9746fe48 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.37-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.37-r1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
+DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
 DESCRIPTION=Various useful Linux utilities
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
 IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
+RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.tar.xz https://dev.gentoo.org/~polynomial-c/util-linux-2.37-manpages.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d8ba890e3c2740fdc4fcd4bc4387e596
+_md5_=132726a397c0e555ab14eb119c4b921d
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.37.1 b/metadata/md5-cache/sys-apps/util-linux-2.37.1
index 9dc219cc0a34..21171f451bfb 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.37.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.37.1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
+DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
 DESCRIPTION=Various useful Linux utilities
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
 IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
+RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.1.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f0e00bffd2e7476ba285c5ea59b8a5d8
+_md5_=b97b185a20242075646e1550e2bc5927
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index 09d457d4b2dc..f4faebedafbf 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) dev-ruby/asciidoctor >=app-portage/elt-patches-20170815 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
+DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
 DESCRIPTION=Various useful Linux utilities
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
 IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 PROPERTIES=live
-RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
+RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c5897c9f64a0e09eae32cd5d54e8b524
+_md5_=45f8411ff3d8053fe883243412ca60f3
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 8af95cf1714d..c806ee300971 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/polkit-qt-0.113.0 b/metadata/md5-cache/sys-auth/polkit-qt-0.113.0
deleted file mode 100644
index 6a526dfc77c0..000000000000
--- a/metadata/md5-cache/sys-auth/polkit-qt-0.113.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-0.103
-DESCRIPTION=Qt wrapper around polkit-1 client libraries
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
-LICENSE=LGPL-2
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-0.103
-SLOT=0
-SRC_URI=mirror://kde/stable/polkit-qt-1/polkit-qt-1-0.113.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b36bb4f1a06e0d76eb3e1545cc4c21fc
diff --git a/metadata/md5-cache/sys-auth/polkit-qt-0.114.0 b/metadata/md5-cache/sys-auth/polkit-qt-0.114.0
index 3ede543642a1..1e6ba817622c 100644
--- a/metadata/md5-cache/sys-auth/polkit-qt-0.114.0
+++ b/metadata/md5-cache/sys-auth/polkit-qt-0.114.0
@@ -5,10 +5,10 @@ DESCRIPTION=Qt wrapper around polkit-1 client libraries
 EAPI=7
 HOMEPAGE=https://api.kde.org/polkit-qt-1/html/
 IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-0.103
 SLOT=0
 SRC_URI=mirror://kde/stable/polkit-qt-1/polkit-qt-1-0.114.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7aaaf25765d48378a07adf5971ee7150
+_md5_=f65bbc0854f8bf90e49ae795a633eef6
diff --git a/metadata/md5-cache/sys-auth/solo-python-0.0.30 b/metadata/md5-cache/sys-auth/solo-python-0.0.30
index c202df73bf56..8538cfb3027b 100644
--- a/metadata/md5-cache/sys-auth/solo-python-0.0.30
+++ b/metadata/md5-cache/sys-auth/solo-python-0.0.30
@@ -1,14 +1,14 @@
 BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python tool and library for SoloKeys
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/solokeys/solo-python
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64
+KEYWORDS=amd64 ~riscv
 LICENSE=Apache-2.0 MIT
 RDEPEND=>=dev-python/click-7.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fido2-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intelhex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyserial[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyusb[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/solokeys/solo-python/archive/0.0.30.tar.gz -> solo-python-0.0.30.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2694d8ce2c582ade0a8b6488fb0dbd28
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=68796b69fced905eeea80600df6883f0
diff --git a/metadata/md5-cache/sys-auth/yubico-piv-tool-2.2.0-r1 b/metadata/md5-cache/sys-auth/yubico-piv-tool-2.2.0-r1
index 9f6d3eaaa2a6..db2ab18af3b7 100644
--- a/metadata/md5-cache/sys-auth/yubico-piv-tool-2.2.0-r1
+++ b/metadata/md5-cache/sys-auth/yubico-piv-tool-2.2.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Command-line tool and p11-kit module for the YubiKey PIV application
 EAPI=7
 HOMEPAGE=https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool
 IUSE=test
-KEYWORDS=amd64
+KEYWORDS=amd64 ~riscv
 LICENSE=BSD-2
 RDEPEND=sys-apps/pcsc-lite <dev-libs/openssl-3.0.0:0=[-bindist(-)]
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-2.2.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6499c122e12508db0853ca5c360fbb4c
+_md5_=19f840de0209cd14964cb6a8010d6eb1
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 5d6f23f0f5a1..4feb4793ddac 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/fio-3.20-r2 b/metadata/md5-cache/sys-block/fio-3.20-r2
deleted file mode 100644
index b2d3ede970c6..000000000000
--- a/metadata/md5-cache/sys-block/fio-3.20-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= dev-libs/openssl:0= ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) io-uring? ( sys-libs/liburing:= ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-fabric/libibverbs sys-fabric/librdmacm ) tcmalloc? ( dev-util/google-perftools:= ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) static? ( aio? ( dev-libs/libaio[static-libs(+)] ) curl? ( net-misc/curl:=[static-libs(+)] dev-libs/openssl:0=[static-libs(+)] ) glusterfs? ( sys-cluster/glusterfs[static-libs(+)] ) gtk? ( dev-libs/glib:2[static-libs(+)] ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) rdma? ( sys-fabric/libibverbs[static-libs(+)] sys-fabric/librdmacm[static-libs(+)] ) tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( dev-util/cunit )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=7
-HOMEPAGE=https://brick.kernel.dk/snaps/
-IUSE=aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static tcmalloc test zbc zlib python_targets_python3_8
-KEYWORDS=amd64 arm ~arm64 ~ia64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= dev-libs/openssl:0= ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) io-uring? ( sys-libs/liburing:= ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-fabric/libibverbs sys-fabric/librdmacm ) tcmalloc? ( dev-util/google-perftools:= ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] || ( ( dev-lang/python:3.8 dev-python/pandas[python_targets_python3_8(-)] ) ) ) gnuplot? ( sci-visualization/gnuplot )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 ) ) gnuplot? ( python ) io-uring? ( aio )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://brick.kernel.dk/snaps/fio-3.20.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d11e04d8a1273370b13184a1f03c57da
diff --git a/metadata/md5-cache/sys-block/gparted-1.3.0 b/metadata/md5-cache/sys-block/gparted-1.3.0
index bbcb9d149607..f854ab9e9919 100644
--- a/metadata/md5-cache/sys-block/gparted-1.3.0
+++ b/metadata/md5-cache/sys-block/gparted-1.3.0
@@ -11,5 +11,5 @@ RDEPEND=!policykit? ( kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) ) poli
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gparted/gparted-1.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=abd444df3940b5161b6e75be6a2017f7
diff --git a/metadata/md5-cache/sys-block/gparted-1.3.1 b/metadata/md5-cache/sys-block/gparted-1.3.1
index e84b6dd8eadd..c629c88d6738 100644
--- a/metadata/md5-cache/sys-block/gparted-1.3.1
+++ b/metadata/md5-cache/sys-block/gparted-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=!policykit? ( kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) ) poli
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gparted/gparted-1.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=412f17349018b85426b63d0574ccb38e
diff --git a/metadata/md5-cache/sys-block/partitionmanager-21.04.3 b/metadata/md5-cache/sys-block/partitionmanager-21.04.3
index bb9db43e4fa8..27f15bdeb1a8 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-21.04.3
+++ b/metadata/md5-cache/sys-block/partitionmanager-21.04.3
@@ -5,10 +5,10 @@ DESCRIPTION=Utility for management of disks, partitions and file systems
 EAPI=7
 HOMEPAGE=https://apps.kde.org/partitionmanager/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.80.0:5 >=kde-frameworks/kconfigwidgets-5.80.0:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/kcrash-5.80.0:5 >=kde-frameworks/kdbusaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kio-5.80.0:5 >=kde-frameworks/kjobwidgets-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=kde-frameworks/kxmlgui-5.80.0:5 >=sys-libs/kpmcore-21.04.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/release-service/21.04.3/src/partitionmanager-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3f7280266b4de61145e6fa821c40fcf3
+_md5_=dc1ba422dd785762d5e79c3992925670
diff --git a/metadata/md5-cache/sys-block/zram-init-11.0 b/metadata/md5-cache/sys-block/zram-init-11.0
index a5df5b2953fe..767e34ca41c2 100644
--- a/metadata/md5-cache/sys-block/zram-init-11.0
+++ b/metadata/md5-cache/sys-block/zram-init-11.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=Scripts to support compressed swap devices or ramdisks with zRAM
 EAPI=7
 HOMEPAGE=https://github.com/vaeth/zram-init/
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-shells/push-2.0 virtual/libintl || ( sys-apps/openrc sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/vaeth/zram-init/archive/refs/tags/v11.0.tar.gz -> zram-init-11.0.tar.gz
 _eclasses_=prefix	d04f14b297013ad1410550c0757f14f8	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530
-_md5_=729bcb2548ca491314763f958eaa08f9
+_md5_=5f7a3435343297f186e91d9936ebae48
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index c73b121440b4..be6f56b789e5 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.06 b/metadata/md5-cache/sys-boot/grub-2.06
index 7314a3378120..a5c786af0d91 100644
--- a/metadata/md5-cache/sys-boot/grub-2.06
+++ b/metadata/md5-cache/sys-boot/grub-2.06
@@ -12,5 +12,5 @@ REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) g
 RESTRICT=!test? ( test )
 SLOT=2/2.06
 SRC_URI=mirror://gnu/grub/grub-2.06.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fde51d4b3320f8fc0e64321993d6f49e
diff --git a/metadata/md5-cache/sys-boot/grub-2.06_rc1 b/metadata/md5-cache/sys-boot/grub-2.06_rc1
index 6ec7cdd55a4d..34721816952c 100644
--- a/metadata/md5-cache/sys-boot/grub-2.06_rc1
+++ b/metadata/md5-cache/sys-boot/grub-2.06_rc1
@@ -12,5 +12,5 @@ REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) g
 RESTRICT=!test? ( test )
 SLOT=2/2.06_rc1
 SRC_URI=https://alpha.gnu.org/gnu/grub/grub-2.06~rc1.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e6e29b038a5202463cf91761d95cf37d
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index 36e3541546dc..0e80c43a47e1 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) g
 RESTRICT=!test? ( test )
 SLOT=2/9999
 SRC_URI=fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=105ef8bbbfdeace9308236f26c7ae148
diff --git a/metadata/md5-cache/sys-boot/woeusb-3.3.1 b/metadata/md5-cache/sys-boot/woeusb-3.3.1
index c21761f2f81c..ca2e3eba949a 100644
--- a/metadata/md5-cache/sys-boot/woeusb-3.3.1
+++ b/metadata/md5-cache/sys-boot/woeusb-3.3.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=sys-apps/util-linux sys-block/parted sys-fs/dosfstools sys-fs/ntfs3g sys-boot/grub:2[grub_platforms_pc] !minimal? ( x11-libs/wxGTK:3.0-gtk3[X] )
 SLOT=0
 SRC_URI=https://github.com/slacka/WoeUSB/archive/v3.3.1.tar.gz -> woeusb-3.3.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=c95a4a1839e4cd1c4a4f79ba03c59adb
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 5d78dfdcd20d..e7c4e4c568b4 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.21-r2 b/metadata/md5-cache/sys-cluster/ceph-14.2.21-r2
index 82da431a70fd..09fcd3c8a8ae 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.21-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.21-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) diskpredic
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.21.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7afdbf0123cc08476d732767d9ce55cb
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.22 b/metadata/md5-cache/sys-cluster/ceph-14.2.22
index 294a05cfdc29..8fdfa7bb75bc 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.22
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.22
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) diskpredic
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.22.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b71262f4b80f8aca4b9bc777fac1578d
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.12-r2 b/metadata/md5-cache/sys-cluster/ceph-15.2.12-r2
index 1dbe01cc0391..4d897159b0d8 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.12-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.12-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ?? ( jemal
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.12.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=619483c79e7d8db808ac2d44dd8ea567
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.13-r2 b/metadata/md5-cache/sys-cluster/ceph-15.2.13-r2
index 6b788b4df76d..45cf08d3768e 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.13-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.13-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ?? ( jemal
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.13.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e37a0c58e20df78195dc19260f090fb1
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2 b/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2
index b672efcc504f..217185a69cfa 100644
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.4-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ^^ ( lua_s
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.4.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=08fe1e531221072af7a4b0933ce9dbe2
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.5 b/metadata/md5-cache/sys-cluster/ceph-16.2.5
index 164b6c2a267a..f5ba83bf91ed 100644
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.5
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ^^ ( lua_s
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.5.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6354c0f7d59d36c1d80f283f9cda79b6
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.23 b/metadata/md5-cache/sys-cluster/charliecloud-0.23
index e0bf854be42d..1332532be6dc 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-0.23
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.23
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hpc/charliecloud/archive/v0.23.tar.gz -> charliecloud-0.23.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9d574ba5b9243b1961e2efde6177f98c
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.24 b/metadata/md5-cache/sys-cluster/charliecloud-0.24
index 60801c7e9203..483d71606b97 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-0.24
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.24
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hpc/charliecloud/archive/v0.24.tar.gz -> charliecloud-0.24.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86e2da06f40df62ffbc514d86c32a015
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-9999 b/metadata/md5-cache/sys-cluster/charliecloud-9999
index 6f066ef7f5c6..92bc9d13d77c 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-9999
+++ b/metadata/md5-cache/sys-cluster/charliecloud-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=890fd959a94c0461dc0ceeb797b1a5ce
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.9 b/metadata/md5-cache/sys-cluster/galera-26.4.9
new file mode 100644
index 000000000000..fc2f99c298b5
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.9
@@ -0,0 +1,15 @@
+BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
+DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
+EAPI=7
+HOMEPAGE=https://galeracluster.com
+IUSE=cpu_flags_x86_sse4_2 garbd test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 BSD
+RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.galeracluster.com/galera-4/source/galera-4-26.4.9.tar.gz -> galera-26.4.9.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=80a06dd34790ba9fd6a9f44742003a3d
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.7.0 b/metadata/md5-cache/sys-cluster/hpx-1.7.0
index 6f4917e853e9..7c71e79b702f 100644
--- a/metadata/md5-cache/sys-cluster/hpx-1.7.0
+++ b/metadata/md5-cache/sys-cluster/hpx-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/STEllAR-GROUP/hpx/archive/1.7.0.tar.gz -> hpx-1.7.0.tar.gz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b8f67e4cc103e10b74fb666cf13aa647
diff --git a/metadata/md5-cache/sys-cluster/hpx-9999 b/metadata/md5-cache/sys-cluster/hpx-9999
index 52ecc7a01cb0..0048da98e643 100644
--- a/metadata/md5-cache/sys-cluster/hpx-9999
+++ b/metadata/md5-cache/sys-cluster/hpx-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ?? ( jemalloc perftools tbb )
 RESTRICT=test
 SLOT=0
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f22f4b3b5d7d7d9209a09881e34d5269
diff --git a/metadata/md5-cache/sys-cluster/vzctl-4.9.4 b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
index b0b4b8bd0d07..a818f1cad7e0 100644
--- a/metadata/md5-cache/sys-cluster/vzctl-4.9.4
+++ b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/libcgroup-0.38 net-firewall/iptables sys-apps/attr sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 virtual/udev ploop? ( dev-libs/libxml2 sys-block/parted >=sys-cluster/ploop-1.13 sys-fs/quota ) vzmigrate? ( app-arch/tar[xattr,acl] net-misc/openssh net-misc/rsync[xattr,acl] net-misc/bridge-utils virtual/awk )
 SLOT=0
 SRC_URI=https://download.openvz.org/utils/vzctl/4.9.4/src/vzctl-4.9.4.tar.bz2
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
 _md5_=348bda5e701de72e6dbbc07e7d5aa657
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 2d67a165901e..5b389b8c2345 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/clang-12.0.1 b/metadata/md5-cache/sys-devel/clang-12.0.1
index 5195d042f45d..c9086bd7c9f2 100644
--- a/metadata/md5-cache/sys-devel/clang-12.0.1
+++ b/metadata/md5-cache/sys-devel/clang-12.0.1
@@ -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 llvm-libunwind +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE test doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-12.0.1 default-compiler-rt? ( =sys-libs/compiler-rt-12.0.1* llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) default-libcxx? ( >=sys-libs/libcxx-12.0.1 ) default-lld? ( sys-devel/lld )
 RDEPEND=~sys-devel/llvm-12.0.1:12=[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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.1:12[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.1:12[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=12
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-12.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ae23af24fa5deb65f37f9c07e368b53e
+_md5_=fa1ed35d6b2feab71bc838608dd3ff1f
diff --git a/metadata/md5-cache/sys-devel/clang-13.0.0_rc1 b/metadata/md5-cache/sys-devel/clang-13.0.0_rc1
new file mode 100644
index 000000000000..e92e93dc5d74
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-13.0.0_rc1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/cmake-3.16 doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-python/sphinx dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-13.0.0_rc1:13=[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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_VE] ) !!sys-devel/llvm:0
+DESCRIPTION=C language family frontend for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug default-compiler-rt default-libcxx default-lld doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k 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_8 python_single_target_python3_9 python_single_target_python3_10
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-13.0.0_rc1 default-compiler-rt? ( =sys-libs/compiler-rt-13.0.0* llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) default-libcxx? ( >=sys-libs/libcxx-13.0.0_rc1 ) default-lld? ( sys-devel/lld )
+RDEPEND=~sys-devel/llvm-13.0.0_rc1:13=[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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc1:13[llvm_targets_VE] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=13
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-2.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=30413ec1711cc53a93e894c6db755315
diff --git a/metadata/md5-cache/sys-devel/clang-common-12.0.1 b/metadata/md5-cache/sys-devel/clang-common-12.0.1
index 269408c05ee1..f3aa85d1dfa8 100644
--- a/metadata/md5-cache/sys-devel/clang-common-12.0.1
+++ b/metadata/md5-cache/sys-devel/clang-common-12.0.1
@@ -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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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-12.0.1.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a595ff2d43181fa2e05cd4b7e10ca6a2
+_md5_=9064f130f807dda7390f34378204e75b
diff --git a/metadata/md5-cache/sys-devel/clang-common-13.0.0_rc1 b/metadata/md5-cache/sys-devel/clang-common-13.0.0_rc1
new file mode 100644
index 000000000000..c71f36a0bbaa
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-13.0.0_rc1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+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-13.0.0-rc1.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b90c4c0dc9eaa89be17463c64885562d
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-12.0.1 b/metadata/md5-cache/sys-devel/clang-runtime-12.0.1
index 437d8a1f5192..d9bcb2c1089f 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-12.0.1
+++ b/metadata/md5-cache/sys-devel/clang-runtime-12.0.1
@@ -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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-12.0.1:12.0.1 sanitize? ( ~sys-libs/compiler-rt-sanitizers-12.0.1:12.0.1 ) ) libcxx? ( >=sys-libs/libcxx-12.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-12.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=12.0.1
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8551111cb5bcf802232b4b97c1129439
+_md5_=907bb941733218de3e667e40f8f1416b
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-13.0.0_rc1 b/metadata/md5-cache/sys-devel/clang-runtime-13.0.0_rc1
new file mode 100644
index 000000000000..6212f11474f6
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-13.0.0_rc1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=7
+HOMEPAGE=https://clang.llvm.org/
+IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=metapackage
+PROPERTIES=live
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-13.0.0_rc1:13.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-13.0.0_rc1:13.0.0 ) ) libcxx? ( >=sys-libs/libcxx-13.0.0_rc1[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-13.0.0_rc1[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=13.0.0
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=75ae4db590ba9c2b4b7ba88cf44c1dfe
diff --git a/metadata/md5-cache/sys-devel/lld-12.0.1 b/metadata/md5-cache/sys-devel/lld-12.0.1
index f8d1dd68da51..ace6f18410fa 100644
--- a/metadata/md5-cache/sys-devel/lld-12.0.1
+++ b/metadata/md5-cache/sys-devel/lld-12.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=The LLVM linker (link editor)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=~sys-devel/llvm-12.0.1
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=49e08269babaf1f564d0bf61f8e291dd
+_md5_=54759be9bc143e7edadb60dd9e03a60f
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.0_rc1 b/metadata/md5-cache/sys-devel/lld-13.0.0_rc1
new file mode 100644
index 000000000000..b0421f9f3fd7
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-13.0.0_rc1
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.10 ~dev-python/lit-13.0.0_rc1[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 ~dev-python/lit-13.0.0_rc1[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 ~dev-python/lit-13.0.0_rc1[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-13.0.0_rc1 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test test
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=~sys-devel/llvm-13.0.0_rc1
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=880a6fe30a5e015c5e4a23f0e5e4cd97
diff --git a/metadata/md5-cache/sys-devel/llvm-12.0.1 b/metadata/md5-cache/sys-devel/llvm-12.0.1
index 48ed7b0ba99a..4bb7dc4018dc 100644
--- a/metadata/md5-cache/sys-devel/llvm-12.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-12.0.1
@@ -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_CSKY llvm_targets_VE doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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-12 )
 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=12
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-12.0.1-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2caa3cd3a915673262272e53b3d559e6
+_md5_=d5fea81ccf3fa03198a1e2dbce0e6480
diff --git a/metadata/md5-cache/sys-devel/llvm-13.0.0_rc1 b/metadata/md5-cache/sys-devel/llvm-13.0.0_rc1
new file mode 100644
index 000000000000..e5bddc8f1262
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-13.0.0_rc1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-13.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-python/sphinx dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gold? ( sys-libs/binutils-libs )
+DESCRIPTION=Low Level Virtual Machine
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-13 )
+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
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE )
+RESTRICT=!test? ( test )
+SLOT=13
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c1c7a5b2c9c75442f4505b2b4decf0b2
diff --git a/metadata/md5-cache/sys-devel/llvm-common-12.0.1 b/metadata/md5-cache/sys-devel/llvm-common-12.0.1
index 583769f13680..4a97096b5928 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-12.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-common-12.0.1
@@ -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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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-12.0.1.tar.gz
 _eclasses_=llvm.org	cb97295f27f4f75aab38e6965ecb7759	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
-_md5_=a8b59d835aeee72041f3863f0ede30ba
+_md5_=59d9139eaed4b8db8f392d075177aa46
diff --git a/metadata/md5-cache/sys-devel/llvm-common-13.0.0_rc1 b/metadata/md5-cache/sys-devel/llvm-common-13.0.0_rc1
new file mode 100644
index 000000000000..a079df47bff4
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-13.0.0_rc1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+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-13.0.0-rc1.tar.gz
+_eclasses_=llvm.org	cb97295f27f4f75aab38e6965ecb7759	multiprocessing	61c959fc55c15c00bbb1079d6a71370b
+_md5_=0f952970544f31ba021c8c334a70d237
diff --git a/metadata/md5-cache/sys-devel/rust-std-1.54.0 b/metadata/md5-cache/sys-devel/rust-std-1.54.0
new file mode 100644
index 000000000000..766524bbacb5
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/rust-std-1.54.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) ~dev-lang/rust-1.54.0:=
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=|| ( >=sys-devel/gcc-4.7:* >=sys-devel/clang-3.5:* )
+DESCRIPTION=Rust standard library, standalone (for crossdev)
+EAPI=7
+HOMEPAGE=https://www.rust-lang.org
+IUSE=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
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=|| ( >=sys-devel/gcc-4.7:* >=sys-devel/clang-3.5:* )
+RESTRICT=test
+SLOT=stable/1.54
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.54.0-src.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=53530058fcdd22792d90ff457d146dfc
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 89edf7803dff..18b61fdab6a5 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/dd-rescue-1.99.11 b/metadata/md5-cache/sys-fs/dd-rescue-1.99.11
index c309f537bc52..8913ee926a37 100644
--- a/metadata/md5-cache/sys-fs/dd-rescue-1.99.11
+++ b/metadata/md5-cache/sys-fs/dd-rescue-1.99.11
@@ -5,10 +5,10 @@ DESCRIPTION=Similar to dd but can copy from source with errors
 EAPI=7
 HOMEPAGE=http://www.garloff.de/kurt/linux/ddrescue/
 IUSE=cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-1.99.11.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1e01bf75c0bb814d3d4d7d28f53e35e4
+_md5_=43ec3f6839b7c69bf67fed6d3a7bc46d
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
index 1c13a01e550a..1d368317a95d 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
@@ -5,10 +5,10 @@ DESCRIPTION=Device-mapper RAID tool and library
 EAPI=7
 HOMEPAGE=https://people.redhat.com/~heinzm/sw/dmraid/
 IUSE=intel_led led mini static kernel_linux
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.45
 SLOT=0
 SRC_URI=https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=29b7aa385d09e87efac63393a71aafd3
+_md5_=ce4450ee1946bdfe29ea4b816b1b215d
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.9-r1 b/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
index 616548b0885f..6ae6a5011b3b 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install prepare setup
 DESCRIPTION=An interface for filesystems implemented in userspace
 EAPI=7
@@ -10,5 +10,5 @@ PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=df3be7fac4218f8549d1fb808f2a13aa
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f7e56c4d1bf80f80b938b2bb62a51029
diff --git a/metadata/md5-cache/sys-fs/growpart-0.0.30 b/metadata/md5-cache/sys-fs/growpart-0.0.30
deleted file mode 100644
index cc86e1412b90..000000000000
--- a/metadata/md5-cache/sys-fs/growpart-0.0.30
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A script that can grow your rootfs on first boot
-EAPI=6
-HOMEPAGE=http://manpages.ubuntu.com/manpages/natty/man1/growpart.1.html
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=GPL-3
-RDEPEND=sys-apps/gptfdisk
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/growpart/growpart-0.0.30.gz
-_md5_=87e3c01426f4b6860ac6f0be1a29efe5
diff --git a/metadata/md5-cache/sys-fs/jfsutils-1.1.15-r1 b/metadata/md5-cache/sys-fs/jfsutils-1.1.15-r1
index 6e0795b978b0..ada5473dcd1a 100644
--- a/metadata/md5-cache/sys-fs/jfsutils-1.1.15-r1
+++ b/metadata/md5-cache/sys-fs/jfsutils-1.1.15-r1
@@ -5,10 +5,10 @@ DESCRIPTION=IBM's Journaling Filesystem (JFS) Utilities
 EAPI=7
 HOMEPAGE=http://jfs.sourceforge.net/
 IUSE=static
-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=!static? ( sys-apps/util-linux:= )
 SLOT=0
 SRC_URI=http://jfs.sourceforge.net/project/pub/jfsutils-1.1.15.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9da7d1cd2ecef59aa96695306ce15478
+_md5_=76931a9d990ba12923e2ccf44a08d814
diff --git a/metadata/md5-cache/sys-fs/lufis-0.3 b/metadata/md5-cache/sys-fs/lufis-0.3
deleted file mode 100644
index 65a41f010471..000000000000
--- a/metadata/md5-cache/sys-fs/lufis-0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=!<sys-fs/lufs-0.9.7-r3 >=sys-fs/fuse-1.3
-DESCRIPTION=Wrapper to use lufs modules with fuse kernel support
-EAPI=6
-HOMEPAGE=http://fuse.sourceforge.net/
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/fuse/lufis-0.3.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=92493f70107a281cd26f72ae466865b2
diff --git a/metadata/md5-cache/sys-fs/lxcfs-4.0.9 b/metadata/md5-cache/sys-fs/lxcfs-4.0.9
index c9c9be2d30ce..220f547e14e9 100644
--- a/metadata/md5-cache/sys-fs/lxcfs-4.0.9
+++ b/metadata/md5-cache/sys-fs/lxcfs-4.0.9
@@ -5,11 +5,11 @@ DESCRIPTION=FUSE filesystem for LXC
 EAPI=7
 HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/
 IUSE=verify-sig
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/glib:2 sys-fs/fuse:3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxcfs/lxcfs-4.0.9.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/lxcfs-4.0.9.tar.gz.asc )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=1d6238d7930048e34bcfd13f038c78db
+_md5_=1f32171b74b73cb9d33e7220866a04a5
diff --git a/metadata/md5-cache/sys-fs/mdadm-4.1 b/metadata/md5-cache/sys-fs/mdadm-4.1
index 7b20d42e8892..8d7be5b0ad1a 100644
--- a/metadata/md5-cache/sys-fs/mdadm-4.1
+++ b/metadata/md5-cache/sys-fs/mdadm-4.1
@@ -5,11 +5,11 @@ DESCRIPTION=Tool for running RAID systems - replacement for the raidtools
 EAPI=7
 HOMEPAGE=https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/
 IUSE=static
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.16
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_4.1-3.debian.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=02fea04439e287efaed230c4ec4cb5e8
+_md5_=06327ad5a8bfbaecda49de6d275f68b3
diff --git a/metadata/md5-cache/sys-fs/mdadm-4.2_rc1 b/metadata/md5-cache/sys-fs/mdadm-4.2_rc1
deleted file mode 100644
index 0bf2e0b525ed..000000000000
--- a/metadata/md5-cache/sys-fs/mdadm-4.2_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst test
-DEPEND=>=sys-apps/util-linux-2.16
-DESCRIPTION=Tool for running RAID systems - replacement for the raidtools
-EAPI=7
-HOMEPAGE=https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/
-IUSE=static
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/util-linux-2.16
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.2-rc1.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_4.1-11.debian.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=caa9505cef01d960cabab36a9e4cb69a
diff --git a/metadata/md5-cache/sys-fs/mdadm-4.2_rc2 b/metadata/md5-cache/sys-fs/mdadm-4.2_rc2
new file mode 100644
index 000000000000..c1cbf059ca03
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/mdadm-4.2_rc2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst test
+DEPEND=>=sys-apps/util-linux-2.16
+DESCRIPTION=Tool for running RAID systems - replacement for the raidtools
+EAPI=7
+HOMEPAGE=https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/
+IUSE=static
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/util-linux-2.16
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.2-rc2.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_4.2~rc2-1.debian.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9f12f4ed8b7fec5e3d0df73537577e94
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.8.6-r1 b/metadata/md5-cache/sys-fs/multipath-tools-0.8.6-r1
index 12f3bea1911d..b384726fcdec 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.8.6-r1
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.8.6-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Device mapper target autoconfig
 EAPI=7
 HOMEPAGE=http://christophe.varoqui.free.fr/
 IUSE=systemd rbd test kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2-2.02.45 >=virtual/libudev-232-r3 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/opensvc/multipath-tools/archive/refs/tags/0.8.6.tar.gz -> multipath-tools-0.8.6.tar.gz
 _eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=a35e949f04f8e0feac3a150c37efe688
+_md5_=0758434d325ee07c8c96ce0c2da8c8bd
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5-r1 b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5-r1
index ee37e998543d..d32362531d5a 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5-r1
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Open source read-write NTFS driver that runs under FUSE
 EAPI=7
 HOMEPAGE=https://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html
 IUSE=acl debug ntfsdecrypt +ntfsprogs static-libs suid xattr kernel_linux
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux:0= ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 )
 SLOT=0/885
 SRC_URI=https://jp-andre.pagesperso-orange.fr/ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz
 _eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ef0053d699734df23addaa4c68c7a876
+_md5_=2ffcd9900e1273e0930d0e77b4eab8d3
diff --git a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27-r1 b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27-r1
index 326eb67b9078..ef2228469f15 100644
--- a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27-r1
+++ b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Reiserfs Utilities
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/fs/reiserfs/
 IUSE=static-libs split-usr
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-3.6.27.tar.xz https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v3.6.27/reiserfsprogs-3.6.27.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a4a9eb0c96ec7d3c012884cb5dd14875
+_md5_=726456756e070c712a987f110ab2f90a
diff --git a/metadata/md5-cache/sys-fs/udev-248 b/metadata/md5-cache/sys-fs/udev-248
deleted file mode 100644
index 408a8b78968b..000000000000
--- a/metadata/md5-cache/sys-fs/udev-248
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
-DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl +kmod selinux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=LGPL-2.1 MIT GPL-2
-PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-34
-RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd/archive/v248/systemd-248.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=95fe649690ffc57658ab49ba3f70baef
diff --git a/metadata/md5-cache/sys-fs/udev-248-r1 b/metadata/md5-cache/sys-fs/udev-248-r1
new file mode 100644
index 000000000000..5286d14509e6
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udev-248-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gperf sys-devel/gettext >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
+DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl +kmod selinux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+LICENSE=LGPL-2.1 MIT GPL-2
+PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-34
+RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd/archive/v248/systemd-248.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_md5_=6d6f256e574b77d6de50573d20b8b7b8
diff --git a/metadata/md5-cache/sys-fs/udev-249-r1 b/metadata/md5-cache/sys-fs/udev-249-r1
deleted file mode 100644
index ad5bb4a61aee..000000000000
--- a/metadata/md5-cache/sys-fs/udev-249-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
-DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl +kmod selinux static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1 MIT GPL-2
-PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-34
-RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd/archive/v249/systemd-249.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=c29386efc5752820190b39becc6cc079
diff --git a/metadata/md5-cache/sys-fs/udev-249-r2 b/metadata/md5-cache/sys-fs/udev-249-r2
new file mode 100644
index 000000000000..ddaa2b498ef1
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udev-249-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gperf sys-devel/gettext >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) test? ( app-text/tree dev-lang/perl ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
+DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl +kmod selinux static-libs test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1 MIT GPL-2
+PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-34
+RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd/archive/v249/systemd-249.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-249.1-r1.tar.xz https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-249.1-r1.tar.xz )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=036d3b27a3e8d590a6d5a55490e12897
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 230e2d8c3e79..8240b63db912 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-util/gperf sys-devel/gettext >=sys-apps/coreutils-8.16 virtual/pkgconfig app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) >=sys-kernel/linux-headers-3.9
 DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
@@ -12,4 +12,4 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
-_md5_=b171d175cc308c3bd95e5181a8d2ff22
+_md5_=cea5323c40e0947df86e2edcaf86d780
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.3 b/metadata/md5-cache/sys-fs/udisks-2.9.3
new file mode 100644
index 000000000000..a81d77bef7d0
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.3
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xsl-stylesheets >=dev-util/gdbus-codegen-2.32 >=dev-util/gtk-doc-am-1.3 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.8 ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.25[kbd] ) >=sys-kernel/linux-headers-3.1
+DESCRIPTION=Daemon providing interfaces to work with storage devices
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
+IUSE=acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ GPL-2+
+RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.25[kbd] ) >=sys-block/parted-3 >=sys-apps/util-linux-2.30 selinux? ( sec-policy/selinux-devicekit ) virtual/tmpfiles
+REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
+SLOT=2
+SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.3/udisks-2.9.3.tar.bz2
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f24be4f5780061f9622ca3c3436239c6
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5 b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5
index 67ea32f9f3e2..763c00dea75b 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.5
@@ -13,4 +13,4 @@ RESTRICT=debug? ( strip ) test
 SLOT=0/2.0.5
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz.asc )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=62db6b095b785cdd4f320d5075f35080
+_md5_=affb4b2f85f7ad4e38c451baaca9544c
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 141990e898a4..5353046a332f 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/dracut-053-r1 b/metadata/md5-cache/sys-kernel/dracut-053-r1
index 953c4595d672..38fb008e6fcb 100644
--- a/metadata/md5-cache/sys-kernel/dracut-053-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-053-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-053.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=92ee7226528c22aacd6099ded139bb7d
diff --git a/metadata/md5-cache/sys-kernel/dracut-055-r1 b/metadata/md5-cache/sys-kernel/dracut-055-r1
index 857255eb5f12..97ca6c69dc04 100644
--- a/metadata/md5-cache/sys-kernel/dracut-055-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-055-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-055.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a2bbd54a200518406d855594895f70c8
diff --git a/metadata/md5-cache/sys-kernel/dracut-9999 b/metadata/md5-cache/sys-kernel/dracut-9999
index 1c86e3ba8080..7e8d14d5bfe3 100644
--- a/metadata/md5-cache/sys-kernel/dracut-9999
+++ b/metadata/md5-cache/sys-kernel/dracut-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys-apps/kmod-23[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/openrc[sysv-utils(-),selinux?] sys-apps/systemd[sysv-utils] ) >=sys-apps/util-linux-2.21 virtual/pkgconfig virtual/udev elibc_musl? ( sys-libs/fts-standalone ) selinux? ( sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6599a55209812928df0da855f7221b69
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.56 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.56
new file mode 100644
index 000000000000..39af5a4a761b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.56
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.56
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.56 || ( 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.56
+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-62.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-62.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=800130f427d30d90d17ffbbcfeaa08e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.8 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.8
new file mode 100644
index 000000000000..8c220dbd6025
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.13.8
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.8
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.13.8 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.8
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-10.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.13.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.13.4 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.13.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.13.4 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=36922c331a2d7e66bac97e814f122bef
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.138 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.138
new file mode 100644
index 000000000000..71125001ebdc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.138
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.138
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.138 || ( 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.138
+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-142.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-142.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=90061225b63ee2e6e582dba6f3d5f21a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.56 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.56
new file mode 100644
index 000000000000..cce2aef82751
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.56
@@ -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.56
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.56 || ( 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.56
+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-62.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-62.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.56-1.xpak -> gentoo-kernel-5.10.56-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.56-1.xpak -> gentoo-kernel-5.10.56-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=57a69e56a2a0ddd314c54789b46ea687
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.56-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.56-r1
new file mode 100644
index 000000000000..2551c53bbe83
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.56-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.56
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.56 || ( 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.56
+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-62.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-62.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.56-1.xpak -> gentoo-kernel-5.10.56-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cbd6a10587fe60af32bfea202e62c1d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.8 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.8
new file mode 100644
index 000000000000..15d17990721c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.8
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.8
+RDEPEND=!sys-kernel/gentoo-kernel:5.13.8 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.8
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-10.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.8-1.xpak -> gentoo-kernel-5.13.8-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.8-1.xpak -> gentoo-kernel-5.13.8-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cb9823513884c4539e79ad162ace2053
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.8-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.8-r1
new file mode 100644
index 000000000000..ad01a9e6cb1f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.13.8-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.13.8
+RDEPEND=!sys-kernel/gentoo-kernel:5.13.8 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.8
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-10.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-10.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.8-1.xpak -> gentoo-kernel-5.13.8-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=96edffee181c4bdb22258f1a4cc4cd8f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.138 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.138
new file mode 100644
index 000000000000..b9d90e5c2f2f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.138
@@ -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.138
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.138 || ( 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.138
+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-142.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-142.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.138-1.xpak -> gentoo-kernel-5.4.138-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.138-1.xpak -> gentoo-kernel-5.4.138-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.138-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.138-r1
new file mode 100644
index 000000000000..4120d5928846
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.138-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.138
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.138 || ( 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.138
+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-142.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-142.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.138-1.xpak -> gentoo-kernel-5.4.138-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=65b0dcce347739bcba48c9db3d787501
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.242 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.242
new file mode 100644
index 000000000000..368da50e998c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.242
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( 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.242
+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-252.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-252.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-252.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-252.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-252.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-252.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-252.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-252.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-252.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ca0851989da7f0ee82f6d263eb02d9fa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.201 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.201
new file mode 100644
index 000000000000..a0e243433df5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.201
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( 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.201
+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-200.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-200.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-200.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-200.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-200.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-200.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-200.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-200.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-200.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b0cc58e6b8bf25bed8b1cce44592249f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.278 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.278
new file mode 100644
index 000000000000..31c7970e2032
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.278
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( 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.278
+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-280.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-280.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-280.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-280.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-280.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-280.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-280.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-280.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-280.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c346b3ba98f0ca38e312710bd1329ea0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.278 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.278
new file mode 100644
index 000000000000..06fe3f190da6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.278
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( 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.278
+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-282.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-282.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-282.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-282.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-282.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-282.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-282.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-282.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-282.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17c1159cdca305210a7f578d6a6df513
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.56 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.56
new file mode 100644
index 000000000000..ffb362d56d64
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.56
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( 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.56
+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-62.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-62.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-62.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-62.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-62.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-62.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-62.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-62.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-62.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c22f95b947d5c44e9512e3cc69d1e8ec
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.8
new file mode 100644
index 000000000000..2e756677b465
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.13.8
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.13 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.13.8
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-10.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-10.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-10.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-10.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-10.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.13-10.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.13-10.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.13-10.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=155e5615c4ce15f887d92a8aeadd56fc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.138 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.138
new file mode 100644
index 000000000000..49e00359995c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.138
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( 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.138
+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-142.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-142.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-142.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-142.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-142.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-142.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-142.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-142.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-142.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dda4049c720fc2a2b5eeabc700e43022
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.14_rc4 b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc4
new file mode 100644
index 000000000000..41faf4ab64dc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.14_rc4
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=7
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.14_rc4
+SRC_URI=https://git.kernel.org/torvalds/p/v5.14-rc4/v5.13 -> patch-5.14-rc4.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=53474533be23ddd0f4c25b64a5a50405
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20210716 b/metadata/md5-cache/sys-kernel/linux-firmware-20210716
new file mode 100644
index 000000000000..8f92a074134d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20210716
@@ -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 ~riscv ~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=binchecks strip test unknown-license? ( bindist )
+SLOT=0
+SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/d79c26779d459063b8052b7fe0a48bce4e08d0d9.tar.gz -> linux-firmware-20210716.tar.gz
+_eclasses_=mount-boot	060ced4c5e0fd737db17cbb609bbf557	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd
+_md5_=e70bf1573de7580c883d601b211b9e1c
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8 b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
index 7ca78e5a427a..c9d6a9df9877 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.11_p8
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.11...v5.11-pf8.diff -> pf-sources-5.11_p8.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.extras.tar.xz https://dev.gentoo.org/~mpagano/genpatches/trunk/5.11/5020_BMQ-and-PDS-io-scheduler-v5.11-r2.patch https://dev.gentoo.org/~mpagano/genpatches/trunk/5.11/5021_BMQ-and-PDS-gentoo-defaults-v5.11-r2.patch
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b0ab021a3784308f684f27c417054f8
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p1 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p1
index cab74eef2164..0a84df1962c7 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf1.diff -> pf-sources-5.12_p1.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e7968761cc64f9fc04974bd0a5e8fa09
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p2 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p2
index 5f060fa2b072..ede471a47bb6 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p2
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf2.diff -> pf-sources-5.12_p2.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e7968761cc64f9fc04974bd0a5e8fa09
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p3
index ced76b12ff29..7d70652fd154 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p3
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf3.diff -> pf-sources-5.12_p3.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b80cd6c61b9e74c40d2aa4bd378bbfa3
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p4 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p4
index fbc504cd5080..6c28bed3380d 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p4
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf4.diff -> pf-sources-5.12_p4.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/1510_fs-enable-link-security-restrictions-by-default.patch -> 1510_fs-enable-link-security-restrictions-by-default-5.12.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28eb43615ee2e75fd85e2f5accb57740
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p5 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p5
index 168f9d71c769..f6e4ae3d140c 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p5
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf5.diff -> pf-sources-5.12_p5.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/1510_fs-enable-link-security-restrictions-by-default.patch -> 1510_fs-enable-link-security-restrictions-by-default-5.12.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28eb43615ee2e75fd85e2f5accb57740
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p6 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p6
index 187a4352d927..2a3e7a2326a6 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p6
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf6.diff -> pf-sources-5.12_p6.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r1.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/1510_fs-enable-link-security-restrictions-by-default.patch -> 1510_fs-enable-link-security-restrictions-by-default-5.12.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5022_BMQ-and-PDS-compilation-fix.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=74d012e6b1e9108b5fd69c56d9c2055c
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2 b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2
index 055701f9d2e7..6cac0c246402 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.13_p2
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.13...v5.13-pf2.diff -> pf-sources-5.13_p2.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.13/prjc_v5.13-r1.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4996c8507f1b78e3dd06822d09187a2e
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p3
index a8025a788921..f6b7efe217bf 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.13_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.13_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.13_p3
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.13...v5.13-pf3.diff -> pf-sources-5.13_p3.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.13-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.13/prjc_v5.13-r1.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4996c8507f1b78e3dd06822d09187a2e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.56 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.56
new file mode 100644
index 000000000000..daa7cf9bccd3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.56
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.56
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.56 || ( 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.56
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.56.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.56.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.8 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.8
new file mode 100644
index 000000000000..22073e9d39b2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.13.8
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.13.8
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.13.8 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.13.8
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.8.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.13.8.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.13.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.13.4 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.13.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/a219e71ba368d65c1ede4fa6a79a17e70815440c/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.13.4 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=a93f1747965c4491c5ddeeb88d925dc1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.138 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.138
new file mode 100644
index 000000000000..f2e3cc08b99c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.138
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.138
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.138 || ( 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.138
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.138.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.138.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	268738f3065cfa3756c109e3092aaec7	kernel-install	60c931461e0011104e6500c61d106a45	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	97566c1a256d07b00848aa767e38a352	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.241 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.241
deleted file mode 100644
index 09b6f8e04a10..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.241
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.14.241
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.241.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.242 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.242
new file mode 100644
index 000000000000..a91c6d83998e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.242
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.242
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.242.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.200 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.200
deleted file mode 100644
index b37794fd87a0..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.200
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.19.200
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.200.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.201 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.201
new file mode 100644
index 000000000000..d8db5ff7274a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.201
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.201
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.201.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.277 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.277
deleted file mode 100644
index dde4a3485e48..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.277
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.4.277
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.277.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.278 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.278
new file mode 100644
index 000000000000..d8d0555aa91b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.278
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.4.278
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.278.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.277 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.277
deleted file mode 100644
index 094942af2a4c..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.277
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.9.277
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.277.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.278 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.278
new file mode 100644
index 000000000000..6e4946f84540
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.278
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.9.278
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.278.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.55 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.55
deleted file mode 100644
index d5a7b773c9d1..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.55
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.55
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.55.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.56 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.56
new file mode 100644
index 000000000000..8e56bc0389f5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.56
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.56
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.56.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.7 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.7
deleted file mode 100644
index f5eec19bb3ef..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.13.7
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.7.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.8 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.8
new file mode 100644
index 000000000000..ecd351b31267
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.13.8
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.8.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.137 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.137
deleted file mode 100644
index 55ed1122baf9..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.137
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.137
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.137.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.138 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.138
new file mode 100644
index 000000000000..247339c90564
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.138
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.138
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.138.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6b17cdaee897466001a472284e0421c8	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 4d1bb7c54f9c..deb8a18d73a7 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-12.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-12.0.1
index 6fbe388692c9..47a486c5646b 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-12.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-12.0.1
@@ -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=12.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=560f9c08abe4053f35f9a670c6bbac0d
+_md5_=f70c8e0dd16f130bd7246978f4978cdc
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-13.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-13.0.0.9999
index bd1be7a2adec..fa2898fd64e1 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-13.0.0.9999
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=13.0.0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=82ec3c36f177593d737c4442c5602192
+_md5_=3c9b500e1ef22aabeecc0c8be2b71fb2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-13.0.0_rc1 b/metadata/md5-cache/sys-libs/compiler-rt-13.0.0_rc1
new file mode 100644
index 000000000000..f23c4f7c7e28
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-13.0.0_rc1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.10 >=dev-python/lit-9.0.1[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 >=dev-python/lit-9.0.1[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/lit-9.0.1[python_targets_python3_8(-)] ) ) =sys-devel/clang-13.0.0*:13 ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=13.0.0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3c9b500e1ef22aabeecc0c8be2b71fb2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-14.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.0.9999
index 902b34910ddf..d9eb8f724528 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-14.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.0.9999
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=14.0.0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=82ec3c36f177593d737c4442c5602192
+_md5_=3c9b500e1ef22aabeecc0c8be2b71fb2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1
index 746c61d0e568..3b085871d4bf 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-10.0.1-4.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e3fa140400891876cff0f11994c246b8
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1
index 86c910a5a393..44e246df5db2 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=11.1.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-11.1.0-3.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=df52bb64510a8c85d18909d3bda211e3
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0
index 60c16ef32fe0..81bda95883a5 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!test? ( test ) !clang? ( test ) test !test? ( test )
 SLOT=12.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.0-1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4f64306de1ce10fa8a62a0a3763e063a
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1
index e4a2c2c1169a..46ed4ef9dd2d 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test elibc_glibc +libfuzzer +memprof +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=12.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ddd4fee6f55de9ec23820c2feb21bd85
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e847f8cea26507608469530c933b5ff5
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0.9999
index d1ea45c80e9e..9cd2007a955b 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0.9999
@@ -4,12 +4,12 @@ DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=+clang test elibc_glibc +libfuzzer +memprof +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
+IUSE=+clang test elibc_glibc +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
-REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
+REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=13.0.0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3959272b2f1ac12e7348d60a60d91519
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4074f15cbb90d0586211eedec07c222b
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0_rc1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0_rc1
new file mode 100644
index 000000000000..3f5607d4a7fe
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-13.0.0_rc1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.10 >=dev-python/lit-5[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 >=dev-python/lit-5[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 >=dev-python/lit-5[python_targets_python3_8(-)] ) ) =sys-devel/clang-13.0.0*:13 sys-libs/compiler-rt:13.0.0 ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test elibc_glibc +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
+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 orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
+RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
+SLOT=13.0.0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4074f15cbb90d0586211eedec07c222b
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.0.9999
index b116d3a55a35..85603d50a379 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.0.9999
@@ -4,12 +4,12 @@ DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=+clang test elibc_glibc +libfuzzer +memprof +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
+IUSE=+clang test elibc_glibc +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
-REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
+REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!test? ( test ) !clang? ( test ) !test? ( test )
 SLOT=14.0.0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3959272b2f1ac12e7348d60a60d91519
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4074f15cbb90d0586211eedec07c222b
diff --git a/metadata/md5-cache/sys-libs/glibc-2.33-r1 b/metadata/md5-cache/sys-libs/glibc-2.33-r1
index 56346cd0fbdc..04933e977c0d 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.33-r1
+++ b/metadata/md5-cache/sys-libs/glibc-2.33-r1
@@ -1,6 +1,6 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=app-misc/pax-utils-1.3.1 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -8,9 +8,9 @@ IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +mu
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.1 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.33.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.33-patches-4.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=09d6eff28a95bb108e46871cef21f751
+_md5_=241fa8d3f959e053d5fb8148382e519d
diff --git a/metadata/md5-cache/sys-libs/glibc-2.33-r5 b/metadata/md5-cache/sys-libs/glibc-2.33-r5
index 2b90954329a3..717bec092ece 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.33-r5
+++ b/metadata/md5-cache/sys-libs/glibc-2.33-r5
@@ -1,6 +1,6 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=app-misc/pax-utils-1.3.1 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -8,9 +8,9 @@ IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +mu
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.1 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.33.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.33-patches-5.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210727.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0a5a30671338bfc13d5de5d4dd90c065
+_md5_=4ce61b4339d2288f26b993106c7ade7d
diff --git a/metadata/md5-cache/sys-libs/glibc-2.34 b/metadata/md5-cache/sys-libs/glibc-2.34
new file mode 100644
index 000000000000..5479780e20ef
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.34
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DESCRIPTION=GNU libc C library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libc/
+IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemd systemtap test vanilla
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RESTRICT=!test? ( test )
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.34-patches-1.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=aa0a4f6e2af2ca27d9f129f9db957925
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 10a586547fa9..b1f8cc4739c1 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=16fd2dde439b83062aed7f0b38cc5845
+_md5_=3d0a0fc87b3b86afbaeba7e1d9895260
diff --git a/metadata/md5-cache/sys-libs/kpmcore-21.04.3 b/metadata/md5-cache/sys-libs/kpmcore-21.04.3
index 42e2cc6a7071..89c8aca15c77 100644
--- a/metadata/md5-cache/sys-libs/kpmcore-21.04.3
+++ b/metadata/md5-cache/sys-libs/kpmcore-21.04.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for managing partitions
 EAPI=7
 HOMEPAGE=https://apps.kde.org/partitionmanager/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.80.0:5 >=kde-frameworks/ki18n-5.80.0:5 >=kde-frameworks/kwidgetsaddons-5.80.0:5 >=sys-apps/util-linux-2.33.2 sys-auth/polkit-qt >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test
 SLOT=5/10
 SRC_URI=mirror://kde/stable/release-service/21.04.3/src/kpmcore-21.04.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bfd4a6aee5dbcabbebde8dd034856230
+_md5_=d07e0d6f9c0f89798fa13c4905b34f1a
diff --git a/metadata/md5-cache/sys-libs/ldb-2.3.0-r1 b/metadata/md5-cache/sys-libs/ldb-2.3.0-r1
index 80fb16349b03..22f2c493402b 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.3.0-r1
+++ b/metadata/md5-cache/sys-libs/ldb-2.3.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=LDAP-like embedded database
 EAPI=7
 HOMEPAGE=https://ldb.samba.org
 IUSE=doc ldap +lmdb python test python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) test? ( python )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.3.0
 SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.3.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
-_md5_=51ad6f5dccd12dce3d3679a7ecb43c32
+_md5_=3f7d427631a115cb73c6ab5cdbf8825d
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.24 b/metadata/md5-cache/sys-libs/libblockdev-2.24
deleted file mode 100644
index 82390ba4c555..000000000000
--- a/metadata/md5-cache/sys-libs/libblockdev-2.24
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gtk-doc-am gtk-doc? ( dev-util/gtk-doc ) introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-DESCRIPTION=A library for manipulating block devices
-EAPI=7
-HOMEPAGE=https://github.com/storaged-project/libblockdev
-IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) escrow? ( cryptsetup )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.24-1/libblockdev-2.24.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=191d3ba485c02f2717d7c49eb1c2ba16
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.25 b/metadata/md5-cache/sys-libs/libblockdev-2.25
index b3bd1cd21e90..95cdd9a6706a 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.25
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.25
@@ -5,7 +5,7 @@ DESCRIPTION=A library for manipulating block devices
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libblockdev
 IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) escrow? ( cryptsetup )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.25-1/libblockdev-2.25.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aa7964bbf6942f816c6a4be0d9a47293
+_md5_=07f258d77185ce4dd08c0fae9d1854bb
diff --git a/metadata/md5-cache/sys-libs/libcap-2.50-r1 b/metadata/md5-cache/sys-libs/libcap-2.50-r1
deleted file mode 100644
index 3d654031e927..000000000000
--- a/metadata/md5-cache/sys-libs/libcap-2.50-r1
+++ /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.50.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9dc3081f29386cebe8db7b4a3e333212
diff --git a/metadata/md5-cache/sys-libs/libcap-2.52 b/metadata/md5-cache/sys-libs/libcap-2.52
new file mode 100644
index 000000000000..7654d486dc6d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcap-2.52
@@ -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.52.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=daea02a3b70601e5b287f17d7c2eae6d
diff --git a/metadata/md5-cache/sys-libs/libcxx-12.0.1 b/metadata/md5-cache/sys-libs/libcxx-12.0.1
index 8916f5fc305f..aaa97d3007b3 100644
--- a/metadata/md5-cache/sys-libs/libcxx-12.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-12.0.1
@@ -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-12.0.1[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-12.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5976bacc7f9a11eea8cebc470dddb4a0
+_md5_=ae8433a32ce7287a6486cb0bf002040d
diff --git a/metadata/md5-cache/sys-libs/libcxx-13.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-13.0.0.9999
index 38fd7405a6f2..969b14fe0e57 100644
--- a/metadata/md5-cache/sys-libs/libcxx-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-13.0.0.9999
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=32fba6facf88f60b12eb8d57799d0357
+_md5_=a6042df71ec9dab089feef515e4552da
diff --git a/metadata/md5-cache/sys-libs/libcxx-13.0.0_rc1 b/metadata/md5-cache/sys-libs/libcxx-13.0.0_rc1
new file mode 100644
index 000000000000..8e0dc8dc869b
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-13.0.0_rc1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-13.0.0_rc1[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=7
+HOMEPAGE=https://libcxx.llvm.org/
+IUSE=elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-13.0.0_rc1[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=libunwind? ( libcxxabi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a6042df71ec9dab089feef515e4552da
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-14.0.0.9999
index 5b0a819ae692..4fbe83b2cdb3 100644
--- a/metadata/md5-cache/sys-libs/libcxx-14.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.0.9999
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=32fba6facf88f60b12eb8d57799d0357
+_md5_=a6042df71ec9dab089feef515e4552da
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-12.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-12.0.1
index 4926487d4b4b..1f5062dc7e9a 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-12.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-12.0.1
@@ -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 abi_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 )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6b0a46f66d48fec325618a29c75d281e
+_md5_=3678a389cddd0316c9bf2d478ed10fb1
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-13.0.0.9999
index 3822bc36fb51..df87e2fc00c3 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-13.0.0.9999
@@ -11,4 +11,4 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a554d662957d8a7a0749634b66efceb2
+_md5_=f40893c9502fa197703ca7d2dcfb16c6
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-13.0.0_rc1 b/metadata/md5-cache/sys-libs/libcxxabi-13.0.0_rc1
new file mode 100644
index 000000000000..d85c3023352e
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-13.0.0_rc1
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=7
+HOMEPAGE=https://libcxxabi.llvm.org/
+IUSE=+libunwind static-libs test elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f40893c9502fa197703ca7d2dcfb16c6
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.0.9999
index 3822bc36fb51..df87e2fc00c3 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-14.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.0.9999
@@ -11,4 +11,4 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a554d662957d8a7a0749634b66efceb2
+_md5_=f40893c9502fa197703ca7d2dcfb16c6
diff --git a/metadata/md5-cache/sys-libs/libomp-12.0.1 b/metadata/md5-cache/sys-libs/libomp-12.0.1
index 8ab98896e55c..123f4b13178d 100644
--- a/metadata/md5-cache/sys-libs/libomp-12.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-12.0.1
@@ -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 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~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-12.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5d4dbd2a5facb904b696c364d5e1320f
+_md5_=46172bfbd9056d5f4f93334cc77be9fc
diff --git a/metadata/md5-cache/sys-libs/libomp-13.0.0_rc1 b/metadata/md5-cache/sys-libs/libomp-13.0.0_rc1
new file mode 100644
index 000000000000..5c6785044bef
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-13.0.0_rc1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig ) test? ( || ( ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) >=sys-devel/clang-6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=7
+HOMEPAGE=https://openmp.llvm.org
+IUSE=cuda hwloc kernel_linux offload ompt test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=82459bc0e8f154380f8dca9d0255402e
diff --git a/metadata/md5-cache/sys-libs/libvpd-2.2.8 b/metadata/md5-cache/sys-libs/libvpd-2.2.8
deleted file mode 100644
index 90d31f947071..000000000000
--- a/metadata/md5-cache/sys-libs/libvpd-2.2.8
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-db/sqlite:3 sys-libs/zlib:=
-DESCRIPTION=Library implementation for listing Vital Product Data
-EAPI=7
-HOMEPAGE=https://github.com/power-ras/libvpd
-KEYWORDS=ppc ppc64
-LICENSE=LGPL-2.1+
-RDEPEND=dev-db/sqlite:3 sys-libs/zlib:=
-SLOT=0
-SRC_URI=https://github.com/power-ras/libvpd/archive/v2.2.8.tar.gz -> libvpd-2.2.8.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
-_md5_=48ec7bbbe879750529a4cd85058451e0
diff --git a/metadata/md5-cache/sys-libs/libvpd-2.2.8-r1 b/metadata/md5-cache/sys-libs/libvpd-2.2.8-r1
new file mode 100644
index 000000000000..d6246dfdac16
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libvpd-2.2.8-r1
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-db/sqlite:3 sys-libs/zlib:=
+DESCRIPTION=Library implementation for listing Vital Product Data
+EAPI=7
+HOMEPAGE=https://github.com/power-ras/libvpd
+KEYWORDS=ppc ppc64
+LICENSE=LGPL-2.1+
+RDEPEND=dev-db/sqlite:3 sys-libs/zlib:=
+SLOT=0
+SRC_URI=https://github.com/power-ras/libvpd/archive/v2.2.8.tar.gz -> libvpd-2.2.8.tar.gz
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068
+_md5_=d6dc808311a503381aa3ca0f76593724
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1
index 95c6b106ad0b..467c838d5f09 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.1
@@ -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 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~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-12.0.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=49e0ff60cd1da27c611eb5ef871594b4
+_md5_=65121f3389553c67d705655d241a8d0f
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0.9999
index 8d426721e34e..5f48eeed5352 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0.9999
@@ -11,4 +11,4 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=692019d16e5e538c9a935241eb80a893
+_md5_=2858ee738c17951a0fc49b710aae42fb
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0_rc1 b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0_rc1
new file mode 100644
index 000000000000..03bdcc9802d5
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-13.0.0_rc1
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=7
+HOMEPAGE=https://github.com/llvm-mirror/libunwind
+IUSE=debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2858ee738c17951a0fc49b710aae42fb
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.0.9999
index 8d426721e34e..5f48eeed5352 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.0.9999
@@ -11,4 +11,4 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	cb97295f27f4f75aab38e6965ecb7759	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=692019d16e5e538c9a935241eb80a893
+_md5_=2858ee738c17951a0fc49b710aae42fb
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index c78a659e850f..a0ef63f7bc30 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/nut-2.7.4-r7 b/metadata/md5-cache/sys-power/nut-2.7.4-r7
index 1e5b70d7c5e7..4d7457e01406 100644
--- a/metadata/md5-cache/sys-power/nut-2.7.4-r7
+++ b/metadata/md5-cache/sys-power/nut-2.7.4-r7
@@ -12,4 +12,4 @@ REQUIRED_USE=ups_drivers_usbhid-ups? ( usb ) ups_drivers_bcmxcp_usb? ( usb ) ups
 SLOT=0
 SRC_URI=https://networkupstools.org/source/2.7/nut-2.7.4.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=84ee746719cb3e8c6bd878d39e622cd4
+_md5_=e0ba07658459f1bca8d808e8942dd7e3
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index e8d8e3439b14..a0fadfd597be 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/bashtop-0.9.25 b/metadata/md5-cache/sys-process/bashtop-0.9.25
index cc9373126683..ae884a333337 100644
--- a/metadata/md5-cache/sys-process/bashtop-0.9.25
+++ b/metadata/md5-cache/sys-process/bashtop-0.9.25
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/aristocratos/bashtop/archive/v0.9.25.tar.gz -> bashtop-0.9.25.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=4d074addf71c049c7b3fca8c0a4c67bf
diff --git a/metadata/md5-cache/sys-process/below-0.3.0 b/metadata/md5-cache/sys-process/below-0.3.0
new file mode 100644
index 000000000000..fdb32de462f1
--- /dev/null
+++ b/metadata/md5-cache/sys-process/below-0.3.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/rust[rustfmt] dev-lang/rust-bin[rustfmt] ) sys-devel/clang virtual/pkgconfig >=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=virtual/libelf sys-libs/zlib sys-libs/ncurses
+DESCRIPTION=An interactive tool to view and record historical system data
+EAPI=7
+HOMEPAGE=https://github.com/facebookincubator/below
+IUSE=debug
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 ISC LGPL-2.1 MIT MPL-2.0 Unlicense
+RDEPEND=virtual/libelf sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/facebookincubator/below/archive/refs/tags/v0.3.0.tar.gz -> below-0.3.0.tar.gz https://crates.io/api/v1/crates/ahash/0.6.3/download -> ahash-0.6.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/array-macro/1.0.5/download -> array-macro-1.0.5.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bytes/1.0.1/download -> bytes-1.0.1.crate https://crates.io/api/v1/crates/cargo-platform/0.1.1/download -> cargo-platform-0.1.1.crate https://crates.io/api/v1/crates/cargo_metadata/0.12.3/download -> cargo_metadata-0.12.3.crate https://crates.io/api/v1/crates/cc/1.0.68/download -> cc-1.0.68.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crossterm/0.19.0/download -> crossterm-0.19.0.crate https://crates.io/api/v1/crates/crossterm/0.20.0/download -> crossterm-0.20.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.7.0/download -> crossterm_winapi-0.7.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.8.0/download -> crossterm_winapi-0.8.0.crate https://crates.io/api/v1/crates/cursive/0.16.3/download -> cursive-0.16.3.crate https://crates.io/api/v1/crates/cursive_buffered_backend/0.5.0/download -> cursive_buffered_backend-0.5.0.crate https://crates.io/api/v1/crates/cursive_core/0.2.2/download -> cursive_core-0.2.2.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/enum-map/0.6.4/download -> enum-map-0.6.4.crate https://crates.io/api/v1/crates/enum-map-derive/0.4.6/download -> enum-map-derive-0.4.6.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/futures-core/0.3.15/download -> futures-core-0.3.15.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/half/1.7.1/download -> half-1.7.1.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/hostname/0.3.1/download -> hostname-0.3.1.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libbpf-cargo/0.8.1/download -> libbpf-cargo-0.8.1.crate https://crates.io/api/v1/crates/libbpf-rs/0.11.2/download -> libbpf-rs-0.11.2.crate https://crates.io/api/v1/crates/libbpf-sys/0.4.0-2/download -> libbpf-sys-0.4.0-2.crate https://crates.io/api/v1/crates/libc/0.2.96/download -> libc-0.2.96.crate https://crates.io/api/v1/crates/lock_api/0.4.4/download -> lock_api-0.4.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/match_cfg/0.1.0/download -> match_cfg-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memmap2/0.3.0/download -> memmap2-0.3.0.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/mio/0.7.11/download -> mio-0.7.11.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/nix/0.20.0/download -> nix-0.20.0.crate https://crates.io/api/v1/crates/nix/0.21.0/download -> nix-0.21.0.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num/0.3.1/download -> num-0.3.1.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/num_enum/0.5.1/download -> num_enum-0.5.1.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.1/download -> num_enum_derive-0.5.1.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/openat/0.1.21/download -> openat-0.1.21.crate https://crates.io/api/v1/crates/os_info/3.0.6/download -> os_info-3.0.6.crate https://crates.io/api/v1/crates/owning_ref/0.4.1/download -> owning_ref-0.4.1.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/paste/1.0.5/download -> paste-1.0.5.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.8/download -> redox_syscall-0.2.8.crate https://crates.io/api/v1/crates/redox_termios/0.1.2/download -> redox_termios-0.1.2.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rustversion/1.0.5/download -> rustversion-1.0.5.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.10.2/download -> scroll-0.10.2.crate https://crates.io/api/v1/crates/scroll_derive/0.10.5/download -> scroll_derive-0.10.5.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver/1.0.4/download -> semver-1.0.4.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/serde/1.0.127/download -> serde-1.0.127.crate https://crates.io/api/v1/crates/serde_cbor/0.11.1/download -> serde_cbor-0.11.1.crate https://crates.io/api/v1/crates/serde_derive/1.0.127/download -> serde_derive-1.0.127.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook/0.3.9/download -> signal-hook-0.3.9.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.1/download -> signal-hook-mio-0.2.1.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/slog/2.7.0/download -> slog-2.7.0.crate https://crates.io/api/v1/crates/slog-async/2.6.0/download -> slog-async-2.6.0.crate https://crates.io/api/v1/crates/slog-term/2.8.0/download -> slog-term-2.8.0.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/strum_macros/0.21.1/download -> strum_macros-0.21.1.crate https://crates.io/api/v1/crates/syn/1.0.73/download -> syn-1.0.73.crate https://crates.io/api/v1/crates/take_mut/0.2.2/download -> take_mut-0.2.2.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/term/0.7.0/download -> term-0.7.0.crate https://crates.io/api/v1/crates/termion/1.5.6/download -> termion-1.5.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.25/download -> thiserror-1.0.25.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.25/download -> thiserror-impl-1.0.25.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/toml/0.5.7/download -> toml-0.5.7.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/vsprintf/2.0.0/download -> vsprintf-2.0.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasmer_enumset/1.0.1/download -> wasmer_enumset-1.0.1.crate https://crates.io/api/v1/crates/wasmer_enumset_derive/0.5.0/download -> wasmer_enumset_derive-0.5.0.crate https://crates.io/api/v1/crates/winapi/0.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/xi-unicode/0.3.0/download -> xi-unicode-0.3.0.crate https://crates.io/api/v1/crates/zstd/0.8.0+zstd.1.4.9/download -> zstd-0.8.0+zstd.1.4.9.crate https://crates.io/api/v1/crates/zstd-safe/4.0.0+zstd.1.4.9/download -> zstd-safe-4.0.0+zstd.1.4.9.crate https://crates.io/api/v1/crates/zstd-sys/1.5.0+zstd.1.4.9/download -> zstd-sys-1.5.0+zstd.1.4.9.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=21c59505fd0ee752051d467c5a78e1b7
diff --git a/metadata/md5-cache/sys-process/evisum-0.5.13 b/metadata/md5-cache/sys-process/evisum-0.5.13
index ca38563cb80c..291a05ec163a 100644
--- a/metadata/md5-cache/sys-process/evisum-0.5.13
+++ b/metadata/md5-cache/sys-process/evisum-0.5.13
@@ -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 ~riscv 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.13.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3b675c6dd6b894869b6cf4a62aed6a4d
+_md5_=24af2b3686a6d2d476a6ca9f4ff98c44
diff --git a/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r2 b/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r2
index df1b767c5aba..9b0d826bc210 100644
--- a/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r2
+++ b/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r2
@@ -4,9 +4,10 @@ DESCRIPTION=A command scheduler with extended capabilities over cron and anacron
 EAPI=6
 HOMEPAGE=http://fcron.free.fr/
 IUSE=audit debug pam selinux l10n_fr +mta +system-crontab readline
+KEYWORDS=~riscv
 LICENSE=GPL-2
 RDEPEND=virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux ) app-misc/editor-wrapper mta? ( virtual/mta ) pam? ( sys-auth/pambase ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.3.0.src.tar.gz -> fcron-3.3.0_beta.tar.gz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	cron	be3d08eb2cdfb330f694bb07c6affc03	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	pam	41ce39f668e11d31ff4734f3b5794f7d	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db263d638cc70963fd4fdcf85ca90db8
+_md5_=5ef464c57ba53a7b31af1bfa5c6ab157
diff --git a/metadata/md5-cache/sys-process/glances-3.2.1 b/metadata/md5-cache/sys-process/glances-3.2.1
index 59081512667d..3e752a231d4c 100644
--- a/metadata/md5-cache/sys-process/glances-3.2.1
+++ b/metadata/md5-cache/sys-process/glances-3.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.2.1.tar.gz -> glances-3.2.1.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d416e6a97a33b383042c2cf96d79e1f
diff --git a/metadata/md5-cache/sys-process/glances-3.2.2 b/metadata/md5-cache/sys-process/glances-3.2.2
new file mode 100644
index 000000000000..5e5a78af231b
--- /dev/null
+++ b/metadata/md5-cache/sys-process/glances-3.2.2
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx_rtd_theme ) test? ( dev-python/defusedxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( dev-python/sphinx ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=CLI curses based monitoring tool
+EAPI=7
+HOMEPAGE=https://github.com/nicolargo/glances
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=dev-python/defusedxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nicolargo/glances/archive/v3.2.2.tar.gz -> glances-3.2.2.tar.gz
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cc4b1842046bca40100e579804a5e3e4
diff --git a/metadata/md5-cache/sys-process/parallel-20210622 b/metadata/md5-cache/sys-process/parallel-20210622
index ba1209ebdce2..e7457517d24b 100644
--- a/metadata/md5-cache/sys-process/parallel-20210622
+++ b/metadata/md5-cache/sys-process/parallel-20210622
@@ -5,10 +5,10 @@ DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote mac
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
 IUSE=verify-sig
-KEYWORDS=amd64 arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20210622.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20210622.tar.bz2.sig )
 _eclasses_=verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=7bc98f2456ac6eb4db602b8b6e9a982c
+_md5_=3eeec0abafe0ba941377b6aa307fc2c7
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 61f5cd171236..9120507492da 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.56 b/metadata/md5-cache/virtual/dist-kernel-5.10.56
new file mode 100644
index 000000000000..25c43b6b5822
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.56
@@ -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.56 ~sys-kernel/gentoo-kernel-bin-5.10.56 ~sys-kernel/vanilla-kernel-5.10.56 )
+SLOT=0/5.10.56
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.13.8 b/metadata/md5-cache/virtual/dist-kernel-5.13.8
new file mode 100644
index 000000000000..539e32b223b0
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.13.8
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.13.8 ~sys-kernel/gentoo-kernel-bin-5.13.8 ~sys-kernel/vanilla-kernel-5.13.8 )
+SLOT=0/5.13.8
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.138 b/metadata/md5-cache/virtual/dist-kernel-5.4.138
new file mode 100644
index 000000000000..305d6677a345
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.138
@@ -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.138 ~sys-kernel/gentoo-kernel-bin-5.4.138 ~sys-kernel/vanilla-kernel-5.4.138 )
+SLOT=0/5.4.138
+_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/perl-Archive-Tar-2.320.0 b/metadata/md5-cache/virtual/perl-Archive-Tar-2.320.0
deleted file mode 100644
index 3e53eda923e0..000000000000
--- a/metadata/md5-cache/virtual/perl-Archive-Tar-2.320.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Archive-Tar
-EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Archive-Tar-2.320.0 ) dev-lang/perl:= !<perl-core/Archive-Tar-2.320.0 !>perl-core/Archive-Tar-2.320.0-r999
-SLOT=0
-_md5_=10eeb11fe450bb8994a11b58586a81d7
diff --git a/metadata/md5-cache/virtual/perl-CPAN-2.220.0 b/metadata/md5-cache/virtual/perl-CPAN-2.220.0
deleted file mode 100644
index 6c580961cea1..000000000000
--- a/metadata/md5-cache/virtual/perl-CPAN-2.220.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for CPAN
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/CPAN-2.220.0 ) dev-lang/perl:= !<perl-core/CPAN-2.220.0 !>perl-core/CPAN-2.220.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.89.0-r1 b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.89.0-r1
deleted file mode 100644
index 1ca82fef056f..000000000000
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.89.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Compress-Raw-Bzip2
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30.2* =dev-lang/perl-5.30.3* ~perl-core/Compress-Raw-Bzip2-2.89.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Bzip2-2.89.0 !>perl-core/Compress-Raw-Bzip2-2.89.0-r999
-SLOT=0
-_md5_=ae96bd93914fd5b0a3f55375c8897f7c
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.84.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.84.0
deleted file mode 100644
index 5c81a5074989..000000000000
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.84.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Compress-Raw-Zlib
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Compress-Raw-Zlib-2.84.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.84.0 !>perl-core/Compress-Raw-Zlib-2.84.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-DB_File-1.843.0 b/metadata/md5-cache/virtual/perl-DB_File-1.843.0
deleted file mode 100644
index 384dcab1ee1d..000000000000
--- a/metadata/md5-cache/virtual/perl-DB_File-1.843.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for DB_File
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30*[berkdb] ~perl-core/DB_File-1.843.0 ) dev-lang/perl:= !<perl-core/DB_File-1.843.0 !>perl-core/DB_File-1.843.0-r999
-SLOT=0
-_md5_=bd0d5bb49a32f3c1d323e0ec598b2402
diff --git a/metadata/md5-cache/virtual/perl-Data-Dumper-2.174.0-r2 b/metadata/md5-cache/virtual/perl-Data-Dumper-2.174.0-r2
deleted file mode 100644
index 8cbe4a7aa314..000000000000
--- a/metadata/md5-cache/virtual/perl-Data-Dumper-2.174.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Data-Dumper
-EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.32.0* =dev-lang/perl-5.30* ~perl-core/Data-Dumper-2.174.0 ) dev-lang/perl:= !<perl-core/Data-Dumper-2.174.0 !>perl-core/Data-Dumper-2.174.0-r999
-SLOT=0
-_md5_=f25e17b8c1d6eecb0835292529aea0b4
diff --git a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.520.0 b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.520.0
deleted file mode 100644
index 1b52beade626..000000000000
--- a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.520.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Devel-PPPort
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Devel-PPPort-3.520.0 ) dev-lang/perl:= !<perl-core/Devel-PPPort-3.520.0 !>perl-core/Devel-PPPort-3.520.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Digest-MD5-2.550.0-r2 b/metadata/md5-cache/virtual/perl-Digest-MD5-2.550.0-r2
deleted file mode 100644
index a2ee4440ae7a..000000000000
--- a/metadata/md5-cache/virtual/perl-Digest-MD5-2.550.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Digest-MD5
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Digest-MD5-2.550.0 ) dev-lang/perl:= !<perl-core/Digest-MD5-2.550.0 !>perl-core/Digest-MD5-2.550.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Dumpvalue-1.180.0-r5 b/metadata/md5-cache/virtual/perl-Dumpvalue-1.180.0-r5
deleted file mode 100644
index 4c49f5606fe4..000000000000
--- a/metadata/md5-cache/virtual/perl-Dumpvalue-1.180.0-r5
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Dumpvalue
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Dumpvalue-1.180.0 ) dev-lang/perl:= !<perl-core/Dumpvalue-1.180.0 !>perl-core/Dumpvalue-1.180.0-r999
-SLOT=0
-_md5_=a1ef175c2a5f424feb2179c131108d54
diff --git a/metadata/md5-cache/virtual/perl-Encode-3.10.0 b/metadata/md5-cache/virtual/perl-Encode-3.10.0
deleted file mode 100644
index 1c375911618b..000000000000
--- a/metadata/md5-cache/virtual/perl-Encode-3.10.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Encode
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Encode-3.10.0 ) dev-lang/perl:= !<perl-core/Encode-3.10.0 !>perl-core/Encode-3.10.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Exporter-5.730.0-r2 b/metadata/md5-cache/virtual/perl-Exporter-5.730.0-r2
deleted file mode 100644
index 176172b607a9..000000000000
--- a/metadata/md5-cache/virtual/perl-Exporter-5.730.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Exporter
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Exporter-5.730.0 ) dev-lang/perl:= !<perl-core/Exporter-5.730.0 !>perl-core/Exporter-5.730.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.231 b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.231
deleted file mode 100644
index 8faf35c996b1..000000000000
--- a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.231
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for ExtUtils-CBuilder
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/ExtUtils-CBuilder-0.280.231 ) dev-lang/perl:= !<perl-core/ExtUtils-CBuilder-0.280.231 !>perl-core/ExtUtils-CBuilder-0.280.231-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.340.0-r2 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.340.0-r2
deleted file mode 100644
index 7474be496c20..000000000000
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.340.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for ExtUtils-MakeMaker
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/ExtUtils-MakeMaker-7.340.0 ) dev-lang/perl:= !<perl-core/ExtUtils-MakeMaker-7.340.0 !>perl-core/ExtUtils-MakeMaker-7.340.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Filter-Simple-0.950.0-r2 b/metadata/md5-cache/virtual/perl-Filter-Simple-0.950.0-r2
deleted file mode 100644
index 1f1951fe28eb..000000000000
--- a/metadata/md5-cache/virtual/perl-Filter-Simple-0.950.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for perl-core/Filter-Simple
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Filter-Simple-0.950.0 ) dev-lang/perl:= !<perl-core/Filter-Simple-0.950.0 !>perl-core/Filter-Simple-0.950.0-r999
-SLOT=0
-_md5_=f9e08a3ee5efd6f42e67c4ffb6dd1ba6
diff --git a/metadata/md5-cache/virtual/perl-Getopt-Long-2.500.0-r2 b/metadata/md5-cache/virtual/perl-Getopt-Long-2.500.0-r2
deleted file mode 100644
index 71b38ead4069..000000000000
--- a/metadata/md5-cache/virtual/perl-Getopt-Long-2.500.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Getopt-Long
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Getopt-Long-2.500.0 ) dev-lang/perl:= !<perl-core/Getopt-Long-2.500.0 !>perl-core/Getopt-Long-2.500.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.430.0-r2 b/metadata/md5-cache/virtual/perl-I18N-LangTags-0.430.0-r2
deleted file mode 100644
index d87a4efbd122..000000000000
--- a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.430.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for I18N-LangTags
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/I18N-LangTags-0.430.0 ) dev-lang/perl:= !<perl-core/I18N-LangTags-0.430.0 !>perl-core/I18N-LangTags-0.430.0-r999
-SLOT=0
-_md5_=21cb01b12e8b11e420baaf8c98a17a62
diff --git a/metadata/md5-cache/virtual/perl-IO-1.400.0 b/metadata/md5-cache/virtual/perl-IO-1.400.0
deleted file mode 100644
index 37c8cd3170fb..000000000000
--- a/metadata/md5-cache/virtual/perl-IO-1.400.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for IO
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/IO-1.400.0 ) dev-lang/perl:= !<perl-core/IO-1.400.0 !>perl-core/IO-1.400.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-IO-Compress-2.84.0 b/metadata/md5-cache/virtual/perl-IO-Compress-2.84.0
deleted file mode 100644
index a73ade21cf1e..000000000000
--- a/metadata/md5-cache/virtual/perl-IO-Compress-2.84.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for IO-Compress
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/IO-Compress-2.84.0 ) dev-lang/perl:= !<perl-core/IO-Compress-2.84.0 !>perl-core/IO-Compress-2.84.0-r999 >=virtual/perl-Compress-Raw-Zlib-2.84.0 >=virtual/perl-Compress-Raw-Bzip2-2.84.0
-SLOT=0
-_md5_=e6f0b03bf727d8133cec758e49dff987
diff --git a/metadata/md5-cache/virtual/perl-IPC-Cmd-1.20.0 b/metadata/md5-cache/virtual/perl-IPC-Cmd-1.20.0
deleted file mode 100644
index 7c4b97f4b3b1..000000000000
--- a/metadata/md5-cache/virtual/perl-IPC-Cmd-1.20.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for IPC-Cmd
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/IPC-Cmd-1.20.0 ) dev-lang/perl:= !<perl-core/IPC-Cmd-1.20.0 !>perl-core/IPC-Cmd-1.20.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-JSON-PP-4.20.0 b/metadata/md5-cache/virtual/perl-JSON-PP-4.20.0
deleted file mode 100644
index 184a4c8fcfdf..000000000000
--- a/metadata/md5-cache/virtual/perl-JSON-PP-4.20.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for JSON-PP
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/JSON-PP-4.20.0 ) dev-lang/perl:= !<perl-core/JSON-PP-4.20.0 !>perl-core/JSON-PP-4.20.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.816 b/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.816
deleted file mode 100644
index 3a6ff61c0e15..000000000000
--- a/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.816
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Math-BigInt
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Math-BigInt-1.999.816 ) dev-lang/perl:= !<perl-core/Math-BigInt-1.999.816 !>perl-core/Math-BigInt-1.999.816-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.800 b/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.800
deleted file mode 100644
index 940c9b52546e..000000000000
--- a/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.800
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Math-BigInt-FastCalc
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Math-BigInt-FastCalc-0.500.800 ) dev-lang/perl:= !<perl-core/Math-BigInt-FastCalc-0.500.800 !>perl-core/Math-BigInt-FastCalc-0.500.800-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.6.13.0_rc b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.6.13.0_rc
deleted file mode 100644
index 5adadcbbfb62..000000000000
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.6.13.0_rc
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Module-CoreList
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30.3* ~perl-core/Module-CoreList-5.202.6.13.0_rc ) dev-lang/perl:= !<perl-core/Module-CoreList-5.202.6.13.0_rc !>perl-core/Module-CoreList-5.202.6.13.0_rc-r999
-SLOT=0
-_md5_=a98ffbf2686a0a46e6b39717a16ace86
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.6.200 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.6.200
deleted file mode 100644
index 0b00ce789a80..000000000000
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.6.200
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Module-CoreList
-EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.32.0* ~perl-core/Module-CoreList-5.202.6.200 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.202.6.200 !>perl-core/Module-CoreList-5.202.6.200-r999
-SLOT=0
-_md5_=3b72b566470c3d547054c44ba52e4eb0
diff --git a/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.680.0-r3 b/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.680.0-r3
deleted file mode 100644
index 048487bb331f..000000000000
--- a/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.680.0-r3
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Module-Load-Conditional
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Module-Load-Conditional-0.680.0 ) dev-lang/perl:= !<perl-core/Module-Load-Conditional-0.680.0 !>perl-core/Module-Load-Conditional-0.680.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.36 b/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.36
deleted file mode 100644
index eff313e6b3bd..000000000000
--- a/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.36
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Module-Metadata
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Module-Metadata-1.0.36 ) dev-lang/perl:= !<perl-core/Module-Metadata-1.0.36 !>perl-core/Module-Metadata-1.0.36-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Net-Ping-2.710.0 b/metadata/md5-cache/virtual/perl-Net-Ping-2.710.0
deleted file mode 100644
index d0672854d60e..000000000000
--- a/metadata/md5-cache/virtual/perl-Net-Ping-2.710.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Net-Ping
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Net-Ping-2.710.0 ) dev-lang/perl:= !<perl-core/Net-Ping-2.710.0 !>perl-core/Net-Ping-2.710.0-r999
-SLOT=0
-_md5_=78bf61d53bc9dc0d08803985f7ecbf2a
diff --git a/metadata/md5-cache/virtual/perl-Pod-Simple-3.350.0-r3 b/metadata/md5-cache/virtual/perl-Pod-Simple-3.350.0-r3
deleted file mode 100644
index 7a8ef04f853d..000000000000
--- a/metadata/md5-cache/virtual/perl-Pod-Simple-3.350.0-r3
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Pod-Simple
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Pod-Simple-3.350.0 ) dev-lang/perl:= !<perl-core/Pod-Simple-3.350.0 !>perl-core/Pod-Simple-3.350.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Safe-2.400.0-r3 b/metadata/md5-cache/virtual/perl-Safe-2.400.0-r3
deleted file mode 100644
index ac54e610232e..000000000000
--- a/metadata/md5-cache/virtual/perl-Safe-2.400.0-r3
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Safe
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Safe-2.400.0 ) dev-lang/perl:= !<perl-core/Safe-2.400.0 !>perl-core/Safe-2.400.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Safe-2.410.0-r1 b/metadata/md5-cache/virtual/perl-Safe-2.410.0-r1
deleted file mode 100644
index 913cd238d03f..000000000000
--- a/metadata/md5-cache/virtual/perl-Safe-2.410.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Safe
-EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.32.0* ~perl-core/Safe-2.410.0 ) dev-lang/perl:= !<perl-core/Safe-2.410.0 !>perl-core/Safe-2.410.0-r999
-SLOT=0
-_md5_=935a4d544fda6134adc8bee94cbf8b53
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.500.0-r2 b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.500.0-r2
deleted file mode 100644
index a730db2014d9..000000000000
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.500.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Scalar-List-Utils-1.500.0 ) dev-lang/perl:= !<perl-core/Scalar-List-Utils-1.500.0 !>perl-core/Scalar-List-Utils-1.500.0-r999
-SLOT=0
-_md5_=fb441128430503aea3ea101d1a7070ee
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.560.0 b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.560.0
index bf513a1c9ca3..3a507e918a1a 100644
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.560.0
+++ b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.560.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils
 EAPI=8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Scalar-List-Utils-1.560.0 dev-lang/perl:=
 SLOT=0
-_md5_=5c4288f8d422fb0f465886e9404c32e7
+_md5_=b7d38dab8f3b663564c2b6ac776b24c6
diff --git a/metadata/md5-cache/virtual/perl-Socket-2.27.0-r2 b/metadata/md5-cache/virtual/perl-Socket-2.27.0-r2
deleted file mode 100644
index df348f053751..000000000000
--- a/metadata/md5-cache/virtual/perl-Socket-2.27.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Socket
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Socket-2.27.0 ) dev-lang/perl:= !<perl-core/Socket-2.27.0 !>perl-core/Socket-2.27.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Storable-3.150.0 b/metadata/md5-cache/virtual/perl-Storable-3.150.0
deleted file mode 100644
index e03c7196ef13..000000000000
--- a/metadata/md5-cache/virtual/perl-Storable-3.150.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Storable
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Storable-3.150.0 ) dev-lang/perl:= !<perl-core/Storable-3.150.0 !>perl-core/Storable-3.150.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Sys-Syslog-0.350.0-r3 b/metadata/md5-cache/virtual/perl-Sys-Syslog-0.350.0-r3
deleted file mode 100644
index 58ba721de655..000000000000
--- a/metadata/md5-cache/virtual/perl-Sys-Syslog-0.350.0-r3
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Sys-Syslog
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Sys-Syslog-0.350.0 ) dev-lang/perl:= !<perl-core/Sys-Syslog-0.350.0 !>perl-core/Sys-Syslog-0.350.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Term-ANSIColor-4.60.0-r3 b/metadata/md5-cache/virtual/perl-Term-ANSIColor-4.60.0-r3
deleted file mode 100644
index bfe671859e47..000000000000
--- a/metadata/md5-cache/virtual/perl-Term-ANSIColor-4.60.0-r3
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Term-ANSIColor
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Term-ANSIColor-4.60.0 ) dev-lang/perl:= !<perl-core/Term-ANSIColor-4.60.0 !>perl-core/Term-ANSIColor-4.60.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Test-Simple-1.302.162 b/metadata/md5-cache/virtual/perl-Test-Simple-1.302.162
deleted file mode 100644
index 5f74fd844bc2..000000000000
--- a/metadata/md5-cache/virtual/perl-Test-Simple-1.302.162
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Test-Simple
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Test-Simple-1.302.162 ) dev-lang/perl:= !<dev-perl/Test-Tester-0.114.0 !<dev-perl/Test-use-ok-0.160.0
-SLOT=0
-_md5_=6acd005a456483b394eb43809d9727a1
diff --git a/metadata/md5-cache/virtual/perl-Thread-Queue-3.130.0 b/metadata/md5-cache/virtual/perl-Thread-Queue-3.130.0
deleted file mode 100644
index 6ae55b1aff8e..000000000000
--- a/metadata/md5-cache/virtual/perl-Thread-Queue-3.130.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Thread-Queue
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Thread-Queue-3.130.0 ) dev-lang/perl:= !<perl-core/Thread-Queue-3.130.0 !>perl-core/Thread-Queue-3.130.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Time-HiRes-1.976.0 b/metadata/md5-cache/virtual/perl-Time-HiRes-1.976.0
deleted file mode 100644
index dca8d13f1a9d..000000000000
--- a/metadata/md5-cache/virtual/perl-Time-HiRes-1.976.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Time-HiRes
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Time-HiRes-1.976.0 ) dev-lang/perl:= !<perl-core/Time-HiRes-1.976.0 !>perl-core/Time-HiRes-1.976.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Time-Piece-1.330.0 b/metadata/md5-cache/virtual/perl-Time-Piece-1.330.0
deleted file mode 100644
index b063af07d436..000000000000
--- a/metadata/md5-cache/virtual/perl-Time-Piece-1.330.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Time-Piece
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Time-Piece-1.330.0 ) dev-lang/perl:= !<perl-core/Time-Piece-1.330.0 !>perl-core/Time-Piece-1.330.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.260.0-r2 b/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.260.0-r2
deleted file mode 100644
index d234c159cc21..000000000000
--- a/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.260.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Unicode-Normalize
-EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Unicode-Normalize-1.260.0 ) dev-lang/perl:= !<perl-core/Unicode-Normalize-1.260.0 !>perl-core/Unicode-Normalize-1.260.0-r999
-SLOT=0
-_md5_=10eeb11fe450bb8994a11b58586a81d7
diff --git a/metadata/md5-cache/virtual/perl-autodie-2.290.0-r5 b/metadata/md5-cache/virtual/perl-autodie-2.290.0-r5
deleted file mode 100644
index e78dde7b11f6..000000000000
--- a/metadata/md5-cache/virtual/perl-autodie-2.290.0-r5
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for autodie
-EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/autodie-2.290.0 ) dev-lang/perl:= !<perl-core/autodie-2.290.0 !>perl-core/autodie-2.290.0-r999
-SLOT=0
-_md5_=10eeb11fe450bb8994a11b58586a81d7
diff --git a/metadata/md5-cache/virtual/perl-parent-0.237.0 b/metadata/md5-cache/virtual/perl-parent-0.237.0
deleted file mode 100644
index dd537d2967a9..000000000000
--- a/metadata/md5-cache/virtual/perl-parent-0.237.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for parent
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/parent-0.237.0 ) dev-lang/perl:= !<perl-core/parent-0.237.0 !>perl-core/parent-0.237.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-podlators-4.110.0 b/metadata/md5-cache/virtual/perl-podlators-4.110.0
deleted file mode 100644
index 9aebd2589abe..000000000000
--- a/metadata/md5-cache/virtual/perl-podlators-4.110.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for podlators
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/podlators-4.110.0 ) dev-lang/perl:= !<perl-core/podlators-4.110.0 !>perl-core/podlators-4.110.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/perl-threads-2.220.0-r2 b/metadata/md5-cache/virtual/perl-threads-2.220.0-r2
deleted file mode 100644
index 8f484f20810c..000000000000
--- a/metadata/md5-cache/virtual/perl-threads-2.220.0-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for threads
-EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30*[ithreads] ~perl-core/threads-2.220.0 ) dev-lang/perl:= !<perl-core/threads-2.220.0 !>perl-core/threads-2.220.0-r999
-SLOT=0
-_md5_=0222ddec541731813b51daeea02087a9
diff --git a/metadata/md5-cache/virtual/perl-threads-shared-1.600.0 b/metadata/md5-cache/virtual/perl-threads-shared-1.600.0
deleted file mode 100644
index 1dd2f8d19e89..000000000000
--- a/metadata/md5-cache/virtual/perl-threads-shared-1.600.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for threads-shared
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/threads-shared-1.600.0 ) dev-lang/perl:= !<perl-core/threads-shared-1.600.0 !>perl-core/threads-shared-1.600.0-r999
-SLOT=0
-_md5_=0e423d8b9ed7e623bbff3b02bc195ac9
diff --git a/metadata/md5-cache/virtual/rust-1.52.1 b/metadata/md5-cache/virtual/rust-1.52.1
index 11ed639f487e..6a5ebdcad281 100644
--- a/metadata/md5-cache/virtual/rust-1.52.1
+++ b/metadata/md5-cache/virtual/rust-1.52.1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Rust language compiler
 EAPI=7
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-RDEPEND=|| ( ~dev-lang/rust-1.52.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(-)?] ~dev-lang/rust-bin-1.52.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(-)?] )
+RDEPEND=|| ( ~dev-lang/rust-1.52.1[rustfmt?,abi_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/rust-bin-1.52.1[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cc4fe4d82fef82f9d12ee4ced86f1732
+_md5_=f4082e23bff8499d1e6d0721f66e6132
diff --git a/metadata/md5-cache/virtual/rust-1.53.0 b/metadata/md5-cache/virtual/rust-1.53.0
deleted file mode 100644
index 76d9a5e18dea..000000000000
--- a/metadata/md5-cache/virtual/rust-1.53.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Rust language compiler
-EAPI=7
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv x86
-RDEPEND=|| ( ~dev-lang/rust-1.53.0[abi_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/rust-bin-1.53.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d15844e2c8126e4bb9963a98ea766efe
diff --git a/metadata/md5-cache/virtual/rust-1.53.0-r1 b/metadata/md5-cache/virtual/rust-1.53.0-r1
new file mode 100644
index 000000000000..bf8c015a099f
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.53.0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=7
+IUSE=rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv x86
+RDEPEND=|| ( ~dev-lang/rust-1.53.0[rustfmt?,abi_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/rust-bin-1.53.0[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f99c928ff6bb71c7e94b40a862f5c1d2
diff --git a/metadata/md5-cache/virtual/rust-1.54.0 b/metadata/md5-cache/virtual/rust-1.54.0
new file mode 100644
index 000000000000..3a521485bbd9
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.54.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Rust language compiler
+EAPI=7
+IUSE=rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~dev-lang/rust-1.54.0[rustfmt?,abi_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/rust-bin-1.54.0[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8464fbd39e5a204486e22b1c8ec43be7
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 14e0ee7e54d3..9cca3892d301 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/airdcpp-webui-2.10.0 b/metadata/md5-cache/www-apps/airdcpp-webui-2.10.0
deleted file mode 100644
index ab6cf412e25b..000000000000
--- a/metadata/md5-cache/www-apps/airdcpp-webui-2.10.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Web interface for airdcpp-webclient
-EAPI=7
-HOMEPAGE=https://airdcpp-web.github.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND==net-p2p/airdcpp-webclient-2.10*
-SLOT=0
-SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-2.10.0.tgz
-_md5_=6c9494df11417428198de308ea279885
diff --git a/metadata/md5-cache/www-apps/airdcpp-webui-2.11.1 b/metadata/md5-cache/www-apps/airdcpp-webui-2.11.1
new file mode 100644
index 000000000000..d409e684cc13
--- /dev/null
+++ b/metadata/md5-cache/www-apps/airdcpp-webui-2.11.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Web interface for airdcpp-webclient
+EAPI=8
+HOMEPAGE=https://airdcpp-web.github.io/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND==net-p2p/airdcpp-webclient-2.11*
+SLOT=0
+SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-2.11.1.tgz
+_md5_=95c84b2bb5eb10e3f161a3429f1f1313
diff --git a/metadata/md5-cache/www-apps/bugzilla-5.0.6-r1 b/metadata/md5-cache/www-apps/bugzilla-5.0.6-r1
index b535f0d0454f..3f9f7eb4014d 100644
--- a/metadata/md5-cache/www-apps/bugzilla-5.0.6-r1
+++ b/metadata/md5-cache/www-apps/bugzilla-5.0.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite )
 RESTRICT=!test? ( test )
 SLOT=5.0.6-r1
 SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-5.0.6.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
 _md5_=5a391e923a051e3b8afc08261d145495
diff --git a/metadata/md5-cache/www-apps/davical-1.1.9.3-r1 b/metadata/md5-cache/www-apps/davical-1.1.9.3-r1
index c38a3961ec00..4c7a9ca11a8b 100644
--- a/metadata/md5-cache/www-apps/davical-1.1.9.3-r1
+++ b/metadata/md5-cache/www-apps/davical-1.1.9.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+ GPL-3+ LGPL-2.1+ LGPL-3+
 RDEPEND=app-admin/pwgen dev-lang/php[calendar,curl,iconv,imap,nls,pdo,postgres,xml] dev-perl/DBD-Pg dev-perl/DBI dev-perl/YAML >=dev-php/awl-0.61 virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=1.1.9.3-r1
 SRC_URI=https://www.davical.org/downloads/davical_1.1.9.3.orig.tar.xz -> davical-1.1.9.3.tar.xz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
 _md5_=a0de8ec33385ad23cb7add0e0a79db7d
diff --git a/metadata/md5-cache/www-apps/drupal-7.80 b/metadata/md5-cache/www-apps/drupal-7.80
deleted file mode 100644
index d2a5c710d48d..000000000000
--- a/metadata/md5-cache/www-apps/drupal-7.80
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=6
-HOMEPAGE=https://www.drupal.org/
-IUSE=+mysql postgres sqlite +uploadprogress vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=7.80
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-7.80.tar.gz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=e5c8001f7001f4aae3ec1e860f1b4e05
diff --git a/metadata/md5-cache/www-apps/drupal-7.82 b/metadata/md5-cache/www-apps/drupal-7.82
new file mode 100644
index 000000000000..e59d18eba3f6
--- /dev/null
+++ b/metadata/md5-cache/www-apps/drupal-7.82
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=6
+HOMEPAGE=https://www.drupal.org/
+IUSE=+mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=7.82
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-7.82.tar.gz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=e5c8001f7001f4aae3ec1e860f1b4e05
diff --git a/metadata/md5-cache/www-apps/drupal-8.9.14 b/metadata/md5-cache/www-apps/drupal-8.9.14
deleted file mode 100644
index 5a1efd1a288a..000000000000
--- a/metadata/md5-cache/www-apps/drupal-8.9.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=6
-HOMEPAGE=https://www.drupal.org/
-IUSE=+mysql postgres sqlite +uploadprogress vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=8.9.14
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.9.14.tar.gz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=b6ec4ee3b1ed75fd18f01c064305d900
diff --git a/metadata/md5-cache/www-apps/drupal-8.9.17 b/metadata/md5-cache/www-apps/drupal-8.9.17
new file mode 100644
index 000000000000..0666edfff495
--- /dev/null
+++ b/metadata/md5-cache/www-apps/drupal-8.9.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=6
+HOMEPAGE=https://www.drupal.org/
+IUSE=+mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=8.9.17
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.9.17.tar.gz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=b6ec4ee3b1ed75fd18f01c064305d900
diff --git a/metadata/md5-cache/www-apps/drupal-9.0.12 b/metadata/md5-cache/www-apps/drupal-9.0.12
deleted file mode 100644
index 130440306258..000000000000
--- a/metadata/md5-cache/www-apps/drupal-9.0.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=6
-HOMEPAGE=https://www.drupal.org/
-IUSE=+mysql postgres sqlite +uploadprogress vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=9.0.12
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.0.12.tar.gz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=b6ec4ee3b1ed75fd18f01c064305d900
diff --git a/metadata/md5-cache/www-apps/drupal-9.1.11 b/metadata/md5-cache/www-apps/drupal-9.1.11
new file mode 100644
index 000000000000..840db7f28a44
--- /dev/null
+++ b/metadata/md5-cache/www-apps/drupal-9.1.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=6
+HOMEPAGE=https://www.drupal.org/
+IUSE=+mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=9.1.11
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.1.11.tar.gz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=b6ec4ee3b1ed75fd18f01c064305d900
diff --git a/metadata/md5-cache/www-apps/drupal-9.1.7 b/metadata/md5-cache/www-apps/drupal-9.1.7
deleted file mode 100644
index 4da31166563f..000000000000
--- a/metadata/md5-cache/www-apps/drupal-9.1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=6
-HOMEPAGE=https://www.drupal.org/
-IUSE=+mysql postgres sqlite +uploadprogress vhosts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=9.1.7
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.1.7.tar.gz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=b6ec4ee3b1ed75fd18f01c064305d900
diff --git a/metadata/md5-cache/www-apps/drupal-9.2.3 b/metadata/md5-cache/www-apps/drupal-9.2.3
new file mode 100644
index 000000000000..9b0df6e31fa6
--- /dev/null
+++ b/metadata/md5-cache/www-apps/drupal-9.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=6
+HOMEPAGE=https://www.drupal.org/
+IUSE=+mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=9.2.3
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.2.3.tar.gz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=2ea7f12b6f80af4c713bb469f0e992f0
diff --git a/metadata/md5-cache/www-apps/element-1.7.34 b/metadata/md5-cache/www-apps/element-1.7.34
new file mode 100644
index 000000000000..3beba5883531
--- /dev/null
+++ b/metadata/md5-cache/www-apps/element-1.7.34
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A glossy Matrix collaboration client for the web
+EAPI=7
+HOMEPAGE=https://element.io/
+IUSE=vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-admin/webapp-config-1.50.15
+SLOT=1.7.34
+SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.7.34/element-v1.7.34.tar.gz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=162eb12efcdb368044c72d136d0c95ba
diff --git a/metadata/md5-cache/www-apps/icingaweb2-module-director-1.6.2 b/metadata/md5-cache/www-apps/icingaweb2-module-director-1.6.2
deleted file mode 100644
index d104fd973ea6..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-module-director-1.6.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=net-analyzer/icinga2-2.4.3 >=www-apps/icingaweb2-2.2.0 || ( dev-lang/php:5.6[curl] dev-lang/php:7.1[curl] dev-lang/php:7.2[curl] dev-lang/php:7.3[curl] )
-DESCRIPTION=Icinga Web 2 plugin for configuration
-EAPI=6
-HOMEPAGE=https://dev.icinga.org/projects/icingaweb2-module-director/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.4.3 >=www-apps/icingaweb2-2.2.0 || ( dev-lang/php:5.6[curl] dev-lang/php:7.1[curl] dev-lang/php:7.2[curl] dev-lang/php:7.3[curl] )
-SLOT=0
-SRC_URI=https://codeload.github.com/Icinga/icingaweb2-module-director/tar.gz/v1.6.2 -> icingaweb2-module-director-1.6.2.tar.gz
-_md5_=bab8f01d7025c3615d88b2284da4fea7
diff --git a/metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.0.1-r1 b/metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.0.1-r1
deleted file mode 100644
index 3223fe72e3c5..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.0.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=net-analyzer/icinga2-2.4.0 >=www-apps/icingaweb2-2.5.0
-DESCRIPTION=Icinga Web 2 plugin for Graphite
-EAPI=7
-HOMEPAGE=https://www.icinga.com/docs/graphite/latest/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.4.0 >=www-apps/icingaweb2-2.5.0
-SLOT=0
-SRC_URI=https://github.com/Icinga/icingaweb2-module-graphite/archive/v1.0.1.tar.gz -> icingaweb2-module-graphite-1.0.1.tar.gz
-_md5_=bb7a72679a2c00135852818b983065b3
diff --git a/metadata/md5-cache/www-apps/klaus-1.5.2 b/metadata/md5-cache/www-apps/klaus-1.5.2
index 267d93c480a7..3ded7a0e1239 100644
--- a/metadata/md5-cache/www-apps/klaus-1.5.2
+++ b/metadata/md5-cache/www-apps/klaus-1.5.2
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A simple, easy-to-set-up Git web viewer
 EAPI=7
 HOMEPAGE=https://github.com/jonashaag/klaus/
-IUSE=ctags python_targets_python3_8 python_targets_python3_9
+IUSE=ctags python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=>=dev-python/dulwich-0.19.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httpauth[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/humanize[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ctags? ( dev-python/python-ctags[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/dulwich-0.19.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpauth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/humanize[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ctags? ( dev-python/python-ctags[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/k/klaus/klaus-1.5.2.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=15045f3b26e5104f5767ea56d84f311e
+_md5_=294b9bf46ce5af391095215205036374
diff --git a/metadata/md5-cache/www-apps/moodle-3.10.5 b/metadata/md5-cache/www-apps/moodle-3.10.5
deleted file mode 100644
index 6f0e78cc5083..000000000000
--- a/metadata/md5-cache/www-apps/moodle-3.10.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=7
-HOMEPAGE=https://moodle.org
-IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-lang/php-7.2[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json(+),session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-SLOT=3.10.5
-SRC_URI=https://download.moodle.org/stable310/moodle-3.10.5.tgz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=a612e1ac56ae2bd5d9997ceba1cb16c1
diff --git a/metadata/md5-cache/www-apps/moodle-3.10.6 b/metadata/md5-cache/www-apps/moodle-3.10.6
new file mode 100644
index 000000000000..71aaf7c92919
--- /dev/null
+++ b/metadata/md5-cache/www-apps/moodle-3.10.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=The Moodle Course Management System
+EAPI=7
+HOMEPAGE=https://moodle.org
+IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-lang/php-7.2[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json(+),session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
+SLOT=3.10.6
+SRC_URI=https://download.moodle.org/stable310/moodle-3.10.6.tgz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=a612e1ac56ae2bd5d9997ceba1cb16c1
diff --git a/metadata/md5-cache/www-apps/moodle-3.11.1 b/metadata/md5-cache/www-apps/moodle-3.11.1
deleted file mode 100644
index da2e068cf627..000000000000
--- a/metadata/md5-cache/www-apps/moodle-3.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=7
-HOMEPAGE=https://moodle.org
-IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-lang/php-7.3[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json(+),session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-SLOT=3.11.1
-SRC_URI=https://download.moodle.org/stable311/moodle-3.11.1.tgz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=92988cc126bef4f59135158196356ef4
diff --git a/metadata/md5-cache/www-apps/moodle-3.11.2 b/metadata/md5-cache/www-apps/moodle-3.11.2
new file mode 100644
index 000000000000..169836cc6a2d
--- /dev/null
+++ b/metadata/md5-cache/www-apps/moodle-3.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=The Moodle Course Management System
+EAPI=7
+HOMEPAGE=https://moodle.org
+IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-lang/php-7.3[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json(+),session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
+SLOT=3.11.2
+SRC_URI=https://download.moodle.org/stable311/moodle-3.11.2.tgz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=92988cc126bef4f59135158196356ef4
diff --git a/metadata/md5-cache/www-apps/moodle-3.9.8 b/metadata/md5-cache/www-apps/moodle-3.9.8
deleted file mode 100644
index c8eaa303b418..000000000000
--- a/metadata/md5-cache/www-apps/moodle-3.9.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=7
-HOMEPAGE=https://moodle.org
-IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-lang/php-7.2[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json(+),session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-SLOT=3.9.8
-SRC_URI=https://download.moodle.org/stable39/moodle-3.9.8.tgz
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=a612e1ac56ae2bd5d9997ceba1cb16c1
diff --git a/metadata/md5-cache/www-apps/moodle-3.9.9 b/metadata/md5-cache/www-apps/moodle-3.9.9
new file mode 100644
index 000000000000..994ad25ebca3
--- /dev/null
+++ b/metadata/md5-cache/www-apps/moodle-3.9.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=The Moodle Course Management System
+EAPI=7
+HOMEPAGE=https://moodle.org
+IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-lang/php-7.2[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json(+),session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
+SLOT=3.9.9
+SRC_URI=https://download.moodle.org/stable39/moodle-3.9.9.tgz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=a612e1ac56ae2bd5d9997ceba1cb16c1
diff --git a/metadata/md5-cache/www-apps/nextcloud-20.0.12 b/metadata/md5-cache/www-apps/nextcloud-20.0.12
new file mode 100644
index 000000000000..c8f937e1cd22
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-20.0.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=7
+HOMEPAGE=https://nextcloud.com/
+IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=AGPL-3
+RDEPEND=<dev-lang/php-8[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=20.0.12
+SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-20.0.12.tar.bz2
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=ada5b7b008320626c71b7bf99484af75
diff --git a/metadata/md5-cache/www-apps/nextcloud-21.0.4 b/metadata/md5-cache/www-apps/nextcloud-21.0.4
new file mode 100644
index 000000000000..25cde7105d14
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-21.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=7
+HOMEPAGE=https://nextcloud.com/
+IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=21.0.4
+SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-21.0.4.tar.bz2
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=a09e2eb0f38ccb7d17832856088d7d81
diff --git a/metadata/md5-cache/www-apps/nextcloud-22.1.0 b/metadata/md5-cache/www-apps/nextcloud-22.1.0
new file mode 100644
index 000000000000..80198ce602b4
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-22.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=7
+HOMEPAGE=https://nextcloud.com/
+IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=22.1.0
+SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-22.1.0.tar.bz2
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=a09e2eb0f38ccb7d17832856088d7d81
diff --git a/metadata/md5-cache/www-apps/nextcloud-notify_push-0.2.2 b/metadata/md5-cache/www-apps/nextcloud-notify_push-0.2.2
new file mode 100644
index 000000000000..e5f4ac919ee4
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-notify_push-0.2.2
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.53 virtual/pkgconfig
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Push daemon for Nextcloud clients
+EAPI=8
+HOMEPAGE=https://github.com/nextcloud/notify_push
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT Apache-2.0 BSD GPL-3 ISC MPL-2.0
+RDEPEND=acct-group/nobody acct-user/nobody
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/nextcloud/notify_push/archive/refs/tags/v0.2.2.tar.gz -> nextcloud-notify_push-0.2.2.tar.gz https://crates.io/api/v1/crates/addr2line/0.16.0/download -> addr2line-0.16.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.7.4/download -> ahash-0.7.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/async-stream/0.3.2/download -> async-stream-0.3.2.crate https://crates.io/api/v1/crates/async-stream-impl/0.3.2/download -> async-stream-impl-0.3.2.crate https://crates.io/api/v1/crates/async-trait/0.1.51/download -> async-trait-0.1.51.crate https://crates.io/api/v1/crates/atoi/0.3.3/download -> atoi-0.3.3.crate https://crates.io/api/v1/crates/atoi/0.4.0/download -> atoi-0.4.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.61/download -> backtrace-0.3.61.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/beef/0.5.1/download -> beef-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/bitvec/0.19.5/download -> bitvec-0.19.5.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/buf_redux/0.8.4/download -> buf_redux-0.8.4.crate https://crates.io/api/v1/crates/build_const/0.2.2/download -> build_const-0.2.2.crate https://crates.io/api/v1/crates/bumpalo/3.7.0/download -> bumpalo-3.7.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.0.1/download -> bytes-1.0.1.crate https://crates.io/api/v1/crates/cc/1.0.69/download -> cc-1.0.69.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.0/download -> chunked_transfer-1.4.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/color-eyre/0.5.11/download -> color-eyre-0.5.11.crate https://crates.io/api/v1/crates/color-spantrace/0.1.6/download -> color-spantrace-0.1.6.crate https://crates.io/api/v1/crates/combine/4.6.0/download -> combine-4.6.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/cpufeatures/0.1.5/download -> cpufeatures-0.1.5.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/crc16/0.4.0/download -> crc16-0.4.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.2/download -> crossbeam-queue-0.3.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crypto-mac/0.10.1/download -> crypto-mac-0.10.1.crate https://crates.io/api/v1/crates/dashmap/4.0.2/download -> dashmap-4.0.2.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dotenv/0.15.0/download -> dotenv-0.15.0.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encoding_rs/0.8.28/download -> encoding_rs-0.8.28.crate https://crates.io/api/v1/crates/eyre/0.6.5/download -> eyre-0.6.5.crate https://crates.io/api/v1/crates/flexi_logger/0.18.0/download -> flexi_logger-0.18.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/funty/1.1.0/download -> funty-1.1.0.crate https://crates.io/api/v1/crates/futures/0.3.16/download -> futures-0.3.16.crate https://crates.io/api/v1/crates/futures-channel/0.3.16/download -> futures-channel-0.3.16.crate https://crates.io/api/v1/crates/futures-core/0.3.16/download -> futures-core-0.3.16.crate https://crates.io/api/v1/crates/futures-executor/0.3.16/download -> futures-executor-0.3.16.crate https://crates.io/api/v1/crates/futures-io/0.3.16/download -> futures-io-0.3.16.crate https://crates.io/api/v1/crates/futures-macro/0.3.16/download -> futures-macro-0.3.16.crate https://crates.io/api/v1/crates/futures-sink/0.3.16/download -> futures-sink-0.3.16.crate https://crates.io/api/v1/crates/futures-task/0.3.16/download -> futures-task-0.3.16.crate https://crates.io/api/v1/crates/futures-util/0.3.16/download -> futures-util-0.3.16.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gimli/0.25.0/download -> gimli-0.25.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/h2/0.3.3/download -> h2-0.3.3.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashlink/0.7.0/download -> hashlink-0.7.0.crate https://crates.io/api/v1/crates/headers/0.3.4/download -> headers-0.3.4.crate https://crates.io/api/v1/crates/headers-core/0.2.0/download -> headers-core-0.2.0.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/hmac/0.10.1/download -> hmac-0.10.1.crate https://crates.io/api/v1/crates/http/0.2.4/download -> http-0.2.4.crate https://crates.io/api/v1/crates/http-auth-basic/0.2.2/download -> http-auth-basic-0.2.2.crate https://crates.io/api/v1/crates/http-body/0.4.2/download -> http-body-0.4.2.crate https://crates.io/api/v1/crates/httparse/1.4.1/download -> httparse-1.4.1.crate https://crates.io/api/v1/crates/httpdate/1.0.1/download -> httpdate-1.0.1.crate https://crates.io/api/v1/crates/hyper/0.14.11/download -> hyper-0.14.11.crate https://crates.io/api/v1/crates/hyper-rustls/0.22.1/download -> hyper-rustls-0.22.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indenter/0.3.3/download -> indenter-0.3.3.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/input_buffer/0.4.0/download -> input_buffer-0.4.0.crate https://crates.io/api/v1/crates/instant/0.1.10/download -> instant-0.1.10.crate https://crates.io/api/v1/crates/ipnet/2.3.1/download -> ipnet-2.3.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/js-sys/0.3.51/download -> js-sys-0.3.51.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lexical-core/0.7.6/download -> lexical-core-0.7.6.crate https://crates.io/api/v1/crates/libc/0.2.98/download -> libc-0.2.98.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.22.2/download -> libsqlite3-sys-0.22.2.crate https://crates.io/api/v1/crates/lock_api/0.4.4/download -> lock_api-0.4.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/logos/0.12.0/download -> logos-0.12.0.crate https://crates.io/api/v1/crates/logos-derive/0.12.0/download -> logos-derive-0.12.0.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/matchers/0.0.1/download -> matchers-0.0.1.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/md-5/0.9.1/download -> md-5-0.9.1.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/mini-redis/0.4.1/download -> mini-redis-0.4.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.13/download -> mio-0.7.13.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/multipart/0.17.1/download -> multipart-0.17.1.crate https://crates.io/api/v1/crates/nextcloud-config-parser/0.4.0/download -> nextcloud-config-parser-0.4.0.crate https://crates.io/api/v1/crates/nextcloud_appinfo/0.6.0/download -> nextcloud_appinfo-0.6.0.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.2.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-bigint/0.3.2/download -> num-bigint-0.3.2.crate https://crates.io/api/v1/crates/num-bigint/0.4.0/download -> num-bigint-0.4.0.crate https://crates.io/api/v1/crates/num-bigint-dig/0.7.0/download -> num-bigint-dig-0.7.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/object/0.26.0/download -> object-0.26.0.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.4/download -> openssl-probe-0.1.4.crate https://crates.io/api/v1/crates/owo-colors/1.3.0/download -> owo-colors-1.3.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/parse-display/0.5.1/download -> parse-display-0.5.1.crate https://crates.io/api/v1/crates/parse-display-derive/0.5.1/download -> parse-display-derive-0.5.1.crate https://crates.io/api/v1/crates/pem/0.8.3/download -> pem-0.8.3.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/peresil/0.3.0/download -> peresil-0.3.0.crate https://crates.io/api/v1/crates/php-literal-parser/0.2.10/download -> php-literal-parser-0.2.10.crate https://crates.io/api/v1/crates/pin-project/1.0.8/download -> pin-project-1.0.8.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.8/download -> pin-project-internal-1.0.8.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.7/download -> proc-macro-nested-0.1.7.crate https://crates.io/api/v1/crates/proc-macro2/1.0.28/download -> proc-macro2-1.0.28.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/radium/0.5.3/download -> radium-0.5.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/redis/0.21.0/download -> redis-0.21.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.9/download -> redox_syscall-0.2.9.crate https://crates.io/api/v1/crates/redox_termios/0.1.2/download -> redox_termios-0.1.2.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.11.4/download -> reqwest-0.11.4.crate https://crates.io/api/v1/crates/rfc7239/0.1.0/download -> rfc7239-0.1.0.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rsa/0.4.1/download -> rsa-0.4.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.20/download -> rustc-demangle-0.1.20.crate https://crates.io/api/v1/crates/rustls/0.19.1/download -> rustls-0.19.1.crate https://crates.io/api/v1/crates/rustls-native-certs/0.5.0/download -> rustls-native-certs-0.5.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sct/0.6.1/download -> sct-0.6.1.crate https://crates.io/api/v1/crates/security-framework/2.3.1/download -> security-framework-2.3.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.3.0/download -> security-framework-sys-2.3.0.crate https://crates.io/api/v1/crates/semver/0.10.0/download -> semver-0.10.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.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_json/1.0.66/download -> serde_json-1.0.66.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.0/download -> serde_urlencoded-0.7.0.crate https://crates.io/api/v1/crates/sha-1/0.9.7/download -> sha-1-0.9.7.crate https://crates.io/api/v1/crates/sha1/0.6.0/download -> sha1-0.6.0.crate https://crates.io/api/v1/crates/sha2/0.9.5/download -> sha2-0.9.5.crate https://crates.io/api/v1/crates/sharded-slab/0.1.1/download -> sharded-slab-0.1.1.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/simple_asn1/0.5.4/download -> simple_asn1-0.5.4.crate https://crates.io/api/v1/crates/slab/0.4.3/download -> slab-0.4.3.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/socket2/0.4.1/download -> socket2-0.4.1.crate https://crates.io/api/v1/crates/source-span/2.2.1/download -> source-span-2.2.1.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/sqlformat/0.1.6/download -> sqlformat-0.1.6.crate https://crates.io/api/v1/crates/sqlx/0.5.5/download -> sqlx-0.5.5.crate https://crates.io/api/v1/crates/sqlx-core/0.5.5/download -> sqlx-core-0.5.5.crate https://crates.io/api/v1/crates/sqlx-macros/0.5.5/download -> sqlx-macros-0.5.5.crate https://crates.io/api/v1/crates/sqlx-rt/0.5.5/download -> sqlx-rt-0.5.5.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/stringprep/0.1.2/download -> stringprep-0.1.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structmeta/0.1.3/download -> structmeta-0.1.3.crate https://crates.io/api/v1/crates/structmeta-derive/0.1.3/download -> structmeta-derive-0.1.3.crate https://crates.io/api/v1/crates/structopt/0.3.22/download -> structopt-0.3.22.crate https://crates.io/api/v1/crates/structopt-derive/0.4.15/download -> structopt-derive-0.4.15.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/sxd-document/0.3.2/download -> sxd-document-0.3.2.crate https://crates.io/api/v1/crates/sxd-xpath/0.4.2/download -> sxd-xpath-0.4.2.crate https://crates.io/api/v1/crates/syn/1.0.74/download -> syn-1.0.74.crate https://crates.io/api/v1/crates/synstructure/0.12.5/download -> synstructure-0.12.5.crate https://crates.io/api/v1/crates/tap/1.0.1/download -> tap-1.0.1.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termion/1.5.6/download -> termion-1.5.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.26/download -> thiserror-1.0.26.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.26/download -> thiserror-impl-1.0.26.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.3.1/download -> tinyvec-1.3.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/1.9.0/download -> tokio-1.9.0.crate https://crates.io/api/v1/crates/tokio-macros/1.3.0/download -> tokio-macros-1.3.0.crate https://crates.io/api/v1/crates/tokio-rustls/0.22.0/download -> tokio-rustls-0.22.0.crate https://crates.io/api/v1/crates/tokio-stream/0.1.7/download -> tokio-stream-0.1.7.crate https://crates.io/api/v1/crates/tokio-tungstenite/0.13.0/download -> tokio-tungstenite-0.13.0.crate https://crates.io/api/v1/crates/tokio-tungstenite/0.15.0/download -> tokio-tungstenite-0.15.0.crate https://crates.io/api/v1/crates/tokio-util/0.6.7/download -> tokio-util-0.6.7.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.26/download -> tracing-0.1.26.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.15/download -> tracing-attributes-0.1.15.crate https://crates.io/api/v1/crates/tracing-core/0.1.18/download -> tracing-core-0.1.18.crate https://crates.io/api/v1/crates/tracing-error/0.1.2/download -> tracing-error-0.1.2.crate https://crates.io/api/v1/crates/tracing-futures/0.2.5/download -> tracing-futures-0.2.5.crate https://crates.io/api/v1/crates/tracing-log/0.1.2/download -> tracing-log-0.1.2.crate https://crates.io/api/v1/crates/tracing-serde/0.1.2/download -> tracing-serde-0.1.2.crate https://crates.io/api/v1/crates/tracing-subscriber/0.2.19/download -> tracing-subscriber-0.2.19.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/tungstenite/0.12.0/download -> tungstenite-0.12.0.crate https://crates.io/api/v1/crates/tungstenite/0.14.0/download -> tungstenite-0.14.0.crate https://crates.io/api/v1/crates/twoway/0.1.8/download -> twoway-0.1.8.crate https://crates.io/api/v1/crates/typed-arena/1.7.0/download -> typed-arena-1.7.0.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/uncased/0.9.6/download -> uncased-0.9.6.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unicode_categories/0.1.1/download -> unicode_categories-0.1.1.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.1.1/download -> ureq-2.1.1.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.4/download -> utf8-ranges-1.0.4.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/warp/0.3.1/download -> warp-0.3.1.crate https://crates.io/api/v1/crates/warp-real-ip/0.2.0/download -> warp-real-ip-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.74/download -> wasm-bindgen-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.74/download -> wasm-bindgen-backend-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.24/download -> wasm-bindgen-futures-0.4.24.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.74/download -> wasm-bindgen-macro-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.74/download -> wasm-bindgen-macro-support-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.74/download -> wasm-bindgen-shared-0.2.74.crate https://crates.io/api/v1/crates/web-sys/0.3.51/download -> web-sys-0.3.51.crate https://crates.io/api/v1/crates/webpki/0.21.4/download -> webpki-0.21.4.crate https://crates.io/api/v1/crates/webpki-roots/0.21.1/download -> webpki-roots-0.21.1.crate https://crates.io/api/v1/crates/whoami/1.1.2/download -> whoami-1.1.2.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winreg/0.7.0/download -> winreg-0.7.0.crate https://crates.io/api/v1/crates/wyz/0.2.0/download -> wyz-0.2.0.crate https://crates.io/api/v1/crates/xpath_reader/0.5.3/download -> xpath_reader-0.5.3.crate https://crates.io/api/v1/crates/yansi/0.5.0/download -> yansi-0.5.0.crate https://crates.io/api/v1/crates/zeroize/1.3.0/download -> zeroize-1.3.0.crate https://crates.io/api/v1/crates/zeroize_derive/1.1.0/download -> zeroize_derive-1.1.0.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6b9ed7f3ab3b1c1336f1058e13cf18c7
diff --git a/metadata/md5-cache/www-apps/phpsysinfo-3.3.2 b/metadata/md5-cache/www-apps/phpsysinfo-3.3.2
index 15eb1f546158..a670a138af4d 100644
--- a/metadata/md5-cache/www-apps/phpsysinfo-3.3.2
+++ b/metadata/md5-cache/www-apps/phpsysinfo-3.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=3.3.2
 SRC_URI=https://github.com/rk4an/phpsysinfo/archive/v3.3.2.tar.gz -> phpsysinfo-3.3.2.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
 _md5_=d4b49d9907e83f8d052045ac8ad5a9f9
diff --git a/metadata/md5-cache/www-apps/phpsysinfo-3.3.4 b/metadata/md5-cache/www-apps/phpsysinfo-3.3.4
index ab80e84ad969..09693afbbf9b 100644
--- a/metadata/md5-cache/www-apps/phpsysinfo-3.3.4
+++ b/metadata/md5-cache/www-apps/phpsysinfo-3.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=3.3.4
 SRC_URI=https://github.com/rk4an/phpsysinfo/archive/v3.3.4.tar.gz -> phpsysinfo-3.3.4.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
 _md5_=daec0c467f1c75b277048b12aa25d652
diff --git a/metadata/md5-cache/www-apps/prewikka-5.2.0 b/metadata/md5-cache/www-apps/prewikka-5.2.0
index a599a1d65a20..ab76e54410e1 100644
--- a/metadata/md5-cache/www-apps/prewikka-5.2.0
+++ b/metadata/md5-cache/www-apps/prewikka-5.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libprelude-5.2.0[python,python_targets_python3_8(-)?] <dev-li
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/prewikka-5.2.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=339a735a0f4d126757ae42a536a7b268
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 1767a402b905..b68f7c8b170c 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-92.0.4515.107 b/metadata/md5-cache/www-client/chromium-92.0.4515.107
index ee99bc3706a9..3a1618d9aaac 100644
--- a/metadata/md5-cache/www-client/chromium-92.0.4515.107
+++ b/metadata/md5-cache/www-client/chromium-92.0.4515.107
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= de
 REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-92.0.4515.107.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-92-patchset-7/chromium-92-patchset-7.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-92-glibc-2.33-patch.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz ) ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/chromium-92-ppc64le-1.tar.xz )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=26d102e42477c54546bc9fc27b7b037d
diff --git a/metadata/md5-cache/www-client/chromium-92.0.4515.131 b/metadata/md5-cache/www-client/chromium-92.0.4515.131
new file mode 100644
index 000000000000..0a5951060e9e
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-92.0.4515.131
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl dev-lang/python:2.7[xml] >=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:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-92.0.4515.131.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-92-patchset-7/chromium-92-patchset-7.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-92-glibc-2.33-patch.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz ) ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/chromium-92-ppc64le-1.tar.xz )
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8477427c8883694c235018817aeb2bf5
diff --git a/metadata/md5-cache/www-client/chromium-93.0.4577.18 b/metadata/md5-cache/www-client/chromium-93.0.4577.18
deleted file mode 100644
index b5c1b9e3185f..000000000000
--- a/metadata/md5-cache/www-client/chromium-93.0.4577.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0:= >=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:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0:= >=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:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-93.0.4577.18.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-93-patchset-6/chromium-93-patchset-6.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-92-glibc-2.33-patch.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
-_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=68281eaf975cebb69926566fc1841abe
diff --git a/metadata/md5-cache/www-client/chromium-93.0.4577.25 b/metadata/md5-cache/www-client/chromium-93.0.4577.25
new file mode 100644
index 000000000000..8e1545ccaa8d
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-93.0.4577.25
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0:= >=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:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0:= >=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:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-93.0.4577.25.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-93-patchset-6/chromium-93-patchset-6.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-92-glibc-2.33-patch.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b4064d5814e0382f2359d02bdace8425
diff --git a/metadata/md5-cache/www-client/chromium-94.0.4595.0 b/metadata/md5-cache/www-client/chromium-94.0.4595.0
new file mode 100644
index 000000000000..1025ac58f4ab
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-94.0.4595.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0:= >=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:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0:= >=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:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-94.0.4595.0.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-94-patchset-1/chromium-94-patchset-1.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1ba45f8af48982064738b8d81f608f88
diff --git a/metadata/md5-cache/www-client/dillo-3.1_pre20181005 b/metadata/md5-cache/www-client/dillo-3.1_pre20181005
index 23b72f2096d4..8ded2b457102 100644
--- a/metadata/md5-cache/www-client/dillo-3.1_pre20181005
+++ b/metadata/md5-cache/www-client/dillo-3.1_pre20181005
@@ -5,10 +5,10 @@ DESCRIPTION=Lean FLTK based web browser
 EAPI=7
 HOMEPAGE=https://www.dillo.org/
 IUSE=doc +gif ipv6 +jpeg +png ssl +xembed
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( net-libs/mbedtls:= )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/dillo-3.1_pre20181005.tar.xz mirror://gentoo/dillo.png
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=78b9e83e6fc20e2f565cc9a71de3522d
+_md5_=fbd79df021288884ede854a1912153bd
diff --git a/metadata/md5-cache/www-client/firefox-78.12.0 b/metadata/md5-cache/www-client/firefox-78.12.0
index e0f73c0d9fa7..bbf02ce8bd32 100644
--- a/metadata/md5-cache/www-client/firefox-78.12.0
+++ b/metadata/md5-cache/www-client/firefox-78.12.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >
 REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland ) wifi? ( dbus )
 SLOT=0/esr78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/source/firefox-78.12.0esr.source.tar.xz -> firefox-78.12.0esr.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-15.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-15.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.12.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.12.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.12.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.12.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.12.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.12.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.12.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.12.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.12.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.12.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.12.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.12.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.12.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.12.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.12.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.12.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.12.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.12.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.12.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.12.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.12.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.12.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.12.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.12.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.12.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.12.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.12.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.12.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.12.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.12.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.12.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.12.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.12.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.12.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.12.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.12.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.12.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.12.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.12.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.12.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.12.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.12.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.12.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.12.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.12.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.12.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.12.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.12.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.12.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.12.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.12.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.12.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.12.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.12.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.12.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.12.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.12.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.12.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.12.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.12.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.12.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.12.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.12.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.12.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.12.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.12.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.12.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.12.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.12.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.12.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.12.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.12.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.12.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.12.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.12.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.12.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.12.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.12.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.12.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.12.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.12.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.12.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.12.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.12.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.12.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.12.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.12.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.12.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.12.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.12.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.12.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.12.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.12.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.12.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.12.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.12.0esr-zh-TW.xpi )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=59001da5b2cc242aa7b5ce37265da2d2
diff --git a/metadata/md5-cache/www-client/firefox-90.0.2 b/metadata/md5-cache/www-client/firefox-90.0.2
index 831f052178bd..1ed3173f7b00 100644
--- a/metadata/md5-cache/www-client/firefox-90.0.2
+++ b/metadata/md5-cache/www-client/firefox-90.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/nss-3.66 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x
 REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
 SLOT=0/90
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/90.0.2/source/firefox-90.0.2.source.tar.xz -> firefox-90.0.2.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-90-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-90-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-90-patches-01.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ach.xpi -> firefox-90.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/af.xpi -> firefox-90.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/an.xpi -> firefox-90.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ar.xpi -> firefox-90.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ast.xpi -> firefox-90.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/az.xpi -> firefox-90.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/be.xpi -> firefox-90.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bg.xpi -> firefox-90.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bn.xpi -> firefox-90.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/br.xpi -> firefox-90.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/bs.xpi -> firefox-90.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-90.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ca.xpi -> firefox-90.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cak.xpi -> firefox-90.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cs.xpi -> firefox-90.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/cy.xpi -> firefox-90.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/da.xpi -> firefox-90.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/de.xpi -> firefox-90.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-90.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/el.xpi -> firefox-90.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-90.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-90.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/eo.xpi -> firefox-90.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-90.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-90.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-90.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-90.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/et.xpi -> firefox-90.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/eu.xpi -> firefox-90.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fa.xpi -> firefox-90.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ff.xpi -> firefox-90.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fi.xpi -> firefox-90.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fr.xpi -> firefox-90.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-90.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-90.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gd.xpi -> firefox-90.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gl.xpi -> firefox-90.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gn.xpi -> firefox-90.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-90.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/he.xpi -> firefox-90.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-90.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hr.xpi -> firefox-90.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-90.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hu.xpi -> firefox-90.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-90.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ia.xpi -> firefox-90.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/id.xpi -> firefox-90.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/is.xpi -> firefox-90.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/it.xpi -> firefox-90.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ja.xpi -> firefox-90.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ka.xpi -> firefox-90.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kab.xpi -> firefox-90.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kk.xpi -> firefox-90.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/km.xpi -> firefox-90.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/kn.xpi -> firefox-90.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ko.xpi -> firefox-90.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lij.xpi -> firefox-90.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lt.xpi -> firefox-90.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/lv.xpi -> firefox-90.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/mk.xpi -> firefox-90.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/mr.xpi -> firefox-90.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ms.xpi -> firefox-90.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/my.xpi -> firefox-90.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-90.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-90.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nl.xpi -> firefox-90.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-90.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/oc.xpi -> firefox-90.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-90.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pl.xpi -> firefox-90.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-90.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-90.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/rm.xpi -> firefox-90.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ro.xpi -> firefox-90.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ru.xpi -> firefox-90.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/si.xpi -> firefox-90.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sk.xpi -> firefox-90.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sl.xpi -> firefox-90.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/son.xpi -> firefox-90.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sq.xpi -> firefox-90.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sr.xpi -> firefox-90.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-90.0.2-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/szl.xpi -> firefox-90.0.2-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ta.xpi -> firefox-90.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/te.xpi -> firefox-90.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/th.xpi -> firefox-90.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/tl.xpi -> firefox-90.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/tr.xpi -> firefox-90.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/trs.xpi -> firefox-90.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/uk.xpi -> firefox-90.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/ur.xpi -> firefox-90.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/uz.xpi -> firefox-90.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/vi.xpi -> firefox-90.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/xh.xpi -> firefox-90.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-90.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-90.0.2-zh-TW.xpi )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=48d7f3319df476e70f6327eae6f06f60
diff --git a/metadata/md5-cache/www-client/google-chrome-92.0.4515.107 b/metadata/md5-cache/www-client/google-chrome-92.0.4515.107
deleted file mode 100644
index 89e7c3e1b907..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-92.0.4515.107
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Google
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_92.0.4515.107-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0ee4a56f10b145d892581d5e32ef181c
diff --git a/metadata/md5-cache/www-client/google-chrome-92.0.4515.131 b/metadata/md5-cache/www-client/google-chrome-92.0.4515.131
new file mode 100644
index 000000000000..8311331d32cb
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-92.0.4515.131
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The web browser from Google
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_92.0.4515.131-1_amd64.deb
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0ee4a56f10b145d892581d5e32ef181c
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.18 b/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.18
deleted file mode 100644
index f3f861372d47..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Google
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_93.0.4577.18-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcc54f6c33b23e21a948dc2d14b06bdc
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.25 b/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.25
new file mode 100644
index 000000000000..32ddf9b1bbb3
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-93.0.4577.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The web browser from Google
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_93.0.4577.25-1_amd64.deb
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=737deb7996e08ef81d69d2897d29dfb2
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4577.18 b/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4577.18
deleted file mode 100644
index 5655865ceae1..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4577.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Google
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_93.0.4577.18-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcc54f6c33b23e21a948dc2d14b06bdc
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-94.0.4595.0 b/metadata/md5-cache/www-client/google-chrome-unstable-94.0.4595.0
new file mode 100644
index 000000000000..94bb3488192b
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-94.0.4595.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The web browser from Google
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_94.0.4595.0-1_amd64.deb
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=737deb7996e08ef81d69d2897d29dfb2
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.49 b/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.49
deleted file mode 100644
index dd76732ada17..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-92.0.902.49
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Microsoft
-EAPI=7
-HOMEPAGE=https://www.microsoft.com/en-us/edge
-IUSE=kernel_linux
-KEYWORDS=-* ~amd64
-LICENSE=microsoft-edge
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_92.0.902.49-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-93.0.961.11 b/metadata/md5-cache/www-client/microsoft-edge-beta-93.0.961.11
new file mode 100644
index 000000000000..2cc875298453
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-93.0.961.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The web browser from Microsoft
+EAPI=7
+HOMEPAGE=https://www.microsoft.com/en-us/edge
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=microsoft-edge
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_93.0.961.11-1_amd64.deb
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.946.1 b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.946.1
deleted file mode 100644
index c0df3086562b..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.946.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Microsoft
-EAPI=7
-HOMEPAGE=https://www.microsoft.com/en-us/edge
-IUSE=kernel_linux
-KEYWORDS=-* ~amd64
-LICENSE=microsoft-edge
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_93.0.946.1-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.957.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.957.0
deleted file mode 100644
index 928cd0546a42..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.957.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Microsoft
-EAPI=7
-HOMEPAGE=https://www.microsoft.com/en-us/edge
-IUSE=kernel_linux
-KEYWORDS=-* ~amd64
-LICENSE=microsoft-edge
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_93.0.957.0-1_amd64.deb
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.961.10 b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.961.10
new file mode 100644
index 000000000000..72f869e85ba8
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-93.0.961.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The web browser from Microsoft
+EAPI=7
+HOMEPAGE=https://www.microsoft.com/en-us/edge
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=microsoft-edge
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_93.0.961.10-1_amd64.deb
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4384ee9b7aa07b38e4b7d7250f6b6862
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-94.0.972.2 b/metadata/md5-cache/www-client/microsoft-edge-dev-94.0.972.2
new file mode 100644
index 000000000000..9edbcf21c8bc
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-94.0.972.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The web browser from Microsoft
+EAPI=7
+HOMEPAGE=https://www.microsoft.com/en-us/edge
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=microsoft-edge
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_94.0.972.2-1_amd64.deb
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=cb79728769d82d0c18e5a479daecae2d
diff --git a/metadata/md5-cache/www-client/opera-developer-79.0.4100.0 b/metadata/md5-cache/www-client/opera-developer-79.0.4100.0
deleted file mode 100644
index f6631a66be1d..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-79.0.4100.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=OPERA-2018
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-developer/79.0.4100.0/linux/opera-developer_79.0.4100.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/79.0.4100.0/linux/opera-developer_79.0.4100.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/79.0.4100.0/linux/opera-developer_79.0.4100.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/79.0.4100.0/linux/opera-developer_79.0.4100.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-92.0.4515.20.tar.xz )
-_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5c15c634a063e31582a9d6d3c4bf9b75
diff --git a/metadata/md5-cache/www-client/opera-developer-79.0.4135.0 b/metadata/md5-cache/www-client/opera-developer-79.0.4135.0
new file mode 100644
index 000000000000..22b5514ac062
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-79.0.4135.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=OPERA-2018
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera-developer/79.0.4135.0/linux/opera-developer_79.0.4135.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/79.0.4135.0/linux/opera-developer_79.0.4135.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/79.0.4135.0/linux/opera-developer_79.0.4135.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/79.0.4135.0/linux/opera-developer_79.0.4135.0_amd64.deb proprietary-codecs? ( https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-93.0.4573.0.tar.xz )
+_eclasses_=chromium-2	5c8f27044b5401cdbf32dbf6c6cdfbea	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e39d64062f349fbd8030808b2b2f7462
diff --git a/metadata/md5-cache/www-client/qutebrowser-2.1.1 b/metadata/md5-cache/www-client/qutebrowser-2.1.1
index 163fba5860e3..cdd421ddc422 100644
--- a/metadata/md5-cache/www-client/qutebrowser-2.1.1
+++ b/metadata/md5-cache/www-client/qutebrowser-2.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v2.1.1/qutebrowser-2.1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0a7918f7c9923f7bf502e9c3d1b00e9c
diff --git a/metadata/md5-cache/www-client/qutebrowser-2.2.2 b/metadata/md5-cache/www-client/qutebrowser-2.2.2
index c37d3f27a255..05824d46a65d 100644
--- a/metadata/md5-cache/www-client/qutebrowser-2.2.2
+++ b/metadata/md5-cache/www-client/qutebrowser-2.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v2.2.2/qutebrowser-2.2.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b7813653c2455330a6687381d43fa68c
diff --git a/metadata/md5-cache/www-client/qutebrowser-2.2.3-r1 b/metadata/md5-cache/www-client/qutebrowser-2.2.3-r1
index ba8dfb8fab9b..635dbe4ffe36 100644
--- a/metadata/md5-cache/www-client/qutebrowser-2.2.3-r1
+++ b/metadata/md5-cache/www-client/qutebrowser-2.2.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v2.2.3/qutebrowser-2.2.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b75c6a60dd345c917354d2c0896aa2c9
diff --git a/metadata/md5-cache/www-client/qutebrowser-2.3.0 b/metadata/md5-cache/www-client/qutebrowser-2.3.0
index 2904213d7ce7..b957d7021f4d 100644
--- a/metadata/md5-cache/www-client/qutebrowser-2.3.0
+++ b/metadata/md5-cache/www-client/qutebrowser-2.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v2.3.0/qutebrowser-2.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8cfbb6090e2eb071494a821d65aace10
diff --git a/metadata/md5-cache/www-client/qutebrowser-9999 b/metadata/md5-cache/www-client/qutebrowser-9999
index 7c8871c97898..452f0de33c87 100644
--- a/metadata/md5-cache/www-client/qutebrowser-9999
+++ b/metadata/md5-cache/www-client/qutebrowser-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=abce7871d423de80c5c13123434f09da
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.7.1-r1 b/metadata/md5-cache/www-client/seamonkey-2.53.7.1-r1
index e3b59c53af3c..d0a13dd9e6b3 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.53.7.1-r1
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.7.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.7.1/source/seamonkey-2.53.7.1.source.tar.xz -> seamonkey-2.53.7.1.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.7.1/source/seamonkey-2.53.7.1.source-l10n.tar.xz -> seamonkey-2.53.7.1.source-l10n.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.53.6_beta1-patches-01.tar.xz system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.3-system_libvpx-1.8.patch.xz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	5366c6998d5538c65a3126b1b22094d5	mozextension	02419f8d0c6b57fd23bb4e875a37996a	mozlinguas-v2	7dd55f04a3aceef648244656b82152bb	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	5366c6998d5538c65a3126b1b22094d5	mozextension	02419f8d0c6b57fd23bb4e875a37996a	mozlinguas-v2	7dd55f04a3aceef648244656b82152bb	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ee4e6211ffb20c2a503dbec9dd9ab28d
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.8 b/metadata/md5-cache/www-client/seamonkey-2.53.8
index 3da181277bf7..65ff6ce307fa 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.53.8
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.8
@@ -11,5 +11,5 @@ RDEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.8/source/seamonkey-2.53.8.source.tar.xz -> seamonkey-2.53.8.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.8/source/seamonkey-2.53.8.source-l10n.tar.xz -> seamonkey-2.53.8.source-l10n.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.53.8_beta1-patches-01.tar.xz system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.3-system_libvpx-1.8.patch.xz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	5366c6998d5538c65a3126b1b22094d5	mozextension	02419f8d0c6b57fd23bb4e875a37996a	mozlinguas-v2	7dd55f04a3aceef648244656b82152bb	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	5366c6998d5538c65a3126b1b22094d5	mozextension	02419f8d0c6b57fd23bb4e875a37996a	mozlinguas-v2	7dd55f04a3aceef648244656b82152bb	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2a946d9f6ed1a02cb75e86dc83ca5991
diff --git a/metadata/md5-cache/www-client/seamonkey-2.53.8.1 b/metadata/md5-cache/www-client/seamonkey-2.53.8.1
index b1ceb919567e..2eba10f05954 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.53.8.1
+++ b/metadata/md5-cache/www-client/seamonkey-2.53.8.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-text/hunspell-1.5.4:= dev-libs/atk >=dev-libs/glib-2.26:2 >=dev-li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.53.8.1/source/seamonkey-2.53.8.1.source.tar.xz -> seamonkey-2.53.8.1.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.53.8.1/source/seamonkey-2.53.8.1.source-l10n.tar.xz -> seamonkey-2.53.8.1.source-l10n.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.53.8_beta1-patches-01.tar.xz system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/seamonkey-2.53.3-system_libvpx-1.8.patch.xz )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	5366c6998d5538c65a3126b1b22094d5	mozextension	02419f8d0c6b57fd23bb4e875a37996a	mozlinguas-v2	7dd55f04a3aceef648244656b82152bb	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mozcoreconf-v6	5366c6998d5538c65a3126b1b22094d5	mozextension	02419f8d0c6b57fd23bb4e875a37996a	mozlinguas-v2	7dd55f04a3aceef648244656b82152bb	multilib	97566c1a256d07b00848aa767e38a352	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2a946d9f6ed1a02cb75e86dc83ca5991
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 41be78add3e6..96f15d379155 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/monitorix-3.13.1 b/metadata/md5-cache/www-misc/monitorix-3.13.1
index 97d6b7d381dd..2402e051552b 100644
--- a/metadata/md5-cache/www-misc/monitorix-3.13.1
+++ b/metadata/md5-cache/www-misc/monitorix-3.13.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=acct-user/monitorix acct-group/monitorix dev-perl/Config-General dev-perl/DBI dev-perl/HTTP-Server-Simple dev-perl/IO-Socket-SSL dev-perl/libwww-perl dev-perl/MIME-Lite dev-perl/XML-Simple net-analyzer/rrdtool[graph,perl] dev-perl/CGI
 SLOT=0
 SRC_URI=https://www.monitorix.org/monitorix-3.13.1.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aaa23850d2d828bb8f55c4b29ffa8f49
diff --git a/metadata/md5-cache/www-misc/wsmake-0.6.4 b/metadata/md5-cache/www-misc/wsmake-0.6.4
deleted file mode 100644
index e7b3b8f0b8ef..000000000000
--- a/metadata/md5-cache/www-misc/wsmake-0.6.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Website pre-processor features tag substitution and page ordering
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/wsmake/
-IUSE=examples
-KEYWORDS=x86
-LICENSE=GPL-2+ Artistic
-SLOT=0
-SRC_URI=mirror://sourceforge/wsmake/wsmake-0.6.4.tar.bz2
-_md5_=1afe4a480bafeb92d2e221c6acd98752
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 56d8eea1d1a6..274bd31f5191 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-92.0.4515.107 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.107
deleted file mode 100644
index 3504c3eed18c..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.107
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_92.0.4515.107-1_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=479a55ea044ba46c0c088e62c24c75c3
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.131 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.131
new file mode 100644
index 000000000000..f28bcb3ade0b
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.131
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=stable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_92.0.4515.131-1_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=479a55ea044ba46c0c088e62c24c75c3
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.18_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.18_alpha
deleted file mode 100644
index 131cb49efc74..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.18_alpha
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
-RESTRICT=bindist mirror strip
-SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_93.0.4577.18-1_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.18_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.18_beta
deleted file mode 100644
index 238f25a59882..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.18_beta
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=7
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_93.0.4577.18-1_amd64.deb
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
-_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.25_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.25_beta
new file mode 100644
index 000000000000..5d4c3953bc2f
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4577.25_beta
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=beta
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_93.0.4577.25-1_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-94.0.4595.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-94.0.4595.0_alpha
new file mode 100644
index 000000000000..c3b65b817840
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-94.0.4595.0_alpha
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=7
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
+RESTRICT=bindist mirror strip
+SLOT=unstable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_94.0.4595.0-1_amd64.deb
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a
+_md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 9cc3289a9bc1..0b4d68f3c5dc 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
index 7e37782e897c..0efa87284211 100644
--- a/metadata/md5-cache/www-servers/gunicorn-20.1.0
+++ b/metadata/md5-cache/www-servers/gunicorn-20.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/benoitc/gunicorn/archive/20.1.0.tar.gz -> gunicorn-20.1.0.tar.gz
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8be2bf0ae866e542e295316a253bd8ea
diff --git a/metadata/md5-cache/www-servers/nginx-1.20.1-r2 b/metadata/md5-cache/www-servers/nginx-1.20.1-r2
index c451ec1aa72c..521183c332c9 100644
--- a/metadata/md5-cache/www-servers/nginx-1.20.1-r2
+++ b/metadata/md5-cache/www-servers/nginx-1.20.1-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Robust, small and high performance http and reverse proxy server
 EAPI=7
 HOMEPAGE=https://nginx.org
 IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
 RDEPEND=virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nginx.org/download/nginx-1.20.1.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.6.0.tar.gz -> njs-0.6.0.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.6.0.tar.gz -> njs-0.6.0.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	d7fc7edcf6eef719ce5cc76acbde4f18	lua-utils	b2a391a6023bd5e1245bf27407f2f684	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	0ee2b2b92175720c966a5608c62b458d	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=21b7bef1e3c878aa34610b1354a66476
+_md5_=7d1da47d04d376518954b02a385f812e
diff --git a/metadata/md5-cache/www-servers/tornado-6.1 b/metadata/md5-cache/www-servers/tornado-6.1
index a9db48379ee5..82ef5e5d6935 100644
--- a/metadata/md5-cache/www-servers/tornado-6.1
+++ b/metadata/md5-cache/www-servers/tornado-6.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python web framework and asynchronous networking library
 EAPI=7
 HOMEPAGE=https://www.tornadoweb.org/
 IUSE=examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pycurl-7.19.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-6.1.tar.gz
 _eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=047e1df1bc231dd864dfc6d49882fa64
+_md5_=3318d0954d93c0bbde0efa72fea49804
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 7d09cd094365..5f7a6d57ca34 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/xeyes-1.2.0 b/metadata/md5-cache/x11-apps/xeyes-1.2.0
new file mode 100644
index 000000000000..5475a8454c0a
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xeyes-1.2.0
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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/libXi-1.7 x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender x11-libs/libxcb x11-base/xorg-proto
+DESCRIPTION=X.Org xeyes application
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xeyes
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc64-solaris
+LICENSE=MIT
+RDEPEND=>=x11-libs/libXi-1.7 x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender x11-libs/libxcb
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xeyes-1.2.0.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=14a5308809342989a8cbbe8cea3c6a7c
diff --git a/metadata/md5-cache/x11-misc/xrestop-0.4 b/metadata/md5-cache/x11-apps/xrestop-0.4
index 5e6ecebbdda5..5e6ecebbdda5 100644
--- a/metadata/md5-cache/x11-misc/xrestop-0.4
+++ b/metadata/md5-cache/x11-apps/xrestop-0.4
diff --git a/metadata/md5-cache/x11-apps/xrestop-0.5 b/metadata/md5-cache/x11-apps/xrestop-0.5
new file mode 100644
index 000000000000..f6d553a147b0
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xrestop-0.5
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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=sys-libs/ncurses:= x11-libs/libX11 x11-libs/libXres x11-libs/libXt x11-base/xorg-proto
+DESCRIPTION='Top' like statistics of X11 client's server side resource usage
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/xrestop
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:= x11-libs/libX11 x11-libs/libXres x11-libs/libXt
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xrestop-0.5.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=ccf9f2bd9f57c5d1143381d18b27c0fd
diff --git a/metadata/md5-cache/x11-apps/xwd-1.0.8 b/metadata/md5-cache/x11-apps/xwd-1.0.8
new file mode 100644
index 000000000000..00a295ac4f30
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xwd-1.0.8
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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.8.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=1703afcbe884a42b18f87161ae7ae630
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 528dd1f41e29..35e5ba5de29d 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xwayland-21.1.2-r2 b/metadata/md5-cache/x11-base/xwayland-21.1.2-r2
new file mode 100644
index 000000000000..65161be36a54
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xwayland-21.1.2-r2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3
+DESCRIPTION=Standalone X server running under Wayland
+EAPI=7
+HOMEPAGE=https://wayland.freedesktop.org/xserver.html
+IUSE=rpc unwind ipv6 xcsecurity selinux video_cards_nvidia
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= dev-libs/wayland video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 rpc? ( net-libs/libtirpc ) >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3 x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
+SLOT=0
+SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-21.1.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5856def41a54a26a1cd86158db5e9c87
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 042cefed7f13..fecdb5580896 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.143-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.143-r1
deleted file mode 100644
index c507361813a2..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.143-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-misc/pax-utils virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=7
-HOMEPAGE=https://www.nvidia.com/download/index.aspx
-IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2 MIT NVIDIA-r2
-RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
-SLOT=0/390
-SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.143/NVIDIA-Linux-x86_64-390.143.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.143/NVIDIA-Linux-x86-390.143.run ) https://github.com/NVIDIA/nvidia-installer/archive/390.143.tar.gz -> nvidia-installer-390.143.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/390.143.tar.gz -> nvidia-modprobe-390.143.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/390.143.tar.gz -> nvidia-persistenced-390.143.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/390.143.tar.gz -> nvidia-settings-390.143.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/390.143.tar.gz -> nvidia-xconfig-390.143.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a31a3f1da640e067f78d0f2d31ee3ac8
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67 b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67
deleted file mode 100644
index 84fbab444a09..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.67
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-misc/pax-utils virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=7
-HOMEPAGE=https://www.nvidia.com/download/index.aspx
-IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64
-LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
-RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
-SLOT=0/460
-SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/460.67/NVIDIA-Linux-x86_64-460.67.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/460.67/NVIDIA-Linux-aarch64-460.67.run ) https://github.com/NVIDIA/nvidia-installer/archive/460.67.tar.gz -> nvidia-installer-460.67.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/460.67.tar.gz -> nvidia-modprobe-460.67.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/460.67.tar.gz -> nvidia-persistenced-460.67.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/460.67.tar.gz -> nvidia-settings-460.67.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/460.67.tar.gz -> nvidia-xconfig-460.67.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2c24e8024cb20aa2301c7e44e46d42da
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.84 b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.84
deleted file mode 100644
index c868b98b2edc..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.84
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-misc/pax-utils virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=7
-HOMEPAGE=https://www.nvidia.com/download/index.aspx
-IUSE=+X +driver static-libs +tools kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64
-LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
-RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
-SLOT=0/460
-SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/460.84/NVIDIA-Linux-x86_64-460.84.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/460.84/NVIDIA-Linux-aarch64-460.84.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-460.84.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-460.84.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-460.84.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.84.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-460.84.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e82f9c9c9c0271e4dac1902ba4e4555e
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
index d09025eca017..6b65749dff97 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
@@ -10,5 +10,5 @@ LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
 RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/460
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/460.91.03/NVIDIA-Linux-x86_64-460.91.03.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/460.91.03/NVIDIA-Linux-aarch64-460.91.03.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-460.91.03.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	linux-mod	17a64f2afa0418f425ab010223fc0d48	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	optfeature	30ce9dec2b8943338c9b015bd32bac6a	readme.gentoo-r1	e51390d48521eb3d400db57d557b7530	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	2eeba54233fa41bdb15dcddcb63fba3a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=caf731fad15cbae21a269c54bb7dfab0
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 3aefa18d4e89..7e18c576c7bf 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/libXfont2-2.0.5 b/metadata/md5-cache/x11-libs/libXfont2-2.0.5
new file mode 100644
index 000000000000..4b2d569acc13
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXfont2-2.0.5
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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 doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=sys-libs/zlib dev-libs/libbsd x11-libs/libfontenc bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 ) x11-base/xorg-proto x11-libs/xtrans
+DESCRIPTION=X.Org Xfont library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxfont
+IUSE=bzip2 ipv6 truetype doc
+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
+RDEPEND=sys-libs/zlib dev-libs/libbsd x11-libs/libfontenc bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXfont2-2.0.5.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=2fae5d9054eae7b86405f9ba61d22d85
diff --git a/metadata/md5-cache/x11-libs/libXfont2-9999 b/metadata/md5-cache/x11-libs/libXfont2-9999
index d94d9ef79e95..8ba95545fd68 100644
--- a/metadata/md5-cache/x11-libs/libXfont2-9999
+++ b/metadata/md5-cache/x11-libs/libXfont2-9999
@@ -1,13 +1,13 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=sys-libs/zlib x11-base/xorg-proto x11-libs/libfontenc bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 ) x11-base/xorg-proto x11-libs/xtrans
+DEPEND=sys-libs/zlib dev-libs/libbsd x11-libs/libfontenc bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 ) x11-base/xorg-proto x11-libs/xtrans
 DESCRIPTION=X.Org Xfont library
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxfont
 IUSE=bzip2 ipv6 truetype doc
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=sys-libs/zlib x11-base/xorg-proto x11-libs/libfontenc bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 )
+RDEPEND=sys-libs/zlib dev-libs/libbsd x11-libs/libfontenc bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 )
 SLOT=0
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
-_md5_=53570727954493d0e593dfb359d1aba2
+_md5_=f0e2cb1c1eef67dd8601d6206d14a36a
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.4 b/metadata/md5-cache/x11-libs/libXft-2.3.4
new file mode 100644
index 000000000000..e0fb37fa321a
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.4
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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 test unpack
+DEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/ttf-fonts >=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/libXrender-0.9.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(-)?] x11-base/xorg-proto
+DESCRIPTION=X.Org Xft library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXft
+IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/ttf-fonts >=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/libXrender-0.9.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(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXft-2.3.4.tar.bz2
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=4b7cd3a155f77d8af48f109d976f3211
diff --git a/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r3 b/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r3
index 86d8f61ee629..3b217b7ab5d9 100644
--- a/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r3
+++ b/metadata/md5-cache/x11-libs/neXtaw-0.15.1-r3
@@ -3,9 +3,9 @@ DEPEND=x11-base/xorg-proto x11-libs/libICE x11-libs/libXext x11-libs/libXt x11-l
 DESCRIPTION=Athena Widgets with N*XTSTEP appearance
 EAPI=7
 HOMEPAGE=http://siag.nu/neXtaw/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=BSD
 RDEPEND=x11-base/xorg-proto x11-libs/libICE x11-libs/libXext x11-libs/libXt x11-libs/libX11 x11-libs/libSM x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXpm !<x11-libs/neXtaw-0.15.1-r1
 SLOT=0
 SRC_URI=http://siag.nu/pub/neXtaw/neXtaw-0.15.1.tar.gz
-_md5_=a7cfebe2cce8e11615942aef68f90874
+_md5_=393914a8f3e443d48f00718de8af9f64
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.11.5 b/metadata/md5-cache/x11-libs/qscintilla-2.11.5
deleted file mode 100644
index 828d39b86b6c..000000000000
--- a/metadata/md5-cache/x11-libs/qscintilla-2.11.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
-DESCRIPTION=Qt port of Neil Hodgson's Scintilla C++ editor control
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
-IUSE=designer doc
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
-SLOT=0/15
-SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.5/QScintilla-2.11.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c71c9973949624185f3535a931317961
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.11.6 b/metadata/md5-cache/x11-libs/qscintilla-2.11.6
index 044374e45dab..b0644f2c08c9 100644
--- a/metadata/md5-cache/x11-libs/qscintilla-2.11.6
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.11.6
@@ -4,10 +4,10 @@ DESCRIPTION=Qt port of Neil Hodgson's Scintilla C++ editor control
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
 IUSE=designer doc
-KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
 SLOT=0/15
 SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.6/QScintilla-2.11.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=80b5e31715c044cde91cf7f64709e21a
+_md5_=77a7f9cc98036808064dad51be546c67
diff --git a/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1 b/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
index 67d6dd970f06..0cff783078e3 100644
--- a/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
+++ b/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Multi platform Qt notification framework
 EAPI=7
 HOMEPAGE=https://techbase.kde.org/Projects/Snorenotify
 IUSE=sound test test debug
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sound? ( dev-qt/qtmultimedia:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/snorenotify/0.7.0/src/snorenotify-0.7.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=876a02f5b20b72c0ddb7c6ebc951850d
+_md5_=77852b5486b86ae1f0f90df7f9696f8d
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index e046c66eb261..e8688a130ab2 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/appmenu-gtk-module-0.7.3-r1 b/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
deleted file mode 100644
index 1bcd7babf42e..000000000000
--- a/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/glib[dbus] >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gtk+-3.22.0:3 dev-libs/wayland
-DESCRIPTION=Application menu module for GTK
-EAPI=7
-HOMEPAGE=https://gitlab.com/vala-panel-project/vala-panel-appmenu
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-libs/glib[dbus] >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gtk+-3.22.0:3
-SLOT=0
-SRC_URI=https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d1a65e77d42cb19e5972d0d1b84/appmenu-gtk-module-0.7.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0c0f1322fb01e114091a714ebd494cc2
diff --git a/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r2 b/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r2
new file mode 100644
index 000000000000..c8005c40ce5d
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/glib[dbus] >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gtk+-3.22.0:3[wayland=] dev-libs/wayland
+DESCRIPTION=Application menu module for GTK
+EAPI=7
+HOMEPAGE=https://gitlab.com/vala-panel-project/vala-panel-appmenu
+IUSE=wayland
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=dev-libs/glib[dbus] >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gtk+-3.22.0:3[wayland=]
+SLOT=0
+SRC_URI=https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d1a65e77d42cb19e5972d0d1b84/appmenu-gtk-module-0.7.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ca2a15b1418bdcba1399bc7fae791e70
diff --git a/metadata/md5-cache/x11-misc/colord-1.3.5 b/metadata/md5-cache/x11-misc/colord-1.3.5
index 95d42d17eb91..6d72e66d49dd 100644
--- a/metadata/md5-cache/x11-misc/colord-1.3.5
+++ b/metadata/md5-cache/x11-misc/colord-1.3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=gusb? ( udev ) scanner? ( udev ) vala? ( introspection )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-1.3.5.tar.xz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	97b90bd8fb799993925e6b3a683184e5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	bash-completion-r1	d3a60385655d9b402be765a6de333245	check-reqs	bfb51de63b0462097e40436214dd43c8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8a668d87bd358d736c8249d3cb9f65e9
diff --git a/metadata/md5-cache/x11-misc/colord-1.4.5-r1 b/metadata/md5-cache/x11-misc/colord-1.4.5-r1
index ead7d366f773..c20ff4281e35 100644
--- a/metadata/md5-cache/x11-misc/colord-1.4.5-r1
+++ b/metadata/md5-cache/x11-misc/colord-1.4.5-r1
@@ -5,7 +5,7 @@ DESCRIPTION=System service to accurately color manage input and output devices
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/software/colord/
 IUSE=gtk-doc argyllcms examples extra-print-profiles +introspection scanner systemd test +udev 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.58.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.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(-)?] dev-db/sqlite:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgusb-0.2.7[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(-)?] udev? ( dev-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/udev ) systemd? ( >=sys-apps/systemd-44:0= ) scanner? ( media-gfx/sane-backends sys-apps/dbus ) >=sys-auth/polkit-0.104 argyllcms? ( media-gfx/argyllcms ) introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) acct-group/colord acct-user/colord
 REQUIRED_USE=scanner? ( udev ) vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0/2
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-1.4.5.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	5bc3f1b890f90cc00cf1d1dddc10233e	meson-multilib	c640b1d57ff5b687118b1e1038e30ecb	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multilib-build	effd4508d5e8209273d82d8f67ee93a0	multilib-minimal	7187f259f207bf5b69e4ff01498a7269	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	c846b9e02ac8293bfc9ca38a195c2a18	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	26207b5d4f4708920b9fcb7302d94068	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7291764972db51d045c66e52133297be
+_md5_=61651f10914913ed7adfd4bc7470cdad
diff --git a/metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127 b/metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127
index ab85b4d64849..b45d4795ef09 100644
--- a/metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127
+++ b/metadata/md5-cache/x11-misc/i3blocks-contrib-1.4.0_p20201127
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=!<x11-misc/i3blocks-1.5 >=x11-misc/i3blocks-1.5
 SLOT=0
 SRC_URI=https://github.com/vivien/i3blocks-contrib/archive/154001e5713c26c70063446022919225b6f916f0.tar.gz -> i3blocks-contrib-1.4.0_p20201127.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=67986a627edde47a0cfd059a12400de8
diff --git a/metadata/md5-cache/x11-misc/i3blocks-contrib-2.0.0 b/metadata/md5-cache/x11-misc/i3blocks-contrib-2.0.0
index 3fcdf7824827..2aec05c50e1e 100644
--- a/metadata/md5-cache/x11-misc/i3blocks-contrib-2.0.0
+++ b/metadata/md5-cache/x11-misc/i3blocks-contrib-2.0.0
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 RDEPEND=!<x11-misc/i3blocks-1.5 >=x11-misc/i3blocks-1.5
 SLOT=0
 SRC_URI=https://github.com/vivien/i3blocks-contrib/archive/v2.0.0.tar.gz -> i3blocks-contrib-2.0.0.tar.gz
-_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68358dee8df08de3fe238737be8e7c23
diff --git a/metadata/md5-cache/x11-misc/idesk-0.7.5-r3 b/metadata/md5-cache/x11-misc/idesk-0.7.5-r3
deleted file mode 100644
index cf4eacb5ff96..000000000000
--- a/metadata/md5-cache/x11-misc/idesk-0.7.5-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 media-libs/freetype >=media-libs/imlib2-1.4[X] media-libs/libart_lgpl x11-libs/gtk+:2 x11-libs/pango x11-libs/startup-notification virtual/pkgconfig
-DESCRIPTION=Utility to place icons on the root window
-EAPI=6
-HOMEPAGE=http://idesk.sourceforge.net/
-KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2 media-libs/freetype >=media-libs/imlib2-1.4[X] media-libs/libart_lgpl x11-libs/gtk+:2 x11-libs/pango x11-libs/startup-notification
-SLOT=0
-SRC_URI=mirror://sourceforge/idesk/idesk-0.7.5.tar.bz2
-_md5_=1d05653d6c3677ff111f33abbde4ce70
diff --git a/metadata/md5-cache/x11-misc/mozo-1.24.0-r1 b/metadata/md5-cache/x11-misc/mozo-1.24.0-r1
index 6d3d77a67d26..6f658823a287 100644
--- a/metadata/md5-cache/x11-misc/mozo-1.24.0-r1
+++ b/metadata/md5-cache/x11-misc/mozo-1.24.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygobject-3:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) python_targets_python3_10? ( dev-lang/python:3.10[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygobject-3:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
 DESCRIPTION=Mozo menu editor for MATE
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygobject-3:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor virtual/libintl
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) python_targets_python3_10? ( dev-lang/python:3.10[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygobject-3:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor virtual/libintl
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/mozo-1.24.0.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	553f2bcf70c72d62970c216e3a74c24d	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=36677e2a816154aafad787b981e57e86
+_md5_=bbe978d5ad5cec6bc069b058f98a0a15
diff --git a/metadata/md5-cache/x11-misc/mozo-1.24.1 b/metadata/md5-cache/x11-misc/mozo-1.24.1
index 87ce64fe9304..1ef76ca3aafc 100644
--- a/metadata/md5-cache/x11-misc/mozo-1.24.1
+++ b/metadata/md5-cache/x11-misc/mozo-1.24.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/pygobject-3:3[python_targets_python3_8(-)?] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) python_targets_python3_10? ( dev-lang/python:3.10[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygobject-3:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
 DESCRIPTION=Mozo menu editor for MATE
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/pygobject-3:3[python_targets_python3_8(-)?] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor virtual/libintl
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) python_targets_python3_10? ( dev-lang/python:3.10[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygobject-3:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor virtual/libintl
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/mozo-1.24.1.tar.xz
 _eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	553f2bcf70c72d62970c216e3a74c24d	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d1ef3690ac7921eb3f569b552a52dfcc
+_md5_=a436dab8a039f1445d6939276b84a391
diff --git a/metadata/md5-cache/x11-misc/obmenu-generator-0.89 b/metadata/md5-cache/x11-misc/obmenu-generator-0.89
index 1bfeb39a3b34..025a92cb039e 100644
--- a/metadata/md5-cache/x11-misc/obmenu-generator-0.89
+++ b/metadata/md5-cache/x11-misc/obmenu-generator-0.89
@@ -7,5 +7,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl[gdbm] dev-perl/Data-Dump >=dev-perl/Linux-DesktopFiles-0.90.0 x11-wm/openbox
 SLOT=0
 SRC_URI=https://github.com/trizen/obmenu-generator/archive/0.89.tar.gz -> obmenu-generator-0.89.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=ee1f1eed9b8879bd73e98128c71d8240
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0-r1 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0-r1
index c13c0491b572..1faf25a47286 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0-r1
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.16.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/util-linux =x11-libs/libfm-qt-0.16* x11-libs/libxcb:= x11-misc/xdg-utils virtual/freedesktop-icon-theme !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/pcmanfm-qt/releases/download/0.16.0/pcmanfm-qt-0.16.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=49b7cbf7522a3afc150d2b75ae7cd4f2
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.17.0-r1 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.17.0-r1
index a286e8ecf180..86facc93af82 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.17.0-r1
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.17.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/util-linux =x11-libs/libfm-qt-0.17* x11-libs/libxcb:= x11-misc/xdg-utils virtual/freedesktop-icon-theme >=lxde-base/lxmenu-data-0.1.5
 SLOT=0
 SRC_URI=https://github.com/lxqt/pcmanfm-qt/releases/download/0.17.0/pcmanfm-qt-0.17.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fe5c510dda696b9dbd2637a073c82a34
diff --git a/metadata/md5-cache/x11-misc/qt5ct-1.3 b/metadata/md5-cache/x11-misc/qt5ct-1.3
new file mode 100644
index 000000000000..1f6b2e016798
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/qt5ct-1.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-qt/qtpaths:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] )
+DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/qt5ct/
+IUSE=+dbus
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] )
+SLOT=0
+SRC_URI=https://download.sourceforge.net/qt5ct/qt5ct-1.3.tar.bz2
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=dab23ceae0b7be0268b6951286311e37
diff --git a/metadata/md5-cache/x11-misc/shutter-0.95 b/metadata/md5-cache/x11-misc/shutter-0.95
index e811b40b6505..958094669154 100644
--- a/metadata/md5-cache/x11-misc/shutter-0.95
+++ b/metadata/md5-cache/x11-misc/shutter-0.95
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/gnome2-canvas dev-perl/gnome2-wnck dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/Gtk2-Unique dev-perl/Gtk2-ImageView dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl]
 SLOT=0
 SRC_URI=https://github.com/shutter-project/shutter/archive/v0.95.tar.gz -> shutter-0.95.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	prefix	d04f14b297013ad1410550c0757f14f8	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	prefix	d04f14b297013ad1410550c0757f14f8	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ad13dfa0ebefbb188eb79ec59f680782
diff --git a/metadata/md5-cache/x11-misc/shutter-0.97 b/metadata/md5-cache/x11-misc/shutter-0.97
index 1fff5de6203c..1ff361df500c 100644
--- a/metadata/md5-cache/x11-misc/shutter-0.97
+++ b/metadata/md5-cache/x11-misc/shutter-0.97
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Carp-Always dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/GooCanvas2 dev-perl/GooCanvas2-CairoTypes dev-perl/Gtk3 >=dev-perl/Gtk3-ImageView-9 dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Pango dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl] x11-libs/libwnck:3[introspection]
 SLOT=0
 SRC_URI=https://github.com/shutter-project/shutter/archive/v0.97.tar.gz -> shutter-0.97.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	prefix	d04f14b297013ad1410550c0757f14f8	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	prefix	d04f14b297013ad1410550c0757f14f8	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6c5f5fe46f36bedc6c6194dd001680c8
diff --git a/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1 b/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
index addd01260c41..803e9c03ff2b 100644
--- a/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
+++ b/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils virtual/udev virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
 SLOT=0
 SRC_URI=https://github.com/IgnorantGuru/spacefm/archive/1.0.6.tar.gz -> spacefm-1.0.6.tar.gz
-_eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ecd3ebc43b87e990a42fa0297e125e1f
diff --git a/metadata/md5-cache/x11-misc/spacefm-9999 b/metadata/md5-cache/x11-misc/spacefm-9999
index fdd80b4a546f..da8ed26abf05 100644
--- a/metadata/md5-cache/x11-misc/spacefm-9999
+++ b/metadata/md5-cache/x11-misc/spacefm-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils virtual/udev virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	7e8ed4c6a1d136fb291c52386f996c2c	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ecd3ebc43b87e990a42fa0297e125e1f
diff --git a/metadata/md5-cache/x11-misc/splatmoji-1.2.0 b/metadata/md5-cache/x11-misc/splatmoji-1.2.0
index fa9ce671b360..71d071c505b7 100644
--- a/metadata/md5-cache/x11-misc/splatmoji-1.2.0
+++ b/metadata/md5-cache/x11-misc/splatmoji-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=app-shells/bash x11-misc/rofi x11-misc/xdotool x11-misc/xsel
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cspeterson/splatmoji/archive/v1.2.0.tar.gz -> splatmoji-1.2.0.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=0dd4d33051ea7517e296053158658e33
diff --git a/metadata/md5-cache/x11-misc/xdotool-3.20210804.2 b/metadata/md5-cache/x11-misc/xdotool-3.20210804.2
new file mode 100644
index 000000000000..f29c17f543f0
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xdotool-3.20210804.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig x11-base/xorg-proto
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/libX11 x11-libs/libXi x11-libs/libXinerama x11-libs/libXtst x11-libs/libxkbcommon
+DESCRIPTION=Simulate keyboard input and mouse activity, move and resize windows
+EAPI=8
+HOMEPAGE=https://www.semicomplete.com/projects/xdotool/
+IUSE=examples
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=x11-libs/libX11 x11-libs/libXi x11-libs/libXinerama x11-libs/libXtst x11-libs/libxkbcommon
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/jordansissel/xdotool/releases/download/v3.20210804.2/xdotool-3.20210804.2.tar.gz
+_eclasses_=multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=58819820fea412b35629a2d1988b79fe
diff --git a/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.7 b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.7
new file mode 100644
index 000000000000..de72ecbbe9f8
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xorg-cf-files-1.0.7
@@ -0,0 +1,10 @@
+BDEPEND=virtual/pkgconfig app-arch/bzip2
+DEFINED_PHASES=install
+DESCRIPTION=Old Imake-related build files
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf
+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/util/xorg-cf-files-1.0.7.tar.bz2 https://dev.gentoo.org/~mattst88/distfiles/xorg-cf-files-1.0.6-solaris-prefix.patch.bz2
+_md5_=74f46c950f2dc573f38c78ce55ed5e5e
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.45-r4 b/metadata/md5-cache/x11-misc/xscreensaver-5.45-r4
index c97416852b54..e7cedf3ca390 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.45-r4
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.45-r4
@@ -11,5 +11,5 @@ RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm virtual/libcr
 REQUIRED_USE=gdk-pixbuf? ( gtk )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.45.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=86cf77b67becaa191a00889e29cac914
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.45-r5 b/metadata/md5-cache/x11-misc/xscreensaver-5.45-r5
index 8ae4fa10ba86..59925d9a2357 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.45-r5
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.45-r5
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 media-libs/netpbm virtual/libcrypt:= x11-apps/appres x1
 REQUIRED_USE=gdk-pixbuf? ( gtk )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.45.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f20b6efaa7b2cc22f9146f75ef394aa
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.45-r6 b/metadata/md5-cache/x11-misc/xscreensaver-5.45-r6
index 7fe9029ee232..cba66ce2f16a 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.45-r6
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.45-r6
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 media-libs/netpbm virtual/libcrypt:= x11-apps/appres x1
 REQUIRED_USE=gdk-pixbuf? ( gtk )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.45.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1bff8234ce606e9619d4319cd5dc0d85
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-6.01-r1 b/metadata/md5-cache/x11-misc/xscreensaver-6.01-r1
index 41d0c07e78bb..214722d496a7 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-6.01-r1
+++ b/metadata/md5-cache/x11-misc/xscreensaver-6.01-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 media-libs/netpbm virtual/libcrypt:= x11-apps/appres x1
 REQUIRED_USE=gdk-pixbuf? ( gtk ) elogind? ( !systemd )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-6.01.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	font	0667878c2b594871023dd1833d05996f	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	font	0667878c2b594871023dd1833d05996f	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7bde6e5451c29a252b5d9d0c1aae04fc
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-6.01-r2 b/metadata/md5-cache/x11-misc/xscreensaver-6.01-r2
index 5ca4199b2fbd..a99841788bce 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-6.01-r2
+++ b/metadata/md5-cache/x11-misc/xscreensaver-6.01-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 media-libs/netpbm virtual/libcrypt:= x11-apps/appres x1
 REQUIRED_USE=gdk-pixbuf? ( gtk ) elogind? ( !systemd )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-6.01.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	font	0667878c2b594871023dd1833d05996f	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	font	0667878c2b594871023dd1833d05996f	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=56f389a981a017fb0433e9d544139255
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-6.01-r3 b/metadata/md5-cache/x11-misc/xscreensaver-6.01-r3
index 3c53dfc95efe..bc883f13bf6c 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-6.01-r3
+++ b/metadata/md5-cache/x11-misc/xscreensaver-6.01-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 media-libs/netpbm virtual/libcrypt:= x11-apps/appres x1
 REQUIRED_USE=gdk-pixbuf? ( gtk ) gtk? ( png ) opengl? ( png ) elogind? ( !systemd )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-6.01.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	font	0667878c2b594871023dd1833d05996f	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	font	0667878c2b594871023dd1833d05996f	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ad9025710db77b9574b0f7ae72c4d9e9
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index b12ccab64162..67052fc9de6f 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/pidgin-sipe-1.25.0-r1 b/metadata/md5-cache/x11-plugins/pidgin-sipe-1.25.0-r1
index 87d1e6fcd109..e263f4c22b27 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-sipe-1.25.0-r1
+++ b/metadata/md5-cache/x11-plugins/pidgin-sipe-1.25.0-r1
@@ -5,9 +5,9 @@ DESCRIPTION=Pidgin Plug-in SIPE (Sip Exchange Protocol)
 EAPI=7
 HOMEPAGE=http://sipe.sourceforge.net/
 IUSE=dbus debug kerberos ocs2005-message-hack openssl telepathy voice
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmime:2.6 dev-libs/libxml2 openssl? ( dev-libs/openssl:= ) !openssl? ( dev-libs/nss ) kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:1.0 net-libs/farstream:0.2 ) !voice? ( >=dev-libs/glib-2.12.0:2 ) net-im/pidgin[dbus?] telepathy? ( >=sys-apps/dbus-1.1.0 >=dev-libs/dbus-glib-0.61 >=dev-libs/glib-2.28:2 >=net-libs/telepathy-glib-0.18.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/sipe/pidgin-sipe-1.25.0.tar.gz
-_md5_=56d005dc269c9959383ba94237a33fb4
+_md5_=6fa1224fdfa3fb391e0c040d3342d43e
diff --git a/metadata/md5-cache/x11-plugins/pidgin-skypeweb-9999 b/metadata/md5-cache/x11-plugins/pidgin-skypeweb-9999
deleted file mode 100644
index cc3ab9582e53..000000000000
--- a/metadata/md5-cache/x11-plugins/pidgin-skypeweb-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=unpack
-DEPEND=net-im/pidgin dev-libs/json-glib virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=SkypeWeb Plugin for Pidgin
-EAPI=5
-HOMEPAGE=https://github.com/EionRobb/skype4pidgin
-LICENSE=GPL-3+
-PROPERTIES=live
-RDEPEND=net-im/pidgin dev-libs/json-glib
-SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=1f83946d74eac1c1d51e413dcd26c431
diff --git a/metadata/md5-cache/x11-plugins/vicious-2.5.0 b/metadata/md5-cache/x11-plugins/vicious-2.5.0
index 03682d8cb54f..0302078a477d 100644
--- a/metadata/md5-cache/x11-plugins/vicious-2.5.0
+++ b/metadata/md5-cache/x11-plugins/vicious-2.5.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-wm/awesome
 SLOT=0
 SRC_URI=https://github.com/vicious-widgets/vicious/archive/v2.5.0.tar.gz -> vicious-2.5.0.tar.gz
-_eclasses_=optfeature	cc13a38ea4d26565e83ef21d58bcd4ab
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
 _md5_=87fe59b3f0fc3520bc8bae6cb85b8f1c
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index b1d51b1f67ec..edf57e926632 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.7.2 b/metadata/md5-cache/x11-terms/alacritty-0.7.2
deleted file mode 100644
index 64d5caafca95..000000000000
--- a/metadata/md5-cache/x11-terms/alacritty-0.7.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/cmake >=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install postinst setup test unpack
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 )
-DESCRIPTION=GPU-accelerated terminal emulator
-EAPI=7
-HOMEPAGE=https://github.com/alacritty/alacritty
-IUSE=wayland +X debug
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB
-RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb] ) media-libs/mesa[X?,wayland?] sys-libs/zlib sys-libs/ncurses:0 wayland? ( dev-libs/wayland ) X? ( x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr )
-REQUIRED_USE=|| ( wayland X )
-SLOT=0
-SRC_URI=https://github.com/alacritty/alacritty/archive/v0.7.2.tar.gz -> alacritty-0.7.2.tar.gz https://crates.io/api/v1/crates/ab_glyph_rasterizer/0.1.4/download -> ab_glyph_rasterizer-0.1.4.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/andrew/0.3.1/download -> andrew-0.3.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/byteorder/1.4.2/download -> byteorder-1.4.2.crate https://crates.io/api/v1/crates/calloop/0.6.5/download -> calloop-0.6.5.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/clipboard-win/3.1.1/download -> clipboard-win-3.1.1.crate https://crates.io/api/v1/crates/cmake/0.1.45/download -> cmake-0.1.45.crate https://crates.io/api/v1/crates/cocoa/0.23.0/download -> cocoa-0.23.0.crate https://crates.io/api/v1/crates/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/copypasta/0.7.1/download -> copypasta-0.7.1.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-graphics/0.22.2/download -> core-graphics-0.22.2.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-text/19.1.0/download -> core-text-19.1.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/crossfont/0.2.0/download -> crossfont-0.2.0.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.4.2/download -> dlib-0.4.2.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dtoa/0.4.7/download -> dtoa-0.4.7.crate https://crates.io/api/v1/crates/dwrote/0.11.0/download -> dwrote-0.11.0.crate https://crates.io/api/v1/crates/embed-resource/1.5.1/download -> embed-resource-1.5.1.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.14/download -> filetime-0.2.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.26.0/download -> freetype-rs-0.26.0.crate https://crates.io/api/v1/crates/freetype-sys/0.13.1/download -> freetype-sys-0.13.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glutin/0.26.0/download -> glutin-0.26.0.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.5/download -> glutin_egl_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.5/download -> glutin_gles2_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.7/download -> glutin_glx_sys-0.1.7.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.5/download -> glutin_wgl_sys-0.1.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.1.0/download -> khronos_api-3.1.0.crate https://crates.io/api/v1/crates/lazy-bytes-cast/5.0.1/download -> lazy-bytes-cast-5.0.1.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.86/download -> libc-0.2.86.crate https://crates.io/api/v1/crates/libloading/0.6.7/download -> libloading-0.6.7.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.2/download -> lock_api-0.4.2.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memmap2/0.1.0/download -> memmap2-0.1.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.6/download -> miow-0.3.6.crate https://crates.io/api/v1/crates/ndk/0.2.1/download -> ndk-0.2.1.crate https://crates.io/api/v1/crates/ndk-glue/0.2.1/download -> ndk-glue-0.2.1.crate https://crates.io/api/v1/crates/ndk-macro/0.2.0/download -> ndk-macro-0.2.0.crate https://crates.io/api/v1/crates/ndk-sys/0.2.1/download -> ndk-sys-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.18.0/download -> nix-0.18.0.crate https://crates.io/api/v1/crates/nom/6.1.0/download -> nom-6.1.0.crate https://crates.io/api/v1/crates/notify/4.0.15/download -> notify-4.0.15.crate https://crates.io/api/v1/crates/num_enum/0.4.3/download -> num_enum-0.4.3.crate https://crates.io/api/v1/crates/num_enum_derive/0.4.3/download -> num_enum_derive-0.4.3.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/owned_ttf_parser/0.6.0/download -> owned_ttf_parser-0.6.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.3/download -> raw-window-handle-0.3.3.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.4/download -> redox_syscall-0.2.4.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.22/download -> regex-syntax-0.6.22.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/rusttype/0.9.2/download -> rusttype-0.9.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.123/download -> serde-1.0.123.crate https://crates.io/api/v1/crates/serde_derive/1.0.123/download -> serde_derive-1.0.123.crate https://crates.io/api/v1/crates/serde_json/1.0.62/download -> serde_json-1.0.62.crate https://crates.io/api/v1/crates/serde_yaml/0.8.17/download -> serde_yaml-0.8.17.crate https://crates.io/api/v1/crates/servo-fontconfig/0.5.1/download -> servo-fontconfig-0.5.1.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/5.1.0/download -> servo-fontconfig-sys-5.1.0.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook-registry/1.3.0/download -> signal-hook-registry-1.3.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.12.2/download -> smithay-client-toolkit-0.12.2.crate https://crates.io/api/v1/crates/smithay-clipboard/0.6.3/download -> smithay-clipboard-0.6.3.crate https://crates.io/api/v1/crates/socket2/0.3.19/download -> socket2-0.3.19.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/syn/1.0.60/download -> syn-1.0.60.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.23/download -> thiserror-1.0.23.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.23/download -> thiserror-impl-1.0.23.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/ttf-parser/0.6.2/download -> ttf-parser-0.6.2.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/urlocator/0.1.4/download -> urlocator-0.1.4.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.10.0/download -> vte-0.10.0.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wayland-client/0.28.3/download -> wayland-client-0.28.3.crate https://crates.io/api/v1/crates/wayland-commons/0.28.3/download -> wayland-commons-0.28.3.crate https://crates.io/api/v1/crates/wayland-cursor/0.28.3/download -> wayland-cursor-0.28.3.crate https://crates.io/api/v1/crates/wayland-egl/0.28.3/download -> wayland-egl-0.28.3.crate https://crates.io/api/v1/crates/wayland-protocols/0.28.3/download -> wayland-protocols-0.28.3.crate https://crates.io/api/v1/crates/wayland-scanner/0.28.3/download -> wayland-scanner-0.28.3.crate https://crates.io/api/v1/crates/wayland-sys/0.28.3/download -> wayland-sys-0.28.3.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.24.0/download -> winit-0.24.0.crate https://crates.io/api/v1/crates/winreg/0.8.0/download -> winreg-0.8.0.crate https://crates.io/api/v1/crates/wio/0.2.2/download -> wio-0.2.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.1/download -> x11-clipboard-0.5.1.crate https://crates.io/api/v1/crates/x11-dl/2.18.5/download -> x11-dl-2.18.5.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xcursor/0.3.3/download -> xcursor-0.3.3.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4e23637fd52010846b592d83696dda1c
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.8.0 b/metadata/md5-cache/x11-terms/alacritty-0.8.0
index 1dbb07e1e3d6..a92cfac6ce33 100644
--- a/metadata/md5-cache/x11-terms/alacritty-0.8.0
+++ b/metadata/md5-cache/x11-terms/alacritty-0.8.0
@@ -5,11 +5,11 @@ DESCRIPTION=GPU-accelerated terminal emulator
 EAPI=7
 HOMEPAGE=https://github.com/alacritty/alacritty
 IUSE=wayland +X debug
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB
 RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb] ) media-libs/mesa[X?,wayland?] sys-libs/zlib sys-libs/ncurses:0 wayland? ( dev-libs/wayland ) X? ( x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr )
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 SRC_URI=https://github.com/alacritty/alacritty/archive/v0.8.0.tar.gz -> alacritty-0.8.0.tar.gz https://crates.io/api/v1/crates/ab_glyph_rasterizer/0.1.4/download -> ab_glyph_rasterizer-0.1.4.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/andrew/0.3.1/download -> andrew-0.3.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/calloop/0.6.5/download -> calloop-0.6.5.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/clipboard-win/3.1.1/download -> clipboard-win-3.1.1.crate https://crates.io/api/v1/crates/cmake/0.1.45/download -> cmake-0.1.45.crate https://crates.io/api/v1/crates/cocoa/0.23.0/download -> cocoa-0.23.0.crate https://crates.io/api/v1/crates/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.crate https://crates.io/api/v1/crates/copypasta/0.7.1/download -> copypasta-0.7.1.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-graphics/0.22.2/download -> core-graphics-0.22.2.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-text/19.2.0/download -> core-text-19.2.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossfont/0.3.0/download -> crossfont-0.3.0.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.4.2/download -> dlib-0.4.2.crate https://crates.io/api/v1/crates/dlib/0.5.0/download -> dlib-0.5.0.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dwrote/0.11.0/download -> dwrote-0.11.0.crate https://crates.io/api/v1/crates/embed-resource/1.6.2/download -> embed-resource-1.6.2.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.14/download -> filetime-0.2.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.26.0/download -> freetype-rs-0.26.0.crate https://crates.io/api/v1/crates/freetype-sys/0.13.1/download -> freetype-sys-0.13.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glutin/0.26.0/download -> glutin-0.26.0.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.5/download -> glutin_egl_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.5/download -> glutin_gles2_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.7/download -> glutin_glx_sys-0.1.7.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.5/download -> glutin_wgl_sys-0.1.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.1.0/download -> khronos_api-3.1.0.crate https://crates.io/api/v1/crates/lazy-bytes-cast/5.0.1/download -> lazy-bytes-cast-5.0.1.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.94/download -> libc-0.2.94.crate https://crates.io/api/v1/crates/libloading/0.6.7/download -> libloading-0.6.7.crate https://crates.io/api/v1/crates/libloading/0.7.0/download -> libloading-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.4/download -> lock_api-0.4.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memmap2/0.1.0/download -> memmap2-0.1.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ndk/0.2.1/download -> ndk-0.2.1.crate https://crates.io/api/v1/crates/ndk-glue/0.2.1/download -> ndk-glue-0.2.1.crate https://crates.io/api/v1/crates/ndk-macro/0.2.0/download -> ndk-macro-0.2.0.crate https://crates.io/api/v1/crates/ndk-sys/0.2.1/download -> ndk-sys-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.18.0/download -> nix-0.18.0.crate https://crates.io/api/v1/crates/nix/0.20.0/download -> nix-0.20.0.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.2.crate https://crates.io/api/v1/crates/notify/4.0.16/download -> notify-4.0.16.crate https://crates.io/api/v1/crates/num_enum/0.4.3/download -> num_enum-0.4.3.crate https://crates.io/api/v1/crates/num_enum_derive/0.4.3/download -> num_enum_derive-0.4.3.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/owned_ttf_parser/0.6.0/download -> owned_ttf_parser-0.6.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.3/download -> raw-window-handle-0.3.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.8/download -> redox_syscall-0.2.8.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/rusttype/0.9.2/download -> rusttype-0.9.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.125/download -> serde-1.0.125.crate https://crates.io/api/v1/crates/serde_derive/1.0.125/download -> serde_derive-1.0.125.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/serde_yaml/0.8.17/download -> serde_yaml-0.8.17.crate https://crates.io/api/v1/crates/servo-fontconfig/0.5.1/download -> servo-fontconfig-0.5.1.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/5.1.0/download -> servo-fontconfig-sys-5.1.0.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook-registry/1.3.0/download -> signal-hook-registry-1.3.0.crate https://crates.io/api/v1/crates/slab/0.4.3/download -> slab-0.4.3.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.12.3/download -> smithay-client-toolkit-0.12.3.crate https://crates.io/api/v1/crates/smithay-clipboard/0.6.3/download -> smithay-clipboard-0.6.3.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/syn/1.0.72/download -> syn-1.0.72.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.24/download -> thiserror-1.0.24.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.24/download -> thiserror-impl-1.0.24.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/ttf-parser/0.6.2/download -> ttf-parser-0.6.2.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.10.1/download -> vte-0.10.1.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wayland-client/0.28.5/download -> wayland-client-0.28.5.crate https://crates.io/api/v1/crates/wayland-commons/0.28.5/download -> wayland-commons-0.28.5.crate https://crates.io/api/v1/crates/wayland-cursor/0.28.5/download -> wayland-cursor-0.28.5.crate https://crates.io/api/v1/crates/wayland-egl/0.28.5/download -> wayland-egl-0.28.5.crate https://crates.io/api/v1/crates/wayland-protocols/0.28.5/download -> wayland-protocols-0.28.5.crate https://crates.io/api/v1/crates/wayland-scanner/0.28.5/download -> wayland-scanner-0.28.5.crate https://crates.io/api/v1/crates/wayland-sys/0.28.5/download -> wayland-sys-0.28.5.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.24.0/download -> winit-0.24.0.crate https://crates.io/api/v1/crates/winreg/0.8.0/download -> winreg-0.8.0.crate https://crates.io/api/v1/crates/wio/0.2.2/download -> wio-0.2.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.1/download -> x11-clipboard-0.5.1.crate https://crates.io/api/v1/crates/x11-dl/2.18.5/download -> x11-dl-2.18.5.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xcursor/0.3.3/download -> xcursor-0.3.3.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3cc833b158b2ce4e621f9c68357fc6c9
+_md5_=925b1b5a03a5236fc178b07606772343
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.9.0 b/metadata/md5-cache/x11-terms/alacritty-0.9.0
new file mode 100644
index 000000000000..152d2babfba6
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/alacritty-0.9.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/cmake >=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install postinst setup test unpack
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 )
+DESCRIPTION=GPU-accelerated terminal emulator
+EAPI=7
+HOMEPAGE=https://github.com/alacritty/alacritty
+IUSE=wayland +X debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB
+RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb] ) media-libs/mesa[X?,wayland?] sys-libs/zlib sys-libs/ncurses:0 wayland? ( dev-libs/wayland ) X? ( x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr )
+REQUIRED_USE=|| ( wayland X )
+SLOT=0
+SRC_URI=https://github.com/alacritty/alacritty/archive/v0.9.0.tar.gz -> alacritty-0.9.0.tar.gz https://crates.io/api/v1/crates/ab_glyph_rasterizer/0.1.4/download -> ab_glyph_rasterizer-0.1.4.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/andrew/0.3.1/download -> andrew-0.3.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/calloop/0.6.5/download -> calloop-0.6.5.crate https://crates.io/api/v1/crates/cc/1.0.69/download -> cc-1.0.69.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/clipboard-win/3.1.1/download -> clipboard-win-3.1.1.crate https://crates.io/api/v1/crates/cmake/0.1.45/download -> cmake-0.1.45.crate https://crates.io/api/v1/crates/cocoa/0.23.0/download -> cocoa-0.23.0.crate https://crates.io/api/v1/crates/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.crate https://crates.io/api/v1/crates/copypasta/0.7.1/download -> copypasta-0.7.1.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-graphics/0.22.2/download -> core-graphics-0.22.2.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-text/19.2.0/download -> core-text-19.2.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossfont/0.3.1/download -> crossfont-0.3.1.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.4.2/download -> dlib-0.4.2.crate https://crates.io/api/v1/crates/dlib/0.5.0/download -> dlib-0.5.0.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dwrote/0.11.0/download -> dwrote-0.11.0.crate https://crates.io/api/v1/crates/embed-resource/1.6.3/download -> embed-resource-1.6.3.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.14/download -> filetime-0.2.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.26.0/download -> freetype-rs-0.26.0.crate https://crates.io/api/v1/crates/freetype-sys/0.13.1/download -> freetype-sys-0.13.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glutin/0.26.0/download -> glutin-0.26.0.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.5/download -> glutin_egl_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.5/download -> glutin_gles2_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.7/download -> glutin_glx_sys-0.1.7.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.5/download -> glutin_wgl_sys-0.1.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/instant/0.1.10/download -> instant-0.1.10.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.1.0/download -> khronos_api-3.1.0.crate https://crates.io/api/v1/crates/lazy-bytes-cast/5.0.1/download -> lazy-bytes-cast-5.0.1.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.98/download -> libc-0.2.98.crate https://crates.io/api/v1/crates/libloading/0.6.7/download -> libloading-0.6.7.crate https://crates.io/api/v1/crates/libloading/0.7.0/download -> libloading-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.4/download -> lock_api-0.4.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memmap2/0.1.0/download -> memmap2-0.1.0.crate https://crates.io/api/v1/crates/memmap2/0.2.3/download -> memmap2-0.2.3.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.2.0/download -> mio-anonymous-pipes-0.2.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ndk/0.2.1/download -> ndk-0.2.1.crate https://crates.io/api/v1/crates/ndk-glue/0.2.1/download -> ndk-glue-0.2.1.crate https://crates.io/api/v1/crates/ndk-macro/0.2.0/download -> ndk-macro-0.2.0.crate https://crates.io/api/v1/crates/ndk-sys/0.2.1/download -> ndk-sys-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.18.0/download -> nix-0.18.0.crate https://crates.io/api/v1/crates/nix/0.20.0/download -> nix-0.20.0.crate https://crates.io/api/v1/crates/nix/0.22.0/download -> nix-0.22.0.crate https://crates.io/api/v1/crates/nom/6.2.1/download -> nom-6.2.1.crate https://crates.io/api/v1/crates/notify/4.0.17/download -> notify-4.0.17.crate https://crates.io/api/v1/crates/num_enum/0.4.3/download -> num_enum-0.4.3.crate https://crates.io/api/v1/crates/num_enum_derive/0.4.3/download -> num_enum_derive-0.4.3.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/owned_ttf_parser/0.6.0/download -> owned_ttf_parser-0.6.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/proc-macro2/1.0.28/download -> proc-macro2-1.0.28.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.3/download -> raw-window-handle-0.3.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.9/download -> redox_syscall-0.2.9.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/rusttype/0.9.2/download -> rusttype-0.9.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.127/download -> serde-1.0.127.crate https://crates.io/api/v1/crates/serde_derive/1.0.127/download -> serde_derive-1.0.127.crate https://crates.io/api/v1/crates/serde_json/1.0.66/download -> serde_json-1.0.66.crate https://crates.io/api/v1/crates/serde_yaml/0.8.17/download -> serde_yaml-0.8.17.crate https://crates.io/api/v1/crates/servo-fontconfig/0.5.1/download -> servo-fontconfig-0.5.1.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/5.1.0/download -> servo-fontconfig-sys-5.1.0.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/slab/0.4.3/download -> slab-0.4.3.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.12.3/download -> smithay-client-toolkit-0.12.3.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.14.0/download -> smithay-client-toolkit-0.14.0.crate https://crates.io/api/v1/crates/smithay-clipboard/0.6.4/download -> smithay-clipboard-0.6.4.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/syn/1.0.74/download -> syn-1.0.74.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.26/download -> thiserror-1.0.26.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.26/download -> thiserror-impl-1.0.26.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/ttf-parser/0.6.2/download -> ttf-parser-0.6.2.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.10.1/download -> vte-0.10.1.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wayland-client/0.28.6/download -> wayland-client-0.28.6.crate https://crates.io/api/v1/crates/wayland-commons/0.28.6/download -> wayland-commons-0.28.6.crate https://crates.io/api/v1/crates/wayland-cursor/0.28.6/download -> wayland-cursor-0.28.6.crate https://crates.io/api/v1/crates/wayland-egl/0.28.6/download -> wayland-egl-0.28.6.crate https://crates.io/api/v1/crates/wayland-protocols/0.28.6/download -> wayland-protocols-0.28.6.crate https://crates.io/api/v1/crates/wayland-scanner/0.28.6/download -> wayland-scanner-0.28.6.crate https://crates.io/api/v1/crates/wayland-sys/0.28.6/download -> wayland-sys-0.28.6.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.24.0/download -> winit-0.24.0.crate https://crates.io/api/v1/crates/winreg/0.9.0/download -> winreg-0.9.0.crate https://crates.io/api/v1/crates/wio/0.2.2/download -> wio-0.2.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.2/download -> x11-clipboard-0.5.2.crate https://crates.io/api/v1/crates/x11-dl/2.18.5/download -> x11-dl-2.18.5.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xcursor/0.3.3/download -> xcursor-0.3.3.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	901d9e22c7a848a1196502edf060f330	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=01478f5157a77cf7919b363fb7c57e29
diff --git a/metadata/md5-cache/x11-terms/kitty-0.19.3 b/metadata/md5-cache/x11-terms/kitty-0.19.3
index 238126be0bee..2f28e72d7a46 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.19.3
+++ b/metadata/md5-cache/x11-terms/kitty-0.19.3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.19.3/kitty-0.19.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a583bd712eaebc08d2fd7ce0119d367c
diff --git a/metadata/md5-cache/x11-terms/kitty-0.20.1 b/metadata/md5-cache/x11-terms/kitty-0.20.1
index 731ebb7430d4..ce3d6a8cc84e 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.20.1
+++ b/metadata/md5-cache/x11-terms/kitty-0.20.1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.20.1/kitty-0.20.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=141d39183bedd446f369a653483412fb
diff --git a/metadata/md5-cache/x11-terms/kitty-0.20.3 b/metadata/md5-cache/x11-terms/kitty-0.20.3
index c0d8aeae29cf..b7d05fa2ca1d 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.20.3
+++ b/metadata/md5-cache/x11-terms/kitty-0.20.3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.20.3/kitty-0.20.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=70b351d45bc0bf2b2c7e1452bd39c992
diff --git a/metadata/md5-cache/x11-terms/kitty-0.21.2 b/metadata/md5-cache/x11-terms/kitty-0.21.2
index 2867a693ae98..973da7bd921b 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.21.2
+++ b/metadata/md5-cache/x11-terms/kitty-0.21.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.21.2/kitty-0.21.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e3bf57ee9c27d79960bc856157bfa7e4
diff --git a/metadata/md5-cache/x11-terms/kitty-9999 b/metadata/md5-cache/x11-terms/kitty-9999
index 46db6873a8b0..6f7deaa83f87 100644
--- a/metadata/md5-cache/x11-terms/kitty-9999
+++ b/metadata/md5-cache/x11-terms/kitty-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/libcanberra media-libs/libpng:0= media-libs/lcms sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	73f113f91928e0d16bceb65ecbcd8e75	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b8da6c893c915a7c20c9ad0bca96436c
diff --git a/metadata/md5-cache/x11-terms/terminator-2.1.1 b/metadata/md5-cache/x11-terms/terminator-2.1.1
index b49ea1fb2963..45b37626ac44 100644
--- a/metadata/md5-cache/x11-terms/terminator-2.1.1
+++ b/metadata/md5-cache/x11-terms/terminator-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnome-terminator/terminator/releases/download/v2.1.1/terminator-2.1.1.tar.gz verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v2.1.1/terminator-2.1.1.tar.gz.asc )
-_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	943c17c3afd0f811ad36a0b5c8dedba9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e20b80360497e6215aed0dd4ca7d6bad	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f9379f8da9df2ed07d638b33b3590c0f
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index a61b7a8722f4..388e8c7f4206 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/comix-xcursors-0.8.2 b/metadata/md5-cache/x11-themes/comix-xcursors-0.8.2
deleted file mode 100644
index 450f65485766..000000000000
--- a/metadata/md5-cache/x11-themes/comix-xcursors-0.8.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=X11 mouse theme with a comics feeling
-EAPI=5
-HOMEPAGE=http://kde-look.org/content/show.php/ComixCursors?content=32627
-IUSE=lefthanded opaque
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/libX11 x11-libs/libXcursor
-SLOT=0
-SRC_URI=http://www.limitland.de/comixcursors/ComixCursors-0.8.2.tar.bz2 lefthanded? ( http://www.limitland.de/comixcursors/ComixCursors-LH-0.8.2.tar.bz2 ) opaque? ( http://www.limitland.de/comixcursors/ComixCursors-Opaque-0.8.2.tar.bz2 ) lefthanded? ( opaque? ( http://www.limitland.de/comixcursors/ComixCursors-LH-Opaque-0.8.2.tar.bz2 ) )
-_md5_=f345c1aafad99fca28e6e32d3a8d113c
diff --git a/metadata/md5-cache/x11-themes/e-gtk-theme-0.19.3 b/metadata/md5-cache/x11-themes/e-gtk-theme-0.19.3
index 239011ae0b57..8af9525c3666 100644
--- a/metadata/md5-cache/x11-themes/e-gtk-theme-0.19.3
+++ b/metadata/md5-cache/x11-themes/e-gtk-theme-0.19.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=A GTK theme to match Enlightenment WM's default theme
 EAPI=7
 HOMEPAGE=https://gitlab.com/tokiclover/e-gtk-theme
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://gitlab.com/tokiclover/e-gtk-theme/-/archive/0.19.3/e-gtk-theme-0.19.3.tar.gz
-_md5_=9070422c8939c5f016124c66fa4afacf
+_md5_=5895bc1abd32c67aefdf243d82626f2f
diff --git a/metadata/md5-cache/x11-themes/greybird-3.22.14 b/metadata/md5-cache/x11-themes/greybird-3.22.14
index 41bee202e75a..5a21aeea919a 100644
--- a/metadata/md5-cache/x11-themes/greybird-3.22.14
+++ b/metadata/md5-cache/x11-themes/greybird-3.22.14
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 x11-themes/gtk-engines-murrine
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/shimmerproject/Greybird/archive/v3.22.14.tar.gz -> greybird-3.22.14.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=41315893e91fa8364e18addf0263860b
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 6dad77a4547c..38dd65439e51 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/ctwm-4.0.2 b/metadata/md5-cache/x11-wm/ctwm-4.0.2
deleted file mode 100644
index a23d81315ca8..000000000000
--- a/metadata/md5-cache/x11-wm/ctwm-4.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt app-arch/xz-utils app-text/rman virtual/jpeg x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A clean, light window manager
-EAPI=6
-HOMEPAGE=http://ctwm.org/
-KEYWORDS=amd64 ppc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt
-SLOT=0
-SRC_URI=http://ctwm.org/dist/ctwm-4.0.2.tar.xz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=81f4d6f79e31da57c9b03d81a6542e4f
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r1 b/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r1
index 775b83627ba7..4b48b138793d 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r1
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/efl-1.24.1[eet,fontconfig,X] virtual/udev x11-libs/libXext x1
 REQUIRED_USE=xwayland? ( wayland )
 SLOT=0.17/0.24.2
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=19421496955c073f676a921d82d551a7
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r2 b/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r2
index 4eaa4d27fe18..166ac9ae7e03 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r2
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.24.2-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/efl-1.24.1[eet,fontconfig,X] virtual/udev x11-libs/libXext x1
 REQUIRED_USE=xwayland? ( wayland )
 SLOT=0.17/0.24.2
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=63afb5b13f71c5e566ed31f3d32b4537
diff --git a/metadata/md5-cache/x11-wm/i3-4.19-r1 b/metadata/md5-cache/x11-wm/i3-4.19-r1
index fdda88e05df4..e424ff966639 100644
--- a/metadata/md5-cache/x11-wm/i3-4.19-r1
+++ b/metadata/md5-cache/x11-wm/i3-4.19-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb[xkb] x11-l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://i3wm.org/downloads/i3-4.19.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=c342e03b16464d6b0d9ca42cf519e933
diff --git a/metadata/md5-cache/x11-wm/i3-4.19.1 b/metadata/md5-cache/x11-wm/i3-4.19.1
index e4c10b9f6689..aa959599cc1e 100644
--- a/metadata/md5-cache/x11-wm/i3-4.19.1
+++ b/metadata/md5-cache/x11-wm/i3-4.19.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb[xkb] x11-l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://i3wm.org/downloads/i3-4.19.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=a2d0f67d615565663fcb4b71aca85f2b
diff --git a/metadata/md5-cache/x11-wm/i3-9999 b/metadata/md5-cache/x11-wm/i3-9999
index cf334ecefc6e..e190cf06face 100644
--- a/metadata/md5-cache/x11-wm/i3-9999
+++ b/metadata/md5-cache/x11-wm/i3-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config x11-libs/cairo[X,xcb(+)] x11-libs/pango[X] dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=a2d0f67d615565663fcb4b71aca85f2b
diff --git a/metadata/md5-cache/x11-wm/i3-gaps-4.19.1 b/metadata/md5-cache/x11-wm/i3-gaps-4.19.1
index 79cfed511a24..28fba6c48366 100644
--- a/metadata/md5-cache/x11-wm/i3-gaps-4.19.1
+++ b/metadata/md5-cache/x11-wm/i3-gaps-4.19.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/c
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Airblader/i3/archive/4.19.1.tar.gz -> i3-gaps-4.19.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	cc13a38ea4d26565e83ef21d58bcd4ab	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	5bc3f1b890f90cc00cf1d1dddc10233e	multilib	97566c1a256d07b00848aa767e38a352	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	2f5967e7ced9abfa71ff7b0ea8d61b3a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=88ded4195a713c2d668771687cb6a243
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 34c0987b1bc5..d18152cc2869 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 13475 BLAKE2B 78672f657c8cd4903e8ecebdb7be6f976c894b3bae286d6dcd5ed5d92f2d0b3f9691c2b4965adb146feb9b29def2b8fb038da3256ba9273197c72de6caa123b3 SHA512 d0fe055f8f6681873a2f4a0a5f219c015cfe8b366b8105534e1272abaad74a581e4d9c8f69db1599303c15acec1eed9bf84545aaaef82424fc60d9119b5f798f
-TIMESTAMP 2021-08-01T20:38:59Z
+TIMESTAMP 2021-08-06T22:39:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEHBmNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmENug1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klATThAAt0w6gOdkQBNAAoJOIz7noV3dKaLnIec44NnaFMzhn/Zq0pewpCLDDEuT
-Smr25D0y7sSX3GY+2EpthoEXV8GXCuev8IM2eoqDaw/pmAoL55ZSpwRCwlr/V1gR
-2/LblK+J/IAqBcdHsQL6ViheOMEGAwZfLF85d8fplK+c+Is/kD9OtmcIXQ4c+qfa
-y8pFfdaazWmO8wuPQzlwtHgHC5FFsRx5PsLdXEWNEtkyG0XTQET0xWEvE1p1sAmY
-hEfXuHcdQ3+e/0b4wDr5IdJpySYl/lyLDdCrZ2MmqJuxomoDIR1EEc1iFDuY+Q3Y
-TuBc3DFJqKgm+mXj3FePz9WPa/3bBCJuLH48GCwJljXVVul2urZ+wMy+hQ23suXT
-wFeBPspATg2UbR2AuVxiVZgrjaaGL/FzQJV2JBoCzJXAMIBmtB/x5zInjHKvr6lj
-szeGwr6tGVgnTvoBrH2dck7MIdlsSFQctndc3VvQ1oRCN7HOKwQN9xWWMwePsrvT
-LKv6Hbz2wz9cYJQle3zxdFAArBQ5xUbrB3QyzaAK4+M4LfdxtTgRwn+26oUmoQKB
-C/VIQMbwTHmwwE1l/ABT7CyYGWJIWYhjfgje2yEhx40HbyumkG/pKF3DIp74JGX/
-VTHUZosfu0ch3svVTlYxeWkfUJsyX5MBbXkJemxOfXK8WKFgSXk=
-=j+RY
+klC2FhAAlpk/kOSGdxVfZBcPNViBkrFnClwolvWqvlftINb6h+PLy83apmBOu0wl
+6piGS4drYUqHCI/Ca2hVet5qnN4/L59W+8tJoOhGulHrMQNx0cRwLmJJzFsUSM86
+ax57eTxFd5nVuE9hsh3sAjjbH6K4fsb0GGWLl0AMQijyl2C6GEDp0e1UV5YA8mO/
+yDIHKVr1Hovl44Z4BXDBGaVG4E1B5f0fWFn/oF6f9OapJA0KwOLPApT+VKPdcAA0
+a8iC0tgyz2M2Fq+Q4J5TH9j8c/fBARKyYgVYHVuyjjmY8ry9iZn3Xs2LZ33+UhOn
+z4K6d/3+ScEIty8UKCbsQZdN8GoCd528wlfOWqsU9BBtcrhR4h9lhdf1u8sEqx7+
+nMbB923O/WreTx8E+igTlo2iH3KdIRbJD05f4OG3JO4jA+k+QtRKLLDw7gYTxt6i
+wZzdNUA4x9XzgJ4nMgJxtZBLioWogOEOjxeXgBBl5BOw7Ck1Al8vIbd2iADYkj3W
+GsiuO/WPELWBwK3vBIMy4k/RBzjgxzY1WyTg0dCQOsImvwMe9eFy5uQhOS61FuVu
+jWHmvkQML2VQdebPxeAs9rP3NNvYHbiOrzvJONUGQZ/9OWuixP/OTCatlMUqeYwI
+gellBfjTAkgaiGmLgZ3DDVp6r4z+qC0jcEEvCSBqUTT7f0SfZLU=
+=/gcu
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c4217f2d7aae..83824d5db7d0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 01 Aug 2021 20:38:55 +0000
+Fri, 06 Aug 2021 22:39:05 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2d47eb6d3adf..5076e968a1f1 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Aug  1 08:38:55 PM UTC 2021
+Fri Aug  6 10:39:05 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5d689be557a5..c4b6fcfa4273 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 01 Aug 2021 20:45:01 +0000
+Fri, 06 Aug 2021 22:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 997c51eabe95..3e4c92dc17d8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-66b0172e8c4a57a48e46a5d018bb2ca983c65a8e 1627849913 2021-08-01T20:31:53+00:00
+e7b0114164283c266d7a246b824dfe906881b93c 1628285166 2021-08-06T21:26:06+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7604bf78a14a..ca36aff189b5 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1627850101 Sun 01 Aug 2021 08:35:01 PM UTC
+1628289301 Fri 06 Aug 2021 10:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c4217f2d7aae..83824d5db7d0 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 01 Aug 2021 20:38:55 +0000
+Fri, 06 Aug 2021 22:39:05 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index cfe9557cd1bb..71f4a6e4bfed 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 71032a053203..e2b6dbdb2077 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,6 +1,8 @@
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.12.4.tar.gz 7535804 BLAKE2B 495a53fc0887ff2e1b5e058c52af63c155da600b4c82e38653a56c4b1dab497ef477254b19727c6c366b48c41a052b68c9910cb4bc4782605612a3d63ccf646c SHA512 3a817eb6f1be256f6eca5136e3d74c49e1cc2a7af382a906abebc6d573579e755decf72bfce62fad48f9c5a37fe6bc304c5849d1008ab7ce4939213f720ab37b
+DIST icinga2-2.13.0.tar.gz 7584525 BLAKE2B 94c08030e508c35d610c12e9855015da35e4dd6a67614bc44ab5605ba61f9f3f9ddc4fec98be8534ae2e84d1d1c1065295b872c6a060a36e821f929c04a90172 SHA512 a3eb0166bb2851a7e6e795fc541b535db3ac2d8d9c2e4e72caf0472e54ac0ef110ea97a1c1c208b97c2b99e1ec51919a378bba68b21e770786074dcb1af4bd26
 EBUILD icinga2-2.12.4.ebuild 3953 BLAKE2B 3c77b7daa7343916baeec5a8a7bd4562e4e6de07b3edbb457f04f8e5c414d7bbf0f422957a8c11b3363d90185d4eedb1245af05128e109294b3d16c1079ef0dc SHA512 216c9c67fddd1b81e22b87e98bb8ba1972f99d6b75a052669ad7e89d69e15db898405901b147be74a389f27c2b122f7cfe30a9c834594c4bd84afc23d2e76054
+EBUILD icinga2-2.13.0.ebuild 3955 BLAKE2B 400b602e82fe0ef14c366641f553b4a775bc7f324c3e345dbe14b8573f5ea11f183830a96a0d56c394828e725ab6d118bf9ca2df040673c0df221d5a145aa168 SHA512 5efbb0d9b2ca186b8bc173d9a2498e5f4479f6780b03e3f32487cc601a2bf0ad5a83fc3aec6d98705b3cc44fdc6af668aed516b1f371168c7f73b7d1009e5866
 EBUILD icinga2-9999.ebuild 3870 BLAKE2B 6f3f86826465ec9e5049b6c712fc0c55558b966da4293fad9e8307dafb5f3830e61859e54525ab4e1ac887a6115eb060e78d95b6b326b7bec04efe89fa47f91c SHA512 5d3987b0c536f04b00f131ab320e353f55f1b3023233468e3702c501da277ecf1cb687d2304672f0ea1576b98841b0b2bc01bbe70b68056e93a5f6d56e9f63b6
 MISC metadata.xml 870 BLAKE2B f18bef5b15712d2fddf22edaaf628b4b9bacbb92fd03750b0d956aa7e13baaf389c131b929236158f1df8c718c754bd55ef6031cca282db0b22d2a4d94a353a3 SHA512 30744556867891c0a4e3ab86dbebdd6b1191bfe25f8b9f997fc8c88b3b8d69365a33184c7ae2cfa7fee5c19e8c348c768fcdaede7a0e4ab5c28927bc09151ae0
diff --git a/net-analyzer/icinga2/icinga2-2.13.0.ebuild b/net-analyzer/icinga2/icinga2-2.13.0.ebuild
new file mode 100644
index 000000000000..de80eb55dfc4
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.66.0:=[context]
+	console? ( dev-libs/libedit )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-libs/yajl:=
+	acct-user/icinga
+	acct-group/icinga
+	acct-group/icingacmd"
+BDEPEND="
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35"
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	mail? ( virtual/mailx )
+	acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+	# https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DICINGA2_RUNDIR=/run
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+		-DUSE_SYSTEMD=$(usex systemd)
+		-DLOGROTATE_HAS_SU=ON
+		-DICINGA2_LTO_BUILD=$(usex lto)
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres)
+			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+	if use mysql || use mariadb; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	fi
+	if use postgres; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/run" || die "failed to remove /run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners root:icinga /etc/icinga2
+	fperms 0750 /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners -R icinga:icingacmd /var/lib/icinga2/api
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${PV}" != 9999 ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${PV}" -gt "${v}"; then
+				elog "DB IDO schema upgrade may be required."
+				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+			fi
+		done
+	fi
+}
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 18227785eb19..58e2ceeb668a 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,5 +1,5 @@
 AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f384258339495abcd937271ad29b429bebe5922f5288113683e5910c5ea513d2a131aa50b230ab51bfaf332e31379 SHA512 996905be6f96f71a742d3a00c0a5c6730b69709f50db4132284e12030dd80929ed838f7a7a94bf3634698bd17234a1324a84f81a5dfe5f4a71ab70e9f8f294aa
 DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
-EBUILD mtr-0.94.ebuild 1426 BLAKE2B 5e54c4c3017cdc6570c8a5e0b8959b8cf2d34d4599b45df2d26f3d47af432f0f5ad4b00dede2d54bc743a8750a4cd190dc14d2635d2c1599f1e809a69156a7e9 SHA512 79481d57db2fc582d3f730e58dd7101618d7f0f095d98ab1d486a0cee344347688b062a4e8eebea7b2d2128772a525e62971f8a0448aa162a75969e0fc80ce0d
+EBUILD mtr-0.94.ebuild 1433 BLAKE2B abaa921cece431cd22f96a0093fdae88752c874b8225f4f86bc4321280a8c14fabd92fdfca0931bc5eeab7ff0dc4c5100e9007b1c1183b5a8fb3fd8b4ea5642f SHA512 b34f1994dd1a070a1593aa8340946be02e23f2a4482f08d3b178145322e7fe7fdf5f2fa8e450aca6e5c910ab6d2598e9a002287a4b92d147b9ec5807e90cf90c
 EBUILD mtr-9999.ebuild 1282 BLAKE2B a9451a299afe9c557b3400d19f39b33dd6cb4cdcdf60fa58edb551e3736d8af261a76516caa9b39561d57c36c74d1eb26fa63c3ca96908c97310adf118a2b173 SHA512 e07ee53e8e2aacdf43cc8fd0d5e1adb773fd4d3c5d47cea982f8104c81d29b7040335d10e201ddda106b8a330381d38d76ea0190d2c56d617d1709b6e3d83319
 MISC metadata.xml 636 BLAKE2B b553bae226e80a85b8cb7c50d3017944e1b86a0085bef3b670db4628b8a03505e3e61a85ef3bb31c25e5585444266147b07a2598bd37bb31573909c17579d61c SHA512 6e5bf3f6f49a341d51de9e3988b9750fa2db80ad4236e845b97f51e10eb962fec6e08a4fee267f14b6783a3e6570ccd083e1bcce058876929bfac9173e69c007
diff --git a/net-analyzer/mtr/mtr-0.94.ebuild b/net-analyzer/mtr/mtr-0.94.ebuild
index b23e88ccf2cc..c9cfd561d602 100644
--- a/net-analyzer/mtr/mtr-0.94.ebuild
+++ b/net-analyzer/mtr/mtr-0.94.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gtk +ipinfo +ipv6 jansson ncurses"
 # This is an inherited RESTRICT - figure out why!
 RESTRICT="test"
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 28d2a0db0123..2c9adef942b2 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -19,6 +19,6 @@ DIST net-snmp-5.9.1.tar.gz 6781346 BLAKE2B 4242ca77372005f995dfd228bec51d35b6b0f
 DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173
 EBUILD net-snmp-5.9-r4.ebuild 5621 BLAKE2B 4e7a0bcacd7d35addc863f2527cb8ce9c6c777ecfe2fc336b072b2b25eed7a388eeff3be3e3a52abb9c705f6bfbe17446e7ed2153867f29174c3093692bfb6f9 SHA512 c7d3fbb129a6c79675a002c0bd96728a60ed4d8d94d51f6c1b82d381c3df30cd9e86d76701bec87cfd1dae0cd7e2c7500ada0b07e7f311083bcab64088f78063
 EBUILD net-snmp-5.9-r5.ebuild 5660 BLAKE2B 4e06816e0f73142b1910c6e887c130e2ef60d8bdbcc948740fb4a330229152655da1dc04bb5bed5d6c505b15172d55daf304a4bd06ca1d560e67b1a4e70b78ad SHA512 fda3983d5c28f2bab36aa11b197990605f5677dfd698dcb398957085261aa7a30a4bac9cdffa89cddb8c263475c09f94ddd6fef320afb333dee18f2c03effcb3
-EBUILD net-snmp-5.9.1-r1.ebuild 5632 BLAKE2B a0288c33c6f4aec424f3e39fe40a4c05e63c98ee36affcad30afdfc0622d64ff5723ff975a729cb1a0325d427c04cdef0df13160efccdde886e70450f1e9bf34 SHA512 d6a9d844ceb5c0d8f16ba61bddbac4e04415f561b7bede2ea1ebce208ac047436c9b1f146427afdf24783db64de64f70deafb3f081ffd7c5198c89e34a6b77e2
+EBUILD net-snmp-5.9.1-r1.ebuild 5639 BLAKE2B 714bf0f0095de5d45b9fe44ea6143eb2c26e63c70d2e326e0ce25a0d762f63c4c93d9dd139de3f65d2da362d6e2d2f729ea2a280ec61f19e27e0252f6653dd1b SHA512 d659e9e6fda0b6a3d3f0b7582210ba2708598d2cb3760acfef51e4d7692e7920f9f71aa2a2c43d09b2028eb81c1d9a1c78a7672cf68557d5382168f7595d0feb
 EBUILD net-snmp-99999999.ebuild 5567 BLAKE2B f2398dac2eec806c1a25335c3345220394eb26de535a9253c53c6690469727cbf6148a7e46a67193189678be6794e634a8627aca152d24166fe1658db2fd3cd3 SHA512 50ce4be6511a7a70f9f4e0e48101774fa4a4ceb1f39a0b3c615264a02b0f01049855f50822bac6e5cfabc312e6404570476667d3455c11627eba565cec864fff
 MISC metadata.xml 1383 BLAKE2B 66b4b2fb72a10c172e0ccdc89aa8903176393f381762e467b1bf7f16be20896b94ea68c67d125f5db7c42c85093f8b4208ded932afebee4a52e47bb691cf708b SHA512 6468e1fcfcbf83104c6165728825d36160e8df8975bc88a8933b6bfd4b28185ba08608e01d7721858760d47bb70d637ca36c6a3e443f02fb799a27fd89a60627
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
index 8199e35e5069..007d4f50bc1c 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
 SLOT="0/40"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
 	X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
 	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
diff --git a/net-analyzer/nsat/Manifest b/net-analyzer/nsat/Manifest
index 8eda30ee1110..573dd4977aaa 100644
--- a/net-analyzer/nsat/Manifest
+++ b/net-analyzer/nsat/Manifest
@@ -1,4 +1,5 @@
 AUX nsat-1.5-amd64-compat.patch 1057 BLAKE2B 69b27007c793201c40ec99526000ff524c741cfefff65dbe49c5ddf05b5675daa3b67997abf17799982387c4425891fbc6afa762e778dc3b38fe6601ed41830c SHA512 e13248ff8ecbb7d659484d211959152cade74121a875f6141e512bbd8eb54495bfacd2acdc91334ab431e8c0f14c73f87297aa40fe98014f1d6c1f0ca04dd7f3
+AUX nsat-1.5-configure-dash.patch 2802 BLAKE2B 2a745404b301a5952146d6695e9f03432db9f03ed25b76ceb6afbd949da2029911d411ae54bd2bf140a21b5ed4355ac8d732c019a79181184a5174e0d05617c7 SHA512 dbbf452faf3577751d8fe3cc86ee70ac1971d210641455fa2f3093f3e57d002a28b4c9811ec78ebc30468a610ef14aec437e208a1aabbc49216da8cd2f055fb8
 AUX nsat-1.5-configure.patch 741 BLAKE2B 51904c7d4b64c1207fbe771ef28ebc72ff2cedbeb931723ba00592ce3a6c01051665dfd65f47ae0cc12ebecda34c60258a3833413b1ec272e02db07cb8e0dc28 SHA512 1134f09b9aa3d715d7c6ef93ee31ead345f3e761f8903a2e6de454b3182cb88811b5e1823b80feab8a87e6194672d0f6f0d00895569fbde23447bccec1a0c8f6
 AUX nsat-1.5-libtirpc.patch 977 BLAKE2B 4846aea97ef9ee6157e47531f306bd46cbc93ca380d47b347a5d6417814e219572ac7bb315d7e6f86453c88dca53a01980682698d8077e1e663f48960684db14 SHA512 509b6c0ecd545893ee49f810c54b11c5c8f527ce14acf92a282f9d993392ab1e40a807a5a4646eb7b62c80f7e21593f2996dc83d0636344ca4273209bdc551bc
 AUX nsat-1.5-lvalue-gcc4.patch 375 BLAKE2B afd39e903b900b7996ad650b1382f4e6a600bd38a04531c4dc7da1365cf635c4363677566d39242facd5a80bbca83474ff9be9fba0c9978944fa0cb8ac1a42d4 SHA512 4768bbc1e1e9ed2b4efe70ec55214827e2dfe59e9c838d8934fee43c886b386c5942e93d862c37f220bc5e019642b3d914e2fde175a2aeee4691c7933c1aa3b5
@@ -6,5 +7,5 @@ AUX nsat-1.5-misc.patch 2422 BLAKE2B 093cbcb9ec6201f6674a0d191db23fc462c9e6bcdf1
 AUX nsat-1.5-strip.patch 205 BLAKE2B ac4b4b54ff6f8cf1771f57497317040eb40be829c8bcbb03c2f063fcaa190419e74b8ff5481f8fab4332af223d9a8ba7526d793d084be1f1498d0046db820227 SHA512 3e8b312e704f08fbe86caea37a8491851474cb0b773a73f4b2995532086fefa85a5240f49084bb0e1195089bfbfa937e68c45c0908a2bb7f427775ccb4535e8e
 AUX nsat-1.5-va_list.patch 470 BLAKE2B 2ac6936d216b497ecbd47cc167f9f142fd6bf20f834b123ce6ace47d9fa999102f8606e856b55db4b03243c6a427931ee56092c5e0dbc8e9357b139f26e28892 SHA512 1963419110a34b826d27b5b34e22ae71906380bc8a2ce130d374c00ad91827fab3781e97aadf417613f042d195ee9e85e50b898befff82190c7e031276903baa
 DIST nsat-1.5.tgz 410603 BLAKE2B 083ac2879afae87d1282bb643d0988b2f858f9c934fe7a6e24407c0f5cf90ceba7be17aeeae8e7cb9d0f7a31cce171fed6382351ea8413b13d3e4343339f0c9c SHA512 1a5b8e88f7bcacdbe1144a719a2e446c0ea025ad4e5f8c79ccb939083308cd2c1b2c1f3d7ab3b791924d5855994cbc3fded95aa36df23c12fd76fc20341a87d0
-EBUILD nsat-1.5-r5.ebuild 1503 BLAKE2B 2bce733a813ea3f78db093ab937f232b44a8c8b28b102181c7bb3c2ea66113221a586cfc59a46065f402284335e3b6f748081141242d63d6e8f64a529526bfcd SHA512 004ad4e801b0fec631b2666925e90afbf0f03ec023f47d9e0942ebfe2d204efef64a966f98121b80c4db93dc603b154b704f18d5c9f0343856d6807abefdd4c9
+EBUILD nsat-1.5-r6.ebuild 1578 BLAKE2B 744ca4dbc0b2e8e92582d407deb0847d4d23abc8dd873d1f64c6554437b0e549aeb58fe93c699608406b3fa9ad0c619641b68e0b7ef14f8c77a924b1a3805822 SHA512 a33736564d9a97a0141cb463c42f820ff319e1831e30dfa4eddded09cbda1e56ffb947f4eea16b42f5f155988a3f5a1b5f26d080d0ee45f18d5f179d40e4abdb
 MISC metadata.xml 354 BLAKE2B 11fb6b027bd44e7d69a5fce125a5932c0ac66affaeed6a4b11d7bf21de87c2d480ed7eb640add9ffec5b3a8baf42e9d2361ac85f4a04d71ea7e374e5028a16a2 SHA512 a3a21d2657992bf6d01e9d184a19b4b25c56bc7125149847fad0118a9ceddddbbbdba00a31f57230efcb76491693ecf289770f2226a720cbc98b65a921c7ac11
diff --git a/net-analyzer/nsat/files/nsat-1.5-configure-dash.patch b/net-analyzer/nsat/files/nsat-1.5-configure-dash.patch
new file mode 100644
index 000000000000..af19ba293ddb
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-configure-dash.patch
@@ -0,0 +1,79 @@
+From eda78d802b11dd7c920cd8e0396ca064f34e2a8b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 5 Aug 2021 00:27:23 +0100
+Subject: [PATCH] Fix configure with non-bash (dash)
+
+---
+ configure.in | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 95c59da..b549092 100644
+--- a/configure.in
++++ b/configure.in
+@@ -10,7 +10,7 @@ AC_CONFIG_HEADER(src/libmix++/mix/lmconfig.h)
+ 
+ AC_PROG_CC
+ AC_MSG_CHECKING(accepted compiler flags)
+-if test $ac_cv_prog_gcc = yes; then
++if test x$ac_cv_prog_gcc = xyes; then
+     AC_MSG_RESULT(GNU CC/ANSI (good))
+ else
+     AC_MSG_RESULT(crappy :P)
+@@ -41,7 +41,7 @@ case "`${UNAME}`" in
+   AC_MSG_RESULT(found Linux. Ph33r.)
+   AC_DEFINE(HAVE_LINUX)
+   AC_DEFINE(MY_HDRINCL,3)
+-if test $LEETCC = yes; then
++if test x$LEETCC = xyes; then
+     CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DLINUX'
+ else
+     CCOPTS="${CFLAGS} -DLINUX"
+@@ -54,7 +54,7 @@ fi
+   AC_MSG_RESULT(found MAC OS X)
+   AC_DEFINE(HAVE_BSD)
+   AC_DEFINE(MY_HDRINCL,2)
+-if test $LEETCC = yes; then
++if test x$LEETCC = xyes; then
+    CCOPTS='-Wall -O -funroll-loops -ansi -fPIC -DBSD44 -DDARWIN'
+ else
+    CCOPTS='-DBSD44 -DOBSD'
+@@ -67,7 +67,7 @@ fi
+   AC_MSG_RESULT(found OpenBSD. Yay.)
+   AC_DEFINE(HAVE_BSD)
+   AC_DEFINE(MY_HDRINCL,2)
+-if test $LEETCC = yes; then
++if test x$LEETCC = xyes; then
+    CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DBSD44 -DOBSD'
+ else
+    CCOPTS='-DBSD44 -DOBSD'
+@@ -80,7 +80,7 @@ fi
+   AC_MSG_RESULT(found BSD. Yay.)
+   AC_DEFINE(HAVE_BSD)
+   AC_DEFINE(MY_HDRINCL,2)
+-if test $LEETCC = yes; then
++if test x$LEETCC = xyes; then
+     CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DBSD44'
+ else
+     CCOPTS='-DBSD44'
+@@ -95,7 +95,7 @@ fi
+   AC_DEFINE(MY_HDRINCL,2)
+   AC_CHECK_LIB(socket, socket, [ CLIB="$CLIB -lsocket " ], AC_MSG_ERROR(libsocket not found.))
+   AC_CHECK_LIB(nsl, gethostbyname, [ CLIB="$CLIB -lnsl " ], AC_MSG_ERROR(libnsl not found.))
+-if test $LEETCC = yes; then
++if test x$LEETCC = xyes; then
+     CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DSOLARIS'
+ else
+     CCOPTS='-DSOLARIS'
+@@ -169,7 +169,7 @@ AC_HEADER_STDC
+ AC_CHECK_HEADERS(fcntl.h unistd.h sys/select.h sys/time.h sys/types.h sys/socket.h stdarg.h std_args.h strings.h netdb.h netinet/in.h arpa/inet.h signal.h stdlib.h errno.h ctype.h sys/file.h sys/ioctl.h sys/signal.h sys/stream.h sys/dlpi.h sys/bufmod.h sys/stropts.h sys/param.h sys/termios.h sys/filio.h net/if.h netinet/in_systm.h netinet/ip.h netinet/ip_var.h netinet/ip_icmp.h sys/resource.h X11/Xlib.h)
+  
+ AC_C_BIGENDIAN
+- if test $ac_cv_c_bigendian = yes; then
++ if test x$ac_cv_c_bigendian = xyes; then
+   ENDIANESS1="#ifndef WORDS_BIGENDIAN"
+   ENDIANESS2="#define WORDS_BIGENDIAN	/* this is a big endian machine */"
+  else
+-- 
+2.32.0
+
diff --git a/net-analyzer/nsat/nsat-1.5-r5.ebuild b/net-analyzer/nsat/nsat-1.5-r5.ebuild
deleted file mode 100644
index 4e71eb08de62..000000000000
--- a/net-analyzer/nsat/nsat-1.5-r5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
-HOMEPAGE="http://nsat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nsat/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="X"
-
-RDEPEND="
-	dev-libs/libmix
-	net-libs/libnsl:0=
-	net-libs/libpcap
-	net-libs/libtirpc
-	net-libs/rpcsvc-proto
-	X? (
-		dev-lang/tk:*
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}"
-PATCHES=(
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-lvalue-gcc4.patch
-	"${FILESDIR}"/${P}-strip.patch
-	"${FILESDIR}"/${P}-misc.patch
-	"${FILESDIR}"/${P}-va_list.patch
-	"${FILESDIR}"/${P}-libtirpc.patch
-	"${FILESDIR}"/${P}-amd64-compat.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
-		nsat.conf || die
-	sed -i -e "s:/usr/local:/usr:g" tools/xnsat || die
-	sed -i \
-		-e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
-		-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
-		src/lang.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf $(use_with X x)
-}
-
-src_compile() {
-	emake MIXOBJ=-lmix++
-}
-
-src_install() {
-	dobin nsat smb-ns
-	use X && dobin tools/xnsat
-
-	insinto /usr/share/nsat
-	doins nsat.cgi
-
-	insinto /etc/nsat
-	doins nsat.conf
-
-	dodoc README doc/CHANGES
-	doman doc/nsat.8
-}
diff --git a/net-analyzer/nsat/nsat-1.5-r6.ebuild b/net-analyzer/nsat/nsat-1.5-r6.ebuild
new file mode 100644
index 000000000000..0817289a2e6c
--- /dev/null
+++ b/net-analyzer/nsat/nsat-1.5-r6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
+HOMEPAGE="http://nsat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nsat/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/libmix
+	net-libs/libnsl:0=
+	net-libs/libpcap
+	net-libs/libtirpc:=
+	net-libs/rpcsvc-proto
+	X? (
+		dev-lang/tk:*
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-lvalue-gcc4.patch
+	"${FILESDIR}"/${P}-strip.patch
+	"${FILESDIR}"/${P}-misc.patch
+	"${FILESDIR}"/${P}-va_list.patch
+	"${FILESDIR}"/${P}-libtirpc.patch
+	"${FILESDIR}"/${P}-amd64-compat.patch
+	"${FILESDIR}"/${P}-configure-dash.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
+		nsat.conf || die
+	sed -i -e "s:/usr/local:/usr:g" tools/xnsat || die
+	sed -i \
+		-e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
+		-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
+		src/lang.h || die
+
+	mv configure.{in,ac} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf $(use_with X x)
+}
+
+src_compile() {
+	emake MIXOBJ=-lmix++
+}
+
+src_install() {
+	dobin nsat smb-ns
+	use X && dobin tools/xnsat
+
+	insinto /usr/share/nsat
+	doins nsat.cgi
+
+	insinto /etc/nsat
+	doins nsat.conf
+
+	dodoc README doc/CHANGES
+	doman doc/nsat.8
+}
diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest
index 179d9bc03f7c..43818626632d 100644
--- a/net-analyzer/slurm/Manifest
+++ b/net-analyzer/slurm/Manifest
@@ -1,6 +1,6 @@
 AUX slurm-0.3.3-overflow.patch 596 BLAKE2B 4cd1544015da6c32373969b5d049644cd0ec1187e998327479841ed94237dab18a0487c9d3a01d019acfc7f43767011b549b1dd81e8f05390b303a89b9770b9f SHA512 6211306f2e6787cc8c4f4e02e4af840003db6b90f32b6a7191e019300a00e460c8a16b13e2ad24c0f51bd5af7de9f7d85ede44b6f4de3d1c8544f9deacb29890
-AUX slurm-0.4.3-fix-includes.patch 556 BLAKE2B f2b9ad3a33fa87e6a66b460b72392bf4ad3d978eaa9ca4886dd09243b73fa4580c402fcd455fbfe8ca8ea31393c25351ddd6ce3a4caf8ee2c1e8942559540c95 SHA512 f6cf0d23c9b311b7b9b2384f00a751d091304f518caf8d4882bbf15c95ea5724e8e1c90b55f175d8781cd1edc917bf65ec09f8cf1c7665c2cb1412b0a5f8cba3
-AUX slurm-0.4.3-tinfo.patch 267 BLAKE2B 2cd7d9cb11504b1eaf9b940e82a8baca65bd067ba99a0ddba6908e4c1863b71688ce3669dd2bed9233a7413810e2e2f71c3a680de024f3f941e7a44b576e1801 SHA512 fc348f28590efebb86993d7187539e949d052d8959eb36765d6dc3a889fff22f7d6b72bc8337d6a93f22426bf590f2a2239ed4426b4a26949624bb1f9e48ac14
+AUX slurm-0.4.3-fix-includes.patch 599 BLAKE2B 96fdbdc5f054ec22638c8b25934085d1ee41c59bdff2ab60530ca9879f77cf8f63b93893cba14ae3867ab391e447d2156b15d8753567fda53edc586fca1322a4 SHA512 c157644a3573c518ca3d2d5498f0025d70888fd45c6d978c6b10266828a391e6ebfcd215e4d80b0b1e45e100f34405113cf49d004a0d1f3460726684f627045f
+AUX slurm-0.4.3-tinfo.patch 310 BLAKE2B a37e40832beb83aae81fed4aa5b4be59210ffe06aff0a6a799737ee966fe1e6dcccfae362e6957a4aa699a72d31c0c3a52424a7e647dee35e8c762346156c7a8 SHA512 a7a70f4dc773272028dedfd0db2194ecda173d19a83581d4ae4a8c261ae06751488bb4d1aec746f7ad97ca7750d30a75083cdb8cd175753fca80a2c98df54a35
 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
diff --git a/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch b/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch
index 9e933ffc509c..a421c0aa1fa0 100644
--- a/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch
+++ b/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch
@@ -1,3 +1,4 @@
+https://github.com/mattthias/slurm/pull/39
 --- a/os.h
 +++ b/os.h
 @@ -177,7 +177,7 @@
diff --git a/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch b/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch
index c1a1233f177b..ccb00fbeb094 100644
--- a/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch
+++ b/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch
@@ -1,3 +1,4 @@
+https://github.com/mattthias/slurm/pull/38
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -25,7 +25,7 @@
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 0058d964a413..c26dd7135e7d 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,9 +1,7 @@
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
 AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
-DIST wireshark-3.4.6.tar.xz 32304604 BLAKE2B 17eb721dd56482e856b10bfb19b3e3f61b9ce4b285415dedcac0b03114969a672b11b975fe2c8c5a56656dc07d744413c3019a2fc38cefa954e735f3cc1162f8 SHA512 eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d
 DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5 SHA512 26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
-EBUILD wireshark-3.4.6.ebuild 7206 BLAKE2B 4808491b469daf8b3185292bcfbbe215a9f32abd4ab0d0f4f78163633524b7b2457b17dc109a653a2ff2aa3f296aa7d9284bbf90c379e593e4bb33e1a6e81675 SHA512 5308aaf15324c020d1fa5bb68ba366f1dc686e0f40b1ea203cd1950cbcaa6e678380c0bc8bf24ec644649a07e364d8318b131cc234db94be2add86046c4626c7
 EBUILD wireshark-3.4.7.ebuild 7206 BLAKE2B 4808491b469daf8b3185292bcfbbe215a9f32abd4ab0d0f4f78163633524b7b2457b17dc109a653a2ff2aa3f296aa7d9284bbf90c379e593e4bb33e1a6e81675 SHA512 5308aaf15324c020d1fa5bb68ba366f1dc686e0f40b1ea203cd1950cbcaa6e678380c0bc8bf24ec644649a07e364d8318b131cc234db94be2add86046c4626c7
 EBUILD wireshark-9999.ebuild 7211 BLAKE2B 2b907655ef70a51ea09d2e597b84e625b9bf75ea3a23c44768176402dc17a6ed3732bcd6c5bec2dd53e4054920402b2412d2dc28aa0a9666dec990cce66624d3 SHA512 20443697c5a2ed143a16d4327bc1af599414beaac337aef6bd77bc6236a39a2d7f862aeeb42007df91a844a1a70d83403b0a82ae2678653bf4c65f4254c82948
 MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/wireshark-3.4.6.ebuild b/net-analyzer/wireshark/wireshark-3.4.6.ebuild
deleted file mode 100644
index 234f78724444..000000000000
--- a/net-analyzer/wireshark/wireshark-3.4.6.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-	S="${WORKDIR}/${P/_/}"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-CDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.32:2
-	>=net-dns/c-ares-1.5
-	dev-libs/libgcrypt:0
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2 )
-	ilbc? ( media-libs/libilbc )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4 )
-	maxminddb? ( dev-libs/libmaxminddb )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	test? (
-		dev-python/pytest
-		dev-python/pytest-xdist
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-	"${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup
-
-	mycmakeargs+=(
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LTO=$(usex lto)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	myctestargs=(
-		--disable-capture
-		--skip-missing-programs=all
-		--verbose
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		epan/wmem
-		wiretap
-		wsutil
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking
-	# in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]]; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the pcap group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index ac51ca24ba5e..c9c4319a4e45 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 17e7fb6ff64a..edde46feb35b 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -5,6 +5,6 @@ DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df
 DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5eec2257350a41206bf05882aa7e2aa0e2cb0944a962d77e23451f604376168298d5ef99c70b134989c35261bae6046b882 SHA512 0ae0f91e8b9cfcd7d1a1af6cb55f7972e9bc029cd4b10469d5be696ae750d6aabb5f59426e9bf6f700d5a56decd3ddf85a097bb98ae1d06f0b167967b5b8b8ea
 DIST rp-pppoe-3.14.tar.gz 224688 BLAKE2B bfac215d206ce53ead2a10d5440f8243cce4763f7ef15d52f7bd609e8eebdebf5bc52204350988cb1d1b69d1df9092aca77173333e753e8bb9752ead8618569c SHA512 0fa26e9478d387d4752ab85837dab9d1464f27c1ca832bad265deb01b5c3565aa341e3c75278b43a56aed466f02861af11b3bc64bae932a13cb103c4f0b91a29
 DIST rp-pppoe-3.15.tar.gz 224966 BLAKE2B 85eda606677b71e35ed3b9389db0d01ac1f16c7b40cc31b3adf31946b18454b77867a5e8822386e9fb08455399733242c4c074c2fee6f1c4d62fe23b44e82707 SHA512 a156c084e57361ab6a464c3205ffb85cf86d02f71f17f92c9567f1ab0ed300f10030832fd232084699dc842ac4891efc8c54c8165587bfc7b4c92724318a60d9
-EBUILD rp-pppoe-3.14.ebuild 2313 BLAKE2B cd5cb24eb813dd08bdb52e67537b867ad52a587ffb60fe55c69819634c0e6dafed40360c1ed6b731ab2680892a7f10dd54d49926a9214a03225532f515e133c8 SHA512 b5004c055b6a4500bf734f987f32ba597bba3af804810a4a092365104476f2e2e6acfa58c77236e33ac7ae538b463ed2a4230e7e9dce5fa93d2c47b40bfae944
+EBUILD rp-pppoe-3.14.ebuild 2312 BLAKE2B c6db7f974d0bdbee0c2ac6c0f591920d9a78a970476caa622f51567dbf37f35f554c875ef09c1da0f0fcf44ad3334a267cf8c668d24340bc069683b906e3dce9 SHA512 399a5c0a7d4f44ad1a71a2a1cc44a277feee5d16b0cf6c21884ee30b730ce87a93a0c90d60c5d6765a7663cfe6176e0518ead32c2080bb8d47dd85c979da1ef3
 EBUILD rp-pppoe-3.15.ebuild 2415 BLAKE2B 8db0be1e63fa4c0e2674f393eeb3efe54874b80b41da57f4ee3160f90112521426f9bdf28efc8afe060fbd3f54c32e3b52c1325acd4dbe7aafaae75d75536367 SHA512 fc86814d913bd017be9d8cbe4976d63218ebc3547a3d1d33f417d53278be25ae4a18a54656df374048bcca41b355902cf3af2fca2fbcb74d626f6f75ca397f8d
 MISC metadata.xml 370 BLAKE2B 00e0195d903d9fe379c0c8662f4019dd55a53f7027ade12f314f8007f9edbb6b4a5e5bccef2897d97ee3d2164a169efcad607548dbf53d363b72a360b57444b3 SHA512 ebfae7addd585ee6f01b45921b1ba6a1c824c6e34f8f6a3c6d2fd917d7b17aceffca5f6a4ca1c7b135a34c679394417b73a23e067daed8a2c4b71fa63536c849
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild
index 50fd55f73f53..b9ccca9ad491 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="tk"
 
 RDEPEND="
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 5e9d88c0b14f..f094f2e8ba2a 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 4bc9d650b04b..c68fb211d2b3 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,8 +1,12 @@
 AUX pdns-recursor-r2 1426 BLAKE2B 4407525f88d6e4299acdaa015e13866b70b2f697493218953c515e00af1476df7b8dbc87f6a39c50743d78b7f8efd2d3446e1a387f98ac4191cea2c04e10c175 SHA512 2f4d8458f6224a42103d28937d69228092c74c9c8c958833b292acf8959df1e617eafc13b65b95cf6eb4e06fb4fa7f23906c28b583865b6885949daaac12799e
 DIST pdns-recursor-4.4.4.tar.bz2 1399645 BLAKE2B 2ef2a59b9c402ab9d9b59d6b89e85b7103dbd9cdcc6147d08f09b85209cb2e298ff539dcb24895a4711f4e7c55c398d0307f237b22d1bdadaf01ec3925af0e8f SHA512 de8ac38d77a4700cd9dd64aad2ba7d1a97057683ace34f1dc3b2e9680faef5637ce7cedb66ceb0b7701f7ff6ef80cbee653549302805b30f9a6defa3a4e8e830
+DIST pdns-recursor-4.4.5.tar.bz2 1400394 BLAKE2B a373d15987860bd6b890e5aa5900f28623ff763a711e527b05c3de950c7fbec186dc5e085100008a8ee89bab24140b0f993357349ec04d968e7f386156cdefbc SHA512 21f4172bb8908cfb53e8d457533a85940b13da6733c2da3972b587e64a0f6d52bfd52b85d5d65769c33dd479ce89b6306bdd105c120ab99b32963e7f0cfbc2e2
 DIST pdns-recursor-4.5.2.tar.bz2 1464834 BLAKE2B 88acd7a6edecf8188b366a9fcff0eaf1b71429df8aad4dbcf157be39901b56ee3c9a9d55bf55bb060bcbb59f68b3ff8987788f4186a7122787874f895be1e751 SHA512 02a9f725c7528f91eb45409b32ffa06cb7fca1f0151907efcd8b75100942e98f593858543df15423413d69c9fd433bad3c8bad0a84f8144af07c637f22a86d5e
 DIST pdns-recursor-4.5.4.tar.bz2 1466655 BLAKE2B 35438eb8dc08990058924d4603e1f7fe2f74f8b2c61e96a82d6972a95f7b3cb43188fa10fa2dc70b699611057a21ba9f78eb3840976ce222c82ea32bdc374bb1 SHA512 403276ab06519a05154fca47fb7270d0199e770f1049a0503a0a1421f2d6fb7df6e9d5359d48348608d6b784e18ac815dd523051b7312f46ad4b510b608af7ab
+DIST pdns-recursor-4.5.5.tar.bz2 1472089 BLAKE2B 408bd0d11b0945de15fe22b290b127a9b7f9f053359a0269fb9e478ae536ed5c4b5ad3b5fa8b15d7786fdd0cdd8721d5a5cb66d46f816105e37ecd9fc9557854 SHA512 7df2e89eea55e870724370753b39d867e2b32fc8bcbdb3efaefa824917b16b9d382817dce7d551dc16d8ad0b0c04b3021cba310b47de969fe54c395eafe7706b
 EBUILD pdns-recursor-4.4.4.ebuild 2009 BLAKE2B 2ac02e0feb23ea88dd1a3cb11501b936df84e479ed6a12d091dc6969d541ed11172a5b62ee60fadf543904c79acbb9c55501cbce3e613fbee6ae5eaab26b9725 SHA512 e61b5b4daa36c405397827d522cc70d9923c9f4294b551b485759f549448b00b0613356a769696240c8a7f9dafbce8645b51b96200c2321f7c5f51ac49b4000f
+EBUILD pdns-recursor-4.4.5.ebuild 2011 BLAKE2B e7b7a322ac34dc9c09ca150973aeee17642c76ec9910cd9fd0c8678fb8a85c23c19e89ff4336a8723b2d4350bb5cb79f7cb234056dcc12ba36d5a428b0cbfffd SHA512 011b7d7dffc0d27e4f4cdcb31f0fb4cbabdeeca82f112aa3fc39cf1a47eb569e65f7e6870e41dab7194eed5175e52f746299a79ebef264e8f028f212c7cabb90
 EBUILD pdns-recursor-4.5.2.ebuild 1882 BLAKE2B 9bac176affd6cb7cdacf908de6b1ffb36615606102840d0c52053f21863a62ff69f3d2cc2756c68b46278b17f6498f07909a6b6c6fec1dd751a8a713c2b58eb5 SHA512 7a51c74ea284045cf6872db7a4ba9b697d1416972a405273411b3fa1c0b220e78849651e5df8f08077de95882a376b331079dd83b8f1a8d450c3665f3583ce3d
-EBUILD pdns-recursor-4.5.4.ebuild 1883 BLAKE2B 2ecec2518d4676d838dbdb0cc41a8c0dfd551b15e87ea212594bff2a0d1507746b592684339cf21c08257501c632d157e3edb5ab79b55221c658deae2a83096a SHA512 a26b2d6eb3c97bd485c4e56b93f719e01752c7f5c14019d436260e514cc77ceb644526c210c0ad96cd329e8a0daae862671944501f305ff7a2b59b7c3188fa80
+EBUILD pdns-recursor-4.5.4.ebuild 1882 BLAKE2B 9bac176affd6cb7cdacf908de6b1ffb36615606102840d0c52053f21863a62ff69f3d2cc2756c68b46278b17f6498f07909a6b6c6fec1dd751a8a713c2b58eb5 SHA512 7a51c74ea284045cf6872db7a4ba9b697d1416972a405273411b3fa1c0b220e78849651e5df8f08077de95882a376b331079dd83b8f1a8d450c3665f3583ce3d
+EBUILD pdns-recursor-4.5.5.ebuild 1883 BLAKE2B 2ecec2518d4676d838dbdb0cc41a8c0dfd551b15e87ea212594bff2a0d1507746b592684339cf21c08257501c632d157e3edb5ab79b55221c658deae2a83096a SHA512 a26b2d6eb3c97bd485c4e56b93f719e01752c7f5c14019d436260e514cc77ceb644526c210c0ad96cd329e8a0daae862671944501f305ff7a2b59b7c3188fa80
 MISC metadata.xml 1008 BLAKE2B 1c82fd9262358bcf1ff0f8503bc8dfe9b640023133ca48711bc576df00312312b5e37a36ff10aac561ef1c71e20f64c5f0a4c431c60ca029220732fba0ee1bf9 SHA512 2deab5a88c42d3416b3da5b6d9d3ed9b2db0a5dcb3d8b7fc4c7a13b2219fd7df786bfef42ff5e3d7c2b40058592e892f380d126a0254013534e66e65499e7105
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.5.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.5.ebuild
new file mode 100644
index 000000000000..dc546d8cd6ca
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.4.5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug dnstap protobuf snmp sodium systemd test"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	dnstap? ( protobuf )"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	dnstap? ( dev-libs/fstrm )
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
+		$(use_with sodium libsodium) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.5.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.5.4.ebuild
index 391869be2aec..cf3bf318576d 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.5.4.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug dnstap snmp sodium systemd test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.5.5.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.5.5.ebuild
new file mode 100644
index 000000000000..391869be2aec
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.5.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug dnstap snmp sodium systemd test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}
+	dnstap? ( dev-libs/fstrm )
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
+		$(use_with sodium libsodium) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 88c859ab4694..b2d2dc69d9a4 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index bb0b9d340143..9403ca48740d 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,4 +1,8 @@
 AUX fwbuilder-5.3.7-qtbindir.patch 1833 BLAKE2B 715f3e218f2e1dd48a58b969da0035bc0caf228d928fc17b3035a57b2170f50efc29d9199193530894ccaae096a285a655093d63548d4a0450fb611833d642cc SHA512 926ea0ebd8fbb58e37c225d84b1e6674ee4e8838ebad35303045e982b689d9b511057d3bdbc93039ad9aa0cd58d875ddcf1717d83c77208bfd1aa125b7b7c2de
+AUX fwbuilder-6.0.0_pre20200502-drop-Werror.patch 802 BLAKE2B e4c0c5668fe9b38e287fb5a49d62f6bc758671ef953757527acf8c70bba913c7790450f268ddec4b004cbc8d70e5375b34dbc08e998be5aefe4c8e97a2486230 SHA512 908c2b8f966612555a0cd3f74cb3ec2bc0e96f0596c99fa1709b6ae8f901df4ffffbbb55e4b3169d02d7be116006f035cfee9e82bda55f8d98ff375aae53ebce
+AUX fwbuilder-6.0.0_pre20200502-fix_version.patch 595 BLAKE2B 8bd44bf7980f2692f20b4f8f06fd1d161f4c9416985c2b01eb86170463fdd4dde7df603cd10f7638b12f88f3d02e94f2fd466462bb9ae3effdc184d419f7e240 SHA512 3e2a7d914957d4df56cadc5f2877d80be8cb85d9d1c8e9edcbe91ea3bb2932ee4e9eb68c773d2850b42d530dd887430de898fd9c844c7b4acdb3dff5ee89715f
 DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
+DIST fwbuilder-6.0.0_pre20200502.tar.gz 7278610 BLAKE2B 9eabf34445f5dad4af4bf88ec717ad60d6010233d501151ae1e115adcba88c19d883eceb60ae9c9850f200e42eec5eca083be9330dc54b0b681c86e90f3ca581 SHA512 7fcc957ebc6dc3a198fdb857e11b3d29e25018c3107f2edffbfea3794fdd5fad2ba56d7a74209c6d7b30e4287dbb13ab3bf973c8aa3213cfd4a7317e43e713bb
 EBUILD fwbuilder-5.3.7.ebuild 1482 BLAKE2B bf0f2d7e38908e69777f00c75b7139be568dce47dd94c346194af67443ba87d0167eee826243f4ec44b72ef8f8e858bc2272ac093972aa2f753d7ed2e367feae SHA512 6e0ae543d68a35816123b304da2eba45c901bee18e08c54dd5bc5684f94ffaa827d3ab2ee2a23f5955c45396d0da57a533dd1c7cb54cfa8a53c4094e91128000
+EBUILD fwbuilder-6.0.0_pre20200502.ebuild 828 BLAKE2B 862372d76f342a4ec3f5b5cd54a5ef8729c7e6e4a2c27f048a015a7e4d2678bc49101ff638bb0fbcf4896e1922f4956f1a66dcaefcd438ee6d49929b9c03a5b4 SHA512 865f19ae513a158b330b56ec14b504d0d44b7f40f549f0aa06d76fecced4d58a2a68d781fa5ec3a43df4f195f815d5f27e757c74476804bd56aba37a7a61a18a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-drop-Werror.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-drop-Werror.patch
new file mode 100644
index 000000000000..36722122e5cb
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-drop-Werror.patch
@@ -0,0 +1,25 @@
+From e4c76883d8de814050893bec4d196d5d5f48c9c2 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 4 Aug 2021 20:46:56 +0100
+Subject: [PATCH] Drop -Werror
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ddabd38..97477b0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,7 +45,7 @@ endif()
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ set(CXX_DEFAULT_FLAGS # clang/GCC warnings
+-	$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:-Wall;-Wextra;-Werror;-Wno-overloaded-virtual>
++	$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:-Wall;-Wextra;-Wno-overloaded-virtual>
+                          # MSVC warnings
+     $<$<CXX_COMPILER_ID:MSVC>:/WX;/W4>)
+ 
+-- 
+2.32.0
+
diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-fix_version.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-fix_version.patch
new file mode 100644
index 000000000000..d71de42d26cd
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_pre20200502-fix_version.patch
@@ -0,0 +1,11 @@
+--- a/cmake/VERSION.cmake	2020-09-05 14:54:43.767374594 +0200
++++ b/cmake/VERSION.cmake	2020-09-05 16:13:20.274809080 +0200
+@@ -3,7 +3,7 @@
+ set(PROJECT_VERSION_MAJOR "6")
+ set(PROJECT_VERSION_MINOR "0")
+ set(PROJECT_VERSION_PATCH "0")
+-set(PROJECT_VERSION_EXTRA "-beta")
++set(PROJECT_VERSION_EXTRA "_p20200502")
+ set(PROJECT_GENERATION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+ set(PROJECT_GENERATION_SHORT "${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}")
+ set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${PROJECT_VERSION_EXTRA}")
diff --git a/net-firewall/fwbuilder/fwbuilder-6.0.0_pre20200502.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_pre20200502.ebuild
new file mode 100644
index 000000000000..e2c2d972c0f1
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-6.0.0_pre20200502.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake vcs-snapshot
+
+MY_COMMIT=a5e14a966447c63bcf7b52a0202149e76bd5ed4a
+DESCRIPTION="A firewall management GUI for iptables, PF, Cisco routers and more"
+HOMEPAGE="https://github.com/fwbuilder/fwbuilder"
+SRC_URI="https://github.com/fwbuilder/fwbuilder/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/openssl
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	net-analyzer/net-snmp
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_version.patch
+	"${FILESDIR}"/${PN}-6.0.0_pre20200502-drop-Werror.patch
+)
+
+src_install() {
+	cmake_src_install
+	docompress -x /usr/share/man
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 9fcd130fea52..3504ec3a874d 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/curlftpfs/Manifest b/net-fs/curlftpfs/Manifest
index f8f482ec2c12..129b525a6d07 100644
--- a/net-fs/curlftpfs/Manifest
+++ b/net-fs/curlftpfs/Manifest
@@ -6,4 +6,4 @@ AUX curlftpfs-0.9.2-memleak-nocache.patch 1810 BLAKE2B 70e63ca6b41a479bf88aa3d7c
 AUX curlftpfs-0.9.2-memleak.patch 834 BLAKE2B 1dff269ccf7e6fb3a4c10034ba124a22df2bc25f9f38352d21ef1164c8c375de9cecd36c03d050c6a524434d678dad26141ef8999f90282a56f03d1bdff5ae5a SHA512 dee0eac27bd09208f44d20d3c0627499da0664601abfb0cb5a3a979c988c71713ef00850f2b72e71c38a9dac09698e55cfbc6249bb1e2196a07a783b0fcd49bc
 DIST curlftpfs-0.9.2.tar.gz 365503 BLAKE2B 2175d5ecd0846a78038a813f76db99a911dff6e52aa170e59ae19d895961b0e9f5ba7b888288408daabc3a6c2b58590ab8b1c5424ea6b4b3875c460b089d6ddb SHA512 df07c418d175f766c89525017fc56e79726061eee0c3a6607ded0e1bf24f64f1475ba0e546157b65892194e3c4414c120822bf8fb175437e68366f82de216067
 EBUILD curlftpfs-0.9.2-r4.ebuild 998 BLAKE2B 9004420b6f424c6989893cd7d5f9999782d77baeb6f701ea497c0d38284fffc7625eacb9ca9165cf4636d7ea0441ff46980a5a4eb7206be03cb2417394a496de SHA512 e376b3cbf29b041aa11f7be5c9962d139ccbdf058e512214e8a9c284547fcf95752ab8746a3d7fecdd45c1193ffa7c9dcfa4641c26d7e364664e369383c43a04
-MISC metadata.xml 340 BLAKE2B 9741e9d58005e0fbfca0c6630eb3a0d1e2963a8ce66e42b61d3c48d5995ecdd99099abe914249460bf4f3bc66a0e73f1472cfa8c17bb403af92076d8c30cb5cb SHA512 4e0ec7a3f4ed5e5e1bf875275776d6d610bca1b6fbb8200e208eff80150df4e98bea430a976deef94405fcbf825aa5ba992b40e30175a30ebccc30d53591eba3
+MISC metadata.xml 251 BLAKE2B 901a8668708bfb98b30b42671f932944c988fa3a67b8808722a0c34b790fdf88a164ca07706cc816cb64ac6d3960108bf95fd996b6874efbf203f4b7fe46d3ad SHA512 bb103368ba64fc4305b7dee602c3b327be330d0c5894dd94869c8a64cbe7d9a0ed95b8fe75eb69ee5b4a25e4b1a82873c0bbbf8f19674033055e358a6b6a3448
diff --git a/net-fs/curlftpfs/metadata.xml b/net-fs/curlftpfs/metadata.xml
index d18ff5806215..9e4cc58453ab 100644
--- a/net-fs/curlftpfs/metadata.xml
+++ b/net-fs/curlftpfs/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slyfox@gentoo.org</email>
-    <name>Sergei Trofimovich</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">curlftpfs</remote-id>
   </upstream>
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 964ef56017fe..1178f4328df6 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -13,6 +13,6 @@ EBUILD samba-4.13.10-r1.ebuild 9949 BLAKE2B ea390ab7ebf754f13df802bd7cafec9e2250
 EBUILD samba-4.13.9-r2.ebuild 9942 BLAKE2B 7bee9ff108d961c7974c3605cfeb5d9c58094b379079bfae49b7c6623bc3bcc0ae6e6ec698d190e4ef96a1948b514e3aa3dc6f4e6bc1fb63a5b9535e2de452ab SHA512 a79bcfd3bf0a4576bcc31468ccad7c73a59bb921e40641f23f4fbf2267ca0ee48967279141b7ae24283df730cda43be00f59a374565b30045a38567936f75081
 EBUILD samba-4.14.4-r2.ebuild 10050 BLAKE2B c8c75e229c2a6fe845eece488c1b74513f896deda4bd44ad0608ad64fe04e59f1f9acfeb68d5eedc62dbdfd8859008c3bb8048658b5f8c08b8948f85cc4529c4 SHA512 1a083be83117996ac09684f110dfeacb1b5d51ca65d6550f284dd889ffdda2b131ff9e71a82da2bd0e6d5fb7cdb65b359f29657b8d48b57bf1363ff46236b2e7
 EBUILD samba-4.14.5-r2.ebuild 10069 BLAKE2B 612013a18e68bb9490337e0a1a5667a2943a6bc143b9a41ac166f20985a20c3f86fa12bafd9ea3fd09ab658fda9b56d479c548f222f9412151de1495833bf1dc SHA512 252b22eea885f102d0c76021a333bd724376e0850ff8783a39f87d16f6e87b664c6fc772918849a173f1106333a193cbc0b66a503239b6c223be64f1b6727206
-EBUILD samba-4.14.6-r1.ebuild 10050 BLAKE2B c8c75e229c2a6fe845eece488c1b74513f896deda4bd44ad0608ad64fe04e59f1f9acfeb68d5eedc62dbdfd8859008c3bb8048658b5f8c08b8948f85cc4529c4 SHA512 1a083be83117996ac09684f110dfeacb1b5d51ca65d6550f284dd889ffdda2b131ff9e71a82da2bd0e6d5fb7cdb65b359f29657b8d48b57bf1363ff46236b2e7
+EBUILD samba-4.14.6-r1.ebuild 10069 BLAKE2B 612013a18e68bb9490337e0a1a5667a2943a6bc143b9a41ac166f20985a20c3f86fa12bafd9ea3fd09ab658fda9b56d479c548f222f9412151de1495833bf1dc SHA512 252b22eea885f102d0c76021a333bd724376e0850ff8783a39f87d16f6e87b664c6fc772918849a173f1106333a193cbc0b66a503239b6c223be64f1b6727206
 EBUILD samba-4.15.0_rc1-r1.ebuild 9968 BLAKE2B 80eb1d44cc52ac0d7a97798d88d527c5fcea2c2e9ce49f984b971b9b265af2c455ce64ccae03803b6e4d42876ad305c263b1cc287f52c0b2c7ecf85204ce8fa5 SHA512 ee28f2034dc75df6c9ae340b29e56b0c046211cc69079434926a46e20a5539cc06a07cd6a70f33ce70a7dde76243828c3bf845fb995ed2d85d534ab290e80fc5
 MISC metadata.xml 2165 BLAKE2B 5fa428c3ddb3f45073923778fc80ca4d62090232b9bb6bcfdd0a16a6c4c51304794db41359c17b6ba9492b30dba0f42ff7ada6c8a30c5df80e83e748d8009ee9 SHA512 8723f3a16210e8da11eb1d3ea8142bff3deeaecc44c62da68a789b5364bf3456aef65794b205d24cc41eff7ba03fffd38266aea2dd1883eff5c9ca305d2032ed
diff --git a/net-fs/samba/samba-4.14.6-r1.ebuild b/net-fs/samba/samba-4.14.6-r1.ebuild
index ac4c338a3303..52f211eaa846 100644
--- a/net-fs/samba/samba-4.14.6-r1.ebuild
+++ b/net-fs/samba/samba-4.14.6-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *_rc* ]]; then
 	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
@@ -90,7 +90,7 @@ COMMON_DEPEND="
 			net-dns/bind-tools[gssapi]
 		)
 	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	!alpha? ( !sparc? ( !riscv? ( sys-libs/libunwind:= ) ) )
 	acl? ( virtual/acl )
 	ceph? ( sys-cluster/ceph )
 	cluster? ( net-libs/rpcsvc-proto )
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 3176cfd13fc4..225297dc236d 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 27262f458396..12914f87dbb3 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.11.0_amd64.deb 111843804 BLAKE2B 3c3d10ce5077d7ae46ffcde35d5a711ddfe6f2138305442d4ac747fd50ae5bbd46c756ab07ecfe9f4e422fe0fa89c5cf1ac90978714d4a65acfa381ce061d15a SHA512 f08ee9716678613e5d5a1036703dfb38b6862dac3b61ef05fbeb49d6d38cc86090d16f3925be2e99bdf252d060d04a699fbaea3a2e0b91170eb50103ec3f509e
-EBUILD signal-desktop-bin-5.11.0.ebuild 2789 BLAKE2B 1ade4d51b1a472ef7c4b4396b2044886a7bd1e06461b26c75977ac6eb7f90619c6761ce0b4f9db0d245bcc9f97cf343cf5dead03d024eb388d8a50132bd0134c SHA512 aa2c22282010509bc52c45e63f891c1327b8bc141968cb587feab339c41b2515411cc2f4c0c5f226b661dceab68fa630bd9c4ba5296776b846213a9dbaedd908
+DIST signal-desktop_5.12.1_amd64.deb 111868722 BLAKE2B 73142c7011305db13b982d9875210bfa149db94cfeaaf5550d1d8f831977bb38201757e8e16e1565fcd3ba6f49ba4620d767440937d6c9a5818c7b71fc259dcc SHA512 e60d8c32685daf423f57aa557554241f4f76dad4b428363145c0cced35b302a032d117f291e9ead954fd4d87a0982dcefc863eb7f50c19d57c956396d3e0cf8c
+EBUILD signal-desktop-bin-5.12.1.ebuild 2789 BLAKE2B 1ade4d51b1a472ef7c4b4396b2044886a7bd1e06461b26c75977ac6eb7f90619c6761ce0b4f9db0d245bcc9f97cf343cf5dead03d024eb388d8a50132bd0134c SHA512 aa2c22282010509bc52c45e63f891c1327b8bc141968cb587feab339c41b2515411cc2f4c0c5f226b661dceab68fa630bd9c4ba5296776b846213a9dbaedd908
 MISC metadata.xml 396 BLAKE2B 38a79e09275e5b085003b4fd511917b1ada4b25a7f7d8693da9fa35be6f924fd3a8cac88aa689a482391b3ccc89a07ec1946b8d0dc1ec5c45f23b94f65095ade SHA512 e173a6d2920e003012ffa756fc3e0aa15bbea2eb63b37b9387ec016680cdef7d7db0d510f4663e2a941df4b587c367d3af66ef0fa8d0c4b069648b1dbfd0d4ad
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.11.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.12.1.ebuild
index 0cbadc9286be..0cbadc9286be 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.11.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.12.1.ebuild
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index bc4090bc2325..cd85bb15647b 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,16 +1,10 @@
-AUX tdesktop-2.7.3-webview-include-gdkx.patch 404 BLAKE2B cb9d282c79bfb7441b5eddf7fa1f3255ed1bee03d00fc71682f6b7acc2624a60d034a536e07c77f01433c93c8afa3383b1e57ba1a474de66078623ce2231b37b SHA512 92a60a59724597ce5daabe6a327a445182d6eac91ed009d72f833216393c7e55789caf88b914b0aa8d62eb11e6449b58c24239372d655af1fbe18a30c72b4ade
-AUX tdesktop-2.7.4-disable-webkit-separately.patch 2804 BLAKE2B 71feb3b5ed92fc136236d1c4638330003f7d57427404c72d8e0f83676c58c244b5dd58612b45dd7987615e0f87a5ec9ed29fcd9e75334750b401a4b58ba1137f SHA512 21061e74a54cac1621b701cfdb06c2212136cf135fcb94747dc7c5cdce0f2704e22a16500b360e67cc1bfcd401c143b8f26bccb4bdf18ef0f151ea84e4aead24
-AUX tdesktop-2.7.4-fix-disable-dbus-integration.patch 494 BLAKE2B 75e8be933873cc19a863423cb3996d14512586442abeb56ea83ef1a0ce3b58265611044285a6ebde390581e8206677136b97bd2361eaf612702ebd44411f2eed SHA512 bd223c7afabb72cacb89e689707aaff01509aafa1271aac5533f57ab88b52624b1f08647be51ea5c40123262eaeb3ea5646cecd00872465d5afd66f262e4bd98
-AUX tdesktop-2.7.4-voice-crash.patch 8437 BLAKE2B 6d03b16e8d60318e135340feeb39d6a077bc935f3ca6789da72ab063575128f356f8d4187552ac1ae1c270aed857802375016f84f8d2666facb7ea89c72284c3 SHA512 cabdadddc7a6873c7c6fc8128ceddf2712c0c73d3316520482162e5c67937bda2a627ddb2f078558a52e812c2a876351196488a5a75381d84a43815b873bac5b
-AUX tdesktop-2.7.4-voice-ffmpeg44.patch 1118 BLAKE2B 21b34c6fbb002be362beb807a8323119b46bf6875de3367006a981808d4648fa56e859728ee10ae51a5655fc921e49412ac4bb81e17667b2e28017a64a10a3f2 SHA512 72ef9bddef1f40e09b9c4334153f1ab8aaddf63d95d9f25dc1b0a0826b7f2ae24f7c5fc4cb5ce90aae2c3144a5d52c4cb870d643f447d654190c4a2c78079354
-AUX tdesktop-2.7.4-webview-fix-gcc11.patch 1035 BLAKE2B 929ff52fdadc65d7ce8bc53850adc48ec17c80d6f1e450a50e421c2fc28ee4f07ca88f1371f9812f3e7e2ef402d465418755ce392abd60fe032fa31c216c2753 SHA512 545e307974eff96ff27d9e99ba1272ff0094c403bcbfed4f67f72d8c45c2c6d0682edcee873a11d6aaed8d4f2b7dd820cbc13dc89e7c1072e04105b99a638831
 AUX tdesktop-2.8.10-jemalloc-only-telegram.patch 973 BLAKE2B 6efc62db44ea8d26f469d937fc91135c77eea38e6e51b1c6cc772bc91afb7372292731b0369544ea52f67075ce9800fdcadc150ec72df571c29f2818b88cc56d SHA512 754e7286aebd183891b3808b66979df4b8e62355147a8f6bd860bf37360e089928247073b7adf9fc8d09ed4edc35746e50a4eff3d0bdc2d74888e8cb74042cf0
+AUX tdesktop-2.8.11-load-gtk-with-qlibrary.patch 4451 BLAKE2B 3d490ce1dd43aed8bf29812b3be5ed916ece4b4da61d8e2a5fdefe0360e5c71580cd5348a5b0dc3977d6f1ac300b4d98881242c8313fa22a3a0d767dae72e2e3 SHA512 080c77c010ea4d5a766f4b9b7f0f321d953d265c2c145ee4cf8fc03a2ba29e2c305521292403f8845308adab67482e4c0c61ce89660eef0af169f5dbf5b0a5f4
 AUX tdesktop-2.8.9-disable-webkit-separately.patch 4643 BLAKE2B 7d84cedd4b7b5879fb402193774e40c2b72f6028592e4dc1df1c4a9002dd4e9cbaff505dceb77e443b84c26b4dff6abfc5a99ff28699fb031cc9cb0ea3612280 SHA512 fc3da934e04d19b6f1be42cb095e3aba2a13f0e6a14164558f3da45152b9fa19bc8235d08fd6537933b9fb25d7aee27ec7763173e6395f55bcb9869f71b31088
 AUX tdesktop-2.8.9-webview-fix-glib.patch 1838 BLAKE2B 16b861f0fda72ba1725779880eb67b3adfd0a3dad4c7614beb8f96fa55fecc613f248477557569904c44e6875adbf7912ac9281f1ff71b4b8a6e5d97f9f71e97 SHA512 c3932b6471150d71469606bdbc93d26b57e8eb556e24df9366bad9e51aed073ab18dd7ee14b7445f8df180806a0ca591afdc8c00b0ce34db29575d2dc114b58a
-DIST tdesktop-2.7.4-full.tar.gz 36894673 BLAKE2B e04749fb0168f8bae69a9ad85c5bff315faf0b355ff5f3a85a34ee36e3305c6b550553284d5179aff9283bbd1a94f9ec3c41e293d0ad8c86e4d08283189e42b3 SHA512 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14
-DIST tdesktop-2.8.1-full.tar.gz 37129127 BLAKE2B 06f2a3050f0e0f321c766c54e19faf3ea172c41088e2ffdbb5928a41ba01de1fc845a84addded17d113316857c68f265642a8ab32feb79a87beef548c739b56c SHA512 df35cc00dc47a8c65b32b62c139cc3a49333f573aa88fb70cc65197524f9b9b4756c58752866c843704ea4df5d6224eb4cba5b32953dd9a4d721b0ee0e1efc69
+AUX tdesktop-2.9.0-fix-disable-wayland-integration.patch 462 BLAKE2B 5dc8f084dd753459f217849606f09b2a847a0fe13de49a6984bb1aedfadf7091833cd314da59a55ea9ff0d04c25bd23e94bbe2c7896a307564c892eea9d98ae4 SHA512 4e8597575cab639d2d6c19556e2125301b8e3b901900bce6e14945da2746ff40085b721f42f525c645c1094914a84d3f50dd9bc063f10a28a96dbfb23c98671c
 DIST tdesktop-2.8.11-full.tar.gz 37105468 BLAKE2B 1ec5a0003bd1b948b45213509fa0649dfde5ec8e3dff097bf45aa0951c7963930788b0bee853f286d04b008b78704c464b6614b8391350767affebc2623b25af SHA512 a553313b04fbb562745be2381a84117657172952e46e280980a73c9fcfe2a7cf29c0e012e4b1259816d1e6652418e7a1ddfc4e394544fcc3aeb33704cbe80860
-EBUILD telegram-desktop-2.7.4-r1.ebuild 4589 BLAKE2B fee2f81578a4c774fe33592641a6a19592e8fd67623f3424ea599c2adbf425861478f34f01fad970fca31d9fe7545f15fe3d53ec195f60933e701fe287fa59d5 SHA512 ed7de5b99a43621b38ee7589a1f842647f7a9e2619b6984d061183ea3ec5d891c55df2cc5e04568924e30252de26bd3450ec1abce6e8d8edd2ff8be6104900dd
-EBUILD telegram-desktop-2.8.1.ebuild 4362 BLAKE2B 8388d5963edc83635719974c4c1372becc37e3a4c53aab0b63883c0c4b3c49f8f312d6781ce7a976dde5f066738398245b0fddb899e5440e96622ad99b736b2d SHA512 b351769398c4585e65382200954732e4574d0bb19e05899f67a600102e2ec604086cf07cbc724a6d108f42081a367f47170bfef94bdf356cef1de8665e8e9c19
-EBUILD telegram-desktop-2.8.11.ebuild 4340 BLAKE2B 276357e4e6783eee86a125490deb8ddd3e759df56162a65b5f4762ef69f92c92cb757230c997d7aa1a3d13640b1ed949c535450d2f3cbecd67c0d6e283cf5413 SHA512 492610a0170b36b29fe2a64ea4bb6780004499bd3ca87951e362471aada0967c6ce0cfc29e0f0561b5e9e2a1ffc75a56081acd7aba0a4710a939a62aa9e4ec76
+DIST tdesktop-2.9.0-full.tar.gz 37327425 BLAKE2B f47abfd41e71dbf950e6357417fd2725b145286861f6dfc8edc4101b6b232c43ea7a9987d028e57979588bf44919fef2e89b00adae7a9843e52f8f2566013dd8 SHA512 e9be60cdaeffa4efa95ea1e5d8fe50308bff5612b546fa92c02f824f479b42e098fb8fbe713e652578ee2308e3faadaf82e4c101dee0e58b6f3c70d8dcb0bd8e
+EBUILD telegram-desktop-2.8.11-r1.ebuild 4401 BLAKE2B 66426f2f964ad5ee3c9b1cfc4d3b1c389a00fea5766de39db94acdf8752edba39a706a63fd210b00bb317c9f4205986c64e77ff5e855d0c6df047acd2077fb9d SHA512 63339b739d3172c9100d40a657c3d49cea31da10e51f05d5138ac837626f616d436cd7d049bc853edb0e7c06b820961bbb4cf864e3a3e8de4a34d25f9265e5d1
+EBUILD telegram-desktop-2.9.0-r1.ebuild 4126 BLAKE2B d269d119e3e33c2af75d0afb78b667f5808a607d3a203629b14dda5ad3555c32c97a913048534b5e5935aa1f089f52022e1f69a12695ea1696a0af24f8489658 SHA512 2abafcabd6aef7bc50c552947d79fc8faf7ec1f4ce37c51b48c16ee65b642f86209651e0ae68222c7a238a8c3a82a01567eb7aff4c12d461678bb41aa1a90426
 MISC metadata.xml 587 BLAKE2B 1f49c91d650d26ba9fd95e9cbcb793ed527d58bf0ccc81ebddb624d54c4af38cc7aff3cf799814932a69b2a6f36dad7fe1c5ce4eb82e562e46dcebca9b751308 SHA512 5e74bb555b2b1a513bd8c7450a3db2f46daa426eecc0d3cebf11d46e58124ef117697bc422f7fccd8757f2e6e8ce6bd8ff0e317b58740dd302c1ea2f2476ff3f
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch b/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch
deleted file mode 100644
index 491a8cd3e1dc..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tdesktop-2.7.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -12,6 +12,7 @@ extern "C" {
- #undef signals
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
-+#include <gdk/gdkx.h>
- #include <webkit2/webkit2.h>
- #include <X11/Xlib.h>
- #define signals public
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch
deleted file mode 100644
index e54aca2ffa05..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- tdesktop-2.7.4-full.orig/Telegram/lib_webview/CMakeLists.txt
-+++ tdesktop-2.7.4-full/Telegram/lib_webview/CMakeLists.txt
-@@ -116,7 +116,7 @@
-         desktop-app::lib_webview_winrt
-     )
- elseif (LINUX)
--    if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
-+    if (NOT DESKTOP_APP_DISABLE_WEBKIT)
-         find_package(PkgConfig REQUIRED)
- 
-         if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
---- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
-+++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
-@@ -11,14 +11,14 @@
- namespace Webview {
- 
- Available Availability() {
--#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#ifndef DESKTOP_APP_DISABLE_WEBKIT
- 	return WebKit2Gtk::Availability();
--#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#else // !DESKTOP_APP_DISABLE_WEBKIT
- 	return Available{
- 		.error = Available::Error::NoGtkOrWebkit2Gtk,
- 		.details = "This feature was disabled at build time.",
- 	};
--#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#endif // DESKTOP_APP_DISABLE_WEBKIT
- }
- 
- bool SupportsEmbedAfterCreate() {
-@@ -26,11 +26,11 @@
- }
- 
- std::unique_ptr<Interface> CreateInstance(Config config) {
--#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#ifndef DESKTOP_APP_DISABLE_WEBKIT
- 	return WebKit2Gtk::CreateInstance(std::move(config));
--#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#else // !DESKTOP_APP_DISABLE_WEBKIT
- 	return nullptr;
--#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#endif // DESKTOP_APP_DISABLE_WEBKIT
- }
- 
- } // namespace Webview
---- tdesktop-2.7.4-full.orig/cmake/options.cmake
-+++ tdesktop-2.7.4-full/cmake/options.cmake
-@@ -49,6 +49,13 @@
-     )
- endif()
- 
-+if (DESKTOP_APP_DISABLE_WEBKIT)
-+    target_compile_definitions(common_options
-+    INTERFACE
-+        DESKTOP_APP_DISABLE_WEBKIT
-+    )
-+endif()
-+
- if (DESKTOP_APP_USE_PACKAGED)
-     target_compile_definitions(common_options
-     INTERFACE
---- tdesktop-2.7.4-full.orig/cmake/variables.cmake
-+++ tdesktop-2.7.4-full/cmake/variables.cmake
-@@ -38,6 +38,7 @@
- option(DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES "Bundle recommended Qt platform themes for self-contained packages. (Linux only)" ${DESKTOP_APP_USE_PACKAGED_LAZY})
- option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF)
- option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target})
-+option(DESKTOP_APP_DISABLE_WEBKIT "Disable WebkitGTK library (Linux only)." OFF)
- option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target})
- option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate})
- option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch
deleted file mode 100644
index 941a4ecc09cb..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tdesktop-2.7.4-full.orig/Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp
-+++ tdesktop-2.7.4-full/Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp
-@@ -13,15 +13,15 @@
- namespace Platform {
- namespace Notifications {
- 
--bool SkipAudio() {
-+bool SkipAudioForCustom() {
- 	return false;
- }
- 
--bool SkipToast() {
-+bool SkipToastForCustom() {
- 	return false;
- }
- 
--bool SkipFlashBounce() {
-+bool SkipFlashBounceForCustom() {
- 	return false;
- }
- 
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-crash.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-crash.patch
deleted file mode 100644
index 41e447989cb2..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-crash.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From 71deaa48afab2bcf9df67b9b347b1f44aad3a9ce Mon Sep 17 00:00:00 2001
-From: John Preston <johnprestonmail@gmail.com>
-Date: Thu, 13 May 2021 15:17:54 +0400
-Subject: [PATCH] Don't crash on voice recording error.
-
-Fixes #16217.
----
- .../media/audio/media_audio_capture.cpp       | 89 +++++++++++--------
- 1 file changed, 54 insertions(+), 35 deletions(-)
-
-diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
-index a5965e0d1988..deb2474d7891 100644
---- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
-+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
-@@ -47,17 +47,17 @@ class Instance::Inner final : public QObject {
- 	void start(Fn<void(Update)> updated, Fn<void()> error);
- 	void stop(Fn<void(Result&&)> callback = nullptr);
- 
--	void timeout();
--
- private:
--	void processFrame(int32 offset, int32 framesize);
-+	void process();
-+
-+	[[nodiscard]] bool processFrame(int32 offset, int32 framesize);
- 	void fail();
- 
--	void writeFrame(AVFrame *frame);
-+	[[nodiscard]] bool writeFrame(AVFrame *frame);
- 
- 	// Writes the packets till EAGAIN is got from av_receive_packet()
- 	// Returns number of packets written or -1 on error
--	int writePackets();
-+	[[nodiscard]] int writePackets();
- 
- 	Fn<void(Update)> _updated;
- 	Fn<void()> _error;
-@@ -150,6 +150,7 @@ struct Instance::Inner::Private {
- 	AVCodec *codec = nullptr;
- 	AVCodecContext *codecContext = nullptr;
- 	bool opened = false;
-+	bool processing = false;
- 
- 	int srcSamples = 0;
- 	int dstSamples = 0;
-@@ -217,7 +218,7 @@ struct Instance::Inner::Private {
- 
- Instance::Inner::Inner(QThread *thread)
- : d(std::make_unique<Private>())
--, _timer(thread, [=] { timeout(); }) {
-+, _timer(thread, [=] { process(); }) {
- 	moveToThread(thread);
- }
- 
-@@ -226,10 +227,10 @@ Instance::Inner::~Inner() {
- }
- 
- void Instance::Inner::fail() {
--	Expects(_error != nullptr);
--
- 	stop();
--	_error();
-+	if (const auto error = base::take(_error)) {
-+		InvokeQueued(this, error);
-+	}
- }
- 
- void Instance::Inner::start(Fn<void(Update)> updated, Fn<void()> error) {
-@@ -384,13 +385,21 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
- 	}
- 	_timer.cancel();
- 
--	if (d->device) {
-+	const auto needResult = (callback != nullptr);
-+	const auto hadDevice = (d->device != nullptr);
-+	if (hadDevice) {
- 		alcCaptureStop(d->device);
--		timeout(); // get last data
-+		if (d->processing) {
-+			Assert(!needResult); // stop in the middle of processing - error.
-+		} else {
-+			process(); // get last data
-+		}
-+		alcCaptureCloseDevice(d->device);
-+		d->device = nullptr;
- 	}
- 
- 	// Write what is left
--	if (!_captured.isEmpty()) {
-+	if (needResult && !_captured.isEmpty()) {
- 		auto fadeSamples = kCaptureFadeInDuration * kCaptureFrequency / 1000;
- 		auto capturedSamples = static_cast<int>(_captured.size() / sizeof(short));
- 		if ((_captured.size() % sizeof(short)) || (d->fullSamples + capturedSamples < kCaptureFrequency) || (capturedSamples < fadeSamples)) {
-@@ -414,11 +423,13 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
- 
- 			int32 framesize = d->srcSamples * d->codecContext->channels * sizeof(short), encoded = 0;
- 			while (_captured.size() >= encoded + framesize) {
--				processFrame(encoded, framesize);
-+				if (!processFrame(encoded, framesize)) {
-+					break;
-+				}
- 				encoded += framesize;
- 			}
--			writeFrame(nullptr); // drain the codec
--			if (encoded != _captured.size()) {
-+			// Drain the codec.
-+			if (!writeFrame(nullptr) || encoded != _captured.size()) {
- 				d->fullSamples = 0;
- 				d->dataPos = 0;
- 				d->data.clear();
-@@ -436,14 +447,14 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
- 	_captured = QByteArray();
- 
- 	// Finish stream
--	if (d->device) {
-+	if (needResult && hadDevice) {
- 		av_write_trailer(d->fmtContext);
- 	}
- 
- 	QByteArray result = d->fullSamples ? d->data : QByteArray();
- 	VoiceWaveform waveform;
- 	qint32 samples = d->fullSamples;
--	if (samples && !d->waveform.isEmpty()) {
-+	if (needResult && samples && !d->waveform.isEmpty()) {
- 		int64 count = d->waveform.size(), sum = 0;
- 		if (count >= Player::kWaveformSamplesCount) {
- 			QVector<uint16> peaks;
-@@ -472,11 +483,7 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
- 			}
- 		}
- 	}
--	if (d->device) {
--		alcCaptureStop(d->device);
--		alcCaptureCloseDevice(d->device);
--		d->device = nullptr;
--
-+	if (hadDevice) {
- 		if (d->codecContext) {
- 			avcodec_free_context(&d->codecContext);
- 			d->codecContext = nullptr;
-@@ -528,12 +535,17 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
- 		d->waveform.clear();
- 	}
- 
--	if (callback) {
-+	if (needResult) {
- 		callback({ result, waveform, samples });
- 	}
- }
- 
--void Instance::Inner::timeout() {
-+void Instance::Inner::process() {
-+	Expects(!d->processing);
-+
-+	d->processing = true;
-+	const auto guard = gsl::finally([&] { d->processing = false; });
-+
- 	if (!d->device) {
- 		_timer.cancel();
- 		return;
-@@ -582,7 +594,9 @@ void Instance::Inner::timeout() {
- 		// Write frames
- 		int32 framesize = d->srcSamples * d->codecContext->channels * sizeof(short), encoded = 0;
- 		while (uint32(_captured.size()) >= encoded + framesize + fadeSamples * sizeof(short)) {
--			processFrame(encoded, framesize);
-+			if (!processFrame(encoded, framesize)) {
-+				return;
-+			}
- 			encoded += framesize;
- 		}
- 
-@@ -597,13 +611,13 @@ void Instance::Inner::timeout() {
- 	}
- }
- 
--void Instance::Inner::processFrame(int32 offset, int32 framesize) {
-+bool Instance::Inner::processFrame(int32 offset, int32 framesize) {
- 	// Prepare audio frame
- 
- 	if (framesize % sizeof(short)) { // in the middle of a sample
- 		LOG(("Audio Error: Bad framesize in writeFrame() for capture, framesize %1, %2").arg(framesize));
- 		fail();
--		return;
-+		return false;
- 	}
- 	auto samplesCnt = static_cast<int>(framesize / sizeof(short));
- 
-@@ -650,7 +664,7 @@ void Instance::Inner::processFrame(int32 offset, int32 framesize) {
- 		if ((res = av_samples_alloc(d->dstSamplesData, 0, d->codecContext->channels, d->dstSamples, d->codecContext->sample_fmt, 1)) < 0) {
- 			LOG(("Audio Error: Unable to av_samples_alloc for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
- 			fail();
--			return;
-+			return false;
- 		}
- 		d->dstSamplesSize = av_samples_get_buffer_size(0, d->codecContext->channels, d->maxDstSamples, d->codecContext->sample_fmt, 0);
- 	}
-@@ -658,7 +672,7 @@ void Instance::Inner::processFrame(int32 offset, int32 framesize) {
- 	if ((res = swr_convert(d->swrContext, d->dstSamplesData, d->dstSamples, (const uint8_t **)srcSamplesData, d->srcSamples)) < 0) {
- 		LOG(("Audio Error: Unable to swr_convert for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
- 		fail();
--		return;
-+		return false;
- 	}
- 
- 	// Write audio frame
-@@ -670,45 +684,50 @@ void Instance::Inner::processFrame(int32 offset, int32 framesize) {
- 
- 	avcodec_fill_audio_frame(frame, d->codecContext->channels, d->codecContext->sample_fmt, d->dstSamplesData[0], d->dstSamplesSize, 0);
- 
--	writeFrame(frame);
-+	if (!writeFrame(frame)) {
-+		return false;
-+	}
- 
- 	d->fullSamples += samplesCnt;
- 
- 	av_frame_free(&frame);
-+	return true;
- }
- 
--void Instance::Inner::writeFrame(AVFrame *frame) {
-+bool Instance::Inner::writeFrame(AVFrame *frame) {
- 	int res = 0;
- 	char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
- 
- 	res = avcodec_send_frame(d->codecContext, frame);
- 	if (res == AVERROR(EAGAIN)) {
--		int packetsWritten = writePackets();
-+		const auto packetsWritten = writePackets();
- 		if (packetsWritten < 0) {
- 			if (frame && packetsWritten == AVERROR_EOF) {
- 				LOG(("Audio Error: EOF in packets received when EAGAIN was got in avcodec_send_frame()"));
- 				fail();
- 			}
--			return;
-+			return false;
- 		} else if (!packetsWritten) {
- 			LOG(("Audio Error: No packets received when EAGAIN was got in avcodec_send_frame()"));
- 			fail();
--			return;
-+			return false;
- 		}
- 		res = avcodec_send_frame(d->codecContext, frame);
- 	}
- 	if (res < 0) {
- 		LOG(("Audio Error: Unable to avcodec_send_frame for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
- 		fail();
--		return;
-+		return false;
- 	}
- 
- 	if (!frame) { // drain
- 		if ((res = writePackets()) != AVERROR_EOF) {
- 			LOG(("Audio Error: not EOF in packets received when draining the codec, result %1").arg(res));
- 			fail();
-+			return false;
- 		}
- 	}
-+	return true;
- }
- 
- int Instance::Inner::writePackets() {
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-ffmpeg44.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-ffmpeg44.patch
deleted file mode 100644
index 4156956032d4..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-ffmpeg44.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a8807bc915f2439acc7c84f06d931d96d6ca602a Mon Sep 17 00:00:00 2001
-From: John Preston <johnprestonmail@gmail.com>
-Date: Thu, 13 May 2021 15:33:42 +0400
-Subject: [PATCH] Fix voice recoding with FFmpeg 4.4.
-
-Fixes #16217.
----
- Telegram/SourceFiles/media/audio/media_audio_capture.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
-index deb2474d789..d129168783d 100644
---- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
-+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
-@@ -679,6 +679,10 @@ bool Instance::Inner::processFrame(int32 offset, int32 framesize) {
- 
- 	AVFrame *frame = av_frame_alloc();
- 
-+	frame->format = d->codecContext->sample_fmt;
-+	frame->channels = d->codecContext->channels;
-+	frame->channel_layout = d->codecContext->channel_layout;
-+	frame->sample_rate = d->codecContext->sample_rate;
- 	frame->nb_samples = d->dstSamples;
- 	frame->pts = av_rescale_q(d->fullSamples, AVRational { 1, d->codecContext->sample_rate }, d->codecContext->time_base);
- 
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
deleted file mode 100644
index 7f4b3f2601f5..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
-+++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
-@@ -6,6 +6,7 @@
- //
- #include "webview/platform/linux/webview_linux_webkit_gtk.h"
- 
-+#include "base/optional.h"
- #include "base/platform/linux/base_linux_gtk_integration.h"
- #include "base/platform/linux/base_linux_gtk_integration_p.h"
- 
---- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.cpp
-+++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
-@@ -14,7 +14,6 @@
- 
- #include <QtWidgets/QWidget>
- #include <QtGui/QWindow>
--#include <QtCore/QJsonDocument>
- 
- namespace Webview {
- namespace {
---- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.h
-+++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h
-@@ -9,6 +9,8 @@
- #include "base/unique_qptr.h"
- #include "base/basic_types.h"
- 
-+#include <QtCore/QJsonDocument>
-+
- class QString;
- class QWidget;
- class QWindow;
diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.11-load-gtk-with-qlibrary.patch b/net-im/telegram-desktop/files/tdesktop-2.8.11-load-gtk-with-qlibrary.patch
new file mode 100644
index 000000000000..91e3f859eebc
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.8.11-load-gtk-with-qlibrary.patch
@@ -0,0 +1,112 @@
+Fix running with QT_QPA_PLATFORMTHEME=gtk2
+
+From: https://bugs.archlinux.org/task/71541
+
+--- tdesktop-2.8.11-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-2.8.11-full/Telegram/CMakeLists.txt
+@@ -114,25 +114,16 @@
+     endif()
+ 
+     if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
+-        target_link_libraries(Telegram PRIVATE rt)
+         find_package(PkgConfig REQUIRED)
+ 
+-        if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
+-            pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
+-            target_link_libraries(Telegram PRIVATE PkgConfig::GTK3)
+-
+-            if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
+-                pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
+-                target_link_libraries(Telegram PRIVATE PkgConfig::X11)
+-            endif()
+-        else()
+-            pkg_check_modules(GTK REQUIRED gtk+-3.0)
+-            target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS})
++        pkg_check_modules(GTK REQUIRED gtk+-3.0)
++        target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS})
+ 
+-            if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
+-                target_link_libraries(Telegram PRIVATE X11)
+-            endif()
++        if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
++            target_link_libraries(Telegram PRIVATE X11)
+         endif()
++
++        target_link_libraries(Telegram PRIVATE rt)
+     endif()
+ endif()
+ 
+--- tdesktop-2.8.11-full.orig/Telegram/lib_base/CMakeLists.txt
++++ tdesktop-2.8.11-full/Telegram/lib_base/CMakeLists.txt
+@@ -254,13 +254,8 @@
+     if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
+         find_package(PkgConfig REQUIRED)
+ 
+-        if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
+-            pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
+-            target_link_libraries(lib_base PUBLIC PkgConfig::GTK3)
+-        else()
+-            pkg_check_modules(GTK REQUIRED gtk+-3.0)
+-            target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS})
+-        endif()
++        pkg_check_modules(GTK REQUIRED gtk+-3.0)
++        target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS})
+     endif()
+ endif()
+ 
+--- tdesktop-2.8.11-full.orig/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration_p.h
++++ tdesktop-2.8.11-full/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration_p.h
+@@ -13,15 +13,7 @@
+ #include <gdk/gdk.h>
+ } // extern "C"
+ 
+-#if defined DESKTOP_APP_USE_PACKAGED && !defined DESKTOP_APP_USE_PACKAGED_LAZY
+-#define LINK_TO_GTK
+-#endif // DESKTOP_APP_USE_PACKAGED && !DESKTOP_APP_USE_PACKAGED_LAZY
+-
+-#ifdef LINK_TO_GTK
+-#define LOAD_GTK_SYMBOL(lib, func) (func = ::func)
+-#else // LINK_TO_GTK
+ #define LOAD_GTK_SYMBOL LOAD_LIBRARY_SYMBOL
+-#endif // !LINK_TO_GTK
+ 
+ namespace base {
+ namespace Platform {
+@@ -31,11 +23,7 @@
+ 		QLibrary &lib,
+ 		const char *name,
+ 		std::optional<int> version = std::nullopt) {
+-#ifdef LINK_TO_GTK
+-	return true;
+-#else // LINK_TO_GTK
+ 	return LoadLibrary(lib, name, version);
+-#endif // LINK_TO_GTK
+ }
+ 
+ inline gboolean (*gtk_init_check)(int *argc, char ***argv) = nullptr;
+--- tdesktop-2.8.11-full.orig/Telegram/lib_webview/CMakeLists.txt
++++ tdesktop-2.8.11-full/Telegram/lib_webview/CMakeLists.txt
+@@ -51,19 +51,11 @@
+     if (NOT DESKTOP_APP_DISABLE_WEBKIT)
+         find_package(PkgConfig REQUIRED)
+ 
+-        if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
+-            pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
+-            target_link_libraries(lib_webview PUBLIC PkgConfig::GTK3)
++        pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
++        target_include_directories(lib_webview PUBLIC ${GTK3_INCLUDE_DIRS})
+ 
+-            pkg_check_modules(WEBKIT REQUIRED IMPORTED_TARGET webkit2gtk-4.0)
+-            target_link_libraries(lib_webview PUBLIC PkgConfig::WEBKIT)
+-        else()
+-            pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+-            target_include_directories(lib_webview PUBLIC ${GTK3_INCLUDE_DIRS})
+-
+-            pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0)
+-            target_include_directories(lib_webview PUBLIC ${WEBKIT_INCLUDE_DIRS})
+-        endif()
++        pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0)
++        target_include_directories(lib_webview PUBLIC ${WEBKIT_INCLUDE_DIRS})
+     else()
+         remove_target_sources(lib_webview ${src_loc}
+             webview/platform/linux/webview_linux_webkit_gtk.cpp
diff --git a/net-im/telegram-desktop/files/tdesktop-2.9.0-fix-disable-wayland-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.9.0-fix-disable-wayland-integration.patch
new file mode 100644
index 000000000000..c76bcc06dfdb
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.9.0-fix-disable-wayland-integration.patch
@@ -0,0 +1,11 @@
+--- tdesktop-2.9.0-full.orig/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
++++ tdesktop-2.9.0-full/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
+@@ -18,6 +18,8 @@
+ WaylandIntegration::WaylandIntegration() {
+ }
+ 
++WaylandIntegration::~WaylandIntegration() = default;
++
+ WaylandIntegration *WaylandIntegration::Instance() {
+ 	if (!::Platform::IsWayland()) return nullptr;
+ 	static WaylandIntegration instance;
diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild
deleted file mode 100644
index 1f51780319cc..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit xdg cmake python-any-r1 flag-o-matic
-
-MY_P="tdesktop-${PV}-full"
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dbus enchant +gtk +hunspell +spell wayland webkit +X"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/glibmm:2
-	dev-libs/xxhash
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?]
-	dev-qt/qtimageformats:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	media-libs/opus:=
-	~media-libs/libtgvoip-2.4.4_p20210302
-	media-libs/openal
-	~media-libs/tg_owt-0_pre20210422
-	media-video/ffmpeg:=[opus]
-	sys-libs/zlib:=[minizip]
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	gtk? ( x11-libs/gtk+:3[X?] )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	wayland? ( kde-frameworks/kwayland:= )
-	webkit? ( net-libs/webkit-gtk:= )
-	X? ( x11-libs/libxcb:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/range-v3
-	=dev-cpp/ms-gsl-3*
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-REQUIRED_USE="
-	spell? (
-		^^ ( enchant hunspell )
-	)
-	webkit? ( gtk )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# https://github.com/desktop-app/cmake_helpers/pull/91
-	# https://github.com/desktop-app/lib_webview/pull/2
-	"${FILESDIR}/tdesktop-2.7.4-disable-webkit-separately.patch"
-	# https://github.com/desktop-app/lib_webview/commit/0b4100d7cecc4e748c51f3f51ebfd1392ec3978a
-	"${FILESDIR}/tdesktop-2.7.3-webview-include-gdkx.patch"
-	# https://github.com/desktop-app/lib_webview/pull/3
-	"${FILESDIR}/tdesktop-2.7.4-webview-fix-gcc11.patch"
-	# https://github.com/telegramdesktop/tdesktop/issues/16217
-	"${FILESDIR}/tdesktop-2.7.4-voice-crash.patch"
-	"${FILESDIR}/tdesktop-2.7.4-voice-ffmpeg44.patch"
-	# https://github.com/telegramdesktop/tdesktop/commit/404538c98968d44d207671de3adde91b8df50721
-	"${FILESDIR}/tdesktop-2.7.4-fix-disable-dbus-integration.patch"
-)
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# no explicit toggle, doesn't build with the system one #752417
-	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
-		cmake/external/rlottie/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
-	local mycmakeargs=(
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
-
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X OFF ON)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON)
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON)
-		-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON)
-		-DDESKTOP_APP_DISABLE_WEBKIT=$(usex webkit OFF ON)
-		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON)  # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF)  # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use gtk || elog "enable 'gtk' useflag if you have image copy-paste problems"
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.8.1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.1.ebuild
deleted file mode 100644
index ceaf8f8b8b03..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.8.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit xdg cmake python-any-r1 flag-o-matic
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-
-MY_P="tdesktop-${PV}-full"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+dbus enchant +gtk +hunspell +spell wayland webkit +X"
-REQUIRED_USE="
-	spell? (
-		^^ ( enchant hunspell )
-	)
-	webkit? ( gtk )
-"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/glibmm:2
-	dev-libs/xxhash
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X(-)?]
-	>=dev-qt/qtimageformats-5.15:5
-	>=dev-qt/qtnetwork-5.15:5[ssl]
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtwidgets-5.15:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20210302
-	>=media-libs/libtgvoip-2.4.4_p20210302-r2
-	media-libs/openal
-	media-libs/opus:=
-	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20210626
-	media-video/ffmpeg:=[opus]
-	sys-libs/zlib:=[minizip]
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	gtk? ( x11-libs/gtk+:3[X?,wayland?] )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	wayland? ( kde-frameworks/kwayland:= )
-	webkit? ( net-libs/webkit-gtk:= )
-	X? ( x11-libs/libxcb:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/range-v3
-	=dev-cpp/ms-gsl-3*
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# https://github.com/desktop-app/cmake_helpers/pull/91
-	# https://github.com/desktop-app/lib_webview/pull/2
-	"${FILESDIR}/tdesktop-2.7.4-disable-webkit-separately.patch"
-	# https://github.com/desktop-app/lib_webview/pull/3
-	# https://github.com/desktop-app/lib_base/commit/01d152af4c6282756585f1405c4bcbb75960a509 (landed in 2.8.0, patch is harmless)
-	"${FILESDIR}/tdesktop-2.7.4-webview-fix-gcc11.patch"
-)
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# no explicit toggle, doesn't build with the system one #752417
-	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
-		cmake/external/rlottie/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
-	local mycmakeargs=(
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
-
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X OFF ON)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON)
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON)
-		-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON)
-		-DDESKTOP_APP_DISABLE_WEBKIT=$(usex webkit OFF ON)
-		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON)  # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF)  # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use gtk || elog "enable 'gtk' useflag if you have image copy-paste problems"
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.8.11-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.11-r1.ebuild
new file mode 100644
index 000000000000..7987cc94ec85
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-2.8.11-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit xdg cmake python-any-r1 flag-o-matic
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+
+MY_P="tdesktop-${PV}-full"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64"
+IUSE="+dbus enchant +gtk +hunspell +spell wayland webkit +X"
+REQUIRED_USE="
+	spell? (
+		^^ ( enchant hunspell )
+	)
+	webkit? ( gtk )
+	gtk? ( dbus )
+"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	dev-cpp/glibmm:2
+	dev-libs/jemalloc:=[-lazy-lock]
+	dev-libs/xxhash
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
+	>=dev-qt/qtimageformats-5.15:5
+	>=dev-qt/qtnetwork-5.15:5[ssl]
+	>=dev-qt/qtsvg-5.15:5
+	>=dev-qt/qtwidgets-5.15:5[png,X?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	~media-libs/libtgvoip-2.4.4_p20210302
+	>=media-libs/libtgvoip-2.4.4_p20210302-r2
+	media-libs/openal
+	media-libs/opus:=
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20210626
+	media-video/ffmpeg:=[opus]
+	sys-libs/zlib:=[minizip]
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	gtk? ( x11-libs/gtk+:3[X?,wayland?] )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	wayland? ( kde-frameworks/kwayland:= )
+	webkit? ( net-libs/webkit-gtk:= )
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/range-v3
+	=dev-cpp/ms-gsl-3*
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# https://github.com/desktop-app/cmake_helpers/pull/91
+	# https://github.com/desktop-app/lib_webview/pull/2
+	"${FILESDIR}/tdesktop-2.8.9-disable-webkit-separately.patch"
+	# Not a proper fix, not upstreamed
+	"${FILESDIR}/tdesktop-2.8.9-webview-fix-glib.patch"
+	"${FILESDIR}/tdesktop-2.8.10-jemalloc-only-telegram.patch"
+	# Already upstream
+	"${FILESDIR}/tdesktop-2.8.11-load-gtk-with-qlibrary.patch"
+)
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# no explicit toggle, doesn't build with the system one #752417
+	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
+		cmake/external/rlottie/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
+	local mycmakeargs=(
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
+
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X OFF ON)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON)
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON)
+		-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON)
+		-DDESKTOP_APP_DISABLE_WEBKIT=$(usex webkit OFF ON)
+		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON)  # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF)  # enables enchant and disables hunspell
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	use gtk || elog "enable the 'gtk' useflag if you have image copy-paste problems"
+}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild
deleted file mode 100644
index aaa30fc0f334..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.8.11.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
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit xdg cmake python-any-r1 flag-o-matic
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-
-MY_P="tdesktop-${PV}-full"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+dbus enchant +gtk +hunspell +spell wayland webkit +X"
-REQUIRED_USE="
-	spell? (
-		^^ ( enchant hunspell )
-	)
-	webkit? ( gtk )
-	gtk? ( dbus )
-"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/glibmm:2
-	dev-libs/jemalloc:=
-	dev-libs/xxhash
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X(-)?]
-	>=dev-qt/qtimageformats-5.15:5
-	>=dev-qt/qtnetwork-5.15:5[ssl]
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtwidgets-5.15:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20210302
-	>=media-libs/libtgvoip-2.4.4_p20210302-r2
-	media-libs/openal
-	media-libs/opus:=
-	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20210626
-	media-video/ffmpeg:=[opus]
-	sys-libs/zlib:=[minizip]
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	gtk? ( x11-libs/gtk+:3[X?,wayland?] )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	wayland? ( kde-frameworks/kwayland:= )
-	webkit? ( net-libs/webkit-gtk:= )
-	X? ( x11-libs/libxcb:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/range-v3
-	=dev-cpp/ms-gsl-3*
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# https://github.com/desktop-app/cmake_helpers/pull/91
-	# https://github.com/desktop-app/lib_webview/pull/2
-	"${FILESDIR}/tdesktop-2.8.9-disable-webkit-separately.patch"
-	# Not a proper fix, not upstreamed
-	"${FILESDIR}/tdesktop-2.8.9-webview-fix-glib.patch"
-	# Not upstreamed (yet)
-	"${FILESDIR}/tdesktop-2.8.10-jemalloc-only-telegram.patch"
-)
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# no explicit toggle, doesn't build with the system one #752417
-	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
-		cmake/external/rlottie/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
-	local mycmakeargs=(
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
-
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X OFF ON)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON)
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON)
-		-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON)
-		-DDESKTOP_APP_DISABLE_WEBKIT=$(usex webkit OFF ON)
-		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON)  # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF)  # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use gtk || elog "enable the 'gtk' useflag if you have image copy-paste problems"
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.9.0-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.9.0-r1.ebuild
new file mode 100644
index 000000000000..7ed38b44c9db
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-2.9.0-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit xdg cmake python-any-r1 flag-o-matic
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+
+MY_P="tdesktop-${PV}-full"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+dbus enchant +gtk +hunspell +spell wayland webkit +X"
+REQUIRED_USE="
+	spell? (
+		^^ ( enchant hunspell )
+	)
+	webkit? ( gtk )
+	gtk? ( dbus )
+"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	dev-cpp/glibmm:2
+	dev-libs/jemalloc:=[-lazy-lock]
+	dev-libs/xxhash
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
+	>=dev-qt/qtimageformats-5.15:5
+	>=dev-qt/qtnetwork-5.15:5[ssl]
+	>=dev-qt/qtsvg-5.15:5
+	>=dev-qt/qtwidgets-5.15:5[png,X?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	~media-libs/libtgvoip-2.4.4_p20210302
+	>=media-libs/libtgvoip-2.4.4_p20210302-r2
+	media-libs/openal
+	media-libs/opus:=
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20210626
+	media-video/ffmpeg:=[opus]
+	sys-libs/zlib:=[minizip]
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	gtk? ( x11-libs/gtk+:3[X?,wayland?] )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	wayland? ( kde-frameworks/kwayland:= )
+	webkit? ( net-libs/webkit-gtk:= )
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/range-v3
+	=dev-cpp/ms-gsl-3*
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/tdesktop-2.8.10-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-2.9.0-fix-disable-wayland-integration.patch"
+)
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# no explicit toggle, doesn't build with the system one #752417
+	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
+		cmake/external/rlottie/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
+	local mycmakeargs=(
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
+
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
+		-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk no yes)
+		-DDESKTOP_APP_DISABLE_WEBKITGTK=$(usex webkit no yes)
+		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes)  # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	use gtk || elog "enable the 'gtk' useflag if you have image copy-paste problems"
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 23f774c6688e..57fc0c023bd2 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index a90495509416..c2089c21059b 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,4 +1,4 @@
 DIST irssi-1.2.3.tar.xz 1145292 BLAKE2B 7b2b7cb8d1533a06ad3cd5e0b2e45bba636cf19d26c69e19fc7e9408313f80d80a26ff2bf5f21a8763d8adec722bb33f6b076a863e6a55e178a814a3e79c9db7 SHA512 826b7bfd86a54647f2d344b6c461e1118b7382fb1637cf33c395af41a9a4ca5d8a794a415f0f0737178968cf2463bb46a0e7b7fd7014c968668b16183e0644bc
-EBUILD irssi-1.2.3.ebuild 1450 BLAKE2B f412328c6d6ff15b95d281e9ed62284de468570bd132509bd0436a78f5f01b663b7508a02f071c321207a0a8e4aefa84bdab288be098f15feae773f7d2535d45 SHA512 b593b701bbc9ad660e83e154c3577e5daa402ebe984a256a1c978fd5640b002d0b5b9c84c7ad6965a19bb484d230bfabeb908a7a3f972ebbe71464548d2f3c41
+EBUILD irssi-1.2.3.ebuild 1449 BLAKE2B 5c1b51ffca7ab66123a0cc5c474a79b7795c395111ff125c98de6a56c562521c493fbda366823ca16d18a09040cf0169d5b78186e1dcab0e5642fc8cccabe2c6 SHA512 e3bd41ade58e387caf133b658d325dc23d3482bb1d91470ab449845a5b8b48a3b6650fad9782ac1c171461fb816419e9acc86c099af082ef6fe2e940ac15173e
 EBUILD irssi-9999.ebuild 1393 BLAKE2B 4b9591b2ba11e38df59d713a7977ad78fc6f810a770313cc11d90eb717c00e7814f4e2025c6ede5e08f373ccc7d71721598d9bd5c92fd1699c99f8b2af8284f3 SHA512 dd4ae6574e4571b21403aa8b85c38b8a3eef67968e7f04570c3a52001c751a12ae39fa16c56a1db3aca46d098c462a50423b09b54e4984d3a951d15ea90a1030
 MISC metadata.xml 700 BLAKE2B 6dd761c206e402091a7847899f6d117a1110cbd12cc3263860470fdc3d2286f902d7949c1b36054508915eaf81622050a8ba734621781fa2bd1c167ff561a971 SHA512 bb8ce4cfafc1bb65ccc5fdfcd95d5aca47a958820eb55f3130967083256a495c4d8bf33e1bddf03394c4bd7b6afba70a838add6815e1e9ac86711ed405451601
diff --git a/net-irc/irssi/irssi-1.2.3.ebuild b/net-irc/irssi/irssi-1.2.3.ebuild
index 6f91a50bf054..4e03972e2afb 100644
--- a/net-irc/irssi/irssi-1.2.3.ebuild
+++ b/net-irc/irssi/irssi-1.2.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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="otr +perl selinux socks5 +proxy"
 
 COMMON_DEPEND="
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 9cea84d34355..749273080ddc 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -2,5 +2,5 @@ AUX konversationrc 346 BLAKE2B 8d236be66f983b3670bbd49578c73a1a868be0b498f965e5f
 DIST konversation-20.12.3.tar.xz 4242136 BLAKE2B 2483b34dde69a73029d15e8d626c77ebc9f91aaca0dc7b83f4b92629bbf773873de52bf8fd1ead3d862fbb496f2dcc3823320d983ea0c0f2c0ba8ac831ce379f SHA512 022854edac9e2b834e9c6795cd02e9d9fe5ab54f4d3facaff9f60cac680e1b6df12ef3ac3281a07d4ce732f491fe2b49f47fd467751c9b87549e02df3ef27bae
 DIST konversation-21.04.3.tar.xz 4251844 BLAKE2B 0db25135752635392248288699ab6a28042fa5a5dbe73c5186d782fe5a68eb3b6396b87830f5ec91da00c434e0462ffae042332e9c82f1e342fd77a0762afe7f SHA512 af2e7d232412f316090be72cc2b412b19c8735be4e04c9286561ed3cf83b5858b83572f33ee70281610c7fe5e339683d33e9d1f9ddb57eb5198db91e82613869
 EBUILD konversation-20.12.3-r1.ebuild 1900 BLAKE2B 7d40422131f9c31abeda4c3d47b087bcd347cc94bd27c309c14d9df3c25e7c105d72ed1295710ef1450d4c6501a6ee87a18a5a39612bd544315a1e81a00a2c8c SHA512 aecec20212c5cdc90ebc7509f5865463a49dbbdb2113882fdf7e84bcef37a58a9f349335b2c4a4fc62de973851308b14b21ea892fa461d6c7280eb6e9e112236
-EBUILD konversation-21.04.3.ebuild 1892 BLAKE2B ccf0502196052468c5ae2cc654c2d4a84d3510583a9f0275c904b95d6859192fd868e862ea361328ee7b7c4fbb4b0aae4c1349c26bfecf326bf47ba01193b744 SHA512 01ecd6b2e19274f36847f57317b09d272080aa06d6fabbb671464846acdc529eadee70721b2b5e392d6842ffb7f3b1ae9cbae4614e91bca61034aab4a76ca21e
+EBUILD konversation-21.04.3.ebuild 1890 BLAKE2B bb6c2f3100250708d015d22203e17a8a24775c3158f809fd5808ac6f5a5233fc5fd42be01b373725bdb7ae04d3d3851555d21bbea6ec6426a22ec3219d04e316 SHA512 bc6d1eeabf1162c6071748b7399c442015edd36dbdedec1c2128f9eef342500e95a333377655ae3cc8218f9e066b63074f32edcd8b01d81fad3bda66ba93e1e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/konversation-21.04.3.ebuild b/net-irc/konversation/konversation-21.04.3.ebuild
index 73a3fb36feee..76f3966b4db5 100644
--- a/net-irc/konversation/konversation-21.04.3.ebuild
+++ b/net-irc/konversation/konversation-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+crypt"
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index da9a44a6e204..00487181cad9 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,5 +1,5 @@
 AUX ngircd.init-r1.d 388 BLAKE2B 10b6d4eb2cd39fe4e3087461cdc15f2ee8f1002e826552e145903b69e16ce46169a2dde19e03af38228ed9ede0473a828aa8cd123ab4a2b043fde448bb180954 SHA512 12e62e23899d1143a35e60bf983c319f72aa13c49123b497963f96317b2990cb2529919336da5a9b5c230e55479c289358261af92d25ef54bd19079908e18158
 DIST ngircd-26.1.tar.gz 562938 BLAKE2B a1a4ca8b6e12a02cb4ba2e07d777cf77051b5330464c91634cfac0b385157ab7c648e3b71151247bc8ee6cc847e84755fdca3d9b4a25205bbb57b8296995dd17 SHA512 4a3ee379dd8d8655a71134c745f750359ceb0512e184db555f65f2bcab68087480365a35680a9ec75b1e6eb0fef23e1cbe0a0e13c3c58d211e5a520a8eeaa71c
 DIST ngircd-26.1.tar.gz.sig 310 BLAKE2B 108daa66aeccd51468aa0c6ab2de18c3ce476e812145902186ac4b3b8b29b0da32057c5a6f44133cfa4507310a9a76a001301ebe2d37ca809e1b7d8502aaa492 SHA512 e0b6b28c65f1363c0e8043378d52bccc0a634d7c17018edbc33130c9dbc4c2896f3b3a3ab758746707b37e3e527abbd61e5af8c1455d5fcc5b1b202758c82576
-EBUILD ngircd-26.1-r1.ebuild 2232 BLAKE2B d3b2f3936585c71ba14ef210446a8d05ffabcc8f0e8becae453189fbf31f01b1466272e6e03804e02c8b90d36e0eafe675b258131b851ae71ed7fc6c6d010af9 SHA512 24f5b93b745ce9706f11ccae7b30c42fe406bf68ae9c694a464c4432cc672e365d1ae388cad3d1da4438f981e5eb017d924ef530c8a644c8f469f8a755758376
+EBUILD ngircd-26.1-r2.ebuild 2229 BLAKE2B 861a102df16f7aa6ca999130399a9ad733dfc8879311c1af698ad3c4518e8694e227b7d0467ab681df16d230b79dc7d76593b79e8fe2edd221170645cbef9a9a SHA512 2fd0067d50e32f3bbd1713617b4056e5cd147a8da1a4f9c6587b69e2a5fda792f06663363b785fa5c3d34d25dd3dd3f1811e4c60609f1dacfaf8c0ddd8f7ae28
 MISC metadata.xml 650 BLAKE2B dd80efa442d59f04e26bb338e371ffa8380a4cdbb630db30e25adbaa930d9f0e4a486bbd05321b8185c23558ad4e29023153a69d1214294c345b46685eb7de86 SHA512 9b8879892c2edc6c7792c22a684f87ae559a43b034ee66f6242e73075012e1f53a33a63fc3ffa62c41f5fd620a4be6c1ffc57a1b62cf42ffa3c032cec4ff743b
diff --git a/net-irc/ngircd/ngircd-26.1-r1.ebuild b/net-irc/ngircd/ngircd-26.1-r1.ebuild
deleted file mode 100644
index 4722361c3540..000000000000
--- a/net-irc/ngircd/ngircd-26.1-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/alexbarton.asc
-inherit verify-sig
-
-DESCRIPTION="An IRC server written from scratch"
-HOMEPAGE="https://ngircd.barton.de/"
-SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz"
-SRC_URI+=" verify-sig? ( https://arthur.barton.de/pub/${PN}/${P}.tar.gz.sig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~x64-macos"
-IUSE="debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib"
-
-# Flaky test needs investigation (bug 719256)
-RESTRICT="test"
-
-RDEPEND="
-	acct-user/ngircd
-	acct-group/ngircd
-	irc-plus? ( virtual/libiconv )
-	ident? ( net-libs/libident )
-	pam? ( sys-libs/pam )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/automake:1.11
-	test? (
-		dev-tcltk/expect
-		net-misc/netkit-telnetd
-	)
-	verify-sig? ( app-crypt/openpgp-keys-alexbarton )
-"
-
-src_prepare() {
-	default
-
-	if ! use prefix ; then
-		sed -i \
-			-e "s:;ServerUID = 65534:ServerUID = ngircd:" \
-			-e "s:;ServerGID = 65534:ServerGID = ngircd:" \
-			doc/sample-ngircd.conf.tmpl || die
-	fi
-
-	# Note that if we need to use automake, we need a certain version (for now):
-	# https://github.com/ngircd/ngircd/issues/261
-	# eautomake
-}
-
-src_configure() {
-	local myeconf=(
-		--sysconfdir="${EPREFIX}"/etc/${PN}
-		$(use_enable debug sniffer)
-		$(use_enable debug)
-		$(use_enable irc-plus ircplus)
-		$(use_enable ipv6)
-		$(use_enable strict-rfc)
-		$(use_with irc-plus iconv)
-		$(use_with ident)
-		$(use_with pam)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with zlib)
-	)
-
-	if use ssl ; then
-		if use gnutls ; then
-			myeconf+=(
-				$( use_with gnutls )
-			)
-		else
-			myeconf+=(
-				$( use_with !gnutls openssl )
-			)
-		fi
-	fi
-
-	econf "${myeconf[@]}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/ngircd.init-r1.d ngircd
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && use pam ; then
-		elog "ngircd will use PAMIsOptionalPAM by default, please change this option."
-		elog "You may not be able to login until you change this."
-	fi
-}
diff --git a/net-irc/ngircd/ngircd-26.1-r2.ebuild b/net-irc/ngircd/ngircd-26.1-r2.ebuild
new file mode 100644
index 000000000000..e11674b6da74
--- /dev/null
+++ b/net-irc/ngircd/ngircd-26.1-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/alexbarton.asc
+inherit verify-sig
+
+DESCRIPTION="An IRC server written from scratch"
+HOMEPAGE="https://ngircd.barton.de/"
+SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://arthur.barton.de/pub/${PN}/${P}.tar.gz.sig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 x86 ~x64-macos"
+IUSE="debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib"
+
+# Flaky test needs investigation (bug 719256)
+RESTRICT="test"
+
+RDEPEND="
+	acct-user/ngircd
+	acct-group/ngircd
+	irc-plus? ( virtual/libiconv )
+	ident? ( net-libs/libident )
+	pam? ( sys-libs/pam )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-tcltk/expect
+		net-misc/netkit-telnetd
+	)
+	verify-sig? ( app-crypt/openpgp-keys-alexbarton )
+"
+
+src_prepare() {
+	default
+
+	if ! use prefix ; then
+		sed -i \
+			-e "s:;ServerUID = 65534:ServerUID = ngircd:" \
+			-e "s:;ServerGID = 65534:ServerGID = ngircd:" \
+			doc/sample-ngircd.conf.tmpl || die
+	fi
+
+	# Note that if we need to use automake, we need a certain version (for now):
+	# https://github.com/ngircd/ngircd/issues/261
+	# WANT_AUTOMAKE=1.11
+	# eautomake
+}
+
+src_configure() {
+	local myeconf=(
+		--sysconfdir="${EPREFIX}"/etc/${PN}
+		$(use_enable debug sniffer)
+		$(use_enable debug)
+		$(use_enable irc-plus ircplus)
+		$(use_enable ipv6)
+		$(use_enable strict-rfc)
+		$(use_with irc-plus iconv)
+		$(use_with ident)
+		$(use_with pam)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with zlib)
+	)
+
+	if use ssl ; then
+		if use gnutls ; then
+			myeconf+=(
+				$( use_with gnutls )
+			)
+		else
+			myeconf+=(
+				$( use_with !gnutls openssl )
+			)
+		fi
+	fi
+
+	econf "${myeconf[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/ngircd.init-r1.d ngircd
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && use pam ; then
+		elog "ngircd will use PAMIsOptionalPAM by default, please change this option."
+		elog "You may not be able to login until you change this."
+	fi
+}
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index acfe6157df19..03125820cad7 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -4,6 +4,6 @@ AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a
 AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
-EBUILD quassel-0.13.1-r2.ebuild 4701 BLAKE2B 11e47ac3b8346b0fcc7521b642a1422dc3d69a162d9da95a746a9764c735fe18829e2ee481d02078c406773200f0f9b1a174f36fdd24a88e268959fd30f9acc1 SHA512 a02f17fbae75b52f2890ffaf87d282bdc43fd3d0396674db15eb902f68e4fdcf4391ca1fc743d7938f559001dce363be0dc8837357b6a84c1ce5b223ca83c928
+EBUILD quassel-0.13.1-r2.ebuild 4700 BLAKE2B a508275b48c7314155d9a133caadfac6745206bac3d92a9d667dfbdf6bc03215b58cecbe2c7fb78b6ea3d8d511e98ca20914ce5e7234be460c22056357816037 SHA512 42eda8c70edfc642e0e011d9111eae7b98a3715ff85129f14a0b15348aa107494fce4d79f7d65ee869b89ab884de804353288436f376f86186d59f0d8787205b
 EBUILD quassel-9999.ebuild 4583 BLAKE2B 59c518587b305ad28b40594af715e2aa54396feb6f596a9273b884b4280bed8152649bc7da6f662a7762d5d01b16d798160e1414d5e5649662d2b18c0bd9863d SHA512 c0de1abaa3fd51e64378c15d425371f9214ebfd0933f4cb64d8dbf4684fbcead6ce19049593ed1b7bbc6d60d6b661d8f0afd6e9e9600ad272c7432aa6bbe2d08
 MISC metadata.xml 1726 BLAKE2B 79f198e894613f560bbcef0b5e0be76058864585c87fae9bfac31caa3b48c83df34379287a2e01d41c8e79b08984d9573011c41cd218dad7b5c96cae1407b214 SHA512 ddd96db79f3cba84b48c3f9fd27c15bdfa8301fc04d0d9c032921c55e148150350c56bdf7589eeaa61c6349573ae5fb15b9b44c272dc61a6b2ed7e22994c92e5
diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild b/net-irc/quassel/quassel-0.13.1-r2.ebuild
index 57fc94c79cd1..5a78333a8ff8 100644
--- a/net-irc/quassel/quassel-0.13.1-r2.ebuild
+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit cmake xdg-utils pax-utils systemd
 if [[ ${PV} != *9999* ]]; then
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~sparc-solaris"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~sparc-solaris"
 	S="${WORKDIR}/${MY_P}"
 else
 	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" )
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7afc0407d39a..5e675e08c9b9 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index b0b5f6da1a3b..74ea55b3bf85 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -4,9 +4,11 @@ DIST courier-authlib-0.70.0.tar.bz2 2183323 BLAKE2B ebf58f8c4e7b58766edc684ced59
 DIST courier-authlib-0.71.0.tar.bz2 2207895 BLAKE2B 8eb92b2c07acfb662b34a2234759a80f3a1b5a96c9e537cd6215bd9a9a607ed8995461dd599e4fe2698e70510f11815ad13a0511446303ae5e26ff616f05d92f SHA512 7a9700c472fd9d6942bd15dfd8db474a738817608bcd8106b6211b24cdc0631fd69f99e7a5c9e9f6088c16b53a9304ec429c031b16621f8ef52581af8a4256ec
 DIST courier-authlib-0.71.1.tar.bz2 2208870 BLAKE2B 5058a5d3182c53020c3be0a693908bd90e6e2397f03124df3efd7c3bd39ebdc794166d49c6153880bbf93518afbf4388160680cd701236b075b6e59624fb6882 SHA512 a1b36f4f3b0f11fb34e5dab197b3a0471bc6a99528fe77836b3b2d12f9dac292be4c181aeba5afa3410685dd6882ed00ff6692e74cd0132ba591de1294d0f2d7
 DIST courier-authlib-0.71.2.tar.bz2 2208460 BLAKE2B 49aaea85032166ba4867e7834bb2f6c8d3eccb0ebe24b94bac3033a3da2154e3162d06892354b37eb0c38db092ce0096b050246db341b18a32065c19f322238a SHA512 b0bd2356013d48a998908d4825901e8e730ec276699005696948781e8af4014e25eded3116fa5a8a38b6236e9713f454170628b51aedab7b7d2ebec082643a47
+DIST courier-authlib-0.71.3.tar.bz2 2208794 BLAKE2B 4b0f56f066368383d471dd8f46941f7b652a87be939ba6319cf99115991c03dd117d6bc246cc802fa7066ce5c75aaa102c59ae397948dd31ddbbb024059566ef SHA512 02c55ff1a91aac581942f8a4a01edd2bb8e2e1a07faf551d40a97583ce2f6eab12e850e3170df255c1e7680a34e418784ec14bb033825d6bac21192ae37ce55d
 EBUILD courier-authlib-0.69.0-r3.ebuild 4462 BLAKE2B 9d4820ae42e6c5f89f74a2a38c75358b7bea3ff5ce1abb658edfe7b6f8167fa0392b4fc6da69efb2a06f602f20bc434deccce93a837839cb725e29a2913931a2 SHA512 e1da10fd1729f371d37116ef3d59ebf32c401fa3aefcea4e46b117321ed9fd46f16226ff10bc8ffb6ce96e3fae4b2f2fc2b9c7ec3b2675ad7405aa750b3f3f29
 EBUILD courier-authlib-0.70.0-r2.ebuild 4470 BLAKE2B 1c1dcbde260e5b444297ed285da434310f860d9244a81d707fc9cd4c1909beea24bdc9ef58976ea39a6cbeb9b21204355bed0f3a0c9e2b7c08f05d1970c5c21f SHA512 0fd647c724cadf384242261bc14f7a2d1286ca9bed7fd4d433c32e536488736076a34609371cc597423c03680c3109da6667dbbae9e9d0eaa4be7dc0443d8ae8
 EBUILD courier-authlib-0.71.0-r2.ebuild 4462 BLAKE2B 9d4820ae42e6c5f89f74a2a38c75358b7bea3ff5ce1abb658edfe7b6f8167fa0392b4fc6da69efb2a06f602f20bc434deccce93a837839cb725e29a2913931a2 SHA512 e1da10fd1729f371d37116ef3d59ebf32c401fa3aefcea4e46b117321ed9fd46f16226ff10bc8ffb6ce96e3fae4b2f2fc2b9c7ec3b2675ad7405aa750b3f3f29
 EBUILD courier-authlib-0.71.1-r2.ebuild 4472 BLAKE2B 6b0fcf845187e296e305d7c09f6e5cc29ad0447f04af56313a866dfe5a7d94b9b86e6f2804be1d31c913004eb0fe6053fb0528377e49aba71583d1a8a58f9353 SHA512 c4e46181e82bfaa7a6b24e53675d04d6615324ecc348ba018200f44bff9f0c085a9e8ac0f70fdf9b432cf7eec58e9b6076518d6337019b4e5d08907694821a37
 EBUILD courier-authlib-0.71.2-r2.ebuild 4479 BLAKE2B cee2dff7871ce782ce545270dfeb56c38d6246156ae618aeb356622711808ec3e3e0ec832305cd4dea1658b302def0f07e30639093bf42378823f7b6aec04f03 SHA512 3186622faab364d72b893b39b7e5c6fa1dc76aa5c4b70a3ef45eb5ae4be6b84692827a0ecabb7bd42824c2e760009a7764300306e957e8500882633171a85ccf
+EBUILD courier-authlib-0.71.3.ebuild 4474 BLAKE2B 54f82c6c68548ecc86f39d6253b1e53976ed4d2807e13d2cd47b391f3ec922b6b82b51b8aa778ab4bf8f48408fa7b1b57a38f0f22a87349e9351bc65055d23ea SHA512 f56d48873bfb9a634d1d94bb3672c3fdfec3dd2989b352d1a9ec8106ca678cfa87869c8df47e5d9a01fce7f45fc4736b8db8b3928e03f66759ed047a22e1a533
 MISC metadata.xml 301 BLAKE2B e5d19d103b9de3e5b34a1b466b3d1fa4fa170fbaa4e81b99eb970ad73b89d7fe3e7b64ea1e60f978f15c17a5058c38ee5324677886efc36e71004c749d909260 SHA512 f0811e6512fca5f760e4b2c745e9245dee529801cf1897d38c4fc817995f5a1edd56f58227f2e8a1fe93c78b1d97fa5f84c6db27e6c3feaa36c8901015d3cd25
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.3.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.3.ebuild
new file mode 100644
index 000000000000..8b5a627c584e
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.71.3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="https://www.courier-mta.org/authlib/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
+
+RESTRICT="!berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+	>=net-libs/courier-unicode-2.2.3
+	virtual/libcrypt:=
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( sys-libs/db:= )
+	dev-libs/openssl:0=
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	local myconf
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="--with-db=db"
+		fi
+	fi
+	use gdbm && myconf="--with-db=gdbm"
+	use debug && myconf+=" debug=true"
+	use sqlite && myconf+=" --with-sqlite-libs"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--without-redhat \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		$(use_with pam authpam) \
+		$(use_with ldap authldap) \
+		$(use_with mysql authmysql) \
+		$(use_with postgres authpgsql) \
+		$(use_with sqlite authsqlite) \
+		${myconf}
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/* || die
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+
+	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
+	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
+	if use mysql ; then
+		DOCS+=( README.authmysql.myownquery )
+		HTML_DOCS+=( README.authmysql.html )
+	fi
+	if use postgres ; then
+		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
+	fi
+	if use ldap ; then
+		DOCS+=( README.ldap )
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+	fi
+	if use sqlite ; then
+		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
+
+	use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb || die
+		makeuserdb
+	fi
+}
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index dd5fb2dbe688..f2d4fc3bf144 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -4,5 +4,5 @@ DIST courier-unicode-2.2.3.tar.bz2 593337 BLAKE2B b384aaac20ae645f4eaf256c90e50d
 EBUILD courier-unicode-2.1-r1.ebuild 523 BLAKE2B 4d524358fbdab0b45b70c54dac63cfe445645826cbb382314e9b52aed377764ba281e15d134fe4df0d72d3fef62ed277960529beb6bce51370dbfd213d243202 SHA512 64bbbeac23da800df682c2059c17e162ae2b36999fce9fe0015a82469866b352c165c4757ed56d1307a2a6dfda3902fd7a510dfbc4bb7d3a1b7ee0995a20cef8
 EBUILD courier-unicode-2.1.2.ebuild 531 BLAKE2B 9f1fd38475d02afcf9a161501f54884b3ecaccb6738917630e8a80dfde9d50701bfc432584ddf0adbba7c6c8fea6f1946f5f5d7ff226e2c88eeb8220a75a5e12 SHA512 63658aa656ccdec8a9941c23a422f55bca14ba8977288ec96a8ffacc11880878bf9832780cd55b47c684a36b5b206c762405d710d4f527eefa2de221890c14bc
 EBUILD courier-unicode-2.1.ebuild 478 BLAKE2B a3b9872184bed03e527cc7a91b41baaa65a762155bdcd2d0543b4ab51d9dc307414c9a231eadd34af37051725740d8893c3aebe8f99b070da118ab013f48c1c0 SHA512 9e168562de2b26bed904d5c44b445e793a6e8efebb37b84e9a22b7c5c8ee647d671777efb054b4df173da6ef122a8c0def3b1343738f086a93cd0d1505d9f34d
-EBUILD courier-unicode-2.2.3.ebuild 538 BLAKE2B 33e74eedd34a1074f9314bb11087286713f69f1b56997f81193d1d8a48459aec6babce2e878688ba6a79aa9f002b12cd346d958b26c3658fefb30970f5681ab7 SHA512 7533e292aac18c63f36021b407f0c8c9aee6121bfbbf1a4dacb1d01a91cefb690fa939c501f5841b515d387a9652bdbe065ecf32069ac1adc04ea849040a1ba6
+EBUILD courier-unicode-2.2.3.ebuild 533 BLAKE2B 73fe6af406ca3267a020f01bce7edfcd17f8b835ed920e8791f9aed6d7ea528697fa5b10420807728116e1a53436e574f88396bf97b329c204b2061bba3bf447 SHA512 568d006e27109347d1470bc20b9a0cb5395aa6e722eef9ce0042f22c51460b26937ea35b361c4baefb51945c98c898d14be535f52950cb4897f2160aaccf2ac5
 MISC metadata.xml 293 BLAKE2B 85c442aa45e6a97917305b7e9326f8445f5911a3a3913d3540250b83361a16bc07810b8288a692082d9a2203bd696ba87d8fa1b6ba47c046f6d96577d07400af SHA512 39ee602134069ac766933c31bacbab2de9f40aa8bab6450660ce5319a95e285f4d4c463df41f22d7fd7e1c8584634a4b3ada8962941143fe8d4120cbb11515f0
diff --git a/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild b/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
index b8afe562a901..cab28dc31f1e 100644
--- a/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 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=""
 
 src_configure() {
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 559fae5a78d7..bde1cbdd1404 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,3 +1,5 @@
 DIST glib-networking-2.68.1.tar.xz 237876 BLAKE2B 11d982a3d65ae5793a3b6c30cf31737ede5879aa3747416253bacc34d62a1ada944a718223300d63a5b37615492929e63c1c0cad6ef34775ee95e49f6769dc04 SHA512 da38b64e6709c864e1c6a60989d86439e0afb1dbf7b7f60a67f58cf430ae354ef9fe7465e74790b0c2827d2f1c39a250db4372d98fab6ab8d73946a7f51e3b22
+DIST glib-networking-2.68.2.tar.xz 239040 BLAKE2B 2b65a63205d3071d05898ca869ae117c9b9fd548b19d9a1c82869a1eb54b77113f8908cd32108f4ca851cc0975ed34c16df04906b5b3c1f9a9a03574187ba929 SHA512 5c2d485332ff1b5a4d0f257b4e7a371b0bfe899b98ee4157845e5f5d3f10cf6f2df891407396edb6955420064dbaa57a5dc3c62c6392881cff05332db925d32d
 EBUILD glib-networking-2.68.1.ebuild 1983 BLAKE2B 57f0697fa0db6c58187cb1dd748c31bd039a8999b7b1abdf330c2405e80bf203cbccc86fde0bd69fcf76499d69265ae2c079c6c43dc238ba5cfaef4014a7b375 SHA512 b1a5877223e456e2518c86d9c14128588a1ce169c30d7b5870b6d9ccb93d5f1f3dd2d06bbb5ee07421c1cfcfda07a22fcdfafc974e85afa4b001b190062e9680
+EBUILD glib-networking-2.68.2.ebuild 1990 BLAKE2B 29807f8e6ff7998f584130127d1da2177897b65ad9d196dd6089daa1ace034be7d99ae4c69a7e787e162232f3ae62b5cb2aea55cdacf777b03929e9190174cf5 SHA512 50a2224242df368dfefa2b3826056e802427d1482a3b4d31d555d6892852ad7fd57fdf6d564c8a21460a4407ae68001badda4db839cc754181ce91cab4275e53
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.68.2.ebuild b/net-libs/glib-networking/glib-networking-2.68.2.ebuild
new file mode 100644
index 000000000000..8365ce18f29d
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.68.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson-multilib xdg
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/glib-networking"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+gnome +libproxy +ssl test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.67.0:2[${MULTILIB_USEDEP}]
+	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+	>=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}]
+	ssl? ( app-misc/ca-certificates )
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+"
+DEPEND="${RDEPEND}
+	test? ( net-libs/gnutls[pkcs11] )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+src_prepare() {
+	xdg_src_prepare
+
+	if ! use test ; then
+		# Don't build tests unconditionally
+		# This is a hack to avoid needing gnutls[pkcs11] when USE=-test
+		# It may become a real runtime dependency in future
+		# Please check!
+		# bug #777462
+		sed -i "/^subdir('tls\/tests')/d" meson.build || die
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgnutls=enabled
+		-Dopenssl=disabled
+		$(meson_feature libproxy)
+		$(meson_feature gnome gnome_proxy)
+		-Dinstalled_tests=false
+		-Dstatic_modules=false
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	multilib_pkg_postrm() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index d53e1091783a..9cd34fa69539 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,5 +1,5 @@
 DIST libktorrent-20.12.3.tar.xz 604488 BLAKE2B e51bba82990632744aaadf3e40043fa80e64395f6f3721992780ff77d7663a0a3600aaf7d2653a00f32366555f1000a961c3e99de6d2e2cfecc4c1f79d1ebb00 SHA512 e2259251e8edbef6154674898614f81b3a29d5c711e9f751435450edbbb987c5e2a1d8ff864da5aa180b5d1adc3ef611f46175f2126faca52d1b1338d986d1cb
 DIST libktorrent-21.04.3.tar.xz 607516 BLAKE2B 5dfea2102fc865d61f2ebf2b1f7045c7ce0f542830f9c7e511d5139f910ff3797a949f85a593a17c56287c3433c086a198f96353a61a4cfc923d96aa30ab4545 SHA512 2c8ee156b0b1e51b96b2670c5fe3f00aa131a34bcebdfdd69898a723fd01a8d2da52a94a1914c13e82b7362a71beaefc03b27eb450dbc84bc43953771bf9b886
 EBUILD libktorrent-20.12.3.ebuild 1448 BLAKE2B 9e40d97d0aef21c498dd61cd924dd4e8f0cf3385d4269176fffc3bb5634b3959de35d723cc3708e0c9f8ac43d61cc893f60981d937ae32b6c039b4cc4a7fe708 SHA512 c3792ec5496f2534b6ac95a7368abc02bc7fbea277b3eac4be062b59f4fc7c3099113713a81a003e43187d7d618c258922320a3e4a420c230ab61f3f5e926aa2
-EBUILD libktorrent-21.04.3.ebuild 1440 BLAKE2B ae855b981c48206979a2abe3f6556584857b4b8c6fd456293e2e9baf0faaacec8997653ddd5e8c098cae4a91be9a04cb10ee1372566dfcf929f2546ccf21ffe0 SHA512 e5a2548d353d0048a7da3af7b4bcc1d459f9ff2049049d70556d0b96cc380456e1226067f9780e66609b014f491c69f23b77e5d64088cc69537799ae5089cffa
+EBUILD libktorrent-21.04.3.ebuild 1438 BLAKE2B 7bb6488dc5d2a84552e93b36896807d0506e35cc513885a89b5b9dd0e1fa31b075e0fc5c88ec520a26daf4ca34b9be660f7200b39957b05d3ba1ae90203fdd34 SHA512 b08fbe506731121d2b0d8d39bf9ad891e797a443ae3221814137628b29ac67c115001c9c20fef0150c422f0d708b7321704d4fde4df2f5ed0a153992e45927d2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/libktorrent-21.04.3.ebuild b/net-libs/libktorrent/libktorrent-21.04.3.ebuild
index 9f24c96e7f05..e14cce571e02 100644
--- a/net-libs/libktorrent/libktorrent-21.04.3.ebuild
+++ b/net-libs/libktorrent/libktorrent-21.04.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index e2988ccd0b3e..925b75f7637b 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,3 +1,5 @@
 DIST libmbim-1.24.8.tar.xz 517872 BLAKE2B ba4d44ea18ecb412d046b1c1cbd1167bd1cf0a1430486dbf760731950b088e66b25c5c870f2e1a49ea78e43bc15fdbac9efed56afa35127d33f6377325677386 SHA512 32a1ed379fb2799c8490058a16f819620290c2a08d0dacacdc7db4a31fb66a4d9c449b4b2d8fd6de898da28815a6c32e3d97a802970115ac2869e7fec0d841af
+DIST libmbim-1.26.0.tar.xz 554672 BLAKE2B b020ea81d6f06bad4c655b285423075873ea01ad253c8eb79fe6e0ce8511d6a8c684c4d8541a64dcc23b46211de117f867d5b405f08942e904156304ce746779 SHA512 b987b3271166eabda7d6767b4b3cd8f34b07ea6a43d5ed1d7cf083561b0e57affeec175a155e5bf8b998dd60f49a303cf54ad6eda146df7483cabe099c401c27
 EBUILD libmbim-1.24.8.ebuild 816 BLAKE2B 6e6acbed86786d0efbe24b0f81ba57ec47868f8d318ed423ec72558f32c0614cd9a0a5f8a558d17f267020565c47ab86e1830adb39c6ed2d3eb0d83e6d122f35 SHA512 11855df9ce1e52596dc81bc504ff0a3a1f1da182db49c2c6f39b0338b7d3f87e8c3c837827a217fec68c654efcfcafb75da26d86a6c6b9fff69760a603bdb8e3
+EBUILD libmbim-1.26.0.ebuild 737 BLAKE2B 04978105e7e927961c2d57d1efced6971ea34faf83c52b033e8af0784cc89012c721ecae5f069d5915ab17c2e3fee6fcb3e5a5efc90e17fa9c3b61d36a29fbc9 SHA512 35f8fdcfef71b65421d4b41fb667076718aab988bb9dd2b906adfb0db6141ebebb217cfaf0102419c13cd35c03731dfd7fb40ba9de3b01d62c0efe9d8dea7fc0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libmbim/libmbim-1.26.0.ebuild b/net-libs/libmbim/libmbim-1.26.0.ebuild
new file mode 100644
index 000000000000..a4e84e6f1bbc
--- /dev/null
+++ b/net-libs/libmbim/libmbim-1.26.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim"
+SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=dev-libs/glib-2.56:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--disable-Werror \
+		--disable-static \
+		--disable-gtk-doc
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
index a76aefac32b1..e600d8f0c6f4 100644
--- a/net-libs/libnpupnp/Manifest
+++ b/net-libs/libnpupnp/Manifest
@@ -1,3 +1,5 @@
 DIST libnpupnp-4.0.14.tar.gz 538629 BLAKE2B 3bcd1cf04126aa0d16056865e2f7c90bc479ae4ccea5094b2c44ee687be95fe346494a2d07ab7925963d88e614fff1a451341af7d41c2a16df1208aef728d515 SHA512 b224cadbcd92b8d66118da015db345b3ef5c4858a458ac681d550c1409e62f212d3b2a744a8368fa4149309f29de2edb8cb14c75ebcb14653ee351e0d24cba71
+DIST libnpupnp-4.1.4.tar.gz 544243 BLAKE2B 4e2d0ad827fd566d70df440246ad8fe081c5eb125fac72827e84680a1d842125562449866dab69305c16e170e8b04679ad40f73c2ac573aae266d24679053c76 SHA512 8a41f52a5665470ddf48233a5262cd906a384f89308423020a6f4d2b67d38b53d9608ec6f01a1118f703dce41ba0c58a863965e7226411b4f8aababd7b1d22b0
 EBUILD libnpupnp-4.0.14-r1.ebuild 719 BLAKE2B 26210c2824c29e491bdddf8185c8a54057fc2adf1a21354b273bce5459f61aeb42ea3ff63561493445776954ee6897de4aa97453c38bff8f6bfee9f6b05c8f5e SHA512 2726d7f7f0e1bd3f300639a835904659e3ea8d752fdb384105db14484227177b646182103a88ee95d6dc1a35feb9d358b6470ad399ea9920d513afa3afad0f18
+EBUILD libnpupnp-4.1.4.ebuild 721 BLAKE2B 19fa3530e0d7edd98b5f22bc571ef9fdf4c964778fe23942c75e10677af50af4ab9cd54e8a3c3dc68a6b27eb5f39d74c6b95ae0f11a46fffd0e68a0042ffdd5e SHA512 28c69380aef94fb50c19738d2c56d303c13d6d2ec375a3b6e07f82ece9cf8beef35ce8bc8b3cdebb5b2e53b6508226913a23da1290e6988da35ed4864696ce21
 MISC metadata.xml 535 BLAKE2B f106ebdadd8d1f09dfd088420c9c750858ed36a2eff5eac1bd256a31cb277b0dbfeceb3cc1d724b65a66b97243f32d618379a8c65a52cf341f78fb4f20a4ecef SHA512 99e4e4ea26cfc4eff4ea0e289d144ec21cbb3834f434a1071c99dd890a0c24dded48b66918d61c4840bb6ed469b3e945f5292d14c244be7acefad561de55962c
diff --git a/net-libs/libnpupnp/libnpupnp-4.1.4.ebuild b/net-libs/libnpupnp/libnpupnp-4.1.4.ebuild
new file mode 100644
index 000000000000..d35dc2f8d1ed
--- /dev/null
+++ b/net-libs/libnpupnp/libnpupnp-4.1.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
+HOMEPAGE="https://framagit.org/medoc92/npupnp"
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/expat
+	net-libs/libmicrohttpd
+	net-misc/curl
+"
+
+src_prepare() {
+	default
+	./autogen.sh || die
+}
+
+src_configure() {
+	econf \
+		--enable-client \
+		--enable-debug \
+		--enable-device \
+		--enable-gena \
+		--enable-ipv6 \
+		--enable-optssdp \
+		--enable-reuseaddr \
+		--enable-soap \
+		--enable-ssdp \
+		--enable-tools \
+		--enable-webserver
+}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 041f3ce5b5da..87a82ff8ee76 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -6,6 +6,6 @@ DIST libpcap-1.10.0-upstream.tar.gz.sig 442 BLAKE2B f19ca45bbeee39ef1b3f8a8e8d8d
 DIST libpcap-1.10.1-upstream.tar.gz 935221 BLAKE2B 0ec028e5d026a97b92ba6f23f88daf36b827eee08a752a0162fbabd1b5a2a70141ec403b6ff26dc3eb25ca5c6630c9c2f60f05b33161770da3d5e829c4eecdc6 SHA512 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171
 DIST libpcap-1.10.1-upstream.tar.gz.sig 442 BLAKE2B b76bf3c40a923b6c8fb9a356dff49a90e30dd0b0d785f138ac56bf1a41ad3a6fcfa3d5b3d28c12543857c5616b8938108b06313e35e4474d50991b72d9d371c8 SHA512 f9807efd11d99524b247981e5f4f02e1ffbeaa8468a9a22c66f9931a894071b9182164807b9fd11436883d36e8b0c6cc62302852005d958e34b5236e20caa33d
 EBUILD libpcap-1.10.0-r1.ebuild 2476 BLAKE2B 473af4c3649a18692e8047304277f56d60917e86ecc092d86445e3fc78d8f64aed3d95d2611d4bf08189e6de8bfa2d6c4549731712929aea393b29ec4d3aafdc SHA512 df995bfabab982b7b1bd5c93b45b14f0071d95427bba84aba3adf3cd623df1d1f1c60493a7bbd84de85004a349e117053b87f35cb58b54d8cdfcaa8a62b421df
-EBUILD libpcap-1.10.1-r1.ebuild 2478 BLAKE2B e7bcc60acf12f843bc7645fcd652f3adc686e36db1ea61ae695c5872d14f650887eefd6c375e3d6dae5223033e09d366c0e5c0c5679f5d4ca71954a686780584 SHA512 5927934318248145b9f103ba07602ed4820921af7f74879e6cc1938e17b0caac3bc5d40d136c01b9c8aefed0f1b722cb89d97b1ef52b21318289345ee2483207
+EBUILD libpcap-1.10.1-r1.ebuild 2476 BLAKE2B 473af4c3649a18692e8047304277f56d60917e86ecc092d86445e3fc78d8f64aed3d95d2611d4bf08189e6de8bfa2d6c4549731712929aea393b29ec4d3aafdc SHA512 df995bfabab982b7b1bd5c93b45b14f0071d95427bba84aba3adf3cd623df1d1f1c60493a7bbd84de85004a349e117053b87f35cb58b54d8cdfcaa8a62b421df
 EBUILD libpcap-9999.ebuild 2367 BLAKE2B f029798f3799a205ad53f90ae83219f8ef372e7f7d4f8b883f41555a17c1501415a0f39b209a0020d47dd3dc85521ac5eccfb20848817635d06a142f11b3ab47 SHA512 01f2afbf6937907e5f271ca3e65c03022137dcf584d82b2169d16a5379e657f264e789e4c338fa980db488875865b4aec51634b28ea9e663605b770a51be24a4
 MISC metadata.xml 918 BLAKE2B 634ea0c95e68eeed1bab1a2e41d6bde245eb4f432fcda4ffb5cc509317d25e1a2c0ebc56a78d478913ee3c281458743b11327328a712fa509baef8654698e150 SHA512 2a81d02fdca06a6cca8afb80d013f4677ad8bd8de07191801bd73270b0140992674050a6fd883945ca1b6aba08a6ba7dee7e38a9eebf3825dda338d11cd5e14f
diff --git a/net-libs/libpcap/libpcap-1.10.1-r1.ebuild b/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
index 2e3e52d41a71..13d40b16ff92 100644
--- a/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
 
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD"
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 21d7c5de2dcd..8fb048141b6f 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,4 +1,6 @@
 DIST libqmi-1.28.6.tar.xz 1192736 BLAKE2B 30330a8d085b26fc461c6fec2cfa58757e91093243aed8a4ac6df53a7656881f295a800979ff8fd42b815f96fafd128848765ecfb163e8101ac9c9a52eaaf507 SHA512 f4f7022e8c9b60618062548ec97450d98a5125dbd0e26df3dfb8bda5ab19a1f4c7864d35f7bd77217a4fe5562ce665fa613902b1d2185680bfa5d0c1e229e6dd
+DIST libqmi-1.30.0.tar.xz 1237944 BLAKE2B 862a7f12d458d7fce53596ec12e6e20d41a8378e6d9fd44535ea54b409f7020d33f5b3bab08ce583452e11abcbf5af48cc3a24a5fd382c7a833c435327c91614 SHA512 e0cf97f1ebc27feb68033d19b8bc146c41d134782c3eeefb1dd3502b08e493d8c484835235a7877854c1a9c2524ed6cc31aa1b897b873d0662f494a771b2c98f
 EBUILD libqmi-1.28.6.ebuild 1222 BLAKE2B 4e226ffda064e482aec9c9fb12c93e8ec57b97aaa7d43048e5a183ef63579c3940ac7fbfc3ca8a3ca75c08c8131f4f890124e42e22de558a18cd9171b8392096 SHA512 b862fde5d896147e419b131bf9e123e4bf76171d557363db2cf77726509861d3c8db5bef9b3f706ac59e38f901cc2f18d413287bd637d0a43ac449ae252b7f15
-EBUILD libqmi-9999.ebuild 1223 BLAKE2B 526c92280dd6838c08a7bc56d975a472bce40b04627cbf2a69402cee7a32fd11b2ca4a658a333b2215272226a380b93aedb8f58bd7669da931c037b4169b9059 SHA512 ec855e747177f058290f8b0375dec0d0e73bca68d8eba4a70203d0013d5a9938c121423c1bbdf23649e20a62c8e3a413627bbf5d555eee05a486cc0434c99205
+EBUILD libqmi-1.30.0.ebuild 1234 BLAKE2B 472ceb47d460b35418e0f367a642871b473ad69849a4ba4d06779069aa21bb6b91fe2e2f305aad251113b938ddd8bf69706c0ac85b977085a966d6ef56e4c5fa SHA512 2bc68f62ef72269258850579872ca6394dfb9395b183b58bcbb983c6590d949d0f7c9c9d933270eafeccd60b6cf485d2d7410d8b704722679882952329b1eed6
+EBUILD libqmi-9999.ebuild 1234 BLAKE2B 472ceb47d460b35418e0f367a642871b473ad69849a4ba4d06779069aa21bb6b91fe2e2f305aad251113b938ddd8bf69706c0ac85b977085a966d6ef56e4c5fa SHA512 2bc68f62ef72269258850579872ca6394dfb9395b183b58bcbb983c6590d949d0f7c9c9d933270eafeccd60b6cf485d2d7410d8b704722679882952329b1eed6
 MISC metadata.xml 424 BLAKE2B 17aae2f0c88f12dd7de0c2ef76687667b5e6c1d0c42e2f584b868f025d0069a56b95d11d8d4f137f8f6e783fdd30f49d191bfd6b42f479057f9967fe66d77a17 SHA512 9104fe16ee4aff27aa0c9861456518ebb0b022b1d37ab7c260c31aa3ad19136bb3338072a1dfdc53a024a3b31e8e6e6bfec14eca2b92d53f8d62b00b213e060e
diff --git a/net-libs/libqmi/libqmi-1.30.0.ebuild b/net-libs/libqmi/libqmi-1.30.0.ebuild
new file mode 100644
index 000000000000..299b20265bf5
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.30.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
+fi
+
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
+
+LICENSE="LGPL-2"
+SLOT="0/5.8"	# soname of libqmi-glib.so
+IUSE="gtk-doc +mbim"
+
+RDEPEND=">=dev-libs/glib-2.56
+	>=dev-libs/libgudev-232
+	mbim? ( >=net-libs/libmbim-1.18.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )"
+[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-Werror
+		--disable-static
+		--disable-qrtr # libqrtr-glib not packaged
+		$(use_enable mbim mbim-qmux)
+		$(use_enable gtk-doc)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild
index 0518bf890c38..299b20265bf5 100644
--- a/net-libs/libqmi/libqmi-9999.ebuild
+++ b/net-libs/libqmi/libqmi-9999.ebuild
@@ -15,16 +15,16 @@ DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
 
 LICENSE="LGPL-2"
-SLOT="0/5.7"	# soname of libqmi-glib.so
-IUSE="doc +mbim"
+SLOT="0/5.8"	# soname of libqmi-glib.so
+IUSE="gtk-doc +mbim"
 
-RDEPEND=">=dev-libs/glib-2.48
-	dev-libs/libgudev
+RDEPEND=">=dev-libs/glib-2.56
+	>=dev-libs/libgudev-232
 	mbim? ( >=net-libs/libmbim-1.18.0 )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
+	gtk-doc? ( dev-util/gtk-doc )"
 [[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
 
 src_prepare() {
@@ -38,7 +38,7 @@ src_configure() {
 		--disable-static
 		--disable-qrtr # libqrtr-glib not packaged
 		$(use_enable mbim mbim-qmux)
-		$(use_enable {,gtk-}doc)
+		$(use_enable gtk-doc)
 	)
 	econf "${myconf[@]}"
 }
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index 6dbd83edc255..0bda45311908 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 872 BLAKE2B 9b0337b92b514ed3b34b0a885149a9baecbfbda879a465a587bbbe76f4b73457f252482b6f4036198b7e80cf214e46ac5329af715535893b0bf553476a185c9a SHA512 65b7173465cf98ea6d0bff33857f9f468645dfa3a7ac6f8ca206e6b3bf64095d290c3284820a4231a8d4bafc05ab3730d34dae89cd2f9d1a4f447908ee15a131
+EBUILD libsearpc-3.2.0-r1.ebuild 825 BLAKE2B bf767130207e96391bd06f631ab9e090ae4e153a957ed17d2c15369119a88e4d4d68273758c496ef92e2e7c18f4d5f482d03f7f58b3bb5e3ae94c09f0eb57265 SHA512 6584c7f5c32006f6d5a84de117ce58d68b184d0bbaefb10e3920aca37731e5ec33355ac96b270af29eb5b903eb0429099fdc4dd35e1d699b5acda2cf7ebb67f9
 MISC metadata.xml 479 BLAKE2B 52ef362ca8291b0f9cb820c002588448a8db2b68b41a495e9ef4ad6303fb523bc599a94fa8e786d9270cb6920b64011c2a965208d2eaf8e18ca56c5912d2409c SHA512 eeff06104b2ed7fd648c0943149296448ac37123be3bdbfb93f6f63703b18637680220b5d284b7d9679e46e3fd742bbeed93ad55f60ce28f03ae6cb25ffd4aa8
diff --git a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
index ca9505393e11..c19c1820eaf0 100644
--- a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=(python3_{8,9})
-
-WANT_AUTOMAKE=1.16
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools python-single-r1
 
@@ -16,7 +14,6 @@ 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=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
@@ -35,6 +32,6 @@ src_prepare() {
 
 src_install() {
 	default
-	# Remove unnecessary .la and .a files
-	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+	# Remove unnecessary .la files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 436cc3841118..dd88c506f260 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,5 +1,5 @@
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
 DIST libssh-0.9.5.tar.xz 502876 BLAKE2B 8ea07bf25218563cbbdab31683e679f71298e2c7c9bb2430195e84892838cd55b9025ed292de65c4942ecec7d4037d5b92a414232fca6c8e41821776f4cf815c SHA512 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18
-EBUILD libssh-0.9.5.ebuild 3110 BLAKE2B 3a57482d2daab70e02a16e8aa3233efdd9b6c667c66113b0ca9391b88ae10124e27d2b7c13cffd8940e55b3433e8e894f72f40e06c10b98d9b9e7fc0b68afcc8 SHA512 4b42193563391d327743be4a2df3bb2e513383a9bef533f9b036e0dfd91710bab96b59ec3f44610fd0393fca343856697057a5dd61bdc5de8aad53926a3ad998
+EBUILD libssh-0.9.5.ebuild 3117 BLAKE2B b05b2f0718376bcdd086cac5ea7301eed6ba29831a2219c3cfff77765476554b16867d83a7974ad03c480485c2f8b7551a4bdb18c6487011b1a62f9000063d44 SHA512 4daf780178f7293affb803614ca71f7c952fadc0cd838c33db41118bba3da15d5f8fbe8d4ce1c4085096a542957e45099ce9f895c41fbebe8ffb2ae56702eab2
 EBUILD libssh-9999.ebuild 3117 BLAKE2B 98eb87a2073ee4a86a2f339d5c37fa89dbb16e1ff6d7548b5ba6e4b051ba24180742d6c90747498c3939236c0fdbfa3d9de9ea28e077a35cfd41aa1dfcc29e47 SHA512 6a300f9e1695c444657fcd2fd19f25cc2d8ee6451076c0e039107c602f056bf23b2b3e8478ddacc5d8416dc2d4a7e383a3ff6afd858b2f4b4d337a8d235f4bf7
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.9.5.ebuild b/net-libs/libssh/libssh-0.9.5.ebuild
index 61f0a49332a0..627887023589 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libupnpp/Manifest b/net-libs/libupnpp/Manifest
index b5b77b314731..2ae231c313e2 100644
--- a/net-libs/libupnpp/Manifest
+++ b/net-libs/libupnpp/Manifest
@@ -1,3 +1,5 @@
 DIST libupnpp-0.20.1.tar.gz 476369 BLAKE2B 8ba72486524c28789564db46e64804289f12b4fa4f249fe4f54830488d80f04f519005ad2f5fd8c3a9626c602a4673d7655177a11586fb43b9bd81644cf7fb3b SHA512 17ad11b2898abbdc57ed96280c298a6c94943f3e79101163cf7cace06a4d36058c0d54f0eaeb5da9b9cbb40a23f0597a6a9658060aefeb714723c9c53404db80
+DIST libupnpp-0.21.0.tar.gz 478894 BLAKE2B 093803ff0a4a0b76272f44e470df69169053c66ae27a42b483623b50d0c2bffa61f51e0ca9a82b4fc759492640c68d0eae90cdc46a1e6e6f38f7655190e4101b SHA512 1032ef83e6880c1e4ae4903f6e175640b1d3da7090bfb04bf480f70d58436ef89e6a43886c86dcda2c4aab8370cbd0d5260601ac359a3dded0688ac2748d30fd
 EBUILD libupnpp-0.20.1.ebuild 468 BLAKE2B b6bd8c63567a181d1e9ae87bb54d5f9fb6e5de954d0bb64b55e1caa285ef1695e665333c06eb66b36a240135fd78d73a695008b8206e2b0a8e6e7be5f1bb4735 SHA512 d718d37a22d695037529e84f9592e06be94978dceefc6b5ec0e9af4a9a9ec83607d5fae674c92bd0f6aae0789430190cb41508ed524654a1927e55e3ce78e8cb
+EBUILD libupnpp-0.21.0.ebuild 458 BLAKE2B a06a8596760865e7b75013fd5de3995c9a4e418c00ff4da962d85f0d3fc137dda32fe2b56892ef0aad9bb63fc28c7b201aceecfd34d1780efa10a78af342e6a5 SHA512 c330976a901789b17338103c842260dac8433f904ae2c791346ff10f55d359aaa3ea7efd7b99625b5e2860a7933222e0f3bf0cc8cd4d47d4cc899c6b56fe93cb
 MISC metadata.xml 217 BLAKE2B c0bbfd196fa82f939049ba60f8a1ea7fffccb97a821373c8ba9d8265585e7cdd81f6cd1623ff0704fbb52a8109d9e31c7872949ac7f5910f646bfb766392e717 SHA512 e09835e34c3f35da82048705a28fcde46e7cc04e4cc8d6118e211bec65666ee1a7f3d6c440c8de99b4a3326ea826ef75b29e0a8898b7d6a2a71a2533e43b1f9d
diff --git a/net-libs/libupnpp/libupnpp-0.21.0.ebuild b/net-libs/libupnpp/libupnpp-0.21.0.ebuild
new file mode 100644
index 000000000000..ab82848626f0
--- /dev/null
+++ b/net-libs/libupnpp/libupnpp-0.21.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DESCRIPTION="The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli"
+SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/expat
+	net-libs/libnpupnp
+	net-misc/curl
+"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index e93420e9ebf6..d0afe9f59b64 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -2,7 +2,7 @@ DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907a
 DIST nghttp2-1.43.0.tar.xz 3973500 BLAKE2B 0e6c674486c484558a55822501a13ac93c4e890cf62749bc8519690f468912701329b7b9e83b0b68c3f35b72442b1ed47a90050cccd3fc05d79622e1e26634dc SHA512 eac69ba356870a1cba420a06771082897be8dd40a68f4e04223f41f3d22626e4f5b3766d3dbcc496dd212be01f64c3ac280a2ebddd31dd88f7350c20f56e5d39
 DIST nghttp2-1.44.0.tar.xz 3972832 BLAKE2B 13afbf6e2e242f5a7a5475c3d0f0380170cc5f50a0fac87951173393e79cb7140ea52e5f4918a8207216cc5826534d8fa550e48c06ee7c61b74a54f2de23727c SHA512 756b78665ef9fe8765332e7f0b249029d845a6b635c00a27f4c3716a1354f98bcc34df4da74179213497f6bfc2647d3773ecff2b192c63427447e37cf6393f6c
 EBUILD nghttp2-1.41.0-r2.ebuild 1939 BLAKE2B 2f985404d208614eacd79a7688e58b041b2f3f145b68af46c3047b69589c78da368af2a0f3c36c4905475a5f6bdd3ef7004e537a211b0df9cee7884f68ff58a9 SHA512 79afbb367fd0dd6c13216f8c49cbf756e517892dc5e83b1f55a3989f6248324d0987de2e1025b0e85d9ab9b7b9d39e3982c0084b35eb2d8db6f78feddc7e541f
-EBUILD nghttp2-1.43.0-r2.ebuild 2009 BLAKE2B 7debad14feef617ba6ce5887e253cf9b403ba7a02cb95df59be9a701e15ea9c4d5ee8940197ccdb4e51abe62deb1574da6100b88be9f3cbd3776ccfda472bc56 SHA512 090f1b59fe007767f48b64339a85288df147f421c12446c0b4d3adb0e07d5b48a1309bc9ac9948abe9c9fb29f3fd6e69daa40c80a4a85e443332380c6e413612
+EBUILD nghttp2-1.43.0-r2.ebuild 2008 BLAKE2B 4458b7697a66bedf0a73ee89d3dae5435097f71bc490436018b588b23b8a3084f4945990cb1ff9039266c3cddc3021893247ec81d99a76a9268098c2e93268de SHA512 64b7aba361f32e9d5d37b4ad189b340eadc14310ad9f8243d59b5b237ac9f8072e35f0af2f81e727cd931ae405d8748f0b98a61c953c1ab9e6765c520e4252b1
 EBUILD nghttp2-1.44.0.ebuild 2016 BLAKE2B 4ea0fe404a634213b1cdf3e4d8cc32dc66d2b5291bb43c90f797b12c115580f2e68d560822ce5704ee41a9fd6ad50bba5af751305a14f1d9d0b1105b92fdcb4f SHA512 e035d8d74e01e4b67124e3d1612ee48779ef892f058be7c527e7fbdb5af3026f69c267c3dd861e759b433af768d415bae9d7633f44e49899a417df5664f3aefc
 EBUILD nghttp2-9999.ebuild 1979 BLAKE2B accfeb064d7750bb523939d9e9f50dc194455d771e0e22b1a5c7138d826f521faa3b0f830cf320d470803636faaaf38f83a6f84a272d875f04bc6d115780cc64 SHA512 f6ea435254aa3f2d2622eee95739a80d9f9e3d9321413a74ed875d71cba1901d87f225b7ed1086db2dd81295bda21bb72152b7502296ff87296cb37485a8a77b
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild b/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild
index 5b3804479109..1315b9f5e31e 100644
--- a/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index d445d5123625..90a1c39eb012 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -14,13 +14,13 @@ DIST node-v12.22.4.tar.xz 23653388 BLAKE2B dfed2c23f7bbafe20d955dbe382ee8b2b40d1
 DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0
 DIST node-v14.17.3.tar.xz 33585080 BLAKE2B 37267c9da2d773dbbe95f7378f5b0c2b0dc397b17850be325f9fec637c6745dede4ca4136ba4bf109d72d8982ee985f1e077cc706165f1be2e3dc3053edfe229 SHA512 c6096715299f155b96df873976da91e854da7e99cde635cdb65d5c962abc5283dac86b8ddce4f5a9f7498f9793ff08943645b5e5b0b23395dfe035f7295218bb
 DIST node-v14.17.4.tar.xz 33592020 BLAKE2B ad8a49715b3d568a5dc66b759d9c3074ea78c1c2293b1642549e32d26c5213ccc8fce4a531ef7727e3a74a63ddc26d8b71ac20bf5c86bf0af09467c2306363ef SHA512 c06228f1a82cf887fa1557be58a8814027926f5c9750c9f1a1656afd6f58151be08e05203343c62fb9a3957d99a73bee6fe509e52543fdbc5bd4c05a1e76c3cf
-DIST node-v16.6.0.tar.xz 33706684 BLAKE2B fa2db621ef2932a259bc2c7193215cad9023a74c5b614d72cd76bb09091a6130f28e4f16ceeaf43186b01695b8cf6b256e0d05e3e717993b691ec9416e801f82 SHA512 ca70e8f6479e3b8dc0aeeab02a377db3a1bbb3924477f720513c8734fc48bb203979a69741dde6c84e21623af1dad256affa5b3f7dfb9e68cf24590d5ddb1690
+DIST node-v16.6.1.tar.xz 33715224 BLAKE2B 2a95dbac7606de45e6c0669ee1c1ec1ee7c105ebbb241fbcae2ec0611df1da21ade28d28d9e011569d600b46fbcb6a32fff11456efb676386ed3cbbdc26d3e16 SHA512 408924c587f7d92074d8cb66903bd4f6c13a3a1f50fd05ead67feb85ed44cbf2ba1a4aebec8fe51ec77c102d3c310fbabb6e2557795a29536c091e9140fcf143
 EBUILD nodejs-12.22.1.ebuild 6450 BLAKE2B 5a540cf0588d177b2be4af525f3cc3b8d0de648b27c51ea2f1d07304711573180ab601f1149a4e8453446e8237f33f1a7b47d44956000856a85fde56693b48ec SHA512 c22aaa0bcfc45a6597162ed09df0facceb2352e2265e718e177d905afc96edb7c1e7c3647cfe98c9ab4a3c11aad7f9f2e7726a66fb680202ec83ff6310057d5e
 EBUILD nodejs-12.22.3.ebuild 7081 BLAKE2B d19b9826fde72e436c85082a4db792bc65c22077a6935b105e431f0c0d0721bfba270e1b6caf9f511632afd6825fa84980e3164a8112d81256183576bfc9caa8 SHA512 07b137e3f19621208f3617cfaf4d98ea733c0aed6f152c717addf59bede2ab972835226a8ab8b60db167bee560a47f9f428ba8cb781b3475f42b7c7c0baadfe7
 EBUILD nodejs-12.22.4.ebuild 7075 BLAKE2B bfb063d663713b81f9abdcc238f05dcf3e7e467c591f0a799655e7d0bc5b0b0020d884585ea8238d5806abd905cf7f709b1f632ab2aa22400233aab2becdfc29 SHA512 63471461c8cf575e256adebfb29423fc419bbba1a39601c7ad844e5cd835aef72fc9f229b79324624655a3ae8542dbc99046b14765ff1445be3409a34a0dd8c7
 EBUILD nodejs-14.16.1.ebuild 6147 BLAKE2B 6172c84baadb436d99ce1bb4dfa21deae28452a4fa7efe136a2868d837c0b26db3c92494fcc018e178080aca31be2ec69232cdeee5794ac4a8ba001305514dba SHA512 73fa6ae5d4c1b7e69e7f04adcdb0ecf431d349dd194671442dba28ce8db60e3383154888a743145c3ffe248d51896fb4b9032a980aaf048cc49e80a7a0c3ef29
 EBUILD nodejs-14.17.3.ebuild 7075 BLAKE2B 8bee554d2f20581ab82fb7abb85dcca4c942b33b93b22f15ba5a4e56006160dbf234ab1fa7f1ee765fe09a3166519d8c6761c7b1904c633153b692af57cba174 SHA512 e3b0f7e2d2e71ac063ebefd23d83343dcce1055b399d6a5f3e860faafbe790ac8fe53cd8dc145b474d133f8521911a7d878e9eb99a1af8e3d093e5f6c01f2068
 EBUILD nodejs-14.17.4.ebuild 7113 BLAKE2B 3cb79fe139ef02582038dd125987e20d90e40871223853469767fb9058dd27891f93ec3798c1c23a4f0fadbd7440499cbe7b0e0f488d67682caf0fdefcd19dd4 SHA512 1e78ceb1c1a09b69cd3ebaed57b9c29658627c1d03e907b40749bb40d9e4f96ca1cb6cc50b0d66f51ec4b419a458d24913a61cb69fb208514a24f6b3eb584e21
-EBUILD nodejs-16.6.0.ebuild 6538 BLAKE2B 7d88a79528f7455bdfb8b6c94da8076343a98247886dd57a3e785a4e7f99470a6513f66528b8b4f1a116c860ee075200cc3442b820b5f25229d93b8770c12995 SHA512 849c115192b313b628a05063c970bfc967d91fb3e26cc558502ed89d435693e9b0e0c1cab80f815b98de5a85b6f11e3fdafa79b07b67cf784c40abd799668bbc
+EBUILD nodejs-16.6.1.ebuild 6538 BLAKE2B 7d88a79528f7455bdfb8b6c94da8076343a98247886dd57a3e785a4e7f99470a6513f66528b8b4f1a116c860ee075200cc3442b820b5f25229d93b8770c12995 SHA512 849c115192b313b628a05063c970bfc967d91fb3e26cc558502ed89d435693e9b0e0c1cab80f815b98de5a85b6f11e3fdafa79b07b67cf784c40abd799668bbc
 EBUILD nodejs-99999999.ebuild 6483 BLAKE2B d4ad4b4ca614a7ead97e4ae37493dfb4bb5da2a4d04bcf8126720401f2a76515608f6de44a6378813c98bdfb112d741072b9e3d9474e3d6248db556d452299e9 SHA512 398caa97aa48d604c91ad8dfc74b4d5b4fcb28a42d535b401253b04f79b0f7c450f25ec03b7b54d41755fa7bb734fe6031e2d0515849301b080dff1dfe98ab9b
 MISC metadata.xml 1000 BLAKE2B 2dd8788da6451360d25beeca97fe03a52761cf0478ddd03e4680e805b0f31309fb16e44c65f1ca7475f197e4f2f53b14a0a07d08d1324387191e0389d124e6a0 SHA512 a2dc0a100769ba541ac469df0ea74c20b057620fedfaeaf87516d62fb0eea00d1a42ec39f14713e37a44079a076a2770497e81ff0e9b987c70f234c6458e114c
diff --git a/net-libs/nodejs/nodejs-16.6.0.ebuild b/net-libs/nodejs/nodejs-16.6.1.ebuild
index 236455536464..236455536464 100644
--- a/net-libs/nodejs/nodejs-16.6.0.ebuild
+++ b/net-libs/nodejs/nodejs-16.6.1.ebuild
diff --git a/net-libs/uhttpmock/Manifest b/net-libs/uhttpmock/Manifest
index 943a1a354bc0..c8fb5784d3e9 100644
--- a/net-libs/uhttpmock/Manifest
+++ b/net-libs/uhttpmock/Manifest
@@ -1,3 +1,3 @@
 DIST uhttpmock-0.5.3.tar.xz 318708 BLAKE2B 7bd257fbc8869ce2d55070bc1f84f0d34c999cd55ba5e09a54031ea391c3c65bb149d48f2ab1ab9de93acac98783ad0e7d5fca4d86dda055d4a5a3407f5ba4ee SHA512 9fccdb58ce04c1615d47bafac275c632f161a8148f0af82447286d0017d6b3946145b8a289f9abb55842bf4610ca3e5f2484bf322fb7a33dce42b3ebed45b2ee
-EBUILD uhttpmock-0.5.3.ebuild 936 BLAKE2B b7445597e80f9cb22ea11ecf6672e0a82b2e23b55beb4ac77d652473b82125568aa45baf35a7d387939fcf3aff44b78942279da282bf64aef828f46580b62ed0 SHA512 c8ab0ef9d838d1b6a52b12826e52d0acb288cb83a902131492e3d4e5e75f495b85dcef88f1e1145a7d7916c8b9b0d6002ad88c74ade1825efbc5ce27a6819e25
+EBUILD uhttpmock-0.5.3.ebuild 944 BLAKE2B ad586d1cef374333902eb02d236c9ef990eee852e3f0a5aa138ff890edd33c1a1a5d297c18281cd890b26358cfb5bcf0744477b0c30b3b44606870d763217ead SHA512 6014574a21f443a02268c51b3f8a8c580859a9483581a9f823b76446e85b33e2190abadf82b2d7947d4c6e3d8c5557846bec70b74859ed6434978bd79a0a05e0
 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
index a1d0cd4dc51d..7526fe4fd04d 100644
--- a/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
+++ b/net-libs/uhttpmock/uhttpmock-0.5.3.ebuild
@@ -8,7 +8,7 @@ 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"
+SRC_URI="https://tecnocode.co.uk/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="debug +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38.0:2
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 7b3f459ef308..360dc1a64d87 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,9 +1,4 @@
 AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd
-AUX 2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch 1893 BLAKE2B be04d827fee9d17d64230c485add8dd21be6f8c9787c0407973774fd2ced724c00c688476c47bddaccaed3b59dab53dfc4de11f2b96139fe2a74b68cf57eae50 SHA512 3eaff22c9002fde1567331ede3196c733c34986932212954270bb59a5c776d6e4709ee8e366cdcdaeb67e36cd7757d01f4cce84ce4e2d6a1eca3c6ab3fa98f66
-DIST webkitgtk-2.32.1.tar.xz 23321600 BLAKE2B a2d0b1cfd1035611427ab23f4723b8ab4c3087b21f3b14716a0bc9b128eba8c74c36dec34709bfc40efa1961416e7b83dceb8c53c1959ce34babb7b5335a5863 SHA512 ff49522c585d3c5c9b88c4176673aebfdf7f2a127d7bc4007008a66c493476ae6551189865e4f0f330a7b332a438b6c951bf1a4c21cd0acf69b7051903d24843
-DIST webkitgtk-2.32.2.tar.xz 23321888 BLAKE2B 1201ca423b90a7ba9e7613407e170d367b7b6e11219134dbefb774349b7752f5b498a168594addcb5d6f0d8a7977d3b946fd546583789d6c74cd8d7faf3823f1 SHA512 ca131fef749e5d882cebcf71b4f865511a43fb60b41c917a8a98876dde108a71888e986e40217ff12a43fb395c147e7b6c7a262bc353269498f1dba33e3905f8
 DIST webkitgtk-2.32.3.tar.xz 23323972 BLAKE2B da6f71214935fa13ee4d3214e3c34b636c2894f579539f0de4165e2fa51611cf8f57d40de9e3285a195b7e9f55fb9f5967722e01dcc78f9458b4fb74bc3e7e4a SHA512 473f89c6d56f6718e3e352a023d12188365b67cbe6535025205594729a10d792122275257b81ebe8e504a98814aa4e2a663616ffb13fea445df2b06929d89ebe
-EBUILD webkit-gtk-2.32.1.ebuild 9219 BLAKE2B f1a1b08374d123ba0d97361dd81fa6fa7d6dd22e8ad02d5cc37b315dadd505d013541c803b30fc3c93d6126934fa9199761305c8ba12eb955947f99ce187b1e4 SHA512 b51d1de9a62f612080bfc7bc470715e3faa4725d5774527c775be399b9811103e0d263b43016b150f19f5d76b6e20db465c8d42abd7466eaab1af67c48b2f911
-EBUILD webkit-gtk-2.32.2.ebuild 9127 BLAKE2B 8f64b27b0d8622086aec726452d99a1b1ca523dbb3f003c28f6ae31a8e460649ae7660fcdb52a6d32c0fad281c46ac180f95d1c7694bd1d2cb8897162079eb25 SHA512 b7803153a17d485dbcb9276986890134a6c560cb56619cc1b848b8eaf5fc9e7546d5bba06e793bdb9965a3ff69dc99212b10e58f39f027286e0d5192cae1c703
-EBUILD webkit-gtk-2.32.3.ebuild 9122 BLAKE2B caf1119b272db82acc5539f50c94e2a7dd28f2fc7f36f1b23c929e85cf755f78fd5e6bb1185c58a191f465f6c8985e8438671617640c73e83c38ce48a45cecc9 SHA512 701e023d2be5679c8923e396251d358ec20e41ae4665f166e957055c29c28311c59c53b260da5355c9752c35f9174574d3529eb2d7a15ef5287f73d7c79a3724
+EBUILD webkit-gtk-2.32.3.ebuild 9127 BLAKE2B 443c6698afcb857041df69322d0cb05f2c7d9d3578a2252377dd5095ea1b4257b8e8bf3e6a3fc9f286bfd0c4d90a406d63325835c1407cd07fad6b37fa23fe5d SHA512 efad4acb738bd51673ca72c5aad1700be5c420b1058cff77da8379406f0524495b13cfbbd6014fe467d4eef4c99913873a07bb259625ae0cb69ee439c3482f05
 MISC metadata.xml 649 BLAKE2B 29aa977878b9cec915abe8d7ef5c367675fb280c184b3b915714e1aa98e3df442dfb5b06e42bcfab33a4329c3445dd9c6c86db02d6b2b29ffa855fdb18f086eb SHA512 c8bf98f91d4bb229e8561af3d33208b0c6df7b5542243e22f3ca04d1856c7fcc0c36a54e1cb536b6a07510daf329405383990008798db77064d66215843cb7e5
diff --git a/net-libs/webkit-gtk/files/2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch b/net-libs/webkit-gtk/files/2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch
deleted file mode 100644
index dfe0ed9ef002..000000000000
--- a/net-libs/webkit-gtk/files/2.32.1-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 94cdcd289b993ed4d39c17d4b8b90db7c81a9b10 Mon Sep 17 00:00:00 2001
-From: "commit-queue@webkit.org"
- <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Sat, 10 Apr 2021 22:02:50 +0000
-Subject: [PATCH] Properly use CompletionHandler when USE_OPENGL_OR_ES is set
- to OFF https://bugs.webkit.org/show_bug.cgi?id=224149
-
-Patch by Charlène Wendling <julianaito@posteo.jp> on 2021-04-10
-Reviewed by Fujii Hironori.
-
-* WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
-(WebKit::LayerTreeHost::forceRepaintAsync):
-
-Canonical link: https://commits.webkit.org/236373@main
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275802 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WebKit/ChangeLog                                | 10 ++++++++++
- .../WebPage/CoordinatedGraphics/LayerTreeHost.h        |  2 +-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-index 6727d16c8c0b..db65f813267d 100644
---- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-@@ -213,7 +213,7 @@ inline void LayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer*) { }
- inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { }
- inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { }
- inline void LayerTreeHost::forceRepaint() { }
--inline bool LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&) { return false; }
-+inline void LayerTreeHost::forceRepaintAsync(CompletionHandler<void()>&&) { }
- inline void LayerTreeHost::sizeDidChange(const WebCore::IntSize&) { }
- inline void LayerTreeHost::pauseRendering() { }
- inline void LayerTreeHost::resumeRendering() { }
--- 
-2.26.3
-
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
deleted file mode 100644
index 9594f2f217a5..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
+++ /dev/null
@@ -1,301 +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} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
-
-IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.5.0:1.0
-	>=gui-libs/wpebackend-fdo-1.7.0:1.0
-"
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-60.2:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-unset wpe_depend
-DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
-	eapply "${FILESDIR}"/${PV}-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_OPENGL_OR_ES=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		# Supported only under ANGLE, see
-		# https://bugs.webkit.org/show_bug.cgi?id=225563
-		# https://bugs.webkit.org/show_bug.cgi?id=224888
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild
deleted file mode 100644
index b9fb5aa5f700..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
-
-IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.5.0:1.0
-	>=gui-libs/wpebackend-fdo-1.7.0:1.0
-"
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-60.2:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-unset wpe_depend
-DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_OPENGL_OR_ES=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		# Supported only under ANGLE, see
-		# https://bugs.webkit.org/show_bug.cgi?id=225563
-		# https://bugs.webkit.org/show_bug.cgi?id=224888
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
index d141e1d49cb8..1ddc63054d38 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 5fa99e0f4c10..e17b08196f13 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/amavis-logwatch/Manifest b/net-mail/amavis-logwatch/Manifest
index d0a6429c5ee0..a58ba45327f9 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -10,5 +10,7 @@ AUX unchecked-encrypted.patch 2022 BLAKE2B fc09850f9b4aeeccb5047086ff32add53347c
 AUX unescaped-left-brace.patch 2043 BLAKE2B 4755ef33bbb8961fc69cee4276546724f1fb5e89b92107baa4b2a5a7f1c6b0f611bb24a5184c7657496784343f3b7639dcbe41bdc70d26de4343576c30bebceb SHA512 3e2f18070a76624b260bdb11586abf79ae16f237d0e765a766ce770e35c8aab6afbda58589514b65a3afedfc9104f491c1e69e3201f764b6590b5f34cde9e745
 AUX will-bind-to-lines.patch 1077 BLAKE2B c96651f6a0b68a4b95eb571ecbe7a7002a20b765184d28ea21e32b96dcde67041bb03431674a9f51809a528f20e14e50337d2c1315a6e19f4bf5a2da5bcd11d4 SHA512 60a0844d7a6a17b7c79422e641660e20b69cf89844bcddf3356ff6a60b4c4ff2b2e90206248a5a5771e014edee2917eb47e83276a0e56aeb7f8dfd75d55190f4
 DIST amavis-logwatch-1.51.03.tgz 87304 BLAKE2B 08b49d6f67e406edee062659c6de0a2c5823286bc24db35030c2b63bc3f0a06617eecdcf0da7f1f66d8eda8f9743254aa752ada82a9963bfac76a1a467503344 SHA512 27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5
+DIST amavis-logwatch-1.51.04.tar.xz 66036 BLAKE2B da2ae91db65586497e5e5bf53b94f8eab84f26ebbad26f563d14ff11960d5c3bd2e046f0a056c28c53c5ce40c6193a812abb4f93db5d7a18747c40444b954d3f SHA512 aec2f6ccc1af7744364e734e2893adc68e034bfab8c9f96bd32e74c6c947c1b39faef2d442d32e50f2578fbc4687dfd2b339856624330aef64ae6cf4e408456f
 EBUILD amavis-logwatch-1.51.03-r5.ebuild 1419 BLAKE2B 473dacf0d49b067d0a6354c7026f54c9d8d320997ef7f2abeb2b4ac6a42f992235b64b213322f2e28995a1f338b97550a617913f8d84e7542488b351fde689a5 SHA512 bc2bf187d2165207c5ac62964444dcbcc994101bce9baa50dfec1798750bfe53ba2b38c5ef1152950ab2ec4529d08a82665c76dccc4a8f1d0c20ec6c02352fcd
-MISC metadata.xml 296 BLAKE2B 3c33a1b9c58306354a087f04e040a9c1e8cbeb17635a1f64f206de2ce47a226068adad992598588e4d1d916ce5eef5c39b6f3ec95ec92ea6807f6e4186522d71 SHA512 ba96de61eeaec557c21ba83c0701d6b83f0e25752a4b949a2562e3eb4a0ceef44d0029d5a5bf5fed5ff7d9add59b8d40cfeac7a57ec566a48d23dca3c327e720
+EBUILD amavis-logwatch-1.51.04.ebuild 930 BLAKE2B e382e23df0018aa557838f4dc19eb56af29068012b71bc0277aa4649aa37ee2e55cc2b904e5c9b9bcf3f7e640f19dfcdcfef03fa193c2db56e5c30622c059e29 SHA512 dbcbeedc6410db6bf7ca764a22eebe045cb53b1cd1059601c941ca780074058923a5da6545a5c2c85d0a662864160de52d81e3c73189d52cb1e680e59f922d35
+MISC metadata.xml 218 BLAKE2B b55d5b84a56be6911406973def7dcc385581e50dbcd1c4a7cad56fb8e5e6ec2c7ddc153d0fead807dc1cc8336c32a3ad2e414ebed9c4dd295050acd456a6885d SHA512 e143c766598413b2b305475039473345bf7e007d6cb4934dd205384c0a3df9451e780a4294c56126103a883bb904d9a02e06c082176b19a4e388020438d71bcd
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
new file mode 100644
index 000000000000..3369b162db4f
--- /dev/null
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A log analyzer for amavisd-new"
+HOMEPAGE="http://michael.orlitzky.com/code/amavis-logwatch.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+src_prepare() {
+	default
+	# Replace the default config file location with ours.
+	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+		|| die 'failed to update the default config location'
+}
+
+src_compile() {
+	# The default make target just outputs instructions. We don't want
+	# the user to see these, so we avoid the default emake.
+	:
+}
+
+src_install() {
+	dodoc Bugs Changes README
+	doman ${PN}.1
+	dobin ${PN}
+	insinto /etc
+	doins ${PN}.conf
+}
diff --git a/net-mail/amavis-logwatch/metadata.xml b/net-mail/amavis-logwatch/metadata.xml
index 04df72792f2a..a0128bcd9ef0 100644
--- a/net-mail/amavis-logwatch/metadata.xml
+++ b/net-mail/amavis-logwatch/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mjo@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">logreporters</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 05559fa55be1..d6927d0919d0 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -4,10 +4,8 @@ AUX fetchmail.confd 297 BLAKE2B 00f9a55be3b6351dc7b97758f3403feab9d1025bb2b0398a
 AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a49309192de313fa38b61e32db0bb9e5148c3d56bae61ca5e714f8d9576e0f95997d45a44d51f56c8235c SHA512 06091152111059425e86207e968ad5819eb67cd2dd264855e7b77a163b95591abc29befe4b3eb8bf2d2af105efb5006bb048f3db4ef3f8f4fafbb78767f69ebb
 AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
-DIST fetchmail-6.4.19.tar.xz 1316672 BLAKE2B 679d2c49698dd368d32439a8276412e3f32c0a0f6f0e7607bc323c0294c987307469451b4b085fe521f2d5dd4869d59b4841762b6a57b3c654b992e9de8ba87c SHA512 b10f0ac5b3b22f8b1d86367990fc96ea5c49dc21c873890c732c254c34503bd6ab9348c5ef88b99ba0f83f065fa9f9aead55de9721b0f296efa14eac0311daaf
 DIST fetchmail-6.4.20.tar.xz 1317204 BLAKE2B 85137bdae2fda05cba6e9bee9056bb9a1ef09b96199dc5f991da9aa5c2073f1c8cbf3fae43999a79de338a95e9d28e474035200758b65ffa9fa18b5a905c1279 SHA512 5b170f51a74b6596020282f5cbb34bf0a9ea8c5b089fd8c6c72df6c7742e16bcd5931d62181d56265779f9c3431c4ddf795a03deee09c5552a3aa0601282bd17
-DIST fetchmail-7.0.0-alpha8.tar.xz 1212256 BLAKE2B 1b123921a696e60b9c42ea30a379bc6cf46bb66dd630f50e1f10ceac5066932da9538295954be451c4665e1186b7281523bbae83fb4cdb7ad2d1b7b408a3a38f SHA512 fdb20b6a4723f718958e8c800d5a996ff0bb8d9ffe485e8f8429f28953a5a691fd8439c29cb4fbbae338d64c1e9cd1f5f9ed6d89261d0ca582f6345cacb696fe
-EBUILD fetchmail-6.4.19.ebuild 2411 BLAKE2B 434eb903a6d3664f5ab4aaa98d49e444fec57f732fac15a901d0fc3092514f9efc38f1e216c5a697f75c7a9fddff4e99dbc513780e933b04719cc955d945892a SHA512 721e3a879e4f8d0396665b146ffd7a321bdb091c449706bf1e2759b2b4f1d10e05abf71da640495718c387c92bd1c5404a511aca12307520115a285b4a55cb0f
+DIST fetchmail-7.0.0-alpha9.tar.xz 1213244 BLAKE2B 895fe178993cc34500e276bef5ebe9a4fd81fea522d39fd271433320afc46faa9657d8b85b2d28cd5dbc6d3dbbb233d5eb27d3e26205f5406de9f750c50d7f1b SHA512 7ac1c26edfd2a0d69ba3c1e9f47d96aa48f1cdc10060ff928f952e43141651896f5c5190c41064075fb5c5837516f63d6ff3e7fb0cdc7d389c44b6e39db01d8f
 EBUILD fetchmail-6.4.20.ebuild 2411 BLAKE2B 434eb903a6d3664f5ab4aaa98d49e444fec57f732fac15a901d0fc3092514f9efc38f1e216c5a697f75c7a9fddff4e99dbc513780e933b04719cc955d945892a SHA512 721e3a879e4f8d0396665b146ffd7a321bdb091c449706bf1e2759b2b4f1d10e05abf71da640495718c387c92bd1c5404a511aca12307520115a285b4a55cb0f
-EBUILD fetchmail-7.0.0_alpha8.ebuild 2531 BLAKE2B 51172611a85f880f5b31414471182fbbec13207d30c3a1e7101a62ba56e87d3931fb9aa0e1999ef6caaa736126d16c56df0d8e82cab4231f9fdb74fee9dc3892 SHA512 a82d93629559170b406adddfbed04f93f5a856c92fb409254717c86bb284664c240fc69cb07cd5288afa09e41211b129f38be772045877c67fc8e787875207f2
+EBUILD fetchmail-7.0.0_alpha9.ebuild 2531 BLAKE2B 51172611a85f880f5b31414471182fbbec13207d30c3a1e7101a62ba56e87d3931fb9aa0e1999ef6caaa736126d16c56df0d8e82cab4231f9fdb74fee9dc3892 SHA512 a82d93629559170b406adddfbed04f93f5a856c92fb409254717c86bb284664c240fc69cb07cd5288afa09e41211b129f38be772045877c67fc8e787875207f2
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.19.ebuild b/net-mail/fetchmail/fetchmail-6.4.19.ebuild
deleted file mode 100644
index e2ab38dd186c..000000000000
--- a/net-mail/fetchmail/fetchmail-6.4.19.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
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="tk"
-
-inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="https://www.fetchmail.info/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ssl nls kerberos tk socks"
-REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="acct-user/fetchmail
-	ssl? (
-		>=dev-libs/openssl-1.1.1:=
-	)
-	kerberos? (
-		virtual/krb5
-		>=dev-libs/openssl-1.0.2:=
-	)
-	nls? ( virtual/libintl )
-	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
-	socks? ( net-proxy/dante )
-	tk? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-		')
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-
-DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
-HTML_DOCS="*.html"
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
-)
-S=${WORKDIR}/${P/_/.}
-
-pkg_setup() {
-	use tk && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# don't compile during src_install
-	use tk && : > "${S}"/py-compile
-	eautoreconf
-}
-
-src_configure() {
-	use tk || export PYTHON=:
-
-	econf \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		$(use_enable nls) \
-		$(use_with ssl ssl "${EPREFIX}/usr") \
-		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos kerberos5) \
-		--without-hesiod \
-		$(use_with socks)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
-	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
-
-	systemd_dounit  "${FILESDIR}"/${PN}.service
-	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
-	dotmpfiles "${FILESDIR}"/${PN}.conf
-
-	docinto contrib
-	local f
-	for f in contrib/* ; do
-		[ -f "${f}" ] && dodoc "${f}"
-	done
-
-	use tk && python_optimize
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
-		elog "the polling delay used by the fetchmail init script."
-	fi
-}
diff --git a/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild b/net-mail/fetchmail/fetchmail-7.0.0_alpha9.ebuild
index 80f96706c304..80f96706c304 100644
--- a/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
+++ b/net-mail/fetchmail/fetchmail-7.0.0_alpha9.ebuild
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 9ebf1480cb63..e69189e9f1e1 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -8,6 +8,7 @@ AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b
 AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d0743ba23fa903cb9f99fac94a7363c7d80b7bbaf76e2d4de848e7ac726642fb23c56caf43a46568 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
 DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2
-EBUILD mailutils-3.12-r2.ebuild 3691 BLAKE2B d2dfeab68b8c1165d6cfee0c9333e99c42499fd9e43475f45fd44338926a1810fdbfa0283f72471148b625b3538605b484618c18e935a109e92064cb15d3b8b3 SHA512 40b34e364f380074a48647e6d897f6f7841dadc3ca7c1723289b11bdabf98f1757b6e990bf4b510b1322dcc943bdaf703ca0e6d5703a4445314c70801671147c
-EBUILD mailutils-3.12-r3.ebuild 3704 BLAKE2B c42084fe3f0993a5e1d4c2dff6086eaa919b2a36fdfc69ea25ba87d6cf883acfbc0ca3b5f250b77c8848bc304a4b4fd7d4ad800ab14213ecf62006d928abb445 SHA512 03aeac5de0343ae0d354e45055188259739a6969f2b76f8b473917d14210f8e96c151e0c7cc2f3db8c062279316ee506b4ec094a44d0da51ff8a15cac6cae659
+DIST mailutils-3.13.tar.xz 3152892 BLAKE2B cd7d9ce0391d85482581eeb52f60fcc175647d21e433a4dacee3547aa4dcd710331ad780b6706c242d1a7501ec7fc50ff0c25f9b5f4ceeed84893c637ca366c1 SHA512 fd0b23aa535c6446af1ae633d68d41d1aa243d489b2623d346f6a0d6b543c43ab6c2b9bb1449d664abacbcd3ec3a0a5e7a0a5d56d2762e8a961544c77ccc592a
+EBUILD mailutils-3.12-r3.ebuild 3703 BLAKE2B e017a2c4b8a2cdfa4a9d93ac16f08a7521f0db1682183adec4a40b258e4af48a320227d4a4114b9bca4b3b41105b06969f0d134326f900cc23fcc99fbe15635f SHA512 b74bd2faaff78dddb92669524ff5a322f4e92006aa429c283e47f7ed5617f7226ce438594d6fa2c9c4f7b8bed73b9271ad6181ce9870cdffa4a628d4ea183c60
+EBUILD mailutils-3.13.ebuild 3585 BLAKE2B 15f56ac88d90c4d266b9ebc6158499c26411056379f93eb50a745aee560ad99ea377a3e12e484717f40766db15780c4b5f8483c09540c0e8e07daa824205aa27 SHA512 fc935ce433e9091198824d10f60ff0b8a8760f98400657fd96019ccb9bd547b9ccaa8805f91bb16a96930202b5ce123ca19901de1270c5d16016fc95899c764b
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/mailutils-3.12-r2.ebuild b/net-mail/mailutils/mailutils-3.12-r2.ebuild
deleted file mode 100644
index 7abe9fabe3e0..000000000000
--- a/net-mail/mailutils/mailutils-3.12-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="A useful collection of mail servers, clients, and filters"
-HOMEPAGE="https://mailutils.org/"
-SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
-	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
-	tokyocabinet"
-
-RDEPEND="!mail-client/nmh
-	!mail-filter/libsieve
-	!mail-client/mailx
-	!mail-client/nail
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	dev-libs/libltdl:0
-	virtual/libcrypt:=
-	virtual/mta
-	berkdb? ( sys-libs/db:= )
-	bidi? ( dev-libs/fribidi )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gdbm? ( sys-libs/gdbm:= )
-	guile? ( dev-scheme/guile:12/2.2-1 )
-	kerberos? ( virtual/krb5 )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c )
-	nls? ( sys-devel/gettext )
-	pam? ( sys-libs/pam:= )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( virtual/gsasl )
-	servers? ( virtual/libiconv dev-libs/libunistring:= )
-	ssl? ( net-libs/gnutls:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tokyocabinet? ( dev-db/tokyocabinet )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	servers? ( tcpd ldap )"
-
-DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-add-include.patch
-	"${FILESDIR}"/${P}-misssing-endif.patch
-	"${FILESDIR}"/${P}-fix-big-endians.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if use mysql; then
-		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
-			sql/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# maildir is the Gentoo default
-	econf \
-		MU_DEFAULT_SCHEME=maildir \
-		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		$(use_with berkdb berkeley-db) \
-		$(use_with bidi fribidi) \
-		$(use_enable ipv6) \
-		$(use_with gdbm) \
-		$(use_with sasl gsasl) \
-		$(use_with guile) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_with postgres) \
-		$(use_enable python) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread) \
-		$(use_with tokyocabinet) \
-		$(use_with kyotocabinet) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable servers build-servers) \
-		$(use_with servers unistring ) \
-		$(use_enable clients build-clients) \
-		EMACS=$(usex emacs emacs no) \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		--with-mail-spool=/var/spool/mail \
-		--with-readline \
-		--enable-sendmail \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	# bug 613112
-	newins "${FILESDIR}/mailutils.rc" mailutils.conf
-	keepdir /etc/mailutils.d/
-	insinto /etc/mailutils.d
-	doins "${FILESDIR}/mail"
-
-	if use python; then
-		python_optimize
-		if use static-libs; then
-			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
-		fi
-	fi
-
-	if use servers; then
-		newinitd "${FILESDIR}"/imap4d.initd imap4d
-		newinitd "${FILESDIR}"/pop3d.initd pop3d
-		newinitd "${FILESDIR}"/comsatd.initd comsatd
-	fi
-
-	# compatibility link
-	if use clients && use split-usr; then
-		dosym ../usr/bin/mail /bin/mail
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
-}
diff --git a/net-mail/mailutils/mailutils-3.12-r3.ebuild b/net-mail/mailutils/mailutils-3.12-r3.ebuild
index b8efb6324f39..2f5b062735ba 100644
--- a/net-mail/mailutils/mailutils-3.12-r3.ebuild
+++ b/net-mail/mailutils/mailutils-3.12-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mailutils/mailutils-3.13.ebuild b/net-mail/mailutils/mailutils-3.13.ebuild
new file mode 100644
index 000000000000..823273c3589a
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.13.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://mailutils.org/"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
+	tokyocabinet"
+
+RDEPEND="
+	!mail-filter/libsieve
+	!mail-client/mailx
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libltdl:0
+	virtual/libcrypt:=
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gdbm? ( sys-libs/gdbm:= )
+	guile? ( dev-scheme/guile:12/2.2-1 )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c )
+	nls? ( sys-devel/gettext )
+	pam? ( sys-libs/pam:= )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( virtual/gsasl )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
+	ssl? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-add-include.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	econf \
+		MU_DEFAULT_SCHEME=maildir \
+		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_enable ipv6) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_with kyotocabinet) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable servers build-servers) \
+		$(use_with servers unistring ) \
+		$(use_enable clients build-clients) \
+		EMACS=$(usex emacs emacs no) \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	# bug 613112
+	newins "${FILESDIR}/mailutils.rc" mailutils.conf
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	if use python; then
+		python_optimize
+		if use static-libs; then
+			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+		fi
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	# compatibility link
+	if use clients && use split-usr; then
+		dosym ../usr/bin/mail /bin/mail
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-mail/postfix-logwatch/Manifest b/net-mail/postfix-logwatch/Manifest
index fa6e618f12d8..ceac90fd5fbe 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -4,5 +4,7 @@ AUX multi-digit-enhanced-status.patch 1479 BLAKE2B b8364d035aa3662b539523ec63cf6
 AUX redundant-argument-to-sprintf.patch 1744 BLAKE2B d251a7e894dd4ebe09d61984a55ad2e7a0771310a88042da952c6e7d13b98952648e2da995e32cac92818e26d2df2e0d83f08a16fed093cfb07fe81187f5aaf6 SHA512 31e35603cee7c51ffe126ba0caeadbbca564694439101d92293d2163d3b674be552ac3e781d4b10fab11435d072bf3bb540e3070bd3a839dd6297fff02cf5b04
 AUX unescaped-left-brace.patch 1277 BLAKE2B 3dc055f3321b958cbe35e0e51336c64e41b4e71e4221ea025c6b4c86eff8af710652ab2f97bde52944ec17ba047039319356b338b10af6594dc50167811535df SHA512 dcfdb1fc7793fcf8a1e41fd890023c901bccff5c241601f99a5aef398fe35c1eae82d786064e189ef2113aad9d2081a67d8451d9c58ceefc78192e22ac5d3033
 DIST postfix-logwatch-1.40.03.tgz 107065 BLAKE2B 153f83c3414d2773ec528260369a564624aacc6de5627ee1da77d1eea89b276fb014c045785bc8ae1fbf7e6da2279a0d309ab171ff55d1087d3379466570c5ea SHA512 7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341
+DIST postfix-logwatch-1.40.04.tar.xz 78996 BLAKE2B fea2a08a7bc776cf0106a60bc0f86730c562d6c893629a1028183150a246803bda8ada6a5ec7e264685fe40016b82ce4140031af7e508ac4b1d9a34e552b865d SHA512 194917fe4d05e9808893da0c175859e932d5e48956d1dda96129dd5de7f9ee23131ae1831b558c8c2d32d03ffda80aa95cfd5048543b7766a0486a71efa6c19b
 EBUILD postfix-logwatch-1.40.03-r4.ebuild 1160 BLAKE2B 9c269a1abd9c561a8f514ac99e991d57344286705b91cbfa53b464a4267e024442ab324b4973c5962e27bec8da601feb6bf550969bae4fb030d05651642a0e6e SHA512 5c9d736880a06bd66c2ea75827d75610b826392e95573c7b75a654cd613afada7aadcc6bcfa8d0cfe365ade3c5ae7e9944c6c7bb304c4bce657a897220336cfe
-MISC metadata.xml 304 BLAKE2B 48bc40ba602d100542b0515ce426fdab3846135079ef677b11c2024c14243d0d06ecd543c0040420bddd839c2043ca0de3223cb9a02135b5c398f825beafdaa4 SHA512 6df4937b334df95e1178cd70c594d9ef08e52f5b34f4da0a129cd3586192dabe974623b13b6992021231150e8a70b7c2d68e7b65faea39113efe04f9a2244cb1
+EBUILD postfix-logwatch-1.40.04.ebuild 796 BLAKE2B cc8aab5fd6c69efb2c31d14559a48539fcae3cede5659f53f79001d554d55c955b39993fe4dfd69aea7e8c0842e53687a7a285825282a6ae871d05c22cf34b47 SHA512 ea8dbfd64225f7aed6847b46641aff571ed171237845c693b9976d554482043877260f06e8954d7437f6648dbaa0d487ba024f44559536d2fcd17212121816bf
+MISC metadata.xml 218 BLAKE2B b55d5b84a56be6911406973def7dcc385581e50dbcd1c4a7cad56fb8e5e6ec2c7ddc153d0fead807dc1cc8336c32a3ad2e414ebed9c4dd295050acd456a6885d SHA512 e143c766598413b2b305475039473345bf7e007d6cb4934dd205384c0a3df9451e780a4294c56126103a883bb904d9a02e06c082176b19a4e388020438d71bcd
diff --git a/net-mail/postfix-logwatch/metadata.xml b/net-mail/postfix-logwatch/metadata.xml
index c2f0518836b4..a0128bcd9ef0 100644
--- a/net-mail/postfix-logwatch/metadata.xml
+++ b/net-mail/postfix-logwatch/metadata.xml
@@ -4,7 +4,4 @@
   <maintainer type="person">
     <email>mjo@gentoo.org</email>
   </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">logreporters</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
new file mode 100644
index 000000000000..bab89768c04c
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A log analyzer for postfix"
+HOMEPAGE="http://michael.orlitzky.com/code/postfix-logwatch.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+src_prepare() {
+	default
+	# Replace the default config file location with ours.
+	local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+	local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+	sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+		|| die 'failed to update the default config location'
+}
+
+src_install() {
+	dodoc Bugs Changes README ${PN}.conf-topn
+	doman ${PN}.1
+	dobin ${PN}
+	insinto /etc
+	doins ${PN}.conf
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 134b62c4bfe6..f73119033c2f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
index 2c8ab98c475c..8591e9cdd395 100644
--- a/net-misc/dleyna-server/Manifest
+++ b/net-misc/dleyna-server/Manifest
@@ -1,5 +1,5 @@
 DIST dleyna-server-0.7.0-r1-patchset.tar.xz 1680 BLAKE2B fd6494dc04bb0fc20e677c69b360df30c89b35b6a990a2ce78e87101291307c485a5cb133152eabbd117691eff4d738fa2e33303128c4305a0c1e5137c67781d SHA512 7f37ba456f84bd9e45b732d40467e08ba5ce775c0f1d30011157e10a6f3010b904fc52a4d699a211dd66b66c54ff6e98b109aa5ba9c04112f81de1529d55c425
 DIST dleyna-server-0.7.0.tar.gz 105020 BLAKE2B 01e4459631fef66e88aabcadfd85a4b01a5b95d33b5c1734decd1b0667876d7e5834bf23f754361772faebd7daf63d5f37cff9cb9bd11ff47c62aeb7afdb4969 SHA512 16bcab369a4d4624f75ed5d40bb5a06cafa1907b3ceceeb0de95f9f00750c257b69202f29f9c2d1ebcd61c541ee930d7a2747dab979e15a74e9a6e109eae6800
-EBUILD dleyna-server-0.7.0-r1.ebuild 786 BLAKE2B 271e0cd33a23386a110cd5d91198a3dd16daa084f7f694895dbfddb6381be27faf618e2b4da042bfc6b84ac360c7a87c77bf447fb81b5744c4b451c63614cecd SHA512 3cf7e358c1226c172b97afd85236391ac26b6a5ebfeb02089ba5942d0d2aa4c62b468fb33b7228263076a85515d5867086e8be8dff08ad54d0bb5feac21e457e
+EBUILD dleyna-server-0.7.0-r1.ebuild 789 BLAKE2B d097deaacff505423a55787c74218964ca12b9a867ae29c1337653d0ee6666e7f34b30b7d8c939c352fa51bdc0612f9f6df49daad67e81a132797aba9a1ef2ac SHA512 b2c0f2a894558dc8c9be937a7f658ffbfee1c9f7fa83409d145048363a542aad0b074e69dc21c7ed224b156faa82b4884f562bc9420635caf2b5d7bdd7f52589
 EBUILD dleyna-server-0.7.0.ebuild 674 BLAKE2B 61ff666be0dd8d68a5ccb443f08e7597c2cf196c8de5db2c018bf88b574a982a677f51cbb4e09e18e022c562911194d27b39aa2ca7cf7fe04e582edce63c1a55 SHA512 64b58c5e4285d80b3e55a16b60a15e1ca531cc96ab84ea599839c2f206dc9d3a85441ffbc3ba0ed640a3ab17171a45722fc1ea99778c3e2fa686ffd9646c75f9
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild b/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild
index 0c97205a63ef..b63a1e717fd1 100644
--- a/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild
+++ b/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild
@@ -18,8 +18,8 @@ RDEPEND="
 	>=dev-libs/glib-2.36:2
 	>=net-libs/gssdp-1.2:0=
 	>=net-libs/gupnp-1.2:0=
-	>=net-libs/gupnp-av-0.11.5
-	>=media-libs/gupnp-dlna-0.9.4:2.0
+	>=net-libs/gupnp-av-0.11.5:=
+	>=media-libs/gupnp-dlna-0.9.4:2.0=
 	>=net-libs/libsoup-2.28.2:2.4
 	>=net-libs/dleyna-core-0.6.0:1.0=
 "
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
index cefb065075af..0759c0b2167a 100644
--- a/net-misc/econnman/Manifest
+++ b/net-misc/econnman/Manifest
@@ -1,3 +1,3 @@
 DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
-EBUILD econnman-1.1-r2.ebuild 861 BLAKE2B b12d76caae9b8188441a4cc36e0c1b0a13a3ca1c32e1b22df59ab0614ed8b130952422f90795468ea7c3bda839c39822ea3a88a5d8e43eb4b1569615957e5bd9 SHA512 50a97526f3aa8efa57b74d6e2f51ef38a15684a21d4a6dfd6025e439b1ddef34b68995b967d692ce0df0064a56a8b40fa5ff1886dd59f2abd789c14544419aec
+EBUILD econnman-1.1-r2.ebuild 868 BLAKE2B e7fda84fe81a76306006310768da2babde38fcdf492ec0c93acc86ab04ca0bbaaa8e23c9c5a79039060eb5b75f13fc81704a2ec859c0847fcdf8e410779d6253 SHA512 b99a9baedc815e63a74ddecb97ba8d6b5dd7205b3e74afff823cf65368a5cf48ff4c52a11978240649b40db69fdf9da390d0537af71a150351903ac37f1d4644
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-misc/econnman/econnman-1.1-r2.ebuild b/net-misc/econnman/econnman-1.1-r2.ebuild
index 8ea76419802b..9e8ccac3016b 100644
--- a/net-misc/econnman/econnman-1.1-r2.ebuild
+++ b/net-misc/econnman/econnman-1.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index cedcd8cf2824..012d45c4c16b 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,11 +1,5 @@
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
-DIST electrum-4.1.2.gh.tar.gz 4926068 BLAKE2B e5d543c963cfec523e80e2de8b6a44c1845bdee23524c182e86efb7ff41caeaccebbefab2b8dda9c1e027410809d42be30db6dbc20fd877f3c749619478a6977 SHA512 4db8f8061ae149a5d9770b8c30676aa85ee66eb71052763e29d551317484b597628aad702370486b466c981688488f5a4592ae30a426e5fcd9250bc1a69a890a
-DIST electrum-4.1.3.gh.tar.gz 4958955 BLAKE2B 0d338261ada16d5f1a9b01532fd976094ed7105204f45997c789c01c757d85e7d8a47d20935f848a7e52db1755f953d999e974500cb016f34088642f046c6637 SHA512 af74cfd5ef3f5bc8a788a55b3459029fec7a08b693a3e58133b74a5ad782d4a716061e8619bef633fcfee8a9d1989980c1e8e8e314cea2431e473745660e773e
-DIST electrum-4.1.4.gh.tar.gz 4959040 BLAKE2B ac17588f542bde4d368065815688c36afac2c5d0ace849a7dfe997113d2c0d6c23512c8091d039a73436709f7104fb0c86aabe1a81448ae0d26644343c4cc588 SHA512 e6e0d01f1f32389da95c3fa131c8aaaeeaf38af1203cddbd06cbfb1b09070cc89fcd30a9c9979f5b06d4ba40001d046690aea6501342ce1669271c6646717be9
 DIST electrum-4.1.5.gh.tar.gz 4998188 BLAKE2B c33f1a8fa2af68370319a4f4fefe4d1814a20870114f4929d53bf90eca6bbb555cf9e52681f329d18dec32642ee21ee0e32558ec817936291296ce8e196c8fb1 SHA512 9430dfde6d6e78bb71db416cd35f474b44e234d69421b370dc7e4b09584ad86e095051dcf1366c142d5e6c3029aca617b4fb383f50904fc43d2f7f99053b1c92
-EBUILD electrum-4.1.2-r1.ebuild 2427 BLAKE2B b3f6b497dc1598fffda1d3a33cde9ccaac99a7b1a1eb91a8fa8cdf4e4da102626bb1b4d0895ce9d72857204405432ef11b8a80d46022028e622517e058786513 SHA512 ffa7139cb2eb713a4fe637ff741f4823f52527fcd0524d88f8288dbd669760f8472ae12779e4d593d4300c2e1d6f5a30a83e82d990d0085b9d74279618f38b7d
-EBUILD electrum-4.1.3.ebuild 2429 BLAKE2B 776cf7736027c4c4469a43abefd667ebdc3de053b5ef7f33b7a6b7e8fa864ee6bf1ec9418302a7ef8e33d223dd93103841591dc6ee626e8213aa242432b44a1f SHA512 9ea0993e5f6b4197d75e770748ee4fcaa69f3cb2ae7445d5d5237873c8730defa5f07806e1d7ff99976a38973d02a3f4cbbd68ff50be0fcd2b130a9e8da6c0ed
-EBUILD electrum-4.1.4.ebuild 2429 BLAKE2B 776cf7736027c4c4469a43abefd667ebdc3de053b5ef7f33b7a6b7e8fa864ee6bf1ec9418302a7ef8e33d223dd93103841591dc6ee626e8213aa242432b44a1f SHA512 9ea0993e5f6b4197d75e770748ee4fcaa69f3cb2ae7445d5d5237873c8730defa5f07806e1d7ff99976a38973d02a3f4cbbd68ff50be0fcd2b130a9e8da6c0ed
-EBUILD electrum-4.1.5.ebuild 2429 BLAKE2B 776cf7736027c4c4469a43abefd667ebdc3de053b5ef7f33b7a6b7e8fa864ee6bf1ec9418302a7ef8e33d223dd93103841591dc6ee626e8213aa242432b44a1f SHA512 9ea0993e5f6b4197d75e770748ee4fcaa69f3cb2ae7445d5d5237873c8730defa5f07806e1d7ff99976a38973d02a3f4cbbd68ff50be0fcd2b130a9e8da6c0ed
+EBUILD electrum-4.1.5.ebuild 2427 BLAKE2B b3f6b497dc1598fffda1d3a33cde9ccaac99a7b1a1eb91a8fa8cdf4e4da102626bb1b4d0895ce9d72857204405432ef11b8a80d46022028e622517e058786513 SHA512 ffa7139cb2eb713a4fe637ff741f4823f52527fcd0524d88f8288dbd669760f8472ae12779e4d593d4300c2e1d6f5a30a83e82d990d0085b9d74279618f38b7d
 MISC metadata.xml 667 BLAKE2B 4532c27bf060a5d6708cd7cbd350a30765778cf197221c6c0a4ce3d6db04f22b57f2c2836010fffb26f2b165b4df4e07652bb64addda4c9c982b80810c064d71 SHA512 ac74b8fab1cc0ca770d0f07b422cdf46af8a845ce49e00bb7b8eb5135b68408482689210025f6be087c997e9154e0d7366b1361d31e22653b872f5638abcea56
diff --git a/net-misc/electrum/electrum-4.1.2-r1.ebuild b/net-misc/electrum/electrum-4.1.2-r1.ebuild
deleted file mode 100644
index 1efda47c7185..000000000000
--- a/net-misc/electrum/electrum-4.1.2-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# unbind aiorpcX dep
-	sed -e '/aiorpcx/s:,<0.19::' \
-		-i contrib/requirements/requirements.txt || die
-	sed -e '/aiorpcx/s:raise.*:pass:' \
-		-i run_electrum || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.1.3.ebuild b/net-misc/electrum/electrum-4.1.3.ebuild
deleted file mode 100644
index a8c551d5f9bb..000000000000
--- a/net-misc/electrum/electrum-4.1.3.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_{8..9} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# unbind aiorpcX dep
-	sed -e '/aiorpcx/s:,<0.19::' \
-		-i contrib/requirements/requirements.txt || die
-	sed -e '/aiorpcx/s:raise.*:pass:' \
-		-i run_electrum || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.1.4.ebuild b/net-misc/electrum/electrum-4.1.4.ebuild
deleted file mode 100644
index a8c551d5f9bb..000000000000
--- a/net-misc/electrum/electrum-4.1.4.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_{8..9} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# unbind aiorpcX dep
-	sed -e '/aiorpcx/s:,<0.19::' \
-		-i contrib/requirements/requirements.txt || die
-	sed -e '/aiorpcx/s:raise.*:pass:' \
-		-i run_electrum || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.1.5.ebuild b/net-misc/electrum/electrum-4.1.5.ebuild
index a8c551d5f9bb..1efda47c7185 100644
--- a/net-misc/electrum/electrum-4.1.5.ebuild
+++ b/net-misc/electrum/electrum-4.1.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cli ncurses qrcode +qt5"
 REQUIRED_USE="|| ( cli ncurses qt5 )"
 
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index d78936a52553..7e1130106946 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -3,8 +3,8 @@ DIST freerdp-2.2.0.tar.gz 6878427 BLAKE2B 0a2a4e4724e9875ce5d975b2c9a0b89ce9467e
 DIST freerdp-2.3.2.tar.gz 7284490 BLAKE2B f6017752993fcd9213117016825344953872b3ad6b6717039ba78555bbeeb276eb548c2c097c5df46d25d19678b8e275ac25a4c62e212c087e1b52d9ce672de9 SHA512 b8502d34c73113a42bf2dc240431967829064d68f507cc42ff06432a784213eee4a2c001b174f1b970545aec75b3caf21ba5f4ee1ca8c07c7ef834131413204b
 DIST freerdp-2.4.0.tar.gz 7244549 BLAKE2B a48c48ca7af044a8421d15b7cae971e3f568b55b26b2bc44c99dfb5cbcd7558fe73ae8b59ee127f40cfafa30fc26fc45bf34cc86ae71cba9b3b9c450c88b131d SHA512 5dc34e66ae7185393981ae33676d689e3e3e8d7f738b37d53675ab991a762a42450d02d738166fc49f196d32453249eb36e35728f86edae6ddec866a913551f3
 EBUILD freerdp-2.2.0.ebuild 2805 BLAKE2B f351598a209d0c2fb18c711e9f76e9d26325d31605cb6ceb1f06d0508030cd6c127384794b03e5156fb866841a8e27915be0e5edc0e84d66c77b671f4c0639c1 SHA512 452305faf9d31e27b6571f1ada542bfac588b6491e6d451a35b132b816e74e25d8cc88b1abfeeb485989fd96eed79e030f68686b6502295b3895453c1b96dab4
-EBUILD freerdp-2.3.2.ebuild 2867 BLAKE2B 67d97e3b81703d0d8be132acfdeade9cc0c08b6861fae2d74d45bfa970c5c22d16683dfef7728f5d5acd71338da6ecbd2bde0d1bbac14ab81730456ecbe50875 SHA512 0f8706eefbd4671c800363ca8bac3443b0c860115f263bc075d39c15414faca4320a0fb27f47a131ae4665dd2049bcb890169b182e2f8a4d1b17c303d3cd064c
+EBUILD freerdp-2.3.2.ebuild 2863 BLAKE2B 54a2dc510e6b8042447f871a813b568460f33a13f0bd5b3dfff6de1e2e86ded42ae3d3ac9a5ed635c5ad8d1b706333677f2aba23c75ffab29d523f8c57ea647f SHA512 4b02f0bdff3bcb80c374c77e53c4550e3db2f31fbbe60520b838e4bc5d803104fd0748b504164f59695455bd0123353c53cb50b7f9bce04b79019472c020f25b
 EBUILD freerdp-2.4.0.ebuild 2867 BLAKE2B 67d97e3b81703d0d8be132acfdeade9cc0c08b6861fae2d74d45bfa970c5c22d16683dfef7728f5d5acd71338da6ecbd2bde0d1bbac14ab81730456ecbe50875 SHA512 0f8706eefbd4671c800363ca8bac3443b0c860115f263bc075d39c15414faca4320a0fb27f47a131ae4665dd2049bcb890169b182e2f8a4d1b17c303d3cd064c
-EBUILD freerdp-2.9999.ebuild 2867 BLAKE2B 67d97e3b81703d0d8be132acfdeade9cc0c08b6861fae2d74d45bfa970c5c22d16683dfef7728f5d5acd71338da6ecbd2bde0d1bbac14ab81730456ecbe50875 SHA512 0f8706eefbd4671c800363ca8bac3443b0c860115f263bc075d39c15414faca4320a0fb27f47a131ae4665dd2049bcb890169b182e2f8a4d1b17c303d3cd064c
+EBUILD freerdp-2.9999.ebuild 2811 BLAKE2B 71ecfc100f2dc04e368e8561fb06c0799e1aa68d9ec64144958d4ba60af70961e66c3f6ac46da48ebd07ffc9e02869d8bb0699bec778b68600332c181aa1ccc3 SHA512 4312971f4594c7c5f966bdc505e5d3483392a1e0289fb84790550d7f270e1a84502c1a89cc3c779675eddf593eda0b6fa15a72280db6442e1cfd286af651c3ff
 EBUILD freerdp-9999.ebuild 2811 BLAKE2B 71ecfc100f2dc04e368e8561fb06c0799e1aa68d9ec64144958d4ba60af70961e66c3f6ac46da48ebd07ffc9e02869d8bb0699bec778b68600332c181aa1ccc3 SHA512 4312971f4594c7c5f966bdc505e5d3483392a1e0289fb84790550d7f270e1a84502c1a89cc3c779675eddf593eda0b6fa15a72280db6442e1cfd286af651c3ff
 MISC metadata.xml 481 BLAKE2B b7102d2ff331d4c991dbd2d20b3bd33d375fe5f332ab48f2c3401a579e584cdc4c84795a286c18536b82cd88b7b9991b3559774a937ac59ad8ccc21b91241f60 SHA512 47db413f3b78632acc874d8e67ef8231551a6074cb2269760fb780f1a86dc334bf7675550fed7a95e98a92470e3d70cfedb10f98f6ec686e785dd67615e93db7
diff --git a/net-misc/freerdp/freerdp-2.3.2.ebuild b/net-misc/freerdp/freerdp-2.3.2.ebuild
index c08a85f6d05a..2aa7099751a7 100644
--- a/net-misc/freerdp/freerdp-2.3.2.ebuild
+++ b/net-misc/freerdp/freerdp-2.3.2.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild
index c08a85f6d05a..50350a7d1f9e 100644
--- a/net-misc/freerdp/freerdp-2.9999.ebuild
+++ b/net-misc/freerdp/freerdp-2.9999.ebuild
@@ -88,10 +88,6 @@ BDEPEND="
 	) )
 "
 
-PATCHES=(
-	"${FILESDIR}/freerdp-2-openssl-3.0.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test ON OFF)
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index fd77338382a9..bfa0e9b5a1bb 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -9,7 +9,7 @@ DIST iperf-3.10.1.tar.gz 636957 BLAKE2B 8390b4fb0d4c6590bf73e46d55fbe100f1c9832b
 DIST iperf-3.9.tar.gz 627100 BLAKE2B c09018dc066612c61076ed4c53dd93b4dba766fbcbc359eb402055dcaa90af63e2df2b6c67ba8a0a72a17648014240dc5b355084e69550afed4d59257a224de8 SHA512 3da0939bed576a7c14baa03c996e6f407f20bfe58c4b3a36a66e74f41bd5442c0b23ab18c8eb1f2f37fd47449af533b61b658d810c68707b2b06d28894ac2035
 EBUILD iperf-2.0.14a.ebuild 856 BLAKE2B d75c7d282707edad5bcf7b8304c1820beb7dbe082f8a0203dd75857ab9ab80a741049acb671bd3383aafa936a51fcaf4cee19e98de64e71456332d6cd676e8b9 SHA512 2dfca97c4d60f56a8977279dd947fc35f0c30d8bc3c36fe308bb72de8287b5975ea20be2b11aaf1b2d858b1e3543ef759a94419e90a9ae0a304e8f852e9a1d34
 EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 753dbd819ad867ee52dcdb9af069667d78053826f0028257eaee9fa13b6fab31cb27e5d419baa4c038a3346f607cd06639ed4dcc8fabbee6af943de336e9c45d SHA512 37d2329648792714b13e5fcdd2709b181d1cf32aa159aa39d8e3a1b922a01ef47e13ea340bef966991b7321d93bf9a41e7d2e824204f6770610eb71afeec6f13
-EBUILD iperf-3.10.1.ebuild 963 BLAKE2B 764cb543a68c77e73935a735c99adf6a8706b2f23f759878051977086a2a2bfbf24073872b2a65ef0e2574b6c33ddd5cb82b8717ce654e1907f43c8f52410f11 SHA512 042fa29144e1d4d5d7d6a0d8dc5b5ab4c6f798011ec17917694657407640aa626ba8bddeddde8fe2aad4e8b2a6189502ef00b7bd625ffdb60115b5befe67d3b3
-EBUILD iperf-3.9-r1.ebuild 908 BLAKE2B 2e607818df5e0058b450da97c0f2e86595835362dc3207b8b936723e5d1f3da2d842195d87d4fa088e23d16660de2770ac4d3acae2315f6402ded93034fc0ae8 SHA512 58b9b928cc6aa02b9219701cd4a152e0b96891f6dae85a2c82d41867fe84539b37604c93f52ee166aed2993f27931880bb0f8f8fc830e2c828045834b63071f3
+EBUILD iperf-3.10.1.ebuild 959 BLAKE2B 8c3c92b165177d9b64e53b254bd5b0255263da0c5133a9d042685e09bf645c199ad971a9cfd6c04c9ec10814319b61c2343a3a778c3b593c08b3424af38c8766 SHA512 628b069ed6c2b92b3ba0227da347faedf8800f5ade836569f86cf869192dc588edfeaa59fe555be3c44c6d627dfbdd4b3a7a5cbc2cd83072efb2d77a9c442e4a
+EBUILD iperf-3.9-r1.ebuild 907 BLAKE2B 1657b6f91e6592920f7134e262fe8bb6c5e8d3369b722f134463645f00fbba39404f26798eb54c34230131b582f1f7d29e0eba090c4d4ff4c66470476953f6c6 SHA512 0486535a43e0973e7bbd0dd842796492a07c9c0bc398d95100b1f4ddeea516f4dc60cd7ba4afaeb5f7da65b3d2c49c015cdb6e4c2ecc05aa6f13582448274cb4
 EBUILD iperf-3.99999.99999.ebuild 722 BLAKE2B 3e048d5eb49365b5c5f89e4072de496e908269c1dcf754f54810671d6ee66c08c814278be899060a7ac97a04464da4ddcbb9a93e79f5cbc6fa195eed584ea71d SHA512 b47ee419c1d04829ccb9a5a4225d58bb15f723a0f297b01c99f194ec662bba4200371aa0e084e737af0f9ccbbccb656c4e0dd680830fc9af11dc1be342bcd64c
 MISC metadata.xml 569 BLAKE2B 66b45104e695c19a4c0e9bb804e75c2f5236d7b9e6b6741df3ab40669c79374a7b01b080c3d99b21f522fd48554713cc44af543c661168aaa0a0989c8dbffeab SHA512 5c67ca8f97c48097ff3e1f8c2a738deebf2357c15f82e19f9b695da6892240a78e3fd2af265b9ebaa2f706e46d09bfc99401f0538ceebef448a911db3197b4ab
diff --git a/net-misc/iperf/iperf-3.10.1.ebuild b/net-misc/iperf/iperf-3.10.1.ebuild
index 0b042e730826..556e31ed3add 100644
--- a/net-misc/iperf/iperf-3.10.1.ebuild
+++ b/net-misc/iperf/iperf-3.10.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="sctp"
 
 DEPEND="
diff --git a/net-misc/iperf/iperf-3.9-r1.ebuild b/net-misc/iperf/iperf-3.9-r1.ebuild
index 1dbcdb0f1507..6e77ed4440e0 100644
--- a/net-misc/iperf/iperf-3.9-r1.ebuild
+++ b/net-misc/iperf/iperf-3.9-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="sctp static-libs"
 
 DEPEND="
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index d71d9813186f..9c6d8cae0431 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,3 +1,5 @@
 DIST mobile-broadband-provider-info-20201225.tar.xz 83052 BLAKE2B 53f37e1d5796350a9ddd1ecf7de491a365baa854d5021c45e9359ff51cd0e545867858ef172eeccf81f0df072b207c6dce8024ca805921b69f0c50d3febfcc0b SHA512 26064451f43494e4895b65912e3dd06a62ca8afbe3334f09ca8428c1812318f7dac4accbd1c3aa9e83fcc1ee177fb187cb6fe77fab56608abd28c5f5ec3499cd
+DIST mobile-broadband-provider-info-20210805.tar.xz 83756 BLAKE2B c7872a4bbb9c0ed2a36c374210e57cdd6a1346772c7f1c06a273e753606f70fe5d911eb6b11c6779382e2fc8a7bfa99ce216522807c6be60ed1719d05b7b452b SHA512 d3166484792aa0d97d7a094ecac309062fa1bf07c50c5b9bcc827e45c0a4d005a1131a589af1ec9920f373346d9ccb27bea6c019bad39c633998c00df92a5356
 EBUILD mobile-broadband-provider-info-20201225.ebuild 481 BLAKE2B c3c19e8e6fe775978d4d6e6f711263a79cb5b1e4021db4134fd7605b09dbb4bcd2f99dfc19a189c492f1bc5b9ca0f996283d4c28b72cdee87ed48f04efd992a4 SHA512 584d39732abe9789cf94ec2f0a74c769e4119b9660685ae078b337dc5fe67cd580a55f6580d34546e846d6113cf06017b3ad641afb1cafad4a1ef8c4189b246f
+EBUILD mobile-broadband-provider-info-20210805.ebuild 488 BLAKE2B 36e1e582f872239dcfbddac0ef4f35bea00496f186c8f28b6ab13a93dbcf005ba4384d370daf5d81c5e626b849a20e79b4f6de5703f5f742b7e3618cc0aad048 SHA512 cd5ded90122c411840968ec862cb833a74d73a83acf48403f0ee784ea7c13ffdeb1ad82ff32fcd3b48847e2321840c13e80fcdfeab08c7e3980474475cd41796
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild
new file mode 100644
index 000000000000..583d882d3fd2
--- /dev/null
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org
+
+DESCRIPTION="Database of mobile broadband service providers"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
+
+LICENSE="CC-PD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-libs/libxslt
+	test? ( dev-libs/libxml2 )
+"
+
+DOCS=( README )
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
index c4c87cc600f8..ef35d41aac67 100644
--- a/net-misc/ndisc6/Manifest
+++ b/net-misc/ndisc6/Manifest
@@ -4,5 +4,5 @@ AUX rdnssd.rc-1 502 BLAKE2B 39875eee2e81627e0e603bc01e552622e219af3bb18fede1d6b8
 AUX resolvconf 148 BLAKE2B 7e11d5f6d87fdf2e60ebb2b308663c51d4683cc389ba9640cd026da5ac99dcdd196c9e7dc4733b77da58285fe3fd6a0eab9d0a6b9695eeb8b7cf54aa17c560c8 SHA512 ba04b2ae327a1136122bf68929fee7946bc2938ce335cfe3c982ccb5bc4d53a66154dad65d79eeb47fd3b306cf203e69aa0197f6751ae5b0e021aff6d7f01ecf
 AUX resolvconf-1 152 BLAKE2B 1219e02e170a1cf279a1497e12269061659af7c61d662adb9beab39e772068d597a5f63b6c1f39efa5001c5f8d1014cd2f265cb3e49c3163ff38d9205126dbcd SHA512 cdba5bbfa69a8288696f14d1f7798445769bf37c6363cf0bdeb2aa162ff5c83728f513917c7649e3f6493bfc9cf437e0c08e460a87b80604fa31dd599441ef83
 DIST ndisc6-1.0.3.tar.bz2 260294 BLAKE2B cb9f302bd4d4f15effc8165dfdc686b2eda7543dd745cae43a24fea49086e3b5c58cc5b4eb14bc1a46657a15f6bd11322d5629570461f68743619deb9cd10004 SHA512 11dc9833edfc76650b46977d653686ed800dc1cc1dd069051410570f522d538ea9297b013a8d16b94aac3ebf33043cafdaee9fdccb5c02cc08b4c29ceaa96a54
-EBUILD ndisc6-1.0.3.ebuild 715 BLAKE2B d40b3c4d80d5de95a303fd5a45e169a723fbaa41e6ef8f47ddd402553b950dedfba4e590699bd6e13ac13e1c61487c3bff7b971e4e25a274bc25dea3136182f6 SHA512 f4eba43964119817149e49fa90a23dd42197ffb4d983a3d4edf1b1437f85767097c0ca51afaf5c52f7a38d7c7229831b821f622958cb09f31da20ff4dbdc18b9
+EBUILD ndisc6-1.0.3.ebuild 714 BLAKE2B 36f429d37af7fec788201473ddd22f2c2f038223f0c47e33a1413b9b43b5e5b08c27176183e64583bb92d8052f3f04a9ba8bc764271b98a24f5991b880bf16a3 SHA512 064d54c64e2a29c6f6385e828612eca5f1cee2d68df4b68b132852d1644638ad8197116ce1f6554cdd2dd00e6e547e7014b5fc019567a2707195858bcff94965
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/ndisc6/ndisc6-1.0.3.ebuild b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
index e0f6fa4c1838..3ff6ac986a70 100644
--- a/net-misc/ndisc6/ndisc6-1.0.3.ebuild
+++ b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
 IUSE="debug"
 
 DEPEND="dev-lang/perl
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 3b481e656bc9..5ba8c8f3f314 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -4,7 +4,7 @@ AUX oidc-agent-4.0.2_makefile-toolchain-vars.patch 1214 BLAKE2B 2e2c78973049160a
 AUX oidc-agent-4.1.0_install-perms.patch 1911 BLAKE2B a74915c1ea19c4d8fcfc09b30c60259e361776c458d0f52885ba4399f0599a8094caced14f59cd024331a4d09efe9298061b914faf4e74a700975e2afb7890df SHA512 9390b4ee8a5baccd8de0f5b22c18ea6d2c0a3c83e70b3e3f44af87cf563ec332ce40c6f5cb4f0f7065cb6b17317442daa22de125139823b4b99428c0624fa08d
 AUX oidc-agent-4.1.0_makefile-toolchain-vars.patch 1439 BLAKE2B 9e3477c1eb3303cfbf66f99f8a3fb71966c78c2af2922219efe6684c2fc572fafd8c5d9e93c70cc05aabeed3a53d97a592f3e22d9a0aa6931ce436946fc194c7 SHA512 e96d88784bc55095308fc40da8c969da1068ec6c2ca62ed34fa455785c28f1e4373c49a8023f2ca77fa64cacdb27481972eae014e66315b30c9de2a76651749f
 DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037
-DIST oidc-agent-4.1.0.tar.gz 800972 BLAKE2B b3dd30e886dea9bf1731fc770047904f6f8e1a67b723fba496e69c55c7d5d1e18bbfd3f0f3ba4c1a42fe3d8cfadc79c2bd64183afc2eb9cdd6ee1446b62a2486 SHA512 81e5dbac389da342db788aa65f8c10d97f1179322259de2dc379cee38e2f6ac1317ef48ee4c91cbabe363ae54cc9596ddf260591526c7524c78ba02b5d3961cc
+DIST oidc-agent-4.1.1.tar.gz 801103 BLAKE2B dcb82a537787ae6ced577843c67acdd4e3fa315d017222067b2914837dfffccae27ddbdeeeaf4e8ca70c7e2744e03df5964d3ba318efd4460c73252bfd3f8e95 SHA512 e383e054623dc3b8fe73ec02df44faa05d4b69aaed47c7925f6f92d25cbc5301173fbc607b6198bc70f99e634e582fbae7c5570812086a8e5694d40ce6d2c2d1
 EBUILD oidc-agent-4.0.2.ebuild 2130 BLAKE2B 32d3eb8dfca12421f40b086dd79cce36ccf3c2b45c003a4642369245e28270cf1df8d9e7b8f870d6c606e11a19a59d1f0d78e111cc6f9e458289808ebbe6f314 SHA512 5915027ae1d15ee1394af98780133b18a0b20a0c9a6f372a138c4aea1083596d807b3426c5b42932c5ecfbd0a35f0b6cf4ebc9f8c15cf1d6a666654ab572f2b4
-EBUILD oidc-agent-4.1.0.ebuild 2134 BLAKE2B 7fa9b7d1a62c7ca9ac148895f7a98e5ae0fa1e788c858ac5f65e30e434ef7f77affcf16626298c003f5c56984907def89904b4cc92c819afc547b0952327e1f5 SHA512 e26b7ce146a929498fcae4a75d95e5ac12277cf665ea3ccf0ecfc453a9ec31f7f4811ba4faf8defa4e704e60cdc25f8be54af5a59eaa9b09b2aac43187ff9226
+EBUILD oidc-agent-4.1.1.ebuild 2134 BLAKE2B 7fa9b7d1a62c7ca9ac148895f7a98e5ae0fa1e788c858ac5f65e30e434ef7f77affcf16626298c003f5c56984907def89904b4cc92c819afc547b0952327e1f5 SHA512 e26b7ce146a929498fcae4a75d95e5ac12277cf665ea3ccf0ecfc453a9ec31f7f4811ba4faf8defa4e704e60cdc25f8be54af5a59eaa9b09b2aac43187ff9226
 MISC metadata.xml 779 BLAKE2B ef7a040559363a8012380b3f8568f963a612078c2d5e5129f54db724d414d6c7864e79e480eba5574fd36847caa13a09a7ac7013f5ceb406d83e3be5ebdb47e9 SHA512 f9465b4e88418ec276071683b5abbe8f7601e54daf0cb74da2d24d142e2307b1bb994ee4191eee48ed1b3fef724ad49b548cef12cc4c77088c2f2d07e1b8a776
diff --git a/net-misc/oidc-agent/oidc-agent-4.1.0.ebuild b/net-misc/oidc-agent/oidc-agent-4.1.1.ebuild
index e433d2b45353..e433d2b45353 100644
--- a/net-misc/oidc-agent/oidc-agent-4.1.0.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.1.1.ebuild
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index d17e872d9727..8266424720be 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -2,6 +2,6 @@ AUX rdate-confd 509 BLAKE2B 92826ed23b867063c8cf1145e7a2f62fe6a904593eca1add0597
 AUX rdate-initd-1.4-r3 525 BLAKE2B 8533f2b589aa860d88a7cdf18931b2a5800a1d82a78db576dfb12189f4b3391535bff5896ef75d6b3ef7373e1ad86c86a82f7422f4c404af8b9b3e414aaad59c SHA512 8563dedff5b2188d5176a882e36d4c8cdab4709ca40e86eb9c76e30f91c3eb78d1da8f971d2c2f4189ef801413e173367d2a8a2b9b37608ef6a84a0e73e39157
 DIST rdate-1.10.tar.gz 19159 BLAKE2B 71c858b5eb10b07a2974fcb463a91808fc59582dfce786dc936370b3fc2122bfe72cc32cb3635a1e77ec663fd44712852ab85d8ba46702d1e222ec63ad46f3bb SHA512 7a7647102b5663218fff6c1364b83250a199a0169adf40db87a49709aa24c3b1fae5acf01732d5432fcb2883d29a24b2ae38cf5333ff75075e5d7a6fd90e7146
 DIST rdate-1.4.tar.gz 11500 BLAKE2B 705324648f30685135d3ba3936b05a82bc6a027d3d1c407950cb7631858f6d9dba34f97f065482988caf4a68addc3ba122fe475cfd1684c526f5224113657ac3 SHA512 ea9d62af3aa58fb7bb2bdce257cc23758f103ac056e4d6a8b44be0e41c44dff49e78bdb03789e3bf2957e74997c2f1c0376fdc659b4f39d89e43ef139a51f996
-EBUILD rdate-1.10.ebuild 745 BLAKE2B 05e00c3d4f382ff8e73af94a6c35fa34e3643100db083fb7a1f9c7f1900bedc30e5dc5f4a295161ce0a693f4f1c36fb053a75927d150479706e0e7f532058b4c SHA512 755efa36e446f5ac05bab5099633d56027a53365399c71e8fb924c1b46164210c01c0f1291b1becd8619abb0ee6bcf0b4efd3495e583c7c5d5430f32322a0950
+EBUILD rdate-1.10.ebuild 744 BLAKE2B 0abcf56513a377a525356f61fb1cdb75067e9e258625fb8b2a2640a8aefbfc138e2ded225016c08fd717cd6ed56d8a995d47ecb80149114b73c96d6cf12a7d2d SHA512 a51f39d3890da382e25f3f5c93f793ebd760deb9ed510e809cd2cfaf12939c3f9b85f6da97793239c194b075942d40993272e05be984f5db99ecb8e4e5d32cc5
 EBUILD rdate-1.4-r4.ebuild 830 BLAKE2B 1a8a3f303d06b50a53cd86bf2f8973b269824b91db1f01dff92f9bd9be59c2e3fe7adb229edce00f36be62ed2fc1594b259a07fb7d82ca9198f777086df504de SHA512 b7924e5b106f30b6df99c0ced3dd37e6e3834ce7407bd46ef62de66c2ddf5e1c955690bbb3af0de9059e0c37398f09b78225189d8c4495fa107e79b474027d50
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/rdate/rdate-1.10.ebuild b/net-misc/rdate/rdate-1.10.ebuild
index 0703f2150756..2a7e8d09bc57 100644
--- a/net-misc/rdate/rdate-1.10.ebuild
+++ b/net-misc/rdate/rdate-1.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${MY_P}/archive/${
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/libbsd"
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index f05a73c90800..f3e834d03e22 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,3 +1,3 @@
 DIST rygel-0.40.1.tar.xz 1693996 BLAKE2B 505b96152c0b73bda2b7c81cb742f48cfea86738ea965f07afc1532a77e2262a5c0050eab185a33a831d57fc2f3c85247bc2a02bf73eab5d0be35817e8f00aac SHA512 180f143f394d7a2697c888eef7e7c2bdb5077b4ad289eb6e3f832cc1efde5147248b46e5ad9e77615d7976de7e7d3e68d737732bf7f91f01c42e18e06d8f89bb
-EBUILD rygel-0.40.1.ebuild 2195 BLAKE2B 622a36e1b407b1a7d596b41f54a7bf9f22bfe01253c3aa73c6c316c3552a41232e4afbc001961f63ea47af89f3175011ec3e274e1329fc513652863efd9150e7 SHA512 4b665f5d653d7645255f0276627f4c732c8820ad69e7150126a58f89f455881457a92266fff5dbc092bd1fe2d3fa8038bf5a842f2008f88c896a484c353035f1
+EBUILD rygel-0.40.1.ebuild 2198 BLAKE2B ef3f3b236482562b9394f8fccdbcaba8f42f5f1b4c3b45db32d99a47e1b3e1fe47c49cd82584760fe51cb907436035a23e730c8605f269a76720fd7e6ec4e36a SHA512 5516705acef67f4da77d2f94a158b8299dd5255268f1ad623527906b6ba92ee5cbd91066e7a455c581462632299b29e1f7f333b171d50c4e14cc8e45726359f5
 MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce
diff --git a/net-misc/rygel/rygel-0.40.1.ebuild b/net-misc/rygel/rygel-0.40.1.ebuild
index b6b7bad539db..882ffb84994e 100644
--- a/net-misc/rygel/rygel-0.40.1.ebuild
+++ b/net-misc/rygel/rygel-0.40.1.ebuild
@@ -21,12 +21,12 @@ DEPEND="
 	>=media-libs/gstreamer-1.12:1.0
 	>=media-libs/gst-plugins-base-1.12:1.0
 	media-libs/gstreamer-editing-services:1.0
-	>=media-libs/gupnp-dlna-0.9.4:2.0
+	>=media-libs/gupnp-dlna-0.9.4:2.0=
 	>=media-libs/libmediaart-0.7:2.0[vala]
 	media-plugins/gst-plugins-soup:1.0
 	>=net-libs/gssdp-1.1.0:0=[vala]
 	>=net-libs/gupnp-1.1.0:0=[vala]
-	>=net-libs/gupnp-av-0.12.8
+	>=net-libs/gupnp-av-0.12.8:=
 	>=net-libs/libsoup-2.44:2.4
 	>=sys-apps/util-linux-2.20
 	x11-misc/shared-mime-info
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 9bd89361a934..87a42b62a0a6 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,7 +1,7 @@
 DIST seafile-8.0.1.tar.gz 731105 BLAKE2B ac4b79112e40196cce2dbc64bb94a852b3f81ea08e0a833d45a297c02f5f66432345647b9a34aef67d8108d16eb5e3648002a070bb556a70be63b8c0314af9bb SHA512 dd6366c06bfa25f16f5d3b2ef83b39b5886e834697891c274a3b4eafec3aabf72858dd4d341452e8d4fb8cd1166d30bb8a783dddb4370c02526e3a00ed9fdb3c
 DIST seafile-8.0.2.tar.gz 732341 BLAKE2B 29bf3187a37c0f01261d3afba996e1165ddebe05a36f734fd3d7ee5d0368ae2f94b70cd9251799ddeeea2318c510094b7b2fe917ce06a6328aca00f378dcb9ae SHA512 772dfb060e381eb2395b7ab094e11865f13e71f8c767d31e4ca8b48eaadf74d5d447298ea261f9cd48ff126828829c8d258ca943b01890f72072a36753d8333b
 DIST seafile-8.0.3.tar.gz 738066 BLAKE2B 302de3b5a4f465429955d2819c7b43ddb305cccc76cc7cf67885a75747ec5dcad85d17f94975abdd3b3d54d49a5d9ea05ab7947c3a2b84764b50fe5fb10e7636 SHA512 c51edfc094aa509c730b1b3f4ceb911461081689c8cc2564fb866cddaa54c445d9ad12ca9e4e90e98b771eafc6b6e1496e052538a2475a03642cdceb9212115a
-EBUILD seafile-8.0.1.ebuild 1116 BLAKE2B 400d7aecebbfbac00ce0719f885b2ecb112c2395ed2494f09022d8108c1ab65d2b0a1e39bb232657f00c617d981a6ebfbc213a127661b2e47252dc413f004aa4 SHA512 4c491f150b09de1aba11d81a1ba6315d2e29912e77f6a9687606fcd2f6e75abe0af9734e265700ced828e9d7fa644430d53e15344eef2169c488dadf4e007612
-EBUILD seafile-8.0.2.ebuild 1226 BLAKE2B b8fb80a1a5fbe79b5e899f034d4eadddc9b18054e4b238f2269ecbef7c33e371f4deddd5d78844fcedeef9fadd285e2602b1ac0334d56b6552791f0cd155bd17 SHA512 82ed8ca384274d88273f570d43299e59f3b7be276f17f6f9ebf3526a41543d9a66532546dfe2954ed8fc1a417d0989cbdfa85984b2b1232ff0544cc41740e5db
-EBUILD seafile-8.0.3.ebuild 1262 BLAKE2B ff12fcdc9fb2ab47e9fa782200ec12a8b33c91852fc687e1b363aff43ccb5932da97f946b164d8e3812aa76831bbdb336882808ab6fbbe8d7372b085ada8a793 SHA512 244ebd2de200707b0e80e36f3e2b9d23c0b584e0d4727a0b320127b44d6930da7b6d377137a301b944f63b1bad750bc7dddadfd689ade0be2c12b6d78471d546
+EBUILD seafile-8.0.1.ebuild 1099 BLAKE2B 10520d7558ad9d4869e834229b127599fd06b260fc11d424442624dd0dde771dc4717826e47521c3953afcdf8dbdfb571341645a270442acb4ae35bcfedea2ae SHA512 f0b72a44a089f7f6ae27202ad92c58df9489213408f14ed94fb1a9227f157d9c74fb2b7b895ea11b46ba435ff8a3d4ba654f3790f021a2963055bbb76ac7d483
+EBUILD seafile-8.0.2.ebuild 1209 BLAKE2B b3e2aea2bd855c3d3b71c8d1b053ee19f07f1bedb97d27a64c4d9ee0bc691517b3314bd692825a29367ee38fe02178954847a196aff1aa203971e5c7fd862b3c SHA512 ea30081b9f03da98eab313a444fdc0ae7543ebdf4adeddec0943f94c7ef60c289d8b19f6e58d8ff752824d8a2b8614b1febb21b18145320f6e7a64e55159f1c3
+EBUILD seafile-8.0.3.ebuild 1265 BLAKE2B 9fd65afff11d3ab56a4e16a796caf48e0c3b2bfa1a88a3a996b1725f44379f2113e39e7ca112724c04c5a1777341a53af9f3b479eb14d0108e14ac2339bcbe86 SHA512 a17c6815c36e2b172755ede64d3f9749ed126484244f863d3683178aab00120517c5f75e049e2abb755a395c9d6c5a272efaba18db959a0ad0c493c2561cb8bc
 MISC metadata.xml 477 BLAKE2B 6491e1ec0cb07251b6bbbeeff7e9b04ece552e19d922f7db44866e323f17b14839a165e5c6ac77ab0327daef328aa701e338f2c9620188bfab8833b9497bd187 SHA512 012355a4c6b2c9fff5f4d1d2202dfc377c718f6b8d96e5474b5650894ef6e5dd0a97a927174b0bd492bfb72af0323a4a8bdca3b9c928f01d664c1f196fb861df
diff --git a/net-misc/seafile/seafile-8.0.1.ebuild b/net-misc/seafile/seafile-8.0.1.ebuild
index ffc82290de46..ddbfc88b379b 100644
--- a/net-misc/seafile/seafile-8.0.1.ebuild
+++ b/net-misc/seafile/seafile-8.0.1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{8,9})
-
-WANT_AUTOMAKE=1.16
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools python-single-r1 vala
 
diff --git a/net-misc/seafile/seafile-8.0.2.ebuild b/net-misc/seafile/seafile-8.0.2.ebuild
index 53ed66a1dc80..80abc7522a43 100644
--- a/net-misc/seafile/seafile-8.0.2.ebuild
+++ b/net-misc/seafile/seafile-8.0.2.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{8,9})
-
-WANT_AUTOMAKE=1.16
+PYTHON_COMPAT=( python3_{8..9} )
 
 RELEASE_COMMIT="2493113afb174b1a0e6f860512922b69c05cee69"
 
diff --git a/net-misc/seafile/seafile-8.0.3.ebuild b/net-misc/seafile/seafile-8.0.3.ebuild
index e9ac6acd1fa8..3e0048280aff 100644
--- a/net-misc/seafile/seafile-8.0.3.ebuild
+++ b/net-misc/seafile/seafile-8.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{8,9})
+PYTHON_COMPAT=( python3_{8..9} )
 
 RELEASE_COMMIT="303080b54859d0fc55ce693902c95f9620876c1b"
 
diff --git a/net-misc/shigofumi/Manifest b/net-misc/shigofumi/Manifest
index 1f216e96ecdd..d5fe9e302c52 100644
--- a/net-misc/shigofumi/Manifest
+++ b/net-misc/shigofumi/Manifest
@@ -1,5 +1,4 @@
-AUX shigofumi-0.3-gcc-10.patch 185 BLAKE2B 72c6ad40b843e62433bc6a31323a72a30b6760deb81b123d22d60c005eef959013d7781796b1b3abf10b8edf9b4c6739f5406cd049098a2dd3a0fbec7000b52c SHA512 39341603a5ccf74757cf410ba4d11b6e3f288ac5609ee67f30906d5fc8db095136856b87ad0d709a18eb77020a95997dd57fefedb7a0efcab05dbbb137307528
-DIST shigofumi-0.3.tar.bz2 312184 BLAKE2B ebf8c0c4a7a347bd1b2c11fae9e8f0da46cad21e2b25e875e94a60a7be00a79c1737ac39754a8a230705a44a812e5f00268b528480f5e33e734e4ce5dfdbea34 SHA512 ef7b2894cfa217b713865c4fe24cc985b4ff963df4a5005bda06f03b3c7f358b318e68a136328787fe2dfbb8b1623fe2b2ceb9fbbd20be7f243fa79ace1b0210
-EBUILD shigofumi-0.3-r1.ebuild 996 BLAKE2B 4b8abdca8bea66797d0279bdf2e785cd66ae046642018bb38e082ed8f41858f0203df762af3a362705b14694e3590a9a44bd4ddc46e9d3f55dd0eac92d9182aa SHA512 6b0bff0bfd7bf29702184f29d4038e385c515dab46de1b01ac34dfe8056ec72f0d9cf0991054148fc0c59fca13403b935850d7d0fdcecfca7b443407976e0c1a
-EBUILD shigofumi-9999.ebuild 950 BLAKE2B ea253d16ffdc9299b509e94b82d704b8f7ac0215a4d7a6b1cf70f30b174cb4ee65c23e98af28a0ea00f1201136d5f2632362232a9ecd561c96d6c1ef190afba9 SHA512 edd2141c636497ac23d702adb0c1a06454eb2e51602144fc4682c03d276d05554dae422f07c7bf73de714c1dd4acee96bb1a269b6ce10a14ce9ecb23ec87fa10
+DIST shigofumi-0.9.tar.bz2 346010 BLAKE2B a8014b6d2db3bc5ffc7656331704fd8a5a81b3f9e3b60e1f96a01ae05f98754df0f2ae76008696c0d01d567eaeffc483a4d688e3c74aec26e2bf95d1eea8e649 SHA512 8deee080d701393cce516ce7e904e24d7d42317e6b4921097b879947ee87391806595ac66e9460887607be19903d91a6eebf197833cf12795161424760bb403b
+EBUILD shigofumi-0.9.ebuild 1090 BLAKE2B b17df509c9db5698487ad478efa40e6411b517cfff3555a9d029e1629a742ee50a06630c5851bbbb8425bdd9499ee3afd46f5320b4da36f4534ed31745a5eeca SHA512 8a023542dfd576d0a8590797681bdc3f8e74f917afc0c342b5d7a7a52be117262a3678e00adbb416b212f47a033914897270926acb087c7ec09e4686c6cb197c
+EBUILD shigofumi-9999.ebuild 1090 BLAKE2B b17df509c9db5698487ad478efa40e6411b517cfff3555a9d029e1629a742ee50a06630c5851bbbb8425bdd9499ee3afd46f5320b4da36f4534ed31745a5eeca SHA512 8a023542dfd576d0a8590797681bdc3f8e74f917afc0c342b5d7a7a52be117262a3678e00adbb416b212f47a033914897270926acb087c7ec09e4686c6cb197c
 MISC metadata.xml 350 BLAKE2B ddf2f81b2030cfe858cff49c0605390ef0f4b7542118a1d91801978537b00e40554ba0311cf6dd0495433ba879f810e4408b53d051f6d8e1b61c3fdf1570f5d5 SHA512 6e0cfef97580b12bf5fa6ccf822b9983fd0ec4170f4b25a011a9a17e7398bdeb1aa9726351dc4fd0bb0d3f981a76aa644d316ab5c01d302639d6ba144394b59c
diff --git a/net-misc/shigofumi/files/shigofumi-0.3-gcc-10.patch b/net-misc/shigofumi/files/shigofumi-0.3-gcc-10.patch
deleted file mode 100644
index 52688ff1d194..000000000000
--- a/net-misc/shigofumi/files/shigofumi-0.3-gcc-10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/shigofumi.h
-+++ b/src/shigofumi.h
-@@ -16,7 +16,7 @@
- extern shi_state state;*/
- 
- /* UI */
--FILE *output;
-+extern FILE *output;
- 
- /* Data */
- extern struct isds_list *boxes;
diff --git a/net-misc/shigofumi/shigofumi-0.3-r1.ebuild b/net-misc/shigofumi/shigofumi-0.3-r1.ebuild
deleted file mode 100644
index a5dcea0425c7..000000000000
--- a/net-misc/shigofumi/shigofumi-0.3-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=6
-
-WANT_AUTOMAKE="1.11"
-inherit autotools
-
-DESCRIPTION="Command line client for ISDS"
-HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI='https://repo.or.cz/shigofumi.git'
-	inherit git-r3
-else
-	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~mips ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug doc nls xattr"
-
-RDEPEND="
-	dev-libs/confuse:0=
-	dev-libs/libxml2:2
-	sys-libs/readline:0=
-	>=net-libs/libisds-0.7
-	xattr? ( sys-apps/attr )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-10.patch
-)
-
-src_prepare() {
-	default
-	[[ ${PV} = 9999* ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fatalwarnings \
-		$(use_enable debug) \
-		$(use_enable doc) \
-		$(use_enable nls) \
-		$(use_enable xattr)
-}
diff --git a/net-misc/shigofumi/shigofumi-0.9.ebuild b/net-misc/shigofumi/shigofumi-0.9.ebuild
new file mode 100644
index 000000000000..398763fed882
--- /dev/null
+++ b/net-misc/shigofumi/shigofumi-0.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Command line client for ISDS"
+HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI='https://repo.or.cz/shigofumi.git'
+	inherit autotools git-r3
+else
+	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~mips ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug nls xattr"
+
+RDEPEND="
+	dev-libs/confuse:=
+	dev-libs/libxml2:2
+	net-libs/libisds
+	sys-apps/file
+	sys-libs/readline:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+[[ ${PV} == *9999 ]] && BDEPEND+="
+	app-text/docbook-xsl-stylesheets
+	app-text/po4a
+	dev-libs/libxslt"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-fatalwarnings
+		--enable-doc
+		--without-docbook-xsl-stylesheets
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable xattr)
+	)
+	[[ ${PV} == *9999 ]] && myeconfargs+=(
+		--with-docbook-xsl-stylesheets
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-misc/shigofumi/shigofumi-9999.ebuild b/net-misc/shigofumi/shigofumi-9999.ebuild
index 8667bb035c0c..398763fed882 100644
--- a/net-misc/shigofumi/shigofumi-9999.ebuild
+++ b/net-misc/shigofumi/shigofumi-9999.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-WANT_AUTOMAKE="1.11"
-inherit autotools
+EAPI=8
 
 DESCRIPTION="Command line client for ISDS"
 HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
-if [[ ${PV} = 9999* ]]; then
+
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI='https://repo.or.cz/shigofumi.git'
-	inherit git-r3
+	inherit autotools git-r3
 else
 	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~mips ~x86"
@@ -18,34 +16,41 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="debug doc nls xattr"
+IUSE="debug nls xattr"
 
 RDEPEND="
-	dev-libs/confuse:0=
+	dev-libs/confuse:=
 	dev-libs/libxml2:2
-	sys-libs/readline:0=
-	>=net-libs/libisds-0.7
-	xattr? ( sys-apps/attr )
-"
-DEPEND="${RDEPEND}
+	net-libs/libisds
+	sys-apps/file
+	sys-libs/readline:="
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	nls? ( sys-devel/gettext )
-"
+	nls? ( sys-devel/gettext )"
+
+[[ ${PV} == *9999 ]] && BDEPEND+="
+	app-text/docbook-xsl-stylesheets
+	app-text/po4a
+	dev-libs/libxslt"
 
 src_prepare() {
 	default
-	[[ ${PV} = 9999* ]] && eautoreconf
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-fatalwarnings \
-		$(use_enable debug) \
-		$(use_enable doc) \
-		$(use_enable nls) \
+	local myeconfargs=(
+		--disable-fatalwarnings
+		--enable-doc
+		--without-docbook-xsl-stylesheets
+		$(use_enable debug)
+		$(use_enable nls)
 		$(use_enable xattr)
+	)
+	[[ ${PV} == *9999 ]] && myeconfargs+=(
+		--with-docbook-xsl-stylesheets
+	)
+
+	econf "${myeconfargs[@]}"
 }
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index f3473995f933..a61f33db2037 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,5 +1,3 @@
-DIST smb4k-3.0.6.tar.xz 3842424 BLAKE2B 7c42007a00b3da07bdc1629360bb8640c66ac7332fefca82698664cf197d4061d6c4419ab99ebd29e6515dace194973be2c179fa3c422820716fc5e5e1b8591f SHA512 993f669c12db30dd78f9f6cc694dfe563958407582f65ff64b6ada36cf4372ad6bb5addecc93970ce6750d031bf4ee9dfefa362e13100d2ce8d3e848a0d89382
 DIST smb4k-3.1.0.tar.xz 3177236 BLAKE2B 17d1fb32acbadd3af2447aab1c1e49c40c1a1b25204f31e366831e380e2a16f4b637f242afd5dfa41cc991e76570bdc0f8a804b1374290c44c417ed07f33f4ba SHA512 b12d054ccd4d8fdf3d975503c07b4c17321201651f68be03be6384e9c2ff127384737d0d5bdcb8d845c6edc21e20d7fd6a06cfe60af31ea6bc0373159771b5d1
-EBUILD smb4k-3.0.6.ebuild 1861 BLAKE2B 4361e390e11a5b3b3821b9300d6f5bd46c1f37460c325d7793f93b32d6228daef0db6eafdaffe75a7e192d6bb4c6737ee46a89750755eb3a560cd18c1b678d58 SHA512 a60dbf1b19f7a0d6a8d8d0198203a6d285187d8fdf55bec1cbcbb1fc7e729476c8c74992a5bf20599b2f00ce267c53928bd21cc9cd311adc20a4095df69a74c5
-EBUILD smb4k-3.1.0.ebuild 2035 BLAKE2B 41e2c505db211256a3f25fca23e6827c100c6991b92bbc0e4986bbcbd0c543f36e670382a8dde4c5a717a6227b3e6d181d8ca5ef63486e9f85b7b9edfdb2b989 SHA512 1a2bb7eca89ffc8f232655fef757b5f9b4142e02b81f52df3944be3eb123606f806f7d181762bc7f3ebdc4abdf39263b478a9cd2af5171e984673768b0793983
+EBUILD smb4k-3.1.0.ebuild 2033 BLAKE2B 78645a0f69655b4023cb6e8e2d7372c0521c55ba3a2f65ba11f3ae66d6b7a81311dd6bd3df775d21ec522a8d216968b063f8d9877dbb67027a69818625b8b1e4 SHA512 f00862ed637a232ccfdd78fd24d4af9e0a768d3269bf9fa7268b6375f7bb1e1bff54f2f9553f4e9893f4e39b3c431076ef84dda18a2fe50b40f04f417f3264e4
 MISC metadata.xml 472 BLAKE2B 408bc0b971e4ab55cc7de279ae23f4cdf8a9385f0d5c9120421b17c032708b0bb967c82d81d4f74e5f8dbd969c2892c0884e7ca4f97aafd31ffe95bbd17716d0 SHA512 055513ca41ae499d8ffc1ed75353a5b1f7da8df91d6e2b5998d101fe1c3a7be96b45bb63f114fd844b335d272722433feb4f81a07d60b25415802f4044abdac2
diff --git a/net-misc/smb4k/smb4k-3.0.6.ebuild b/net-misc/smb4k/smb4k-3.0.6.ebuild
deleted file mode 100644
index 0466ede258ea..000000000000
--- a/net-misc/smb4k/smb4k-3.0.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://apps.kde.org/smb4k/
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-fs/samba[cups]
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_PLASMOID=$(usex plasma)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Users of Samba 4.7 and above please note that for the time being,"
-	elog "the following setting has to be added to or changed in the [global]"
-	elog "section of the smb.conf file:"
-	elog
-	elog "[global]"
-	elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.1.0.ebuild b/net-misc/smb4k/smb4k-3.1.0.ebuild
index e82ccc21919f..8b9bf80d294e 100644
--- a/net-misc/smb4k/smb4k-3.1.0.ebuild
+++ b/net-misc/smb4k/smb4k-3.1.0.ebuild
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 93cfe04b8a07..e0deaa2c3ba7 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -4,9 +4,9 @@ DIST sslh-1.21.tar.gz 111298 BLAKE2B 46003021292436023c7f2e0d9cbfb283f4ca7497f5d
 DIST sslh-1.21b.tar.gz 111740 BLAKE2B 5d42eab551e05ac1367da9ae85eac945657e086672712c148ee07c78af5c2a546e696d77081c7282e77c8bef535c186f89d541489f07153bd7ca2d338b341a48 SHA512 59bd33b47b70f82ae1ba3d6ffac3d54897dc6b7343d0d9e3bb8384adc30ac8a44a64e71590a7eecc5a83c2f70712bd79c0eb4ea8eef15ae770633dead9888c5f
 DIST sslh-1.21c.tar.gz 111895 BLAKE2B 3ec7a4a4f8eb7ec3d22e9630070037ebef7df2cbe3657a38234573ecf4eb9f331914858f703690b094ddc1977cd80b3a5760b94004f35a2ec2c59761f6cd142e SHA512 9446c6afe965684c5d6406ac8917338f57d95f8fbfacd7a51193dd5dbac77e1ed5e39eb8e2575e7025a8612b25e9fba7e64832a48c999f366875217b9328da22
 DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a
-EBUILD sslh-1.20-r1.ebuild 1929 BLAKE2B eba93f9518e5dff10b6cf1e41922457f3527a8c2c8b00170125166fdfae56839a0a24c93c83c2e1a0a8b23f294c312d493a1bd821362a8f5ad535e277057c50c SHA512 1d1734e8b1dce6c26c619402a7194e3386130c48f5392b785f0eef43b80f24f344acb2eaab43fb4b495980e94383c1ced53f4d88027f09c6c3d35d32b95fb1f1
-EBUILD sslh-1.21-r1.ebuild 1927 BLAKE2B 3a0a8bb7733eaf9b89f2ca0d26ac61c9e729f30924ca8544aaac1dbb95f2e29eb6978c06b72a7e125366cc5175d036f30eed9b296a16eb83200405668a1e77da SHA512 a458923fc4a157ee506ef578d9155b46b709b47ac6c79b2a08c85c374826968b38bb746784b563535f1222f397eddcdf72bca4e832d5333cd0a1b227be389829
-EBUILD sslh-1.21b-r1.ebuild 1927 BLAKE2B 3a0a8bb7733eaf9b89f2ca0d26ac61c9e729f30924ca8544aaac1dbb95f2e29eb6978c06b72a7e125366cc5175d036f30eed9b296a16eb83200405668a1e77da SHA512 a458923fc4a157ee506ef578d9155b46b709b47ac6c79b2a08c85c374826968b38bb746784b563535f1222f397eddcdf72bca4e832d5333cd0a1b227be389829
-EBUILD sslh-1.21c-r1.ebuild 1927 BLAKE2B 3a0a8bb7733eaf9b89f2ca0d26ac61c9e729f30924ca8544aaac1dbb95f2e29eb6978c06b72a7e125366cc5175d036f30eed9b296a16eb83200405668a1e77da SHA512 a458923fc4a157ee506ef578d9155b46b709b47ac6c79b2a08c85c374826968b38bb746784b563535f1222f397eddcdf72bca4e832d5333cd0a1b227be389829
-EBUILD sslh-9999.ebuild 1949 BLAKE2B 79a3ece7a5661b89708ac99bca1ad206bd5ca7e997551fd1393f4c75510fe7ce73e2196093fa25dfad3a324285925a2b32a26f34fc35cdad02789a5a92b823fa SHA512 55998165014dc2ce31124206fc9248bfbfdb1bc5ed0f4c66d78bad67fa51591780ac6c2face08bc0f3ef31bb628f945b69e714abee27ce9aed9ffee1f47a3834
+EBUILD sslh-1.20-r2.ebuild 1929 BLAKE2B 1cc0b4554e89aee8e7cde80da933824674a4ebf926bbc7fbf94186cb06e367ba4422949e20bb90f4dab2d85ad1ad59b613507b37b47df9d905254bdc0f80dea5 SHA512 4a9288d4dea17c0dd6ffab5ea1219b37f77c61675ca61a4baf443119c0543b3fae48c48923fc3b75653ffc01d340c302059d88abd96ae6aa89c3984fdb0d662f
+EBUILD sslh-1.21-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff0a63acef5725e945423e365e9c8827173398cd1eb766ec3c145f967852b1e162a5e7906a7e4b75a60c4f3fbb2 SHA512 fd51f1353e53206b28336f9faee1d97de876dc72259ca866b466175d42841ff59ed52bd654a964c05f078bbb0de0d11ab7e1bd3a0626c235084273fd7e136dcf
+EBUILD sslh-1.21b-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff0a63acef5725e945423e365e9c8827173398cd1eb766ec3c145f967852b1e162a5e7906a7e4b75a60c4f3fbb2 SHA512 fd51f1353e53206b28336f9faee1d97de876dc72259ca866b466175d42841ff59ed52bd654a964c05f078bbb0de0d11ab7e1bd3a0626c235084273fd7e136dcf
+EBUILD sslh-1.21c-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff0a63acef5725e945423e365e9c8827173398cd1eb766ec3c145f967852b1e162a5e7906a7e4b75a60c4f3fbb2 SHA512 fd51f1353e53206b28336f9faee1d97de876dc72259ca866b466175d42841ff59ed52bd654a964c05f078bbb0de0d11ab7e1bd3a0626c235084273fd7e136dcf
+EBUILD sslh-9999.ebuild 1907 BLAKE2B b162585a30d535683f62186a3347496908b8593afc64e97ccf2503cfa2f3683c6dbe7567e31285fd5696e70d72c1395d3ee949afbc199f8577b6df1a9ea6ea39 SHA512 822016551a1f66789e1d76e2f5b71f2fed705d03711251564568577791d24617a7fc852eb27d38ea674d38ff30d7bcdd5caa543a251d7d52029f509c85bab514
 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da
diff --git a/net-misc/sslh/sslh-1.20-r1.ebuild b/net-misc/sslh/sslh-1.20-r1.ebuild
deleted file mode 100644
index 55f5f8809262..000000000000
--- a/net-misc/sslh/sslh-1.20-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
-HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86"
-	MY_P="${PN}-v${PV}"
-	SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps pcre systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5:="
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre:= )"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/MAN/s:| gzip -9 - >:>:' \
-		-e '/MAN=sslh.8.gz/s:.gz::' \
-		Makefile || die
-}
-
-src_compile() {
-	# On older versions of GCC, the default gnu89 variant
-	# will reject within-for-loop initializers, bug #595426
-	# Furthermore, we need to use the gnu variant (gnu99) instead
-	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
-	# to be defined.
-	append-cflags -std=gnu99
-
-	emake \
-		CC="$(tc-getCC)" \
-		USELIBPCRE=$(usev pcre) \
-		USELIBCAP=$(usev caps) \
-		USELIBWRAP=$(usev tcpd) \
-		USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
-	dosbin sslh-{fork,select}
-	dosym sslh-fork /usr/sbin/sslh
-
-	doman ${PN}.8
-
-	dodoc ChangeLog README.md
-
-	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
-	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
-
-	if use systemd; then
-		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
-		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
-		systemd_newunit scripts/systemd.sslh.service sslh.service
-		exeinto /usr/lib/systemd/system-generators/
-		doexe systemd-sslh-generator
-	fi
-}
diff --git a/net-misc/sslh/sslh-1.20-r2.ebuild b/net-misc/sslh/sslh-1.20-r2.ebuild
new file mode 100644
index 000000000000..f9a1e233c7eb
--- /dev/null
+++ b/net-misc/sslh/sslh-1.20-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
+	inherit git-r3
+else
+	KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86"
+	MY_P="${PN}-v${PV}"
+	SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps pcre systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	pcre? ( dev-libs/libpcre:= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	>=dev-libs/libconfig-1.5:="
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/MAN/s:| gzip -9 - >:>:' \
+		-e '/MAN=sslh.8.gz/s:.gz::' \
+		Makefile || die
+}
+
+src_compile() {
+	# On older versions of GCC, the default gnu89 variant
+	# will reject within-for-loop initializers, bug #595426
+	# Furthermore, we need to use the gnu variant (gnu99) instead
+	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
+	# to be defined.
+	append-cflags -std=gnu99
+
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBPCRE=$(usev pcre) \
+		USELIBCAP=$(usev caps) \
+		USELIBWRAP=$(usev tcpd) \
+		USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	dosym sslh-fork /usr/sbin/sslh
+
+	doman ${PN}.8
+
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+	if use systemd; then
+		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
+		systemd_newunit scripts/systemd.sslh.service sslh.service
+		exeinto /usr/lib/systemd/system-generators/
+		doexe systemd-sslh-generator
+	fi
+}
diff --git a/net-misc/sslh/sslh-1.21-r1.ebuild b/net-misc/sslh/sslh-1.21-r1.ebuild
deleted file mode 100644
index db0cf15ce9e6..000000000000
--- a/net-misc/sslh/sslh-1.21-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
-HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
-	SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S=${WORKDIR}/${P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps pcre systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5:="
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre:= )"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/MAN/s:| gzip -9 - >:>:' \
-		-e '/MAN=sslh.8.gz/s:.gz::' \
-		Makefile || die
-}
-
-src_compile() {
-	# On older versions of GCC, the default gnu89 variant
-	# will reject within-for-loop initializers, bug #595426
-	# Furthermore, we need to use the gnu variant (gnu99) instead
-	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
-	# to be defined.
-	append-cflags -std=gnu99
-
-	emake \
-		CC="$(tc-getCC)" \
-		USELIBPCRE=$(usev pcre) \
-		USELIBCAP=$(usev caps) \
-		USELIBWRAP=$(usev tcpd) \
-		USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
-	dosbin sslh-{fork,select}
-	dosym sslh-fork /usr/sbin/sslh
-
-	doman ${PN}.8
-
-	dodoc ChangeLog README.md
-
-	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
-	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
-
-	if use systemd; then
-		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
-		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
-		systemd_newunit scripts/systemd.sslh.service sslh.service
-		exeinto /usr/lib/systemd/system-generators/
-		doexe systemd-sslh-generator
-	fi
-}
diff --git a/net-misc/sslh/sslh-1.21-r2.ebuild b/net-misc/sslh/sslh-1.21-r2.ebuild
new file mode 100644
index 000000000000..fa5062502fa5
--- /dev/null
+++ b/net-misc/sslh/sslh-1.21-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
+	SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S=${WORKDIR}/${P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps pcre systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	pcre? ( dev-libs/libpcre:= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	>=dev-libs/libconfig-1.5:="
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/MAN/s:| gzip -9 - >:>:' \
+		-e '/MAN=sslh.8.gz/s:.gz::' \
+		Makefile || die
+}
+
+src_compile() {
+	# On older versions of GCC, the default gnu89 variant
+	# will reject within-for-loop initializers, bug #595426
+	# Furthermore, we need to use the gnu variant (gnu99) instead
+	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
+	# to be defined.
+	append-cflags -std=gnu99
+
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBPCRE=$(usev pcre) \
+		USELIBCAP=$(usev caps) \
+		USELIBWRAP=$(usev tcpd) \
+		USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	dosym sslh-fork /usr/sbin/sslh
+
+	doman ${PN}.8
+
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+	if use systemd; then
+		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
+		systemd_newunit scripts/systemd.sslh.service sslh.service
+		exeinto /usr/lib/systemd/system-generators/
+		doexe systemd-sslh-generator
+	fi
+}
diff --git a/net-misc/sslh/sslh-1.21b-r1.ebuild b/net-misc/sslh/sslh-1.21b-r1.ebuild
deleted file mode 100644
index db0cf15ce9e6..000000000000
--- a/net-misc/sslh/sslh-1.21b-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
-HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
-	SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S=${WORKDIR}/${P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps pcre systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5:="
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre:= )"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/MAN/s:| gzip -9 - >:>:' \
-		-e '/MAN=sslh.8.gz/s:.gz::' \
-		Makefile || die
-}
-
-src_compile() {
-	# On older versions of GCC, the default gnu89 variant
-	# will reject within-for-loop initializers, bug #595426
-	# Furthermore, we need to use the gnu variant (gnu99) instead
-	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
-	# to be defined.
-	append-cflags -std=gnu99
-
-	emake \
-		CC="$(tc-getCC)" \
-		USELIBPCRE=$(usev pcre) \
-		USELIBCAP=$(usev caps) \
-		USELIBWRAP=$(usev tcpd) \
-		USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
-	dosbin sslh-{fork,select}
-	dosym sslh-fork /usr/sbin/sslh
-
-	doman ${PN}.8
-
-	dodoc ChangeLog README.md
-
-	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
-	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
-
-	if use systemd; then
-		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
-		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
-		systemd_newunit scripts/systemd.sslh.service sslh.service
-		exeinto /usr/lib/systemd/system-generators/
-		doexe systemd-sslh-generator
-	fi
-}
diff --git a/net-misc/sslh/sslh-1.21b-r2.ebuild b/net-misc/sslh/sslh-1.21b-r2.ebuild
new file mode 100644
index 000000000000..fa5062502fa5
--- /dev/null
+++ b/net-misc/sslh/sslh-1.21b-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
+	SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S=${WORKDIR}/${P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps pcre systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	pcre? ( dev-libs/libpcre:= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	>=dev-libs/libconfig-1.5:="
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/MAN/s:| gzip -9 - >:>:' \
+		-e '/MAN=sslh.8.gz/s:.gz::' \
+		Makefile || die
+}
+
+src_compile() {
+	# On older versions of GCC, the default gnu89 variant
+	# will reject within-for-loop initializers, bug #595426
+	# Furthermore, we need to use the gnu variant (gnu99) instead
+	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
+	# to be defined.
+	append-cflags -std=gnu99
+
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBPCRE=$(usev pcre) \
+		USELIBCAP=$(usev caps) \
+		USELIBWRAP=$(usev tcpd) \
+		USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	dosym sslh-fork /usr/sbin/sslh
+
+	doman ${PN}.8
+
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+	if use systemd; then
+		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
+		systemd_newunit scripts/systemd.sslh.service sslh.service
+		exeinto /usr/lib/systemd/system-generators/
+		doexe systemd-sslh-generator
+	fi
+}
diff --git a/net-misc/sslh/sslh-1.21c-r1.ebuild b/net-misc/sslh/sslh-1.21c-r1.ebuild
deleted file mode 100644
index db0cf15ce9e6..000000000000
--- a/net-misc/sslh/sslh-1.21c-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
-HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
-	SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S=${WORKDIR}/${P}
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps pcre systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5:="
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre:= )"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/MAN/s:| gzip -9 - >:>:' \
-		-e '/MAN=sslh.8.gz/s:.gz::' \
-		Makefile || die
-}
-
-src_compile() {
-	# On older versions of GCC, the default gnu89 variant
-	# will reject within-for-loop initializers, bug #595426
-	# Furthermore, we need to use the gnu variant (gnu99) instead
-	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
-	# to be defined.
-	append-cflags -std=gnu99
-
-	emake \
-		CC="$(tc-getCC)" \
-		USELIBPCRE=$(usev pcre) \
-		USELIBCAP=$(usev caps) \
-		USELIBWRAP=$(usev tcpd) \
-		USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
-	dosbin sslh-{fork,select}
-	dosym sslh-fork /usr/sbin/sslh
-
-	doman ${PN}.8
-
-	dodoc ChangeLog README.md
-
-	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
-	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
-
-	if use systemd; then
-		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
-		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
-		systemd_newunit scripts/systemd.sslh.service sslh.service
-		exeinto /usr/lib/systemd/system-generators/
-		doexe systemd-sslh-generator
-	fi
-}
diff --git a/net-misc/sslh/sslh-1.21c-r2.ebuild b/net-misc/sslh/sslh-1.21c-r2.ebuild
new file mode 100644
index 000000000000..fa5062502fa5
--- /dev/null
+++ b/net-misc/sslh/sslh-1.21c-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
+	SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S=${WORKDIR}/${P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps pcre systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	pcre? ( dev-libs/libpcre:= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	>=dev-libs/libconfig-1.5:="
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/MAN/s:| gzip -9 - >:>:' \
+		-e '/MAN=sslh.8.gz/s:.gz::' \
+		Makefile || die
+}
+
+src_compile() {
+	# On older versions of GCC, the default gnu89 variant
+	# will reject within-for-loop initializers, bug #595426
+	# Furthermore, we need to use the gnu variant (gnu99) instead
+	# of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
+	# to be defined.
+	append-cflags -std=gnu99
+
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBPCRE=$(usev pcre) \
+		USELIBCAP=$(usev caps) \
+		USELIBWRAP=$(usev tcpd) \
+		USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	dosym sslh-fork /usr/sbin/sslh
+
+	doman ${PN}.8
+
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-3 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+	if use systemd; then
+		# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+		sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
+		systemd_newunit scripts/systemd.sslh.service sslh.service
+		exeinto /usr/lib/systemd/system-generators/
+		doexe systemd-sslh-generator
+	fi
+}
diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild
index 81bb80b2588f..d0a8689cff13 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-9999.ebuild
@@ -18,16 +18,16 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="caps pcre systemd tcpd"
+IUSE="caps systemd tcpd"
 
 RDEPEND="caps? ( sys-libs/libcap )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5:="
+	>=dev-libs/libconfig-1.5:=
+	dev-libs/libpcre2:="
 DEPEND="${RDEPEND}
 	dev-util/conf2struct
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre:= )"
+	dev-lang/perl"
 
 RESTRICT="test"
 
@@ -49,7 +49,6 @@ src_compile() {
 
 	emake \
 		CC="$(tc-getCC)" \
-		USELIBPCRE=$(usev pcre) \
 		USELIBCAP=$(usev caps) \
 		USELIBWRAP=$(usev tcpd) \
 		USESYSTEMD=$(usev systemd)
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 4a60a20412ae..e2d7d81451c8 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -7,8 +7,6 @@ AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311
 DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac SHA512 262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
-EBUILD tigervnc-1.11.0-r2.ebuild 4119 BLAKE2B 4391703cb314cf923b455ba36270f7a12f5f8d89f441d9cacc57d8b2a9e5b73c6b087941ec4238f61d937b8fd193a9324d3820942bc7b57140d826fe2427cbab SHA512 6c7d465314a4b12699cbfd68e9ec07a84d719f25c57b5f97cceb8f15ab44c2b1dda1bce4243520422ffcf177c1773bd0c8310acdf214042dea51e15df4bdc70a
 EBUILD tigervnc-1.11.0-r3.ebuild 4113 BLAKE2B 09995fb98a43899b50d2f6ca7051d713fb0c76593c405d1b36c5f5b37b23513493bd9ee67eda9704a2ac44ec394dfab9ae1d6889778c254f14ca8759ec9f04f7 SHA512 7ec990a1747655c78051c782034bde44bb2cf89b3c7a4e521b38cb085a8f4ba480415f6f32590f2b6cbaaa083c9c728243e7f3191e30a2eb804880dd06735283
-EBUILD tigervnc-1.9.0-r1.ebuild 4488 BLAKE2B 43b4cfaee8dd183e5b5591c2b20248f79503770c5ba2ef69e64f7defad9a3534265dffb12b17700f52dbee1bcad144be1d9df82115a728fd931c979ee64385e8 SHA512 5428d3bc4828e04fb6919b5818b72d73f7f6e2d66179e6b1ca94c742d7826d20545d40f0cf88af5d81543d06af75fc1198b66ada3fd2322db9225774efc57b6c
-EBUILD tigervnc-1.9.0-r2.ebuild 4446 BLAKE2B 5804fffa0eecc1cb0327d715a4cd86293c879a5e2098aeb50df71a5a2f7e0e31ec8ccf01ef9657c53862688db2bde59a4f12a9b0d7d43c1bfebcb86970f61bd9 SHA512 5930af12c2fee57a14706cc28afeea3837229676a0912423297113100a40af258c7ad56f48788784581e4ba79e67e42bf03f7becc4f54f5ab5b4bc45d1135a68
+EBUILD tigervnc-1.9.0-r2.ebuild 4441 BLAKE2B 382a526908be00b9950ea532acf9333fc02a7cc54a73fc69842fb8277fdcc2cadc68e5a7db062336be6c0f0597ed2de7501cae83b3574fed55cd401e209b6a2d SHA512 86f4e20b142df805a4a9d3d509065bdd1679e64e456437d26d88aa0c84c24cbcab142015aafa7d195b31bcc40d4090da18a874b43875b4eb499a23c3cd0c859d
 MISC metadata.xml 470 BLAKE2B de3d7d8fab83908aa664760afe1d401f016be431c67eee547127f3ee94f290d0127cc972e2d27f31b9adc0d48786f755a94ac8d1e605ce3e8e02fcf7144b7af3 SHA512 b31d1126757d68a177817cfa7069e07277742222c02dbb0e0a26ed5a144f68eeda94db5cdaec760a2b8abb491fe420867dbf06d89b6a4c1a3edfdbb1461999c3
diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild
deleted file mode 100644
index 6b3e1e476600..000000000000
--- a/net-misc/tigervnc/tigervnc-1.11.0-r2.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
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
-
-XSERVER_VERSION="1.20.0"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
-
-CDEPEND="
-	virtual/jpeg:0
-	sys-libs/zlib:=
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( sys-libs/pam )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/pixman
-	server? (
-		x11-libs/libXau
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXfont2
-		x11-libs/libXtst
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-		dev-libs/openssl:0=
-	)
-	xinerama? ( x11-libs/libXinerama )
-	"
-
-RDEPEND="${CDEPEND}
-	!net-misc/tightvnc
-	!net-misc/vnc
-	!net-misc/xf4vnc
-	java? ( >=virtual/jre-1.5:* )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	java? ( >=virtual/jdk-1.5 )
-	x11-base/xorg-proto
-	media-libs/fontconfig
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	server? (
-		dev-libs/libbsd
-		x11-libs/libxkbfile
-		x11-libs/libxshmfence
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-libs/xtrans-1.3.3
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
-	)"
-
-src_prepare() {
-	if use server; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	cmake_src_prepare
-
-	if use server; then
-		cd unix/xserver || die
-		eapply "${FILESDIR}"/xserver120.patch
-		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
-		sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if use arm || use hppa; then
-		append-flags "-fPIC"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
-	)
-
-	cmake_src_configure
-
-	if use server; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			$(use_enable dri3) \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			$(use_enable xinerama) \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--with-sha1=libcrypto
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use server; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
-			damageext miext Xi xkb composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use server; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
-		else
-			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		systemd_douserunit unix/vncserver/vncserver@.service
-	else
-		local f
-		for f in x0vncserver vncconfig; do
-			rm "${ED}"/usr/bin/${f} || die
-			rm "${ED}"/usr/share/man/man1/${f}.1 || die
-		done
-		rm -r "${ED}"/usr/{sbin,libexec} || die
-		rm -r "${ED}"/usr/share/man/man8 || die
-	fi
-}
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
deleted file mode 100644
index f455a2bea0dd..000000000000
--- a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd xdg-utils gnome2-utils
-
-XSERVER_VERSION="1.20.0"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
-
-CDEPEND="
-	virtual/jpeg:0
-	sys-libs/zlib:=
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( sys-libs/pam )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	server? (
-		x11-libs/libXau
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXfont2
-		x11-libs/libXtst
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-		dev-libs/openssl:0=
-	)
-	xinerama? ( x11-libs/libXinerama )
-	"
-
-RDEPEND="${CDEPEND}
-	!net-misc/tightvnc
-	!net-misc/vnc
-	!net-misc/xf4vnc
-	java? ( >=virtual/jre-1.5:* )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	java? ( >=virtual/jdk-1.5 )
-	x11-base/xorg-proto
-	media-libs/fontconfig
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	server? (
-		dev-libs/libbsd
-		x11-libs/libxkbfile
-		x11-libs/libxshmfence
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-libs/xtrans-1.3.3
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-030_manpages.patch
-	"${FILESDIR}"/${P}-055_xstartup.patch
-)
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	# do not rely on the build system to install docs
-	sed -i 's:^\(install(.* DESTINATION ${DOC_DIR})\):#\1:' \
-		cmake/BuildPackages.cmake || die
-
-	cmake-utils_src_prepare
-
-	if use server ; then
-		cd unix/xserver || die
-		eapply "${FILESDIR}"/xserver120.patch
-		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
-		sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if use arm || use hppa ; then
-		append-flags "-fPIC"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
-	)
-
-	cmake-utils_src_configure
-
-	if use server ; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			$(use_enable dri3) \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			$(use_enable xinerama) \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--with-sha1=libcrypto
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server ; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render damageext miext Xi xkb
-			composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use server ; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
-		else
-			rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		systemd_douserunit contrib/systemd/user/vncserver@.service
-	else
-		local f
-		cd "${ED}" || die
-		for f in vncserver x0vncserver vncconfig; do
-			rm usr/bin/$f || die
-			rm usr/share/man/man1/$f.1 || die
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
index d437a75767e6..099a5b57f34a 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
 
 CDEPEND="
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index e13dfb118c5c..f731321f5b41 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -3,7 +3,7 @@ AUX xmrig.service 835 BLAKE2B 96a6d52cae6730a08d06563cac47f054b86e8bd78972ab3535
 DIST xmrig-6.12.2.tar.gz 1628708 BLAKE2B 4fca418c7e0d6df25c84609d657a050f7df6383d0a5ee3a4ebf87ff26805d4f445d6c184df1651813e21ac4c972e0681d37ccb45a493cb4d1e199a6ba5e707c5 SHA512 a1e8d37955177f0988b0683c9b92dc6eef4bcaea68b3c1411917929a0573119cd13107e5a68a2a7971ec45bf2554aed5fc7d82c11d49e7411e95d9b81fe1a911
 DIST xmrig-6.13.0.tar.gz 1694984 BLAKE2B 6449df3fe7a42c5caa9050d0e7ef8723cb36175d6e624dae04f0c7d68670a41f705e8676acb6a377c35d7d572ca6e42ae0833bbf8fcb84ebdefa7a50027b0151 SHA512 49e55aef9c316b14b5974f58c3083486f097c1d2bfec10b0e615efcfb642b0186f2de866b5b88eb9fe2ee0153dd3ff7749936d142825928c68e96595478b9dc8
 DIST xmrig-6.13.1.tar.gz 1695005 BLAKE2B 8094a7f247d1b1f714a22fcdddcbede0d859f4883c6fcb1789ce134bdae31875da434679bdb141cd332a575ca0e4fa80b8ca96e603e8c381e9073c58394abe71 SHA512 f1a4e11f6e13bd275f2d867f1a4826cb244bdc9d157e590870ebc4dcd3cafc522bf7f46cfb4eb81e129fc3f9dbef59219288088c42e8f6b876ac16b5b6224323
-EBUILD xmrig-6.12.2.ebuild 1285 BLAKE2B f15b873ba2ccd6b9d3ec6e62caaa5bc42a1f8aec5fcd34125a7fa342a581189665e61dbe76f58942e6c016f17f27cdef772abbe874a72ce15a103075a1472437 SHA512 4de94d4676131fad47a5f5cfd43822f210895cb55b724d7ead73c075af5dcc892e1abd896e230be5b063965df207e6617e34cc7cfe695723820ea2a78763fd52
+EBUILD xmrig-6.12.2.ebuild 1284 BLAKE2B ad14cf0ce42c072c6a640e32927035704a2144f76462d98fe108aae7b970ae27304abdb0600561a159ddd22874c08a19e4d42b308b1fdd6b1f9049c0f13d1c03 SHA512 87d2e6897670dd2d43383f305718536ed6769482556d8b3e88988521b4434cd635f4c5b5f0e59f59638e0851135cbf226492837e30ef96c650a1b7f71305c201
 EBUILD xmrig-6.13.0.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
 EBUILD xmrig-6.13.1.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
 EBUILD xmrig-9999.ebuild 1286 BLAKE2B 5bdf3a943db95f04cc89874e01da31da394afdb598201a80d2f0a96f5a673aa0d487d25fcaad3399f6e2d159998575eec0685168c29d6338af40efde76d22b66 SHA512 1d2fbd241abbd39eea115a0c13741be5e57a2ce70f76a0fc1ec7f14e12182522c0e887a9a265943ace2b7b58e3732782de6053783b31202c64cdf6aacec11c15
diff --git a/net-misc/xmrig/xmrig-6.12.2.ebuild b/net-misc/xmrig/xmrig-6.12.2.ebuild
index 81cbcc47b6f9..809b9c2c5aa0 100644
--- a/net-misc/xmrig/xmrig-6.12.2.ebuild
+++ b/net-misc/xmrig/xmrig-6.12.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 LICENSE="Apache-2.0 GPL-3+ MIT"
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 314925039628..76494f40a29f 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index a2ce2327dfb8..920801ff03f9 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,8 +1,8 @@
 AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef90c28b170b84ecd3a82da77b582b69ef442a9a455752192ba4b6b33aeb9a43587c0209fdf380342 SHA512 025ec93c208173771fe697574c9161b9af8d740eab0b1290c8d3857961dc3635339bdb9c18b97fdde6fa7dc8924f4453b9c609ca57e61f1cad9ff47683fb613e
 AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721
 AUX airdcppd.service 302 BLAKE2B 5e446eb4253c71648e8e6850da4d71e6f16bdb6d82b611882ba4b1ff755073ff611a5502f5f9dbfc94020610ccef9a022add2f85721d464cba94907320618e66 SHA512 79aa352d7943e5297835ec226142661f084a39bd8ccaebace8d4356db995e2eff7c77a9f04ee636bd50e61103bc5a30e83fa126ffa8d77ec068053da2c1b9508
-DIST airdcpp-webclient-2.10.1.tar.gz 964433 BLAKE2B aa0db1c199e0546a35dddb7750ae9b2723afe09ab77a3ee17c02a1f592afc4075eab1017ea4114f07ee2e4d363aabfde510647f4e25569835312f120677cb1c6 SHA512 82a0ab406fa5861deea5be6a06682f2a756d3140ec85faf0cd1f9c5ddbae3a63acdad560f7196e7a25de0183e6647954ad7428fc327f81578a4b64a0e2ce088f
 DIST airdcpp-webclient-2.11.0.tar.gz 967326 BLAKE2B 47d257e47c332b4fd5351a680f0585360cb7329cd1bcf3c478d0a7847adbee68c024af7136eeb3b551188d3af7c4a6db2257eefaca7f82ee4670667a4a6e3e63 SHA512 926457e76b6bd29e0124c519b67d9e0f3cee48192c1b56e073b84d65f0171d53a7a4dbaf55e100f0685e01116935f4e4e2c193dab0ef0bed08d8101e12c33b82
-EBUILD airdcpp-webclient-2.10.1-r1.ebuild 1375 BLAKE2B 8b89e42b19e9f5d0f21fa79f401860b4679bb9b270b80d6383bc6c6335b947405369a322eb2ccae9f9ded17b87aad77f1115e5e67fcd2656c5bc05b6e2e9b46d SHA512 d4bd48a915a917c6b82360cc30a26a247c8ec0c56e9833821fdea6bcb36277ccd2e3a4721659501023eedb38a28e71b0f396dad8bdb7fb83cbff1f9ea0103192
+DIST airdcpp-webclient-2.11.1.tar.gz 967966 BLAKE2B d95760f3ae945255a396f20504995a2ea8843071ab19574a6faac919fb411a0a4e44ebcb005afce0056d960729d6b8bdd9df4ca457cea91931eedb1d329c7a12 SHA512 03f6ce82467f824d1b4e10075bf9e28b45282fb977b3feb67fc948044ed592672a83182d4716d0c10591c0b7568417997b335e25827d8e78fbd3735605cd052e
 EBUILD airdcpp-webclient-2.11.0-r1.ebuild 1375 BLAKE2B 8b89e42b19e9f5d0f21fa79f401860b4679bb9b270b80d6383bc6c6335b947405369a322eb2ccae9f9ded17b87aad77f1115e5e67fcd2656c5bc05b6e2e9b46d SHA512 d4bd48a915a917c6b82360cc30a26a247c8ec0c56e9833821fdea6bcb36277ccd2e3a4721659501023eedb38a28e71b0f396dad8bdb7fb83cbff1f9ea0103192
+EBUILD airdcpp-webclient-2.11.1.ebuild 1376 BLAKE2B 47d2187db6f8f01de207a8337f4886b56ef0741ea120cf5d49b109ff1d5f55ef3269e9bbfb28e85afcf97ebbf8e102ef07d90384b31ef8ba755c8d68084c9437 SHA512 68a72d07ffc123c6514333d8bd45421923bb7e2d5f47c162edcef0c01457c3138995591e723dbb51ab84b8738df92c8c1e18014b849fe02c59f8d36ac2a7f5ad
 MISC metadata.xml 804 BLAKE2B 4d7003fed4a4fcf24fcf30ecf7d5e2c8970f4c76e6b37444721d09da8413a1d1aeb3a2d4c22174f02bfb7fff7b38e35f23c85a9070625a3eaf63bf0f68fc20e7 SHA512 1408ae27ba8cce6f6f6d53a5fade6d4bf2ce0587cd0b829c3426d88257e83dcd6c69ba5e3cb143d7ac7a31ad7a59e7324a6faf489162f88b62932b4bf8129268
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.10.1-r1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.10.1-r1.ebuild
deleted file mode 100644
index b70ff5e20049..000000000000
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.10.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=( pypy3 python3_{7..9} )
-
-inherit cmake python-any-r1 systemd
-
-DESCRIPTION="Cross-platform Direct Connect client"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug nat-pmp +tbb +webui"
-
-RDEPEND="
-	acct-user/airdcppd
-	acct-group/airdcppd
-	app-arch/bzip2
-	dev-cpp/websocketpp
-	dev-libs/boost:=
-	dev-libs/leveldb:=
-	dev-libs/libmaxminddb:=
-	dev-libs/openssl:0=[-bindist(-)]
-	net-libs/miniupnpc:=
-	sys-libs/zlib
-	virtual/libiconv
-	nat-pmp? ( net-libs/libnatpmp:= )
-	tbb? ( dev-cpp/tbb:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-PDEPEND="webui? ( www-apps/airdcpp-webui )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_NATPMP=$(usex nat-pmp)
-		-DENABLE_TBB=$(usex tbb)
-		-DINSTALL_WEB_UI=OFF
-	)
-	CMAKE_BUILD_TYPE=$(usex debug Debug Gentoo) cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newconfd "${FILESDIR}/airdcppd.confd" airdcppd
-	newinitd "${FILESDIR}/airdcppd.initd" airdcppd
-	systemd_dounit "${FILESDIR}/airdcppd.service"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Run 'airdcppd --configure' to set up ports and authentication"
-	fi
-}
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.1.ebuild
new file mode 100644
index 000000000000..cc018d24b40d
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.1.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=( pypy3 python3_{7..10} )
+
+inherit cmake python-any-r1 systemd
+
+DESCRIPTION="Cross-platform Direct Connect client"
+HOMEPAGE="https://airdcpp-web.github.io/"
+SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug nat-pmp +tbb +webui"
+
+RDEPEND="
+	acct-user/airdcppd
+	acct-group/airdcppd
+	app-arch/bzip2
+	dev-cpp/websocketpp
+	dev-libs/boost:=
+	dev-libs/leveldb:=
+	dev-libs/libmaxminddb:=
+	dev-libs/openssl:0=[-bindist(-)]
+	net-libs/miniupnpc:=
+	sys-libs/zlib
+	virtual/libiconv
+	nat-pmp? ( net-libs/libnatpmp:= )
+	tbb? ( dev-cpp/tbb:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+PDEPEND="webui? ( www-apps/airdcpp-webui )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NATPMP=$(usex nat-pmp)
+		-DENABLE_TBB=$(usex tbb)
+		-DINSTALL_WEB_UI=OFF
+	)
+	CMAKE_BUILD_TYPE=$(usex debug Debug Gentoo) cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newconfd "${FILESDIR}/airdcppd.confd" airdcppd
+	newinitd "${FILESDIR}/airdcppd.initd" airdcppd
+	systemd_dounit "${FILESDIR}/airdcppd.service"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Run 'airdcppd --configure' to set up ports and authentication"
+	fi
+}
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 6bbd813ed092..7de913676e3d 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,5 +1,6 @@
+AUX ktorrent-21.04.3-fix-tests.patch 1093 BLAKE2B aabbbca3fcf6cdd8d8b9d5c49732351e6daf2da710b984a439a43fb26920ad250f0226a4aed0edb3940852034480fc0bb737bd3579d44924b1385aa8cec903bf SHA512 d65322f860482b0fe7983ebb1642df72bf358cea96816ecd9975126e8c63ac5b2dc3db9410ee17fd61e7085cf26e23b33f1e23d47d9cfd4363e264a6c26df4c2
 DIST ktorrent-20.12.3.tar.xz 2141556 BLAKE2B 8c1bfd675597a724ae6143bddb88005da0ec852a93ef3cc843605b4a3a47d80acba23df2a2cc13ff49efa9e4576269f3157e8456c80388b7e309527befbf0297 SHA512 fb54341368b3260ceefdb9be8bbc62c74397ada1a824a96f9de316caa365be438adc96ed15ee0bc44b7cc0db8eb1082c9ffb49eacb9448c31e8fbfe6e6314e93
 DIST ktorrent-21.04.3.tar.xz 2091116 BLAKE2B bd03c3730a5082c17c58d6453d035fa785b5ee6e0f253d5cd37adb5e43508315deedbdd423a2e453a116a8ab9dedfe78cef063fd11262579d910b1a0f5a36e05 SHA512 70e8baf2d04fe86be09fd4583ba20375ccbec67e5e8b7a8aac252bbe04469ccfb36c55fc5088497f8575f3bef59cff40f48f648d73071e06f676b45504aa935e
 EBUILD ktorrent-20.12.3.ebuild 3088 BLAKE2B f7285f9e6d0071698ec7af6c329a4537e4766aa073265af0c08c50921cd853c4e7db6c8f256102c2292c982c4aadee50b7872a49e6cfbbf621b33bcd4715835f SHA512 736a156c76972306a0e08d376fee53dde944a9434890eca28f8e70535d6a041f7518b20ebc2439e7d612726dc25ad45f506a1c2ba88eee4972947415295d865e
-EBUILD ktorrent-21.04.3.ebuild 3080 BLAKE2B 34e6edcc5b843aff51bd44c57ff24b9714b403c76810543fad88339bbbf8cdc3accc64af42cfe11a17e6c7edca51adc152da42ad7bd5c0d3b22a5bd0aa164577 SHA512 756fc3a8b501bb779aeb28ab21958dd9f7754e694e4dde186ef81948f7bb99a7e7df84d142d2ca08b0fa775810ac15438a75006cdfd12ad0594319b28fe7f58f
+EBUILD ktorrent-21.04.3.ebuild 3126 BLAKE2B 267d8ab24fe076f6f3a93413d12a260812ecfc1755297e444ded9200b65b3801a2c29ce9e84a84b47cdd6cf3113891ce6236deac7bfd5213d7c79c5edb597bf1 SHA512 5868ca0090c8a02404a377323379e0e4ca6d68d0bdddb2e870969f664b829da4fbc46e83eec7eafc5a27c48c9e0d73008a7b9b2573c261f21fb7214ced0c9cff
 MISC metadata.xml 1389 BLAKE2B b928cdf2526433fcf48c5600049b27c9f7c12aa043a332931b5a567d1baff9fa0bb0ac6e4e8de056947637d1253ee338a8b6620e52b294b20cdd7127a3b1c81d SHA512 4cf5204afc5a9f451752efcf1bae64a947c3bbb0d259641a85771071a7c390ee50818518a15c38f47f7778cdb3ff10732428dfff3c99a09049ca8c2486736991
diff --git a/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch b/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch
new file mode 100644
index 000000000000..fc644bd80b8e
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-21.04.3-fix-tests.patch
@@ -0,0 +1,25 @@
+From dfc063a4d1f174cd5f84b82154a58b86da334d35 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta@gmail.com>
+Date: Tue, 18 May 2021 15:15:26 +0000
+Subject: [PATCH] Fix tests with new ecm sytle
+
+* asturm 2021-08-04: Merged w/ c8701e6a9ff52c04c364e8f5dd8f32f44bfeaa93
+---
+ plugins/ipfilter/tests/CMakeLists.txt | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/plugins/ipfilter/tests/CMakeLists.txt b/plugins/ipfilter/tests/CMakeLists.txt
+index ec839aac..6c34b2d0 100644
+--- a/plugins/ipfilter/tests/CMakeLists.txt
++++ b/plugins/ipfilter/tests/CMakeLists.txt
+@@ -1,5 +1,2 @@
+-set(ipblocklisttest_SRCS ipblocklisttest.cpp ../ipblocklist.cpp)
+-add_executable(ipblocklisttest ${ipblocklisttest_SRCS})
+-add_test(ipblocklisttest ipblocklisttest)
+-ecm_mark_as_test(ipblocklisttest)
+-target_link_libraries(ipblocklisttest Qt5::Core Qt5::Network Qt5::Test ktcore)
++include(ECMAddTests)
++ecm_add_test(ipblocklisttest.cpp ../ipblocklist.cpp TEST_NAME ipblocklisttest LINK_LIBRARIES ktcore Qt5::Core Qt5::Network KF5::Torrent  Qt5::Test)
+-- 
+GitLab
+
diff --git a/net-p2p/ktorrent/ktorrent-21.04.3.ebuild b/net-p2p/ktorrent/ktorrent-21.04.3.ebuild
index 2728b9034f1a..a98fb3e20e7d 100644
--- a/net-p2p/ktorrent/ktorrent-21.04.3.ebuild
+++ b/net-p2p/ktorrent/ktorrent-21.04.3.ebuild
@@ -17,11 +17,10 @@ HOMEPAGE="https://apps.kde.org/ktorrent/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
 +mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf"
 
-BDEPEND="sys-devel/gettext"
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -76,6 +75,9 @@ RDEPEND="${COMMON_DEPEND}
 		>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	)
 "
+BDEPEND="sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 1f8562a861d0..c323eefa3d58 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -792,8 +792,8 @@ 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
 DIST syncthing-1.15.1.tar.gz 6110326 BLAKE2B 0d1db888cb5a23fd09856f3733433c0848658c6ceadbaf3acd2fa34e9e03a0477e24392251bdde3ab42f0f43ed1011225227fee28e37915e857720ff76e5f57f SHA512 fdcf9e5b43f8d7923553979bd7cbab8a65deac16def727c4982fb1aae6d43c0c38cc6e3e140cf04ceed3fe6661e8d5fc087df3034e9c32e1ba08ef71f0b96832
 DIST syncthing-1.17.0.tar.gz 6093692 BLAKE2B 20ac82f916bb58c2390d49403e6d2934f5e26029d55750ddf03811294af23cb048d534e28953627d17e5c49532740acbe1c31fd5e3fd45139e0c0c8b4620930f SHA512 6ccc43bf21ce20543031e070b14e5383a1bee6a0c6df5a0e1a914d2fae51f04d7776f715e4874c2b854798cc89236028955be6a462574bdafb6bc9dd56bce854
-DIST syncthing-1.18.0.tar.gz 6143299 BLAKE2B 31510722fa409c9ed4adce62107329933d81eec830b7baf4aa6aea1dbe35168be5370e5654a8a8a0d5f1d6a649ec7ff6a01d7c1195bf33ca86606417a8223a0e SHA512 d8b3de5b4511c5e5a979abb5ca3ba8880e3fd3dd490123d80135d65067bcc3bd16513d2584b1f2427d761923de34289ba68731caef3923190ce0945177dd484f
+DIST syncthing-1.18.1.tar.gz 6145390 BLAKE2B 9c40daad6016a90dda135f91a3d17cf6d5cd0803417488720491fda9d56811bcb6ab6d32c8b638374b2354077261428f1de578ad8171baf4430b937b5ab68d5f SHA512 b20e49ccffda2646ebcf3904077a3496c6ef2744600d98fdd5db45758d9511c0dd9f2f3b5ac37c275e9bdb01827e37a0551bdcec92c118651937cf72ae7adb6e
 EBUILD syncthing-1.15.1.ebuild 39791 BLAKE2B 8cd048b2e8bd021aec1da09b6493b19c82a97d2b144df685a0dc76c868506ca4a3fc82eb4626bb8091300903bb4c51f4745cc1a8a6f8cb224db384def1bd835f SHA512 8112c6436bfde905c6db91e7662b55c48879de2d737395b50faee7920abafe57a054a569632a185f93e323fd7b570dac06aaad859d7b36b953f847ae5eb7d796
 EBUILD syncthing-1.17.0.ebuild 41736 BLAKE2B a523da4c5af2cb733b9d5f71b856341307aebe3a0c1274bfade3730b495fb0a8a35a3096084ebab76bf6f78f4e4843eb3109a9363530ceaf3ea4d90a315c1c7f SHA512 f1c7a83e1d66df27177240e14b835967e1898d8b94f3754f93a41e4c6288dbfe50efbc0c930e8ee21b41b5c00d3de1a72a8a84c38cafd7e9d1ab0f092c8bdbf5
-EBUILD syncthing-1.18.0.ebuild 41411 BLAKE2B 831c0ecc38474b1616df46fb285b32fe325c0b15dfbb8b888e29e1154157f1ad6e377bface2692813b35b4553a0ad7fc6fa12a734983d39d6d927dd0be7f9b7a SHA512 482768dc93ddb86d0166882e29992dc8179cc3d7a0577ce2c507e3183bfe1466fca77147409282730f58f05278dfdbb147844c3035155442dda7f83aa651e51e
+EBUILD syncthing-1.18.1.ebuild 41411 BLAKE2B 5ceca1b939e92f12eb8d330f9a995b226e5046b5a8f8a9ba7a8c87df6a880940f6339528250c10caac0e32b00fd1ee97451f9718d3a90f29cce3262dcc5622e5 SHA512 e42ac3d1dba26ced690eccab7351c845a2549ecbd3196beafc84ce1dfdda96973a6878bdad99e7db66f25cb6c08d19d72938931bd03549fa73be04ed1ab1c37d
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-1.18.0.ebuild b/net-p2p/syncthing/syncthing-1.18.0.ebuild
deleted file mode 100644
index 5f13140be27a..000000000000
--- a/net-p2p/syncthing/syncthing-1.18.0.ebuild
+++ /dev/null
@@ -1,813 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop go-module systemd xdg-utils
-
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.31.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.37.0/go.mod"
-	"dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod"
-	"dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod"
-	"dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod"
-	"dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod"
-	"git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod"
-	"github.com/AudriusButkevicius/pfilter v0.0.0-20210511165305-e9aaf99ab213"
-	"github.com/AudriusButkevicius/pfilter v0.0.0-20210511165305-e9aaf99ab213/go.mod"
-	"github.com/AudriusButkevicius/recli v0.0.6"
-	"github.com/AudriusButkevicius/recli v0.0.6/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
-	"github.com/Shopify/sarama v1.19.0/go.mod"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
-	"github.com/VividCortex/gohistogram v1.0.0/go.mod"
-	"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
-	"github.com/alecthomas/kong v0.2.16"
-	"github.com/alecthomas/kong v0.2.16/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
-	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
-	"github.com/apache/thrift v0.12.0/go.mod"
-	"github.com/apache/thrift v0.13.0/go.mod"
-	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
-	"github.com/aws/aws-lambda-go v1.13.3/go.mod"
-	"github.com/aws/aws-sdk-go v1.27.0/go.mod"
-	"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0/go.mod"
-	"github.com/beorn7/perks v1.0.1"
-	"github.com/beorn7/perks v1.0.1/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e"
-	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e/go.mod"
-	"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod"
-	"github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod"
-	"github.com/calmh/xdr v1.1.0"
-	"github.com/calmh/xdr v1.1.0/go.mod"
-	"github.com/casbin/casbin/v2 v2.1.2/go.mod"
-	"github.com/ccding/go-stun v0.1.3"
-	"github.com/ccding/go-stun v0.1.3/go.mod"
-	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/certifi/gocertifi v0.0.0-20210429200110-83314bf6d27c"
-	"github.com/certifi/gocertifi v0.0.0-20210429200110-83314bf6d27c/go.mod"
-	"github.com/cespare/xxhash/v2 v2.1.1"
-	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-	"github.com/cheekybits/genny v1.0.0"
-	"github.com/cheekybits/genny v1.0.0/go.mod"
-	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5"
-	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5/go.mod"
-	"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
-	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/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/cpuguy83/go-md2man/v2 v2.0.0"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/creack/pty v1.1.7/go.mod"
-	"github.com/d4l3k/messagediff v1.2.1"
-	"github.com/d4l3k/messagediff v1.2.1/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dchest/siphash v1.2.2"
-	"github.com/dchest/siphash v1.2.2/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/eapache/go-resiliency v1.1.0/go.mod"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
-	"github.com/eapache/queue v1.1.0/go.mod"
-	"github.com/edsrzf/mmap-go v1.0.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568"
-	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
-	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
-	"github.com/francoispqt/gojay v1.2.13/go.mod"
-	"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
-	"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.9"
-	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
-	"github.com/getsentry/raven-go v0.2.0"
-	"github.com/getsentry/raven-go v0.2.0/go.mod"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/gliderlabs/ssh v0.1.1/go.mod"
-	"github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod"
-	"github.com/go-asn1-ber/asn1-ber v1.5.3"
-	"github.com/go-asn1-ber/asn1-ber v1.5.3/go.mod"
-	"github.com/go-errors/errors v1.0.1/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-kit/kit v0.9.0/go.mod"
-	"github.com/go-kit/kit v0.10.0/go.mod"
-	"github.com/go-ldap/ldap/v3 v3.3.0"
-	"github.com/go-ldap/ldap/v3 v3.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.5.0/go.mod"
-	"github.com/go-ole/go-ole v1.2.4"
-	"github.com/go-ole/go-ole v1.2.4/go.mod"
-	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/gobwas/glob v0.2.3"
-	"github.com/gobwas/glob v0.2.3/go.mod"
-	"github.com/gogo/googleapis v1.1.0/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.0/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.3.2"
-	"github.com/gogo/protobuf v1.3.2/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-	"github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod"
-	"github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da"
-	"github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod"
-	"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/mock v1.4.0/go.mod"
-	"github.com/golang/mock v1.4.4/go.mod"
-	"github.com/golang/mock v1.5.0"
-	"github.com/golang/mock v1.5.0/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-	"github.com/golang/protobuf v1.4.0/go.mod"
-	"github.com/golang/protobuf v1.4.2/go.mod"
-	"github.com/golang/protobuf v1.4.3/go.mod"
-	"github.com/golang/protobuf v1.5.0/go.mod"
-	"github.com/golang/protobuf v1.5.2"
-	"github.com/golang/protobuf v1.5.2/go.mod"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-	"github.com/golang/snappy v0.0.1"
-	"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/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/go-cmp v0.5.1/go.mod"
-	"github.com/google/go-cmp v0.5.4/go.mod"
-	"github.com/google/go-cmp v0.5.5"
-	"github.com/google/go-cmp v0.5.5/go.mod"
-	"github.com/google/go-github v17.0.0+incompatible/go.mod"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/google/uuid v1.0.0/go.mod"
-	"github.com/googleapis/gax-go v2.0.0+incompatible/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.3/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorilla/context v1.1.1/go.mod"
-	"github.com/gorilla/mux v1.6.2/go.mod"
-	"github.com/gorilla/mux v1.7.3/go.mod"
-	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
-	"github.com/greatroar/blobloom v0.7.0"
-	"github.com/greatroar/blobloom v0.7.0/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.5.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
-	"github.com/hashicorp/consul/api v1.3.0/go.mod"
-	"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go-version v1.2.0/go.mod"
-	"github.com/hashicorp/go.net v0.0.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.4"
-	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-	"github.com/hashicorp/logutils v1.0.0/go.mod"
-	"github.com/hashicorp/mdns v1.0.0/go.mod"
-	"github.com/hashicorp/memberlist v0.1.3/go.mod"
-	"github.com/hashicorp/serf v0.8.2/go.mod"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/hudl/fargo v1.3.0/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
-	"github.com/jackpal/gateway v1.0.7"
-	"github.com/jackpal/gateway v1.0.7/go.mod"
-	"github.com/jackpal/go-nat-pmp v1.0.2"
-	"github.com/jackpal/go-nat-pmp v1.0.2/go.mod"
-	"github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/jpillora/backoff v1.0.0/go.mod"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/json-iterator/go v1.1.8/go.mod"
-	"github.com/json-iterator/go v1.1.10/go.mod"
-	"github.com/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/julienschmidt/httprouter v1.3.0"
-	"github.com/julienschmidt/httprouter v1.3.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/errcheck v1.5.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/klauspost/cpuid/v2 v2.0.4/go.mod"
-	"github.com/klauspost/cpuid/v2 v2.0.6"
-	"github.com/klauspost/cpuid/v2 v2.0.6/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/pty v1.1.3/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/lib/pq v1.10.1"
-	"github.com/lib/pq v1.10.1/go.mod"
-	"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
-	"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
-	"github.com/lucas-clemente/quic-go v0.19.3"
-	"github.com/lucas-clemente/quic-go v0.19.3/go.mod"
-	"github.com/lunixbochs/vtclean v1.0.0/go.mod"
-	"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
-	"github.com/marten-seemann/qpack v0.2.1/go.mod"
-	"github.com/marten-seemann/qtls v0.10.0"
-	"github.com/marten-seemann/qtls v0.10.0/go.mod"
-	"github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod"
-	"github.com/marten-seemann/qtls-go1-15 v0.1.4"
-	"github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod"
-	"github.com/maruel/panicparse v1.6.1"
-	"github.com/maruel/panicparse v1.6.1/go.mod"
-	"github.com/maruel/panicparse/v2 v2.1.1/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.7/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.2/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0"
-	"github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0/go.mod"
-	"github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod"
-	"github.com/microcosm-cc/bluemonday v1.0.1/go.mod"
-	"github.com/miekg/dns v1.0.14/go.mod"
-	"github.com/minio/sha256-simd v1.0.0"
-	"github.com/minio/sha256-simd v1.0.0/go.mod"
-	"github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75"
-	"github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75/go.mod"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/gox v0.4.0/go.mod"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
-	"github.com/nats-io/jwt v0.3.0/go.mod"
-	"github.com/nats-io/jwt v0.3.2/go.mod"
-	"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
-	"github.com/nats-io/nats.go v1.9.1/go.mod"
-	"github.com/nats-io/nkeys v0.1.0/go.mod"
-	"github.com/nats-io/nkeys v0.1.3/go.mod"
-	"github.com/nats-io/nuid v1.0.1/go.mod"
-	"github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod"
-	"github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-	"github.com/nxadm/tail v1.4.4"
-	"github.com/nxadm/tail v1.4.4/go.mod"
-	"github.com/oklog/oklog v0.3.2/go.mod"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.7.0/go.mod"
-	"github.com/onsi/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/go.mod"
-	"github.com/onsi/gomega v1.10.3"
-	"github.com/onsi/gomega v1.10.3/go.mod"
-	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
-	"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
-	"github.com/opentracing/basictracer-go v1.0.0/go.mod"
-	"github.com/opentracing/opentracing-go v1.0.2/go.mod"
-	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
-	"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
-	"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
-	"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
-	"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
-	"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
-	"github.com/oschwald/geoip2-golang v1.5.0"
-	"github.com/oschwald/geoip2-golang v1.5.0/go.mod"
-	"github.com/oschwald/maxminddb-golang v1.8.0"
-	"github.com/oschwald/maxminddb-golang v1.8.0/go.mod"
-	"github.com/pact-foundation/pact-go v1.0.4/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/pborman/uuid v1.2.0/go.mod"
-	"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
-	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5"
-	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod"
-	"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
-	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pkg/profile v1.2.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/prometheus/client_golang v0.8.0/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
-	"github.com/prometheus/client_golang v1.0.0/go.mod"
-	"github.com/prometheus/client_golang v1.3.0/go.mod"
-	"github.com/prometheus/client_golang v1.7.1/go.mod"
-	"github.com/prometheus/client_golang v1.10.0"
-	"github.com/prometheus/client_golang v1.10.0/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/client_model v0.1.0/go.mod"
-	"github.com/prometheus/client_model v0.2.0"
-	"github.com/prometheus/client_model v0.2.0/go.mod"
-	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
-	"github.com/prometheus/common v0.2.0/go.mod"
-	"github.com/prometheus/common v0.4.1/go.mod"
-	"github.com/prometheus/common v0.7.0/go.mod"
-	"github.com/prometheus/common v0.10.0/go.mod"
-	"github.com/prometheus/common v0.18.0"
-	"github.com/prometheus/common v0.18.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
-	"github.com/prometheus/procfs v0.0.2/go.mod"
-	"github.com/prometheus/procfs v0.0.8/go.mod"
-	"github.com/prometheus/procfs v0.1.3/go.mod"
-	"github.com/prometheus/procfs v0.6.0"
-	"github.com/prometheus/procfs v0.6.0/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475"
-	"github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/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 v1.5.2"
-	"github.com/russross/blackfriday v1.5.2/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/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-	"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
-	"github.com/sasha-s/go-deadlock v0.2.0"
-	"github.com/sasha-s/go-deadlock v0.2.0/go.mod"
-	"github.com/sclevine/spec v1.4.0"
-	"github.com/sclevine/spec v1.4.0/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shirou/gopsutil/v3 v3.21.4"
-	"github.com/shirou/gopsutil/v3 v3.21.4/go.mod"
-	"github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod"
-	"github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod"
-	"github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod"
-	"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
-	"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
-	"github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod"
-	"github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod"
-	"github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod"
-	"github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod"
-	"github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod"
-	"github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod"
-	"github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod"
-	"github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod"
-	"github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod"
-	"github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod"
-	"github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod"
-	"github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod"
-	"github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod"
-	"github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod"
-	"github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/sirupsen/logrus v1.4.2/go.mod"
-	"github.com/sirupsen/logrus v1.6.0/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/goconvey v1.6.4/go.mod"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/sony/gobreaker v0.4.1/go.mod"
-	"github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod"
-	"github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod"
-	"github.com/spf13/cobra v0.0.3/go.mod"
-	"github.com/spf13/pflag v1.0.1/go.mod"
-	"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
-	"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
-	"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0/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/syncthing/notify v0.0.0-20210308121556-f45149b04939"
-	"github.com/syncthing/notify v0.0.0-20210308121556-f45149b04939/go.mod"
-	"github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7"
-	"github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7/go.mod"
-	"github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod"
-	"github.com/thejerf/suture/v4 v4.0.1"
-	"github.com/thejerf/suture/v4 v4.0.1/go.mod"
-	"github.com/tklauser/go-sysconf v0.3.4/go.mod"
-	"github.com/tklauser/numcpus v0.2.1/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
-	"github.com/urfave/cli v1.20.0/go.mod"
-	"github.com/urfave/cli v1.22.1/go.mod"
-	"github.com/urfave/cli v1.22.5"
-	"github.com/urfave/cli v1.22.5/go.mod"
-	"github.com/viant/assertly v0.4.8/go.mod"
-	"github.com/viant/toolbox v0.24.0/go.mod"
-	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0"
-	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0/go.mod"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-	"github.com/yuin/goldmark v1.1.27/go.mod"
-	"github.com/yuin/goldmark v1.2.1/go.mod"
-	"go.etcd.io/bbolt v1.3.3/go.mod"
-	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
-	"go.opencensus.io v0.18.0/go.mod"
-	"go.opencensus.io v0.20.1/go.mod"
-	"go.opencensus.io v0.20.2/go.mod"
-	"go.opencensus.io v0.22.2/go.mod"
-	"go.uber.org/atomic v1.3.2/go.mod"
-	"go.uber.org/atomic v1.5.0/go.mod"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/multierr v1.3.0/go.mod"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
-	"go.uber.org/zap v1.10.0/go.mod"
-	"go.uber.org/zap v1.13.0/go.mod"
-	"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
-	"golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-	"golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
-	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b"
-	"golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
-	"golang.org/x/mod v0.2.0/go.mod"
-	"golang.org/x/mod v0.3.0"
-	"golang.org/x/mod v0.3.0/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-	"golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod"
-	"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
-	"golang.org/x/net v0.0.0-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-20190313220215-9f648a60d977/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
-	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-	"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod"
-	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
-	"golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod"
-	"golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod"
-	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-	"golang.org/x/net v0.0.0-20201026091529-146b70c837a4/go.mod"
-	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-	"golang.org/x/net v0.0.0-20210428140749-89ef3d95e781"
-	"golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
-	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
-	"golang.org/x/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-20180926160741-c2ed4eda69e7/go.mod"
-	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-	"golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
-	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
-	"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
-	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
-	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
-	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
-	"golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod"
-	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod"
-	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
-	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod"
-	"golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod"
-	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20201231184435-2d18734c6014/go.mod"
-	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
-	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
-	"golang.org/x/sys v0.0.0-20210217105451-b926d437f341/go.mod"
-	"golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod"
-	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
-	"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887"
-	"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod"
-	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/text v0.3.6"
-	"golang.org/x/text v0.3.6/go.mod"
-	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba"
-	"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
-	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
-	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-	"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
-	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
-	"golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/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"
-	"google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod"
-	"google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod"
-	"google.golang.org/api v0.1.0/go.mod"
-	"google.golang.org/api v0.3.1/go.mod"
-	"google.golang.org/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/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod"
-	"google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod"
-	"google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod"
-	"google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/grpc v1.14.0/go.mod"
-	"google.golang.org/grpc v1.16.0/go.mod"
-	"google.golang.org/grpc v1.17.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.0/go.mod"
-	"google.golang.org/grpc v1.22.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.23.1/go.mod"
-	"google.golang.org/grpc v1.26.0/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-	"google.golang.org/protobuf v1.21.0/go.mod"
-	"google.golang.org/protobuf v1.23.0/go.mod"
-	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
-	"google.golang.org/protobuf v1.26.0"
-	"google.golang.org/protobuf v1.26.0/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/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-20200902074654-038fdea0a05b"
-	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod"
-	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/gcfg.v1 v1.2.3/go.mod"
-	"gopkg.in/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.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.5/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"
-	"grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod"
-	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-	"rsc.io/quote/v3 v3.1.0/go.mod"
-	"rsc.io/sampler v1.3.0/go.mod"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
-	"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
-	"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="Open Source Continuous File Synchronization"
-HOMEPAGE="https://syncthing.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="selinux tools"
-
-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 )"
-
-DOCS=( README.md AUTHORS CONTRIBUTING.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
-)
-
-src_prepare() {
-	# Bug #679280
-	xdg_environment_reset
-
-	default
-	sed -i \
-		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
-		cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
-		|| die
-
-	# We do not need this and it sometimes causes build failures
-	rm -rf cmd/stupgrades
-}
-
-src_compile() {
-	go run build.go -version "v${PV}" -no-upgrade install \
-		$(usex tools "all" "") || die "build failed"
-}
-
-src_test() {
-	go run build.go test || die "test failed"
-}
-
-src_install() {
-	doman man/*.[157]
-	einstalldocs
-
-	dobin bin/syncthing
-	domenu etc/linux-desktop/*.desktop
-	if use tools ; then
-		exeinto /usr/libexec/syncthing
-		local exe
-		for exe in bin/* ; do
-			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
-		done
-	fi
-
-	# openrc and systemd service files
-	systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.service
-	systemd_douserunit etc/linux-systemd/user/${PN}.service
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-
-	keepdir /var/log/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use tools ; then
-		# openrc and systemd service files
-
-		systemd_dounit "${FILESDIR}/stdiscosrv.service"
-		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
-		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
-
-		systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
-		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
-		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv
-		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-p2p/syncthing/syncthing-1.18.1.ebuild b/net-p2p/syncthing/syncthing-1.18.1.ebuild
new file mode 100644
index 000000000000..8355b3d6a6e1
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.18.1.ebuild
@@ -0,0 +1,813 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop go-module systemd xdg-utils
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.31.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.37.0/go.mod"
+	"dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod"
+	"dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod"
+	"dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod"
+	"dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod"
+	"git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod"
+	"github.com/AudriusButkevicius/pfilter v0.0.0-20210511165305-e9aaf99ab213"
+	"github.com/AudriusButkevicius/pfilter v0.0.0-20210511165305-e9aaf99ab213/go.mod"
+	"github.com/AudriusButkevicius/recli v0.0.6"
+	"github.com/AudriusButkevicius/recli v0.0.6/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
+	"github.com/Shopify/sarama v1.19.0/go.mod"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+	"github.com/VividCortex/gohistogram v1.0.0/go.mod"
+	"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
+	"github.com/alecthomas/kong v0.2.16"
+	"github.com/alecthomas/kong v0.2.16/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/apache/thrift v0.12.0/go.mod"
+	"github.com/apache/thrift v0.13.0/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
+	"github.com/aws/aws-lambda-go v1.13.3/go.mod"
+	"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+	"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e"
+	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e/go.mod"
+	"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod"
+	"github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod"
+	"github.com/calmh/xdr v1.1.0"
+	"github.com/calmh/xdr v1.1.0/go.mod"
+	"github.com/casbin/casbin/v2 v2.1.2/go.mod"
+	"github.com/ccding/go-stun v0.1.3"
+	"github.com/ccding/go-stun v0.1.3/go.mod"
+	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/certifi/gocertifi v0.0.0-20210429200110-83314bf6d27c"
+	"github.com/certifi/gocertifi v0.0.0-20210429200110-83314bf6d27c/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/cheekybits/genny v1.0.0/go.mod"
+	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5"
+	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5/go.mod"
+	"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/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/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.7/go.mod"
+	"github.com/d4l3k/messagediff v1.2.1"
+	"github.com/d4l3k/messagediff v1.2.1/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dchest/siphash v1.2.2"
+	"github.com/dchest/siphash v1.2.2/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/eapache/go-resiliency v1.1.0/go.mod"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+	"github.com/eapache/queue v1.1.0/go.mod"
+	"github.com/edsrzf/mmap-go v1.0.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568"
+	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/francoispqt/gojay v1.2.13/go.mod"
+	"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
+	"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/getsentry/raven-go v0.2.0"
+	"github.com/getsentry/raven-go v0.2.0/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/gliderlabs/ssh v0.1.1/go.mod"
+	"github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod"
+	"github.com/go-asn1-ber/asn1-ber v1.5.3"
+	"github.com/go-asn1-ber/asn1-ber v1.5.3/go.mod"
+	"github.com/go-errors/errors v1.0.1/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-kit/kit v0.10.0/go.mod"
+	"github.com/go-ldap/ldap/v3 v3.3.0"
+	"github.com/go-ldap/ldap/v3 v3.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+	"github.com/go-ole/go-ole v1.2.4"
+	"github.com/go-ole/go-ole v1.2.4/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/gogo/googleapis v1.1.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.0/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.2"
+	"github.com/gogo/protobuf v1.3.2/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod"
+	"github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da"
+	"github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod"
+	"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/mock v1.5.0"
+	"github.com/golang/mock v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.2"
+	"github.com/golang/protobuf v1.5.2/go.mod"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+	"github.com/golang/snappy v0.0.1"
+	"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/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-github v17.0.0+incompatible/go.mod"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/googleapis/gax-go v2.0.0+incompatible/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.3/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/context v1.1.1/go.mod"
+	"github.com/gorilla/mux v1.6.2/go.mod"
+	"github.com/gorilla/mux v1.7.3/go.mod"
+	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/greatroar/blobloom v0.7.0"
+	"github.com/greatroar/blobloom v0.7.0/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.5.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/hashicorp/consul/api v1.3.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/hudl/fargo v1.3.0/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
+	"github.com/jackpal/gateway v1.0.7"
+	"github.com/jackpal/gateway v1.0.7/go.mod"
+	"github.com/jackpal/go-nat-pmp v1.0.2"
+	"github.com/jackpal/go-nat-pmp v1.0.2/go.mod"
+	"github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/jpillora/backoff v1.0.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.8/go.mod"
+	"github.com/json-iterator/go v1.1.10/go.mod"
+	"github.com/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/julienschmidt/httprouter v1.3.0"
+	"github.com/julienschmidt/httprouter v1.3.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/errcheck v1.5.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/cpuid/v2 v2.0.4/go.mod"
+	"github.com/klauspost/cpuid/v2 v2.0.6"
+	"github.com/klauspost/cpuid/v2 v2.0.6/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.3/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lib/pq v1.10.1"
+	"github.com/lib/pq v1.10.1/go.mod"
+	"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
+	"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
+	"github.com/lucas-clemente/quic-go v0.19.3"
+	"github.com/lucas-clemente/quic-go v0.19.3/go.mod"
+	"github.com/lunixbochs/vtclean v1.0.0/go.mod"
+	"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/marten-seemann/qpack v0.2.1/go.mod"
+	"github.com/marten-seemann/qtls v0.10.0"
+	"github.com/marten-seemann/qtls v0.10.0/go.mod"
+	"github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod"
+	"github.com/marten-seemann/qtls-go1-15 v0.1.4"
+	"github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod"
+	"github.com/maruel/panicparse v1.6.1"
+	"github.com/maruel/panicparse v1.6.1/go.mod"
+	"github.com/maruel/panicparse/v2 v2.1.1/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.7/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0"
+	"github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/minio/sha256-simd v1.0.0"
+	"github.com/minio/sha256-simd v1.0.0/go.mod"
+	"github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75"
+	"github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+	"github.com/nats-io/jwt v0.3.0/go.mod"
+	"github.com/nats-io/jwt v0.3.2/go.mod"
+	"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
+	"github.com/nats-io/nats.go v1.9.1/go.mod"
+	"github.com/nats-io/nkeys v0.1.0/go.mod"
+	"github.com/nats-io/nkeys v0.1.3/go.mod"
+	"github.com/nats-io/nuid v1.0.1/go.mod"
+	"github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod"
+	"github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/nxadm/tail v1.4.4"
+	"github.com/nxadm/tail v1.4.4/go.mod"
+	"github.com/oklog/oklog v0.3.2/go.mod"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.7.0/go.mod"
+	"github.com/onsi/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/go.mod"
+	"github.com/onsi/gomega v1.10.3"
+	"github.com/onsi/gomega v1.10.3/go.mod"
+	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
+	"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
+	"github.com/opentracing/basictracer-go v1.0.0/go.mod"
+	"github.com/opentracing/opentracing-go v1.0.2/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+	"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
+	"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
+	"github.com/oschwald/geoip2-golang v1.5.0"
+	"github.com/oschwald/geoip2-golang v1.5.0/go.mod"
+	"github.com/oschwald/maxminddb-golang v1.8.0"
+	"github.com/oschwald/maxminddb-golang v1.8.0/go.mod"
+	"github.com/pact-foundation/pact-go v1.0.4/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
+	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5"
+	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod"
+	"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
+	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/profile v1.2.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/prometheus/client_golang v0.8.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.3.0/go.mod"
+	"github.com/prometheus/client_golang v1.7.1/go.mod"
+	"github.com/prometheus/client_golang v1.10.0"
+	"github.com/prometheus/client_golang v1.10.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.1.0/go.mod"
+	"github.com/prometheus/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
+	"github.com/prometheus/common v0.2.0/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/common v0.10.0/go.mod"
+	"github.com/prometheus/common v0.18.0"
+	"github.com/prometheus/common v0.18.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
+	"github.com/prometheus/procfs v0.1.3/go.mod"
+	"github.com/prometheus/procfs v0.6.0"
+	"github.com/prometheus/procfs v0.6.0/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475"
+	"github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/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 v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/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/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
+	"github.com/sasha-s/go-deadlock v0.2.0"
+	"github.com/sasha-s/go-deadlock v0.2.0/go.mod"
+	"github.com/sclevine/spec v1.4.0"
+	"github.com/sclevine/spec v1.4.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shirou/gopsutil/v3 v3.21.4"
+	"github.com/shirou/gopsutil/v3 v3.21.4/go.mod"
+	"github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod"
+	"github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod"
+	"github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod"
+	"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
+	"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
+	"github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod"
+	"github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod"
+	"github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod"
+	"github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod"
+	"github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod"
+	"github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod"
+	"github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod"
+	"github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod"
+	"github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod"
+	"github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod"
+	"github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod"
+	"github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod"
+	"github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod"
+	"github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod"
+	"github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sirupsen/logrus v1.6.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/sony/gobreaker v0.4.1/go.mod"
+	"github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod"
+	"github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
+	"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
+	"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/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/syncthing/notify v0.0.0-20210308121556-f45149b04939"
+	"github.com/syncthing/notify v0.0.0-20210308121556-f45149b04939/go.mod"
+	"github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7"
+	"github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7/go.mod"
+	"github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod"
+	"github.com/thejerf/suture/v4 v4.0.1"
+	"github.com/thejerf/suture/v4 v4.0.1/go.mod"
+	"github.com/tklauser/go-sysconf v0.3.4/go.mod"
+	"github.com/tklauser/numcpus v0.2.1/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/cli v1.22.1/go.mod"
+	"github.com/urfave/cli v1.22.5"
+	"github.com/urfave/cli v1.22.5/go.mod"
+	"github.com/viant/assertly v0.4.8/go.mod"
+	"github.com/viant/toolbox v0.24.0/go.mod"
+	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0"
+	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+	"go.opencensus.io v0.18.0/go.mod"
+	"go.opencensus.io v0.20.1/go.mod"
+	"go.opencensus.io v0.20.2/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.5.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"go.uber.org/zap v1.13.0/go.mod"
+	"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
+	"golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b"
+	"golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod"
+	"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
+	"golang.org/x/net v0.0.0-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-20190313220215-9f648a60d977/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod"
+	"golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201026091529-146b70c837a4/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210428140749-89ef3d95e781"
+	"golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/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-20180926160741-c2ed4eda69e7/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
+	"golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod"
+	"golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201231184435-2d18734c6014/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+	"golang.org/x/sys v0.0.0-20210217105451-b926d437f341/go.mod"
+	"golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887"
+	"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.6"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba"
+	"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
+	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+	"golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/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"
+	"google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod"
+	"google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod"
+	"google.golang.org/api v0.1.0/go.mod"
+	"google.golang.org/api v0.3.1/go.mod"
+	"google.golang.org/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/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod"
+	"google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod"
+	"google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod"
+	"google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/grpc v1.14.0/go.mod"
+	"google.golang.org/grpc v1.16.0/go.mod"
+	"google.golang.org/grpc v1.17.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.22.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.0"
+	"google.golang.org/protobuf v1.26.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/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-20200902074654-038fdea0a05b"
+	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gcfg.v1 v1.2.3/go.mod"
+	"gopkg.in/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.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.5/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"
+	"grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod"
+	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
+	"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
+	"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="selinux tools"
+
+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 )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
+)
+
+src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+
+	# We do not need this and it sometimes causes build failures
+	rm -rf cmd/stupgrades
+}
+
+src_compile() {
+	go run build.go -version "v${PV}" -no-upgrade install \
+		$(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+	domenu etc/linux-desktop/*.desktop
+	if use tools ; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+	fi
+
+	# openrc and systemd service files
+	systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	keepdir /var/log/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use tools ; then
+		# openrc and systemd service files
+
+		systemd_dounit "${FILESDIR}/stdiscosrv.service"
+		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
+		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
+
+		systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
+		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv
+		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 14ec3333710d..1e74b43da63a 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-fortisslvpn/Manifest b/net-vpn/networkmanager-fortisslvpn/Manifest
index caa5dfba5929..d304716eb20d 100644
--- a/net-vpn/networkmanager-fortisslvpn/Manifest
+++ b/net-vpn/networkmanager-fortisslvpn/Manifest
@@ -1,5 +1,7 @@
 DIST NetworkManager-fortisslvpn-1.2.10.tar.xz 366700 BLAKE2B 5160d5947fe391b53a0293db4727baa0e6c453da0985abb999503a8f4c67a03c3159652c216e9982414d5db718af6c8a2aa6ac00aa627801949d4f96403f0ade SHA512 8b4d100403f3bdd557394a6cadd94e24afffd97a584f8c58cb4008be2834bd8c12c3f293c03c0f111ede54fe18058e3ef41218fd33d2dd564147f255d76e4252
 DIST NetworkManager-fortisslvpn-1.2.8.tar.xz 325100 BLAKE2B 9449bbec99ee50c2c0b9cc1a74d8714e71995c17d2c1fa206134b71a1ea448be8fd86711ce0743f38e86ccd330eb7bc7e4cb57c2093001ac1b301b00e5c8f25e SHA512 5a602b872b1efbd8d9ed2f32d05ec8560f0a923dfdf58e7a775010ee2182790b8cbe7c2a6c8d1198eba47c66fddecf178e1c454d1ac74c10a63c75c603eeafc8
+DIST NetworkManager-fortisslvpn-1.3.90.tar.xz 375416 BLAKE2B d2e07a2f79685cb600b6c0abca52a54911ff41534c152e9c5befe25d436757ba517d84cc474ff5c200ae62ca019296871fc29dc8342788295b3e59be55fa8198 SHA512 98b3e524cbb33c8dcdb325b10d227f88534948d98ca8009f770e48b87d42637762ba5343f081ac583b77c3387cb47f2660be0f60430ede237f812a2af8d9a7aa
 EBUILD networkmanager-fortisslvpn-1.2.10.ebuild 865 BLAKE2B ac01c51df4c7cd3f0026c7a303c6c81e84190a30549f40075eef2fb0870ba6fc36b8c3bc629f1b4029d40ac9e2002116357f392ce90adb75f793ba9f20455cd3 SHA512 f7330641874fee8b36f1cf95b08bb9ef5de95c4058d0debeae2ceafdf6b899885e76919f9075e1e6c7e1ffb7adf9f820f77abd1d34ef15b0a8dae840a16961af
 EBUILD networkmanager-fortisslvpn-1.2.8-r2.ebuild 884 BLAKE2B 52e053b236facdd5eb8ff392b40d7f90e95402b458d5eefacff9605dff8de252ac3a8d9cc6e7266e04a6e7f9588516da2cd8bb3e1cd6aef142a7d0380645e78a SHA512 1298ade8a40e7c0790b7682431f7895ad729c4bc94308a8851a6777f4b34d2691a1dbd52a3c9f804df918e60f5806da8177ff1a5f56aa298aed87293d2cc1c6a
+EBUILD networkmanager-fortisslvpn-1.3.90.ebuild 1072 BLAKE2B 57fec0072095a0e512c40c95a67ffdff5a1e3731ac6d9359ccf83eb6dbc1dbd9d09810721c150127cba42207eeace06a1501b84f33c215105028362b7eb0ebc6 SHA512 363d021128c9146c0c220761ac9cdf426cc99d5ff27075926db0d835e21994e5fdf0a530c402f3e9ec8dd1586d1cbb1421384873f80c5d6fa0d60acde0a54ee0
 MISC metadata.xml 410 BLAKE2B 611977709cb718457aa2b636d5bf2f1936a2c9035abb58ae7ff7397c72481ba4bd8e6ca156d4d5cde7797c508d39d6b62f2c2bc84be8eb7f27edd7dd978f5728 SHA512 5ce3ae870f955435b4ad18f62fde4af72c640bce9605f1d979ae6bf5c8c1a402e8e3ff265fe859554490e10a6a50d09a4e271d075a6ab4364a2882000eba9507
diff --git a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild
new file mode 100644
index 000000000000..81b8594e7f8e
--- /dev/null
+++ b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager Fortinet SSLVPN compatible plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gtk"
+
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-1.2:=
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		media-libs/harfbuzz
+		>=net-libs/libnma-1.2.0
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-3.4:3
+		x11-libs/pango
+	)
+"
+RDEPEND="${RDEPEND}
+	net-dialup/ppp
+	>=net-vpn/openfortivpn-1.2.0"
+BDEPEND="dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Fix deprecated location, #709450
+	sed -i 's|/appdata|/metainfo|g' Makefile.{in,am} || die
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		--localstatedir=/var \
+		$(use_with gtk gnome) \
+		--without-libnm-glib
+}
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index 5b455b79a936..915295835a3e 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,3 +1,5 @@
 DIST NetworkManager-openvpn-1.8.12.tar.xz 597216 BLAKE2B 55ccb3139b1be9d1894d3651d60ce0f2167a24efbb24a9870eb4bb683a91603ae5f5149ed9aca8307cf608140c075a7b19bdfef68b1dbfe0729c117f084bb904 SHA512 1b8adf926426f866f7509a07c24203d6b584627aba4f8e2b1b00fa897bf0d7155009d566c3440565d1ee0e938694dd8d6746f37f62d493864d16eae007590b22
+DIST NetworkManager-openvpn-1.8.14.tar.xz 611084 BLAKE2B c986f85a6af93b88bc73a0e111cf712948e1434aff35b1df5c86a7afa6092acfc637e0e9031f170107c2856cf4f907bcc36543769ee531a1407bef69a9fbd0a3 SHA512 6775be9667c722cb2eec23354b950ff29b739119615a3f8c9730ad597427def716e9911a4232d014df78e88f5e4968f359e0aecacd81183db65586e2bc6ca0e7
 EBUILD networkmanager-openvpn-1.8.12-r1.ebuild 1285 BLAKE2B c4faf61c0046a69574c734cfa7d993f64e130ca57b18280b45595968b48cbafb99d38423c4faf2694b2fcda81fdf38ffab9489d390d6340c842444daf302f325 SHA512 94e87c8733b4295892a180afc3495a62834373a90ba18f3d19dade67cb4d2768413c59c01c0223c0133b518260cb595c098771b7b20c5524e908f7a1a67b5e6a
+EBUILD networkmanager-openvpn-1.8.14.ebuild 1287 BLAKE2B b0d6874180cf20d3056168b930d5d3a50fec6b33f0e9ea05cd2ea513735fd7d9a82b199f3770bac163d8175d0d4ce85d9b8bd48e1504b0c1c769d38e1c3e65b2 SHA512 a3b13bf69560df4eea2aff2683ee30ec0a58a006563110f020ac57f4db0a8a469236322d32459b463b97a29e145f19e14fe772034390c4d7dbe54556f7bdc28f
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild
new file mode 100644
index 000000000000..1f43b0b4c2e5
--- /dev/null
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gtk test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/libxml2:2
+	>=net-misc/networkmanager-1.7.0:=
+	>=net-vpn/openvpn-2.1
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=net-libs/libnma-1.7.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/nm-openvpn
+	acct-user/nm-openvpn
+"
+
+BDEPEND="
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome) \
+		--without-libnm-glib
+}
diff --git a/net-vpn/ocserv/Manifest b/net-vpn/ocserv/Manifest
index 991edfdb8b3d..4fff789ef367 100644
--- a/net-vpn/ocserv/Manifest
+++ b/net-vpn/ocserv/Manifest
@@ -1,6 +1,6 @@
 AUX ocserv 182 BLAKE2B b7ea6c381fed7406bda8fae3638445d6cd2e2acaf5f5c310227fc56f62e3286df6bb49063db8d2ab8dce2c6d5e8487b50085875f2af057b662aeb37b5adfe77a SHA512 9e0dcc3668e5e7584b4f01f56c0b48c7a1099b3658ee2387cd899050030328c497e64f9409a1af589ab42f8b6b1e7f13828a50b478906721ccad9d3013f3b06a
 DIST ocserv-1.0.1.tar.xz 787800 BLAKE2B 655a2a6e1434a5b31b157e0f73df3d6d04011c06fd5a1f39f1152752abdc837974c739bc0694a804a1e96b4e219c78c5cf1a58040bbcdcad3e326d0c9e584c7b SHA512 953e1b6084f68f8627b5383e28b5fcde987881e66feac645a40fa37d895f0711b171c9029c3703773dfbd5432d747f92c71af9240c2df3381599902a7d5fe880
-DIST ocserv-1.1.1.tar.xz 818988 BLAKE2B 06fdc47fcabea162ddd417f315c53e85f4ccdc1dc9b60b624c06ee4adae9d6f0ee96f94c15daafa0633b4925720519da7220914008c64c5771f61416208a570e SHA512 1173416f0d32f9faf98e539c8e73316a50ac93b519d1ade19374a3df865d10d975e13ac53e0c5a5e77c80f3605d7a810287b18b85b798887d227389761b54220
+DIST ocserv-1.1.3.tar.xz 833320 BLAKE2B bdf92683df55cd26bc102327b233703eefd58ea18ef71ccfc383e06b7fdd78ca59d605ef3517f430f3a20e8d4ab2c3f8abf2684cedd2eb0aeefe10c688faab15 SHA512 1138bd530e41f215f75e967aa293e80504a0ffc3384184832910b7bf8dc2049a637c1d8bef0221b6abb3e6510e51fba3c45d43901c0d2e4c0f180e72c0804628
 EBUILD ocserv-1.0.1-r1.ebuild 1764 BLAKE2B 7d70d482356ab6cd8d3023c1473a7e0a9df670156fb6ac73fe2ed3553238629b109f475ca3503ec14bf3dcb19693be0cc492fef36253fff52df62922fcc847ef SHA512 fe17989107f3e3fb08663c66b49f4c87664b033ddb3094743fa939e5940d723718ce862d292cbed1176e2a5669e73973789f02ef7212d624a26fa96d8fdc6bb6
-EBUILD ocserv-1.1.1-r1.ebuild 1751 BLAKE2B b9746f11601f1d3879c912e024f0122fb13e2a4f242b7b83629e6faf13a8f77fa97faeb5ccc6537e48e5c07d7abc8341419f012dfc9a0fd93ba2f2305c83eb67 SHA512 ae0e337be65aae1f114ecac874e46bfa64d7c98d540366ea716e47abdce8176b0621e4df03a0dc7ac1f3fdf2d5b3d47c07d1f4d1eebb39de93978e9b6b68b06a
+EBUILD ocserv-1.1.3.ebuild 1751 BLAKE2B b9746f11601f1d3879c912e024f0122fb13e2a4f242b7b83629e6faf13a8f77fa97faeb5ccc6537e48e5c07d7abc8341419f012dfc9a0fd93ba2f2305c83eb67 SHA512 ae0e337be65aae1f114ecac874e46bfa64d7c98d540366ea716e47abdce8176b0621e4df03a0dc7ac1f3fdf2d5b3d47c07d1f4d1eebb39de93978e9b6b68b06a
 MISC metadata.xml 325 BLAKE2B 1bb6068aff761fbf40d489d5d60bcbf295a079a2fffbb99af64abfcecaedf7cb5407b3f94b6823b58690912f43dc4427cd8d7a658d2f809b45462702ba5f0aeb SHA512 4fb35360034ac9639198ebd1e0917848b807e0a53ec10eb2d4e1a90a4f3f631b582e6f3d6e3a7d50f2f284ff47dc1a2ec4d362fa73f6b5a1834ef531bb2bc5ca
diff --git a/net-vpn/ocserv/ocserv-1.1.1-r1.ebuild b/net-vpn/ocserv/ocserv-1.1.3.ebuild
index 459da4219219..459da4219219 100644
--- a/net-vpn/ocserv/ocserv-1.1.1-r1.ebuild
+++ b/net-vpn/ocserv/ocserv-1.1.3.ebuild
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index ffccaded4a1c..0ede340644f6 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/b43-fwcutter/Manifest b/net-wireless/b43-fwcutter/Manifest
index dba4d4a1920d..1d955e7e1fba 100644
--- a/net-wireless/b43-fwcutter/Manifest
+++ b/net-wireless/b43-fwcutter/Manifest
@@ -1,3 +1,3 @@
 DIST b43-fwcutter-019.tar.bz2 46769 BLAKE2B fc67d285ee1caa4cb17584cfbae21ff5852282a3565a8a21d5775b4ca734bec4c9e62281dffeaac884a85530b2ba70479620b8425abd73ce1e502ab032aaed42 SHA512 2a439d1583d1ee7b13dd6a7526b78b216073e044c3934adf6615b8d2ca9a4b8c74db9791182d27baf1690b5c5ff6ce1a9c8dd4fb796e47939d055fef5bb37960
-EBUILD b43-fwcutter-019.ebuild 669 BLAKE2B 65cf56cb449ea490073a7abd50b73815eaa5e13992471fc27ca12f27e146b86fa4f544efd5f04f9154c86cd1324cc467c6ca231a0f6d4d577c1256ea233bafb1 SHA512 9b46eebb84462017435023493fc57129db7d62bd985d11bf8cb3ae63cf4ae16dc44efd2bc2497fa0e3e7bd858e2f25479c4ffd5148db7ab8315401a0a307f092
+EBUILD b43-fwcutter-019.ebuild 668 BLAKE2B 3d1459773395b18463e91fffe263c30379be9505e289d5b34c1323a0139c764228c8bf56f1ff239087a55beab1e2d5b4c78005d7aa8197e73de2089985d924ae SHA512 6017b69787ad34a184f911f41d9e8085d3eb9cfc1a89f90502d19670a0290f4111d342cf633a00a8d8fda87faa3ae9b1ee8402d9040da666608c9f6ca98409a2
 MISC metadata.xml 245 BLAKE2B 8e07a60629de7eebe0a80961485b0b014d1c34c4eaa1c1bea11bfe52743c699420920d6ff5e856875db644f5b896eacf68acb2ee8c1b412293b76b1d0cbdc79c SHA512 7d4de8859d1163ce6df658785501e0b7355a8eb06916e3c5f5c76e21f56c336d040ede25630068a0af983ae9eeb48ac2dbb6b2f3822f9a5e6e6bd8092e60b6cb
diff --git a/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild b/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild
index 6c2f27dd0aa7..10a4760079ce 100644
--- a/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild
+++ b/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bues.ch/b43/fwcutter/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 
 src_compile() {
 	emake CC="$(tc-getCC)" V=1
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 41c014d3850e..099ef85fb923 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -3,7 +3,9 @@ AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-1.14.tar.xz 933764 BLAKE2B edc6a925872afb6b98f5bbe16fc1cb6b8459a1aff33ec1f9e2d6bd45e605e34debaffa3048b6506cd3e8006c57d6efc9ae341f73050668454ad85fe7e6b4f256 SHA512 bff9b5a744e8eb4e285f28d976e9335d2c85b57fc1eb023c3aa9442e451523b3b9f080d2c02fc5432735c398857b64d115ed2929dd4bb910925cbf18df0b0874
 DIST iwd-1.15.tar.xz 940724 BLAKE2B 6dae8a71e15136bcc9d8bb44cc6b152848207d89af2f447f48e834a3feda72a0a018dd1db3cb3a0e92c834cb2a19d8f9e4a9c900d91f96df378772d220205d65 SHA512 71e1f5f1b9d4e09a158b9bf801cee8af5ed8a19a3e80ad677e28ccab29ae10a79ebb7dbeaed60dd24283b6a40dbda8c212400b6d5ac659ed6056588a8663f0d4
+DIST iwd-1.16.tar.xz 949692 BLAKE2B 6063f0fe79cfe61f68fd2d1acc4c67cd9b907bcf728da072b5845a60c6032db472428fa5ea7f203d840a7934c58fcb73d23805c5f3d4336a7ebb795575233260 SHA512 4cbf548421f7f5be6e73cea29802cf5757aece92fa2ce36257a608346bca0280338130915a974c895d3b865e0621a3ffe22228487d2552e407dacdd7d7eb9109
 EBUILD iwd-1.14.ebuild 4928 BLAKE2B a562a3ec297608b899413a35973b37da935260225be99a7eb864deaa0c2d960edf07e7d98620d68868c660e964a0a93daf179531c1caf3f1e687160c984e7cc2 SHA512 cbca49ef774352a05f7fc52e285d7ef494838a281c08d2c2f9276187e38dd8450c28ba5243fed7a4a2515b37562b21bc3bc013bc2333769b04f89fe2a4ab31cc
-EBUILD iwd-1.15.ebuild 4929 BLAKE2B 2fab9bdf75a569fbcec3260eb10352ca76bbb8d627d6edfe7a66956cb027d9bb0b50fd31c720188847ec439e086c5d6edea9229da318b391b1a59d101d75641b SHA512 fa64cfe6b28ab6f77294b83600cab0f913a3f0d94a802fc2306a81186a6f5edb794a88a7ec9224daff5d868bf91d7390e01da962001b6d048431d0de1865b8ac
+EBUILD iwd-1.15.ebuild 4928 BLAKE2B bbaf00a83a66e02df79499ebefd5591750f27daadf1c7b98c34c6095ef8281d1de08066e7f92b87f798b1b777dd9d398978e6b2a390b57da748cfbfe93a4822c SHA512 99df966cf16d483672803644533d9efcbd69521f8f5eb31cc5c96698fd05f617299cf1648259dfa09b81800060d591dc108de1dd31843c48e76e00d3890716a7
+EBUILD iwd-1.16.ebuild 4934 BLAKE2B d61c3374ca51c1fa1593fe0bbbb66bb94ecf3d7a2e48bfa5cadad59951c3c646657cc52d7d0fbff91ff95bd52a1235bf5be0e5918c0b73d095d62e433770a695 SHA512 09b57d109fb7e836b4a3ad8c2159ee46ccc62016cd6d26b419939ea03088b2791102c08019f3dd85c1843d73f7429b306dbf9d524fcc83652bb269ca195e8781
 EBUILD iwd-9999.ebuild 4930 BLAKE2B ef4e6abb91312e52edc376f99664863d83ff87340a7a83e617b826d48fd85c8b70c95e0929a1c3461ec03bc45724ace0f287ce5b03cb381e6221b9414f38b93e SHA512 485aaca5116e7f13b5a76816bf0b98731c95f305b69e40ae717bad2da2760b8759eb2043c8f6888fa790854ed5f8b0039d920572af5e6396fd297aa2e2d06256
 MISC metadata.xml 832 BLAKE2B 904ff92a3b4e243fe9780fcb0ca0376c33f93669a77dbc8cfb345257dfec77057a54a41688b0cf5a9230a058d4e258096fa9664867b1c43dbc1bdc9662441838 SHA512 f8b8cb1b2d49159a23b8bfc27b6e54c0fd5509c16b6425881dd80f833586dde918f9a2d94a608b61689e30891c10780318197f10e703d9587a12179f98121442
diff --git a/net-wireless/iwd/iwd-1.15.ebuild b/net-wireless/iwd/iwd-1.15.ebuild
index a8b6a3dcbdd9..a38be2745d9c 100644
--- a/net-wireless/iwd/iwd-1.15.ebuild
+++ b/net-wireless/iwd/iwd-1.15.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 	MYRST2MAN="RST2MAN=:"
 fi
 
diff --git a/net-wireless/iwd/iwd-1.16.ebuild b/net-wireless/iwd/iwd-1.16.ebuild
new file mode 100644
index 000000000000..f10831472038
--- /dev/null
+++ b/net-wireless/iwd/iwd-1.16.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic linux-info systemd
+
+#Set this variable to the required external ell version
+ELL_REQ="0.42"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	MYRST2MAN="RST2MAN=:"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3
+standalone systemd"
+
+DEPEND="
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )
+"
+
+[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
+
+RDEPEND="
+	${DEPEND}
+	net-wireless/wireless-regdb
+	crda? ( net-wireless/crda )
+	standalone? (
+		systemd? ( sys-apps/systemd )
+		!systemd? ( virtual/resolvconf )
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
+		~CRYPTO_AES
+		~CRYPTO_CBC
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
+		~KEY_DH_OPERATIONS
+		~PKCS7_MESSAGE_PARSER
+		~RFKILL
+		~X509_CERTIFICATE_PARSER
+	"
+	if use crda;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3 && use amd64; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	if use kernel_linux && kernel_is -ge 4 20; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
+	fi
+
+	check_extra_config
+
+	if ! use crda; then
+		if use kernel_linux && kernel_is -lt 4 15; then
+			ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
+			ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
+		fi
+		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
+			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
+		then
+			ewarn ""
+			ewarn "REGULATORY DOMAIN PROBLEM:"
+			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+			ewarn ""
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
+		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == *9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	append-cflags "-fsigned-char"
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
+		$(use_enable client)
+		$(use_enable monitor)
+		$(use_enable ofono)
+		$(use_enable wired)
+		--enable-systemd-service
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
+		--with-systemd-networkdir="$(systemd_get_utildir)/network"
+	)
+	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake ${MYRST2MAN}
+}
+
+src_install() {
+	emake DESTDIR="${D}" ${MYRST2MAN} install
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd-r1" iwd
+
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
+	if [[ ${PV} == *9999* ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+
+	if use standalone ; then
+		local iwdconf="${ED}/etc/iwd/main.conf"
+		dodir /etc/iwd
+		echo "[General]" > "${iwdconf}"
+		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
+		echo "[Network]" >> "${iwdconf}"
+		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
+		dodir /etc/conf.d
+		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
+	fi
+}
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 87e9ae6a12c1..eafac0580a04 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -7,6 +7,6 @@ DIST rtl-sdr-0.6.0_p2020802.tar.gz 134107 BLAKE2B 18ff8fe93a0dfaa20614924c7f951b
 EBUILD rtl-sdr-0.5.3_p20170919.ebuild 1142 BLAKE2B 1321119ae94c5c89a8912dde134ee7890b987c70cafa61617f0118fa596cab58485f3fbf51b3f6ebfce819eb50b281606adfb36cbea12497ea02cbc7a0e053d2 SHA512 043448e7787215446c27eb1e264e7c18f463f829ae162dd23ede268c3664ed0073fac4c6f3c30c77902cf421bf535eee83a585575b980c1fafc9119809cbe9a1
 EBUILD rtl-sdr-0.5.4.ebuild 1149 BLAKE2B 3690e4cfd90271b6b49a0f453b0a1e290e096e432f42621cfd3a97aebcd0050a4a4cbc69334c6906eed637c3814bdb554e97edf997d116618715af8c1673f7b1 SHA512 08d4f453f18be3c631b54ca11f0042c60163182f25bcb335148d32978a64280f116d61fed6fa0bff8efc94acc09b901c87a89e3a93bfb6d7f24e8936ccd24411
 EBUILD rtl-sdr-0.6.0-r1.ebuild 1180 BLAKE2B 52cafed14f3ffadadfe80fc939bde5798eb93ceac4a7d050e1f03c5a1ece453f646619181476f0074752c24e6437ab218b92fe4c7531ef96cd38525e09ec9938 SHA512 d30cbb5fe9ab5c80a2eb44a53e875bb6042ad5352f5418cab1e2097197b94d15ffd1d8dd7e973891571258912562dab6c85b6a848e384c72c3fd7b0b6b4af395
-EBUILD rtl-sdr-0.6.0_p2020802.ebuild 1595 BLAKE2B 0a18667da090013bb1462de2896545176a75daf74b2d539d03463972b3b06e48eaac632859b1bedf6a7eb4e1adc04d69c710120f4be0e6f1bbf56ea9cf4bcdbc SHA512 9d555bc05a0c799dca3936eb6bd8da5640316c9734a1781ad6d5d9ac5cfbdf4b9ab32d72aba41ba8ac94867415c462e367f0e5c119fc47283728b3b6581607d8
+EBUILD rtl-sdr-0.6.0_p2020802.ebuild 1594 BLAKE2B 8303029241e98f14a1c9d6533b35a90407ab88eb0ac40e01add275a2bfcf9409d7fbdb36f3c95e8253e84448fdea317e03856a836ad4e441646261aa94829600 SHA512 8c7531fa651969852fac15244a638d8a84ea4ea78af99ca13661547e059037672645ce49251c66f89a05f20fa7dc2f0e3bf7684079bba87ad560a39c5ff37aa7
 EBUILD rtl-sdr-9999.ebuild 1583 BLAKE2B 0b4b10624672aa7496f0b8a4542ab0754869f167b62c664ea190e980fc1f4b6d59ff6ac384867df28243586ccccaa723ae3382c4b8ca6b1bab2d140005c613a5 SHA512 c2d06c9b5073fa9f28120c02eff2689193db47fa0dd202b2c76cd2c61f7b047515cb68c82f2da0a90a39e9af5b14eef29879d823d4e09aeead017a80b67bb557
 MISC metadata.xml 326 BLAKE2B bc05ca32a96bfdc2221a30c9214fddbf4c4616e2f79b97fb8ee6f0fc875c1934452cf8bbfe513c184addfeed36c007c4b5e78e08a0e1003b24396149460ee03c SHA512 df8ab517f535f57ae6ebecbecd33f49ecc83a4d0446020f9e40f4a43eb86b5f1cb279a4c356a09986c8dc8497ae2a5f309ae21cd8797ac5d1f546a785727ee1d
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
index 957f18b6e3bb..1e982dd443b4 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
@@ -21,7 +21,7 @@ else
 	COMMIT="ed0317e6a58c098874ac58b769cf2e609c18d9a5"
 	SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/srslte/Manifest b/net-wireless/srslte/Manifest
index da465c1c875d..5fded62d55a5 100644
--- a/net-wireless/srslte/Manifest
+++ b/net-wireless/srslte/Manifest
@@ -1,4 +1,5 @@
+AUX srslte-20.10.1-add-missing-include.patch 617 BLAKE2B 26b371dafafcf1f0620b66ac9ce0e4b8f79dfc609803170f4038a8ed7486496b260cf048d0703f64419a1f6f4fc965ccf4dcf5c19215c3220ed49174674d76bd SHA512 f81038b45859fb861bf49e4068603d1ef4d3ac80268a0420937e4b00b16293cf4368eefb4da0d7f5411431425108ab858fc94c1bfe680cb893cdc3bc4083d446
 DIST srslte-20.10.1.tar.gz 8098321 BLAKE2B 713cbe45c49baa416b96dc432982656fef92082f026392c890f447d09588a48aafab32f94a4d7ed982814d2d838224303895a0bd0276a90f5815f6d0707d9732 SHA512 a6e38ccdb02a7e129f51fbad258722f5cd1f568541627c3e9e70f9e92491279cb55c18ab0463bce94b0f5fc62f0868027a83beffc483bb3689f0838fbea91186
-EBUILD srslte-20.10.1-r2.ebuild 1303 BLAKE2B fe172c59869c9caec4d45431d51f7efc48b7808072a99022706355f9fc1cb6d5f3588772e5a2fca71eabfbd8680c1516bba0a7826444d38028af76499459f050 SHA512 408e8e29ab0b17e3e111fa1966a414dccc50606074ed1750c45f2fe9cc85802a8e1c4807eea7acd6bfaf4b2cfcd0e65b3bbcc1c4828ec4659055ced61a90fc87
+EBUILD srslte-20.10.1-r2.ebuild 1371 BLAKE2B 364f811a06925cca50d1b576fbca91569e8704733923bd554926cce4bbf583d6442fb7b28b38e947c6e222e2111e865fed4f2b0e61a788b90f7e3206ffd7b9d4 SHA512 183c0c3ef2d580e1218845663a26b1611b1bc1f3aeb17d100543d8afa73a7a0337776361e0615739391b35dd09f0b8ae373aa31df1b96824ad3b11e3605e8d0b
 EBUILD srslte-9999.ebuild 1303 BLAKE2B fe172c59869c9caec4d45431d51f7efc48b7808072a99022706355f9fc1cb6d5f3588772e5a2fca71eabfbd8680c1516bba0a7826444d38028af76499459f050 SHA512 408e8e29ab0b17e3e111fa1966a414dccc50606074ed1750c45f2fe9cc85802a8e1c4807eea7acd6bfaf4b2cfcd0e65b3bbcc1c4828ec4659055ced61a90fc87
-MISC metadata.xml 560 BLAKE2B b7ddd92fc58b496527910d8f81df05ff473dc557c92d9a46ce18193ec411b5fb5b6b431f3f6bd54c2cd303570fb4215f438cbdbf5105c4316645a4cf734f3d68 SHA512 6f34f666c0b11b6ccb576117ae114f6628d50b0fff6cae384e77bec82c6398951f4b0dabfb273d801ff79e2e0aa70ae7babc0c19ed75f3cfd0be02527c6ebebd
+MISC metadata.xml 638 BLAKE2B bd45f5659a3202531fd3d53e9e7ff7384b761a70ca6310bce9c6f05611e69b11f26c4f450732ed81f31dfc00b1984c8149701567827125c5d1ac3a42ef3df699 SHA512 36ce4b5cf73154f494f0a43c61dd3f5a4a08815fed650ef783b5178aa45d594e1cf32282284aaa7a175717be501c4b82300c573b406465f846cd7c990980cae4
diff --git a/net-wireless/srslte/files/srslte-20.10.1-add-missing-include.patch b/net-wireless/srslte/files/srslte-20.10.1-add-missing-include.patch
new file mode 100644
index 000000000000..158ff9e6db39
--- /dev/null
+++ b/net-wireless/srslte/files/srslte-20.10.1-add-missing-include.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/786855
+
+From 4ec818f0d337a54ff3d4ff587bbd6f5f05363700 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 4 Aug 2021 23:14:21 +0100
+Subject: [PATCH] Add missing include
+
+---
+ lib/include/srslte/adt/observer.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/include/srslte/adt/observer.h b/lib/include/srslte/adt/observer.h
+index 38a881d..9ad33a0 100644
+--- a/lib/include/srslte/adt/observer.h
++++ b/lib/include/srslte/adt/observer.h
+@@ -26,6 +26,7 @@
+ #include <functional>
+ #include <limits>
+ #include <vector>
++#include <cstddef>
+ 
+ namespace srslte {
+ 
+-- 
+2.32.0
+
diff --git a/net-wireless/srslte/metadata.xml b/net-wireless/srslte/metadata.xml
index 04c0836aaf67..fb4254fe90dc 100644
--- a/net-wireless/srslte/metadata.xml
+++ b/net-wireless/srslte/metadata.xml
@@ -12,4 +12,7 @@
 		<flag name="simcard">support hardware sim cards</flag>
 		<flag name="zeromq">enable zeromq message passing</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">srsLTE/srsLTE</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/srslte/srslte-20.10.1-r2.ebuild b/net-wireless/srslte/srslte-20.10.1-r2.ebuild
index 02ff600dab82..789887297552 100644
--- a/net-wireless/srslte/srslte-20.10.1-r2.ebuild
+++ b/net-wireless/srslte/srslte-20.10.1-r2.ebuild
@@ -39,6 +39,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.10.1-add-missing-include.patch
+)
+
 src_prepare() {
 	sed -i '/ -Werror"/d' CMakeLists.txt || die
 	cmake_src_prepare
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 8df8d32be1ed..370f9efe5ba3 100644
--- a/perl-core/Manifest.gz
+++ b/perl-core/Manifest.gz
diff --git a/perl-core/Scalar-List-Utils/Manifest b/perl-core/Scalar-List-Utils/Manifest
index cc99ecd93110..d03aecdd929b 100644
--- a/perl-core/Scalar-List-Utils/Manifest
+++ b/perl-core/Scalar-List-Utils/Manifest
@@ -1,3 +1,3 @@
 DIST Scalar-List-Utils-1.56.tar.gz 173248 BLAKE2B 9dde08b8ce9ca8de84569e60a3f9da794912008ed45f140a14aff1f7190c8a5168065a9fbc83f73779653b3cd26e7be3a9172493084db7f326f9e4c92281b2a4 SHA512 90291e154497599e7e41b6746dc29351c619201b5723eedfa76dee81d0db4ae28ad598355edc61c529de5c05d5eafc17ae6c3205f0c624fc2a028ecbac9f2c3f
-EBUILD Scalar-List-Utils-1.560.0.ebuild 448 BLAKE2B 4923f6afc0443979e21252ec044df0a0982cabb42854a176c07fc06da633fd499184928fe96175873fa3775fa8e6eee91ba941017df464c3169ff709156a1f03 SHA512 fcf6276076fb8d6516b2f5e1251dfcffaf79312b4904d54509e74c5d92cf6f9606a2ca6c9df97cd013101a3460aa0a07cf87d99c4028425ee0726a1f8aa1c191
+EBUILD Scalar-List-Utils-1.560.0.ebuild 443 BLAKE2B e1b30c652578fe93a34be36f039220b0eddf31d5f823ce1fac150868884680c0a4d2e0e75dfa9914a2a47ef9fe914f79af1dd06ed576dc2d18dbd5f5d18aa402 SHA512 51f95be82bbf2b9646f9b889b1235105d55d3abfbc2ba6a9f7798da357933709fe3abcfe4dcf872b1894d800aaae5cfd5bbf8599c7c622ac50a1804235a62541
 MISC metadata.xml 574 BLAKE2B a58de3a041485c962e4f62a61d562e226f9aa349b03536eb1eb4a61898e2dfea40f6231c9815de0bde59485bad84c255e53a023e1973c842860282997e0f4721 SHA512 e9b319821da9fb8618f12d546c4c71be99db66541c209f2d7be3ffcc3f8c03530df32580e9fa8de5d519260ade1e62399267db71e9d66c74ede1a0108bee94d7
diff --git a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.560.0.ebuild b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.560.0.ebuild
index 627cf9669b6a..98b72ebfa6e2 100644
--- a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.560.0.ebuild
+++ b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.560.0.ebuild
@@ -9,4 +9,4 @@ inherit perl-module
 
 DESCRIPTION="Common Scalar and List utility subroutines"
 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"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7504daafcb9f..9ec40eb8b8d8 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/ppc64/eapi b/profiles/arch/amd64/lib32/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/arch/ppc64/eapi
+++ b/profiles/arch/amd64/lib32/eapi
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index e2b47d92c069..450387342147 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -53,7 +53,7 @@ net-misc/asterisk -blocks
 sys-libs/compiler-rt-sanitizers -asan -dfsan -lsan -msan -hwasan -tsan
 sys-libs/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo
 sys-libs/compiler-rt-sanitizers -gwp-asan
-sys-libs/compiler-rt-sanitizers -libfuzzer -memprof -profile -xray
+sys-libs/compiler-rt-sanitizers -libfuzzer -memprof -orc -profile -xray
 
 # Sam James <sam@gentoo.org> (2020-10-24)
 # asm redc is only available on amd64,
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 38621c7f6d36..f2f76f9aa189 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -22,6 +22,7 @@ app-office/texmaker
 app-text/bibletime
 app-text/calibre
 app-text/cb2bib
+app-text/kchmviewer
 app-text/sigil
 dev-lang/typescript
 dev-python/spyder
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 8a76c66af9ec..b0a8d12e13b0 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-08-02)
+# pandoc not keyworded on arm64
+sys-apps/exa man
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-07-24)
 # not supported on arm64
 sys-boot/grub grub_platforms_qemu grub_platforms_uboot
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index e9acf79d2f25..c71049984f05 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -11,11 +11,6 @@ dev-util/diffoscope haskell
 x11-base/xwayland video_cards_nvidia
 x11-wm/mutter video_cards_nvidia
 
-# Bernd Waibel <waebbl-gentoo@posteo.net> (2021-06-16)
-# sci-libs/pcl-1.11.1 is missing support for >=sci-libs/vtk-9
-# bug #796368
-~media-gfx/freecad-0.19.2 pcl
-
 # Bernd Waibel <waebbl-gentoo@posteo.net> (2021-06-11)
 # Has unpackaged depdencies, bug #795459
 >=media-libs/opencolorio-2.0.0 doc
@@ -48,7 +43,7 @@ net-misc/asterisk blocks
 sys-libs/compiler-rt-sanitizers asan dfsan lsan msan hwasan tsan
 sys-libs/compiler-rt-sanitizers ubsan safestack cfi scudo
 sys-libs/compiler-rt-sanitizers shadowcallstack gwp-asan
-sys-libs/compiler-rt-sanitizers libfuzzer memprof profile xray
+sys-libs/compiler-rt-sanitizers libfuzzer memprof orc profile xray
 
 # Sam James <sam@gentoo.org> (2020-10-24)
 # asm redc is only available on amd64,
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/eapi b/profiles/arch/mips/mipsel/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/eapi
+++ b/profiles/arch/mips/mipsel/eapi
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 6f0fc6cdc7a5..27501552b45f 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
 
+# Thomas Deutschmann <whissi@gentoo.org> (2021-08-04)
+# Requires net-misc/modemmanager[qmi], mask until keyworded
+sys-apps/fwupd modemmanager
+
 # Miroslav Å ulc <fordfrog@gentoo.org> (2021-03-13)
 # virtual/jdk isn't keyworded here
 media-libs/rubberband jni
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd/eapi b/profiles/arch/ppc64/big-endian/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd/eapi
+++ b/profiles/arch/ppc64/big-endian/eapi
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index c702c9a2127b..c134b9c5c0ad 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,15 +1,22 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Alex Fan <alexfanqi@yahoo.com> (2021-08-05)
+# pdfannotextractor depends on java, not (sustainably) supported yet
+app-text/texlive pdfannotextractor
+
+# Yixun Lan <dlan@gentoo.org> (2021-08-05)
+# Boost.Context can be built on riscv
+dev-libs/boost -context
+
+# Ye Cao <ye.c@rioslab.org> (2021-07-31)
+# Dependencies not keyworded, not tested
+dev-util/perf unwind
+
 # Marek Szuba <marecki@gentoo.org> (2021-07-28)
 # app-cdr/cdrtools fails to compile on riscv
 dev-util/catalyst iso
 
-# Yixun Lan <dlan@gentoo.org> (2021-07-27)
-# depend on sci-physics/bullet, media-libs/libv4l
-# which not keyworded
-dev-libs/efl physics v4l
-
 # Marek Szuba <marecki@gentoo.org> (2021-07-27)
 # dev-libs/boxfort does not support riscv64 yet, meaning
 # dev-libs/criterion cannot be keyworded here
@@ -109,10 +116,11 @@ media-libs/libcaca doc imlib
 dev-libs/libbytesize test
 sys-libs/libblockdev dmraid escrow
 app-misc/geoclue modemmanager zeroconf
-gnome-base/gvfs bluray cdda gnome-online-accounts google mtp ios test zeroconf
+dev-libs/libgdata gnome-online-accounts
+gnome-base/gvfs bluray cdda gnome-online-accounts google mtp ios zeroconf
 sys-power/upower ios
 net-libs/webkit-gtk gstreamer
-xfce-base/xfce4-settings colord libcanberra
+xfce-base/xfce4-settings libcanberra
 xfce-extra/tumbler epub ffmpeg gstreamer odf pdf raw
 xfce-extra/xfce4-power-manager networkmanager
 xfce-base/xfce4-meta pulseaudio
@@ -136,32 +144,21 @@ x11-base/xwayland unwind
 
 # Yixun Lan <dlan@gentoo.org> (2021-05-19)
 # Dependencies not keyworded, not tested
-dev-libs/gobject-introspection doctool test
-dev-python/markdown test
-x11-libs/gtk+ test colord
-net-libs/libsoup test
 net-libs/libproxy spidermonkey webkit kde networkmanager
 
 # Sam James <sam@gentoo.org> (2021-03-11)
 # Yixun Lan <dlan@gentoo.org> (2021-07-27)
 # media-libs/libheif isn't keyworded here
-# media-libs/libavif isn't keyworded here
-dev-libs/efl avif
-media-libs/gd avif heif
+media-libs/gd heif
 
 # Joonas Niilola <juippis@gentoo.org> (2021-01-15)
 # Dependency not keyworded on this arch.
 app-text/enchant voikko
 
 # Patrick McLean <chutzpah@gentoo.org> (2020-04-16)
-# dev-python/breathe not keyworded here, mask to facilitate
-# keywording dev-libs/libfido2
+# dev-python/breathe not keyworded here
 dev-libs/libcbor doc
 
-# Patrick McLean <chutzpah@gentoo.org> (2020-02-15)
-# Mask until dev-libs/libfido2 is keyworded
-net-misc/openssh security-key
-
 # This doesn't work for (any) riscv yet.
 dev-libs/libpcre2 jit
 dev-libs/libpcre jit
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index bc692130ebae..d8f22f0dd177 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,22 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@gentoo.org> (2021-08-04)
+# Needs last-rited app-dicts/kasumi
+# bug #786738
+app-i18n/scim-anthy kasumi
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-08-02)
+# Two years after the tracker was opened it is time to mask dev-qt/qtwebkit
+# for good. No commits to upstream repository for >9 months, latest available
+# tarball still "alpha" with warning about known unpatched vulnerabilities.
+# Bugs: #684580, #750893
+app-office/kexi webkit
+dev-libs/kreport webkit
+dev-python/PyQt5 webkit
+media-plugins/mythplugins mythbrowser mythmusic
+net-irc/kvirc webkit
+
 # Sam James <sam@gentoo.org> (2021-07-24)
 # USE=exec-static-trampoline can break consumers due to
 # faulty assumptions. Masked for now due to the possibility
@@ -135,9 +151,12 @@ x11-libs/colord-gtk doc
 <dev-ml/llvm-ocaml-12 llvm_targets_ARC llvm_targets_VE
 <sys-devel/clang-12 llvm_targets_ARC llvm_targets_VE
 <sys-devel/llvm-12 llvm_targets_ARC llvm_targets_VE
-<dev-ml/llvm-ocaml-12.0.0.9999 llvm_targets_CSKY
-<sys-devel/clang-12.0.0.9999 llvm_targets_CSKY
-<sys-devel/llvm-12.0.0.9999 llvm_targets_CSKY
+<dev-ml/llvm-ocaml-13 llvm_targets_CSKY
+<sys-devel/clang-13 llvm_targets_CSKY
+<sys-devel/llvm-13 llvm_targets_CSKY
+<dev-ml/llvm-ocaml-14 llvm_targets_M68k
+<sys-devel/clang-14 llvm_targets_M68k
+<sys-devel/llvm-14 llvm_targets_M68k
 
 # Joonas Niilola <juippis@gentoo.org> (2020-12-03)
 # Doc building seem to be very random without any predictability,
diff --git a/profiles/features/eapi b/profiles/default/linux/amd64/17.0/no-multilib/prefix/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/features/eapi
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/eapi
diff --git a/profiles/prefix/darwin/macos/arch/eapi b/profiles/default/linux/amd64/17.1/no-multilib/prefix/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/prefix/darwin/macos/arch/eapi
+++ b/profiles/default/linux/amd64/17.1/no-multilib/prefix/eapi
diff --git a/profiles/prefix/sunos/solaris/arch/eapi b/profiles/default/linux/arm/17.0/armv7a/prefix/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/prefix/sunos/solaris/arch/eapi
+++ b/profiles/default/linux/arm/17.0/armv7a/prefix/eapi
diff --git a/profiles/default/linux/arm64/17.0/prefix/eapi b/profiles/default/linux/arm64/17.0/prefix/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/deprecated b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/deprecated
new file mode 100644
index 000000000000..39201a2ed7be
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/deprecated
@@ -0,0 +1,69 @@
+default/linux/ppc64/17.0
+
+A new set of ppc64 profiles has been added to the Gentoo
+repository in Jan 2020.  These profiles switch to a more standard
+'no SYMLINK_LIB' multilib layout, and require explicit migration as
+described below.  They are considered stable at the moment, and we would
+like to request all users to upgrade their systems.  The old profiles
+will be deprecated in the near future.
+
+In the new profiles, the lib->lib64 compatibility symlink is removed.
+64-bit libraries need to be installed directly to lib64.  /lib
+and /usr/lib become real directories, that are used for cross-arch
+and native non-library packages (gcc, clang).
+
+The migration is performed using app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 4.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+
+     # eselect profile set default/linux/ppc64/17.0
+
+[at this point you can start using emerge again]
+
+9. Rebuild the toolchain:
+
+      # emerge -1v sys-devel/gcc:10
+      [ repeat for other slots you will be using ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
+
+For known issues, please see bugs #506276 [2] and #640184[3] .
+If you have any problems with the new profiles or the migration procedure,
+please report a bug and make it block the tracker.
+
+For more information on the layout, please see the wiki article
+on AMD64 multilib layouts [4], it applies to PPC64 as well.
+
+[1] https://gentoo.org/support/news-items/2017-11-30-new-17-profiles.html
+[2] https://bugs.gentoo.org/506276
+[3] https://bugs.gentoo.org/640184
+[4] https://wiki.gentoo.org/wiki/Project:AMD64/Multilib_layout
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/deprecated b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/deprecated
new file mode 100644
index 000000000000..d2d65c2bca03
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/deprecated
@@ -0,0 +1,69 @@
+default/linux/ppc64/17.0/desktop
+
+A new set of ppc64 profiles has been added to the Gentoo
+repository in Jan 2020.  These profiles switch to a more standard
+'no SYMLINK_LIB' multilib layout, and require explicit migration as
+described below.  They are considered stable at the moment, and we would
+like to request all users to upgrade their systems.  The old profiles
+will be deprecated in the near future.
+
+In the new profiles, the lib->lib64 compatibility symlink is removed.
+64-bit libraries need to be installed directly to lib64.  /lib
+and /usr/lib become real directories, that are used for cross-arch
+and native non-library packages (gcc, clang).
+
+The migration is performed using app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 4.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+
+     # eselect profile set default/linux/ppc64/17.0
+
+[at this point you can start using emerge again]
+
+9. Rebuild the toolchain:
+
+      # emerge -1v sys-devel/gcc:10
+      [ repeat for other slots you will be using ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
+
+For known issues, please see bugs #506276 [2] and #640184[3] .
+If you have any problems with the new profiles or the migration procedure,
+please report a bug and make it block the tracker.
+
+For more information on the layout, please see the wiki article
+on AMD64 multilib layouts [4], it applies to PPC64 as well.
+
+[1] https://gentoo.org/support/news-items/2017-11-30-new-17-profiles.html
+[2] https://bugs.gentoo.org/506276
+[3] https://bugs.gentoo.org/640184
+[4] https://wiki.gentoo.org/wiki/Project:AMD64/Multilib_layout
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/deprecated b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/deprecated
new file mode 100644
index 000000000000..5c4e2a902c41
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/deprecated
@@ -0,0 +1,69 @@
+default/linux/ppc64/17.0/desktop/gnome
+
+A new set of ppc64 profiles has been added to the Gentoo
+repository in Jan 2020.  These profiles switch to a more standard
+'no SYMLINK_LIB' multilib layout, and require explicit migration as
+described below.  They are considered stable at the moment, and we would
+like to request all users to upgrade their systems.  The old profiles
+will be deprecated in the near future.
+
+In the new profiles, the lib->lib64 compatibility symlink is removed.
+64-bit libraries need to be installed directly to lib64.  /lib
+and /usr/lib become real directories, that are used for cross-arch
+and native non-library packages (gcc, clang).
+
+The migration is performed using app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 4.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+
+     # eselect profile set default/linux/ppc64/17.0
+
+[at this point you can start using emerge again]
+
+9. Rebuild the toolchain:
+
+      # emerge -1v sys-devel/gcc:10
+      [ repeat for other slots you will be using ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
+
+For known issues, please see bugs #506276 [2] and #640184[3] .
+If you have any problems with the new profiles or the migration procedure,
+please report a bug and make it block the tracker.
+
+For more information on the layout, please see the wiki article
+on AMD64 multilib layouts [4], it applies to PPC64 as well.
+
+[1] https://gentoo.org/support/news-items/2017-11-30-new-17-profiles.html
+[2] https://bugs.gentoo.org/506276
+[3] https://bugs.gentoo.org/640184
+[4] https://wiki.gentoo.org/wiki/Project:AMD64/Multilib_layout
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/deprecated b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/deprecated
new file mode 100644
index 000000000000..d5f704a6a522
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/deprecated
@@ -0,0 +1,69 @@
+default/linux/ppc64/17.0/desktop/gnome/systemd
+
+A new set of ppc64 profiles has been added to the Gentoo
+repository in Jan 2020.  These profiles switch to a more standard
+'no SYMLINK_LIB' multilib layout, and require explicit migration as
+described below.  They are considered stable at the moment, and we would
+like to request all users to upgrade their systems.  The old profiles
+will be deprecated in the near future.
+
+In the new profiles, the lib->lib64 compatibility symlink is removed.
+64-bit libraries need to be installed directly to lib64.  /lib
+and /usr/lib become real directories, that are used for cross-arch
+and native non-library packages (gcc, clang).
+
+The migration is performed using app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 4.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+
+     # eselect profile set default/linux/ppc64/17.0
+
+[at this point you can start using emerge again]
+
+9. Rebuild the toolchain:
+
+      # emerge -1v sys-devel/gcc:10
+      [ repeat for other slots you will be using ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
+
+For known issues, please see bugs #506276 [2] and #640184[3] .
+If you have any problems with the new profiles or the migration procedure,
+please report a bug and make it block the tracker.
+
+For more information on the layout, please see the wiki article
+on AMD64 multilib layouts [4], it applies to PPC64 as well.
+
+[1] https://gentoo.org/support/news-items/2017-11-30-new-17-profiles.html
+[2] https://bugs.gentoo.org/506276
+[3] https://bugs.gentoo.org/640184
+[4] https://wiki.gentoo.org/wiki/Project:AMD64/Multilib_layout
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/developer/deprecated b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/developer/deprecated
new file mode 100644
index 000000000000..be667d59c808
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/developer/deprecated
@@ -0,0 +1,69 @@
+default/linux/ppc64/17.0/developer
+
+A new set of ppc64 profiles has been added to the Gentoo
+repository in Jan 2020.  These profiles switch to a more standard
+'no SYMLINK_LIB' multilib layout, and require explicit migration as
+described below.  They are considered stable at the moment, and we would
+like to request all users to upgrade their systems.  The old profiles
+will be deprecated in the near future.
+
+In the new profiles, the lib->lib64 compatibility symlink is removed.
+64-bit libraries need to be installed directly to lib64.  /lib
+and /usr/lib become real directories, that are used for cross-arch
+and native non-library packages (gcc, clang).
+
+The migration is performed using app-portage/unsymlink-lib tool.
+The following steps can be used to upgrade your system:
+
+1. Sync and upgrade your system to the newest package versions
+   to reduce the risk of issues.
+
+2. Install the tool:
+
+     # emerge -1v app-portage/unsymlink-lib
+
+3. Run 'unsymlink-lib --analyze' and check the output for obvious
+   mistakes.  If you need to perform any changes to the system, remember
+   to run 'unsymlink-lib --analyze' again afterwards.
+
+[past this point do not call emerge or modify /usr manually]
+
+4. This is a very good time to make a backup.
+
+5. Run 'unsymlink-lib --migrate'.  You can add '--pretend' first to see
+   what is going to happen.
+
+6. Reboot your system.  Check if important programs work.
+   In particular, verify that e.g. 'emerge --info' works (but do not
+   install anything).  If you hit any serious problems, you can use
+   'unsymlink-lib --rollback' to revert the changes and return to
+   step 4.
+
+7. Run 'unsymlink-lib --finish'.  You can add '--pretend' first to see
+   what is going to happen but note that you're going to see a very long
+   list of files to remove.
+
+8. Switch the profile, e.g.:
+
+     # eselect profile set default/linux/ppc64/17.0
+
+[at this point you can start using emerge again]
+
+9. Rebuild the toolchain:
+
+      # emerge -1v sys-devel/gcc:10
+      [ repeat for other slots you will be using ]
+      # emerge -1v sys-devel/binutils
+      # emerge -1v sys-libs/glibc
+
+For known issues, please see bugs #506276 [2] and #640184[3] .
+If you have any problems with the new profiles or the migration procedure,
+please report a bug and make it block the tracker.
+
+For more information on the layout, please see the wiki article
+on AMD64 multilib layouts [4], it applies to PPC64 as well.
+
+[1] https://gentoo.org/support/news-items/2017-11-30-new-17-profiles.html
+[2] https://bugs.gentoo.org/506276
+[3] https://bugs.gentoo.org/640184
+[4] https://wiki.gentoo.org/wiki/Project:AMD64/Multilib_layout
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/deprecated b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/deprecated
deleted file mode 100644
index 4469104445c1..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/deprecated
+++ /dev/null
@@ -1,2 +0,0 @@
-default/linux/ppc64le/17.0
-# eselect profile set default/linux/ppc64le/17.0
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/make.defaults b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/make.defaults
deleted file mode 100644
index a4712d66ffa0..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Keep this in the 13.0 version profile.  Drop in next upgrade.
-SYMLINK_LIB="no"
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/parent b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/parent
deleted file mode 100644
index 64683a942ea2..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../arch/powerpc/ppc64/64le
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd/deprecated b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd/deprecated
deleted file mode 100644
index 858b34d8727c..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd/deprecated
+++ /dev/null
@@ -1,2 +0,0 @@
-default/linux/ppc64le/17.0/systemd
-# eselect profile set default/linux/ppc64le/17.0/systemd
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd/parent b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd/parent
deleted file mode 100644
index f7739b405877..000000000000
--- a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/ppc64le/17.0/prefix/eapi b/profiles/default/linux/ppc64le/17.0/prefix/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/prefix/eapi b/profiles/default/linux/x86/17.0/prefix/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/eapi b/profiles/features/prefix/standalone/kernel-2.6.16+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/features/prefix/standalone/kernel-2.6.32+/eapi b/profiles/features/prefix/standalone/kernel-2.6.32+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/package.mask b/profiles/package.mask
index d0e2c93abd7c..832863fe8b15 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,134 @@
 
 #--- END OF EXAMPLES ---
 
+# Stephan Hartmann <sultan@gentoo.org> (2021-08-06)
+# Dev channel releases are only for people who
+# are developers or want more experimental features
+# and accept a more unstable release.
+>=www-client/chromium-94
+
+# Ulrich Müller <ulm@gentoo.org> (2021-08-06)
+# Masked for removal in 30 days. Upstream has joined the
+# manpages-l10n project, so 5.06 was their ultimate release
+# as a separate package. Use app-i18n/man-pages-l10n[l10n_it]
+# as replacement. Bug #769017.
+app-i18n/man-pages-it
+
+# David Seifert <soap@gentoo.org> (2021-08-05)
+# Dead upstream, last release over 5 years ago, multiple
+# build issues, fails to build with GCC 11. Use something like
+# sci-biology/abyss or canu as a modern day replacement.
+# Bug #610094, #715874, #731860, #739486, removal in 30 days.
+sci-biology/wgs-assembler
+
+# David Seifert <soap@gentoo.org> (2021-08-05)
+# Unmaintained, tons of issues, fails to build with GCC 11.
+# Bug #631598, #690024, #735960, #749038, #761415, #761667,
+# #778557, #786789, #799179, removal in 30 days.
+app-backup/bareos
+dev-libs/bareos-fastlzlib
+dev-python/bareos
+
+# Sam James <sam@gentoo.org> (2021-08-05)
+# Fails to build with GCC 11. No activity upstream.
+# bug #740308, bug #789816. Removal on 2021-09-05.
+app-eselect/eselect-audicle
+app-eselect/eselect-miniaudicle
+media-sound/audicle
+
+# Sam James <sam@gentoo.org> (2021-08-04)
+# Fails to build with GCC 11. No activity upstream since 2008.
+# bug #730692, bug #787866. Removal on 2021-09-04.
+dev-scheme/ypsilon
+
+# Sam James <sam@gentoo.org> (2021-08-04)
+# Fails to build with GCC 11. Library with no reverse-dependencies.
+# bug #731254, bug #787905. Removal on 2021-09-04.
+net-libs/openmq-cclient
+
+# Sam James <sam@gentoo.org> (2021-08-04)
+# Fails to build with GCC 11, no activity upstream.
+# bug #786738. Removal on 2021-09-04.
+app-dicts/kasumi
+
+# Sam James <sam@gentoo.org> (2021-08-04)
+# Fails to build with GCC 11, no activity upstream.
+# bug #729106, bug #786648. Removal on 2021-09-04.
+app-backup/zbackup
+
+# Sam James <sam@gentoo.org> (2021-08-04)
+# Fails to build with GCC 11, large number of open bugs,
+# no activity upstream. bug #692806, bug #694674, bug #712832,
+# bug #725166, bug #740792, bug #788637, bug #798042.
+# Removal on 2021-09-04.
+net-misc/stargazer
+
+# Sam James <sam@gentoo.org> (2021-08-04)
+# Fails to build with GCC 11 and has Boost incompatibility issues.
+# bug #741646, bug #792993. Removal on 2021-09-04.
+sci-physics/sassena
+
+# David Seifert <soap@gentoo.org> (2021-08-04)
+# Last release over 4 years ago, upstream pretty much dead, the
+# ecosystem has switched to dev-util/pkgconf, which is alive. Testing
+# and prefix bugs, blocks WANT_AUTOMAKE=1.12 removal.
+# (If you hit blockers, please run:
+# $ emerge --deselect dev-util/pkgconfig
+# This is necessary as your world file should not contain dependencies.)
+# Bug #245228, #632124, #691268, #767853, removal in 30 days.
+dev-util/pkgconfig
+
+# David Seifert <soap@gentoo.org> (2021-08-04)
+# Last release 11 years ago, XDG env issue, no revdeps, blocks
+# WANT_AUTOMAKE=1.11 removal, last major distro to package this.
+# Bug #586586, removal in 30 days.
+media-libs/memphis
+
+# David Seifert <soap@gentoo.org> (2021-08-04)
+# Last release 16 years ago, multiple build failures, unmaintained,
+# upstream disappeared, last distro that still packages this.
+# Bug #722376, #742938, #742941, removal in 30 days.
+app-i18n/libtabe
+app-i18n/xcin
+
+# David Seifert <soap@gentoo.org> (2021-08-04)
+# Last release 7 years ago, multiple test failures, unmaintained,
+# last distro that still packages this.
+# Bug #629610, #646690, removal in 30 days.
+dev-libs/hyperleveldb
+dev-libs/replicant
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-08-02)
+# Two years after the tracker was opened it is time to mask dev-qt/qtwebkit
+# for good. No commits to upstream repository for >9 months, latest available
+# tarball still "alpha" with warning about known unpatched vulnerabilities.
+# Bugs: #684580, #685750, #709858, #740416
+dev-qt/qtwebkit:5
+app-text/fb2edit
+mail-client/trojita
+<media-video/openshot-2.5.1_p20210228
+
+# Sam James <sam@gentoo.org> (2021-08-01)
+# Broken with GCC 11, out of date, unmaintained in Gentoo.
+# bug #763651, bug #774009, bug #789027, bug #759988.
+# Removal on 2021-09-01.
+dev-util/intel-graphics-compiler
+dev-libs/intel-neo
+
+# Sam James <sam@gentoo.org> (2021-08-01)
+# Fails to compile, multiple open bugs.
+# No activity upstream since 2015.
+# bug #570484, bug #715412, bug #723204.
+# Removal on 2021-09-01.
+sys-apps/lmctfy
+
+# Sam James <sam@gentoo.org> (2021-08-01)
+# Fails to build with network-sandbox and variety
+# of other open bugs. Unmaintained.
+# bug #632638, bug #688530, bug #709992, bug #757768,
+# bug #796920. Removal on 2021-09-01.
+sys-apps/habitat
+
 # David Seifert <soap@gentoo.org> (2021-08-01)
 # Dropped into ::gentoo, then unmaintained. Multiple versions behind
 # upstream, GCC 11 bug open, lacks python 3.10, python library without
@@ -74,7 +202,7 @@ dev-java/jgoodies-binding
 dev-java/jgoodies-forms
 
 # Joonas Niilola <juippis@gentoo.org> (2021-07-29)
-# Upstream provided migration instructions from 2. -> 3. update, 
+# Upstream provided migration instructions from 2. -> 3. update,
 # breaks if not all at least many revdeps. #805011 for tracker bug.
 >=net-libs/mbedtls-3.0.0
 
@@ -99,6 +227,8 @@ net-im/minbif
 # Fails to build with GCC 11.
 # Removal on 2021-08-26. bug #787113, bug #735714, bug #657510.
 dev-cpp/libxsd-frontend
+dev-cpp/libcutl
+dev-util/build
 
 # John Helmert III <ajak@gentoo.org> (2021-07-26)
 # Open security bug, service backing it seems to be dead, making these
@@ -122,7 +252,6 @@ sci-electronics/drawtiming
 # Only one reverse dependency (media-libs/openexr_ctl) which
 # is uninstallable.
 # Removal on 2021-08-25. bug #789792, bug #715298.
-media-libs/ctl
 media-libs/openexr_ctl
 
 # Michał Górny <mgorny@gentoo.org> (2021-07-25)
@@ -154,7 +283,7 @@ www-servers/resin
 dev-ml/cstruct
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-18)
-# No gtk4 and friends in the tree yet
+# No dev-cpp/gtkmm:4 in the tree yet (Bug #801490)
 >=media-sound/easyeffects-6.0.0
 
 # Hans de Graaff <graaff@gentoo.org> (2021-07-18)
@@ -401,11 +530,6 @@ sys-libs/db:5.1
 # Removal on 2021-07-27
 media-sound/loudness-scanner
 
-# Marek Szuba <marecki@genoo.org> (2021-06-25)
-# Unslotted version conflicting with lua eclasses.
-# No revdeps left. EAPI 5. Removal in 30 days (Bug #798693)
-dev-lang/lua:0
-
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-06-21)
 # library with no consumer, removal in 30 days
 # see https://bugs.gentoo.org/794562
@@ -441,6 +565,8 @@ dev-java/jibx-tools
 # Davide Pesavento <pesa@gentoo.org> (2021-06-15)
 # Masked for revdep testing.
 >=dev-python/sip-6
+>=dev-python/PyQt5-5.15.5_pre
+>=dev-python/qscintilla-python-2.13
 
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-06-14)
 # DeprecatedDep jre-1.3, upstream dead,removal in 30 days
@@ -546,12 +672,6 @@ dev-java/werken-xpath
 # bug #737406
 =media-fonts/culmus-0.133-r1
 
-# Lars Wendler <polynomial-c@gentoo.org> (2021-03-22)
-# On fast CPUs eautoreconf skips intermediate steps,
-# enables maintainer-mode or fails automake assertions:
-# bug #782985
-sys-devel/autoconf:2.71
-
 # Sam James <sam@gentoo.org> (2021-03-03)
 # Doesn't seem to sync clock correctly
 # in some cases.
@@ -685,6 +805,8 @@ sys-devel/automake:1.7
 sys-devel/automake:1.8
 sys-devel/automake:1.9
 sys-devel/automake:1.10
+sys-devel/automake:1.11
+sys-devel/automake:1.12
 
 # Nicolas Bock <nicolasbock@gentoo.org> (2017-10-31)
 # There are multiple unresolved upstream issues with >=jabref-bin-4.0 (#636036).
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/eapi b/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/eapi b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index be3739cfc416..e7e19692b5dc 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -160,13 +160,11 @@ ppc		default/linux/powerpc/ppc64/17.0/32bit-userland/desktop			stable
 ppc		default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome		stable
 ppc		default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd	stable
 ppc		default/linux/powerpc/ppc64/17.0/32bit-userland/developer		stable
-ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland				stable
-ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/desktop			stable
-ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome		stable
-ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd	stable
-ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/developer		stable
-#ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian		stable
-#ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd	stable
+ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland				dev
+ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/desktop			dev
+ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome		dev
+ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd	dev
+ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/developer		dev
 
 # PPC/PPC64 flat Profiles
 # @MAINTAINER: gyakovlev@gentoo.org, ppc64@gentoo.org, musl@gentoo.org
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index dea40502c379..b65158ad3832 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -51,3 +51,6 @@ net-firewall/nftables json python xtables
 
 # Required by dev-qt/qtwebengine:5
 sys-libs/zlib minizip
+
+# Required by kde-plasma/kwin; >=1.20.13-r1 has dropped the flag
+<x11-base/xorg-server-1.20.13-r1 wayland
diff --git a/profiles/updates/3Q-2021 b/profiles/updates/3Q-2021
index d256eeddfc0f..749bbc977b48 100644
--- a/profiles/updates/3Q-2021
+++ b/profiles/updates/3Q-2021
@@ -1,2 +1,3 @@
+move x11-misc/xrestop x11-apps/xrestop
 move media-sound/zam-plugins media-plugins/zam-plugins
 slotmove =dev-ruby/elasticsearch-transport-6.8.3 6 6.8.3
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 26f4c4c7e88a..68f8c503bc06 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1079,6 +1079,7 @@ app-text/groonga:nfkc - Use nfkc based utf8 normalization
 app-text/groonga:sphinx - Enable document generation by app-misc/sphinx
 app-text/groonga:uyield - Build for detecting race conditions
 app-text/groonga:zeromq - Enable net-libs/zeromq used for suggestion
+app-text/htmltidy:deprecated - Install tools and header files which are now considered deprecated
 app-text/hyperestraier:mecab - Enable app-text/mecab support for Estraier
 app-text/kbibtex:webengine - Use dev-qt/qtwebengine for HTML previews
 app-text/kbibtex:zotero - Enable support for synchronisation with zotero.org web service
@@ -2407,6 +2408,7 @@ dev-python/cvxopt:glpk - Use GNU Linear Programming Kit sci-mathematics/glpk
 dev-python/drf-yasg:validation - Enable swagger spec validation using swagger-spec-validator
 dev-python/editorconfig-core-py:cli - Install command line interface as well as python library
 dev-python/falcon:cython - Build cython-based python modules
+dev-python/gevent:events - Enables the gevent events system which is required by libraries that use gevent monkey patching. This adds dev-python/zope-event and dev-python/zope-interface as runtime dependencies.
 dev-python/hiredis:system-libs - Use dev-libs/hiredis from system
 dev-python/hypothesis:cli - Install a CLI tool used to write tests.
 dev-python/icalendar:doc - Generate examples and other extra documentation
@@ -2741,7 +2743,6 @@ dev-util/catalyst:system-bootloader - Pulls in the depends needed to setup livec
 dev-util/ccache:static-c++ - Avoid dynamic dependency on gcc's libstdc++.
 dev-util/cccc:apidoc - Build software docs with doxygen/graphviz and metrics with cccc
 dev-util/cccc:mfc - Add patch for MFC dialect options
-dev-util/cmake:system-jsoncpp - Use system copy of dev-libs/jsoncpp instead of bundled one.
 dev-util/codeblocks:contrib - Build additional contrib components
 dev-util/codeblocks:fortran - Build FortranProject plugin which enables to use Code::Blocks IDE for Fortran language
 dev-util/cppcheck:htmlreport - install cppcheck-htmlreport
@@ -3198,6 +3199,8 @@ games-simulation/simutrans:pak128-britain - Install British scenario data
 games-simulation/simutrans:pak128-german - Install German scenario data
 games-simulation/simutrans:pak192-comic - Install comic-like scenario data
 games-simulation/train-valley:gui - Install the GUI for configuring screen resolution and input
+games-sports/speed-dreams:osggraph - Enable the new work-in-progress 3D engine using dev-games/openscenegraph
+games-sports/speed-dreams:webstats - Enable support for sending racing statistics to a web server (experimental)
 games-sports/speed-dreams:xrandr - Enable support for the X xrandr extension
 games-sports/xmoto:double-precision - more precise calculations at the expense of speed
 games-strategy/0ad:editor - Include Atlas scenario editor projects
@@ -3898,7 +3901,7 @@ media-gfx/blender:oidn - Enable OpenImageDenoiser Support
 media-gfx/blender:opencl - Allow OpenCL Graphics Acceleration. This may require extra graphics card drivers.
 media-gfx/blender:openimageio - Enable OpenImageIO Support
 media-gfx/blender:opensubdiv - Add rendering support form OpenSubdiv from Dreamworks Animation through media-libs/opensubdiv.
-media-gfx/blender:openvdb - Add GPU preview rendering. Only works with nVidia cards.
+media-gfx/blender:openvdb - Enable openvdb for volumetric processing, like the voxel remesher. Also enables volumetric GPU preview rendering for Nvidia cards.
 media-gfx/blender:osl - Add support for OpenShadingLanguage scripting.
 media-gfx/blender:potrace - Add support for converting bitmaps into Grease pencil line using the potrace library.
 media-gfx/blender:pugixml - Enable PugiXML support (Used for OpenImageIO, Grease Pencil SVG export)
@@ -4089,7 +4092,7 @@ media-libs/dumb:allegro - Add support for Allegro 4
 media-libs/embree:compact-polys - Enables double indexed poly layout.
 media-libs/embree:ispc - Build Embree with support for ISPC applications.
 media-libs/embree:raymask - Enables ray mask support.
-media-libs/embree:ssp - When enabled, Embree compiles with stack protection against return address overrides.
+media-libs/embree:ssp - When enabled, Embree compiles with stack protection against return address overrides. Stack protection will wield a minor performance decrease in return for higher security.
 media-libs/embree:tbb - Use TBB instead of the built-in Embree tasking system.
 media-libs/embree:tutorial - Enable to build Embree tutorials programs.
 media-libs/esdl:image - Enable image support
@@ -4512,7 +4515,6 @@ media-sound/csound:chua - Build the chua opcodes
 media-sound/csound:double-precision - Use double-precision floating point for audio samples
 media-sound/csound:dssi - Build the DSSI opcodes
 media-sound/csound:fluidsynth - Build the fluidsynth opcodes
-media-sound/csound:image - Build the image opcodes
 media-sound/csound:keyboard - Build Virtual MIDI keyboard
 media-sound/csound:linear - Build the linear algebra Opcodes
 media-sound/csound:portmidi - Build the PortMIDI I/O module
@@ -7710,6 +7712,7 @@ sys-apps/fwupd:archive - Use app-arch/libarchive for archives support
 sys-apps/fwupd:dell - Enable Dell-specific support.
 sys-apps/fwupd:flashrom - Enable flashrom plugin via sys-apps/flashrom
 sys-apps/fwupd:gusb - Enable dev-libs/libgusb support
+sys-apps/fwupd:modemmanager - Build and install Modem Manager plugin
 sys-apps/fwupd:nvme - Build and install NVMe plugin
 sys-apps/fwupd:spi - Install Intel-SPI plugin
 sys-apps/fwupd:synaptics - Install synaptics plugin
@@ -8292,6 +8295,7 @@ sys-libs/compiler-rt-sanitizers:libfuzzer - Build fuzzing runtime.
 sys-libs/compiler-rt-sanitizers:lsan - Build Leak Sanitizer runtime.
 sys-libs/compiler-rt-sanitizers:memprof - Build memory profiler runtime.
 sys-libs/compiler-rt-sanitizers:msan - Build Memory Sanitizer runtime.
+sys-libs/compiler-rt-sanitizers:orc - Build ORC runtime.
 sys-libs/compiler-rt-sanitizers:profile - Build profiling runtime.
 sys-libs/compiler-rt-sanitizers:safestack - Build SafeStack runtime.
 sys-libs/compiler-rt-sanitizers:sanitize - Build sanitizer runtimes.
@@ -8444,6 +8448,7 @@ virtual/mysql:embedded - Build embedded server (libmysqld)
 virtual/mysql:server - Build server (mysqld)
 virtual/podofo-build:boost - Add support for boost
 virtual/podofo-build:tools - Build and install commandline tools
+virtual/rust:rustfmt - Install rustfmt, Rust code formatter
 virtual/ssh:minimal - Prefer net-misc/dropbear over net-misc/openssh
 virtual/wine:staging - Enable Wine-Staging's Patchset
 www-apache/mod_backtrace:unwind - Use sys-libs/libunwind to provide better resolution of function names.
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 22d468a374ae..c67205ab51ce 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/ament_cmake/Manifest b/ros-meta/ament_cmake/Manifest
index 57dcd26fd888..ae94157a63bc 100644
--- a/ros-meta/ament_cmake/Manifest
+++ b/ros-meta/ament_cmake/Manifest
@@ -4,11 +4,13 @@ DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6
 DIST ament_cmake-1.0.3.tar.gz 67279 BLAKE2B 5a11fd6e8174a47acc2f7524c8aec4ce0b77668525928d722c631b6d874d8d7229a84e5dd084eda834d5afcdf4cc1faf692c3ea4552374b0858c2b60610417e6 SHA512 654a02d8c8130d023d063eff29197ed71e75a1f46c73e3808f5e481ce1b68ff6d0b3002b471bb3ba13a473c4947f4a291cc91cf1aa803906d3a89c78e66eb76a
 DIST ament_cmake-1.0.4.tar.gz 67452 BLAKE2B 6c28c06e67e77ca636b1f85a4bb69e1bb856d87a64fbf0cebddbecefc495113aeb001b83b446086233e4330c70b1f420c59efa01f92647539dd8b87a3321fb24 SHA512 f7ec6afd35c314a99f09ccce0568eb9debdcce4ce7494d21a3919328f0b9da062ed3837653e8016f930db75125bf4db85a244f2ce5d26c790e47d1440d1be07e
 DIST ament_cmake-1.1.3.tar.gz 69705 BLAKE2B 3f6cbe397c6690265ee9e367b3379359d36571789eed1ff615b8b1dc7e710a73e7f061e69b1f21a91091928e6633c3e3f9d0c1e167eee79b9549deaef5d1f150 SHA512 633604a3d3d37591b48574d0fedbb5a9e88656066bc8457ff73e03895b2cd372f0a0dc5331d1a87df0af2268ff5b1a1da7e4ee18e448a5ce83e4333e91aad22e
+DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 EBUILD ament_cmake-0.9.6.ebuild 1546 BLAKE2B 7ac0348099f8e15c00d3760b7ef96df1cb6fc0a6ff013df365cb4142011eed1f50fe1ef673ca9ccd9eedefd64cdd2c620adcb7b680c4ad47a73f81c053fed8c2 SHA512 a20f7fe6f44c7cba5add4ab87acfee18d152c8a18267c8ab978805a120dfd03bc07d7bef0bf43c90aa6f8b00dc0df9a64bb8fb98d3a8f94b2115b1fa0e3c8c2a
 EBUILD ament_cmake-1.0.0.ebuild 1546 BLAKE2B 7ac0348099f8e15c00d3760b7ef96df1cb6fc0a6ff013df365cb4142011eed1f50fe1ef673ca9ccd9eedefd64cdd2c620adcb7b680c4ad47a73f81c053fed8c2 SHA512 a20f7fe6f44c7cba5add4ab87acfee18d152c8a18267c8ab978805a120dfd03bc07d7bef0bf43c90aa6f8b00dc0df9a64bb8fb98d3a8f94b2115b1fa0e3c8c2a
 EBUILD ament_cmake-1.0.1.ebuild 1546 BLAKE2B 7ac0348099f8e15c00d3760b7ef96df1cb6fc0a6ff013df365cb4142011eed1f50fe1ef673ca9ccd9eedefd64cdd2c620adcb7b680c4ad47a73f81c053fed8c2 SHA512 a20f7fe6f44c7cba5add4ab87acfee18d152c8a18267c8ab978805a120dfd03bc07d7bef0bf43c90aa6f8b00dc0df9a64bb8fb98d3a8f94b2115b1fa0e3c8c2a
 EBUILD ament_cmake-1.0.3.ebuild 1546 BLAKE2B 35ec65a67b8be70c61bb3fbbfc6eca7da9dd2319694e5e8165967246946ce6e83dc59d1456bee1b47518824a688c5e4c259d01bbe64d2eafc4db3118d1625f05 SHA512 73914a38af2ae87c19f4ac8a0207e1f9262e375330152b3a4efc73f25fac5d7f124e22cf03f68c8d3d22766aabba27dd30e9ff3f45395dc25731e0860ce1f91f
 EBUILD ament_cmake-1.0.4.ebuild 1546 BLAKE2B 35ec65a67b8be70c61bb3fbbfc6eca7da9dd2319694e5e8165967246946ce6e83dc59d1456bee1b47518824a688c5e4c259d01bbe64d2eafc4db3118d1625f05 SHA512 73914a38af2ae87c19f4ac8a0207e1f9262e375330152b3a4efc73f25fac5d7f124e22cf03f68c8d3d22766aabba27dd30e9ff3f45395dc25731e0860ce1f91f
 EBUILD ament_cmake-1.1.3.ebuild 1546 BLAKE2B 35ec65a67b8be70c61bb3fbbfc6eca7da9dd2319694e5e8165967246946ce6e83dc59d1456bee1b47518824a688c5e4c259d01bbe64d2eafc4db3118d1625f05 SHA512 73914a38af2ae87c19f4ac8a0207e1f9262e375330152b3a4efc73f25fac5d7f124e22cf03f68c8d3d22766aabba27dd30e9ff3f45395dc25731e0860ce1f91f
+EBUILD ament_cmake-1.1.4.ebuild 1546 BLAKE2B 35ec65a67b8be70c61bb3fbbfc6eca7da9dd2319694e5e8165967246946ce6e83dc59d1456bee1b47518824a688c5e4c259d01bbe64d2eafc4db3118d1625f05 SHA512 73914a38af2ae87c19f4ac8a0207e1f9262e375330152b3a4efc73f25fac5d7f124e22cf03f68c8d3d22766aabba27dd30e9ff3f45395dc25731e0860ce1f91f
 EBUILD ament_cmake-9999.ebuild 1546 BLAKE2B 7ac0348099f8e15c00d3760b7ef96df1cb6fc0a6ff013df365cb4142011eed1f50fe1ef673ca9ccd9eedefd64cdd2c620adcb7b680c4ad47a73f81c053fed8c2 SHA512 a20f7fe6f44c7cba5add4ab87acfee18d152c8a18267c8ab978805a120dfd03bc07d7bef0bf43c90aa6f8b00dc0df9a64bb8fb98d3a8f94b2115b1fa0e3c8c2a
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/ros-meta/ament_cmake/ament_cmake-1.1.4.ebuild b/ros-meta/ament_cmake/ament_cmake-1.1.4.ebuild
new file mode 100644
index 000000000000..cc6aa4dbc3f5
--- /dev/null
+++ b/ros-meta/ament_cmake/ament_cmake-1.1.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The entry point package for the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_definitions
+	dev-ros/ament_cmake_export_dependencies
+	dev-ros/ament_cmake_export_include_directories
+	dev-ros/ament_cmake_export_interfaces
+	dev-ros/ament_cmake_export_libraries
+	dev-ros/ament_cmake_export_link_flags
+	dev-ros/ament_cmake_export_targets
+	dev-ros/ament_cmake_libraries
+	dev-ros/ament_cmake_python
+	dev-ros/ament_cmake_target_dependencies
+	dev-ros/ament_cmake_test[${PYTHON_USEDEP}]
+	dev-ros/ament_cmake_version
+	${PYTHON_DEPS}
+
+	dev-python/ament_package[${PYTHON_USEDEP}]
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+"
+# Last batch of deps above are transitive (from ament_cmake_core) but we need this to propagate proper deps
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	python_setup
+	cmake_src_configure
+}
diff --git a/ros-meta/calibration/Manifest b/ros-meta/calibration/Manifest
index 7a8c0a6a5189..1c52b7b36486 100644
--- a/ros-meta/calibration/Manifest
+++ b/ros-meta/calibration/Manifest
@@ -1,4 +1,6 @@
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
+DIST calibration-0.10.15.tar.gz 115940 BLAKE2B 43c8564ad8f15894d04571fbb3c6bc2059a5d232de3fb6225b715b078a11fef2e19283e3f0587ed47f2d52784ade22bebdf4680f6b30c585da2fbbfa1c45b0a5 SHA512 06ffc9ae6872b914eb6954996d165e2aa65d786756896a21be1ab3b5c20f1df3340e2fdf9804bc3cd78089f5b2e05eaed2a4376e70e98ccaaa8a88d95c3f4894
 EBUILD calibration-0.10.14.ebuild 649 BLAKE2B c0caf055d3a1589eda51ebed0f356f13a129e204f3e607f847f2d32b3c923856f5873b849643d19b14c45c3476be0ef9284351c481422f08b3419160047fd157 SHA512 06442bed5cf939727b2404d967a703a80079f4e2dd868f7ff40d0c4138a00de3097225bc65e14b55f962a4527c142d74594ea29d761a2ddd709512ced602d407
+EBUILD calibration-0.10.15.ebuild 649 BLAKE2B 490d4a49403f3632c7756a56c64821e8c7eb2cbccf3bddb025475be3f8ab89ebe0cbda9bc4563086a76e4664415d2a3f49a66298ac5e6cd2f3b54ae60bf6e0e2 SHA512 cb8b44c8d8f65d4bff1952552f432e4c7e9db4c3d1e4aef1438b94b7494bec238ac659c190c3a7c39977c823b0a4a2032174541b708c8da8aba2acb65d942e0f
 EBUILD calibration-9999.ebuild 649 BLAKE2B c0caf055d3a1589eda51ebed0f356f13a129e204f3e607f847f2d32b3c923856f5873b849643d19b14c45c3476be0ef9284351c481422f08b3419160047fd157 SHA512 06442bed5cf939727b2404d967a703a80079f4e2dd868f7ff40d0c4138a00de3097225bc65e14b55f962a4527c142d74594ea29d761a2ddd709512ced602d407
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/ros-meta/calibration/calibration-0.10.15.ebuild b/ros-meta/calibration/calibration-0.10.15.ebuild
new file mode 100644
index 000000000000..94e26dc16954
--- /dev/null
+++ b/ros-meta/calibration/calibration-0.10.15.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Provides a toolchain running through the robot calibration process"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/calibration_estimation
+	dev-ros/calibration_launch
+	dev-ros/calibration_msgs
+	dev-ros/calibration_setup_helper
+	dev-ros/image_cb_detector
+	dev-ros/interval_intersection
+	dev-ros/joint_states_settler
+	dev-ros/laser_cb_detector
+	dev-ros/monocam_settler
+	dev-ros/settlerlib
+"
+DEPEND=""
diff --git a/ros-meta/geographic_info/Manifest b/ros-meta/geographic_info/Manifest
index 5787f6721d7f..475613e2736a 100644
--- a/ros-meta/geographic_info/Manifest
+++ b/ros-meta/geographic_info/Manifest
@@ -1,4 +1,6 @@
 DIST geographic_info-0.5.5.tar.gz 27762 BLAKE2B 9235911d6a2b010e47722268f5aa14b2bd10dac73bf4445bcd6585c5094947e9ea43ee2ccb6d6a3b0ae788d149fcc546e6618f0097e4bde32d69ed9baacbf255 SHA512 a1699778cd85960603435e7b7d46831c7c5ac4b57f4a06e9f394933799151a5ebf95c59bc109ca05eeb9376763aae8c77bc9150081c81170f1778730145910ec
+DIST geographic_info-0.5.6.tar.gz 28130 BLAKE2B 4d7013543db91c02c470c6b6dcb6e00070d5356f91ace20b3bb97aafa71eff2b525fc11994796f2de103b1df40efe8358d19a7e8fc0b1290c73cc28c791f22ce SHA512 d2f41320d2b094c2ea04593941e35d2b5581b84cc2f599099880dd671255dd59bc8787ad4a5640539cc25a13592df2ec7a887e3ea171398cfeafeccc669bd7f0
 EBUILD geographic_info-0.5.5.ebuild 393 BLAKE2B 1461d04b9a6f463bcc0f530c17994c80ea7e8933a67454d5831cc6ba3ca8ca086e87e29dbf83dc3ccf2851d2fd6ef60fcdc16d5941a1388f005bac993c9c124d SHA512 05412192d57b0c36727a4a85da2285ca2316b4df7a29a9db8de859bb92c31bd58c4f8fbc1f01377d91f05e114f838837e258041fd0061ec6527a90645e8f8ea2
+EBUILD geographic_info-0.5.6.ebuild 393 BLAKE2B f27046ff04f5666efd1e84c3a7f2c8b2ccd82392fa3a0ffc3cee92f3f0c55ac2fa0429fc60ee8fab5ae48237908c41c5bfb145bac9badf88badccf3bb1f4a20b SHA512 fe1b52e7f2f7ce67251c40f94242efc36fd3d02b042b3b67f145b2d0021520fb029d5d623ee7315b9436103ad3d1f8918418b05b30ce5dabce1b40cc435358b3
 EBUILD geographic_info-9999.ebuild 393 BLAKE2B 1461d04b9a6f463bcc0f530c17994c80ea7e8933a67454d5831cc6ba3ca8ca086e87e29dbf83dc3ccf2851d2fd6ef60fcdc16d5941a1388f005bac993c9c124d SHA512 05412192d57b0c36727a4a85da2285ca2316b4df7a29a9db8de859bb92c31bd58c4f8fbc1f01377d91f05e114f838837e258041fd0061ec6527a90645e8f8ea2
 MISC metadata.xml 349 BLAKE2B f945481736db4b708a82107474a58d9dd6e805eae69557ea08bb80c9bff8913446618bd610ef7cfb69e84a88e6477de9fe4c2c86a1b693c7515114b78820ae1e SHA512 453f7929a678908957bfde47ef0816a11162200a6b5541850320d874b3419155c4efebae51ef2d1b542f73bb4dcb319fdd93098817819cad2a9cb74adf008918
diff --git a/ros-meta/geographic_info/geographic_info-0.5.6.ebuild b/ros-meta/geographic_info/geographic_info-0.5.6.ebuild
new file mode 100644
index 000000000000..9b057f8b81fe
--- /dev/null
+++ b/ros-meta/geographic_info/geographic_info-0.5.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Geographic information metapackage"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/geodesy
+	dev-ros/geographic_msgs
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/hector_slam/Manifest b/ros-meta/hector_slam/Manifest
index c6c76a464605..945c6489b227 100644
--- a/ros-meta/hector_slam/Manifest
+++ b/ros-meta/hector_slam/Manifest
@@ -1,4 +1,6 @@
 DIST hector_slam-0.5.1.tar.gz 160548 BLAKE2B 7a4cf8f0c1a387c4de08620478c8954df27a3ae6d23b1f11bf8574a1f62f8e742934cfb08d278e881dfb73941be89de43fe97813c992f9aa53a97487b0ae2efb SHA512 b46131a4ba3bc1eaef27091040a29f4b0f7d1a80f54e2f2756f13e08ef4d4b37ad4fef2802737bb31afe7cbbbf0e49573b87d7df991e7a19e80219a4158e3064
+DIST hector_slam-0.5.2.tar.gz 161865 BLAKE2B b9dbff17e53f2a28c0f918ff74050b2b479f4afad3acddd853a387e6cf066a0f75ff0a4b59fe212889598a65b04a08ca18a03d8cedb2b42187ec36b6f2dd03cd SHA512 62e5a74d5bc29c2fe8adc3d9d138282af6ef9d4390b44bae42a772a97a69d4f1a3d79acad0845f7bfbfddb43db6ca9b17a7b03921829643a51f44b25c2170baf
 EBUILD hector_slam-0.5.1.ebuild 728 BLAKE2B ea22a47b6a28a4451a41147e8e1e4f01decf23952140b81b4fca68d89baa8eff88194d14c0aa51e35506e2bc6bc893d350f6db07450211c08eb4abd5b73e6a4c SHA512 d0f8d65bbd740e5182e7c720bbc8ca60128f343e48fea098c362fb7953428dec6a4ba299dad510782d4deb2dd68e656a26d034709ba91520c74d0b2e721ec127
+EBUILD hector_slam-0.5.2.ebuild 728 BLAKE2B ea22a47b6a28a4451a41147e8e1e4f01decf23952140b81b4fca68d89baa8eff88194d14c0aa51e35506e2bc6bc893d350f6db07450211c08eb4abd5b73e6a4c SHA512 d0f8d65bbd740e5182e7c720bbc8ca60128f343e48fea098c362fb7953428dec6a4ba299dad510782d4deb2dd68e656a26d034709ba91520c74d0b2e721ec127
 EBUILD hector_slam-9999.ebuild 728 BLAKE2B ea22a47b6a28a4451a41147e8e1e4f01decf23952140b81b4fca68d89baa8eff88194d14c0aa51e35506e2bc6bc893d350f6db07450211c08eb4abd5b73e6a4c SHA512 d0f8d65bbd740e5182e7c720bbc8ca60128f343e48fea098c362fb7953428dec6a4ba299dad510782d4deb2dd68e656a26d034709ba91520c74d0b2e721ec127
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/ros-meta/hector_slam/hector_slam-0.5.2.ebuild b/ros-meta/hector_slam/hector_slam-0.5.2.ebuild
new file mode 100644
index 000000000000..ad6e79ea1add
--- /dev/null
+++ b/ros-meta/hector_slam/hector_slam-0.5.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="hector_mapping and related packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/hector_compressed_map_transport
+	dev-ros/hector_geotiff_plugins
+	dev-ros/hector_imu_tools
+	dev-ros/hector_map_server
+	dev-ros/hector_marker_drawing
+	dev-ros/hector_trajectory_server
+	dev-ros/hector_geotiff
+	dev-ros/hector_geotiff_launch
+	dev-ros/hector_imu_attitude_to_tf
+	dev-ros/hector_mapping
+	dev-ros/hector_map_tools
+	dev-ros/hector_nav_msgs
+	dev-ros/hector_slam_launch
+"
+DEPEND=""
diff --git a/ros-meta/imu_tools/Manifest b/ros-meta/imu_tools/Manifest
index 6ba50160aeb1..00032779c484 100644
--- a/ros-meta/imu_tools/Manifest
+++ b/ros-meta/imu_tools/Manifest
@@ -1,4 +1,6 @@
 DIST imu_tools-1.2.2.tar.gz 1654829 BLAKE2B 1cd0ce321f6a9012146da07fc7f24425c1e68a8144b1ec3e5fefda316d07c3bc579f63f14adc4b86fc4f3975ad2d5c575ecfb2ae729d54ae3876a2ce2aa9d7f3 SHA512 d4b746acdf39e5137f54de9ac27f338bf89cd4102af5407ae0b6bb45c830b6a7da9250570000a7ed140187659d93934e5ecc3f2b1722f686a5cc8cbd52e986be
+DIST imu_tools-1.2.3.tar.gz 1656874 BLAKE2B d11a3d706ddd1eaae7562ca55ed25ade02dc79456ef8f99aa772e4dc6c6d38684d47175b3ffca3ca69e89aff1f02353379d2debfd53a03aa9a1eadd216a9dfe4 SHA512 b3c652836c049e096113ac075790ecb03fd8867b5702f83e52e5b97e41b1fecb448835ab9c8846b24104387e9148a1678c4d0b294885bc2472e8694dd090ba82
 EBUILD imu_tools-1.2.2.ebuild 422 BLAKE2B 782449d75518642209f849f72c8f8f79a02220a5124f07a85333bf4130fc35e34169fd2c415431385f36a5ede1b3160e792be08b0ce9558e96fc09b84df72bc5 SHA512 25d7047a50906388f129678eeb880504284a6e9a9050ff4e7b34d00a54ab172d30844fa57ea2bca536e2aeeba2c2237c0968514a39c4ed29476920a03bec32e5
+EBUILD imu_tools-1.2.3.ebuild 422 BLAKE2B 31979bfe8227e7fb404a08a1fb797c7dfce29a0222d595b2179143b06eb40672490f5b166dd7bdf0045b041dbc90b4120602d6ffae42b1dce5d14dacec99e048 SHA512 231f1a9f1c6d647e7e43f822b7b2fd98faa210f2b28faed5311b4988cbcb7e89c5ad678dfe0f1381e321f9d547d12aa6dd68332a6c66ef5885c2b3f7d3ffa411
 EBUILD imu_tools-9999.ebuild 422 BLAKE2B 782449d75518642209f849f72c8f8f79a02220a5124f07a85333bf4130fc35e34169fd2c415431385f36a5ede1b3160e792be08b0ce9558e96fc09b84df72bc5 SHA512 25d7047a50906388f129678eeb880504284a6e9a9050ff4e7b34d00a54ab172d30844fa57ea2bca536e2aeeba2c2237c0968514a39c4ed29476920a03bec32e5
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/ros-meta/imu_tools/imu_tools-1.2.3.ebuild b/ros-meta/imu_tools/imu_tools-1.2.3.ebuild
new file mode 100644
index 000000000000..202d866e0d79
--- /dev/null
+++ b/ros-meta/imu_tools/imu_tools-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
+
+ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Various tools for IMU devices"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/imu_complementary_filter
+	dev-ros/imu_filter_madgwick
+	dev-ros/rviz_imu_plugin
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/mavros/Manifest b/ros-meta/mavros/Manifest
index 170dbd3022ff..96a42ed7e805 100644
--- a/ros-meta/mavros/Manifest
+++ b/ros-meta/mavros/Manifest
@@ -1,5 +1,6 @@
 EBUILD mavros-1.2.0.ebuild 397 BLAKE2B ce5dd00688aaeb3bd2b28cb4631c35fd575fadd7f233693db68d40e5fbc1a6bda790cdd87be385d82ea9f5509d1895777f21ba498e6f01eadc133bd9a75f6f7c SHA512 37297f837c7bdc61c39a36f6f0760fc191759c0442129da3c53822ceddf475035d9e1be7fd9b258772f7e1d319e873e53a6f7a5b7fe4ee53dfc5a2941f60dfb2
 EBUILD mavros-1.4.0.ebuild 397 BLAKE2B ce5dd00688aaeb3bd2b28cb4631c35fd575fadd7f233693db68d40e5fbc1a6bda790cdd87be385d82ea9f5509d1895777f21ba498e6f01eadc133bd9a75f6f7c SHA512 37297f837c7bdc61c39a36f6f0760fc191759c0442129da3c53822ceddf475035d9e1be7fd9b258772f7e1d319e873e53a6f7a5b7fe4ee53dfc5a2941f60dfb2
 EBUILD mavros-1.5.2.ebuild 397 BLAKE2B 6b1b8d31ae8945941c080429bea56bdf030ef202b60e39edf7a8f50f1e72c5ae0a5c1ed128e5a2fdd0c2e9adccac78ad059d9965bdd4913701d1578c675a748f SHA512 f295773cadc584a5b47dcccd0542658c5fd197c403a539d0d7c8fb2c3b3a158d3291bf7248cdf818d6b58af24e1257c971d85ed557684daffdb4a8e24089cd3e
+EBUILD mavros-1.8.0.ebuild 397 BLAKE2B 6b1b8d31ae8945941c080429bea56bdf030ef202b60e39edf7a8f50f1e72c5ae0a5c1ed128e5a2fdd0c2e9adccac78ad059d9965bdd4913701d1578c675a748f SHA512 f295773cadc584a5b47dcccd0542658c5fd197c403a539d0d7c8fb2c3b3a158d3291bf7248cdf818d6b58af24e1257c971d85ed557684daffdb4a8e24089cd3e
 EBUILD mavros-9999.ebuild 397 BLAKE2B ce5dd00688aaeb3bd2b28cb4631c35fd575fadd7f233693db68d40e5fbc1a6bda790cdd87be385d82ea9f5509d1895777f21ba498e6f01eadc133bd9a75f6f7c SHA512 37297f837c7bdc61c39a36f6f0760fc191759c0442129da3c53822ceddf475035d9e1be7fd9b258772f7e1d319e873e53a6f7a5b7fe4ee53dfc5a2941f60dfb2
 MISC metadata.xml 249 BLAKE2B 05e1e70021900498f37045733d9cf72175655cc72ef45d5cc5593c6fe6c04bf8a1895a6b40470e31ba15254dbf2c0e71dca9da3e1a7e7a0c76ffea90ca518f82 SHA512 f6c1880cb315572548c1cea0233124f8dfb99091c9dff06484f02847e4a6ab4bbecd627f2d561ef3d666c99c240195031294d170024fd2549dec228b7058bb71
diff --git a/ros-meta/mavros/mavros-1.8.0.ebuild b/ros-meta/mavros/mavros-1.8.0.ebuild
new file mode 100644
index 000000000000..f6781e007847
--- /dev/null
+++ b/ros-meta/mavros/mavros-1.8.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Metapackage for mavros packages"
+LICENSE="metapackage"
+SLOT="0"
+IUSE=""
+HOMEPAGE="https://wiki.ros.org/mavros"
+
+RDEPEND="
+	dev-ros/mavros_msgs
+	dev-ros/libmavconn
+	dev-ros/mavros
+	dev-ros/mavros_extras
+"
+DEPEND="${RDEPEND}"
+[ "${PV}" = "9999" ] || KEYWORDS="~amd64 ~arm"
diff --git a/ros-meta/ros/Manifest b/ros-meta/ros/Manifest
index d22f055ddde9..55200b50bef1 100644
--- a/ros-meta/ros/Manifest
+++ b/ros-meta/ros/Manifest
@@ -1,8 +1,10 @@
 DIST ros-1.15.5.tar.gz 178252 BLAKE2B 2e96f550ee6d9e049db4a69464db0bf948f2baf8ea50b2105ac19dcd758e4fc57cb011529e28cd9058ccb4adcbcf087e6295f35e6f9c511f5f33c3ddbe27c2db SHA512 d526e267faf231c0c9153614a24f05294b648595bda6d99ea937ca3cca70b2784b26c3c62f9b4830322adbd17d8e151be314c7301b753450450c5c38527d48d3
 DIST ros-1.15.6.tar.gz 178270 BLAKE2B dccadd6c3b59b54d732d94a173c40e940f2e7effad5bc8f835bbf56f2b7f3d6b7a80183d1e4826edd566697ffc22ae77b5b75d792493220c0fc04603b3c33f85 SHA512 740727c68113d7a84583a85f4fc3f575aea05067d1aa3b96d5636d3454dba09a4730413c92f49cb7800f26bae15ab02496bd5f91f964b28511e8b8cd3cb116a6
 DIST ros-1.15.7.tar.gz 178451 BLAKE2B 970b736c2ead0ca63e5b9ac5c47ef306ed22e5e6205e7529efd8bc8847f3ac0e73d5cdb55c00827e644e35e3ed49c534e797a8382bdd45451ba1f95a3af9634a SHA512 163a9c677d0213cea85f0d7c82d7a8da7f9423155f19857a8146f29c7b2b3a5ecd800f49d1e9b63b45da33544163acb6f32f7525602f249a30841e140654144a
+DIST ros-1.15.8.tar.gz 179267 BLAKE2B b62614b85bece7620c15ec3da70b54fc62428e6b72d86aeb8dd8a54d8f188032696815f05ee2072f31a1530194741c00e8dfd78fd68b4c43046de444b98c2b29 SHA512 9426b85e4b9aef5b81f678e613cb823f8b13d8940c0e85addfe5862885fb8a371daf696d5144310f44049eaec5ae6e6d1d57dcfab9feba7493cfd6e11d9e7b33
 EBUILD ros-1.15.5.ebuild 487 BLAKE2B 51c10c37371fa83cfb28e01403f77594d904166504fd208fa0e0e3029423667ee4ca188742b4844db8e9795f5b2b0919ff1cb3577968f1839044b73c92ca1cb3 SHA512 5a782d4ffe5154e71160a64e6a69782d4573cce5e389e15a5dbe811d229017d1812c589da0dabf5c3180ac677cef802b6e4055bb548b3bf5275afabbe08a73f8
 EBUILD ros-1.15.6.ebuild 487 BLAKE2B 51c10c37371fa83cfb28e01403f77594d904166504fd208fa0e0e3029423667ee4ca188742b4844db8e9795f5b2b0919ff1cb3577968f1839044b73c92ca1cb3 SHA512 5a782d4ffe5154e71160a64e6a69782d4573cce5e389e15a5dbe811d229017d1812c589da0dabf5c3180ac677cef802b6e4055bb548b3bf5275afabbe08a73f8
 EBUILD ros-1.15.7.ebuild 487 BLAKE2B 51c10c37371fa83cfb28e01403f77594d904166504fd208fa0e0e3029423667ee4ca188742b4844db8e9795f5b2b0919ff1cb3577968f1839044b73c92ca1cb3 SHA512 5a782d4ffe5154e71160a64e6a69782d4573cce5e389e15a5dbe811d229017d1812c589da0dabf5c3180ac677cef802b6e4055bb548b3bf5275afabbe08a73f8
+EBUILD ros-1.15.8.ebuild 487 BLAKE2B 084dbcd50115ba86b97dfbf588c60de14f51b6d179f6b6e7baea738257ea06bb2e73dfdfe6fcbaaa999d1faa26a6887820d00f917785fc5a07a294dafd36d715 SHA512 4453e10f3b0b051745a167c3a2534728e85f9a727ef8308195f0baa2b4a2783708b0ffd74fd61c43c030a4f300fe02b07ed3f79374fca9fc8dcbb5bb11b56656
 EBUILD ros-9999.ebuild 487 BLAKE2B 51c10c37371fa83cfb28e01403f77594d904166504fd208fa0e0e3029423667ee4ca188742b4844db8e9795f5b2b0919ff1cb3577968f1839044b73c92ca1cb3 SHA512 5a782d4ffe5154e71160a64e6a69782d4573cce5e389e15a5dbe811d229017d1812c589da0dabf5c3180ac677cef802b6e4055bb548b3bf5275afabbe08a73f8
 MISC metadata.xml 321 BLAKE2B 5aff6f63738a6c61bcd8109bcc02f50d4237d3da78403a8c9b621d2c7d825f9be53f11f825b377c927334e7504495cdef9c48418689dcdeed4200a0d82fd81e3 SHA512 0707198ce7a91d49db28c402c1e0ae63251b706f002d35d2116c0b38669d42c07696c46eb3eae61deeb6fdb0d8ef2da900ead8d83d87970f055f818925f9c5fb
diff --git a/ros-meta/ros/ros-1.15.8.ebuild b/ros-meta/ros/ros-1.15.8.ebuild
new file mode 100644
index 000000000000..133bdb2e6ce6
--- /dev/null
+++ b/ros-meta/ros/ros-1.15.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=ros
+
+inherit ros-catkin
+
+DESCRIPTION="ROS packaging system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbash
+	dev-ros/rosboost_cfg
+	dev-ros/rosclean
+	dev-ros/roscreate
+	dev-ros/rosmake
+	dev-ros/rosunit
+
+	dev-ros/mk
+	dev-ros/rosbuild
+	dev-ros/roslang
+	dev-ros/roslib
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_comm/Manifest b/ros-meta/ros_comm/Manifest
index 787fcc1280a3..814f7822247c 100644
--- a/ros-meta/ros_comm/Manifest
+++ b/ros-meta/ros_comm/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.15.10.tar.gz 1089479 BLAKE2B 9855089aeb608466c3bff22676093c172e1e7898a1c1d7ab35cfffb948df4cb1324abbfc6c209df5944bee6265f24c53250c9bb0f811394bf276e33c19e81ee2 SHA512 34ac32a16eb170dae683e97dbc1528e1f0b2c3ddab9a84f2690ba92aa66639e0c99902ebc2e8e3e1aa5d6c97e6bd3d925f34827aa1943c3213eae2d211baf5a8
+DIST ros_comm-1.15.11.tar.gz 1089801 BLAKE2B 2ff05aa249dbdf5af2704efb52ef3fa12681e277f5e4fd0024645350bace6e41d3430ea727bc0d0e47ac1f946d8ef0b6b0c30e99a3695d67fd863bf9e01a8b3d SHA512 b8033ac96ebcd6a93c107dadd31b13fc48aab4cf2be9ebed0f773f94514b13cc395971eba9142aeb830251db7dd3df8a82d201b5663e9e1461b2ca792c981c99
 DIST ros_comm-1.15.9.tar.gz 1087337 BLAKE2B 8c1582425770eee7898de42785c620c5fe82e31764d8947c16f9dbb43dd03d0201344e72d5a24911f7cc3cf4eacd51d6fc2940cc2346b635a2c769b055898297 SHA512 3f009a29d74dd74169585afb8d08c41faa19128e384ef6aa6c7bf58ae4d31345e4ea5441fc99a81b7742f724df7c7e3c16c4e51473c4fddeb4b9b6bf41cff04b
 EBUILD ros_comm-1.15.10.ebuild 1047 BLAKE2B e8280a4de4b14675fdd7f4e7dd464b9b8b37afb3aafa0eca44f2b118cde3c0c237ab0745508aaa4bc864fb66a966b77f7c3fd99759b61ea910bff2ca03622503 SHA512 15310a9284016fbf855200aec19cde0aab9c8c8cf305d163ed61b821d379f8af0e3435d9439c22db0308eacc80a887680a3725ffde1fb7fe7d21313643151f37
+EBUILD ros_comm-1.15.11.ebuild 1047 BLAKE2B e8280a4de4b14675fdd7f4e7dd464b9b8b37afb3aafa0eca44f2b118cde3c0c237ab0745508aaa4bc864fb66a966b77f7c3fd99759b61ea910bff2ca03622503 SHA512 15310a9284016fbf855200aec19cde0aab9c8c8cf305d163ed61b821d379f8af0e3435d9439c22db0308eacc80a887680a3725ffde1fb7fe7d21313643151f37
 EBUILD ros_comm-1.15.9.ebuild 1047 BLAKE2B 07d254f01cc5b985f532cd3a8673ce18ef21886c0132cc958b7788ac91db321737e8a267cca4492df5c9d6c69dfae6d6123a460cd4e5de6aef2af553e0d5a8b9 SHA512 6f6390210d4930457fe8d91e4db0d6a6d9ec2cc46ca249674c1a352220f551e8cc039dd46057bf2e7d439a471152b8d5fcfd30d6913a23eb39eea41fd870be1b
 EBUILD ros_comm-9999.ebuild 1047 BLAKE2B 07d254f01cc5b985f532cd3a8673ce18ef21886c0132cc958b7788ac91db321737e8a267cca4492df5c9d6c69dfae6d6123a460cd4e5de6aef2af553e0d5a8b9 SHA512 6f6390210d4930457fe8d91e4db0d6a6d9ec2cc46ca249674c1a352220f551e8cc039dd46057bf2e7d439a471152b8d5fcfd30d6913a23eb39eea41fd870be1b
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/ros-meta/ros_comm/ros_comm-1.15.11.ebuild b/ros-meta/ros_comm/ros_comm-1.15.11.ebuild
new file mode 100644
index 000000000000..00b04a0107d9
--- /dev/null
+++ b/ros-meta/ros_comm/ros_comm-1.15.11.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS communications-related packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+# utilities subdir
+RDEPEND="
+	dev-ros/roslz4
+	dev-ros/xmlrpcpp
+	dev-ros/roswtf
+	dev-ros/message_filters
+"
+# tools subdir
+RDEPEND="${RDEPEND}
+	dev-ros/rosbag
+	dev-ros/rosbag_storage
+	dev-ros/rosgraph
+	dev-ros/roslaunch
+	dev-ros/rosmaster
+	dev-ros/rosmsg
+	dev-ros/rosnode
+	dev-ros/rosout
+	dev-ros/rosparam
+	dev-ros/rosservice
+	dev-ros/rostest
+	dev-ros/rostopic
+	dev-ros/topic_tools
+"
+# clients subdir
+RDEPEND="${RDEPEND}
+	dev-ros/roscpp
+	dev-ros/rospy
+"
+# test subdir
+RDEPEND="${RDEPEND}
+	dev-ros/test_rosbag
+	dev-ros/test_rosbag_storage
+	dev-ros/test_roscpp
+	dev-ros/test_rosgraph
+	dev-ros/test_roslaunch
+	dev-ros/test_roslib_comm
+	dev-ros/test_rosmaster
+	dev-ros/test_rosparam
+	dev-ros/test_rospy
+	dev-ros/test_rosservice
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_control/Manifest b/ros-meta/ros_control/Manifest
index 372a98f8727d..976a5b5f6146 100644
--- a/ros-meta/ros_control/Manifest
+++ b/ros-meta/ros_control/Manifest
@@ -2,9 +2,11 @@ DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6
 DIST ros_control-0.19.2.tar.gz 679272 BLAKE2B ac08db38e1ee543fdc0a23449c7e9a2ad9b81ce9a414ed99f6549fee0c1bde7cc53ff8b72b059bb6300c3eb57da4460a50c7ebf8bfb9c0ce60eabefc7e210cf8 SHA512 bee37088acb49a8f033c613947befbb14d5b7ceff947a5c4c0def826b6458e4a758819b18973c755ce137416a0283bb76b30ba30a972cea4807f8b98681ec310
 DIST ros_control-0.19.3.tar.gz 684069 BLAKE2B fe767c8012be6675b03c56b3d1c9a2246e7e4b0d0b02b579ba5bc6b6806765163451c1ce4183f94d005507e37b8d4d2e9d023404a86de918a41bb53e1cd3c531 SHA512 59e3f86e8d69de68ae1bc38264c0e3d1fa479153290c8574bb8b8c00c5c257f6ef72dfcf1abe2367f5573f75f583f488e08aa10c67a5c59f2fd307e08b08b284
 DIST ros_control-0.19.4.tar.gz 685911 BLAKE2B 32a3922e1d0e92569c2efb25dcaac512e6837268a8c134e93bc5c4ca5b20be320ecb9cf670583d517b4aff3b8d09578da32455b75531e9a0b6a0a51eb5ba9622 SHA512 4e948b96b2aa918d2570a571e26ecc43620b94f9d8cc941a89a3ea1a1e4251fa126950c7cfa3bab1ddecdf150b6ecae50d195cc3ca7a6be25d9ca317e33eacbf
+DIST ros_control-0.19.5.tar.gz 686250 BLAKE2B 54cc8a3aadfd908df0ccfcd407f638aab69450bb98bd8f824f76b346f5cfcfdc0cf968d0046147fce6c024f6e60d810c25940488bd15c455a668204388405929 SHA512 bf97d077e12cffda07f87014edbf03750358322016acfe722fa3c75453920c1caac23a2ca2428c4346f0f70c5dfcf8e3018d90215da165c162f8adc99a1402e3
 EBUILD ros_control-0.19.1.ebuild 678 BLAKE2B a185a1ade12592e4925312d32329da92c6da13d31c267b7fe6c0a53c41aa202e8b56016e6f3fd6ff6da991efb7f2eddf4a772f30324d088a7973db388b173098 SHA512 f3c5a8411aa5f0bc2bbe9d9324fb491eb874adcab68b75a0674db283579c0f0b4fd2825e1958d1394794cd723096e7d7625fda1be2010bc3ea6a030221d41024
 EBUILD ros_control-0.19.2.ebuild 678 BLAKE2B a185a1ade12592e4925312d32329da92c6da13d31c267b7fe6c0a53c41aa202e8b56016e6f3fd6ff6da991efb7f2eddf4a772f30324d088a7973db388b173098 SHA512 f3c5a8411aa5f0bc2bbe9d9324fb491eb874adcab68b75a0674db283579c0f0b4fd2825e1958d1394794cd723096e7d7625fda1be2010bc3ea6a030221d41024
 EBUILD ros_control-0.19.3.ebuild 678 BLAKE2B a185a1ade12592e4925312d32329da92c6da13d31c267b7fe6c0a53c41aa202e8b56016e6f3fd6ff6da991efb7f2eddf4a772f30324d088a7973db388b173098 SHA512 f3c5a8411aa5f0bc2bbe9d9324fb491eb874adcab68b75a0674db283579c0f0b4fd2825e1958d1394794cd723096e7d7625fda1be2010bc3ea6a030221d41024
 EBUILD ros_control-0.19.4.ebuild 678 BLAKE2B 80ada56c44d96a6605db5a14209761a88be1ea33a2429efcd0aecb9e2bc37fa51798cdfe2acb4247db97ecac333bf1ae739df91ca55f3fecf4a2c92433f374be SHA512 d1c34610f58573a80f2e48307378887993f9fe4a3ec0f4316462666d3fb6f3f33729909a0836662aa4714aa9d75c604e17e272bd6ff371ad3af3285a5059ab01
+EBUILD ros_control-0.19.5.ebuild 678 BLAKE2B 80ada56c44d96a6605db5a14209761a88be1ea33a2429efcd0aecb9e2bc37fa51798cdfe2acb4247db97ecac333bf1ae739df91ca55f3fecf4a2c92433f374be SHA512 d1c34610f58573a80f2e48307378887993f9fe4a3ec0f4316462666d3fb6f3f33729909a0836662aa4714aa9d75c604e17e272bd6ff371ad3af3285a5059ab01
 EBUILD ros_control-9999.ebuild 678 BLAKE2B a185a1ade12592e4925312d32329da92c6da13d31c267b7fe6c0a53c41aa202e8b56016e6f3fd6ff6da991efb7f2eddf4a772f30324d088a7973db388b173098 SHA512 f3c5a8411aa5f0bc2bbe9d9324fb491eb874adcab68b75a0674db283579c0f0b4fd2825e1958d1394794cd723096e7d7625fda1be2010bc3ea6a030221d41024
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/ros-meta/ros_control/ros_control-0.19.5.ebuild b/ros-meta/ros_control/ros_control-0.19.5.ebuild
new file mode 100644
index 000000000000..aad4ab131863
--- /dev/null
+++ b/ros-meta/ros_control/ros_control-0.19.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Controller interfaces, managers, transmissions, control_toolbox"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/combined_robot_hw
+	dev-ros/combined_robot_hw_tests
+	dev-ros/controller_interface
+	dev-ros/controller_manager
+	dev-ros/controller_manager_msgs
+	dev-ros/controller_manager_tests
+	dev-ros/hardware_interface
+	dev-ros/joint_limits_interface
+	dev-ros/rqt_controller_manager
+	dev-ros/transmission_interface
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/rosserial/Manifest b/ros-meta/rosserial/Manifest
index 4110098c1d80..157887fd3811 100644
--- a/ros-meta/rosserial/Manifest
+++ b/ros-meta/rosserial/Manifest
@@ -1,6 +1,8 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
 DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
+DIST rosserial-0.9.2.tar.gz 318944 BLAKE2B 324247e419a62be8ac00d8549e28fa0178b8055d3c5e2471f39137d791c228ffc8fe209c3bfb8b556cd55e112a2d90e10c84b65f3f5059d168aaaf37f914c05c SHA512 f649bc5a50085ce480ea5b0a9c7238b4254f9c0daaf138b91bc14eae44ab48141bc83a376773cb8a0daff7805ee81edbf2557b646da19c65feb38b794f9321a9
 EBUILD rosserial-0.8.0.ebuild 579 BLAKE2B 59b82a09299529e3f47c6f452b7bcaaf8e35ec8995c3a24d99f912e05514181ec8613543a95e2e61a4848a3b3dcea8e0f0b4aa2326843768f6f137df9391ab7b SHA512 6fd6b82e567972e74671626f07cd5208bc80e1d18b6a3b1bb06d9e18c97d014feff43de9a2ed7916ff5947eea6afda3744e9b86d04721462d7471aa8a69f97c1
 EBUILD rosserial-0.9.1.ebuild 579 BLAKE2B 59b82a09299529e3f47c6f452b7bcaaf8e35ec8995c3a24d99f912e05514181ec8613543a95e2e61a4848a3b3dcea8e0f0b4aa2326843768f6f137df9391ab7b SHA512 6fd6b82e567972e74671626f07cd5208bc80e1d18b6a3b1bb06d9e18c97d014feff43de9a2ed7916ff5947eea6afda3744e9b86d04721462d7471aa8a69f97c1
+EBUILD rosserial-0.9.2.ebuild 579 BLAKE2B 8dbd1e37d01ceb8e6df3183e73cff740e34eef4cf974f84905557d8875a30662de1e6b5e015f3febb4ca99cb90041138aa529880230e0e2fbbea65744f68b902 SHA512 9e3f7d0da03773cb967829123742c2e0dd82803a6d36cd8d2f8bc42216f8f3dc5ada70eb22010e60c5322f9e484c2872724c107afc0335ce7804253aba97b941
 EBUILD rosserial-9999.ebuild 579 BLAKE2B 59b82a09299529e3f47c6f452b7bcaaf8e35ec8995c3a24d99f912e05514181ec8613543a95e2e61a4848a3b3dcea8e0f0b4aa2326843768f6f137df9391ab7b SHA512 6fd6b82e567972e74671626f07cd5208bc80e1d18b6a3b1bb06d9e18c97d014feff43de9a2ed7916ff5947eea6afda3744e9b86d04721462d7471aa8a69f97c1
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/ros-meta/rosserial/rosserial-0.9.2.ebuild b/ros-meta/rosserial/rosserial-0.9.2.ebuild
new file mode 100644
index 000000000000..cd2e456276f3
--- /dev/null
+++ b/ros-meta/rosserial/rosserial-0.9.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage for core of rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosserial_arduino
+	dev-ros/rosserial_client
+	dev-ros/rosserial_embeddedlinux
+	dev-ros/rosserial_msgs
+	dev-ros/rosserial_python
+	dev-ros/rosserial_server
+	dev-ros/rosserial_tivac
+	dev-ros/rosserial_windows
+	dev-ros/rosserial_xbee
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/vision_visp/Manifest b/ros-meta/vision_visp/Manifest
index ae567db649a1..d67afb4c7b09 100644
--- a/ros-meta/vision_visp/Manifest
+++ b/ros-meta/vision_visp/Manifest
@@ -1,4 +1,6 @@
 DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
+DIST vision_visp-0.12.1.tar.gz 1014707 BLAKE2B 0c482268761f75e4e36260bb8a98c32677e500f322b3807eda7e24c35681d5fee628e422b67ab9ae73c6a27b467d600ca5ba72220a09e93b146b97273b5d0d54 SHA512 9e050009a335bd8d7f3c024e460087139b43e5b4c44c2048409176b8503aa81193916e767ce06df48fa5d0f0ca23ac551df7201e92e7de65967b9f2df5a1bf7c
 EBUILD vision_visp-0.11.1.ebuild 601 BLAKE2B 71e2efc693f4c731f5d5dcbf9b0d40564cd07febd4b0606953742aa635995436db5d4812b72ba685aacdc47d763beae5bac694a9a9571cfef85ba76410ebbe64 SHA512 c505d82858efc4095350baa0f7f062668fabe70ecd32ae00b3b1dfd44c23b76c444b8aa35e5d956ac474b6082c8f4fdb4ad17c52ac3d4400e0438caf3d1a78a5
-EBUILD vision_visp-9999.ebuild 601 BLAKE2B 71e2efc693f4c731f5d5dcbf9b0d40564cd07febd4b0606953742aa635995436db5d4812b72ba685aacdc47d763beae5bac694a9a9571cfef85ba76410ebbe64 SHA512 c505d82858efc4095350baa0f7f062668fabe70ecd32ae00b3b1dfd44c23b76c444b8aa35e5d956ac474b6082c8f4fdb4ad17c52ac3d4400e0438caf3d1a78a5
+EBUILD vision_visp-0.12.1.ebuild 599 BLAKE2B 70ad199d280d49171eaa1a51fe0559e12bf1d15af4bd60b6683e8d43ddae7f68ca6ff55fdef2aaa53b74729653210b4761a243f7d3389f0bff30b3f39ceea2b0 SHA512 f58898268fd2f682089e194d60ca3f51c8a95f19362c15e3feb40d8bc4968f8fc72ef968841fd5a3d21c5225fed3df6057383fac0dc9a0f878493a8a833e7f97
+EBUILD vision_visp-9999.ebuild 599 BLAKE2B 70ad199d280d49171eaa1a51fe0559e12bf1d15af4bd60b6683e8d43ddae7f68ca6ff55fdef2aaa53b74729653210b4761a243f7d3389f0bff30b3f39ceea2b0 SHA512 f58898268fd2f682089e194d60ca3f51c8a95f19362c15e3feb40d8bc4968f8fc72ef968841fd5a3d21c5225fed3df6057383fac0dc9a0f878493a8a833e7f97
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/ros-meta/vision_visp/vision_visp-0.12.1.ebuild b/ros-meta/vision_visp/vision_visp-0.12.1.ebuild
new file mode 100644
index 000000000000..a820bd65f573
--- /dev/null
+++ b/ros-meta/vision_visp/vision_visp-0.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="noetic-"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Virtual package providing ViSP related packages"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/visp_auto_tracker
+	dev-ros/visp_bridge
+	dev-ros/visp_camera_calibration
+	dev-ros/visp_hand2eye_calibration
+	dev-ros/visp_tracker
+"
+DEPEND=""
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
+fi
diff --git a/ros-meta/vision_visp/vision_visp-9999.ebuild b/ros-meta/vision_visp/vision_visp-9999.ebuild
index aa371b2e1310..a820bd65f573 100644
--- a/ros-meta/vision_visp/vision_visp-9999.ebuild
+++ b/ros-meta/vision_visp/vision_visp-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
+VER_PREFIX="noetic-"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -23,5 +23,5 @@ RDEPEND="
 "
 DEPEND=""
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-noetic-${PV}/${ROS_SUBDIR}"
 fi
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index c2d8ff11cb80..512237955165 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/embassy-vienna/Manifest b/sci-biology/embassy-vienna/Manifest
index dcf9c44204c2..d3e38a4ed499 100644
--- a/sci-biology/embassy-vienna/Manifest
+++ b/sci-biology/embassy-vienna/Manifest
@@ -1,4 +1,5 @@
+AUX embassy-vienna-1.7.2.650-C99-inline.patch 1457 BLAKE2B 0911b395427e1564d89557a1312e54fb414d0413aa368a8d93fe71dd821af828127c387ba561135e2ba4e16a9e1f9cdeac18e9b0c750844fc8eea3ea65c7e6b9 SHA512 c9a2e8004a7a0ae4e7078ccc223f0b2c16386c56a6458596c32de0afbdd6498cc9a01514a70f137ad0d12cffbc0a237762ae5440cce604f86428fe319983efeb
 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 433 BLAKE2B 2feaec37d75ccd9bb4798f56ed58a06944e06488d4ce8bb2ba924dda2cbce5abf54e6ef1e15cca61620db06b51132143cc001e0ef84f5eeeb4f3e7b95bc23bfc SHA512 0481fac0f109b153119e6e12907cea9083a52b3a85e1c26985b14e45cf9a68e36b188bc16c10f528eb19df73fad511afc13742eaa8cd653e5fdd6559497c7184
+EBUILD embassy-vienna-1.7.2.660.ebuild 397 BLAKE2B 9f190749fed69294abeec16e993515ade0b94d5c99b00a47775ac702cedb1c01d789dc9b34e54dd64ae0e3b692e7d36a267b6e3a801de64b4dd77479ed2fd1e0 SHA512 b27a9747ec96c704ad6eebf9a122dc97f9d2995f97a44195641573fabd0cd69c6ca9e5dca58a77cc525e8175230a8e86898bcc328089fc04f3cb97cc5516e8c7
 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 6d63add1eea0..35143accb01a 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
@@ -7,14 +7,12 @@ EBO_DESCRIPTION="Vienna RNA package - RNA folding"
 
 EBO_EAUTORECONF=1
 
-inherit emboss-r2 flag-o-matic
+inherit emboss-r2
 
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/VIENNA-1.7.2.650"
-PATCHES=( "${FILESDIR}"/${PN}-1.7.2.650_fix-build-system.patch )
-
-src_configure() {
-	append-cflags -std=gnu89
-	emboss-r2_src_configure
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.2.650_fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.7.2.650-C99-inline.patch
+)
diff --git a/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650-C99-inline.patch b/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650-C99-inline.patch
new file mode 100644
index 000000000000..1eda10172dc5
--- /dev/null
+++ b/sci-biology/embassy-vienna/files/embassy-vienna-1.7.2.650-C99-inline.patch
@@ -0,0 +1,32 @@
+--- a/src/fold.c
++++ b/src/fold.c
+@@ -65,9 +65,9 @@
+ PRIVATE int fill_arrays(const char *sequence);
+ /*@unused@*/
+ INLINE PRIVATE  int oldLoopEnergy(int i, int j, int p, int q, int type, int type_2);
+-INLINE int  LoopEnergy(int n1, int n2, int type, int type_2,
++int  LoopEnergy(int n1, int n2, int type, int type_2,
+ 			 int si1, int sj1, int sp1, int sq1);
+-INLINE int  HairpinE(int size, int type, int si1, int sj1, const char *string);
++int  HairpinE(int size, int type, int si1, int sj1, const char *string);
+ int loop_energy(short * ptable, short *s, short *s1, int i);
+ char *backtrack_fold_from_pair(char *sequence, int i, int j);
+ void export_circfold_arrays(int *Fc_p, int *FcH_p, int *FcI_p, int *FcM_p, int **fM2_p,
+@@ -831,7 +831,7 @@
+ }
+ /*---------------------------------------------------------------------------*/
+ 
+-INLINE int HairpinE(int size, int type, int si1, int sj1, const char *string) {
++int HairpinE(int size, int type, int si1, int sj1, const char *string) {
+   int energy;
+   energy = (size <= 30) ? P->hairpin[size] :
+     P->hairpin[30]+(int)(P->lxc*log((size)/30.));
+@@ -901,7 +901,7 @@
+ 
+ /*--------------------------------------------------------------------------*/
+ 
+-INLINE int LoopEnergy(int n1, int n2, int type, int type_2,
++int LoopEnergy(int n1, int n2, int type, int type_2,
+ 		      int si1, int sj1, int sp1, int sq1) {
+   /* compute energy of degree 2 loop (stack bulge or interior) */
+   int nl, ns, energy;
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 4e903572b94f..8158d0640aab 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index bc1aea4aeaf9..27a5fd9a3c8d 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -2,6 +2,8 @@ AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df2
 AUX qwt.patch 555 BLAKE2B f959e84dc5e144fd3dd35e6e6c7714507e1a4815495d41611198381165e386d135d334c4f3cb2293592abca72bbb16307b2e5a17d5903d4899c7fa2cd1790d5a SHA512 9a1138acd9bd5ce75a709d50dd585a17ca7d913d4cf37283d8db68e79fd08bf98ddd27ea5d2e459efac0a71df1369c83a67f6727419c0d26c0dd02f5a6ce22b8
 DIST gazebo-11.3.0.tar.bz2 56778002 BLAKE2B d466556c834935d8b3694461ddf6d7a7872b00d2f8f58d50d70cceb8bca3ab4ada1e72e7bb14b79404d45c48f95419e3dedd9019ecc3a8c1623afda077bcbeb2 SHA512 2e219655e45a787aeda50065dcec5d90954c18223f134d6da90b8cb43e119268262e515e527547d0b0b5ed1f73b5083d279551a01faa3d3c34ba7a580c077970
 DIST gazebo-11.5.1.tar.bz2 56486174 BLAKE2B c1bffc5067f2739a8eb2e178bb2209d9c7b5a58d0589710cc515c4bcbbca281fb94ddf16de977f3771bc4b64fb6afe8e86327dde00d19ef62754e4d7634bb65f SHA512 7c922963881cf079e926c239f510e722fc6cabd07ef5e846a4b78772364a3aecb0b68f2b690ff451d42ceb11e88e2f831c30515e5a228f12826516ecad10e53a
+DIST gazebo-11.7.0.tar.bz2 56394312 BLAKE2B 2da58a2702113c1954f0202bb779b723ad8e59cab678f9ca6fe64908785198b996ef71c845a1a85f00e2f4eddb9ed5683f815ada850917b2af4afad214eac77d SHA512 7de40908a021655b2a200a73cf979585f4bdb245064f7e9a853998f87df329223252c73882aa1e2b705bc7de5841e2a87d67f772dfef18e5735c1b06c2663192
 EBUILD gazebo-11.3.0-r1.ebuild 1873 BLAKE2B 5491807d3e02a1b7b23d6f48f5ded1d980a19908c199cec18b0671c2382e72ecf17bbcf8151d4c9f4f3c967670bed6653af7baed35529a67d304ae417bec85dc SHA512 625dcad90aed8097a379556b877ba02e3033b2ba8fbc1a667eafa68f732b96fc8312ee5a191bacadc256377a08386579667fc0eb41180228aeb8e082ea82f96c
 EBUILD gazebo-11.5.1-r1.ebuild 1873 BLAKE2B 5491807d3e02a1b7b23d6f48f5ded1d980a19908c199cec18b0671c2382e72ecf17bbcf8151d4c9f4f3c967670bed6653af7baed35529a67d304ae417bec85dc SHA512 625dcad90aed8097a379556b877ba02e3033b2ba8fbc1a667eafa68f732b96fc8312ee5a191bacadc256377a08386579667fc0eb41180228aeb8e082ea82f96c
+EBUILD gazebo-11.7.0.ebuild 1873 BLAKE2B 5491807d3e02a1b7b23d6f48f5ded1d980a19908c199cec18b0671c2382e72ecf17bbcf8151d4c9f4f3c967670bed6653af7baed35529a67d304ae417bec85dc SHA512 625dcad90aed8097a379556b877ba02e3033b2ba8fbc1a667eafa68f732b96fc8312ee5a191bacadc256377a08386579667fc0eb41180228aeb8e082ea82f96c
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/gazebo-11.7.0.ebuild b/sci-electronics/gazebo/gazebo-11.7.0.ebuild
new file mode 100644
index 000000000000..d2074820693c
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-11.7.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="A 3D multiple robot simulator with dynamics"
+HOMEPAGE="http://gazebosim.org/"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# Subslot = major version = soname of libs
+SLOT="0/11"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse2 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/protobuf-2:=
+	virtual/opengl
+	media-libs/openal
+	net-misc/curl
+	dev-libs/tinyxml
+	>=dev-libs/tinyxml2-6:=
+	dev-libs/libtar
+	dev-cpp/tbb
+	>=dev-games/ogre-1.7.4:=[freeimage]
+	<dev-games/ogre-1.10
+	>=media-libs/freeimage-3.15.4[png]
+	sci-libs/libccd
+	>=media-video/ffmpeg-2.6:0=
+	sci-libs/gts
+	>=sci-physics/bullet-2.82:=
+	>=dev-libs/sdformat-9.1:=
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-libs/boost:=[threads(+)]
+	sci-libs/gdal:=
+	virtual/libusb:1
+	dev-libs/libspnav
+	media-libs/freeimage
+	sci-libs/hdf5:=[cxx]
+	sys-apps/util-linux
+	media-gfx/graphviz
+	net-libs/ignition-msgs:5=
+	sci-libs/ignition-math:6=
+	net-libs/ignition-transport:8=
+	sci-libs/ignition-common:3=
+	sci-libs/ignition-fuel-tools:4=
+	x11-libs/qwt:6=[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	x11-apps/mesa-progs
+	test? ( dev-libs/libxslt )
+"
+BDEPEND="
+	app-text/ronn
+	app-arch/gzip
+	virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=(
+	"${FILESDIR}/qwt.patch"
+	"${FILESDIR}/cmake.patch"
+)
+
+src_configure() {
+	# find OGRE properly
+	sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
+
+	local mycmakeargs=(
+		"-DUSE_UPSTREAM_CFLAGS=OFF"
+		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
+		"-DUSE_HOST_CFLAGS=FALSE"
+		"-DBUILD_TESTING=$(usex test TRUE FALSE)"
+		"-DENABLE_SCREEN_TESTS=FALSE"
+		"-DUSE_EXTERNAL_TINYXML2=TRUE"
+	)
+	cmake_src_configure
+}
diff --git a/sci-geosciences/GeographicLib/GeographicLib-1.50.1.ebuild b/sci-geosciences/GeographicLib/GeographicLib-1.50.1.ebuild
deleted file mode 100644
index 65db138fee55..000000000000
--- a/sci-geosciences/GeographicLib/GeographicLib-1.50.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
-
-DESCRIPTION="C++ classes for performing conversions between geographic coordinates"
-HOMEPAGE="https://geographiclib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/geographiclib/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/19"
-KEYWORDS="~amd64 ~arm"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-	doc? ( >=app-doc/doxygen-1.8.7 )
-"
-
-src_configure() {
-	econf \
-		--disable-static
-	# Automagic deps..
-	sed -e "s/SUBDIRS =.*$/SUBDIRS = src man tools $(usex doc doc "") include cmake/" -i Makefile || die
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/sci-geosciences/GeographicLib/GeographicLib-1.51-r1.ebuild b/sci-geosciences/GeographicLib/GeographicLib-1.51-r1.ebuild
deleted file mode 100644
index 50bc12fbb31a..000000000000
--- a/sci-geosciences/GeographicLib/GeographicLib-1.51-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake distutils-r1
-
-MY_PN="${PN,,}"
-
-DESCRIPTION="C++ library for converting geographic coordinate systems"
-HOMEPAGE="https://sourceforge.net/projects/geographiclib/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/19"
-KEYWORDS="~amd64 ~arm"
-IUSE="doc examples python"
-# To-Do:find out why this doesn't work
-# 105/167 Test #105: GeodSolve82 ......................***Failed
-# Required regular expression not found. Regex=[20\.0010* 0\.0* 180\.0* 20\.0010* 0\.0* 180\.0* 0\.0* 0\.0* 0\.0* 1\.0* 1\.0* -?0
-RESTRICT="test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		>=app-doc/doxygen-1.8.7
-		>=dev-lang/perl-5.26.1-r1
-		>=dev-python/sphinx-1.6.3-r2
-		>=sys-apps/util-linux-2.31
-	)
-"
-
-distutils_enable_tests setup.py
-# there are additional docs in the python dir
-distutils_enable_sphinx python/doc
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use python; then
-		pushd "python" || die
-		distutils-r1_python_prepare_all
-		popd || die
-	fi
-}
-
-src_configure() {
-	export GEODATAPATH="/usr/share/${MY_PN}"
-
-	local mycmakeargs=(
-		-DGEOGRAPHICLIB_DOCUMENTATION=$(usex doc ON OFF)
-		-DGEOGRAPHICLIB_LIB_TYPE="SHARED"
-		-DGEOGRAPHICLIB_DATA="${GEODATAPATH}"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use python; then
-		pushd "python" || die
-		python_foreach_impl distutils-r1_python_compile
-		popd || die
-		python_compile_all
-	fi
-}
-
-src_test() {
-	# Only 1 failing test in the C code, python passes for me
-	cmake_src_test
-
-	if use python; then
-		pushd "python" || die
-		python_foreach_impl python_test
-		popd || die
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove python things added by the cmake_src_install function
-	rm -r "${D}/usr/$(get_libdir)/python" || die
-	# if use python we re-add these python files for each implementation
-	if use python; then
-		pushd "python" || die
-		python_foreach_impl distutils-r1_python_install
-		popd || die
-	fi
-
-	#TODO: find out if java stuff need something
-
-	# Installs to wrong doc dir for some reason
-	# Also happens with USE="-doc"
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" || die
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-
-	insinto "/usr/share/maxima/${MY_PN}"
-	doins -r maxima/.
-
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/sci-geosciences/GeographicLib/GeographicLib-1.51.ebuild b/sci-geosciences/GeographicLib/GeographicLib-1.51.ebuild
deleted file mode 100644
index 3721cff16459..000000000000
--- a/sci-geosciences/GeographicLib/GeographicLib-1.51.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="C++ classes for performing conversions between geographic coordinates"
-HOMEPAGE="https://geographiclib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/geographiclib/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/19"
-KEYWORDS="~amd64 ~arm"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-	doc? ( >=app-doc/doxygen-1.8.7 )
-"
-
-src_configure() {
-	econf \
-		--disable-static
-	# Automagic deps..
-	sed -e "s/SUBDIRS =.*$/SUBDIRS = src man tools $(usex doc doc "") include cmake/" -i Makefile || die
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/sci-geosciences/GeographicLib/GeographicLib-1.52.ebuild b/sci-geosciences/GeographicLib/GeographicLib-1.52.ebuild
new file mode 100644
index 000000000000..892d850baaac
--- /dev/null
+++ b/sci-geosciences/GeographicLib/GeographicLib-1.52.ebuild
@@ -0,0 +1,106 @@
+# 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 distutils-r1
+
+MY_PN="${PN,,}"
+
+DESCRIPTION="C++ library for converting geographic coordinate systems"
+HOMEPAGE="https://sourceforge.net/projects/geographiclib/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/19"
+KEYWORDS="~amd64 ~arm"
+IUSE="doc examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		>=app-doc/doxygen-1.8.7
+		>=dev-lang/perl-5.26.1-r1
+		>=dev-python/sphinx-1.6.3-r2
+		>=sys-apps/util-linux-2.31
+	)
+"
+
+distutils_enable_tests setup.py
+# there are additional docs in the python dir
+distutils_enable_sphinx python/doc
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use python; then
+		pushd "python" || die
+		distutils-r1_python_prepare_all
+		popd || die
+	fi
+}
+
+src_configure() {
+	export GEODATAPATH="/usr/share/${MY_PN}"
+
+	local mycmakeargs=(
+		-DGEOGRAPHICLIB_DOCUMENTATION=$(usex doc ON OFF)
+		-DGEOGRAPHICLIB_LIB_TYPE="SHARED"
+		-DGEOGRAPHICLIB_DATA="${GEODATAPATH}"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python; then
+		pushd "python" || die
+		python_foreach_impl distutils-r1_python_compile
+		popd || die
+		python_compile_all
+	fi
+}
+
+src_test() {
+	cmake_src_test
+
+	if use python; then
+		pushd "python" || die
+		python_foreach_impl python_test
+		popd || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove python things added by the cmake_src_install function
+	rm -r "${D}/usr/$(get_libdir)/python" || die
+	# if use python we re-add these python files for each implementation
+	if use python; then
+		pushd "python" || die
+		python_foreach_impl distutils-r1_python_install
+		popd || die
+	fi
+
+	#TODO: find out if java stuff need something
+
+	# Installs to wrong doc dir for some reason
+	# Also happens with USE="-doc"
+	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" || die
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+
+	insinto "/usr/share/maxima/${MY_PN}"
+	doins -r maxima/.
+
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sci-geosciences/GeographicLib/Manifest b/sci-geosciences/GeographicLib/Manifest
index 87e449a0caaa..a7e4912f23d2 100644
--- a/sci-geosciences/GeographicLib/Manifest
+++ b/sci-geosciences/GeographicLib/Manifest
@@ -1,6 +1,3 @@
-DIST GeographicLib-1.50.1.tar.gz 2463854 BLAKE2B bed7d003dee92e794af993d8fef6cbf1233f9e3f37f53dd6026f16a237dba46bb4d4e2db7adea7931b632bb419288c9731c79cf65f15a4f35e95e8ada34a8f42 SHA512 1db874f30957a0edb8a1df3eee6db73cc993629e3005fe912e317a4ba908e7d7580ce483bb0054c4b46370b8edaec989609fb7e4eb6ba00c80182db43db436f1
-DIST GeographicLib-1.51.tar.gz 2470362 BLAKE2B 5e0a0f44d3b0c62ed7e28285b240cab07a7592e5bf4b181c25b62d8462bb7e2c21f6fcb09577c5f766578803c4b303fdb69af006d3ae62a8b5cb80e92b76236f SHA512 34487a09fa94a34d24179cfe9fd2e5fdda28675966703ca137cbfe6cc88760c2fbde55f76c464de060b58bfe0a516e22c0f59318cf85ae7cc01c5c6a73dd6ead
-EBUILD GeographicLib-1.50.1.ebuild 681 BLAKE2B baf824caf5142d9491de3aec3c6d04b6f6d9ba8e0d3a432f693b2d5b456bc3871d71556bdc18168453443807a740b0cd4eabd884606b804e64723c721065c36d SHA512 da5adf122a846ad28c0890163048d728ce8e14b261c002165888e84282ae40b6cf2d478d80ab793792795907eb24a71e38bb1df1b4fa175dd366affc2955a46e
-EBUILD GeographicLib-1.51-r1.ebuild 2512 BLAKE2B bd54d4b4de21675fe3f38591b14168de50eccad4eb5a7df4f4b73ac3748f41b03e305d4ba01dbe01a4bad409bae26ec143370cc34ea16b5ff283d4b7cd020ccb SHA512 838e0014e0e09ebcef32ebe7b45f4cdfd8d7edc36671d13268ddbe9a5f89ccb73d91670ec4a4eb00bb94b04c17e03478776070a91fba45131c26f0b500314201
-EBUILD GeographicLib-1.51.ebuild 681 BLAKE2B 83c23bbd938a3fc24dc88aa68b1d9a5a2568b868a3d014f1056016ab53ba77157c3296e544cdb3d8a438227547b3a4f96931b20f80d25f8a0369524b78e28c5c SHA512 fc69f3b0a756b037e9fa4bfbc577deb52ea5536da868bacb31a92719907a56854d8dc266390ddd7c057491474f44a81fb82524a50928d8d630e5a075b519b365
+DIST GeographicLib-1.52.tar.gz 2432658 BLAKE2B 87328de1774ab9aec05355362c9a1760cf62864135b97a3e9cb1382b0ec9825b032f6c67a5e02b762c3009a3876a9cd995e3a49a3ad3c051dcd36446b55d0191 SHA512 98a4d33764db4a4755851a7db639fd9e055dcf4f1f949258e112fce2e198076b5896fcae2c1ea36b37fe1000d28eec326636a730e70f25bc19a1610423ba6859
+EBUILD GeographicLib-1.52.ebuild 2203 BLAKE2B 218787f48f5b7d55aeb7dbeedae9b427101225e99bf1e4857ffeab9378455a229ea4621dd40514903c548c88b53c57be7dd03566d8a71554cdf765efa4482ecd SHA512 c2d375b60d1e05e78ff447145b180b0aae9586d57c67f22903721a7888ff3ed7d1063290b7a62d2be450786ecda87f16e03932f82c64222cac13e61749ca7a04
 MISC metadata.xml 874 BLAKE2B d5534e73295e7cabf3d0b80547846b04cb5174a9c23f75a41e57e82a207bad3bd41232add45109e75cce6a10b4be311ebfa0bb7006d50ee611013aa1e3f13d87 SHA512 735095b1d41ee490568eea0572e3543bf85f44618d92ade74c4ff98c7dde1bcc5b9dd35942f0a3861dfab7066816eecefd741331563006425fc02f1cfd4ffaf3
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 07c3ddc824f7..0b8327377d6b 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/folium/Manifest b/sci-geosciences/folium/Manifest
index 890e6b330253..3d213bbb3db4 100644
--- a/sci-geosciences/folium/Manifest
+++ b/sci-geosciences/folium/Manifest
@@ -1,5 +1,5 @@
 AUX folium-0.12.1-gentoo.patch 319 BLAKE2B f859846e54add4e65a92f7e3a71af4f71b77bc9e09e682fe8b16af6a2e79e166bc73e9329e468cc7af22753615e4ed945f9934f35617147adcca4f046ff482d8 SHA512 f55ef6e0fb50d3b5ac057d118c047b1c7b70c09a859c30d676bbc59efdf7a0a2276d0bc8514b1367306972b79a3d2e7d3afe4f5a25b554eb904d94506ea15809
 AUX folium-0.12.1-scm.patch 439 BLAKE2B 58d054e56a0ea38d63c75fa43a5cdbbf671abbf5f7c67649dc1037ca83a8bce6f388a904666b89681a4ffc3f5c517cb2eb5e7b37f2f3e577b7bdbe5f0fe80130 SHA512 aad8a6c22441d593b7895565f7cb37621da4882123e4d40ec4370d707a58c38cf9de4b5fedc9b2e229138fde5e33eef914431e0f9f7761c5a1b9d8b0f6414b04
 DIST folium-0.12.1.tar.gz 20033236 BLAKE2B 00e9fb369be9300ca04f9ba3fed18ca28a4985111ccd358312570773b80906df292e14a6f4acbd8ea7686f1b807017f729ad918b3b025af321faf5d7686333db SHA512 b19d2180c36160a370e6ab5ccfacf74ba7b735610d43e69a5200529c776e9c11ee42f4f7fa1ee54621f52b0f2e1fc1f86bc9a146c4a924831b12578643a69616
-EBUILD folium-0.12.1.ebuild 689 BLAKE2B ae18d34cd24468f7f6a46064f24a9b327f934998616d72749b493dc71a1d4b0b9ca7dc6abbf5059bc5f9aa083a43e6bb188e4ede35519ad7eea5ea5db7ee050f SHA512 803baf10ef7cb6fa23bae20637c726e6f3d412f49691f77a1088b93721cdb75a0071db3e05d08b8f7f7a0dcc26feecb82741796e16b99176c9cab4a400c7bacc
+EBUILD folium-0.12.1.ebuild 775 BLAKE2B f06f536f6f026e937521704b41c68f10dc523ea1a6e0cafb48c1f31c2463e8e487b9955177f6f5e32257d4c3c16ae235752d2a69976ade29055b551a36cf955f SHA512 94c7f2bf8338b4ef5c475cd0276f931283fe8f739fbb15d5407130dc61dd42ea8477eeea5626aa03bcae48e58c4cc6d1ae2a2fb4443a85377b43a70c9e570b5f
 MISC metadata.xml 629 BLAKE2B 77c818e0b7433187baf801c2112c0fd99f4249a0c98b77a8014c5780a0a84c51616a441b8e55653ce0c76c606d1306d3a08eb8be845f68c5b23f8bcc8d6aaf00 SHA512 c69f2992006da35e13df370758f49dcc6ed3db5df00240b4682fb3ef418a87c2509d8495e28e72d2a04ae4603c24169a7cef5baa4f38036acf5ec807ec64c7bd
diff --git a/sci-geosciences/folium/folium-0.12.1.ebuild b/sci-geosciences/folium/folium-0.12.1.ebuild
index 1a5944469af3..aed528317177 100644
--- a/sci-geosciences/folium/folium-0.12.1.ebuild
+++ b/sci-geosciences/folium/folium-0.12.1.ebuild
@@ -20,8 +20,12 @@ PATCHES=(
 )
 
 RDEPEND="sci-libs/branca[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
 BDEPEND=""
 
 distutils_enable_tests pytest
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 4531a480c8ad..49cbe3c608f1 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -3,4 +3,4 @@ AUX grass-7.8.5-bool.patch 4472 BLAKE2B b48a2138b9299e91eb15ebe62f29f0a677dfc690
 DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
 EBUILD grass-7.8.5.ebuild 6993 BLAKE2B a772460a6bc1ce8c2b50bd68dafb4b98c0771bab4ed72e99f685064081f7f9e1edb3abfc9fb308579e864f12beb282383029e89455ab73e4c235ebdc5ec81117 SHA512 cf69543c0883fe7d93bedb72280d04ca8055c6659bc84a6016a86c58c273487aba68948c84b6bc5ff3c84223c375d5ac4c32f7ca53dd175c2e19ded5c2a223b6
 EBUILD grass-9999.ebuild 6869 BLAKE2B a70777bdbcfa1bd020d7f64a6dbcd74194075c18a9bc753fa0cfaf7113c9a1fe8f087e6f3a7ec0ab77d6eca08eac0ce5bad401e95686baec0c3bd0c28618bda9 SHA512 20ff6e8b55ba0090f4beb9750ce67ed3746f443568397a636f4c82dac2eb705dfa73b3541c00ba6b232a7f609a891ef3424fa291cb104e59384d3cdc553346de
-MISC metadata.xml 1088 BLAKE2B 4a9d470738d4860ae6e841976ba21974a18c97759c61cc4677d9707c8fb2220f998999368247ed1b19bfc45d7c53624d0ffec9c4aefad951e270f07c43fdbe4f SHA512 0ba4c779c3c0f3ed226fbf7c53e291341513c78e4a5d9ef228cab5436dacfa686cf8fad28aa3143f5036603fcccaf538b5607f48a86138be42af4aead4d147bf
+MISC metadata.xml 1164 BLAKE2B 6a82ef7f835de1d83c3034707233269e591a4af90b64ee5b7d8a75f7f446be3767e859ea008435b49384d688b8ef65d3b6061ce673c349013e3d226953971389 SHA512 70f37950cf2264c5640731ab985bdc43c1098b598a1e4c300806d9061988b9a9a60e6adf598a74d0157ff38e7f3b13288da8d8e61ba637cec7572a71c82bbc67
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index e62b0339f087..28e7e4392fff 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -23,4 +23,7 @@
 		<flag name="liblas">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag>
 		<flag name="opencl">Enable OpenCL support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">OSGeo/grass</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
new file mode 100644
index 000000000000..efcad2b79cb1
--- /dev/null
+++ b/sci-geosciences/josm-bin/Manifest
@@ -0,0 +1,5 @@
+DIST josm-snapshot-18004.jar 15839807 BLAKE2B 4eed4c47f9a9df0e4dcd98cbe6a00793dc87359c1adad4a03a12e7b9207e5519c7570e1d3c3ba49464adf8fc191a0dc33acdf7c39a5db1c001b044ebf2ed0ce7 SHA512 9b66a4e6327008e24550464bc76c710ce0a99c39fb4fd83d99705f292b5d11203b96411eebb02c9ba8bb1dc28252a26787b5d83cc4f87cd89fc6294a3b8627c4
+DIST josm-snapshot-18118.jar 16005374 BLAKE2B 1b8d0b31adfaca4f0435719bac7258fe43bf78d078ce9cd46aa5e44bf7e4e69325f8675eede6f56ea0305bad57102bf5565a5ef38ca1b29b5f3e1fa889aceba5 SHA512 18e5f06c7eb52004617df23efaef85bf784d36b301cbc78b967a5ed91b684c9bc664424282b06278a109e88e2f72424c0b89fe447a06c7bb1a00edc12c1372a4
+EBUILD josm-bin-18004.ebuild 879 BLAKE2B d0118c70d6b42da0a64f2751f2178a7676bea2b8f78b87923b582e3d26871be0ab4bb627fa12b3e22a1294b06be8446130729fac0515c7f6ad63f08930d0c1e8 SHA512 86759166dc0ac8c44e28d7e4c89c2e755e910591112dd218de05318cc2e4738561049666678b3d3cf78b1938ba4c9666fbd5861981907169ed33668f1682cc86
+EBUILD josm-bin-18118.ebuild 879 BLAKE2B d0118c70d6b42da0a64f2751f2178a7676bea2b8f78b87923b582e3d26871be0ab4bb627fa12b3e22a1294b06be8446130729fac0515c7f6ad63f08930d0c1e8 SHA512 86759166dc0ac8c44e28d7e4c89c2e755e910591112dd218de05318cc2e4738561049666678b3d3cf78b1938ba4c9666fbd5861981907169ed33668f1682cc86
+MISC metadata.xml 543 BLAKE2B 71fc907a3ec05246278de8bc64a2dc70965667d5d19ce890eb2ec6ccb5de528d624cf978de72e3893a116274579f947ebf3b6c4ccf7d204b55fa4222d2537c29 SHA512 eb7bda5abad60b96b73b170826750b4758666325d70a5d6f65fd4b40bedb1665f333b22314cfda437e825669c0a77a09a71ec4c1ea575bb6e1c8bc22ad289fff
diff --git a/sci-geosciences/josm-bin/josm-bin-18004.ebuild b/sci-geosciences/josm-bin/josm-bin-18004.ebuild
new file mode 100644
index 000000000000..3d54799f8cdc
--- /dev/null
+++ b/sci-geosciences/josm-bin/josm-bin-18004.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-utils-2 xdg
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="https://josm.openstreetmap.de/"
+SRC_URI="https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0 GPL-2+ GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8"
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}/${A}" ${PN}.jar
+	java-pkg_dolauncher ${PN} --jar ${PN}.jar
+
+	local icon_size
+	for icon_size in 16 32 48; do
+		newicon -s ${icon_size} -t hicolor \
+			images/logo_${icon_size}x${icon_size}x32.png ${PN}.png
+		newicon -s ${icon_size} -t locolor \
+			images/logo_${icon_size}x${icon_size}x8.png ${PN}.png
+	done
+	make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience"
+}
diff --git a/sci-geosciences/josm-bin/josm-bin-18118.ebuild b/sci-geosciences/josm-bin/josm-bin-18118.ebuild
new file mode 100644
index 000000000000..3d54799f8cdc
--- /dev/null
+++ b/sci-geosciences/josm-bin/josm-bin-18118.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-utils-2 xdg
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="https://josm.openstreetmap.de/"
+SRC_URI="https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0 GPL-2+ GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8"
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}/${A}" ${PN}.jar
+	java-pkg_dolauncher ${PN} --jar ${PN}.jar
+
+	local icon_size
+	for icon_size in 16 32 48; do
+		newicon -s ${icon_size} -t hicolor \
+			images/logo_${icon_size}x${icon_size}x32.png ${PN}.png
+		newicon -s ${icon_size} -t locolor \
+			images/logo_${icon_size}x${icon_size}x8.png ${PN}.png
+	done
+	make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience"
+}
diff --git a/sci-geosciences/josm-bin/metadata.xml b/sci-geosciences/josm-bin/metadata.xml
new file mode 100644
index 000000000000..003853666418
--- /dev/null
+++ b/sci-geosciences/josm-bin/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>henning@hennsch.de</email>
+    <name>Henning Schild</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci-geosciences@gentoo.org</email>
+    <name>Gentoo Geosciences Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index fbab1f9bf1b2..bcd680493f61 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/branca/Manifest b/sci-libs/branca/Manifest
index ae0b6b5ac69b..94d3b25cd2a9 100644
--- a/sci-libs/branca/Manifest
+++ b/sci-libs/branca/Manifest
@@ -1,4 +1,4 @@
 AUX branca-0.4.2-test.patch 358 BLAKE2B 087756ebe2507101eaf8c18b2726294b3eec99f7708fff092217b6083ea4f85878c2671671fb8bfbddf92822b60dbdcc737bc0eef0d46b33e1e74f00e244c470 SHA512 81d6542e259c7233e3a2c926b07cadd9fbc930db7d25f552d8febb70f3d689f57f01c49c0b6cc5e795e7fa817a7989a05a8b2768162d730b021bb6a4f2ff3925
 DIST branca-0.4.2.tar.gz 59337 BLAKE2B 7d7f101a3dcc07c0210f968da2ed41f4a75177b625ce46252024da7dbba82618dbe60886c615c9461c724af76b45c7710f631bc65d5743cee7f18a2052f9db49 SHA512 cefb3b0f41d515492902ef4046cf7f10b638aca8409f5b08f201550ed5a971a441d13243b1ce38ac0b8c0f76cde1329955d26c1856e1f3c25014a6ce0d805fd6
-EBUILD branca-0.4.2.ebuild 690 BLAKE2B 73e8827c08d67736567ea7d848b72f273f20a995d292624f24856cd64bd6666baba2e3fd5f6a5d58f669c3507365bc0e724da9bca413042ea594a2d11c8c4dca SHA512 692c3d5af1abc488ce49f3566ebb7e3013508ea9657e34214a637f523a147232f009e65e1404be1e0fc028621591b803ff8035165135d3a30da197293849e487
+EBUILD branca-0.4.2.ebuild 731 BLAKE2B c53004be38829f283538bdd3dd96879589c00e0230fc1dc03d9fc046e43c60d73a67910083babdc5d73d9c0e97d5926ea6cb49d9e21f69d11febae2493383c1a SHA512 5d53b6de85d12fd62a985aed96c64aa6c79bfa3c7f7fb38c8e6eab52bac4ef7190d9dcbcedb474c12fe881423de6a1d16d6e8636507f6d60bdc024b5265dd245
 MISC metadata.xml 566 BLAKE2B a5480589b81b88e433fc25420876d44f2d2c44bac5283c7b06c203d6fbe05afc46f0f17c2d35721894dc88d52686bf5a7386eeb55a8142695ec45961cf0d75f1 SHA512 fa78103653a5554470eb01f24e6c32412697c99fe9d3b1a75a18918c9fde42b649748c2bd9534af41e61f16255bd0794b86354fcd0d0f1942fb017316a2d78b7
diff --git a/sci-libs/branca/branca-0.4.2.ebuild b/sci-libs/branca/branca-0.4.2.ebuild
index f536554b7301..78650db40a7a 100644
--- a/sci-libs/branca/branca-0.4.2.ebuild
+++ b/sci-libs/branca/branca-0.4.2.ebuild
@@ -20,6 +20,7 @@ RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/nbconvert[${PYTHON_USEDEP}]
 	)"
 BDEPEND=""
 
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index db4015653f37..726f317aa22d 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,5 +1,5 @@
 AUX camd-2.4.6-dash_doc.patch 498 BLAKE2B 93871bfdc9fbe1bc77f7cdc66d18d7517e318edcdbc09e1efa63a9400de5a3e91fa1febdc24394743b710090d7a78fc9e864732c4979db73f679cbd008fea670 SHA512 61a38299792ade16a067e7960d5922ffeb6be838eab73f8be493b999c9256875a07b28066e1965b59f9d9e5f63f616a1674f8987ff847e49ac4ff2a8fe05c73f
 DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
-EBUILD camd-2.4.6-r1.ebuild 840 BLAKE2B c02405546aae3b43bcfd70fa24b2ca475b3d0492fc27f4f1292a00092916f7c20a52e94d65777c3f3a236e03ccb0a350117441e299f49a469935d3871a474b80 SHA512 fa5b9796edf73cba07c9e7c1acd8bd09b12f9e74eb6a1fe30081ee46984a6c0d2b40455ce3a981d08e813e5300e5669ebc5a5b4cecee53858ccaaf01b4c09fc6
+EBUILD camd-2.4.6-r1.ebuild 839 BLAKE2B 8d3c096c6b51b4d8b7876e89293eaf21dfb907eac34665b3f8755637556f276752d51f86acd92a4283e7ec94dfe8d528f9a5fa1e736988f265da0b3364232aa8 SHA512 eb5d7db8b9ea7228537a1de51fe09e621114391e8e5a99cb0fd227f1d5c57318808c74f6bb26256163515e7b35732a6575dadbc35aff542a3bafbc056011a3ff
 EBUILD camd-2.4.6.ebuild 717 BLAKE2B aaea2b067e019608d3bd31ec989d25b926299da54b35fb9b60e0b9bfcd050e9c7ddddf987c9d1b36de838fd3360812d3ded619b576e4f042f9f3dc9e243b84df SHA512 3344d69aec563ab8d21a0aacdc6a14587b182bd460f4849a396ecd51fd2a2ee63bd483eddcafb12c489c23369356a3f4eeb14a7369da11d55f4d93616058c950
 MISC metadata.xml 494 BLAKE2B 456f4ab539ab7303849cfabfda3e07987874a833e5691d6c3336ebb8a86cc6d5cc5fe8c20b65d8e5fdd8da1c947b9e7ff8eedfd2cc17da6040ff5d109b1b110d SHA512 6402783aec0922669bbf45477074644a9b10f44b0b06bf86ad9b4ecbab124076ee7f19c2c68c6eb3bf21a1569a3410f1ed0ac12f653dd5808559da133613d09f
diff --git a/sci-libs/camd/camd-2.4.6-r1.ebuild b/sci-libs/camd/camd-2.4.6-r1.ebuild
index 76e46e3b9ddf..74e087194477 100644
--- a/sci-libs/camd/camd-2.4.6-r1.ebuild
+++ b/sci-libs/camd/camd-2.4.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/cdd+/Manifest b/sci-libs/cdd+/Manifest
index ff600fbc237b..5667afeec722 100644
--- a/sci-libs/cdd+/Manifest
+++ b/sci-libs/cdd+/Manifest
@@ -1,7 +1,8 @@
-AUX cdd+-077a-gcc-5.patch 369 BLAKE2B c213d0c13c779c02846f0c3e005265ba696a82619f3690242743eda6fa8203ac2c5df4e7d5f0e9c0972f37a6de955a9b55f6aa76fda3c4fc8b80f875afda70a5 SHA512 36804d2cf1f8ac137b2ef5b1991e5e73a2ab40f8391a813f07b3d1ba6d5556bf852f07f25567a3696f9c1fa5927ef23f3364125af50136d0954723fee8d80059
-AUX cdd+-077a-gentoo.patch 1141 BLAKE2B 6b4a63e53e7a892df25eff22a198aecbed3e9b9987466e9662959f9cdcd9abf37e9a3a3e25f2c7e61cbf1c49e778b1a3ab4141f6ee2be89ccc2bae99246f1d85 SHA512 7b05ac66c6b4205c5434dc63ca46f2fbd88c115fa3bdae92ad8014fe5c70daf256b24ec1d7a0f7697e78868f78afd3ea6d5e23ed294433c2507fd8b1be510e61
-AUX cdd+-077a-headers.patch 1993 BLAKE2B e9659821dd75f7202be84ed7384a4123e96ab50f5e45ec59724c39aea7c820417022abf2b15e2b1a60931be4a31c5e92857df83758e9dbbe54d11e328a0b75ba SHA512 8b141789efea76eba1256c0f9c882dc7920169c39b80040f8c7a0238cede399b69094cf3352b26c3996d0d9ced650c654cb12d07996d0c6466a7efa1069e609f
-AUX cdd+-077a-qa-const-char.patch 1469 BLAKE2B fe9afa62b86a0d43eea6b5652599f064905c3815d2a732eb4536988751c06c5e3fc795839c2d2cbc6eb61fc8beb2aa1faf7c1bfa51118fddd2b225970762641e SHA512 fb9165442197cdbe5c1994d1759eed4c7948ce2fd89dc15b10012684be5749e9cdff548d0809f7dbf6f07141d608b71f990c10d4fbe089c73abeda8519158ab5
+AUX cdd+-077a-gcc-5.patch 353 BLAKE2B 3c37c431e1dbfbcaefed3b8df952e731ee45d63fca4c6bb83f60177fbdc9a18f4299145a7ac2af3821929e54d338786a12aabd8a1fbe1f4d26467a78e67f6d34 SHA512 04f955b92344d7e2f0a9686b014ab11e776e347388fed169641953c594e5556374d9b169c493cb19421adf96ef479a121e4f46b2632e4e43656abe420a8741e7
+AUX cdd+-077a-gcc11-dynamic-exceptions.patch 1955 BLAKE2B d84de845adc66fe4e66b345764a6652fbdc89c76c5326fac4e867976c40c50557d5dae13dad096868f80fa815149f70ed6540e456db68af379f8037821093106 SHA512 053e55dccc31a4e2284d8c929401530c8a1d04516ffef834b4ee4bf9c71e99341e353b47e954b3f44407a24997d7ec7ea4aa018ac34668e1c115d714db0ca181
+AUX cdd+-077a-gentoo.patch 1068 BLAKE2B adb0a66750309896dd58309e39b42cf982d3864c03f919f83905c09d74d118e171aa647a71d38a65f6a67acceaa81444d9fd65d55690d5da406ee72eb95e5a64 SHA512 7213b26439a8a555eba25563d7396fbfc444426480675721503fabebe96418f05b0277479c7450dfbc75fd1e51f4d5841611d7fd3a76179119c084cd35db634f
+AUX cdd+-077a-headers.patch 1066 BLAKE2B 4d63d96fddb9e265d28e66371dd3a8656cbfb0b4d13338912f88220e29bc90488d4b50afca581d192559c36c134bc0755ab1e02fb6b900eed0734aad5eac395d SHA512 462f6a11a2cc27df264d93432088fb5abb998c759e08b6bf12121336ae77a9a33702f7169971926bf9feed8fc3bf6f5b526c7ffcfa9f1e12b72a238d9aac8d4c
+AUX cdd+-077a-qa-const-char.patch 1437 BLAKE2B 5d6a347f6c8c2ee7c03612849454aa4134bb4ae41272bc6cbf1420ebebadb6dd68c5ba19973e5252d0b9badd9d90275dca78fa8cc56631395688f93e85d27754 SHA512 5ab7d38beceb21527e2c3daf889a5bcb93eb537b2a5b39f6a1d9781ddb36e3366600ce97717558c7dbf548b075c7280c474388809d37c9ab7391069e7b3839a7
 DIST cdd+-077a.tar.gz 186771 BLAKE2B 1bc1ae864c83da4f2c2d421c783f484933ee9625bf16d299a65ae738cb218e670453b661e9914776d6fc0766503a44f345c4cdfaea834120c79e677bb5686b46 SHA512 cb151274adec502420e5e931d2f248d62b26d5797f7d55f6db9c947f8e9d715a864c88ad08ad2cd74ada237789de5ca3c49dc04dc55e63d4101f07cc1685ab12
-EBUILD cdd+-077a.ebuild 852 BLAKE2B 067bb02142b588a6cd5855c330a5b3207784903490389dbe03a3ea913d9e94abe6fab2478436c32c90a661dc00907c94e82c20d10c0e4fae143b87916c748fa3 SHA512 bdb20e049558dfde9b40c9b810a52603436bbb5b75030d378beb0fdb66c27c2a2e54aeab7d4ae8c2b3aade5eef527387fb51ce9c5e880311e39942030e2386c3
-MISC metadata.xml 661 BLAKE2B 281640e5f49b4c8512384dc9f2a48996d96a6e91f7a85bde3510ae7808698fbc09be72d8997e37f8b27065fd9f5696384aec2880b5224d060727aba9f21e727f SHA512 cefc0b38a9d11cd66ef0646a3bad907d3fc4d78aa6cf24e594efd40b8114293c94255c3fea1bb54f66f5e1beeb6a732fe1809ffb62d4528ef3f63b6f7e4a73e8
+EBUILD cdd+-077a.ebuild 854 BLAKE2B f7189d0b866de1eac79af31782f71a86bb6c76bdfff026e3e9e5adcb2440627dab925e2bd2536a31acd6e07490959b8c5055e403a32bcd0f2845416753d9ce5c SHA512 4d22b9838d6c4809f32e864bb4119849eec35572bf109857e12df5e2d6f2a4ad5fd04f5d6eb71ec2864037ce27963dd214e5e3aeea36cb6bb155057c405095c8
+MISC metadata.xml 723 BLAKE2B 68b9f97d2373aafafaf1b63d834d649dd5aaf8fd0adbbe1642ed3e819769b1b569c7d658d52905b04e880ed03f40bdfb5f921bac212e1a56e756e47296ed87e3 SHA512 a6c58e4cba4852ff383be3a15d8e9bcf8621827679e02a9ce18509d816a9e286e895e8d4d5e7be68468cab815481db653fa023be89cf72a77123173f77ab5c3a
diff --git a/sci-libs/cdd+/cdd+-077a.ebuild b/sci-libs/cdd+/cdd+-077a.ebuild
index b0f5d66efdd8..12930c685aba 100644
--- a/sci-libs/cdd+/cdd+-077a.ebuild
+++ b/sci-libs/cdd+/cdd+-077a.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Another implementation of the double description method"
 HOMEPAGE="http://www.ifor.math.ethz.ch/~fukuda/cdd_home/"
@@ -12,27 +12,25 @@ SRC_URI="ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE=""
 
 DEPEND="dev-libs/gmp:0="
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-headers.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-gcc-5.patch \
-		"${FILESDIR}"/${P}-qa-const-char.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-headers.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-gcc-5.patch
+	"${FILESDIR}"/${P}-qa-const-char.patch
+	"${FILESDIR}"/${P}-gcc11-dynamic-exceptions.patch
+)
 
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		GMPLIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		GMPINCLUDE="${EPREFIX}/usr/include" \
+		GMPLIBDIR="${ESYSROOT}/usr/$(get_libdir)" \
+		GMPINCLUDE="${ESYSROOT}/usr/include" \
 		all
-
 }
 
 src_install() {
diff --git a/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch b/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch
index cd2d32a8a31b..94018d6da2a6 100644
--- a/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch
+++ b/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch
@@ -1,8 +1,8 @@
 Fix check for GCC version beyond major version 4.
 Gentoo bug #569222
 
---- cdd+-077a/gmp_init.cc
-+++ cdd+-077a/gmp_init.cc
+--- a/gmp_init.cc
++++ b/gmp_init.cc
 @@ -31,7 +31,7 @@
  # define pm_gmp_reallocate std::__alloc::reallocate
  #endif // gcc 3.3
diff --git a/sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch b/sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch
new file mode 100644
index 000000000000..1ac5a0cef32b
--- /dev/null
+++ b/sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch
@@ -0,0 +1,71 @@
+https://bugs.gentoo.org/787941
+
+From 46d95aeac2d3951d79291def284bb610e7cb033f Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 5 Aug 2021 02:00:33 +0100
+Subject: [PATCH] Drop deprecated C++17 dynamic exceptions
+
+---
+ Integer.h   |   6 +++---
+ Rational.cc |   2 +-
+ Rational.h  |   2 +-
+ cddio.o     | Bin 0 -> 154584 bytes
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+ create mode 100644 cddio.o
+
+diff --git a/Integer.h b/Integer.h
+index 8b7f04e..d4a1bdd 100644
+--- a/Integer.h
++++ b/Integer.h
+@@ -179,7 +179,7 @@ public:
+    }
+ 
+    /// Recognizes automatically number base 10, 8, or 16.
+-   Integer& set(const char *s) throw(gmp_error)
++   Integer& set(const char *s)
+    {
+       if (mpz_set_str(rep, s, 0) < 0)
+ 	 throw gmp_error("Integer: syntax error in string");
+@@ -195,14 +195,14 @@ public:
+ 
+    operator double() const { return mpz_get_d(rep); }
+ 
+-   operator long() const throw(gmp_error)
++   operator long() const
+    {
+       if (!mpz_fits_slong_p(rep))
+ 	 throw gmp_error("Integer: value too big");
+       return mpz_get_si(rep);
+    }
+ 
+-   operator int() const throw(gmp_error)
++   operator int() const
+    {
+       if (!mpz_fits_sint_p(rep))
+ 	 throw gmp_error("Integer: value too big");
+diff --git a/Rational.cc b/Rational.cc
+index f1b86a4..c679671 100644
+--- a/Rational.cc
++++ b/Rational.cc
+@@ -19,7 +19,7 @@
+ #include "Rational.h"
+ #include <cstring>
+ 
+-Rational& Rational::set(const char* s) throw (gmp_error)
++Rational& Rational::set(const char* s)
+ {
+    const char* digit=s;
+    while (*digit && *digit!='/') ++digit;
+diff --git a/Rational.h b/Rational.h
+index acaba13..eb30578 100644
+--- a/Rational.h
++++ b/Rational.h
+@@ -421,7 +421,7 @@ public:
+        Numerator and denominator are expected delimited by `/'.
+        Omitted denominator assumed equal to 1.
+    */
+-   Rational& set(const char *s) throw(gmp_error);
++   Rational& set(const char *s);
+ 
+    Rational& operator= (const Rational& b)
+    {
diff --git a/sci-libs/cdd+/files/cdd+-077a-gentoo.patch b/sci-libs/cdd+/files/cdd+-077a-gentoo.patch
index efe6d7035e99..b61b8ab42a0b 100644
--- a/sci-libs/cdd+/files/cdd+-077a-gentoo.patch
+++ b/sci-libs/cdd+/files/cdd+-077a-gentoo.patch
@@ -1,5 +1,5 @@
---- makefile.orig	2010-01-19 20:22:59.000000000 +0100
-+++ makefile	2010-01-19 20:52:01.000000000 +0100
+--- a/makefile
++++ b/makefile
 @@ -6,21 +6,21 @@
  #CC = /bin/cc
  
diff --git a/sci-libs/cdd+/files/cdd+-077a-headers.patch b/sci-libs/cdd+/files/cdd+-077a-headers.patch
index c6ceb93bfaad..4df6f05871c9 100644
--- a/sci-libs/cdd+/files/cdd+-077a-headers.patch
+++ b/sci-libs/cdd+/files/cdd+-077a-headers.patch
@@ -1,10 +1,5 @@
-Index: Integer.h
-===================================================================
-RCS file: /home/imocvs/cdd+/Integer.h,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 Integer.h
---- Integer.h	2008/12/15 01:19:52	1.1.1.1
-+++ Integer.h	2008/12/15 01:24:04
+--- a/Integer.h
++++ b/Integer.h
 @@ -23,6 +23,7 @@
  #include <gmp_init.h>
  #include <cctype>
@@ -13,13 +8,8 @@ diff -u -p -r1.1.1.1 Integer.h
  
  class Integer; class Rational;
  
-Index: Rational.cc
-===================================================================
-RCS file: /home/imocvs/cdd+/Rational.cc,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 Rational.cc
---- Rational.cc	2008/12/15 01:19:52	1.1.1.1
-+++ Rational.cc	2008/12/15 01:25:14
+--- a/Rational.cc
++++ b/Rational.cc
 @@ -17,6 +17,7 @@
  
  #include <cctype>
@@ -28,13 +18,8 @@ diff -u -p -r1.1.1.1 Rational.cc
  
  Rational& Rational::set(const char* s) throw (gmp_error)
  {
-Index: Rational.h
-===================================================================
-RCS file: /home/imocvs/cdd+/Rational.h,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 Rational.h
---- Rational.h	2008/12/15 01:19:52	1.1.1.1
-+++ Rational.h	2008/12/15 01:27:08
+--- a/Rational.h
++++ b/Rational.h
 @@ -17,6 +17,7 @@
  #define _POLYMAKE_GMP_RATIONAL_H "$Project: polymake $$Id$
  
@@ -52,13 +37,8 @@ diff -u -p -r1.1.1.1 Rational.h
        *den_buf++ = '/';
        denominator(a).putstr(os.flags(), den_buf);
     }
-Index: gmp_init.cc
-===================================================================
-RCS file: /home/imocvs/cdd+/gmp_init.cc,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 gmp_init.cc
---- gmp_init.cc	2008/12/15 01:19:52	1.1.1.1
-+++ gmp_init.cc	2008/12/15 01:23:45
+--- a/gmp_init.cc
++++ b/gmp_init.cc
 @@ -16,6 +16,7 @@
  #ident "$Project: polymake $$Id$
  
diff --git a/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch b/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch
index a2304725990f..883b6bf809ba 100644
--- a/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch
+++ b/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch
@@ -4,8 +4,8 @@ cddio.C: In function ‘void SetWriteFileName(char*, char, char*)’:
 cddio.C:103:20: warning: deprecated conversion from string constant to ‘char*’ [-Wwrite-strings]
            extension=".ine"; break;     /* output file for ine data */
 
---- cdd+-077a/cdd.h
-+++ cdd+-077a/cdd.h
+--- a/cdd.h
++++ b/cdd.h
 @@ -185,8 +185,8 @@
  extern int output_digits;  /* Float digits for output.  Does not affect the computation. */
  
@@ -17,8 +17,8 @@ cddio.C:103:20: warning: deprecated conversion from string constant to ‘char*â
  
  myTYPE FABS(myTYPE);
  void SetNumberType(string);
---- cdd+-077a/cddio.C
-+++ cdd+-077a/cddio.C
+--- a/cddio.C
++++ b/cddio.C
 @@ -90,10 +90,10 @@
    }
  }
diff --git a/sci-libs/cdd+/metadata.xml b/sci-libs/cdd+/metadata.xml
index 1745610437d5..e793c504506a 100644
--- a/sci-libs/cdd+/metadata.xml
+++ b/sci-libs/cdd+/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>sci-mathematics@gentoo.org</email>
-    <name>Gentoo Mathematics Project</name>
-  </maintainer>
-  <longdescription>
-    The program cdd+ is a C++ implementation of the Double Description Method of Motzkin et al. for generating all
-    vertices (i.e. extreme points) and extreme rays of a general convex polyhedron in R^d given by a system of linear
-    inequalities: P = { x : A x &lt;= b } where A is an m x d real matrix and b is a real m dimensional vector.
-  </longdescription>
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<longdescription>
+	The program cdd+ is a C++ implementation of the Double Description Method of Motzkin et al. for generating all
+	vertices (i.e. extreme points) and extreme rays of a general convex polyhedron in R^d given by a system of linear
+	inequalities: P = { x : A x &lt;= b } where A is an m x d real matrix and b is a real m dimensional vector.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">cddlib/cddplus</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 7cb03fb408ca..6e1c1cf46fea 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,3 +1,6 @@
+AUX ceres-solver-2.0.0-system-mathjax.patch 325 BLAKE2B a649088517ec1bef7d5a6144de57657daeff2b5a1a0b053c0bfa81d8af7143ad5d829571be947d8853bd6d1fe39adc63b4f14a4075004775151fa649747911c6 SHA512 e16646210fddb350f5cc43665afaa88d2ffe53c817dab778c0e2534c1a0001242865a547e8a308621a9068555e7e20a57e83b0447ff5d32688ed5fb3f5694d29
 DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc SHA512 a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6
+DIST ceres-solver-2.0.0.tar.gz 11225245 BLAKE2B 1761908747d460f6a84cb519b4bbb49fec7e1e36cc616b438c45ace57d10bd3bb4d0cb2795e07d5096e0b9453511c185ffdd3872e317aa8095daeb86933643b0 SHA512 843b19389f4d628b2b8b8538655cb330e092ffcc960c6896c6e3065b3a34e330c81e993b7abcd754e575742e2104087efde3526945c92f7df3f6b700984e49f9
 EBUILD ceres-solver-1.14.0.ebuild 2390 BLAKE2B 6aa1716982173734e1f95f2ba76b18ae27854811c35d95f8b2812fd6ff7ff1b74adb7c4f674e4834b5ee65e1a5a159d9cd656d28a9fbdda6192da84060150e8c SHA512 1e8da4d8abbfe6705841a453a9db6e5d672c40efff438afe32085b7ad43b7801970184d1869726ce9ec28b32e6c076f84a7fa622417b88bcd9f7072602bd235a
+EBUILD ceres-solver-2.0.0.ebuild 2524 BLAKE2B a3fdcf279d57e9d69a0ac3f3d6639f1e0ac84c1116628da74dd80bb77271ade03ef3be70cc88efa2e0b8c4d1faf1dd77bc3a061f0ef05c62f9f4d3219d92d3f4 SHA512 e430efbf26696b97e619045463da032b376811d999fd394d9e3c51301e7db7d29217452df27e716ab9de1cda2c033301b505571ab362dc8aaa541d8f955cb1be
 MISC metadata.xml 1451 BLAKE2B c23657557890c4b62551c79eb7a3b07ef0921f5766b9d771d85e1cf156b03a9d783f6d307504ce5cfc810e096bd990f2aef58f7da6cf912df3fbafa7b63f257e SHA512 e9867b3e997e1c28e900f1148287ed052d5e29440c7f8d99b61432c8870d8f6d7368d387f9cc72bb948a412b77ad8e4cc2f418c41ad60f21c8027e23f36d71aa
diff --git a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
new file mode 100644
index 000000000000..771ac309e41c
--- /dev/null
+++ b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+DOCS_BUILDER="sphinx"
+DOCS_DEPEND="dev-python/sphinx_rtd_theme"
+DOCS_DIR="docs/source"
+inherit cmake-multilib python-any-r1 docs toolchain-funcs
+
+DESCRIPTION="Nonlinear least-squares minimizer"
+HOMEPAGE="http://ceres-solver.org/"
+SRC_URI="http://ceres-solver.org/${P}.tar.gz"
+
+LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxsparse examples gflags lapack openmp +schur sparse test"
+
+REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=dev-cpp/eigen-3.3.4:3
+	lapack? ( virtual/pkgconfig )
+	doc? ( dev-libs/mathjax )
+"
+RDEPEND="
+	dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
+	cxsparse? ( sci-libs/cxsparse )
+	lapack? ( virtual/lapack )
+	sparse? (
+		sci-libs/amd
+		sci-libs/camd
+		sci-libs/ccolamd
+		sci-libs/cholmod[metis(+)]
+		sci-libs/colamd
+		sci-libs/spqr
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md VERSION )
+
+PATCHES=( "${FILESDIR}/${P}-system-mathjax.patch" )
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
+			ewarn "OpenMP is not available in your current selected gcc"
+			die "need openmp capable gcc"
+		fi
+	fi
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# search paths work for prefix
+	sed -e "s:/usr:${EPREFIX}/usr:g" \
+		-i cmake/*.cmake || die
+
+	# remove Werror
+	sed -e 's/-Werror=(all|extra)//g' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	# CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
+	local mycmakeargs=(
+		-DBUILD_BENCHMARKS=OFF
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DGFLAGS=$(usex gflags)
+		-DLAPACK=$(usex lapack)
+		-DSCHUR_SPECIALIZATIONS=$(usex schur)
+		-DCXSPARSE=$(usex cxsparse)
+		-DSUITESPARSE=$(usex sparse)
+		-DEigen3_DIR=/usr/$(get_libdir)/cmake/eigen3
+		-DCERES_THREADING_MODEL=$(usex openmp OPENMP CXX_THREADS)
+	)
+	use doc && mycmakeargs+=(
+		-DCERES_DOCS_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+	)
+	use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON )
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples data
+	fi
+}
diff --git a/sci-libs/ceres-solver/files/ceres-solver-2.0.0-system-mathjax.patch b/sci-libs/ceres-solver/files/ceres-solver-2.0.0-system-mathjax.patch
new file mode 100644
index 000000000000..61e0f000f267
--- /dev/null
+++ b/sci-libs/ceres-solver/files/ceres-solver-2.0.0-system-mathjax.patch
@@ -0,0 +1,10 @@
+diff -urN a/docs/source/conf.py b/docs/source/conf.py
+--- a/docs/source/conf.py	2020-10-25 22:25:47.000000000 -0500
++++ b/docs/source/conf.py	2021-07-29 09:44:35.488893188 -0500
+@@ -252,3 +252,6 @@
+         'scale' : 90
+    }
+ }
++
++# Use system MathJax
++mathjax_path = "/usr/share/mathjax/MathJax.js?config=TeX-MML-AM_CHTML"
diff --git a/sci-libs/coinor-bcp/Manifest b/sci-libs/coinor-bcp/Manifest
index f11f4dfc112a..2b6e7ecdf7c7 100644
--- a/sci-libs/coinor-bcp/Manifest
+++ b/sci-libs/coinor-bcp/Manifest
@@ -1,3 +1,4 @@
+AUX coinor-bcp-1.4.4-gcc11-exceptions.patch 1424 BLAKE2B 72b2890a23f15cbdfc868b9b82d9a315a7439571e9518b1fc61aa6e84f89ac199e2ff1847f3051121f7ac18dbae3dd654d4fdd7a52daa6bed3c2d9a1cef59562 SHA512 53a0010025e92c5bf099aa475fa913550723cdce99e5e46f9f96071c71e7854f896f6d26a8c3627c4ff196053b56de97ede0cea654a4df728de004846781ffa9
 DIST coinor-bcp-1.4.4.tar.gz 1983573 BLAKE2B 79265c0336ca719b417825df2f27e88c08c314e599693e8886170fe69755b3272aa05469bfc069660c979e4a273ca63a25fc4d3a86a695838039121fa98a14bd SHA512 066ad631a67ccf33eebc175451f4734cbf190cb4fd9866dec987d80688a69400b76415de65ee9399b1a8ccfdf3bf3af307245610481a6d673598bc157c3963bc
-EBUILD coinor-bcp-1.4.4.ebuild 1286 BLAKE2B cacfeb014ef35c6c25d7296bce2bb975d686a1ae1ee79fba63ff3f20734283aa2b597a25994ddde5083de9a9b1b74eecb8a90de77c88a24593b7c18a323918db SHA512 6a7e1253bb1635ac0811c64162a915c5ed15d4868d561cbcbdcdd5183145e87799a6c5204136eb3303080436e2039e6552cd1e6a9cddcaf87df9c26c901f7600
+EBUILD coinor-bcp-1.4.4.ebuild 1342 BLAKE2B 3604cf8bdb00449d1f6efd365f12ef0b5d8bc21f028d8ce928c5bdde5e42a01806a40f7b47d45669f698bc2688a03b6af6e99c847b341e53557ae7cdabf3e264 SHA512 8261262187cbfa0433dc025348cfb346e31b6ca262e34e0514a3f185e29be8526a1ce85fac4dc196e4318bf13c6fb4117d62fdd9930569076efb7210d8013d13
 MISC metadata.xml 754 BLAKE2B 42bb77241c68a9f2e81c4a50350fd25d42ccbab57cefc743ea0eea119b6ef530d512c89fcfc598a1f0b5ddb67ae8477c93cb61b7bddd7c242bff20acff4c57d3 SHA512 9dc6b85158dfe5ccb8820338f45c8ee1b1b7ce926ec7a41b3dae25210b99de72b87d8560e7f4a1a0772a35f5cabc2fa261fc0044e0d4c5c826f0c61034b8b6cd
diff --git a/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild b/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild
index b4b5f58fbe9e..a904acfd1336 100644
--- a/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild
+++ b/sci-libs/coinor-bcp/coinor-bcp-1.4.4.ebuild
@@ -25,6 +25,10 @@ BDEPEND="
 	doc? ( app-doc/doxygen[dot] )
 	test? ( sci-libs/coinor-sample )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc11-exceptions.patch
+)
+
 src_prepare() {
 	default
 	# Prevent unneeded call to pkg-config that needs ${ED}'s in path.
diff --git a/sci-libs/coinor-bcp/files/coinor-bcp-1.4.4-gcc11-exceptions.patch b/sci-libs/coinor-bcp/files/coinor-bcp-1.4.4-gcc11-exceptions.patch
new file mode 100644
index 000000000000..d37e8b024396
--- /dev/null
+++ b/sci-libs/coinor-bcp/files/coinor-bcp-1.4.4-gcc11-exceptions.patch
@@ -0,0 +1,36 @@
+https://github.com/coin-or/Bcp/commit/e581a2dd4b55352eb318c15e8281b3cc9d8abe23.patch
+https://bugs.gentoo.org/786306
+
+From e581a2dd4b55352eb318c15e8281b3cc9d8abe23 Mon Sep 17 00:00:00 2001
+From: Julien Schueller <schueller@phimeca.com>
+Date: Fri, 14 Aug 2020 09:58:47 +0200
+Subject: [PATCH] Fix deprecated dynamic exception warning
+
+warning: dynamic exception specifications are deprecated in C++11
+--- a/src/include/BCP_buffer.hpp
++++ b/src/include/BCP_buffer.hpp
+@@ -101,13 +101,13 @@ class BCP_buffer{
+    /**@name Modifying methods */
+    /*@{*/
+    /** Position the read head in the buffer. Must be between 0 and size(). */
+-   inline void set_position(const int pos) throw(BCP_fatal_error) {
++   inline void set_position(const int pos) {
+      if (pos < 0 || pos > size())
+        throw BCP_fatal_error("Incorrest buffer position setting.\n");
+      _pos = pos;
+    }
+    /** Cut off the end of the buffer. Must be between 0 and size(). */
+-   inline void set_size(const int s) throw(BCP_fatal_error) {
++   inline void set_size(const int s) {
+      if (s < 0 || s > size())
+        throw BCP_fatal_error("Incorrest buffer position setting.\n");
+      _size = s;
+@@ -221,7 +221,7 @@ class BCP_buffer{
+    */
+    template <class T> BCP_buffer& unpack(T*& values, int& length,
+ 					 bool allocate = true)
+-     throw(BCP_fatal_error) {
++   {
+      if (allocate) {
+ #ifdef PARANOID
+        if (_pos + sizeof(int) > _size)
diff --git a/sci-libs/coinor-couenne/Manifest b/sci-libs/coinor-couenne/Manifest
index 43c0218ff534..88f04d05385f 100644
--- a/sci-libs/coinor-couenne/Manifest
+++ b/sci-libs/coinor-couenne/Manifest
@@ -1,4 +1,4 @@
-AUX coinor-couenne-0.5.8-fix-build-with-gcc11.patch 1497 BLAKE2B edc1886a22c886a667181b42bd8d764f368af22c424a96d326a878104a01600a7b1f155c6a0ae66ccd0b09df39a44d8e6e6acb02ead8cd8c359cd7e173b02463 SHA512 f5a2b371129b5e50567d06794a4907cfc64c688518f931518b653159929c322ec070298d66e45d7443cd9af1cb394d9349b5a8322aa23f4bdb0eff2e3fb1bd9a
+AUX coinor-couenne-0.5.8-fix-build-with-gcc11.patch 1649 BLAKE2B afc60f6ab29aa4e1534fcb1eb30642319f25b8409d585da03041909531f27f1b7eccbaadcd1c1f08f6b563f2cad85d5a06973de7c6d756562482d15680244326 SHA512 4511028eecb450a363f0bd23301d4e903b8f7f9cb7314aeb1da63f7b257a048a626e853900e191afac81030b5fe40418d37d907a9cd892b220adc400a2e7c87c
 DIST coinor-couenne-0.5.8.tar.gz 1321163 BLAKE2B 841a4af3d76fd308ef5abe481157fa1ecf307e7fae03fa0cb931483be74443febc7eb1ba7e85f47c3dca5d5447a74ae86dc0f3dbeb6c0f0032f543861462e0a1 SHA512 bf474503bd77be6536f9d00b40ff45041b3976ea2167d64e667fa580aa8ed6a383861ec67d57eec83623b6542f7779ed7d50d9b72347c3f77ef36a194a3f9e71
 EBUILD coinor-couenne-0.5.8-r1.ebuild 1314 BLAKE2B 18b8c8fccced626330a6aabd72c1f1656951c8710a6f85a1481e6f50caedbaef664b4ab5a30daa7adbd9950281810e3db2af95d4f4b5c0bc8f5c359184905b88 SHA512 b3f67f357dce7aa682eb1684ae18012aa76f7868cdf98aff457489ec31b9b9906d2068e92962cbe57a924f9893f95fa51a89adaccab6cda7585240033ade0f50
 MISC metadata.xml 700 BLAKE2B 945c3aafd3cc6b2280c64b664cc9a49ccc5be8b9d6dd33c4bb4730c7367e1ad15b25f9fefb968b69f29f2b5cf1e57d8cae3f990db8948d8436385bea67e34212 SHA512 641fa4e5a9bd4f66e42aa86960141e3de0d8f68bc9b01d8235a6be90c1b2c60a262221b0253a366491ed161b8acf114df8549affbc30acd250b89ca3d65105fc
diff --git a/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch b/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch
index 339ce1a0e903..7cae89c1ada8 100644
--- a/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch
+++ b/sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch
@@ -1,3 +1,6 @@
+https://github.com/coin-or/Couenne/pull/57
+https://github.com/coin-or/Couenne/commit/fdfe17562c59518b4db478ca51c18ab5e01a59a5 (later found post-patch)
+
 https://bugs.gentoo.org/792798
 
 From debc5de2d0ac9654c01db080448df064b808c56e Mon Sep 17 00:00:00 2001
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index ac4699e90609..2c5cfa1aad5d 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -8,5 +8,5 @@ DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e392662421852
 DIST gsl-2.7.tar.gz 7508761 BLAKE2B a9da4df40ea57374880026a0586f2f218dbb0c9154cc661b3e7f5cd414311b95300e60faa2d7f4d3c6cdae5cfdf77cb8052075b56f51564aec2649cc4ad5f7f9 SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5
 EBUILD gsl-1.16.ebuild 3069 BLAKE2B 3cb68ede8761db13a1e17b0e0aff1f165e20f38946dd5b70a92b597c38faa4581bd0c9b96d16257f7fbccfa765513e4a0319686f4ffd959e7a0d2e084cacab75 SHA512 03a6b20f6d6cf125d120841aea9b2170e9bb77bbc64346e82f3a03fc5e78c19ae75bf8e01c19e6371f21658c3bcc168f0f13a04ebb500715629c45306b5af713
 EBUILD gsl-2.5-r1.ebuild 1428 BLAKE2B 199410861db77b4e73bba3647790efd91fe675185c55cb1730e6e06221753f34048cff8033e07c1846104801c994da0b9fe0c2da3a6661e3899d67b0345892fc SHA512 bc175e93a0ab179b397d97efe24a9b66a1787c28dcd5c38e6cec359246790fb01fb43764567dd1031ace02acc99928d1518a59f6c4e98b8c674c7f8f1f7c09bf
-EBUILD gsl-2.7.ebuild 1461 BLAKE2B b8ba4ef7b9bd8c2485750c9a26ea778f0a913a0a6c2e67be34d5deaaa0a7349299e216ed2635681b4f46e489f76600a2f406e31a255bf3b876bbb6b1b734b0f9 SHA512 f1c8fd6ac5b35ae6854745d33c51af2066f72ebacd1ab49f52109a7362a47d8b3804ccf7ef3def69df91eceea1056b26e28a436b4af72c70255842d3645ca0bc
+EBUILD gsl-2.7.ebuild 1459 BLAKE2B de1eafceae45af3c5a051be50cbb54afdc34fe2610f18b08c7eedc92c8d7d3aeb43016d2531cbb99649d00f47157a3ec3569ee4b81360aad2db99720a0095c10 SHA512 788fca8c7a6768938c1c6b3bea5f48f16194b49fbbf992489e0250d205ab19160ac6000fbf7dc93355e456339515b225aa15d8af788de7ddd2850760f72f6c5b
 MISC metadata.xml 1190 BLAKE2B b9015dc09464b327144a546a0e9dae6e1c5eaf3ce118a24b7ad1853f09af1952284f754aada2436d7e1a1df82638720492445d8f015ccb1cec05c78dd718fc26 SHA512 f56ec87aeb8f257480a631748db79c78193797e1ecd586dbbd78f31a01fbbd3341fa67ffd3244e5dba352478ee552184d6a1d9b5ef5d54d67b038215090eca00
diff --git a/sci-libs/gsl/gsl-2.7.ebuild b/sci-libs/gsl/gsl-2.7.ebuild
index 1819cb8629de..247d2fe2b638 100644
--- a/sci-libs/gsl/gsl-2.7.ebuild
+++ b/sci-libs/gsl/gsl-2.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/25"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 925711eae626..414b70346f5b 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -6,5 +6,5 @@ DIST indilib-1.9.1.tar.gz 2322783 BLAKE2B 801071bf9190e4c27b4f3bf9fa2d9a44c4e297
 EBUILD indilib-1.8.8.ebuild 1188 BLAKE2B 5afef4724dc43ac28d5f3d0c3449dd48c2caec78a1dfdda6dc1e27f32b014a542d965a17c0cd872fc3bb01b5baf3df41665a8a356f923cf50de608c052dddec7 SHA512 744705826bf3d864f6e847fe80839e0c5aba5ec075c64d5a0995f0e6241c88bb0b37131df0ec4272a3a0ee50bef2cb6fe771fc1e802e778d1dca1ec39becfa38
 EBUILD indilib-1.8.9.ebuild 1189 BLAKE2B 60b9a949b599b8a1a9772355a68d9257501a85eb1d6155e95afc0c7766ad13564e77e669f6341377674c0b5cd5886649e402944dedee06fe975642132a48add3 SHA512 96428f3be5dafea90c4ce14da7dae749c6124bd3824500928f3f25c89c4c26dd054b07e3536f9db30140d7a539775148f7fa9da739b0ff4c2da5fa22651cdc68
 EBUILD indilib-1.9.0.ebuild 1191 BLAKE2B 1047b62c8a546e70dd5fe645eebaf6f5c5615d9beed2d9d406197f731ebd13d72b1047ace29f3988d3ea097e561b1b52d718f33b33dde4ecf97c49c07ba3faf1 SHA512 388fb2ff99e874e029fa999f934459c156d821738f3d3c4327429b7604121d50a06276dc768bc0c2d1e770132cf665f35003d2923f6adb828f2e821ff2332e05
-EBUILD indilib-1.9.1-r1.ebuild 1334 BLAKE2B da82a5c7dd9e8a8b1a8dfdecce12f22b39cdf0381eef94be46e836fc63071fde720c325151d531f317133439525b13ae732ab0497b32bdcd8d400442a1700a55 SHA512 0632e5a82020334e961cd4e1d500f4f94dc76f37a336474c9d03797dd92da1828764c976f137ef392422b880963cdcda4bd6df6baa7a4b5c31cd7264dabb2dcb
+EBUILD indilib-1.9.1-r1.ebuild 1333 BLAKE2B 336899d9f2357e3ed1b021b6e53b259ba2c44647d89760c4c99f7af3f83e5498341147519f98181baa8db24b1a480bcfa7e00ceaa429d0de0a783a1f30d3e0c1 SHA512 a0e9e8ff4290994004e577d77dd5e77f2b02717cd9de435810b8f588fcc3700907b4996d0373d42d021bdfc1d0bf79be1d2bdbab5b2eeb92a826be5678cd5434
 MISC metadata.xml 561 BLAKE2B 08059ed028ee0f961a58fe6e8ba141160437cee5e944bc72ad82a5731b0f187cd412ea2669a2d726d7c602a0dc8c659a79672f0e3786f502db22754076498854 SHA512 c0f2d64008a0ea23319101a2ca7e928940c81a6959544410476f80482cc560e42c991228ec96a1f8eab7d333f22a8853a40162228953a6dad6e5cdb67e8f3d7b
diff --git a/sci-libs/indilib/indilib-1.9.1-r1.ebuild b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
index c67a2b8eea54..be99265cb352 100644
--- a/sci-libs/indilib/indilib-1.9.1-r1.ebuild
+++ b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}"
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="ogg rtlsdr test websocket"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index c701b185873d..c7233599d6d3 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -3,5 +3,5 @@ DIST libint-1.1.6.tar.gz 256404 BLAKE2B c754e25f0c3bc6c52eb434beafd2cb794a2e7150
 DIST libint-2.6.0.tar.gz 24743255 BLAKE2B 3ab7baba012828485c6c8425bce100e1ab50d2a3c8443ea2ef5cf173d58d8aa211a07e837b10a7f89d7e57f2e15b9384060bbf7b9885f32e9426525e65e15960 SHA512 56343c64b0dfb829702f4bb2fe14a04ad063acd7cb8b5a21cd1a45a830944c1ee98c888c9a28d6746b1bc17459aefcfb0aafe6ef310bfe554056212ad19e43ef
 EBUILD libint-1.1.6.ebuild 855 BLAKE2B 65e5b86aa9e9b8a29825c7075145b4ad170c9a6bd255773e605a826476a54e3ec4734194362a53d74c95b3916e98ab7343ac5b94f4defb2a6cad0c42c55077a0 SHA512 ec5cc40c2c27cf812cca7d843461e5568f2596970ef80912e3c8cfab2cc70b0a5179c680c63a7d8df84d8d38bfd3e43dfad035ac4b43bf587ef81738d0e84274
 EBUILD libint-2.6.0-r3.ebuild 1422 BLAKE2B 5a95126604bd6e1e9f7b697fd542a0ee74a24b539d5ec367d2fcb833ec70481305869cbc18e6bdcb23692f5fe39467cf53d5264353ae854530cda4cda3de98c5 SHA512 0b2e7980ed09840a83659640df1ad32803d3975e419926958d5d75eb0fb8e7d2ca207093727b68b89419065c51c1c46dff268d833e897c1d5a4c827c90fc1c31
-EBUILD libint-2.6.0-r5.ebuild 1598 BLAKE2B d3efe5f6bb2e2304cbb07eb1de390d5b596cb4dbd4e34e4716a468345cbf72c0bc7b71dc714a66383304ca6a17a4f7c232450c7d989b1d8e9c571ac10ab24f90 SHA512 ace5668a85735297d2f7e835de962e3e3c4c84f0c6ccb3f8989e9e3fc53a0d84fad5320ba3dbab00e1d70ded7e909e0c8afbcf60d5332979dd000154f88bc3db
+EBUILD libint-2.6.0-r5.ebuild 1597 BLAKE2B b5ba23f8101470e970a1a65bf7c70650c3144520ac798d9c41286b1e97cb296519af05d312cde7f015b4164997921db78e94c869b51a8700016be2e2281894f9 SHA512 f4409edfa07a47c1c629b2a48bd3adf9c280e634a5d6d995d40f8be0007730ec70a6e7fb39cfde6ed019a96c1240fa9fc5c75107487006bd3fa23ca1cf215264
 MISC metadata.xml 612 BLAKE2B bc2b11edd30d0db99860d1d005c56c428c75be96224fa3285fd3cde6f35af0f142b445254214af00308a29ee8965505a8dfe14ffb2e80b57ca42ef20c91bf100 SHA512 db9172c0e887d45f42914159eae83c0f11b40fbafac31395c782ff959cdccad8a62a8d468cec66d6e362cd8ea09aa3b05057d19fff8a1f94b9bd472be97d04b0
diff --git a/sci-libs/libint/libint-2.6.0-r5.ebuild b/sci-libs/libint/libint-2.6.0-r5.ebuild
index bbf70b01e2ba..176c1000db5f 100644
--- a/sci-libs/libint/libint-2.6.0-r5.ebuild
+++ b/sci-libs/libint/libint-2.6.0-r5.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs doc"
 
 DEPEND="
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 19d7b4d1d5b9..73d7043e31ee 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -4,6 +4,6 @@ DIST libqalculate-3.19.0.tar.gz 2007385 BLAKE2B bd0b1bbfcd4bad0053ec9193bec1081c
 DIST libqalculate-3.20.1.tar.gz 2107300 BLAKE2B 79314cbe2adb183a17f96947b8ad4fa0bbfea665f7b9afda67785059e9bc0d94599b05cd55999302fc5e1216929b4ed98db4e2a6ae0c6fc74ebdd37dc6dcb72e SHA512 65a723c257c9e2419fc60ca254c23a7a7dd4d9a31beaa9c8fcf41a1e252e5f3be08e1160dcc72a0a407fe3ffd3e73353b141e40019871677a490d8c810c96931
 EBUILD libqalculate-3.17.0.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469
 EBUILD libqalculate-3.18.0.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469
-EBUILD libqalculate-3.19.0.ebuild 1604 BLAKE2B 742061709594aff32c619af31ed37f9741c71c59e015415ed3a2cad9e3b491c3f8546fd54d8db3bdb66b60f5d1e0fef71fc407bea2fd9ac7a34c851262ef414c SHA512 f85aa53889d88ea0e6cfadabdafdc5bfb6681452351e8adf9e740561831ad0ac9ed1a228be82e82a4e4a08c39f3f9e7c736c5d91bd9f9bf0471301608ad27608
+EBUILD libqalculate-3.19.0.ebuild 1603 BLAKE2B a503ff3c6842ce2c20340e3783eda16ec0071151adedb157402df9c6ef0051afdc36ba03482d3b7edd8543c77c77d254b6fe6745ade186eff54f0be9cb9fa25f SHA512 f417057b5dc28dc540b2ba858e6219484d230e2a5a94416b67bcfb2670f09e144f09a3249f6a104eda529cd2c6a710ab9a0e6f935477f3d8731eb7adf4695790
 EBUILD libqalculate-3.20.1-r1.ebuild 1608 BLAKE2B 527c1abfaa8d29f92f178d63c8898ec26affc870a830cfe7c26bde6f76fd9b900457822ec148a8aef32ef23d51ffc5aa0f89b96549c587e699e3ef2179f35f7e SHA512 dd7b56e849de9713540e1c449f09f982b5042e7210d8b4612d4ead5bf29646ffc7343d8400fc60f681ff37e5cb457bc84ea1af4289d37877581db02d07f4e328
 MISC metadata.xml 412 BLAKE2B bec97c9946830a88d871c0a27f06ff42a2ed252971f616f43f4c0cfa9617ea46565153c41c2aabea921b694c6a665a097635fdcf5dd82387dc60445e14657427 SHA512 3e011ceae845d6f233e86f7d39eb4460f561720312d8a0696b87672251cf46138228ae678ab63459280dd36fda3f9f8f302d9259e49acd6606fe2e66126bffb9
diff --git a/sci-libs/libqalculate/libqalculate-3.19.0.ebuild b/sci-libs/libqalculate/libqalculate-3.19.0.ebuild
index b1e1ab831657..aa63a8ec0a91 100644
--- a/sci-libs/libqalculate/libqalculate-3.19.0.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.19.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/21"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot readline"
 
 DEPEND="
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 9ba04972ac8b..4b846c45e5c6 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,10 +1,7 @@
-AUX libsc-2.2-autoconf_lua_version.patch 1310 BLAKE2B 5d6ced3339ced04b9681cb4940dc5b0bc130b87dc7fa357f91fffc3deb8316ecd1f3f504b578cdf105b533772e8ba9ec34f4410960721ace1ac7e5fba3a04a65 SHA512 51c417011b481712d3469fe86591c903e16cce2c06b83cc7e3ee663d75ad4910b60f8893f589fdd6a38282e1668a1f97d93c50fc360a5919379dec5520a8905c
 AUX libsc-2.3-add_soname.patch 479 BLAKE2B 3e7e199f88160dc7d5af67696d1a1b1cb2d668589e5a219adcdb6791879e1370f3f638d546b915a4cc40bc5fa594a4e3dd927d31e735dfb287d95ffaa4e6e897 SHA512 d8460b4b1ddb790903f7ddf053f5cb1eabf74741a10a79784a2764b756f82e7c160e6e6752c01eeb4cca2e2e99316c0b2b0f3192bf4415685523abdf71dc1065
 AUX libsc-2.3-autoconf_lua_version.patch 1790 BLAKE2B 7968b643acddc54f81b06028392ee328143f280178ed4a52e4a7eabc85906f043b9edd82cf7c0ef7c4956cee59602bb231e0051da162538419de3b9b88c7a57d SHA512 6c3c183b5255296ac0340845b94d39e6aa1f4675a6fc44ea139635e73aca7a4d8eb02d14a7e9599723ca9d0702c911c3d20102a95c3d4ff1ed941b565a5f9cf7
 AUX libsc-9999_20201220-autoconf_lua_version.patch 1449 BLAKE2B 7212839168ab69f115cd177fa998cb8352f9c0abb06c4a89916a1e14b5d99695d15602700f891a8985f74ba19114e62da152bda3c74810d7b307762dadff837a SHA512 4993bc99cd7e88ee4fc523b14d859745fbc06ff3e89a80a96a2f33ba64e782c2c25ffd5620b93537056b17fe02a2648de54eee276174147d776c6747230b476c
-DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
 DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
-EBUILD libsc-2.2-r100.ebuild 2291 BLAKE2B 418dc0bc9219b6f897523352c8c056c2e495fe5e89634f29aea1810fba4ad23073c544b807c42bd594eb3f2892e320918b9cb0151f5aece319d442c2a9517706 SHA512 7922b32ff3989cedb0b34fa9b6abedd8cdd8a890ede27dade44fb3e2082b353c47444f30a21f4e0d5e84c3cc78a16dd92dcfcf1dcdf8a267f9327915be723cf1
-EBUILD libsc-2.3.1.ebuild 2333 BLAKE2B ec5969ed4acac58bfd0d50675ac8b7b52f552f6cc82c9270edf72f2a18464333fc5bdcde0670ede24f6bd0b6e80ff13023dae91f97c6d10c8434fd3a27162934 SHA512 a257c87659a08a3a68ae2f9096c5f0633fc892ef15e59c76f966fe8994200571c7a1ca0185bf8145e7a9cfffd92c0798c2a8123325bc17fbf00cff4e1359b847
-EBUILD libsc-9999.ebuild 2301 BLAKE2B d0512fc7b8fbcf57439361287a160376a9b88fed9c8bb8d6026d95a133f50fd6f0796e81e143f55abbf5d964a9a55dbaf57a83b3a28f2dca02cae1cac553ce22 SHA512 0ffaeb80966af4463a496059605895669bde82381b3a8bfd76d899806d8cba863ac6a252ec400a38659b872126fb4dd5d69e4816334c87e430665183382ea064
+EBUILD libsc-2.3.1-r1.ebuild 2329 BLAKE2B 0e76824c176255a9f3f5d3094f07d5ad8fbcc721f069ea2b0981ddffbc821fcc5eee5f0780a074ed828e4344ab76d8d64426cbf79918a3044dcdeddbf2fef490 SHA512 9094098895f555dc8cb62c78b2fd600b1b563dfb0412bff14f593c1706dd96b633eb76aeaaf205d527ec3e842c0fff04a35997f368c52a30ed90c0f0930fd47a
+EBUILD libsc-9999.ebuild 2297 BLAKE2B 0afe3197122a28663aabd949c40add49441e978cfd02b3bcf6072c1b844c02922bdfeb87626e28f46d9047dbd299d9edcd0299e7b7cb28e2739e03619f9d754d SHA512 acbab2613f93d41789f38057d0385be80d8729ac34cdd6011eda569f5a5595d6eedd68a91858c622acb096392cfa6743453657be287de600e10fda8550b64868
 MISC metadata.xml 712 BLAKE2B 9e1ddf9aece6b04220d62626d4fd3af7b2f02a99f52b526482166bbd27b131dfaa3b6acf6e9324667a5f942617dcc78463631fea0e08e7dc84aa401bbd51741c SHA512 fa2abd50b887f928a97f3612a53f3254e08be476d5e4ca699bc25143bb13f4f83d69f9040c937710cb70399e2e7a4de8ca86d412173d9bd32257313bb4d12d74
diff --git a/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch
deleted file mode 100644
index c2cbdb1b003b..000000000000
--- a/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/config/sc_include.m4
-+++ b/config/sc_include.m4
-@@ -281,7 +281,7 @@ AC_DEFUN([SC_CHECK_LIBRARIES],
- [
- SC_REQUIRE_LIB([m], [fabs])
- SC_CHECK_LIB([z], [adler32_combine], [ZLIB], [$1])
--SC_CHECK_LIB([lua52 lua5.2 lua51 lua5.1 lua lua5], [lua_createtable],
-+SC_CHECK_LIB([$LUA_IMPL], [lua_createtable],
- 	     [LUA], [$1])
- SC_CHECK_BLAS_LAPACK([$1])
- SC_BUILTIN_ALL_PREFIX([$1])
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,7 +74,7 @@ echo "| Checking headers"
- echo "o---------------------------------------"
- 
- AC_CHECK_HEADERS([execinfo.h signal.h sys/time.h sys/types.h time.h])
--AC_CHECK_HEADERS([lua.h lua5.1/lua.h lua5.2/lua.h lua5.3/lua.h])
-+AC_CHECK_HEADERS([$LUA_IMPL/lua.h])
- 
- echo "o---------------------------------------"
- echo "| Checking functions"
---- a/src/sc_lua.h
-+++ b/src/sc_lua.h
-@@ -30,23 +30,9 @@
- 
- SC_EXTERN_C_BEGIN;
- 
--#ifdef SC_HAVE_LUA5_2_LUA_H
--#include <lua5.2/lua.h>
--#include <lua5.2/lualib.h>
--#include <lua5.2/lauxlib.h>
--#else
--#ifdef SC_HAVE_LUA5_1_LUA_H
--#include <lua5.1/lua.h>
--#include <lua5.1/lualib.h>
--#include <lua5.1/lauxlib.h>
--#else
--#ifdef SC_HAVE_LUA_H
--#include <lua.h>
--#include <lualib.h>
--#include <lauxlib.h>
--#endif
--#endif
--#endif
-+#include <@LUA_IMPL@/lua.h>
-+#include <@LUA_IMPL@/lualib.h>
-+#include <@LUA_IMPL@/lauxlib.h>
- 
- SC_EXTERN_C_END;
- 
diff --git a/sci-libs/libsc/libsc-2.2-r100.ebuild b/sci-libs/libsc/libsc-2.2-r100.ebuild
deleted file mode 100644
index e29a4201d39b..000000000000
--- a/sci-libs/libsc/libsc-2.2-r100.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-inherit autotools lua-single toolchain-funcs
-
-DESCRIPTION="Support for parallel scientific applications"
-HOMEPAGE="http://www.p4est.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="debug examples mpi openmp romio static-libs threads"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	romio? ( mpi )"
-
-RDEPEND="${LUA_DEPS}
-	sys-apps/util-linux
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi[romio?] )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-autoconf_lua_version.patch
-)
-
-DOCS=( AUTHORS NEWS README )
-
-AUTOTOOLS_AUTORECONF=true
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
-		tc-has-openmp || \
-			die "Please select an openmp capable compiler like gcc[openmp]"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die
-
-	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable mpi)
-		$(use_enable openmp openmp)
-		$(use_enable romio mpiio)
-		$(use_enable static-libs static)
-		$(use_enable threads pthread)
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-	)
-	econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		docinto examples
-		dodoc -r example/*
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		# Remove compiled example binaries in case of -examples:
-		rm -r "${ED}"/usr/bin || die "rm failed"
-	fi
-
-	# Remove ac files, bug #619806
-	rm -r "${ED}"/usr/share/aclocal || die "rm failed"
-
-	# Fix wrong installation paths:
-	dodir /usr/share/libsc
-	mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed"
-	rmdir "${ED}"/etc/ || die "rmdir failed"
-	mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed"
-	rmdir "${ED}"/usr/share/ini || die "rmdir failed"
-}
diff --git a/sci-libs/libsc/libsc-2.3.1-r1.ebuild b/sci-libs/libsc/libsc-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..667c713b0096
--- /dev/null
+++ b/sci-libs/libsc/libsc-2.3.1-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools lua-single toolchain-funcs
+
+DESCRIPTION="Support for parallel scientific applications"
+HOMEPAGE="http://www.p4est.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="debug examples mpi openmp romio threads"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	romio? ( mpi )"
+
+RDEPEND="
+	${LUA_DEPS}
+	sys-apps/util-linux
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi[romio?] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-autoconf_lua_version.patch
+	"${FILESDIR}"/${PN}-2.3-add_soname.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die
+
+	# Inject a version number into the build system
+	echo "${PV}" > ${S}/.tarball-version || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable debug)
+		$(use_enable mpi)
+		$(use_enable openmp openmp)
+		$(use_enable romio mpiio)
+		$(use_enable threads pthread)
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+	)
+	econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto examples
+		dodoc -r example/*
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		# Remove compiled example binaries in case of -examples:
+		rm -r "${ED}"/usr/bin || die "rm failed"
+	fi
+
+	# Remove ac files, bug #619806
+	rm -r "${ED}"/usr/share/aclocal || die "rm failed"
+
+	# Fix wrong installation paths:
+	dodir /usr/share/libsc
+	mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed"
+	rmdir "${ED}"/etc/ || die "rmdir failed"
+	mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed"
+	rmdir "${ED}"/usr/share/ini || die "rmdir failed"
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/libsc/libsc-2.3.1.ebuild b/sci-libs/libsc/libsc-2.3.1.ebuild
deleted file mode 100644
index e84c20273cf0..000000000000
--- a/sci-libs/libsc/libsc-2.3.1.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
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit autotools lua-single toolchain-funcs
-
-DESCRIPTION="Support for parallel scientific applications"
-HOMEPAGE="http://www.p4est.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="debug examples mpi openmp romio static-libs threads"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	romio? ( mpi )"
-
-RDEPEND="${LUA_DEPS}
-	sys-apps/util-linux
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi[romio?] )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-autoconf_lua_version.patch
-	"${FILESDIR}"/${PN}-2.3-add_soname.patch
-)
-
-DOCS=( AUTHORS NEWS README )
-
-AUTOTOOLS_AUTORECONF=true
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
-		tc-has-openmp || \
-			die "Please select an openmp capable compiler like gcc[openmp]"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die
-
-	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable mpi)
-		$(use_enable openmp openmp)
-		$(use_enable romio mpiio)
-		$(use_enable static-libs static)
-		$(use_enable threads pthread)
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-	)
-	econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		docinto examples
-		dodoc -r example/*
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		# Remove compiled example binaries in case of -examples:
-		rm -r "${ED}"/usr/bin || die "rm failed"
-	fi
-
-	# Remove ac files, bug #619806
-	rm -r "${ED}"/usr/share/aclocal || die "rm failed"
-
-	# Fix wrong installation paths:
-	dodir /usr/share/libsc
-	mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed"
-	rmdir "${ED}"/etc/ || die "rmdir failed"
-	mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed"
-	rmdir "${ED}"/usr/share/ini || die "rmdir failed"
-}
diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild
index b99e72325210..00143eccd873 100644
--- a/sci-libs/libsc/libsc-9999.ebuild
+++ b/sci-libs/libsc/libsc-9999.ebuild
@@ -10,11 +10,10 @@ inherit autotools lua-single toolchain-funcs
 DESCRIPTION="Support for parallel scientific applications"
 HOMEPAGE="http://www.p4est.org/"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
 	EGIT_BRANCH="develop"
-	SRC_URI=""
 else
 	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -22,34 +21,31 @@ fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="debug examples mpi openmp romio static-libs threads"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
+IUSE="debug examples mpi openmp romio threads"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
 	romio? ( mpi )"
 
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+	${LUA_DEPS}
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
 	mpi? ( virtual/mpi[romio?] )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999_20201220-autoconf_lua_version.patch
 )
 
-DOCS=( AUTHORS NEWS README )
-
-AUTOTOOLS_AUTORECONF=true
-
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
-		tc-has-openmp || \
-			die "Please select an openmp capable compiler like gcc[openmp]"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -64,11 +60,11 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
 		$(use_enable debug)
 		$(use_enable mpi)
 		$(use_enable openmp openmp)
 		$(use_enable romio mpiio)
-		$(use_enable static-libs static)
 		$(use_enable threads pthread)
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
@@ -97,4 +93,7 @@ src_install() {
 	rmdir "${ED}"/etc/ || die "rmdir failed"
 	mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed"
 	rmdir "${ED}"/usr/share/ini || die "rmdir failed"
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/orocos_kdl/Manifest b/sci-libs/orocos_kdl/Manifest
index a8c0b2ab730d..006efabe1859 100644
--- a/sci-libs/orocos_kdl/Manifest
+++ b/sci-libs/orocos_kdl/Manifest
@@ -1,6 +1,4 @@
-AUX orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch 763 BLAKE2B 2d8c88ae2261b9f8689dc9900bb93d554656135c5507246db8b6280bce20a18e932b9ec69737adf7a00e32d384784681cbe95cc5b747b85d189be5356ab606b1 SHA512 e7cba8158efcf3b7638f344d717666070a545baf8b96e52bb9a10ed11575e062806569a3c5299c4439491709ebcc2eef1113623479b641df8ea1a45190a8938f
-AUX orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch 686 BLAKE2B ad47abd10972b668a8656be08c24fc1cca356e33177b2949aa3e9cc07022bd0d8bdfaf16daa4957cb81f84a3806f0617ee464e0c6067045520ad18e8cf85aa40 SHA512 1223b4f503d8f394a0c73c91c231e96e83b241f31afcc7dfb3ae7f7b6a96e367fa294bfa9759be4e8de419f00f18a489713fe25bf1a037dedd116da314856f1b
-DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD orocos_kdl-1.4.0-r2.ebuild 1782 BLAKE2B a0788001c6eab7a3c5208776b47a6aa07ee00e71f530bd1d07134a696e94e5c101f00672faf8a9b50291ac033402f07e35cfb8f3c9cc9c349b48df2c9b7af7b2 SHA512 4130d847b169ca69a0a7ab3da52b5c2cc034eb155b78881e426557760800b20e60bdf5be353f72c0fb4ae229d7577389bdf2f2083645875bbdba94d0adbb2c9e
-EBUILD orocos_kdl-9999.ebuild 1707 BLAKE2B 0f42c6fe09c59e3e91c20aa24fc3f20bc4288e5ca321ff0b801d0ff269118d73b3848a65d7a1cce2d1ee348fc5ea0c07664a456423a8546acdabcf103cd1816f SHA512 bb290e4d6a1667aa98f9a80deea798ef3d7ca54ab8fb1315f57afbdbb9dd9f54f6d53a490f0562e02f880320092c19e7912cd69fa4b58e7b1a346ecf421405f4
+DIST orocos_kinematics_dynamics-1.5.0.tar.gz 251515 BLAKE2B 53c14354b0833867b6fd030cde91c9524b6f0537ea0d0f3977e7aeb8482030edd5723a571030e8b78e4d6d01eba38c6a8e5c49d66c49c4b1b0f2e7a3d8159c74 SHA512 5fc9c336d6ed31ad59a5bdf6ee06444cac29beae090b9026b34f35a3cb4cdf1cd6c33af621205b8d6a5201070e679531c8b5bbdeb8a91cd1d8061153b0e47e49
+EBUILD orocos_kdl-1.5.0.ebuild 1616 BLAKE2B 3b7daf7074e00e3d735e330a53b09964eeb685d3771814798e40cb75d717779e73f028d7e7bd23612f8cb106c04b6e3d429f3c1fbea99a96daf55d3c3e386484 SHA512 ea14a1fa34bb8ff8ff83529f5e5990a5829cfcdf26382a1d97fbde7367cd4c6c0017ea368fb2e1766d055483f8c350c5957a33f77adc87f0668ec246892be8b3
+EBUILD orocos_kdl-9999.ebuild 1616 BLAKE2B 3b7daf7074e00e3d735e330a53b09964eeb685d3771814798e40cb75d717779e73f028d7e7bd23612f8cb106c04b6e3d429f3c1fbea99a96daf55d3c3e386484 SHA512 ea14a1fa34bb8ff8ff83529f5e5990a5829cfcdf26382a1d97fbde7367cd4c6c0017ea368fb2e1766d055483f8c350c5957a33f77adc87f0668ec246892be8b3
 MISC metadata.xml 934 BLAKE2B d82ddb6554a65a4221e67f46cfc6ff218c8caff71662090cd22332bc8f77c88b54c0ed8a7ccde53f00c6ef9c7faa386a82ca4654652ed7876c84105cd4426451 SHA512 09dc8b8c362da950ea685ee6cb2d7eb3ee400f34fca286fa0bf064f3cc4338a5ad2ca8917c951211e9407122a3bd7a1f23e5d394bfed901d6f69e9caefe5eaed
diff --git a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch
deleted file mode 100644
index d3205b556284..000000000000
--- a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0001-don-t-install-kdl.tag-file.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 719735a7d36f079f63c4be06bf3118581f628562 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 3 Apr 2021 18:39:42 +0200
-Subject: [PATCH] don't install kdl.tag file
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- doc/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index dcc81b0..cc1774e 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -1,4 +1,3 @@
- 
- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" IMMEDIATE @ONLY)
- ADD_CUSTOM_TARGET(docs "doxygen" "Doxyfile")
--INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdl.tag DESTINATION share/doc/liborocos-kdl/ OPTIONAL) # only installs if found.
--- 
-2.31.1
-
diff --git a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch b/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch
deleted file mode 100644
index fe7eb126f84b..000000000000
--- a/sci-libs/orocos_kdl/files/orocos_kdl-1.4.0-0002-add-LIB_SUFFIX-in-pkg-config-file.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 54e66339b734639dc42b63b65a8a4b100f2549c3 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 3 Apr 2021 18:46:42 +0200
-Subject: [PATCH] add LIB_SUFFIX in pkg-config file
-
-Add the LIB_SUFFIX suffix to the libdir variable
-in the kdl.pc.in file.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- src/kdl.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kdl.pc.in b/src/kdl.pc.in
-index 49e2ab9..1650e2e 100644
---- a/src/kdl.pc.in
-+++ b/src/kdl.pc.in
-@@ -1,5 +1,5 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--libdir=${prefix}/lib
-+libdir=${prefix}/lib@LIB_SUFFIX@
- includedir=${prefix}/include
- 
- Name: orocos-kdl
--- 
-2.31.1
-
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild
deleted file mode 100644
index 175baf488d17..000000000000
--- a/sci-libs/orocos_kdl/orocos_kdl-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Kinematics and Dynamics Library (KDL)"
-HOMEPAGE="https://www.orocos.org/kdl"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S="${WORKDIR}/orocos_kinematics_dynamics-${PV}/${PN}"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/14"
-IUSE="doc examples models test"
-REQUIRED_USE="examples? ( models )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-cpp/eigen:3"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-don-t-install-kdl.tag-file.patch
-	"${FILESDIR}"/${P}-0002-add-LIB_SUFFIX-in-pkg-config-file.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_MODELS=$(usex models ON OFF)
-		-DENABLE_EXAMPLES=$(usex examples)
-		-DENABLE_TESTS=$(usex test)
-	)
-	if use examples; then
-		mycmakeargs+=(
-			-DBUILD_MODELS_DEMO=ON
-		)
-	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_build docs
-		rm "${BUILD_DIR}/doc/kdl.tag" || die
-	fi
-}
-
-src_test() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	eninja check
-	popd > /dev/null || die
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}/doc/api/html/." )
-	cmake_src_install
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		docinto examples
-		dodoc -r "${S}"/examples/.
-	fi
-
-	# Need to have package.xml in our custom gentoo path
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-}
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild
new file mode 100644
index 000000000000..bb20a06d821c
--- /dev/null
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.5.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Kinematics and Dynamics Library (KDL)"
+HOMEPAGE="https://www.orocos.org/kdl"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/orocos_kinematics_dynamics-${PV}/${PN}"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/15"
+IUSE="doc examples models test"
+REQUIRED_USE="examples? ( models )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-cpp/eigen:3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+	test? ( dev-util/cppunit )
+"
+
+src_configure() {
+	# disable catkin support
+	sed -e 's/find_package(catkin/find_package(NoTcatkin/' -i CMakeLists.txt || die
+	local mycmakeargs=(
+		-DBUILD_MODELS=$(usex models ON OFF)
+		-DENABLE_EXAMPLES=$(usex examples)
+		-DENABLE_TESTS=$(usex test)
+	)
+	if use examples; then
+		mycmakeargs+=(
+			-DBUILD_MODELS_DEMO=ON
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_build docs
+		rm "${BUILD_DIR}/doc/kdl.tag" || die
+	fi
+}
+
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	eninja check
+	popd > /dev/null || die
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/doc/api/html/." )
+	cmake_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc -r "${S}"/examples/.
+	fi
+}
diff --git a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
index d50c631a39c3..bb20a06d821c 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 LICENSE="LGPL-2.1"
-SLOT="0/14"
+SLOT="0/15"
 IUSE="doc examples models test"
 REQUIRED_USE="examples? ( models )"
 RESTRICT="!test? ( test )"
@@ -31,11 +31,9 @@ BDEPEND="
 	test? ( dev-util/cppunit )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-0001-don-t-install-kdl.tag-file.patch
-)
-
 src_configure() {
+	# disable catkin support
+	sed -e 's/find_package(catkin/find_package(NoTcatkin/' -i CMakeLists.txt || die
 	local mycmakeargs=(
 		-DBUILD_MODELS=$(usex models ON OFF)
 		-DENABLE_EXAMPLES=$(usex examples)
@@ -72,8 +70,4 @@ src_install() {
 		docinto examples
 		dodoc -r "${S}"/examples/.
 	fi
-
-	# Need to have package.xml in our custom gentoo path
-	insinto /usr/share/ros_packages/${PN}
-	doins "${S}/package.xml"
 }
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 9bf258f97022..ecc16a921e1d 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,10 +1,7 @@
 AUX p4est-2.3-add_soname.patch 559 BLAKE2B 3a4037ef9f9343aa9ecadb4f5406821152f0d7c9d2fa461a5fa9c74a8a0088101fe6d374c38c52e489e6a1aee818733ed08f57d13f0d50497bc9edfd8f14a538 SHA512 2b16c58c2b897abe31f26cd128eb99716961369e3c41a411ac79b8a31f51864bd346a46d8c78e6ed2206073555237b647346afd475c40d5012c60dae890c839a
 AUX p4est-2.3-fix_aclocal.patch 289 BLAKE2B 9a361db45d08f9355cef4d33079a88ceec2e804d772c806a078e07d0174906ca5c2f24580efb346654806abb2fc329b9c78b9cecb857c8369fb937c1b96e9a5b SHA512 848e65b78abc5cd74a9458289d7376cd7bc9667e96fa2baaefe7b64d9bcf34326a6f6ac040e1229f639708eabd3bedc52ba82444632ecbbe0dd33ebdba216ff7
-DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
 DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
-DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
 DIST p4est-2.3.1.tar.gz 2623681 BLAKE2B 426f15d27dd376b918e197adc46a8ef5555bd4765f53d7c98bc8f9b58e0a27125d38808503fd1c545e428e845635e2499ba27df22a989ed619ce264417d02908 SHA512 c691b39d140c2714a813dc45f721cf21a1e0f5d1a264a3d5733b09ec90cc3f8bcc9e5d799e41e91d2b994490c811287f8177bf6d7890ea4cd1cdfecb95cdbf23
-EBUILD p4est-2.2-r100.ebuild 2908 BLAKE2B 768a3e492a9b2dc00dba2443111e6a39cc701b113a696398f93a2b9947ca6ca8fc7fe1203c8e650e3dc122161ca55b85f91f2bded64b13bd0a60d3618d8529f8 SHA512 9ec1e876334f5cd13e148b68a30a661ce03e91cdd0f4dcd6126b044c0fd645ee4494e1e6aa03edb8f787ad10a1136f47cc636f8a44e38aafdc482a85d17a3461
-EBUILD p4est-2.3.1.ebuild 2913 BLAKE2B eed1fe198cdab40113eb84ca27cf01abf416fe3bb2e9038366855bfb8e6df0bd6a934b92bc9a654d2369917183206e5014163aedda21996fe0e459f232e7be1b SHA512 44eb74926a3bd881beecc63d74de81f62cbd3ee698ce7b482b2e0c4eaf8dea5542eb23517a534234d175bf8f8bfe30dbad9e73dff4fdde889177b526fdcac442
-EBUILD p4est-9999.ebuild 2908 BLAKE2B 25d8be9880948ec1d3f30c3e10049b89f1d05880e366b74f60e814847baa7b63f5582013f28ba41af3ab3055912c823b580f2021f55d6e91fcd79da3d811f1d5 SHA512 27dd306e9a793bdcb08c4eaab32d39facfaae784e80f2c50e0f137c9a9121d5e5304a0b432003c55c695df8bacd0e5a83265bfd8629833baad4b5af2d60c831d
+EBUILD p4est-2.3.1-r1.ebuild 2917 BLAKE2B cac667b2d40f920b9b48732ae4e503d30f391a44b080adc00545fa6eb09268aa6c36a882126a4cb78609eb4288131fbcbeee82e94b8487b8bdc9af99dacc90cc SHA512 0d2b661d46c9a0cc11b84cc941cc28c340fc5b0efbe8eab09e46fc1daef1dcbbcf099522cd2c08c890d09455151b055e92dc5cff137c78632ea7ab26ed3f91f9
+EBUILD p4est-9999.ebuild 2917 BLAKE2B cac667b2d40f920b9b48732ae4e503d30f391a44b080adc00545fa6eb09268aa6c36a882126a4cb78609eb4288131fbcbeee82e94b8487b8bdc9af99dacc90cc SHA512 0d2b661d46c9a0cc11b84cc941cc28c340fc5b0efbe8eab09e46fc1daef1dcbbcf099522cd2c08c890d09455151b055e92dc5cff137c78632ea7ab26ed3f91f9
 MISC metadata.xml 932 BLAKE2B 7125dfc51747febbc0c075085cfd92b86fdf92814a8ce104c980891ffae0eb0c1056a3d8d029fca27faaaa3df8a13e43909f4dcd3fb7bae77aa280f418e344af SHA512 65de097b1150b51b50bc5a163386cd902ad885963448a0d1f345378da56153f2881209d1f7b04a39be2c294ca80d8d59f05e2e6f3d9765c071cad15c18e843ba
diff --git a/sci-libs/p4est/p4est-2.2-r100.ebuild b/sci-libs/p4est/p4est-2.2-r100.ebuild
deleted file mode 100644
index ee878cbfc3ee..000000000000
--- a/sci-libs/p4est/p4est-2.2-r100.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-# The build system currently fails with everything newer than 1.11.
-WANT_AUTOMAKE=1.11
-
-inherit autotools lua-single toolchain-funcs
-
-DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
-HOMEPAGE="http://www.p4est.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="
-		https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-# TODO petsc
-IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	romio? ( mpi )"
-
-RDEPEND="${LUA_DEPS}
-	~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=]
-	sys-apps/util-linux
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi[romio=] )"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/automake:1.11
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
-		tc-has-openmp || \
-			die "Please select an openmp capable compiler like gcc[openmp]"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Inject libsc to get  all parts of the build system...
-	if ! [[ ${PV} = *9999* ]]; then
-		rmdir "${S}/sc" || die "rmdir failed"
-		mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
-	fi
-
-	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version
-
-	AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
-	eautoreconf
-
-	sed -i \
-		"s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \
-		"${S}"/configure || die "sed failed"
-
-	sed -i \
-		"s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
-		"${S}"/configure || die "sed failed"
-}
-
-src_configure() {
-	# avoid underlinkage
-	LDFLAGS="${LDFLAGS} -lsc"
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable mpi)
-		$(use_enable openmp)
-		$(use_enable romio mpiio)
-		$(use_enable static-libs static)
-		$(use_enable threads pthread)
-		$(use_enable vtk-binary)
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		--with-sc="${EPREFIX}/usr"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	use doc && dodoc -r doc/*
-
-	if use examples
-	then
-		docinto examples
-		dodoc -r example/*
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		# Remove compiled example binaries in case of -examples:
-		rm -r "${ED}"/usr/bin || die "rm failed"
-	fi
-
-	# Fix wrong installation paths:
-	dodir /usr/share/p4est
-	mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
-	mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
-	rmdir "${ED}"/etc/ || die "rmdir failed"
-}
diff --git a/sci-libs/p4est/p4est-2.3.1-r1.ebuild b/sci-libs/p4est/p4est-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..c7756fee11c5
--- /dev/null
+++ b/sci-libs/p4est/p4est-2.3.1-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools flag-o-matic lua-single toolchain-funcs
+
+DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
+HOMEPAGE="http://www.p4est.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="
+		https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# TODO petsc
+IUSE="debug doc examples mpi openmp romio threads +vtk-binary"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	romio? ( mpi )"
+
+RDEPEND="${LUA_DEPS}
+	~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=]
+	sys-apps/util-linux
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi[romio=] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-fix_aclocal.patch
+	"${FILESDIR}"/${PN}-2.3-add_soname.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Inject libsc to get  all parts of the build system...
+	if ! [[ ${PV} = *9999* ]]; then
+		rmdir "${S}/sc" || die "rmdir failed"
+		mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
+	fi
+
+	# Inject a version number into the build system
+	echo "${PV}" > ${S}/.tarball-version
+
+	AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
+	eautoreconf
+
+	sed -i \
+		"s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \
+		"${S}"/configure || die "sed failed"
+
+	sed -i \
+		"s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
+		"${S}"/configure || die "sed failed"
+}
+
+src_configure() {
+	# avoid underlinkage
+	append-libs -lsc
+
+	local myeconfargs=(
+		--disable-static
+		$(use_enable debug)
+		$(use_enable mpi)
+		$(use_enable openmp)
+		$(use_enable romio mpiio)
+		$(use_enable threads pthread)
+		$(use_enable vtk-binary)
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--with-sc="${ESYSROOT}/usr"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r doc/*
+
+	if use examples
+	then
+		docinto examples
+		dodoc -r example/*
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		# Remove compiled example binaries in case of -examples:
+		rm -r "${ED}"/usr/bin || die "rm failed"
+	fi
+
+	# Fix wrong installation paths:
+	dodir /usr/share/p4est
+	mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
+	mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
+	rmdir "${ED}"/etc/ || die "rmdir failed"
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/p4est/p4est-2.3.1.ebuild b/sci-libs/p4est/p4est-2.3.1.ebuild
deleted file mode 100644
index 597b67a136a5..000000000000
--- a/sci-libs/p4est/p4est-2.3.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit autotools lua-single toolchain-funcs
-
-DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
-HOMEPAGE="http://www.p4est.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="
-		https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-# TODO petsc
-IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	romio? ( mpi )"
-
-RDEPEND="${LUA_DEPS}
-	~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=]
-	sys-apps/util-linux
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi[romio=] )"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/automake
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-fix_aclocal.patch
-	"${FILESDIR}"/${PN}-2.3-add_soname.patch
-)
-
-DOCS=( AUTHORS NEWS README )
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
-		tc-has-openmp || \
-			die "Please select an openmp capable compiler like gcc[openmp]"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Inject libsc to get  all parts of the build system...
-	if ! [[ ${PV} = *9999* ]]; then
-		rmdir "${S}/sc" || die "rmdir failed"
-		mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
-	fi
-
-	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version
-
-	AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
-	eautoreconf
-
-	sed -i \
-		"s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \
-		"${S}"/configure || die "sed failed"
-
-	sed -i \
-		"s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
-		"${S}"/configure || die "sed failed"
-}
-
-src_configure() {
-	# avoid underlinkage
-	LDFLAGS="${LDFLAGS} -lsc"
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable mpi)
-		$(use_enable openmp)
-		$(use_enable romio mpiio)
-		$(use_enable static-libs static)
-		$(use_enable threads pthread)
-		$(use_enable vtk-binary)
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		--with-sc="${EPREFIX}/usr"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	use doc && dodoc -r doc/*
-
-	if use examples
-	then
-		docinto examples
-		dodoc -r example/*
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		# Remove compiled example binaries in case of -examples:
-		rm -r "${ED}"/usr/bin || die "rm failed"
-	fi
-
-	# Fix wrong installation paths:
-	dodir /usr/share/p4est
-	mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
-	mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
-	rmdir "${ED}"/etc/ || die "rmdir failed"
-}
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index bb4b3a864ed0..c7756fee11c5 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -5,10 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..3} )
 
-# The build system currently fails with everything newer than 1.11.
-WANT_AUTOMAKE=1.11
-
-inherit autotools lua-single toolchain-funcs
+inherit autotools flag-o-matic lua-single toolchain-funcs
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
 HOMEPAGE="http://www.p4est.org/"
@@ -29,29 +26,31 @@ LICENSE="GPL-2+"
 SLOT="0"
 
 # TODO petsc
-IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
+IUSE="debug doc examples mpi openmp romio threads +vtk-binary"
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	romio? ( mpi )"
 
 RDEPEND="${LUA_DEPS}
-	~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=]
+	~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=]
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
 	mpi? ( virtual/mpi[romio=] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DEPEND="
-	${RDEPEND}
-	sys-devel/automake:1.11
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-fix_aclocal.patch
+	"${FILESDIR}"/${PN}-2.3-add_soname.patch
+)
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
-		tc-has-openmp || \
-			die "Please select an openmp capable compiler like gcc[openmp]"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -80,19 +79,19 @@ src_prepare() {
 
 src_configure() {
 	# avoid underlinkage
-	LDFLAGS="${LDFLAGS} -lsc"
+	append-libs -lsc
 
 	local myeconfargs=(
+		--disable-static
 		$(use_enable debug)
 		$(use_enable mpi)
 		$(use_enable openmp)
 		$(use_enable romio mpiio)
-		$(use_enable static-libs static)
 		$(use_enable threads pthread)
 		$(use_enable vtk-binary)
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		--with-sc="${EPREFIX}/usr"
+		--with-sc="${ESYSROOT}/usr"
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -117,4 +116,7 @@ src_install() {
 	mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
 	mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
 	rmdir "${ED}"/etc/ || die "rmdir failed"
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 824de612114e..dec6627b2046 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,4 +1,4 @@
-DIST pcl-1.11.1.tar.gz 68515312 BLAKE2B b6e8810861ca715acd9e97ad2b7d62ba9bf18b6a5ce3f13d7e2967f994ac39c42ba08aca83e1ae2186b986e4caf065d25d80d16d2c81a33838bde29326657e7a SHA512 93dd3180443a1a26f019bfd1e34855014619b3b74326ae93806a2711dba392b1c76f2aa682cc3955c651a45ce829a0c89d1cae7cef09cdea60fcb671aefe4da2
-EBUILD pcl-1.11.1-r1.ebuild 2166 BLAKE2B 274829fa374065b8f32f834c29706dd884d312483f152f6ffaf2d0bab0d4f6533903a80a3774007f8ed703255dc5f78a47ffd478724ed98e2d78f1fa9cc24852 SHA512 ca09b24479465af55a95ab640905a94233615ad5da8a596b71bc69a71c241b542418c90aed33461ce539104f446c5a44f29f262f7e870ceb6a4dcfe17184ebef
-EBUILD pcl-9999.ebuild 2166 BLAKE2B 274829fa374065b8f32f834c29706dd884d312483f152f6ffaf2d0bab0d4f6533903a80a3774007f8ed703255dc5f78a47ffd478724ed98e2d78f1fa9cc24852 SHA512 ca09b24479465af55a95ab640905a94233615ad5da8a596b71bc69a71c241b542418c90aed33461ce539104f446c5a44f29f262f7e870ceb6a4dcfe17184ebef
+DIST pcl-1.12.0.tar.gz 68547886 BLAKE2B 1734af6fb44587cf52bf37802494fcdd7b3623f8fad6ca83ce40803912a48dc76a58263ba454678d18bc7ce46486c3053a5eed32947864db6653fd7381fada42 SHA512 ce0544fdd82bcc415f81a9c74d58e5f6da2d0e0aaa54238a2601eca90386774155f1e032e6fb55a9edbf467ffa5ebf2ad695ec652ab437b323b8c6241f81193f
+EBUILD pcl-1.12.0.ebuild 2154 BLAKE2B 40cce6d9991fbb8d1a3c83c2f93a850fa95fc146964c9875064e97d245afdcec851dca54cf57f0fd4ba62b71fbfa1e83f392dc75bd9b9133612031b41638b98e SHA512 8e4c201bfdd9dc462a50489c30aeb79949f7e5edf9e4564c65f5a57ad7f24c665020dd0a2ed02e6eeb96196667a324523a1f834779e4d5f6fda624934a78227f
+EBUILD pcl-9999.ebuild 2154 BLAKE2B 40cce6d9991fbb8d1a3c83c2f93a850fa95fc146964c9875064e97d245afdcec851dca54cf57f0fd4ba62b71fbfa1e83f392dc75bd9b9133612031b41638b98e SHA512 8e4c201bfdd9dc462a50489c30aeb79949f7e5edf9e4564c65f5a57ad7f24c665020dd0a2ed02e6eeb96196667a324523a1f834779e4d5f6fda624934a78227f
 MISC metadata.xml 1125 BLAKE2B 27e8b272d41bf690e99b28e7b9af140412e3d5641f56131c1c8ece113262f3222444a487a3e6a050fcf7fb8c8c404f284bc731780fa557d56241e0e0ad18613f SHA512 d5676bf63401993065215538dd0725f13a99251117e7e61cf9614ea765eb0b9388a8866aa74fb6840dba4ead49f763070076cd328c60ab0830ff11bee827e7cf
diff --git a/sci-libs/pcl/pcl-1.11.1-r1.ebuild b/sci-libs/pcl/pcl-1.11.1-r1.ebuild
deleted file mode 100644
index 4f9bd374f66e..000000000000
--- a/sci-libs/pcl/pcl-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-HOMEPAGE="https://pointclouds.org/"
-DESCRIPTION="2D/3D image and point cloud processing"
-LICENSE="BSD"
-SLOT="0/1.11"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sci-libs/flann-1.7.1
-	dev-libs/boost:=[threads(+)]
-	dev-cpp/eigen:3
-	opengl? ( virtual/opengl media-libs/freeglut )
-	openni? ( dev-libs/OpenNI )
-	openni2? ( dev-libs/OpenNI2 )
-	pcap? ( net-libs/libpcap )
-	png? ( media-libs/libpng:0= )
-	qhull? ( media-libs/qhull:= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtcore:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtopengl:5
-	)
-	usb? ( virtual/libusb:1 )
-	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-"
-DEPEND="${RDEPEND}
-	!!dev-cpp/metslib
-	test? ( >=dev-cpp/gtest-1.6.0 )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
-	virtual/pkgconfig"
-
-REQUIRED_USE="
-	openni? ( usb )
-	openni2? ( usb )
-	tutorials? ( doc )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLIB_INSTALL_DIR=$(get_libdir)"
-		"-DWITH_CUDA=$(usex cuda TRUE FALSE)"
-		"-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
-		"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
-		"-DWITH_PNG=$(usex png TRUE FALSE)"
-		"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
-		"-DWITH_QT=$(usex qt5 TRUE FALSE)"
-		"-DWITH_VTK=$(usex vtk TRUE FALSE)"
-		"-DWITH_PCAP=$(usex pcap TRUE FALSE)"
-		"-DWITH_OPENNI=$(usex openni TRUE FALSE)"
-		"-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)"
-		"-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
-		"-DWITH_DOCS=$(usex doc TRUE FALSE)"
-		"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
-		"-DBUILD_TESTS=$(usex test TRUE FALSE)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/pcl/pcl-1.12.0.ebuild b/sci-libs/pcl/pcl-1.12.0.ebuild
new file mode 100644
index 000000000000..1ab0b8e362ff
--- /dev/null
+++ b/sci-libs/pcl/pcl-1.12.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
+fi
+
+inherit ${SCM} cmake multilib
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+HOMEPAGE="https://pointclouds.org/"
+DESCRIPTION="2D/3D image and point cloud processing"
+LICENSE="BSD"
+SLOT="0/1.12"
+IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=sci-libs/flann-1.7.1
+	dev-libs/boost:=[threads(+)]
+	dev-cpp/eigen:3
+	opengl? ( virtual/opengl media-libs/freeglut )
+	openni? ( dev-libs/OpenNI )
+	openni2? ( dev-libs/OpenNI2 )
+	pcap? ( net-libs/libpcap )
+	png? ( media-libs/libpng:0= )
+	qhull? ( media-libs/qhull:= )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtcore:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtopengl:5
+	)
+	usb? ( virtual/libusb:1 )
+	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
+"
+DEPEND="${RDEPEND}
+	!!dev-cpp/metslib
+	test? ( >=dev-cpp/gtest-1.6.0 )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
+	virtual/pkgconfig"
+
+REQUIRED_USE="
+	openni? ( usb )
+	openni2? ( usb )
+	tutorials? ( doc )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DLIB_INSTALL_DIR=$(get_libdir)"
+		"-DWITH_CUDA=$(usex cuda TRUE FALSE)"
+		"-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
+		"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
+		"-DWITH_PNG=$(usex png TRUE FALSE)"
+		"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
+		"-DWITH_QT=$(usex qt5 TRUE FALSE)"
+		"-DWITH_VTK=$(usex vtk TRUE FALSE)"
+		"-DWITH_PCAP=$(usex pcap TRUE FALSE)"
+		"-DWITH_OPENNI=$(usex openni TRUE FALSE)"
+		"-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)"
+		"-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
+		"-DWITH_DOCS=$(usex doc TRUE FALSE)"
+		"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
+		"-DBUILD_TESTS=$(usex test TRUE FALSE)"
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index 4f9bd374f66e..1ab0b8e362ff 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
 fi
 
-inherit ${SCM} cmake-utils multilib
+inherit ${SCM} cmake multilib
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
@@ -22,7 +22,7 @@ fi
 HOMEPAGE="https://pointclouds.org/"
 DESCRIPTION="2D/3D image and point cloud processing"
 LICENSE="BSD"
-SLOT="0/1.11"
+SLOT="0/1.12"
 IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
 RESTRICT="!test? ( test )"
 
@@ -79,5 +79,5 @@ src_configure() {
 		"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
 		"-DBUILD_TESTS=$(usex test TRUE FALSE)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest
index 334dd41a9227..a10ef5197122 100644
--- a/sci-libs/qd/Manifest
+++ b/sci-libs/qd/Manifest
@@ -1,4 +1,17 @@
+AUX 0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch 929 BLAKE2B 35e344c408d6ebe01760a421024e3cf8e0b0fd051ff5ab7992a8fe672e2066277001a1725dc9e6a1183620688bb38791c79313a371409ff6a59de176da7770b8 SHA512 fdb8561244582a63bfa356c8aae0f3bdc91d2e9e36bb11be7c8ac7be3b7f60f1ecb4c87b8d89810fc8576eed6ae5356a9d80c13fef0aa37062fe7b127d8530fa
+AUX 0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch 1000 BLAKE2B fa8a818b6eace5ae2d1d8d1da309e65b30b272cad3b2fbcaaedcb61070eff1f1b0db3b1594ddf6471b89361983f2685d49fbddbf0f33e7826bc2ce0db226ce89 SHA512 43a50f9df2b672838bef8e437b23987ca92bc7e7624f04bf2aa919bc5938e08fc1c6243e17d3c1c9e384176ef0d2d3aa0ba34e615d2316d7369520d9246a0d1d
+AUX 0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch 1135 BLAKE2B 8e86456585f07da2060f63411e4f665285665f86f78f11a1cf2a15e0d62c1d5efa33e619bec0cab9d61f854f82dd199960e214ec3378694db6e08067cb1d7929 SHA512 2a978e3f39e7b5bb8c5cb92d88b2c4b39d82ee8061cdbdd6b76aa8cfbd6d4918fd02cef440ec931c4599f7b2833ee942ebe8b51692d92450cbfdac65a14b24b5
+AUX 0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch 4692 BLAKE2B 9275336264e44d92bd7f02eba07b8f212626d37a07474dcc38bcfb24cf35750784420292e12120102673af8b42042621437dccdbd448ecf341d7883dbba56788 SHA512 32ef4f3c6f7ced7ac074594956c9d79bc4e8ed15ddeefeb3b14eca6ad1b53578dfba52cca16b3dc515290eb80c101a1452ef69379f245160d2f693397510a0d4
+AUX 0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch 1300 BLAKE2B 51623f11f92cf43252992ffa9d52d052b1370b674132232a02e33d9af5025aa195894e37eb0403e873b2112f2491b55dcf5a498da82333b474f8ed1d0c4e544a SHA512 371d9b6f41a019e985fb9876bdddf702771d1fac86a5bc14ef346344fad183788f4ba739bea59b47b673a5ac7df0c4f8fa0dbe8e24a5295bf1d9b92a52768659
+AUX 0006-configure.ac-remove-enable-debug-flag.patch 3510 BLAKE2B d908f6a1dd47b70d2731b9b645a9c6fb713c43cdcdd22bceeba57532f891a6beb9d0aa3efe4c7e5e1daf287f5f09ecd392fe48aa92c3bc3da18d884362746186 SHA512 b2629f6d90232dd0bd26eb55d14c844e218791d832038b13aa5f4b3836ae6b54aa27c32d9dc0002b3275d6cf01928da69b26fa56390fc3261f001afa05c74cdc
+AUX 0007-config.h.in-remove-QD_DEBUG-constant.patch 840 BLAKE2B 720f9992ec61c806f39837f31f68c35173708c50c14886bc39a286f5be513f49c7b663f60587af25bdc4f851409915da31300777e477d2b22b56f51d856262b4 SHA512 fda6efc3cbc5c868007653662fd0400351f0016725b62895fe5528495e6cb77ceb027755ff08c1475786511bf7a50e6e671612fd7643e3e247c4485182af0f0e
+AUX 0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch 1697 BLAKE2B f28e848cc3a6c6c513dc98c9e7d50027446d02c6ffe070a15de3cc56c77fb253a132836ac2d0eaed37cad09cc4cabbd8779806fcd89eaa70eecca09601973851 SHA512 f78205cbcd564f79fb1a1cc1002fc5bc1429428a4da7243c3894a5c33f7082376537f9f5edf33dce0192386354ee4a54885117c15a64856dd03a9ff116ef5293
+AUX 0009-configure.ac-don-t-set-CC-to-CXX.patch 1338 BLAKE2B 5c58663a9f51c9a05b78d3bfaa2584a3af53488e1afdf7f49edb2d5374b977bbb2cb62555f23ac6ea5c8bdff5682b3581051b2e6aefc4bc48dbcca0d99a8479b SHA512 27f3111aa7160eb1028f4bb40ebb002e5b7c2bb8e51b2dc6740fc37b25673274017d3e2cfffdc1de49e65cc148ede949e2eee914765ba8580db2efb2798e9cad
+AUX 0010-configure.ac-don-t-manually-search-for-compiler-name.patch 2523 BLAKE2B df5b8c919751ae74b70158cdeb715c83d3e57efa9497a81748cfcc10e77f557eee49f69383713dfc2cdd35239b6df8125c1dccd54d73953da0fc7a72d10acb52 SHA512 481d84a28cfbbd1f5768d0324d9a3c74326871c46d2e414d52a8c742e70aedbf6461f6b7dca567c3a2683baf1782248d9d942d766af3187094db7782049ccda7
+AUX 0011-qd-config.in-remove-REQ_CXXFLAGS.patch 751 BLAKE2B 95c283128d2218cde0a9f3baf1ce43d1aadf6a4cb47be830e2ee043a61988b32c9d8b1bdf025bd67f84c2ebe37aa2d04d3d60de7fde2177cdbd6ec78fa4b2718 SHA512 c36319dab08581730c8943b77cadfa93fb36f982aa6bf774909473c7dc27fd687c45d3e876e84b5c3d5fb3b49b1f93b58ea860d273dce56df0705028d7a04bd4
+AUX 0012-configure.ac-remove-the-enable-warnings-flag.patch 1544 BLAKE2B 54c316843f90676110ff41e37ac8968de871975b0d12debb9358edc446f742c1bd8914e1c681a3ab7f4050c28f4c63cce9521b3a79de6960b1f92a6132be3616 SHA512 42180e95744a0d0b6b577afe4deba95d171ea7d14d6ff3f189ad01f78667fcf4b2f81842f47b66e6ccb020beb0da0740b7cf67989835bd8871ec3cbb4817ddfb
 AUX qd-2.3.22-fix-build-system.patch 6617 BLAKE2B 6712f53a1b46a4d1f74d45380330ff5b15b7f2216f61245d467748557f607f670fbb0d977f4e6455c93c383ef6eb466e243177d29a3227ba89cf34ec836c54d2 SHA512 e70d4b87342840fb63cab04e63ceddb790d5509f65188894cbedb077042e2dbb6e7e18a108589fb77e8ec6253ba6b70680f637ce30c62575aa4a0eb7fbed36ce
 DIST qd-2.3.22.tar.gz 1427456 BLAKE2B 628fb88b8cb105baa689380e4084cc2e327415674fcebca59721cc163e1043f39e48c1b2a2bdc68ba402d311f37e71c9e3c390a119515128e0296aa413c850d5 SHA512 2228b6ed019d1462939957d0d0f64ab2ecfa98ac5aefecf56e9dbcf0c6ed63bdd895b86019fbb0dfdbc22d047c4c2d4e42ff91ca18846b5c1bdaa1ad28a55c2b
+EBUILD qd-2.3.22-r1.ebuild 1835 BLAKE2B b0d5760fd7d5254cff90ccc55bc32e7f6835e4528a1d0bf68a4f85c391f4afc2c297be7090c4f7275bb9366742b9914b1d87721e7b44377188cc751b11fa2a00 SHA512 56b3c7c80523528a5c474b260abe5405a6309f3704332321fb3e0dd877f4b55540dabfa81202deb0dcaf27f4ca6924d7e06d02f92c94f5042275a2f5e626f95a
 EBUILD qd-2.3.22.ebuild 1100 BLAKE2B 50c55e5d7b4bb1d1e8c0298619aad3ec1d7ba65084dd87f59105cd2be3a4e940ab71e03ecdbb3e3fd842d9604fc84df1c4c5b8ed30a9d5c8a1508be364aa7f5f SHA512 f86a94765cd174ec9d2573d79cb39e94c381d4d752ca13ea47d805336381284dd6382695c375e589899f627cf9bf2fb5b66688f82f598dcd3c5b9dd1461bac95
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/qd/files/0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch b/sci-libs/qd/files/0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch
new file mode 100644
index 000000000000..4fe4d49fa92b
--- /dev/null
+++ b/sci-libs/qd/files/0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch
@@ -0,0 +1,31 @@
+From a05e1577085507266908f40ff8e5246e10eb72d1 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 4 Aug 2021 18:29:45 -0400
+Subject: [PATCH 01/12] configure.ac: update QD_PATCH_VERSION to 2.3.22.
+
+Autotools currently thinks that this is version 2.3.12, as can be seen
+when running
+
+  $ ./configure
+  configuring qd 2.3.12...
+
+We update QD_PATCH_VERSION within configure.ac to fix that.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2ca10c9..7485936 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,6 +1,6 @@
+ #                                               -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+-define([QD_PATCH_VERSION], 12)
++define([QD_PATCH_VERSION], 22)
+ AC_PREREQ(2.60)
+ AC_INIT(qd, 2.3.QD_PATCH_VERSION, dhbailey@lbl.gov)
+ AC_CONFIG_SRCDIR([src/qd_real.cpp])
+-- 
+2.31.1
+
diff --git a/sci-libs/qd/files/0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch b/sci-libs/qd/files/0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch
new file mode 100644
index 000000000000..956feb275117
--- /dev/null
+++ b/sci-libs/qd/files/0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch
@@ -0,0 +1,34 @@
+From 0641c0b9dd87bfbef6a7b6e77cf4b264e3fa84d7 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 4 Aug 2021 18:32:21 -0400
+Subject: [PATCH 02/12] configure.ac: replace AM_CONFIG_HEADER with
+ AC_CONFIG_HEADERS.
+
+The AM_CONFIG_HEADER macro is obsolete, as evidenced by warnings like,
+
+  configure.ac:21: warning: 'AM_CONFIG_HEADER': this macro is obsolete.
+  configure.ac:21: You should use the 'AC_CONFIG_HEADERS' macro instead.
+
+This commit uses the suggested replacement.
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7485936..7b52a9e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,8 +18,8 @@ echo "configuring $PACKAGE $VERSION..."
+ 
+ AC_CONFIG_AUX_DIR(config)
+ AM_INIT_AUTOMAKE([nostdinc foreign])
+-AM_CONFIG_HEADER([config.h])
+-AM_CONFIG_HEADER([include/qd/qd_config.h])
++AC_CONFIG_HEADERS([config.h])
++AC_CONFIG_HEADERS([include/qd/qd_config.h])
+ 
+ AC_CANONICAL_HOST
+ 
+-- 
+2.31.1
+
diff --git a/sci-libs/qd/files/0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch b/sci-libs/qd/files/0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch
new file mode 100644
index 000000000000..e436c04716db
--- /dev/null
+++ b/sci-libs/qd/files/0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch
@@ -0,0 +1,37 @@
+From a6ba0059c80849ef349b9d02e5972f89fcd59793 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 4 Aug 2021 18:40:26 -0400
+Subject: [PATCH 03/12] configure.ac: replace AC_PROG_LIBTOOL with LT_INIT.
+
+The AC_PROG_LIBTOOL macro is obsolete, according to modern versions of
+autoconf:
+
+  configure.ac:316: warning: The macro `AC_PROG_LIBTOOL' is obsolete.
+  configure.ac:316: You should run autoupdate.
+
+Running autoupdate replaces it with a call to LT_INIT, which is what
+this commit does too. We have also removed a call AC_DISABLE_SHARED,
+which no longer affects anything; its removal is "harmless" since, at
+worst, it will cause some people to build shared libraries that they
+do not need.
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7b52a9e..31b32f5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -312,8 +312,7 @@ AC_SUBST(FFLAGS, $FCFLAGS)
+ AC_CHECK_LIB(m,sqrt)
+ 
+ # libtool stuff
+-AC_DISABLE_SHARED
+-AC_PROG_LIBTOOL
++LT_INIT
+ 
+ # Output
+ AC_CONFIG_FILES([Makefile config/Makefile src/Makefile include/Makefile 
+-- 
+2.31.1
+
diff --git a/sci-libs/qd/files/0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch b/sci-libs/qd/files/0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch
new file mode 100644
index 000000000000..aad1936b7017
--- /dev/null
+++ b/sci-libs/qd/files/0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch
@@ -0,0 +1,100 @@
+From 829c868c9655fa7dfd4a64a42476fe1eddadc792 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 4 Aug 2021 18:47:12 -0400
+Subject: [PATCH 04/12] configure.ac: fix syntax of all AC_ARG_ENABLE calls.
+
+Currently, we find AC_ARG_ENABLE being called like
+
+  AC_ARG_ENABLE(enable_inline, ...
+
+where the corresponding argument should be --enable-inline. The
+autoconf documentation however suggests that this should be
+
+  AC_ARG_ENABLE([inline], ...
+
+so we update all of these calls accordingly. In the process, we update
+all of the corresponding AC_HELP_STRING instances, since that macro
+has been superseded by AS_HELP_STRING.
+---
+ configure.ac | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 31b32f5..1e91cd1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,7 +25,7 @@ AC_CANONICAL_HOST
+ 
+ # Checks for arguments
+ # --enable-inline
+-AC_ARG_ENABLE(enable_inline, AC_HELP_STRING(--enable-inline, [inline commonly used functions.  [[default=yes]]]))
++AC_ARG_ENABLE([inline], AS_HELP_STRING(--enable-inline, [inline commonly used functions.  [[default=yes]]]))
+ AC_MSG_CHECKING([if commonly used function is to be inlined])
+ if test "$enable_inline" != "no"; then
+   enable_inline="yes"
+@@ -34,7 +34,7 @@ fi
+ AC_MSG_RESULT($enable_inline)
+ 
+ # --enable-ieee-add
+-AC_ARG_ENABLE(enable_ieee_add, AC_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound.  [[default=no]]]))
++AC_ARG_ENABLE([ieee-add], AS_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound.  [[default=no]]]))
+ AC_MSG_CHECKING([if addition with IEEE-style error bound is to be used])
+ if test "$enable_ieee_add" = "yes"; then
+   AC_DEFINE([QD_IEEE_ADD], [1], [Define to 1 to use additions with IEEE-style error bounds.])
+@@ -44,7 +44,7 @@ fi
+ AC_MSG_RESULT($enable_ieee_add)
+ 
+ # --enable-sloppy-mul
+-AC_ARG_ENABLE(enable_sloppy_mul, AC_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication.  [[default=yes]]]))
++AC_ARG_ENABLE([sloppy-mul], AS_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication.  [[default=yes]]]))
+ AC_MSG_CHECKING([if sloppy multiplication is to be used])
+ if test "$enable_sloppy_mul" != "no"; then
+   enable_sloppy_mul="yes"
+@@ -53,7 +53,7 @@ fi
+ AC_MSG_RESULT($enable_sloppy_mul)
+ 
+ # --enable-sloppy-div
+-AC_ARG_ENABLE(enable_sloppy_div, AC_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division.  [[default=yes]]]))
++AC_ARG_ENABLE([sloppy-div], AS_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division.  [[default=yes]]]))
+ AC_MSG_CHECKING([if sloppy division is to be used])
+ if test "$enable_sloppy_div" != "no"; then
+   enable_sloppy_div="yes"
+@@ -63,7 +63,7 @@ AC_MSG_RESULT($enable_sloppy_div)
+ 
+ 
+ # --enable-debug
+-AC_ARG_ENABLE(enable_debug, AC_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
++AC_ARG_ENABLE([debug], AS_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
+ AC_MSG_CHECKING([if debugging code is to be enabled])
+ if test "$enable_debug" = "yes"; then
+   AC_DEFINE([QD_DEBUG], [1], [Define to 1 to enable debugging code.])
+@@ -73,7 +73,7 @@ fi
+ AC_MSG_RESULT($enable_debug)
+ 
+ # --enable-warnings
+-AC_ARG_ENABLE(enable_warnings, AC_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
++AC_ARG_ENABLE([warnings], AS_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
+ AC_MSG_CHECKING([if compiler warnings is to be enabled])
+ if test "$enable_warnings" != "yes"; then
+   enable_warnings="no"
+@@ -149,7 +149,7 @@ if test "$enable_debug" = "yes"; then
+ fi
+ 
+ # --enable-fma
+-AC_ARG_ENABLE(enable_fma, AC_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
++AC_ARG_ENABLE([fma], AS_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
+ if test "x$enable_fma" = "x"; then
+   enable_fma="auto"
+ fi
+@@ -248,7 +248,7 @@ if test "$FCFLAGS" = ""; then
+     FCFLAGS="-O2"
+   fi
+ fi
+-AC_ARG_ENABLE(enable_fortran, AC_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
++AC_ARG_ENABLE([fortran], AS_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
+ if test "$enable_fortran" != "no"; then
+   AC_LANG_PUSH(Fortran)
+   AC_PROG_FC([xlf95 ifort pathf95 f95 gfortran g95 pgf95 lf95 fort ifc efc pathf90 xlf90 pgf90 epcf90 xlf f90])
+-- 
+2.31.1
+
diff --git a/sci-libs/qd/files/0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch b/sci-libs/qd/files/0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch
new file mode 100644
index 000000000000..cbd58a3af5f9
--- /dev/null
+++ b/sci-libs/qd/files/0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch
@@ -0,0 +1,35 @@
+From 12e53493a0413590d9dc0a0eaeeb4dfec71a1a8c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 4 Aug 2021 18:52:30 -0400
+Subject: [PATCH 05/12] fortran/Makefile.am: fix underlinking of libqdmod and
+ libqd_f_main.
+
+The libqdmod library needs to be linked to the just-built libqd, and
+then libqd_f_main needs to be linked to both the just-built libqd and
+the just-built libqdmod. Moreover, both of them need to be linked
+against whatever is in $FCLIBS.
+
+This commit adds two "_LIBADD" lines to fortran/Makefile.am to ensure
+that this happens. Their absence most likely only causes problems when
+the user has "--as-needed" in his LDFLAGS.
+---
+ fortran/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/fortran/Makefile.am b/fortran/Makefile.am
+index 1ab54f7..7a67c08 100644
+--- a/fortran/Makefile.am
++++ b/fortran/Makefile.am
+@@ -16,7 +16,9 @@ endif
+ 
+ lib_LTLIBRARIES = libqdmod.la libqd_f_main.la
+ libqdmod_la_SOURCES = ddext.f ddmod.f qdext.f qdmod.f f_dd.cpp f_qd.cpp
++libqdmod_la_LIBADD = $(top_builddir)/src/libqd.la $(FCLIBS)
+ libqd_f_main_la_SOURCES = main.cpp
++libqd_f_main_la_LIBADD = $(top_builddir)/src/libqd.la libqdmod.la $(FCLIBS)
+ ddmod.lo: $(DDEXT) ddext.lo
+ qdmod.lo: ddmod.lo $(DDMOD) qdext.lo
+ $(QDMOD): qdmod.lo $(DDMOD)
+-- 
+2.31.1
+
diff --git a/sci-libs/qd/files/0006-configure.ac-remove-enable-debug-flag.patch b/sci-libs/qd/files/0006-configure.ac-remove-enable-debug-flag.patch
new file mode 100644
index 000000000000..151ec930e5aa
--- /dev/null
+++ b/sci-libs/qd/files/0006-configure.ac-remove-enable-debug-flag.patch
@@ -0,0 +1,102 @@
+From 6aac051631b20f5cde990fb3eda8dae85ff29666 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 4 Aug 2021 19:01:17 -0400
+Subject: [PATCH 06/12] configure.ac: remove --enable-debug flag.
+
+The --enable-debug flag only does two things at the moment:
+
+  1. It adds "-O" (as opposed to "-O2") to your CXXFLAGS and FCFLAGS.
+  2. It adds "-g" to your CXXFLAGS and FCFLAGS.
+
+When using gcc and gfortran, this is a convenient way to enable those
+debugging flags. However, those options are not guaranteed to be
+supported by other compilers. In the interest of simplicity and
+portability, this commit simply removes the flag.
+
+It would of course be possible to compile two test programs with
+CXXFLAGS="-g -O" and FCFLAGS="-g -O" to determine whether or not those
+flags are supported. That would solve half of the problem, but would
+be a no-op (that is, it would not enable any debugging features) on
+systems where the flags are not supported. That problem is more
+difficult to solve, and hints that it's best to leave specific
+compiler flags out of the build system whenever possible.
+---
+ configure.ac | 30 ++----------------------------
+ 1 file changed, 2 insertions(+), 28 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1e91cd1..108e58a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,16 +62,6 @@ fi
+ AC_MSG_RESULT($enable_sloppy_div)
+ 
+ 
+-# --enable-debug
+-AC_ARG_ENABLE([debug], AS_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
+-AC_MSG_CHECKING([if debugging code is to be enabled])
+-if test "$enable_debug" = "yes"; then
+-  AC_DEFINE([QD_DEBUG], [1], [Define to 1 to enable debugging code.])
+-else
+-  enable_debug="no"
+-fi
+-AC_MSG_RESULT($enable_debug)
+-
+ # --enable-warnings
+ AC_ARG_ENABLE([warnings], AS_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
+ AC_MSG_CHECKING([if compiler warnings is to be enabled])
+@@ -84,11 +74,7 @@ AC_MSG_RESULT($enable_warnings)
+ # Checks for programs.
+ AC_LANG(C++)
+ if test "$CXXFLAGS" = ""; then
+-  if test "$enable_debug" = "yes"; then
+-    CXXFLAGS="-O"
+-  else
+-    CXXFLAGS="-O2"
+-  fi
++  CXXFLAGS="-O2"
+ fi
+ 
+ # Set up compiler search list.  DUe to possible case insensitive filesystems, 
+@@ -144,10 +130,6 @@ if test "$enable_warnings" = "yes"; then
+   fi
+ fi
+ 
+-if test "$enable_debug" = "yes"; then
+-  CXXFLAGS="$CXXFLAGS -g"
+-fi
+-
+ # --enable-fma
+ AC_ARG_ENABLE([fma], AS_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
+ if test "x$enable_fma" = "x"; then
+@@ -242,11 +224,7 @@ AC_DEFINE([QD_HAVE_STD], [1], [Define to 1 if your compiler have the C++ standar
+ 
+ # Check for fortran-90 compiler
+ if test "$FCFLAGS" = ""; then
+-  if test "$enable_debug" = "yes"; then
+-    FCFLAGS="-O"
+-  else
+-    FCFLAGS="-O2"
+-  fi
++  FCFLAGS="-O2"
+ fi
+ AC_ARG_ENABLE([fortran], AS_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
+ if test "$enable_fortran" != "no"; then
+@@ -296,14 +274,10 @@ if test "$enable_fortran" != "no"; then
+   fi
+   AC_SUBST(REQ_FCFLAGS)
+   FCFLAGS="$FCFLAGS $REQ_FCFLAGS"
+-  if test "$enable_debug" = "yes"; then
+-    FCFLAGS="$FCFLAGS -g"
+-  fi
+   AC_LANG_POP(Fortran)
+ fi
+ AM_CONDITIONAL(UPCASE_MODULE, [test "$module_case" = "uppercase"])
+ AM_CONDITIONAL(HAVE_FORTRAN, [test "$enable_fortran" = "yes"])
+-AM_CONDITIONAL(QD_DEBUG, [test "$enable_debug" = "yes"])
+ 
+ AC_SUBST(F77, $FC)
+ AC_SUBST(FFLAGS, $FCFLAGS)
+-- 
+2.31.1
+
diff --git a/sci-libs/qd/files/0007-config.h.in-remove-QD_DEBUG-constant.patch b/sci-libs/qd/files/0007-config.h.in-remove-QD_DEBUG-constant.patch
new file mode 100644
index 000000000000..f3538b4953e6
--- /dev/null
+++ b/sci-libs/qd/files/0007-config.h.in-remove-QD_DEBUG-constant.patch
@@ -0,0 +1,29 @@
+From 0e7e6933467c76f97c4c1233558c3e1f8f17b52e Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 4 Aug 2021 19:08:36 -0400
+Subject: [PATCH 07/12] config.h.in: remove QD_DEBUG constant.
+
+Having removed the --enable-debug flag from the configure script in an
+earlier commit, the constant QD_DEBUG will never be defined (or used,
+as it happens) in config.h. We remove it too.
+---
+ config.h.in | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/config.h.in b/config.h.in
+index a08fd0e..dcb4272 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -112,9 +112,6 @@
+ /* Define this macro to be the copysign(x, y) function. */
+ #undef QD_COPYSIGN
+ 
+-/* Define to 1 to enable debugging code. */
+-#undef QD_DEBUG
+-
+ /* If fused multiply-add is available, define correct macro for using it. */
+ #undef QD_FMA
+ 
+-- 
+2.31.1
+
diff --git a/sci-libs/qd/files/0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch b/sci-libs/qd/files/0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch
new file mode 100644
index 000000000000..5f560a816aec
--- /dev/null
+++ b/sci-libs/qd/files/0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch
@@ -0,0 +1,47 @@
+From fc272f5407e10e84dc1d3e0013bc6d43ecedc5db Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 4 Aug 2021 19:10:34 -0400
+Subject: [PATCH 08/12] configure.ac: don't assume that "-O2" is a valid
+ compiler flag.
+
+Our configure script presently adds "-O2" to both CXXFLAGS and FCFLAGS
+when those variables are empty. If using gcc and gfortran, this
+enables some safe optimizations, but no checks are performed to ensure
+that the compiler actually understands "-O2". While we could compile
+some test programs to check, it may be simplest to leave the compiler
+flags up to the person (the user) who chooses the compilers themselves.
+
+Support for --enable-debug was removed in a recent commit for similar
+reasons.
+---
+ configure.ac | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 108e58a..823fa9e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -73,9 +73,6 @@ AC_MSG_RESULT($enable_warnings)
+ 
+ # Checks for programs.
+ AC_LANG(C++)
+-if test "$CXXFLAGS" = ""; then
+-  CXXFLAGS="-O2"
+-fi
+ 
+ # Set up compiler search list.  DUe to possible case insensitive filesystems, 
+ # Cygwin and Apple systems sometimes gets confused between cc and CC.
+@@ -223,9 +220,7 @@ AC_DEFINE([QD_API], [], [Any special symbols needed for exporting APIs.])
+ AC_DEFINE([QD_HAVE_STD], [1], [Define to 1 if your compiler have the C++ standard include files.])
+ 
+ # Check for fortran-90 compiler
+-if test "$FCFLAGS" = ""; then
+-  FCFLAGS="-O2"
+-fi
++
+ AC_ARG_ENABLE([fortran], AS_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
+ if test "$enable_fortran" != "no"; then
+   AC_LANG_PUSH(Fortran)
+-- 
+2.31.1
+
diff --git a/sci-libs/qd/files/0009-configure.ac-don-t-set-CC-to-CXX.patch b/sci-libs/qd/files/0009-configure.ac-don-t-set-CC-to-CXX.patch
new file mode 100644
index 000000000000..14269ce2d75a
--- /dev/null
+++ b/sci-libs/qd/files/0009-configure.ac-don-t-set-CC-to-CXX.patch
@@ -0,0 +1,46 @@
+From eff1594d04f140d9e0a4c423a0685481a612c8ca Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 4 Aug 2021 19:15:44 -0400
+Subject: [PATCH 09/12] configure.ac: don't set $CC to $CXX.
+
+The build system currently sets $CC to whatever $CXX that the
+configure script is able to find. This was harmless until now because
+C++ is a superset of C, so the C++ compiler should be able to compile
+any C code. But in the recently-released autoconf-2.71, the test
+program infrastructure no longer emits the
+
+  #ifdef __cplusplus
+  extern "C"
+  #endif
+
+in the same place it used to, which is breaking the test for
+name-mangling in the AC_FC_WRAPPERS macro. The macro thinks that it's
+compiling C code, but using a compiler that expects C++. While this may
+be fixable within autoconf, letting AC_PROG_CC detect the C compiler
+separately is both morally correct in this case and happens to solve the
+issue anyway.
+
+This fixes a build issue that was reported on Gentoo linux.
+
+Gentoo-bug: https://bugs.gentoo.org/775215
+---
+ configure.ac | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 823fa9e..a657e8f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -84,9 +84,6 @@ case $host in
+ esac
+ 
+ AC_PROG_CXX($cxx_list)
+-if test "$CC" = ""; then
+-  CC="$CXX";
+-fi
+ AC_PROG_CC
+ 
+ 
+-- 
+2.31.1
+
diff --git a/sci-libs/qd/files/0010-configure.ac-don-t-manually-search-for-compiler-name.patch b/sci-libs/qd/files/0010-configure.ac-don-t-manually-search-for-compiler-name.patch
new file mode 100644
index 000000000000..e8bef28db329
--- /dev/null
+++ b/sci-libs/qd/files/0010-configure.ac-don-t-manually-search-for-compiler-name.patch
@@ -0,0 +1,81 @@
+From 18d508793abbfc4045af7c7c91f6d71bb5bb7ef1 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 4 Aug 2021 19:31:36 -0400
+Subject: [PATCH 10/12] configure.ac: don't manually search for compiler
+ names/flags.
+
+The AC_PROG_CXX macro is generally capable of finding the best C++
+compiler on the system these days, including the flags it needs.  This
+commit removes the hard-coded list of C++ compilers, and the manual
+computation of REQ_CXXFLAGS based on the name of the compiler.
+
+This serves another purpose: the qd-config program is capable of
+outputting an appropriate "-I" flag to allow consumers to use libqd
+when it is installed in a nonstandard location. At the moment, however,
+that "-I" flag is accompanied by whatever other REQ_CXXFLAGS were
+computed -- and many of those flags are invalid in the other context.
+By eliminating REQ_CXXFLAGS, we solve that problem too.
+---
+ configure.ac | 43 +------------------------------------------
+ 1 file changed, 1 insertion(+), 42 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a657e8f..5ac7079 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -73,51 +73,10 @@ AC_MSG_RESULT($enable_warnings)
+ 
+ # Checks for programs.
+ AC_LANG(C++)
+-
+-# Set up compiler search list.  DUe to possible case insensitive filesystems, 
+-# Cygwin and Apple systems sometimes gets confused between cc and CC.
+-# Try to use vendor compilers first, as they are often the fastest.
+-case $host in 
+-  *cygwin* | *mingw* ) cxx_list="" ;;
+-  *apple* ) cxx_list="xlC_r xlC icpc pathCC c++ g++ gpp" ;;
+-  * ) cxx_list="xlC_r xlC icpc pathCC pgCC cxx aCC CC cc++ FCC KCC RCC c++ g++ gpp" ;;
+-esac
+-
+-AC_PROG_CXX($cxx_list)
++AC_PROG_CXX
+ AC_PROG_CC
+ 
+ 
+-CXX_PROG_NAME=`basename $CXX`
+-case $host in
+-  powerpc*-*-*)
+-    case "$CXX_PROG_NAME" in
+-      xlC*) 
+-        REQ_CXXFLAGS="$REQ_CXXFLAGS -qstrict"
+-      ;;
+-    esac
+-  ;;
+-  i?86-*-* | k?*-*-* | athlon-*-* | ia64-*-* | x86_64-*-*)
+-    case "$CXX_PROG_NAME" in
+-      icc|icpc|ecc)
+-        REQ_CXXFLAGS="$REQ_CXXFLAGS -mp"
+-        if test "$enable_warnings" = "yes"; then
+-          CXXFLAGS="$CXXFLAGS -wd1572 -wd981 -wd1418 -wd1419"
+-        fi
+-      ;;
+-    esac
+-  ;;
+-  alpha*-*-*)
+-    case "$CXX_PROG_NAME" in
+-      cxx) 
+-        CXXFLAGS="$CXXFLAGS -std strict_ansi -tweak"
+-      ;;
+-    esac
+-  ;;
+-esac
+-
+-AC_SUBST(REQ_CXXFLAGS)
+-CXXFLAGS="$CXXFLAGS $REQ_CXXFLAGS"
+-
+ if test "$enable_warnings" = "yes"; then
+   if test "$GCC" = "yes"; then
+     CXXFLAGS="$CXXFLAGS -Wall"
+-- 
+2.31.1
+
diff --git a/sci-libs/qd/files/0011-qd-config.in-remove-REQ_CXXFLAGS.patch b/sci-libs/qd/files/0011-qd-config.in-remove-REQ_CXXFLAGS.patch
new file mode 100644
index 000000000000..7c36b768d6e9
--- /dev/null
+++ b/sci-libs/qd/files/0011-qd-config.in-remove-REQ_CXXFLAGS.patch
@@ -0,0 +1,27 @@
+From 8d9e74e71cd2c0878c85b3559eeb66ec5020a99b Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 4 Aug 2021 19:36:23 -0400
+Subject: [PATCH 11/12] qd-config.in: remove @REQ_CXXFLAGS@.
+
+We no longer compute REQ_CXXFLAGS in configure.ac, so this commit
+removes the empty variable from qd-config.in.
+---
+ qd-config.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qd-config.in b/qd-config.in
+index 3abfcb7..56bc960 100644
+--- a/qd-config.in
++++ b/qd-config.in
+@@ -14,7 +14,7 @@ builddir="@abs_top_builddir@"
+ build_CXXFLAGS="@CXXFLAGS@"
+ build_LDFLAGS="@LDFLAGS@"
+ CXX="@CXX@"
+-CXXFLAGS="-I$includedir @REQ_CXXFLAGS@"
++CXXFLAGS="-I$includedir"
+ FC="@FC@"
+ 
+ LDFLAGS="-L$libdir -lqd @LIBS@"
+-- 
+2.31.1
+
diff --git a/sci-libs/qd/files/0012-configure.ac-remove-the-enable-warnings-flag.patch b/sci-libs/qd/files/0012-configure.ac-remove-the-enable-warnings-flag.patch
new file mode 100644
index 000000000000..a7cb94077f84
--- /dev/null
+++ b/sci-libs/qd/files/0012-configure.ac-remove-the-enable-warnings-flag.patch
@@ -0,0 +1,55 @@
+From b02e5c5403b1ac88b1fd606f3c1147330c47700c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 4 Aug 2021 19:38:31 -0400
+Subject: [PATCH 12/12] configure.ac: remove the --enable-warnings flag.
+
+This flag simply adds "-Wall" to $CXXFLAGS when it is enabled and the
+value of the $GCC variable is true. Given how easy it is to run
+
+  CXXFLAGS=-Wall ./configure
+
+(which uses standard knowledge) compared to
+
+  ./configure --enable-warnings
+
+(which does not), I don't think this flag warrants the extra complexity
+in configure.ac. This commit removes the option.
+---
+ configure.ac | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5ac7079..46640e5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,27 +62,12 @@ fi
+ AC_MSG_RESULT($enable_sloppy_div)
+ 
+ 
+-# --enable-warnings
+-AC_ARG_ENABLE([warnings], AS_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
+-AC_MSG_CHECKING([if compiler warnings is to be enabled])
+-if test "$enable_warnings" != "yes"; then
+-  enable_warnings="no"
+-fi
+-AC_MSG_RESULT($enable_warnings)
+-
+-
+ # Checks for programs.
+ AC_LANG(C++)
+ AC_PROG_CXX
+ AC_PROG_CC
+ 
+ 
+-if test "$enable_warnings" = "yes"; then
+-  if test "$GCC" = "yes"; then
+-    CXXFLAGS="$CXXFLAGS -Wall"
+-  fi
+-fi
+-
+ # --enable-fma
+ AC_ARG_ENABLE([fma], AS_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
+ if test "x$enable_fma" = "x"; then
+-- 
+2.31.1
+
diff --git a/sci-libs/qd/qd-2.3.22-r1.ebuild b/sci-libs/qd/qd-2.3.22-r1.ebuild
new file mode 100644
index 000000000000..3baf812eeb53
--- /dev/null
+++ b/sci-libs/qd/qd-2.3.22-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit autotools fortran-2
+
+DESCRIPTION="Quad-double and double-double float arithmetics"
+HOMEPAGE="https://www.davidhbailey.com/dhbsoftware/"
+SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran"
+
+PATCHES=(
+	"${FILESDIR}/0001-configure.ac-update-QD_PATCH_VERSION-to-2.3.22.patch"
+	"${FILESDIR}/0002-configure.ac-replace-AM_CONFIG_HEADER-with-AC_CONFIG.patch"
+	"${FILESDIR}/0003-configure.ac-replace-AC_PROG_LIBTOOL-with-LT_INIT.patch"
+	"${FILESDIR}/0004-configure.ac-fix-syntax-of-all-AC_ARG_ENABLE-calls.patch"
+	"${FILESDIR}/0005-fortran-Makefile.am-fix-underlinking-of-libqdmod-and.patch"
+	"${FILESDIR}/0006-configure.ac-remove-enable-debug-flag.patch"
+	"${FILESDIR}/0007-config.h.in-remove-QD_DEBUG-constant.patch"
+	"${FILESDIR}/0008-configure.ac-don-t-assume-that-O2-is-a-valid-compile.patch"
+	"${FILESDIR}/0009-configure.ac-don-t-set-CC-to-CXX.patch"
+	"${FILESDIR}/0010-configure.ac-don-t-manually-search-for-compiler-name.patch"
+	"${FILESDIR}/0011-qd-config.in-remove-REQ_CXXFLAGS.patch"
+	"${FILESDIR}/0012-configure.ac-remove-the-enable-warnings-flag.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-ieee-add \
+		--disable-sloppy-mul \
+		--disable-sloppy-div \
+		--enable-inline \
+		$(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \
+		$(use_enable fortran)
+}
+
+src_install() {
+	default
+
+	dosym qd_real.h /usr/include/qd/qd.h
+	dosym dd_real.h /usr/include/qd/dd.h
+
+	if ! use doc; then
+		rm "${ED}"/usr/share/doc/${PF}/*.pdf || die
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 338a5d4c5f60..3a54a8235e24 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,5 +1,4 @@
-AUX pcl.patch 1093 BLAKE2B 16faab539f13f54db1518babe02d208b438d984fd462098ac4c1babc9b6f509e14b307c58f59e66a177e66bdaadd8ccc3e509aac9da4c207104f0a967e790843 SHA512 5a5b97f9c028adff316ad50cf4e002b54d8603f3394d631330109c986b7184aaae6cba08e2bbcc1c21f9b97f77fbabe2fab344fa1119b47a1c24a774ed637bd6
-DIST rtabmap-0.20.3.tar.gz 20008545 BLAKE2B d50a66034905243473d26f66a09f1e1408477908cca9337d77227d8e38ba6b571d5720a5391495903cd784742dd11ccaa035b2ed03568c9917e85c46681bdfe1 SHA512 2f8837e00f89210b270dbd863e1088d9786774a8fcf3db593efe35384251c2bb92bd97b261f823e4aee90312e30c886b42241ed22042a540091a218a2d1819f7
-EBUILD rtabmap-0.20.3.ebuild 1462 BLAKE2B c01fe814a8d4c300705bbf4116633d5e9670274cfcadda21ef38139111e35a0d37fb147800dabe36ab48bcfb1796f1ea35fad285661e4a53745c961f7dc9cb2e SHA512 aa238a9379b985357223cd9356d6effb5344a4f5c627d747207e2bca0e2cb8127a35ad5a63852cabd5b52a7461fcc41279f6416b4b03ca762968f0e1408bae38
-EBUILD rtabmap-9999.ebuild 1426 BLAKE2B 8f75d91b8b718f4aa724b9e3b3b2abd38e84760606818eb4d1d1f26958aadd7f907e0b43cad24a0f3e132e83d19efcce15960d8f9b8235d4c08976ebb0496973 SHA512 291b0a6427444d18a36aa883e83c4a42696080caea646b8e44f2236a1f74c9ec361cf5022e346c11fa621185b672c6fbfc76de5022da1908b8ef95757267feb6
+DIST rtabmap-0.20.13.tar.gz 21501493 BLAKE2B eddec6e4812cea231f88263ce136eb535bc099939a482d6fb6de0e6ab3a302c395eb5f6c824d04da8d48a7f7ad9d63b8fa313ae3c21dcada74ec89c7e8130af5 SHA512 4014ec3b7bc2edbd7f361026d5a4be9222b094e398fde68512aab37b3edcb01d47256e4931de6ea1b3bcada9ac81405946e85e774220b9cf43d14a2db6c91118
+EBUILD rtabmap-0.20.13.ebuild 1456 BLAKE2B 18d465856ee04f6f645346c3236915a9a176e90f4b1e0d8388b5283e27b1c3e9ac163d0b135f88ccbd3071b2c21e910becf19aee5225c27c89a58c4f644faa20 SHA512 8879a04f0ad734d780f9a8f54b7d78101eab47406364f5e1125e74b5d2655e948dd6003b8285e28a79cbd0ca4495e64d6c19b9d55d7ea3a8ed70ea4e936a7304
+EBUILD rtabmap-9999.ebuild 1456 BLAKE2B 18d465856ee04f6f645346c3236915a9a176e90f4b1e0d8388b5283e27b1c3e9ac163d0b135f88ccbd3071b2c21e910becf19aee5225c27c89a58c4f644faa20 SHA512 8879a04f0ad734d780f9a8f54b7d78101eab47406364f5e1125e74b5d2655e948dd6003b8285e28a79cbd0ca4495e64d6c19b9d55d7ea3a8ed70ea4e936a7304
 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81
diff --git a/sci-libs/rtabmap/files/pcl.patch b/sci-libs/rtabmap/files/pcl.patch
deleted file mode 100644
index 249d93d1c595..000000000000
--- a/sci-libs/rtabmap/files/pcl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 24052a6ebe65fb260ee1d838ca5305b12b15d928 Mon Sep 17 00:00:00 2001
-From: matlabbe <matlabbe@gmail.com>
-Date: Tue, 25 Aug 2020 10:56:30 -0400
-Subject: [PATCH] fixed pcl::getAngle3D not found error on latest pcl version
- (https://github.com/PointCloudLibrary/pcl/commit/6df3e602a72ea16657f901c9a6911d95b263ba08#diff-8e08415b9972a447d115dbca3f8fa0a1)
-
----
- corelib/src/pcl18/surface/impl/texture_mapping.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/corelib/src/pcl18/surface/impl/texture_mapping.hpp b/corelib/src/pcl18/surface/impl/texture_mapping.hpp
-index a30f5766f..fbeedb221 100644
---- a/corelib/src/pcl18/surface/impl/texture_mapping.hpp
-+++ b/corelib/src/pcl18/surface/impl/texture_mapping.hpp
-@@ -41,6 +41,7 @@
- #include <pcl/common/distances.h>
- #include <pcl18/surface/texture_mapping.h>
- #include <pcl/search/octree.h>
-+#include <pcl/common/common.h> // for getAngle3D
- 
- ///////////////////////////////////////////////////////////////////////////////////////////////
- template<typename PointInT> std::vector<Eigen::Vector2f, Eigen::aligned_allocator<Eigen::Vector2f> >
diff --git a/sci-libs/rtabmap/rtabmap-0.20.13.ebuild b/sci-libs/rtabmap/rtabmap-0.20.13.ebuild
new file mode 100644
index 000000000000..906a00d0ba74
--- /dev/null
+++ b/sci-libs/rtabmap/rtabmap-0.20.13.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
+fi
+
+inherit ${SCM} cmake multilib
+
+VER_SUFFIX=rolling
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P}-${VER_SUFFIX}"
+fi
+
+DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
+HOMEPAGE="http://introlab.github.io/rtabmap/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples ieee1394 openni2 qt5"
+
+RDEPEND="
+	media-libs/opencv:=[qt5(-)?]
+	sci-libs/pcl:=[openni,vtk,qt5(-)?]
+	sci-libs/vtk:=[qt5(-)?]
+	sys-libs/zlib
+	sci-libs/octomap:=
+	dev-libs/boost:=
+	ieee1394? ( media-libs/libdc1394:2= )
+	openni2? ( dev-libs/OpenNI2 )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DWITH_QT=$(usex qt5 ON OFF)"
+		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
+		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
+		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# Needed since we force ros crawling to be done only in
+	# /usr/share/ros_packages/
+	insinto /usr/share/ros_packages/${PN}
+	doins "${ED}/usr/share/${PN}/package.xml"
+}
diff --git a/sci-libs/rtabmap/rtabmap-0.20.3.ebuild b/sci-libs/rtabmap/rtabmap-0.20.3.ebuild
deleted file mode 100644
index 38dc4acd24e8..000000000000
--- a/sci-libs/rtabmap/rtabmap-0.20.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P}"
-fi
-
-DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
-HOMEPAGE="http://introlab.github.io/rtabmap/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples ieee1394 openni2 qt5"
-
-RDEPEND="
-	media-libs/opencv:=[qt5(-)?]
-	sci-libs/pcl:=[openni,vtk,qt5(-)?]
-	sci-libs/vtk:=[qt5(-)?]
-	sys-libs/zlib
-	sci-libs/octomap:=
-	dev-libs/boost:=
-	ieee1394? ( media-libs/libdc1394:2= )
-	openni2? ( dev-libs/OpenNI2 )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/pcl.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		"-DWITH_QT=$(usex qt5 ON OFF)"
-		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
-		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	# Needed since we force ros crawling to be done only in
-	# /usr/share/ros_packages/
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-}
diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
index d05ebf85b047..906a00d0ba74 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
@@ -9,14 +9,16 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
 fi
 
-inherit ${SCM} cmake-utils multilib
+inherit ${SCM} cmake multilib
+
+VER_SUFFIX=rolling
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P}"
+	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P}-${VER_SUFFIX}"
 fi
 
 DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
@@ -51,11 +53,11 @@ src_configure() {
 		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
 		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	# Needed since we force ros crawling to be done only in
 	# /usr/share/ros_packages/
 	insinto /usr/share/ros_packages/${PN}
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 61c5072a121d..cbb6f6edd974 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -17,5 +17,5 @@ DIST VTKLargeData-9.0.1.tar.gz 247522733 BLAKE2B a1d603f7560cf2cd7d1f355fd30fa5b
 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
 DIST vtkDocHtml-9.0.1.tar.gz 138707547 BLAKE2B 1493d21a41b5f8fd43c3503cb4f98905c6d8d0c39e3245a97141bb1baa59ef0054b52595b48fe2b1c1579b02da0dd1f660e5ef7fefd3c7a9cfdbed42f923a234 SHA512 9997fb73ab46d28f107f5a7ef31a86f6948cd3ff88184fd4f1b0cc14dff1b8b6395e420ae2b2a42e772b90b84d8e077cc4543b8b8c9495481c3f8271949f11e4
 EBUILD vtk-8.2.0-r4.ebuild 10333 BLAKE2B 834bac0a4f2a2ebb770a67b62dab0240c45588ddebf5939e4e0557441750c8a83cb76ecee02a3841673e2749ffd628ea8e611f9327c214c01a95eeb5dd23fd75 SHA512 26c1bf583d835717950cd0f5842eb358ed31728484c906b9122e5cb72b72f0255f73f6a52974d098eebe2af6af9a72aa4b369148cf47d1ca994ebd6dfcd3f68a
-EBUILD vtk-9.0.1.ebuild 13679 BLAKE2B 4b46f2a93590a6f7403e9ca4d491d632e2ca9bbc0ba0f45c5a4c541cb2bf351e69f9b498edfc46ecfd84e2c1eaef5673c035ee050b584844e3e665fbca2e031d SHA512 4515771d506b19696467eeb0146dffeacca46df9310ca3c1176c80f050dee05b189c109b12e508822478b820e1a247eb0ae16542ac23ed86d3330c6224875acb
+EBUILD vtk-9.0.1.ebuild 14476 BLAKE2B 2e67bbb40a0b63df76193c8d3883b35180e84c6a97b65ac551017a6e32340a67433d2f34db1f912996d5c6a138816d7efb5f3fe39e2c892c421c4395e650df0b SHA512 bfa4a2d152b81e52cf0bec0fb41b35985df7e8ff0a11385b3907bd93a8745a3e5726819f84edc5b63d0a30afdcd5d065dd70afed077de64234904602ed7bbd90
 MISC metadata.xml 1404 BLAKE2B d55945785c3e374227585ec5adb6cf9ad652c111cf4de2572179ea7f88df21b281bd02f841f9acdea72e034e4504cfe204833c44a265690ef4966bcf574bc0d0 SHA512 1d15b7c59d735c84915288dec1166ab9e48cfbe42d050bb4cc74e6c878a54c1e31da0e7edca5ffcbcb7d50de77d849b3df6ff68e07495e1c549217f87b0708c1
diff --git a/sci-libs/vtk/vtk-9.0.1.ebuild b/sci-libs/vtk/vtk-9.0.1.ebuild
index 6e0717f814c3..a38e3f1c3270 100644
--- a/sci-libs/vtk/vtk-9.0.1.ebuild
+++ b/sci-libs/vtk/vtk-9.0.1.ebuild
@@ -41,7 +41,7 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	all-modules? ( boost ffmpeg gdal imaging mysql odbc postgres qt5 rendering theora views )
-	cuda? ( X )
+	cuda? ( X video_cards_nvidia )
 	java? ( rendering )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	qt5? ( X rendering )
@@ -294,7 +294,28 @@ src_configure() {
 	fi
 
 	if use cuda; then
-		mycmakeargs+=( -DVTKm_CUDA_Architecture="native" )
+		local cuda_arch=
+		case ${VTK_CUDA_ARCH:-native} in
+			# we ignore fermi arch, because current nvidia-cuda-toolkit-11*
+			# no longer supports it
+			kepler|maxwell|pascal|volta|turing|ampere|all)
+				cuda_arch=${VTK_CUDA_ARCH}
+				;;
+			native)
+				ewarn "If auto detection fails for you, please try and export the"
+				ewarn "VTK_CUDA_ARCH environment variable to one of the common arch"
+				ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all."
+				cuda_arch=native
+				;;
+			*)
+				eerror "Please properly set the VTK_CUDA_ARCH environment variable to"
+				eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all"
+				die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!"
+				;;
+		esac
+		ewarn "Using CUDA architecture '${cuda_arch}'"
+
+		mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} )
 	fi
 
 	if use ffmpeg; then
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 1a9f94f94460..d6211e53b8ec 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index e3d17e1b4cb1..bcc286dc1352 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -9,5 +9,5 @@ DIST flint-2.6.3.tar.gz 4526340 BLAKE2B d663b44166cd857f83c2752eb4d4f6dc45eb8de5
 DIST flint-2.7.1.tar.gz 4945081 BLAKE2B 9dcc4b0062be08778cd8ada1794a73237ea091a7bff4a4673aa59eac9b414ed90e0291b9547bdf72aa30e48da11f98ff983267ea2e3dd1d75fcec00b24c86ca9 SHA512 abea97228e91089d82a9a44714e719064bef261c45f5f5b24700955bb841cc98a8182e04e6054fcbcaa3bd92f2f95a82bd5d168ec2171af6a58d4f71eb0a479a
 EBUILD flint-2.5.2-r1.ebuild 1715 BLAKE2B 3805ac1b99b797b928655535fb506a7851f6072edc96c7f3ed4fd2b93df130d4068a23bec0d3807d188c5198883683a95a5a5ed876eaf71ec6fe44907ace8b7d SHA512 eccb82bd32103efe2f3c732d680be5cfd8ef503e5b24c8b5086942412f59d898b8380759b80bb9ab3faad32943764e6a937e1abeb3ae35480656e1819ab6537c
 EBUILD flint-2.6.3-r1.ebuild 1170 BLAKE2B 48d562711cbc2dc0fb758b9f24679a9529e912ccf0008fbeb46d639f099798f69189266e2bda1a6b4c7337dd6dbd82f6fddd9db6a4b1cf7639c4e0d1b5ae3372 SHA512 891e482a3182179ffad15aeced9d8232c8b85b8ff399c3f396c7c36a053746a9e5cdbfb7633d60aa0f6935f41434f1001eb19445ea9dbd9740b8d5a1a901998e
-EBUILD flint-2.7.1-r1.ebuild 1372 BLAKE2B 4026ba6637f534d522ad3b7390ec491e764e440a913094fc98d9765b8cd3f89a0388099a56eb9805a2c588efc870d8cb7139b1d4daf8223314aed166b46b3162 SHA512 4f5cdebc04ff9888f5a235f4409b0428ba8ce4c18548c709cc0abf296254e6724f18d081f248f32c447c253af5dd7a71935bbd202e5789dd2b79981dd691a33e
+EBUILD flint-2.7.1-r1.ebuild 1371 BLAKE2B 859d5bb309b970d5d92e909f8c5573d782d076ed79a23080fb879caba258e35825113823f19a1c5572de726f7f213bd0fc459c088dae48b50bca0fbbb8397552 SHA512 fad00e1482b27ada9a2847638ac1129b90b8c30b5f033af6103509e9181f4dcb6d944ba7ed23ec18c4de51ecb3b9fa8963f13da57e6d0f0a23d7c6e0de1d6ad3
 MISC metadata.xml 737 BLAKE2B 1f88d93a32f6d74075c11e0d29f8f5b8c7cbfed6d2eb943284c49b05bd20484ba392ed5acc7fbdb40defefc76355ce029a882e71f74ee1cc01eed4873a91073a SHA512 36de4a606c13677c8abc469378888f41590a5b8b02be101a106bb7765c2a2f9084d64de59db55106558bbc086e2bb9905c6609e92ea0c03e3a2b4bfcf170ced9
diff --git a/sci-mathematics/flint/flint-2.7.1-r1.ebuild b/sci-mathematics/flint/flint-2.7.1-r1.ebuild
index f8e7471260ea..7086b59e6308 100644
--- a/sci-mathematics/flint/flint-2.7.1-r1.ebuild
+++ b/sci-mathematics/flint/flint-2.7.1-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="LGPL-2.1+"
 # Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
 SLOT="0/15"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="doc ntl test"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index dfae36a94ecf..cca150ecc72d 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,7 +1,3 @@
-DIST z3-4.8.10.tar.gz 4731869 BLAKE2B 92487f71a0c8d961949dc23032d8fa3ff157fe7acc29b41d0d79326f8b59c60e19f43527cccf4e51872c0f0664598f9063876b04cc581f918aa48c37a13c4f3f SHA512 d2741d7ad3e1d5ee3fec92095b061a96a700c3327b2eb2090d4162bdcaeaebca8c072ef79c5daac1f6de3456165c2cc38e13f1045bc707779d1027b943837c5b
-DIST z3-4.8.11.tar.gz 4799940 BLAKE2B 5478f9f45f2dc8ea5d2b781e79d886e77eed5ae034498b434dae349aa76f05836d8fd3134a08b381830b57acb3896ac51337d5bbe480dcce4770f2cd4fbee841 SHA512 ceab703d0413d0135e0f4e6c3ba2bb58d6a4823385edb0bf7ecc96949a3073b687d415a2674c86c9f876adb52823f98f9fbbc107d799ed756dc16292f9864894
 DIST z3-4.8.11b.tar.gz 4801435 BLAKE2B 903a04246fe4dedc96fda653fa9e3a57a80b951d20b992306bd07bc778cf0a94cf36fe4ed3f178bb26196a1ca294834c784a117fe906d52b82f874a43869d110 SHA512 dfcfc85209dd00aa5f07de0a7e7186a33442b72b94b05c01f53350b9281551be2a2c21ad5e7814bc2c52a3329be8df578e6be8c387cbfdc3a9d3bef0611d6613
-EBUILD z3-4.8.10-r1.ebuild 2428 BLAKE2B dbcf484ac1b804abc88bc0dc7405e2c161f1d80259d972d2327c7f837bec3bee355efaa0d689fe5f490d09c0a509a2ee4be7fb38588518ca3f5db92997449e31 SHA512 3a48335f2cbb5d94a24c80793c4651f244c71645a869ee494ec83600aaaa3824a8198d71a32fe3c14c8f2df80c5b76ac321f41f6e04b5c4aab05851db65bf37c
-EBUILD z3-4.8.11-r1.ebuild 2433 BLAKE2B 6289708b8c64f3aa62e98f659cc79bad7d9d189267e670d2543c45dc8b2fc60ee31b1a9950059f7a75ed2a470cf13d5a9dc5956259614985365de2aa6fd4418e SHA512 37db72f50f850d89bc9b540140d94d26a18358fda78afdd4cb95ba47b9ba3591c2afb50679acd722b776e8a9ff681688ab73899317d63d71c47687a8b8dd4d0e
-EBUILD z3-4.8.11b.ebuild 2433 BLAKE2B 7cb4957417d1f8327cdb7ce66b820838b84984b73e2825b2feaa14e4877f7655d60f946f54e08979ebf61aa86c225aa4082d15145dc602c3c5e27488736edfe9 SHA512 fe28f5f6d28b00b0092411fb102c810d07e97c95df7c693aefc3279822773953b0b58006d96ec06d030e59278eb359f30e76d1acfbf8f8d65b64cf9fc9758f11
+EBUILD z3-4.8.11b.ebuild 2429 BLAKE2B 68983cb9280cf7f92358c76088b5bb8986fdb1e18bc8168353588aa3dce5ae730f85ac5a5edd74d5bf08e3f71fdc53a56a40b606cf0cbc9279f4590cdb810c34 SHA512 ac16f7be8563ab8d98be87f8aa9788e4674742f79475a03d1083b8a538d96d68ba018c441c6a07b694177bdab8de7627632387998688f2a5230a27f49d76b350
 MISC metadata.xml 616 BLAKE2B c35cac6f5810148c69a612d6b04ed4cacdbf066e61951ea1433336f14b2b058c4dd50530b547021007489122f5e94407b30641dc9ccf3b59a345e7a09e5fdd28 SHA512 eaf72a29601e96d5312120a1fc01a0b3dd2b7d8dbee70f6052e8ff7a7e07ae8b768d1417b7f4b523e755e5569092f2685bba77beaf3d7c455ccbd057cc9b670a
diff --git a/sci-mathematics/z3/z3-4.8.10-r1.ebuild b/sci-mathematics/z3/z3-4.8.10-r1.ebuild
deleted file mode 100644
index 2683e9fa94d9..000000000000
--- a/sci-mathematics/z3/z3-4.8.10-r1.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
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake-multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="https://github.com/Z3Prover/z3/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-S=${WORKDIR}/z3-${P}
-
-SLOT="0/4.8"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="doc examples gmp isabelle java python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.8 )"
-BDEPEND="
-	doc? ( app-doc/doxygen )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DZ3_USE_LIB_GMP=$(usex gmp)
-		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
-		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
-		-DZ3_INCLUDE_GIT_HASH=OFF
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-multilib_src_install_all() {
-	dodoc README.md RELEASE_NOTES
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/z3/z3-4.8.11-r1.ebuild b/sci-mathematics/z3/z3-4.8.11-r1.ebuild
deleted file mode 100644
index 87be02fc9950..000000000000
--- a/sci-mathematics/z3/z3-4.8.11-r1.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
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake-multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="https://github.com/Z3Prover/z3/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-S=${WORKDIR}/z3-${P}
-
-SLOT="0/4.8"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc examples gmp isabelle java python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.8 )"
-BDEPEND="
-	doc? ( app-doc/doxygen )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DZ3_USE_LIB_GMP=$(usex gmp)
-		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
-		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
-		-DZ3_INCLUDE_GIT_HASH=OFF
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-multilib_src_install_all() {
-	dodoc README.md RELEASE_NOTES
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/z3/z3-4.8.11b.ebuild b/sci-mathematics/z3/z3-4.8.11b.ebuild
index 6716e2d4fda3..d4386c546aac 100644
--- a/sci-mathematics/z3/z3-4.8.11b.ebuild
+++ b/sci-mathematics/z3/z3-4.8.11b.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index bf986fc6e944..42b0067360f8 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index ffb2fc29d972..b4d2489cf6b1 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -4,5 +4,5 @@ DIST bullet-3.08.tar.gz 129282084 BLAKE2B daa5b6719575af28c6f6359ef51c7a9b8ca9cd
 DIST bullet-3.17.tar.gz 131995187 BLAKE2B 38996c299eb900f867367966c90c7511d4f5c727671249665a073f86390a4514f7c8193577fd73502b49d467eaeb6e7b195426089065ce3bda3238ee76e237b3 SHA512 a5105bf5f1dd365a64a350755c7d2c97942f74897a18dcdb3651e6732fd55cc1030a096f5808cf50575281f05e3ac09aa50a48d271a47b94cd61f5167a72b7cc
 EBUILD bullet-3.07.ebuild 1929 BLAKE2B c0a1c9c8c2f92c7e7493164eca8f4d27d83944eff2bd5dbffe6705b6c6bd69705b275eff2074de76ac6747702e792e6ff1110247d9fb18b4713efc8d07a7b2a4 SHA512 df6585dc25557f961177d89b340eed84c28a23e2bb8174540ad833e06bf1ec735e3135535348c79323eb2fafa504643eea9a8d386b56ede968344092321c7408
 EBUILD bullet-3.08.ebuild 1931 BLAKE2B 975648f912744474bf610c45ab06f786698b677a0633c7b71dfd514e7b0ec8f138048e13a04aa04c0aa0cfa1d21cccd020255aba23aa5b1dfcacb90be5f31b0b SHA512 3176b2563d9ee11de1d75ad0d51427d761df548699f98772c6337440ba3593a0e83fb19428acb9cf55a6160dd2de8491910bb9db04901698775bec24c93dcfa1
-EBUILD bullet-3.17.ebuild 2033 BLAKE2B 3c761d9108ca17304d3da731a27be50545f5325573499fa3199fddb02809eec91f3f04d45ee5ff435baf6c9b22e641a98464816e30f914c1d796f71633602395 SHA512 aa2001729bdf57df2d99627d6ae1a78431d6a8099ba10004f54fe456686f6f74f669fb4b7745b4867bfaaad150b597eb7b4e4e6561074e640545e97ff2cb579b
+EBUILD bullet-3.17.ebuild 2040 BLAKE2B a08fb2f6181d87b486f55285eb8eaf9224f882374acbaa06e34399eb47a48ac90f0cb77c0c0f2f2e3ac5463e2513ce060c917a761179d4ecc2e67096b6563c84 SHA512 87487fefb7eeb857f7a058a39e54c1e09ba68316e835fd9bda1cb0f7b9a7d13d933a9869d4217d433a27be776dd183df05c6355c8ab381aed05a247a3feaa803
 MISC metadata.xml 1161 BLAKE2B 5e308d9e4bcd802e4dae22eaf07ed2fe622769e31da919929fdc483c55624a4bf856c2ceba66a4c5e107dae4030ab8a831ce687ad393f6fef569bcb6aa16e140 SHA512 7531dfb626d9a18e61a7ef538a4440ad38b43794d37325d4d1bab9422f7d14f3c4599453d418262b8ce27d7a7a51a8c1f3b82b40a9f3ffc348987b6e9b9fc94e
diff --git a/sci-physics/bullet/bullet-3.17.ebuild b/sci-physics/bullet/bullet-3.17.ebuild
index 4e1e291757d7..3b3f47ca0078 100644
--- a/sci-physics/bullet/bullet-3.17.ebuild
+++ b/sci-physics/bullet/bullet-3.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc double-precision examples extras openmp tbb test +threads"
 
 REQUIRED_USE="
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 7c5b0a08fb39..eb0c631adc11 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index 190e3d11d553..def9ccef6e11 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -1,8 +1,5 @@
 AUX 50epix-gentoo.el 298 BLAKE2B 236677e59724ddda6cca138c5e049250798a249373558caa1d2f85b432710352d86cf4c4a90ac4556da4857d5aa4bbf2dbae816a2338808a6a79d44eed0fcd75 SHA512 7033d169194cffe4265569f1b048e9ec1929dc98257eb4fb63f486be1ab8162e80fa75fd3943c81b5f9a8eb0e13665e66852ef1f9fbf7cfaee949f5d56fbe9a3
-AUX epix-1.2.10-autotools.patch 2701 BLAKE2B 1478b23499deda305b94b26e9b680131bcecf6dc633d35187f9e9fc3fa7ee500e6b679eb6ade85564b631e7d207c3e0c0cb4ee1caf42779ff1477e1a55e5fd31 SHA512 c94beae67c28ceff6cd4445272574e6cb93f4c181cddb4023587d20e2fed1bea523891191f80b6dd8870f167cbcae2567cd014b6a20aafbb6a74624c76e54cac
 AUX epix-1.2.19-autotools.patch 2020 BLAKE2B 0b5df14c1e31526aadb6bd06ed979616c0ad91fa2555d0b77617eb37aeb902c3d9ac25dacadd3306bd0e6674bef1b9a4a75b1207b9a7ca6289635de5b94f9319 SHA512 f4d2c959031dda084d69c9c89ded0a05b4329819dd420f164a64c763c0917d0a6041ea6fb999574c0f8b640b3585f99133aca3671e02543111696fbda1d16424
-DIST epix-1.2.11_withpdf.tar.bz2 1709429 BLAKE2B db9cba5b94e27742347f8fc85366399016438681a7016077966e5048b9a178404af8305da7d170722aaac82d85283552f87fbba76b21e788fee546b0e0aebf43 SHA512 16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45
 DIST epix-1.2.19_withpdf.tar.bz2 1757443 BLAKE2B 4c7d78f27d355e078ebbe81f9c5d9b1d342f4f04d5f91260460d0559bfb7fc8204668072c06c8d493eb739c492b2935bffd24cb77cd554cd863734b7d84ff6e1 SHA512 b51821256ccaf9957562964b1342ee1656d1d8456081869797d8c704df3098d2643135767987b0673aa64a16703cb2e21deea4aef7d1598e67b9661b98245cda
-EBUILD epix-1.2.11-r3.ebuild 1520 BLAKE2B 18be4038da89c7d289e5187ac9a767acc77ea0e62a1389d168ca79d5a9e78976f11ce1fd2179067471da4c5d819016553fcefeaa21513456f309f4540c8cea41 SHA512 3f9fecddb0699610577dd3ff8215b2be5ac6abb012e8867535cd86ee67bc065268c3cf26af0fdb35963c8bf8e42df48acc1ad71a2f01cc97a13b86d1ea9739f7
 EBUILD epix-1.2.19.ebuild 1477 BLAKE2B f1b458cdf291afa763f6c16bfc1dbc324830e028fe39ce7688243e91a9dd300c850204f442cb521ea82f5e6c84b48fe06da230d524e26307b3865ff9c6490c1c SHA512 6f2305b8c80ae42171eb3f2cba0e5ad61c3bdcb970b9c74e57beba7e731c6eb98fff7ff08f8e88498fe22f30df1f0c3e82ae6a851ce09d36044eb79738e44e15
 MISC metadata.xml 779 BLAKE2B 2e6405de37d7ed3e85eb865d140a599b1de484f9cc5c35eda7be384259b34bbed06aa84dffc8a5b1b05c6db18a5d0bd1b0f28c9969a8aac933582bf0d1c9cc2a SHA512 b0cb62a782873b0e2e115f18495f520f3fb5cf06052d6fdae023a65a3a40fb2eaf355ffacf0243149d9890d8f56be87dbbdaf459b05ae32b877037e7ff2bc5e9
diff --git a/sci-visualization/epix/epix-1.2.11-r3.ebuild b/sci-visualization/epix/epix-1.2.11-r3.ebuild
deleted file mode 100644
index 747862885521..000000000000
--- a/sci-visualization/epix/epix-1.2.11-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp-common bash-completion-r1 autotools epatch
-
-DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
-HOMEPAGE="https://mathcs.holycross.edu/~ahwang/current/ePiX.html"
-SRC_URI="https://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc emacs examples"
-
-DEPEND="
-	virtual/latex-base
-	dev-texlive/texlive-pstricks
-	dev-texlive/texlive-pictures
-	dev-texlive/texlive-latexextra
-	dev-texlive/texlive-latexrecommended
-	emacs? ( >=app-editors/emacs-23.1:* )"
-RDEPEND="${DEPEND}"
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.10-autotools.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-epix-el
-}
-
-src_install() {
-	default
-	if use emacs; then
-		# do compilation here as the make install target will
-		# create the .el file
-		elisp-compile *.el || die "elisp-compile failed!"
-		elisp-install ${PN} *.elc *.el || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	newbashcomp bash_completions epix
-	bashcomp_alias epix flix elaps laps
-	if use doc; then
-		dodoc doc/*gz
-	fi
-	if use examples; then
-		cd samples || die
-		docinto examples
-		dodoc *.xp *.flx *c *h README
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-visualization/epix/files/epix-1.2.10-autotools.patch b/sci-visualization/epix/files/epix-1.2.10-autotools.patch
deleted file mode 100644
index 03f93cd26c9c..000000000000
--- a/sci-visualization/epix/files/epix-1.2.10-autotools.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -Nur epix-1.2.10.orig/configure.ac epix-1.2.10/configure.ac
---- epix-1.2.10.orig/configure.ac	2012-11-29 21:04:20.411280150 -0800
-+++ epix-1.2.10/configure.ac	2012-11-29 21:14:00.462163755 -0800
-@@ -9,6 +9,7 @@
- dnl Checks for programs.
- AC_PROG_CXX
- AC_PROG_LN_S
-+AM_PROG_AR
- AC_PROG_RANLIB
- AC_PROG_MAKE_SET
- AC_PROG_INSTALL
-diff -Nur epix-1.2.10.orig/doc/Makefile.am epix-1.2.10/doc/Makefile.am
---- epix-1.2.10.orig/doc/Makefile.am	2012-11-29 21:04:20.414280167 -0800
-+++ epix-1.2.10/doc/Makefile.am	2012-11-29 21:04:30.491329674 -0800
-@@ -1,7 +1,7 @@
- # Makefile.am for ePiX v1.x "doc" directory
- #
- 
--EPIXFLAGS = --no-defaults -I.. -L.. -lepix -v
-+EPIXFLAGS = --no-defaults -I.. -L.. -lepix -q
- 
- %.eepic: %.xp
- 	../epix-local $(EPIXFLAGS) $<
-@@ -13,13 +13,13 @@
- CLEANFILES = *~ *.aux *.dvi *.log *.out *.toc \
- 	*.fdx *.flg *.fnd *.idx *.ilg *.ind \
- 	epix.info epix.info.bz2 manual_src.tar manual.pdf manual.ps \
--	manual_src.tar.gz manual.pdf.gz manual.ps.gz manual-stamp
-+	manual_src.tar.gz manual.pdf manual.ps.gz manual-stamp
- 
- MAINTAINERCLEANFILES = *.eepic *.aux *.dvi *.log *.out *.toc \
- 	*.fdx *.flg *.fnd *.idx *.ilg *.ind
- 
- ## Targets ##
--doc_DATA = manual.pdf.gz manual.ps.gz manual_src.tar.gz
-+doc_DATA = 
- 
- info_TEXINFOS = epix.texi
- 
-@@ -42,8 +42,7 @@
- 	gzip -9 -c manual.ps > manual.ps.gz
- 
- #PDF
--manual.pdf.gz: manual-stamp
--	gzip -9 -c manual.pdf > manual.pdf.gz
-+manual.pdf: manual-stamp
- 
- epix.info: manual-stamp epix.texi
- 	makeinfo epix.texi 2>&1 >/dev/null
-diff -Nur epix-1.2.10.orig/Makefile.am epix-1.2.10/Makefile.am
---- epix-1.2.10.orig/Makefile.am	2012-11-29 21:04:20.415280173 -0800
-+++ epix-1.2.10/Makefile.am	2012-11-29 21:05:52.489734436 -0800
-@@ -56,7 +56,7 @@
- 
- EPIX_CONFFILES = bash_completions $(EPIX_EL)
- 
--EPIX_NOTEFILES = AUTHORS BUGS ChangeLog COPYING INSTALL NEWS POST-INSTALL \
-+EPIX_NOTEFILES = AUTHORS BUGS ChangeLog NEWS POST-INSTALL \
- 	README THANKS VERSION
- 
- EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \
-@@ -85,11 +85,6 @@
- 	    -e 's%@RUNTIME_COMPILER\@%$(CXX)%;' $< > $@-local
- 	chmod a+x $@ $@-local
- 
--# libepix.a
--libepix.a: $(libepix_a_OBJECTS)
--	ar -ru libepix.a $(libepix_a_OBJECTS)
--	$(RANLIB) libepix.a
--
- # object file dependencies
- $(libepix_a_LIBADD): %.o: %.cc %.h
- 
-diff -Nur epix-1.2.10.orig/samples/Makefile.am epix-1.2.10/samples/Makefile.am
---- epix-1.2.10.orig/samples/Makefile.am	2012-11-29 21:04:20.416280179 -0800
-+++ epix-1.2.10/samples/Makefile.am	2012-11-29 21:04:30.491329674 -0800
-@@ -7,7 +7,7 @@
- CLEANFILES = *~ *.eepic *.eps sample_src.tar sample_src.tar.gz sample-stamp
- 
- ## Targets ##
--doc_DATA = sample_src.tar.gz
-+doc_DATA =
- 
- 
- # tar up tex, xp, and eepic files
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 477817067f55..7f5c89e95517 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,7 +1,10 @@
 AUX gnuplot-5.0.1-fix-underlinking.patch 483 BLAKE2B 1719635d947a5d53fa5b6def65286aa1064e5a80d36d42670890bdda7dc849add342e3574dbee85f0546d953491271354c6946cc157207af700ab1cfde6d0249 SHA512 b5ac3ed830f201ba6018a81bc4860e6da0e41cc9cdc1ac8acc225bf41a0006cbd6e2f8e061ab2bd013ad55b105a02e915e256a09ca4e4faaf4791ea1c3199f28
 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c
+AUX gnuplot-5.5-no-picins.patch 830 BLAKE2B 8e0a303ff5306f3afa07a585b220fe65440432c455710fc5abd67f7afe73dc923e5b796a3dc184f2195709a9def277933678c05c804cebd9686a6b0353f9a53b SHA512 9ca6c6f53a4940cda8634078556052be966a7f62d1b33566ce42dad066265b65970034f38c0abff66230531b49af4feda5301f6af270b0dd622b28b251b3cf5a
 DIST gnuplot-5.4.1.tar.gz 5608076 BLAKE2B 7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d SHA512 2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121
+DIST gnuplot-5.4.2.tar.gz 5640202 BLAKE2B 42bdbe569a4dcd9e65010aff3d0b7428f1c3485bc64429ac0f2c4f157d43c4d640aa2b191430428ec01cb289bd1d43eb95b4167b5b9d236002d54e48b45c0a2a SHA512 e69ca74335cdd69c6013a254ac785dc67cc82713308460971cf6e0a66438716d8892a37344611d1841563efbc4b2b8c5692c13c7b06cff4f30f8d43e2ddfd7d4
 EBUILD gnuplot-5.4.1-r1.ebuild 5059 BLAKE2B 1dcb458413bc167a7a1329f2d1fac9c6a25959ca8aafc4f38c2b73753fab7e4627a54d13bd166a40307b1e75e5cd8289b5b8028339181b9587b1d3e5ce102bce SHA512 b5e459e9e8fa0332e92e190dad95ce1f26abfa8f9d4f1982853a8c546cd6ef492132363624065b4a3457f9fae4ae03a90c06a9be8597407c20d46e741aa55701
-EBUILD gnuplot-5.4.1-r2.ebuild 5099 BLAKE2B 13d76018e6800afca391f71a1820a322b57ef0e61fd4a38a1a04258a185ea01d97edc18f621842b799b5f9fd24101379d785fd58a3d751029cb777da2245afeb SHA512 a912f8ca065989a4861539ffda711960df8804ca7fc84c50891f8454104ef539be2d47299ec938667a0fdceaa2ba8dde58963ed1c2d1e9c883c2f8bf5d97f3d2
-EBUILD gnuplot-5.5.9999-r1.ebuild 5100 BLAKE2B 951612f52afede49d5a93e906c063c70e5f97342f5586aa124ea79525d73b10faef7c346f5f32a7b5f48b0357d9a02ed9b25af20c26f3b42262e29439a55402f SHA512 edbfda82aacefeea9d37ecd2ec7520b5e36d1a5b2d15c9c83ebb5002f485d223e0243e45799306772a7d57a15a07282d9e03d369c793f198e8fef7214c304f01
+EBUILD gnuplot-5.4.1-r2.ebuild 5032 BLAKE2B f227bcfb3aef159975741fcbcc0b4bf0c1940ed2a61a2f0567345b5a8076437bcf6149ba692bf5aa7fe71e0ce60ed739ebd4a52858efee706b39659158bff3b0 SHA512 5def29205ad1b282712504fee79e6af6775ecd50efae33b02a632ae3919250f50ae0f4db83966a011d1b77e7445c0c42f621ecd3a74428899d5fdcc14a12616e
+EBUILD gnuplot-5.4.2.ebuild 5043 BLAKE2B 278deea5ef23c753a9b73a42a7ec98973262539fda381c140346664748f6c8e54f88c3d352785328dc704ada430767c1f7d738d421b50240f49a525ca08dbc7b SHA512 1d9a0e53ec54380aa4a78d8f20a91ad781408f20207f7b34e709d8d5d73b49c9d383bdd9827381fd814cef31fc62ae63766e0fd7332f7445cfd30a814349be79
+EBUILD gnuplot-5.5.9999-r1.ebuild 5042 BLAKE2B ad1833f11cd70e7539d65162194801c762aeb18e55f2a8195644d5608527d4bea9d96371f663e04b96d6e939e80b8197eaf19213bf7617f04595ec9733c3f781 SHA512 17a5acb1030671a56a9bfa8c7d46ed6b3f892258b3eb313946e6da1d3f9cb37fcc696e65d7d57a3aa7b5d8c8071c4369d1ab3de40b2704bd9dcee60299e3e4a4
 MISC metadata.xml 1069 BLAKE2B 2f42ec584b402482270c5f975c6001702f2d5cf367e9f86c190af4b91d97e3c807434e1963a5e1ed856751f592cf1d28cc25897674f92894409497b173e84e8a SHA512 7433f704ff9bee279a70346522595532c221462a915acedb44be85838a472c8a064670a31f72792d10df038b96595e61788c625614a691e956840b39fc063feb
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch b/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch
new file mode 100644
index 000000000000..b27b0bd941bd
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.5-no-picins.patch
@@ -0,0 +1,18 @@
+Do not require picins.sty.
+https://bugs.gentoo.org/577828#c4
+
+--- gnuplot/docs/Makefile.am
++++ gnuplot/docs/Makefile.am
+@@ -179,9 +179,10 @@
+ 	$(AM_V_at)GNUPLOT_LIB=$(top_srcdir)/demo $(GNUPLOT_EXE) $(srcdir)/plotstyles.gnu
+ 	  rm -f gpinsetfigure.tex ; \
+ 	  ( echo "\usepackage{graphicx}" > gpinsetfigure.tex ; \
+-	    echo "\usepackage{picins}" >> gpinsetfigure.tex ; \
+ 	    echo "\newcommand{\gpinsetfigure}[1]{" >> gpinsetfigure.tex ; \
+-	    echo "  \parpic[r][rt]{\includegraphics[width=3in,keepaspectratio]{#1}}" >> gpinsetfigure.tex ; \
++	    echo "  \begin{figure}[htb]" >> gpinsetfigure.tex ; \
++	    echo "  \centering\includegraphics[width=3in,keepaspectratio]{#1}" >> gpinsetfigure.tex ; \
++	    echo "  \end{figure}" >> gpinsetfigure.tex ; \
+ 	    echo "}" >> gpinsetfigure.tex ; \
+ 	  ) ; \
+ 	$(AM_V_GEN)touch $@
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
index 1dd56629fad6..bb76d9370665 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-{1,2,3} )
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
+inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
@@ -20,7 +20,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -75,7 +75,6 @@ E_SITEFILE="lisp/50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
 	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
 )
 
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.2.ebuild
new file mode 100644
index 000000000000..128d9bc70f61
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.4.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1,2,3,4} )
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
+	EGIT_BRANCH="master"
+	MY_P="${PN}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
+else
+	MY_P="${P/_/.}"
+	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="gnuplot"
+SLOT="0"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+	ggi? ( media-libs/libggi )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	libcaca? ( media-libs/libcaca )
+	lua? ( ${LUA_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5=
+		dev-qt/qtgui:5=
+		dev-qt/qtnetwork:5=
+		dev-qt/qtprintsupport:5=
+		dev-qt/qtsvg:5=
+		dev-qt/qtwidgets:5= )
+	readline? ( sys-libs/readline:0= )
+	libcerf? ( sci-libs/libcerf )
+	wxwidgets? (
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:3 )
+	X? ( x11-libs/libXaw )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-langgreek
+		app-text/ghostscript-gpl )
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+IDEPEND="latex? ( virtual/latex-base )"
+
+GP_VERSION="${PV%.*}"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV##*.} = 9999 ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am
+		done
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	eautoreconf
+
+	# Make sure we don't mix build & host flags.
+	sed -i \
+		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
+		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
+		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
+		-e 's:@CC@:$(CC_FOR_BUILD):' \
+		docs/Makefile.in || die
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	use wxwidgets && setup-wxwidgets
+
+	tc-export CC CXX			#453174
+	tc-export_build_env BUILD_CC
+	export CC_FOR_BUILD=${BUILD_CC}
+
+	econf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_with gd) \
+		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with libcerf) \
+		$(use_with lua) \
+		$(use_with regis) \
+		$(use_with X x) \
+		--enable-stats \
+		$(use_with qt5 qt qt5) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="https://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	export VARTEXFONTS="${T}/fonts"
+
+	emake all
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		if use cairo; then
+			emake -C docs pdf
+		else
+			ewarn "Cannot build figures unless cairo is enabled."
+			ewarn "Building documentation without figures."
+			emake -C docs pdf_nofig
+			mv docs/nofigures.pdf docs/gnuplot.pdf || die
+		fi
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+
+	local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
+		use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information."
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die
+		rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die
+	fi
+
+	if use doc; then
+		# Manual, FAQ
+		dodoc docs/gnuplot.pdf FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+src_test() {
+	emake check GNUTERM="dumb"
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
index 306871a94a96..f2904c7651db 100644
--- a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-LUA_COMPAT=( lua5-{1,2,3} )
+LUA_COMPAT=( lua5-{1,2,3,4} )
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
+inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
@@ -70,13 +70,13 @@ BDEPEND="
 		app-text/ghostscript-gpl )
 	qt5? ( dev-qt/linguist-tools:5 )"
 
+IDEPEND="latex? ( virtual/latex-base )"
+
 GP_VERSION="${PV%.*}"
-E_SITEFILE="lisp/50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
-	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+	"${FILESDIR}"/${PN}-5.5-no-picins.patch
 )
 
 pkg_setup() {
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 67ffca24be09..df57e2c940aa 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 4cbd56681e02..a20851a5dcf1 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,7 +1,5 @@
 AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9f3042c70e0f8d8a2b7c363ceeae5ec63fa4b736b42e129f9e90ea4a576e5419af7e0e26d848e SHA512 59616543c6cd101373249b06bcbc0b7dd13fb2c8e45d6dc61a56088434cdf0a6b57630471bd2d788dd6253b66bcbfc3ec60b11ba8442043e837119130344216e
 AUX bolt.openrc-r1 374 BLAKE2B 91dcbfb842166837d4a89c12e7c8b39db9810ba1ffd18eb1ee61798f3634952440b1bb79118d1486819c34916b266a8c47b4398df42ba8f0c3411d482e2e4874 SHA512 3731459efce91c89e5a601b649acc7ed4faee4d08d2a52a5784dc53b914a15113003516e8fed64e532dc703e019ed53b37ec9a4414b770165c1e46813392f9d3
 DIST bolt-0.9.1.tar.gz 250978 BLAKE2B a3b1ea51704e2b54abb0135013019b9cad6ed9c0acfdb56797e19c9b5a1abe9f921446cfcc5b664f73bbbff857cf8d420f588517d4c633d1b3776a35c37fc882 SHA512 c925c290de75d3fa2dfb9e86b2f14ea39279b3f2ab6bebeced72a7853c901d44de02157d684534af2b54edd3a2e0b2ba61e889579ab1b192f99e98a2d73685d9
-DIST bolt-0.9.tar.gz 238596 BLAKE2B 8032ecb83d39d6c3550c000eed400ee0451e5ed94f7c898ffe9c8fcf512af387cfd759bd94241a47623b5aac63615bcda40ddb3e9ae3ec4060da20e46d7e9b7d SHA512 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78
-EBUILD bolt-0.9-r3.ebuild 1347 BLAKE2B 28a3a9aadf5c1ce03b2ee4132e603de2f3e68051e2361bd984e3cb41aa62d1a4659bdc4c59002861c6ce51e5a8f8c68d39d37d35a7a8eb37e41eec9887533159 SHA512 e51fff67782fe10d9048d0feaefca084d481ccd3aee72a098d215750272e064bc3ea3059cf1adaaac917adcb3e664bd13bc95795948442258fe1d7d3b080722c
 EBUILD bolt-0.9.1.ebuild 1347 BLAKE2B 28a3a9aadf5c1ce03b2ee4132e603de2f3e68051e2361bd984e3cb41aa62d1a4659bdc4c59002861c6ce51e5a8f8c68d39d37d35a7a8eb37e41eec9887533159 SHA512 e51fff67782fe10d9048d0feaefca084d481ccd3aee72a098d215750272e064bc3ea3059cf1adaaac917adcb3e664bd13bc95795948442258fe1d7d3b080722c
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-apps/bolt/bolt-0.9-r3.ebuild b/sys-apps/bolt/bolt-0.9-r3.ebuild
deleted file mode 100644
index d0f8d019bc70..000000000000
--- a/sys-apps/bolt/bolt-0.9-r3.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 linux-info meson systemd
-
-DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
-HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc systemd"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	dev-util/glib-utils
-	virtual/libudev
-	virtual/udev
-	dev-util/umockdev
-	sys-auth/polkit[introspection]
-	systemd? ( sys-apps/systemd )
-	doc? ( app-text/asciidoc )"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 5 6; then
-		CONFIG_CHECK="~THUNDERBOLT"
-		ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
-	else
-		CONFIG_CHECK="~USB4"
-		ERROR_USB4="This package requires the USB4 kernel driver for Thunderbolt support."
-	fi
-	check_extra_config
-
-	CONFIG_CHECK="~HOTPLUG_PCI"
-	ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support."
-	check_extra_config
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman=$(usex doc true false)
-		--sysconfdir=/etc
-		--localstatedir=/var
-		--sharedstatedir=/var/lib
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	newinitd "${FILESDIR}"/${PN}.openrc-r1 boltd
-	keepdir /var/lib/boltd
-}
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 3975d629751f..080b51a932b1 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,3 +1,5 @@
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
+DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af SHA512 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
 EBUILD diffutils-3.7-r1.ebuild 1179 BLAKE2B aa0c831588bceba6c855b67d53b51fe853b94659c70f63e829540b46e61be3a87fa2dc3889f81640a819ff4ed1a0db2a8d2903b707f27f59bf5b839916271209 SHA512 3a4287c690502ea4890850726d42ae937f726821a712435eb749e1ef82ef40ab415739dc3981872c541a2007596b22319aea7909e1dabee721c3f076d733599c
+EBUILD diffutils-3.8.ebuild 1069 BLAKE2B 3eabc7ddcfaf257fbd02b045b02ee0e4137d5e4dd539966c2bd979f48b4e1175ff24132ec43810c37de1aa84010831f72ed59b01ceb3d5403458e158cd5ef121 SHA512 c3a42f0971680cc09fce254badc285c2aaa8f263f2cbacbd864f2f88862ea61f57c168fcfb8c923cf9424ecaa2c4174ac68574bfeb98c9f45c3cabd5a9666aef
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild b/sys-apps/diffutils/diffutils-3.8.ebuild
new file mode 100644
index 000000000000..48330a993112
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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
+	https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# Disable automagic dependency over libsigsegv; see bug #312351.
+	export ac_cv_libsigsegv=no
+
+	# required for >=glibc-2.26, bug #653914
+	use elibc_glibc && export gl_cv_func_getopt_gnu=yes
+
+	local myeconfargs=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR}"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/edac-utils/Manifest b/sys-apps/edac-utils/Manifest
index 6b7428a8a312..1b3c095eadfa 100644
--- a/sys-apps/edac-utils/Manifest
+++ b/sys-apps/edac-utils/Manifest
@@ -1,3 +1,6 @@
+AUX edac.init 336 BLAKE2B 7ebffaf4d4431977d607448f43beb5f17903e28a1aef3a8445e0c83a267a221e7fdaa6f0aa1860123da44dfbef00c1861f8eaf93d9968bbfc0896ad9de39ea5e SHA512 51936a92d46f324964d8149d69c9e9260428030e3bf23e4a46aabc716d04ddb06acf05c55a63747436e0a3b3a2775f3725a8adae594af2b1a6ae234143338f85
+AUX edac.service 230 BLAKE2B a38c84a994bcaf884ed1a23c406971c57c4353a226029d5c08cd71481ca888dae91c5a6c6422a20181319c3199d2e97fb1985a05415ffc9f1cdad318281f50d6 SHA512 de8838c5f2227e4c81c8b571dd117ac90aeabeb082b767e84bd208a80c24496f3bd5105fb15fab890ea3224616646a882d12dc7c37af6d0e554f95cd8d081b7d
 DIST edac-utils-0.18.tar.gz 285909 BLAKE2B 7d2662daf94c4ff796760b4863837861015397016bb79202baaa194608b61450d6749981cec621571267ac818a09af758167d2d768513e7d5bf7e763aed7ee51 SHA512 5c81b11c28e8fb3198f2d656171493877393024d9e31233c252d358d8029aa83065e7b66ea87d742518f710466c9ba7dfcf57a1641374ce169cf95fd379101fa
-EBUILD edac-utils-0.18.ebuild 1085 BLAKE2B d8509b37fab1eb499ea479ff82a70b02d4ebe1a0fe89fcce536632ff950a27923716fb36ff2b6c02c9114ef453b21f98f6ef4b96d1b88ac2d7f853e092bdb973 SHA512 f473e7238fee5057140507e7efc9865e99778851f42349ea028f08a44820946dbf08e7f3fc996223ddf7a13edecf79a58042f68b30397ff3c9f0819cc3f2cf22
-MISC metadata.xml 254 BLAKE2B 1392a93224819fb2dcdf8e7842fad36812de4dcee5e7424e55932c71885354ee8e308b407a8c7ff5f22b3fde199c17a83c2fc743f0f56d8d21e92dc5b3a43252 SHA512 ef70b7addb82535bb76effbc086b2e94c868c0eeefd321bed35d554f4117007ff5dba431561b16e90ff42a23011568b877959d9d59eac6c7c59642ed9d46bd91
+EBUILD edac-utils-0.18-r1.ebuild 1199 BLAKE2B 75a6ac217e0af96d69834966fc445d0610d57dbba72bc1a1120339e289236d81fd175869198b7070eb2afe182303b4806ee738782d974365db9b671202926393 SHA512 e50ab6190c9c5ba746eea38f259f9859f0eb8aad2035ce99a2f79b7fd2d7a0dac90da070ce334ffa1757244af0fd7f385b73c76d6ea945614b38ea793d677283
+EBUILD edac-utils-0.18.ebuild 1111 BLAKE2B ba93435dbd30940dedaafb83540e36352ae99b3449a5549a1d09404be9a5ef800e082d457f24d95b430a9f629598fa224f81ab511a34e7eb15307bde34271c17 SHA512 4b2827907f8f45d01a08026a11a8dca5762b7fab6e1a4bd4852a945325714efb1e670c751288d513007584b49256fe7b6721fae9f3457d151aec89b1166d6a7b
+MISC metadata.xml 321 BLAKE2B 2828640a5bcb4f053424e252971d3232a31884ff9ee357dd302a47667da146f4eea8f72f1b0765bec79d34f9b9bbd97ef58874a4f107bcf7329725205010bf42 SHA512 4493bc3bd8f1b3ac3b8b9defe38d1368b9fcd7f54a0556e1d786c92bf30ff485875ac2e1bba65ebd96d9c85dc961b0db682bcd448717bd58853143b9b105b1dd
diff --git a/sys-apps/edac-utils/edac-utils-0.18-r1.ebuild b/sys-apps/edac-utils/edac-utils-0.18-r1.ebuild
new file mode 100644
index 000000000000..b48d523eff5d
--- /dev/null
+++ b/sys-apps/edac-utils/edac-utils-0.18-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Userspace helper for Linux kernel EDAC drivers"
+HOMEPAGE="https://github.com/grondo/edac-utils"
+SRC_URI="https://github.com/grondo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="debug"
+
+DEPEND="sys-fs/sysfsutils"
+RDEPEND="${DEPEND}
+	sys-apps/dmidecode"
+
+src_prepare() {
+	default
+
+	# Needed to refresh libtool and friends to not call CC directly
+	# bug #725540
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	# Dump the inappropriate-for-us bundled init script
+	rm -rf "${ED}/etc/init.d" || die
+
+	# Install our own
+	newinitd "${FILESDIR}"/edac.init edac
+	systemd_dounit "${FILESDIR}"/edac.service
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "There must be an entry for your mainboard in ${EROOT}/etc/edac/labels.db"
+	elog "in case you want nice labels in /sys/module/*_edac/"
+	elog "Run the following command to check whether such an entry is already available:"
+	elog "    edac-ctl --print-labels"
+}
diff --git a/sys-apps/edac-utils/edac-utils-0.18.ebuild b/sys-apps/edac-utils/edac-utils-0.18.ebuild
index 86bafa9ff0dc..c4aa0a9e04cf 100644
--- a/sys-apps/edac-utils/edac-utils-0.18.ebuild
+++ b/sys-apps/edac-utils/edac-utils-0.18.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="Userspace helper for Linux kernel EDAC drivers"
 HOMEPAGE="https://github.com/grondo/edac-utils"
@@ -17,6 +17,8 @@ RDEPEND="${DEPEND}
 	sys-apps/dmidecode"
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e 's|-Werror||' \
 		configure || die
@@ -34,13 +36,13 @@ src_install() {
 	# We don't need this init.d file
 	# Modules should be loaded by adding them to /etc/conf.d/modules
 	# The rest is done via the udev-rule
-	rm -rf "${D}/etc/init.d"
+	rm -rf "${ED}/etc/init.d" || die
 
 	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
-	elog "There must be an entry for your mainboard in /etc/edac/labels.db"
+	elog "There must be an entry for your mainboard in ${EROOT}/etc/edac/labels.db"
 	elog "in case you want nice labels in /sys/module/*_edac/"
 	elog "Run the following command to check whether such an entry is already available:"
 	elog "    edac-ctl --print-labels"
diff --git a/sys-apps/edac-utils/files/edac.init b/sys-apps/edac-utils/files/edac.init
new file mode 100644
index 000000000000..23318b37e10c
--- /dev/null
+++ b/sys-apps/edac-utils/files/edac.init
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+command=/usr/bin/edac-ctl
+
+start() {
+	ebegin "Registering edac-utils labels"
+	/usr/sbin/edac-ctl --register-labels
+	eend $?
+}
+
+stop() {
+	ebegin "Unregistering edac-utils labels"
+	/usr/sbin/edac-ctl --unload
+	eend $?
+}
diff --git a/sys-apps/edac-utils/files/edac.service b/sys-apps/edac-utils/files/edac.service
new file mode 100644
index 000000000000..b94a4b6b5443
--- /dev/null
+++ b/sys-apps/edac-utils/files/edac.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Initialize EDAC Drivers For Machine Hardware
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/edac-ctl --register-labels
+ExecStop=/usr/sbin/edac-ctl --unload
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-apps/edac-utils/metadata.xml b/sys-apps/edac-utils/metadata.xml
index 0d757f0cc8d4..57f6459cb14b 100644
--- a/sys-apps/edac-utils/metadata.xml
+++ b/sys-apps/edac-utils/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-needed -->
-  <upstream>
-    <remote-id type="github">grondo/edac-utils</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">grondo/edac-utils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/exa/Manifest b/sys-apps/exa/Manifest
index 6910ced1c846..88f7538c583b 100644
--- a/sys-apps/exa/Manifest
+++ b/sys-apps/exa/Manifest
@@ -119,6 +119,6 @@ DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbe
 DIST wincolor-1.0.3.crate 5030 BLAKE2B 165e38a7d234241081d3fed3477854c5241e2d6ea685230c9e44b64601f77953f1e65e9166a3e843e7bf5bc23c9af427d6e9718579f683e7ac1c96e14ed3618c SHA512 0fc5dc7f1c57bbf1a8a6d5342ca363384a14a464b53ce92ef08544925e7a9e8d031a457045233148ba10355e3c3f0cd34b08e12d54d2fcb10b3ed60ad678a492
 DIST zoneinfo_compiled-0.4.8.crate 7959 BLAKE2B 06b41aa69298319760eef3959c9447d9078ced6ea409b95bc0a3de5d9ddc1006d022caa23a64f46a9c6abf1eb077681ffaa3e03af0d533ec65d3351a4ecb3ac7 SHA512 e5337233b464cb97501a2694972a5707f6762ee567416bae876e0ee72aa0bb9cfd152a9253ba97c9fcb24a59e6b2fd5417d5567f7e17336ddc8dee121ba76589
 DIST zoneinfo_compiled-0.5.1.crate 8837 BLAKE2B 1d513b145a391ccb22d2110cce06dc1fc91e109d93cc7f2a056ceb5056a5a480b98ed3471cf8ff8fb8011f2d9c037b3bbd4f47dcedc0a56499e324ea5d7849da SHA512 4ad46983742ed37246f3ba5538fdf3a4dfc444ec635ffaa51d5daffa70c14e1876e703cd0a1f077e6b324e0d44d4b5e1e710b3543636fa9f33d509fa8bce333c
-EBUILD exa-0.10.1.ebuild 2679 BLAKE2B 328f029f03044e35ea546ee04697ae1dc67b1b08115b446bd1d3ee7a25c959a27251026b359a6e0b17b90975a0d00ab21a55cc4fbc62c0f925842cad5b496f61 SHA512 c51a76a11eb5cf2a0ece8804866baee7ca1018155eb79c6da6e752206541b8124a553fc43af32fca4b56b507391ac44018b7ed1f8862564a95a9a14354d33bd7
+EBUILD exa-0.10.1.ebuild 2686 BLAKE2B 138873c728ffc0a8c0ce2bc8d65f08cec7ba7f4b2d0e13ad2310aaced437a31c700f5d0adde6d46984efd8b0663f5b4a58a70cac7c8c02ad93769dac4cd52c99 SHA512 62310004e160d6933b37e2ae09d45ba4079c8d1bc3cb41e4c7d7fd1d8c7b540a1fc0dfe42e2b350168a3609b9bcdedd4d9f141fb9c1f258971e33346dedba7ed
 EBUILD exa-0.9.0-r1.ebuild 2036 BLAKE2B 5344785f721a35548a99edfba4ff6fd3ad679a3eb57c9b94a0d10aea6b37744e0cf47a7ff4026d1e2eb4d07a8c9228800fb1fdaeba13b99733220d6e467abaed SHA512 4ac3694ebbc396f806d9b7b195a1a1fae0a0848d3794249c0830c71b37ef4d9212cd5e7a3e084114b90214be89401c925de440edd782873501e3d41f5be1ac9c
 MISC metadata.xml 717 BLAKE2B 513b32288ac66f97bcda880bb525e078386bff526405b4fea84d8e426a773fe4bc8a9ed6b678499391ee1afa733c62e8c0dbde60c00546a3855ad9defb12c18d SHA512 b2c0d0bc4c63c730c70a90b0fb1c74e9f138e7d3e27be1015812e6ac48192f830a6030eb0cd37f96d273003fed84edc98487623519bf12cba653f4feb333e87a
diff --git a/sys-apps/exa/exa-0.10.1.ebuild b/sys-apps/exa/exa-0.10.1.ebuild
index 938344102d54..f43c754979b6 100644
--- a/sys-apps/exa/exa-0.10.1.ebuild
+++ b/sys-apps/exa/exa-0.10.1.ebuild
@@ -81,7 +81,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="Apache-2.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+git man"
 
 DEPEND="git? ( dev-libs/libgit2:= )"
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index bc6630fdee72..cfa877a4e981 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,8 +1,12 @@
 AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb
 AUX fwupd-1.6.1-fix-python-detection.patch 1897 BLAKE2B 4c33cca345113fcae867b55e8575ac2da89c13cb76c9245201f2118695d319dd5795656a5c70151466973f19a8ffaf6d385255eb49e834e40aa6cf937fb0e6a8 SHA512 2174d2a9f99d444ec846adffc5c62a14553274d11072ef9ddcb78a3044a03c8c33d9f9e1c54604facde270a6d135b65cdb6d5fe9f20cf075181e19012545adf9
+AUX fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch 1105 BLAKE2B 898f70b2baa27de6678b415ffe9671e2599ff69d9f1ad52cfcefd271d5c5c936bf32276970ef36a88464f11ea1956d90bedd64989adeb9f87be6a2e4d82bcd14 SHA512 106112dedd1c205604b6588ad08092cdb5bcdc1bab3f2e415526faf7af3075ed442d61b3f31a3d0421b683d6f772fb196f93131d3f2f8227b65a6dc781ec6461
+AUX fwupd-1.6.2-dell-dock-requires-gusb.patch 716 BLAKE2B 470db7243fa0e7398778ef8c5d716013e04ef6429e1b4a35b644c3f4bca7148f3bb9f2fc08814b82edc50e1605dc00feb2691f3f1c09b371afdeb1b838181a6c SHA512 08546194d1dfe27a09b10feb6d63a1f29cae881a0ac23bd1497b91eea44fff21559bb67ab5feac3b5613d4f99626708dade0127cb6c7f5ea4c842612c0323ec3
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
 DIST fwupd-1.6.1.tar.gz 3786336 BLAKE2B 429e41cad3acdcd9b245532a38126a8e3d366081aba16b9f3e04a2029980b8d6e3f4ac3f8c6d6cd1332c344526a7901c976d6fa0bc1c4011e54d5dc96a427d2d SHA512 6d795e9898de6097d0f1185fbc3a6864566f90fc504e5d9cf192e5dca50c659d39f43f1922c7506151bd1538a23db507e95893436de733b1335bd69dc56f3b1c
+DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0
 EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506
 EBUILD fwupd-1.6.1-r1.ebuild 4374 BLAKE2B 4081625c0d91e6d318e84ba368fa5abe96f3a6bcbf690ffde03d4995cd53d4ba2dcdea7c7b869da9fc29a0e00957a35de93376c9f49e6c2790103e80ddd7e134 SHA512 599c623fecd7dc801673cad0480c042eb7bc9095e74dcbf7d6431337916deb17a211d6c90cf12b4dc9ea0a3a111be6cdec34e91efc4d9b981f04d81088fa1367
-MISC metadata.xml 1273 BLAKE2B e58cbe75ac3cf69ef5f70b831617f0a6c268d8270263cfa005046120eeeac464aa70024ae7b5ffb5a4526c948070d55cfcb6b927ea03c660db91c7cadc86417f SHA512 b024927cfdf78d1ec6ac33a1e04a2c6f7b9397a3cbd0334bcc13e964f2f8f5b01fe50a4b0bea896cf8b6e491b33473d0ba9a7f87edb47fd3b0d3e63a919b0909
+EBUILD fwupd-1.6.2.ebuild 4560 BLAKE2B f85eebae29ee6e20705e7db84bbf8ebc33d109a1fc063c6225c24faf70e1289ae693da3ba6bb36c53ab56e5cfefe39c99a684bbf5393abca8c94b082ce5c9a50 SHA512 f9556caeb5e6678a7bded64b97523e5917a81500a2f7791963c18c769e7e650e3d435c4fd0efe4bb3a0e771d95e294be28bee28a798c974abfaa252de90eb5ea
+MISC metadata.xml 1347 BLAKE2B 93c3805765fb699b8325f80aef9bdc1281d80619ae74a89fc95d764f7a52ccf50e97425360779a66231a8bb8013e4d5e90649f7c7ab8cca8ccfd2938a2377b38 SHA512 8e50016bb8339b9b278c19a6e580cfcd3426d0b6fb186cde07c4535f48c5bd7a8a4437338360a10ea4550504242722ab2ed99bb4573b8e8809de0015db25ddc2
diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch b/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch
new file mode 100644
index 000000000000..99434fe226f8
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch
@@ -0,0 +1,27 @@
+From 196cc6d9b445ee4246c7ff18d98d616aef286550 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Wed, 4 Aug 2021 15:38:59 +0200
+Subject: [PATCH] plugin modem-manager: XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY is
+ only available in >=libxmlb-0.2.2
+
+Closes: https://github.com/fwupd/fwupd/issues/3600
+---
+ plugins/modem-manager/fu-firehose-updater.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/plugins/modem-manager/fu-firehose-updater.c b/plugins/modem-manager/fu-firehose-updater.c
+index 00fcdf607..076aa79cc 100644
+--- a/plugins/modem-manager/fu-firehose-updater.c
++++ b/plugins/modem-manager/fu-firehose-updater.c
+@@ -630,7 +630,11 @@ fu_firehose_updater_run_action (FuFirehoseUpdater *self, XbNode *node, guint max
+ 
+ 	action = xb_node_get_element (node);
+ 
++#if LIBXMLB_CHECK_VERSION(0,2,2)
+ 	cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY, error);
++#else
++	cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_NONE, error);
++#endif
+ 	if (cmd_str == NULL)
+ 		return FALSE;
+ 	cmd_bytearray = g_byte_array_new_take ((guint8 *)cmd_str, strlen (cmd_str));
diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch
new file mode 100644
index 000000000000..162cc194a2ad
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch
@@ -0,0 +1,24 @@
+From 4f5961a389698844117e70601ccf4c9e3ae1cb86 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Wed, 4 Aug 2021 15:11:26 +0200
+Subject: [PATCH] dell-dock plugin requires gusb
+
+Closes: https://github.com/fwupd/fwupd/issues/3598
+---
+ plugins/dell-dock/meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/dell-dock/meson.build b/plugins/dell-dock/meson.build
+index 829771de1..ae8f67f33 100644
+--- a/plugins/dell-dock/meson.build
++++ b/plugins/dell-dock/meson.build
+@@ -1,3 +1,4 @@
++if get_option('gusb')
+ cargs = ['-DG_LOG_DOMAIN="FuPluginDellDock"']
+ 
+ install_data(['dell-dock.quirk'],
+@@ -34,3 +35,4 @@ shared_module('fu_plugin_dell_dock',
+     gudev,
+   ],
+ )
++endif
diff --git a/sys-apps/fwupd/fwupd-1.6.2.ebuild b/sys-apps/fwupd/fwupd-1.6.2.ebuild
new file mode 100644
index 000000000000..aa776823c5e4
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.6.2.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_{8..10} )
+
+inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	dell? ( uefi )
+	minimal? ( !introspection )
+	spi? ( lzma )
+	synaptics? ( gnutls )
+	uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
+	test? (
+		thunderbolt? ( dev-util/umockdev )
+		net-libs/gnutls[tools]
+	)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	dev-db/sqlite
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/json-glib
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.1.13:=
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	net-misc/curl
+	virtual/libelf:0=
+	virtual/udev
+	archive? ( app-arch/libarchive:= )
+	dell? ( >=sys-libs/libsmbios-2.4.0 )
+	elogind? ( >=sys-auth/elogind-211 )
+	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+	gnutls? ( net-libs/gnutls )
+	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+	lzma? ( app-arch/xz-utils )
+	modemmanager? ( net-misc/modemmanager[qmi] )
+	policykit? ( >=sys-auth/polkit-0.103 )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss )
+	uefi? (
+		sys-apps/fwupd-efi
+		sys-boot/efibootmgr
+		sys-fs/udisks
+		sys-libs/efivar
+	)
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+	!<sci-chemistry/chemical-mime-data-0.1.94-r4
+	${COMMON_DEPEND}
+	sys-apps/dbus
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/pango[introspection]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
+	"${FILESDIR}"/${P}-dell-dock-requires-gusb.patch
+	"${FILESDIR}"/${P}-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use nvme ; then
+		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+	fi
+}
+
+src_prepare() {
+	default
+	# c.f. https://github.com/fwupd/fwupd/issues/1414
+	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+		-i plugins/thunderbolt/meson.build || die
+
+	sed -e '/platform-integrity/d' \
+		-i plugins/meson.build || die #753521
+
+	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
+		-i data/builder/meson.build || die
+
+	vala_src_prepare
+}
+
+src_configure() {
+	local plugins=(
+		$(meson_use amt plugin_amt)
+		$(meson_use dell plugin_dell)
+		$(meson_use flashrom plugin_flashrom)
+		$(meson_use gusb plugin_altos)
+		$(meson_use modemmanager plugin_modem_manager)
+		$(meson_use nvme plugin_nvme)
+		$(meson_use spi plugin_intel_spi)
+		$(meson_use synaptics plugin_synaptics_mst)
+		$(meson_use synaptics plugin_synaptics_rmi)
+		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm plugin_tpm)
+		$(meson_use uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_capsule_splash)
+		$(meson_use uefi plugin_uefi_pk)
+	)
+	use ppc64 && plugins+=( -Dplugin_msr="false" )
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		-Dconsolekit="false"
+		-Dcurl="true"
+		-Ddocs="$(usex gtk-doc gtkdoc none)"
+		-Defi_binary="false"
+		-Dsupported_build="true"
+		$(meson_use agent)
+		$(meson_use archive libarchive)
+		$(meson_use bluetooth bluez)
+		$(meson_use elogind)
+		$(meson_use gnutls)
+		$(meson_use gusb)
+		$(meson_use lzma)
+		$(meson_use man)
+		$(meson_use introspection)
+		$(meson_use policykit polkit)
+		$(meson_use systemd)
+		$(meson_use test tests)
+
+		${plugins[@]}
+	)
+	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+
+		if ! use systemd ; then
+			# Don't timeout when fwupd is running (#673140)
+			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+				-i "${ED}"/etc/${PN}/daemon.conf || die
+		fi
+	fi
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index f746f9116957..57762c975d6f 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
 		<flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag>
 		<flag name="nvme">Build and install NVMe plugin</flag>
+		<flag name="modemmanager">Build and install Modem Manager plugin</flag>
 		<flag name="spi">Install Intel-SPI plugin</flag>
 		<flag name="synaptics">Install synaptics plugin</flag>
 		<flag name="thunderbolt">Install Thunderbolt plugin</flag>
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index ecd7c3d1db43..6d4202494481 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,3 +1,5 @@
 DIST hwinfo-21.74-1.1.src.rpm 967046 BLAKE2B 305db6eb3184de0e84d166f0e32988ea2a0ec65eceb322c8c451f33ab8656c38a21a74f416ff08442bcbc5fa91fb4fa8439d907c2c244fe62a2048be7f84b181 SHA512 1a681b51934fbed229b7daa96b5e4e0d8fc62d480927034d0c95ae8c89dc2ae43214c63cca273379162353aeb2bf81883e7c02006c4f45fd1deab0d74f8a2988
+DIST hwinfo-21.76-1.1.src.rpm 966123 BLAKE2B dbacb4d8605e3529eb94dd91b4a480c73c935024cf119ba12fd1be4850dd3f5e07df6a306b39b04b1e830284be73d0fcb476f396f27312b692b0a424190a1388 SHA512 990c63574531f74949b60e072bb68069aba99594b57b4b1f71150c96a8630c32a56437968b37bff675a837e08f172e0e18743517566460b8120630d8195f8224
 EBUILD hwinfo-21.74.ebuild 1546 BLAKE2B c9dfb7a7d72ba0e2d64bd2d1073decdf1c84a011d8e1924bda302b31f4f837d3566b2c43fcfac34205a13597dbaf81262d5f746e06f705a93ed2e58f29e241cc SHA512 26e7c91ad4cb94548e82dbf3d64c0441a2ead9f2006423cb625655832dabe4248b68bf34fbe1109ddf03a6a2385f7f097085a93e0397fab36f7252a25ee60d11
+EBUILD hwinfo-21.76.ebuild 1549 BLAKE2B a99c8e0c59f645fe5dd982913071326303305bc34299dd62ab36d6e126c3397da18e73d565bf6ccfa25fc9373b27d2f8c23b034b245a07190fa8907df8deb361 SHA512 65f5c677c51035ab83b35724f39872a0bdc0e4368e710f26000c48c892973f58ccdb1246201ffbbcf4a710d1c536f1cb248423c79e48b917678dd98b4225003c
 MISC metadata.xml 334 BLAKE2B 08e4d837af5734c290c474fe28c4082531eb9b07be2fddef29e16e4dda6aee904bc8674830842b1c1f9736a92a4ccf21992ffdb6f0f3b7e62be73f3d3e93c6d5 SHA512 94c2a056338c3e3e40737e45468d77e170341185017098fc8892cbac1a0993321a1ee8dd007c075430d999fce90508f1e3d4a4f71fda6bfeb6f7c15b199c2405
diff --git a/sys-apps/hwinfo/hwinfo-21.76.ebuild b/sys-apps/hwinfo/hwinfo-21.76.ebuild
new file mode 100644
index 000000000000..b4051eb59a5d
--- /dev/null
+++ b/sys-apps/hwinfo/hwinfo-21.76.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib rpm toolchain-funcs
+
+DESCRIPTION="Hardware detection tool used in SuSE Linux"
+HOMEPAGE="https://www.opensuse.org/"
+#Using srpms from SUSE to get pregenerated changelog, otherwise we could use GH
+#SRC_URI="https://github.com/openSUSE/hwinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.1.src.rpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	amd64? ( dev-libs/libx86emu )
+	x86? ( dev-libs/libx86emu )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6.17"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	# Respect AR variable.
+	sed -i \
+		-e 's:ar r:$(AR) r:' \
+		src/{,isdn,ids,smp,hd}/Makefile || die
+
+	# Respect LDFLAGS.
+	sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die
+
+	# Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS.
+	sed -i \
+		-e 's:make:$(MAKE):' \
+		-e 's:-pipe -g::' \
+		-e 's:LDFLAGS.*=:LDFLAGS +=:' \
+		Makefile{,.common} || die
+	# Workaround from Arch, if using source tarballs from github
+	# echo 'touch changelog' > git2log
+	default
+}
+
+src_compile() {
+	tc-export AR
+	emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
+	keepdir /var/lib/hardware/udi
+
+	dodoc changelog README*
+	docinto examples
+	dodoc doc/example*.c
+	doman doc/*.{1,8}
+}
diff --git a/sys-apps/lsd/Manifest b/sys-apps/lsd/Manifest
index 0ba55b23c100..11eb81caeb5d 100644
--- a/sys-apps/lsd/Manifest
+++ b/sys-apps/lsd/Manifest
@@ -145,5 +145,5 @@ DIST xdg-2.1.0.crate 12444 BLAKE2B 616b52f46f3904f3da7584fba331b730a3fbc78e2b41f
 DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
 EBUILD lsd-0.16.0.ebuild 1392 BLAKE2B c1b8865714c255758cce5d34664ba768436fc50e4eb86eb9b5d6cd1794f6e7f0f902be5f586f44e3546765261345b0725340351403351a50284b841d917930a4 SHA512 d5e9098898f97cc1e6e5e2c796c90c66f6965967164871aabf876277f95b8214fcc552dad926ae8d4b27c91bdfc3a2a582055d185bb83fdcdec1e3bb0f7384c7
 EBUILD lsd-0.19.0.ebuild 2064 BLAKE2B 18d8629dce22033901a6baf22c888d06fd7f5c5b24eb7b5738fa212cabbdeffcf8854311062c37e99c7643047d24c6dba700c6b80be0ecd919a4c7916f83022b SHA512 8596e21e238b81c3fe14955dec85e528358580610313816ee8d872d45573dad6ebceacc0ccf3d0f023dd9788a6b43ac3b17696adb2819f6ba4d5c885aa49ef96
-EBUILD lsd-0.20.1.ebuild 2602 BLAKE2B 446e01519bafd2bbe8acaf79112cdc7e1d7f4957ed6e0da410559a6215d7435ebc737d7976fd6a6d093f84a901aa29c0d322847629c56e5aa4ed7e6f39d364d4 SHA512 851e2d845cc773d67249adbd328b52d7814d3d680853f84e2cfc74178c4827247b31ca0941385fdf701e3d27f0a2d62037a3490b5361b665a3318d0aaeeb432b
+EBUILD lsd-0.20.1.ebuild 2609 BLAKE2B 80724c4cba0301efea1d25a6dd6028a2d67fcfb76fa8152ed4fd769b782562baf3c25841e987db439d7e871cf2b662bea73bcff6081a6e585e6938d2b640e053 SHA512 c8d5391c932c26929a3fdf273384bb6d89a009a06567e97fb27615ec9e4ed6e967cd0340484ae7f29fcb152608f35dfd4ffb3b6201330885fce69e16334d69b8
 MISC metadata.xml 759 BLAKE2B 46f9729d738136d537cfed0a59cb6be6821b5b59bd4381171fce99943119cc477c54b03f303be47451ba9f8929fe94bb62c32881eb730ec11e306517afca505a SHA512 98a410b73a6a4f51f3e949a6e78087052580ce53e4720528aa9e97d3ddb052b6d6e1055cd2609f07d7a605c499e620843842461d514ddc84644f6cac007be599
diff --git a/sys-apps/lsd/lsd-0.20.1.ebuild b/sys-apps/lsd/lsd-0.20.1.ebuild
index d21203f06999..76daf0085bfa 100644
--- a/sys-apps/lsd/lsd-0.20.1.ebuild
+++ b/sys-apps/lsd/lsd-0.20.1.ebuild
@@ -112,7 +112,7 @@ SRC_URI="https://github.com/Peltoche/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 878ebe19403d..6085fc5e3a5e 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,6 @@
 DIST man-pages-5.11.tar.xz 1758092 BLAKE2B 45f1f8751f197f616913fd0084ead3ff7e3b3d11d0c3c70ecd43acbc621927cbb3582ffc7df5101887ec5c733e35a9c5321af9ddaf477e06da391c5af9eb6bc5 SHA512 2f57308fb331e0207ed4764d7753711caf74c0b74eef789612bc1869126be529450c7a2a7011fd6413eebea4ff0fee9a1ba0c94959652a3c747c780e83741450
 DIST man-pages-5.12.tar.xz 1778220 BLAKE2B 347c5ef63cb80134018f322f810545354ccc7afdb8acb62f83e3b06ef15d7fbe6c0c68db37f52ce9727682a856a7810a5e64f1dcbe1cc11b22f83fb0273f7add SHA512 455794ed6e3bf20649f78b464300d5c1adad5000668a82a1194c1af8bdcbd064e4d930696cbe534481368d6526c7cda69927e958b9a868d95891202476fb4608
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.11-r1.ebuild 1844 BLAKE2B 01ffab22fdb472dff042e9f6d99c4133de5c94903f9d64510dabccb4aa5756c5dc8f3e2ee098c8129312448a11d2a755d86ae5b6e2f4ce5c2f937fbf8c657c66 SHA512 558d9cff941082d9488e861a2832e9ef5943ed3dccdd20afb32e3fe0888bb6a203586ec6d1033ef78b974d670e114766c7a855894ab479ebe369de26fa1a1697
-EBUILD man-pages-5.12-r2.ebuild 1955 BLAKE2B a15709358bf511be71b57c9fc5a246d05bb6f461cdfdc06574138d6fdbeb8097fc6a9fa0b31d129077f8439ef2aeee1d6a2a0257ed66269b26910161672641a4 SHA512 bf6ef86098064bbea9611adaa748ce4684b4b57fc25484e7ecdd9e614cd24a2b54f1d52be57fd4a8f0c578b689e1de92a473f21a215d7a96f456ac2b6ed30be0
+EBUILD man-pages-5.11-r1.ebuild 1860 BLAKE2B c6b0c8340a4dede5566c26691d6f5897e9399a352b4a3138a2be17a772b1c6556918e4e7b85f93b4f5494cfaf8a7cd1689947235b932e6b1348f95277c39cb6e SHA512 effffa434388c270bd6d8f38cfd22c8a7d8d69a20f3f520140689c5e696a900b51418a7bfb64bff94751f9e8e50c414fae147882600013141126877b59744bcc
+EBUILD man-pages-5.12-r2.ebuild 1921 BLAKE2B 4bfc6fdf690209c553301f76c5ada93a73ac3ecad229ea71383375d92a47967e42952d01910ab6683c404ef4886c163f97cb3037ef64adacf4877e167ce5ae63 SHA512 ce7863cd6e9948d0a4435df70be60caa037f862e5ff35c5640ce961ed68e9de5d03a0f01feda155ee8838fa33010655c1ffe7122b088a95f2190adc0d25caa67
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages/man-pages-5.11-r1.ebuild b/sys-apps/man-pages/man-pages-5.11-r1.ebuild
index 003bfac75bbb..deec76a5b389 100644
--- a/sys-apps/man-pages/man-pages-5.11-r1.ebuild
+++ b/sys-apps/man-pages/man-pages-5.11-r1.ebuild
@@ -26,14 +26,14 @@ RDEPEND="
 	!<dev-libs/libbsd-0.8.3-r1
 "
 PDEPEND="
-	l10n_de? ( app-i18n/man-pages-l10n[l10n_de] )
-	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] )
-	l10n_it? ( app-i18n/man-pages-it )
+	l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] )
+	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] )
+	l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] )
 	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] )
-	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] )
-	l10n_pt-BR? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_pt-BR] )
-	l10n_ro? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_ro] )
+	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] )
+	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] )
+	l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] )
+	l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] )
 	l10n_ru? ( app-i18n/man-pages-ru )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 	sys-apps/man-pages-posix
diff --git a/sys-apps/man-pages/man-pages-5.12-r2.ebuild b/sys-apps/man-pages/man-pages-5.12-r2.ebuild
index fa7c93e7d50e..24b58ba3b70f 100644
--- a/sys-apps/man-pages/man-pages-5.12-r2.ebuild
+++ b/sys-apps/man-pages/man-pages-5.12-r2.ebuild
@@ -29,10 +29,7 @@ PDEPEND="
 	l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] )
 	l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] )
 	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] )
-	l10n_it? ( || (
-		app-i18n/man-pages-l10n[l10n_it(-)]
-		app-i18n/man-pages-it
-	) )
+	l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] )
 	l10n_ja? ( app-i18n/man-pages-ja )
 	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] )
 	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] )
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 09729edefcbb..0809ba024241 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,3 +1,3 @@
 DIST mawk-1.3.4-20200120.tgz 468855 BLAKE2B dd8bb8f66cb8bd67d8415ee25ce928113cf3f33f8135bc432a16f30b83df861cd2e29da9e0fac1dfb1a6796239d0c838ed72cf51467f8ed79b96068e3e1f1e93 SHA512 14d9a6642ce931bf6457d248fc2d6da4f0ea7541976ca282ea708b26df048f86fdf92c27f72d497501ccd43a244d1d1a606f1a2f266a7558306fea35dcc3041b
-EBUILD mawk-1.3.4_p20200120.ebuild 861 BLAKE2B d95c29bc349b1c7465a5b00b1d4277c2a8babaf8ea35099d348121df01f2e35b76bb120b0ed42d66002fdc315dd1bdb5e206d127ecec5e2357f865c83325f829 SHA512 d15be66fd63771e6d1aecd5cfbb3ba05e3148f7c613a57971691383534eb0f482b5d57956ce5cdb322ee723634fa4fa98001da4a30aeaacf3d11402d54ead7ab
+EBUILD mawk-1.3.4_p20200120.ebuild 860 BLAKE2B 0fddd17c7bac6b8260dda8daeaebe16be9d0b3eacdb1099685679a1d8b960fb0f456cc1b0e67ad0a9b6b4382f2f8645c28d2df2a25053f2e8549bb5c61839537 SHA512 a8bbb39c2bf2ed622831a0672ce1ca516d4de2a6b4ae128926292a368c6571ab09415c23e6cae0ca4caeec2550c528d95001c152dca9f20a28696d85abc5b472
 MISC metadata.xml 354 BLAKE2B e8a003a587171e7313564e5b8f97a607fc26b434e5045426789dc5e8e1fd54fac9830fb7b262b5b116b9c46f2eaffb8d24cc84aa0efea8b2adba659629d55b19 SHA512 64ebb5869d73b897984a63747eacda76fd6ba1b374e4995df9b3ff4b4e4908570dd2e0e6028581983486b5eb4ce2f61743da737eb353b2822ab8d5e16fe49bed
diff --git a/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
index 2df5944453c9..01feeb83d1ce 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 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"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index a539df74be77..fe497e961ded 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -4,9 +4,11 @@ DIST pkgcore-0.11.6.tar.gz 634191 BLAKE2B c06f24006be697771dd3d7569e3a27310dca56
 DIST pkgcore-0.11.8.tar.gz 631665 BLAKE2B 1e33ce394c1df9418d22fc8653fca4da1b4e27d53325167e3b7231fb8382f3c81daa7a93587ab2226116865546d4ca1ae1dd4265ccc2adc9cb9b27106d9c352b SHA512 42ed7c54db5fa48dffa5e3927afae32d1b4db92da41eff99c8eaa10232fdeae4e0f3f4d39b1e1b4e3881304523822a9a99575648809c554e3bdcf59d9eab485b
 DIST pkgcore-0.12.0.tar.gz 621376 BLAKE2B d58390ad7251fc48465d744a0b0694210d1f1cf505b072c06dc9731819b327b1edfa60d0f89db113852c87109c6340c8c13c72ae2d89b517d5fca34b53632b6b SHA512 d066a2f2deb4f654b04f9e78d37bf88a97f67f0396f5867ffe3a18f8c0d6459d73721b66cad52a50581ee10420694a1fd195b28a013b3a97cb1ebf08bc59598b
 DIST pkgcore-0.12.1.tar.gz 621918 BLAKE2B aa3bedaf4d58d8e604b19ce3e6f97242d29eadbbeab85b7de029d0230a5ea77e2ee96b128381964afe92a327674d64878f833d8c1ddc983c0fe1381b008e2d62 SHA512 a78f3ffd5610f14adb07e2adce07c8446012e742c777d08bbc7ac711bf194508d66a14d21aa56f5d0c9353bd10354fdd34bc6eb4b6017c03bff5d1b565a53575
+DIST pkgcore-0.12.2.tar.gz 621604 BLAKE2B 15964d9a73727028010b7267a61802566aa59f28769f4ac67aa91ccd32708b1a27914ba14957e1da848dc1a2a24ee9fbf92a7b4cee055a7cff22dd1f0d204f58 SHA512 192532dcee696e7ce159efad2f90597aa68801759ceb5ae85484a99a11242c1da98b73290ce1e4c9e29f2c92607989991b3802c4d0fb9bd1f4a866dd80f13cde
 EBUILD pkgcore-0.11.6-r1.ebuild 1127 BLAKE2B 044d792557c997a47814f18ef40a27b4136df40247a7ccd11c20bdf4baf5b2ac3cbb287c185ded8709409ce5d709a5fd4bfde145f1dd1e5f9a9350b7efa2162e SHA512 8795d3194db29c36862dd4d1ecf46e323f163a331b5aae2182aeca4e68838b446e64a1be7653e03662af18cac10e9849d9d736693df771828cc435e25f18a106
 EBUILD pkgcore-0.11.8-r3.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2
 EBUILD pkgcore-0.12.0.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2
 EBUILD pkgcore-0.12.1-r1.ebuild 1112 BLAKE2B 142795b861489cedd1abccd333803e814eda9356e32412dc5bcb6f68b17b5a5739f38eb53e9dd9faf2a2cdc170ccea9d0b1dcbca92b7dd196c1b16776a1d2199 SHA512 ce0e5e62ceb954ffe48ec510ddb658c2b43b3ce5b684c716a97ca9c2f61340bb1a1cbdace1fb2a24bb92fd4b7c7df5226814846195cbba3c6685fec18a89aa80
-EBUILD pkgcore-9999.ebuild 1095 BLAKE2B 917f74c8f372ca977fca3583b826c4be4133f6ee309974ccf5dbca85feaeedc4c60684a35e5ca181a8d704dbf893618b276f4dd4711d083766edc98c34d3104c SHA512 c092cd782306f476e1a71cb118a76fc53e8964b73b23a030eeb8c48ef73b12d69e2bda7803df6c356dacc6aff9b141b8c801e2739ac71875ec86780a2512da0f
+EBUILD pkgcore-0.12.2.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
+EBUILD pkgcore-9999.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.12.2.ebuild b/sys-apps/pkgcore/pkgcore-0.12.2.ebuild
new file mode 100644
index 000000000000..5c7eeb03645d
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.12.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~mips ~ppc ~ppc64 ~riscv ~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="
+	>=app-shells/bash-5.0
+	dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	test? (
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+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-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index be4a8d5836a1..5c7eeb03645d 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
@@ -20,7 +21,9 @@ HOMEPAGE="https://github.com/pkgcore/pkgcore"
 LICENSE="BSD MIT"
 SLOT="0"
 
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=app-shells/bash-5.0
+	dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
diff --git a/sys-apps/prctl/Manifest b/sys-apps/prctl/Manifest
index 4aac1db5d7c0..3f842300476d 100644
--- a/sys-apps/prctl/Manifest
+++ b/sys-apps/prctl/Manifest
@@ -3,4 +3,4 @@ AUX configure.ac 200 BLAKE2B 3ec747f56bb304484671171dd61c72cac8b264563955b7759b0
 AUX prctl-1.6-no-implicits.patch 381 BLAKE2B 4374744647de591232e9da6398465a5b9f31f75027f57ce7da5d2294321c6ee17d6bb3c4a108131602bdab7f6643aff2778313c764d659e15093a6cee1081fad SHA512 b01e17872a6c098ddbd4720cf62cd83d485fd1095a9da47c2f79cc09b50648a02bde2aeb38b8dec03d5be794223c898f2c753f576068540252071209e1701812
 DIST prctl-1.6.tar.gz 18876 BLAKE2B 9f26fec1d178141d7e5aa7390dc0403ab1774d711a12588074ee6dbf62c980ab3713179b2f476f20cac0d7e4b027899b144fa67164021dd13b10be3dc087fb2f SHA512 c5b70abbb76f76f4a4c53cebcbd34fa4e87d7db2278a2ea17128da30dea958cc4e4d75b641cb3b9fbd8fa56fee482e97dbae5e61c697e80ef4d13f4b6d28cfda
 EBUILD prctl-1.6-r1.ebuild 499 BLAKE2B 33fa444df6679fb2f43b47bd1cb495fb3ea5ff1592c2323c8d772e0e8adf31ecff263ad3c6a170282a83734957295cb8e1813eb348671b4a742cb646aeda2d40 SHA512 9c613de230c09e8ea956fa83b25b0f38fdcdd44f4ab8118ec84b3870681d3f04d46913679eabb9edd49f2457411b7e0182ecb7ad63a9a2683002a8204cecc05a
-MISC metadata.xml 326 BLAKE2B 0133c9224a3685844700784a04d8fd4a9bc5ff6f98213e84bc2d3e12efb8d68dbbc9cbb250c058fed38a903b75bbe908459db58dee9b6725479b8289277aa450 SHA512 bc575ce8fb40e554f52ed9a0154b9d5952538d6703d45a2b7bed559c452458e2bd57cd057771c8db351665f9737dbd1de95471e4cd2884505241514938bb5ffe
+MISC metadata.xml 242 BLAKE2B e035600b599efc420043b50b7940aec24ffd914dc17638a8ed2819f44178ad871a3314e48d045035d51ce25d6fe0b6ec290e133bf77b2d84e9e699bda5a9943f SHA512 c42d94f1c68588a23d01b5ed90cd8ca395294369c5c9865ec50a5c6f134ad6015fe920f1169599f83ad6fc1889f0e445429851b12c4eee9c1150c8eeaf79bd72
diff --git a/sys-apps/prctl/metadata.xml b/sys-apps/prctl/metadata.xml
index 5dd84ef1cd45..809e63b64538 100644
--- a/sys-apps/prctl/metadata.xml
+++ b/sys-apps/prctl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">prctl</remote-id>
 	</upstream>
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 9262c8566857..56616995e2db 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,8 +1,8 @@
-AUX rng-tools-6.13-various-autotools-fixups.patch 2854 BLAKE2B f29fc73edbf7a14e92bde4bb18982ba688cf3f11ecd4dc9c19c058c5ccb66bf110ea270ac64bf5d7aff4b5411e8713fb94ba86df6a3f0a4959be5763e0ba99ee SHA512 5dc08943a0d1f267b595ddaec6fb7faa1f4a7554fea4ea2956123cb59d041bc7c7e1fab4a1d44041ea0cba57ab42b29bf7fdbb00a74dff2cebf0a6cd46944e96
+AUX rng-tools-6.13-various-autotools-fixups.patch 3845 BLAKE2B 83087f451411a57c1426d5510241a9cc3fe887d9b38b341e60b9e9c00cc063f9bc96ffc18c48ebf067a8428464c7e7503adcbc54d98bb01ebcbdfdb338a4b908 SHA512 c7f43976f64955bf15922389201ba3c2c10c1eabb63b6eb613d3ac49f2910f0ed6c3996ba0001126255728be6d792c3515bc9578109979d62d166f0fb575b67c
 AUX rngd-confd-6.11 2321 BLAKE2B 6cdf4cf7d61e33415df1c41933d1c38c398fd96370cb4c4e257f60479a3e69428d3735802d480e1a25714854de9bc6ed997856c1c4dbbf289b7a014026522aea SHA512 32c52316ebdffef7ec07dd97b45f124c2ecced3d0f49d75ad8d226f6eff478739dab6b008e0b1f4e55bc81bf615feee9860c45f35f0994c7c65d4d439501621f
 AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9d75253a7f84c265536db1b70b290e0029cfaf40e565c8b280e3b1ec79ab93c8f659c969b5dedc7dab SHA512 60bf2c2d4984a1db8fcfaeaebd5249ed6d428c9ccb8412813ce97e146f3143efae23058475ac8baa1c2e88b00012fc119411bcfc14b04a0128696ee69641d98d
 DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb
 DIST rng-tools-6.13.tar.gz 59311 BLAKE2B e4601a2fa8158775a8ef7188edbe61a5eb1df35dccc9e1a0ab6b31b559f2f11dd67b682cf9995f0a67834690417e283d443ae6fa54e99ab6462a1185f9b9e09b SHA512 def5f2dcdd1771e8fe5af9476de866ff89a225065416672165af6019cbb166f874fae936b3705221aa47dc13ae99fa63d054d7d49b612f3151cd922a0a129490
 EBUILD rng-tools-6.11-r1.ebuild 1793 BLAKE2B 07215f34a520bea511c8931960af5fccdf3b92cfcb5c2ba70881ae80cac1229a5cbd40a80ccc167dc0a248ac0712d47b2a9ec03fd9c314ce528bed3cc421e196 SHA512 ea1a99eb14f59c685c2d4ea8823051b807f36fd1573ccc66a6c3fe93fb10dc278a72af901767819759832549272be5de96afbac7b7d897ea72473e45b8fc8b47
-EBUILD rng-tools-6.13.ebuild 1705 BLAKE2B a6ca110edd7f950372bb3d746d32631542a3bc7e6f9eb682fe68fe0253585efe17da60ca46bbcb78f57e25194077818bf09ecb8a0a694694172dd4054851ac2a SHA512 c8d318d9d0ad66c3ae93bacd89df17a719c7de74ef00b0f109782a7d9fcca17ba5df5be636b7c92bf8a60de21a2e1007380efc039cde043d8274d6712097e466
+EBUILD rng-tools-6.13-r1.ebuild 1704 BLAKE2B 3005edac0db4da6d2222973f4a837d025742bb6c6e67fcdba9e4fde45b00ada12b1d3a9ee9e4f42fb4eb4b5d3a7575ee7252eaaa97c3879f85bea56df3dfec2b SHA512 8b7167cc590171dc2ab071b7fb63f245b2647cf086599b76fc5d58c33977af3672c3e6cc842b246bb072bc9b3d66b98856ead1369a009039b58a5a1e7194fd84
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch b/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
index 4ad2348dad96..8cb68ae9b02a 100644
--- a/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
+++ b/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
@@ -1,4 +1,5 @@
 https://github.com/nhorman/rng-tools/pull/132
+https://github.com/nhorman/rng-tools/pull/143
 
 From 16b728f9a5bb138386fa770de817ec244a158be5 Mon Sep 17 00:00:00 2001
 From: David Seifert <soap@gentoo.org>
@@ -76,3 +77,27 @@ Subject: [PATCH 3/3] `AC_CANONICAL_TARGET` -> `AC_CANONICAL_HOST`
  AM_CONDITIONAL([JITTER], [false])
  
  AC_ARG_ENABLE(jitterentropy,
+From 800d7c6e23f0a04bd893ee748a74b622657017a9 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sun, 1 Aug 2021 13:16:16 +0200
+Subject: [PATCH] configure.ac: Add missing `test`
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0fe06fc..7c8e327 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,8 +68,8 @@ AC_PROG_GCC_TRADITIONAL
+ 
+ AX_PTHREAD
+ 
+-AM_CONDITIONAL([RDRAND], [test $host_cpu = x86_64 || $host_cpu = i686])
+-AS_IF([test $host_cpu = x86_64 || $host_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
++AM_CONDITIONAL([RDRAND], [test $host_cpu = x86_64 || test $host_cpu = i686])
++AS_IF([test $host_cpu = x86_64 || test $host_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
+ 
+ AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le])
+ AS_IF([test $host_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
diff --git a/sys-apps/rng-tools/rng-tools-6.13-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.13-r1.ebuild
new file mode 100644
index 000000000000..1e3e35cf30a9
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.13-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 systemd readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="https://github.com/nhorman/rng-tools"
+SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
+IUSE="jitterentropy nistbeacon pkcs11 selinux"
+
+DEPEND="
+	dev-libs/openssl:0=
+	jitterentropy? ( app-crypt/jitterentropy:= )
+	nistbeacon? (
+		dev-libs/jansson
+		dev-libs/libxml2:2=
+		net-misc/curl[ssl]
+	)
+	pkcs11? ( dev-libs/libp11:= )
+	elibc_musl? ( sys-libs/argp-standalone )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rngd )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	# backport, remove on bump
+	"${FILESDIR}"/${P}-various-autotools-fixups.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable jitterentropy)
+		$(use_with nistbeacon)
+		$(use_with pkcs11)
+		--without-rtlsdr # no librtlsdr in the tree
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/rngd-initd-6.11 rngd
+	newconfd "${FILESDIR}"/rngd-confd-6.11 rngd
+	systemd_dounit rngd.service
+
+	if use pkcs11; then
+		local DISABLE_AUTOFORMATTING=1
+		local DOC_CONTENTS="
+The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
+to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
+	'${EPREFIX}/etc/conf.d/rngd'
+reflects the correct PKCS11 engine path to be used by rngd.
+"
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	use pkcs11 && readme.gentoo_print_elog
+}
diff --git a/sys-apps/rng-tools/rng-tools-6.13.ebuild b/sys-apps/rng-tools/rng-tools-6.13.ebuild
deleted file mode 100644
index a053373f0109..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.13.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 autotools systemd readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="https://github.com/nhorman/rng-tools"
-SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE="jitterentropy nistbeacon pkcs11 selinux"
-
-DEPEND="
-	dev-libs/openssl:0=
-	jitterentropy? ( app-crypt/jitterentropy:= )
-	nistbeacon? (
-		dev-libs/jansson
-		dev-libs/libxml2:2=
-		net-misc/curl[ssl]
-	)
-	pkcs11? ( dev-libs/libp11:= )
-	elibc_musl? ( sys-libs/argp-standalone )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rngd )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	# backport, remove on bump
-	"${FILESDIR}"/${P}-various-autotools-fixups.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable jitterentropy)
-		$(use_with nistbeacon)
-		$(use_with pkcs11)
-		--without-rtlsdr # no librtlsdr in the tree
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/rngd-initd-6.11 rngd
-	newconfd "${FILESDIR}"/rngd-confd-6.11 rngd
-	systemd_dounit rngd.service
-
-	if use pkcs11; then
-		local DISABLE_AUTOFORMATTING=1
-		local DOC_CONTENTS="
-The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
-to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
-	'${EPREFIX}/etc/conf.d/rngd'
-reflects the correct PKCS11 engine path to be used by rngd.
-"
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	use pkcs11 && readme.gentoo_print_elog
-}
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 38cadc69d905..efe97ce72cd8 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -4,10 +4,11 @@ AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d3
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX pam.d-include/shadow-r1 116 BLAKE2B bc7baa8e224cb90b6ef79762941b3b7505fcf4b8ed8c5da06a33a8a7fefa91098e4ac0c0f915eeca4a19714d60a2bf43e3922805347e3dfe0ccc80f210bf88e4 SHA512 ddecc5cc8f667f9931ddf5d98d89a986712c5a6e44826add1e1d9ead37064758a3879f6afd1fc45c89c216956593852051e2ef3abc52e2ab58a0e191adfe75d1
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
+AUX shadow-4.9-libcrack.patch 738 BLAKE2B 7ba0fd5e2c9c81bbefa75b2f1e29ed94ae32f302cf81c9ff978319bdb81a905248a638a535131df92c401383c184b22aff174d1a366e37a9dbb8756c9f7975ba SHA512 c967227926a5bd2c511ecc9d4e39b39aef50615404c79ad30d1e7bb967e09d52669ac9e2047d7d5039cdfad9b2dcf53f2de17a6d917cecbf9c8a72a77f1c0a10
 AUX shadow-4.9-libsubid_oot_build.patch 2933 BLAKE2B 9bc638bd1d0733c6e51b54ab1f1db132bd4499a24b33efc76c58c306267015ebd9e2e927e774c3631cfa94490bb249b4d2267a163ae85f9f6ba18b964fcc81d4 SHA512 7f42cd84cb606fde19750f26883c4650642499dc6cb0078bc733d5d61a51b39c9f1c3898000e2df8ceb84eaecadbab6ae502178bf51d205fe644bb8c58a62bfa
 AUX shadow-4.9-libsubid_pam_linking.patch 706 BLAKE2B 8d9b3f6ab2aea004275e6347568013b0092beb57d08a51e6bbca0480773525518febd0ec975dd37a9c071c5ec17d56541586b9afa12010081a392dc60cee4c13 SHA512 49a40045520358d1fb29daae30f9fef1f8aab4516596f16781d3702642ef70592959536d69f4755d57689fc6e30d029c5dfc545d95362e811a284900cb628b6b
 DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe916b36d993802b3ce42594de332a9bc22933a28881af3d317a340eab017ada55511b4e4fbc3ca6b422c4bc254 SHA512 780a983483d847ed3c91c82064a0fa902b6f4185225978241bc3bc03fcc3aa143975b46aee43151c6ba43efcfdb1819516b76ba7ad3d1d3c34fcc38ea42e917b
 DIST shadow-4.9.tar.xz 1627008 BLAKE2B 7a9a6a489115c7a20520cfec61f008fc0f70f7f50aaf539e94dfdcb20035d2de88ab3198e76812a4e3eb944b92c76c0ca2e85e35f4342537711c2c033248a72b SHA512 254cda49bb14505a7604821e7fa898bf4bf317d648e9ddc881ab80a6860d52053dfffacad6feab87c7d16608c35ed6b6cee99e7757eac930da3a7b31cdcd4b95
 EBUILD shadow-4.8.1-r4.ebuild 6134 BLAKE2B a3effe54f52408bfee5ed17134a58806e005aab38391d4ff78888e3ae18c86f0d76dd946c2494bc92901e8400e7b98db0e4045f004a8880cb6c437acff28d560 SHA512 2e7375dd6c94bdc85eabfe8cb65d0c7df4bb1bc9b2aff418824046a8af80493f3a481476f63bdc91abca4aefcc61105b2aa6c551e8b260b8da1db2d0587b56fb
-EBUILD shadow-4.9-r1.ebuild 6299 BLAKE2B 248e374de4098b388e264561bf43179d33d65421fc6ab02c036d296b4abae40c9bd0fc13752da8244ea270e286cfc285618efaa466138b1f6334764a917e4506 SHA512 80f60d49b550420b1512ac4484ea845e0fde472746b90f32bbe631012607cf19c87d278c098f27ce1905234f0746833a63514d481be7df83717da6aae43a9be0
+EBUILD shadow-4.9-r1.ebuild 6340 BLAKE2B ebe11dd7bb7776f9580ee2de30cd5a16dc1aa166f4780ba9235d216f4832cdde995a1be0f20c973318ca0c393d9fd7b1ae7c5cab41a84d3547de12773315f036 SHA512 46f7ef1b3be5cb224e787f1fa1cff5e30bdcc55ab7268d3ac376ba5e570f7746debf714a290ebfe82277d2c669272d67e0429b21f06aaa1cb8113bf71d0896f5
 MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/files/shadow-4.9-libcrack.patch b/sys-apps/shadow/files/shadow-4.9-libcrack.patch
new file mode 100644
index 000000000000..5c954feac1ae
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.9-libcrack.patch
@@ -0,0 +1,27 @@
+From 6becc82e262205f8a23bf9fe1127af57286826ee Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 2 Aug 2021 11:51:44 -0400
+Subject: [PATCH] libsubid: fix build with libcrack
+
+Fixes a link failure:
+
+  ../libsubid/.libs/libsubid.so: undefined reference to `FascistCheck'
+
+Bug: https://bugs.gentoo.org/806124
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ libsubid/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am
+index 8bba02ab..bfc982ef 100644
+--- a/libsubid/Makefile.am
++++ b/libsubid/Makefile.am
+@@ -11,6 +11,7 @@ MISCLIBS = \
+ 	$(LIBAUDIT) \
+ 	$(LIBSELINUX) \
+ 	$(LIBSEMANAGE) \
++	$(LIBCRACK) \
+ 	$(LIBCRYPT_NOPAM) \
+ 	$(LIBSKEY) \
+ 	$(LIBMD) \
diff --git a/sys-apps/shadow/shadow-4.9-r1.ebuild b/sys-apps/shadow/shadow-4.9-r1.ebuild
index 4e3c4cc53a2b..545c8cb652b1 100644
--- a/sys-apps/shadow/shadow-4.9-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.9-r1.ebuild
@@ -56,6 +56,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
 	"${FILESDIR}/${P}-libsubid_pam_linking.patch"
 	"${FILESDIR}/${P}-libsubid_oot_build.patch"
+	"${FILESDIR}/shadow-4.9-libcrack.patch"
 )
 
 src_prepare() {
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index 5ff3711c08b3..eff0069937ba 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -1,12 +1,13 @@
+AUX 249-sys-include-posix.patch 1831 BLAKE2B eaea99f57a189d77789c9b61ed7962f108f1ed733e3ab8d76fb8dd4849faf8f05338f3addaaad97ba2f8796200de0f5079d3838d995ba2519b7d4ea2a568d0d5 SHA512 3d98055f2beb22fe5607125585929fc531b790f489779dcd162541b5461a9da15d76e7a713f6476a3278073e6fd2488bc0af19eca952f6534d90aadb81ef644f
 AUX musl-1.2.2.patch 656 BLAKE2B 73abdd679bfb99f8085e3341a80059f62e836622c765c89d4d0e8123f8ad391eca5a0eacf006f1a92bcfce278e806bc565972c2cf2b0c08862a4bcda4799d7f1 SHA512 a72ebb54d7f7b2ba9fbfcae1a6d03ff5bc0511923429502e1dd1c19bb57b06b184e0c762a5b9a9d824a72c2a3e293f7805b7f0cd7be9b8b4d9be676b39c7604d
 AUX stmpfiles-dev.initd 421 BLAKE2B af962a76a2f3985aff460193a9bdcb7d340a3cf0a5c7cb65150dade564dc780d91634028b5f8a87750be66e6c47bbe519088fbc0c46047f180e93c3eabffc16d SHA512 1eac910984bda9ba5d8e9c5b17718c356f90b41ccf22bb68393b4f00901c8999501e1b482decbf22e6a16157f430eee159b3332f6e82a9442423adc884057475
 AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f547755f0631f5f37f2d6e1382e361878aed80545bbb5ba198b564337e4083c073f73552d8bed4a8732ff6b819f SHA512 12201b6a3d7f4a178ca9504638cbbc7e518c5075ce9a3b2653650960b54225f3516381dd4e0366d13f16aecaa1dec40ad1a41ef1f849b6c45be81c49108bdccd
 AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40
 AUX systemd-tmpfiles-246-musl-mallinfo.patch 2317 BLAKE2B b2d7d82fadfb42273ae37cf57da569421c0ac3334d27e404035fccc0fe70e4bc6b44dc4b5d19c5d95cc9f5761a384497606653a94c8951df9353600da174d989 SHA512 c008e2f6b6a63b36bd582e09c35109093a2883f3fc8b784e15990f5ccdb17f3922d5a6468a89b61ad530bdaed1c667c5c0a6554b23cf80e2bd01812d068d4a59
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
-DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485
+DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c SHA512 4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a
+DIST systemd-stable-249.2.tar.gz 10591728 BLAKE2B fb24c681cf2328aa26fa49a8ba20cccd1ee0fae82ec9f9931a69eaa377fc01b2ece12fdf407444514d494b8ac1418f155b0fceeff4925bebaba691f0b8a2acc8 SHA512 4f42a0b93156529a464545361436fa98193e12a7e0809315b9fdedbcf33b81dd2037acac27fb0dfefcb2679bc49ebb6da4d152ecb4b15db797c81f7ca4588a11
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
-DIST systemd-tmpfiles-248.3-musl.tar.xz 22904 BLAKE2B a277ce86577644cecbca5dbfde34aec494e3e14075ab4f7fcbb02f9307d714a93ca63f38e346a1e98391ca9c55860c7e90789cd5edb9b196cf638d54bfe1153b SHA512 d3db6a90bed6b6c1a9f6bce138137554742d1bc60da142fbadbd49b64677a562e47d8140b9c413857106e053d740476744b7f7e05af9dd4a1329058c78cef940
 EBUILD systemd-tmpfiles-246.ebuild 4802 BLAKE2B cea13522b54ef9644dc274e4ccf3c3f2532f93eec3b7edb467e0505479a42463576dd971377407067f59f34edcc0e6a5f994ed16a6b9a0a532ee23241d80ffde SHA512 1cbf46e13a8a48e9e6659e580dfa81c356337ed63baae7a8ebae055e60932ad83283de1be9922104f57d61fc44dab9750fb7cad37a5e5f4896544e3c932453cd
-EBUILD systemd-tmpfiles-248.3.ebuild 5466 BLAKE2B ca9ce4c359614a3b2f632dd482758f87e977aa81a238efd39a70a4d3739888ef5ec763f0dec927aad41b97e72a5b9d8595992484fd43facef0cbf421ee91b45d SHA512 946c0c0127665c715b8986b416d4c08a1bc97953f0501dbfd283e95a5210138f6ebbcd26c8e939b64e614423f4b03b69781c5dc12ab85a8caa9a04028a077192
+EBUILD systemd-tmpfiles-249.2.ebuild 5910 BLAKE2B 040f11ac201f67fad61449f848bd8df4eb14b12fbb77596b88ad074a27372eab05a714e7cea1f3f2eff904555f2fd939b601cf2047f3c03c3efe92f71f1685be SHA512 edff3dd451bd6132b1757100e414bace0e99f241c03be525219e8596ee90c5af7cbcdcd5b6c0c55ce1b54b958fd0912ed1ac7efd13b93f07f54f0774256ac5cf
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch b/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch
new file mode 100644
index 000000000000..6d9e0039b9c9
--- /dev/null
+++ b/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch
@@ -0,0 +1,67 @@
+Silence annoying #warning's on musl
+
+https://github.com/systemd/systemd/pull/20362
+https://github.com/systemd/systemd/pull/20364
+
+From f8d54f7810aeea5ff27a5db03e1aab7ea54c8268 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Mon, 2 Aug 2021 12:41:38 +0200
+Subject: [PATCH] Use correct `<fcntl.h>` include
+
+* `<sys/fcntl.h>` is not specified in POSIX
+---
+ src/basic/fileio.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/basic/fileio.h b/src/basic/fileio.h
+index af797cfafdbf..4295b84a85c5 100644
+--- a/src/basic/fileio.h
++++ b/src/basic/fileio.h
+@@ -2,11 +2,11 @@
+ #pragma once
+ 
+ #include <dirent.h>
++#include <fcntl.h>
+ #include <stdbool.h>
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <sys/stat.h>
+-#include <sys/fcntl.h>
+ #include <sys/types.h>
+ 
+ #include "macro.h"
+From 2b6c0bb2a341c95223ce672249e43c743b03d78c Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Mon, 2 Aug 2021 16:09:10 +0200
+Subject: [PATCH] Use correct `<poll.h>` include
+
+* `<sys/poll.h>` is not specified in POSIX
+---
+ src/shared/nscd-flush.c | 2 +-
+ src/shared/varlink.c    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/nscd-flush.c b/src/shared/nscd-flush.c
+index dfc47c423441..19e16d93455c 100644
+--- a/src/shared/nscd-flush.c
++++ b/src/shared/nscd-flush.c
+@@ -1,5 +1,5 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #include "fd-util.h"
+ #include "io-util.h"
+diff --git a/src/shared/varlink.c b/src/shared/varlink.c
+index 3a53c16a7242..4033947d3b8c 100644
+--- a/src/shared/varlink.c
++++ b/src/shared/varlink.c
+@@ -1,7 +1,7 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ 
+ #include <malloc.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #include "alloc-util.h"
+ #include "errno-util.h"
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
deleted file mode 100644
index ff052d6a4b1c..000000000000
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *.* ]]; then
-	MY_PN=systemd-stable
-else
-	 MY_PN=systemd
-fi
-
-MINKV="3.11"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit flag-o-matic meson python-any-r1
-
-DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz
-	elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/${P}-musl.tar.xz )"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-apps/acl:0=
-	>=sys-apps/util-linux-2.30:0=
-	sys-libs/libcap:0=
-	selinux? ( sys-libs/libselinux:0= )
-	!sys-apps/opentmpfiles
-	!sys-apps/systemd
-"
-
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	sys-devel/m4
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# musl patchset from:
-	# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
-	# check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches
-	if use elibc_musl; then
-		einfo "applying musl patches and workarounds"
-		eapply "${WORKDIR}/${P}-musl"
-
-		# avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch
-		append-cflags '-D__UAPI_DEF_ETHHDR=0'
-
-		# src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’,
-		# but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’}
-		# not a nice workaround, but it comes from debug messages and we don't really use this component.
-		append-cflags '-Wno-error=format'
-	fi
-
-	default
-
-	# https://bugs.gentoo.org/767403
-	python_fix_shebang src/test/*.py
-	python_fix_shebang test/*.py
-	python_fix_shebang tools/*.py
-}
-
-src_configure() {
-	# disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries"
-	# and optionally selinux feature can be enabled to make tmpfiles secontext-aware
-	local systemd_disable_options=(
-		adm-group
-		analyze
-		apparmor
-		audit
-		backlight
-		binfmt
-		blkid
-		bzip2
-		coredump
-		dbus
-		efi
-		elfutils
-		environment-d
-		fdisk
-		gcrypt
-		glib
-		gshadow
-		gnutls
-		hibernate
-		hostnamed
-		hwdb
-		idn
-		ima
-		initrd
-		firstboot
-		kernel-install
-		kmod
-		ldconfig
-		libcryptsetup
-		libcurl
-		libfido2
-		libidn
-		libidn2
-		libiptc
-		link-networkd-shared
-		link-systemctl-shared
-		link-timesyncd-shared
-		link-udev-shared
-		localed
-		logind
-		lz4
-		machined
-		microhttpd
-		networkd
-		nscd
-		nss-myhostname
-		nss-resolve
-		nss-systemd
-		oomd
-		openssl
-		p11kit
-		pam
-		pcre2
-		polkit
-		portabled
-		pstore
-		pwquality
-		randomseed
-		resolve
-		rfkill
-		seccomp
-		smack
-		sysext
-		sysusers
-		timedated
-		timesyncd
-		tpm
-		qrencode
-		quotacheck
-		userdb
-		utmp
-		vconsole
-		wheel-group
-		xdg-autostart
-		xkbcommon
-		xz
-		zlib
-		zstd
-	)
-
-	# prepend -D and append =false, e.g. zstd becomes -Dzstd=false
-	systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
-	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
-
-	local emesonargs=(
-		-Dacl=true
-		-Dtmpfiles=true
-		-Dstandalone-binaries=true # this and below option does the magic
-		-Dstatic-libsystemd=true
-		-Dsysvinit-path=''
-		${systemd_disable_options[@]}
-		$(meson_use selinux)
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	# tmpfiles and sysusers can be built as standalone and link systemd-shared in statically.
-	# https://github.com/systemd/systemd/pull/16061 original implementation
-	# we just need to pass -Dstandalone-binaries=true and
-	# use <name>.standalone target below.
-	# check meson.build for if have_standalone_binaries condition per target.
-	local mytargets=(
-		systemd-tmpfiles.standalone
-		man/tmpfiles.d.5
-		man/systemd-tmpfiles.8
-	)
-	meson_src_compile "${mytargets[@]}"
-}
-
-src_install() {
-	# lean and mean installation, single binary and man-pages
-	pushd "${BUILD_DIR}" > /dev/null || die
-	into /
-	newbin systemd-tmpfiles.standalone systemd-tmpfiles
-
-	doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
-
-	popd > /dev/null || die
-
-	# service files adapter from opentmpfiles
-	newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev
-	newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup
-
-	# same content, but install as different file
-	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev
-	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup
-}
-
-src_test() {
-	# 'meson test' will compile full systemd, but we can still outsmart it
-	"${EPYTHON}" test/test-systemd-tmpfiles.py \
-		"${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed"
-}
-
-# stolen from opentmpfiles ebuild
-add_service() {
-	local initd=$1
-	local runlevel=$2
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	mkdir -p "${EROOT}/etc/runlevels/${runlevel}"
-	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
-}
-
-pkg_postinst() {
-	if [[ -z $REPLACING_VERSIONS ]]; then
-		add_service stmpfiles-dev sysinit
-		add_service stmpfiles-setup boot
-	fi
-}
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
new file mode 100644
index 000000000000..66a216552215
--- /dev/null
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
@@ -0,0 +1,254 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *.* ]]; then
+	MY_PN=systemd-stable
+else
+	 MY_PN=systemd
+fi
+
+MINKV="3.11"
+MUSL_PATCHSET="${PV%.*}.1-r1"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit flag-o-matic meson python-any-r1
+
+DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz
+	elibc_musl? (
+		https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+		https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+	)"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-apps/acl:0=
+	>=sys-apps/util-linux-2.30:0=
+	sys-libs/libcap:0=
+	selinux? ( sys-libs/libselinux:0= )
+	!sys-apps/opentmpfiles
+	!sys-apps/systemd
+"
+
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	# backport from 250 to silence musl warnings
+	"${FILESDIR}/249-sys-include-posix.patch"
+)
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# musl patchset from:
+	# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
+	# check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches
+	# we share patch tarball with sys-fs/udev
+	if use elibc_musl; then
+		einfo "applying musl patches and workarounds"
+		eapply "${WORKDIR}/musl-patches"
+
+		# avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch
+		append-cppflags '-D__UAPI_DEF_ETHHDR=0'
+
+		# src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’,
+		# but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’}
+		# not a nice workaround, but it comes from debug messages and we don't really use this component.
+		append-cflags '-Wno-error=format'
+	fi
+
+	default
+
+	# https://bugs.gentoo.org/767403
+	python_fix_shebang src/test/*.py
+	python_fix_shebang test/*.py
+	python_fix_shebang tools/*.py
+}
+
+src_configure() {
+	# disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)"
+	# and optionally selinux feature can be enabled to make tmpfiles secontext-aware
+	local systemd_disable_options=(
+		adm-group
+		analyze
+		apparmor
+		audit
+		backlight
+		binfmt
+		blkid
+		bzip2
+		coredump
+		dbus
+		efi
+		elfutils
+		environment-d
+		fdisk
+		gcrypt
+		glib
+		gshadow
+		gnutls
+		hibernate
+		hostnamed
+		hwdb
+		idn
+		ima
+		initrd
+		firstboot
+		kernel-install
+		kmod
+		ldconfig
+		libcryptsetup
+		libcurl
+		libfido2
+		libidn
+		libidn2
+		libiptc
+		link-networkd-shared
+		link-systemctl-shared
+		link-timesyncd-shared
+		link-udev-shared
+		localed
+		logind
+		lz4
+		machined
+		microhttpd
+		networkd
+		nscd
+		nss-myhostname
+		nss-resolve
+		nss-systemd
+		oomd
+		openssl
+		p11kit
+		pam
+		pcre2
+		polkit
+		portabled
+		pstore
+		pwquality
+		randomseed
+		resolve
+		rfkill
+		seccomp
+		smack
+		sysext
+		sysusers
+		timedated
+		timesyncd
+		tpm
+		qrencode
+		quotacheck
+		userdb
+		utmp
+		vconsole
+		wheel-group
+		xdg-autostart
+		xkbcommon
+		xz
+		zlib
+		zstd
+	)
+
+	# prepend -D and append =false, e.g. zstd becomes -Dzstd=false
+	systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
+	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
+
+	local emesonargs=(
+		-Dacl=true
+		-Dtmpfiles=true
+		-Dstandalone-binaries=true # this and below option does the magic
+		-Dstatic-libsystemd=true
+		-Dsysvinit-path=''
+		${systemd_disable_options[@]}
+		$(meson_use selinux)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	# tmpfiles and sysusers can be built as standalone and link systemd-shared in statically.
+	# https://github.com/systemd/systemd/pull/16061 original implementation
+	# we just need to pass -Dstandalone-binaries=true and
+	# use <name>.standalone target below.
+	# check meson.build for if have_standalone_binaries condition per target.
+	local mytargets=(
+		systemd-tmpfiles.standalone
+		man/tmpfiles.d.5
+		man/systemd-tmpfiles.8
+	)
+	meson_src_compile "${mytargets[@]}"
+}
+
+src_install() {
+	# lean and mean installation, single binary and man-pages
+	pushd "${BUILD_DIR}" > /dev/null || die
+	into /
+	newbin systemd-tmpfiles.standalone systemd-tmpfiles
+
+	doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+
+	popd > /dev/null || die
+
+	# service files adapter from opentmpfiles
+	newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev
+	newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup
+
+	# same content, but install as different file
+	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev
+	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup
+}
+
+src_test() {
+	# 'meson test' will compile full systemd, but we can still outsmart it
+	"${EPYTHON}" test/test-systemd-tmpfiles.py \
+		"${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed"
+}
+
+# stolen from opentmpfiles ebuild
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}"
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+}
+
+pkg_postinst() {
+	if [[ -z $REPLACING_VERSIONS ]]; then
+		add_service stmpfiles-dev sysinit
+		add_service stmpfiles-setup boot
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 464588813580..c31ce40dc2e4 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -6,7 +6,7 @@ AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f1
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
 DIST systemd-stable-248.6.tar.gz 10388927 BLAKE2B a102d0fd37a3422f673ced2bbd5bb88b6589195e1f436f43231fd91d79aaf9f548154a3ab2a62a9b409527b3f2e7a9ea735925364ece15c2e151d06c0e4f303f SHA512 35a9d4a9ae04423959c71ad0175d04a1792b9ab39897a497776b93cea166de58b8fb111207c104c0e747d3ffbd85480d8b0cab38e3dc0defbbf09b15211954ce
 DIST systemd-stable-249.2.tar.gz 10591728 BLAKE2B fb24c681cf2328aa26fa49a8ba20cccd1ee0fae82ec9f9931a69eaa377fc01b2ece12fdf407444514d494b8ac1418f155b0fceeff4925bebaba691f0b8a2acc8 SHA512 4f42a0b93156529a464545361436fa98193e12a7e0809315b9fdedbcf33b81dd2037acac27fb0dfefcb2679bc49ebb6da4d152ecb4b15db797c81f7ca4588a11
-EBUILD systemd-248.6.ebuild 15190 BLAKE2B 62e9e842209da6ab45c25c4e4ff582477fd0f3b89c84b312a81155d69defa33833d767fb5fced0c3a56de24fd64c1c05ef4431a95b8f1ac7924f19ad9a46619f SHA512 f25e1f5e5ebcefca0f495e50cf7a9eceae12d48ca8e4b5156c1098a6767a00c21e57f12399d3996042071040daab03a4182d5fc71b6fea6722d8983892416bb2
-EBUILD systemd-249.2.ebuild 14900 BLAKE2B c5a24664029ef8024c66515c4638c9d150105c207f71b8e506ce6e55d00ff6a183e94ade8c1a5920732d9c198a8820ffa4f55ec881662b0bc328bf6c214c61d4 SHA512 4f97d6c63057e2684e517684d74465d19de38dcc000ca27efad81b531047881e604b3224dd4b6e23738af2e5e3b5472d2f79c9f0869aa0300892f608309a3e23
-EBUILD systemd-9999.ebuild 14812 BLAKE2B aee682e4b01400bd2fd3b347be8f219014681e2ce314ec64bc0d51c9187e1c06239efef9985b7c88580ec29e333f3ac959ab8df7d943b5be0ea3c3e3b7b1948f SHA512 0199f497a1d5607f7b1f751efdac6eed18eff34b1d6e8276bf6004778006cba09fe0cbc952e6a178efa44d77f959a2e8f6080c9cce6fa3f2b39097ff6bd59d8b
+EBUILD systemd-248.6.ebuild 15225 BLAKE2B e6f52236abedad5db4c80f01aeff4f5df3c9542f733945e33128e45da4ae758c2182d00583c690f359131e0bdb88968122b39360f97adf4f5b8d2ff8347c74c4 SHA512 3c03bbbb6d50b7cfb78b9f0932f988241efea10785b3f83accfe3edd9b98dd39da9572aeab5ac3779db8c72645bb1e436155b8a71800f30f12e4b1a4755428d3
+EBUILD systemd-249.2.ebuild 14935 BLAKE2B 7ad2fa83ae177e7d3f36631f253a0bf1e785ac210df0775fecc9aa86f4e42c20bf53dba1b8545f95e1f82452444ca891ad0b3c413003fa1f6911ca0ee6fc82c5 SHA512 21976a9d95425d7097fd884c3af5684dbede5dce3e7431d7a47a98484c1ceede03bf86bb7c6e7ea10d5969596906bc6d6e305f844974140355e6d194625d5eae
+EBUILD systemd-9999.ebuild 14847 BLAKE2B f1fe499bd623a98a35be52313e525dd014a35a945f4532aa28db6938a41cd60e0a656beacee915373444a97639b1fc4628e18e27be2c98b0d2804d2a6a0ce987 SHA512 0b45deec2279c3642a2a39e84225c6b776a5fd621e7fdf65967c40cf3dca326fc2c08be161e41856f5375399701529503fa9dba734355659d3e084d70f521dda
 MISC metadata.xml 2418 BLAKE2B bec7b05950f495cd678359bca70723286c33d4943407fee45e1214a53d9bfbbb25d3612a5b1bb51d885c38ea63719b3de2f0341d2b8aeb5d5919a29459cb89e4 SHA512 46979fbafe3561a722efefeb82e283e221cb930e56e9f43c25a47c299712dac21f6ef4c970afed86cb390e21dc8dd86b23eea310d5dd7e66a7a6fde250b929d7
diff --git a/sys-apps/systemd/systemd-248.6.ebuild b/sys-apps/systemd/systemd-248.6.ebuild
index 8bd8d0b12c40..469ea95ee5be 100644
--- a/sys-apps/systemd/systemd-248.6.ebuild
+++ b/sys-apps/systemd/systemd-248.6.ebuild
@@ -146,7 +146,11 @@ BDEPEND="
 	sys-devel/gettext
 	sys-devel/m4
 	virtual/pkgconfig
-	test? ( sys-apps/dbus )
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
diff --git a/sys-apps/systemd/systemd-249.2.ebuild b/sys-apps/systemd/systemd-249.2.ebuild
index e26b4a1abdbc..9e5fa453bcfd 100644
--- a/sys-apps/systemd/systemd-249.2.ebuild
+++ b/sys-apps/systemd/systemd-249.2.ebuild
@@ -145,7 +145,11 @@ BDEPEND="
 	>=sys-apps/coreutils-8.16
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? ( sys-apps/dbus )
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 714f276a62f0..71b8f9c1b29c 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -145,7 +145,11 @@ BDEPEND="
 	>=sys-apps/coreutils-8.16
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? ( sys-apps/dbus )
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 82fca44b96b3..549dcdc0dc3b 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -14,5 +14,5 @@ DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
-EBUILD ucspi-tcp-0.88-r18.ebuild 2099 BLAKE2B 741c2af0f4265292b8c7a026d3f838947a82f32c602935d49c73a954038cce8cc95a1a5d65db3acae0a3b813d041cb318e131f8aa5fa4ec9cc9f3e5e1e9a5b71 SHA512 a43ff16d2b499a200f453acba1356569aab1972c3f345c24d9561951633ba79ab77e43872c34a2874104ee93c294743e2616e5ab1b308492ca06b111554a1b08
+EBUILD ucspi-tcp-0.88-r18.ebuild 2106 BLAKE2B 02a7266ee3a794f01da1e1c93160913a963691e473e16710a860da78327030d8d4459a013ffd57df1e807235a546fa8f1d300a22ecc4e65e5b9c63e5db218401 SHA512 9867e2ac4e039c724ccc59679c942cf27184406e5b16b905aa630e1fa98db06d6bad69573a9a3f28dc12253e13b49746450d201d1d77266d63938550489adec4
 MISC metadata.xml 600 BLAKE2B eee72034e2adba51553bf32dd54e0ec2026a97fd709cc828f28e22525dc66cbff4bdc8801f7c5b4fa655fdbd682ceeb71639f22094b96150cca02f7db538554a SHA512 8cc6d3b8383d604b971b5cfd48060d5190269beacd1060ca279cb5eb0defc54e36fd1972ccecdff5f3fa912ca0a80e177433226876ba72158e93a5a6c1cadffa
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
index a16a279be269..0181a320a247 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 248d6a13a7c8..22b3ba91f7b1 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -9,8 +9,8 @@ DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d
 DIST util-linux-2.37-manpages.tar.xz 160156 BLAKE2B 39572332cfe4cac2313941ae922a01f5f4fe34cceb2ca3c806e87ec55187053dfce044790ad497d04adafc2abc513ae1429a1686e71b3b4e0e7907d17c9b6548 SHA512 2f3f1da3eae10b90daa672690ec90de303d87e9b0390f795daf80927a7c42f6aac9d3516b63051a6237a5609b5fda1dec92a1b8adc172115f3478b7edfa04918
 DIST util-linux-2.37.1.tar.xz 5628360 BLAKE2B 309ea7202f32c0ec750cb01486cf32c3e9dd457d83e5beab8d6b97a5e7f312332ecfcd1ddbb88ae5ec9ee483bb15452b8d58bce1f931f9dfa35be3ce042da3da SHA512 ec300c830869e10a0d7f8c0b99e9bb46e0b88fc51f3c6c6a4d9752a89f035e8d69d81f25fd103ef8d7d253e81440695ef3f5d72dccc94815ec8d5f6f949f7555
 DIST util-linux-2.37.tar.xz 5519268 BLAKE2B 37d4f260d636539c60b7196545c7c542c7e08a24cf3395be0c14054b5f05765c9f8234ded1c8fed60855e76bf0cfedc557d45e99b37d1e6b4a0244897fe06860 SHA512 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615
-EBUILD util-linux-2.36.2-r1.ebuild 8935 BLAKE2B 065f9a2c46802fdc656dfe1fb01b575aa769c087d295e646970efd6f16c20d3b10705c82dd1f536f0edde3a1422047bb8ac214361f3a2349c9b2295d5bfc5f05 SHA512 6100692d0d27f04f28112b4512a83ebb79805bfbdf1aba5c9b4f8a191deebf3efd4c1c45401bad0498ebf7d65edd9383e2c8a748ede22f733e09570cdeffb22b
-EBUILD util-linux-2.37-r1.ebuild 9991 BLAKE2B a6b00e3fd2aeb4fba72026456c02b243b950d5a6aa9f6166d8c2ef4015a5751d33be0ae28db15174770198e561b35476159baf03251e6cee860aee65ce82e8c3 SHA512 c76077d9f66cf106bc59e7075121d7c6d8c0260bf220b92e9f642bc1754973dbdbe410fb6d09cda02a40d85cfa15a22a1bcfceca77d50f4c50ce0a480f64a7e5
-EBUILD util-linux-2.37.1.ebuild 9280 BLAKE2B 0356e14ea41414d58c7c19a249496998529ded536e92cf50cbe7ee32c93b8c44f5009abbf34cde0996dcbcb5806a5350b9a4cfd64970e23b83c791ca863cf375 SHA512 9f5e17b5aafb7fa8262cdad6e3f94f94fcbd064f6e266b5bb9c6b29d50e7d913b9338c3a0e83fd695da900b72c0f365c13e62da999f950b560fea3349652be88
-EBUILD util-linux-9999.ebuild 9219 BLAKE2B 29540366c24bcabd3ba816c927b950afa1e7785339ff3cb657e7cfdf70e713a49e42a314b3378694794b03b50d085912f47211f9ff1d30735f0c1ea778fbe679 SHA512 e97de69dd6c1bea120070bb36df737111db68c4108fe23bea58a99f2ca2815010b1fc7a2c7f7bd9b4eab7a560c08b70af7a1139cf66882359f762f5ce9662f87
+EBUILD util-linux-2.36.2-r1.ebuild 8943 BLAKE2B 02deedf4a71d2acc2cd15fce983471237f84bf131debc2f161ec9afa7102b70dcdbd0aa70062ca4208d0e2fa444f5a9effe4650d07e4d9ec027fa7c1004b0e85 SHA512 4ac8f481c02d804078a16c3d92ffaf9320028630ca4bd9233ca5461a1ed373cb8c5aaee7a08be49b38ed103698f089cb5db0e87f119911423154b4754e39d23f
+EBUILD util-linux-2.37-r1.ebuild 9999 BLAKE2B fc8118a93be6b7c434d86773da8e3b5dd78e18153cce7eb6b806a9e6e0741cc2a30e2cce4cf9f0637fb2fab73b1db27396abb06023e722642350779135ed775a SHA512 5588ac089b27a20df5f813a15164ba282d3321cc288b4c0fcbffc7fba36db57eed496af7f8cb05d372bc87e1466195bc3a31035ea2de03b74bf65784035ece9c
+EBUILD util-linux-2.37.1.ebuild 9288 BLAKE2B 3be449936783f0da3269d4e45f8c39881cb28c96a6844a14f498991a697286e168700bafe092df750e941bbe099e503c2782ca098027733dee8f46aa2f12ec50 SHA512 d6accd9769ec8dfc23bd6602e195d1b62a8776fec5754418cf2f8fd06caca48d4bc90c5fe12c86f53782fe5d334d528c517f5ef558e52958d460fd297a843161
+EBUILD util-linux-9999.ebuild 9227 BLAKE2B 2b797ee2166256daa32f4d04593d28663746937fa81a07821b7204b07b31b92874c8266e0ffa3d9b1eeb7191f0329d6d7d13e228360f47e0e94a2e4921a74db8 SHA512 9a430472ec02d0e3c76927f9479ee4b5bdab9231e249991c8c6ff48f4922a099bc15d6533a2502ddd455f18def6530ad21c7d166fb39790614348db6eed3aef7
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/util-linux-2.36.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.36.2-r1.ebuild
index a33c67583eab..92191cf91ea5 100644
--- a/sys-apps/util-linux/util-linux-2.36.2-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.36.2-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	audit? ( >=sys-process/audit-2.6:= )
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
-	cryptsetup? ( sys-fs/cryptsetup )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
 	hardlink? ( dev-libs/libpcre2:= )
 	ncurses? (
 		sys-libs/ncurses:=[unicode(+)?]
diff --git a/sys-apps/util-linux/util-linux-2.37-r1.ebuild b/sys-apps/util-linux/util-linux-2.37-r1.ebuild
index 22c0a4dea4bf..5aa4349db6e9 100644
--- a/sys-apps/util-linux/util-linux-2.37-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37-r1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	audit? ( >=sys-process/audit-2.6:= )
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
-	cryptsetup? ( sys-fs/cryptsetup )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
 	hardlink? ( dev-libs/libpcre2:= )
 	ncurses? (
 		sys-libs/ncurses:=[unicode(+)?]
diff --git a/sys-apps/util-linux/util-linux-2.37.1.ebuild b/sys-apps/util-linux/util-linux-2.37.1.ebuild
index c12359853f47..c0b9a494a98e 100644
--- a/sys-apps/util-linux/util-linux-2.37.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37.1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	audit? ( >=sys-process/audit-2.6:= )
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
-	cryptsetup? ( sys-fs/cryptsetup )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
 	hardlink? ( dev-libs/libpcre2:= )
 	ncurses? (
 		sys-libs/ncurses:=[unicode(+)?]
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 141bdf409cb5..4f991bccc9a5 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	audit? ( >=sys-process/audit-2.6:= )
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
-	cryptsetup? ( sys-fs/cryptsetup )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
 	hardlink? ( dev-libs/libpcre2:= )
 	ncurses? (
 		sys-libs/ncurses:=[unicode(+)?]
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index d13cd6cc523a..28093a453c74 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/polkit-qt/Manifest b/sys-auth/polkit-qt/Manifest
index 8e18969a6e94..9305fe5326c7 100644
--- a/sys-auth/polkit-qt/Manifest
+++ b/sys-auth/polkit-qt/Manifest
@@ -1,5 +1,3 @@
-DIST polkit-qt-1-0.113.0.tar.xz 64652 BLAKE2B 52d8c5c8009e2595c70db5b6a6349e4524d6d9cbec12c5a535f25d737da1d16e77fadf3572eebbede7a5ed583c818e878119b416d69a076e03bb37d2f7da7b41 SHA512 deea5d75f547eaa0279c664ec9608b65f464db97fd5fdea27437f8ed4ec033de2b9f91d967deacb28bf0a1e54f131f997acb862cc3e1f8dfcb1f6c337e719b38
 DIST polkit-qt-1-0.114.0.tar.xz 58384 BLAKE2B e788198e386797ba9b4c228a451dde703f83e79c81eacaf805e431a3f60c0832adc3faef4616e3008dfaa816d7dc5a7a80aaf02936ea232373e78e0d008724ca SHA512 4a16d9428d5ccc0107dcbd67c29ecba196424e555dc43d55cf2b6e0e7b72c99f894e9c994eaed85a9536010d67a19f20fe74f792c0d6b9ca0e05ce85f655f9a8
-EBUILD polkit-qt-0.113.0.ebuild 814 BLAKE2B 5e99b99d78a7b6339550a464980ba0aec6f5d4dc4049de4388c87915906d09f2f639eaf114d60909b58572817f0fa15270a0551305287fa9f601a2441f2705b5 SHA512 71333f134b632293c09dadee8838cb1f39a14bebce7fe2d4f47cc8ba74888b99efd5ec40e5e0b38d485c5d33a86d72f69aad08b362bbdd7be905dc9fb94ca6c8
-EBUILD polkit-qt-0.114.0.ebuild 793 BLAKE2B 8eb5ce365f638b208142166149b17ddf7f226a1b15e20d9c042f38b396f4b911cf3a71e0c8297b80eb2dd4da7ad75447acc50239fdb516bde189cffdca1d1544 SHA512 28df131ca9dc8b9f7dc4a221698f010704f8cfd42b1dd51b282aa882da5ff7345d00e93b5b6e16b9b156681d8ce6c3ff22f814a095f5601050d41ac52e31c387
+EBUILD polkit-qt-0.114.0.ebuild 792 BLAKE2B 88596d568bb2563b7c15f99f0e7b92a3caea1bfc3849c02b8436156bc7f233e6c685917e6f0c917e26ae69f371587e8241a40384709688bd7f89fbbd93c6354e SHA512 9b430e2151188d6c5de57032fb5ac74a10a5ec9885138de15d3e029c6cac9990e683dce04be55e4835d3e24ba6d8d42560c94cc2af1b85bf3abc17f35065eaf6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild b/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
deleted file mode 100644
index 7e85ce613a86..000000000000
--- a/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="polkit-qt-1"
-inherit cmake kde.org
-
-DESCRIPTION="Qt wrapper around polkit-1 client libraries"
-HOMEPAGE="https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${KDE_ORG_NAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-	S="${WORKDIR}/${KDE_ORG_NAME}-${PV}"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=sys-auth/polkit-0.103
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README README.porting TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/sys-auth/polkit-qt/polkit-qt-0.114.0.ebuild b/sys-auth/polkit-qt/polkit-qt-0.114.0.ebuild
index fef63b40378b..a90ac4af7d5a 100644
--- a/sys-auth/polkit-qt/polkit-qt-0.114.0.ebuild
+++ b/sys-auth/polkit-qt/polkit-qt-0.114.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://api.kde.org/polkit-qt-1/html/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${KDE_ORG_NAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2"
diff --git a/sys-auth/solo-python/Manifest b/sys-auth/solo-python/Manifest
index f043d1158ed0..75d22c1900da 100644
--- a/sys-auth/solo-python/Manifest
+++ b/sys-auth/solo-python/Manifest
@@ -1,3 +1,3 @@
 DIST solo-python-0.0.30.tar.gz 34932 BLAKE2B 6787d9c6e102cd2cb5579be0cb3ffbbe76b3ae90f4fa6891b6a1ca3e76436568a949daa6796fc17c9868d10d5de3b0dd377619936eccb0d436a284a35efa40a9 SHA512 bba63e598ef585ef49e98f3ec2a79911cf8af3fc38c9407bd91b7500dc55bf84f365664e6f80ff0ed3553ce93f5d61ba11c5301e8b36d6000c7a922857adaa5e
-EBUILD solo-python-0.0.30.ebuild 1134 BLAKE2B 1e703ee0c685f70d9b1ab0382d6d7a5e7049298628973e40c7dd63f3fbc8ab5654c11538fcf5cb9cec3424f65368c0418812ebaf9995d5451f53f94006649638 SHA512 d1b429c6f7eada8d5198742c2af4a0e0b5960934a30c2c67cd28b75812849926a4752700e467a0dd8f1679315207319293cf7b194e265921cf3a1fcb6c8be681
+EBUILD solo-python-0.0.30.ebuild 1141 BLAKE2B f3ffe66798b2fd3f075da98ae820b5ef4bc7f90c1ee050108074c0f2a7c30385f704c7b38b2778973b5b6531586c6ee56a5d1f45b9443849186e55dce32e81a7 SHA512 20da743018fe89e84fb4ad2a752eb3c597a7ed43ab9a54f6d8c586151a3b8ac31386832187264c06fd0c10729769e3a3389ffe9db1d66e13698686723700cbc9
 MISC metadata.xml 691 BLAKE2B 56d4a4830788efd1222f1e3a9e456b01d43c876856f8ad5063ea9a2a75363fcd66cccc9100af139aadb63b68741493ed89e398c5a38d7a41b676bae187cde15c SHA512 0814323a9067bdfca6730146c21e0c46243eae7b3f68603de5bb3f455f57e47743ea5bce602a897b3f37f27c8981c281d49e04c279295cea74b207d6c0e65945
diff --git a/sys-auth/solo-python/solo-python-0.0.30.ebuild b/sys-auth/solo-python/solo-python-0.0.30.ebuild
index 9c5f1048ec41..e8cd0529f6d9 100644
--- a/sys-auth/solo-python/solo-python-0.0.30.ebuild
+++ b/sys-auth/solo-python/solo-python-0.0.30.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/solokeys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND=">=dev-python/click-7.1.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index 4f2e15ab7d2e..f286babd9bc3 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -2,5 +2,5 @@ AUX yubico-piv-tool-2.1.1-no-Werror.patch 453 BLAKE2B 80e024475d4c5c648154a0cb79
 AUX yubico-piv-tool-2.1.1-tests-optional.patch 881 BLAKE2B 02821ac155a75a213567958d33e5f9b25838c1b1ea9dc65efda223ee397643d2d6479b5e5bd5867dfaf057d64bdebf1f1379d2187e4f9fbca1fb4fa97133d0fa SHA512 f694e2d9e882cdb04728a3fc1f857c9c5c388ed439d6efbb385fa96414c8241ce918f7a2bbbe0ac2c94fbf3b2981fc68de4c7a999822a14068c8f43bd21de43d
 AUX yubico-piv-tool-2.1.1-ykcs11-threads.patch 1168 BLAKE2B ec91a73c7ad6c9ddd2e6250536b89f01d1778a79bc8df823e896323053dac8fe23c6b23a84b526da61146204df3cbc7889cae3ffc9a0414626e6ddb3b0806051 SHA512 d48787ff5de1ed5ff80fbf2f65308ea0c174500e32b55033508284aa05b0674f013479aaed5697a8f1207f821e7fdbf99cc206830725c023aa3a349fa0792172
 DIST yubico-piv-tool-2.2.0.tar.gz 1309359 BLAKE2B a5be7a48549f864b9322b5bf53726007b593ce7d08cd06f2251aef98cb065d90586e0189e6f3da94d6d274d6998459afa4a55a0d4c1145395f55830f53d334e4 SHA512 b2f8cd73800e0e0778ce36148b962026479f5d3ada3e313acb5a780993c28c41b03e9aa9335ac5b79fed7a418a2d3d3697231adf2da0dd06cd8d22ea5a01aca5
-EBUILD yubico-piv-tool-2.2.0-r1.ebuild 1286 BLAKE2B 8c9680ac2683f6f0a2f9d04ae12a8f7f5c190bb10ba84c3f0547bc07411093c6556095b0a151655eab0178ff64c8dde5af0dff52b49bd0ab69584ad480c9ea43 SHA512 a01a15aef8de6e9c9e8bcfaa63c7e327ce6c71029d75dbc7315df6dfa96499e079890301065849928b1543145a994314bdd7b0047fd645c69b7f54383293bb5e
+EBUILD yubico-piv-tool-2.2.0-r1.ebuild 1293 BLAKE2B 4b57db4dd0fbc08af0cd4f567bb2023539ced6da261d94b98a206f550699907db5fd5a1098c49270094f670af2a889efe064ea7ae514a00a8d291255a4f91daa SHA512 f476c29d5ccb49fad0cd9bcae78500e65683082d25613f6d2c7b5e49408936430409dac559a252118607354370932c2069b4ad931e75b93a0c1d0e0266afcd1a
 MISC metadata.xml 332 BLAKE2B cab42a159a3cd0da5f66dbbd7e542f4fbae2deb966a20e7392baa575ce00b65b40db1846abb69baced17c6feb6f9e3d565620ed5476735cfaa121b0a2b81dc22 SHA512 892f4b9d170c5bd2679a1777215d7b88249bd4347c918499b762aa9ad0132b7b15d847180e4d27527d5cead6a4f8e23a7a4d3dc89752bda3852a99782129c257
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild
index f93875e443a8..fd630dc72b19 100644
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/2"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index fd14465c02ab..857ba33abdcd 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 798f54f4a8c5..50fc1a52df35 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,7 +1,5 @@
 AUX fio-2.2.13-libmtd.patch 398 BLAKE2B b1519ed240879f1260e3f5859c9cada3f41161457b7e06e5e764ac3a6656c3a6439fb5f0380cf90bbd6f2133f25e80419e108d725ea4672adfdd976bee94846f SHA512 18792d4ea3dbc2664d9e24541a07d82a50cd60bb7ff2d14bcdadd2207341c003ad2d298d99d65fd72c88813073b17d03a710a50db4df52ee72d49d9e9bcfe400
 AUX fio-3.20-fno-common.patch 1220 BLAKE2B dcfaac74241111cae75ebf956f34258ce883b6abb360b51eaa6bf80c91770d0d4307818e7daf63dc284c3b21a0869d54523d9b4c5cb4733fac898d05c17c8933 SHA512 04e435073204d158d6e8a5de87681cd70fa76c80c82b4c86e3e12650288c3bb2c0c457d64e05812e94f9e07172b5df36542f330306bdbab8222ec2464bda12f4
-DIST fio-3.20.tar.bz2 912040 BLAKE2B 44f8c20a390a6382aadc07881c1e7c65cca932099a1b3992e848669cf2a52b410fde67f9ae576efcd0d8e88ceec04174b6bc077d4b3f9b615b59be9f24f62bed SHA512 4e073754c95cb8d6416a80f48ca61003f34d664717f67a3f29b554e9205f8fe3553595ba6f8a8e9cb3463022d5c83be961f5b5a1ebcd2a9f4da9406a9986c1fb
 DIST fio-3.27.tar.bz2 960330 BLAKE2B 7e7e01a5c1d6af13a6f87139e7738646cbc8f45ebc370d0c45b9efe1f93778613d374daafc6df459f988f27f2be54ff636235e1e5a92a4a6ecf9a60ed573d170 SHA512 9c5f2ab0c9ac24ab78dbc74fb6c5acd60f8189fdc618f4280992141b6c0abe1c235c373fee18ad0c803e7fb25d480f45aec56dc3be2e0d26d181b3418b179f99
-EBUILD fio-3.20-r2.ebuild 4337 BLAKE2B cad2afe783c27e7e55fa8884d5fd8725ebf6f7900319970d7f837a999bc461e2cc8e882a7c86bdaeab3b60ecb07f11a2f1344122bcd0398e91602cf2852652c3 SHA512 b36adb5fa50b176031a63d4aa06bcf4bf2740b1daac62ddecdb542f437c03e858e43e332636eabcf9d3bf47c69e2e2192ee4549de95fded13a96aa48c03cc2a8
 EBUILD fio-3.27.ebuild 4248 BLAKE2B 3ce690dfcc7de7f55325128cd8e51d04b80226e8cdcf3811739b5dc4098b26894b4be622d45d05dc3966bb07e0692ff565699b44592e4cbf44ee134c3541bea4 SHA512 6202649f094e30df45cd9e40080c6dede7bf9ea59e69d91fb236c504c045c6e74f357569b2579d048a8f50b759ab26cdf545229c328607c5d89a416a9b1d792e
 MISC metadata.xml 1172 BLAKE2B e35bbaaa15c8cd095791a4a23a7344314a015ea42bb864b11bb165d340585ee667f969426282465b834a7d092ab6885736e55ec8d4fe950001fbb6336fdfdc14 SHA512 defbc7f932a5ab83b67da58a601ef62784b27f2268f8a8dd5057c02fb441b164bd0945217fa52a0e06803c74b5168dda3b4668de52f593d5cade428bd2f79e86
diff --git a/sys-block/fio/fio-3.20-r2.ebuild b/sys-block/fio/fio-3.20-r2.ebuild
deleted file mode 100644
index 272495d4ce18..000000000000
--- a/sys-block/fio/fio-3.20-r2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="https://brick.kernel.dk/snaps/"
-SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
-IUSE="aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static tcmalloc test zbc zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	gnuplot? ( python )
-	io-uring? ( aio )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-# GTK+:2 does not offer static libaries.
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
-	curl? (
-		net-misc/curl:=[static-libs(+)]
-		dev-libs/openssl:0=[static-libs(+)]
-	)
-	glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
-	gtk? ( dev-libs/glib:2[static-libs(+)] )
-	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	rdma? (
-		sys-fabric/libibverbs[static-libs(+)]
-		sys-fabric/librdmacm[static-libs(+)]
-	)
-	tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
-	zbc? ( >=sys-block/libzbc-5 )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( dev-util/cunit )"
-RDEPEND+="
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
-	)
-	gnuplot? ( sci-visualization/gnuplot )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/fio-2.2.13-libmtd.patch
-	"${FILESDIR}"/fio-3.20-fno-common.patch
-)
-
-python_check_deps() {
-	has_version "dev-python/pandas[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-
-	# Many checks don't have configure flags.
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e '/if compile_prog "" "-lzbc" "libzbc" *; *then/  '"s::if $(usex zbc true false) ; then:" \
-		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
-		-e '/if compile_prog "" "-laio" "libaio" *; *then/'"s::if $(usex aio true false) ; then:" \
-		-e '/if compile_prog "" "-lcunit" "CUnit" *; *then/'"s::if $(usex test true false) ; then:" \
-		configure || die
-}
-
-src_configure() {
-	chmod g-w "${T}"
-	# not a real configure script
-	# TODO: cuda
-	# TODO: libnbd - not packaged in Gentoo
-	# TODO: pmem - not packaged in Gentoo
-	set -- \
-	./configure \
-		--disable-optimizations \
-		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-		--cc="$(tc-getCC)" \
-		--disable-pmem \
-		$(usex curl '' '--disable-http') \
-		$(usex glusterfs '' '--disable-gfapi') \
-		$(usex gtk '--enable-gfio' '') \
-		$(usex io-uring '--enable-libaio-uring' '') \
-		$(usex numa '' '--disable-numa') \
-		$(usex rbd '' '--disable-rbd') \
-		$(usex rdma '' '--disable-rdma') \
-		$(usex static '--build-static' '') \
-		$(usex tcmalloc '' '--disable-tcmalloc')
-	echo "$@"
-	"$@" || die 'configure failed'
-}
-
-src_compile() {
-	emake V=1 OPTFLAGS=
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
-	local python2_7_files=(
-		"${ED}"/usr/bin/fiologparser_hist.py
-		"${ED}"/usr/bin/fiologparser.py
-	)
-	local python_files=(
-		"${python2_7_files[@]}"
-		"${ED}"/usr/bin/fio_jsonplus_clat2csv
-	)
-	if use python ; then
-		sed -i 's:python2.7:python:g' "${python2_7_files[@]}" || die
-		python_replicate_script "${python2_7_files[@]}"
-	else
-		rm "${python_files[@]}" || die
-	fi
-
-	local gnuplot_python2_7_files=(
-		"${ED}"/usr/bin/fio2gnuplot
-	)
-	local gnuplot_files=(
-		"${gnuplot_python2_7_files[@]}"
-		"${ED}"/usr/bin/fio_generate_plots
-		"${ED}"/usr/share/man/man1/fio_generate_plots.1
-		"${ED}"/usr/share/man/man1/fio2gnuplot.1
-		"${ED}"/usr/share/fio/*.gpm
-	)
-	if use gnuplot ; then
-		sed -i 's:python2.7:python:g' "${gnuplot_python2_7_files[@]}" || die
-		python_replicate_script "${gnuplot_python2_7_files[@]}"
-	else
-		rm "${gnuplot_files[@]}" || die
-		rmdir "${ED}"/usr/share/fio/ || die
-	fi
-
-	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
-	rm "${ED}"/usr/bin/genfio || die
-
-	dodoc README REPORTING-BUGS HOWTO
-	docinto examples
-	dodoc examples/*
-}
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 22d80efcaf28..27f6b4b62983 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,5 +1,5 @@
 DIST partitionmanager-20.12.3.tar.xz 2085060 BLAKE2B b6f94220f157e33d287f967d0ed568b07622cdbedda82e2659257b92487a40cc8519922f62c705b9eefca5404c0f43b6b331679fd4b18fb5957bbc850417c296 SHA512 480f706b3c1fd7fcd3df49bf9f2277a4337ca696e912664fa9283110be2575b84694b1145d02bf9c4c968ea1be1864c01125e9fe3892d910b898a4afb2aac130
 DIST partitionmanager-21.04.3.tar.xz 2097428 BLAKE2B 821ea6c8cd61a250acd433e55dddc3ddc6e115f8908f79b7d243e0ba5bda69f8edc38e6b2aef1d014258d38111b8cdd361632015af031fd85ced9d13f3ba6129 SHA512 cfaf08ee27a4976de38cee282092915aa154a3c4c0561b1ce9a971e991038473dcce4ffd4f20d845eb5d29e48a223f16b3d4a670d0442b8267c4ed0c86dff4a4
 EBUILD partitionmanager-20.12.3.ebuild 941 BLAKE2B ffa89f5fcebe8b912f97b879fb36d1e7998660366b9b19a81dd7cc860e51419a532b0415be587d090af24d02aad8d5b32c98e159001fec2d32873806d284d7a0 SHA512 eebc080000ac20184cfa03e78c7be88d14e3a701e8cdd1f85eb50ebc67192628408c2f79d23e0facb4488064bfd7be62393a6bf03e97a98e7045a3d18ac544d9
-EBUILD partitionmanager-21.04.3.ebuild 933 BLAKE2B 875a518c404bf5ff689394cdf27b42dc55f6fb76578232f9f59a11654e680aa26aeec85c265174302e237cf855d433e9359db5898f3ec78609927775376c410e SHA512 656821a719b0f638437414b6e62a4b7e8d9233392ace32ece4fea3a075a0ff2a9cef1614977e6e16baa4ef317bf7bf2985dad467c65086ce89b758b51d1c8606
+EBUILD partitionmanager-21.04.3.ebuild 931 BLAKE2B 114985b099aa6e76b559b4f476f94302b5a3fe17b43951e5eebaf8cd84313d91cb94e4e1fc19c081a5a63f50088285f2991bf7a542911ff272836b603e113a86 SHA512 80d615484923cf1b322381c6cbf1b4adde5970c6445e432e6e88770cae96d84e2f3a1e7f7c8bc0ad2a00853083f5f62f1aa8373ae2eee968c7e8e992cbb93dfa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-block/partitionmanager/partitionmanager-21.04.3.ebuild b/sys-block/partitionmanager/partitionmanager-21.04.3.ebuild
index c53fb9a3e278..e1a8543de227 100644
--- a/sys-block/partitionmanager/partitionmanager-21.04.3.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-21.04.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/partitionmanager/"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-block/seekwatcher/Manifest b/sys-block/seekwatcher/Manifest
index 64df1c49b016..a41a10f91d86 100644
--- a/sys-block/seekwatcher/Manifest
+++ b/sys-block/seekwatcher/Manifest
@@ -1,3 +1,3 @@
 DIST seekwatcher-0.13.tar.gz 25811 BLAKE2B 72c574e239a346620eb5a1c574365f18dc745e926bfb4f191dd9997ff73b26e716ded9679481be34149c3e5e424077a23a264e7dabe9423eafb396f687085dbd SHA512 687c1190a4d62ee4d7237c6930358d69d2045a7fd5af19caf9fdde8dfae8fcc64ba2d382445af2b038bc31f77c356f31b8dbff2d52cdaf4320881d1b1340dd17
 EBUILD seekwatcher-0.13.ebuild 759 BLAKE2B e445dc4b51855d7a3931aca36beb75d7be927814879b661925f411a19924bc19194b72c6db3a19e7047b356f45efa4492778cb513e919a7e331957c2c649f5a7 SHA512 bbd28a0f93a42bcf6c4d3340837f29546186ea1a964a7dc08ebe79a886b2b2b0c4ea66ebafef8e7166167778d88e7705800dff48f14885c30de2b90a2a4d0e4a
-MISC metadata.xml 326 BLAKE2B 21768c11bcab92a1bb978e7ed1be16b1b76525a957955894a1ca18ae5e5fd0103dc312c8dc09b586ed4b3d46f471ccf039a4180ba000b0f4e410b05d34f7f335 SHA512 0a77e934710066157e808d2848283a9d25d9db5c1ccd03292ddb35b812b996918c8ae731b75eb1d60518cf1d6ece5ee9db51ae4e8a964357cb66e77fcd1c3b06
+MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/sys-block/seekwatcher/metadata.xml b/sys-block/seekwatcher/metadata.xml
index 888bfebd33fc..79d462e85571 100644
--- a/sys-block/seekwatcher/metadata.xml
+++ b/sys-block/seekwatcher/metadata.xml
@@ -4,8 +4,4 @@
 <maintainer type="person">
   <email>robbat2@gentoo.org</email>
 </maintainer>
-<maintainer type="person">
-  <email>slyfox@gentoo.org</email>
-  <name>Sergei Trofimovich</name>
-</maintainer>
 </pkgmetadata>
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index 09a9a64747c1..fb84fabeaa57 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -2,7 +2,7 @@ DIST zram-init-10.5.tar.gz 20496 BLAKE2B a28ba9e3813be7ca571ac033ca7b4bdf7c95624
 DIST zram-init-11.0.tar.gz 21069 BLAKE2B f1a41cad3aad89bde2343a079e31d66de15d051c8431edc08999965993c6f894959289a01415259a93c8691dfec5316ebcb28d0a81844e985395ca5592654f12 SHA512 f11c7ad4e684701ab7c89cb1e859c6ee58ff6795f03b584884f64341d511a8c2de375fc43463318220fab2e16632807d8a13e9b6ac502fa933d406996bf4d115
 DIST zram-init-8.1.tar.gz 9177 BLAKE2B 229a469aeeb0b22b80f48d946d4ff746c7bd5d7b58ea9290db0da011df6d618c7c55ad95810b0be74ff81350182057d9067e834ecba688eb4ffa668521468a8b SHA512 8f688accb7a4231f705f694c4b4e7344bbb338b2b1f09a6dacd900020a4e8583105b25fef5b40f39630db88db6fcc8ec79824945ceaee95ea1279d09d081a994
 EBUILD zram-init-10.5.ebuild 1812 BLAKE2B ab1bf793161192950c29473c2bf6e1479f6ec081c6bcf379e3a817ad56b8b3b333859db71d0def9af9da7d64d7ece1f248e634a393551fe0f336e62b7126f712 SHA512 8453554558e1c9101b99593b3d4c11befbd6bfc182d3e28d0012cd2141d229df9190069de3a45b88f1dbe3cca3a4850d2073320e2f54eb3d6d73c90b4f3160bf
-EBUILD zram-init-11.0.ebuild 1862 BLAKE2B 588ffac207f993e13a3790ffae889ee1ff7b1dd3c442bdfe155ffd2dd5e2e87d0449d4bd7e368742f318feeab96d003b8734567e0cfcb28d40a958ddbc601bad SHA512 e5c6f802e90ec8cb5217c6b6f1b3d3c0e6b53bfc4382a03e7631f4b111b8689c235881226cd11ee016c45805f7e31868974ee00a87e1a17eea4ee9d1acf45eb9
+EBUILD zram-init-11.0.ebuild 1867 BLAKE2B d5656ed85eb0702a44755482a795e5cc463337a8a78ef98748d4c92608f02ac2ba05481b02989d435e58136317250d0d0447fa96790907dbb4f87ea42e6ca7a3 SHA512 ed4bae5042834c03aaefcd9edeba5126203741811dd5916e3cb3a27b89bb99bb77203d36114bf5acb981446170fb8b3cf7b115babab61bf0798927ebb79f6eb3
 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 1862 BLAKE2B 588ffac207f993e13a3790ffae889ee1ff7b1dd3c442bdfe155ffd2dd5e2e87d0449d4bd7e368742f318feeab96d003b8734567e0cfcb28d40a958ddbc601bad SHA512 e5c6f802e90ec8cb5217c6b6f1b3d3c0e6b53bfc4382a03e7631f4b111b8689c235881226cd11ee016c45805f7e31868974ee00a87e1a17eea4ee9d1acf45eb9
diff --git a/sys-block/zram-init/zram-init-11.0.ebuild b/sys-block/zram-init/zram-init-11.0.ebuild
index e6b8db2062ea..78ccfd943a55 100644
--- a/sys-block/zram-init/zram-init-11.0.ebuild
+++ b/sys-block/zram-init/zram-init-11.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/vaeth/${PN}.git"
 else
 	SRC_URI="https://github.com/vaeth/zram-init/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index e255ec256126..96a7a9893617 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 2629024db2b8..81f9645202c8 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -7,4 +7,4 @@ AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799
 DIST elilo-3.16-all.tar.gz 485844 BLAKE2B 813762ffef32a640c074973a07d886e0de137be10ff08e9375cd894b0d83dd8bc96cc33f80da1e698db49cc9f105a905abb2fa04048eaca394d3d70e79cb8534 SHA512 4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842
 DIST elilo_3.14-3.debian.tar.gz 32179 BLAKE2B 84f8055d3e33b99ce91079768da80a8800c3c2f569ce5619641a983efb943055dfd9a8fb2fda8e5e6d60009ffefbcc1573098f022f06635d4d5304bc3bfddf1e SHA512 b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f
 EBUILD elilo-3.16-r5.ebuild 2268 BLAKE2B 2f0863a55a5fa846a8f81afcefb37b1ed00403985bd7cfa427505b1d52967adf9e6fd554ea4f3ec6fa941d22e59a9214e2bd4104238d37474f72f6a6a4c7563a SHA512 7d33c42bba010f6bee117e2349459d7b376b034961f430470906d13288a89ad17f5fbbd04bb0462330b6fec7893594f5f3fc7c3811132988fce9b6c4c037bab4
-MISC metadata.xml 326 BLAKE2B cc7b85b290136d54ab8857ad992bef9eca8cbb607949a50ff090ddfbbab704d87d3e028415845fddc57ea984215dfe0048d1a219dcd386dcf1c1062f657f5db8 SHA512 e40b5a31e5e5954c817f994c6215488a34b32191cfc597e5514bef2fa1ae1e36f0aca1b7e80043e452946051885a04081875edd53d285fc557cbe3277ae3d624
+MISC metadata.xml 242 BLAKE2B 7dbca463647d8b2cf9900ec795124570368da9c08e8ff8af7767b271c33f24cbe4c965bd63508950f53bd65432dce10bfa305bbd8756b442ed50990a36912ba6 SHA512 3c0fa8ca0802f86aba82d652395bdbd5eee66c0194e273b9dee3c1f57ca822ec82843fae4524fba203a235e638a5622ca3e225c19b3990cff7b93f9c9d27a485
diff --git a/sys-boot/elilo/metadata.xml b/sys-boot/elilo/metadata.xml
index 0b9c119b3c0e..aed513bd520b 100644
--- a/sys-boot/elilo/metadata.xml
+++ b/sys-boot/elilo/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">elilo</remote-id>
 	</upstream>
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 3280c9574f5b..f523603d23b5 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index e0c82f3fe539..0ceff2867c9b 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -9,10 +9,12 @@ DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5
 DIST galera-25.3.32.tar.gz 1277302 BLAKE2B 061e146054e530d8e95139749d345ddf5a94bfd5861fad7e7c3612400e766f80618f79e18434f93bd188ebfe46f103e805f2ba18eeca81dfee34eb4212a9b3d2 SHA512 e9aa97c0d0de61c25bc11181a99ee38e24a6ffe5ed71769b5034ea7f232502f082f2c88ccacbc832ab37c19b8f647b5e2c4f2e67efcd7c6d3e5880c6a95eaa53
 DIST galera-26.4.7.tar.gz 1339462 BLAKE2B 9d8ef6ba9e153de848005195edbd99234f282c4e7bda4ddf42f3d6c99088fc3e57536863eb244bfb90d37dbdb6d0cc71661ee5297e59f2faf666da84ee731975 SHA512 ae9c898756ed6cd180bb7bc6a25e7e6b533e4a15a88d3820a936ca203cb0215aca5840599214d2236013da6759981471b47e0e0759d1ccd24c05b8e3c59f3a8c
 DIST galera-26.4.8.tar.gz 1423256 BLAKE2B 9925207387b1ff5886bc0313fee3257a166fb7ad4cb4a93c508688e32467b5e048a8643d3ca0b2d190fe89883a9c7f450de10f488f1fb24988d62d9ab823bbd4 SHA512 5a99f733e38dffe648df6e313e82cc16066b81341e057e9fe7c7494327cc33db77bb9368d43c80d8b09ce2df95cd9079ad2fc6ff6a6a441a42c55bbf07947661
+DIST galera-26.4.9.tar.gz 1422801 BLAKE2B 45840fd73083c292ca7b2f491dafdf9134066f66bee85e10d6be72a428272dbe8773bf8d7ba52793cbc63c388e59d900e2e7a7c861266d11a5d07640552cb42d SHA512 c089d76ec72c2b3ad8814119f24b0f46e562d469a029b43bffc5b25dc73334f23fd016084f69f4fe42152402db8e03528371e2fa9802c9fa39d4112300aa163d
 DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6 SHA512 25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a
 EBUILD galera-25.3.28-r1.ebuild 1787 BLAKE2B dfe11ca3f23116f4d703a9e72ff09985919e87bbe86779d312d0358b3170c6c7341eca6e3a4889a759bee1aa12b6f4060f0982d3f5ed50395bf985666c7d05a0 SHA512 42e6b73db57e82986323a5856ff21ec8d422531f157b6ba986de60616644b1808fb26bc13ef677ba7f11cfd20f4c53412ab9659ad8e3193942088208f047d9d7
 EBUILD galera-25.3.32.ebuild 1726 BLAKE2B 69be6fa5fb2fcc79d844497c5e2c374caeefb7307620a66b93333330705a44587c0eedfa0eac8194606513bf453f42739f440e9f2704869d87ae20d02b58482a SHA512 cd89402a39cdc67e2d441106148de15928faa89d63cb93af57242ab95917467569b2342488b96dac860693dc4798627afb977ce30621edfe92f08eab46817858
 EBUILD galera-26.4.6.ebuild 1883 BLAKE2B 1c25c650cc1aaa24e15b5fe91075174ffe45292d184c78a4ad2a03c6f57576a1d27c428ad9d827308678920027061836e26679e0daf6132b51dbc1278e9c7d7e SHA512 50d2c6b0efb9e3d912ada92de0f1034bad21307b355b9bd3eb1b6edb9fa9c69e086a2dd10a257804377f03b76c60bfd134f70d7d460a95677efce8990aaaee5e
 EBUILD galera-26.4.7.ebuild 1780 BLAKE2B 3d1481060258879c4b2efd30f3923f7f3fd7b37d177941ff1b2ec15606cd77f28e242baa94b8214460cf6301a4ab7f48984b0feab4850022dff56be693415761 SHA512 f28a2fb4215ae66a14d5fc640df8e1a9b124881da616ef74e7ce2d3050630c74753cb1edeaff3c843a04505c5a99d2ae02fbd2b2f829493bcaf89f60cec94fda
 EBUILD galera-26.4.8.ebuild 1909 BLAKE2B cacfb74ca71c02f846e2d5804ad827a9d697c7531005149d89bcff83187b22429ced418a790cd575bfabd202774ab6155ef52ec477401e94169308453ecad96f SHA512 48bd6e47d3eae317578c0d28ce90c280d5c1981256762eee4584615b2146866f8795e73404d28f168f2e79e6d8ff27250c6266c0db219717a78e4dd0eceaa84e
+EBUILD galera-26.4.9.ebuild 1912 BLAKE2B 6afe7d53883703ecb4423a46d6285321b07eb9aec432b182c402d99b547c45b86a227fb2a0827397c8bdabca542ea44f67f0dc68ff0f9346b30eee5112c00a12 SHA512 8f6c62efaa8c72e762366c5be4ce69bd4675d7b39da4b58fbb8a5b5ac8dbb951ee5a8bff1073bea10d160010c3c47c5c9ffde830b3b011b340c467c74d342d59
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-26.4.9.ebuild b/sys-cluster/galera/galera-26.4.9.ebuild
new file mode 100644
index 000000000000..18d41bef84ca
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.9.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,8,9} )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="https://galeracluster.com"
+SRC_URI="https://releases.galeracluster.com/galera-4/source/galera-4-${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+
+# Tests are currently broken, see
+#   - https://github.com/codership/galera/issues/595
+#   - https://github.com/codership/galera/issues/596
+RESTRICT="test"
+
+CDEPEND="
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.41:0=
+	"
+
+BDEPEND=">=sys-devel/gcc-4.4"
+
+DEPEND="${BDEPEND}
+	${CDEPEND}
+	dev-libs/check
+	>=dev-cpp/asio-1.10.1[ssl]
+	<dev-cpp/asio-1.12.0
+	"
+
+#Run time only
+RDEPEND="${CDEPEND}"
+
+# Respect {C,LD}FLAGS.
+PATCHES=(
+	"${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
+	"${FILESDIR}"/${PN}-26.4.8-respect-toolchain.patch
+)
+
+S="${WORKDIR}/galera-4-${PV}"
+
+src_prepare() {
+	default
+
+	# Remove bundled dev-cpp/asio
+	rm -r "${S}/asio" || die
+
+	#Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -r "${S}/garb" || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX OBJDUMP
+
+	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+	# and -Wold-style-cast
+	MYSCONS=(
+		crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
+		tests=$(usex test 1 0)
+		strict_build_flags=0
+		system_asio=1
+	)
+}
+
+src_compile() {
+	escons --warn=no-missing-sconscript "${MYSCONS[@]}"
+}
+
+src_install() {
+	dodoc scripts/packages/README scripts/packages/README-MySQL
+	if use garbd ; then
+		dobin garb/garbd
+		newconfd "${FILESDIR}/garb.cnf" garbd
+		newinitd "${FILESDIR}/garb.init" garbd
+		doman man/garbd.8
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 4acc8e69d948..ec88502b0c85 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -9,4 +9,4 @@ DIST keepalived-2.2.2.tar.gz 1159896 BLAKE2B 42ff86b4aa7c0a45a3472102107701262b4
 EBUILD keepalived-2.0.20.ebuild 2000 BLAKE2B 78bc40bc66c58f9c339de897dbeb6d45ae93b129f7ddbce9616f464307481394a45691ad258001153f5125f7cc87c6858039653d00308de96a269f5e5166d4f5 SHA512 ce3e6d6f63c3cc65a93950dfee0b64a1782b14c011cf64e2452d36858e8aa42487b15465868bf759f2b3101723ae834dd6bc6e1dda7d524164680a3076d828ca
 EBUILD keepalived-2.1.5.ebuild 2000 BLAKE2B 78bc40bc66c58f9c339de897dbeb6d45ae93b129f7ddbce9616f464307481394a45691ad258001153f5125f7cc87c6858039653d00308de96a269f5e5166d4f5 SHA512 ce3e6d6f63c3cc65a93950dfee0b64a1782b14c011cf64e2452d36858e8aa42487b15465868bf759f2b3101723ae834dd6bc6e1dda7d524164680a3076d828ca
 EBUILD keepalived-2.2.2.ebuild 2147 BLAKE2B f8df9357c8adfe8c50bd7746e7e807d727a971a5248a3ddedbe57bf2917dc5ac1659cf5d168d84df4674b8a095e9f8599ddb144d9412ce43109fef6daf27b992 SHA512 91265586dcc506d64cfcbc167a6418d23523bbb62937e324bc29c346ed23fe7881c84fb1362b1ae01cb2e1ba44d874366607221d501a805013b0ad24250a685d
-MISC metadata.xml 529 BLAKE2B e20e135a1037fe1ce32a4321858160594512de8c13bb8bf67655fc431c7d6ebf8806db518a09c59e6724842577647a23bb7f310638025a85c5ee8e5fee4ee877 SHA512 3925927d7e0866283769f5582e77bfadf1708162e6aae6a5d1a605fda4a2b4c3de631b96718f5ea69ed5335445523ea1ec1e121a1372641dbec751285cb35dd2
+MISC metadata.xml 612 BLAKE2B 0ab97817bb6e83b80383a05e33408074e7f9919c051c0582262487405b306693a7a48dafcb9d11c4bda1ecdd99ea4b79d5277e37502a5fc22472bb07ec9a4662 SHA512 0270c60c6750450cca5f5e9a51266a5de888aab07b06d791e77fc4bdbb14d4f13e6b83f9a819ce3183943a6d27c213052225ac8989849f0ffe3aad1afba4297e
diff --git a/sys-cluster/keepalived/metadata.xml b/sys-cluster/keepalived/metadata.xml
index 10ad7b166fdc..8333f9e2d4a1 100644
--- a/sys-cluster/keepalived/metadata.xml
+++ b/sys-cluster/keepalived/metadata.xml
@@ -10,4 +10,7 @@
 		<flag name="json">compile with signal to dump configuration and stats as JSON.</flag>
 		<flag name="regex">compile with support for regex in health checks</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">acassen/keepalived</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 46c92c120c13..1bff8949260e 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index f109b52347f7..b151ce1e7817 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD clang-common-10.0.1.ebuild 573 BLAKE2B a2e0ed9b70b470ade3c22d56ea097befd935702369dcb21b367f3baa95635e1edea1f62760ffe3b678a72410b8b20091167bc5c38d75350004f52b24d7497cae SHA512 da407fe94951d7b6edfe8a237d761bda0114a8e34fd3fe59933c4605851b6a414f9278204e6b7f83d3f6ac9334f80660a7733484b64291ad58c84364015585a4
 EBUILD clang-common-11.1.0.ebuild 581 BLAKE2B 3e7e2e6c0b0a7f177aaf610a7be4bebb6eb23aec0f4677263555a37c57eb6547d94078465939f9062b562f0b5cc59bda22b2e293e0b2f7907f66dd76c95fe554 SHA512 1ce397f6029bc8ee03c8d0aac13e14b7faf77cc446ab390f1435c8c028364620e565e73cb5e97bb6c0093e0a20c34e8a4ceab9591707687567520c0192264bea
 EBUILD clang-common-12.0.0.ebuild 594 BLAKE2B 24422b771d72ca53dec018f281f05701f0b39a60e81168f60dbe36545e520f1e974eaa3b2d65d513fd5207f01acd63a90777b50509953ba2d21e38d8c4d025dc SHA512 07ded270729f30ec981a54b729f451c8c2dcc3d94ea60cd37556f54a8f4e78e9aa0daf3c377dda7de8d8d9c1277e0c33c5576e89f6a239750b87d52139578f2b
-EBUILD clang-common-12.0.1.ebuild 598 BLAKE2B 4bcaeaa6c64e882067cef81c495839c752b54864284183f0383be63dc07ebaef1758b1e870486c2c09b8f42d0ffabba7988750c60a0eb4d83e42ac3a934239fc SHA512 d0fb7add5034bc118c6246d0b01954e07c8e401571ba9fa3a9f11140cfa1606a3b1f48f788e4c8bb4da1fa5a7bbc591e21a4363d3179e194d80b5b7e2da0bda8
+EBUILD clang-common-12.0.1.ebuild 597 BLAKE2B d72fc72d52a30928d2d4fed8ba35e2ae726107d5727d4c383f303a313d298dc2de8706c94d49772892b171db1686db792ffb229d70ab408f0bceca57e64df121 SHA512 6a8b05bc4bf181da5aab6a1bfeff17755a01889305aff856f9f7a2b3c8cf607b463df1081ee4251181296827a1c80369064dabd1be38b5522fa9af7998bad9f2
 EBUILD clang-common-13.0.0.9999.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
+EBUILD clang-common-13.0.0_rc1.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
 EBUILD clang-common-14.0.0.9999.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-12.0.1.ebuild b/sys-devel/clang-common/clang-common-12.0.1.ebuild
index 01622c6e875a..ea334ad572cb 100644
--- a/sys-devel/clang-common/clang-common-12.0.1.ebuild
+++ b/sys-devel/clang-common/clang-common-12.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-common/clang-common-13.0.0_rc1.ebuild b/sys-devel/clang-common/clang-common-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..03e4441b91b9
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-13.0.0_rc1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+PDEPEND="sys-devel/clang:*"
+
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 9abb55bbcac4..268a70b1887d 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,7 +1,8 @@
 EBUILD clang-runtime-10.0.1.ebuild 685 BLAKE2B 175c35a6d7960eb40f49cfe3ecf42cd7c52aceb60591b83a81ef494b52ca08739cf06397fdd45fb0e782ae07dd506277826c816643a6f885a8d59d0b97c63123 SHA512 51e03c55059ada3ed7b7b26217c8184045aab8397bbb7172e0a5d9fe6c90b0369fdc91429a485bfda2fef08701a2ea8d9ba15b349438fd53470e37c28789ee23
 EBUILD clang-runtime-11.1.0.ebuild 692 BLAKE2B 5703e482af3e2983d4c7a5c6345fb33d2ec0e7bc68ec67b3a9346aa022819f1c324f766639f49828da6fe4e254a4986bdd60276766b8558a488ed9aecb9d75dd SHA512 ae9e43cf8f97366d8248f8587cec068c775f57d3daeaccd09f24ea337ed98dd7808507e8a6024225d8508301abd35f63a6723cdc83593176fc3affddd74fdf11
 EBUILD clang-runtime-12.0.0.ebuild 705 BLAKE2B e78f47523b471645662518919b515067f25a69a339739ebfb96a31e19422f325ff38dcbc8b8ad591d11eeb3c4b5b0b73ea7ab9c423a9e6b2f8e35cf588a5c006 SHA512 e7c3f2420c794916c8367e874c01db1e1e297852ca8682da333d54b3424bf32870d3fe8f4936e25e3537c075a8fa429522fd173fbcf75fa5f1e59b69db4bb98a
-EBUILD clang-runtime-12.0.1.ebuild 709 BLAKE2B 5b533ae47cfa4c8c5dfa8b0a9383c5d39cf8bd43d5ea3424fef3dfab89e18199c01e9263f94b354985be82cf3268a0b7accc09d6237d3cbbbc3e7f81e0099807 SHA512 28ff3e688a68b5070de307fb5a7a040488b1e1e8464ab440e2186b2ab20dcef4ade742180b74db91909ed79f66a511da4eb2012af0f1575ce0d6dc7b13f2c8c6
+EBUILD clang-runtime-12.0.1.ebuild 708 BLAKE2B 8157a8f46b6ce5228d6adf84bb4beebab9e25e79be59540b6f46275c695c2ecbf8f4fa571c5ab02b422c289540cc7fe0e19ee3c62789dea041da613193278f6e SHA512 0484ec1a4331b33d1931c6bf4082a345e45ed5df04c05813d6e56434cd3e2c5d4df6ece7e3e494aeb111a9788607ec53a4b91157e32a1676ad12911526ff126e
 EBUILD clang-runtime-13.0.0.9999.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
+EBUILD clang-runtime-13.0.0_rc1.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
 EBUILD clang-runtime-14.0.0.9999.ebuild 643 BLAKE2B 350729e0dfcd606089836e7d8f40e6f080a2dcc9553e9283df027c39ab041f93584162a9d299f5a2fea49c448019c9d19d0df6f1fd40d53b51324a0ad7495020 SHA512 c383b8976ca5e5b5a0a8f724854c019e1f6800d8b47594a2f9203c6b9c0831675a862218acfcaa93267f114a5904ca7041e281b746f9f1fbaeddfbfc08235c4f
 MISC metadata.xml 578 BLAKE2B d58a4d1a7bf88a0d5640a02f3acb7e491f275b3bb66a8583aa057b8daae93bb1dbb80f6150bc326228c6ab8c8f8498b46bf72a3fb5e97d0eeea2fb39f87660e3 SHA512 822f56b33d991088ad5e51c3dd96e2e36f544b68c57e45ed8365835d1ef6d0eb797f9de1f8f33b59fbbaf085e245079ca767d5e8b773261cf9ad2c5629b7b16a
diff --git a/sys-devel/clang-runtime/clang-runtime-12.0.1.ebuild b/sys-devel/clang-runtime/clang-runtime-12.0.1.ebuild
index b3f915df904c..9730bf88debc 100644
--- a/sys-devel/clang-runtime/clang-runtime-12.0.1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-12.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang-runtime/clang-runtime-13.0.0_rc1.ebuild b/sys-devel/clang-runtime/clang-runtime-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..218cdb1426f6
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-13.0.0_rc1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+PROPERTIES="live"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}
+		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index d1f1f1efd299..da4b47969deb 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -11,10 +11,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD clang-10.0.1.ebuild 11494 BLAKE2B 0e3a04d4d8f6db728703cac19b8bc0a07e3e9644651986969e9422515eb5037ac2107ae90e5b6fc3cf8d3c549cfb6e21b918bf193f275f18efbb46b0e7da4464 SHA512 05df3ae5d3bd93f55dd572b5e524f4e8f1bcd155228d480bcdafb5db29613edf8d8d98a02183260091bfccb61636612355b387e53c8e0c1bb9612a5a4f9fb148
 EBUILD clang-11.1.0.ebuild 11852 BLAKE2B f2c36f5206bc0995a921a583beb85ba6430ba74ff62409f238b36dadcd20b3092abdbd1f4143a6a1a6de1f6b82a24cbaff481ea0483e30240e4d8788c8294a07 SHA512 3833b2597f3cf7d6887e151a95e6e81bab8b8c4f964ab08e4ea2bedd4a7b22e7efc12ce2ba15ba02c6dd6997801a81a9b905f2bbedc1611d8e78bde05c192278
 EBUILD clang-12.0.0-r1.ebuild 12007 BLAKE2B 105fee23696a755fead0b4c261da12c87648ccdb5b499078e6821e17b48d8a2148a805457dbcc100888d9df0f32aeed1c4b9277023252766d8aa1f98af95d098 SHA512 22b1cedea4b139b4d4cb942631dee99fe0f0c7fb242e3e46ac857cf396fc49cb50006e9ac3f42fa85aa16bf75cd07f60592e1e6c7b05ff585be6ee10c2e05241
-EBUILD clang-12.0.1.ebuild 12010 BLAKE2B c46af2a8dce955060b2c5aa66f297ba7195cf0bda95bc3c01e316818a5de9a0e6624415b8baa1c4416d80cf90309b1a53fc2bd76db18a1ff83ea839f8221014f SHA512 0f858f6d9ebe68273795b046fa28837fbc7b26ec0d618ad98ba7991176a28b3df0fe6b090100784e79ae4cb86ff50ff40a9d15fa93e6e7185ca7cc64ffdd5518
+EBUILD clang-12.0.1.ebuild 12009 BLAKE2B 75d8254f6421dfaf89b511b16cf69bd130cb44f29fd9d4acfcce9fb145d24881010c0cba4b5e5b3b11342a32bf632f77fc4196054246550818eeb3167d4e955d SHA512 6873cbc8087417c031cd4c815150cbacab715334af89bb03190b1eade8e4b72bdbddb9541e4069c8feaeaf8efaae0935e4c9a2e03b5d44fa469700c4d14f1652
 EBUILD clang-13.0.0.9999.ebuild 11952 BLAKE2B dd5024b469679b5ec459101bc2dea65fb2f888d15c494cce41491604973946e4370a661c4783269fb3952e838bfd9cf55981baa3d986d3df88ed225b68899126 SHA512 b434043d9b98baf06ab7a1b07916fabcadaeafee68abdc16e515fb0c015fa78c7e660e5864896e6cce740107882ec361cc4ec62a5b95afee1d6fbe5d7b9e8915
+EBUILD clang-13.0.0_rc1.ebuild 11952 BLAKE2B dd5024b469679b5ec459101bc2dea65fb2f888d15c494cce41491604973946e4370a661c4783269fb3952e838bfd9cf55981baa3d986d3df88ed225b68899126 SHA512 b434043d9b98baf06ab7a1b07916fabcadaeafee68abdc16e515fb0c015fa78c7e660e5864896e6cce740107882ec361cc4ec62a5b95afee1d6fbe5d7b9e8915
 EBUILD clang-14.0.0.9999.ebuild 11952 BLAKE2B dd5024b469679b5ec459101bc2dea65fb2f888d15c494cce41491604973946e4370a661c4783269fb3952e838bfd9cf55981baa3d986d3df88ed225b68899126 SHA512 b434043d9b98baf06ab7a1b07916fabcadaeafee68abdc16e515fb0c015fa78c7e660e5864896e6cce740107882ec361cc4ec62a5b95afee1d6fbe5d7b9e8915
 MISC metadata.xml 1336 BLAKE2B aaddc1c1193323466a545df21dfa53b637c3edff4f61cd55037d8327273457cf8d35cad7b92a2eef31acfb055a3e1ed93cb53a913b01eddf43b7b3dc6de880c4 SHA512 0538198df449cdf4d0cd00cb50d7c6883b06524419a29c4376cdcaed440fb84cfbd4983a1a025ae9a6e2fc5d91a4870bfcde587c493d8b617baec2214705601c
diff --git a/sys-devel/clang/clang-12.0.1.ebuild b/sys-devel/clang/clang-12.0.1.ebuild
index 7e51bae7ca16..9bd1ade6159a 100644
--- a/sys-devel/clang/clang-12.0.1.ebuild
+++ b/sys-devel/clang/clang-12.0.1.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)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
 IUSE="debug default-compiler-rt default-libcxx default-lld
 	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-devel/clang/clang-13.0.0_rc1.ebuild b/sys-devel/clang/clang-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..d5bd5c8e6ea9
--- /dev/null
+++ b/sys-devel/clang/clang-13.0.0_rc1.ebuild
@@ -0,0 +1,441 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org multilib-minimal pax-utils \
+	prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx default-lld
+	doc llvm-libunwind +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	doc? ( dev-python/sphinx )
+	xml? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!<sys-devel/llvm-4.0.0_rc:0
+	!sys-devel/clang:0"
+PDEPEND="
+	sys-devel/clang-common
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? (
+		=sys-libs/compiler-rt-${PV%_*}*
+		llvm-libunwind? ( sys-libs/llvm-libunwind )
+		!llvm-libunwind? ( sys-libs/libunwind )
+	)
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	default-lld? ( sys-devel/lld )"
+
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_MANPAGES=build
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+LLVM_PATCHSET=9999-2
+llvm.org_set_globals
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+	eprefixify \
+		lib/Frontend/InitHeaderSearch.cpp \
+		lib/Driver/ToolChains/Darwin.cpp || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# headers for clang-tidy static library
+					clang-tidy-headers)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-wrapper
+			clang-refactor
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+
+			# extra tools
+			clang-apply-replacements
+			clang-change-namespace
+			clang-doc
+			clang-include-fixer
+			clang-move
+			clang-query
+			clang-reorder-fields
+			clang-tidy
+			clangd
+			find-all-symbols
+			modularize
+			pp-trace
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-clang-man
+				docs-clang-tools-man
+			)
+		fi
+
+		use doc && out+=(
+			docs-clang-html
+			docs-clang-tools-html
+		)
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-build-py
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# disable using CUDA to autodetect GPU, just build for all
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+		-DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-clang
+	multilib_is_native_abi &&
+		cmake_build check-clang-tools check-clangd
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
+	elog "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
+	elog "  dev-python/pyyaml"
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index a2ae630b37e7..37f5cd201cdf 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -2,12 +2,14 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD lld-10.0.1-r1.ebuild 1178 BLAKE2B 52360dc17b7276276ead4183d47954a68f217f19fc0b52f36772cf28225df793b53e61b38a6c90b0dfade77c05270e5c4ade8696b4b29b56746b1b8e2a97f691 SHA512 6a313c7fe0719f32805f7eb3fdc601ec84c6a386ec25867ddafd05c71ec5a37ce1116ead22d8ae64b5f96dda944b34202a0e2eb03452daa9bff822442865ec74
 EBUILD lld-10.0.1.ebuild 1327 BLAKE2B c1933a141d5460f94cee3bdeac644760aec6d8e5906e3202e54a7a9da441a57d2de33b77d906dea4dcf6d7bac0bef97edd29c0a8d756093e9b56f81fbec07e01 SHA512 5901b7d0f5b2d07234d3287ab003e68b032a42e0887ab0d76fdd7a7af12feaea97a3ce07f06f3f1c428f7b5b4fa7f98daddf0909c8e3c0bf7ab2adc75363ed95
 EBUILD lld-11.1.0-r1.ebuild 1250 BLAKE2B befcc678c9eda33c73806c12b2c24bb8f3b8c9310303c42ceb87247e9816862f25bab546a5989bbe018f40118283c432c71f895e0b333a27a3e344d570e58102 SHA512 7a2046cc5bef8a7c0889fa6fb0bbf1eeaf776cd446ce3188df6c70898de097c0833e6d9293d4a7dad99fa1d6bf894440920549b6295ed442aa0c560149a71a58
 EBUILD lld-11.1.0.ebuild 1399 BLAKE2B bfa3538e4bd9492e94547f4ed304d75ff5da1e58c1d1a3e044be9da0c77a6ac71fce301ef3e6970cc520cb0c31abd9a81a668998b9c808852b157c91c3e398f4 SHA512 2ae031e69815ad5711567fc0ff5a7aa20d1cd49bb29dadb03f9754bc69da89d309d57996f3a67157be55c87c75cac7ab00ec53deb9b579ed74901c1789f7cf5b
 EBUILD lld-12.0.0.ebuild 1666 BLAKE2B 6fe783db711fd7a68603e02271eb8dcdd71bee6729e2b940fdbfbe318514bf87312252ad290f059d0c547ab9c5efa4877f6c93c201e5b2e10e31d3f31466980c SHA512 85a2c9f6105acc9ab00a241e7dace1c933fad82f878e7d0df7706e57b6c54df9a94932a1c3b66d5bf0a551eb1187e4964fc7e370648f2243765bdacb6e2f2040
-EBUILD lld-12.0.1.ebuild 1671 BLAKE2B 8f04ffcf0837a8000f5de80d36034b33b83458918f76dbd7ecfc5640d07cf2c9fce3b6b8e49138cc97e9d2a05051a4e5cb9d68b1a77db5060c861d018699ea28 SHA512 e054b3d29377f6b396366370026b54e362de3ba20e4b5ef971b32610a1b7de57ec24eec94d4586b7c453653249840260eb16aca795a36c2a29a3039fa37f8d8f
+EBUILD lld-12.0.1.ebuild 1670 BLAKE2B cdcd11b84306a45791d3bdcb41f7058ced2df5278d5a2c7c57a83a359ede641ecfd7009894c67c60b4b43b1303df347a1bf85f790bd71b069acf82b87df073da SHA512 887a40f2f88f34815e5f355ad38c6a9bc20a3d24bfd55f9e1117021b696940a9c947b4beddf20f6acedd404c7f279495a768c77e594d1fed9bf86a819bb32fae
 EBUILD lld-13.0.0.9999.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
+EBUILD lld-13.0.0_rc1.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
 EBUILD lld-14.0.0.9999.ebuild 1629 BLAKE2B 6bbe1d8e730c8ab5719492f03791754bcba4b18839bed1031afa617cff7e88f6b16cad038fa96eccf64e817fe017844fe466b754fbecebea32bb7bc48c5a0339 SHA512 f4239a40bd9cbdde38f837643290214d230f79243f21b22503af0c0c2ebc28683d913db3b0a72ac9582c95c236b63f1134cdac41a18118a98915c606e4d62285
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-12.0.1.ebuild b/sys-devel/lld/lld-12.0.1.ebuild
index 28e940174a88..b3e4d53f390c 100644
--- a/sys-devel/lld/lld-12.0.1.ebuild
+++ b/sys-devel/lld/lld-12.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-13.0.0_rc1.ebuild b/sys-devel/lld/lld-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..68762b0a03cc
--- /dev/null
+++ b/sys-devel/lld/lld-13.0.0_rc1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)"
+
+LLVM_COMPONENTS=( lld libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index c1319c260e0e..9fc1c92a0b9b 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD llvm-common-10.0.1.ebuild 588 BLAKE2B cd416d913d8ef3f7abc35f4d4db088cb116ba1881b6ce10760ad6a7302b91cc128c560ddf9b7d4ba0acbbbf9c88f2fdc57ddb15e117254d4feec03a601a7fb24 SHA512 c0e63e8e0b26e33133aa0982b21fef306e3d07ad07a9d9e6046e5dbe782162ec8ec701064d0db1aa741d61b6146854cd1de2a352938e6b579be22a21dde753fe
 EBUILD llvm-common-11.1.0.ebuild 603 BLAKE2B 0a7273b73b30e1cfb707d232c8634368edf0c10ec938c78544c65ee8553f0916a271fbdacbd358fbafc8d02f1f3e2d8f48dc4ff5b77ef9f5d5f80ef3d2e05eb3 SHA512 520efa24caa6415e82461362659b7db6ea11d4bc3b6b93105cbdd45ce0f46dc35f2b14151425e989a45656e93a5d7b9a3288ff55ef0d585b4b376dfcd5908067
 EBUILD llvm-common-12.0.0.ebuild 609 BLAKE2B 2faa36404e10c224574c12300a941de17ef147a0574a95b5c3296ebcd607b705dee123620ba335e98a66846a2989a37a2f6a53330c9f1a5fb6ee14ae4bcf5aa9 SHA512 236aa7322479eec3d1c442998fbbc235f277c559bd060ab1655cbd8e172de5a1fc603b56390bbba0e027d62fc46d2d781b7680daa29f62633230fd167f9f9a95
-EBUILD llvm-common-12.0.1.ebuild 613 BLAKE2B 960b0e06a84ef48bf0f0ef0e174b475572689d9a8a477f8b0a1a336203e1c8a3c5d034010a8e3e36251a0e0af95e8be9891d4ef77527122c173d65ff6e45e48c SHA512 7e4fdb7fae1bf619a2c2bcaae1486b8687431576bf3dfd856cfe2ecd618a77fa20a66f66ad692131cea71b762f3c7818ce677dceb58c3d45b145a4e2a9a3cfce
+EBUILD llvm-common-12.0.1.ebuild 612 BLAKE2B c0c69e45e0a291ac7648d29e5fe115945edc767d58c933d25e5f13b0566ae590993283dbb8e13c702eed030c1e7dfc549cffb7730337bcc986cfe2fb9f46fbd5 SHA512 6f7f7ad3f9c4dc7caa358d54c0cec553c145c20e4b2f9d43d1bc5cc4a3aceb1e7aa4c8c317424f00af97225e25a71dcd3961e411836aa41d3dd595c6b299b567
 EBUILD llvm-common-13.0.0.9999.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
+EBUILD llvm-common-13.0.0_rc1.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
 EBUILD llvm-common-14.0.0.9999.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-12.0.1.ebuild b/sys-devel/llvm-common/llvm-common-12.0.1.ebuild
index a2e51ece1ffb..39588c40e874 100644
--- a/sys-devel/llvm-common/llvm-common-12.0.1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-12.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm-common/llvm-common-13.0.0_rc1.ebuild b/sys-devel/llvm-common/llvm-common-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..53511a0a20e3
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-13.0.0_rc1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index 8fc2f029e5dd..c2017e0f9f35 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -26,4 +26,4 @@ EBUILD llvm-roc-4.0.1.ebuild 2344 BLAKE2B d195d63018e995832f513b50ad0f2ac7563492
 EBUILD llvm-roc-4.1.0.ebuild 2353 BLAKE2B 0ad6a859369212effe46aa857af8902d2be4113ff00b7760c79c4372c31f4c08e217b928fa06938e9aa9f4859677c6dc7b6624fe19b42b1477c238ec31c2b0df SHA512 2075d70c1d396a7a09a570480dfe054236ec987bf2b95059a85a0011e2c82f9dbc0d0a66ec61a93b5954ecfd5a6061cf742b51edf574754e3876e92733d458be
 EBUILD llvm-roc-4.1.1.ebuild 2392 BLAKE2B 6991a50a82746c051c1084f0e4794c31347fc792a7da6ba791cc09fe16de7394cdf70edc50da73db0db8db5e554c6d8cd41f087c47b9dec0d60bb9f8ac98f9fb SHA512 489431911aa16544645387b13a6296000b7171bd0910065bd778d87ef5b1db33f26d40ca4d6ea88998a7ed932603ceba41eea5c11b1ffb09890c5d530f64b644
 EBUILD llvm-roc-4.2.0.ebuild 2366 BLAKE2B 91003a3a21fc407c8546b4984daf617414877b61b83bfa20ddad15f64582b3076e744d42040d896c3afec6ca9e9a06433035883775d72841914c48b6a60546b8 SHA512 c149083879e100e8db6125c9d5ce839e3cf15e932b49378be4351da1e5213369b18a428b681d7dd1fd53aa1e0c9ec24e6d8cc2c59a8fd748395764473b5bedd4
-MISC metadata.xml 461 BLAKE2B 5a060c417f0bb9bf1fba8375292e7bff20b2c50c3a2ab490bd436f81a954dbd370d61ba59b305b8bdaad9887e9c6a872eb30fea31c566dc6d74d3493b40d0a26 SHA512 a82c2186fc0642dab37608155dcf0aafd20701cb7e2769c6eb3aae88d4df6690743769a75f47efdb36fd8a3d6771f0feecd3efd01c98460fe195394c16d95660
+MISC metadata.xml 469 BLAKE2B a1e09f1367584ac91c7ff11e1960ea9bc9fb4cc91f6aba026c62bc8eda0d73c63d9cac2307c0acc45a0d6edad2c42dfe48b62ce7186e97eeaa431cd92e49efb9 SHA512 80825c579b65284d97c97ed7988330141c9c5587e3b95e22c28908b98cf010298b75dc04b5e2ccfe38cee22f6ef916c9226f7db4c604a4b4dde2b2ff6c755a37
diff --git a/sys-devel/llvm-roc/metadata.xml b/sys-devel/llvm-roc/metadata.xml
index bf09a1db7df6..3059c2f2ffbf 100644
--- a/sys-devel/llvm-roc/metadata.xml
+++ b/sys-devel/llvm-roc/metadata.xml
@@ -6,7 +6,7 @@
         <name>Craig Andrews</name>
     </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/llvm</remote-id>
+        <remote-id type="github">RadeonOpenCompute/llvm-project</remote-id>
     </upstream>
     <use>
         <flag name="runtime">Builds the compiler runtime libraries.</flag>
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 2250b1f6793d..3c0a62ac8a3e 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -11,10 +11,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD llvm-10.0.1.ebuild 11490 BLAKE2B 40960dd1109655157b04396283d704ea1a0af35ffd09ec9bab2718d62fde888508246ea77a473cd7512c1818b5a3a8d7b72e5786d64faf43bd42ff823b765e22 SHA512 75767e94d55ca1f9f7a769abfc0c916388e69ccd51620c8083f8bb184bf9649d2b9c75efaed46d96f8e0932cb3e6beb71d51a3b1565243218a3efd5144238296
 EBUILD llvm-11.1.0.ebuild 12504 BLAKE2B 7f22ab387fab31e11d554667b1b183f5b66203f601096c130642500f877f2af473b31a0cba96da93d9c85d50e2fbafb7f46a0ff6bf2f96a0bd41266ddc04dc8f SHA512 716b8474077279b821140d2defa5f1dd5b2ab7cf09aeb27907410a184a701ecbf99f545622e68d0a81a762c3b5cbc6ff3b30415a331d38dac8fb72f37a3147bf
 EBUILD llvm-12.0.0.ebuild 12772 BLAKE2B a41ff10ab546eecb3b37c32ad55ac317b7d966f6a3b0cad7c3d5263a43919df575f76e0f60498e03e0fda4e6eb61183d4aa645621c946cd3aad5d05908209eb2 SHA512 6ca48dfcb3b975f0d837fd6de1b1a02ff199fe615ef0524ff8cfea95ca9cb8b25339c14fc9c746081cb4d19566ffb9d9c5dac42e650efc56174bf5ffeca80fb5
-EBUILD llvm-12.0.1.ebuild 12625 BLAKE2B 458487e1b943f982da89b171de0a0deb8b6a4418fb55df88f35adaab1d28dcc8990c34c3b1c65ec486ab7762c72f6cbdafb212585ad48397b1368a2bd854abe7 SHA512 3fd3f71b2eb2651aec0670c178a530eb54227616013d5220857352bc0d63fad101792b41e79135166cbe25401ee3ec63614a93c7fe0d1a355193232331ca3b8e
+EBUILD llvm-12.0.1.ebuild 12624 BLAKE2B 6805d822bc72cac0c028c88848662f0ca4e23a9a9bd7ae55e48a2e55a62c4830cae727fc007b99e351258b8507c85faaccdccbd3c9fe453e298746b198e3878d SHA512 9ce574d793324cb126022f170fa0111460233dc0a9e1df69604ee028e018a29affc013a41defbbd164cfbcd44a146cc3158c8d9f2d9ca32a60e1f43f1d209795
 EBUILD llvm-13.0.0.9999.ebuild 12589 BLAKE2B 44bca6c287c2d804f6701a8ac8a953624e8418d1ead94450b7b8b5f0ff5192bf6c027ca4f290c8a0e6bc96badd50be68e3fa2765f8cc535ddbd2bd8a39530b2d SHA512 b3e11ab52ca7309933d7cb66e3cb5c85c934c5e417e271d3c8c14879a1afc190b7a49f68a5abc2d847f1883a17f85cd3e9ab42b358b530424d4314707063fce9
+EBUILD llvm-13.0.0_rc1.ebuild 12589 BLAKE2B 44bca6c287c2d804f6701a8ac8a953624e8418d1ead94450b7b8b5f0ff5192bf6c027ca4f290c8a0e6bc96badd50be68e3fa2765f8cc535ddbd2bd8a39530b2d SHA512 b3e11ab52ca7309933d7cb66e3cb5c85c934c5e417e271d3c8c14879a1afc190b7a49f68a5abc2d847f1883a17f85cd3e9ab42b358b530424d4314707063fce9
 EBUILD llvm-14.0.0.9999.ebuild 12589 BLAKE2B 44bca6c287c2d804f6701a8ac8a953624e8418d1ead94450b7b8b5f0ff5192bf6c027ca4f290c8a0e6bc96badd50be68e3fa2765f8cc535ddbd2bd8a39530b2d SHA512 b3e11ab52ca7309933d7cb66e3cb5c85c934c5e417e271d3c8c14879a1afc190b7a49f68a5abc2d847f1883a17f85cd3e9ab42b358b530424d4314707063fce9
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-12.0.1.ebuild b/sys-devel/llvm/llvm-12.0.1.ebuild
index 7c4592021a3c..30f76066e2e5 100644
--- a/sys-devel/llvm/llvm-12.0.1.ebuild
+++ b/sys-devel/llvm/llvm-12.0.1.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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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/llvm/llvm-13.0.0_rc1.ebuild b/sys-devel/llvm/llvm-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..ebe79aea74c9
--- /dev/null
+++ b/sys-devel/llvm/llvm-13.0.0_rc1.ebuild
@@ -0,0 +1,521 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Those are in lib/Targets, without explicit CMakeLists.txt mention
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
+# Keep in sync with CMakeLists.txt
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	exegesis? ( dev-libs/libpfm:= )
+	gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	gold? ( sys-libs/binutils-libs )"
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/cmake-3.16
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+
+LLVM_COMPONENTS=( llvm )
+LLVM_MANPAGES=build
+LLVM_PATCHSET=9999-1
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_live_ebuild() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+	# reorder
+	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
+		eqawarn "ALL_LLVM_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
+		eqawarn "Expected: ${all_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the live ebuild is up-to-date
+	check_live_ebuild
+
+	llvm.org_src_prepare
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-bitcode-strip
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwp
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-jitlink-executor
+			llvm-lib
+			llvm-libtool-darwin
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-otool
+			llvm-pdbutil
+			llvm-profdata
+			llvm-profgen
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-rtdyld
+			llvm-sim
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tapi-diff
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			split-file
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use gold && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/rust-std/Manifest b/sys-devel/rust-std/Manifest
index 14da0147f1dc..8348fd1a7f27 100644
--- a/sys-devel/rust-std/Manifest
+++ b/sys-devel/rust-std/Manifest
@@ -2,7 +2,9 @@ AUX 1.51.0-bootstrap-panic.patch 1508 BLAKE2B c5fec1047e0fd5ec7413a4555edb427f19
 DIST rustc-1.51.0-src.tar.xz 109596164 BLAKE2B c1ac89655adfe7db8005476d42c748cf1896f52888141229fd6dda43855dbb08c21c8e1f11398d2f1f9dd5f8d508d9158a3bda4f1b282d1b184ea4c701100837 SHA512 ded91468ddf3e6627f00e7ec3d44452aa24eb727a183c0de9d90264f593119a54300d56b09251a88260db480b48554181ae195c538996a32d68d48b6587ac0df
 DIST rustc-1.52.1-src.tar.xz 115109508 BLAKE2B c5d73f5884037d287d88ba9fdaf63a36678b692e1b510920045797ab29f1660f05cda901e19411ff83ec3084c4130034c269976b1056220f3e629cff116d07f0 SHA512 55f5053ce40d4eba4663052817aef6a6275139ca229c89cd1ec44711458b412720203301d8c7975aac5720a91fcaf21847f8184f641cbb0004f722520283c73c
 DIST rustc-1.53.0-src.tar.xz 115686332 BLAKE2B fa068f89d42f927fdc79ee31aad1386eaf2aa596a060e059c5a1a73fe48c48d008fc952cd6c7912b743e41d77a94b205639eed0f728b2539b62f18a772cabfe3 SHA512 70485cf7a0f7fc36ee31644e546374079dc387a85b44e5e793707fd0a4d7ca05d311291e78b86db955485d8f21c47ff9e1908acc4da68ba04929287213a40c24
+DIST rustc-1.54.0-src.tar.xz 116286856 BLAKE2B 5ac47822646a0b6205f09282168b4d4ddcace9f6bc8f242c890327ca4074626f129514f8bcae5c5556015745f718990cce490658076f5cd3526623439540416b SHA512 5162f85b43ca2c5af93fdbfb2597d75df8a838f7fcc025a5298499ce1043db50f1ea2fbba753e47ce5daad3d80d4b612acf6527ef902c34117763e687fdbbcfa
 EBUILD rust-std-1.51.0.ebuild 3432 BLAKE2B 3e1190dea4bcce01f58843ab7ff3577de9b573cbb2b7d5ceaa346c994f0343343740aaea657cb8359c40c1d4e993255ea540ec49fb5168a00a933916848d5ec5 SHA512 d50bef61cd3f49e044612bbee7f52dbb57ae0290e030acf1d1ad56b4d7d166a11fd07766ffde6fbad7fe359e4d36ffb0357b76ef3df8fe5e962076033a4639fc
 EBUILD rust-std-1.52.1.ebuild 3376 BLAKE2B 04e3aab94fa92feca1a5486a1e608c08ffbadca0c73b1bf904a817cf5f07b2b916c37ca629125ad45f9f4f9cc0bb106508294ac39d13e66660547f03480bcd24 SHA512 286c95f28e1ec4f284b1d8412b97cfa427d7573b8dac73b7b2b7e9e8ccee07ccf07f4f2c35f3bc4d32bd848907bdce7b38dcf2040ad9e9e31b0a43445d76fed3
 EBUILD rust-std-1.53.0.ebuild 3376 BLAKE2B 04e3aab94fa92feca1a5486a1e608c08ffbadca0c73b1bf904a817cf5f07b2b916c37ca629125ad45f9f4f9cc0bb106508294ac39d13e66660547f03480bcd24 SHA512 286c95f28e1ec4f284b1d8412b97cfa427d7573b8dac73b7b2b7e9e8ccee07ccf07f4f2c35f3bc4d32bd848907bdce7b38dcf2040ad9e9e31b0a43445d76fed3
+EBUILD rust-std-1.54.0.ebuild 3376 BLAKE2B 04e3aab94fa92feca1a5486a1e608c08ffbadca0c73b1bf904a817cf5f07b2b916c37ca629125ad45f9f4f9cc0bb106508294ac39d13e66660547f03480bcd24 SHA512 286c95f28e1ec4f284b1d8412b97cfa427d7573b8dac73b7b2b7e9e8ccee07ccf07f4f2c35f3bc4d32bd848907bdce7b38dcf2040ad9e9e31b0a43445d76fed3
 MISC metadata.xml 818 BLAKE2B 32766ac24fada44b46f8d4ef77164a4e4843b876347056223184ec6fe48af9a6e2fa7d3e1fd48dec299f328f37fbdf4c84225a7450b788ce3e6c92e87bf8f313 SHA512 c1c4a46790dedc83b6890bbb536927148b293eed7f4d3bbd1f602b7664a9b303ca9689d4d1d35ed8047c2c909d64145fc4098efbec279f630b86207b0216ca80
diff --git a/sys-devel/rust-std/rust-std-1.54.0.ebuild b/sys-devel/rust-std/rust-std-1.54.0.ebuild
new file mode 100644
index 000000000000..7ca481644a6a
--- /dev/null
+++ b/sys-devel/rust-std/rust-std-1.54.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit flag-o-matic multiprocessing python-any-r1 rust-toolchain toolchain-funcs
+
+DESCRIPTION="Rust standard library, standalone (for crossdev)"
+HOMEPAGE="https://www.rust-lang.org"
+SRC_URI="https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable/$(ver_cut 1-2)"
+# please do not keyword
+#KEYWORDS="" #nowarn
+IUSE="debug"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	~dev-lang/rust-${PV}:=
+"
+
+DEPEND="||
+	(
+		>="${CATEGORY}"/gcc-4.7:*
+		>="${CATEGORY}"/clang-3.5:*
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+# need full compiler to run tests
+RESTRICT="test"
+
+QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so"
+
+S="${WORKDIR}/${P/-std/c}-src"
+
+#
+# The cross magic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+toml_usex() {
+	usex "$1" true false
+}
+
+pkg_pretend() {
+	is_cross || die "${PN} should only be used for cross"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	# do the great cleanup
+	strip-flags
+	filter-flags '-mcpu=*' '-march=*' '-mtune=*' '-m32' '-m64'
+	strip-unsupported-flags
+
+	local rust_root x
+	rust_root="$(rustc --print sysroot)"
+	rtarget="$(rust_abi ${CTARGET})"
+	rtarget="${ERUST_STD_RTARGET:-${rtarget}}" # some targets need to be custom.
+	rbuild="$(rust_abi ${CBUILD})"
+	rhost="$(rust_abi ${CHOST})"
+
+	echo
+	for x in CATEGORY rust_root rbuild rhost rtarget RUSTFLAGS CFLAGS CXXFLAGS LDFLAGS; do
+		einfo "$(printf '%10s' ${x^^}:) ${!x}"
+	done
+
+	cat <<- EOF > "${S}"/config.toml
+		[build]
+		build = "${rbuild}"
+		host = ["${rhost}"]
+		target = ["${rtarget}"]
+		cargo = "${rust_root}/bin/cargo"
+		rustc = "${rust_root}/bin/rustc"
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = true
+		verbose = 2
+		cargo-native-static = false
+		[install]
+		prefix = "${EPREFIX}/usr/lib/${PN}/${PV}"
+		sysconfdir = "etc"
+		docdir = "share/doc/rust"
+		bindir = "bin"
+		libdir = "lib"
+		mandir = "share/man"
+		[rust]
+		# https://github.com/rust-lang/rust/issues/54872
+		codegen-units-std = 1
+		optimize = true
+		debug = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		debuginfo-level-rustc = 0
+		backtrace = true
+		incremental = false
+		default-linker = "$(tc-getCC)"
+		rpath = false
+		dist-src = false
+		remap-debuginfo = true
+		jemalloc = false
+		[dist]
+		src-tarball = false
+		[target.${rtarget}]
+		cc = "$(tc-getCC ${CTARGET})"
+		cxx = "$(tc-getCXX ${CTARGET})"
+		linker = "$(tc-getCC ${CTARGET})"
+		ar = "$(tc-getAR ${CTARGET})"
+		$(usex elibc_musl 'crt-static = false' '')
+	EOF
+
+	einfo "${PN^} configured with the following settings:"
+	cat "${S}"/config.toml || die
+}
+
+src_compile() {
+	env RUST_BACKTRACE=1 \
+		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
+		library/std --stage 0 || die
+}
+
+src_test() {
+	ewarn "${PN} can't run tests"
+}
+
+src_install() {
+	local rustlib="lib/rust/${PV}/lib/rustlib"
+	dodir "/usr/${rustlib}"
+	pushd "build/${rhost}/stage0-sysroot/lib/rustlib" > /dev/null || die
+	cp -pPRv "${rtarget}" "${ED}/usr/${rustlib}" || die
+	popd > /dev/null || die
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index d35f4ee693f0..90c57bb718e0 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 2970763fbf73..57cf4e108443 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -5,6 +5,6 @@ AUX dd-rescue-1.99.8-xattr.patch 9308 BLAKE2B 0874806f5394759edacdc4d937619b4ab5
 AUX dd_rescue-1.99-musl-r2.patch 4035 BLAKE2B cffc620f429db2042a405174a280e44c27dc60f9b3da007969b77d66df599b9c4b9fb02cb2799017c7fb6a0a0f1e8b785c88fb741fb478b6a8f256d0e461bf78 SHA512 a0fe42686852cbdd4ce5a4c55c9dc77cff7165109f3c7d4dfaaec527fa116a17f602ad4fab22410991f05aac6aa8f5b57bb711c05e08f146d532aaa807dbfd66
 DIST dd_rescue-1.99.11.tar.bz2 181927 BLAKE2B 8cd4db6cb8d85962e4cea50b0006fdbe5f085fbcf7bdbfe4d0fab1fe33412c1379317f54429c76ed1d905e32d5e791869fa27f2f14917cb1c3842fc6caca2a12 SHA512 e1d32711421ebbafd80fd210718667ff8c2d22b5349945105b3e4c29d54d381385b1fd188b2d8aa1b7a0aaf2cc9d8f7374373cff3992726a3d17549ca50f3904
 DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
-EBUILD dd-rescue-1.99.11.ebuild 2381 BLAKE2B 901bc00304978c28bf32c1609a510a375fe3512af94859c689ccf259f5fdc2a9e8fb89ae86bbc0136875c63d101e608c6ca34121e7073298512efbcaeca85e74 SHA512 496c4f4bfe2191d26f2d2c9cdacca0a1ff9b16909b7100757fb8616cf3ca79cf8ea439094513818a3fa1691f452894ccef02ba86deadd1f788cf7618e9f8b8b1
+EBUILD dd-rescue-1.99.11.ebuild 2380 BLAKE2B 3b5b1d93e912bfbfb392166441bdb251fb7395c3660dac4ac87190c56ce8cae898fb80c80dcd8ca0f79c2c2389e075b091501619a327fd720b0f461c939f1946 SHA512 ac14b397fc4d73f078d902e5e0e61a5377567dfe578b3fe5ee150ba87d7527a856640358dbaa0f4c89966670d8437d45209a052e5a8d2ce9333efe9e76a399ab
 EBUILD dd-rescue-1.99.8-r1.ebuild 2502 BLAKE2B 8d7f487f02b8c6cbb1ecab1d9226f646a8a6118eb4d90b25128538b1d4a3430d99a1eb2d17f8e70600346e2f3b987e3cf86276c360bc127d90f15dde0c60a099 SHA512 7df6dceb92cdb93f43002cf33f138cdee775ab431e761663cbb6ea4b15c2bec73d73dabb11347d2a3e6cbbb04a2e1feee8f3bff128bdc9c3cc5b6891e00aacd3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild
index 5b84b240edb4..881768ee7963 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
 
 RDEPEND="lzo? ( dev-libs/lzo )
diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index 96c52bf81d3a..b65898871ffa 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -5,5 +5,5 @@ AUX dmraid-1.0.0_rc16-return-all-sets.patch 283 BLAKE2B 5278f1df08db2a63519b6d31
 AUX dmraid-1.0.0_rc16-static-build-fixes.patch 3840 BLAKE2B 713e255890dfbfd7ded83cc914a136cf88a40943ac310f10e574f6ee3683e4cd61b1e369a38ddfb6ad767c904b95b2a04c04b1a38833998485aa4b1e29006870 SHA512 ff2aaebec2be1ace40377a4bcd91c802c190ac4047643478d6f99e3023cf69b4a5e8230519ce2f3febe5d6419a54557184739bcbeaa08047354ca93f27e4ec67
 AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 BLAKE2B eef9d2ef5f2766773bf83bba93d44a02a450a03b1e338f3120473512fe60d7a5f60d4bb2ae25ed019e0c58b89c5e67fd81426ae0fd5e06220976640b84d29d67 SHA512 b5b93d49e716c585284dfd89fe4651fd5bb6921196a053797aeec9cf5654f11da7b2ed1ad93f2df15fd3ef47c95efd67aeecc196fcfd3feb22f7903ad103a8c6
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
-EBUILD dmraid-1.0.0_rc16-r5.ebuild 3373 BLAKE2B f99592578bf19d358fddbee013d95ed6c3b8b8c114f34c7ef0195bcd4ac50e925338af94b4441a532fc43e372471532adb09f7b7c57bf3f22dee6c2157eaacb3 SHA512 4662255b18607c09ab924aa81ed59abfd2e274ec7a53fecf13d3b9a1f764594ec3e20942135961f1cb8d613e06e05b7e17f567683aac7b2957984c2a5a4d290d
+EBUILD dmraid-1.0.0_rc16-r5.ebuild 3372 BLAKE2B d483d9c2c76c3dbf38ef53e0fe593023eab9af678320e20636fb0ba0124b67d02d4eab77d170192d602fac3bb0f6c03825e1b36b38121bb68de932adeedc9805 SHA512 68ac1079bb6b6970c35a84a8f8004e0a92690669e5d493c2c7fe1d702d925b6d8fa00cc247864923d930f97f9f38e953bf2e81a8b7b9dd98685dae3864ba5bf0
 MISC metadata.xml 544 BLAKE2B 8a100ed92851488b9a8c722769ea1d5a443ebf1220698b8de3de05f2b6cb282d4cf1d9849d5f86ceabfc6f70fab0d610853b084f8adaf938c48625be5db87191 SHA512 002f647c3c87349f1d56a1180e90e5746c5e94dc1b2e118aa2737b5d5b1dd72b4c3dbe808cdb56c2db6d47a6eb224784542ae7b005f100818979177c7e1d1898
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
index 3032982b79b5..246c90731c0b 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}/${MY_PV}/${PN}"
 
 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="intel_led led mini static"
 
 RDEPEND=">=sys-fs/lvm2-2.02.45"
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index f86db311c939..6d6ed5762b6b 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,9 +1,11 @@
 AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f977308c429858817fce81520291fd49fb58e6c863474a45a2e3a674da33b5678fcd784a7d1e8bc9472bbe0995ae3dc SHA512 909d43fbe190400d4beabd9801bf554e38a5bb5a3545930883976f42a2090c8768e485183949269639ddeae5bae5490b37dc23f031c48d6c4fd4c9facf08b66b
+AUX fuse-2.9.9-avoid-calling-umount.patch 1264 BLAKE2B f02bb80aab844f90638ed291891d819169946e3e4e58318bf370f5f3721aa80ba8ecd7cb127e387780e5ed8336875e3eca2d776ecde29a85e40821ee89c8264d SHA512 24f6c7ccf8b3d291e0e477685532854a21aeb65a90f7c428db039e6c7ba8a4cdb5435f2effba3a397448c0f6a44e056f2580eb55357a0b29c6c78bf5b364830c
+AUX fuse-2.9.9-closefrom-glibc-2-34.patch 1649 BLAKE2B 6697ecfd16ca8a71ec10c0caadee97c84fe412056c04124cf501a30df1dd7cb5bbbfd8a761692f2396755dda156fd94b86278d78f1a2bd2d7a41b9fd87f20fee SHA512 77bca6a67c235d7d22b156a9c3a8b906de59029d28fa0c985cb15e30d306b0dd6b9437d75eabe307aca7e159ecd90e47bd8fb723a582e95d0c491a6cb308e8a5
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST fuse-3.10.3.tar.xz 2558792 BLAKE2B 5b730321677e5080148c2ca5db35ed14b6f1919c4233ddd54d3a0613199aa06f45124995c5a56d2e8d4551bf328ff26ae034fae42c39035148361cd2d99600f1 SHA512 7329dd26284a15309eafc2b8b3f29ed431a5ce9c927c5965a51c270718f4915c318b84e4cf4e7f7ee1913831ce943a2e1a378d0bd2a1215eba7b9bc65efb7942
 DIST fuse-3.10.4.tar.xz 2787472 BLAKE2B 174b51bf55544bbc08e04089a4d8685b371d3f584e337ed0d8d82c62e10c14b6ef14a964d6627e8a121036db1ab4c6c1ccd413c08f8685d3d91893874427e46f SHA512 1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6
 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
-EBUILD fuse-2.9.9-r1.ebuild 2056 BLAKE2B a62986e92f4deb4993f4c0bd71996c1f2b4be435e396dc869f8fda9d6b0c3e74e397a6388fb66b076cc5bbc441d3122aa8ea7c788d5a96b82386621e1427b882 SHA512 0c65cac78140b2baf6ce8c3342c99cb52a1746b0a7d0a21d4e44955d56d7fd5b334b020ffd2cb1bb982f9652b422e7555d05ab2ff5746b664786e5c2f3c38bf8
+EBUILD fuse-2.9.9-r1.ebuild 1977 BLAKE2B b0db87fd06f8aa63af54aaba48d83718cf1c008cc29ad2b7ac43540e9550fdd3c46341a0d2b6bc1b721372077a61e70c090cffeef28d169caf3a8c2119ae7b96 SHA512 bbf51969a363e230596d2a4e4a3d184d29392a8067124e9362c18da6f596d432b65d1f71f852abab99ed06f9dc89c84ec47083147d2f940d8403d8c0360ab0a2
 EBUILD fuse-3.10.3.ebuild 1779 BLAKE2B c6b51c0cb628354f575d7428a6fd1db86a9a8db3c400f425170334c74409599f079bb5195338b9f1b8325cf7eaeb4a6e52672eec253e7ddf018c84c5687c0930 SHA512 3f52e1f3b2fee5b8704c01d7309c4f0864a48c688731bc54662c7eb96107ea0468f3402df22ff71409311311736f114c6f6c76e43b5ca6f06687cbaf6e7f38cb
 EBUILD fuse-3.10.4.ebuild 1787 BLAKE2B 19b6886011b27cb4ecb6e8128d23833b78c6f97c349b1b65e290607c0ee24a186ff5945ac3f689905162cfba719aad02ebe2269cc6ca0ab33aeeb16eb2edf22a SHA512 b81a884161020b1d1e284e47b0857e0edb4543f3ae504409f2f2f1f2c798e137626a20f914cb1217d42e8273493bad61e9c2e5c12e5d18feb2da38dec2279d80
 EBUILD fuse-3.9.3.ebuild 1909 BLAKE2B 1782605f62d587f1677e140cd2dcf714c2420d642d164a1cfafdbd1270d8a79881ff3daefe168fd9b5fea7dfbf95c994878106493ca89a84cdcbeaf41362dabe SHA512 2dac127d407278184c69798fd84c2f1520a48a31122ef33988efeab878dd942fa82b2abf62098a0ae52b3ffcfe3a5cfc883690bd642238112069f36c0575034e
diff --git a/sys-fs/fuse/files/fuse-2.9.9-avoid-calling-umount.patch b/sys-fs/fuse/files/fuse-2.9.9-avoid-calling-umount.patch
new file mode 100644
index 000000000000..b5c141d29ed0
--- /dev/null
+++ b/sys-fs/fuse/files/fuse-2.9.9-avoid-calling-umount.patch
@@ -0,0 +1,38 @@
+From acb69eca6c25db44523efb4cb1e7088ae66d093d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 3 Aug 2021 23:14:12 +0100
+Subject: [PATCH] Avoid calling umount
+
+Converting a sed into a patch.
+
+Ebuild had:
+	# sandbox violation with mtab writability wrt #438250
+	# don't sed configure.in without eautoreconf because of maintainer mode
+	sed -i 's:umount --fake:true --fake:' configure || die
+
+Bug: https://bugs.gentoo.org/438250
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9946a0e..de433cb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -101,11 +101,11 @@ util_linux_ok=yes
+ if test "$arch" = linux -a "$cross_compiling" != "yes"; then
+ 	AC_MSG_CHECKING([if umount supports --fake --no-canonicalize])
+ 	# exit code of umount is 1 if option is unrecognised, 2 otherwise
+-	umount --fake --no-canonicalize > /dev/null 2>&1
++	true --fake --no-canonicalize > /dev/null 2>&1
+ 	if test $? != 1; then
+ 		AC_MSG_RESULT([yes])
+ 	else
+-		firstline=`umount --fake --no-canonicalize 2>&1 | head -1`
++		firstline=`true --fake --no-canonicalize 2>&1 | head -1`
+ 		if test "$firstline" = 'umount: only root can use "--fake" option'; then
+ 			AC_MSG_RESULT([yes])
+ 		else
+-- 
+2.32.0
+
diff --git a/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch b/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch
new file mode 100644
index 000000000000..beb8d51da1ee
--- /dev/null
+++ b/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch
@@ -0,0 +1,60 @@
+From ae2352bca9b4e607538412da0cc2a9625cd8b692 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 24 Jul 2021 22:02:45 +0100
+Subject: [PATCH] util/ulockmgr_server.c: conditionally define closefrom (fix
+ glibc-2.34+)
+
+closefrom(3) has joined us in glibc-land from *BSD and Solaris. Since
+it's available in glibc 2.34+, we want to detect it and only define our
+fallback if the libc doesn't provide it.
+
+Bug: https://bugs.gentoo.org/803923
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac           | 1 +
+ util/ulockmgr_server.c | 6 ++++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 9946a0efa..a2d481aa9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,6 +55,7 @@ fi
+ 
+ AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat])
+ AC_CHECK_FUNCS([posix_fallocate])
++AC_CHECK_FUNCS([closefrom])
+ AC_CHECK_MEMBERS([struct stat.st_atim])
+ AC_CHECK_MEMBERS([struct stat.st_atimespec])
+ 
+diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c
+index 273c7d923..a04dac5c6 100644
+--- a/util/ulockmgr_server.c
++++ b/util/ulockmgr_server.c
+@@ -22,6 +22,10 @@
+ #include <sys/socket.h>
+ #include <sys/wait.h>
+ 
++#ifdef HAVE_CONFIG_H
++	#include "config.h"
++#endif
++
+ struct message {
+ 	unsigned intr : 1;
+ 	unsigned nofd : 1;
+@@ -124,6 +128,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp,
+ 	return res;
+ }
+ 
++#if !defined(HAVE_CLOSEFROM)
+ static int closefrom(int minfd)
+ {
+ 	DIR *dir = opendir("/proc/self/fd");
+@@ -141,6 +146,7 @@ static int closefrom(int minfd)
+ 	}
+ 	return 0;
+ }
++#endif
+ 
+ static void send_reply(int cfd, struct message *msg)
+ {
diff --git a/sys-fs/fuse/fuse-2.9.9-r1.ebuild b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
index aaf77a867a81..d7a2b42e6113 100644
--- a/sys-fs/fuse/fuse-2.9.9-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic libtool linux-info udev
+inherit autotools flag-o-matic linux-info udev
 
 DESCRIPTION="An interface for filesystems implemented in userspace"
 HOMEPAGE="https://github.com/libfuse/libfuse"
@@ -18,6 +18,12 @@ PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
 BDEPEND="virtual/pkgconfig"
 RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.3-kernel-types.patch
+	"${FILESDIR}"/${PN}-2.9.9-avoid-calling-umount.patch
+	"${FILESDIR}"/${PN}-2.9.9-closefrom-glibc-2-34.patch
+)
+
 pkg_setup() {
 	if use kernel_linux ; then
 		if kernel_is lt 2 6 9 ; then
@@ -30,21 +36,17 @@ pkg_setup() {
 }
 
 src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.9.3-kernel-types.patch )
-	# sandbox violation with mtab writability wrt #438250
-	# don't sed configure.in without eautoreconf because of maintainer mode
-	sed -i 's:umount --fake:true --fake:' configure || die
-	elibtoolize
+	default
 
+	eautoreconf
+}
+
+src_configure() {
 	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
 	# gcc-9 with -flto leads to link failures: #663518,
 	# https://gcc.gnu.org/PR91186
 	filter-flags -flto*
 
-	default
-}
-
-src_configure() {
 	econf \
 		INIT_D_PATH="${EPREFIX}/etc/init.d" \
 		MOUNT_FUSE_PATH="${EPREFIX}/sbin" \
diff --git a/sys-fs/growpart/Manifest b/sys-fs/growpart/Manifest
index eca0652964f1..26a8755058a7 100644
--- a/sys-fs/growpart/Manifest
+++ b/sys-fs/growpart/Manifest
@@ -1,5 +1,3 @@
-DIST growpart-0.0.30.gz 7897 BLAKE2B b8f28615578c1b19a7cd2eff9cb60c37929c2d3767d9f98b07b1040f7f5d2687f41ed051b9899573119b4de9c2e04dcb91d76fc70fcff7a6e6dde0335959681f SHA512 ed6cf92149c0802c4a08427fa025ce2666dd7c32c5d1f362f4d14973f709dfd73124fd85b7eaf179daad5dfb1d126e86d7db0fb1fe7e2d496e17bf0bc1bc9c58
 DIST growpart-0.0.32.gz 9525 BLAKE2B a7c7ca27ae237eb7d6e43decb16cba2c8a26b63bcfe1b1f74f63b116a9cc23fc5e54394df846c13de6caeb8433a4ad7e76046f2f4311e6fe7cb069fce588b6e3 SHA512 baa9e59581d2d9685d4b0e7563e6582130064881f6f9b9fcd3250a4bdceb7d03bcd1ce346218ce4395f82de948f85fd59339cc30417377feb61d5b444f3dde23
-EBUILD growpart-0.0.30.ebuild 512 BLAKE2B b9121f0240fb8b2eee6cf9e2b33ab2e678610a74c1bd295e06096b52b38d654cea9d82212a330cc48a1eafcb6350c546ccaca93f16710b226469fa6e7e28a6f8 SHA512 14148542f813a66c27c9a5b3fe5b2e3cc9a0a2fc1db0b773e9b091d8135a543023acd05a5e173fe43d9c42d0503b6dc2b4ffe667784a030c9c479d33ad6fafea
 EBUILD growpart-0.0.32.ebuild 512 BLAKE2B 8e33048a5607007466c59f918d2c7448caf69277aae1de06c6d6382b233723a29676cde63a5479ba5c5d0ad81ad0e5444efae02cadc9f8656131e1be022951fc SHA512 a0124611f4281df340ece691b956a7803cd2a48fb1607d451b9841d8f22496c5f521c83fbacf0ae9e501ae7ac4fdeaf8e6c52446d3351d0045ec709b5d0103a2
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-fs/growpart/growpart-0.0.30.ebuild b/sys-fs/growpart/growpart-0.0.30.ebuild
deleted file mode 100644
index 2d7de159d565..000000000000
--- a/sys-fs/growpart/growpart-0.0.30.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
-
-DESCRIPTION="A script that can grow your rootfs on first boot"
-HOMEPAGE="http://manpages.ubuntu.com/manpages/natty/man1/growpart.1.html"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/${PN}/${P}.gz"
-S="${WORKDIR}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="sys-apps/gptfdisk"
-
-src_install() {
-	exeinto /usr/sbin/
-	newexe "growpart-${PV}" growpart
-}
diff --git a/sys-fs/jfsutils/Manifest b/sys-fs/jfsutils/Manifest
index d8b223cba34d..5a56c8fc81c0 100644
--- a/sys-fs/jfsutils/Manifest
+++ b/sys-fs/jfsutils/Manifest
@@ -4,5 +4,5 @@ AUX jfsutils-1.1.15-gcc10.patch 2015 BLAKE2B 58accef19b804367f6801724a443e9eefd3
 AUX jfsutils-1.1.15-linux-headers.patch 318 BLAKE2B c04fc414526ed854ed9fd0ac6cd8c1874c924e4446ade2ec85eec2ccbdd8a9c6f580fe6b4b91e61050a468855c46082f2373de08246640362ab81b8e74199cad SHA512 1fd097f403e0ffd434b433fcbf20664166b7ed9b9878f81719d45747fc96249ebac25f8afc9f1f6e532bfac90fe98f1474bb616da3c83fd69cc57d2fe3c11815
 AUX jfsutils-1.1.15-sysmacros.patch 276 BLAKE2B 5c45f4bfc1a03843f59d715bf1c837f33a455e74508b82360c7f77ecd19205e23bc53f445e1bb8c03ca5e88d210685e0dc0ac28f8dfa3eb0b88c4347888e94fd SHA512 3f6472cdfc706e32cc2cefdf673450cb98e81c24c16dea47cacd95f83d75461c8750a9f4dc73ac30782d91e2b7814efdc7e736ef30bffb6cc8ceaf6dba8d51d5
 DIST jfsutils-1.1.15.tar.gz 539148 BLAKE2B 8fe3b4b157482311e7afd938b0d7d22af62a4d342c5d0e6527fc04a90ecc3a5b80de226a4faec582b17bb5a5f10371ab8e0f87e72dc5e1211a0b79180cc5a952 SHA512 fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858
-EBUILD jfsutils-1.1.15-r1.ebuild 1220 BLAKE2B c9a589534a011a4b13a5f586485c96620aa1d65d9c4a7976ebe01eee2a88940b0fed9b3161fa907d1e8689fc9f08edb3654cfedaa85a2a56e6fec24ece7bdad1 SHA512 da313a2a40a387b7e146f9414c039059b2cca226531e0f2b71600783fb0ea435e47440c31feabc9a2de05b517bb76d08ee82915f604584eac15766f26297dfb4
+EBUILD jfsutils-1.1.15-r1.ebuild 1219 BLAKE2B 44f0ba8fc88468c179c25a59faf544047bdf373f6b4e6a09a99c3f6a1a1356a93707a791c3d4a48088b74861681b809af0b1cf14c1a39d2b2fba5adb039c8e57 SHA512 4d270a9997fb1f326ac38f9a9cfe1f79ce16526125bb24cb39418589eb60678ea4415855ad59dd09f9c52d03d00b967ea24ac4c098ac5654950ee6250de647fc
 MISC metadata.xml 683 BLAKE2B db09548b3469462387d1835ad1c835cb45be5fdf5f18b4940ba35e20a1dd5a57159519e862672fdf08989a0c1b4351d721226ee289523fc214dfafb506150f23 SHA512 e81833363d32078db3c370d6a3faa1803857af05e6df470bc3b625da06680bcf725b443697ef356d73d3b4d4c7e4230ba54459e260f9a5e738978a08742af189
diff --git a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
index 43e86a78bf49..af1738a9b97c 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="static"
 
 LIB_DEPEND="sys-apps/util-linux:=[static-libs]"
diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index ec502aa8b4da..2909e5a97f40 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1,3 +1,3 @@
 DIST libeatmydata-129.tar.gz 358437 BLAKE2B 448cff19629fa1a07443a52ebe16a7bf9a8ac7d0c2688e89555ed6c9c2369695a70ae2abf1b74152b3c305e6bc019e2e9808af6642122cd10a73deb7dfb580f2 SHA512 dbd0ea4df77034ecbb75955394b15aec6f1331205a5c7aa4a6e0595e3e486bbcc81c28a264bf5441c660563f74bfb06630da98373d481a2ebd9e9b1538c109d1
 EBUILD libeatmydata-129-r1.ebuild 845 BLAKE2B f053a4f83e42ebab36ab199a86365317f31d83096a7b82b6b672e6c9d644157aefcef9aae5c3e35cff407eefc8d9a781875fe5a1c58f2a6f7ba46717cb71d6d4 SHA512 d81b90984fa1072628a77c20ee7595bfd8bf1b9c1418bf155f866fe80cbc85a760e79015b943e2d1610c37076fd9bc424410ada70d7b08cced7615e881d8b33c
-MISC metadata.xml 512 BLAKE2B 549d76a933090ccaf7100a6ae03b8a1f0c1c68454764018360184bcdce4e6628a38ac499bd8a568fc43240fa13596a6f0b4e108fff1c742d4e229aad59049b10 SHA512 4b436b230dfafd7554ffe9ef222fda5aa4e4132768f945c34cde4fed9359f2782e0f371617ecf52b55339f278fbd51f28fe58bf50ec600bef8644c82f594d363
+MISC metadata.xml 428 BLAKE2B f1215f1d1fa0588ccdfadfc5c38a2f831194f78c544bd89bae718133dea66f68d914766b1416322f0dc9fb0173a8931f6b53daf1cfaa8a92f0461fa0adcea5f6 SHA512 0be490ae80ff44082ff502f789ba9a53b8da4577259b06085115759b2ac087614a578cc94509d171fd8e3eaa250c35a28ec132fd633e528b491bf830213c98af
diff --git a/sys-fs/libeatmydata/metadata.xml b/sys-fs/libeatmydata/metadata.xml
index 77dcbe5e8b01..2fe7b7e58580 100644
--- a/sys-fs/libeatmydata/metadata.xml
+++ b/sys-fs/libeatmydata/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		eatmydata: library and utilities designed to disable fsync and friends.
 		Used as LD_PRELOAD hack to hijack fsync() and open(O_SYNC) calls.
diff --git a/sys-fs/lufis/Manifest b/sys-fs/lufis/Manifest
index de4ae423eb1c..d39d3ed97b07 100644
--- a/sys-fs/lufis/Manifest
+++ b/sys-fs/lufis/Manifest
@@ -1,5 +1,4 @@
 AUX lufis-allow-uid-and-gid-addon.patch 1090 BLAKE2B 49bd9cbec1b101174b0aab1a11723104a858ff68652f960e14ab1b05e24a70fac014e8fbf6bf8c611671783579bafa93a4cd983c2fc43b34556de0af9466d534 SHA512 7e5680560b624e033530dea158684d92c134bd8b73ab0d9030eb2c73416785c546915aeb8e13dd815730dca65925659394b86c0a8ad1b94acac04e8e787762e4
 DIST lufis-0.3.tar.gz 18158 BLAKE2B cad5154f244232262ae3fef7f792bea58b18019e29df8c0763cf39a6d61bd84abc030bcb3e20eb47a557a8edcde8f7ff1ea6c9873da885bea5184845f15e54bd SHA512 86f0c77e748ab7ba3f92ed9563011e8262b435a8878bf3629c8fa4a8e1bec058249a288e2aafd395f524748b419a599c6533900348b4e23239f47930a874e14e
 EBUILD lufis-0.3-r1.ebuild 633 BLAKE2B db9caacd181cd745bc14e430f192b1401cefb8b74d279a58b4b5d58dc882d0802b7ee5aa73b654a3931b6653a865aac27156fd523bc32bb08920a794d00a5549 SHA512 647fb86c17c73ed38300a5cee4040920463ca6b8a87a81446bfddb1e7d009892d4f9248f66e6369dc3fb696201d7f46951a52758500e3c23ac46f9fa9581cba5
-EBUILD lufis-0.3.ebuild 622 BLAKE2B c06f03c41e5f1b10b023c6ee6eb2a0db6ab8f378c3d4c4e5c8555209428d0678d0a1ddae79b501d04972f74e7e1a7fc4ff94a8360f978b3daad3adbbd93bf6c2 SHA512 b951e7334dffb752df47920e1482dbd57590ad02df59f9e9278395f33f8e20c82edd22330b5251d68f013c60719289321ad6e5aa17707067dda813db2dcd032a
 MISC metadata.xml 246 BLAKE2B fd5580dee18582c2dcb849e4f5f46b7f430a240ddf6b50d7ecd3b096a72f55cf7e16206474766dd4688fb3d43c31fc85523a897f15e613e8ed013f91950241dc SHA512 41ea0697fbdeac910a35652ecb4de0a35d7a531956c7c0ace6364c9cef6e1348ecd427a1c5b9301b779d2f189ffbdcd04c7c9f59fb429ef73b75af9d140a92af
diff --git a/sys-fs/lufis/lufis-0.3.ebuild b/sys-fs/lufis/lufis-0.3.ebuild
deleted file mode 100644
index df57946bde05..000000000000
--- a/sys-fs/lufis/lufis-0.3.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 toolchain-funcs
-
-DESCRIPTION="Wrapper to use lufs modules with fuse kernel support"
-HOMEPAGE="http://fuse.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="!<sys-fs/lufs-0.9.7-r3
-	>=sys-fs/fuse-1.3"
-
-PATCHES=(
-	"${FILESDIR}"/lufis-allow-uid-and-gid-addon.patch
-)
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin lufis
-	dodoc README ChangeLog
-
-	insinto /usr/include/lufs/
-	doins fs.h proto.h
-}
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 1ae759d77294..dc23135db336 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -6,5 +6,5 @@ DIST lxcfs-4.0.8.tar.gz.asc 833 BLAKE2B da4ef0f8d6dea59d83f708b6aa7c1835773537e3
 DIST lxcfs-4.0.9.tar.gz 453383 BLAKE2B 06694218d45d93baa9041aeae39e52d827ca1b53d616284d0ee04ddfe98436a15b3cf900c7b58f14e506a0726f30679b0a04e6b5047087201ad2a9c35f0cc09e SHA512 c8d02cefb42dee82ea9467631e8e59243a6cb06d4ea53f0ce8da0a9bbc9018480bb0f12723091da672446a75ba200cca044b84c2f13388009dde9e5ad0ca3ebe
 DIST lxcfs-4.0.9.tar.gz.asc 833 BLAKE2B fa71f7a6a7a35fbc7613ec2d7549197fe0d33c9584aea86fe3db959848eeb1b0e69a75ca2d596578f3c7f3a9deca5cec1badce428b4aa52e6f112cf3fe544b3b SHA512 fd9feac31469db7785c8b486ddc4f5c0431ab2aa52aed715e853fcab322e8c6ee755aa87d9bdee7a969a8030be1956863662f8b2db09bfe4b8ba69ef8f2fbb3e
 EBUILD lxcfs-4.0.8.ebuild 1446 BLAKE2B 7c7eb6eb44f3cdeb5c38be49dc36b34f6fe77b23283b4928ab5b0d13edfc21c6d0b29b366f8d771dba608ad5970bee4b9ceebfbf37ccda82aea9c977d2583189 SHA512 549ce7620931289cfba89a89aff9bdf4cc62759e67fc96df29d0227718751ca4b2743b0d981d1c484038996eabb2402653abf93ae88bb037c49d1da4e1acbc76
-EBUILD lxcfs-4.0.9.ebuild 1447 BLAKE2B e5711cb3ae0d93591afede59b97bafe863486c18d7f6b314905f3c991e08f6764b7fe69005f33ed07bef49a68ecedafd7b1c377a137fd83d97b8a53cab09fb09 SHA512 88fb2e45a0931820bdb1c94e0275a87bbe2989d3ea6f7851dd6adb587936991db178ce388a5cf22341f0dc8a1c3bd48d99aefdd21ece01799b16d4b426710e05
+EBUILD lxcfs-4.0.9.ebuild 1454 BLAKE2B 3d25726a9e60591d58f50edb3231dbfedaa3a50e20ab08d8006de25c954e6fe5c6c351433143f53e37ae3be843b9158d20e4a1423d27378ecde95ab9862ed17d SHA512 17b95fea85260a89ebde0f59c8b256bc12e7c828a82007b50b6b6a9dd76b544db3746f37f0ac7f6661cbaee8c012a19bcb6dada3e46c778d12bbc1f0274e0075
 MISC metadata.xml 709 BLAKE2B 7c053869dc93fb8eea0b63604fa137736820ff1e2b8e6ee7d500ffd2a46ab381dc1321f2df0268d8f34eef10935f98959089b9f983c112b6809880b27f93eeb6 SHA512 bba720236a7d3fb0c4e71f624575c14a79abacea4441d672a151a3fe16c220fde0c03fa4bbdb2f7d0171920ccb787e1357a0c7aaa54bea4244e8e6771423f19c
diff --git a/sys-fs/lxcfs/lxcfs-4.0.9.ebuild b/sys-fs/lxcfs/lxcfs-4.0.9.ebuild
index 61b57c9974a8..60d44d241420 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.9.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-libs/glib:2
 	sys-fs/fuse:3"
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index f8809316978e..5e5d30c5e7ef 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -6,9 +6,9 @@ AUX mdadm.weekly 187 BLAKE2B 50048d84cd57b384b98fcdb6b2a4a18380aab6e76877ee9edd4
 AUX mdraid.confd 383 BLAKE2B c61fd2c072a0d12ca21ad4f8a60a55101b4e452f9acc8cdcdf9a6069060b11bf90387830f516b69d266fef061112ba41f903b9371fff91c94c9332b12e436145 SHA512 37fe70f5df0fb2b68be01ee774e3a943cfb280322f2db0c5d6892e701fb58be26a225b78448814294bf68f154cca697278fcf9572a47b6201920d95ad05189d6
 AUX mdraid.rc 759 BLAKE2B 41f1b4cb9dd29411d56bea656dddc2cb2fd3cc14b183d05c502fb5e29407d1d816de9595e13349ef7e03240308cf4395578be31149f59d1960d1feee0165506d SHA512 d76190646b393d1480607b0d89d08ce4196738295fbb7790fa1035c53a041b5cb88fe857bb2070920a9c3ae21b9fb8f7838dde240fa0e275e5915add9c113021
 DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
-DIST mdadm-4.2-rc1.tar.xz 451540 BLAKE2B 04683fab09ee91f1f090bc1214e7d49a6505107e9a8b57f826cc6d5505765e3aea5051214aa9a541f3be1885f7a9bbe3ac56ebf7ade7c076dd4c363e0384691b SHA512 dbb836def3872ff079b8576c9d7506476882b211dd91c3f10b14a64dd6cb6e22ae3fac6c32eb40d991a47fe3053d44e783ecd947a9e5aeaae1ec0e48b5503e34
-DIST mdadm_4.1-11.debian.tar.xz 103044 BLAKE2B 16ec2c7f96125148df838af9c07ba6b94b0d886640effd8600dbb30f2b6d65eca5ef39020b7d1f221c91b08613d7080edb6535564b624c92f0c7fe463386f309 SHA512 dca9bc40a12fc717437f9881bfd985ce60a9e47117e2aa3d61a1b45e0798f4a310a37c4592a2e0dbd00ebd78fdeef7bcf505e9a084f48120f8130f17e94db39c
+DIST mdadm-4.2-rc2.tar.xz 452724 BLAKE2B c13c031450a93a3e74c286a84cca541a32041ad7611a2a427539f8583404a9c1b7dffb2565d7cf72fe4b43c79e4dd144ad3b76c65193cc05c9f0da0bf08a8ee5 SHA512 09a3657284c7f98892f5be663d5e034252ff319d8ff1d235597efc373c156188d450e12f64a9a0fb9266b00035c1602133e487ce1961db1a12db05f7f9829249
 DIST mdadm_4.1-3.debian.tar.xz 89640 BLAKE2B 3cb5e42dcbd218a71e55127cecda6f2594a1b1691e17c05f52a8cd0ba05b556d2812772e53d78de025738d7c2de059df3f878b8290ba3906b3d75ef435bfb698 SHA512 e9b04abf195d7bda9fb0197eb926c01a69b879ef82c72af6497116cea9be8f0823408dddbe5c6c033f5fae554a8fec17299e361fa48045e033c87dcee1a0bb63
-EBUILD mdadm-4.1.ebuild 2385 BLAKE2B d47945719787cc0b2679f3ba7d1b9e4e9f138048adfbf5e90059d5bf828f0596b93f1833b5963d5dc6a7b5e7d896ea8760ebfbf2068d8878a3a3277590af41fd SHA512 0313b4c5e895b19a82fdc67717bf46e39ce7b6cfc6f6ce2d816759e881c5fbd05bddfa06ed64959329f14a276c3f7d3c304bafb90654a929718d39b964599874
-EBUILD mdadm-4.2_rc1.ebuild 2392 BLAKE2B 6c597cb94ca47235aa95320f967bc0e2ae5e8aee9a760664f2024aa6d65d043fa1238d054ef7f3582b49093b03ce0111c773076e42563315e446e411d3d06702 SHA512 9d1ff99866796d5afcd29a3048397c5ef589c717ce80dcfb5090eb44639bf9228cd165aa12b6cda40b58d3796d7ac4a5c377d0d0e051eb3ee393b39f7a64bd0c
+DIST mdadm_4.2~rc2-1.debian.tar.xz 89160 BLAKE2B 055fb705fde6c47bf4187eb596e1bba3eb4b0e47f79e1b8d134f18dacb363dc3a434959a2d337a6e33b714d5b34b1359853fcfdc91d50b8f6ab14ad5015cdb51 SHA512 2900bae6b8133ddaaa29a83856b16ebe3ae5bb16aea4d252318392e6c789a11df16d874c101316e90df124b1dea0c939cd5b6fcb07f7c09abf5eabe1d2202113
+EBUILD mdadm-4.1.ebuild 2384 BLAKE2B a37afe6b3515a8bb1286af50d914c1da0c938d255dda104f8929a13a491d089e02af8a6b12bc5a124f979783c934b95fe63200b94e9f4f077048133cfa9e8904 SHA512 73a0ffca8db229143f41d8d968798be46a727d98a5386c676d0e80395b1c9547532728ba8981609b930e72a52eaad88cd42c3cb47894a3c28a95ad2816fb5dfe
+EBUILD mdadm-4.2_rc2.ebuild 2395 BLAKE2B b2dc049808b2bae2de7d02842986522196a496b9cd0ffd3859b9dc2152bb65834c21dfee03b5489795d10d55af5b9051c67f1dbb8e53f71c8fa82e01a105c9c9 SHA512 36b5f31a7f10ff937f81a91a9e99b60406611bd0b834e26e2712bd2877a69e08b4695749d92d7dafa8b7f2afa56b4965cf86b368b87a047aedb309e15220282f
 MISC metadata.xml 338 BLAKE2B 09821f9f1d507fccd175044288b7d5d8966b7bb807399c86e9e2e5b41134ac39a76f79b7c9000ecee890b902175aa86b7dd1ce2f288b6926fbe633496c1b1d9c SHA512 1f86c31c1f9c17f0a0d57a17c7bdfe6da70eed4e8102f3c545f447b58e892b0f6a3b0f6c4df9c611abcb544d6b26d3a0d0c591f1afd20f91a445746e3454eca1
diff --git a/sys-fs/mdadm/mdadm-4.1.ebuild b/sys-fs/mdadm/mdadm-4.1.ebuild
index e33bb8d1f8a7..3ed763dc18dc 100644
--- a/sys-fs/mdadm/mdadm-4.1.ebuild
+++ b/sys-fs/mdadm/mdadm-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sys-fs/mdadm/mdadm-4.2_rc1.ebuild b/sys-fs/mdadm/mdadm-4.2_rc1.ebuild
deleted file mode 100644
index acea997ecfb4..000000000000
--- a/sys-fs/mdadm/mdadm-4.2_rc1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic multilib systemd toolchain-funcs udev
-
-DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
-HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"
-DEB_PF="4.1-11"
-SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
-		mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static"
-
-BDEPEND="virtual/pkgconfig
-	app-arch/xz-utils"
-RDEPEND=">=sys-apps/util-linux-2.16"
-DEPEND="${RDEPEND}"
-
-# The tests edit values in /proc and run tests on software raid devices.
-# Thus, they shouldn't be run on systems with active software RAID devices.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188
-)
-
-mdadm_emake() {
-	# We should probably make corosync & libdlm into USE flags. #573782
-	local args=(
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		CC="$(tc-getCC)"
-		CWFLAGS="-Wall"
-		CXFLAGS="${CFLAGS}"
-		UDEVDIR="$(get_udevdir)"
-		SYSTEMD_DIR="$(systemd_get_systemunitdir)"
-		COROSYNC="-DNO_COROSYNC"
-		DLM="-DNO_DLM"
-
-		# https://bugs.gentoo.org/732276
-		STRIP=
-
-		"$@"
-	)
-	emake "${args[@]}"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	mdadm_emake all
-}
-
-src_test() {
-	mdadm_emake test
-
-	sh ./test || die
-}
-
-src_install() {
-	mdadm_emake DESTDIR="${D}" install install-systemd
-	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-*
-
-	insinto /etc
-	newins mdadm.conf-example mdadm.conf
-	newinitd "${FILESDIR}"/mdadm.rc mdadm
-	newconfd "${FILESDIR}"/mdadm.confd mdadm
-	newinitd "${FILESDIR}"/mdraid.rc mdraid
-	newconfd "${FILESDIR}"/mdraid.confd mdraid
-
-	# From the Debian patchset
-	into /usr
-	dodoc "${WORKDIR}"/debian/README.checkarray
-	dosbin "${WORKDIR}"/debian/checkarray
-	insinto /etc/default
-	newins "${FILESDIR}"/etc-default-mdadm mdadm
-
-	exeinto /etc/cron.weekly
-	newexe "${FILESDIR}"/mdadm.weekly mdadm
-}
-
-pkg_postinst() {
-	if ! systemd_is_booted; then
-		if [[ -z ${REPLACING_VERSIONS} ]] ; then
-			# Only inform people the first time they install.
-			elog "If you're not relying on kernel auto-detect of your RAID"
-			elog "devices, you need to add 'mdraid' to your 'boot' runlevel:"
-			elog "	rc-update add mdraid boot"
-		fi
-	fi
-}
diff --git a/sys-fs/mdadm/mdadm-4.2_rc2.ebuild b/sys-fs/mdadm/mdadm-4.2_rc2.ebuild
new file mode 100644
index 000000000000..ce30130e13d8
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-4.2_rc2.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 multilib systemd toolchain-funcs udev
+
+DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"
+DEB_PF="4.2~rc2-1"
+SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
+		mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+BDEPEND="virtual/pkgconfig
+	app-arch/xz-utils"
+RDEPEND=">=sys-apps/util-linux-2.16"
+DEPEND="${RDEPEND}"
+
+# The tests edit values in /proc and run tests on software raid devices.
+# Thus, they shouldn't be run on systems with active software RAID devices.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188
+)
+
+mdadm_emake() {
+	# We should probably make corosync & libdlm into USE flags. #573782
+	local args=(
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		CC="$(tc-getCC)"
+		CWFLAGS="-Wall"
+		CXFLAGS="${CFLAGS}"
+		UDEVDIR="$(get_udevdir)"
+		SYSTEMD_DIR="$(systemd_get_systemunitdir)"
+		COROSYNC="-DNO_COROSYNC"
+		DLM="-DNO_DLM"
+
+		# https://bugs.gentoo.org/732276
+		STRIP=
+
+		"$@"
+	)
+	emake "${args[@]}"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	mdadm_emake all
+}
+
+src_test() {
+	mdadm_emake test
+
+	sh ./test || die
+}
+
+src_install() {
+	mdadm_emake DESTDIR="${D}" install install-systemd
+	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-*
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm
+	newconfd "${FILESDIR}"/mdadm.confd mdadm
+	newinitd "${FILESDIR}"/mdraid.rc mdraid
+	newconfd "${FILESDIR}"/mdraid.confd mdraid
+
+	# From the Debian patchset
+	into /usr
+	dodoc "${WORKDIR}"/debian/README.checkarray
+	dosbin "${WORKDIR}"/debian/checkarray
+	insinto /etc/default
+	newins "${FILESDIR}"/etc-default-mdadm mdadm
+
+	exeinto /etc/cron.weekly
+	newexe "${FILESDIR}"/mdadm.weekly mdadm
+}
+
+pkg_postinst() {
+	if ! systemd_is_booted; then
+		if [[ -z ${REPLACING_VERSIONS} ]] ; then
+			# Only inform people the first time they install.
+			elog "If you're not relying on kernel auto-detect of your RAID"
+			elog "devices, you need to add 'mdraid' to your 'boot' runlevel:"
+			elog "	rc-update add mdraid boot"
+		fi
+	fi
+}
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 65ae527b84f9..f475d198e70d 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -3,6 +3,6 @@ AUX multipath-tools-0.8.6-no-compress-man-pages.patch 8056 BLAKE2B 6e1ef1680538f
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
 AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
-EBUILD multipath-tools-0.8.6-r1.ebuild 2141 BLAKE2B 70dc0bdd9bc5d7d4fff9a64d883841410265f541c10e24d79e64708422f32a9a6b9eaf561054292bac27ff46a66b5c4c56086a7eadc3819bc0e7a7d8df4ad0e8 SHA512 1f4c59f6ea83c0463f7350a2ee3f6003ca081c33c965db90b26dcd4152682c60b6449cf438e5ee8d0b2a7f2a2380cc2af8a3379a4f9e2bc68ca84ef070e0b43e
+EBUILD multipath-tools-0.8.6-r1.ebuild 2138 BLAKE2B e6be272ce638c903e22abe6dddc932b2b52a52293ff2719e4a56dea2d782592ae034171f100379ee0239d7b2e0c8254d02396e50ed0c51d357dfb3118ea21be7 SHA512 66e6adbfbda1b831333a4e2dcd928f78e9aa89aa3415a803c716b9700e8247c822be2094ce5780718da879546738d344b012d4cf495aabf7c885b865367aa805
 EBUILD multipath-tools-0.8.6.ebuild 2078 BLAKE2B 185d6508999de14cb02f9db69823b561cc62d9dbe596828421cd2381c656301874bb3f43052042b5a3179ca8de469914557acc7369109cdd5ef9c267b5493059 SHA512 c591a02efae279dce30f20f6ba5647eeec4d353e29f38f07a4677c0a683b07ad24a7471e7316e8e4063df43c4bca0833bbdef653ffa8e833566a9bb7fdb14c2a
 MISC metadata.xml 452 BLAKE2B e950c42b1b03518526a348e0bb2a6ad8d2b912e14f71562d4249d1adeaf149443621d4518a6fdf7912e8efeb40634177a0da7d944d2142c7eb851231356a353c SHA512 2bd1aab9e07240502a4bd344c9ed73df3c677f41083f76865862e679c613dbf23957bce83469b5ddb9afa43fda13b7cf2fa4efb31da9b89a9ec91631260111b2
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
index 7a3d1e0718c2..e8862ae67790 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 92ead8b54d4e..40c5b42ddcf6 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,3 +1,3 @@
 DIST ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz 1278315 BLAKE2B d4f84bf744b12fec7faff82bd3d3048282a3cbcde2ca75e5d3a295206585c4cee68e25dff5fb20b034f516a3f2cd95c489105d9df810f8a9378024ef065b67d3 SHA512 8534970ba9f07999c5ff433144ad3a59640fb9a28fb30b37b5d736101e19f9fec1c222152338be382c894f972fce2b2a83680b85a28cf147cb5500b40a0a25cc
-EBUILD ntfs3g-2017.3.23.5-r1.ebuild 2064 BLAKE2B e2caefd80f21d7715bb082aecbeb507a8d8f85f227fad64d5f256614f5c714e2bba04f9b90078dfdcac5e800ca74a3026675c068f84697ceeb4ef1e00703fa33 SHA512 bf3b15c47da0f1913e40737dc32cf7b82369adf5eba38b36a23658b5d7b925065d99762024f3005e136d17cad64f8e1db4cd4a26ca7bf16ca3843a74887e1726
+EBUILD ntfs3g-2017.3.23.5-r1.ebuild 2063 BLAKE2B d70e46fe59628db9440f4d6516781fad6d9d10873f98b06364acd4c8afbc6b609f78fca688fbb1c4486ae6cd7a0089a6c3674b8555fec8af4360b6c7e4ac54b1 SHA512 fbf424b708a4e15fabdffb1046dd49854ed21335bf953fe39eb8993541178cfd3ffe482121d29c56b5dd5802c373d8aaaa70e0ae9dc6526f091baa886950bf36
 MISC metadata.xml 1071 BLAKE2B 745a88ce8a93612a3658b149ed33acad8bc30e66d65694c8096203a054482d9972798f0bdb7cc707fc35acb33303da37dac2bfcdcc3537ab0e61a307ff0cd152 SHA512 0d8df4e5d4b5e0ed52dc0a35b2fe81355859dfa01ff65b8b63a767bff87d5a4ea1741fd6f1243dc32f9f2d83566967d6aa4bee0b0f3d95997d8873833fc7ac31
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild
index 75a364e80508..17c8330cd5b4 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://jp-andre.pagesperso-orange.fr/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/885"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="
diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest
index ab815a8a56a1..672d3987d894 100644
--- a/sys-fs/reiserfsprogs/Manifest
+++ b/sys-fs/reiserfsprogs/Manifest
@@ -1,5 +1,5 @@
 AUX reiserfsprogs-3.6.25-no_acl.patch 274 BLAKE2B 1b49c0c98d935c1bfcb0191882a7e8e21aecd042dc8a8ba5d3a807dc59534b9b47e727ca668741fd8a82c811a744706348c3ea88c39837af891a2c711437f5c3 SHA512 29419b64f7749612ab2883da91ac97831a2ba8aee819b6e0e8b781b34594541e59b6b7a3841e9967e4623fb9772e4be81b13970c86d61497222789ffa8b4e20e
 AUX reiserfsprogs-3.6.27-loff_t.patch 504 BLAKE2B 6c38ac24d9d8e0bc665557303b5cc299fdd3a4529bc29370ffa8129499ac9d6e1f0a7ed66c93fefa1a647a304ae77309dc87deeeb8b29961398e509f30d0cb27 SHA512 74332f8acd84a3d0374d6ff9803e63bc78ceb18ec130fef213bf326a6b146b8e4951ac8aee5b7349239716627889febd1c832862ae058a822cc71b0a75333d2f
 DIST reiserfsprogs-3.6.27.tar.xz 449176 BLAKE2B cd22120faa4d6d11ab545349fde5304f41cf3ca88b2c988255b7ca0e87961c9ccaa3095cad086e479a2b50627ad9bf3e90b2af46ddda64abc119e2a6755b8341 SHA512 bc524aa1ad7f8502238761fd185bfb8473048947bd579e2803c73371928c6b245e0d90bd9d458f4bebcbf163892dbc9f4bae65aec68ebbaa436be7451c13f50c
-EBUILD reiserfsprogs-3.6.27-r1.ebuild 1337 BLAKE2B 6a58fbbd006d288b7ba695ad158aa080851d326209723c5c0124450243997d13c22d9d14e6d07979e7bb0568d182fb98df4dfa1ad9769e4708d37ee9260c0c05 SHA512 edd539f67b11a90a6b999b575cba16cb426d81b4fc5ef3de4989cbc98ba6a5d7148656563e3433fbc4dd5338604cebb8b8ab8eca5d55f09e178eb62ba68f22dc
+EBUILD reiserfsprogs-3.6.27-r1.ebuild 1336 BLAKE2B 59f5d078922d75203d2bca6f7c8ba73cdceb1109197f51951bf2242b07d7f5c1a7b361407218d482d4af3471e7556becc939d2e572fc40018b79f4bf0a550ce1 SHA512 142fd1c3de2df30216f95fdfdbae7430859e3c4a57657e0cd89e171c7d11a87eca0da2849bf2d356d8ac46bb14e508e27eeaa0c97f97ef837dc1eb147edf1829
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild
index 1751f2192730..7031007f4201 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/reiserfs/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 319b0f2a6d56..c6a796dd507e 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,8 +1,10 @@
 AUX 249-libudev-static.patch 1454 BLAKE2B 420f9452066ccf951033c1ae1e215284fa9d11f24777c68ecd0178db5c7571ee881451300d409468c1ba3f3b2ad4b35adca5b2761309c84b315bbabd45f6b97f SHA512 4d616b4b02981c4622951a46f23519e03c2d1228453837d31fe060db70afa24722883ca57c08c55cd9fd35c720a5ef2ecb11ab3313867e1b3cfc3682e45e3f45
+AUX 249-sys-include-posix.patch 1831 BLAKE2B eaea99f57a189d77789c9b61ed7962f108f1ed733e3ab8d76fb8dd4849faf8f05338f3addaaad97ba2f8796200de0f5079d3838d995ba2519b7d4ea2a568d0d5 SHA512 3d98055f2beb22fe5607125585929fc531b790f489779dcd162541b5461a9da15d76e7a713f6476a3278073e6fd2488bc0af19eca952f6534d90aadb81ef644f
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
 DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1cb190b25e4dbf0a8f2be075d04a3cbe92e2fee5bb6a03b73bd8195d8c7b691661b39b7850547d512219cc40af SHA512 486f6ac6c2897a2aac97a59306091a03fd50768340407401e1f088ea5b21c67dae726bff4cbe53cec6b89a8f0ee72205b340165a4fe3a3c16cff6d176506c6e0
 DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
-EBUILD udev-248.ebuild 5475 BLAKE2B 70b628ed25d8f5b39c556e680bece42604ba30ff083fe7e0f2e77a677dc8f89a7aafcea7fadfec4f756aad03c0f9b19dae34f1a43bff724444fa429d55ab183d SHA512 1954e732be787b8a9b9454ae0987bbc2276de6b7e71ec8d260d5e1c835bb9a1f68c04843709f42c791e58ad43c70f5146f5faeaf1e776353119b5ad15404d901
-EBUILD udev-249-r1.ebuild 5776 BLAKE2B 909f1699e70b77b0347f35fa3353cc16021870aea15fbdf4faca6623327a22237ca78a9891e4e141cf72ae682023611155234cac4fb6008e6ccc1cfb97d9eef5 SHA512 1ec11b20403555deb4d7725289af1a214550aa92d3aea2d39807a1d26a73764e499eed1b3b8deec9300e406c5eb9efab24ae01d365fb9055728660b2c74bacba
-EBUILD udev-9999.ebuild 5735 BLAKE2B 7847f1af44dd1dd3b85b9144c690066260297ab2beba5cc86be946838f3a07b7976b108629f8d50424b6cc3bfe37e60c3ed87262a44465d42c68c689fb70db16 SHA512 68ee2e626625d6fbd7c7747b0e6788329b3a81015ebe3f6db1d65bc3bca8cbe8e56792ffe2a9acb736395c2549d0f6969f1fadd2cd00eec950ed5726674c05dd
+DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c SHA512 4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a
+EBUILD udev-248-r1.ebuild 5468 BLAKE2B 65d07077600d16deb4970920dd728698f3d4b8c58f457e8df7167a2fe3c31ae4b8ad2a45b4d3fac4480c1a3a90e4376c22996d94909463df018543af09333fef SHA512 f73fefbcca00081271756322c19fe959cf2548a4e4a27af88e5b6eece368e0760b98465659106c884f8c16cba3f7a337e7b8c22c82ff575eebd7a6c38f5e0ab9
+EBUILD udev-249-r2.ebuild 7289 BLAKE2B 2a67bb851bbf65c6b99dd5fed6d7926e6ae83e0ff0574cb2919afb1c0bc8dee874d52aa0719235fc6ce0ee63ffb1b3e507d51696e62d7a6d8a1b35be27148ad9 SHA512 1e8bd32d7590bfcf90e9aaf1758776e906477f747848d7d99c6aa28797fcfb3ae60d9fc9e238c46d1713f1b2fe76cfbbb550b175e3be8c010e29cc18e25d0e4c
+EBUILD udev-9999.ebuild 5728 BLAKE2B f46125da6569e41064abe7a6e2e0bbdd53d112bf1a6f1894e9682952c68df60cf2b81ea262c21d52e7abd45f0a6ee95af157d15dcc621ab03d902a00b0d5c452 SHA512 46c5ec30be014a9d2b27fba94af74c500e506f6b4a813f8195b622ce702711a70e7c0706be5f1607ccc61f94e2bd2e4776c4277d035982a8352cb07cf889fa33
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/files/249-sys-include-posix.patch b/sys-fs/udev/files/249-sys-include-posix.patch
new file mode 100644
index 000000000000..6d9e0039b9c9
--- /dev/null
+++ b/sys-fs/udev/files/249-sys-include-posix.patch
@@ -0,0 +1,67 @@
+Silence annoying #warning's on musl
+
+https://github.com/systemd/systemd/pull/20362
+https://github.com/systemd/systemd/pull/20364
+
+From f8d54f7810aeea5ff27a5db03e1aab7ea54c8268 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Mon, 2 Aug 2021 12:41:38 +0200
+Subject: [PATCH] Use correct `<fcntl.h>` include
+
+* `<sys/fcntl.h>` is not specified in POSIX
+---
+ src/basic/fileio.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/basic/fileio.h b/src/basic/fileio.h
+index af797cfafdbf..4295b84a85c5 100644
+--- a/src/basic/fileio.h
++++ b/src/basic/fileio.h
+@@ -2,11 +2,11 @@
+ #pragma once
+ 
+ #include <dirent.h>
++#include <fcntl.h>
+ #include <stdbool.h>
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <sys/stat.h>
+-#include <sys/fcntl.h>
+ #include <sys/types.h>
+ 
+ #include "macro.h"
+From 2b6c0bb2a341c95223ce672249e43c743b03d78c Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Mon, 2 Aug 2021 16:09:10 +0200
+Subject: [PATCH] Use correct `<poll.h>` include
+
+* `<sys/poll.h>` is not specified in POSIX
+---
+ src/shared/nscd-flush.c | 2 +-
+ src/shared/varlink.c    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/nscd-flush.c b/src/shared/nscd-flush.c
+index dfc47c423441..19e16d93455c 100644
+--- a/src/shared/nscd-flush.c
++++ b/src/shared/nscd-flush.c
+@@ -1,5 +1,5 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #include "fd-util.h"
+ #include "io-util.h"
+diff --git a/src/shared/varlink.c b/src/shared/varlink.c
+index 3a53c16a7242..4033947d3b8c 100644
+--- a/src/shared/varlink.c
++++ b/src/shared/varlink.c
+@@ -1,7 +1,7 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ 
+ #include <malloc.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #include "alloc-util.h"
+ #include "errno-util.h"
diff --git a/sys-fs/udev/udev-248-r1.ebuild b/sys-fs/udev/udev-248-r1.ebuild
new file mode 100644
index 000000000000..f8a443b31f96
--- /dev/null
+++ b/sys-fs/udev/udev-248-r1.ebuild
@@ -0,0 +1,228 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript
+
+if [[ ${PV} = 9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]] ; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV="${PV/_/-}"
+	MY_P="${MY_PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux static-libs"
+
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/gperf
+	sys-devel/gettext
+	>=sys-apps/coreutils-8.16
+	virtual/pkgconfig
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	${PYTHON_DEPS}
+"
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl )
+	kmod? ( >=sys-apps/kmod-15 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.9
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/kmem
+	acct-group/tty
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/lp
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd
+"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+	>=sys-fs/udev-init-scripts-34"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]] ; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
+		linux-info_pkg_setup
+
+		# CONFIG_FHANDLE was introduced by 2.6.39
+		local MINKV=2.6.39
+
+		if kernel_is -lt ${MINKV//./ } ; then
+			eerror "Your running kernel is too old to run this version of ${P}"
+			eerror "You need to upgrade kernel at least to ${MINKV}"
+		fi
+
+		if kernel_is -lt 3 7 ; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+	)
+
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_bool acl)
+		-Defi=false
+		$(meson_native_use_bool kmod)
+		$(meson_native_use_bool selinux)
+		-Dlink-udev-shared=false
+		-Dsplit-usr=true
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		$(meson_use static-libs static-libudev)
+
+		# Prevent automagic deps
+		-Dgcrypt=false
+		-Dlibcryptsetup=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dp11kit=false
+		-Dseccomp=false
+		-Dlz4=false
+		-Dxz=false
+	)
+	meson_src_configure
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+	python_setup
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	# meson creates this link
+	local libudev=$(readlink libudev.so.1)
+
+	local targets=(
+		${libudev}
+	)
+	if use static-libs; then
+		targets+=( libudev.a )
+	fi
+	if multilib_is_native_abi; then
+		targets+=(
+			udevadm
+			src/udev/ata_id
+			src/udev/cdrom_id
+			src/udev/fido_id
+			src/udev/mtd_probe
+			src/udev/scsi_id
+			src/udev/v4l_id
+			man/udev.conf.5
+			man/systemd.link.5
+			man/hwdb.7
+			man/udev.7
+			man/systemd-udevd.service.8
+			man/udevadm.8
+		)
+	fi
+	eninja "${targets[@]}"
+}
+
+multilib_src_install() {
+	local libudev=$(readlink libudev.so.1)
+
+	dolib.so {${libudev},libudev.so.1,libudev.so}
+	gen_usr_ldscript -a udev
+	use static-libs && dolib.a libudev.a
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins src/libudev/libudev.pc
+
+	if multilib_is_native_abi ; then
+		into /
+		dobin udevadm
+
+		dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+
+		exeinto /lib/udev
+		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+		rm rules.d/99-systemd.rules || die
+		insinto /lib/udev/rules.d
+		doins rules.d/*.rules
+
+		insinto /usr/share/pkgconfig
+		doins src/udev/udev.pc
+
+		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
+		rm man/systemd-udevd-{control,kernel}.socket.8 || die
+		doman man/*.[0-9]
+	fi
+}
+
+multilib_src_install_all() {
+	doheader src/libudev/libudev.h
+
+	insinto /etc/udev
+	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
+
+	insinto /lib/systemd/network
+	doins network/99-default.link
+
+	# see src_prepare() for content of 40-gentoo.rules
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/40-gentoo.rules
+	doins "${S}"/rules.d/*.rules
+
+	dobashcomp shell-completion/bash/udevadm
+
+	insinto /usr/share/zsh/site-functions
+	doins shell-completion/zsh/_udevadm
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]' ; then
+		udevadm hwdb --update --root="${ROOT}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+	fi
+}
diff --git a/sys-fs/udev/udev-248.ebuild b/sys-fs/udev/udev-248.ebuild
deleted file mode 100644
index 090111f3ac0d..000000000000
--- a/sys-fs/udev/udev-248.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 2003-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript
-
-if [[ ${PV} = 9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]] ; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV="${PV/_/-}"
-	MY_P="${MY_PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="acl +kmod selinux static-libs"
-
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	virtual/pkgconfig
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-"
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl )
-	kmod? ( >=sys-apps/kmod-15 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.9
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/kmem
-	acct-group/tty
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/lp
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-"
-PDEPEND=">=sys-apps/hwids-20140304[udev]
-	>=sys-fs/udev-init-scripts-34"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != buildonly ]] ; then
-		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
-		linux-info_pkg_setup
-
-		# CONFIG_FHANDLE was introduced by 2.6.39
-		local MINKV=2.6.39
-
-		if kernel_is -lt ${MINKV//./ } ; then
-			eerror "Your running kernel is too old to run this version of ${P}"
-			eerror "You need to upgrade kernel at least to ${MINKV}"
-		fi
-
-		if kernel_is -lt 3 7 ; then
-			ewarn "Your running kernel is too old to have firmware loader and"
-			ewarn "this version of ${P} doesn't have userspace firmware loader"
-			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
-		fi
-	fi
-}
-
-src_prepare() {
-	local PATCHES=(
-	)
-
-	default
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool acl)
-		-Defi=false
-		$(meson_native_use_bool kmod)
-		$(meson_native_use_bool selinux)
-		-Dlink-udev-shared=false
-		-Dsplit-usr=true
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		$(meson_use static-libs static-libudev)
-
-		# Prevent automagic deps
-		-Dgcrypt=false
-		-Dlibcryptsetup=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dp11kit=false
-		-Dseccomp=false
-		-Dlz4=false
-		-Dxz=false
-	)
-	meson_src_configure
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-	python_setup
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	# meson creates this link
-	local libudev=$(readlink libudev.so.1)
-
-	local targets=(
-		${libudev}
-	)
-	if use static-libs; then
-		targets+=( libudev.a )
-	fi
-	if multilib_is_native_abi; then
-		targets+=(
-			udevadm
-			src/udev/ata_id
-			src/udev/cdrom_id
-			src/udev/fido_id
-			src/udev/mtd_probe
-			src/udev/scsi_id
-			src/udev/v4l_id
-			man/udev.conf.5
-			man/systemd.link.5
-			man/hwdb.7
-			man/udev.7
-			man/systemd-udevd.service.8
-			man/udevadm.8
-		)
-	fi
-	eninja "${targets[@]}"
-}
-
-multilib_src_install() {
-	local libudev=$(readlink libudev.so.1)
-
-	dolib.so {${libudev},libudev.so.1,libudev.so}
-	gen_usr_ldscript -a udev
-	use static-libs && dolib.a libudev.a
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins src/libudev/libudev.pc
-
-	if multilib_is_native_abi ; then
-		into /
-		dobin udevadm
-
-		dosym ../../bin/udevadm /lib/systemd/systemd-udevd
-
-		exeinto /lib/udev
-		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
-		rm rules.d/99-systemd.rules || die
-		insinto /lib/udev/rules.d
-		doins rules.d/*.rules
-
-		insinto /usr/share/pkgconfig
-		doins src/udev/udev.pc
-
-		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
-		rm man/systemd-udevd-{control,kernel}.socket.8 || die
-		doman man/*.[0-9]
-	fi
-}
-
-multilib_src_install_all() {
-	doheader src/libudev/libudev.h
-
-	insinto /etc/udev
-	doins src/udev/udev.conf
-	keepdir /etc/udev/{hwdb.d,rules.d}
-
-	insinto /lib/systemd/network
-	doins network/99-default.link
-
-	# see src_prepare() for content of 40-gentoo.rules
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-	doins "${S}"/rules.d/*.rules
-
-	dobashcomp shell-completion/bash/udevadm
-
-	insinto /usr/share/zsh/site-functions
-	doins shell-completion/zsh/_udevadm
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	# Update hwdb database in case the format is changed by udev version.
-	if has_version 'sys-apps/hwids[udev]' ; then
-		udevadm hwdb --update --root="${ROOT}"
-		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
-	fi
-}
diff --git a/sys-fs/udev/udev-249-r1.ebuild b/sys-fs/udev/udev-249-r1.ebuild
deleted file mode 100644
index 4b808e917a4d..000000000000
--- a/sys-fs/udev/udev-249-r1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 2003-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript
-
-if [[ ${PV} = 9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]] ; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV="${PV/_/-}"
-	MY_P="${MY_PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="acl +kmod selinux static-libs"
-
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	virtual/pkgconfig
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-"
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl )
-	kmod? ( >=sys-apps/kmod-15 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.9
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/kmem
-	acct-group/tty
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/lp
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-"
-PDEPEND=">=sys-apps/hwids-20140304[udev]
-	>=sys-fs/udev-init-scripts-34"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != buildonly ]] ; then
-		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
-		linux-info_pkg_setup
-
-		# CONFIG_FHANDLE was introduced by 2.6.39
-		local MINKV=2.6.39
-
-		if kernel_is -lt ${MINKV//./ } ; then
-			eerror "Your running kernel is too old to run this version of ${P}"
-			eerror "You need to upgrade kernel at least to ${MINKV}"
-		fi
-
-		if kernel_is -lt 3 7 ; then
-			ewarn "Your running kernel is too old to have firmware loader and"
-			ewarn "this version of ${P} doesn't have userspace firmware loader"
-			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
-		fi
-	fi
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/249-libudev-static.patch"
-	)
-
-	default
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool acl)
-		-Defi=false
-		$(meson_native_use_bool kmod)
-		$(meson_native_use_bool selinux)
-		-Dlink-udev-shared=false
-		-Dsplit-usr=true
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		$(meson_use static-libs static-libudev)
-
-		# Prevent automagic deps
-		-Dgcrypt=false
-		-Dlibcryptsetup=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dp11kit=false
-		-Dseccomp=false
-		-Dlz4=false
-		-Dxz=false
-	)
-	meson_src_configure
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-	python_setup
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	# meson creates this link
-	local libudev=$(readlink libudev.so.1)
-
-	local targets=(
-		${libudev}
-		src/libudev/libudev.pc
-	)
-	if use static-libs; then
-		targets+=( libudev.a )
-	fi
-	if multilib_is_native_abi; then
-		targets+=(
-			udevadm
-			src/udev/ata_id
-			src/udev/cdrom_id
-			src/udev/fido_id
-			src/udev/mtd_probe
-			src/udev/scsi_id
-			src/udev/udev.pc
-			src/udev/v4l_id
-			man/udev.conf.5
-			man/systemd.link.5
-			man/hwdb.7
-			man/udev.7
-			man/systemd-udevd.service.8
-			man/udevadm.8
-			rules.d/50-udev-default.rules
-			rules.d/64-btrfs.rules
-		)
-	fi
-	eninja "${targets[@]}"
-}
-
-multilib_src_install() {
-	local libudev=$(readlink libudev.so.1)
-
-	dolib.so {${libudev},libudev.so.1,libudev.so}
-	gen_usr_ldscript -a udev
-	use static-libs && dolib.a libudev.a
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins src/libudev/libudev.pc
-
-	if multilib_is_native_abi ; then
-		into /
-		dobin udevadm
-
-		dosym ../../bin/udevadm /lib/systemd/systemd-udevd
-
-		exeinto /lib/udev
-		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
-		# Install generated rules (${BUILD_DIR}/rules.d/*.rules)
-		insinto /lib/udev/rules.d
-		doins rules.d/*.rules
-
-		insinto /usr/share/pkgconfig
-		doins src/udev/udev.pc
-
-		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
-		rm man/systemd-udevd-{control,kernel}.socket.8 || die
-		doman man/*.[0-9]
-	fi
-}
-
-multilib_src_install_all() {
-	doheader src/libudev/libudev.h
-
-	insinto /etc/udev
-	doins src/udev/udev.conf
-	keepdir /etc/udev/{hwdb.d,rules.d}
-
-	insinto /lib/systemd/network
-	doins network/99-default.link
-
-	# Install static rules (${S}/rules.d/*.rules)
-	insinto /lib/udev/rules.d
-	doins rules.d/*.rules
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	dobashcomp shell-completion/bash/udevadm
-
-	insinto /usr/share/zsh/site-functions
-	doins shell-completion/zsh/_udevadm
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	# Update hwdb database in case the format is changed by udev version.
-	if has_version 'sys-apps/hwids[udev]' ; then
-		udevadm hwdb --update --root="${ROOT}"
-		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
-	fi
-}
diff --git a/sys-fs/udev/udev-249-r2.ebuild b/sys-fs/udev/udev-249-r2.ebuild
new file mode 100644
index 000000000000..e6d857dcefb5
--- /dev/null
+++ b/sys-fs/udev/udev-249-r2.ebuild
@@ -0,0 +1,290 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript
+
+if [[ ${PV} = 9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]] ; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV="${PV/_/-}"
+	MY_P="${MY_PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+# musl patches taken from:
+# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
+SRC_URI+="
+	elibc_musl? (
+		https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz
+		https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz
+	)"
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/gperf
+	sys-devel/gettext
+	>=sys-apps/coreutils-8.16
+	virtual/pkgconfig
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	test? (
+		app-text/tree
+		dev-lang/perl
+	)
+"
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl )
+	kmod? ( >=sys-apps/kmod-15 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.9
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/kmem
+	acct-group/tty
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/lp
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd
+"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+	>=sys-fs/udev-init-scripts-34"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]] ; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
+		linux-info_pkg_setup
+
+		# CONFIG_FHANDLE was introduced by 2.6.39
+		local MINKV=2.6.39
+
+		if kernel_is -lt ${MINKV//./ } ; then
+			eerror "Your running kernel is too old to run this version of ${P}"
+			eerror "You need to upgrade kernel at least to ${MINKV}"
+		fi
+
+		if kernel_is -lt 3 7 ; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		# backport from 250 to silence musl warnings
+		"${FILESDIR}/249-sys-include-posix.patch"
+		"${FILESDIR}/249-libudev-static.patch"
+	)
+	use elibc_musl && PATCHES+=( "${WORKDIR}"/musl-patches )
+
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_bool acl)
+		-Defi=false
+		$(meson_native_use_bool kmod)
+		$(meson_native_use_bool selinux)
+		-Dlink-udev-shared=false
+		-Dsplit-usr=true
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		$(meson_use static-libs static-libudev)
+
+		# Prevent automagic deps
+		-Dgcrypt=false
+		-Dlibcryptsetup=false
+		-Didn=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dp11kit=false
+		-Dseccomp=false
+		-Dlz4=false
+		-Dxz=false
+	)
+	use elibc_musl && emesonargs+=(
+		-Dgshadow=false
+		-Dsmack=false
+		-Dutmp=false
+	)
+
+	meson_src_configure
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+	python_setup
+
+	use elibc_musl && append-cppflags -D__UAPI_DEF_ETHHDR=0
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	# meson creates this link
+	local libudev=$(readlink libudev.so.1)
+
+	local targets=(
+		${libudev}
+		src/libudev/libudev.pc
+	)
+	if use static-libs; then
+		targets+=( libudev.a )
+	fi
+	if multilib_is_native_abi; then
+		targets+=(
+			udevadm
+			src/udev/ata_id
+			src/udev/cdrom_id
+			src/udev/fido_id
+			src/udev/mtd_probe
+			src/udev/scsi_id
+			src/udev/udev.pc
+			src/udev/v4l_id
+			man/udev.conf.5
+			man/systemd.link.5
+			man/hwdb.7
+			man/udev.7
+			man/systemd-udevd.service.8
+			man/udevadm.8
+			rules.d/50-udev-default.rules
+			rules.d/64-btrfs.rules
+		)
+	fi
+	eninja "${targets[@]}"
+}
+
+multilib_src_test() {
+	# The testsuite is *very* finicky. Don't try running it in
+	# containers or anything but a full VM or on bare metal.
+	# udev calls 'mknod' a number of times, and this interacts
+	# badly with kernel namespaces.
+
+	if [[ ${EUID} -ne 0 ]]; then
+		ewarn "udev tests need to run under uid 0"
+		ewarn "Skipping tests"
+	elif has sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=sandbox\' detected"
+		ewarn "udev tests needs full access to /dev"
+		ewarn "Skipping tests"
+	else
+		einfo Running tests
+
+		# two binaries required by udev-test.pl
+		eninja systemd-detect-virt test-udev
+		local -x PATH="${PWD}:${PATH}"
+
+		# prepare ${BUILD_DIR}/test/sys, required by udev-test.pl
+		"${EPYTHON}" "${S}"/test/sys-script.py test || die
+
+		# the perl script contains all the udev tests
+		"${S}"/test/udev-test.pl || die
+	fi
+}
+
+multilib_src_install() {
+	local libudev=$(readlink libudev.so.1)
+
+	dolib.so {${libudev},libudev.so.1,libudev.so}
+	gen_usr_ldscript -a udev
+	use static-libs && dolib.a libudev.a
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins src/libudev/libudev.pc
+
+	if multilib_is_native_abi ; then
+		into /
+		dobin udevadm
+
+		dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+
+		exeinto /lib/udev
+		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+		# Install generated rules (${BUILD_DIR}/rules.d/*.rules)
+		insinto /lib/udev/rules.d
+		doins rules.d/*.rules
+
+		insinto /usr/share/pkgconfig
+		doins src/udev/udev.pc
+
+		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
+		rm man/systemd-udevd-{control,kernel}.socket.8 || die
+		doman man/*.[0-9]
+	fi
+}
+
+multilib_src_install_all() {
+	doheader src/libudev/libudev.h
+
+	insinto /etc/udev
+	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
+
+	insinto /lib/systemd/network
+	doins network/99-default.link
+
+	# Install static rules (${S}/rules.d/*.rules)
+	insinto /lib/udev/rules.d
+	doins rules.d/*.rules
+	doins "${FILESDIR}"/40-gentoo.rules
+
+	dobashcomp shell-completion/bash/udevadm
+
+	insinto /usr/share/zsh/site-functions
+	doins shell-completion/zsh/_udevadm
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]' ; then
+		udevadm hwdb --update --root="${ROOT}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+	fi
+}
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 9cb8cd5f731a..8cc1075e8be7 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -33,7 +33,7 @@ RESTRICT="test"
 
 BDEPEND="
 	dev-util/gperf
-	>=dev-util/intltool-0.50
+	sys-devel/gettext
 	>=sys-apps/coreutils-8.16
 	virtual/pkgconfig
 	app-text/docbook-xml-dtd:4.2
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 845b40e1a787..f768d418ef36 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,5 +1,7 @@
 DIST udisks-2.9.1.tar.bz2 1680327 BLAKE2B 6573dd91decfaece6668a9848fc5ff276190c0d2be272e2d0fa550274a3e20df4038a87dd5fbb7b1b6a33a4c94f5668d01297d583da7df7027353353ef3936f4 SHA512 a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3
 DIST udisks-2.9.2.tar.bz2 1701377 BLAKE2B 402cf2354907acee13230d035c8b22634a70efab0e61939d8ff260391c80a0d166de67f57cc4b78025da027df16deb07c5620ab546d37181681d824ea84d0e8c SHA512 73a162bbb0fd6ec1e6a79af2a01185672712d7e94eacdc1a913f559a87fc620a095fe4c8b4dacbaa12bc816f565fc966d28c2f9299104da18581d4879321aee9
+DIST udisks-2.9.3.tar.bz2 1778637 BLAKE2B 77352e2beb081486586587e3d7bdc5047662b27a246424bb995188c9da784e464681d9307dd0c4ca22a21da66d04dbdc9c945cc926b219a80682acfa60de04fe SHA512 1ee6e982e599c6872183068dd64f9259a522dea7a91ddc3119f9bc436c9c6bf2911e61f7ae339d67d4851cb6f55ec05b6d9a4cc8c1a9f7c5d35c66b80d5ada42
 EBUILD udisks-2.9.1-r2.ebuild 3529 BLAKE2B 45aa4d904dd309b528754dd7077a1c0c23b94c6f6f2aa3413af4ff793536aafc46947c360274ed38999538838e63accbb34d01d2e846040268df8f24853c0193 SHA512 2d20c606cd8e05f50da1e0020b58f8790f9ae25fbd98de2e4280a1dc55826ae44e15a2d8ceef3c2d6c4fea5da4622c8d29ba71eb86245fcc8583f70728d8dd36
 EBUILD udisks-2.9.2-r2.ebuild 3652 BLAKE2B b7e3809e57ab006d4652152287941e08c902d1cdc950a9dbbd187fb62be7f7dcdfd01bd840157aa62b6612d56bdf11f24dbc048dc01073010c33ac005c39e52c SHA512 83b736c253aedda99a8376e3bcd341a73430d18ccbd056314573af5d7fe29fa7b51fd593c0a260ae22e4fcd7dff04aad35cd4cfffa58e111bd6118f5e6e4a753
+EBUILD udisks-2.9.3.ebuild 3652 BLAKE2B b7e3809e57ab006d4652152287941e08c902d1cdc950a9dbbd187fb62be7f7dcdfd01bd840157aa62b6612d56bdf11f24dbc048dc01073010c33ac005c39e52c SHA512 83b736c253aedda99a8376e3bcd341a73430d18ccbd056314573af5d7fe29fa7b51fd593c0a260ae22e4fcd7dff04aad35cd4cfffa58e111bd6118f5e6e4a753
 MISC metadata.xml 728 BLAKE2B 4a540e1378d04b04e2b75a531e9df8c13faee4870c8bc3778e9e08dc742eb9e28e2b1134448302e43cbb8815432fa0bbbb402f22722267fa4869fe0c04775c8b SHA512 9f057eb51f5924b53cecf5e495b02bb6fad41e9b23c197b1f24a972e8a25504506e73329a93295e9eb30e62863f7c4454909fba10fdea696be23caa7cf50d8cb
diff --git a/sys-fs/udisks/udisks-2.9.3.ebuild b/sys-fs/udisks/udisks-2.9.3.ebuild
new file mode 100644
index 000000000000..480609ab96ff
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.9.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	elogind? ( daemon )
+	systemd? ( daemon )
+	zram? ( systemd )
+"
+
+# See configure.ac file for the required min version
+BLOCKDEV_MIN_VER="2.25"
+
+COMMON_DEPEND="
+	>=sys-auth/polkit-0.110
+	>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[cryptsetup,lvm?,vdo?]
+	virtual/udev
+	acl? ( virtual/acl )
+	daemon? (
+		>=dev-libs/glib-2.50:2
+		>=dev-libs/libatasmart-0.19
+		>=dev-libs/libgudev-165:=
+	)
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+	lvm? ( sys-fs/lvm2 )
+	systemd? ( >=sys-apps/systemd-209 )
+	zram? ( >=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[kbd] )
+"
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+	>=sys-block/parted-3
+	>=sys-apps/util-linux-2.30
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.1
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	>=dev-util/gdbus-codegen-2.32
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.8 )
+"
+# If adding a eautoreconf, then these might be needed at buildtime:
+# dev-libs/gobject-introspection-common
+# sys-devel/autoconf-archive
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+pkg_setup() {
+	# Listing only major arch's here to avoid tracking kernel's defconfig
+	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+		CONFIG_CHECK="~!IDE" #319829
+		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
+		CONFIG_CHECK+=" ~NLS_UTF8" #425562
+		kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+
+	if ! use systemd ; then
+		sed -i -e 's:libsystemd-login:&disable:' configure || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-btrfs
+		--disable-gtk-doc
+		--disable-static
+		--localstatedir="${EPREFIX}"/var
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
+		--with-udevdir="$(get_udevdir)"
+		$(use_enable acl)
+		$(use_enable daemon)
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_enable lvm lvm2)
+		$(use_enable lvm lvmcache)
+		$(use_enable nls)
+		$(use_enable vdo)
+		$(use_enable zram)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+	keepdir /var/lib/udisks2 #383091
+
+	rm -rf "${ED}"/usr/share/bash-completion
+	dobashcomp data/completions/udisksctl
+}
+
+pkg_preinst() {
+	# Remove gtk-doc symlink, #597628
+	if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then
+		rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die
+	fi
+}
+
+pkg_postinst() {
+	# TODO: obsolete with tmpfiles_process?
+	# mkdir -p "${EROOT}"/run #415987
+
+	tmpfiles_process udisks2.conf
+
+	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index c75d5b2ad606..ec1cd47b6387 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -5,7 +5,7 @@ DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa
 DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f
 DIST zfs-2.1.0.tar.gz.asc 195 BLAKE2B d5a7c01c7fd1798a235d5bc9ba89353a85978ac8bb1eaec1c587b8cc6d7cd24b0d7613c465a8da7ba29a172e4ebd6e465f893145d9dd7adf11d7e3858fea835a SHA512 1c5c8d20adbcc27c5e5d760a84e258a897dee7c3950ef1eb56f3ef6bd1c85516c7776ce30b3e63229cd65315d43e06b5e04c587e9483b96b00adb42d24749c1a
 EBUILD zfs-kmod-0.8.6.ebuild 5334 BLAKE2B abaa4b20899db464246d9c445ba55d938ba1982a2686a2c6b22fcc213e76551d2a28a59709760dd5e15af6cfdc8e4999713ae4d1efd3275c02a85f1dfc5b3275 SHA512 f67b1c4483f2a985256c18dcaf232c47219726f67c9fa95b184be6e608dc997b2beab18bd5863d32afcc92da0bad5c3ef8337a8878cf060d45b3931e8e736b77
-EBUILD zfs-kmod-2.0.5.ebuild 5377 BLAKE2B c2072da1710548fa4e48db0acfe432c4f274b99fde91e0d567080ddb48b8fe943a0eaae91ea0e5effe36280086c53a7e0945ef7276543cb8cf013d8548b84bc7 SHA512 43f97f4c862b9e92f129922b78aca4fba2be1eb1ec338c8e46ec98ac471efc3cda5c60c9a59cc6d0ffc45f9dd5198f9a4266ed82d8a42a157bf4c4bf8a88f280
+EBUILD zfs-kmod-2.0.5.ebuild 5377 BLAKE2B 9b5ffcf6b292665fc0db11c3e38e49fa48a14644c8b8ccaf30c0e5c5139293559cd6909c7820c2e1fb3e74bdfd0aa690563a9cc426e179ebcce602299e003b8b SHA512 3044f36db92ef226581703b376f3a3c2bba5406fefbec3d0f10909fb1a51082f5a12bda6f3fd3e3ddab8e0b5a61360d1e0d9cd815c24c78ea401cfe7f2654c11
 EBUILD zfs-kmod-2.1.0.ebuild 4586 BLAKE2B 2c60424a9ad3f7473eeda9828fe91a6a805d24e2662c768f388ecadd76eedc52e70992a15b701adcf72687557f808b0d47f7849bd4d8e7634a0ce99445918f89 SHA512 2423d31d421a8c1c3f46f9618f13823413eab3c70cd7cb580f25647e9ae9db1e53bda49aa0656ca220f27cc53b4d5c8091db73e6c88be429e04d14249c852c0f
 EBUILD zfs-kmod-9999.ebuild 4586 BLAKE2B 2c60424a9ad3f7473eeda9828fe91a6a805d24e2662c768f388ecadd76eedc52e70992a15b701adcf72687557f808b0d47f7849bd4d8e7634a0ce99445918f89 SHA512 2423d31d421a8c1c3f46f9618f13823413eab3c70cd7cb580f25647e9ae9db1e53bda49aa0656ca220f27cc53b4d5c8091db73e6c88be429e04d14249c852c0f
 MISC metadata.xml 548 BLAKE2B 0245ac0b73ed129ce2df41358814d46749fab0463a03fceb643010629cd522460e84c5b8c0247f499adf4ed2e781e0d6f6857a3c6be4f4fb206eeabba158e86c SHA512 2b98b289369d875c5ff89825590a98c9764a1b716df1b79c852dbb833f4f02d5c66782f43084a1acde11a0ba2cb9ef2956b35c10881f77ec92d6749566276e6b
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
index 1087f2c1bc99..441c7831782d 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
 	S="${WORKDIR}/zfs-${PV%_rc?}"
-	ZFS_KERNEL_COMPAT="5.12"
+	ZFS_KERNEL_COMPAT="5.13"
 
 	if [[ ${PV} != *_rc* ]]; then
 		KEYWORDS="amd64 arm64 ppc64"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 41315ca3006b..dbe862d47041 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 15e39d322517..e8bb71105551 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,8 +6,12 @@ DIST genpatches-5.10-60.base.tar.xz 1973040 BLAKE2B fb67f230bf6d8a0fb881fd3cc8fd
 DIST genpatches-5.10-60.extras.tar.xz 3420 BLAKE2B 57d4b7bd7fe2cbce448384754e98bb84dc9f68cbe50fddf9799f82449cf4f04b77041f17cdbb08c5a7938cfe38f788bc4802cc6b0c709a84f0cff5ecff4bad71 SHA512 0b1a7ede058eed0b8f20b5f020f9fe41de07d691ca5674d5ee41fbd2636627d77dc95ff4929654a6bc430e6a4d437f2b798ba1c50dc6394e51a7c627bcbdd7a7
 DIST genpatches-5.10-61.base.tar.xz 1978152 BLAKE2B 2943d58ccae232d4111f33e76f8c41234c013eed3d196f12a85d317251549225b7062609876cfb57c0b27a3328aed93ea68508050e9aebec14cdc7c6cb1cc898 SHA512 d1065304d3b0d7d5c9855252f25c4c34328f3f7e97e87e8f9cc12449451501660b279d16e1bd83ade943f42fcd97e5c4d569eabb097a77f7ca837238d6d2e093
 DIST genpatches-5.10-61.extras.tar.xz 3416 BLAKE2B 41bfb877b640ce1a8d5b01226b77db8dd9aea03926139bd9fd4055f86fd9844ebcfe2a21ade837fb860f0f5007a3c1cb27b2147fafe79ae1ea003592a33b887d SHA512 36b16758d14c47dc94d8a00b3416182262f270f04f3ec652e89ce492dfc6694eaf0d4c214a9d57778afd0ab803c72348edb5848e362ba807f2912f7c4d51d66e
+DIST genpatches-5.10-62.base.tar.xz 1996836 BLAKE2B 071dcd4cd4ae685c020e460a5858891f895f5a135b53c94cba0f03476698f4270e1461a8caf93f5f0cc5eda42f4df8194f463caf63b4fab354daec95811b09e0 SHA512 e37dc31fd2b129b7f45f663394eed3d386f50710b41291d687fc000120ea21e92351629c7144f48f27f9f7edd261803c67ec0bdb0925075fd5880a1b10314b68
+DIST genpatches-5.10-62.extras.tar.xz 3436 BLAKE2B 625104ad203699aa2083281ab4e1a9e0565cf3418dcee8af30632570f90554e97f63d70a89f3de43f0869857fc47cfcd6ee91083b398dd241171c6389e647d01 SHA512 013772cd15a03dd9bf193a8d45330cca268ba45e604be4670edbd1489ee2435aed0670fa40de33b63a37d8c802bb3ffc7e8442185023170d2ccfe79f4ed7a38e
 DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac SHA512 08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
 DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651 SHA512 20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
+DIST genpatches-5.13-10.base.tar.xz 573992 BLAKE2B f3de7462b97e0a2bcd38edd0cd7972b3da8f9d14b5874f7137bac5e6193c046b7405b9ce4e3d74c6f72af3a83e731ebee65aa8884dd28124907090c489d04a93 SHA512 12707bcd389647dce3dd90ab0e0d3a604d250fa43f8634818363c6d3e7b260e392402fa8b5750e72e5e1e2937323a689c3d5ef48f5ec9a347d77eeccd2681cf3
+DIST genpatches-5.13-10.extras.tar.xz 3436 BLAKE2B 325894702295cd2684027d2512a4f480fd021ea1e7c3af5f87d573ab2828283e371178a0d3d84d42409dfd079f8b77d36deb7360e1bc153b803af18c5303ae45 SHA512 49a8aeeca93b88d727e305c18cde5de517863ffb76ac6c80263697c416509d84dded656b5c2c6625986baa9440081fecaacad22bf9b38fc5c3268c4fc48625e5
 DIST genpatches-5.13-6.base.tar.xz 447968 BLAKE2B afcec75958e44f3ef7da0b2ab3e2a3d9574fbacac23d028335ce241838e36355d813fb89944ab4ed45153f5317997f18e153514f877bee6a490969b75242c043 SHA512 05afae24abbd06771ecc88b8bd93e765e7c41e9ea6826510d291cb8b10387be747ac7738e3df8cbef1d7488c96fd3fcba1138a7cbe9dc7348a76b5df51c95a74
 DIST genpatches-5.13-6.extras.tar.xz 3420 BLAKE2B 9ad0d2bf1b2621b328d142cd464b6de2676c8a4f0caef8ee4c5d7fa60db56d73b9056917e07ca421b02e6de1564b3d5f900299721b6b412cb145efa9bea8d60c SHA512 a7906d25d02082217bec37c435b316880e1af9922018b88569cdb4cf8c2cf5fd789bdac946100f2b1a9e0e2125a69222fc853ab1496abdd30ca00497afcb8fd8
 DIST genpatches-5.13-7.base.tar.xz 481660 BLAKE2B 810b5438e39c8928ec2aca11658cba78666e3384deda7f7ae3c21ed9987fc94b8b1d0c1b802ea454978a226fb6ddc13295097a284d84c95afc060fdbad09b9b8 SHA512 237189cd9f09bf1e83f83f27ea47306881f560fca9a96ce58185bd0dde707a0c46103889bbf798742d9eff9e2c0708c08b27698e659ad1b679d07f0ebcecb061
@@ -24,6 +28,8 @@ DIST genpatches-5.4-140.base.tar.xz 3800500 BLAKE2B 96f0643b5969a4901c1c0e31cb08
 DIST genpatches-5.4-140.extras.tar.xz 1772 BLAKE2B e1e90362759de205856b26cb96bb131fd9ea80e198d059e101c67d4d4ec97b4bf15992cd14f50b75015c5accebbf441f28a01dc14060baf5cd71adb87ad1f174 SHA512 2fe6cc926eb174c773144ca7bcb3d6479223582cf11112aa5f30250124e1b1c4f69736b87faf7e6316eb90fa92af441fb1bf9413ce80d568342204f035263a80
 DIST genpatches-5.4-141.base.tar.xz 3803356 BLAKE2B 77cce01a65621f898f939d9f46936d28d1971d8184df8b90a07c9a0e268b2593de27374a340cb1e6f2002630b8501163e412b3b868adbc0007d7e9033fe7a8b4 SHA512 c2434cbf65b5468c62cc295fedca7e74493bde7126c26d1cf47e2725608d9f4dfc845ca18ce779991847cdb7092d34e7018ec91648fbe3c09ef999db35dbc68e
 DIST genpatches-5.4-141.extras.tar.xz 1772 BLAKE2B 647e100ffda7cb137748ab92bc5cc95e4262570cb14b5612d6f40f5c28f7c7d38b022c11c3416506e03a303555995f2e4fb4cf07d53e44bddfbc8094f4467d98 SHA512 4ff6aff1eca4607f01940253b8fdb563fe5dd52684439860a29a2f747ec531af1120652e128f1fe44ca9b36f3a9cf47aeeeb684a3aa313903eb9cbf396177fea
+DIST genpatches-5.4-142.base.tar.xz 3810892 BLAKE2B 66afbcd352ba038920281b3220f41278281c4626945e6c7f0949089a8dffa6b681c9cf926cc7ebd7e8588dc1f46c9facd8e907915cfeb4490274772d23fdd17c SHA512 8d2d6a4c856fc246a1cd6324f6802a1755b18e8b828b01ea244ea36dde4ff2a56c18283ef5b9b59f60b582aa26a6d8dfe55376f8c8d54f5aa3f204de60142c0b
+DIST genpatches-5.4-142.extras.tar.xz 1788 BLAKE2B a8bed6a689141fdeb3fbd857b0b753a4d317298205b0961c9bbedbf7064d55d05ad3ad437fe8d2e182898063f0fbbdd05ad32b52173bafb6e7e8155ebaf8e698 SHA512 e288e2047cbdde57a8d20297b6d669a107b2a0185f3351972f0df8921eaecd3f0971ad68cb7989f6a265a324c13095374cf90d01d26982e7a757e5fd0b2ebbe3
 DIST gentoo-kernel-5.10.52-1.amd64.xpak 65489696 BLAKE2B a2db9e17da673f174515c38e2107d36ffb99ce1478f2852a3f953c0ca4732acdc556806738172342002f73232f960fcaeecc3d31700b9b3d0c1359dfd493e74b SHA512 bb20d147d15358ca0adaf54d32f7c42d4b8c62073c4a7ccb09ae939f5757b42bb988176dd60946f2720d046061a9517426f0f92074257515216f66c548d6c6b1
 DIST gentoo-kernel-5.10.52-1.arm64.xpak 59035661 BLAKE2B b6084e13be321a59402a79ece7bc3c302b1b49e4a0ab24ac456185590fa8c5a555833db68ddebd1905da4bffce3b8f7ad17b86bcf882cdb839d88c8d4d135912 SHA512 1853c88f26a1d2d26b67a37cb40faaab6ef9b4af7ac77fc1b83d0b6603c1addf299f58e34a5608e6a056aeb81d0e9c2058fd1eee056f5f150cf4507327d6c8f2
 DIST gentoo-kernel-5.10.52-1.x86.xpak 57220562 BLAKE2B 89a0555e23ba7c5493b1d3865665497f821d7a256166cc4a92e5854fc506ca8aa5b883b84f4a97771934fc6ac5d61b1a213aaa66767e1881a487db5ca6dee216 SHA512 a12657010017d2d2ae317ad234b8f114daca90f94eab0cd42e3776fa7d6d933b8c8ab507412b43a11aada62a863993f63243c56dd906b4b85796f968dfcd2ca9
@@ -36,6 +42,9 @@ DIST gentoo-kernel-5.10.54-1.x86.xpak 57217543 BLAKE2B e978d64011c71d186980da394
 DIST gentoo-kernel-5.10.55-1.amd64.xpak 65491981 BLAKE2B 73390f8750f11e309cf9f7b32a3f199e84717402459987af695441acbc53e2a19b126904ba2a09e7e2f51188f3b391e2f623dc338473c79baf8ef570c06e3b8d SHA512 a3c1c3e5514c0ffeda250023ad01a384449c78335ec82de2f4d67bd0913a567253ee4fd3819bbc2e82cb3575b980e9157263a2188532ea16ac5bfcbff65e37ce
 DIST gentoo-kernel-5.10.55-1.arm64.xpak 61167016 BLAKE2B 1de73432ca09ac34c84f621d3a14a4c3ef3b8e26dc3f930fff9c569f0b6c6afd44c00f1d7b41f0ddcca15c421532f53256740f12de3ad2305306d5c8181e1221 SHA512 da8952228418f8acdab8f136ebe181a201eef8b0d594645469af73d9b85a9bc297d83ea9a15c32a0b63fc3850b006091ace3ee21dab15c9104755c16dc8c95a6
 DIST gentoo-kernel-5.10.55-1.x86.xpak 57214089 BLAKE2B 6a411b8e89fa877a0f091e8a1c83896208f96e980ca00f6e73f835fe3258a58b62814e114e6728a63ba8d1679de22b7c10c0920db40ec5fd7ec73f3047667ec5 SHA512 6c762a018aa48d7c687c696ce6bf8786801e4b870812f908e1bd15a742aaf098e22b802061c150e62cb0b06e473e99f720444657b984b8f6069e037823522794
+DIST gentoo-kernel-5.10.56-1.amd64.xpak 65466530 BLAKE2B bc22262e84dab9a7fb747064655d910ab963c03bf37099438bb0afda73e211f4e34b49d447fa6496fd4233be032418a5f4e7cc54c3ce812b82c6929715d55004 SHA512 45f2735e482d3bac6893270c2fd82a47021697f4be333cdc353b76597e0ebaad774e49a4c52c7dd29808a9c5975fdc0cc67ea3d9223722e8d4741675f2452a29
+DIST gentoo-kernel-5.10.56-1.arm64.xpak 61251700 BLAKE2B 5afde0d58d7a6839cb5093beab66ec4357f1dd2bb900674bee68353b72325ba510d983ac096e1cbf3bcebfe3c336ab30774a948664b471cb84a72990a7acbac0 SHA512 c494bfdd391b0328bec671eff159986da0e745bf3db70a2647f6ef8ba57f851bfa0b4262d89526f3670ddf620c4cf1e0377c299b9cf3de241e37e22bb90e8932
+DIST gentoo-kernel-5.10.56-1.x86.xpak 57227791 BLAKE2B 4cb8e8af367ffde0ad63061f8b45665c9f594f106ba4db2c4ead93c46426f989f8eff507c534dafbc66cb92f53bf72cf6ee93ee353069caf8fe8c46119080e27 SHA512 529a69dc7177c9bf0c2da9b9614144185851e8a4bb0cd66a352fdfc877771f624b493bb16f62956e58a52849ffdd0ac31d219c9ac9d542c0fd9c14a3bc5567be
 DIST gentoo-kernel-5.12.19-1.amd64.xpak 66346655 BLAKE2B a03cbcdcd1a90d48d7e11e988d03efa43980f4d5d8af4b74e4c81f195faa01803af45fb38f7dc1f5af7e9b5338a53bc6f34837c37f7e853c088ec6c1dc084e44 SHA512 3d7f78c488ecee2532f8a8ad61e3aa0f5e238e4cd520d29288715a3dc5c488670d7378f3dc5bc110252dff10108dfbda27a54722c6b044151999428d002b34e1
 DIST gentoo-kernel-5.12.19-1.arm64.xpak 60043529 BLAKE2B 8746081847a39e1847b8e9f35fcd68565370b116d6418edf803c4cdca9d750ac8ada58c4a7fd377480a1c75b3c805864d419c02ee21675bc77ac195731385a18 SHA512 d1a8a9210a1ab3d3c1894be1fe524e64b859b0a02763feacfed1a24655540ade6c28af751b23e924fcc04fb9abd56e84c43d634ad80bbb4d5de79ed533b5ea50
 DIST gentoo-kernel-5.12.19-1.x86.xpak 58076509 BLAKE2B 0e4aca91c834b23fb169bb6fabab13130de811c15f89e6341ad2a36ac230071ced6c6d7bd30be0f0f3860d09968449c1933cd33ed021213c667304070b80f9a7 SHA512 9786f106ed59661546d9f035e25c39f4c7a4a41f51afa96700867e47bab19e148e8a42c79bc3b7780967c2f82f1fef6920f220fb5fccd6f267a2c6e6a3081126
@@ -51,6 +60,9 @@ DIST gentoo-kernel-5.13.6-1.x86.xpak 58503030 BLAKE2B 155b0e3dbb55457f6f9d2eb488
 DIST gentoo-kernel-5.13.7-1.amd64.xpak 67276613 BLAKE2B 18e0b34b5b6f214d98eec3d1a2e573e3323174351a8f8409485a119a4acff6160ebba11ba6f3145f96b3c6044549e03b47103471cf5a72b49a92a73b444b02d4 SHA512 2e7e31fef38e50ec8662040a61cdb6658896b71d294106a43cde41ef338440ee3912c5a5544bb6f093a74e9cd584e86150cea51eb0486cf973051b1610a6f0ed
 DIST gentoo-kernel-5.13.7-1.arm64.xpak 62784203 BLAKE2B fa13585c714e5e0f8a02d23908ef6e4312f04e530869d8827969fc5483bbbe8bd5c9d578a68edf3d7631800b4ef9d4791f44cac5d960d0892e6a401a5503cf62 SHA512 b91ed9f6b9717c1514802a75ef6f2e1d4268dacf95caf404157ad973e7a38d5da34f8ae0d38d2a0f2061e1e1e350815fd0c43c5d322c5affe68989ae160d646e
 DIST gentoo-kernel-5.13.7-1.x86.xpak 58487920 BLAKE2B accf7b6a0f5f57e0759f48ddd6868af0b569571b383b876448424c97c4e7a66a139250752ee3ddb42d314cb8018a45859f9bd3fa3c57074364f4d7a09130a2ef SHA512 456c3aeb610ac6516d46f5ba0944b3cc0d78bbf0d773a7de76abc548f349f9e891ff04ed60420cf51c83588b1b2e162f37034e00416d138daab589b72c67a91b
+DIST gentoo-kernel-5.13.8-1.amd64.xpak 67284810 BLAKE2B 62ab6e2d4849e945ca160a6f0afd8d80e568d58aae569ff3b2e4a98598831fdeedb01ba37ed4b28f5e2d3a00924b783a2891385faa57b5d295a0369c103093f7 SHA512 a0ad7ae5d66f3979851cd99cb5c9021b3f3a55ccb6d98cba4d4a82e750cacc2d0018e2f020e1026f8af93c6c20812b9972d5d8e4ca7a6458f75e30166bb09cec
+DIST gentoo-kernel-5.13.8-1.arm64.xpak 62737848 BLAKE2B cd2cd8ff5c275e053cbaebc4816f97b7ca08bb36aac00c41316c8869c04ee9ebd569caa0dc0f48319f5e523348df5895a106ebfa7df553d48ebb999eba646104 SHA512 fb0b10884699f520914c625e79bcc3f2333c6fe69b74d54608e07e3d2e9c6c7f2f51554c0d84e115e27646d439f92d5ff993f9002bce630d85cbaaa10166adb8
+DIST gentoo-kernel-5.13.8-1.x86.xpak 58496336 BLAKE2B d501a93ae7760c54190f954b40962a6a47a65e7e7e4e9ee4224414c40784bc479178d44a19ba394fb61b4ce6adf0d7c07b6dca0ec8bedfb2b8ffd05940f76b0c SHA512 c4e3a66e8522ceb0bde5e89b434a46e24c9124b580963eff4718b7d380b6c49bc9385ed72490cf877ab9447612bbe29a31155499a64a8df41b32be7ded97c0d9
 DIST gentoo-kernel-5.4.134-1.amd64.xpak 61349154 BLAKE2B c7627b1a8ad85b22450ae1b47a26f9144707f8a2173b01859ea1d876cf4d96e9fcc27be439e6c0239d7494795cc62fa931ecc71be84f9f898ec017a79d82dcf9 SHA512 d4c6613ed069a0ec2dbb5f5bb317abe952309f6ba6fbb163cbf1392478b1756dd129e51665b3b4e9c939395f5cdbc553003d7f0201098f959be9d29233a48cc9
 DIST gentoo-kernel-5.4.134-1.arm64.xpak 56052116 BLAKE2B 6a901fb6a639470145c8b58e435cfe4a380ebd402397ca34eace732936fda8e38a8e92e0f49d747e6f1ae8fb5410960e236ea2cc22dbc7f25ac833275b9b6fea SHA512 216287843b7d1e740afa3c88376e5d5ae99d88882b6669c753fdd341d7f9cd84ee8cbf28fb08f6101b9a9263ce20c6ddeeececf078c7387e571eac53baa52204
 DIST gentoo-kernel-5.4.134-1.x86.xpak 53144418 BLAKE2B d11e4de3fddb270cc41c9ad49c048df0af8e578f9ef0d811dbc4d930c7b399b7bfff724db889e3e8ce9332920b5f736594923646f7c1c8eb9f07371a85f0a1c9 SHA512 7fc2a72b5f7b636312ff28a2beb07a4514093499bb498bd43574cfd5178490c94628391acfb0da1c08569cbe0cc629373a1b9828398418f82c1745961c6508e1
@@ -63,6 +75,9 @@ DIST gentoo-kernel-5.4.136-1.x86.xpak 53155965 BLAKE2B dda19ed3567e9d97385a7fed5
 DIST gentoo-kernel-5.4.137-1.amd64.xpak 61351375 BLAKE2B 0ab9e813b74fa66eec713ca7ade8666f1d6e89f7b3a66c8a7cee2c56b07f6af3c7b7e1f000f32e73edc1e438adf8647ae441f731fc68c2cc38f9757286c5e66f SHA512 e2b640546e8bf46917c73277499e3c098a0400dfc1d34587d7942f1b3f6fa99e933ecda2308500f5a4b3f544082e5dcd243d94db05f6dc0dc0b1c2a24b06d5f4
 DIST gentoo-kernel-5.4.137-1.arm64.xpak 58029600 BLAKE2B e52bbf985127a0b1888862e0a7330da458e90fa87ec87ade63cf4c6dfd234959822f59aba6aff2967a7b86765651faebd43bd68040d685571890703f84120e93 SHA512 30a4de2040b8e094cbf0a7186040551302523b628aa6749fbecd425b6f4ff90e1ba95582eb95962c521654429a939d05ca957b151bf9c6201692a7c41debe99d
 DIST gentoo-kernel-5.4.137-1.x86.xpak 53152996 BLAKE2B 640fb56116dc7eec0af1746d491a9e201914ed6831cf98a588c14a116e0d6164da5458bb3798d4e25df85d6e2f515b4eaae710e99521b5b17579b17d3fa7f648 SHA512 da4ce341561f6c24239efa905b7afc17467cb97b4c23b10cefbcad8483055ebeefbe422339eb66d2a9837300e6d1bd5405510189119e848ef45217a744b65bed
+DIST gentoo-kernel-5.4.138-1.amd64.xpak 61360184 BLAKE2B c4a1beca6401ee254860c475abfcafc8fc986514a0615900688897f63727ac19f881b55598b80ffa3d59afb1d57197af0b527583208d73c4d77e58a610ae5a60 SHA512 8495ac018a8c9c2cb52dc65b836fa8cdae4835207a62908bafbf591fd6a645f8da380f5c6747c328836d54928bab88eaf80c9359c307bdf27cf0c91949cac2ea
+DIST gentoo-kernel-5.4.138-1.arm64.xpak 58029161 BLAKE2B 87075c8e6698b2fb8c8bd3e6169a0a2d6b18a045a24bb2bc7da9dddf86eeb3fe4171ab55812b50a49fe891b5edb4717b8a7e3cb1c7d6452711e9e9ff9ee872e6 SHA512 93f2e040194c566dbe11d4c6973fcad6f373504eee05e39957559618aaf984b43337bd57967168489b8361ed8732b0c6553f67f45e28f97771d3486d8f27e906
+DIST gentoo-kernel-5.4.138-1.x86.xpak 53142871 BLAKE2B 28b8f8fe44d9287cc5730600ab385a58270e9a5840f070613a310505ff0dcae6a206bffcb1c1d094142815fc263044b9421beee31e80f2fad2220bd1aca2a6d7 SHA512 cad459364a323df751144c3164a1b522d7e7a18f11398261543b2394de27fa51fd19e9a0e1ef77526f58bcecb3499901f3297baa2683bd31bec4ff3a9d8b78b4
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
@@ -75,6 +90,8 @@ EBUILD gentoo-kernel-bin-5.10.54-r1.ebuild 2542 BLAKE2B f0875f84db933407258e0b4c
 EBUILD gentoo-kernel-bin-5.10.54.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
 EBUILD gentoo-kernel-bin-5.10.55-r1.ebuild 2542 BLAKE2B f0875f84db933407258e0b4c068efa29a99a2e87bf77ac1f40c2387be9a73ad15af1ea01c14641b2b3d8ed05b55347059de2feac8bba1853706ad68b72f2b9cd SHA512 bb839e158eca955a08d18fae084cb14359c3e83c459f724b584b3c41c5e763faf6c06d6f35742b564681a7365fd909c1f3a6c1e1070edfa1d2a802a2dc921447
 EBUILD gentoo-kernel-bin-5.10.55.ebuild 2675 BLAKE2B 50558464db4279a19a8a2c19827e7cfad716be6c252a58494692bf6debede6d05368253ec8d63f259d8f15377a61e9046e3106d93189865f3a90b9aeeaffb8ed SHA512 c4803d43d6c29839380d6f6c9ad3bf09db75e0fab94fe09025d907f574ab3be35c59114a9a32e4feb511e9d70079a0355dba7d827d439b88eee9d86cc9d4be0f
+EBUILD gentoo-kernel-bin-5.10.56-r1.ebuild 2542 BLAKE2B f0875f84db933407258e0b4c068efa29a99a2e87bf77ac1f40c2387be9a73ad15af1ea01c14641b2b3d8ed05b55347059de2feac8bba1853706ad68b72f2b9cd SHA512 bb839e158eca955a08d18fae084cb14359c3e83c459f724b584b3c41c5e763faf6c06d6f35742b564681a7365fd909c1f3a6c1e1070edfa1d2a802a2dc921447
+EBUILD gentoo-kernel-bin-5.10.56.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
 EBUILD gentoo-kernel-bin-5.12.19-r2.ebuild 2544 BLAKE2B 7f3517bdd2c1bc73ded6502b5ed35fc403fd5013075a4e9e21335bb610be88ab6e17cb298d74e739beb3e330a7e3d52fe2a3e24cf0d254eaf61590f3a413f92e SHA512 abf32b339058742ec4e95e8ac134bec00d68a5a599efc6ff208299370e2032ea8dc9600eaa21e23047289ce9ec807819a26c232c17893d52e180a852034c70f2
 EBUILD gentoo-kernel-bin-5.12.19.ebuild 2675 BLAKE2B 72309c486946ff627032085b25686e89b43a29fe5c68ecd57be8b6ae8556d76651ea1a41b88f99fc5317880df9589ae6ce49d580d1df3f0d6c7409bf7227ce72 SHA512 5378f15c4f5e70117f8e12726a27d81e26f91e2443936eca2ce086a16dcb61eba1d28f16ae42d5b2f97c88e96e5fbf95b71ecdb79f2a8526627236ed5b408ea4
 EBUILD gentoo-kernel-bin-5.13.4-r1.ebuild 2539 BLAKE2B a43511445c920382f46cc9fd20931bd2a098a026e9f42f2493e68cd148eb68694f9a8cc3f2a74eaf12282013cf14ff7947f7e218151cb12c01246fae6a5972af SHA512 f8040b13ec219010a8946cdb2aaebfdb207c6d8cb818ffaf232a3c526d4a6eed1652e56cab943a71888f0028cedc3e2286b3dfe95ba044f4d89c363bcd67b76f
@@ -85,6 +102,8 @@ EBUILD gentoo-kernel-bin-5.13.6-r1.ebuild 2539 BLAKE2B a43511445c920382f46cc9fd2
 EBUILD gentoo-kernel-bin-5.13.6.ebuild 2677 BLAKE2B 36ea71e86c73f165c48bf0be61a199b287b19d8b5a24577a671c458ab58a1489d27d03390092f24cf5685f4e3ec52c7062afd39eb2ba7e3f00cf0bf13caf0c5c SHA512 7a4d3a7525feb32b33e173d469decb36eb65d61a7c0d1bc5454ad3037200fd4d8ce0bb20d421cb88edb72e6846501cb79999c58161c08166d022163b49072634
 EBUILD gentoo-kernel-bin-5.13.7-r1.ebuild 2539 BLAKE2B a43511445c920382f46cc9fd20931bd2a098a026e9f42f2493e68cd148eb68694f9a8cc3f2a74eaf12282013cf14ff7947f7e218151cb12c01246fae6a5972af SHA512 f8040b13ec219010a8946cdb2aaebfdb207c6d8cb818ffaf232a3c526d4a6eed1652e56cab943a71888f0028cedc3e2286b3dfe95ba044f4d89c363bcd67b76f
 EBUILD gentoo-kernel-bin-5.13.7.ebuild 2675 BLAKE2B 51c3d2f67482b88f85e0d4ee7c7ab263f964b4d83f0ef80cab9630fc6afaebadc1f53adf9320dacf12c26859bc3b659cd880001b27cabea86c80b5660a369641 SHA512 281c7feaa3ce6acbc7cb4873eeda9df46027d928446d77437dbf94b38cf55f61b62a30d2c8c2ac3a44867b971b6f3c892f612b435aff6b44e4945cd18109b30c
+EBUILD gentoo-kernel-bin-5.13.8-r1.ebuild 2539 BLAKE2B a43511445c920382f46cc9fd20931bd2a098a026e9f42f2493e68cd148eb68694f9a8cc3f2a74eaf12282013cf14ff7947f7e218151cb12c01246fae6a5972af SHA512 f8040b13ec219010a8946cdb2aaebfdb207c6d8cb818ffaf232a3c526d4a6eed1652e56cab943a71888f0028cedc3e2286b3dfe95ba044f4d89c363bcd67b76f
+EBUILD gentoo-kernel-bin-5.13.8.ebuild 2677 BLAKE2B 36ea71e86c73f165c48bf0be61a199b287b19d8b5a24577a671c458ab58a1489d27d03390092f24cf5685f4e3ec52c7062afd39eb2ba7e3f00cf0bf13caf0c5c SHA512 7a4d3a7525feb32b33e173d469decb36eb65d61a7c0d1bc5454ad3037200fd4d8ce0bb20d421cb88edb72e6846501cb79999c58161c08166d022163b49072634
 EBUILD gentoo-kernel-bin-5.4.134-r2.ebuild 2542 BLAKE2B 9727a87501a83e6d8ced5d1a6c9fa58a737d86eb549cbabc827af379e9e7aea63024f66f0b55f0306212a0b5502c63df810cfebd55e4d6e3de11c37c6cef826e SHA512 738f3f502781058fb53463b5199686c21ce7d08135c6e91a0a0f586c2ee24e70e52f5f7a3d676d2a6f1cf6439037b5ceb05977fa2fa59e9e9e1eb9c6a6e41014
 EBUILD gentoo-kernel-bin-5.4.134.ebuild 2673 BLAKE2B 504684885b7e4d71ef6bf6379565f478cc9714f5334f74e6d8b4f2c974a86176bf6c4e3033784e6296797fe1ad63c81fe3ccacbb5330e55fa2895b6ad3ca471e SHA512 af5e9435a6803789dfcf3b36755f30db552261e362197a8328f8096a9803c27e60db3a60ac5c57c5b6ad357a0bcffa5a5a093d201e8673902a9ef6aacdb282a7
 EBUILD gentoo-kernel-bin-5.4.135-r1.ebuild 2542 BLAKE2B 6d28ac98d98db7ebf5bfcb35c7a2c223b9bc82164fca1a85ce89e987f285b1eb5c8b1848dfb9b185c6ead189d0bd1a6346d44d8638b71dea1ee0083c3e879e02 SHA512 847c2545daa9a7d6cbf094aec806ea00f7e4fcaa4092342d69d2e3313e3dc85adcafb284c5f9a654446e5062340d4b96aa1c007003ce1484d32a8a9e02a7906f
@@ -93,4 +112,6 @@ EBUILD gentoo-kernel-bin-5.4.136-r1.ebuild 2542 BLAKE2B 6d28ac98d98db7ebf5bfcb35
 EBUILD gentoo-kernel-bin-5.4.136.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
 EBUILD gentoo-kernel-bin-5.4.137-r1.ebuild 2542 BLAKE2B 6d28ac98d98db7ebf5bfcb35c7a2c223b9bc82164fca1a85ce89e987f285b1eb5c8b1848dfb9b185c6ead189d0bd1a6346d44d8638b71dea1ee0083c3e879e02 SHA512 847c2545daa9a7d6cbf094aec806ea00f7e4fcaa4092342d69d2e3313e3dc85adcafb284c5f9a654446e5062340d4b96aa1c007003ce1484d32a8a9e02a7906f
 EBUILD gentoo-kernel-bin-5.4.137.ebuild 2675 BLAKE2B 81a555fb9602a18818f384c1cbc0929eca560a2c1ca7055dc3ccebb44e66a16e12ca132523ae18b45b61d644fee834cb06aee9145a886cf1a89b8f0a45219883 SHA512 5fc435c9479c488354d3be8457d8ec8fb3934b399bd687bab80b5721474514e0cab39ed3b6ab54eda9e004b8edc860104333a3981e69ce884bb88561055c38b4
+EBUILD gentoo-kernel-bin-5.4.138-r1.ebuild 2542 BLAKE2B 6d28ac98d98db7ebf5bfcb35c7a2c223b9bc82164fca1a85ce89e987f285b1eb5c8b1848dfb9b185c6ead189d0bd1a6346d44d8638b71dea1ee0083c3e879e02 SHA512 847c2545daa9a7d6cbf094aec806ea00f7e4fcaa4092342d69d2e3313e3dc85adcafb284c5f9a654446e5062340d4b96aa1c007003ce1484d32a8a9e02a7906f
+EBUILD gentoo-kernel-bin-5.4.138.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
 MISC metadata.xml 352 BLAKE2B d14768a94b44290d052fa5b86553dc09bdc609c629fc96da7d5314510091484d7f22f2f4b4244fb033046eb949da8fdf6b9535d698ea3323f2da79400454b8d2 SHA512 a7b17e6764a339943b587985b95d828e84a076ceb3c372181794c905f6ce1a5554be69cb55560d823d71d8ea66666bcd5474fec1ead721633477eba31cf1cc8a
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.56-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.56-r1.ebuild
new file mode 100644
index 000000000000..9f8ae493e215
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.56-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.56.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.56.ebuild
new file mode 100644
index 000000000000..b23f3e054425
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.56.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.8-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.8-r1.ebuild
new file mode 100644
index 000000000000..2f16601a52d9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.8-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##*.} + 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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+		-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.8.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.8.ebuild
new file mode 100644
index 000000000000..e00d3ebb8dc1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.13.8.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.138-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.138-r1.ebuild
new file mode 100644
index 000000000000..fe6e6023d323
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.138-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.138.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.138.ebuild
new file mode 100644
index 000000000000..19484744cb5c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.138.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index e045b3cb9a17..00976c273397 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,8 +6,12 @@ DIST genpatches-5.10-60.base.tar.xz 1973040 BLAKE2B fb67f230bf6d8a0fb881fd3cc8fd
 DIST genpatches-5.10-60.extras.tar.xz 3420 BLAKE2B 57d4b7bd7fe2cbce448384754e98bb84dc9f68cbe50fddf9799f82449cf4f04b77041f17cdbb08c5a7938cfe38f788bc4802cc6b0c709a84f0cff5ecff4bad71 SHA512 0b1a7ede058eed0b8f20b5f020f9fe41de07d691ca5674d5ee41fbd2636627d77dc95ff4929654a6bc430e6a4d437f2b798ba1c50dc6394e51a7c627bcbdd7a7
 DIST genpatches-5.10-61.base.tar.xz 1978152 BLAKE2B 2943d58ccae232d4111f33e76f8c41234c013eed3d196f12a85d317251549225b7062609876cfb57c0b27a3328aed93ea68508050e9aebec14cdc7c6cb1cc898 SHA512 d1065304d3b0d7d5c9855252f25c4c34328f3f7e97e87e8f9cc12449451501660b279d16e1bd83ade943f42fcd97e5c4d569eabb097a77f7ca837238d6d2e093
 DIST genpatches-5.10-61.extras.tar.xz 3416 BLAKE2B 41bfb877b640ce1a8d5b01226b77db8dd9aea03926139bd9fd4055f86fd9844ebcfe2a21ade837fb860f0f5007a3c1cb27b2147fafe79ae1ea003592a33b887d SHA512 36b16758d14c47dc94d8a00b3416182262f270f04f3ec652e89ce492dfc6694eaf0d4c214a9d57778afd0ab803c72348edb5848e362ba807f2912f7c4d51d66e
+DIST genpatches-5.10-62.base.tar.xz 1996836 BLAKE2B 071dcd4cd4ae685c020e460a5858891f895f5a135b53c94cba0f03476698f4270e1461a8caf93f5f0cc5eda42f4df8194f463caf63b4fab354daec95811b09e0 SHA512 e37dc31fd2b129b7f45f663394eed3d386f50710b41291d687fc000120ea21e92351629c7144f48f27f9f7edd261803c67ec0bdb0925075fd5880a1b10314b68
+DIST genpatches-5.10-62.extras.tar.xz 3436 BLAKE2B 625104ad203699aa2083281ab4e1a9e0565cf3418dcee8af30632570f90554e97f63d70a89f3de43f0869857fc47cfcd6ee91083b398dd241171c6389e647d01 SHA512 013772cd15a03dd9bf193a8d45330cca268ba45e604be4670edbd1489ee2435aed0670fa40de33b63a37d8c802bb3ffc7e8442185023170d2ccfe79f4ed7a38e
 DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac SHA512 08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
 DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651 SHA512 20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
+DIST genpatches-5.13-10.base.tar.xz 573992 BLAKE2B f3de7462b97e0a2bcd38edd0cd7972b3da8f9d14b5874f7137bac5e6193c046b7405b9ce4e3d74c6f72af3a83e731ebee65aa8884dd28124907090c489d04a93 SHA512 12707bcd389647dce3dd90ab0e0d3a604d250fa43f8634818363c6d3e7b260e392402fa8b5750e72e5e1e2937323a689c3d5ef48f5ec9a347d77eeccd2681cf3
+DIST genpatches-5.13-10.extras.tar.xz 3436 BLAKE2B 325894702295cd2684027d2512a4f480fd021ea1e7c3af5f87d573ab2828283e371178a0d3d84d42409dfd079f8b77d36deb7360e1bc153b803af18c5303ae45 SHA512 49a8aeeca93b88d727e305c18cde5de517863ffb76ac6c80263697c416509d84dded656b5c2c6625986baa9440081fecaacad22bf9b38fc5c3268c4fc48625e5
 DIST genpatches-5.13-6.base.tar.xz 447968 BLAKE2B afcec75958e44f3ef7da0b2ab3e2a3d9574fbacac23d028335ce241838e36355d813fb89944ab4ed45153f5317997f18e153514f877bee6a490969b75242c043 SHA512 05afae24abbd06771ecc88b8bd93e765e7c41e9ea6826510d291cb8b10387be747ac7738e3df8cbef1d7488c96fd3fcba1138a7cbe9dc7348a76b5df51c95a74
 DIST genpatches-5.13-6.extras.tar.xz 3420 BLAKE2B 9ad0d2bf1b2621b328d142cd464b6de2676c8a4f0caef8ee4c5d7fa60db56d73b9056917e07ca421b02e6de1564b3d5f900299721b6b412cb145efa9bea8d60c SHA512 a7906d25d02082217bec37c435b316880e1af9922018b88569cdb4cf8c2cf5fd789bdac946100f2b1a9e0e2125a69222fc853ab1496abdd30ca00497afcb8fd8
 DIST genpatches-5.13-7.base.tar.xz 481660 BLAKE2B 810b5438e39c8928ec2aca11658cba78666e3384deda7f7ae3c21ed9987fc94b8b1d0c1b802ea454978a226fb6ddc13295097a284d84c95afc060fdbad09b9b8 SHA512 237189cd9f09bf1e83f83f27ea47306881f560fca9a96ce58185bd0dde707a0c46103889bbf798742d9eff9e2c0708c08b27698e659ad1b679d07f0ebcecb061
@@ -24,6 +28,8 @@ DIST genpatches-5.4-140.base.tar.xz 3800500 BLAKE2B 96f0643b5969a4901c1c0e31cb08
 DIST genpatches-5.4-140.extras.tar.xz 1772 BLAKE2B e1e90362759de205856b26cb96bb131fd9ea80e198d059e101c67d4d4ec97b4bf15992cd14f50b75015c5accebbf441f28a01dc14060baf5cd71adb87ad1f174 SHA512 2fe6cc926eb174c773144ca7bcb3d6479223582cf11112aa5f30250124e1b1c4f69736b87faf7e6316eb90fa92af441fb1bf9413ce80d568342204f035263a80
 DIST genpatches-5.4-141.base.tar.xz 3803356 BLAKE2B 77cce01a65621f898f939d9f46936d28d1971d8184df8b90a07c9a0e268b2593de27374a340cb1e6f2002630b8501163e412b3b868adbc0007d7e9033fe7a8b4 SHA512 c2434cbf65b5468c62cc295fedca7e74493bde7126c26d1cf47e2725608d9f4dfc845ca18ce779991847cdb7092d34e7018ec91648fbe3c09ef999db35dbc68e
 DIST genpatches-5.4-141.extras.tar.xz 1772 BLAKE2B 647e100ffda7cb137748ab92bc5cc95e4262570cb14b5612d6f40f5c28f7c7d38b022c11c3416506e03a303555995f2e4fb4cf07d53e44bddfbc8094f4467d98 SHA512 4ff6aff1eca4607f01940253b8fdb563fe5dd52684439860a29a2f747ec531af1120652e128f1fe44ca9b36f3a9cf47aeeeb684a3aa313903eb9cbf396177fea
+DIST genpatches-5.4-142.base.tar.xz 3810892 BLAKE2B 66afbcd352ba038920281b3220f41278281c4626945e6c7f0949089a8dffa6b681c9cf926cc7ebd7e8588dc1f46c9facd8e907915cfeb4490274772d23fdd17c SHA512 8d2d6a4c856fc246a1cd6324f6802a1755b18e8b828b01ea244ea36dde4ff2a56c18283ef5b9b59f60b582aa26a6d8dfe55376f8c8d54f5aa3f204de60142c0b
+DIST genpatches-5.4-142.extras.tar.xz 1788 BLAKE2B a8bed6a689141fdeb3fbd857b0b753a4d317298205b0961c9bbedbf7064d55d05ad3ad437fe8d2e182898063f0fbbdd05ad32b52173bafb6e7e8155ebaf8e698 SHA512 e288e2047cbdde57a8d20297b6d669a107b2a0185f3351972f0df8921eaecd3f0971ad68cb7989f6a265a324c13095374cf90d01d26982e7a757e5fd0b2ebbe3
 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
 DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
@@ -51,13 +57,16 @@ EBUILD gentoo-kernel-5.10.52.ebuild 3109 BLAKE2B e15cfaa865253cf75ee6f462e61e15e
 EBUILD gentoo-kernel-5.10.53.ebuild 3115 BLAKE2B 5c1a0b136cbcfa49036153ad7dacbe9d365ed5fcd1d3b481ae48bf0afaa40f9016e5f0fbfd7425aa4a4de0ab4a03cce825669ef878bdaaebb0f6669f445b0ad6 SHA512 6937e12ea7750e73b6e4b8627cc9a06a64dfd02a35bf84ca99c5a0d69acf0c27e322cc4c52345c1b64bf4b6f0390253800936ae012e5b25416a0056658cbe4b2
 EBUILD gentoo-kernel-5.10.54.ebuild 3115 BLAKE2B 5c1a0b136cbcfa49036153ad7dacbe9d365ed5fcd1d3b481ae48bf0afaa40f9016e5f0fbfd7425aa4a4de0ab4a03cce825669ef878bdaaebb0f6669f445b0ad6 SHA512 6937e12ea7750e73b6e4b8627cc9a06a64dfd02a35bf84ca99c5a0d69acf0c27e322cc4c52345c1b64bf4b6f0390253800936ae012e5b25416a0056658cbe4b2
 EBUILD gentoo-kernel-5.10.55.ebuild 3113 BLAKE2B a931dd6ecf886233766b0b1ec60ea67c73e248a511da1bbe41c92118acfc89ace483dfa85e4dec5e8d8a0ddbdb9635fa7601c5fe2476500039ee0d48a7102d27 SHA512 0027054cec995ac00941c5d7cfaef3c5a32b9eac8f5abed327fad9b6069a78fdf47703e097b3bbd6596bacfca2ca6fde6a409fde0ad96676b24d9f49c8bb9c52
+EBUILD gentoo-kernel-5.10.56.ebuild 3115 BLAKE2B 5c1a0b136cbcfa49036153ad7dacbe9d365ed5fcd1d3b481ae48bf0afaa40f9016e5f0fbfd7425aa4a4de0ab4a03cce825669ef878bdaaebb0f6669f445b0ad6 SHA512 6937e12ea7750e73b6e4b8627cc9a06a64dfd02a35bf84ca99c5a0d69acf0c27e322cc4c52345c1b64bf4b6f0390253800936ae012e5b25416a0056658cbe4b2
 EBUILD gentoo-kernel-5.12.19.ebuild 3112 BLAKE2B ba1162989a26898748ff8c46f5bd36b6d21de3db498c2017835fc20b874a1ff94171e7917a1f4fa27e20569b05217478a45371224b5e5fb2c0ea88061d1e9533 SHA512 5e2fe2a48dc9c4615e0eddb044bd09b94e29a68afdf36272ab547251649480bf011e9a52a6df4f607c99a4b8eb3af068ef1301a3da26d0bd7cd28e9b45eedcb7
 EBUILD gentoo-kernel-5.13.4.ebuild 3111 BLAKE2B 3859cb3c0ec0f218941b11f20e5239715555dd5cba9faff8c8f53608a27c2f727a11df7ef70e0289dbd6dd0cf8ede9b2b3b1f60f81292704b0375c456da7cfee SHA512 81fa1c65dc0a31e03499242e71c74970aa181f86e7ec3701a95841e25b6e4a7f4262b445b39888cb8383e1b2083dddc855e6d29754f80066ac7c983c75f94d7c
 EBUILD gentoo-kernel-5.13.5.ebuild 3113 BLAKE2B 08f3fb03832666b3a2f78870d8ea06be028b7c1dc16ae748d2fd8d139a46adcfc94341910704ae6bc2a7c6e281756c12469081023c613c6be1e620aeab017ada SHA512 96b1d119094e62370e57c7b82d9d8c68f239779683fa6837fa68600b7fd981fa83366372416734f91ffdab4d30f93e9fafc1fa5b110725df983420b7c8871e63
 EBUILD gentoo-kernel-5.13.6.ebuild 3113 BLAKE2B 08f3fb03832666b3a2f78870d8ea06be028b7c1dc16ae748d2fd8d139a46adcfc94341910704ae6bc2a7c6e281756c12469081023c613c6be1e620aeab017ada SHA512 96b1d119094e62370e57c7b82d9d8c68f239779683fa6837fa68600b7fd981fa83366372416734f91ffdab4d30f93e9fafc1fa5b110725df983420b7c8871e63
 EBUILD gentoo-kernel-5.13.7.ebuild 3111 BLAKE2B 3859cb3c0ec0f218941b11f20e5239715555dd5cba9faff8c8f53608a27c2f727a11df7ef70e0289dbd6dd0cf8ede9b2b3b1f60f81292704b0375c456da7cfee SHA512 81fa1c65dc0a31e03499242e71c74970aa181f86e7ec3701a95841e25b6e4a7f4262b445b39888cb8383e1b2083dddc855e6d29754f80066ac7c983c75f94d7c
+EBUILD gentoo-kernel-5.13.8.ebuild 3113 BLAKE2B 08f3fb03832666b3a2f78870d8ea06be028b7c1dc16ae748d2fd8d139a46adcfc94341910704ae6bc2a7c6e281756c12469081023c613c6be1e620aeab017ada SHA512 96b1d119094e62370e57c7b82d9d8c68f239779683fa6837fa68600b7fd981fa83366372416734f91ffdab4d30f93e9fafc1fa5b110725df983420b7c8871e63
 EBUILD gentoo-kernel-5.4.134.ebuild 2816 BLAKE2B d309bcad3bdb461a42844e76b61e76b6a2cc935af6e2c2623126b2e121532e84bd28ebc067beac0fc5259f67a9be36869e7e7c1bdbcbff15674f6760d98c153c SHA512 a75e9374a0cb22935c56aa2050a8b8e3f8e30377807e25bf99bf6cd2c28f703caa25dd1b7a132151745f0c910d412b2e6959bead16ccf1051578e4995e1875d9
 EBUILD gentoo-kernel-5.4.135.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
 EBUILD gentoo-kernel-5.4.136.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
 EBUILD gentoo-kernel-5.4.137.ebuild 2820 BLAKE2B 3b56769b765f440213db7fcadc05eda3569f3bdcbdd69518fea282a8fb6318ef4568efaca467603bdaff2b65adc725e886123d62cf1eabfe66ce829c1351d945 SHA512 61e52d3dfef7bc2634797a7e8744ed9f56883f05965bd0a097ccf56a99862561301bfac6d3e1a88afec466d965c115d4931528ddb4f861007e868afbc833440e
+EBUILD gentoo-kernel-5.4.138.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
 MISC metadata.xml 464 BLAKE2B 8f1b0ec7ef58c31bba668cd26cb39bdd0e676c22fc9def7802ea02c6fdaa32ca2d129519c51dcf7a6711ff2f5e22b3e8fa10ed5667b129f9be698bf828644c98 SHA512 2b01cf5cd40c16da8bfe767614ec47c8b95ed915a9cf3208276dbd75c9e7c065cc43c036d0e141433b6d19c2cee88fc8ae344ed596d8c1caa31c05e722373a06
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.56.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.56.ebuild
new file mode 100644
index 000000000000..660215fc8655
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.56.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.42
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.8.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.8.ebuild
new file mode 100644
index 000000000000..973b0f5eb16b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.13.8.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.13.4
+CONFIG_HASH=a219e71ba368d65c1ede4fa6a79a17e70815440c
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.138.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.138.ebuild
new file mode 100644
index 000000000000..1bf22439675a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.138.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 9140cb5a48a9..d502a1f5838a 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -4,6 +4,9 @@ DIST genpatches-4.14-250.extras.tar.xz 3340 BLAKE2B a8601179ede30ef4dcfdcc3b79f5
 DIST genpatches-4.14-251.base.tar.xz 5202652 BLAKE2B 0e7be8c48338d75d61550b81ca0ef90533097fe606fcff55a661abe1eed833aa81930238ed52c602176312d131faa3d76542254a661d5f65b50a23e5659a9efc SHA512 c96af7a45c94d7d657a805551ff64651ca996f45396b32b7d930438f2ef7f9fb72182dc391afd6a7618168612a8ebcf85d730b8bb8b69aa14b1b6bd08042e210
 DIST genpatches-4.14-251.experimental.tar.xz 5708 BLAKE2B 06d8d13d3314f742de73042fad4bb02fd8c261f6e9c8f0d34cebec91d5d658593dfbe1a1416688c80e47b5dc79df5c991553231ded0294d1a5ddad0c7fc2ee73 SHA512 d9f9756329b8fd6cc61c643377c2c6c895815e1653d3abf88c09c6262528015c231ba3f652a342552e9825bc39464f03c6dd4ef9791058ba80585480099a2042
 DIST genpatches-4.14-251.extras.tar.xz 3340 BLAKE2B be7681076f30d68770b49c8e8bef09a2b9b247bcdaf1e025a96ad950d85718463ca94882cf70c77d58b3b42a363cda9d5aa6c080d359254146fea139a8305d5f SHA512 6964919505adc947487e45d6dd83cd4e59e2c96d07c465da7327d6dbf7f4fafc9b2b9d2b039312ea3d5777d8ce55d2646b6daf98e7f0ff77f61c1a0b0c25d863
+DIST genpatches-4.14-252.base.tar.xz 5212396 BLAKE2B 74f1589f950d8cd796b13a06946f537676cc369619bf89bf556ee8f0b3a84598f23630e9c4ef95977a571e979acb05da7127845f8e0745ec05b8d3161c3e5161 SHA512 569db4aea724475afc65cd889c44e3e3da27462437d340299823e3ded7273d842651d9523d1042f3eac05971829f48a0eb1096b819353ac8da24eaa5943291c0
+DIST genpatches-4.14-252.experimental.tar.xz 5708 BLAKE2B 043405bad8b16d8b7af5395feeb4d0d949b2ade3b0dbfa56dfb923f3136b0a69215ba4e2d5582774f2d2f76df7ed7f4a45998a8a3ffe40e314d1219dd7c8751a SHA512 4f9b40eb844ff7366f285896ebea813c5b61e845c332c3b120f67cb7b2a58d40d45f9273a1471d9d526a719fdee3250253eeb6a1044574f31487ddeea08d5432
+DIST genpatches-4.14-252.extras.tar.xz 3360 BLAKE2B 2b84799e33312813d452ae376ab2be00e2cb8b5f4eff40738e09490f47e624c347840b11e7e2ccf39463b33384531ad911353819da0a50416c60c3dd054012c0 SHA512 fae47de576fdbf9811259998c2a26387debb87dd19f15133b366f32d1cfb4a2c41da32c1d9c03738e9f173018a1e50915a25d190f2d0bff2164337381674351b
 DIST genpatches-4.19-197.base.tar.xz 4827304 BLAKE2B e6f711dab44d013bd46a969279502cfece6a360773ce8e943e7de07b0208373ca1cf0658844a344d4c5f7c7bc664cc04934224725e7ceec87d572aa0af3bf4d9 SHA512 3d4c02f0af8cba6cd0a86fd9576c64123c67d703987798c1b4f7d4983ef628092a7878a9c146dc801d06efece5171f9305c9738f804c4f71bae00477d830b851
 DIST genpatches-4.19-197.experimental.tar.xz 5472 BLAKE2B 36c7e3fc57f08147e49ad15a13ee336ed7d46ab4d14320955ee16d4e96b3c74214b99d32c6e35204f397984f7dd57ddca51c3197567efb0a08ce77aaa8177010 SHA512 087f40ea713591dc1275da5ce5cb94a4bf6163594057c3cf9359893d146ddd14728816552ea9f22e189148bd39cd35ac647cd7c1beaec6534d061bbdddfeb53f
 DIST genpatches-4.19-197.extras.tar.xz 3320 BLAKE2B 37274f82572529441a009299cfc332ffddc76e4bd34c07e8fa10849df4218d21cf4f852179d7b58acc162ef32ad823f5770a1027f4cce9ca797e65958ae80f8c SHA512 b4207a2d10a778c9c722decc23b7aa96aac22678bbe67a838afddaa5fee669539f721f92bb1eff95475f8f056ab70380d957cb8b9ca3ea2767893c3220074b56
@@ -13,18 +16,27 @@ DIST genpatches-4.19-198.extras.tar.xz 3316 BLAKE2B 9cd995848fbb08c7f9420374e628
 DIST genpatches-4.19-199.base.tar.xz 4857860 BLAKE2B 201f1786e2b4c3abc629f86c78694723dc674f0153f937f8abf2c324057c937e23ac20057b97452b18efd115043a0653d3e5489df834498013eeed6c9389e626 SHA512 105b6e0d41c6b33b1782e18cb279703851afe14f2a7247181699b486d09951c6402dde109b67391446170f1712832c69f8135086450f0ca55ad05d825c46aea2
 DIST genpatches-4.19-199.experimental.tar.xz 5468 BLAKE2B 9f23a33125a731501d5c5bc68703cee90072dfbaf361588936948a6e4c4c82c3c92eda125413ff0753b6e24611cb171180a4c720e5ecc6fa8aaba5377ba9d3bb SHA512 07e2311027a123ff318167810833665932643bc2c1efab78249d9da56974fbe31c03c5b3ac0a1b28f99cd9e9adb409844840ebb1d2b371ff6c4e9f5c58a5e1d1
 DIST genpatches-4.19-199.extras.tar.xz 3316 BLAKE2B 7eadb480369c72ca4d72570cf5d8bfccd6eab677cfbc2fbfc512a7eef133f706d3f4ef55f35a04685bc3170d6bd8767130ded4c65dd97daa3e4a13ead569f7ac SHA512 7fd66ae5065fe30a2efa2929963f2020dc6d10be77e82915be7a225ae69d33878f6e2b7b30e1fbb3cae790f752c345ad3e3d76a957ee6edb300236af53f75c69
+DIST genpatches-4.19-200.base.tar.xz 4863724 BLAKE2B ec158dc8ce7246e5d519b03b4985ab95bba8b08adf98f286036fe24cdbd95e31a4cb2414c1ad9c862f25057eb95cd5345a3715bd687b0cbdad84cb9867c720be SHA512 9aa58b7056bda6a41c42b7e87ee580e6c8402fda9508015e6fe7f96ce735dc12170d06ab6be3d79a99328770cdc125d38f9c5aa2cf775d20f991365925999ee3
+DIST genpatches-4.19-200.experimental.tar.xz 5472 BLAKE2B 47f402a7c3b1949b1fdce0fdae1b0c24518f9cdcd420a05032c7606d8636ec60585b265d31e2e42944f32a6fdd1dd06bb96cc8d7d5274d15fe551ba713693a46 SHA512 a383975fff90262fb86dc34226bb54e04e3bfb8de4950dd4248bda216e91c139fabc74dc78c49177cdbb08824e5177e55bae807e7e4bd3bf2af5f9f8b02b8928
+DIST genpatches-4.19-200.extras.tar.xz 3336 BLAKE2B 9cc034de5a8ea0c8e8461e1e97f72b2a0c3dc9aeffc0ba700c96f865a01ea93d051fe8c757a611e3df55246bac6cff0451ba8047f636f0c59eb7513ef3e863d4 SHA512 574d417961d8efb8a93a1abf5aaf617b34452864292aa2011ce11a63c5a97d4eb21e1988c8bbffd821e1aa0d893188ec6e48dc1a7bb8a5478ffdd990a6818fb7
 DIST genpatches-4.4-278.base.tar.xz 4220100 BLAKE2B 29b976c1d04a2303c9af683ca73ddeb5c7ed0a5b2c9dd01dfbfb8a91ef7747846a7db390721e3b31ce16df6ffb4a73f8c881cf8a1018124052638cddf945040b SHA512 c7f645028bcf397c8c6a4eeb6fa133e5cdd88c2ecf765796e3042848988dd7228ded865860b05c5a1b591e8ceb44e8569a3f38f74ad26e9c63182bc1b8a0de55
 DIST genpatches-4.4-278.experimental.tar.xz 83276 BLAKE2B 326de10594ddc544219d09778f9a50b4c8e80e29c74f1f67d6d591cfc87bf1b507941edf9efb01ae32eb296810b2c6a2268754c8bf133a59b30e3ca613ece860 SHA512 41dfda8d0425c9482c888298a0ede667826645977339e8991c134747ff081b5df67a2ac543ee4412c39961767b60846b7f6b8b3eca83ea8c243cd5a1ce383d86
 DIST genpatches-4.4-278.extras.tar.xz 1788 BLAKE2B 2068810485c3e86622d1131b8695518ff56534f6af5095df48a357716ee095453f406d06543617eff8feac06d4e227fc3710b230181fdcfe8ab8d4ce4b9173a8 SHA512 5e89f24ac7e6a45d682463d9c2526334f9b619f092e340cabdf5a24612bc5ad21c6e3b8760e57e43a82a527dec05b3f0ae6663e4a7bde809a5a020194d9d8200
 DIST genpatches-4.4-279.base.tar.xz 4231600 BLAKE2B 00665e462bc8f1433dee9175b1d9cd5f70fbc2399eb29b653c1ccb2f2ba62bb60a74aa1f37ee252dd16f674f5f62b2b43169a55680927917c5a5fd61d70ab0cf SHA512 87b686b34d672f654d935182d3fa3be5625adfcc218be447308452ba048af411b9777c6914cc6d2bd55bfd27942dae52aceba876791cf1077cba932586010dd2
 DIST genpatches-4.4-279.experimental.tar.xz 83284 BLAKE2B a7dce62b928ca1c6b9fb175e08a39980be2da3cc46e08ea61c503a2b885a5da183b5acda9495d2ec37e61377771c4909fa6d154619d45f1c78d06c1d2699d20f SHA512 96ce30ab41e5b6f40c4fb2bd07b05783df41cde039bdcf903484f0f147d70757d9a22e1753398d6f4951d2478f079f97cd95b5d17fa873898b63886f42ee0c93
 DIST genpatches-4.4-279.extras.tar.xz 1788 BLAKE2B 56d243fbc74757b0477691a8ffef97cd71318a4746e15a653f65a4966827acd1c71a0b488e67c29533ebbf5f5a792c869000956136060660763566847ff8a111 SHA512 52b2638c8d3dce7493d52bd9dc01c2c208d92be7aec81c0720efa427ebfc80caca6123e23b3e400f188402e92d02a316fe52082240c27e547425151195e75449
+DIST genpatches-4.4-280.base.tar.xz 4240040 BLAKE2B 90c57278098d1320b54d7c0bd752af9d711be24375e6324092205a258e22959520d93a54447de537ce440f7e2e3886f80e29a648aff831d803b1bb0a7c978525 SHA512 3446d967bae0ce56e2b4c056fd129d67245f4738e30184443ec7473ef2939e36881e7309bfaf6ac895ebb43e665eaf9bf1e9ee46fbeaae68d92b271b87093488
+DIST genpatches-4.4-280.experimental.tar.xz 83284 BLAKE2B 340b4eff64dc4016f8fa03c2785e923574d71dd4f4b09ce4b088e059c4356f778fbfd0c71803ce675ff28b2368d3f1d546506afe5c666f74e7de3be14129f7c6 SHA512 5d2491591111b1e1025fc6d4012c63c7372c173eef8f2d78ed6ceb245783de10776795021dd880447a5630e5b824d8499fe605827d0a98a9c8cf4637c1ee9f5a
+DIST genpatches-4.4-280.extras.tar.xz 1804 BLAKE2B 36e5d8442341de9d6e277fc68431893ff920f17ca57ede29544cafa6af16c0322fc037f7a292a00945d805d18d73c8408c2ff9d6520b8922cc7fe38e18f01999 SHA512 89c060ae70863d464d8a3793716b922e59c66e672d1ac7e24e630f556eeb63f71c63c73a3165d848d464b5dd5b07e2539521febb0712452eaa34ce2be2731687
 DIST genpatches-4.9-280.base.tar.xz 4768964 BLAKE2B c35dfd4d2582b6d915306927920954b8d98b066c52b46fd72a4028f3450e1c4dcf475028c9ddbedf49cab0babc1425f1f60970866698826d018ce4d40ad37f50 SHA512 8140cd9eb97a1a92bd8a7e02668f5317658ade0d13d7348c77eb19eb02cbf115c8ac6033f4606ff581be8f580b606c62100686c83df5381a8dd7c66c6a8d6f5b
 DIST genpatches-4.9-280.experimental.tar.xz 106396 BLAKE2B 093294344dccb1608fdfd6bbad0facc436b3948a832ff9f607c759559e3c59d02fd9b4d94b09fc3def40ee0cde12e773c911e356ba3ffdf10d5bd0132490cddb SHA512 761b109895cba5ddb0103bc902a6422d048c39b4dc3b194e6c65cefe39b707a1cb61a690dabf416baed0ef4b812acb312225381537ed997e3533e00668305b6f
 DIST genpatches-4.9-280.extras.tar.xz 3340 BLAKE2B cd0fdd227d9188dc7e61f5a2793602168b6b3b1a3427a028429cd48cd161c61e73d4b884bbd555b2d08a79478c178a6dd089a4398b2d4c4352bb6c365996d248 SHA512 d95fc7133e2dd8dfd7265173b3a6e1d90ea671b55d396396a437bad2f88142f514f1d79a61faceee25c556bcdbf2d42820d60b4b94d89a61680b4b8e519dbbe7
 DIST genpatches-4.9-281.base.tar.xz 4781732 BLAKE2B 4813bd12b2b38ca92da2cea6a8bb375d69ae6b3a40af1de138fb90bb0def686ff4444343d21fdb68dd6f2e46bffe9901d53f734e473af5aeb4e18332134820cd SHA512 859d27e5334c9c5d07864618dba17cd722cd142769d79e5cd323f57e710b07699529d79ad875ff004e6e849a7f2bd2be7eb1300c89ba2f2383809ea628168ce8
 DIST genpatches-4.9-281.experimental.tar.xz 106376 BLAKE2B b9c6e6fd5598d45680d0c6378edec3cf1795c2bcf3c67ff63acdcafa6edfe72f48ede31786cd562455f60dcdee95a0b6bbb1688cbe599bfdcb974ef7843c635e SHA512 91c2c0cba1e1262c6c676df57b42543f0e2322958ed186a51823fd04435392cca6d8172015c3871c2f991287e33273ebd1193be86e3ee1efdb7f67b8d4983799
 DIST genpatches-4.9-281.extras.tar.xz 3340 BLAKE2B f507788f7c94ae0351b4c4f21b0b23da62210586e501dd891bb603cc2c6ed58cc1707d20fa391a62345ee7b80a635a84551d5c5c66c35fedca443554714b8772 SHA512 7a3dbb96988d43265daf82ab7a2d26c35a8a3fe8b6f9eb3222f36b30c9924acd352a0a06092f592ebd19eccda31b2a2bd2aef95536894d27efa9eb7fd985b1e5
+DIST genpatches-4.9-282.base.tar.xz 4790884 BLAKE2B b868d0bcb0cfa2be89467c37acedcce14efda071a170d9f409e6481c4d1218fa5ca090b4cc2b3ae6491814d8c19852e38d1dd834b22c42aad6db0832fb20a21b SHA512 fb8340a9dffe8166e20acda37ac4ee5dee1aa6152081bf83d243bc864ba37f55ba8dd2fccf59e73267b90a76314c50808db45cf72f702f3cfcdad4a4992526a6
+DIST genpatches-4.9-282.experimental.tar.xz 106364 BLAKE2B 513b5009f636fc923b6160e407ed76db3750dc5c4a9480b71aecbba07d5159cb0816ed30d752849476361156e1996ce34a581065a50763b545372b6275976ddb SHA512 5dfd955f66dbe836cf09886620cf82f1a23ac58af213aa7e9d292a5efb20b748d25bb7db7ce43930a1104ed2320895e66913963ed3d47b78286a9858b4f4e16c
+DIST genpatches-4.9-282.extras.tar.xz 3360 BLAKE2B e789efa9cb7ed00715828b720228b931108cd3f39ffc0c4125270e9526a068c8afa7f5abf2278b480d242603ecdd5b54a0f1d90ca232ed9b04b1275a157ecb2a SHA512 7d87b7daead6fc4b2ec2d776fb63b0be14cdcbb18324c307ba7d0e87827b178f205b17f0577680d0b4de6fe3cecd63d1b43b33a51cab800c2801c3c759dc7752
 DIST genpatches-5.10-58.base.tar.xz 1910208 BLAKE2B 3f385e4cae808101f092a1ebf72dc9cf1bcc94ed8bdca8a4772afd0c32cb1424f96fee2e59ab7605b588e64d162e46aae2918b7916bded019f97f637292853ee SHA512 be328dd7212c5a0e009ba95d45c716912d96743f3ae5e2e5e1daabc252f1e151043abe21f61ef90fc4f23d4e164b6ebe2d289abfc1470daf1a33a1564dbe7b06
 DIST genpatches-5.10-58.experimental.tar.xz 16888 BLAKE2B 612c0ebb760571891d4a05cff1f63396457a7da98d29698a87954da7c12dacd79e635072254fa7016b99012c65543ec7cc7670239c12520e29d48428738b019c SHA512 0dfe7846a5cb99ad0fcd01bb8a772401dc93e3ed91387cade18daed2ca884fbc484598dd27d5b1b07bea934c73049342457fdc6051946e68c08d5a045764b307
 DIST genpatches-5.10-58.extras.tar.xz 3420 BLAKE2B 81c42396369ce4e26d2a1574067d251b9013bd012f052e3e35ecaa1953e3d81cb9e398eb9521d191a4197ad2a81780d49059fd7abb9774e886d6d10b6b6831d3 SHA512 79afef40259c8ab2cfa957bdb56666e9ff691ff68362ad95482129e7037fc0659185923ec87ac97d217f5d2956e2be7189077ddf38844fa6c7ced4f0f6f58870
@@ -37,9 +49,15 @@ DIST genpatches-5.10-60.extras.tar.xz 3420 BLAKE2B 57d4b7bd7fe2cbce448384754e98b
 DIST genpatches-5.10-61.base.tar.xz 1978152 BLAKE2B 2943d58ccae232d4111f33e76f8c41234c013eed3d196f12a85d317251549225b7062609876cfb57c0b27a3328aed93ea68508050e9aebec14cdc7c6cb1cc898 SHA512 d1065304d3b0d7d5c9855252f25c4c34328f3f7e97e87e8f9cc12449451501660b279d16e1bd83ade943f42fcd97e5c4d569eabb097a77f7ca837238d6d2e093
 DIST genpatches-5.10-61.experimental.tar.xz 16872 BLAKE2B 371e5096439f2517511fd0680b79ff1cb7f4f9a7c70eb17878f2fc662e5d634860da3dd138fa1d09dcedfd1b6e42687c6ac964b447d6c0dc779e0fcdfebcba03 SHA512 a054bc8e0f360c580c501868c176a72037cb57041accceff10a2074abe1db63ec0492ed7cfad8f27c78bee65d8592f9164a3d232e47abdcdb724dffb0a7e5e54
 DIST genpatches-5.10-61.extras.tar.xz 3416 BLAKE2B 41bfb877b640ce1a8d5b01226b77db8dd9aea03926139bd9fd4055f86fd9844ebcfe2a21ade837fb860f0f5007a3c1cb27b2147fafe79ae1ea003592a33b887d SHA512 36b16758d14c47dc94d8a00b3416182262f270f04f3ec652e89ce492dfc6694eaf0d4c214a9d57778afd0ab803c72348edb5848e362ba807f2912f7c4d51d66e
+DIST genpatches-5.10-62.base.tar.xz 1996836 BLAKE2B 071dcd4cd4ae685c020e460a5858891f895f5a135b53c94cba0f03476698f4270e1461a8caf93f5f0cc5eda42f4df8194f463caf63b4fab354daec95811b09e0 SHA512 e37dc31fd2b129b7f45f663394eed3d386f50710b41291d687fc000120ea21e92351629c7144f48f27f9f7edd261803c67ec0bdb0925075fd5880a1b10314b68
+DIST genpatches-5.10-62.experimental.tar.xz 16872 BLAKE2B c6fe8b898e49ac50046b4f6ba66ffc2c225976fe6d78876f5daf5c313c392df665cfa783149c0ce57b0c036eaa5c0922f7c1e4cd37b0906c1f8f2a399aff5223 SHA512 c5fde3b00d0650023f38b7e09ad14c7dd22b02ae05197aa67c0dc8a9e9ea999662ef13ae024ccc7a5fc0b683ffe0fe4c1c0fbdb8a573ffb57c9592e1d1803ba0
+DIST genpatches-5.10-62.extras.tar.xz 3436 BLAKE2B 625104ad203699aa2083281ab4e1a9e0565cf3418dcee8af30632570f90554e97f63d70a89f3de43f0869857fc47cfcd6ee91083b398dd241171c6389e647d01 SHA512 013772cd15a03dd9bf193a8d45330cca268ba45e604be4670edbd1489ee2435aed0670fa40de33b63a37d8c802bb3ffc7e8442185023170d2ccfe79f4ed7a38e
 DIST genpatches-5.12-22.base.tar.xz 1085632 BLAKE2B 328a25218394a93755d29335f0a827faaad2fc823bb25bf8ef36385eaf8b30427c4075bc0074969fe0923a975d88d7573fda0b8e1288e787f03afc6cc77d25ac SHA512 08a71f09955c92bd92f4c67a018349a9b1d7ac5e1dad7efa3f1cdd2968a4c82042308613069e5bb65a0c38f19d05db5a0ff25d17726809cf12ba018fff5bf564
 DIST genpatches-5.12-22.experimental.tar.xz 70168 BLAKE2B ad642f4dd65ab934f7ad5de9e30bd9aff1a52da5d32e958e753c73b19e8d9a7987a0181e5048c9e47675bcea2a1bd4df1e71f900eea976fd484560fabf332dcf SHA512 1169012901b5e5363242398fd3b6fbbef3db0d62df9d3c24e4e4336a6de917abb58f7d4be4c2ed064d697b6121d4833bbcefacdf2e3babb411960da5f4c46b5f
 DIST genpatches-5.12-22.extras.tar.xz 3420 BLAKE2B 61d7d8bf8c88a1f0ee16efd07dca0fcb82a48574dcf545421e5e8302128acd5e28fbcadc4d1a82f0b2049491988691e3f8b85c99d50ec1c81a4a4549c96b9651 SHA512 20a505a8247ba33f8c0c201b809b22073ec589f4d83b1089c6787afbe42760443a964fd12fbe2dc6ec778c6d3067db04d93ec098551ff9ed6e5030d5830fce9e
+DIST genpatches-5.13-10.base.tar.xz 573992 BLAKE2B f3de7462b97e0a2bcd38edd0cd7972b3da8f9d14b5874f7137bac5e6193c046b7405b9ce4e3d74c6f72af3a83e731ebee65aa8884dd28124907090c489d04a93 SHA512 12707bcd389647dce3dd90ab0e0d3a604d250fa43f8634818363c6d3e7b260e392402fa8b5750e72e5e1e2937323a689c3d5ef48f5ec9a347d77eeccd2681cf3
+DIST genpatches-5.13-10.experimental.tar.xz 67624 BLAKE2B de538d32d5b0382816df98c489dfd9b82b28be5c8b01dc766d6615ce2d67bbbeccf40754b80535034f213efa3c4046f24269aa4903e8e0b31ae0ff2ab7e4fc25 SHA512 618ae425cdba206b06dd00cf44d0f467d474c8ca0e60c7b5b89c4dc1060f245f97766539b075c7cb9ec9ee7a331530d6fd035f46e9995df83673dcadaeb5774e
+DIST genpatches-5.13-10.extras.tar.xz 3436 BLAKE2B 325894702295cd2684027d2512a4f480fd021ea1e7c3af5f87d573ab2828283e371178a0d3d84d42409dfd079f8b77d36deb7360e1bc153b803af18c5303ae45 SHA512 49a8aeeca93b88d727e305c18cde5de517863ffb76ac6c80263697c416509d84dded656b5c2c6625986baa9440081fecaacad22bf9b38fc5c3268c4fc48625e5
 DIST genpatches-5.13-6.base.tar.xz 447968 BLAKE2B afcec75958e44f3ef7da0b2ab3e2a3d9574fbacac23d028335ce241838e36355d813fb89944ab4ed45153f5317997f18e153514f877bee6a490969b75242c043 SHA512 05afae24abbd06771ecc88b8bd93e765e7c41e9ea6826510d291cb8b10387be747ac7738e3df8cbef1d7488c96fd3fcba1138a7cbe9dc7348a76b5df51c95a74
 DIST genpatches-5.13-6.experimental.tar.xz 67640 BLAKE2B d5fc5275ca0668becdacdc7dacec2ca395967e33868de28c56a18d10764d1315bd0366d579a34fb9eb25471dc098f39f097e5e4f85b8cd5a8f3fa1d5708e715a SHA512 94db0f615c37c8059a7038071cc928ad1cd067cb21059ffd8398c490ae9a4966eed460a0242a906ffa099ad5f2d80b707da780b670641b00685296e9eb37bdcc
 DIST genpatches-5.13-6.extras.tar.xz 3420 BLAKE2B 9ad0d2bf1b2621b328d142cd464b6de2676c8a4f0caef8ee4c5d7fa60db56d73b9056917e07ca421b02e6de1564b3d5f900299721b6b412cb145efa9bea8d60c SHA512 a7906d25d02082217bec37c435b316880e1af9922018b88569cdb4cf8c2cf5fd789bdac946100f2b1a9e0e2125a69222fc853ab1496abdd30ca00497afcb8fd8
@@ -64,6 +82,9 @@ DIST genpatches-5.4-140.extras.tar.xz 1772 BLAKE2B e1e90362759de205856b26cb96bb1
 DIST genpatches-5.4-141.base.tar.xz 3803356 BLAKE2B 77cce01a65621f898f939d9f46936d28d1971d8184df8b90a07c9a0e268b2593de27374a340cb1e6f2002630b8501163e412b3b868adbc0007d7e9033fe7a8b4 SHA512 c2434cbf65b5468c62cc295fedca7e74493bde7126c26d1cf47e2725608d9f4dfc845ca18ce779991847cdb7092d34e7018ec91648fbe3c09ef999db35dbc68e
 DIST genpatches-5.4-141.experimental.tar.xz 16912 BLAKE2B 3fc41eaa1bfe34e1140b92301ae90a8ea43b9bd5608fc4d50a4ad96ab1d1ec12b0d53749ebec3a7c21373fb811738a1baaa1f4a66a23dddeb365eb59e1263e78 SHA512 090446167e9a1106488f29783f9088ff3c1c8a95235a0c18b273dd215d892c3cad2797889453ed78f96fb4918aa145282fe0ffa5efb06cd78f4aed7f45b4611a
 DIST genpatches-5.4-141.extras.tar.xz 1772 BLAKE2B 647e100ffda7cb137748ab92bc5cc95e4262570cb14b5612d6f40f5c28f7c7d38b022c11c3416506e03a303555995f2e4fb4cf07d53e44bddfbc8094f4467d98 SHA512 4ff6aff1eca4607f01940253b8fdb563fe5dd52684439860a29a2f747ec531af1120652e128f1fe44ca9b36f3a9cf47aeeeb684a3aa313903eb9cbf396177fea
+DIST genpatches-5.4-142.base.tar.xz 3810892 BLAKE2B 66afbcd352ba038920281b3220f41278281c4626945e6c7f0949089a8dffa6b681c9cf926cc7ebd7e8588dc1f46c9facd8e907915cfeb4490274772d23fdd17c SHA512 8d2d6a4c856fc246a1cd6324f6802a1755b18e8b828b01ea244ea36dde4ff2a56c18283ef5b9b59f60b582aa26a6d8dfe55376f8c8d54f5aa3f204de60142c0b
+DIST genpatches-5.4-142.experimental.tar.xz 16916 BLAKE2B d997e05f553ba2d6ea92f23cc8b73658932414b85f0029f706410b895422df8dfaeedc46d0186b509b4b9b4ea27741193dfaeb3d12e7cf716e1e8c2034b33fd5 SHA512 4b96b5c9f07ce6349fdd1d0f0a8e8b4101acc069e422d2bde33589c6375cd7af45502fc000744f6fba14aad7d0e0272e1a1a7dc8fead0d525ab231cdba5c2204
+DIST genpatches-5.4-142.extras.tar.xz 1788 BLAKE2B a8bed6a689141fdeb3fbd857b0b753a4d317298205b0961c9bbedbf7064d55d05ad3ad437fe8d2e182898063f0fbbdd05ad32b52173bafb6e7e8155ebaf8e698 SHA512 e288e2047cbdde57a8d20297b6d669a107b2a0185f3351972f0df8921eaecd3f0971ad68cb7989f6a265a324c13095374cf90d01d26982e7a757e5fd0b2ebbe3
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
@@ -74,24 +95,31 @@ DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-sources-4.14.240.ebuild 730 BLAKE2B 8ae20f5740a13a0eab73e5d1c6c748f3eb39f21a852f2c82a28f10936d859c5de5604874b632e0ba79be4b0d3e7691a4bc450fb7398ff2665d7203ba09841b7e SHA512 3bab8a192e1a2d3efff596ba8c5d97169bf8e65df52a3c92255dac7a1d1563c05dc8e8c155f5b7e4fc1a26629bad29c37e0bef891473f49010bcf151c84d2192
 EBUILD gentoo-sources-4.14.241.ebuild 736 BLAKE2B 848b8ff4e951f5040875b2d35f5e2ce061528630b8ffed112ca91e0e1efcbf78395df4787bd2945a0c83fe0d55353c79c545bd3a18e71744f556188e396dcfe1 SHA512 1e90464611a9f388d5c9ef49ee671e6a5ff635dda62d6291445c246b5b7c4fa1de521ba0ef40f4283d7a56a035ed8733b72a75d67284ed5de94428b636260447
+EBUILD gentoo-sources-4.14.242.ebuild 736 BLAKE2B f09b760d45c87a7a03ade001d0c535d557aef356235541cb67d3d8b6b2db1c3b2bea4514a06f8c244222b313bcd44d29a00367833a5e16d5e9db85285a1e2710 SHA512 8e23b8105800e4754e540944ed20874f1620e9e603881082882c069b4b28d11f3957cf6db05ee06e7b1d13d6745ea4bb824a8db831b3a9d92fe75d2691f61918
 EBUILD gentoo-sources-4.19.198.ebuild 730 BLAKE2B eb4a1da4f6a8ccc42f5915db24aa5566740e75f65692f6073408ad5237c4b12591e9d553c85d80dfb0dd4bef8f4ed1ff74fd05fff8178f773e67a829d44e70e2 SHA512 a04c571b2db0a3a5b5d7ca27049011aad0f90232f089428001629a79c1a7c496f6f5222ff9cefa17b238f0baac820693b59005a2ddf8c549c3ce7a01affd5d6f
 EBUILD gentoo-sources-4.19.199.ebuild 736 BLAKE2B 94332acee8d2b30c8881dcaee1b221c37e01cbe315ed9294dc0d83f1804f45dedc1ccf58ed1cea509f3762a5d462e5a3a8f5668da92a6a15674b9b7f5f7dd1b2 SHA512 14d468e96fa8e8b70c3a726edae3ea0cc87eb2287a95e47f25abe99aa192d328f6b4813c89c5bd81fe504a80057ffd212d259bc2f052debb3d3cac5f8d74906c
 EBUILD gentoo-sources-4.19.200.ebuild 736 BLAKE2B 86c5489ea9db67746706a6449076ea4df61f2f5144b263a20fafa9d589115aca6ef891d51490a1598f00dacceed1da62b322dfdb56f746598c657334afb69b3e SHA512 52edba3e53f1301452dc5f4e4ea85b3083676d8ed1696682fd65d6cd452e2651f3430112ac752c8df41f210dbbd778eb2288446df400ac6e66a58d6730c4310b
+EBUILD gentoo-sources-4.19.201.ebuild 736 BLAKE2B 67d646a7b5ba2c8e3ae078819e19bb08bd554d1422d4b26071a1f31f3e211b948a952e9302459b774c24026aa10adc7092c6645e4be5f234a576003114c7197c SHA512 26415164f502cb31acee54ba1c65e5d5497fb94b2e80676a0a1ce571ed77bb308aefa584f950de9f4e21dd96ee8bfc8a46594a4794e5fe62bf58a737270bbbc5
 EBUILD gentoo-sources-4.4.276.ebuild 730 BLAKE2B 8c06c87da83c0d058b3a48f1653b1792a930556ae9f526d3b831e13c5c71eed74590bd635d119f84f6194b1f693a44aeef61efc683954c46b9624915d0f3a339 SHA512 2f6be2ba0b757464c8d2419bcd5703f01cae5835c9988274dee7a5f95908eeba7ed57cb8318f017695a513c05601fcbfeaf412b42c949046e24aa6c6b7927c2a
 EBUILD gentoo-sources-4.4.277.ebuild 736 BLAKE2B 241de1b96d94915dbc3c9089643b84fb57a7fd4551bc77c12a6c404885d55e72a90c5aa128e1f053f36f5621b421d4c244aec2b3261d6690ced88d5cf7c3e1d9 SHA512 3e1fcf3e57b3395c0ab089db8c811b726be4a88365df6b883bdf41dedde2d49e8a81e366aecd188f0398ed34f8a6579aba8b3ebd2852837d3da887fe4f031ff9
+EBUILD gentoo-sources-4.4.278.ebuild 736 BLAKE2B 0f9c0db54c65aa0d419e3ce20330c79ed1aa9fc8de60b3b318999afd361c4c6a4607ed3cb8a3d1e4134debebba471b22d42e5425b867982e5158011d8890424c SHA512 bf466130b52f0e82b8feed22a38923a80d946f9f1d9cf38919a657c4cc70cad1f44ffa09f5f481493dc78fef8aff9ffa4821b103a6062826e23b653f13c71ab5
 EBUILD gentoo-sources-4.9.276.ebuild 730 BLAKE2B 8a46b97e4c93477c65c065d1387882a202bad7f3e63e26be690122e2b3f4072c5d384a690888738d86d59d4049e5ea64a64caae3fb0dac17cca4585b8929c613 SHA512 e25cc8fd11b1d3369ab27fc91b9dd77cd4d2c6c060ee194ff1c2b802048e2f5a1936878f2263ad9f38161abac2f95a39498701bc80889a9fc41a4238a25a04d6
 EBUILD gentoo-sources-4.9.277.ebuild 736 BLAKE2B 2a9f0f83b44861ed77b34d4fc4669741de76786f9e2aed9d458cd8ebd7278169d07ba78374aaec027ada9da062a8dc5a01e03993250577e9fe0c7c2ff3241fe2 SHA512 7fea33a86a3a8ad1935844811db9bc1321e48d3ea12167a35c99ff4604c98b0ad7b86c324d55c37aaf3462d7dc735f5197428d5a726f7a85db483eafe8118150
+EBUILD gentoo-sources-4.9.278.ebuild 736 BLAKE2B 0e06d7587d537aa438c3d83056bd59d7d443bf01811a07671d79f49c17f25282ef492951760fa245cc28578ead18e0ccfd7508030c346e94f1c5c8c49f87b2a7 SHA512 d6877a41e72caef3f7fd245d29fb59da24534c1385684f1b9a6a2822012c6103e6dd1edb5367a13c0da706df7739d73adaad1be5ddab39d34057dbb06f148209
 EBUILD gentoo-sources-5.10.52.ebuild 735 BLAKE2B 8f23c05d24848eb773c073eaa34d1276ff4bb6ad64c40cd72210beb6dcff6b18dc93a26bccc38e363b0b97c680ed7322e7b34ee3bbd9883e0529c508029a8a47 SHA512 061223e3a3d795eb4480fdd39d5e8d75d9454b599afb1326cc0e51d0ca0544306bde81568467ab623681d7be06cb6d18ce6a2c9f940888590a18b548075f7d80
 EBUILD gentoo-sources-5.10.53.ebuild 742 BLAKE2B 37a337a076d192483c1db50771f5ea9fde3b6088803144a1f14f4497397baf8bf8c904285211f9142c9795f9ba3bbc16a46f1522e707ecd7772c22240597a98d SHA512 937a330a39db0fce6278178065616438299528e0d76716bfa6234204dfbd1e116c4d7fb4d29e110d0eceb970652f78fcf2a0b86b7a8eb24bda10c7c346fc41ff
 EBUILD gentoo-sources-5.10.54.ebuild 742 BLAKE2B cd24dbc473295c6c86aa26c36d30b28a6a777dff6200f0da626d0a4f5c1293469ecdbb95e5a63f3e0dc848816d38ebff620bc529e210849d6d6225fd55ff0a93 SHA512 dea936401fdd833b3cd5f362cc8054b6c722a47e23c8e34e7a8c2390bb927bdc5f808d928b384dbf8fc898e29da5f79d796b0cc2fa828c661a22d1ace2fd66c4
 EBUILD gentoo-sources-5.10.55.ebuild 742 BLAKE2B 2b77d80f36fef8ee9c1c1e88144a1b73d088c63f15dbb8d0b299fe445195987bc69ae50e0102a8489c22e718861ca4504b734470aac67bca22ca0f20e0603b82 SHA512 4b6ba2f3c8b02703535620ef5c4c3296a6b54db595e7dbb8e85d0612917b1a539aa39aad492186ffbc646c6204b60087c0f7f3fe243db3fd215109901c189e11
+EBUILD gentoo-sources-5.10.56.ebuild 742 BLAKE2B 9d36979786d1a932cc82e217dc7b6ecfd15e7dff08ab6308734c58a2519316682b587ff6f2bb631f9eb5b2285971b7d99996d49ef37ed6dde72f4ca9e6ec2141 SHA512 bf74f801977cd39ce37c4a62e47c118bf79bf41597276d7a792d17a176ef678471578787f0acab0228d77693238b059b52aa1041e077147a0666872f26306087
 EBUILD gentoo-sources-5.12.19.ebuild 742 BLAKE2B 9bee131b78a23937df942aa798c46becb32f986636724c0175343acd3edb2c9440aa7e5db5653e5c69257944f8160b74e6618992543ee81cd463973b09850ac5 SHA512 70f9dcb289d34a30caa8db6ae7677d2907e216f4f98c28c37c127f09fbb2782f93e0984ebb3672b2f90e89dd363a0804aa1e6e2cb55bcb77f6fe5ec267de03a5
 EBUILD gentoo-sources-5.13.4.ebuild 741 BLAKE2B f0487ca8d40583bcc4579008a474f44071dd6e5abd5135dacb19ef5b090dfff529443df2f9a9d05d02e725fa7701d70e77a4af659f37b17fad8625be213efb46 SHA512 dd24c1ded718b2790c55b49b79dced7279f08e7199adfd79bc7eccf158ac550e3a5e0fd546618d75451b4b959e226b9df9fd38b421437ceac38a907d6bdd3a16
 EBUILD gentoo-sources-5.13.5.ebuild 741 BLAKE2B bbe96fedb8e0b92042297f268a5696ddf692d8615911176bb5109d9bd363013fea30fa7f68995b2e0e3a25539cdefaaf8853638a5e22cebc9a849807e7fe09bb SHA512 0c01d57a1d008a8207626a11ccdfa8a93b7c8a02312ec94a40d37b8e8f7852de9f2cb4a0045a1aa407dcd55e0a71ad531c4f040b9974968dccb19fe215beec2b
 EBUILD gentoo-sources-5.13.6.ebuild 741 BLAKE2B 62862b47ee529bd550507836f5fef896fd76b89ab82de6e8f36036e8990df9e3e008de96e9f90477095ed0c0131e6d1b3cc6a483ba97b94b2ee5756483b62d8e SHA512 4326503ff06f38b82d126907bd960cedf72faaa203b0c40350e668555b614a595c30f2c74a018578a562aeb2caa0f5128fd9b86f6b311adfcb2ee654cb269d86
 EBUILD gentoo-sources-5.13.7.ebuild 741 BLAKE2B 78abb67fc8906fc433e5c50b7858a4799f8c61f8a0f37e6491f77feeff92bc04ce9e6b62320f49ddbba4d698d743fe44896a6d6fe3d538f74c6784b75a837420 SHA512 2eac1bb97c105fc89ddb1bb3feca2b65f3658315e30e97f204ca4fdc8f1505adb62a89ed1bf8e001d1141a924c60c9ae4a9bb9711bff182864e8fe992ff5bc24
+EBUILD gentoo-sources-5.13.8.ebuild 742 BLAKE2B 66538f28b863bb7383192a0922a38e36f046fdacaf8722328588eb1a57f5cbb5b4fc81e44e464175704c76b50c1f8a5957a1c2d4ff138ec32b2e31a3c4f7c9ed SHA512 d31877cc74dec7701fde8ffacb90262f2f281c510d5111788a6d76aacddb9592aa55e2959a4528d3b3d939830feb77f0e26489999cffeace8e87b621ab016e14
 EBUILD gentoo-sources-5.4.134.ebuild 729 BLAKE2B 0faaeb7dc582de55d17f6bebee8c474e7c3f08543826ea61c6f92fd280ff86cbdf46387afe115de73445c393d3922756cde6963fe99ffbed641e0c7ce29e3d28 SHA512 f58cddec29089ffbee4db5007863f89dc5a69610756047609fb2011a56b7f2b5458f7d6424dcae79198ac07015ae174291ea2197e60e8b4a2ec1d917698d0fcc
 EBUILD gentoo-sources-5.4.135.ebuild 736 BLAKE2B 9aee345695a1e40a82525b5728941ef551ff9021d0d94da0cb61c0cc14ff77d34ba376d9aa02140de648337624566f6c03bb93f390e92157aa0cdaa2df2ecdfb SHA512 73958e013fda30305a0dcfa92f15c60a6b9a86ca2a4613048e36fca1d1923bf12b9f4711ee9ecb548bb69a8845e6ebc70cfa5e348b39727e07843bfa4cc762cf
 EBUILD gentoo-sources-5.4.136.ebuild 736 BLAKE2B acba3dd2b842308d1e4df4e06ad9a1238c0a20da7e72de29871a2299be037307ef2835ee48a7dd5c7091e3eed21cc3cda917a8d089ed54595b06fbaa9cc89e3d SHA512 64a2cffdd35d0368c4bc244bb3987af8bf4627eb06a56f462bd029e6f1eeed381550e190547eac07d3bc820cfabd5de789e0661a0a57d2af52bb606639931f28
 EBUILD gentoo-sources-5.4.137.ebuild 736 BLAKE2B ade446b7b90328968c7d101976db783ba98f47b63032dfe4a6b0f0c4bd742a7c7a855b88d1484ed3cf642f77dba1be582051e89c42a50318ef40d8f8438ed4aa SHA512 71746fe02c27b3fb7b10c9a0b99da069fa5edd1f9e5098f3481e4658bd367aed09e06bfd01b0a5a28697d1756edfe9dc857bc60298e127fa7ff6209a1aea39b2
+EBUILD gentoo-sources-5.4.138.ebuild 736 BLAKE2B b8500a85f5a212708b56fd7f13ca9b6f932a08264dcffab1330cd69679e26340e069626953a440bcb2893acb8428cffc7460e8fc717d8b316d902fe0e4f6fe29 SHA512 beb32c2ab4b28de17723569bbf8c71848b1ffa4a002887986c2fde10d9046ccc6005c7285397a6a4e46ddfd1f0664b7182f96e9b22d1c3602d1e6cdf33aa0119
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.242.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.242.ebuild
new file mode 100644
index 000000000000..07720add9269
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.242.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="252"
+
+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.201.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.201.ebuild
new file mode 100644
index 000000000000..028fe9de9354
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.201.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="200"
+
+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.278.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.278.ebuild
new file mode 100644
index 000000000000..60c63c06a050
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.278.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="280"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.278.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.278.ebuild
new file mode 100644
index 000000000000..24be9e754359
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.278.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="282"
+
+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.56.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.56.ebuild
new file mode 100644
index 000000000000..fba7e5ed448f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.56.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="62"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.13.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.13.8.ebuild
new file mode 100644
index 000000000000..c4af02fcbf12
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.13.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="10"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.138.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.138.ebuild
new file mode 100644
index 000000000000..0592dd83e812
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.138.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="142"
+
+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 538d35131fbf..6817c380becd 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -2,7 +2,9 @@ DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27
 DIST patch-5.14-rc1.patch 68962675 BLAKE2B 0f5bc5de6167c3f2b884354a54dd9cbedc3d89508e9861ef7bebe181c650ab9dde4f604f8c5e77c27eef9c213345ac85d8c65e0c9a7f48cc918a2ad681fc3e59 SHA512 e68522063c08adf11c8cbdb86aa439347ed833be77cf189655e14df6e2e9c18479a69bfbcb8258411e896f32b15c53f8df04402f6ba0434179c3d37e0cabc5b9
 DIST patch-5.14-rc2.patch 69403130 BLAKE2B 56a55e40625fbdf9b9324ffbdae401bc9202cb63ea3d787960a93c0f72a10aeffcc7e2988f873ca916d434981e949c1ff2e1e09941d93ff119c5d9da295e3628 SHA512 5962339c1e84c2e760d76aca6c4d0f74fbc80bd997f55f85ad22745d5db43846ad86270862206684304a42e3b25d1c505df58da4e0f0460b82e7c7a12e97a70b
 DIST patch-5.14-rc3.patch 69715862 BLAKE2B bf826bfaf1968b2da2f074bb16ac82237c41d8b57e689545a88c64f125ece052e24557a82e00b37761ece2f440498cf0ffa848cfad4fae18380bd3fa0e637ac0 SHA512 56199a49b579f3511605a4a90dd8a2f5c9c904705bcd3036933e748864b4fe10cef5f084cf39227b959776df0e2509776f12c9d6d9f0c12947613ca2dba86b26
+DIST patch-5.14-rc4.patch 69955713 BLAKE2B b4e3051cbba62cf937072205c29116362578be25dec7d5b25d020ffb4e634855be2771c152a36b1d40249692aceed0e70edc25479aad1ac99399dbec878fd97b SHA512 0d62ef70193c4bcb2b13637878e5c6d163d59cdcf00ec1447fe356e86853735e460706aba783a1942de0f32dc5b3fc8d95a012ff6cdcb6ab0d398556a2aa3bf4
 EBUILD git-sources-5.14_rc1.ebuild 1172 BLAKE2B bff8ddc8315c78f97712397c0489677c2120d59d3d000db164657f066f32345d0812c6151f9d263240e82fb8be080839d2478cfac91da38af65cd8d5efc42f9d SHA512 ac380b11e0bc3f2eb77b670d8ab3f8daea4f7cd63e63f35ed6a4b2e64be285dcf7464db1485dd98ff3c3986054a1a45944f71b81567a3a7ac17876dc4314fde5
 EBUILD git-sources-5.14_rc2.ebuild 1172 BLAKE2B bff8ddc8315c78f97712397c0489677c2120d59d3d000db164657f066f32345d0812c6151f9d263240e82fb8be080839d2478cfac91da38af65cd8d5efc42f9d SHA512 ac380b11e0bc3f2eb77b670d8ab3f8daea4f7cd63e63f35ed6a4b2e64be285dcf7464db1485dd98ff3c3986054a1a45944f71b81567a3a7ac17876dc4314fde5
 EBUILD git-sources-5.14_rc3.ebuild 1172 BLAKE2B bff8ddc8315c78f97712397c0489677c2120d59d3d000db164657f066f32345d0812c6151f9d263240e82fb8be080839d2478cfac91da38af65cd8d5efc42f9d SHA512 ac380b11e0bc3f2eb77b670d8ab3f8daea4f7cd63e63f35ed6a4b2e64be285dcf7464db1485dd98ff3c3986054a1a45944f71b81567a3a7ac17876dc4314fde5
+EBUILD git-sources-5.14_rc4.ebuild 1172 BLAKE2B bff8ddc8315c78f97712397c0489677c2120d59d3d000db164657f066f32345d0812c6151f9d263240e82fb8be080839d2478cfac91da38af65cd8d5efc42f9d SHA512 ac380b11e0bc3f2eb77b670d8ab3f8daea4f7cd63e63f35ed6a4b2e64be285dcf7464db1485dd98ff3c3986054a1a45944f71b81567a3a7ac17876dc4314fde5
 MISC metadata.xml 464 BLAKE2B 37fa8f89a0431479faf733cd072c8d86fe27976913e47a9e09d6028e2eec20bd9b3093da14a2f01f00ff88ee6da012eb1dad96a9b3f5bc04f82157e9715c2645 SHA512 56e60b220ade75cd0b4175c43f01e8e31eb088c563327a25c0875493bbe28b5cef80fefb2b5394eb749c2eee43a1cbb632bdc79d48435e6a2f0fe609b13a2dfe
diff --git a/sys-kernel/git-sources/git-sources-5.14_rc4.ebuild b/sys-kernel/git-sources/git-sources-5.14_rc4.ebuild
new file mode 100644
index 000000000000..d43c5c0ce00d
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.14_rc4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.13"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 2fa5b4aeae8a..4b25e5653839 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -3,10 +3,12 @@ DIST linux-firmware-20210208.tar.xz 146701492 BLAKE2B 49d39e9a6cf1ee1afc41c6317e
 DIST linux-firmware-20210315.tar.xz 151454796 BLAKE2B aef09bf2043117c821c5e1460d02d50131e46c2c4257dd3816813089881791b876670990d774dc3e43060785f7303ef509cdec45b64f300ee1acba769bfdc5d1 SHA512 499f0cd746f700ac95f8ca9947d1fb402f3bc53dd5302101ce94f0510ee013b5fa3b8cb6316ace93e3bb2df0a25fb53eb8099acc45c9bec051aa92986e9d188f
 DIST linux-firmware-20210518.tar.gz 328396097 BLAKE2B 7e7b2a41a8906e9bf6147a6ca4dc9cd57db66e98cf10fe4edf8ab56905bf6ad5eca88c479cad5e585b55cad765f051e6b96c0f827c2fa85ba78706b48ba9e047 SHA512 64c81d97aafa43fd438a29258ffcd812497bbd1b22c40b1e352ffea5a40c3c61b5f5a9788d76508c7010209a82ae3938ac6e28ff7f4dffc1582f6e5f8b8c00da
 DIST linux-firmware-20210629.tar.gz 333073746 BLAKE2B 89a0448dc471ff0c3edfa37b2a34bbe9f52d7c7e1fe416bea1121bd0248614e28672ef26b78dc7570cd6b949b9b8628492e9ee023eefd4fa49c7206146cc8e8a SHA512 1bc206ea691e3a17994150e3827251d539f1e77f44afc452f45129455f1c9d0c3563add95ffa5306c5c49b6dcff031c293e755e08a0329a2b094de786d8330b8
+DIST linux-firmware-20210716.tar.gz 333073746 BLAKE2B 89a0448dc471ff0c3edfa37b2a34bbe9f52d7c7e1fe416bea1121bd0248614e28672ef26b78dc7570cd6b949b9b8628492e9ee023eefd4fa49c7206146cc8e8a SHA512 1bc206ea691e3a17994150e3827251d539f1e77f44afc452f45129455f1c9d0c3563add95ffa5306c5c49b6dcff031c293e755e08a0329a2b094de786d8330b8
 EBUILD linux-firmware-20201218.ebuild 9780 BLAKE2B 821911ea247388fc31e2dbbde9f4efb9b80a698faf0c14a0c0a64edc191b5a86661fec73011fe43b0d10985a60d5e29a62571ee916162d52b39d05eb3bfc2531 SHA512 3c555e33a91e9c0bbf8d4067a10b40f17e75a9d25618d487e754f1c1c3e5deb1c01b697fb3167eb021311b1b1f2eb507e7e0398c57f173080c0841dd87529ae2
 EBUILD linux-firmware-20210208.ebuild 9780 BLAKE2B 821911ea247388fc31e2dbbde9f4efb9b80a698faf0c14a0c0a64edc191b5a86661fec73011fe43b0d10985a60d5e29a62571ee916162d52b39d05eb3bfc2531 SHA512 3c555e33a91e9c0bbf8d4067a10b40f17e75a9d25618d487e754f1c1c3e5deb1c01b697fb3167eb021311b1b1f2eb507e7e0398c57f173080c0841dd87529ae2
 EBUILD linux-firmware-20210315.ebuild 9787 BLAKE2B f8ae0d7b9818c54efb26eb1274cb0fc53e420ce0c0ac495b30602219dad7bcc97bd422da1809c14b027590acef80503ccc07700c7baff5c5edd722a73943a8eb SHA512 4f7a9d6f3c7deb53ede632f607b63535e223e430ff3d9cdcaa83cc324dc97acad9befc8aaac9f454a7f240bfa11bbbf55c5c6dd24f28f70a2a2c478bfc4a632d
 EBUILD linux-firmware-20210518.ebuild 9859 BLAKE2B 4dd630f2c6987fdffb23b2742a85bc71a74046bcd73a9410589bc002ac0e7d733c45bae8fde3f804db07655b40cfbbba4b74ca76dc280316e7882b5beac4afa3 SHA512 e442dae707d62e30345f96bcdd442e02aaae68575e07065e1a66187a41366a995f91c3777bf96a6587e0fe9f976a888149b2ccbbe20e44b6fded052b36327689
 EBUILD linux-firmware-20210629.ebuild 9859 BLAKE2B fcac472eaf3ac19e331dae13553c06fda8b2f7e7634d2b5256134a2e51546d3fd67c95abbe61967f4abf763bd2ceac3f55d6f35ca4fb0283d1596e762bbc71fe SHA512 e0fb56608283700200143ba191d9cf01051bb8c8496f9ecbca18c828e483aa30a38836619b4f1111ac59ec14777e28f34d49e2c3c74c3d968159c5e73ba681a6
+EBUILD linux-firmware-20210716.ebuild 9859 BLAKE2B fcac472eaf3ac19e331dae13553c06fda8b2f7e7634d2b5256134a2e51546d3fd67c95abbe61967f4abf763bd2ceac3f55d6f35ca4fb0283d1596e762bbc71fe SHA512 e0fb56608283700200143ba191d9cf01051bb8c8496f9ecbca18c828e483aa30a38836619b4f1111ac59ec14777e28f34d49e2c3c74c3d968159c5e73ba681a6
 EBUILD linux-firmware-99999999.ebuild 9787 BLAKE2B f8ae0d7b9818c54efb26eb1274cb0fc53e420ce0c0ac495b30602219dad7bcc97bd422da1809c14b027590acef80503ccc07700c7baff5c5edd722a73943a8eb SHA512 4f7a9d6f3c7deb53ede632f607b63535e223e430ff3d9cdcaa83cc324dc97acad9befc8aaac9f454a7f240bfa11bbbf55c5c6dd24f28f70a2a2c478bfc4a632d
 MISC metadata.xml 867 BLAKE2B db510434e654367fb0ae439b1a3ca3fc170f558022f07634a534ea982f2445ff656fa618b9dac5ebb6ac2f64d9ee93dcc59525c1f3d429eda4ebce05a678298c SHA512 5429e7424fac663e3448e80dad98365239b855f09522fe7ea3cd2c731bec37fee29209cc8ead46e73ea03cd85a3e9c8fafe18ddf4a35e5bb55513d63ad5ae7ff
diff --git a/sys-kernel/linux-firmware/linux-firmware-20210716.ebuild b/sys-kernel/linux-firmware/linux-firmware-20210716.ebuild
new file mode 100644
index 000000000000..2c752eda8e1b
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20210716.ebuild
@@ -0,0 +1,354 @@
+# 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="d79c26779d459063b8052b7fe0a48bce4e08d0d9"
+
+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"
+		S="${WORKDIR}/${MY_COMMIT}"
+	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 ~riscv ~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="binchecks 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/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 3a6915bf727f..58c70251702b 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -25,6 +25,8 @@ DIST linux-5.10.54.tar.sign 991 BLAKE2B 23c4fd74b10cf6f346061ebb5bf212c199eb6eba
 DIST linux-5.10.54.tar.xz 116390580 BLAKE2B ead7156c56e59aade8c71d2065c1dabeacf04016cb8a7b48cf711efa2038e03bf581ce3e2a40ac6c56a241e7f2fb41cb27c9484003fd85ff0de0a6849aff7a68 SHA512 a46ca0d12baf81f5f0f2d1cae89747beb844f8f1cb5875bc5f44317ea4314eb833bd24464429605aff55bc2dd39bac24df89768a5a804fd71965ff386995db34
 DIST linux-5.10.55.tar.sign 991 BLAKE2B 74f6f4ad107ccde36a4b5537ed400563d1047f58717ed5f10b2f512849dd0bb6c401453204dfaee41b400b1429632b7e362eece46fb62848850836ce87d027b0 SHA512 53a8a737ae6abc46a38e0ab2dd30008e2cdcf0bca12e4efe878e9b82437a3c6c5ad116bf075092ed5729d25b30300db57949315247d320a85703f01fedbf1fa4
 DIST linux-5.10.55.tar.xz 116402012 BLAKE2B d4d981cf2305a6a91ce14ff676b4153fdd42d67e1ad06234ed71243b71955fa18a972de2b0a50fd1dad1c78e72cc58c8122b2377c61d35d1920480f41ffbcd7a SHA512 53b80d1027c6df6a4f13237a21a3ea69bfe51ba12dd4bf4e984da29150e457fea6fdc493542e4b86a04a9ba1481ae0db866bd883767f7107c323b41fb9fe022c
+DIST linux-5.10.56.tar.sign 991 BLAKE2B acb71b35826aeef78a977306ff3d4c8db81d5d4839c0f497d5f836199ebf2735bff699fe0d27b9e189e8694ecaf338391004d5fe69ecff07857ea3ddc3c27e34 SHA512 512558b5848ec1b05eba47c61020bf08fd7968c83067a00edf45be64cbe71b8a92dc7c57cb5e142b72a2d49659adffcffafedd4f86ffdebf5ecac804847dca4d
+DIST linux-5.10.56.tar.xz 116391116 BLAKE2B 026ed9e08e0dfba2551e249880c2ab0490d2aadb068997cfba6e1a5b7b610567db9f76c3cd8d6bcba3c18511c70037812e305f3ed6503a101776b653dd284d3a SHA512 61438e9354074b47e0aa834ab277e9947c8b7353761e0ee9dfe2f2e4ecd3e8c406e7efbe4db5cc3d8e234e95a52a83f6009b7f0ae7710dc33c9afd9e78471e9e
 DIST linux-5.12.19.tar.sign 991 BLAKE2B 881e8f5df1f9503e7ba58b84351b2e4f0e90b63df2b14577bc65cca76f72c6a97f8ba2bef87c46a9d88a714bcf010f7b706c1bf57a68896390126c5902710a1f SHA512 fafe83c82fb1c7f67bcf8402fe4eb3363087324c7ab11ff15892021737685d945fc2ccefa78088f2645570bd763a6d7d846d7c1ff4f998d9af92f5f3e35cba48
 DIST linux-5.12.19.tar.xz 118204168 BLAKE2B 88e4c32cf196662a6a24e72b978019d6f8881a8523918029f4229a995c5fd957a5e01f42de9f53c7980df7e3de5ea6b069cc2c5f93852e615fe8fe78a1b131c6 SHA512 2d010d6d75052083300b1a629dbec25a39f6314a1871ed355133bb59946453915a2265f4ba26e60119ee0d05abb9859c5ee7d8fb8dd816c476ebfdb76d3399ef
 DIST linux-5.13.4.tar.sign 989 BLAKE2B 06c680880006ddca64c4b22e8d853e1b72727a3ca245667ba43d47058089954091a2d49c4b5e02506e34d72a1c3802201291701562dcf91b389c95c70c0a9408 SHA512 e19fb694f7749ad28a401c8f134866028e5b851b95325e81d3f1e4ef15a256b5aead1557f37644118dbb9528d401ca216ae2e2bfdfb4eeda3d46c826e7cbadfc
@@ -35,6 +37,8 @@ DIST linux-5.13.6.tar.sign 989 BLAKE2B c559917c2901e237de4e7fb2dbc66b4af9bfa0ab4
 DIST linux-5.13.6.tar.xz 119331048 BLAKE2B 2ef4e2a144714a188c67bb8262cacff7d81d6eede02f1289c102312570b41dbf51653e7862dc18cff120bdffbc8dd0763018814c3c0279317d7ba8b0b3169cf6 SHA512 3c03d1a8232258e23e6cf3a6f441299ab3ccb422c6d372d4b73ab447c963f3f7add9db9a435f2e63f404b665a8005c7233509090d0c0bac5c06b7387b99c2453
 DIST linux-5.13.7.tar.sign 989 BLAKE2B b466fa48bc704717dac88a759fe0679e114bd4cb2848ff4bffe07c39b06b5e872ff4955bfbb5e832d84f77d5a978195588b34acb82afb6fbb310f16d97d722de SHA512 ca76c553dc38159d5acaa75a7597094092e33e65e0a6fc2ceea236fd7f258bb0685308a3336675995d13c6ac82c085c3e0e0013d09290ad261d9d8f1df09cbb6
 DIST linux-5.13.7.tar.xz 119340120 BLAKE2B 2204912daa4b48f551f8d72b6f982e7e0c3bd12c98a9f4fe3a038c72a3229803e39577da057149d1b1bb117dc4fc33ed3ec0b3889b4d94470f7d77d9dd2c812d SHA512 d50ff2c639f89187b261225223e1c1a599e6face488574325f5f2e2fd43cc551a9684484ac7fefacd7fcaf76b7c86fa2679d62d27c4f4d5b7634f2d1739f0ac5
+DIST linux-5.13.8.tar.sign 989 BLAKE2B a1690b203c66fedb0a37bb612479239995f622afc83b7212d8e4e0055e8639b42be8349878a525e04e191ade7ac986c725c8e83d83a83adc7a73b3f44f717d13 SHA512 01d2352bc057b9974ca8a4bbe026409abc81de36b36439b1adfcb12813bcd3768e67c4576eafa4e0b2aea1d9090bb072ce3b85ccec8700d3631b5d666f8ebc29
+DIST linux-5.13.8.tar.xz 119331752 BLAKE2B 567812f1ad10dd2fa260cd087849148b8b4ea05db73ec9743c44e49e572cb5604ac24fd402db0b22660cdbc59e4dd5dac4662acf33b468018c31e250ba75eb0a SHA512 3a502e61b012152801be2de318f03bdadff2a7ef304c3f52425b72cd935dc5293ece53f773201506190df8b4b9fb1bd96023c6b10008de5a8c11d10c69f7fb44
 DIST linux-5.4.134.tar.sign 991 BLAKE2B d5b705ecf03edfac4274ee6a3d8930e1e022d8e19970822822ac7e75d0ec97a3d50d1c3f2057ecbcd12fd8078a00a314bb8991c4f043ca5cb1db94c53a3264e7 SHA512 cb312e065218605520c8e445032bfde209cb941945947988369e6fdb9900c6843aefd03dcb3c913f8b7a59ad588b7dcea86ccae1aae29566579a19285f4a84a6
 DIST linux-5.4.134.tar.xz 109136880 BLAKE2B c9bfcfdbd6e30fc265cbc16eec5f0014acf8c63cf8271d6a436c1da5126013fbb2b08de2e552707203cc50e8991d9aa78ca8cc7ed67ddf20e3d2d08b825a4659 SHA512 7b5faa3f1c64d2b270f93416b5031407aa3181ee8029f3a576c8f09ac034fd0771f362068c41bbbb546d14b1d389042e8cb940f493d2ff9e3e4173cba1633c93
 DIST linux-5.4.135.tar.sign 991 BLAKE2B 0d64c3b0390b34a42ef4cd60df2f6e5c0ef2eff8e492ece562f301800bd2606042370bab40f5a9edac29a905edf74e9ab5a487ba2dd33a2a84704bd4978939c0 SHA512 95d2689a9297c2214f42b9e94f644e117958baa4bfcd9a2d47b4c80fabe56d1475522dd07471dd35efd72baa4d40a4afdb573c1b06f9e8957bbca2a805c9920b
@@ -43,17 +47,22 @@ DIST linux-5.4.136.tar.sign 991 BLAKE2B b00eae0e8f6425c148f7be9d613c8c420c2bc0c9
 DIST linux-5.4.136.tar.xz 109141428 BLAKE2B f9f60af9b63b5abf91057b0160ff9f75b33c587b48f1bf7c8be99e8b6a3ea4c7399bff0f004d054de5631b9a1b44c330a04262647b2ea52c03e78eec237385f4 SHA512 c539deadf9dd44647bef81a5da5efcac1f0b22de473bca87a9f2586f23c47403c210a6d3bdf1f20d77bfc48d2d3ebd72471e7cd2b437e2379bcb17895a9c4a60
 DIST linux-5.4.137.tar.sign 991 BLAKE2B 1df6a3ebc9ce9fa8b55bec8d069f8689661080dc4da0c705c0cd52bceb5afdf4f2a7ecf11bf807558febb36a5853b7772dbcf92b94cc8ce03c64d7d3a34a865d SHA512 17ac540551735313798400f1be8bff03287c8c447f13c3b21c231f70e2024d376ecf1a4da427cc4b2caaeac789406488da5055578b6b95f204882d9d7ac6a62d
 DIST linux-5.4.137.tar.xz 109139968 BLAKE2B 165ddbebf36f877cedfb8449f8b969be33cf98f10a78b1b47e3a01c3cc0788515df2a55710f610657318c45e4c13b0e53de8a1062507bc30714da3e7185a3f80 SHA512 ffe8b15699e4ca2ddfc792cdf4e95687ec89b6f04fda3444d1236790f3a139dab98362c103b26ca68608f17aa1e2126d2d317bcb5129569b52436b893a8126ef
+DIST linux-5.4.138.tar.sign 991 BLAKE2B 62d2861c79afb866096a938d7d92da5f1dd9891c17061631166188913cf4b1f3ec6e4d91c5919256d3b3f90872f5ebaa75fad5cc8429a1341b5848713b6dc3c3 SHA512 1827256c5f24c9f17ca1099b34fff5527980063d6f2b6ffde237e3345f505722d6c9f9b4b36fbfc227b89a2311e8149b6bf8d2402d5e388ff1100d45cfdbdbf3
+DIST linux-5.4.138.tar.xz 109142300 BLAKE2B c3cd90a3a3d4157db8be479afa28222d1ff17f663ad1ef36d10534b86a6dedd7057a33fe3a10023d0a2aefa4aeb3da9b2d3d8a0a1fa07f10ff66c30737f6b680 SHA512 2e63e4e83b0c5d2a16b10a56cf81f4387c03c918a856314f886b12fc1d71d3fe7a4067fb6028c8cc057b9e2aa0ab7c2e44da446fb459ee5beae4bd0a019abb87
 EBUILD vanilla-kernel-5.10.52.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.10.53.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.10.54.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.10.55.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
+EBUILD vanilla-kernel-5.10.56.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.12.19.ebuild 2912 BLAKE2B d1606ffc26790b5bd830d4e43bd873a6bfe974203474136ef5a61ccdeece3a312af4517e4c06f59597f986dff1d4560727d09f1e2d135e14a27978216ba8ed32 SHA512 a8071db701fd3454c62d2643378d9686026b0b43abcee339493cb5f8c3c7fa2f79d39de573b881d24434e804eda0d5d74ac7f7f5e7402b3cd17883f7557b94f2
 EBUILD vanilla-kernel-5.13.4.ebuild 2911 BLAKE2B e8bbdbf21da6da4ababf94ae6f55d46fb62f171275e28333d9fce58e52b782621633f3873dad87f3db18c44ea83f2f8a89d7fa37d1d8cf8ab1ed8ad5ae9438f9 SHA512 11e4066a71ec3ef2c2568b83d85dee4062b30641aa2073810a6f31c198fccf6a077e48984687de9862b2d518307890c1ea60d89362c61471b4685b34f013a922
 EBUILD vanilla-kernel-5.13.5.ebuild 2911 BLAKE2B e8bbdbf21da6da4ababf94ae6f55d46fb62f171275e28333d9fce58e52b782621633f3873dad87f3db18c44ea83f2f8a89d7fa37d1d8cf8ab1ed8ad5ae9438f9 SHA512 11e4066a71ec3ef2c2568b83d85dee4062b30641aa2073810a6f31c198fccf6a077e48984687de9862b2d518307890c1ea60d89362c61471b4685b34f013a922
 EBUILD vanilla-kernel-5.13.6.ebuild 2911 BLAKE2B e8bbdbf21da6da4ababf94ae6f55d46fb62f171275e28333d9fce58e52b782621633f3873dad87f3db18c44ea83f2f8a89d7fa37d1d8cf8ab1ed8ad5ae9438f9 SHA512 11e4066a71ec3ef2c2568b83d85dee4062b30641aa2073810a6f31c198fccf6a077e48984687de9862b2d518307890c1ea60d89362c61471b4685b34f013a922
 EBUILD vanilla-kernel-5.13.7.ebuild 2911 BLAKE2B e8bbdbf21da6da4ababf94ae6f55d46fb62f171275e28333d9fce58e52b782621633f3873dad87f3db18c44ea83f2f8a89d7fa37d1d8cf8ab1ed8ad5ae9438f9 SHA512 11e4066a71ec3ef2c2568b83d85dee4062b30641aa2073810a6f31c198fccf6a077e48984687de9862b2d518307890c1ea60d89362c61471b4685b34f013a922
+EBUILD vanilla-kernel-5.13.8.ebuild 2911 BLAKE2B e8bbdbf21da6da4ababf94ae6f55d46fb62f171275e28333d9fce58e52b782621633f3873dad87f3db18c44ea83f2f8a89d7fa37d1d8cf8ab1ed8ad5ae9438f9 SHA512 11e4066a71ec3ef2c2568b83d85dee4062b30641aa2073810a6f31c198fccf6a077e48984687de9862b2d518307890c1ea60d89362c61471b4685b34f013a922
 EBUILD vanilla-kernel-5.4.134.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 EBUILD vanilla-kernel-5.4.135.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 EBUILD vanilla-kernel-5.4.136.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 EBUILD vanilla-kernel-5.4.137.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
+EBUILD vanilla-kernel-5.4.138.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 MISC metadata.xml 352 BLAKE2B d14768a94b44290d052fa5b86553dc09bdc609c629fc96da7d5314510091484d7f22f2f4b4244fb033046eb949da8fdf6b9535d698ea3323f2da79400454b8d2 SHA512 a7b17e6764a339943b587985b95d828e84a076ceb3c372181794c905f6ce1a5554be69cb55560d823d71d8ea66666bcd5474fec1ead721633477eba31cf1cc8a
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.56.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.56.ebuild
new file mode 100644
index 000000000000..12c958a4bb2d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.56.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.32
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.8.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.8.ebuild
new file mode 100644
index 000000000000..7feaac0c449a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.13.8.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.13.4
+CONFIG_HASH=a219e71ba368d65c1ede4fa6a79a17e70815440c
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.138.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.138.ebuild
new file mode 100644
index 000000000000..dc33930084ad
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.138.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index a5d91759781e..9b8f7b2dee4d 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -6,20 +6,20 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-4.14.241.xz 4387084 BLAKE2B 7d3126cbb14d1e5459689314b4a465712f66bc4b88392ad8514811cbfca5a2110c3f3c8cf577d86ac7aa5c8cd699336aed1f51368cae0a7e47f36c6ff8758393 SHA512 2f509afd824f1a924c10d763c1608b401c098c2e4084922bcc1b9a3ab558bd43ba3a62c232a99be5717666eb32baa93ca4a2b7c233b8184df567aaf1a5dc92da
-DIST patch-4.19.200.xz 4167064 BLAKE2B 5216e28d2a8cb22415d94a3f397f86cb0bdb9bc8d05be5d6a679e5ef58342c188e2ec37c7469cda0a61ebed42929597a2a4175f56f2b7912494ffc801e1a5189 SHA512 c979cbc8016b5c7409494940ab652f997807a459f008225fda79000c23b46e2f3c4fffa70b746b40a8d07ee0e9654511d1ecd9fab5016c8bdd1977ae51ef5dd4
-DIST patch-4.4.277.xz 3615816 BLAKE2B ca88745d191bc1f10967f11ed65ecd98f45ba5696b17177544ab5f959ac97d224a56d321fce7381c37136532d72b9bc9374ecac8725822a9f282c43145b25342 SHA512 dd5688365b947409eb65395ca2a903acddcd86183162c31df0f2f40eaa04746b2d3bed6e81a9594f0b18afd4cdde4bf3dd5ec407356c0199935483ad38339b91
-DIST patch-4.9.277.xz 4051168 BLAKE2B f47984484c77acd6609b92b5759e4fb27fc4e87130a2cee36936b5126ef999ef108f59a5a453feca499798865d8c421a91a61db888b8a7ed3671bd8fba92f292 SHA512 53d77bcf45144e624e9ec10397253a142ca8bdaa839a9548cec5740bb93384264b35811a0b15aef9849a16d9c71b0063df4951fcd89ede79efa5a49cd0a6bdc7
-DIST patch-5.10.55.xz 1859036 BLAKE2B 970d29524173d29bdf4031ad06f6c7f14e0db283c140dc416e38f3e490a30cd12f3284eded06e55db236c55f230dc26d1b5dc15efd75f4e07bd20bd56aabe0cb SHA512 cd5003dac939c8748664b902cc3de612f116c94e86ad5e725172fd552add2e4f4f7ee4c7d19f81d2a95d2fd8dec0b455a9ef6ee7eee61a4efdf3e6f58dc9ce3b
+DIST patch-4.14.242.xz 4394572 BLAKE2B 49e54610336094861f744fc1e5d1a75c4ac5ffb17437f33c903d0634ecfefcd8b63061c4fa8dc6be15075063c14fb7084dcbbf5c52bd6fc3074510d0e3798645 SHA512 0791a0f350fdf4f25c3fd8e2e5e9fa4d7297ebee960f1a78ba7095b52e4b64e538407d72b37eb800ed72f93f9c35ac5dfd801f7f25ed58a0665f09f41bb635b5
+DIST patch-4.19.201.xz 4171216 BLAKE2B fb46fa71de25b6ee8cfa027e1068aeb66afd4ac95cf660957ebf4aad01795dd5d23fe679b9f3d1e1a75492de60c775cf5eb46ec0fd3add73cb4b26391bf332e2 SHA512 56822ae3243bd87ab778568c865d78e5245fda9fde10b27a607d9b66048e35a9d69c8db0bbeb120f1d0ebf469d408282f7e20110581ad67d5db4bff343c11d71
+DIST patch-4.4.278.xz 3621940 BLAKE2B 11a9b7a621f7a21f1312b1f321a22cf532944fc25656a3f0a21e272299937cdc14f8470831bc8c4b17efb46da5ca1f522a5073165844ad29030c0accde3b4840 SHA512 71b3c524675e766f93a4142768242380cc7447a9890afa34b97815aa03320a97ef55ee05e3320a6864d71f7d5478a5a10d0c9526291c4451a6e20bfa67b3492c
+DIST patch-4.9.278.xz 4059040 BLAKE2B c2f416794306b8419f49d735aacef8e267529516de263994143a3876fa0fd0293cf353d1d917805984ad36e01f3e064b2a182179068387015eb9fdae4615f9a4 SHA512 213921e6172846b2261e45ac24a4f3a02a2b948e235d03618969dc0cf74390f54124b6be1e9ac54c245dc8a75b2eb9e1862660083f4ce333a60e033e9cd2a3f8
+DIST patch-5.10.56.xz 1874436 BLAKE2B af6d36d2f2aaf73d5c43dc2116edc22258e34158ffd9c08abaeb25fd61fa1c9322d72a0cb4756c8807d5ddf6b0f581a3aac650fd421a8a681159491b0b55d67d SHA512 35e17411cd1371010de16c05ae7af945d6dab1bb83be83f8b5f645c5e572fe860ed70244aa02c0c93ae64f0553683f395be85dbbaad63f45f08438ec39751505
 DIST patch-5.12.18.xz 954280 BLAKE2B 45c1485e24a3dcf246694e531a5d259efa6446df5337ceee59271c04ca76a3ba016dcf3e7e9c0b9373728c465d295537da3d5dc4b912231ee228a34207b53426 SHA512 725897d478b61ac6e7fbf9d2de33b89578adb637367c4a70da92996a4a82643a8d314533e7cd9a3c3b992fce967336662175ea87b32ac16b95ebba8d8cec8a60
-DIST patch-5.13.7.xz 531132 BLAKE2B c1ed0ba00149d83f2c29ba7796786973c6e9bd6f046b6161a8b56769c5cc746a8f1a6d39245cdc9d1db65737824f31fa7b33f5ae406064ccca723df98450c0de SHA512 4f16262621d2153b9e98db1644af2323e32cecd47dd119f8b3ce52182f46d4018ba1573e29150c2deeb1761131fecdeb7a3215525dbbb1da3de2278c9a1639e2
-DIST patch-5.4.137.xz 3214908 BLAKE2B de1d58f6100e89cee5c103748cab753c4dab425e730695af61000bd4fb2f1a8d4c699aaf32f1dc77c28778477466a2ca24e14b9efca882608cc4166dc51ffb02 SHA512 30da56861035f55ce11fd0db06fb4f289b51753f3f24b5e863b77f23d53dab38edb7cfe80c528d394fb70a7b46d66f47adc9e2e765feebc7b0b293e7515631a3
-EBUILD vanilla-sources-4.14.241.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-4.19.200.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-4.4.277.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-4.9.277.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-5.10.55.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+DIST patch-5.13.8.xz 560636 BLAKE2B 4f21b50c330ceb4293349b74fba123739381845171918e59dd974ada923cbfc24201111eb4e0272eb6e69a4c4ce34bd708f820adbbf7da344e895d5b046117d6 SHA512 8ecdcd19b0a1154796e3e31c600d45bcce1571f1c710affc3220d52622a56b3c6e2c6176c652d905b8c1647a21fd2f23f846f1a3103c3b74ca3bec5e467e3331
+DIST patch-5.4.138.xz 3221104 BLAKE2B 67f23da6fb88ac9787aae01426d0ae03e169e383d1a8b8cafd33fe946b74ae0f1bfcd310a25b20ba1fdccb5de8f52d041700d5ad193efeb045e230845eeb0473 SHA512 fa81c0f8ff8aeb728fad31b973d12ac5640a2b4308c613674aa107a8f48d9f086cf529f36e733db200c2a531ecabd95539aae33d0bcde6310eddca193c52b320
+EBUILD vanilla-sources-4.14.242.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-4.19.201.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-4.4.278.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-4.9.278.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.10.56.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
 EBUILD vanilla-sources-5.12.18.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-5.13.7.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
-EBUILD vanilla-sources-5.4.137.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.13.8.ebuild 426 BLAKE2B c93fd36dacf35c09168f51df0857eac9450fd0292f6d8978ed8763be084cbb4b14d229c155d5f3d440a1d976b8cee039ad1f384757c1552c821695a638361fe1 SHA512 da83ee51190a7659b8f1cc086f2e2238eeb3977bcb22f04d3468df5938cf966ca69beb04006046e8c98f233127cd574282b661a7f1cf27e2181694f4d7e775d1
+EBUILD vanilla-sources-5.4.138.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.241.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.242.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.241.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.242.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.200.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.201.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.200.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.201.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.277.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.278.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.277.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.278.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.277.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.278.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.277.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.278.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.55.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.56.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.55.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.56.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.13.7.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.13.8.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.13.7.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.13.8.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.137.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.138.ebuild
index 7083facc514b..7083facc514b 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.137.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.138.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 7a95633cfe78..eddbccc4210d 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 ef3a6792e240..ed90ea3de5a9 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -7,10 +7,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD compiler-rt-sanitizers-10.0.1-r1.ebuild 4513 BLAKE2B daa067db497d6548d10041d7a2e99aca314c0b8c136e045d799f1205df135c04af2bce717e0fa281b67a6ef6bbf95fad014d1ae354eada02b2c79884af8e7576 SHA512 3579b322368ca2f350d2d373f6addc871aa8046d80dfead13d90a6564f288f35244bd5957b96d743356af7aa9560e3ca8ebb5863eea7c835fd8648e8b0fb4d8e
 EBUILD compiler-rt-sanitizers-11.1.0-r1.ebuild 6036 BLAKE2B 30bbe8f96289a6a4e66367728d74c3cd4631a11273dd0b2a597251c9742205577d4561c92ca9ba15d1afa7a58cb049441828b09b1d77ab1bee4d4cc6227d2673 SHA512 6755070c159402442b3e02ab21a9415313ddf82c6c54bd0a171b987c155bd85f6d0882d4146d02695fc4c157892106b9d1678235f92c28d7fe86fe8e9bb9486e
 EBUILD compiler-rt-sanitizers-12.0.0.ebuild 6081 BLAKE2B 7b72248427b99b3210a6aaab4d2d335c66d113bd3b473f16e660396009d1e1444241748d40b2d91851433754227fce0a893132dc668d43c7a8e962ddb83cd635 SHA512 ad69ec8901fa6273498b2b249d87c7546deeb7c294a8625fb3568faad9edaa2dd55443c00686ce18008201fecc3cba120e6282c2cec056db87af4440c920e293
-EBUILD compiler-rt-sanitizers-12.0.1.ebuild 5958 BLAKE2B 817b71b56351dd4ec5fd1b812949b5f02826b6d1122f7ab9d40975aa65f7ff8e8f068bbe4eb111ac579686485be06cf386f621386993cae1c628f1636bed3ab6 SHA512 0ba1217f5949313bd857fe62c0a773d587e629c640eee4d39c2db0a2b558db4398eb39b73cb52dfa0ec2eb5eba9b108fa9c4a219ebd9a979e894eb503d33a3bb
-EBUILD compiler-rt-sanitizers-13.0.0.9999.ebuild 5886 BLAKE2B 63ff0582aae1fb2ec007553d3d0800f9caf900e95299fa8571d5151c2f029696391af2fab3358b5b378c1ae5fe6de4a60136c09b3f8f72435b92d353e948c24e SHA512 c553a0cd3d4849af21324eeb1498aee728bba3705d00c734f6f55ad6d0354cafd3078addfa691be494bf79b902fc8c669cd76b13a45868ddcb00ea196cd5454d
-EBUILD compiler-rt-sanitizers-14.0.0.9999.ebuild 5886 BLAKE2B 63ff0582aae1fb2ec007553d3d0800f9caf900e95299fa8571d5151c2f029696391af2fab3358b5b378c1ae5fe6de4a60136c09b3f8f72435b92d353e948c24e SHA512 c553a0cd3d4849af21324eeb1498aee728bba3705d00c734f6f55ad6d0354cafd3078addfa691be494bf79b902fc8c669cd76b13a45868ddcb00ea196cd5454d
-MISC metadata.xml 1341 BLAKE2B 27ba2b57b7ba21538680b5535aec8b0e8e772a040b25ac8c9285765ed00a485a01ce6dd47c32686c7d162d072f4d6d7d2e1a790e9bd867b61a460b01ad79bade SHA512 909a922e1b0e9649534d88bb7692b1d1d7a9d3d539a4926054dac834d672da065cfea5b2aab02dd23f2a7b0dde0eb0b10ae453990c3ecf99ec20f6a2d2bdbac6
+EBUILD compiler-rt-sanitizers-12.0.1.ebuild 5957 BLAKE2B ca70b1bcb71e5219a95cb27cead388818395c6b2f55cb775e3007be1c2c92cfeebf08718aefe27a0410bc623fd4b923d50fa9bd92f9e7b1614669d8809d5e11b SHA512 dd6c020c00eb22177c1db9a38ca15f016e91bd675a7a1832c972643f1d8317d1c29149ac0bfa78d41aa12cd69d58fc54c966af0d9b2852d7dad8e9959d6e9c02
+EBUILD compiler-rt-sanitizers-13.0.0.9999.ebuild 5933 BLAKE2B 74922d3c2fec0c97e72748142c4b3f4ebe38b7e488f1fa92593f5399efcbe4629afcf9587a8d5adbc68034c62110912c8882bc88deffdad4963d5841f6147b09 SHA512 86d8343941cb32e6fd8c3c8590c4e975fc40b3dc87dbb27c4b01db16c52ce68ca430dd90365ae8972e16c016a2ad780b6c569738856ef20081480832a67192ea
+EBUILD compiler-rt-sanitizers-13.0.0_rc1.ebuild 5933 BLAKE2B 74922d3c2fec0c97e72748142c4b3f4ebe38b7e488f1fa92593f5399efcbe4629afcf9587a8d5adbc68034c62110912c8882bc88deffdad4963d5841f6147b09 SHA512 86d8343941cb32e6fd8c3c8590c4e975fc40b3dc87dbb27c4b01db16c52ce68ca430dd90365ae8972e16c016a2ad780b6c569738856ef20081480832a67192ea
+EBUILD compiler-rt-sanitizers-14.0.0.9999.ebuild 5933 BLAKE2B 74922d3c2fec0c97e72748142c4b3f4ebe38b7e488f1fa92593f5399efcbe4629afcf9587a8d5adbc68034c62110912c8882bc88deffdad4963d5841f6147b09 SHA512 86d8343941cb32e6fd8c3c8590c4e975fc40b3dc87dbb27c4b01db16c52ce68ca430dd90365ae8972e16c016a2ad780b6c569738856ef20081480832a67192ea
+MISC metadata.xml 1386 BLAKE2B cf5470df8e8b812b622d707ec7f6a8ec1e120fd24dea4ee52d07747f8b20600618e111002c6cb75d6f0fb209d6b8300e0ea3ada5441a8d0609145084079a0794 SHA512 7ed2225dfdd77711b46eb153149680fe340afcb2d57b912a59daf11d240fc1aad552b386ae41251b4cbc84ba9352dae0e1bb123274b0c1cbd300d42605424ecb
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild
index 57d1ab1f3837..dd24d7b58862 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.1.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 +memprof +profile +xray"
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
index cc239e8feec6..86e4d10a7c76 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild
@@ -14,7 +14,7 @@ SLOT="$(ver_cut 1-3)"
 KEYWORDS=""
 IUSE="+clang test elibc_glibc"
 # base targets
-IUSE+=" +libfuzzer +memprof +profile +xray"
+IUSE+=" +libfuzzer +memprof +orc +profile +xray"
 # sanitizer targets, keep in sync with config-ix.cmake
 # NB: ubsan, scudo deliberately match two entries
 SANITIZER_FLAGS=(
@@ -23,7 +23,7 @@ SANITIZER_FLAGS=(
 )
 IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
 REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray )
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
 	test? (
 		cfi? ( ubsan )
 		gwp-asan? ( scudo )
@@ -126,6 +126,7 @@ src_configure() {
 		-DCOMPILER_RT_BUILD_CRT=OFF
 		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
 		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
 		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
 		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
 		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..86e4d10a7c76
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0_rc1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang test elibc_glibc"
+# base targets
+IUSE+=" +libfuzzer +memprof +orc +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+	shadowcallstack gwp-asan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
+	test? (
+		cfi? ( ubsan )
+		gwp-asan? ( scudo )
+	)"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		!<sys-apps/sandbox-2.13
+		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+		sys-libs/compiler-rt:${SLOT}
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+LLVM_PATCHSET=9999-1
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	local flag
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if ! use "${flag}"; then
+			local cmake_flag=${flag/-/_}
+			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+				cmake/config-ix.cmake || die
+		fi
+	done
+
+	# TODO: fix these tests to be skipped upstream
+	if use asan && ! use profile; then
+		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+	fi
+	if use ubsan && ! use cfi; then
+		> test/cfi/CMakeLists.txt || die
+	fi
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local flag want_sanitizer=OFF
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if use "${flag}"; then
+			want_sanitizer=ON
+			break
+		fi
+	done
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX
+			# This disables i386 for SDK >= 10.15
+			# Will error if has_use tsan and SDK < 10.12
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
index cc239e8feec6..86e4d10a7c76 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
@@ -14,7 +14,7 @@ SLOT="$(ver_cut 1-3)"
 KEYWORDS=""
 IUSE="+clang test elibc_glibc"
 # base targets
-IUSE+=" +libfuzzer +memprof +profile +xray"
+IUSE+=" +libfuzzer +memprof +orc +profile +xray"
 # sanitizer targets, keep in sync with config-ix.cmake
 # NB: ubsan, scudo deliberately match two entries
 SANITIZER_FLAGS=(
@@ -23,7 +23,7 @@ SANITIZER_FLAGS=(
 )
 IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
 REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray )
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
 	test? (
 		cfi? ( ubsan )
 		gwp-asan? ( scudo )
@@ -126,6 +126,7 @@ src_configure() {
 		-DCOMPILER_RT_BUILD_CRT=OFF
 		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
 		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
 		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
 		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
 		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
diff --git a/sys-libs/compiler-rt-sanitizers/metadata.xml b/sys-libs/compiler-rt-sanitizers/metadata.xml
index b1905bb2cb09..bfdf4ba33fb5 100644
--- a/sys-libs/compiler-rt-sanitizers/metadata.xml
+++ b/sys-libs/compiler-rt-sanitizers/metadata.xml
@@ -9,6 +9,7 @@
 			than the default CC/CXX).</flag>
 		<flag name="libfuzzer">Build fuzzing runtime.</flag>
 		<flag name="memprof">Build memory profiler runtime.</flag>
+		<flag name="orc">Build ORC runtime.</flag>
 		<flag name="profile">Build profiling runtime.</flag>
 		<flag name="sanitize">Build sanitizer runtimes.</flag>
 		<flag name="xray">Build XRay runtime.</flag>
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 6a73abf3dbb5..22e081e9fbe7 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -7,10 +7,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD compiler-rt-10.0.1.ebuild 2782 BLAKE2B cdc7937f616e86c3394d1cc68eeea05f3eebdcac051ca48e477d3a2cb765be1d616159f72a2b77ac21a0c2a4ebf1cc79f9d9cd23a2a1c7b26a4a252142c3af21 SHA512 4380bb10112f745e0034d36be105a1b4df159f34adafdd2b24157dc3652881ab8792e7758555ce167f59e2c3360b5d36b5d4f8d456df44fa5ee754f3c310677a
 EBUILD compiler-rt-11.1.0.ebuild 3506 BLAKE2B fea54ca4aabe9bf35afc64a579ae18eb4491eeecb58ede43369ba9c294f624851214525f399cfa3adadee70ca66cbe64821376272b9965304266bcfc07b9f220 SHA512 f50906ee9f3b044a251ddd56db6ce10d3d2b632ffa7d3fd608cc5d7320e8d4b47b1ada26965b5fc9bb746e77c1b01ec61b5f719bc6bb2805720df035fca993da
 EBUILD compiler-rt-12.0.0.ebuild 3541 BLAKE2B 0d5581a8a0f45d6843d3aca9ff184bb447e886e7e41faee2e4ebebb2154cfb2138ffa04be73eb6f76c60f7bbd65a8589649c64c60612037221c646535f04b7b5 SHA512 fa67b1e4105f9aa3bfa95c95a24c8bfeade28c521d4c69b0c08d8e8c469a06d62eb3a2b8c97175806922bd319ece1e016437c693baaab50646ec650f7aecd46e
-EBUILD compiler-rt-12.0.1.ebuild 3544 BLAKE2B b1841f87854a8fe106739b4248ef914219bc82c922a229fc6280ca2213e669bce4c64e06cc389bc3183f098afec0786492a3163d373a51a2664f586f7e700097 SHA512 2555664baf282d0d0e56cbb53c6824a196b4448e28c3c472e9d5f2c8cb114e12c0f1771219a8b62645a9cfbaf77ea8c80dd433b88a48d8a01922ad460e37cd26
-EBUILD compiler-rt-13.0.0.9999.ebuild 3472 BLAKE2B f51cde79576ea3eca64225cc1c9dd85b3613409739593f1ac362282328b5801c5ebd79cea1bb09935b6e33e0bbb080b2a9f6be33b909b3af9ff18270dd4ee120 SHA512 0bce4326f3c704f1f56c3a54e8c53b3424500f1bf0d30cf63d6645bc05daf87dcc8c27c894746c5a14c8b9121ed952e87c3a1c08e8d5c263d1d2fc97d2d952cf
-EBUILD compiler-rt-14.0.0.9999.ebuild 3472 BLAKE2B f51cde79576ea3eca64225cc1c9dd85b3613409739593f1ac362282328b5801c5ebd79cea1bb09935b6e33e0bbb080b2a9f6be33b909b3af9ff18270dd4ee120 SHA512 0bce4326f3c704f1f56c3a54e8c53b3424500f1bf0d30cf63d6645bc05daf87dcc8c27c894746c5a14c8b9121ed952e87c3a1c08e8d5c263d1d2fc97d2d952cf
+EBUILD compiler-rt-12.0.1.ebuild 3543 BLAKE2B 712b9ac026db2cb651ca4ce885e9a13d09ac72a048cfc9c795365309734b5cba35d6797e6027e04b4178b84bd73d62026d7cb212096c78e11f59e6b14b4c53c0 SHA512 b9ce661a62aad0f40a31ec9f0256558e02ce121e35a823891b7c2b4c23b340b4a27ec441ed4a8b650993436d4677acee920bfff4eb6e19ad0306fa62ec332566
+EBUILD compiler-rt-13.0.0.9999.ebuild 3502 BLAKE2B 260e765d2fbb17d20f3a4635301f2374b1197064746449d5ac4dbb3bfc3272bf033e8f12b71f8fbebed1175960942245b4bc835b86a2ebceb14cc0e8c3a71db3 SHA512 a28b48c91f9385ce0af256dbd7a8623e2da99619462ce7430fc219aed01198dd383196259f25f31c6daf44a51b405110f907a88456c13ea6fa5d389ed32b68fb
+EBUILD compiler-rt-13.0.0_rc1.ebuild 3502 BLAKE2B 260e765d2fbb17d20f3a4635301f2374b1197064746449d5ac4dbb3bfc3272bf033e8f12b71f8fbebed1175960942245b4bc835b86a2ebceb14cc0e8c3a71db3 SHA512 a28b48c91f9385ce0af256dbd7a8623e2da99619462ce7430fc219aed01198dd383196259f25f31c6daf44a51b405110f907a88456c13ea6fa5d389ed32b68fb
+EBUILD compiler-rt-14.0.0.9999.ebuild 3502 BLAKE2B 260e765d2fbb17d20f3a4635301f2374b1197064746449d5ac4dbb3bfc3272bf033e8f12b71f8fbebed1175960942245b4bc835b86a2ebceb14cc0e8c3a71db3 SHA512 a28b48c91f9385ce0af256dbd7a8623e2da99619462ce7430fc219aed01198dd383196259f25f31c6daf44a51b405110f907a88456c13ea6fa5d389ed32b68fb
 MISC metadata.xml 333 BLAKE2B fc411d2ccf9b848ed7ba71d6a1eb01c54237a38e3c612c22d39549f6b23ebc3179dd08c855852a72b9a4f4ae89418a078048702324df27b4fac11c36e80f846b SHA512 ca50c4e5ef7d52c167bca6a4ab2961a1f7f82d0e84722ec65b8ae44d0ff8a4a7db1dce630f6f18f7b526f77c432af7ebc9a29564659631bad1e3900b6f1df49b
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.1.ebuild
index 6470229215e3..ab455e9a4d17 100644
--- a/sys-libs/compiler-rt/compiler-rt-12.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.1.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/compiler-rt-13.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
index 6f732cc60ab6..f726db78861b 100644
--- a/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
@@ -83,6 +83,7 @@ src_configure() {
 		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
 		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
 		-DCOMPILER_RT_BUILD_MEMPROF=OFF
+		-DCOMPILER_RT_BUILD_ORC=OFF
 		-DCOMPILER_RT_BUILD_PROFILE=OFF
 		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
 		-DCOMPILER_RT_BUILD_XRAY=OFF
diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.0_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..f726db78861b
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.0_rc1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=9999-1
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	local nolib_flags=( -nodefaultlibs -lc )
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+	elif ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
+		-DCOMPILER_RT_BUILD_ORC=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX.
+			# This disables i386 for SDK >= 10.15
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild
index 6f732cc60ab6..f726db78861b 100644
--- a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild
@@ -83,6 +83,7 @@ src_configure() {
 		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
 		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
 		-DCOMPILER_RT_BUILD_MEMPROF=OFF
+		-DCOMPILER_RT_BUILD_ORC=OFF
 		-DCOMPILER_RT_BUILD_PROFILE=OFF
 		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
 		-DCOMPILER_RT_BUILD_XRAY=OFF
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index cef0573f729a..326441fd9535 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -26,6 +26,8 @@ DIST glibc-2.33-patches-3.tar.xz 37076 BLAKE2B 718ab706df85c966145958fb6137b5499
 DIST glibc-2.33-patches-4.tar.xz 60124 BLAKE2B a7a99f39c16df241745772c31b10946dc44c51e6c09f8a447b905e7dd6ba529aee08f66a581431453c6665485ac1848861559aa3f0aaba8c2061c1f1eb77d9be SHA512 05c33dc465a98097f836783bb5037dfa14b3a2c0c140014f642ea72954222ae919fe2db9573ee70ca9c1881b3b59dd4b815a8f39f331494fa12951c9012797ef
 DIST glibc-2.33-patches-5.tar.xz 63032 BLAKE2B e7f5952b2d84dc264e960d8bd3d9af4ca43089ca269735168933e80a0a74d7be1cadc90935b429cfdf5f0052d3ce3482a8f073b15378e7f9c05034535d9eae4d SHA512 00c2f8f104e7899b76398a6a39f054cd109a71f5fcc4020304b7d7e15ae0c53df1c3acbafd56898427b3849452f9fb9e5064ff584d6c86c4d18c8a9201c89d29
 DIST glibc-2.33.tar.xz 17031280 BLAKE2B 703d12121c1e2c5d9e0c6ba5341f5fb5c4d9111611a83f2360029b5de9c6e5a5611249d1833684a58ed4afdf49cae614365d87ec8721ba0e5d218f593b1f229d SHA512 4cb5777b68b22b746cc51669e0e9282b43c83f6944e42656e6db7195ebb68f2f9260f130fdeb4e3cfc64efae4f58d96c43d388f52be1eb024ca448084684abdb
+DIST glibc-2.34-patches-1.tar.xz 7656 BLAKE2B e4ed403a10276a4ea468632b3f2baf31c8e7cd6c95a6f50fb6dd8f1196890e2ce5e66c878a67a3a28451d662b71ba67177d467f94a2161d3b13894eccbe54694 SHA512 d495a27c38eb685273e509d02b1c87e17b9908af9ff838925c34e0f2bcb063afb89e666eca1e5829edf91ffe41f4e70f66ed6cbd738b1df82ef6af4b3f99f502
+DIST glibc-2.34.tar.xz 17301232 BLAKE2B 874031192f2f5a3b35c3f5b044a467d4be4e67e8593e070e5b49b901ce8ea6bde2f8d2f6c92fa33b3f61eb723572a9e5f2b45e56064168df80a96d3fdb6fa30c SHA512 15252affd9ef4523a8001db16d497f4fdcb3ddf4cde7fe80e075df0bd3cc6524dc29fbe20229dbf5f97af580556e6b1fac0de321a5fe25322bc3e72f93beb624
 DIST glibc-systemd-20210727.tar.gz 1454 BLAKE2B 0383338f73cec9a13165f0be261eb3d46c0362425b5fe31846f0ec00da9aff69d941e8b0e0ad1f8691edf9dc30796c239e8e984207725e4cf98fd037e7168e22 SHA512 09a91f6351657abfca200d110b0a43d541399c2db142c5706e06b4eebb736932e8f1b026be8d844be64f8e2c981777c342004492ef99c3c81cb04bf75a2c3ee8
 DIST glibc-systemd-20210729.tar.gz 1480 BLAKE2B 37722c7579df782d890e44dbab99c3de52ab466eb9de80d82405e9bb5620bf39ffc8c5f466a435bdb86ef6d36dd7019c0736573916bda6c67d02a2581e0ec979 SHA512 efd75af58b50522c28cdac7abd1fc56555bc1bb042512c90d8340c1ec09c5791b3872a305bf83723252bbde5855b75d958c041083457765c4cfd170732d09238
 DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff
@@ -35,8 +37,9 @@ EBUILD glibc-2.25-r11.ebuild 6071 BLAKE2B aed6cdc8141eb47e7f734ca59e98314d0c5340
 EBUILD glibc-2.30-r9.ebuild 43403 BLAKE2B 039f1e866d0ecbe7e6805265694800ed4873a5643b5ccbaedd18c24ab42bdb2797bd4a597d3cb5321a527eb4feda555b31a143ce80f984774f2ae5498b57c45f SHA512 b9843ca092e6814b23ac1b9741bec02bd9d54a6d48df3caf451e65eae8db2068137a425c9d03d86daccdf67c856f8bf1c8200b8c95461fcbc7aa790599fdccd6
 EBUILD glibc-2.31-r7.ebuild 44522 BLAKE2B 1adfba68c35d3af5ec8476b2fe5d3bebf13880eeacb5aaa8438b41b98f5b275f0816a0e654446f62ee2f34f412c5c6e72befcc0deb8988b6faec2c53a07601a9 SHA512 5247b1d75efa86b1a1c85a09219f54d402aae8aaecf0e377ca663a984daf7c69ea97b3072fe83a20002ec7d72661ec7737fbc72982122b58c26cb5bc89997548
 EBUILD glibc-2.32-r8.ebuild 44853 BLAKE2B 724f95c0ed2cda18dc2edcaa03b0783a2bc603b72a67e1451535040ddc83be6d1a90ad4b30f9623140b5c0a329ecafb6f19793390137e629d43a3c26e202b28a SHA512 0973b86c266e40203e301cf0c6f8fddc4273c002ffb8fd6c16f6e78f2cfdfbea95fda04adfebb8ee84a14dc950763ba706eadadb2e83f7982b800bee636d5d8f
-EBUILD glibc-2.33-r1.ebuild 45207 BLAKE2B 0512c0b719895136a6a5ab76e2625805539c8733403d3738ddc5d069f5d74fdc3592e3fa4fd8865d839c179189260fa74f6a37eaa4ae1e26f008eab60484cbf7 SHA512 42c84f34a6559ebd3d957d6a73a757a542f83f34ba32c98bd013b8b392329816f3e2c09c37afb24fbbfb1a6720ccd2321ed3d555102c0b5a0e797a36995eb6f8
-EBUILD glibc-2.33-r5.ebuild 46548 BLAKE2B 242f7ec2f124fc172e89e21602a8fda9b1ce0d92ac953237736cc83afedb81fbbc7a2204ee99a2149e86a88310ec5d5d229d2db4be47bc93beec0389fc28c3b0 SHA512 f825bede4d8bc7bfebe030ec987fc90dabade3ab8df53cb163227d9bd81395f52d02819e3c65e996c3e1847d6190e3ca42768aef50b3c70636afb634a29ad3ff
+EBUILD glibc-2.33-r1.ebuild 45234 BLAKE2B 2a698cab717d087df0f991d2849cd293e9b7504265f1049906d64d36cabf7bd7d44204db38da3ea95984dec6908ae665d471ff1cf077c1b89d9677fec6447224 SHA512 d8799b40c1f61ed11f081285af9998fcfa025cc0b11eeed1de2798f3524ad9b8771708b01f1853ee203875ba881659c7a863ecebd363840dea4118d942b17b22
+EBUILD glibc-2.33-r5.ebuild 46575 BLAKE2B 077bf1b4f462242a54d3730f9c5ee0cb137958b0687f40408f4af12f1665cdc0eceb82b05578a4448f7f0f4892da5c489b90996803ce0fd58e2d3c1d3f3ed434 SHA512 c807e788d85ecfeb8d9ade66ceb757976294b1ebb8aae17dabeb46be6304c14f643ecd1bd893591a24448ab4b27b6be57c30460c4ae702d30a5fb6d2ce4b819e
 EBUILD glibc-2.33.ebuild 43992 BLAKE2B b5fd1fa3b2e2b727574028241e7805cab448b37d3975502f12140e2cd6cf98784af36393a1116c13ebaa490db3f18b7b20a56bd53343015abc521201c193eb3f SHA512 911c152ce3ff50ff79db9d53b570ff0fcf837549a072656fef8ad429d02788f89d6ee1266605c539dcbcf273aa791cf075043e8b4895eb8d67404be531631086
-EBUILD glibc-9999.ebuild 46809 BLAKE2B 4d0728aaccb95fae5aed73bcc14c1cf1301ec021b39772ffa281b8112f7e8c4ffb2a4e794197657ec66df62e87c1147fd64004e444e9bfc04d89025782487fd8 SHA512 fe4e3d759c7efb4926b987ebb10de093355e5afe8cdc63c9c893d3e923a78681f4563df1c0813470117262a49acf0acedad9b26485ed247f704e71d34a218d67
+EBUILD glibc-2.34.ebuild 46846 BLAKE2B a879fcda54e7fb31e86992fd1a0f1beb06472f99033e886d8ab84aef7fefd853cae341707f15c12a5da8089dd947dd01914d97d4833de1563c44785ed35036ae SHA512 7c0cba27ac833a9c20c9d7072be33f3de3ebe46112854c4640917de68d655d04005a28e60820d5e258561bdc9bc7fe35d970cb73b2b197b0d1ecc0ed20d76673
+EBUILD glibc-9999.ebuild 46844 BLAKE2B f509268bfe2452c28f5e75565ef2c704251452dc090ae9c0f1c01a37bafa450f65dae6b4a19b6fe968cc3eb9ae1dfd272c7f776001dc0999e5c60158caa6545a SHA512 27fde2de8f1aa15de4e6df6a7d04c416832628cf7420267485a624e2f6cffb9a7f464cb34e0ed2de78c69ff1a4f99951756cf7d6389dec4ca3ed4e05c7c972db
 MISC metadata.xml 1611 BLAKE2B 3bd777c160ea20cdbd86cca791d9fd4ff02f8d100344235ec74fff37d5cae1e7119e0ec26969707e75a983dcdb23e994559c8be128ef40fa0ec9ed655017466d SHA512 08be6d085ac47b140fff17a3be8cee77e066a4536cdce76fa44c77875dec2a9dc236ff67ff44301abf75cb196d1902feb2a139dda420220248b46dd9cdb16b9f
diff --git a/sys-libs/glibc/glibc-2.33-r1.ebuild b/sys-libs/glibc/glibc-2.33-r1.ebuild
index fe0ef6cbb240..bf6573015127 100644
--- a/sys-libs/glibc/glibc-2.33-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.33-r1.ebuild
@@ -94,7 +94,7 @@ fi
 
 BDEPEND="
 	${PYTHON_DEPS}
-	>=app-misc/pax-utils-0.1.10
+	>=app-misc/pax-utils-1.3.1
 	sys-devel/bison
 	doc? ( sys-apps/texinfo )
 	!compile-locales? (
@@ -112,7 +112,6 @@ COMMON_DEPEND="
 	suid? ( caps? ( sys-libs/libcap ) )
 	selinux? ( sys-libs/libselinux )
 	systemtap? ( dev-util/systemtap )
-	!<net-misc/openssh-8.1_p1-r2
 "
 DEPEND="${COMMON_DEPEND}
 	compile-locales? (
@@ -127,6 +126,8 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/grep
 	virtual/awk
 	sys-apps/gentoo-functions
+	!<app-misc/pax-utils-1.3.1
+	!<net-misc/openssh-8.1_p1-r2
 "
 
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/glibc/glibc-2.33-r5.ebuild b/sys-libs/glibc/glibc-2.33-r5.ebuild
index 8c7ab1e3d329..65857001c425 100644
--- a/sys-libs/glibc/glibc-2.33-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.33-r5.ebuild
@@ -97,7 +97,7 @@ fi
 
 BDEPEND="
 	${PYTHON_DEPS}
-	>=app-misc/pax-utils-0.1.10
+	>=app-misc/pax-utils-1.3.1
 	sys-devel/bison
 	doc? ( sys-apps/texinfo )
 	!compile-locales? (
@@ -115,7 +115,6 @@ COMMON_DEPEND="
 	suid? ( caps? ( sys-libs/libcap ) )
 	selinux? ( sys-libs/libselinux )
 	systemtap? ( dev-util/systemtap )
-	!<net-misc/openssh-8.1_p1-r2
 "
 DEPEND="${COMMON_DEPEND}
 	compile-locales? (
@@ -130,6 +129,8 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/grep
 	virtual/awk
 	sys-apps/gentoo-functions
+	!<app-misc/pax-utils-1.3.1
+	!<net-misc/openssh-8.1_p1-r2
 "
 
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/glibc/glibc-2.34.ebuild b/sys-libs/glibc/glibc-2.34.ebuild
new file mode 100644
index 000000000000..b9c6d96cb9f1
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.34.ebuild
@@ -0,0 +1,1558 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+TMPFILES_OPTIONAL=1
+
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing tmpfiles
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=1
+PATCH_DEV=dilfridge
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+else
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS=""
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20201208
+
+LOCALE_GEN_VER=2.10
+
+GLIBC_SYSTEMD_VER=20210729
+
+SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
+SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )"
+
+IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemd systemtap test vanilla"
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# Note [Disable automatic stripping]
+# Disabling automatic stripping for a few reasons:
+# - portage's attempt to strip breaks non-native binaries at least on
+#   arm: bug #697428
+# - portage's attempt to strip libpthread.so.0 breaks gdb thread
+#   enumeration: bug #697910. This is quite subtle:
+#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
+#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
+#     via 'ps_pglobal_lookup' symbol defined in gdb.
+#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
+#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
+#     (unexported) is used to sanity check compatibility before enabling
+#     debugging.
+#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
+#   * normal 'strip' command trims '.symtab'
+#   Thus our main goal here is to prevent 'libpthread.so.0' from
+#   losing it's '.symtab' entries.
+# As Gentoo's strip does not allow us to pass less aggressive stripping
+# options and does not check the machine target we strip selectively.
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+# Lastly, let's avoid some openssh nastiness, bug 708224, as
+# convenience to our users.
+
+# gzip, grep, awk are needed by locale-gen, bug 740750
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/pax-utils-1.3.3
+	sys-devel/bison
+	doc? ( sys-apps/texinfo )
+	!compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
+"
+COMMON_DEPEND="
+	gd? ( media-libs/gd:2= )
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-util/systemtap )
+"
+DEPEND="${COMMON_DEPEND}
+	compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
+	test? ( >=net-dns/libidn2-2.3.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/gzip
+	sys-apps/grep
+	virtual/awk
+	sys-apps/gentoo-functions
+	!<app-misc/pax-utils-1.3.3
+	!<net-misc/openssh-8.1_p1-r2
+"
+
+RESTRICT="!test? ( test )"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	BDEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.27
+		>=${CATEGORY}/gcc-6
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	BDEPEND+="
+		>=sys-devel/binutils-2.27
+		>=sys-devel/gcc-6
+	"
+	DEPEND+=" virtual/os-headers "
+	RDEPEND+="
+		>=net-dns/libidn2-2.3.0
+		vanilla? ( !sys-libs/timezone-data )
+	"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+# Ignore tests whitelisted below
+GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
+
+# The following tests fail due to the Gentoo build system and are thus
+# executed but ignored:
+XFAIL_TEST_LIST=(
+	# 9) Failures of unknown origin
+	tst-latepthread
+
+	# buggy test, assumes /dev/ and /dev/null on a single filesystem
+	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
+	# https://sourceware.org/PR25909
+	tst-support_descriptors
+
+	# Flaky test, known to fail occasionally:
+	# https://sourceware.org/PR19329
+	# https://bugs.gentoo.org/719674#c12
+	tst-stack4
+)
+
+#
+# Small helper functions
+#
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+	is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+	is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	# Most of the time CC is already set, but not in early sanity checks.
+	nonfatal emake glibc-test CC="${CC-$(tc-getCC ${CTARGET})}"
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# TODO: See cross-compile issues listed above for x86.
+			[[ ${ABI} == x86 ]] &&
+			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				# Normally the target is x86_64-xxx, so turn that into the -march that
+				# gcc actually accepts. #528708
+				[[ ${t} == "x86_64" ]] && t="x86-64"
+				filter-flags '-march=*'
+				# ugly, ugly, ugly.  ugly.
+				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		ppc|ppc64)
+			# Many arch-specific implementations do not work on ppc with
+			# cache-block not equal to 128 bytes. This breaks memset:
+			#   https://sourceware.org/PR26522
+			#   https://bugs.gentoo.org/737996
+			# Use default -mcpu=. For ppc it means non-multiarch setup.
+			filter-flags '-mcpu=*'
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				cpu="sparc64"
+				case $(get-flag mcpu) in
+				v9)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				*)
+					cpu="sparcv9"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Allow users to explicitly avoid flag sanitization via
+	# USE=custom-cflags.
+	if ! use custom-cflags; then
+		# Over-zealous CFLAGS can often cause problems.  What may work for one
+		# person may not work for another.  To avoid a large influx of bugs
+		# relating to failed builds, we strip most CFLAGS out to ensure as few
+		# problems as possible.
+		strip-flags
+		# Lock glibc at -O2; we want to be conservative here.
+		filter-flags '-O?'
+		append-flags -O2
+	fi
+	strip-unsupported-flags
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# ld can't use -r & --relax at the same time, bug #788901
+	# https://sourceware.org/PR27837
+	filter-ldflags '-Wl,--relax'
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# glibc's headers disallow -O0 and fail at build time:
+	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
+	replace-flags -O0 -O1
+
+	filter-flags '-fstack-protector*'
+}
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	case $(tc-arch) in
+		x86)
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
+			return 1
+		;;
+	esac
+	return 0
+}
+
+want__thread() {
+	want_tls || return 1
+
+	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
+	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+	# only test gcc -- can't test linking yet
+	tc-has-tls -c ${CTARGET}
+	WANT__THREAD=$?
+
+	return ${WANT__THREAD}
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if just_headers ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+	local VAR=CFLAGS_${ABI}
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other.
+	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET})}
+	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	echo "${b}"
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ -z ${ROOT} ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	# Users have had a chance to phase themselves, time to give em the boot
+	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
+		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
+		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
+		die "Lazy upgrader detected"
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then
+		ebegin "Checking gcc for __thread support"
+		if ! eend $(want__thread ; echo $?) ; then
+			echo
+			eerror "Could not find a gcc that supports the __thread directive!"
+			eerror "Please update your binutils/gcc and try again."
+			die "No __thread support in gcc!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+			if ! eend_KV ${build_kv} ${want_kv} ; then
+				echo
+				eerror "You need linux-headers of at least ${want_kv}!"
+				die "linux-headers version too low!"
+			fi
+		fi
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	# All the checks...
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+}
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+	# Consistency is not guaranteed between pkg_ and src_ ...
+	sanity_prechecks
+
+	use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	setup_env
+
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patches || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
+	use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
+}
+
+src_prepare() {
+	local patchsetname
+	if ! use vanilla ; then
+		if [[ ${PV} == 9999* ]] ; then
+			patchsetname="from git master"
+		else
+			patchsetname="${RELEASE_VER}-${PATCH_VER}"
+		fi
+		einfo "Applying Gentoo Glibc Patchset ${patchsetname}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}"
+	find . -name configure -exec touch {} +
+
+	# move the external locale-gen to its old place
+	mkdir extra || die
+	mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
+
+	eprefixify extra/locale/locale-gen
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}"
+}
+
+glibc_do_configure() {
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	# CXX isnt handled by the multilib system, so if we dont unset here
+	# we accumulate crap across abis
+	unset CXX
+
+	einfo "Configuring glibc for nptl"
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM READELF; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}"
+
+	if is_crosscompile; then
+		# Assume worst-case bootstrap: glibc is buil first time
+		# when ${CTARGET}-g++ is not available yet. We avoid
+		# building auxiliary programs that require C++: bug #683074
+		# It should not affect final result.
+		export libc_cv_cxx_link_ok=no
+		# The line above has the same effect. We set CXX explicitly
+		# to make build logs less confusing.
+		export CXX=
+	fi
+	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
+
+	# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
+	# can't detect them automatically due to ${CHOST} mismatch and fallbacks
+	# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
+	export NM="$(tc-getNM ${CTARGET})"
+	export READELF="$(tc-getREADELF ${CTARGET})"
+	einfo " $(printf '%15s' 'Manual NM:')   ${NM}"
+	einfo " $(printf '%15s' 'Manual READELF:')   ${READELF}"
+
+	echo
+
+	local myconf=()
+
+	case ${CTARGET} in
+		m68k*)
+			# setjmp() is not compatible with stack protection:
+			# https://sourceware.org/PR24202
+			myconf+=( --enable-stack-protector=no )
+			;;
+		*)
+			# Use '=strong' instead of '=all' to protect only functions
+			# worth protecting from stack smashes.
+			# '=all' is also known to have a problem in IFUNC resolution
+			# tests: https://sourceware.org/PR25680, bug #712356.
+			myconf+=( --enable-stack-protector=$(usex ssp strong no) )
+			;;
+	esac
+	myconf+=( --enable-stackguard-randomization )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
+	case ${CTARGET} in
+		x86_64-*) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		--sysconfdir="$(host_eprefix)/etc"
+		--localstatedir="$(host_eprefix)/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_enable crypt)
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable static-pie)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+
+		# locale data is arch-independent
+		# https://bugs.gentoo.org/753740
+		libc_cv_complocaledir='${exec_prefix}/lib/locale'
+
+		# -march= option tricks build system to infer too
+		# high ISA level: https://sourceware.org/PR27318
+		libc_cv_include_x86_isa_level=no
+		# Explicit override of https://sourceware.org/PR27991
+		# exposes a bug in glibc's configure:
+		# https://sourceware.org/PR27991
+		libc_cv_have_x86_lahf_sahf=no
+		libc_cv_have_x86_movbe=no
+
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+	# We take care of patching our binutils to use both hash styles,
+	# and many people like to force gnu hash style only, so disable
+	# this overriding check.  #347761
+	export libc_cv_hashstyle=no
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
+		echo 'main(){}' > "${T}"/test.c
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	case ${CTARGET} in
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	local myconf=()
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+do_src_compile() {
+	emake -C "$(builddir nptl)"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+
+	local myxfailparams=""
+	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
+		for myt in ${XFAIL_TEST_LIST[@]} ; do
+			myxfailparams+="test-xfail-${myt}=yes "
+		done
+	fi
+
+	# sandbox does not understand unshare() and prevents
+	# writes to /proc/, which makes many tests fail
+
+	SANDBOX_ON=0 LD_PRELOAD= emake ${myxfailparams} check
+}
+
+do_src_test() {
+	local ret=0
+
+	glibc_src_test
+	: $(( ret |= $? ))
+
+	return ${ret}
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	# Give tests more time to complete.
+	export TIMEOUTFACTOR=5
+
+	foreach_abi do_src_test || die "tests failed"
+}
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local inplace=""
+
+	if [[ "${root}" == "--inplace-glibc" ]] ; then
+		inplace="--inplace-glibc"
+		root="$2"
+	fi
+
+	local locale_list="${root}/etc/locale.gen"
+
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root}/usr/share/i18n/SUPPORTED"
+	fi
+
+	set -- locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
+		--destdir "${root}"
+	echo "$@"
+	"$@"
+
+	popd >/dev/null
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	# Avoid stripping binaries not targeted by ${CHOST}. Or else
+	# ${CHOST}-strip would break binaries build for ${CTARGET}.
+	is_crosscompile && dostrip -x /
+	# gdb thread introspection relies on local libpthreas symbols. stripping breaks it
+	# See Note [Disable automatic stripping]
+	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
+
+	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		# riscv
+		ilp32d  /lib/ld-linux-riscv32-ilp32d.so.1
+		ilp32   /lib/ld-linux-riscv32-ilp32.so.1
+		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
+		lp64    /lib/ld-linux-riscv64-lp64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+			# ELFv2 (glibc does not support ELFv1 on LE)
+			ppc64   /lib64/ld64.so.2
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+			# ELFv1 (glibc does not support ELFv2 on BE)
+			ppc64   /lib64/ld64.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# In the LSB 5.0 definition, someone had the excellent idea to "standardize"
+	# the runtime loader name, see also https://xkcd.com/927/
+	# Normally, in Gentoo one should never come across executables that require this.
+	# However, binary commercial packages are known to adhere to weird practices.
+	# https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-AMD64/LSB-Core-AMD64.html#BASELIB
+	local lsb_ldso_name native_ldso_name lsb_ldso_abi
+	local lsb_ldso_abi_list=(
+		# x86
+		amd64	ld-linux-x86-64.so.2	ld-lsb-x86-64.so.3
+	)
+	for (( i = 0; i < ${#lsb_ldso_abi_list[@]}; i += 3 )) ; do
+		lsb_ldso_abi=${lsb_ldso_abi_list[i]}
+		native_ldso_name=${lsb_ldso_abi_list[i+1]}
+		lsb_ldso_name=${lsb_ldso_abi_list[i+2]}
+		has ${lsb_ldso_abi} $(get_install_abis) || continue
+
+		if [[ ! -L ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} && ! -e ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} ]] ; then
+			dosym ${native_ldso_name} "$(alt_prefix)/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name}"
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+	cd "${WORKDIR}"/extra/locale
+	dosbin locale-gen
+	doman *.[0-8]
+	insinto /etc
+	doins locale.gen
+
+	keepdir /usr/lib/locale
+
+	cd "${S}"
+
+	# Install misc network config files
+	insinto /etc
+	doins posix/gai.conf
+
+	if use systemd ; then
+		doins "${WORKDIR}/glibc-systemd-${GLIBC_SYSTEMD_VER}/gentoo-config/nsswitch.conf"
+	else
+		doins nss/nsswitch.conf
+	fi
+
+	# Gentoo-specific
+	newins "${FILESDIR}"/host.conf-1 host.conf
+
+	if use nscd ; then
+		doins nscd/nscd.conf
+
+		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		use systemd && systemd_dounit nscd/nscd.service
+		newtmpfiles nscd/nscd.tmpfiles nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen --inplace-glibc "${ED}/"
+		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+
+	if ! use static-libs ; then
+		einfo "Not installing static glibc libraries"
+		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+	fi
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	# first let's find the actual dynamic linker here
+	# symlinks may point to the wrong abi
+	local newldso=$(find . -name 'ld*so.?' -type f -print -quit)
+
+	einfo Last-minute run tests with ${newldso} in /$(get_libdir) ...
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		${newldso} --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ -n ${ROOT} ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+
+	if [[ -L ${EROOT}/usr/lib/locale ]]; then
+		# Help portage migrate this to a directory
+		# https://bugs.gentoo.org/753740
+		rm "${EROOT}"/usr/lib/locale || die
+	fi
+
+	# Keep around libcrypt so that Perl doesn't break when merging libxcrypt
+	# (libxcrypt is the new provider for now of libcrypt.so.{1,2}).
+	# bug #802207
+	if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]"; then
+		PRESERVED_OLD_LIBCRYPT=1
+		preserve_old_lib /$(get_libdir)/libcrypt$(get_libname 1)
+		cp "${EROOT}"/usr/include/crypt.h "${T}"/crypt.h || die
+	else
+		PRESERVED_OLD_LIBCRYPT=0
+	fi
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
+	fi
+
+	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
+		use compile-locales || run_locale_gen "${EROOT}/"
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+
+	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
+		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
+		cp "${T}"/crypt.h "${EROOT}"/usr/include/crypt.h || eerror "Error restoring crypt.h, please file a bug"
+		elog "Please ignore a possible later error message about a file collision involving"
+		elog "/usr/include/crypt.h. We need to preserve this file for the moment to keep"
+		elog "the upgrade working, but it also needs to be overwritten when"
+		elog "sys-libs/libxcrypt is installed. See bug 802210 for more details."
+	fi
+}
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 60bd75d08acd..564367df0b9d 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -678,7 +678,7 @@ sanity_prechecks() {
 	fi
 
 	# When we actually have to compile something...
-	if ! just_headers ; then
+	if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then
 		ebegin "Checking gcc for __thread support"
 		if ! eend $(want__thread ; echo $?) ; then
 			echo
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index 5fa9f88ce09b..67a868412c93 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,5 +1,5 @@
 DIST kpmcore-20.12.3.tar.xz 584264 BLAKE2B de80d48bb6becb3e8d6f5b9b4456e4ad4e220ca52d76700c6be33942c5d762e1fc39b43b3595894a3d28605d7010662ebec588c3f1d3a4525a9efe797dbf65ed SHA512 90083374bbc4b91e948e9ef8e3e272cf7bd6b038261414c7e08eea1a903bd61c723f29a4afe462e29c1a083c6771be435fd4dfbf8a364c2c167f1eed19d04323
 DIST kpmcore-21.04.3.tar.xz 586264 BLAKE2B b9733f8b941fed98503e78b9c0357e002df92a39c4e70885822f6bb8944cf2c76be1fbba23e4cedf104b46a95832e72d2384c0d78abde312e0b2be40aa4d5745 SHA512 44614e3a0db646b81e56b87daa841b7b7e03ff97699ea393d83b6cc61e6c12efa36ac6b8aba87da612f2973a1d108bdad21ef0d73fc2db98595e5b711e5a0fcf
 EBUILD kpmcore-20.12.3.ebuild 749 BLAKE2B 0e0cd54e67d6fed17f721cf615ac5ebb0a405ed67a7338834d235e15e156119cbd0f8fe9489abb13231e47b89b975314f0fc84f7576833b1262cd6823a4cc1ba SHA512 4db6919ded366d2c343f68c84e929727a0cc6cc2762f886f4a087829b1c30b1f350d20fdaa57fe89cc041f96b30150e79f5966b7f9f968c41a5b79cc63af67d9
-EBUILD kpmcore-21.04.3.ebuild 741 BLAKE2B 41fa2450cc6387ee771ba56aa2e62343b656fd6dcf55076a3105550205dd10f72d0a974fcde784117a1c94274e2c2b4ad2c29c3891391b091944ba130cb39a4e SHA512 c9e94cf51a85e97536686f65011166b5d88504348c99d2d0ceab5fc259f3f42c06d46a986806ed963042b93419c67e41c753df38fe222b58485f2e4f25f9bdc3
+EBUILD kpmcore-21.04.3.ebuild 739 BLAKE2B e2e9d5d52455505c26ab307b474b0011c1c619744093f780f1fda1bee8aefc5fb87edf5d50313e7bda211b8522cf1c55f0e134d2231f25612d68866243df3665 SHA512 1e5f2062dd648e5832b89a2f2ebd39f2eeaf47bb524453e71aa4d9adb31c0f10580767a461b9f85f0758a6314ff974781609659cdbb268a30051615948eaffaa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-libs/kpmcore/kpmcore-21.04.3.ebuild b/sys-libs/kpmcore/kpmcore-21.04.3.ebuild
index 202540698757..af64abdb788d 100644
--- a/sys-libs/kpmcore/kpmcore-21.04.3.ebuild
+++ b/sys-libs/kpmcore/kpmcore-21.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/partitionmanager/"
 
 LICENSE="GPL-3"
 SLOT="5/10"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 # bug 689468, tests need polkit etc.
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 676d4b8e5f59..e286325ff3a3 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -4,6 +4,6 @@ DIST ldb-2.2.1.tar.gz 1676819 BLAKE2B 794575d5bd7d33dcd586cb5de6c392411795c467f4
 DIST ldb-2.3.0.tar.gz 1686378 BLAKE2B b31949e14a41f6fc99ef022e4072021d135037d835aeca80ee81a58ed20cab4f8cbd96e394f59460df11e2424e2e263d5fb01b9cebbfb4ca1bcc77162e93ed3f SHA512 7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348
 DIST ldb-2.4.0.tar.gz 1689484 BLAKE2B 904d74900011ce3f63ad1c24fe88b1a090e835c68829ddfda5e8af2c0ab3674d7a8cd9a62b95c1f38f26578d0704556d3562e46e21a54cbb44a15b9d83676521 SHA512 6c500b723c081488bc0717b6a5b0e8966c5d8a751232f8856281a6fe4d358ae6b5878c8400a82fa666379066105fbb9259b2967313e73efabef0e1386095e2ee
 EBUILD ldb-2.2.1-r1.ebuild 2932 BLAKE2B 004dc7b83fcd5705135df1e4848a49296b75d850152bc41bfff56ea1c352fd4a0e4f6074a0b96a54576e594b1f8f79ad669a22f39390b90489654180665fcf1c SHA512 8ec5dd9111c238dbad97e0a1ae1f0ebaf90a4e8e083dca3946e597a7d28922ae72ccedfa3e9b6425a997a3f2d21abf7c407231808415076b0dfc2126d47cd164
-EBUILD ldb-2.3.0-r1.ebuild 2945 BLAKE2B 3206c45d381d82395b3f4862d7784f5657e4ee813a94f625a0f6d7a37edc6d8a0160a171d6167a70bf41bff77362982ce6a52d4da2fd26513a694ee7c04f349f SHA512 aaafae8b4f21815701e955c6a4e9f876a55919a0795d343b544afae5b423cc938d4ed0b8a28b500f7b1187330a37507d257db9e48a3bb7a2c0447638bab56d50
+EBUILD ldb-2.3.0-r1.ebuild 2942 BLAKE2B 462a024d8fb1eb9c1b3e1b1e038b92333681c64b9d1ad03c2e590fb3de4f7a6224314d2cd3935d4810f4316d9a0a17e95d5c920cbc8fe5285fe1859f3dfd44d1 SHA512 c13f21a177ebb9583def8fae9d2f3c9ca6212f8158da846d811c8eee667c7bae2a3856800626839e5842242082d98b80c1eca30cc6282ba744825ff46d6b6f9f
 EBUILD ldb-2.4.0-r1.ebuild 2946 BLAKE2B dde6e4beeec5907b3e32cfbc675bbd08d1f52081fd547d58e30b490305000c36be8a8d55b3daf9ad8b21edc8c7bc90fbd8984dad1bdff90273d1c66b3eb0b0ab SHA512 9994c7964012f99db5c6d2972e6e0a750a3632fcc25d0a6435fbc42bea3b067f8853efe018f7b9e25ea41420f9de325aff1c2e42fae8501c3ec314a9f2494c04
 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
diff --git a/sys-libs/ldb/ldb-2.3.0-r1.ebuild b/sys-libs/ldb/ldb-2.3.0-r1.ebuild
index 9af82267e426..af3afbf29527 100644
--- a/sys-libs/ldb/ldb-2.3.0-r1.ebuild
+++ b/sys-libs/ldb/ldb-2.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc ldap +lmdb python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index d2f268a0e096..5fe81eddc4ed 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,8 +1,6 @@
-DIST libblockdev-2.24.tar.gz 905838 BLAKE2B dcc31021d72c2a4f92d8f70387537ec409302e85a9bdb338a09449b02318113d40cabf7fc2f6b4aca819400baccba69a9f67a616b30c744cf843eeac785875e4 SHA512 92b7d734ea2cefbb67e626bef369d6785ba2a4bbbf09a4f59345febe977bc32319fb44f38b3c3177b8652abbc1f87b6cc76d41fdd2d70783c1c168049bdcb1d6
 DIST libblockdev-2.25.tar.gz 930238 BLAKE2B ae28c40b5e114826baf4a8ba9012267b297dbc4abee52669cf39c886d2c9989291f41937ec742c7457049a6a30e674f9c89ad6478923f393ae1773db3afcf621 SHA512 628d05f3a257b44208a9d0b5d84ae248fefd415812d9a93d132c03039b09fefc4d6110beb9aa0d3072e3f0c992e642d7867d0241209056538f132f86a748e195
 DIST libblockdev-2.26.tar.gz 932129 BLAKE2B 39d95db69de917449e6009fa0160b6288327b2c49b64309d17a1e4e028756d1ce170779ce1c4df926c8796d8a8ed7b9131b5d4b51115a3ea901dacdaa971961a SHA512 ddd4e9c22135bd7dad0bb9bc254ac0c63e3bacc592e7c5a0c846e367da3fc248bf6187f1c81407c3bce599d3b0ceeec9a8a0030ad8e981e245f715b35eaec523
-EBUILD libblockdev-2.24.ebuild 2607 BLAKE2B 8070fda4de97cbb3744f72abe7a26e5a158382569d2af63e094b4983485a29096f672ab9ed97e323e5b2a810697669fc8214e47ed0a685a0de43d16201437c11 SHA512 13fb01f0d87e6f9f92d8c94b59404e08976e98f7d7729801b6d5be1f929aaba2f43ce0b15249ef669fb486e2e463e9946cfa1cb72f08e0b34ea6ef0fa9d9e75a
-EBUILD libblockdev-2.25.ebuild 2614 BLAKE2B f1ae37eb906d009c780d19afe0f16a125ad61538a68bfd35b521570b21d6e0607de12229cbbe986f36a3c6e9bcec96ec5f4f5631ac419d1d9a329824da4ea55c SHA512 ae0188fa83fdf9da01e37d5dc599b5cae1e5e6f8fe5fb96440f6ca66c4f2b9a82d8cfd0a1e742ec69bb4701883e540670347715183ca86677c599d62358186fa
+EBUILD libblockdev-2.25.ebuild 2613 BLAKE2B 848c426ed0dc619799901680eb16d5d00d94c36894adf29c9b8338edb711a090d57ebadd94d6dc720217902fda2390f1d45f46c41febe3dee89333b42fd845f8 SHA512 781c02b20d97d28430ba2834998c62aff5721e6b9f36f7e2325285dbaab4eaa7adf5b2511caf6accf48d0935c9bdff455c976c7f0b4a9bebc36c31c71fd919ad
 EBUILD libblockdev-2.26.ebuild 2620 BLAKE2B abdec73cdc1336f734acd7658dc0869f3b05c0653c0cb52b976393f5e4056196cc5e98f5b1072812ae0c593d93eddcf905cb814bb592d3c2b025a738dd08174e SHA512 90894691d584bea79837c9b6c216c7104ffbe59c928ba7c3d7f491cae90650870e12489771c2c62403481580f01d3f331760a61b442a0ffcd40c2666555739e2
 EBUILD libblockdev-9999.ebuild 2620 BLAKE2B abdec73cdc1336f734acd7658dc0869f3b05c0653c0cb52b976393f5e4056196cc5e98f5b1072812ae0c593d93eddcf905cb814bb592d3c2b025a738dd08174e SHA512 90894691d584bea79837c9b6c216c7104ffbe59c928ba7c3d7f491cae90650870e12489771c2c62403481580f01d3f331760a61b442a0ffcd40c2666555739e2
 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.24.ebuild b/sys-libs/libblockdev/libblockdev-2.24.ebuild
deleted file mode 100644
index 3d13b5989022..000000000000
--- a/sys-libs/libblockdev/libblockdev-2.24.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools python-single-r1 xdg-utils
-
-DESCRIPTION="A library for manipulating block devices"
-HOMEPAGE="https://github.com/storaged-project/libblockdev"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
-	BDEPEND="
-		sys-devel/autoconf-archive
-	"
-else
-	MY_PV="${PV}-1"
-	#MY_P="${PN}-${MY_PV}"
-	#SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-	#S="${WORKDIR}/${MY_P}"
-fi
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.42.2
-	dev-libs/libbytesize
-	>=sys-apps/kmod-19
-	>=sys-apps/util-linux-2.27
-	>=sys-block/parted-3.1
-	cryptsetup? (
-		escrow? (
-			>=dev-libs/nss-3.18.0
-			dev-libs/volume_key
-		)
-		>=sys-fs/cryptsetup-1.6.7:=
-	)
-	device-mapper? ( sys-fs/lvm2 )
-	dmraid? (
-		sys-fs/dmraid
-		sys-fs/lvm2
-	)
-	lvm? (
-		sys-fs/lvm2
-		virtual/udev
-	)
-	vdo? ( dev-libs/libyaml )
-	${PYTHON_DEPS}
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND+="
-	dev-util/gtk-doc-am
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		escrow? ( cryptsetup )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset #623992
-	default
-
-	# https://bugs.gentoo.org/744289
-	find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \
-		| xargs --null sed "s@ -Werror@@" -i || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-btrfs
-		--with-fs
-		--with-part
-		--without-mpath
-		--without-nvdimm
-		$(use_enable introspection)
-		$(use_enable test tests)
-		$(use_with bcache)
-		$(use_with cryptsetup crypto)
-		$(use_with device-mapper dm)
-		$(use_with dmraid)
-		$(use_with escrow)
-		$(use_with gtk-doc)
-		$(use_with kbd)
-		$(use_with lvm lvm)
-		$(use_with lvm lvm-dbus)
-		$(use_with tools)
-		$(use_with vdo)
-		--without-python2
-		--with-python3
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-	# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
-	# doesn't work at all.
-	if ! use lvm; then
-		rm -f "${ED}"/usr/bin/lvm-cache-stats || die
-	fi
-	python_optimize #718576
-}
diff --git a/sys-libs/libblockdev/libblockdev-2.25.ebuild b/sys-libs/libblockdev/libblockdev-2.25.ebuild
index 6cf07b867f96..542a3e9e88c6 100644
--- a/sys-libs/libblockdev/libblockdev-2.25.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.25.ebuild
@@ -19,7 +19,7 @@ else
 	#MY_P="${PN}-${MY_PV}"
 	#SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 	#S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2+"
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 9b80ad6996f5..21096467e341 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -3,11 +3,11 @@ AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032
 AUX libcap-2.38-no_perl.patch 3049 BLAKE2B 77fdcda75b273fd69695161d48f37fda40375f5f36acdb31e9f9e5b7585e6933733586c6ad96673efb79a6657dbbffd4431612ed723905e9f4d595a9dd8c49c4 SHA512 f3938a8a78407639bfdda4d9c4b4096025f956430f9efbce438689aabbea74915c55c6afbd45a7af4ecc0c437ee72e9aa8335da52d3237c928702e62824e537a
 AUX libcap-2.48-build-system-fixes.patch 6274 BLAKE2B 4c81eb50b0a682ca9df03145a53e884589e0961e1b754b522f40d48fca60fe983ae93349d256e62977bf28c99c8c25763d05aa8483aebfc436664756a220d70a SHA512 5b88a5c5ea14d2270ed4018249ceb32b0c91db03ed18a6989cc44250da91887385dc3f37087f716771ddbaa90c7e3d733a64063507465eb354252d9f64b85f80
 AUX libcap-2.50-build-system-fixes.patch 6687 BLAKE2B d46b6f0734a5acd930248b29c17850447d87f4e554b4d3e79cb35d978b17552e84e27e036c3b0c4ae6573f94e9e7033a9264b646d61dc8c441c04bc6d9b12af8 SHA512 0fd3b5463dcbbaca41d7c1099be7dd370945408f3763dad68d128a650cbf62c23c653a971b07ed4cdc1b56d425caeec3775b91912635c6a2539534bd20e00756
-AUX libcap-2.50-install_capsh_again.patch 991 BLAKE2B f9260fe8d3045e7d4408d5c2ba976a7c22031f174a14c282c31df8e4ac9a7a9cfe8207bdacd0b10d4ed741030319f2524edfc6ca28abdc0040118f2e3286b350 SHA512 891f690440b6d67a2d1f32bb1a8fc51048ba2b6d8c5e0cc1543d741e1ed0b32898a7df7641382698b23056b279c7cf7ed1cfa162a1908ff6362cf011e22d632b
+AUX libcap-2.52-build-system-fixes.patch 7320 BLAKE2B 7b7de195e7cec61b395e9cbf1d8b41195079fb2b0742db2e6a53380de3e43ee038aac092b3fd69bea0906fc668abd67673a11699323c2003b4a9583ba472b59d SHA512 db569516789792020f975591a553bd4b7ca205a9bbbae6adb245fe719377f78335dcabe7ec987d5729da1052083a972ce725ecb263d990cec169a2960584e55a
 DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0
-DIST libcap-2.50.tar.xz 143792 BLAKE2B be83dfe1e55a4363936f53afb13edd2c1fd8c9bc27f7946bfda1eb8fb3046d0370997dcf85ba9dab7de10673527b4e8d15f104a75eaf407cba8ed0fc42465790 SHA512 6ac2df1ea9a9154e082c0595d343380ff8abed953b53c635a9297683289f2fa708eff488a42c6053e5ac556a5d90faa8709b3d98a47b2911f05bf80f2663a543
 DIST libcap-2.51.tar.xz 145440 BLAKE2B 9f004e28891fbbb3552016e2e9250eab38935b6b40ad9e808a64ab07eecb52c5fa9032caed0baab719df8afe9aeec98403d10b05336bebe15a50b64020e5afc2 SHA512 3b4a97ef864a2ce2f87056ebc282223b0c71ca71c539744dc629ffe7905ca5fdde937ca70c34ec84406fe54863d39abf32775818a5e5a6fdf3069706b1723a88
+DIST libcap-2.52.tar.xz 158720 BLAKE2B 0696ae00a485df019f5441efe1d71676ddf294f1116e7fc3f352ad0595f9d4830f2e4fac1f98353016de36a4866f9d018f53419970ccd114c6df0faa556bcea3 SHA512 95d9e0f81fd955c42a0f299163a4402f00e9e7a2b392dfbabe613abea4babba2730576e76c9b612665a0bb8bd88aa98bf28ea3eb5582b5c06cd1137594a59893
 EBUILD libcap-2.49.ebuild 2195 BLAKE2B b5950f22f86e8ee2008751b9ab76013d603c201e5b1c1665c34f4d7e31bb2102ad1e3ad1c0ad67b2ca48ae5f76ba4c12169f61493a3861e97f1744a3d5355133 SHA512 2a84719633d35cd16a301cbdcde67dc1ee4e7f1f04c043303404d1b088529491fdfdfadd29c3eb5f8a2afbfe7dede105885063322645bca986ffcdf002bb42ee
-EBUILD libcap-2.50-r1.ebuild 2263 BLAKE2B c05c69b56c92c537dbfa49a48ce1090552c274e638638c6e934ed8b97fb872169d077b07a73e7439210ce9d7a0a3cd935692ae766669603d9482a64f0e3d7eaa SHA512 5f667e05321f15f55ced0dc98520429085808cbbc751f9c7aeab2e75067512fc03fe04bb0f41d27390ea634cc0a2f8a30856142bbd8cbc633042e41163082f07
 EBUILD libcap-2.51.ebuild 2203 BLAKE2B 399ce7893f4ca837e9dfef9812c20f59d415e713ce8c8e12e314c9661afbff6eec1be46550b75d2b853babf4cf1b10d51272ab3b8effc3d3cfe20f6244f9bc12 SHA512 c156a98c337eb09e24a36bbe746d1f724f360df9d53a6e551ee556bf0d794414c505251611e2dd7fafbe759b1550837d609eada16dea2354e5e13fc9f4995902
+EBUILD libcap-2.52.ebuild 2146 BLAKE2B d9876af9fcd0de4fd1e1289ec51e1697700162c57c7222a3a63c5a8faff5233458cc2251e66914768d6ce2a46ce95ff5dde738388054480f4fafcdc5c8a7b7d2 SHA512 ca8d558788aa27fc57270906e6df1f10f50135ccf8e2c5fc329f3f2c15358a6dbed9e0bcc0962f810387f3bf3bd963c757a873f646740885631640ba15d2346e
 MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
diff --git a/sys-libs/libcap/files/libcap-2.50-install_capsh_again.patch b/sys-libs/libcap/files/libcap-2.50-install_capsh_again.patch
deleted file mode 100644
index 0ae7520dc7b9..000000000000
--- a/sys-libs/libcap/files/libcap-2.50-install_capsh_again.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1f8d32942be54850a3a89c7b58ba5613b5525c58 Mon Sep 17 00:00:00 2001
-From: "Andrew G. Morgan" <morgan@kernel.org>
-Date: Fri, 28 May 2021 13:41:17 -0700
-Subject: [PATCH] Make capsh an installed binary again
-
-Bug report from Jan Palus:
-
-  https://bugzilla.kernel.org/show_bug.cgi?id=213261
-
-Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
----
- progs/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/progs/Makefile b/progs/Makefile
-index 313dc4d..3c3dc97 100644
---- a/progs/Makefile
-+++ b/progs/Makefile
-@@ -32,14 +32,14 @@ $(BUILD): %: %.o $(DEPS)
- 
- install: all
- 	mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
--	for p in $(PROGS) ; do \
-+	for p in $(PROGS) capsh ; do \
- 		install -m 0755 $$p $(FAKEROOT)$(SBINDIR) ; \
- 	done
- ifeq ($(RAISE_SETFCAP),yes)
- 	$(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap
- endif
- 
--test: $(PROGS)
-+test: $(PROGS) capsh
- 
- capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh
- 	./mkcapshdoc.sh > $@
--- 
-2.32.0.rc2
-
diff --git a/sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch
new file mode 100644
index 000000000000..2d6b441c485d
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-2.52-build-system-fixes.patch
@@ -0,0 +1,219 @@
+From 0e977b8595d4e8690bd3f3a816c9ec407dca5ba6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 4 Nov 2020 22:46:20 +0100
+Subject: [PATCH] build system fixes
+
+This touches up the homebrewed build system to work much better "out of the
+box" for people.  Specifically:
+        - allow toolchain vars to be set via environment
+        - CC / BUILD_CC / AR / RANLIB
+        - CFLAGS / CPPFLAGS / LDFLAGS
+        - split CPPFLAGS out of CFLAGS
+        - break -fPIC out of global CFLAGS and only use where needed
+        - use LDLIBS for libraries, not LDFLAGS
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+Forward ported from libcap-2.24 to libcap-2.25
+Forward ported from libcap-2.25 to libcap-2.28
+Forward ported from libcap-2.28 to libcap-2.29
+Forward ported from libcap-2.29 to libcap-2.33
+Forward ported from libcap-2.33 to libcap-2.34
+Forward ported from libcap-2.34 to libcap-2.37
+Forward ported from libcap-2.37 to libcap-2.39
+Forward ported from libcap-2.39 to libcap-2.42
+Forward ported from libcap-2.42 to libcap-2.44
+Forward ported from libcap-2.44 to libcap-2.45
+Forward ported from libcap-2.45 to libcap-2.48
+Forward ported from libcap-2.48 to libcap-2.50
+Forward ported from libcap-2.50 to libcap-2.52
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Make.Rules       | 10 ++++++----
+ Makefile         |  1 -
+ libcap/Makefile  |  7 ++++---
+ pam_cap/Makefile | 10 ++++++----
+ progs/Makefile   |  4 ++--
+ tests/Makefile   |  6 ++++--
+ 6 files changed, 22 insertions(+), 16 deletions(-)
+
+diff --git a/Make.Rules b/Make.Rules
+index 8f7906c..fea4c78 100644
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -52,18 +52,13 @@ GOMAJOR=1
+ # Compilation specifics
+ 
+ KERNEL_HEADERS := $(topdir)/libcap/include/uapi
+-IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+ 
+-CC := $(CROSS_COMPILE)gcc
+ DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ COPTS ?= -O2
+ CFLAGS ?= $(COPTS) $(DEFINES)
+ BUILD_CC ?= $(CC)
+ BUILD_COPTS ?= -O2
+-BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH)
+-AR := $(CROSS_COMPILE)ar
+-RANLIB := $(CROSS_COMPILE)ranlib
+-OBJCOPY := $(CROSS_COMPILE)objcopy
++BUILD_CFLAGS ?= $(CFLAGS)
+ DEBUG = -g #-DDEBUG
+ WARNINGS=-Wall -Wwrite-strings \
+         -Wpointer-arith -Wcast-qual -Wcast-align \
+@@ -77,10 +72,13 @@
+ 
+ BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
+ 
+-SYSTEM_HEADERS = /usr/include
++LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include $(DEFINES)
++CPPFLAGS += $(LIBCAP_CPPFLAGS)
++BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS)
+ INCS=$(topdir)/libcap/include/sys/capability.h
+ LDFLAGS += -L$(topdir)/libcap
+-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
++CPPFLAGS += -Dlinux
++CFLAGS += $(WARNINGS) $(DEBUG)
+ INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
+ 
+ # SHARED tracks whether or not the SHARED libraries (libcap.so,
+diff --git a/Makefile b/Makefile
+index 984d502..a917238 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes)
+ 	$(MAKE) -C go $@
+ 	rm -f cap/go.sum
+ endif
+-	$(MAKE) -C tests $@
+ 	$(MAKE) -C progs $@
+ 	$(MAKE) -C doc $@
+ 	$(MAKE) -C kdebug $@
+diff --git a/libcap/Makefile b/libcap/Makefile
+index 47cf8f4..5125ffb 100644
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -32,6 +32,7 @@ MINCAPLIBNAME=$(MAJCAPLIBNAME).$(MINOR)
+ PSXOBJS=$(addsuffix .o, $(PSXFILES))
+ MAJPSXLIBNAME=$(PSXLIBNAME).$(VERSION)
+ MINPSXLIBNAME=$(MAJPSXLIBNAME).$(MINOR)
++CFLAGS += -fPIC
+ 
+ all: pcs $(STACAPLIBNAME)
+ ifeq ($(SHARED),yes)
+@@ -73,7 +74,7 @@ $(PSXTITLE).pc: $(PSXTITLE).pc.in
+ 		$< >$@
+ 
+ _makenames: _makenames.c cap_names.list.h
+-	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
+ 
+ cap_names.h: _makenames
+ 	./_makenames > cap_names.h
+@@ -125,10 +126,10 @@ $(PSXLIBNAME) $(MAJPSXLIBNAME) $(MINPSXLIBNAME): $(PSXOBJS) include/sys/psx_sysc
+ endif
+ 
+ %.o: %.c $(INCLS)
+-	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
+-	$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
+ 
+ cap_test: cap_test.c libcap.h $(CAPOBJS)
+ 	$(CC) $(CFLAGS) $(IPATH) $< $(CAPOBJS) -o $@
+diff --git a/pam_cap/Makefile b/pam_cap/Makefile
+index a4c4891..a15feae 100644
+--- a/pam_cap/Makefile
++++ b/pam_cap/Makefile
+@@ -3,6 +3,8 @@
+ topdir=$(shell pwd)/..
+ include ../Make.Rules
+ 
++CFLAGS += -fPIC
++
+ all: pam_cap.so
+ 	$(MAKE) testlink
+ 
+@@ -19,13 +21,13 @@ install: all
+ 	$(MAKE) -C ../libcap loader.txt
+ 
+ execable.o: execable.c ../libcap/execable.h ../libcap/loader.txt
+-	$(CC) $(CFLAGS) $(IPATH) -DLIBCAP_VERSION=\"libcap-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" -c execable.c -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -DLIBCAP_VERSION=\"libcap-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat ../libcap/loader.txt)\" -c execable.c -o $@
+ 
+ pam_cap.so: pam_cap.o execable.o
+-	$(LD) -o pam_cap.so $+ $(LIBCAPLIB) $(LDFLAGS) --entry=__so_start
++	$(LD) $(CFLAGS) -o pam_cap.so $+ $(LIBCAPLIB) $(LDFLAGS) --entry=__so_start
+ 
+ pam_cap.o: pam_cap.c
+-	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ ../libcap/libcap.a:
+ 	$(MAKE) -C ../libcap libcap.a
+@@ -34,7 +36,7 @@ test_pam_cap: test_pam_cap.c pam_cap.c ../libcap/libcap.a
+ 	$(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static
+ 
+ testlink: test.c pam_cap.o
+-	$(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
+ 
+ test: testlink test_pam_cap pam_cap.so
+ 	$(MAKE) testlink
+diff --git a/progs/Makefile b/progs/Makefile
+index 3e82862..dba7e8f 100644
+--- a/progs/Makefile
++++ b/progs/Makefile
+@@ -28,7 +28,7 @@ $(BUILD): %: %.o $(DEPS)
+ 	$(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
+ 
+ %.o: %.c $(INCS)
+-	$(CC) $(IPATH) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ install: all
+ 	mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
+@@ -46,7 +46,7 @@ capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh
+ 	diff -u capshdoc.h $@ || (rm $@ ; exit 1)
+ 
+ capsh: capsh.c capshdoc.h.cf $(DEPS)
+-	$(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
++	$(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
+ 
+ tcapsh-static: capsh.c capshdoc.h.cf $(DEPS)
+ 	$(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static
+diff --git a/tests/Makefile b/tests/Makefile
+index 3a917c4..07eb2d5 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -13,6 +13,8 @@ ifeq ($(PTHREADS),yes)
+ 	$(MAKE) psx_test libcap_psx_test libcap_psx_launch_test
+ endif
+ 
++CFLAGS += -fPIC
++
+ install: all
+ 
+ ifeq ($(DYNAMIC),yes)
+@@ -63,13 +65,13 @@ run_psx_test: psx_test
+ 	./psx_test
+ 
+ psx_test: psx_test.c $(DEPS)
+-	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS)
+ 
+ run_libcap_psx_test: libcap_psx_test
+ 	./libcap_psx_test
+ 
+ libcap_psx_test: libcap_psx_test.c $(DEPS)
+-	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS)
+ 
+ # privileged
+ uns_test: uns_test.c $(DEPS)
+-- 
+2.32.0
+
diff --git a/sys-libs/libcap/libcap-2.50-r1.ebuild b/sys-libs/libcap/libcap-2.50-r1.ebuild
deleted file mode 100644
index 2745eb56bf9d..000000000000
--- a/sys-libs/libcap/libcap-2.50-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 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.50-build-system-fixes.patch
-	"${FILESDIR}"/${PN}-2.50-install_capsh_again.patch #793026
-	"${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.52.ebuild b/sys-libs/libcap/libcap-2.52.ebuild
new file mode 100644
index 000000000000..6dc8e00f317b
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.52.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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.52-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
+	)
+	emake "${args[@]}" "$@"
+}
+
+src_configure() {
+	tc-export AR CC OBJCOPY 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 1277986bcb72..6d5074496612 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -7,10 +7,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD libcxx-10.0.1.ebuild 5796 BLAKE2B c3c1e4d49ad96de1338998d35b0495ba2aa448db3558988bbbc9e5d4603d3d2ded354b1c04b186b0134be930edd72c931240ac3a068744e72e18087fc1550160 SHA512 7fbae29d2658305ddac7854a96e353ccf1901fcc6b1c15370d7a69a602f41b7d9f1afdd91018ea5be949955b3f8f1424903b5bac13d840e8f8c72ffcf7d7d34d
 EBUILD libcxx-11.1.0.ebuild 6661 BLAKE2B 93445de819484ea32a708d2ff616501d715e7fd3a3f4204f143e64c40bc89ebceb8e50c80215c6b54d7c8a3cce00fcecaac099298b41e010bf77655563d30a20 SHA512 ce56f24e7b4aed1405e682af6b3cb48bad6617d5b7e2ecf5b990fae4f7d6badc479a583ef24801e34b0155c12354a7b76a414402f89c31f228315eb92f279a62
 EBUILD libcxx-12.0.0.ebuild 6950 BLAKE2B 44bdf31592a101724f3a45f41856e68ae2522a9f63cbb1b29d9eecc370fc6e1eb25ba435f9bf06c2faf14107abc3dd0df85f2dbb3cca29c7ca48f7ed5f2deb62 SHA512 9fc4ca41655c5a677ae6a52210943dd00246b080a11d17175f184c956c286915836cfe850716efd91c3c74d0e4b56dc1258d524d4aac9cb787c46c8a4e6e57aa
-EBUILD libcxx-12.0.1.ebuild 6704 BLAKE2B dda3c886e800201a33f2a84bf8ee081637ebbdae1ba61c74da2d5bc46a3b7252b14814cb2bcbf49eaadd7cb0627c8ed3fc5d193e2167351ee445c1c8daaac7ca SHA512 7af30677b2df8518cbe0feee57fe874bd8b1f64d34998f83fe497b9412327ec49445a2e62a71184449b45ddae18fd544ff7e7253cf5599737ec70daaebf63b3e
-EBUILD libcxx-13.0.0.9999.ebuild 6663 BLAKE2B 29fdc86ece97a67463eea19ac3fc7354bae72abda4791960a62af3c3ff8e3b8d24264f191a1e74651b10a451c8bc7e90fb8b37dc6ce9f031de370e6d442f53e5 SHA512 e1bb8090d04e21db78521944f7393e67dc875b1979ec308a204f695d45a9f6975f3eb57a1707d1a0a55c2df7c459a818682db311fc051ef8c29f7d247f257efd
-EBUILD libcxx-14.0.0.9999.ebuild 6663 BLAKE2B 29fdc86ece97a67463eea19ac3fc7354bae72abda4791960a62af3c3ff8e3b8d24264f191a1e74651b10a451c8bc7e90fb8b37dc6ce9f031de370e6d442f53e5 SHA512 e1bb8090d04e21db78521944f7393e67dc875b1979ec308a204f695d45a9f6975f3eb57a1707d1a0a55c2df7c459a818682db311fc051ef8c29f7d247f257efd
+EBUILD libcxx-12.0.1.ebuild 6703 BLAKE2B 22768e6a6a4fdf0c78da96d0c20d47c71961a545a64d6817056a904ec70e55db7bb1c29f6841bb39516383f35e95c5f1808eec50379cfb7cafa61ff3f8db108b SHA512 955ed1b3ca5b6d27d00ab3d1836f4ca23293beccc049153545b3b3da563b470e3d8d438a1cb91edce00b5be95c5a3c1362e3eefaf85db7f30cc69d8a29efd3f6
+EBUILD libcxx-13.0.0.9999.ebuild 6703 BLAKE2B e4988bec759918ae49a368a4b7c79918cfc99a6da325b04153f548f64c1d0de9698c9aa0f2c917a9a5fc75c96bac54771c2681f46a79bc698d175e29b7bcf3c4 SHA512 75408fcc8004065d88c5b114487107ed754e7fd7c4474f2b39d8956e704bc6889b7d5ad6159d593731d78c4fd1996468026827b21e2ae929eef6f9f0742466ba
+EBUILD libcxx-13.0.0_rc1.ebuild 6703 BLAKE2B e4988bec759918ae49a368a4b7c79918cfc99a6da325b04153f548f64c1d0de9698c9aa0f2c917a9a5fc75c96bac54771c2681f46a79bc698d175e29b7bcf3c4 SHA512 75408fcc8004065d88c5b114487107ed754e7fd7c4474f2b39d8956e704bc6889b7d5ad6159d593731d78c4fd1996468026827b21e2ae929eef6f9f0742466ba
+EBUILD libcxx-14.0.0.9999.ebuild 6703 BLAKE2B e4988bec759918ae49a368a4b7c79918cfc99a6da325b04153f548f64c1d0de9698c9aa0f2c917a9a5fc75c96bac54771c2681f46a79bc698d175e29b7bcf3c4 SHA512 75408fcc8004065d88c5b114487107ed754e7fd7c4474f2b39d8956e704bc6889b7d5ad6159d593731d78c4fd1996468026827b21e2ae929eef6f9f0742466ba
 MISC metadata.xml 621 BLAKE2B d8b68920ece0e3a700f1e425cf72a4ca7e75cf4b0b35e1ac6db9374d32020fc9f62b434da2108ad5b3538a46a2a7f4f5de7aa1640cd4b10046f2480ebb89450d SHA512 e1b0c874a6d229e098ffe7c0c2827502f2cdbf74fb7a0254687a0ca75dde74db06ef2bc79bfe8b526c413b13beac27b8261eab8d0b8df36011790dada3eae421
diff --git a/sys-libs/libcxx/libcxx-12.0.1.ebuild b/sys-libs/libcxx/libcxx-12.0.1.ebuild
index bf4009dbd8fb..99b2c61fd2b8 100644
--- a/sys-libs/libcxx/libcxx-12.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-12.0.1.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/libcxx/libcxx-13.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild
index db5b489c505b..5dca7551438c 100644
--- a/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 
 DOCS=( CREDITS.TXT )
 
-LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake,utils/llvm-lit} )
 LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
@@ -142,6 +142,7 @@ multilib_src_configure() {
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
 			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON
 			-DPython3_EXECUTABLE="${PYTHON}"
 		)
 	fi
diff --git a/sys-libs/libcxx/libcxx-13.0.0_rc1.ebuild b/sys-libs/libcxx/libcxx-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..5dca7551438c
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-13.0.0_rc1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
+REQUIRED_USE="libunwind? ( libcxxabi )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
+# llvm-6 for new lit options
+# clang-3.9.0 installs necessary target symlinks unconditionally
+# which removes the need for MULTILIB_USEDEP
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		>=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+DOCS=( CREDITS.TXT )
+
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake,utils/llvm-lit} )
+LLVM_PATCHSET=9999-1
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		llvm_pkg_setup
+	fi
+	use test && python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# we want -lgcc_s for unwinder, and for compiler runtime when using
+	# gcc, clang with gcc runtime (or any unknown compiler)
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
+	if use libunwind; then
+		# work-around missing -lunwind upstream
+		extra_libs+=( -lunwind )
+		# if we're using libunwind and clang with compiler-rt, we want
+		# to link to compiler-rt instead of -lgcc_s
+		if tc-is-clang; then
+			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			   ${LDFLAGS} -print-libgcc-file-name)
+			if [[ ${compiler_rt} == *libclang_rt* ]]; then
+				want_gcc_s=OFF
+				want_compiler_rt=ON
+				extra_libs+=( "${compiler_rt}" )
+			fi
+		fi
+	elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then
+		# clang-based darwin prefix disables libunwind useflag during
+		# bootstrap, because libunwind is not in the prefix yet.
+		# override the default, though, because clang based libcxx
+		# should never use gcc_s on Darwin.
+		want_gcc_s=OFF
+		# compiler_rt is not available in EPREFIX during bootstrap,
+		# so we cannot link to it yet anyway, so keep the defaults
+		# of want_compiler_rt=OFF and extra_libs=()
+	fi
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
+		-DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s}
+		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
+	)
+
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxx
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	local libdir=$(get_libdir)
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
+
+	# Move it first.
+	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=" libpthread.a libdl.a"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
+}
+
+gen_shared_ldscript() {
+	local libdir=$(get_libdir)
+	# libsupc++ doesn't have a shared version
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
+
+	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
+	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
+}
+
+multilib_src_install() {
+	cmake_src_install
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		gen_shared_ldscript
+		use static-libs && gen_static_ldscript
+	fi
+}
+
+pkg_postinst() {
+	elog "This package (${PN}) is mainly intended as a replacement for the C++"
+	elog "standard library when using clang."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild
index db5b489c505b..5dca7551438c 100644
--- a/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-14.0.0.9999.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 
 DOCS=( CREDITS.TXT )
 
-LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake,utils/llvm-lit} )
 LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
@@ -142,6 +142,7 @@ multilib_src_configure() {
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
 			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON
 			-DPython3_EXECUTABLE="${PYTHON}"
 		)
 	fi
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index e0baca913334..68f97287f7a4 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD libcxxabi-10.0.1.ebuild 3237 BLAKE2B 828cabd1bccb0f7dc672648fd1143f1913df2b3f075194da3b053413ad8e0ff8f8669ce6263fa51ed0b02702e0bd611a77f4009e57a7d2659362db21c5665e4e SHA512 b9fef273fea1343aab604c3606fa4b9ed340e0e6f649e68f81f1285d96374f440ab787937b203ee5eba5b8e867a5926b48f63d8739c326fd1a646193635dd65e
 EBUILD libcxxabi-11.1.0.ebuild 3559 BLAKE2B dc74318b252f772fbc6833e413ee2dd9b682c01ae3bca88a78d2f7854aa374311474f7af9f19453e4b4fbb6db4149e8330db7632faf710a0aeb2e0d741119096 SHA512 18632637cb6fb86a3c003ba66f6a80aece299f50e356870599bb932fa100ba3e51293cee71576cc994a7e2b5f56f3b4ec8b4d3eae6202322d50a9bc0aa922ac3
 EBUILD libcxxabi-12.0.0.ebuild 3542 BLAKE2B b64bd260671e5109a31ac3f779f46720ea2972d5da3e5d4b0293453be3e8ab209a1bca2a459c160271fa4cfa39cba968b6faaab1cd12667dd3822bfc0633266f SHA512 8b1874aa691d2aec5f149625d9865f23ef4ba181d8d805852a9cfa22bb7649872183d94f047a3406d2bd9135127e854a477eb8b31281ff7ce2f7a120888fe04f
-EBUILD libcxxabi-12.0.1.ebuild 3547 BLAKE2B 80a38e4458df2465501399df48d71e8907c17f302967b318eb980ef581121b4e7d1f333ff275673b731e8f17dca2efd6da534b418064b1f4240ae6d942a9adb9 SHA512 adabd99bb5fafe4cdf1f8ec72fca0cbe9536ff370cd12327661523ae495056f7a67602e759c766ad09b9f4ff75cc4a1e18cd40d9f44d6049d37af406ecf65416
-EBUILD libcxxabi-13.0.0.9999.ebuild 3498 BLAKE2B 5483dca08c66645c4ecc947884a103384076d092a2ff3e52d7a4354ec5a0aecca5aa0ec06331120dfef3227823b9a0fd91b3e37c52519a93a44d6293419e9bc1 SHA512 3ff549741d571ea4952e6658c41c1aa476b8db033097aa56f741148bd991e0a62181b60a51969a4e04f8b3a0d8b5cf7491a1e3fc6c2046f1c74941407a17e493
-EBUILD libcxxabi-14.0.0.9999.ebuild 3498 BLAKE2B 5483dca08c66645c4ecc947884a103384076d092a2ff3e52d7a4354ec5a0aecca5aa0ec06331120dfef3227823b9a0fd91b3e37c52519a93a44d6293419e9bc1 SHA512 3ff549741d571ea4952e6658c41c1aa476b8db033097aa56f741148bd991e0a62181b60a51969a4e04f8b3a0d8b5cf7491a1e3fc6c2046f1c74941407a17e493
+EBUILD libcxxabi-12.0.1.ebuild 3546 BLAKE2B 1975a7acd224df87f5e6b705b7588f75493e90d09ec8d078516a270b5afa7ef1c89a54a3e4172a5f27605d9dd90c57a5ffd1898b4026c0a19b06ed5902443d7c SHA512 4903ef1c6a71d41d7174ebef0c1f3b9b7122c59e862919589a1f3bc5de10c6785d4403a41789cbbce33328743377b2fac8a85e207d73e1c99492ebf41ab12a50
+EBUILD libcxxabi-13.0.0.9999.ebuild 3504 BLAKE2B bfa2d35ac94fb452d09b37a9d7d1810a7ecf33ee9509020caecb700d8e5b8e30067429f03db8297cc40ba194b819689e2bc6a46e78b48cc0f943da10536aec8a SHA512 830df6f081e8012d43062e0388bf5bd8975a3896765d38567c0ba52a54435b8be06df3955ed8dda5d6025091fd52eb1b1ec1c774e558ffc5eae5812822bb6725
+EBUILD libcxxabi-13.0.0_rc1.ebuild 3504 BLAKE2B bfa2d35ac94fb452d09b37a9d7d1810a7ecf33ee9509020caecb700d8e5b8e30067429f03db8297cc40ba194b819689e2bc6a46e78b48cc0f943da10536aec8a SHA512 830df6f081e8012d43062e0388bf5bd8975a3896765d38567c0ba52a54435b8be06df3955ed8dda5d6025091fd52eb1b1ec1c774e558ffc5eae5812822bb6725
+EBUILD libcxxabi-14.0.0.9999.ebuild 3504 BLAKE2B bfa2d35ac94fb452d09b37a9d7d1810a7ecf33ee9509020caecb700d8e5b8e30067429f03db8297cc40ba194b819689e2bc6a46e78b48cc0f943da10536aec8a SHA512 830df6f081e8012d43062e0388bf5bd8975a3896765d38567c0ba52a54435b8be06df3955ed8dda5d6025091fd52eb1b1ec1c774e558ffc5eae5812822bb6725
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild
index 392b9a3630f5..efc23d05bba2 100644
--- a/sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-12.0.1.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/libcxxabi/libcxxabi-13.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
index 953c0c81796c..d11be625eea5 100644
--- a/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)"
 
-# libcxx is needed uncondtionally for the headers
 LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake )
 llvm.org_set_globals
 
@@ -49,6 +48,10 @@ pkg_setup() {
 }
 
 multilib_src_configure() {
+	# we need a configured libc++ for __config_site
+	wrap_libcxx cmake_src_configure
+	wrap_libcxx cmake_build generate-cxx-headers
+
 	# link against compiler-rt instead of libgcc if we are using clang with libunwind
 	local want_compiler_rt=OFF
 	if use libunwind && tc-is-clang; then
@@ -68,7 +71,7 @@ multilib_src_configure() {
 		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
 		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
 
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		-DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
 		# upstream is omitting standard search path for this
 		# probably because gcc & clang are bundling their own unwind.h
 		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
@@ -86,7 +89,7 @@ multilib_src_configure() {
 	cmake_src_configure
 }
 
-build_libcxx() {
+wrap_libcxx() {
 	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
 	local CMAKE_USE_DIR=${WORKDIR}/libcxx
 	local BUILD_DIR=${BUILD_DIR}/libcxx
@@ -103,13 +106,11 @@ build_libcxx() {
 		-DLIBCXX_INCLUDE_TESTS=OFF
 	)
 
-	cmake_src_configure
-	cmake_src_compile
+	"${@}"
 }
 
 multilib_src_test() {
-	# build a local copy of libc++ for testing to avoid circular dep
-	build_libcxx
+	wrap_libcxx cmake_src_compile
 	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
 	local -x LIT_PRESERVES_TMP=1
diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..d11be625eea5
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.0_rc1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libunwind static-libs test elibc_musl"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libunwind? (
+		|| (
+			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
+		)
+	)"
+# llvm-6 for new lit options
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
+	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		llvm_pkg_setup
+	fi
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# we need a configured libc++ for __config_site
+	wrap_libcxx cmake_src_configure
+	wrap_libcxx cmake_build generate-cxx-headers
+
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+wrap_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	"${@}"
+}
+
+multilib_src_test() {
+	wrap_libcxx cmake_src_compile
+	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r include/.
+}
diff --git a/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild
index 953c0c81796c..d11be625eea5 100644
--- a/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-14.0.0.9999.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)"
 
-# libcxx is needed uncondtionally for the headers
 LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake )
 llvm.org_set_globals
 
@@ -49,6 +48,10 @@ pkg_setup() {
 }
 
 multilib_src_configure() {
+	# we need a configured libc++ for __config_site
+	wrap_libcxx cmake_src_configure
+	wrap_libcxx cmake_build generate-cxx-headers
+
 	# link against compiler-rt instead of libgcc if we are using clang with libunwind
 	local want_compiler_rt=OFF
 	if use libunwind && tc-is-clang; then
@@ -68,7 +71,7 @@ multilib_src_configure() {
 		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
 		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
 
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		-DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
 		# upstream is omitting standard search path for this
 		# probably because gcc & clang are bundling their own unwind.h
 		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
@@ -86,7 +89,7 @@ multilib_src_configure() {
 	cmake_src_configure
 }
 
-build_libcxx() {
+wrap_libcxx() {
 	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
 	local CMAKE_USE_DIR=${WORKDIR}/libcxx
 	local BUILD_DIR=${BUILD_DIR}/libcxx
@@ -103,13 +106,11 @@ build_libcxx() {
 		-DLIBCXX_INCLUDE_TESTS=OFF
 	)
 
-	cmake_src_configure
-	cmake_src_compile
+	"${@}"
 }
 
 multilib_src_test() {
-	# build a local copy of libc++ for testing to avoid circular dep
-	build_libcxx
+	wrap_libcxx cmake_src_compile
 	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
 	local -x LIT_PRESERVES_TMP=1
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 43b49c671a0a..db81b8b28d78 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -3,10 +3,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD libomp-10.0.1.ebuild 2893 BLAKE2B 6085966e4e392ded8492c6b398d3a14ba5205aee8ecf3f63d0853e463f1bf007ff3b3c31555eb7cb566cc8c4bdc580e9d0ce38ca7cd58785820a7949e2969024 SHA512 e1b7b17dd0800908adbb06b29c7ef2d5bd73c66784104b554c59e5c5176c9c49c5432e0ecd72c6e3c00e71def839342cbedbd666f3886afa3ea92d8fc94ba591
 EBUILD libomp-11.1.0.ebuild 2901 BLAKE2B e18155f24e5d0aa2de9a1976c818777e8d2d16092aa5e58b5c38197461a0b4ca5967ec161140b2a63835a0cfa601eb31fc08cbaa492088269808d6d803c7a47a SHA512 23a429ded341114ea3c4282b974520146ea0734e01b5863c837d119517b39365b537126091f5efcf752ca7860bccf0e0e2d763b507e903321532db87bcd42b79
 EBUILD libomp-12.0.0.ebuild 2947 BLAKE2B b8ad55a9462099224e7a15c781d0ef10b5b408749878496d7813e638cc21c789914f16143ab307bf5f6c42300f5b31145ddf650147c16915e6407469431e30a7 SHA512 69e37474b659a8f05af8ef0a725a6f99911882364ccca279e3179d2bf89bed603067bf760f0c430a9184d95208d41c7f418a023eae534013f2765de98d73ea57
-EBUILD libomp-12.0.1.ebuild 2973 BLAKE2B 2a00ea561ea97eaf205c12f15f9cadf854a24a119e659b605a2ffc94ef645dcc945723d2637ae5c550f997806a74786c49a5fd842cc012888c3872036bd551b2 SHA512 3cc4f781c5e485671a47cc9a46a52a8ac50ccd543d7d3aa34b1499d7572394ad789cada576640738a6d80dbcc2b4af1b8865d5abf885442ec3d8e3345267338e
+EBUILD libomp-12.0.1.ebuild 2972 BLAKE2B 7864989b48b85abf2b1ce9bb2485234fb55f2da3250db1d691e53f9229bf2eb04ec53bc5248f557a17b1e2c4f0b45e20684cda5d458d9e5d570d2b577e5ac50f SHA512 399cdb4f287a707e262105139b290d9ab1b2b41f94512d6239e680194f0e5b2a1228d9701e5c162ef7ddcb97fefb0987eab1cca4cb8b86fc32c795dbeda5d209
 EBUILD libomp-13.0.0.9999.ebuild 2886 BLAKE2B 277ab76b2a945ad163abaf324eaa463185c4c331c024ba672328cec8b07d13b86bfb0447705aa9d58a26e75cf10d62d5e95a81f043154f08b0c694845190e669 SHA512 f7dcfc17813949f3bee56104f58931784dda788eabd6ea9e06f8898fdf27f6f1e90a415193028285d0e079663339d77b44a26a98dea6ea997e231940df0af296
+EBUILD libomp-13.0.0_rc1.ebuild 2886 BLAKE2B 277ab76b2a945ad163abaf324eaa463185c4c331c024ba672328cec8b07d13b86bfb0447705aa9d58a26e75cf10d62d5e95a81f043154f08b0c694845190e669 SHA512 f7dcfc17813949f3bee56104f58931784dda788eabd6ea9e06f8898fdf27f6f1e90a415193028285d0e079663339d77b44a26a98dea6ea997e231940df0af296
 EBUILD libomp-14.0.0.9999.ebuild 2886 BLAKE2B 277ab76b2a945ad163abaf324eaa463185c4c331c024ba672328cec8b07d13b86bfb0447705aa9d58a26e75cf10d62d5e95a81f043154f08b0c694845190e669 SHA512 f7dcfc17813949f3bee56104f58931784dda788eabd6ea9e06f8898fdf27f6f1e90a415193028285d0e079663339d77b44a26a98dea6ea997e231940df0af296
 MISC metadata.xml 825 BLAKE2B 9c4afd81e02ecba9db7cac8487acf4e9dcbf772d62ee46c5c95510f1c624b52e0005786d06c119d4d7f0bf498fbd9cae2f9200a27ea427c9d6e83a5d74d45c1c SHA512 b2ba293ffb87f06c21172607234e8f69730d8ade0732fe98a5bc876353a01853dbef8cbe0ace0f6a556f2ae7217facee040349b460815dc2cf2f3b48cfd46762
diff --git a/sys-libs/libomp/libomp-12.0.1.ebuild b/sys-libs/libomp/libomp-12.0.1.ebuild
index 72bb4548cf87..c9bea8e17293 100644
--- a/sys-libs/libomp/libomp-12.0.1.ebuild
+++ b/sys-libs/libomp/libomp-12.0.1.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 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~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/libomp-13.0.0_rc1.ebuild b/sys-libs/libomp/libomp-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..5adaa0dfbcac
--- /dev/null
+++ b/sys-libs/libomp/libomp-13.0.0_rc1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib linux-info llvm.org python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="cuda hwloc kernel_linux offload ompt test"
+# CUDA works only with the x86_64 ABI
+REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		virtual/libelf:=[${MULTILIB_USEDEP}]
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	)"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	offload? ( virtual/pkgconfig )
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		>=sys-devel/clang-6
+	)"
+
+LLVM_COMPONENTS=( openmp llvm/include )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+	use offload && mycmakeargs+=(
+		# this is non-fatal and libomp checks for CUDA conditionally
+		# to ABI, so we can just ignore passing the wrong value
+		# on non-amd64 ABIs
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+	)
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	addpredict /dev/nvidiactl
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/sys-libs/libvpd/Manifest b/sys-libs/libvpd/Manifest
index 38a0fa01ba17..ac9d0e127109 100644
--- a/sys-libs/libvpd/Manifest
+++ b/sys-libs/libvpd/Manifest
@@ -1,3 +1,5 @@
+AUX 2.2.8-gcc11.patch 3279 BLAKE2B 50816aa628d6c9b3f9c9d27b1a4550a10c83fafc9a95dd5a9f499a68534fa96b4ce6fd73d7b28777e09dfe45580b7928a7370e51f1784f59c6ee7e78dd45d2a2 SHA512 817d00ffb794b685f5c20625dba50950ea67baae8cd7d4120e907d789bd93d5ea306681dd384296782d6037560b72aefd5db9c004a8a711a4e3df0aa639746e2
+AUX 2.2.8-warnings.patch 2326 BLAKE2B 71a480bedc290a447ae988ed96d4ec3b8f68fc74773c39c0b813b0083c69f5bb659fbbee078b741c496c46f1906e6e6c47bf5acbb29c2b8064b8eefa79851828 SHA512 b095be3e4d9cfe03d8b01d0d1861df2934a7695cc1585af556702dee9c6692fbbe68ea1266181250f72ff74d97694516329de0fde00cd574d60eff004d7083e1
 DIST libvpd-2.2.8.tar.gz 52725 BLAKE2B 76bdc6ddf80236a6848185273c2cac181d44214f0c609d7c5af6fa4d09a7cd816324af35745617ce3daa7268311e2ed754335600df1d4970a324eb327015d051 SHA512 d0b7d1760c6ae54717c538405c651317b7318dec5780961f5386c09b7d245e35a84c2fc47d89c47c3cd2168d73d7186f5819981d52c3ba962514639833dc62aa
-EBUILD libvpd-2.2.8.ebuild 909 BLAKE2B 6b3e715ce6d8c736d205340513b93479f1c8d176e29b2e162f27d448f8d08fe962232050a44eb57c46d9049c4a4cf5af8f533a4061dd2670b6504e579042abd4 SHA512 c1af2a36595cae47c3d803b2ce14e664587aa7348376f03f194d5d89a7c64e86c15e8da0aff50858a8862bf194b8dfaa597b3000fa4940dce91d38ac4c304e08
+EBUILD libvpd-2.2.8-r1.ebuild 991 BLAKE2B 8e3145531b1e1dbae7eeba2e0df7c7810d6045f93c97c83567bdd786c33b2913662f54be950e9677e2ff6b34dd8a904a738ad2ed4863e1497de5418a6114e4e3 SHA512 716bb2e1d385ec53f99281f7f1bc8c466c266461570f65b8e700263bf8ab9a484c3efeb1ec81f0816efd77a765038f7e41a23df533f1ced7dcd5571853564003
 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710
diff --git a/sys-libs/libvpd/files/2.2.8-gcc11.patch b/sys-libs/libvpd/files/2.2.8-gcc11.patch
new file mode 100644
index 000000000000..7e09f8329bba
--- /dev/null
+++ b/sys-libs/libvpd/files/2.2.8-gcc11.patch
@@ -0,0 +1,84 @@
+From 83ccb994e30364c0703d7b8c15817d56b42da2e6 Mon Sep 17 00:00:00 2001
+From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
+Date: Wed, 7 Apr 2021 14:11:41 +0530
+Subject: [PATCH] Remove dynamic exception specification
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Tomasz KÅ‚oczko reported that the build fails, while compiling
+with GCC 11:
+
+In file included from src/vpdretriever.cpp:25:
+./src/libvpd-2/vpdretriever.hpp:62:33: error: ISO C++17 does not allow dynamic exception specifications
+   62 |                                 throw( VpdException& );
+      |                                 ^~~~~
+./src/libvpd-2/vpdretriever.hpp:74:33: error: ISO C++17 does not allow dynamic exception specifications
+   74 |                                 throw( VpdException& );
+      |                                 ^~~~~
+src/vpdretriever.cpp:50:37: error: ISO C++17 does not allow dynamic exception specifications
+   50 |                 string dbFileName ) throw( VpdException& )
+      |                                     ^~~~~
+src/vpdretriever.cpp:62:39: error: ISO C++17 does not allow dynamic exception specifications
+   62 |         VpdRetriever::VpdRetriever( ) throw( VpdException& )
+      |                                       ^~~~~
+make: *** [Makefile:660: src/vpdretriever.lo] Error 1
+
+As part of
+http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0003r5.html,
+the dynamic exception specification have been removed. Remove the
+throw specifier, to specify that the function might throw an exception.
+
+Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
+Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
+---
+ src/libvpd-2/vpdretriever.hpp | 6 ++----
+ src/vpdretriever.cpp          | 4 ++--
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/src/libvpd-2/vpdretriever.hpp b/src/libvpd-2/vpdretriever.hpp
+index 0d91ac4..1be2664 100644
+--- a/src/libvpd-2/vpdretriever.hpp
++++ b/src/libvpd-2/vpdretriever.hpp
+@@ -58,8 +58,7 @@ namespace lsvpd
+ 			 * @param dbFileName
+ 			 *   The file name for the VPD database.
+ 			 */
+-			VpdRetriever( string envDir, string dbFileName )
+-				throw( VpdException& );
++			VpdRetriever( string envDir, string dbFileName );
+ 			
+ 			/**
+ 			 * Builds A VpdRetriever object that can be used for reading the
+@@ -70,8 +69,7 @@ namespace lsvpd
+ 			 * this constructor, there were serious underlying issues that
+ 			 * are not recoverable.  Uses the default dir and filename
+ 			 */
+-			VpdRetriever( )
+-				throw( VpdException& );
++			VpdRetriever( );
+ 			~VpdRetriever( );
+ 
+ 			/**
+diff --git a/src/vpdretriever.cpp b/src/vpdretriever.cpp
+index 9f7e7a0..470047e 100644
+--- a/src/vpdretriever.cpp
++++ b/src/vpdretriever.cpp
+@@ -47,7 +47,7 @@ namespace lsvpd
+ 	const string VpdRetriever::UDEV_NOTIFY_FILE ( "/run/run.vpdupdate" );
+ 
+ 	VpdRetriever::VpdRetriever( string envDir,
+-		string dbFileName ) throw( VpdException& )
++		string dbFileName )
+ 	{
+ 		try {
+ 			db = new VpdDbEnv( envDir, dbFileName, true );
+@@ -59,7 +59,7 @@ namespace lsvpd
+ 		}
+ 	}
+ 	
+-	VpdRetriever::VpdRetriever( ) throw( VpdException& )
++	VpdRetriever::VpdRetriever( )
+ 	{
+ 		struct stat vpd_stat,udev_stat;
+ 		const string vpddb = VpdRetriever::DEFAULT_DIR + VpdRetriever::DEFAULT_FILE;
diff --git a/sys-libs/libvpd/files/2.2.8-warnings.patch b/sys-libs/libvpd/files/2.2.8-warnings.patch
new file mode 100644
index 000000000000..1419de3dda49
--- /dev/null
+++ b/sys-libs/libvpd/files/2.2.8-warnings.patch
@@ -0,0 +1,52 @@
+From 72b75e1976b50372f07271a5235ee8e9c75bdac4 Mon Sep 17 00:00:00 2001
+From: Kamalesh Babulal <kamalesh@linux.ibm.com>
+Date: Mon, 21 Jun 2021 11:42:02 +0530
+Subject: [PATCH] vpddbenv_c: fix compile warnings
+
+src/vpddbenv_c.c: In function 'new_vpddbenv':
+src/vpddbenv_c.c:56:17: warning: 'strncat' specified bound 1 equals source length [-Wstringop-overflow=]
+   56 |                 strncat( ret->fullPath, "/" , 1 );
+      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+src/vpddbenv_c.c:58:17: warning: 'strncat' accessing between 258 and 9223372036854775804 bytes at offsets 514 and 257 may overlap 1 byte at offset 514 [-Wrestrict]
+   58 |                 strncat( ret->fullPath, ret->dbFileName, strlen(ret->dbFileName) );
+      |
+                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+While compiling the code with GCC-11 (Fedora 34), the GCC complains
+about src string length and N bytes mentioned in the strncat() are of
+same length. It gets suspicious, when strncat() mimics strcat(), the
+strcat() was replaced using strncat() by the commit 38de4e65205
+("libvpd: Convert strcat to strncat") as part of secure coding.
+
+refactor the code using snprintf(), making the code lean and keep the
+GCC happy as well.
+
+Signed-off-by: Kamalesh Babulal <kamalesh@linux.ibm.com>
+Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
+---
+ src/vpddbenv_c.c | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/src/vpddbenv_c.c b/src/vpddbenv_c.c
+index 96aecd3..bae36e9 100644
+--- a/src/vpddbenv_c.c
++++ b/src/vpddbenv_c.c
+@@ -50,14 +50,10 @@ struct vpddbenv * new_vpddbenv( const char *dir, const char *file )
+ 		ret->dbFileName[MAX_NAME_LENGTH] = '\0';
+ 	}
+ 
+-	strncpy( ret->fullPath, ret->envDir , FULL_PATH_SIZE - 1);
+-
+-	if (strlen(ret->fullPath) + 1 < FULL_PATH_SIZE)
+-		strncat( ret->fullPath, "/" , 1 );
+-	if (strlen(ret->fullPath) + strlen(ret->dbFileName) < FULL_PATH_SIZE)
+-		strncat( ret->fullPath, ret->dbFileName, strlen (ret->dbFileName) );
+-
+-	ret->fullPath[FULL_PATH_SIZE - 1] = '\0';
++	if ( ( strlen( ret->envDir ) + strlen( ret->dbFileName ) + 1 ) <
++			FULL_PATH_SIZE )
++		snprintf( ret->fullPath, FULL_PATH_SIZE,
++				"%s/%s", ret->envDir, ret->dbFileName );
+ 	
+ 	rc = sqlite3_open( ret->fullPath, &(ret->db) );
+ 	if( rc != SQLITE_OK )
diff --git a/sys-libs/libvpd/libvpd-2.2.8-r1.ebuild b/sys-libs/libvpd/libvpd-2.2.8-r1.ebuild
new file mode 100644
index 000000000000..3b69e327edd6
--- /dev/null
+++ b/sys-libs/libvpd/libvpd-2.2.8-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 udev
+
+DESCRIPTION="Library implementation for listing Vital Product Data"
+HOMEPAGE="https://github.com/power-ras/libvpd"
+SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="ppc ppc64"
+
+DEPEND="
+	dev-db/sqlite:3
+	sys-libs/zlib:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/2.2.8-gcc11.patch"
+	"${FILESDIR}/2.2.8-warnings.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# sysconfdir is used only to establish where the udev rules file should go
+	# unfortunately it also adds the subdirs on its own so we strip it down to
+	# dirname
+	local myconf=(
+		--disable-static
+		--localstatedir="${EPREFIX}/var"
+		--sysconfdir="$( dirname $(get_udevdir) )"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/lsvpd
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-libs/libvpd/libvpd-2.2.8.ebuild b/sys-libs/libvpd/libvpd-2.2.8.ebuild
deleted file mode 100644
index 0c38cecb19fc..000000000000
--- a/sys-libs/libvpd/libvpd-2.2.8.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 udev
-
-DESCRIPTION="Library implementation for listing Vital Product Data"
-HOMEPAGE="https://github.com/power-ras/libvpd"
-SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="ppc ppc64"
-
-DEPEND="
-	dev-db/sqlite:3
-	sys-libs/zlib:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# sysconfdir is used only to establish where the udev rules file should go
-	# unfortunately it also adds the subdirs on its own so we strip it down to
-	# dirname
-	local myconf=(
-		--disable-static
-		--localstatedir="${EPREFIX}/var"
-		--sysconfdir="$( dirname $(get_udevdir) )"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/lsvpd
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 0026d73ea600..dce681e9b03f 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -2,10 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
+DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
 EBUILD llvm-libunwind-10.0.1.ebuild 3185 BLAKE2B 150bde0a85684ac2cbc01d20139e458f57377c2c9692037e7fec432019b16f073d6e14d772dfee190ab8a682e4b133f538dce51fce3ede54e8e20152575ac7c1 SHA512 4cdf4ce69be5ca630701d4e41bdcfead01eac10ced7edc39a9b20628e3225b65b33ac493d3010f8ac8cfe5cce73b70bb2d4988d1ea00f2766efdbe30c03aa6de
 EBUILD llvm-libunwind-11.1.0.ebuild 3223 BLAKE2B c39bdefd6bf0656db7d84f3cd868da01aa4b37f51c729951d1bcb73336f6ab1d8beb114a7d10d79c1441ce945b03aaf9444481e5e1b3e7dd7fdb9a7e971c451d SHA512 ad8cb081326e4dd6cd888882fabcc3fa1a152c37b28197c9565d46d8f8419f233a1a9f6cc9f3bcfe4ba1441cf97147dafb684e3eb60453020d2b64ccfb56d1c1
 EBUILD llvm-libunwind-12.0.0.ebuild 3657 BLAKE2B 4370cc5e2c1d423a7ab3bb3ed6c208d02e785c89d6d5159c5f6f967591dadf6a49602b34f6e94a66e3c8700b3cab273140aeeaabf941eac49c03cf0926470b7e SHA512 0d0aaadc05b8beca6e692b9b6325e426a4c29186b45376d1501cde2c1ee66f69ab5b60b2f148188f7ae708908a200395a51b02920a62c755101176b035aafd2d
-EBUILD llvm-libunwind-12.0.1.ebuild 3662 BLAKE2B cca4b3398c6ab63c31d06e49e81de202cab987c85b0cdb98faa2f91989f27f8c2853d53acc5ed5b80bcedf931d2750d4cf9db21d1c6c08a1b1f59255e1d3a15b SHA512 482caf63adb19a49809a7ca2350c5d9801aa765de96ede422e346da3c5d961b820c629cb77405789d7cfb68fdfca9a5692ca50d54b1e5ee7fe3299910637073c
-EBUILD llvm-libunwind-13.0.0.9999.ebuild 3606 BLAKE2B d1f27261c22950e15e904340132567781446e14a349f5e39d538ed4eee3659d4a93a27efaf4350e2de14829c93560e66d5a123bebcb04f731c80f81075548e83 SHA512 adfc61c4c2d9f09d5573d04c200fa84f7ca61d59073406ea01d35ff9b6095f8d7aabb30fb09f7a4f97a19fff9368816dae099e8d52427e1c7b32613cfcb3dc83
-EBUILD llvm-libunwind-14.0.0.9999.ebuild 3606 BLAKE2B d1f27261c22950e15e904340132567781446e14a349f5e39d538ed4eee3659d4a93a27efaf4350e2de14829c93560e66d5a123bebcb04f731c80f81075548e83 SHA512 adfc61c4c2d9f09d5573d04c200fa84f7ca61d59073406ea01d35ff9b6095f8d7aabb30fb09f7a4f97a19fff9368816dae099e8d52427e1c7b32613cfcb3dc83
+EBUILD llvm-libunwind-12.0.1.ebuild 3661 BLAKE2B afe1ac798786ab4d666e7af78d853bbd0c8a5f8385e189436227a6283f4f2cedffbd98572d2fd441ef65b955da121fcbf6a58250b7079e5875555fc8ea5cbc1c SHA512 85c47c9ce6eba843c19b93e81bd3765d1a9ed2524b9052ea2b83511514aa509a81b90957c98514c8103f3df95db1c1394125533632a6a354b9b3f454123f4615
+EBUILD llvm-libunwind-13.0.0.9999.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382
+EBUILD llvm-libunwind-13.0.0_rc1.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382
+EBUILD llvm-libunwind-14.0.0.9999.ebuild 3700 BLAKE2B 20bca0c3633cb0d0c9e522b113e32593fa8b86a0f5a4d87089f3fe9363c404b2c1684415a5fa4446a2114c597d7d80c4208f1db8f92e3486e7208f9f024f98e7 SHA512 a02b45822393f7a0d48ff26754e22b532ff4216df16468254eb7e38afd8ea9deed908c9273e86fe94effeae12b1065d41c34dc12312a156eb12d5e9292c78382
 MISC metadata.xml 302 BLAKE2B ef8858b3c26dfa1727e57685381dbf71eb74008e74127b06467aaff9eea2fd7f3fdcdb1819529b8e828d42720745855e948d608bbe3eb40778fe1e4e260118ad SHA512 d5e641d63402052ef7af157f98998868a816d5e5072424725b09ded5c2477b26aaafbb8874473367a860d3fc365e0f4f0db451315ec4be3df23cce4c1194f2d7
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.ebuild
index f436a136f170..a1da7f398e2e 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.1.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 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild
index ba5225ffe696..a4b1aceef510 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild
@@ -78,10 +78,7 @@ multilib_src_configure() {
 	cmake_src_configure
 }
 
-build_libcxxabi() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
-	local BUILD_DIR=${BUILD_DIR}/libcxxabi
+wrap_libcxxabi() {
 	local mycmakeargs=(
 		-DLIBCXXABI_LIBDIR_SUFFIX=
 		-DLIBCXXABI_ENABLE_SHARED=OFF
@@ -89,18 +86,18 @@ build_libcxxabi() {
 		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
 		-DLIBCXXABI_INCLUDE_TESTS=OFF
 
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		-DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
 		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
 	)
 
-	cmake_src_configure
-	cmake_src_compile
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
+	local BUILD_DIR=${BUILD_DIR}/libcxxabi
+
+	"${@}"
 }
 
-build_libcxx() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxx
-	local BUILD_DIR=${BUILD_DIR}/libcxx
+wrap_libcxx() {
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=
 		-DLIBCXX_ENABLE_SHARED=OFF
@@ -115,15 +112,21 @@ build_libcxx() {
 		-DLIBCXX_INCLUDE_TESTS=OFF
 	)
 
-	cmake_src_configure
-	cmake_src_compile
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+
+	"${@}"
 }
 
 multilib_src_test() {
 	# build local copies of libc++ & libc++abi for testing to avoid
 	# circular deps
-	build_libcxxabi
-	build_libcxx
+	wrap_libcxx cmake_src_configure
+	wrap_libcxx cmake_build generate-cxx-headers
+	wrap_libcxxabi cmake_src_configure
+	wrap_libcxxabi cmake_src_compile
+	wrap_libcxx cmake_src_compile
 	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
 	local -x LIT_PRESERVES_TMP=1
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc1.ebuild
new file mode 100644
index 000000000000..a4b1aceef510
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0_rc1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://github.com/llvm-mirror/libunwind"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!sys-libs/libunwind"
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)"
+
+LLVM_COMPONENTS=( libunwind libcxx llvm/cmake )
+LLVM_TEST_COMPONENTS=( libcxxabi )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local use_compiler_rt=OFF
+	local libdir=$(get_libdir)
+
+	# link to compiler-rt
+	# https://github.com/gentoo/gentoo/pull/21516
+	if tc-is-clang; then
+		local compiler-rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+		   ${LD_FLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			use_compiler_rt=ON
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+
+		# avoid dependency on libgcc_s if compiler-rt is used
+		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+wrap_libcxxabi() {
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=
+		-DLIBCXXABI_ENABLE_SHARED=OFF
+		-DLIBCXXABI_ENABLE_STATIC=ONF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
+	)
+
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
+	local BUILD_DIR=${BUILD_DIR}/libcxxabi
+
+	"${@}"
+}
+
+wrap_libcxx() {
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+
+	"${@}"
+}
+
+multilib_src_test() {
+	# build local copies of libc++ & libc++abi for testing to avoid
+	# circular deps
+	wrap_libcxx cmake_src_configure
+	wrap_libcxx cmake_build generate-cxx-headers
+	wrap_libcxxabi cmake_src_configure
+	wrap_libcxxabi cmake_src_compile
+	wrap_libcxx cmake_src_compile
+	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# install headers like sys-libs/libunwind
+	doheader "${S}"/include/*.h
+}
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild
index ba5225ffe696..a4b1aceef510 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild
@@ -78,10 +78,7 @@ multilib_src_configure() {
 	cmake_src_configure
 }
 
-build_libcxxabi() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
-	local BUILD_DIR=${BUILD_DIR}/libcxxabi
+wrap_libcxxabi() {
 	local mycmakeargs=(
 		-DLIBCXXABI_LIBDIR_SUFFIX=
 		-DLIBCXXABI_ENABLE_SHARED=OFF
@@ -89,18 +86,18 @@ build_libcxxabi() {
 		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
 		-DLIBCXXABI_INCLUDE_TESTS=OFF
 
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		-DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
 		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
 	)
 
-	cmake_src_configure
-	cmake_src_compile
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
+	local BUILD_DIR=${BUILD_DIR}/libcxxabi
+
+	"${@}"
 }
 
-build_libcxx() {
-	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
-	local CMAKE_USE_DIR=${WORKDIR}/libcxx
-	local BUILD_DIR=${BUILD_DIR}/libcxx
+wrap_libcxx() {
 	local mycmakeargs=(
 		-DLIBCXX_LIBDIR_SUFFIX=
 		-DLIBCXX_ENABLE_SHARED=OFF
@@ -115,15 +112,21 @@ build_libcxx() {
 		-DLIBCXX_INCLUDE_TESTS=OFF
 	)
 
-	cmake_src_configure
-	cmake_src_compile
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+
+	"${@}"
 }
 
 multilib_src_test() {
 	# build local copies of libc++ & libc++abi for testing to avoid
 	# circular deps
-	build_libcxxabi
-	build_libcxx
+	wrap_libcxx cmake_src_configure
+	wrap_libcxx cmake_build generate-cxx-headers
+	wrap_libcxxabi cmake_src_configure
+	wrap_libcxxabi cmake_src_compile
+	wrap_libcxx cmake_src_compile
 	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
 
 	local -x LIT_PRESERVES_TMP=1
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 00a7d462d4f8..45da32991bbd 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 588848e7cc88..decd402cf3b0 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -5,10 +5,11 @@ AUX nut-2.6.5-init.d-upsd 671 BLAKE2B a8658d22ffdba585d9fd6de13a347a16e98182bd48
 AUX nut-2.6.5-init.d-upslog 573 BLAKE2B 2a0e04f83990035beb12eee33cfe7ce4fdcd1f310a7ba6f2255e4ad3a1f76245acf4a66332eea5cce7765d914ce7c14f02da50ebb8fa8640c871a12f492ed28b SHA512 06ca7fa8f3fe729b07a919d2a0ecb573b8ac180c447f927504524fca18894e045492458271b9a15898861cb3839b9fb95b2c843e241c7148bc25331ab8360b36
 AUX nut-2.6.5-init.d-upsmon 557 BLAKE2B a48b215181d6b40691db244d38b5868e69844f5a1ee6f91cb8815c4386ae801f957b2fbaf53fbe5dd98925be42036dbd54dd5d13c0077c8884e018fac24d101a SHA512 9ccf947b2c5e7a73e96148edb7684f21ae84c4212b980f2ba7b88006dc1e3400b1b9017202b87648f928a3e19f4898094622a6683e0995b72f355ccb394280c3
 AUX nut-2.7.1-snmpusb-order.patch 1417 BLAKE2B 20c3150559d3810c8bf15a9560ccf950ad1bb26bd58b4f2bcf3736871f4599bc3ad948e5f008b1549184f78d0fa3b417bbc8728660fbb110f4537fce83231bad SHA512 df3701821bc4ef45a5089e4d4439c3367fb23cefce7d06168bd422a8c32a1b373ae9fb3456bd5f90a51a672edf9ce29254a08c2045efe210a11b82399793ec19
-AUX nut-2.7.2-no-libdummy.patch 535 BLAKE2B f18f65ca92e834b5e085358a09c7363cf156b4a156c6c99d4f7cc34a17d25cf1518f342c072791eb37db613a6dafc32aeed364b88063c4d92d20e21e34a5d807 SHA512 a402a70a4cfc922d31203560627ace87f82795aef072d333cb1bfb91a6b67fbc10769e5d68a8d2741ca512b81b5754e9141b68dcb197dbe558ed5556e2de37a1
+AUX nut-2.7.4-nut-scanner.patch 1615 BLAKE2B dd672f2996ca650a6456084dc92d6a9c6ea1b0fe2d1b812bffcfdefda5e797f3f89e19e325f5a2d9ba066b077b9855d2403e111038bd4024f255f2fee243f500 SHA512 5db031aa5c74e4987824b2ac7a5f6e073de16b8958104ceabb7482a6c6b7779d8380fc30b6189ca2cfee9ab795a7413e537d093b0a338aee73d3385b54d280d7
 AUX nut-2.7.4-py3.patch 1940 BLAKE2B 5bb77bca18ad40a1ba4e579098accb0135c0f4b24436425de3983204554ddb0aeceb473a7a6729048dbfb6175e015129a8bfcce26b169b3e21c905f9f08f079e SHA512 2a4f12954bdf2e50cbfb7a7dd09ed83be27ed2a6d0a2e4244ca8b309614515599c81541b5cfb4c81244b739cf3a47d56cb2746db3fae9e8861c5115c0287041b
+AUX nut-2.7.4-slibtool.patch 2470 BLAKE2B 6baadd663f83209f3abbb4a6b83f170df56da07bb679f6e47571151406c879cfe9a0dbe17fa72678ca66fdcd07ad07bfb8a38e4821cf529e9367a71fad18de69 SHA512 9dfa6c38a56dcf6d743e4ea4eb46ff5e4a81e77eb79df97921662e00c6f4bee4f70a845c3e49ef5ecda31e0e90b8e7f5b450a9c3cd8c5742b093409b894556a8
 AUX nut-openssl-1.1-support.patch 3873 BLAKE2B 17877276e46372aa17d357efc0851b9cdb33b14ac0c40913b47ea513a8ecaa6eebe3241ae8b324583070d76b6c12d3cf18c043778754b5774af846fb8a33b4d7 SHA512 8945f2f663dc50cfd7041cc7f2c4af5cca4b5ef9cfa1be48c122a623e6eadfc511bbaa60a8bd6b68bb2569c75d5f64613d595ad7444b8d6ec9f773d7743872a1
 AUX nut.powerfail.initd 1306 BLAKE2B 9e9c6eb40c6a313ad625136523de730a75b811841331ae5f7dd42b71b65f591c4ab5b8da6e954ceab42da89f4a20e8655cae57354aec6ab796cec80f60ebb419 SHA512 b9aaab526d0996b36a7a6d76a3ee63c1452b0a1bed358e23f6f7f5534e0da7751281428091efc7dba2004706996850ec18318809fdacb94cd8d73ea22bda52ee
 DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a
-EBUILD nut-2.7.4-r7.ebuild 8748 BLAKE2B 7ef88bc7588399130a0f72d63f0d9f38f150fa5b8675520e35f2304e1f01873094d37f6eb7c5badd698f01459dffebca68da42c5b11c752d0cebb781ba0a91e4 SHA512 d7425b3ba2b16fa77f597df10d6e91857c7409ee80b26f51e4f1db893ef7f81d3d6f9b6cf01b73d28f513312e9d55a02cacb8f6190bbc9e017f736a3928ffa9a
+EBUILD nut-2.7.4-r7.ebuild 8831 BLAKE2B 4391c9c831d4fb0043c9116fe08d01627b9b7b342d5f711cdf4a8d516a95cd7d1e7022aa91ea1318bb9a07513dead4348d0d9ed4281b553be734455fe441ee27 SHA512 cb877b5432e426870c45cca693f80764ed44591f06b3ea86533d8ba7a744a5ebb672476a31de837db2f51abb523df65581f43df2d5cc903398dc732824071c92
 MISC metadata.xml 5272 BLAKE2B cc580840e8c437fb37cd8c2132d2daf6751097374ccf11c5a7519756adc6b5d3654e3c40cfe7a66cee8ee5b016c09f65f4f425e4edbd503aed88da5f0eedc1a9 SHA512 f3133fcd673344452904f95d5898fdca3988970bf6526f50191cfa1741fb222468dc00652e968ba305a21851e6a070478627d181c26f6a1d152a215399f469ee
diff --git a/sys-power/nut/files/nut-2.7.2-no-libdummy.patch b/sys-power/nut/files/nut-2.7.2-no-libdummy.patch
deleted file mode 100644
index ca0d8be028f5..000000000000
--- a/sys-power/nut/files/nut-2.7.2-no-libdummy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Makefile.am b/drivers/Makefile.am
-index 99614ca..42b3611 100644
---- a/drivers/Makefile.am
-+++ b/drivers/Makefile.am
-@@ -267,5 +267,6 @@ dist_noinst_HEADERS = apc-mib.h apc-hid.h baytech-mib.h bcmxcp.h    \
-
- # Define a dummy library so that Automake builds rules for the
- # corresponding object files.  This library is not actually built,
--EXTRA_LIBRARIES = libdummy.a
--libdummy_a_SOURCES = main.c dstate.c serial.c
-+EXTRA_LIBRARIES =
-+#EXTRA_LIBRARIES = libdummy.a
-+#libdummy_a_SOURCES = main.c dstate.c serial.c
diff --git a/sys-power/nut/files/nut-2.7.4-nut-scanner.patch b/sys-power/nut/files/nut-2.7.4-nut-scanner.patch
new file mode 100644
index 000000000000..c846e3a782cd
--- /dev/null
+++ b/sys-power/nut/files/nut-2.7.4-nut-scanner.patch
@@ -0,0 +1,35 @@
+From 5d98d5536699222bc93c58c1e6f6df43dc9bfcff Mon Sep 17 00:00:00 2001
+From: Arnaud Quette <arnaud.quette@free.fr>
+Date: Thu, 10 Mar 2016 14:41:40 +0100
+Subject: [PATCH] Fix nut-scanner compilation in some environments
+
+Following the commits 5187dab (common: add some string-related functions) and
+e767df5 (common: consolidate some string-related functions), the build rules of
+nut-scanner were not updated to also use str.c. Since the libcommon.la
+dependency was still there, some environments managed to build cleanly, while
+other are failing.  Update build dependencies to fix this situation
+---
+ tools/nut-scanner/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/nut-scanner/Makefile.am b/tools/nut-scanner/Makefile.am
+index 558cb23b8f..db85c68287 100644
+--- a/tools/nut-scanner/Makefile.am
++++ b/tools/nut-scanner/Makefile.am
+@@ -14,14 +14,14 @@ libnutscan_la_SOURCES = scan_nut.c scan_ipmi.c \
+ 			scan_avahi.c scan_eaton_serial.c nutscan-serial.c \
+ 			../../drivers/serial.c \
+ 			../../drivers/bcmxcp_ser.c \
+-			../../common/common.c
++			../../common/common.c ../../common/str.c
+ libnutscan_la_LIBADD = $(NETLIBS) $(LIBLTDL_LIBS)
+ libnutscan_la_LDFLAGS = $(SERLIBS) -version-info 1:0:0
+ libnutscan_la_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include $(LIBLTDL_CFLAGS) -I$(top_srcdir)/drivers
+ 
+ nut_scanner_SOURCES = nut-scanner.c
+ nut_scanner_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include
+-nut_scanner_LDADD = libnutscan.la ../../common/libcommon.la
++nut_scanner_LDADD = libnutscan.la
+ 
+ if WITH_SSL
+   libnutscan_la_CFLAGS += $(LIBSSL_CFLAGS)
diff --git a/sys-power/nut/files/nut-2.7.4-slibtool.patch b/sys-power/nut/files/nut-2.7.4-slibtool.patch
new file mode 100644
index 000000000000..ddcebdc2ec4f
--- /dev/null
+++ b/sys-power/nut/files/nut-2.7.4-slibtool.patch
@@ -0,0 +1,61 @@
+From a0328e384ad3fb230c2276c8b6dd9f2c47ac07fb Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 27 Mar 2021 15:18:17 -0700
+Subject: [PATCH] drivers: Fix undefined references with slibtool.
+
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ drivers/Makefile.am | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/Makefile.am b/drivers/Makefile.am
+index 40746364e3..3c2277cfc0 100644
+--- a/drivers/Makefile.am
++++ b/drivers/Makefile.am
+@@ -4,8 +4,8 @@
+ # (libtool version of the static lib, in order to access LTLIBOBJS)
+ #FIXME: SERLIBS is only useful for LDADD_DRIVERS_SERIAL not for LDADD_COMMON
+ LDADD_COMMON = ../common/libcommon.la ../common/libparseconf.la
+-LDADD_DRIVERS = $(LDADD_COMMON) main.o dstate.o
+-LDADD_DRIVERS_SERIAL = $(LDADD_DRIVERS) $(SERLIBS) serial.o
++LDADD_DRIVERS = libdummy.la $(LDADD_COMMON)
++LDADD_DRIVERS_SERIAL = libdummy_serial.la $(LDADD_DRIVERS) $(SERLIBS)
+ 
+ # most targets are drivers, so make this the default
+ LDADD = $(LDADD_DRIVERS_SERIAL)
+@@ -109,6 +109,7 @@ bcmxcp_LDADD = $(LDADD) -lm
+ belkin_SOURCES = belkin.c
+ belkinunv_SOURCES = belkinunv.c
+ bestfcom_SOURCES = bestfcom.c
++bestfortress_SOURCES = bestfortress.c
+ bestuferrups_SOURCES = bestuferrups.c
+ bestups_SOURCES = bestups.c
+ blazer_ser_SOURCES = blazer.c blazer_ser.c
+@@ -198,7 +199,6 @@ richcomm_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS)
+ riello_usb_SOURCES = riello.c riello_usb.c libusb.c usb-common.c
+ riello_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
+ 
+-
+ # HID-over-serial
+ mge_shut_SOURCES = usbhid-ups.c libshut.c libhid.c hidparser.c mge-hid.c
+ # per-target CFLAGS are necessary here
+@@ -253,7 +253,7 @@ nutdrv_qx_LDADD = $(LDADD_DRIVERS) -lm
+ nutdrv_qx_CFLAGS = $(AM_CFLAGS)
+ if WITH_SERIAL
+ nutdrv_qx_CFLAGS += -DQX_SERIAL
+-nutdrv_qx_LDADD += $(SERLIBS) serial.o
++nutdrv_qx_LDADD += libdummy_serial.la $(SERLIBS)
+ endif
+ if WITH_USB
+ nutdrv_qx_CFLAGS += -DQX_USB
+@@ -291,5 +291,8 @@ dist_noinst_HEADERS = apc-mib.h apc-hid.h baytech-mib.h bcmxcp.h bcmxcp_ser.h	\
+ 
+ # Define a dummy library so that Automake builds rules for the
+ # corresponding object files.  This library is not actually built,
+-EXTRA_LIBRARIES = libdummy.a
+-libdummy_a_SOURCES = main.c dstate.c serial.c
++EXTRA_LTLIBRARIES = libdummy.la libdummy_serial.la
++libdummy_la_SOURCES = main.c dstate.c
++libdummy_la_LDFLAGS = -no-undefined -static
++libdummy_serial_la_SOURCES = serial.c
++libdummy_serial_la_LDFLAGS = -no-undefined -static
diff --git a/sys-power/nut/nut-2.7.4-r7.ebuild b/sys-power/nut/nut-2.7.4-r7.ebuild
index 581389d74b18..d1fe21dbae53 100644
--- a/sys-power/nut/nut-2.7.4-r7.ebuild
+++ b/sys-power/nut/nut-2.7.4-r7.ebuild
@@ -83,11 +83,12 @@ NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
 NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.7.2-no-libdummy.patch
 	"${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
 	"${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
 	"${FILESDIR}"/nut-openssl-1.1-support.patch
 	"${FILESDIR}"/nut-2.7.4-py3.patch
+	"${FILESDIR}"/nut-2.7.4-nut-scanner.patch
+	"${FILESDIR}"/nut-2.7.4-slibtool.patch
 )
 
 src_prepare() {
@@ -110,7 +111,11 @@ src_prepare() {
 
 src_configure() {
 	local myconf
+
 	append-flags -fno-lto
+	# bug #786702
+	append-cxxflags -std=c++14
+
 	tc-export CC
 	tc-export CXX
 	tc-export AR
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 43f8e4a5fa70..32c2f7d6555d 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/below/Manifest b/sys-process/below/Manifest
index 224443537768..25aa27c9262f 100644
--- a/sys-process/below/Manifest
+++ b/sys-process/below/Manifest
@@ -7,6 +7,7 @@ DIST async-trait-0.1.50.crate 25321 BLAKE2B a5742a3496530b52b32b61aaab483d1ea066
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST below-0.2.0.tar.gz 722158 BLAKE2B 4affc0070074d51bcfde1129e1cbf8fabf1c5d453c22be52e1dd07270c31499d13cfefb605c1ed24614487d75d19f15d56d56325e7762b29853fbb4932dedbbb SHA512 612ebdfdaf4c3c34c346cc59ec12eb401d658f6f61005e0cb65576484f23ef163a0bd20253dbadee177465adec7537fbbb62f9c9be2e1d6ec435a5b1fd758d95
+DIST below-0.3.0.tar.gz 762768 BLAKE2B b97ef12e4812099671bf0dfaaea3d154bdf64e0e9f4bd624d73bc0ce10f2d09edadc76a276fc68665e0e9485a5060781ccc95fa679e7f1b33d49f4f716e5ac18 SHA512 59284fbf57d549a69fe7a2ae65e51e078d25345bbf604d55bbadbc82f91cae55c7022d6cf8af48fb274d27aec05409adc0acc5b30e86352b4edf59bbc8049935
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bytes-0.5.6.crate 46291 BLAKE2B 6d33ab47d04f2e469db2add31db118f95cad53002be7969738923d62a4fe3605ccbe9fbcae6d8741310c543625e80d9adac7d9e9fed01b71cb3943ddd015d920 SHA512 a1caa1f58754f4d2e54b8df8d0ca0083ee5282f5e4d3bb5b1735022933dd2e66fb3f39c7a82216bf7a7e29591695c2e10c8b7144c83ac598e34193f2425a32cc
 DIST bytes-1.0.1.crate 48142 BLAKE2B 3ffe07c5429d7d2df821c04325b8dc84b343c634b4699e9c08b07181e741c06233a0501d987b95f513be57ac169537bd0812defd118305e0648ef41f6802d19a SHA512 885d3229e51c0deffe06824e81e8a016e3244106e7ed382a721a938cd2e69fcad7f5e757f95cb07ee1be83de04fcf98f9774f8f2e07aaa9a1ff068eaabf2fe87
@@ -20,7 +21,9 @@ DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42
 DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST crossterm-0.19.0.crate 104572 BLAKE2B 13b341870516c5ce4f3ac1d4f40567a2a465d65f9dbe9f627821bd6dde994fa5f8d9802a1b42f19ff91d5511ef7d03a0b62361fe8addbb18e74c624dbe66c9e9 SHA512 c46c095d73be48a3c1875806547ba708a40abfc8e5cd89514162e0d1636675c4f4e2857ac3b4b32239d14f7ab57a61018b6a919160b2136ae761dbbde726b932
+DIST crossterm-0.20.0.crate 103025 BLAKE2B 8aed50d2df3e3705134f1d20bdd37a8a0b9c16afdff0701073723b038f916f6104d48d646fd3aed8fc93baf4e749f7447149a099829b137055deb9aec00eaa0d SHA512 998d5377b5e204375ba6016da678d3d3a4feb5174092b9e2dd8c8d26d8a5c7f321d60d829262f4b3a962566204fc6e804e3637494be97760e6ef66f888a6ab38
 DIST crossterm_winapi-0.7.0.crate 15187 BLAKE2B 5407aca29ccb36473b34527d977fd3fe9d190d2dd940da7077535351458fc0a06af114c145a0f3e741402f2df98a98605a8fb02e2e07c5bb107679a24260fc96 SHA512 5efbe7992b4a19725b5992e0b29a77673e8ecc03d28da35580a5cddaeb32b7e30c7bdb53a2392ebb5b1218617045c306d78451f109d5b836f0e00dcab59e0dfd
+DIST crossterm_winapi-0.8.0.crate 15531 BLAKE2B 663d08cffbf1996d585922ce09d486afa288b998b6509958ee0c89f8ca4ae316c8d404b326961a464435d22bfcb91e9c3fd26a48e90b8b267c40a7ab6f596c17 SHA512 e246db39c7adae89ee1699b6a0ca2f5aec2dd053db0698ee25c320eb315c59be51d6db2193493ebecadeebee5a4b6f3c52c2e9ede8088da7f9d102ff7ac1e936
 DIST cursive-0.16.3.crate 28536 BLAKE2B 92b519931620ee0c98180bc9cd74dfd325cb8ff464a6b0f59c0e72b8c059396ae17afc8aaca9b8ad35999868606d2500c0066e62cb86a7e83d2da9fcb82672f6 SHA512 ba70f3bdc96886c031c854218332bc275e0a72a092f51857fa52dda166db9b03aabbdbb9a320f895772f059ddaa03f38cb510b2750f04c1ace091bd79aa7dc46
 DIST cursive_buffered_backend-0.5.0.crate 6279 BLAKE2B 5d770cb19fdffc57cad5c44f2d500dbdc774fa7bc330416a477032f3fb3dd472d3260347d75ecfc43d1bd9df4698662208119e9ab224125a1a07de74e2726a01 SHA512 5128c6cc87aacbfe72cc3bf68b02e7b970367f10b3f2609523d1fea5012f9bc06e639ef9d7c9381b3f26ee254295042b0a5cad858461524502ece962490827d6
 DIST cursive_core-0.2.2.crate 147357 BLAKE2B afa7fc14cd76bfdfee17cbd847d0a3fa59b0e0ad4f91fb0f83cc5afc398817c3e97570087bd2735c8be6a5217d281aecc07e7504665d76c4a11ac99a2c7ac838 SHA512 24418b74c02de0cf0a5b95108425933201e45ca64a307b8bdf3c360d257add6f31edd5fc2ae24d2f91e5725b982a8f45d3a06f3d8661651ce924f91497c84da8
@@ -57,14 +60,18 @@ DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d9
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
+DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST jobserver-0.1.22.crate 21175 BLAKE2B dc0f20541fd14aa5c8b161cf36829a36e550ef414215417e25516ef1cf67cc1c7100cbe4ebcf8d2530e3245f8793a3ff11f407a0ec5d96385ecb6618e2de7a20 SHA512 ad3d180bb49fbaf51c9a2f40de0e2082947a0cb5bef95001bcc664e4c98f75a4c32a6c53f5eba90595e415b600aacae54d92c2f613dbeb8af94fa08b6d770d8b
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libbpf-cargo-0.7.1.crate 680376 BLAKE2B 9ad6d5c2bf37794f080cff5c3756782c22fc91825f714fb6c3f70151dd4896f11ebfd31cd0b12196443cb77fae9cfdd90c9ae0659b8689076e41b7ebefc10185 SHA512 a8c6320057d9ff5944bf6001bf07ea3545208e6628eabe714b9684fe16e53aa5e8b92a48fe627ceeca2d36def97b56a30352c91a590fc7983987000ef1a57b7a
+DIST libbpf-cargo-0.8.1.crate 653476 BLAKE2B 3421fb05f86052e57c287a2885f0ff6774c673b12f9c243a9dec06b4c09771069c4287617b0b8d17f8744d35069bc0ab0e9f926a1be70d209d90f74a34771415 SHA512 2eedf493e650aadfc4946fab1103dbc6491141d2a548cbaac328b61c9fae5dd46ca689ef8ee12d8848a996510fed7ed9bc22b0a34a21f2951a893003d17e12d6
 DIST libbpf-rs-0.10.0.crate 558928 BLAKE2B 1971bdaf176e6967c1a2fbd5efd4b25fa7b4b46397cfe459846b295ec8737f7266f403f1c0b3a40e72477e9b2f364e0bd0bba04dbd779f35aaa299070b413a34 SHA512 74024134b9facbc1c09cf4e92733d2d85019b6bf52bcea72b04aefa7df789566b7a27b98e3287524f1d52ed55e14fdcdbe3ad10e262d0364b2ff6c9ac409d08b
+DIST libbpf-rs-0.11.2.crate 559318 BLAKE2B 164f261360528ef927874e1ced4bc7f0f4baa76d6ed083a6bed248c788aaa7bf81e50df5c585be441036e9d1b17f9e304af2e7b857932caf1e1294dbd900d33c SHA512 dbef8ef8eb4104ea7521574d5433cf421ad0923dcdd6d6c4b6ada1bbdfa560b92cc7514c912619ed57650492753609bfcf847095f4c0c7e1ae968a84bddf8237
 DIST libbpf-sys-0.3.0-2.crate 993083 BLAKE2B 9319a42fcc0a1be679ed7a9adedbbe4c0804b0efbef3a9241e02bdc546e2b423b64fe271743f82289e5a924cb8903f6093329cdc5f012d8e033516ba7fa17b5c SHA512 1f95174e799bec47e140da4e640102f8ecf29183742a88972b2d3537f34e69623dc0ece364476bff1654e64e1b3c4c0813dd49be608d37a1e8f9593105da78e5
+DIST libbpf-sys-0.4.0-2.crate 1030435 BLAKE2B bd8b00f43e9538ca9d4326164a17e15db5588aad8047540889d3e4e2d5427cdce4fa585cf4f89c326fef827528ef85e2e4c9aa21bda0a04eee480b308d13137e SHA512 55f8b731c80bb2d08be7eb5313ec35de54ca79f9356bd600b30e9e0751b5dd6c8348880a32eae3718f62ea614b24086fb041378d542092ba5098d57e7e0bde37
 DIST libc-0.2.96.crate 517567 BLAKE2B b08930af5819ab11016c85849571a0bf431c2dff09d433d18772995dc86d4f12ddbdda497a264a37ad0717c8bdc21f40cdcee026879f205f860be5004123d0fb SHA512 9df4196531ec2076cc0bc0dcfa9cfaafe0a4dc7e79b21f2f75855e1f60961330fc0f960b61bfc1e94ebffae94831408332e47c237daae78d4292b95620b98c0b
 DIST lock_api-0.4.4.crate 20356 BLAKE2B 1b4a648467eba49232df5c595d7c5a0444018269a67db1768c7711d9d1a903a1dd00f99d8654c30186a470c035abdcec9994c8b1a347fc559c684b1792ec7f49 SHA512 655c8a1503b6e7f833b4c62109e1c5005727054847bff81e17d4159f91c02ac97512da0673ab227d17bc9ed0342fe3476247daf74cbc9a0b470e68c648ba706e
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
@@ -72,6 +79,8 @@ DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b62
 DIST match_cfg-0.1.0.crate 7153 BLAKE2B d3f40e5b16761fed337ed18dfa9db9e46aa2ad84ca8cfdc7cf7c72bea7cff8d084d95214ce013b3515bbe5b1ad4b8527bfce692569551e4588fe6f396a8a96ee SHA512 fd36f2b128d70a0f278e708bcb3274d90380229f754aed7ce9b808138b0189d5e1a07e0ba732216f788a530cecddcdd980559b3f71efa371d8805a213ff8f2d6
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
+DIST memmap2-0.3.0.crate 18045 BLAKE2B 13d5db82f7145cefe803eaa8980f314630f6113b291729e716b5159bda132431eb1f598d6030ab59e95c64ccd87999b57aecefecb4c12e717f43e085a7d19d3d SHA512 43a4a657d5c6d54d50f9411b3a5855d07388a84f521923f264f18039b58555bfe216c1fe90418ba383ab12218937b01b17be1c337b08df3b9ee7430e0466da6f
+DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
 DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
 DIST mio-0.7.11.crate 86660 BLAKE2B c55020ecb53cfbff143314d0adfce7e5124f66004711df9dd5f95d18d89b994a13e61b4a12b19a482cc0232393690ac87fc7d56d7d431d85e6826c2f5822b56d SHA512 abcb2d29868ba749ffbf2f4eadd5c24ea80bdc7d62aa09fa0a70d9963e73fd5f603fb9b73410db5f72a051a153e0ef5526992aaaf1b212ff0e961bc31d107c63
 DIST mio-named-pipes-0.1.7.crate 15140 BLAKE2B 5e19ee9baaac61efa0c683f46acec94dbb5a932a6012370976e444d265f71b7dc168c9de838389c5fd492c5bdb15dbc1f8e8956640b11fe5b4e3e09a5b7f12ea SHA512 bd78651d89c292c792c108ab5d199da436ad62097c0fa1563523b8fd5a3c7dc0a7a948df38a4ad05a8e97d7f30652de6ef15d9f0be9157653de11c790ed25c90
@@ -81,6 +90,8 @@ DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422
 DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
 DIST nix-0.17.0.crate 195654 BLAKE2B 6857f84b3deb5800fe3167efd226f042bbcbbc61a4153ce59f69fb544616842c3f6d4566444201c669c6235d1d7577302e5404399f4937f1c0bbbd17fd47ef71 SHA512 3f2bc4f0e9dcb9753535aec9d626ad8126f0a9ea18f73760ba72be0f35d82542c659b4c443783010de133a318f423a16f71cd1f1dd5b5a1f4f71ff7bda247b63
 DIST nix-0.19.1.crate 213462 BLAKE2B 6abc355e7635272adf3933ec5835704a1b1b13b2d2a0e1a4d93280d91093184c7a0a115b75aecd44420b5f4f8e766fa0a86ae3cb96f71ab91bcbd0455a2bcc09 SHA512 0ac549babd0ea438825ad875dbaa4563d8eb90d83160dde429c0a97bb77d4ed3f19f1ad17437c61da69aed3f23382d464e99bbed0199678f7de41cd38953b51c
+DIST nix-0.20.0.crate 216983 BLAKE2B cb7dc3a6b61abb66645613f16a22b5f127fef38bff5ad40fa99ef50019bc40da7f40457af9dac08af5dd67644c2a102ee6ca99425077ac7e2024c89387587752 SHA512 4efb0a6147870aca6b5612428216f36cd826320b75f4f12fb0c75140d47561834695db7745908a23d08ac7114d69848cdafcf87830718da1f03aa6f2c664c5d5
+DIST nix-0.21.0.crate 220596 BLAKE2B 9a9c8bc8c1161b4a642eaae2dca8dee7635168249ea724d59e425253895236a1edebdc82828ccebc577edad2c7920cd918ffab1725c89068c9ef21386208714f SHA512 a3f96ba6eb976867017bf372d8e804b8048a29d32cce962d75199f10621719fe9ed3019bc40f4c8e7a683b6dc82cf818476ec9481c927a5e14b09a738cfe74a7
 DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
 DIST num-0.3.1.crate 9414 BLAKE2B b3b4ab10882c481cc2a8777eb44fb268a5ae1e76768df4f16b7c4f76bacfb6974a9ffa9d0b510c9763af49aa30b3cdfdc344a919700e65da5402d90c3d5ad083 SHA512 38eaf591bdd1a8f758f80f6fcd815f32c064738ba21fd97078200945cc5a2025f88b79efb36538e425df43441adb33144e20e68dc351101845074260d10ab85c
 DIST num-complex-0.3.1.crate 24541 BLAKE2B 10777a6df568fb94740a2bf2a84d68c5612efae200f99be1c20114d0adb0672f08b512f499ea4f86e19e3f20e98a7213fe116509651071b979e59515fb9958f8 SHA512 d24d613f20e04dcfdee68e95b2d4b06ba99db637a96e41a55c4f599626951a44cc5f8adf8e8c86003d42c316aaea0c27739e812fcd4d4bb6efca5b2d9cecdd71
@@ -95,6 +106,7 @@ DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45
 DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
 DIST openat-0.1.21.crate 17503 BLAKE2B 1237236d5f5a5ae70615ba64e40fadf44e0eb1267b6b6875d8f1e87fafb3e1948a507b38d6276a16b765eaaf294a0f08c760d5c4bc40655134bb2e1ee30f3736 SHA512 2fd1ace390652f0616dcf2cf53fbedd0f54404d325494bbb0e3e6bab19aa388f05cedf6ded212e5568b6114b732a0ce6573f323a593f9dace8374cd19c24898f
 DIST os_info-2.0.1.crate 20268 BLAKE2B 73bf110ae6b4c6ae4367471ad05f95c86212aab1df9c85fe9b2bcf9a15be8d542bc864ba539172975b1bb2f172261bd13cf7489877e89f15bb50890fbe6a21dc SHA512 3a8b476e0160846d3d45d147691e9fb4c5a2b999f57f21fbd45921b6ac05a68ce9eff52cff8c6efae896afd10c821ef56f86080d0415ea1b3cde1579360767e8
+DIST os_info-3.0.6.crate 19986 BLAKE2B 482b8d7253ebc5b52a6a666003aa3dda467f5c58c065dc1e0e39106050775a402fd0bba41d312d44b4db9a6617e7a6e5d4a9cf50dc8ba2dd8b3f126ac5bb1f12 SHA512 1b3ebf477264d7c9f4e215a0014ce873a60cec1e12155d6ab8576636afe927fa8c92feb8138f2a42fa1533f1778e6b3b980852b0264e6715355b9a8e85501d64
 DIST owning_ref-0.4.1.crate 12658 BLAKE2B 42bda4584b2f017e7b48bfc1fab9aaf59d49b8942eceaff6f6d95e5e1fd456d952693ef70ca1a496c48d3bfbf69604dd47adb97af31fdd803a6119f11503920d SHA512 15ecf5c53a675f7c96f850f54bea5fde63f8cfe22ad5c01941f67695154a39950087bd72bbd9a2f9e76825a3fb8dd1d20ba92335f265f4aa273e1086773b918c
 DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
 DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d53566005775a3c440c6a2890efb189a4edfe8e99f6499cac36038846628a915ac988c15e1ebab1b3a3ffb53a64631dc19 SHA512 1dba5a7e68ee007918fb210ff308f7382ed1c54d2fe6db36a8246453434246b71e6795db107c83ca39c2bddf5e4a27da7978a464b53d41e150e744d81e75b341
@@ -141,14 +153,18 @@ DIST scroll-0.10.2.crate 27810 BLAKE2B 969202d13e99c12bdd7e5aa6cd6bcd47686d53c81
 DIST scroll_derive-0.10.5.crate 5783 BLAKE2B 1ba52fb972bb051fb0e2f9827db55966058e6747a41b54de9d43d9e34105c1c4ad45f758ffca597d7aa13f8ba2d2abbb2d1648883f51458c1b8fdedef5234cd2 SHA512 029e024921d558c14113f16b6c406c766e9065d37b6e0a43dacf4da6845eadb780580a7e0e9d5c78cea02859e2acd842e23855cee193b1a533183550f2d595cc
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.118.crate 74248 BLAKE2B 0d78d29a9d97da401dba93cd6e118dfa48c73351e32ee48bdc2a649ad60f1b198574b78a5261564d466e8097f8b635e810f4c8a52592e3f39550910e250971e8 SHA512 d3b316e721ce395fad656a598fed7e83b248a3dbd98a9eced98fdc337c8fd40f415356a0af6a0e5a104a592ad10e1265d47d94b10b343ce9475797b3a74306e4
+DIST serde-1.0.127.crate 75162 BLAKE2B 7472c9328b4398bb25bd71febe9483e6255b309d98d2655babe5d16933c5b92a71cb75df8aec3abaff84082bffdc44a549673d30a3cb68888d17157e58b32be0 SHA512 dc2b9c0a71028853bc05b4bdb3db1e9e753dfc588ebcff5dccc42d05252fe250b797e10b4d574f161fe11747c9740e93a47a2eba2b4ffd6ecf1992dfadbdd2ef
 DIST serde_cbor-0.11.1.crate 43947 BLAKE2B 4c1dc444089276b4bfb1b1237eeaefbb6954fa8b613e539fa6eabe01ddda990be50c5e5ce72e5f765835224e9de4fb0fdb26d2fada2b18d6b03f77665e2c41cc SHA512 165192ed999cfdbe162abd3aff92f86f4300ffa9347e57fda2ef3c32c69a18183d468db059d9dd80218bf01de15fec6fde7cf6dbb8cc2a6158785484353f2192
 DIST serde_derive-1.0.118.crate 50589 BLAKE2B b1328a3c7fb0fd6321f0d020969f1b7e32150488410d574cf9e75ca06bebef3d753dacfac4e45cbc0eb9626246734a1dd5b766b96a1a98b53f3f17897dcfb349 SHA512 f0909822f73e900c8a0b791a30fc5cf5be0a79e6c455766a90d6cc314408b95f2b9d7e3ef99363860d615620968e217da304457d2d6e00f60da8ab8fd2db7115
+DIST serde_derive-1.0.127.crate 54201 BLAKE2B 207c20d2e276a173a1ae0326be307f3d77937442838a7890db923fea434d6e134a9591a07139f8eabb9981aee74dd092d6e2c0a98f17aa67f069faa3dccec6c8 SHA512 2c346d45bb96867ea5b4a0ca24aa9b0584d83f26578f5a1ec8a51c514d0158d98c7b76408a0ea64e5718567afb6a0cfc5922d3c5588a89b7e19035b13b1a0416
 DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
 DIST signal-hook-0.3.9.crate 48416 BLAKE2B 1075d4b767f3d3c2e556ad1ca2511eee4eea8674989ee76cf4234ebac78f1351291f3dfff72605ec9fe92e978fc9ba25298182564e5a17676fb14441de6bb6e4 SHA512 bcb6cfd4d062ed4a2a83a7fbb35ec90f7dfa5e875807fe6b7c65d0393447b56fee613eac2b3dd08dae0cf2e3cdee920f2c3b3d27ccd1f6f8dbec849c3e6e4261
+DIST signal-hook-mio-0.2.1.crate 8893 BLAKE2B d3dad6a9bdaa52c3a45b9839608fed8e79f44916a07ea36e342a7a29d2ff81c0c1928fbd8628130203f00d2562bdf7e191277d6ba2c3bc51f94edc15da455809 SHA512 ca95684574e2934e138fcc2bdd023960cb4207095916650710e76b6fa32f8bfbfc8c5119d3bc92e31a55a2edd6e63b47a2119ff31cef5ba63719b9bec0b438e8
 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
 DIST slab-0.4.3.crate 15681 BLAKE2B d7e3eb0374de081d1870d2b46c9137e5ec75950a8fec217e3b120e455fe847e9245884990fbff4d01d512ea297c2012cb1a64f9b169264168081f5f7d6b20b39 SHA512 8649f32f26c1354b3281534fa0e062a145b62813c46f9ff5989ae688154221b00ed1b8c044c67a4b78c00a2e3478a8eb9c1c96fb424c24cd6cefd4df875fbb15
 DIST slog-2.7.0.crate 45432 BLAKE2B 69b3e8d826cb3a60b2707e6b0afac2226daab5a72a29c3bc1bbc141cc8f082e53a1cea43d3b4e5c7e54821eca0990248f17536aa52df116c356958c780e528b3 SHA512 13bab46e288596d856adac80a6481d803646f27ef7bc1669ee2f7667b321b33beceb050348007a0ef28d0722bb597fed2139eef4685d01269ffe271830d1b15b
@@ -162,6 +178,7 @@ DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
 DIST strum_macros-0.18.0.crate 10229 BLAKE2B cdfb1d626f8b338ec7002056e70d539e41af7ae060fb85d787d66218f6b7f58c260f99f02e0c3ba9512de371d35456ffab29a7633d0d6f716c1879adadf08b3b SHA512 df13553e2b89b2c87be3948f4881434a5eb851d0318fafab9eeb9764ea56ae8ebd50639d10fa508f674442a859d4cbd4d344c7d1253fc7f8eed3443891f4defd
+DIST strum_macros-0.21.1.crate 16280 BLAKE2B 48e4eb3f5e5431684a4688feb55cbf024a810b39df37fa869b4d417bf16c245c3eb901fe2c544da206f1dd4a3c2e62653b4080a9dc02eb446c6795225b34d857 SHA512 85ea12f8e03f04c427b99e027065279bd559ea1c51532c6f35cc842218e350e27349258f0fe25f5efc9fca047387da3ec5d670f94a50d574b15f4b5f1c99ddea
 DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
 DIST take_mut-0.2.2.crate 4263 BLAKE2B 3660c519b5ce8a39ab4f06dd61ac062f645de321f36913e948e8f10ead18866e2aae2609eb1f7f5faa7cc2500083743fcad816578defaddede456c6c05b3244e SHA512 f75a5ce723e710809130878b0ff5df368f5929201e557661dd0154f3b31ea58d7d30d84672ca5a684fbfcae5f82ab2c21b1b5d9edc4c67d08c221228bd9de814
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
@@ -181,6 +198,7 @@ DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9
 DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST users-0.11.0.crate 21980 BLAKE2B c106e9ed67b9ad766bb7318506261579768185aea3d956d9e8b2adb52349525fe69703ee3bb2e4fb02aa223bfa6fc92a14d8128412623f70654254f842d7322c SHA512 e28028f895780bd59a11069b81b87470a287a447e42566cfb8de0e2d4ba8c90a3ce92901e253dcd2628383c8ed06c10714bc0181a57bf257f7edb3510936e596
 DIST users-0.9.1.crate 20456 BLAKE2B 49a2dd188f8d944d361a4e58f3f437718af7510c2b684e22209058e97dfd9d5ecec2c901cbe2cef36ab74d11091b1280de8b94135da523f57b02372ed5571fe0 SHA512 e372f8402d241e924c77a13621053836a1a36a6a6b9b66d5e187a582be0a85638270ea140c048e07f6739ed228711095fc98705303c499f2b542fd548df0819a
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
@@ -200,7 +218,10 @@ 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
 DIST xi-unicode-0.3.0.crate 87001 BLAKE2B 1d44488a32dc9bd9284df6ee26f0f05c5145c458dc76943cfab88f2f2544762477bbe1378bc1f5e365cd5a5ecf79e41fa66140190047f37ea5dfe678c97a542e SHA512 39875839dcf90b391e76a6b2c2efb2e6f8bfdfdaa59c4815bab8f24412f840c6b01232b5bd79a8f8c6bf7733333e5915c2a7235d27f890b883d6658094bf6271
 DIST zstd-0.7.0+zstd.1.4.9.crate 27411 BLAKE2B 7f35f179c893476e8c15ac4b013290bc226114fc4ae1fe3742345365f92ab32965e04f4c52bca39c598cc05ebe7c575b5ce4bc6a4a0b6974520810203f30cd5d SHA512 b01ff06d3863ede51fcdfd99ef2e2a669f0532f56d55c0ebf0a041187c335018c6911b96f25dc7836ed4545486fd7affe926e90fa8e1901f4335d5df3abc7110
+DIST zstd-0.8.0+zstd.1.4.9.crate 27554 BLAKE2B 6148b5c06d09f2cd5193b58a9518047cffc7e94f076f5dcf235fbebe046e9c0555bc78bd5c5e059904b3f385e25bdfd4655e33db2d7be2d93508f7648ef5dd15 SHA512 71172e0ce8b4ca29c9f2cf0646c11acd2620b880d7982d380bfd78962d92742282b6677fadccbdc8daa36bbdd91112fa19879d9762d229cd0fa07b6902157740
 DIST zstd-safe-3.1.0+zstd.1.4.9.crate 10261 BLAKE2B b6f064d82eb5162a64ceaee7a26a042ac043967b1a7112c30bf78cab406f9faea8f835e4e1187af0a2746f6ba8d369dee7a2f4e74fc992992af1c22dbc2d7894 SHA512 99cfc605240399bda04e71f12dd0d4d8f5134504d9f30ed663832876906584480f24b53c312dec31005e8b079ba0286cdfb9b3ec4eb616d406f8465d35fd343a
+DIST zstd-safe-4.0.0+zstd.1.4.9.crate 11801 BLAKE2B f1674d43f24acd8e8672db2b8b09c427502de5baa0c850ae1e883c579e5343bc3b8ea09d224bc5ea7d7de9adf546ff881cf5dbdbf804f222d28a0eb46b0e33f5 SHA512 9135d5de9b04eb5e4881150dd0e58258a373c3d4b5d7e681eb0980a93e1f42657e6478c81950582afdc617aaf119e4277c3381cd531548e99b02a03eb9772002
 DIST zstd-sys-1.5.0+zstd.1.4.9.crate 1901023 BLAKE2B 64e4444e478d6728f8e90ed03e86f07b7f14a55562c4093cb64af98f3b2857ffd50021f683aee84072140e2823476c06b0e3aacd7ea12770e9240b70dea05eba SHA512 0e4984d49e1d71796f6335eb37f229422307d359b98e9ebfde2807446478d95a101f506991a1eba8c7aba498019089422631dc0e5f8b58fc55758b00f4f8afb7
 EBUILD below-0.2.0-r1.ebuild 4344 BLAKE2B 4a4ef52caa6b944c730d1a95ae1134ff385b291084926b1862c24106fd300f4fc4f5912e3cfd38cb98afc9a8ecde38ef91e1f60db3a255bd5a64ae6a6d68083c SHA512 e933d86cadfb44a2aaa2bb04674e5d0f708d6e4d08b651c26dd95f306494a40750818b1ffe29628812481793d72001fefadcd18b2f53c367da7be4d6b19aac71
+EBUILD below-0.3.0.ebuild 3987 BLAKE2B 5f8983780ea8fb4e3a4f5abbeb3d1cb5fe26fd6f591672291997bdbd1f7f8b1a96656699e43b73ffdadaa3bc4b5c0d37e08d8bb48fb7742872d40b9c56e8f3aa SHA512 181f412dcec36bd2449918482e301cec34049c66f91ba405457c916850849e75781ef7ef7a204598f843e27d1e6bc143342e2916663c269b66a6614e610140cb
 MISC metadata.xml 1093 BLAKE2B 130366867f7fd554d1abff758801a67900f992a594e3a5e30515ead93fa9668826a2dd509e46a9279c9d6912d3fb9a6dba6a8d5a4150137a771b50660eb2a959 SHA512 4124eb9b7ccfbc1ebb46967cf8fb36722a61ac420e801df61b3e5fa00d75518a8e712e7aedf972c55ed1673f06f5fd4b6d2d9bb6c2163fd87494c06bcb03fbd9
diff --git a/sys-process/below/below-0.3.0.ebuild b/sys-process/below/below-0.3.0.ebuild
new file mode 100644
index 000000000000..1eda62fead3a
--- /dev/null
+++ b/sys-process/below/below-0.3.0.ebuild
@@ -0,0 +1,218 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+	ahash-0.6.3
+	aho-corasick-0.7.18
+	ansi_term-0.11.0
+	anyhow-1.0.40
+	array-macro-1.0.5
+	atty-0.2.14
+	autocfg-1.0.1
+	bitflags-1.2.1
+	bytes-1.0.1
+	cargo-platform-0.1.1
+	cargo_metadata-0.12.3
+	cc-1.0.68
+	cfg-if-1.0.0
+	chrono-0.4.19
+	clap-2.33.3
+	crossbeam-channel-0.5.1
+	crossbeam-utils-0.8.5
+	crossterm-0.19.0
+	crossterm-0.20.0
+	crossterm_winapi-0.7.0
+	crossterm_winapi-0.8.0
+	cursive-0.16.3
+	cursive_buffered_backend-0.5.0
+	cursive_core-0.2.2
+	darling-0.10.2
+	darling_core-0.10.2
+	darling_macro-0.10.2
+	derivative-2.2.0
+	dirs-next-2.0.0
+	dirs-sys-next-0.1.2
+	either-1.6.1
+	enum-map-0.6.4
+	enum-map-derive-0.4.6
+	fnv-1.0.7
+	fuchsia-cprng-0.1.1
+	futures-core-0.3.15
+	getrandom-0.1.16
+	getrandom-0.2.3
+	half-1.7.1
+	heck-0.3.3
+	hermit-abi-0.1.18
+	hostname-0.3.1
+	humantime-1.3.0
+	ident_case-1.0.1
+	instant-0.1.9
+	itertools-0.10.1
+	itoa-0.4.7
+	jobserver-0.1.22
+	lazy_static-1.4.0
+	libbpf-cargo-0.8.1
+	libbpf-rs-0.11.2
+	libbpf-sys-0.4.0-2
+	libc-0.2.96
+	lock_api-0.4.4
+	log-0.4.14
+	maplit-1.0.2
+	match_cfg-0.1.0
+	memchr-2.4.0
+	memmap-0.7.0
+	memmap2-0.3.0
+	memoffset-0.6.4
+	mio-0.7.11
+	miow-0.3.7
+	nix-0.20.0
+	nix-0.21.0
+	ntapi-0.3.6
+	num-0.3.1
+	num-complex-0.3.1
+	num-integer-0.1.44
+	num-iter-0.1.42
+	num-rational-0.3.2
+	num-traits-0.2.14
+	num_cpus-1.13.0
+	num_enum-0.5.1
+	num_enum_derive-0.5.1
+	numtoa-0.1.0
+	once_cell-1.7.2
+	openat-0.1.21
+	os_info-3.0.6
+	owning_ref-0.4.1
+	parking_lot-0.11.1
+	parking_lot_core-0.8.3
+	paste-1.0.5
+	pest-2.1.3
+	pkg-config-0.3.19
+	plain-0.2.3
+	ppv-lite86-0.2.10
+	proc-macro-crate-0.1.5
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.27
+	quick-error-1.2.3
+	quote-1.0.9
+	rand-0.4.6
+	rand-0.7.3
+	rand-0.8.3
+	rand_chacha-0.2.2
+	rand_chacha-0.3.1
+	rand_core-0.3.1
+	rand_core-0.4.2
+	rand_core-0.5.1
+	rand_core-0.6.2
+	rand_hc-0.2.0
+	rand_hc-0.3.0
+	rand_pcg-0.2.1
+	rdrand-0.4.0
+	redox_syscall-0.2.8
+	redox_termios-0.1.2
+	redox_users-0.4.0
+	regex-1.5.4
+	regex-syntax-0.6.25
+	remove_dir_all-0.5.3
+	rustversion-1.0.5
+	ryu-1.0.5
+	same-file-1.0.6
+	scopeguard-1.1.0
+	scroll-0.10.2
+	scroll_derive-0.10.5
+	semver-0.11.0
+	semver-1.0.4
+	semver-parser-0.10.2
+	serde-1.0.127
+	serde_cbor-0.11.1
+	serde_derive-1.0.127
+	serde_json-1.0.64
+	signal-hook-0.1.17
+	signal-hook-0.3.9
+	signal-hook-mio-0.2.1
+	signal-hook-registry-1.4.0
+	slog-2.7.0
+	slog-async-2.6.0
+	slog-term-2.8.0
+	smallvec-1.6.1
+	stable_deref_trait-1.2.0
+	static_assertions-1.1.0
+	strsim-0.8.0
+	strsim-0.9.3
+	structopt-0.3.21
+	structopt-derive-0.4.14
+	strum_macros-0.21.1
+	syn-1.0.73
+	take_mut-0.2.2
+	tempdir-0.3.7
+	tempfile-3.2.0
+	term-0.7.0
+	termion-1.5.6
+	textwrap-0.11.0
+	thiserror-1.0.25
+	thiserror-impl-1.0.25
+	thread_local-1.1.3
+	threadpool-1.8.1
+	time-0.1.43
+	toml-0.5.7
+	ucd-trie-0.1.3
+	unicode-segmentation-1.7.1
+	unicode-width-0.1.8
+	unicode-xid-0.2.2
+	users-0.11.0
+	vec_map-0.8.2
+	version_check-0.9.3
+	vsprintf-2.0.0
+	walkdir-2.3.2
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasmer_enumset-1.0.1
+	wasmer_enumset_derive-0.5.0
+	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
+	xi-unicode-0.3.0
+	zstd-0.8.0+zstd.1.4.9
+	zstd-safe-4.0.0+zstd.1.4.9
+	zstd-sys-1.5.0+zstd.1.4.9
+"
+
+inherit cargo
+
+DESCRIPTION="An interactive tool to view and record historical system data"
+HOMEPAGE="https://github.com/facebookincubator/below"
+SRC_URI="
+	https://github.com/facebookincubator/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)
+"
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 ISC LGPL-2.1 MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+BDEPEND="
+	|| (
+		dev-lang/rust[rustfmt]
+		dev-lang/rust-bin[rustfmt]
+	)
+	sys-devel/clang
+	virtual/pkgconfig
+"
+RDEPEND="
+	virtual/libelf
+	sys-libs/zlib
+"
+DEPEND="
+	${RDEPEND}
+	sys-libs/ncurses
+"
+
+QA_FLAGS_IGNORED="usr/bin/below"
+
+src_install() {
+	cargo_src_install --path below
+
+	keepdir /var/log/below
+}
diff --git a/sys-process/evisum/Manifest b/sys-process/evisum/Manifest
index 433af741b272..981dddd17f00 100644
--- a/sys-process/evisum/Manifest
+++ b/sys-process/evisum/Manifest
@@ -1,3 +1,3 @@
 DIST evisum-0.5.13.tar.xz 2056416 BLAKE2B 06347190bdf0831b9902ec683ec8bfaabf1c27e498e050e4eb2d51a1a73be62e987c3518c0196e76a717a95c7d7dfa451adc85d5f79dafa613960c08e35602c9 SHA512 7f0af18a9e7c1af6dcf74e2b975b16885aecd829af51af66332e9af5634a3c948158c606caafa1823a04af0191fe7f2b1f13e06af6c16c6b2f2f45832d0706b8
-EBUILD evisum-0.5.13.ebuild 465 BLAKE2B 6d82e5dee8e52a9572596b09a4be2e7a1a75c08dcdebe2888de37234898e9835d3676b50bb4ea0fd47c6e7b13cc26d8c1cb13d693cd029c3e173d77cf5ef5836 SHA512 b211f184a3861bbfed001fbc0b686df6af849de29a21065f5c334873d17e8ef43f773a1276a5d7a171d0d94b0116ace75321ed419b148ace31e0e325a958dcfa
+EBUILD evisum-0.5.13.ebuild 472 BLAKE2B f67e20c0cd0dbeb258493f9b3fb592886865adeeff651af61b568b3f4c071d32622ce8ece4014d0c0e4d3c705f331061faa98ca7eefb004feb360d8a2f09560f SHA512 7b1e154f7c591eb17fe9510f74d74529d57200e12b9e24fd82b55716a69624f9c51d4da04d14c0e4f87ac7797d280b3b756462cee40777b5c36dc32a595ca60f
 MISC metadata.xml 815 BLAKE2B d969cde79150c0cd2977017520a7ac95713b1c43aad52645f4d354f5a3ef3320638f5da097f0b7999689135036f1f8594b5331d2ca3420af93a2c3bfc726569e SHA512 c1b2c28863e8572ddfb79f8159e9ffc0defb4dc9c7b02c3ad7b1a4804ddcad06034471d9774f4e09bda1c84a8ce72393172f194c30cb5e5fda0a1177db842c3e
diff --git a/sys-process/evisum/evisum-0.5.13.ebuild b/sys-process/evisum/evisum-0.5.13.ebuild
index a83ca9c22961..d0d85f497246 100644
--- a/sys-process/evisum/evisum-0.5.13.ebuild
+++ b/sys-process/evisum/evisum-0.5.13.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 ~riscv x86"
 
 DEPEND="dev-libs/efl"
 RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )"
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index 0573dc1e3713..7ef11b1eeb67 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -10,5 +10,5 @@ DIST fcron-3.2.1.src.tar.gz 601142 BLAKE2B 184b74f9d64186b7d3aae87d48ed0107525fd
 DIST fcron-3.3.0_beta.tar.gz 592481 BLAKE2B b862dac8e70621e299ec2fbbc75a0e8843e7a085190fa7a18f9444f6f41f28cf55ef0dcd7234a388b9b3e6689f25019a581ded2ae6002643bb3dc472a59207bb SHA512 e5b76e23af774997d9ee1ef58d17009cea95d10b19a2d22b550b178a39bb7c439c055b440eb99c4286db6622901e5deb029318e4425e8cd098766452ffc15bc6
 EBUILD fcron-3.2.1-r4.ebuild 6984 BLAKE2B a0ffbc0ff0c143eff057010923b90a0fe379c8d9d55e756d7fc9b13ee68390aaf4aed26894bda92ccf5cfe2276a1269db8f517a9adba0aace662dfecee796790 SHA512 a44daaee4c1d15644427faa1f345b7c141e5c3bb27406f2b4a4ccb9c2819cd951a6fd475d508be3f485cb7acc34aaba4581b9527442de3a0e2865258b0c56a52
 EBUILD fcron-3.2.1-r5.ebuild 7093 BLAKE2B 7bcc217ad1f34b2991a3a35a629123667fb63c0c488df39ee94fc93538f4186f548faed125a717b0c0bce06fbad25289112593cf23f03a8cb5d25de49c222c79 SHA512 6d6815b015b5e20d8ebab26c3736aa8a503f42b5987e30c71ee3134bc1f6735e3aa8f442f16288f535c8febe16ee8d1dde878575ad5b6b07896175347116445c
-EBUILD fcron-3.3.0_beta-r2.ebuild 7114 BLAKE2B 7e302b974f42ad77be822ba97dd94556020b886b2b5e2abf188c4edd3c35bcecdf9a7db0bbc19e743a42284b8a563bb832be293602b47d73d73ff5e27983b98c SHA512 68f9f511885778d7a804012129cddd752859f6cfa23020efc499fc4234e3a1a51eda027042c3be0bdae71cfc4c140409b8c3b82d0ec97fd3f6c5764ab505095e
+EBUILD fcron-3.3.0_beta-r2.ebuild 7120 BLAKE2B 5397bbb8a5283761ca7df55dc24aab398d3a6c20837261e9070e465a08c50e09a8a01f84d47782ec87e047838f553b30dac9f92d6895e510c4b97a9f6052aa43 SHA512 218af6c1327b7c71bb69cb17090d0ccd89176f0abb8a1704ab9a6d94e0a056884f03c153a57604e0fdc1d2c21a4f569dc30d9ee9a359025e523edaf89ac192e7
 MISC metadata.xml 1236 BLAKE2B cba4b98c8851e5c28d4bdfd06081cea35f8bed59e9f48d3ad094e43cfe72e12242ebd5a656b2a573dffe8e97158810370801b8395f3562eed0600540b60c9248 SHA512 6bc85c005fe5adefd42834bc3448bf97f2757b219ca9f28f03555cdf900044f8814f34386c468de30eb3ea482fc0bb839e59376734921e1cd7761e703858699f
diff --git a/sys-process/fcron/fcron-3.3.0_beta-r2.ebuild b/sys-process/fcron/fcron-3.3.0_beta-r2.ebuild
index f670bb69dd3d..12fc00624ce3 100644
--- a/sys-process/fcron/fcron-3.3.0_beta-r2.ebuild
+++ b/sys-process/fcron/fcron-3.3.0_beta-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://fcron.free.fr/"
 SRC_URI="http://fcron.free.fr/archives/${MY_P}.src.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="~riscv"
 IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline"
 
 DEPEND="virtual/libcrypt:=
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index a909090de804..09fc31561232 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,4 +1,6 @@
 AUX disable-update-check.patch 992 BLAKE2B d06bc123aef2aec89bb4cca40334183aa5b6d198fcf9abffd15ad60f1c7c43f1e9a3103ebb5f2f743c83cc9d09cdf610c4e5d5caea89523f9ed37f3a4801e774 SHA512 02b06b01f8e3782da632677aa84b9131cb33dae3270677a1a4b0af3c139d100fa54c90c412d1e608e08859facb31e04768927e4862cfc4d9cfcbd061020a5dac
 DIST glances-3.2.1.tar.gz 6851329 BLAKE2B 3f8eb91a0957961d0ed2465d8025d25158303cc8332b7a976c2af0bbd671405aae3b71b1d3a63eeb86ddb0d6e500b955bb0e1e5a93c0ba0b88835f88872eb979 SHA512 e2f8a46a9bc3b2e3aa16d0716b34e06991029df9dec4c29ef70c65b5fb7c96dee3c71cc565b551e35a31aa1c7e1a92538b158c2e660d15b22defad8ae04c4eb3
+DIST glances-3.2.2.tar.gz 6861708 BLAKE2B 99ed3298724a82f036660f05cfd374f8dfa4883ef3c710dfe789ed9f9986bfe873117096564f1dd46d91cd3d0304e0cd1876d17ecd6e3aad98c7dd9df2095265 SHA512 e77b62e5fa6131914b56f0b5249789b3bcac0c625cd429eeb0870a14be55f15c401956c002376e5868fa1332bbb219e9bd3a5bd14c739e3404b068a063af6821
 EBUILD glances-3.2.1.ebuild 2730 BLAKE2B 2d283e515974bad92aa7564bf014db086714853b9e5d7e79501907ead2efd781c727e4a985da85661b1646cc296699fd97100ca6cdeae31f00801bde753fb4b3 SHA512 4279c64766099feb65e67a8689dcf2ce5d54033887c786883ffe03910e7bccf30f4b5ae019ff388cae4b7c3220fbc04a65da2623c98e89b56b77d1950f15933f
+EBUILD glances-3.2.2.ebuild 2680 BLAKE2B 0cb171f0abe0aa5823d1bb3cc75eddb7e7665f9089344d7f5a370ec1b026ed525bf88948b42cf6d6690b05878c6a6d5d2e30fe59c0e3eebf76fcc359fb4cd0ec SHA512 131db877438f42ea850451de6b9cdbdf5f7f0cff56eac6f04cd94f77e27a8247d5f0c4542696c083f5ec65dfb7f15a18453f18cf1a19bb6b703687b2e0684fe8
 MISC metadata.xml 856 BLAKE2B e3d750f1586383ffabb204739bd0636a1b7729b4b704f03f03b356afd540482571780aa4de84620ac2aa4e832e4250867228e59cb5ed3f0f6867e7bc65104246 SHA512 8315a7896acc1068a2f7a6efa2a99078090677f685a90bd2c5220c043fd25e03d137ea0aeea1cd3660544f139970508037e9447cfb08d82fdb4023c856709e73
diff --git a/sys-process/glances/glances-3.2.2.ebuild b/sys-process/glances/glances-3.2.2.ebuild
new file mode 100644
index 000000000000..c5aa0b348ec7
--- /dev/null
+++ b/sys-process/glances/glances-3.2.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 linux-info optfeature
+
+DESCRIPTION="CLI curses based monitoring tool"
+HOMEPAGE="https://github.com/nicolargo/glances"
+SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
+
+# PYTHON_USEDEP omitted on purpose
+BDEPEND="doc? ( dev-python/sphinx_rtd_theme )"
+
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
+
+PATCHES=(
+	"${FILESDIR}/disable-update-check.patch"
+)
+
+distutils_enable_tests setup.py
+distutils_enable_sphinx docs --no-autodoc
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+python_prepare_all() {
+	# Remove duplicate entries of a prebuilt doc build and
+	# ensure install of the file glances.conf in /etc/${PN}
+	sed \
+		-e '/share\/doc\/glances/d' \
+		-e "s/'CONTRIBUTING.md',//" \
+		-e "s:'conf/glances.conf':('${EPREFIX}/etc/glances', ['conf/glances.conf':g" \
+		-i setup.py || die
+	sed -i "s/, 'irq']/]/" unitest.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	# add an intended file from original data set from setup.py to DOCS
+	local DOCS=( README.rst CONTRIBUTING.md conf/glances.conf )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	#optfeature "Action script feature" dev-python/pystache
+	optfeature "Autodiscover mode" dev-python/zeroconf
+	optfeature "Cloud support" dev-python/requests
+	optfeature "Docker monitoring support" dev-python/docker-py
+	#optfeature "Export module" \
+	#	unpackaged/bernhard \
+	#	unpackaged/cassandra-driver \
+	#	unpackaged/potsdb \
+	#	dev-python/couchdb-python \
+	#	dev-python/elasticsearch-py \
+	#	dev-python/influxdb \
+	#	dev-python/kafka-python \
+	#	dev-python/pika \
+	#	dev-python/paho-mqtt \
+	#	dev-python/prometheus_client \
+	#	dev-python/pyzmq \
+	#	dev-python/statsd
+	#optfeature "Nvidia GPU monitoring" unpackaged/nvidia-ml-py3
+	optfeature "SVG graph support" dev-python/pygal
+	optfeature "IP plugin" dev-python/netifaces
+	optfeature "RAID monitoring" dev-python/pymdstat
+	#optfeature "SMART support" unpackaged/pySMART.smartx
+	optfeature "RAID support" dev-python/pymdstat
+	optfeature "SNMP support" dev-python/pysnmp
+	#optfeature "sparklines plugin" unpackaged/sparklines
+	optfeature "Web server mode" dev-python/bottle dev-python/requests
+	optfeature "WIFI plugin" net-wireless/python-wifi
+}
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 6d88c5818aa9..7217c6e3e66d 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -8,6 +8,6 @@ DIST parallel-20210722.tar.bz2 2248893 BLAKE2B c72da41de516e00af9d73216a134a184b
 DIST parallel-20210722.tar.bz2.sig 2080 BLAKE2B 48186854bb752e50c719f2fc6c964b3dd0b3407bf5d0683dafb475a7e6a537de1ae0e6f054f9105a4860b2fcfab50bc59ca159639bf72fcc42373f457af1cb93 SHA512 bc999d37c6eed6b170b845a01d3b0fb88661ed271fe4c18609144d3d224173ac2c66bd6fe40a5b8ddc4894503a38e558835a45ffad3ee8c0201d04dc1aed9a3c
 EBUILD parallel-20210422-r1.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
 EBUILD parallel-20210522.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
-EBUILD parallel-20210622.ebuild 897 BLAKE2B 93b79bc381e23c42963d939ef6d48c0d1b820345786bb2aa7693ad055f8e8bea2d3c2bc775a0719d9444a213ce1cc3799fa07226bdc1c4931cf08eb56387b084 SHA512 1f83a41a9d4f4251ab988e298466f255f12453c0c598f9770290c8ae242c43f8a77f2af9d8b16a778116d4a3b294e0a1c0046c382dda707af55b39cd21c24f4b
+EBUILD parallel-20210622.ebuild 896 BLAKE2B 34eeaa5e5e2d7a816ed5f094c4fc074627348f64af768c86009539d1f6c6c980fad8d2d1521398b42aeb58486da775979cb24b1ac1fa061665acdd759c15185c SHA512 8a686b059c8749ac330e93faddec0863c8cb895ddb74492f294aced088c99e3258dc20ea313e1a0ea6f5a668fe17649c2a1ae354452f685dc70cfdc0b32125fc
 EBUILD parallel-20210722.ebuild 900 BLAKE2B 24fc7f4850789ce9d10a96500af216cbbd64d985f8560581b27dbc0ee672fa48393ecefcc815e38a534e3eac2e84cf54bd2c1393d767bea203532c7296e245da SHA512 ae23b5af9ce95be7936712ff4b0da8f26db8d74f74c97ae58a6869234093cefb6ba77c423cedba198e2cd973fcc7acfa504636492f46856c8c64358b0d4359d1
 MISC metadata.xml 1077 BLAKE2B a636be1d6e6e4861e156561d8670e0c07ae27657e2ddf8cac3a6d9dfcb3c637931fe95daf998dc93fac1ab2a31d9ae43e73469a2882124fa8e229f1c7bf55d06 SHA512 5cfcbca8d00c6fd19ef2ad24fe6f23d3e02164b31a330d0ab34a739a8a4152f8d8df31a42c563d0b482a94519bdc4b0d92182b04d6937dd98f06bcee3726493b
diff --git a/sys-process/parallel/parallel-20210622.ebuild b/sys-process/parallel/parallel-20210622.ebuild
index 584dd57ac596..33f0a0338b71 100644
--- a/sys-process/parallel/parallel-20210622.ebuild
+++ b/sys-process/parallel/parallel-20210622.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 01383d2d862f..00183af8dd96 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 09c252a28762..21308b54ef6f 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -2,13 +2,16 @@ EBUILD dist-kernel-5.10.52.ebuild 383 BLAKE2B 80eec9edaf8e2502e3d24e3c4c48b98ef7
 EBUILD dist-kernel-5.10.53.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.10.54.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.10.55.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.10.56.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.12.19.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.13.4.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.13.5.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.13.6.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.13.7.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.13.8.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.4.134.ebuild 378 BLAKE2B 425766351233e0cc1717be1ad4fd1e200bc799f0aba6693f174bc043be6a179616a25797d8411897c3fe6dcac975f3d7917d33171d3e0cfea8e842586ff68808 SHA512 763d2b93d60d712cdca6dfb85666b79d3e678a8ea3969609c8edd8f96f05d372cb768718893cbf7dc85e0a4615b1d3842fc1423d287e07c598d30f0bd321cf29
 EBUILD dist-kernel-5.4.135.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.136.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.137.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
+EBUILD dist-kernel-5.4.138.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 MISC metadata.xml 290 BLAKE2B bcb7e629ba04928387a13bfb6b95fc2acce4d8b2bdf2669ea1c6299a954c8e94b0e3b4d65cd4b424dd8da2e33405bfd0cac3a12ff2603faad3f69b516d0f0aa4 SHA512 6b8c9a6b6055c46b0cce5bbd155d53a0dd1115edaad016bade7fc1cbe3ee4a9c2097fa3392f9df6830546b36c65cdf99cf2ffda40a313117ab5f32249677c753
diff --git a/virtual/dist-kernel/dist-kernel-5.10.56.ebuild b/virtual/dist-kernel/dist-kernel-5.10.56.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.56.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.13.8.ebuild b/virtual/dist-kernel/dist-kernel-5.13.8.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.13.8.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.138.ebuild b/virtual/dist-kernel/dist-kernel-5.4.138.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.138.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/perl-Archive-Tar/Manifest b/virtual/perl-Archive-Tar/Manifest
index 13d367dcd880..8f5f988727c0 100644
--- a/virtual/perl-Archive-Tar/Manifest
+++ b/virtual/perl-Archive-Tar/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Archive-Tar-2.320.0.ebuild 521 BLAKE2B 1da51b7114e6014812d51f3cbb6969f4649251078f15945c67ed4df64a073032ca8d086b62c048d685f8ef2a61a369b44232ae7a35dc0171227af8a4e4d14e9d SHA512 f6324ad25a1d901b2e4fbf7766a9e5323ef9de055b79b64eb9164146405071834bc8f153d1a41b09ae610396f47339726b26277d30cdcb93601bd6969b4a8c53
 EBUILD perl-Archive-Tar-2.360.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Archive-Tar-2.380.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.320.0.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.320.0.ebuild
deleted file mode 100644
index 0db0af2c959c..000000000000
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.320.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-CPAN/Manifest b/virtual/perl-CPAN/Manifest
index bdc31db84ceb..9a43c34ae99f 100644
--- a/virtual/perl-CPAN/Manifest
+++ b/virtual/perl-CPAN/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-CPAN-2.220.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-CPAN-2.270.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 EBUILD perl-CPAN-2.280.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-CPAN/perl-CPAN-2.220.0.ebuild b/virtual/perl-CPAN/perl-CPAN-2.220.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-CPAN/perl-CPAN-2.220.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Compress-Raw-Bzip2/Manifest b/virtual/perl-Compress-Raw-Bzip2/Manifest
index eef43415580a..ace7e13660af 100644
--- a/virtual/perl-Compress-Raw-Bzip2/Manifest
+++ b/virtual/perl-Compress-Raw-Bzip2/Manifest
@@ -1,4 +1,3 @@
 EBUILD perl-Compress-Raw-Bzip2-2.101.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
-EBUILD perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild 546 BLAKE2B 884bb9799b4caefa35c485ff1f2bff7a9df78795fa012f82280e97b5b47578d6e21512b738c1e74fe5d0e292054d9ff17fc946861bcb09afd7861f6d8e5d7f72 SHA512 4b5684036c5f8cecc8d5eca044ee76d6566103380c3d213fe12e999fcf3a6059b57ef4556b80fa0dd699e8bcb032586e4d72be98f24e6aa62a2ec3bf4ad0a1d2
 EBUILD perl-Compress-Raw-Bzip2-2.93.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild
deleted file mode 100644
index bafed6dba1f3..000000000000
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30.2* =dev-lang/perl-5.30.3* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Compress-Raw-Zlib/Manifest b/virtual/perl-Compress-Raw-Zlib/Manifest
index 7163983cebec..b1844e395eb8 100644
--- a/virtual/perl-Compress-Raw-Zlib/Manifest
+++ b/virtual/perl-Compress-Raw-Zlib/Manifest
@@ -1,4 +1,3 @@
 EBUILD perl-Compress-Raw-Zlib-2.101.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
-EBUILD perl-Compress-Raw-Zlib-2.84.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Compress-Raw-Zlib-2.93.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-DB_File/Manifest b/virtual/perl-DB_File/Manifest
index b51962627212..20a75f324eb7 100644
--- a/virtual/perl-DB_File/Manifest
+++ b/virtual/perl-DB_File/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-DB_File-1.843.0.ebuild 529 BLAKE2B 53df5834d5fa106d7cd672f876a594f292fef796bc573b2890429fa9f9d87588fedded2b9ceec84b7dad524ff0c504fe44fcf35319dfd7f46e798a5354905e91 SHA512 5cf14fabd83852437a3d168c2eca8068040afbb40508fe55be206ad7f4f64ea31bb5c4ef548cb81b76ad4dbdf999ca2bc7a9192a35ad574090413e8f6d240892
 EBUILD perl-DB_File-1.853.0.ebuild 529 BLAKE2B 4f3467467239114b3ebf508a146bda1dda0f0330c8cd1b9e2c3cc4508d93d6fa64e50c0019591b98517abe41a35017051e45fd0605c4900b7d35fead63e1edd2 SHA512 c60f1634d3913c57ed4e8b857794f1319a71e16b61df5119a8c4488f6847e8f835cb6825427d8b7701a2653c2df953435d83838c9c3e80f051143665af3b548c
 EBUILD perl-DB_File-1.855.0.ebuild 529 BLAKE2B 49833a2cc9de956edf7a67ce07f682f392aa9bb1f576752c8a432024b03df2611bd4e396c6e397c20a467459b699200dd91fa80c1d7f26af8716e8e13526e717 SHA512 4ef748e4a7f87d315586287e565ac0d1fede26338f93214e5a90d75f68bd100584a8d8a4864d4e7d9cc7c32ba6cd73d0b5f1cdb909a3d547c60bb6f9dd29c2f6
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-DB_File/perl-DB_File-1.843.0.ebuild b/virtual/perl-DB_File/perl-DB_File-1.843.0.ebuild
deleted file mode 100644
index 3e38a90499c6..000000000000
--- a/virtual/perl-DB_File/perl-DB_File-1.843.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30*[berkdb] ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Data-Dumper/Manifest b/virtual/perl-Data-Dumper/Manifest
index a3e53c15105b..4f53e7988f2b 100644
--- a/virtual/perl-Data-Dumper/Manifest
+++ b/virtual/perl-Data-Dumper/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Data-Dumper-2.174.0-r2.ebuild 544 BLAKE2B eb674a8d24e71fed6d3e679563223cffc9e44ea33a701b7e02cb4d67adf93f9b7e826bc14e2f3836307e59e29ec3b2e12c0de603c3d52ea6d892eefc89cbd4cc SHA512 d36e5424652690b45e5232d8f85aaebfd255aafd950b1bc9107323dd9aea2d907cae342b8be5acff1a3b19e71b0d7c1d54392981d5f7bdfb8ccc5714e9aceef6
 EBUILD perl-Data-Dumper-2.174.10_rc.ebuild 523 BLAKE2B 79e27c9a1b607a9a48c0ec116609a58eea98b9454a82f37ac36089fccf1b65c4573e56c2b01fc5853a2d3f8aed41bf289c2595434d13dc957f4bb66d42a73fa6 SHA512 0558cc737f8aac66ad7f8f90574ba203266a96fa0c943f4eb04d6056dda0baddd30e1a0e8eb483307a873c557ec85253f26a178a36afb77eec70848ef51a2468
 EBUILD perl-Data-Dumper-2.179.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r2.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r2.ebuild
deleted file mode 100644
index f00794387935..000000000000
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32.0* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Devel-PPPort/Manifest b/virtual/perl-Devel-PPPort/Manifest
index 4455133607f3..f621837556bb 100644
--- a/virtual/perl-Devel-PPPort/Manifest
+++ b/virtual/perl-Devel-PPPort/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Devel-PPPort-3.520.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Devel-PPPort-3.570.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 EBUILD perl-Devel-PPPort-3.620.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.520.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.520.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.520.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Digest-MD5/Manifest b/virtual/perl-Digest-MD5/Manifest
index 93954d919b0b..48d9fb5e1db9 100644
--- a/virtual/perl-Digest-MD5/Manifest
+++ b/virtual/perl-Digest-MD5/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Digest-MD5-2.550.0-r2.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Digest-MD5-2.550.100_rc.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 EBUILD perl-Digest-MD5-2.580.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0-r2.ebuild b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0-r2.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Dumpvalue/Manifest b/virtual/perl-Dumpvalue/Manifest
index 17825ca230ff..d76da3b71180 100644
--- a/virtual/perl-Dumpvalue/Manifest
+++ b/virtual/perl-Dumpvalue/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Dumpvalue-1.180.0-r5.ebuild 417 BLAKE2B da9de6df986604b7335e796ec7fc704c79410a10ddd73e46514977aae763b059bc9d4fa1727f2e824e68a4391d806e5f165357dc2c3f85a49ac0acad96411101 SHA512 a3ddd1fe35283b0565418952e3e258a12feb236611e100cfa2beaf34bc5c46680fc4af7725b2275f3a805e74088d2a9b03051e1220196e7f8a6fcb064fdd92ce
 EBUILD perl-Dumpvalue-1.210.0-r1.ebuild 438 BLAKE2B 92968b876c1abfa05b3569882b39aad5acd59f2aa973cd153346c01e21a711bafa372af3e6461b4f3ab6750c7e495bae188da833b0ef9272e61f48c1f41b8c12 SHA512 1675bc57507cc7c6cc169de86fa82a619e1331f41fb906ded8cb67243b88f5be68ad80433a972be7863c622e49241c6d09eabc387dab4ee52de3a1c388b22653
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r5.ebuild b/virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r5.ebuild
deleted file mode 100644
index 7373641fdebb..000000000000
--- a/virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Encode/Manifest b/virtual/perl-Encode/Manifest
index 801c444f0898..8d0ed03ac7cb 100644
--- a/virtual/perl-Encode/Manifest
+++ b/virtual/perl-Encode/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Encode-3.10.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Encode-3.60.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Encode-3.80.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Encode/perl-Encode-3.10.0.ebuild b/virtual/perl-Encode/perl-Encode-3.10.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Encode/perl-Encode-3.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=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Exporter/Manifest b/virtual/perl-Exporter/Manifest
index 3676642dd9a6..692790d1bed3 100644
--- a/virtual/perl-Exporter/Manifest
+++ b/virtual/perl-Exporter/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Exporter-5.730.0-r2.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Exporter-5.740.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Exporter-5.760.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Exporter/perl-Exporter-5.730.0-r2.ebuild b/virtual/perl-Exporter/perl-Exporter-5.730.0-r2.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Exporter/perl-Exporter-5.730.0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-ExtUtils-CBuilder/Manifest b/virtual/perl-ExtUtils-CBuilder/Manifest
index 6d79a597bee3..b2406996939d 100644
--- a/virtual/perl-ExtUtils-CBuilder/Manifest
+++ b/virtual/perl-ExtUtils-CBuilder/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-ExtUtils-CBuilder-0.280.231.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-ExtUtils-CBuilder-0.280.234.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-ExtUtils-CBuilder-0.280.236.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.231.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.231.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.231.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-ExtUtils-MakeMaker/Manifest b/virtual/perl-ExtUtils-MakeMaker/Manifest
index 0992143c570a..7f5cd2ae6256 100644
--- a/virtual/perl-ExtUtils-MakeMaker/Manifest
+++ b/virtual/perl-ExtUtils-MakeMaker/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-ExtUtils-MakeMaker-7.340.0-r2.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-ExtUtils-MakeMaker-7.440.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-ExtUtils-MakeMaker-7.620.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r2.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r2.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Filter-Simple/Manifest b/virtual/perl-Filter-Simple/Manifest
index 61518a93d4a8..69f9e861cda0 100644
--- a/virtual/perl-Filter-Simple/Manifest
+++ b/virtual/perl-Filter-Simple/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Filter-Simple-0.950.0-r2.ebuild 533 BLAKE2B d9e2de8396ea81378cbac0523c58ef079203c17e0d904ce0bbd244a43f6494a8389e1036a291cdb4febe5451de86ae96e2223dc1e0d5ce9020bab6877b1ea372 SHA512 ae9f50f97103974d093eccc17745685369e8ccc347669568c4c13acb7a516112508d440c90fc69944be04961543aa6234ac483e8d9d3a7850d3af5636a3c2934
 EBUILD perl-Filter-Simple-0.960.0-r1.ebuild 554 BLAKE2B 17ada25cccf254bae2bcfe66b1e9c6744054fbb9db964d4030c80719a7999eeb5e7821e9d9f0a31fb56388d27569a9d683bed2f6bd0beb95eca7a345b261f0dc SHA512 6756e4372d64614290e4fb0bf260963fefd28bc8fd30dd29baa34151182929a957ad26949d0cdb14b2333d5a198f2c2c42fb5569549d2dd2129d31d9ca84d498
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r2.ebuild b/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r2.ebuild
deleted file mode 100644
index bf1d95963245..000000000000
--- a/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for perl-core/Filter-Simple"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Getopt-Long/Manifest b/virtual/perl-Getopt-Long/Manifest
index 9d22e29e16fe..1aa020dca55a 100644
--- a/virtual/perl-Getopt-Long/Manifest
+++ b/virtual/perl-Getopt-Long/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Getopt-Long-2.500.0-r2.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Getopt-Long-2.510.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 EBUILD perl-Getopt-Long-2.520.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r2.ebuild b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r2.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-I18N-LangTags/Manifest b/virtual/perl-I18N-LangTags/Manifest
index 453e21402ab8..fa9fc14cdb33 100644
--- a/virtual/perl-I18N-LangTags/Manifest
+++ b/virtual/perl-I18N-LangTags/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-I18N-LangTags-0.430.0-r2.ebuild 529 BLAKE2B 612291003aa2e7801876903baf968eca29f4da91198f130be44caaba6e31c5fe7fe3eec5745f6447305792de94b7e00de94f4307574d49946165b292d096e0b5 SHA512 83fc7d1344d0faf9180ae9b9a6307fcbcc9fee9795a9c680ad182a508370b8653c4e7e650e7beb8ea9eb931983bf774a47d8f68171e47b259b300d1714453d26
 EBUILD perl-I18N-LangTags-0.440.0.ebuild 529 BLAKE2B 8c54723ec2ff280d5df2c8e1ef61d966ebdf6a0c2a23fbb9bb2b97cf27ae01579a24a7c8f723ad61bbd2a1a4f5fdcb23bc223ff9fa01317351aec6533dab55b3 SHA512 3b8948f3c5b097b9130c328b66914679857462d828dd22b3c550513bb25dec5452d59a60eaad37aefebfa4c141196f2e6b6380847ba01c8b1995b62def8fb9b1
 EBUILD perl-I18N-LangTags-0.450.0.ebuild 529 BLAKE2B 8cab532c66b2d8164ca506ca12ae9dcaf33ba5d8aa1f961c6865e0760e4a3954d96e3960ce8614426204eb895789023c7fa8267ae375aa54ef5653c570e46908 SHA512 74034f8c2147a9f39a6030f3669d2fed62f50d2f1ad1784fbfeb5fce4bdaf53ecc4c5c795693563e343039a2b6e3613639b6f5470c5e4abfec442ba82412f3df
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r2.ebuild b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r2.ebuild
deleted file mode 100644
index 941ec479b48a..000000000000
--- a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for I18N-LangTags"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/I18N-LangTags-${PV} )
-	dev-lang/perl:=
-	!<perl-core/I18N-LangTags-${PV}
-	!>perl-core/I18N-LangTags-${PV}-r999
-"
diff --git a/virtual/perl-IO-Compress/Manifest b/virtual/perl-IO-Compress/Manifest
index f119e0a41c8d..037de2850b78 100644
--- a/virtual/perl-IO-Compress/Manifest
+++ b/virtual/perl-IO-Compress/Manifest
@@ -1,4 +1,3 @@
 EBUILD perl-IO-Compress-2.102.0.ebuild 708 BLAKE2B c02b5f359db69c330489271cb17a7e21070b717e311f862f40f89e8383884de3c566fed79013f983ec2a2b93f112e08bf5fdbfaa4d0d28dcf8c7e951562051d7 SHA512 23b728a08e800c214cfac5fadefefffe83933f22b612fa36f18003b3d4ac92970178d54697e479f1abb44f727274a33c7cb19eb719f4d29870f4e0a3e3cc0716
-EBUILD perl-IO-Compress-2.84.0.ebuild 704 BLAKE2B d063415c6647c6e55886f8867efec12bdac3e59b676ab8ea0fba8c86d20c05660da3b3d96c8ad1a6f3163a4ab8749a61398cd5d89c47efd005a95bc3febe7695 SHA512 e44915eedf92037d0cf750c237d1452c0cc387067ebb796c5393ef9e606ce5d41e86c39c05fce3cd320f6eb3822fb79bf7cf48644bb69c39f38397059bbb5262
 EBUILD perl-IO-Compress-2.93.0.ebuild 704 BLAKE2B 7662907ccf152886e72630215a0003b64258cd1f1bbc7cb4809a1c88644a203bd6897a3726eb2bc12276d7a33bd3c1d072a5d989d6a6c515fe106fd50c8dbfe9 SHA512 83a59823c76c1c653cba972273df2dfb36240f86998ac2d9c70d698014a09f70c1fb299ba9311b31dcc0849cda396f25998f39fe415e30ed925d7a1c6633aa6a
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.84.0.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.84.0.ebuild
deleted file mode 100644
index 7d8e852bedbc..000000000000
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.84.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-	>=virtual/perl-Compress-Raw-Zlib-${PV}
-	>=virtual/perl-Compress-Raw-Bzip2-${PV}
-"
-# Dependencies on Compress-Raw* must be kept in step
-# but sometimes not .... use ${PV} when you can.
diff --git a/virtual/perl-IO/Manifest b/virtual/perl-IO/Manifest
index 8c6f9b95f79b..2ba0530f931d 100644
--- a/virtual/perl-IO/Manifest
+++ b/virtual/perl-IO/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-IO-1.400.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-IO-1.430.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-IO-1.460.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-IO/perl-IO-1.400.0.ebuild b/virtual/perl-IO/perl-IO-1.400.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-IO/perl-IO-1.400.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-IPC-Cmd/Manifest b/virtual/perl-IPC-Cmd/Manifest
index 84c464a12836..b3df2f773576 100644
--- a/virtual/perl-IPC-Cmd/Manifest
+++ b/virtual/perl-IPC-Cmd/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-IPC-Cmd-1.20.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-IPC-Cmd-1.40.0-r1.ebuild 542 BLAKE2B da038d3837134e31e56ced622c0ebd6b3a82692079f51d18eea93aa1fe65e29f2c5a80258b117879b792437268f20a20d129d07dfa4247ad69acab5762409f2e SHA512 b8222cdccea6411782f0b8d3aeef6e0965ec3cef1582c67b2ac83b4d91947f919925dcec2f0ed3d433f96ad1541b46c1251b02c5a81f773324568f3f6f1a0ce5
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.20.0.ebuild b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.20.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.20.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-JSON-PP/Manifest b/virtual/perl-JSON-PP/Manifest
index 3b446a8b1aec..4c72cc169cfa 100644
--- a/virtual/perl-JSON-PP/Manifest
+++ b/virtual/perl-JSON-PP/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-JSON-PP-4.20.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-JSON-PP-4.40.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-JSON-PP-4.60.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-JSON-PP/perl-JSON-PP-4.20.0.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-4.20.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-JSON-PP/perl-JSON-PP-4.20.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Math-BigInt-FastCalc/Manifest b/virtual/perl-Math-BigInt-FastCalc/Manifest
index 1a39d60cc402..ee2ee5b31b45 100644
--- a/virtual/perl-Math-BigInt-FastCalc/Manifest
+++ b/virtual/perl-Math-BigInt-FastCalc/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Math-BigInt-FastCalc-0.500.800.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Math-BigInt-FastCalc-0.500.900-r1.ebuild 542 BLAKE2B da038d3837134e31e56ced622c0ebd6b3a82692079f51d18eea93aa1fe65e29f2c5a80258b117879b792437268f20a20d129d07dfa4247ad69acab5762409f2e SHA512 b8222cdccea6411782f0b8d3aeef6e0965ec3cef1582c67b2ac83b4d91947f919925dcec2f0ed3d433f96ad1541b46c1251b02c5a81f773324568f3f6f1a0ce5
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.800.ebuild b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.800.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.800.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Math-BigInt/Manifest b/virtual/perl-Math-BigInt/Manifest
index 9bb6b7671284..6faacd394490 100644
--- a/virtual/perl-Math-BigInt/Manifest
+++ b/virtual/perl-Math-BigInt/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Math-BigInt-1.999.816.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Math-BigInt-1.999.818-r1.ebuild 542 BLAKE2B da038d3837134e31e56ced622c0ebd6b3a82692079f51d18eea93aa1fe65e29f2c5a80258b117879b792437268f20a20d129d07dfa4247ad69acab5762409f2e SHA512 b8222cdccea6411782f0b8d3aeef6e0965ec3cef1582c67b2ac83b4d91947f919925dcec2f0ed3d433f96ad1541b46c1251b02c5a81f773324568f3f6f1a0ce5
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.816.ebuild b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.816.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.816.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Module-CoreList/Manifest b/virtual/perl-Module-CoreList/Manifest
index aeca461891db..6bb7f3b03596 100644
--- a/virtual/perl-Module-CoreList/Manifest
+++ b/virtual/perl-Module-CoreList/Manifest
@@ -1,5 +1,3 @@
 EBUILD perl-Module-CoreList-5.202.101.230.ebuild 644 BLAKE2B ee7a8a0992416a1b59c5961d8041b259c86d1fe650f6bc2fcc7b65df35ea57d79b43723105729a2516a41af7dabf010a6eff2f7740b2235b919c761917ac2f15 SHA512 4977d9f201bfcfcd2fee8914b423846cd063af6155915f248249416b3dd7d1488b0203a90351a791b4c53a716d1e0281a0550f1abf35a60a0e814ae074d22b11
 EBUILD perl-Module-CoreList-5.202.105.200.ebuild 644 BLAKE2B 7892122cf84cc47e8629a710e2179942b1d1adbe53e38743410c81672069964126b14bb7c9e51c686d2e97b8484e58945ec97920c752da9f1d3c920b0ab5eb22 SHA512 828d796d90a6f7d33d5cee88e86f8b8f3ead5ae7576aebfb8d8ae85976fbf40993f9b9a1c5eb169ad1626208e9d3272778d068dfd3f32a6542803472e5ab8cfd
-EBUILD perl-Module-CoreList-5.202.6.13.0_rc.ebuild 644 BLAKE2B ddcd4e7107870d0ada899d55a401550b3c1ed4269f3e911a4138d6a42d1f3eec252b65b5ac8b51e1b188d42ed5c6ff963b41273aea87a3bd7b296b54040a3681 SHA512 b757b8cb5ce0e8d84868358d033593303ed70b2d57ba05b9a3f66d1ab9f4ec21279d9df2fb8c2ec2fff92bbeeb34bb0d74f37d7f04807a8f70a2cb5e24f0d519
-EBUILD perl-Module-CoreList-5.202.6.200.ebuild 651 BLAKE2B 005936306be56577bd8700cf6d6c0566d2da6a06f065abb2c7db924376185d6f586ebdfc7e04a0b5492decbb3ec4c2b7fd9d9204b4f0ff06995e88d42533904f SHA512 aecf255d576a49abc13602aeead8c6985edcee4def25a8be97d3cf35ca0ef6252922ab48014941e5a1559e2f35dce23c5d7bf09d0320d49c4ae9cca35a496999
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.13.0_rc.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.13.0_rc.ebuild
deleted file mode 100644
index 7699d239337d..000000000000
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.13.0_rc.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
-# When bumping this package.
-RDEPEND="
-	|| ( =dev-lang/perl-5.30.3* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.200.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.200.ebuild
deleted file mode 100644
index d4b2d65d7aed..000000000000
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.200.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
-# When bumping this package.
-RDEPEND="
-	|| ( =dev-lang/perl-5.32.0* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Module-Load-Conditional/Manifest b/virtual/perl-Module-Load-Conditional/Manifest
index e9599737fe51..3acca433f34b 100644
--- a/virtual/perl-Module-Load-Conditional/Manifest
+++ b/virtual/perl-Module-Load-Conditional/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Module-Load-Conditional-0.680.0-r3.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Module-Load-Conditional-0.700.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Module-Load-Conditional-0.740.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.680.0-r3.ebuild b/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.680.0-r3.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.680.0-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Module-Metadata/Manifest b/virtual/perl-Module-Metadata/Manifest
index e33134795e59..c25fe1726c90 100644
--- a/virtual/perl-Module-Metadata/Manifest
+++ b/virtual/perl-Module-Metadata/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Module-Metadata-1.0.36.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Module-Metadata-1.0.37-r1.ebuild 542 BLAKE2B da038d3837134e31e56ced622c0ebd6b3a82692079f51d18eea93aa1fe65e29f2c5a80258b117879b792437268f20a20d129d07dfa4247ad69acab5762409f2e SHA512 b8222cdccea6411782f0b8d3aeef6e0965ec3cef1582c67b2ac83b4d91947f919925dcec2f0ed3d433f96ad1541b46c1251b02c5a81f773324568f3f6f1a0ce5
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.36.ebuild b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.36.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.36.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Net-Ping/Manifest b/virtual/perl-Net-Ping/Manifest
index 8ce499c14184..af0fabf57f63 100644
--- a/virtual/perl-Net-Ping/Manifest
+++ b/virtual/perl-Net-Ping/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Net-Ping-2.710.0.ebuild 515 BLAKE2B 8b62469dd63b6ed9d0e355bbe568028caa3db0156edd63714ee40640671359ed407f0282e6b0221b33db8765bee16fead8092c6d8b6f91303400c54bceb0c0b2 SHA512 03e036e948456c62b282ccdcc88e75bac791907c6e001ccb6f0cfd0ffb159b245b378ccd035a5a1bd74b59d2f1d6bf60a1313d01035894c545f15e5b101d790b
 EBUILD perl-Net-Ping-2.720.0.ebuild 515 BLAKE2B ae500da3f4d0515bda1fb5c1eaa8b9b1cb9aeab03c62b5f05174de502befb537fd3522c393f8465d2b17d29b46a8d951c2928b4a6b716f1e59f5ea2f9baf5071 SHA512 cd7e5030412530e80a573c2782c924743e890edaf8307e05a7bcdcfbf86f1be5c51f5ff8a583f07f5eb48dd03895ee70d076ee008ab64dc51c89992209d6aaf5
 EBUILD perl-Net-Ping-2.740.0.ebuild 515 BLAKE2B 515e40a94072748f6b234f9c1bed5d86c411b0289a255836a4ced1a3fcd18e73e3ff5a2c0f60bf521c98a6b6c6f54ed5c76bfdbbcf29331f39d9235618b2fe36 SHA512 648ad1732c7ac8015623896fa8875b78b2b3c0c81fe8203057c9a9a709375f15fd9fd87077219ec1ba577eae547f0196791947079f632a344ded66726830027a
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Net-Ping/perl-Net-Ping-2.710.0.ebuild b/virtual/perl-Net-Ping/perl-Net-Ping-2.710.0.ebuild
deleted file mode 100644
index 6452c1b5f892..000000000000
--- a/virtual/perl-Net-Ping/perl-Net-Ping-2.710.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/Net-Ping-${PV}
-	!>perl-core/Net-Ping-${PV}-r999
-"
diff --git a/virtual/perl-Pod-Simple/Manifest b/virtual/perl-Pod-Simple/Manifest
index b4672a76956e..5c643cee7452 100644
--- a/virtual/perl-Pod-Simple/Manifest
+++ b/virtual/perl-Pod-Simple/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Pod-Simple-3.350.0-r3.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Pod-Simple-3.400.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Pod-Simple-3.420.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.350.0-r3.ebuild b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.350.0-r3.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.350.0-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Safe/Manifest b/virtual/perl-Safe/Manifest
index 0e1347e675ed..1de47594d931 100644
--- a/virtual/perl-Safe/Manifest
+++ b/virtual/perl-Safe/Manifest
@@ -1,5 +1,3 @@
-EBUILD perl-Safe-2.400.0-r3.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
-EBUILD perl-Safe-2.410.0-r1.ebuild 531 BLAKE2B 43f354de3c120bbfcd3f18fc694c0825d558a6f77cf2138a40933e5ac7da58015f6490278e57967a8596c07953624c105a6067098bfaf7026eb7f0e3b684d315 SHA512 7028f8cec809b77f13afac087bff309c9854a1390f4da7f9020acd9517b56e53c275edeb61520608620a077bc3419929c1657105d311f873339eefed9183ff3e
 EBUILD perl-Safe-2.410.100_rc.ebuild 523 BLAKE2B 79e27c9a1b607a9a48c0ec116609a58eea98b9454a82f37ac36089fccf1b65c4573e56c2b01fc5853a2d3f8aed41bf289c2595434d13dc957f4bb66d42a73fa6 SHA512 0558cc737f8aac66ad7f8f90574ba203266a96fa0c943f4eb04d6056dda0baddd30e1a0e8eb483307a873c557ec85253f26a178a36afb77eec70848ef51a2468
 EBUILD perl-Safe-2.430.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Safe/perl-Safe-2.400.0-r3.ebuild b/virtual/perl-Safe/perl-Safe-2.400.0-r3.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Safe/perl-Safe-2.400.0-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Safe/perl-Safe-2.410.0-r1.ebuild b/virtual/perl-Safe/perl-Safe-2.410.0-r1.ebuild
deleted file mode 100644
index 9a70ee8a9886..000000000000
--- a/virtual/perl-Safe/perl-Safe-2.410.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32.0* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Scalar-List-Utils/Manifest b/virtual/perl-Scalar-List-Utils/Manifest
index 7a2a63e66dac..5e046b4e7790 100644
--- a/virtual/perl-Scalar-List-Utils/Manifest
+++ b/virtual/perl-Scalar-List-Utils/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Scalar-List-Utils-1.500.0-r2.ebuild 578 BLAKE2B 5188053e08f2ae6f517094a8c391a51f4b62703d32c5e1874861626dc22ebddcc4d85da132f77865cd770e727ff732e53e6d85ab1405aec756b7070622ed04f6 SHA512 357f134eb7a407fbc6ad196919062d89c3348ea059528f7e30dc0d89e5986bc761e756af2716e778b57e69db8f10dbd5a12886b2db5b7a426ed320b0ff9b8057
 EBUILD perl-Scalar-List-Utils-1.550.0-r1.ebuild 599 BLAKE2B 17b1a08223c879fdb32b1cfac4e85cb4ca143a0a998ee50e28795e898049d6f0b0a2ba2f080792c2d46a05e6fb0e81a298395184a0f83b58078f3275288d878c SHA512 e3e785f47dbb30978f04ec17a552ed06b10c977d6620d7bfa87532a1eabddbed0e03267a54f5d502749fbe8d5fcb5539782424729238a4f89b911db003b12d98
-EBUILD perl-Scalar-List-Utils-1.560.0.ebuild 488 BLAKE2B a6be35d721e9b9e42036d68a14fb6e78d745a23fc1a33c532a92f7029883d1ed7e97a838ac02c6d8ebc0e060a76ccaaf4cbd4b7fb7191e0dce4859a389c71b57 SHA512 c4e5987334d9b211764f3f258bdfa2716c0f1f5c123290eaea568cef295d16f7881317415ffc36a91bdc8060428df862eafa155584b70682ed407294ab06d137
+EBUILD perl-Scalar-List-Utils-1.560.0.ebuild 483 BLAKE2B 5b7da278b76620e49d505b9d5bec2a8d70d1a6759073a1246498224f954d28b16e4701b3a89184eeb99984912f20c646e188e595cd03ea6cc71d62ebe94e8c76 SHA512 7935f994d52e18c29cfc1f5b6824eca448a2623e0e496ddf5563b508b599aab9c855d24eac98e3498a470b2735dc9b85f10de62d6c2014570c18e20f28e7042b
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r2.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r2.ebuild
deleted file mode 100644
index 3c5e6f5627ad..000000000000
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.560.0.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.560.0.ebuild
index 0dca780dd4a9..4196f630bc23 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.560.0.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.560.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	~perl-core/${PN#perl-}-${PV}
diff --git a/virtual/perl-Socket/Manifest b/virtual/perl-Socket/Manifest
index f16be46b4128..6cf22ad82b9f 100644
--- a/virtual/perl-Socket/Manifest
+++ b/virtual/perl-Socket/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Socket-2.27.0-r2.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Socket-2.29.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Socket-2.31.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Socket/perl-Socket-2.27.0-r2.ebuild b/virtual/perl-Socket/perl-Socket-2.27.0-r2.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Socket/perl-Socket-2.27.0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Storable/Manifest b/virtual/perl-Storable/Manifest
index cbffbc07d8fb..2dd66de9b5e2 100644
--- a/virtual/perl-Storable/Manifest
+++ b/virtual/perl-Storable/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Storable-3.150.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Storable-3.210.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Storable-3.230.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Storable/perl-Storable-3.150.0.ebuild b/virtual/perl-Storable/perl-Storable-3.150.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Storable/perl-Storable-3.150.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Sys-Syslog/Manifest b/virtual/perl-Sys-Syslog/Manifest
index 7923b89572ea..bd87bcfc7573 100644
--- a/virtual/perl-Sys-Syslog/Manifest
+++ b/virtual/perl-Sys-Syslog/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Sys-Syslog-0.350.0-r3.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Sys-Syslog-0.360.0-r1.ebuild 542 BLAKE2B da038d3837134e31e56ced622c0ebd6b3a82692079f51d18eea93aa1fe65e29f2c5a80258b117879b792437268f20a20d129d07dfa4247ad69acab5762409f2e SHA512 b8222cdccea6411782f0b8d3aeef6e0965ec3cef1582c67b2ac83b4d91947f919925dcec2f0ed3d433f96ad1541b46c1251b02c5a81f773324568f3f6f1a0ce5
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.350.0-r3.ebuild b/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.350.0-r3.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.350.0-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Term-ANSIColor/Manifest b/virtual/perl-Term-ANSIColor/Manifest
index e5fe426a6ddc..54edba9f8913 100644
--- a/virtual/perl-Term-ANSIColor/Manifest
+++ b/virtual/perl-Term-ANSIColor/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Term-ANSIColor-4.60.0-r3.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Term-ANSIColor-5.10.0-r1.ebuild 542 BLAKE2B da038d3837134e31e56ced622c0ebd6b3a82692079f51d18eea93aa1fe65e29f2c5a80258b117879b792437268f20a20d129d07dfa4247ad69acab5762409f2e SHA512 b8222cdccea6411782f0b8d3aeef6e0965ec3cef1582c67b2ac83b4d91947f919925dcec2f0ed3d433f96ad1541b46c1251b02c5a81f773324568f3f6f1a0ce5
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0-r3.ebuild b/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0-r3.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Test-Simple/Manifest b/virtual/perl-Test-Simple/Manifest
index 6624ef286d84..e70d9c216e9b 100644
--- a/virtual/perl-Test-Simple/Manifest
+++ b/virtual/perl-Test-Simple/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Test-Simple-1.302.162.ebuild 518 BLAKE2B 5ee16a64618c9fbb918e5b5378d4956e9e2fd5ab6b254efebaed4d5f01f0cd64747a67c147fd61be5f522884234f7ca725d08225572ac6b7462e1fbb48e71645 SHA512 b7848f3c4ce538ba4545d58b91a994f0a0494b122adeaf9eefdaf40d432cdf61fd12389dd0a343b20a28ff56791b0400fb4388f5b0f6f6e796a06a7d246bdc43
 EBUILD perl-Test-Simple-1.302.175.ebuild 518 BLAKE2B f1ab978361478badd6228960272075e4ce1dca09cb1ff01f2c564fadec6bc45e690eb31eca8f0858ecef36f7241e6969f830e4f1396d6cbad1553b5ee822fb92 SHA512 4a07f2795aac3d33783ec06e0c6fa34166a0c320819f673824607c59c399bc06d6b5ec8a9b058590f291a37878ed3adb7580208a35e246453a4e6a092d2ed6f8
 EBUILD perl-Test-Simple-1.302.183.ebuild 518 BLAKE2B cff4692a1918d403a86c82d7e0a79f0e2987beea2f7e9ff5bbfa6d70dec501ed9ce7f0e40d99373c50ffb5375456d3e5e878bb889ca70b855547a246fbbbb6c2 SHA512 a50230a7995f31ff4dfa6cb1e1bd1b9b9a4aeaf36c7c04e40421e8be57df22ab2ddd854eedcc7319082463a917cec840e9cdf36b39a4f19b63322cee4c81a4bf
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.162.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.162.ebuild
deleted file mode 100644
index 4a8a90199ac2..000000000000
--- a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.162.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<dev-perl/Test-Tester-0.114.0
-	!<dev-perl/Test-use-ok-0.160.0
-"
diff --git a/virtual/perl-Thread-Queue/Manifest b/virtual/perl-Thread-Queue/Manifest
index c5bd454a4c5f..acf624109132 100644
--- a/virtual/perl-Thread-Queue/Manifest
+++ b/virtual/perl-Thread-Queue/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Thread-Queue-3.130.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Thread-Queue-3.140.0-r1.ebuild 542 BLAKE2B da038d3837134e31e56ced622c0ebd6b3a82692079f51d18eea93aa1fe65e29f2c5a80258b117879b792437268f20a20d129d07dfa4247ad69acab5762409f2e SHA512 b8222cdccea6411782f0b8d3aeef6e0965ec3cef1582c67b2ac83b4d91947f919925dcec2f0ed3d433f96ad1541b46c1251b02c5a81f773324568f3f6f1a0ce5
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.130.0.ebuild b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.130.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.130.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Time-HiRes/Manifest b/virtual/perl-Time-HiRes/Manifest
index b70130931c0a..3e0b11c96723 100644
--- a/virtual/perl-Time-HiRes/Manifest
+++ b/virtual/perl-Time-HiRes/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Time-HiRes-1.976.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Time-HiRes-1.976.400.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Time-HiRes-1.976.700.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.0.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Time-Piece/Manifest b/virtual/perl-Time-Piece/Manifest
index fb90d8410655..a679a2723dc3 100644
--- a/virtual/perl-Time-Piece/Manifest
+++ b/virtual/perl-Time-Piece/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Time-Piece-1.330.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-Time-Piece-1.340.100-r1.ebuild 542 BLAKE2B da038d3837134e31e56ced622c0ebd6b3a82692079f51d18eea93aa1fe65e29f2c5a80258b117879b792437268f20a20d129d07dfa4247ad69acab5762409f2e SHA512 b8222cdccea6411782f0b8d3aeef6e0965ec3cef1582c67b2ac83b4d91947f919925dcec2f0ed3d433f96ad1541b46c1251b02c5a81f773324568f3f6f1a0ce5
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Time-Piece/perl-Time-Piece-1.330.0.ebuild b/virtual/perl-Time-Piece/perl-Time-Piece-1.330.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-Time-Piece/perl-Time-Piece-1.330.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Unicode-Normalize/Manifest b/virtual/perl-Unicode-Normalize/Manifest
index c9dd11e3f856..5c6849eafb51 100644
--- a/virtual/perl-Unicode-Normalize/Manifest
+++ b/virtual/perl-Unicode-Normalize/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-Unicode-Normalize-1.260.0-r2.ebuild 521 BLAKE2B 1da51b7114e6014812d51f3cbb6969f4649251078f15945c67ed4df64a073032ca8d086b62c048d685f8ef2a61a369b44232ae7a35dc0171227af8a4e4d14e9d SHA512 f6324ad25a1d901b2e4fbf7766a9e5323ef9de055b79b64eb9164146405071834bc8f153d1a41b09ae610396f47339726b26277d30cdcb93601bd6969b4a8c53
 EBUILD perl-Unicode-Normalize-1.270.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Unicode-Normalize-1.280.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r2.ebuild b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r2.ebuild
deleted file mode 100644
index 0db0af2c959c..000000000000
--- a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-autodie/Manifest b/virtual/perl-autodie/Manifest
index c1e5ef7ce54a..16b2db1fa5e2 100644
--- a/virtual/perl-autodie/Manifest
+++ b/virtual/perl-autodie/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-autodie-2.290.0-r5.ebuild 521 BLAKE2B 1da51b7114e6014812d51f3cbb6969f4649251078f15945c67ed4df64a073032ca8d086b62c048d685f8ef2a61a369b44232ae7a35dc0171227af8a4e4d14e9d SHA512 f6324ad25a1d901b2e4fbf7766a9e5323ef9de055b79b64eb9164146405071834bc8f153d1a41b09ae610396f47339726b26277d30cdcb93601bd6969b4a8c53
 EBUILD perl-autodie-2.320.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-autodie-2.340.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-autodie/perl-autodie-2.290.0-r5.ebuild b/virtual/perl-autodie/perl-autodie-2.290.0-r5.ebuild
deleted file mode 100644
index 0db0af2c959c..000000000000
--- a/virtual/perl-autodie/perl-autodie-2.290.0-r5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-parent/Manifest b/virtual/perl-parent/Manifest
index 399010a93f35..a1e9198c1338 100644
--- a/virtual/perl-parent/Manifest
+++ b/virtual/perl-parent/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-parent-0.237.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-parent-0.238.0-r1.ebuild 542 BLAKE2B da038d3837134e31e56ced622c0ebd6b3a82692079f51d18eea93aa1fe65e29f2c5a80258b117879b792437268f20a20d129d07dfa4247ad69acab5762409f2e SHA512 b8222cdccea6411782f0b8d3aeef6e0965ec3cef1582c67b2ac83b4d91947f919925dcec2f0ed3d433f96ad1541b46c1251b02c5a81f773324568f3f6f1a0ce5
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-parent/perl-parent-0.237.0.ebuild b/virtual/perl-parent/perl-parent-0.237.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-parent/perl-parent-0.237.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-podlators/Manifest b/virtual/perl-podlators/Manifest
index 391232b91404..2221f6373425 100644
--- a/virtual/perl-podlators/Manifest
+++ b/virtual/perl-podlators/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-podlators-4.110.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-podlators-4.140.0-r2.ebuild 563 BLAKE2B fa371bdb60576ac782450131345a7e2c0029808683eba816ae053795cf20d5d24e047a17899ecbe7c1a34bd0d1ade6ddc43fd108b883b74fb82b30c2655a6c6a SHA512 43d36d546cb074a4acd3c1b53e29dca2692d58b1a57c08752b91cfc81876934ddecb76e3f8d1bdd0c63a9e3befe720da46a3adf00f51b9ae3bd6e76aaa8b2646
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-podlators/perl-podlators-4.110.0.ebuild b/virtual/perl-podlators/perl-podlators-4.110.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-podlators/perl-podlators-4.110.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-threads-shared/Manifest b/virtual/perl-threads-shared/Manifest
index f2e7cc2fba3a..685be90541a4 100644
--- a/virtual/perl-threads-shared/Manifest
+++ b/virtual/perl-threads-shared/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-threads-shared-1.600.0.ebuild 521 BLAKE2B 99c588c9a9a9722cb88e30bed3351aac297b512e63f2d30e91690a7f8e87301d2841c4388828f895291f8f1962eb5dadb6c3bf1fc12cfaffe46bf573e597f67b SHA512 d14f7f2d30a106e59adb27e95f5276744dc6c68d77c17fed2defcfadef0a9242f3c58da8d536f4be921c7f1305e153e39ca2c3b5d87578153d254ccf6feb89ef
 EBUILD perl-threads-shared-1.610.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-threads-shared-1.620.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-threads-shared/perl-threads-shared-1.600.0.ebuild b/virtual/perl-threads-shared/perl-threads-shared-1.600.0.ebuild
deleted file mode 100644
index a3fbf30ef753..000000000000
--- a/virtual/perl-threads-shared/perl-threads-shared-1.600.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-threads/Manifest b/virtual/perl-threads/Manifest
index cee527d3566b..661bc913c24a 100644
--- a/virtual/perl-threads/Manifest
+++ b/virtual/perl-threads/Manifest
@@ -1,4 +1,3 @@
-EBUILD perl-threads-2.220.0-r2.ebuild 531 BLAKE2B 11717e9b5952eae918455cb3977a84e5fd67f6f022e727ef100aefc3bfb3e84c0900749ce91ca15b3c7685a463a08dc6d27460656198ee9e198ae38a3ee47a36 SHA512 59f8aed415d16915fde243c0ac693860058dd4e94ed1a199e0149f0e5401a4d5fa29a9ad3f4334b1fb4873142b4b1e9335f632e16f94bf47f7d9a52d4e260f4c
 EBUILD perl-threads-2.250.0.ebuild 531 BLAKE2B 791770c997990c5577f10960eb410950a70061a943d9a2c53f91317211861775fcae59a33aea218a52f7ff2b33dfd479878f0739aa1cbeed138d9798cde6dd50 SHA512 1a56831614e0ba3d55ff12e64371cb878653f8adef40eacffea7f7de8d5225e9372f6cea7b33856afb5e88fc87ebc17ac075d64360c12064f4af7755f0d699a2
 EBUILD perl-threads-2.260.0.ebuild 531 BLAKE2B 8c58d9aaaa4becf80ccbd21c9f09b782f9004edd029564fb14ccf01c65250b0d59786b98c9dbbde5ec8ff6090e3a82fb5968b286b2e2441512f8feb5530ccf01 SHA512 e4e0a4a167cfc10691e285f052fc7714d831583b35d7f0f76fbfa56ef1cc9b46ad5c2bb8e9f31dcbd796f4fa90f4b489272ba19f26180278265bab839ca4ae49
 MISC metadata.xml 275 BLAKE2B d1fd2cde85b8131a41d6ccaa7c942d0418e3dbc2cb5bbc36e93fd6c0c85024cc52b8f9810cef7f1df4c429494115ae239b7b55eedef2dc5c4654b9182927d96f SHA512 1e3c6650c958c9f2c3136d6063ab704d9eaa3e8d415b2dd4b78c63aab9e4c3c0c6e7debe5b11d13aec95d0a435e988caa365bce2df354dd650caa1afea41ac6a
diff --git a/virtual/perl-threads/perl-threads-2.220.0-r2.ebuild b/virtual/perl-threads/perl-threads-2.220.0-r2.ebuild
deleted file mode 100644
index f9501c1835d0..000000000000
--- a/virtual/perl-threads/perl-threads-2.220.0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30*[ithreads] ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/pkgconfig/Manifest b/virtual/pkgconfig/Manifest
index 97f7c0e06ac0..c264efc80a5d 100644
--- a/virtual/pkgconfig/Manifest
+++ b/virtual/pkgconfig/Manifest
@@ -1,2 +1,2 @@
 EBUILD pkgconfig-2.ebuild 529 BLAKE2B ed9ccc14eca3cb4a460effe46e234cfe680c93cf29c850a61e0048e8291bca96f5c30745847881eb799e5742ea1d63411bc8ad164622547eb57704b649f87a3f SHA512 504ab8820e9d21d6fbc181a89749f0ae0dd292913d73781b379b54affc4ff34979929e046888bda1b0d01a3de034f56e826467333fbf19d202069b819bc1cb55
-MISC metadata.xml 406 BLAKE2B be0bee750cf99039f88d03909eb95c730eaa91da9ad6f3376dbb5b9978b273bd0a2270d8acae86a8a47c48b0ca8dae6c36a08157a7e27cdea5dad5988ea69912 SHA512 883288e55d2901a4fd5a98594265232d39e248b0ba2cc40a20363d5eed3519d66066626539e6ad33aff326d23cef70b323efe27505523a1dc633001b6baea449
+MISC metadata.xml 490 BLAKE2B fe8c13d69889abceffee86b6597fcfbffc862723a69ee29dcecc2c36f7145a20a617eac0b26c56b66c75670b54075c7960347e71d8599c8bb61ec02afeaab6bc SHA512 594a7f9c7aab932f66a7c4a107140115fa3fa22b6a62ec2cb3fd8c16ff7a473829af696ad18f7cdf434a26071358ab4aee6267e7df0ece7721b8eeba61b6292c
diff --git a/virtual/pkgconfig/metadata.xml b/virtual/pkgconfig/metadata.xml
index b9476908c292..c54f01e91c31 100644
--- a/virtual/pkgconfig/metadata.xml
+++ b/virtual/pkgconfig/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
 		<email>freedesktop-bugs@gentoo.org</email>
 		<name>Gentoo Freedesktop Project</name>
 	</maintainer>
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index abcc9d54eee2..e4ecb11e9205 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,3 +1,4 @@
-EBUILD rust-1.52.1.ebuild 371 BLAKE2B 9c84995703f6feb85f28aa4960fc6b1fb6bd699c470d470605945204113f65489b6cc0c11d4ec548be5bfa09b4cf292a3680978823274054d27993ca26e7c91b SHA512 d35e99a11737a5196751cd1e54f67bf9d326cca8302ec40ca2a53c2379a1338e3cfda92f629ad0cc69c7aa4d11ec067182037f18a5a1eaab5afc1cae35f01c29
-EBUILD rust-1.53.0.ebuild 372 BLAKE2B 8e8f813389a3e15a42ec37bd19e5a6dabf07026ad681c1087d417e74ac51a144e8dc6734bb0b81fd3586e5fccfd975c1f4f0269d7acf11fed787f91d6c8df08b SHA512 1bc96791519f5156463109461535fd3c7e94155d65b0a972799b89aaaab6739c2b6ccd47b6278f6da7b1c65951863f599013dce5fb1fb9280291f9e96c924f28
-MISC metadata.xml 268 BLAKE2B 46d3c7977b1330642faf645f584a622873cefe48d21a61da239a4dd81ee2d8eaf48365cce90e6daef2958902cfb659c865177baf60e1fb042f3a8c3f20dba238 SHA512 030301fb1334a76098e632d92941c0c5547f07cb845f88c468528bff146f962d17e8b13e993d4a6e843dcd25b24896853412bb5b49ec7773af738a7c39e994c6
+EBUILD rust-1.52.1.ebuild 406 BLAKE2B 55a09e36f1d03cec045d994929ece183f272ff9f942508095387f94731b0cf5619ba4c58de84b1a9cd5ddad895936f13cee17967fe4fd965f1762a1c1dad2fed SHA512 54739a9836eeb250627c336604128e83dc5b36e03fe218fd4ce05a0e0fa748a69658fa6233be142baec31c0a6e8adec4dd9bf1a7b05b5ab2b54e9cf18877c365
+EBUILD rust-1.53.0-r1.ebuild 407 BLAKE2B e348137e89ef48fbb8a19e062abea028f2e13a3a53b1f38ecad6dd3c6cc6d34cf3aa338e7ca8f9dcc309eafd3317bf628b7fd273f0ae56b1ac3fc8d119f751c2 SHA512 30e7af176ea8970d4c07458fc1ffd9da188b739011e767d509c8ae622a8d118dea0d36120b563bf8097eeb2cd7322593238de5ddd5f665cf88fb7a58d835e0fe
+EBUILD rust-1.54.0.ebuild 411 BLAKE2B 32e1e7089803d7cdd4eb3f4e31bb727a83f0b1af103cefa0e31ff479f8017f3be9d1fd4c595bf6e7d00541839b618f5ac51febd75537ce7e66991741998e2eae SHA512 a8d2f7491a8750c8f560c6b1c6f64d9c405deec340c7bbe8e3e01a2d137bd616caa2db2dbe45df1a6e37d0ee4c90a279f4c6462147a1544736c5f6b3eca6c48a
+MISC metadata.xml 350 BLAKE2B f1bee4038a42ed625c9cca655120cbcd3dd4bfc80f0a816855ecbb602481c7befbd465c36bf634f1cfb62318aa60dc2c678c0c23111d3cbd002c4adb12121748 SHA512 4e888f2cd088970de180963cf1346f88da5bc870e314aff62f6b61a02973305179c1bb7e66e6b3c9bef63b5963e9181a36f410c01b4386faf9200bfea37cdde9
diff --git a/virtual/rust/metadata.xml b/virtual/rust/metadata.xml
index 50012e64c207..203f8b542713 100644
--- a/virtual/rust/metadata.xml
+++ b/virtual/rust/metadata.xml
@@ -5,5 +5,8 @@
 		<email>rust@gentoo.org</email>
 		<name>Rust Project</name>
 	</maintainer>
+	<use>
+		<flag name="rustfmt">Install rustfmt, Rust code formatter</flag>
+	</use>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/virtual/rust/rust-1.52.1.ebuild b/virtual/rust/rust-1.52.1.ebuild
index d19c6c4beec2..b6e4774761b8 100644
--- a/virtual/rust/rust-1.52.1.ebuild
+++ b/virtual/rust/rust-1.52.1.ebuild
@@ -10,6 +10,10 @@ DESCRIPTION="Virtual for Rust language compiler"
 LICENSE=""
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+IUSE="rustfmt"
 
 BDEPEND=""
-RDEPEND="|| ( ~dev-lang/rust-${PV}[${MULTILIB_USEDEP}] ~dev-lang/rust-bin-${PV}[${MULTILIB_USEDEP}] )"
+RDEPEND="|| (
+	~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+	~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+)"
diff --git a/virtual/rust/rust-1.53.0-r1.ebuild b/virtual/rust/rust-1.53.0-r1.ebuild
new file mode 100644
index 000000000000..b98ade72cf12
--- /dev/null
+++ b/virtual/rust/rust-1.53.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
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Rust language compiler"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86"
+IUSE="rustfmt"
+
+BDEPEND=""
+RDEPEND="|| (
+	~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+	~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+)"
diff --git a/virtual/rust/rust-1.53.0.ebuild b/virtual/rust/rust-1.53.0.ebuild
deleted file mode 100644
index f30cb07276fb..000000000000
--- a/virtual/rust/rust-1.53.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
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for Rust language compiler"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86"
-
-BDEPEND=""
-RDEPEND="|| ( ~dev-lang/rust-${PV}[${MULTILIB_USEDEP}] ~dev-lang/rust-bin-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/virtual/rust/rust-1.54.0.ebuild b/virtual/rust/rust-1.54.0.ebuild
new file mode 100644
index 000000000000..f9d87cdb210c
--- /dev/null
+++ b/virtual/rust/rust-1.54.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Rust language compiler"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="rustfmt"
+
+BDEPEND=""
+RDEPEND="|| (
+	~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+	~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+)"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index eb39787d5da0..9414b803c83f 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/airdcpp-webui/Manifest b/www-apps/airdcpp-webui/Manifest
index 0dc468833281..e7cd134ee799 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,5 +1,5 @@
-DIST airdcpp-webui-2.10.0.tgz 8135065 BLAKE2B a14cd4be3745386ef05d4bdb96b0f60b10d55abeb734f752cacba44a34e9e7615c26a52136c93fb1965c31fb36f5eadfebac0aa84b73f9cd4c36190b11a69fbd SHA512 7dcd8261be48e570e125cd3b31738fa7b5970fd78c15f86c78abc929801cc86d0e56909d7c653394575e156513a6454094708c22d2241ba6541a1350fcce2085
 DIST airdcpp-webui-2.11.0.tgz 8148062 BLAKE2B 2a47bae691667aae14afadbfd5a5b1f938c72de7ba3ff75f0feca6a5d13f890fdb663057237ff29ed85eea6fe55f72e421201fe2c44efd9181dc751e59748bb8 SHA512 00147c4f1d19a0866735a6bb0b4789e915ae028bf92e4a46aea586c1c4eea57fd85558cdffd9504abb36ffb78764bf6c310a5937f06d99de03883bdfaf6a2b33
-EBUILD airdcpp-webui-2.10.0.ebuild 466 BLAKE2B 653bbb9da8b78f84fbae7427681388e8eed36969eec8af7e8275aadceda156900fffd87dc5a88d7ca47312b1b368a9ecaf8fd8b042b3125259440121cb5ccb67 SHA512 c0303de5e61ac84b3590b58a973cccf1eed9905d3797f2fda2a9725a4c0f041ad1c34be332c06ae4fc7a01c8ee202c9202b1365281169b569fbd509fa241aacd
+DIST airdcpp-webui-2.11.1.tgz 8147412 BLAKE2B 4d4eb713b1c0c570d5c1cf02053c87bf983c97c6ae33ac58b04f4cee0aab41828981fc299c74383da4bdd015695daba4dfed62b0a6bf5d925e1dd1065fe2e60e SHA512 c54673ba2755e3b7e5889c34d2ca3a19c9682b81b2c527d579007931a7983e8faa905ef8f26b5a7c8479d98c7c9fd98de5c9aac2de0161aeb849460e28d22465
 EBUILD airdcpp-webui-2.11.0.ebuild 466 BLAKE2B 33d5bf2a65ef48aa5178d11145433d33091bc16766b10335aeca6d43ace6d0f725d911c0b8f4bcf50dd06f497f08da8504f489367429a5b1adb59f4aa6e58d61 SHA512 1b8d9d28d58616b93e7ffc9dd12a0309a9443fd0f2d6f936810ca6c116e16e1081c32061af5e2d9550f7ed63893787f73d18c53f904925c2afd1ac2f9f4d8f8f
+EBUILD airdcpp-webui-2.11.1.ebuild 466 BLAKE2B f7fac3d59fdd1a83f4c6481d0284b3992f3b4dee4f12a47122512d867fb0cfaf478cd9c3be977d70bcd982045dab927c93228d940226296759a6f7d08462b10d SHA512 a7a2ff15c5af50e3c7bd0309b30046f05a8e66b4044918076b162d654ceca08b99f1ea0378fe9f451ca16dbad898085179a80f61700f90164e329045390acf08
 MISC metadata.xml 436 BLAKE2B 92cd8485d25c29615695fb9962b3257e23313798a95eb8d8d9b08713139516c7d27e4ec23a297b67fa8755fdb38d81ce8107f7e0c2126c028d0e2c97f8503726 SHA512 40b9ea3a77b14203c322d5afd798aea2aac78acc4fe5a4998acbbd3b3a41b701ac31e554ce75389db2e4d960c79bf52c941588749859d31e402c80b840aac72d
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.10.0.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.10.0.ebuild
deleted file mode 100644
index aed6a3249e7e..000000000000
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.10.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Web interface for airdcpp-webclient"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="=net-p2p/airdcpp-webclient-${PV%.*}*"
-
-S="${WORKDIR}/package"
-
-src_install() {
-	insinto "/usr/share/airdcpp/web-resources"
-	doins -r dist/.
-}
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.11.1.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.11.1.ebuild
new file mode 100644
index 000000000000..e7bbc80f2a8b
--- /dev/null
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.11.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Web interface for airdcpp-webclient"
+HOMEPAGE="https://airdcpp-web.github.io/"
+SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="=net-p2p/airdcpp-webclient-${PV%.*}*"
+
+S="${WORKDIR}/package"
+
+src_install() {
+	insinto "/usr/share/airdcpp/web-resources"
+	doins -r dist/.
+}
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index d739acacb8ae..34cd0b3524c7 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,10 +1,10 @@
 AUX postinstall-en.txt 1730 BLAKE2B b335309795d753c7689338c5e94b596efa5f66dc8dee17ad30b1a2d10b694a7bc288597b526239ea1d443887b45b8cd8ef89b499b79e86ab5df1c195ee85d4a0 SHA512 4ae14616c49e6aa61dc781350b5a75defefc2f894b98422a5b69a5827e367eb00fce140e6a45bcc02c90f068fc31970512d2632bbbf398cbe34f947933990050
-DIST drupal-7.80.tar.gz 3342293 BLAKE2B 342c8d69b3decdb50570590a96dd90f8fbfe5b403164e7ef3e855f7adb21e015bdebb6ecd943e23e4003f74c85ce889b4e4cf8e20eb65572337543120e15fb83 SHA512 38d3325252994abfa18709e52dac8194fb773185574019ee7b5037c1cee68ec5122afaf99e9c6dffef3053bbe7547f114783287aa9bcb51ee35f023cb7467c90
-DIST drupal-8.9.14.tar.gz 19805555 BLAKE2B 342850aefb487b9e48f73227233858494bd07502d4c6114c98986c45ab037d597d71fbb86c001d4da1dc74d46aadbd0014ac2e4892dd5cc38ce0f58927a70118 SHA512 f7754700aae7eeaf7105d87d00c9656995fede2c33a7d949d783fd5e8e664c823bfe2cdff2253da994f986ea950eee840ba31a5830334e337f3cbefb2d8c2c85
-DIST drupal-9.0.12.tar.gz 16877538 BLAKE2B c54df6b12b128e4c0815589ccb05313b6c2bacd604be8c3cf09481977f78c34859a4c66de97ad7c96e920a64382adccdce83a51b85f8cfcc7de73fd6b07c0d1f SHA512 fcf3eec42361b67d58bd3e7151131db830e4d6a19fc5ea1e39f5dedaa3701fb1c9737b0025c2dce0d8c2c3be45cd701583a29d593f2f6609a104fce073aa71c0
-DIST drupal-9.1.7.tar.gz 18542878 BLAKE2B 91f6a979d0fecc754b87926083baddbeba908c8e63444ff5bee1abd0ca5cd7cd53777db05a5c58bffc6f5d697319d6f208b1631793993b9944864a33e9b9e9e2 SHA512 14b078d299e7b2d33ce37a1ad55cfaff620d676aa0745ee1f11ed0852eb93ac5681afd5a7ba13839b40dde22dcc7808b86ee43c6c2711d32a94a4300bf8e21a4
-EBUILD drupal-7.80.ebuild 1546 BLAKE2B 4049ed833958fdfebbf89a1ec584c06a66d92297b1cf71978cbb3956455959c91b920716a14cbf893d59bc1c2b97e324c97f3aa70f276ceff8ee6de8f1d992ee SHA512 902f0456f711369d90eb172e2049a1af86aade03293712208b13635fefce0786550d1b16a6bd88dccfedf4f3431993bec03b874c975016697911f1610dd23ceb
-EBUILD drupal-8.9.14.ebuild 2084 BLAKE2B 9eb091e4672abddd5dddcaebacef7a1c08ec965ed95d7fe2e7c145ba8c0a6a5d2a9fb3f16ca6a51b6b8609784891bccd1b5478d1fa8bfef7a1a099b3670b0948 SHA512 1bee0a01ca06ff0b31361a31e246e3ce045b7a833e86f219d9fa66cbd7ec188e075e1f0e554b89c2a6ab2d0f90b8d7dcb9b0c06b0e78087dc261196ae5965516
-EBUILD drupal-9.0.12.ebuild 2084 BLAKE2B 9eb091e4672abddd5dddcaebacef7a1c08ec965ed95d7fe2e7c145ba8c0a6a5d2a9fb3f16ca6a51b6b8609784891bccd1b5478d1fa8bfef7a1a099b3670b0948 SHA512 1bee0a01ca06ff0b31361a31e246e3ce045b7a833e86f219d9fa66cbd7ec188e075e1f0e554b89c2a6ab2d0f90b8d7dcb9b0c06b0e78087dc261196ae5965516
-EBUILD drupal-9.1.7.ebuild 2084 BLAKE2B 9eb091e4672abddd5dddcaebacef7a1c08ec965ed95d7fe2e7c145ba8c0a6a5d2a9fb3f16ca6a51b6b8609784891bccd1b5478d1fa8bfef7a1a099b3670b0948 SHA512 1bee0a01ca06ff0b31361a31e246e3ce045b7a833e86f219d9fa66cbd7ec188e075e1f0e554b89c2a6ab2d0f90b8d7dcb9b0c06b0e78087dc261196ae5965516
+DIST drupal-7.82.tar.gz 3348407 BLAKE2B c01c93fda768d587a009c9007a019f01461ae3fed1010c80a4636971fcdf4ce97e1cad61a60b447698d8e2d6d39217ead52de3cf915f04ad620357aafb3209a0 SHA512 41b844df868971ea21fa574daf46502edcb78f4287c223694fe967541da72dfe9b360e1764441eddafb64b782d14408eac58ecff7eaed4bc1fd832b35f0c7e2d
+DIST drupal-8.9.17.tar.gz 19829635 BLAKE2B 58ff2623121ab1a283e5d89bc5983154f5c040c024ceaa3728d5a54b1a519b72d4c834b9535f5de38df11217a2e25f8e18225d6ea521b0e5f51fa9c7b29f337f SHA512 7c805092a182d660dec9d060662cb510debb4732ddce616089c32df8c12e4c945b25c904c8bf3b186e868e2a33615cb5483651e9aea0b51f5cb47ec55e8ab55d
+DIST drupal-9.1.11.tar.gz 18572070 BLAKE2B b1c2ad47bb9d36b47b6a74569b825fbf0ecb4e1ad951397778fd14c8eed9e633b685bbcbadae15b346d8c5944e53a4001c55e85d54a512aa639427054b90d0d3 SHA512 ac20865dc9791883fd684a455e753baedd1abc4f77617af5d1f57ba547a2c21f93909724919393a26058654592d68210d493fba9a593700239aa58b9f7939ddd
+DIST drupal-9.2.3.tar.gz 18860238 BLAKE2B c5a482d3a46aea128e92525d2339b26d68d3e92f11588643e5010dd4f36fab15df06203d02797badad0dd7519dfec0403b30bc02aa7ec72c8099c2281eb54f8f SHA512 9caaf1fe050ba1727f036a8aa0ecc0adde55ea37a66bd6e437602a86bedf368be86d0d0577ebc05d56615d161f93229026067f8c10ac6a656bd564a29229621d
+EBUILD drupal-7.82.ebuild 1546 BLAKE2B 4049ed833958fdfebbf89a1ec584c06a66d92297b1cf71978cbb3956455959c91b920716a14cbf893d59bc1c2b97e324c97f3aa70f276ceff8ee6de8f1d992ee SHA512 902f0456f711369d90eb172e2049a1af86aade03293712208b13635fefce0786550d1b16a6bd88dccfedf4f3431993bec03b874c975016697911f1610dd23ceb
+EBUILD drupal-8.9.17.ebuild 2084 BLAKE2B 9eb091e4672abddd5dddcaebacef7a1c08ec965ed95d7fe2e7c145ba8c0a6a5d2a9fb3f16ca6a51b6b8609784891bccd1b5478d1fa8bfef7a1a099b3670b0948 SHA512 1bee0a01ca06ff0b31361a31e246e3ce045b7a833e86f219d9fa66cbd7ec188e075e1f0e554b89c2a6ab2d0f90b8d7dcb9b0c06b0e78087dc261196ae5965516
+EBUILD drupal-9.1.11.ebuild 2084 BLAKE2B 9eb091e4672abddd5dddcaebacef7a1c08ec965ed95d7fe2e7c145ba8c0a6a5d2a9fb3f16ca6a51b6b8609784891bccd1b5478d1fa8bfef7a1a099b3670b0948 SHA512 1bee0a01ca06ff0b31361a31e246e3ce045b7a833e86f219d9fa66cbd7ec188e075e1f0e554b89c2a6ab2d0f90b8d7dcb9b0c06b0e78087dc261196ae5965516
+EBUILD drupal-9.2.3.ebuild 2083 BLAKE2B 80ecce0204acf38f4d736e1c6196e14fabef35bf119f82f19a47eb14e24a7b02ee57f505918019da0774bd7cf399980caafb0c7de18ba577f3d80d1ec2476283 SHA512 6c9272dbb28754e98726a6cb189e74d42497c5f67b53852a3945c1d7d74b514f34efd3b3b0488c136f643028162dcd5cbdb82890e62b219395d21487ebdb5871
 MISC metadata.xml 381 BLAKE2B 3c01944b3e66963bbd236a45dfb708c17e9d80e050a245316cc0d9ed2c94db2f882fe57ee2f7e0ec6285da21bb860b1eae48f470f449d1f4129ac83669a8d2bc SHA512 9b69d4241578d4e3e972d2910df1eea4506092e0f6511f30df5c7b2136db05b3a0b34978875f12cc3fe5c40f165da33fde01bd831271b928ebefbaf3a8231444
diff --git a/www-apps/drupal/drupal-7.80.ebuild b/www-apps/drupal/drupal-7.82.ebuild
index 4e6998d1e429..4e6998d1e429 100644
--- a/www-apps/drupal/drupal-7.80.ebuild
+++ b/www-apps/drupal/drupal-7.82.ebuild
diff --git a/www-apps/drupal/drupal-8.9.14.ebuild b/www-apps/drupal/drupal-8.9.17.ebuild
index 1fa351c0c00f..1fa351c0c00f 100644
--- a/www-apps/drupal/drupal-8.9.14.ebuild
+++ b/www-apps/drupal/drupal-8.9.17.ebuild
diff --git a/www-apps/drupal/drupal-9.0.12.ebuild b/www-apps/drupal/drupal-9.1.11.ebuild
index 1fa351c0c00f..1fa351c0c00f 100644
--- a/www-apps/drupal/drupal-9.0.12.ebuild
+++ b/www-apps/drupal/drupal-9.1.11.ebuild
diff --git a/www-apps/drupal/drupal-9.1.7.ebuild b/www-apps/drupal/drupal-9.1.7.ebuild
deleted file mode 100644
index 1fa351c0c00f..000000000000
--- a/www-apps/drupal/drupal-9.1.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PV=${PV:0:3}.0
-MY_P=${P/_/-}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="https://www.drupal.org/"
-SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres sqlite +uploadprogress"
-
-RDEPEND="
-	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
-	virtual/httpd-php
-	uploadprogress? ( dev-php/pecl-uploadprogress )
-"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
-
-	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
-
-	cp sites/default/{default.settings.php,settings.php} || die
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	echo
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	echo
-	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
-	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
-	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
-	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
-	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
-	ewarn "reported by the setup."
-	echo
-}
diff --git a/www-apps/drupal/drupal-9.2.3.ebuild b/www-apps/drupal/drupal-9.2.3.ebuild
new file mode 100644
index 000000000000..23610d15a891
--- /dev/null
+++ b/www-apps/drupal/drupal-9.2.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	virtual/httpd-php
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.md core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/element/Manifest b/www-apps/element/Manifest
index 12e1c372c12c..11b89006936f 100644
--- a/www-apps/element/Manifest
+++ b/www-apps/element/Manifest
@@ -1,3 +1,5 @@
 DIST element-v1.7.33.tar.gz 15425526 BLAKE2B 0cb13c5aa94a16e532f9ff4a8558b08c01afe1d5c8c4070bc9c26684571a316b2ce1265cd763ee4fe6c54b255313d489adc41e8dfc18f619ae3c2016b593087f SHA512 8b23d2e63cd69ec51cd053826d73f72be50a9662f2adcb7d8b86b0d2b32175038e77c3d00c2e37b39147565fc9fc1cb9c61be1f7a59d1f23e3c4d6316512912d
+DIST element-v1.7.34.tar.gz 15635182 BLAKE2B b9926a7b2aba2189004c9c0885b25878479e4ca0b80053261601e7bca64703c7148403671e3a5783530cfd1d431c0b3ffc398c5bd2767d7b0a93472306c581e1 SHA512 96bc96d98677e7154790accd7fca8314aada7352d8b8c1a9cc1b18c65b78705db766e5238feda6a3601aabd1f487b115dbaaecd0f55354b752ea07730e2d2312
 EBUILD element-1.7.33.ebuild 728 BLAKE2B 877d2ab169d6d3dc480351f830c4c545dea80b40cffef12b16901f36cea50faab16f3f10e543b5b21e783802128370610d92f1c7e4b7c47174871a41588c29d6 SHA512 6a3a88784accd6fbe15f346894267aac7cd9e93e8bb4eac4f6bc37524a3070595148446654178cdce08e846c267bed8cfc4c3522ec74ce8c560a429707c8e728
+EBUILD element-1.7.34.ebuild 728 BLAKE2B 877d2ab169d6d3dc480351f830c4c545dea80b40cffef12b16901f36cea50faab16f3f10e543b5b21e783802128370610d92f1c7e4b7c47174871a41588c29d6 SHA512 6a3a88784accd6fbe15f346894267aac7cd9e93e8bb4eac4f6bc37524a3070595148446654178cdce08e846c267bed8cfc4c3522ec74ce8c560a429707c8e728
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/www-apps/element/element-1.7.34.ebuild b/www-apps/element/element-1.7.34.ebuild
new file mode 100644
index 000000000000..0d6f2e6d2cb4
--- /dev/null
+++ b/www-apps/element/element-1.7.34.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="A glossy Matrix collaboration client for the web"
+HOMEPAGE="https://element.io/"
+SRC_URI="https://github.com/vector-im/element-web/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+need_httpd
+
+S=${WORKDIR}/${PN}-v${PV}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/home
+	dodir "${MY_HTDOCSDIR}"/sites
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/home
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites
+	#webapp_configfile "${MY_HTDOCSDIR}"/config.json
+
+	webapp_src_install
+}
diff --git a/www-apps/icingaweb2-module-director/Manifest b/www-apps/icingaweb2-module-director/Manifest
index 95199c1c621e..7b792b7be476 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1,6 +1,4 @@
-DIST icingaweb2-module-director-1.6.2.tar.gz 2772722 BLAKE2B 3d51f68469cd4ddf45f6bc62f76ad1f4c8d7d7bec36cc33022f1e0761334707bb345c87bc9f0e1276010e4a643867f1e1a6ea7c53a6fa28dd33e810089b7840b SHA512 693a2aca10e25f99fcf9ada4babb031d682b577b82098185259991214ac7d7662c494b58cf52284569dbca90c8eafa522177b6c64dd817912dafd20b4d7109cb
 DIST icingaweb2-module-director-1.8.0.tar.gz 3042572 BLAKE2B e29ac535c8975f79abfa086ce54e2b78e3f1a992858ec83e902c5e8e72a447f7436a1a9876c1b7237a14d08c54dec12069e9c57231b23c4fd203be3f6f2635b8 SHA512 e33cc49c8255aa3693f73693d874ca5e00a9d95fe3d737c457473d8c5b37f36faf44bbc7f608ba03be79d5a6fd032e5ffd8fbc824eda1831422f837040b0c400
-EBUILD icingaweb2-module-director-1.6.2.ebuild 850 BLAKE2B f803f56f1f577ab0912792d406ece4fdde9497d78ad4a61ddc3e7c6f8f14fb2f8ebe70250a8a8bb077a08af5a0056e1daf93bdece40fd67d3de49fecea9da2cc SHA512 7f8fb69603207dc61ff73ffc81c4e7f605db6f1c5664a6a0e494ba3765caef5b87cfa297d5190e3d84110047b6c73f0b9b8f419576c28552aa906865d293e876
 EBUILD icingaweb2-module-director-1.8.0.ebuild 850 BLAKE2B 22fffaad05127803aaa4e4c8ef6a2dc469022a19860f8099da3c1f3105bc66c1ee0f6596f29185e6b24416c74b54e15fb047118d93e2ac01ab244fb36adc2cbe SHA512 41dce56439bcc6908f5b08347ba6e9ff9c12cf8b06d25d47dec2c823de9bb45d0310681091c63b1be34ebc9b34a7a40c7ac6b15d3ac654866a843b6d7101819c
 EBUILD icingaweb2-module-director-9999.ebuild 852 BLAKE2B 1ea6bb826157c55611c75431ad8479d165174a0f741bed61f9de0e21b4c719080182aa671d7c8751d9c350e796da9647ca44fc916de70266f5cab8d8542665aa SHA512 16f2166e547f92549aa815710e78da502b2e958a7568d2ec73591c0e025cd0ef48c82cc10672cc7e6b09cc7d96a6ec42df6666cd0d4d420056080336310545e8
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild
deleted file mode 100644
index 2f84950d9e81..000000000000
--- a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.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
-
-DESCRIPTION="Icinga Web 2 plugin for configuration"
-HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-director/"
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git"
-else
-	KEYWORDS="amd64 x86"
-	MY_PN="icingaweb2-module-director"
-	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=net-analyzer/icinga2-2.4.3
-	>=www-apps/icingaweb2-2.2.0
-	|| (
-		dev-lang/php:5.6[curl]
-		dev-lang/php:7.1[curl]
-		dev-lang/php:7.2[curl]
-		dev-lang/php:7.3[curl]
-	)"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto "/usr/share/icingaweb2/modules/director/"
-	doins -r "${S}"/*
-}
diff --git a/www-apps/icingaweb2-module-graphite/Manifest b/www-apps/icingaweb2-module-graphite/Manifest
index 65522778377a..c2ead33d33fb 100644
--- a/www-apps/icingaweb2-module-graphite/Manifest
+++ b/www-apps/icingaweb2-module-graphite/Manifest
@@ -1,6 +1,4 @@
-DIST icingaweb2-module-graphite-1.0.1.tar.gz 329327 BLAKE2B e53f9ea0e3ca061fdec80da71b6624f97eeda04d78975ac198a6e75ae5300eabf50db3e95802e6d0108ee0314ad9af6108daa24d5b99228c7d9c2fcecfc80cac SHA512 1270d2e7768d3f9181950f08c703236042a9c99d337bd2964396890cdb645b72afabe387d35d232fb123d9f635cc27fc09ac374ec2c5707fa83706b0ba67ac2a
 DIST icingaweb2-module-graphite-1.1.0.tar.gz 331879 BLAKE2B 11e34a5daf5aab583e349297aa612880c782b3cba4514c87e5c2f025fda52e98db1e81eeea3652c070cf075fda87c37a1dc6f5cf870fc57e2fb7594a3e39dfaf SHA512 3c37ef9571f086373e063f8397953605005ae5eeceadc7bfc6beb10168b71f5fbe4e58f3dc6ba9fd5a5e274097c8d881489f8d2772985343b9c8a0f5db9558ed
-EBUILD icingaweb2-module-graphite-1.0.1-r1.ebuild 653 BLAKE2B 3778e56284628d38ff027223be38ac404a1988dd9500103e71f53ce12a334100f3c8c988d9e9b52b120e1240f77e50d32df379393743a3c94bcea634e135cda6 SHA512 7a77e5f7fe1a8d4abb38ca2defba9b4800d7b07681238695a430c2905aecd8f3acc7398a4d70976b9b42f3f7e66534076407f8677d833ef148de7018e2181554
 EBUILD icingaweb2-module-graphite-1.1.0.ebuild 650 BLAKE2B be23d500907a3a381a04c98388e13da820fc312d37d9d661206bfe75af2ba866edc1c6ad0d8c7400048cc10b049bfbd0506493a9bd5599e90214eed67655bf9d SHA512 9c29b1c46ad832a890da8b76d31a75677c49a56d32fdf0d7029409fe2cd20d2056e7fb4f7e9c0a99b639a9f9ed69863a3af9c841d65b6d536e14e171992874b8
 EBUILD icingaweb2-module-graphite-9999.ebuild 655 BLAKE2B e78227eaa1fe9f89451867b77143fe33cee1e9452219490e4f4374e64a67342dd18c07db8fb11fc9df8097df303c7298f0a63ac8b59e34b6ddee47608c940558 SHA512 a75ef3143b498cb55b965c9c937a59bd53c7f4c95227668f08a69511af9bb67989bb26c44e03a2fa2f7bc791580515f76f90432142c296bc220f65775f06e7ed
 MISC metadata.xml 433 BLAKE2B e4b486abac016ae60b7cc2f9f8893bd55f4de4b126ae87a3497d689ffe269cc42d1f6b873febe506aad55ec5a5dc780fdec51dc638aea2152e32e51c65bfd60c SHA512 86d44590ce1d15251e1fc03ff7fc769651fadd0769eb709b0607f61d253de7513fbe4616c4d6a0dd5498f089882d6c362c7e4a768ba4c86e7a6f86368f688591
diff --git a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
deleted file mode 100644
index 3fa010ff83bc..000000000000
--- a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Icinga Web 2 plugin for Graphite"
-HOMEPAGE="https://www.icinga.com/docs/graphite/latest/"
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git"
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=net-analyzer/icinga2-2.4.0
-	>=www-apps/icingaweb2-2.5.0"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto "/usr/share/icingaweb2/modules/graphite/"
-	doins -r "${S}"/*
-}
diff --git a/www-apps/klaus/Manifest b/www-apps/klaus/Manifest
index 03529b8e6bfd..66de126b899d 100644
--- a/www-apps/klaus/Manifest
+++ b/www-apps/klaus/Manifest
@@ -1,3 +1,3 @@
 DIST klaus-1.5.2.tar.gz 38168 BLAKE2B 4bcaf91ce641ca1f937d8b1b46367caf0ac7e9130fe222c820ded7cca8a708d1374142b09ae511da2695a64b3f2b67be69645d05602779c05081081b29494d9d SHA512 6423bfbef83f09b9abe4a1150d096ae72fc058a81c60fac585796918fa7c12b9a81c4d5808cf2e18acda5f6b891eaf93ed72a2e229b5b8d6ab5f060ea3230932
-EBUILD klaus-1.5.2.ebuild 864 BLAKE2B 61c392923f007a65b234dc28319f652d958fb0a498da5e811624520609c2df2df39a5545feb453b79e6b7ccb71d514ab70a75a07afae4546a114d575307cdc25 SHA512 9d6a42899f0e835b1360df3563fee4c447599a20c5b0b6a9aefecd5623565ae96173e00f87c2704da4f6de79079453f76da3bd6983d83820c677e80c5aca4083
+EBUILD klaus-1.5.2.ebuild 864 BLAKE2B 1a0685955e40bbd048f1ecb758925e7bf5e7f0ee77f779c593672548149ca4b71a2a61fbb124318d1b5d16fd9977e859b643c8b7eb5ed5653978f6e1d86958fd SHA512 b616e11fc00b651dcd58ad8a848a0d4c3f357ff47338e48c2a294b59a954099899174d2124337b09f07cedcf56bdd4dc3801f56859a8a7be8e3d17c495efa30e
 MISC metadata.xml 708 BLAKE2B 018ab6257246396f8d56cb7b784de9da56396e319055ed8187899751416a4427cab356d27a0989e686bc264a252bd5bcef68d12b76b9160637d57666d3ba8d9a SHA512 6c33b3ecae508430c6aea30c018284cedecd9e62a95660ba6912be9ded1ae1875b74c857a9959b3e3fd07feab28a2201e801f7a74f2816bec0d5bdbc3e80739d
diff --git a/www-apps/klaus/klaus-1.5.2.ebuild b/www-apps/klaus/klaus-1.5.2.ebuild
index c95b4a0b0ac8..602bd7a5eb1e 100644
--- a/www-apps/klaus/klaus-1.5.2.ebuild
+++ b/www-apps/klaus/klaus-1.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index db87e2bd9169..b3eeacd5830c 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,10 +2,10 @@ AUX config-r1.php 1780 BLAKE2B 1d80339f97771f5f4cce03f49d055598269fd50832d6f98d5
 AUX config.php 718 BLAKE2B b12392f83a9feaaad4ad5ac7c7e3ff27670b9aad959db5528900472cc6cd10f19c9a371c17f0412b7c0c985f4ba1bcf39ecea8c7ef9e0a8ed50012cc64f4b72b SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479
 AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6ea6626da43b1ac481b6edea6d0314cc4038adb511c4354a8f18dfd9da9145901d26665f84e746ab14e9b SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
-DIST moodle-3.10.5.tgz 57567486 BLAKE2B 677370969ef906ce49a16751a67dc6ba5464a6cd29c609517c235288a5a145177ae357e4fce633e59cba9dcfb243e83115d1705fef65f2c7c3b080771c6925ac SHA512 b46f238f4216e3cf0fc332b7e1605641425f6a6d26534c481a2613f4315b319b7403adc3575f68a78d218a6f6ebe4cdf8d89408f29fbfa7e841fca11929ca036
-DIST moodle-3.11.1.tgz 59388965 BLAKE2B 8298debbf0cec61d45f232a7aee038b8abd6f0e191b29d2be45db7beeac97f536729fdeae409cb1079e0ed4d42f966ace4a5fdabcf3490ff2c57a5c541f72d96 SHA512 92cc1cbd40951647fa93c557b7bc944ab7574c8a010cc87bbdb027bce201d2553496926013d28e28a1ef6f0fa580dc60b67c11a9cc1662edc19211ae566ad0ac
-DIST moodle-3.9.8.tgz 57152387 BLAKE2B 410b4e6e540bb7f3147e8da73a4b737b5d0d92e4c48fa0653cb56374521177d2d3407c0310b808e49a7c686e6f6c64402f4fd9f780b40478008f0453c321cb61 SHA512 f0adad79f2bf96db1f103d2662545c8d136fda4c49ab56b8204a34d71102b0bf07b064b1ba49fbdeac021a43c8a29a78c3fbcf70be3757a48385cc13c092c2f5
-EBUILD moodle-3.10.5.ebuild 2812 BLAKE2B 5c5fa3db9258c0500e5a27c35ef83abc18aaff7091ac0a4060a6761a06915029ded8839ca39341f3b681b5ff80c5b4259640245bdfd42a2e339a266ed6b16d37 SHA512 63f22abecb020ed92d4eea4fabbef9d7f128c3f04d535e0b367dfbc53ca5df5751f960361372512a42340f1fd11b00622736d1b2fbfa658ca163e14a4be1b616
-EBUILD moodle-3.11.1.ebuild 2812 BLAKE2B 5626350ca51dfca177261d5f89f59c6eb59e736f0992851f1adda51abe91b40b067106402586aeaf128035299a33792d8cda0b77980c17293804ee1edcecec70 SHA512 79c8aeb215fec8dbdd2e7fd0747b8c48a277713532a38f671596590799d3d8100ac4b502670798168b3bd8d9bcf0c20f4cedeb430fa8cd3cc9108004afca021a
-EBUILD moodle-3.9.8.ebuild 2812 BLAKE2B 5c5fa3db9258c0500e5a27c35ef83abc18aaff7091ac0a4060a6761a06915029ded8839ca39341f3b681b5ff80c5b4259640245bdfd42a2e339a266ed6b16d37 SHA512 63f22abecb020ed92d4eea4fabbef9d7f128c3f04d535e0b367dfbc53ca5df5751f960361372512a42340f1fd11b00622736d1b2fbfa658ca163e14a4be1b616
+DIST moodle-3.10.6.tgz 57576901 BLAKE2B d5f6885b24d7b701df7989b64eb93472d128bf4275697c371c928f9cca75ab205f3bd265afa3386e4dd8f17099e4c3145263a7b044a2752b87eaef2fd2e3a805 SHA512 bdc84e08d7a84357a2478431fa78ba0572bb3b612be96a2824df29beec43d792699dfd55abda093598adbf37d31384fd0dfd48cc6ff9f9e3038f448a684bf54d
+DIST moodle-3.11.2.tgz 59407095 BLAKE2B 46e40f00aaf6d87381eb642ddd52ba40524a9894f5cfc094f1dcdfed07f5351d1c442fe4ed0fd514123aed8bc5d8f4aa356d58df8a008a6eabb518d900d3c313 SHA512 ba37f2ded778e974e5a1950fad9f224b557cde7800a06f8039bff460aaec201dd5a6d24359e46c49f382e54d88192b4ab1d834c3c27a15a0b55984d4ed007f18
+DIST moodle-3.9.9.tgz 57163605 BLAKE2B 4d0402530c3003a0241e1c527b3cebb5062e8ff2c187ce28b49b0d4f83b374a266d6c274d906393c757f3cfd7005abf6d829896c469481d1b5a446e63c30ae5b SHA512 beb12a9084da46125ec114536a06523d62104714eb1a5b1a4b7c7f251d4ec2d6e0707f7335170ff9c31ef70497132c9d0bf509929d69550a605ce90c1faed9e9
+EBUILD moodle-3.10.6.ebuild 2812 BLAKE2B 5c5fa3db9258c0500e5a27c35ef83abc18aaff7091ac0a4060a6761a06915029ded8839ca39341f3b681b5ff80c5b4259640245bdfd42a2e339a266ed6b16d37 SHA512 63f22abecb020ed92d4eea4fabbef9d7f128c3f04d535e0b367dfbc53ca5df5751f960361372512a42340f1fd11b00622736d1b2fbfa658ca163e14a4be1b616
+EBUILD moodle-3.11.2.ebuild 2812 BLAKE2B 5626350ca51dfca177261d5f89f59c6eb59e736f0992851f1adda51abe91b40b067106402586aeaf128035299a33792d8cda0b77980c17293804ee1edcecec70 SHA512 79c8aeb215fec8dbdd2e7fd0747b8c48a277713532a38f671596590799d3d8100ac4b502670798168b3bd8d9bcf0c20f4cedeb430fa8cd3cc9108004afca021a
+EBUILD moodle-3.9.9.ebuild 2812 BLAKE2B 5c5fa3db9258c0500e5a27c35ef83abc18aaff7091ac0a4060a6761a06915029ded8839ca39341f3b681b5ff80c5b4259640245bdfd42a2e339a266ed6b16d37 SHA512 63f22abecb020ed92d4eea4fabbef9d7f128c3f04d535e0b367dfbc53ca5df5751f960361372512a42340f1fd11b00622736d1b2fbfa658ca163e14a4be1b616
 MISC metadata.xml 387 BLAKE2B c94976408768e98849655b8679935062d448bd3c9a2b65f165c005556d0a7230717c23577216e61d1d529e2172ad4c19d51223aaf7db07731cf2e1e92b858efe SHA512 bc5bc14f985ea4eba911fb4e411c5caafca175a1859f2535abe5b8fa3ebe45e05ecb9085ffa4dc33bd9f88bc220fbf42f7b1615553f352b742ffb524c482e49a
diff --git a/www-apps/moodle/moodle-3.10.5.ebuild b/www-apps/moodle/moodle-3.10.6.ebuild
index c6650ea73158..c6650ea73158 100644
--- a/www-apps/moodle/moodle-3.10.5.ebuild
+++ b/www-apps/moodle/moodle-3.10.6.ebuild
diff --git a/www-apps/moodle/moodle-3.11.1.ebuild b/www-apps/moodle/moodle-3.11.2.ebuild
index ec940d7eb7b7..ec940d7eb7b7 100644
--- a/www-apps/moodle/moodle-3.11.1.ebuild
+++ b/www-apps/moodle/moodle-3.11.2.ebuild
diff --git a/www-apps/moodle/moodle-3.9.8.ebuild b/www-apps/moodle/moodle-3.9.9.ebuild
index c6650ea73158..c6650ea73158 100644
--- a/www-apps/moodle/moodle-3.9.8.ebuild
+++ b/www-apps/moodle/moodle-3.9.9.ebuild
diff --git a/www-apps/nextcloud-notify_push/Manifest b/www-apps/nextcloud-notify_push/Manifest
index 770edf48bcb1..d7f2a4660c62 100644
--- a/www-apps/nextcloud-notify_push/Manifest
+++ b/www-apps/nextcloud-notify_push/Manifest
@@ -3,6 +3,7 @@ AUX nextcloud-notify_push-r1.init 3513 BLAKE2B f3353adaa3a1565105e61970219fab361
 AUX nextcloud-notify_push.service 573 BLAKE2B 0a9a3525af01dfb71d01ab4abd0ab5f7ce54953891dcff1c4c426c3526bff3490bb7d5a60ee609e3875932a70bc64de2d9f4a97c37de5d836b80131499f89ece SHA512 0307c39dec71ebd0b722646be4ba8e2c6c32b10225d6dcb73ad2076ff0f5272b5abe770d9a7c3531fcc9a559d204f1f0d5280ed23d3118400dc9b661ea911543
 DIST addr2line-0.14.1.crate 31201 BLAKE2B 52564dd603a9c02694ea41bafc91bf20aaf6837321407d2fdf3e7a0db9f92726c73735fb7d8424295bda9db016d319bd6ab1b3ffcd79df60656a0524006732eb SHA512 f665deccae566ec2754cd43fc1d8fc05db11320af54d0561a612faad769234e8b3b8c0235f90f86027a4db9b7ef2915c86398005c949e2c096fac8e53f3f441e
 DIST addr2line-0.15.2.crate 32966 BLAKE2B 471658962dc1ce9dbc44a6e44173114eea110c3ef5673d90d4e12935263ce99f7dcd9bf474e5e7d8d1bb458b914d1ab50ed3a55a17cfc3afc990d05c7a5c6d0f SHA512 9c36be4a476a54da90cff00ddc1621e827c995bacc04e3e382a6d22e724e6e03abc5228d24e13073c5cde63ffc2ed4f26a66c3814e8d183cc062ba6c6cb178d7
+DIST addr2line-0.16.0.crate 33440 BLAKE2B b59a006ba732935d408d0574799037ef0a424ad3c27b894fbd7a9c91664460972a8c464aaad4e9b82b94e4cc35ee9016490bd469fa21358e11e6d78126378038 SHA512 7ea8fffcdff7f8f25c0a588fe2ee652053988ab2e1d39ac740f5199d6e7d30beed0272403d04b86ec5de6ad5459698cdf28f8efd5caab7b6693102df7ec4889c
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST ahash-0.4.7.crate 51474 BLAKE2B 0974b90539398d61903ce7fcbecdfcd802fcb5c7ed631be919ec17be6951e68bc80787876cafebd33e40a80605f6e2352a86047077bc40575420bb6ee1a4915a SHA512 2f42cdbacb2b2f9bd7d94a4cc61294d7813428157ce242ba82f7c3fccb6e4b83c767f4dedd35ff26ae61a89506b388d7cf96af4e727c29a14b25b9f82b1f2126
 DIST ahash-0.6.3.crate 53912 BLAKE2B 65fea8e66df2d6c29f2173b5c01b8df1ba41a2bc4b03b3a2950b84f81a099e4cee004bcacc296603f0a4b2afacf7faf77cdec56e6bb6d8ae0d7c55e802b8f73a SHA512 9d7b31b6da2999757f64d7963dcc9af946a70bac7b528ca103dad992a8e14f643e1c51843c77256919403b470b9591fab0c476bb511197a5608645c0e3ec2dc5
@@ -19,6 +20,7 @@ DIST async-stream-impl-0.3.0.crate 3652 BLAKE2B c2c73730f7b9953859bb5f6455d386c8
 DIST async-stream-impl-0.3.2.crate 4100 BLAKE2B 93e294bb0ca1ad7a03ef4f9488cec60bbaefc0f9de2e7f03d9c4ffbfadc858cb4d2aca924127e29434fc1c2e19762acef3d441de486f837f6eadee1d75fa66cc SHA512 f381c48c57aa72c08708fe7a2a30d2ff3a73552b69a45d6147915cf0ea426743576e1254cf5c96a416bf7a983e056db7a5b415efae2ddfc78fb2cca4cbc34574
 DIST async-trait-0.1.48.crate 25044 BLAKE2B c508436d4b457d57155e5fb9c3a3d2ee03f908b0eee549641a035bf7d62b2a250d43a74e6edae9540bca4cb056c8d4e1bf20b3169556e145653d473d7a9194a4 SHA512 ef3078389a7b0ec3e97fa7cfef0b74d281f2dde7f669b9fe51831475614b788b697fa6e6b4033a84339db10e91933a7d1468a472d629a0264675d0eb6af4fdba
 DIST async-trait-0.1.50.crate 25321 BLAKE2B a5742a3496530b52b32b61aaab483d1ea066119c67290162fbfa2d45c47318fef2d9428c4bd60427ac2e7ee62575f54f46c61c55042eccef3868408d07e3a958 SHA512 0f2694fdce91f28041e6afdff1be574f19665ff874337b24322214393ba58a0b16dce5b4a6e0d0e5b6881ffbf071aa117c90210322bb4397124d16e58d63de13
+DIST async-trait-0.1.51.crate 25531 BLAKE2B b4ae85616d5f84392381539d98c1751baaa01cf936045423179538fa4e027d86c8aaf42f98d4e781e0f8ce7ee3bf95d64fc5aa624997fa4aedd06f1e9144b11b SHA512 9a0505109f984bde511a6e1543925ac447935824594fb0ae3da6af3f72fca29cbbfa0cc282f751bb2c597e73084d831fd75c202beb5998cd368eb0c13a067990
 DIST atoi-0.3.3.crate 6968 BLAKE2B ccbe7d4e47ee5e9f2f979f9589b7edb148a25169753e51e893fc8885c169ca1b9aad04b5c92bf92e828da4c1df28ec7c9e913a60efc9d54100046569ed32e33c SHA512 0b9f5ff975025a94624a435f50028624b1d5b1180b008b16b2ee82b659f86c415858ad096ea81449f3975da8d63d940708f1c9bf74f7809adcd63e0f4832fe68
 DIST atoi-0.4.0.crate 7106 BLAKE2B 20cc7e387c579023465ecf00aaab766aace33d009b8584de5cadb76bbe4e6f823f7592f96a8dac7aaa0d30296a97fa45e638924ba6213ef715ad2f679b134c4f SHA512 f154ea9175f9445d0756798fc957e4df17acff63d8ef314a5d10f77f53b54486346c8782fd2ec301ec8296264f8d4b9cd36a9ffb6255ca133eec6e5778c4924f
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
@@ -26,9 +28,11 @@ DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107c
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST backtrace-0.3.56.crate 73377 BLAKE2B ef13597495bc655bb01ffe3d5724ef487d48dce598d9522c737c694ebed1f4c78d8e6bb1b80c817409ec4eb8c99b4835b254ee92a2c2befd1cce2034d0b3567a SHA512 0baf075eb3a964f27306863c19a2961121b52758b58d12ec7dfb508fbae2f3136e8be21d2d9f63ca5b54d4e9db78d9cdbe65fa27b31c42b65c182ccd79a0d7e6
 DIST backtrace-0.3.60.crate 70983 BLAKE2B d47ad8fecb2a200e1d0e0cbad54df070186bddba33a6115aa2223db5ad0d458ec6608224d5f5311cfccc911f1cb35235dcee79a203480240e280ec89428559cb SHA512 f8b39daeff3ad26b2c66dd0712d177ee8ee2e1007377af9abec7e5197780aaee2d3a7e89ba311f4dc38185cf2a20e45e2ac4502e862e6d9aa6498493df522f46
+DIST backtrace-0.3.61.crate 74284 BLAKE2B 3e66726d5ed8130963a988dbb751828447073467bb6ab4bfa1c385d74f991b52a0f3ccf00823b74a48de3d043e6dfcb474644f7a81ea9cca7242b272cf715aca SHA512 209105f135720b54d584c7ccecdb16b49381cc7531c94b81ff7279a44752ee11075cd85960f86f809a22ecb3dac6728afa05903c1d355df3ad8abf4503eec861
 DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST beef-0.5.0.crate 14870 BLAKE2B 486e92a57e6c9dd109256a80ebf0e2bfc9aec6ab0d6f4958f5ac0c4a2616b56d9d8947f5c9f2bcaaf313e14af0447b39bc1edfd2e77b21d0308c00398dead4b1 SHA512 f46643f7aecbe5784dbae3f4bd20dd186a752534a5fd2170d9277b813b5bd9e15498e4f1296643526b201992cd7fc044acef5bd9dbf55cab3437865ad71df12f
+DIST beef-0.5.1.crate 15177 BLAKE2B 7d81c3e4dd7e8e66b670b7a907d54656c5e1932554e2c162401ec2b406495120fc7c5297faa7b827565c27b483b76c63a531cbf0478aafb5a5822bc076aa1468 SHA512 7e4e33c598d7f28a0b939f9be67bfa6cc4deb5c2b04179a24e4e26ffafe715fa84c9dabbf3a1979c456be8d07f8e39cea1dcb24d1717118ef86900b292741a0e
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bitvec-0.19.5.crate 148200 BLAKE2B da9ad68fa928013a0f9403ca791072b35388d453b563d76d73e3ac34bb095bd1acabd158ccb1ce3a3e648e4ed602408d93065d9fb561338ccc80beec75ec8040 SHA512 6a2028f1354b39a734ceb5859664f9766c5a291b560c6f7e0dd8195b7f8d15a3e0552f6fba158009119103f217938dcaa22291af420580ce13b80edaed168459
 DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
@@ -41,6 +45,7 @@ DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f3
 DIST bytes-1.0.1.crate 48142 BLAKE2B 3ffe07c5429d7d2df821c04325b8dc84b343c634b4699e9c08b07181e741c06233a0501d987b95f513be57ac169537bd0812defd118305e0648ef41f6802d19a SHA512 885d3229e51c0deffe06824e81e8a016e3244106e7ed382a721a938cd2e69fcad7f5e757f95cb07ee1be83de04fcf98f9774f8f2e07aaa9a1ff068eaabf2fe87
 DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
 DIST cc-1.0.68.crate 55936 BLAKE2B 9bbbeda78b8c3aca487e770cddbe11bf4686424bd33d023ad66e1fbdfc8dcbc17fd85c15905e0edbed8745202c01aea13d4f03a7f8f655e5806da152565419aa SHA512 faca9aa91488808f920f1d88422cc8a69790aa6dbd7bd2cc5d08a579d248faafd0fd675e8499e56aef6715398c278db1fa2079511d211d41aa65741de5d5ac8c
+DIST cc-1.0.69.crate 56044 BLAKE2B adcd10bf4faf6835ae8feb79ce5e7a4895700d9714fc4322dd52e37bdd8db66b849d5e59aceba6ef0edcf9a5c7c0e2bc616de4acd98b71999bd63592c1c69dda SHA512 ba2b84fb61b4097a96f9013f9925b1985263ccd75274186f5d37589444e390ae8d5d1f88c210822a9e9dac2db551c24aee2b12bb61801aef8b31a72b2ac77437
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST chunked_transfer-1.4.0.crate 9238 BLAKE2B b29737023c78041fa1166d56bb5fb7be2e502b06c56b0fe127c1ec2eaaf3ebdbf9bfdc8645d7234dc17703706529406072b90fb06a15df482b1065044d3dd4c4 SHA512 b3891bc1b101677c2ae6bbac19e74f5ad0aee7b499b0a339b78fa0af7150b2ae0b2151d640bd2a7c4d052a12cf935d16e04db3d37d0048ec1d79a9ff01f13389
@@ -50,6 +55,8 @@ DIST color-eyre-0.5.11.crate 630879 BLAKE2B e2e0d908e1df3851bd68f22c862bffb65f97
 DIST color-spantrace-0.1.6.crate 185435 BLAKE2B 4242c62952ec5670eec3f34cc58f91f0828b185ebdd35ed8e6a2924c37935dab4d81fd13a6757633391f884ed4218d2eac560f76dd6b512e12fe06733587ef22 SHA512 3bf371e233f3285018a533efbdfabef87d498ea323e4654cde41d9552c80a5dd379cb5573d8199f0b6161d0ad271c07c439229aa2e626340096f011ca43ef5a5
 DIST combine-4.5.2.crate 131467 BLAKE2B 1dbc4832f3de3bd42844ed48d10f3a1aaaf9c193063ebd6bbe6507d4a6ec7d785ea0b0e2239be288a1a11c3b82ea53643776a1e0040f13ba014b93212cfade1f SHA512 a5115a40488beefc7e34c6cefa8f558486ec0aaf8edd7912f3fba46005c4f53cbd6725937e91f56b03076168aa236bafc22c8a3371935ec01b7680693f4ce39b
 DIST combine-4.6.0.crate 131476 BLAKE2B b557f47f5f9b2bc4b205ede55fd3791cc9e4bcf19f37815b2034292fc5090f101510f8ed80bcef3596c875f5fa7a62b468e6599c21b62e340ca1ee30307ad828 SHA512 1cece5ceb47e35bc0afa10a199f600d01326fb3594b6fac81ab3abbdaa3977db148b47a38daf9fdc7abb1bb9873c40ba38a4e1760285b589677d24c079b17983
+DIST core-foundation-0.9.1.crate 25985 BLAKE2B 22e70b7b1cd1f39c4ac287f406dabc549e3ba750ecf17955f129ff83afe67bb4bdee7e7907287eac0c28597df971de27dae77619f44d0368864c08798def1ae2 SHA512 d6dae760082ef9dcfc37d18acfa9a6ad8ee491335d17ee17447c5bccad623564f1e8bdc54460fb260aebe9276ce5ea4d8a389a83b5c7d17193614906c3d2bea9
+DIST core-foundation-sys-0.8.2.crate 17461 BLAKE2B bafa6f6af67f55b34c20e50093a5426bed35c159058a97c03d28c99b6f0075305596907291d26b170ee2ce1bf0c74bd51e2c54f11ef021399791129de6cabb57 SHA512 1c66f2012c11185603a0e4c09311d32bc4ffe639ef7626e49bb15006306fbed4c963f2c53d3b853a254b29cda73c393e0236436575d217992268463441ac7348
 DIST cpufeatures-0.1.4.crate 10129 BLAKE2B a497cb23661b52c8627ec7a794a6ded37277ecc6aa3a405258e712cca4194811645947368ac5db4e22360f52a98205d9420de2288879635e5269e3de3aa684ea SHA512 8d6fbdf934359f4fa5f65df30801fef2ef1d011107884060b542a8f521c86ad3ce808f39bd78e971794a888d53df8dc045efc00e208df8c26ccaa9d951e5570c
 DIST cpufeatures-0.1.5.crate 10419 BLAKE2B 77e0eb2c8b1b638b9812ebb3a1ac5c48b9c2f7690fa9ef7a9c14a49a880958c2a39afc00e981115078bec98725e4f76eb338465935017958caf5922f3f124933 SHA512 700c31a677867df05c69ab098575c66d4d9f2de077431f938c1e0036492e00e876e6c563b705e22cc82c937fa01049b42d577c9b4c84ede4fee774ac30362478
 DIST cpuid-bool-0.1.2.crate 7173 BLAKE2B c94598ab349d87a0859112433d6fc31e46eb04ec8c0edc7ce1f15a31f9f3857f93f067c4ae35e648bf2bd4f54d1ef37ffc1507b5d6eec8c3432636c589d1d8c2 SHA512 7907fc4ec0d5ed370edde0655c8223f0df6ab06c2c297c7d3bdfa958f601550851331e777065b4fe21f01f46610604e91ea2e20aa4b4147f441319224f69597e
@@ -61,6 +68,7 @@ DIST crossbeam-queue-0.3.2.crate 14993 BLAKE2B b22d68d0bebcee8eeb53fe431f54ae219
 DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST crypto-mac-0.10.0.crate 9476 BLAKE2B c9d2507012f3e88cc6a8933db4b879f90a93f8cc16a573436a200a386c67434fd8e33b1cd6aed1298a50681de554b7b3f9ffbbaf46d411ecd3323a12218c0bcf SHA512 8b406db46a08f64d899eb26597fac99576b3fa892eb83bbe089eeef7e6452f43dd138232ed4fe75cdbac2966f94b71f92910c14c53b39e5501990a9976ed1b59
+DIST crypto-mac-0.10.1.crate 9531 BLAKE2B 6a26505762d8d466275fe7674de1c4f95686b7a5fe107442361c892ba3123213e3f7cfb8d5516219e84c44496ef342ab534ebca724732e509d33fb9300027ef4 SHA512 39b7d966ef2df4f01a6b6f43838ec30c9df4a51106ee42d8d349f2d826722834ad5f7875bf68d7359799015d53ed45942d71a10f701fd080e264b21a89879dfe
 DIST dashmap-4.0.2.crate 21066 BLAKE2B 61c8cd1d52188ff071aae0c323b67e2f16b2282791c696a3f9c3d876d21efcccbad62f80bed85fc1b6a8223708c30ff5d5513b7f4a980f29980f2a6a1f8ab787 SHA512 1658183be619b781c5d9e33a2c709805053ab81187145517eb4bd22e12acb42426fef841a91618e889f4e7da792b88437bbf26e3899144222562c54575107d0e
 DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
 DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
@@ -78,28 +86,38 @@ DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb
 DIST funty-1.1.0.crate 11631 BLAKE2B 37b246ed78132b52461dda9f3c1b52feafac998f6cd0ebc62408b90e5f826def1456ce820adc745aa1ccf07b281fde3df65af84eea561eeaf1ecedaebfab24b7 SHA512 771f42f601a0349a8e9344c8df552491c64af350b18eacc99463e972335d4a4c95416704ebf49e904503fb2d6f78bf201c8cb82fa20bfbf460ab1e7ed9f94a9e
 DIST futures-0.3.14.crate 45557 BLAKE2B f58e82dcdd7a238427a394aa05d98104fac3bf498f73475f2ec6c5af021672f41dab71819551b2ae4b2a472764e96ad020bbc2e9217a887bc41b08da247d0859 SHA512 a5a93ec0bfc62409299816022e93850bf110ff8038b2d09bc0ed533fd7057e002b32b0aa141852d961e218190d1e1a0dc7d483d75882203966a0b89469932e2c
 DIST futures-0.3.15.crate 46425 BLAKE2B f3885930da0f5d57cfa80c42e1805bca3be6ce20247bceb827862d1b9f25e2770da050ce89a5043884c63cddbcdf415306e39d32b8a1cbe6c6ae16563211c114 SHA512 75a9f0f16c693a1a24d5aaff57aba72abf4f2cd74cb335d905a42e31b9ea20ea0e8fb24e4685d39239f3b7df8a78b13944c04f208798f43249db5e8a36a7affb
+DIST futures-0.3.16.crate 46410 BLAKE2B 30fab6c72c09c030ebfa8d4deaf35cf5d5efc2b14a8cc7c3eea83109e1588f6042daab3ddf2e660daa643d26cd227229e2f3d780e24b7686dde1ca04e24c7d08 SHA512 57a58ede8599cc61fcbe555c84df312aa890ea993ba956759ec8effb71982fad668f024c536dbd20856388d6ceb93841de6c063e5321affcd41e96fddf7a9a0a
 DIST futures-channel-0.3.14.crate 31260 BLAKE2B 86809f71b17c5b285ca7c05b02f5d864afd3eac865472d08b45e71cff54574dddf9f0069f4db2bb9589e4ea32377787695d8b03c7a2906fb4c36478d1be5fe28 SHA512 0f88863d9d2cdb58426cdf1898c050ccf08f6086963308518725e3b778eea87ed632c776e450c0e890c872d6e67ad9680554d4d1c7433200986877e593eae642
 DIST futures-channel-0.3.15.crate 31867 BLAKE2B 4dfffcba38e26f7805b55e09413e114976e205507f21454eda084ac975034183ca1083f4d9df624bf17c05d98d1e3a84e0b6cfbb99521792d56cd2e1d3dce997 SHA512 d612c1425286eaa1a713e073edfae8ab8fb4e0b7c82ffdade57bc5dd06c54de6de46119b1cd87d7686cd4efbec38228c4a82d250ac693daa39dcfbf365b7ad25
+DIST futures-channel-0.3.16.crate 31765 BLAKE2B eaef9d4daa760dde5811355230659ee5ec1e8ad784fd935667664cb3db65bed30c4e342bbb4ec4687ed2ab299c7e733d30c017055b18e307296dc8e7797cbc5c SHA512 84baf9a5b74693448ba3cdc402957d0882da6ad0becd3588fb61107d0ed9912a6ddfe599ecc4751713c81f4c962cfa283f0b3bf6472ca17383ab7c5ea5821e65
 DIST futures-core-0.3.14.crate 13831 BLAKE2B 0380b7ce85ad227715db962af37b7427de60ea5a033637fda5d9a389a9e92dd21346182490bedb02b438c3521a19e25aa1ad1c45f5035cd90f0ce662dec30bae SHA512 7cc7c7073a7a5bfe4295073e63a7dff82f32f43df3a0fcf6e7c0905a1272a50a19a8bceb32755590e456c8cd1b296574a2c48d02b8fd3622aaad305ac4520d75
 DIST futures-core-0.3.15.crate 14514 BLAKE2B c24ac1060c981887896b73ddaf85007a8a56c4fe03c6ea731d3e8389294bc7d97cc478d8ba7ff5d0e7a2cb17f54d1c7b2bbb2a2a0646c44fe1f5bff670495cea SHA512 e8c6710882e7328493e7975fecc360f2071ae39d1ea88a04a38e4228c48f9af4c545c6aead868d13689cfe33f4c98c5b5bff2f9cfdb0105368b11ab2d652efb4
+DIST futures-core-0.3.16.crate 14486 BLAKE2B eb6afd63cea682e3b3252e956a213d9a6a7135ee3631eb10482af03e3bd717e1c69b49c6956aa3390cb4c9961a50b33cf7e7a356e6a511d98de9893d93f2f9c3 SHA512 cc3aa3794a0fc6005c88134943552dd426dcdbe0d117a2ab3269fc6b5b7ae637e0441c28f5b25bc544585c8830ceebde252241a0502fe832f64476c4b4774bb4
 DIST futures-executor-0.3.14.crate 17110 BLAKE2B 85f6921bc1f6ae884995bf2f75d059f99fef2a6f586ead639eba9e9454080037712de416f2bb67220d1792eec500cca56dcca705f09e35b9169e13cdf4808e4d SHA512 15f3d71a699b6d900bc3ac4c0ea13997877f88f9ae3c17b15039a4adf1a8724dc238e18eb1673137977fd81a32d7611669de7ab12118472cb92697043e098523
 DIST futures-executor-0.3.15.crate 17166 BLAKE2B cee50035f9d0c5fccbeddc4cb66778a3cee5b76a0fdba39f4aef2c569e06d5c2bae96eee8f5a3cd42ff2163891104c89856758889ac687f2276a5cb1f1af9e08 SHA512 fb1337a2500d084145fd3dd2821db6d9419ebb781adf3e7b2ce4836c17a10ee4d5dc2b0c73414fde4c78dab89884620753424802902886a5d4ab8e4730110fb9
+DIST futures-executor-0.3.16.crate 17104 BLAKE2B 8c60033c4c1b0880d0e31cae158aecea49056444b0425afe209ae7f669975e1edbd16955b5a758d1220aec5fe435a1822b1c448b2d477a14566a7b2faa9d5c93 SHA512 fc878d29d0f2c181ce78c67d64a2449554c84f079716534db4217039c76fc7f64091d1c5b8b113ecdd842bec85251956fcd9e86d80e7a8a7ea2a4a6ca32133ae
 DIST futures-io-0.3.14.crate 9056 BLAKE2B eec9cfdfafeb2794959cb3a94f5c8b463ef31a55d68e6a762e82125a90cc61233e9e9219e355c5bd7354e7c133669811e40fc5e8902ab9651d0b88e1845eed10 SHA512 7533e75d82864709299a29df3a2770aa9b14cdff91c6a2b6a3f98e577866afbc20f329ae71e748320553fc1cb7754027c6e11ac7bf28913e9fe8b26dab59c01f
 DIST futures-io-0.3.15.crate 9058 BLAKE2B ab496ea8852ac74edf96f7c91bf074739bf3972d22c2dfa1ba3138244910e39098c99994679b0f4211ed9e49542523bce2caf7bbe972da6a550dd6169a69df50 SHA512 9e8787d8066636351de2958169d6ad21d02a3b871cb242dd4fef64b97dcfc14397740107f13d1e48c27640b768fada821fb433187b5d0f0a03e7555d15eb5917
+DIST futures-io-0.3.16.crate 9050 BLAKE2B 60bcaca9e006adbc0d97af5cd9a5a7c3b50a94f017a130c21d7132f7f121e1e74f5ab538362afaffe44d4ad1bdb67f89dc8c7fa28ea69ee30dde84019ebe4c70 SHA512 cb9edb5224741f249f1936b3444e6bfd4ea4eee1d3964971d242ae1f80bb191067b1e3f0b36045e3234ea7f35738037c863fec204b952a40f84c5f46026c9ac9
 DIST futures-macro-0.3.14.crate 9681 BLAKE2B 35f8870fd86d33c0713535de85545726b7b22fa019f363d4b688a24367de1c87899b10207e8df73f2dbb4249b4d274095901f2632cc558621ae793977a369e7b SHA512 07e50e955f4b666d2457ebfd15503f359b7b9605d4736e6be939a02b30754be4f8761201780d8cb7929429a293d013f7a853ac1d9be4b7ea2060dccabebde489
 DIST futures-macro-0.3.15.crate 10872 BLAKE2B 82cc8ee228b31fff8d4663c4a3ca02cf67a77f53730f20e4d153614ef3bfca5fb3be81cc25b233a75ab4630887c19ef52f3f5751844f1199377ce59aa426b4be SHA512 68aaf9a5f53d93a24ed080021ecc07de04f88443829e244e4926fdfb440cf9a57f0853b3b071ce7444a755463a34140e0368a8f8b185bdd031915d01c843ef17
+DIST futures-macro-0.3.16.crate 10779 BLAKE2B 94d23ff28c5211f27faf1e9f3444b00a226dd1b43594edc8016dbe425b07ba59d335c1fb93ddce63d1ca1ca2c9ccdf3a56dfd6d8088391d62fadc71fd2cbea97 SHA512 ca36a9499937d0afcfaa9fe9f3e29fbed1ae8fb83e7e6cd267c67fdc3c723098788aa25a941ba8571fb9a5f9e40431a1024c647cd719ca57b847659b926cc515
 DIST futures-sink-0.3.14.crate 7658 BLAKE2B 7d560ff741ae650497137f4b23720bb32f7f7ee57346e124a0fb69f742f4cb622728be35ac917870dca52e8ed44c808d522f0a9e42235c10f400cb7e5676b6f0 SHA512 839f1a4fd62e4552673f2e35c4abee5d84ce99acd4f27cf4845662fe951a255ea5617de2b2c2c8882fea416407ac6b3b826b23a46e4f4dbbab4e98cf8587b425
 DIST futures-sink-0.3.15.crate 7672 BLAKE2B 10386b796da43d3c2c18a53ce0e0f0db862ebc45f71bf277e2e0912d2fbe04ffe8411ac1f0f4b530fbcd1e37258df46640db7e68d84c5fe8863508ae530eeff4 SHA512 319a8367c2ad4f9410a3eba4a345ab2d49a896d9b9b2ef2a888918ff0289491283afd17a29e618eb4e064b7c76008e28d5b16f00e888fd5a506b65d5b79a2dc7
+DIST futures-sink-0.3.16.crate 7663 BLAKE2B 355c7372524be71fbd6405f5bbd173765eb191008c725deb790f183eedae194a8b5c09c512a8e4641a903c409c2a903fc6a2095372ee52dc15f9e10527abeb98 SHA512 32d42751026ea88aa169c0e8f69b80aaa4ad582d852492f7056da35859ec3299d4ff57f508a5fa2da18c5931e97c924d88ec72341cdb342ff79f50f7dba1f87a
 DIST futures-task-0.3.14.crate 11115 BLAKE2B 6d68f897fb4ad7f80ee4bfa851da15516da20177c1ccdb610121bccadc6c587ef9869c01d266275bbba4742fb400be23be00db68565a5091660b5d987c76e3a9 SHA512 32e55a5651e23733e2b60872de25d307d201fb9990c1418edc955ba2c93a083a52584a16ab951c28560069ba4da588f5b070b670c7244fab0074e28459a49da3
 DIST futures-task-0.3.15.crate 11811 BLAKE2B 65c6fbbc9f3b2f39765550f673d5e21eb455521db8b9251645b173fdd898bde9ba69f8efa8597e1ffb051e7c8f2749f2141affa5a5c64c92604992410aaba199 SHA512 66529a849c924ac08603f5ade52954bbcfc3e1796f20dd49eb0289d2ad9cab34e31f07e942736b635d6c1903dba299a7d9a36defbd4902c019ca382c4a376040
+DIST futures-task-0.3.16.crate 11712 BLAKE2B 88c095b45590e6b4d645413fdfb82b3be178fbfb44c6e36c31a6e78f97cf4a7f53d896ae57b0e34da4195678a49c68a684b3af2f3182435352884a7562d30426 SHA512 7c95d177e9cca05ca8982886957010c4defa9c5dcd3b425738b68f750515277e27fd331148168e866d55da4b2389aeb8f0a7af0174553914c55095654666b6ec
 DIST futures-util-0.3.14.crate 140139 BLAKE2B 8d22ad08d86e8ae11f4bc9ee53a458c126b9bb75f43960f66a5004a8bd4e6dce351e2123cf80972c2ff67803ce40147e8c955e84f27c31f56fd89bfb79831355 SHA512 b1ba5bf402be6fefefe2fdd54df7eb802fcf11470ab6cde987ea01c9ea0fa7da61a5a4cff79e3a7f58db3f1c8b98df39345eeae8d9455e337878f8f6f395f341
 DIST futures-util-0.3.15.crate 141962 BLAKE2B f31ef9a97f05807c995aa73d181050a0ab6af4369058f548c9a6ea6f7e055ecfd5e3c6efadccea2c3d39982cda280ca6a6b7f9a404e8c6bf19df64206598b851 SHA512 a89ffe93d277a93e9c825cdeccfe50dd797d9de6360a1ba44748a46bff6238261e60c9eea9659a0c7e13294973c0976595b20b0740c36c1f9204144102e204ca
+DIST futures-util-0.3.16.crate 144642 BLAKE2B 0ce9ebcd85868d6e64622ab498962d8450f7fdb3d15357b77d94409640f6d09803f4ddf6423a118a87231799f0dd495f59ec431e4bd3e823f0decb035f5b43f4 SHA512 21815551e0e22d9fdfbb7ad36daeb3b01bd01c58e85091d0fe08a677141338f68f8754012c9e7b78e031e3baa345927fd05851f20de29fe6155e532bebb19b26
 DIST generic-array-0.14.4.crate 28916 BLAKE2B 41adcb738bb316d17967e029a829dcf7377427977309b010c2f2e365f16306b44991eb5f65698782497f614b129b14cad11bfeba2ae19b45efd117114492517e SHA512 34ac71fee2cd50ff786d39b4abacd9e090a8598baf4dc36ba5fecfb7171cd8e4f58e5360cbb0baf02a87eea26b7dca85b35555b82bbefe06635d2fd38f7b8b40
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
 DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST gimli-0.23.0.crate 702175 BLAKE2B 9acdb3afc092e43b25a11639407eba7258d25e6dd57c1f1aa18d17ac7c2ad73b422f85d850947498deb3ad8c1b8001077f9b636f7c1c11a4215b957c990483f7 SHA512 b5dce7b563ce7b8dd6cfec5258793323d370f217779d0d57265bbbe2b1eb2704dbf0f25c189ae6e9079989b6ac7d5341e10fe49457577e482a3904c745c89b5a
 DIST gimli-0.24.0.crate 703534 BLAKE2B a0103b03d3ab369f3dad8d8aee3e36dd8db402b700c5b5b6ecec568e8579dba8f5d9c09c21381ec9de51988d9121873cbdb66f8e1fae7d8643ea1ca73f4ae1b3 SHA512 b4d088b25f177975a1a301b742e38acab5151f510771c4c276d9cfbb27b3c1421c4bc09ad789ecc64a9764ef95ea50c2d4b7a3cf1ed8042270d5652991ea494e
+DIST gimli-0.25.0.crate 705238 BLAKE2B 61b3da99b6cfa732b35d1fd71eb5bf5003b0caa5464e6da8daeb31486d8066443eeeb693b1e84d49f390a0c33f24fd3c0332aec01986127ffe26f7e770a94614 SHA512 f4e90703b8b7d83c36a63ca7a3d4ee48eec2b0762419780670558c4496ee840489b6a275eb2b635676ba25a010c0e378bae429b54aa4591b9d9868b48e0f0beb
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST h2-0.3.2.crate 158590 BLAKE2B aa10bcb70279be4034b6eb6e9084578c0da3851025f6e45f13ae5785c6618d00db021f021784448228624ab43023d38a49c3b51ab6a3917231446a078eee069e SHA512 0b85b011ddac37dd7f3c7b7b36a453418fe63632e77f163ac32816d58b9537b28d49e31fc2e117bca53970ac613e67d0093374bcf57c0492b8200d3b8b27d39a
 DIST h2-0.3.3.crate 158845 BLAKE2B 4c9d0f9ebc34a3aeafd7492876b90f43e49adee4f99d031de53245e87f8fb0b2cdbf1aa98db5beb27bb8e852218241f8fd2f8a50631e68839c2fbd98a9aebf97 SHA512 7f7ac1d513b6c6068700b41c19cdf74a57ddb6090b5457ed247df93f0a4bb877fc44f9081c962692adb4731c82e0802a0d2151d69c59cc5af754102e83613a42
@@ -112,17 +130,20 @@ DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST hmac-0.10.1.crate 11120 BLAKE2B eabb92f1f276f2397f7e28d306f4bc3ef0928f83b4b622f120dcf1203cdd420c331ecbe430e8f8424e6709523118fe01d425712cb8e520aebee620144f666834 SHA512 ab61133d280fb1b149ad097e29f6028a1998475d2f1995e3ed4f354a8fc91eaff01cf9437a13da637ff433fa05b43d7b144b5726c1edba1130c7004bf18b1c3d
 DIST http-0.2.4.crate 105489 BLAKE2B 07acee6b91b6a316f3277ad324df6da1d2ac804a409983384d2fc027ab63ed05390278b21867c0096730c91a00b8f8971ab6a66d17b9764f119d245592a1cfb6 SHA512 0b5c609c12ae4020801a184dd6c751919bfd4db985844c55b53368afbe2b9f641cf9aa523ae49a0b25a251cd8f19ed634fa28990d4582cf7a27f10c4304eb465
 DIST http-auth-basic-0.1.2.crate 21200 BLAKE2B 147587de97518170e7824e10e9dff64dd91807bf665ce5a586bcd525bb9409c65d7e173cd319c6085e1221d5aa37c7073f2573a40a4afc615b59f0a532e95a62 SHA512 3fd760cfcc20f0804652f5e19028b4b51551dc45c7f221473f937240ebd045068971ee141a9443b4fb3a71c26eccd5d4e88db08ec9aa0b80e2c8517c8c194116
 DIST http-auth-basic-0.1.3.crate 21107 BLAKE2B 24acf93a3cb2475c9c396d1a46b8cf749935642e295ad3d2ecc18759a0145a0f2b3bfc6b3be6c2a88b92548d876c689b8f9f3b2f52fcd2f878eaf2f78e56ec63 SHA512 3b0083c00db00eb6a818e0a92a35690983e8687b0a1382e782df0fdb49fab0b011db1052aa09c180f525fb1694422976fe65de63c8d216547e51f86d397a99cb
+DIST http-auth-basic-0.2.2.crate 25323 BLAKE2B 07f6d333a07df7e7fe562ead12deed9cd7b2cca989f12e74104bc8be404c8f9e222a1c95dbeaac05c6b9f93c45911b640ace26b1ef2e80aa585f168294494531 SHA512 2a1d5d5e45edd8b48f3b471280b91b31713783ac57e19f4ef413f8fc20925eec4f7d9f216808d114f226b6480933cad9e284eb33e9752bc72fb0067137ba9455
 DIST http-body-0.4.1.crate 6792 BLAKE2B 462329c293946394b5bcf5deec9ab13a9afc34beaeff85bd7bc9cf23e09f0903d4d1921d648a732ffbb9a5d2893f1c1dfa3478ffd375d840cbaee2c803a971cd SHA512 1c26d924feb0a7f713e5726d51158461849a4b273881ae4e53904e284488f31b01e941a3a4e9ed6e07b5f248a8e476fd6bc4038706aaad31d8489fa14d5e50b3
 DIST http-body-0.4.2.crate 7603 BLAKE2B cb3739c4207e678dace73889a621d56ce85cb87c32df8174112bd3812e1d804454694679a38c268d13bfe49de4f364ffca3c279317beeb26e89949c86b335b58 SHA512 69bd0a9324626953d2114ef4dddb69da8bb9f90236529e6d40cde0ed92c210f6b6849fe4558fcae50a578dff74e70c57fe8853bac4980101404fffc0b0cfb6fe
 DIST httparse-1.3.6.crate 24914 BLAKE2B 010658b7df7cc57ae08b2a4e3ed6a7f20cc20cf8bf8c4e2d1374edc8b32669f5dfab15370a55b721c9e8741b39c9fc1e08094bd0c355735c9680f035606fc73e SHA512 628d6aec185c4bd3e8f7149382eea9dbda180fe77b8f9c741bbd1337de7655e85803422702247f2cb2b835051ad936ef87394ed099b84dcbb6982c79efde6ba2
 DIST httparse-1.4.1.crate 25592 BLAKE2B 4527521876c4c44306819336bb4b53ca92b427b1b7e6d41f7b1c284812d6c5256870f074bf5273e63922da50297fbeead19c451816f76d9b9b500a5a4316dfb3 SHA512 0dd0f41076009616a80e6b43b317e8560918f5ffffa7467d58fc9885bcfec758ee521beecd665e75d1ee6fcf7dc7c9bf8aa560c2eb885b4e42b84e24bf2ed9a4
 DIST httpdate-0.3.2.crate 10768 BLAKE2B b435d0a530fcab46496a921a565c3ad8654cb39ea038bc942c8fefab8dee2576e9b157f203b376e80a10690650c1c899eaa29e5af75888c8998b07d5d049fa97 SHA512 5cb56c85aac5acc0e9e2c72fe0913d2faaaaeab10a15c0479407ab779494bd81f8e3fc9675f5990186a34689e841427e83723a87a91a5204ff57188e89be98ea
 DIST httpdate-1.0.1.crate 10293 BLAKE2B f25b69244fd82beeb0c9c8f4691d1d057df6f835883f6cde069a4eb28bdbd7808b5f02c8a48b88ca4f60e14c2e0dcc84f4cadd733edea2f8f3d061bb485fff1a SHA512 1a63f11759e331e5938697d181c7f021e953e3616741116437253eaf6da862b6cdb08a0fef5808042d8367de9fac31b63ebcc917cfb81b0244b4d238f95538ab
+DIST hyper-0.14.11.crate 169467 BLAKE2B d4640bf1619711c15c155777a84cad1c5d9220d6d029ec808d953f46ec409b14664e8a5ffb489250874790ee512c4a30d1c298d974d9da83c40a88690c6dfeeb SHA512 c04875f2e3c1732ed29c4f73de24fc197486d157325fa8304aa29e6948984a01d91ae7e9455f56337d3cff2c270694cdec0dad950f1b4bc3f8b3c7964fc079af
 DIST hyper-0.14.4.crate 158482 BLAKE2B 99eff9b280412077ddbee0b9e672739cb13db6ccb2267721ca44cd4c9028a8198e28ccf42dbe843ed37e618431ffdb9793dc7abfbd1d3a8bb6d631868d47a498 SHA512 8126f88ae81e9e85c7035b94c8abbcac5664e6178f6ca470985b41824dd255a307ea90cb9e55a85329c1fb6597ab9fd1a44b12bcfc4b65e1bf4eadf8cb568b00
 DIST hyper-0.14.9.crate 167073 BLAKE2B 253e3896b77fbdc2f45526ed92331aa57fb981be5fe318edd4113bbd7a1a8e84873ddf68ce7fcfdcdff679a5cc8e12603e78e39f5a7f085e64293bcf59dba7e1 SHA512 f365d248f00d870311456102095678bed8cd2ba4b41b1d1e2203effae0e4051f9bf1eec749164e21f58b1cac4f001306d8f2633807e2ed3e8ce09ccf12509913
 DIST hyper-rustls-0.22.1.crate 26718 BLAKE2B 69bdc6de6ee9058a3d782be27147f4856421f7e0ac6509d9e94bc955f4f392e0c9e904d2745868a6cddea060dec7b33f230d0eff17432ea513e1c8049d1f2cb6 SHA512 90c9b430276b553bfb771fd67f81eb5b782b7c5ab009eaf862c26ca330befa75e61f8d890078a9e5510ee6e1774d7f8def146d0a9ae92141951a59e1d94ebf41
@@ -130,7 +151,9 @@ DIST idna-0.2.2.crate 271070 BLAKE2B 3a07d53ea832d53a2e99ed3345d748b6299f6b4e6d4
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST indenter-0.3.3.crate 6587 BLAKE2B dc4a73eb90bf05ec939634d3f1543f57c8b612e44e0fb3b38329ed2b9bdedcaedce84eb3f542f71c726b00c7cd273c3c390f827da170b5ba361cf669de4d1d3f SHA512 6585964939ee84739cdd19576faef467703415777e159ab2ff8b0f2a371fb2cd6c7a83dff4df954e9bea35844a43b72d93131dd4d23d328e9f365950ad831a71
 DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
+DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST input_buffer-0.4.0.crate 7771 BLAKE2B e23b89b67f70decf77b91d3a370d07f430d7119ba5fbfeabaa8f669ada225ea9c37a40e80457f112b3519369b7dae0f886bdb0e03314421486167c3d071343fb SHA512 85ac0716580a3d2121d35d9d2f721b282f3424ff78947c31ac203f4ea85cbcd9fd86efd3f41341551da15beb51171a5a8f8aa09ea081715236f23b5c5234cf2b
+DIST instant-0.1.10.crate 5218 BLAKE2B 1e4203d235006ca922134c715781a5bda5a932f6740b7e22505db21d3b675758bce10dbb370e96694574c40c43a1d71ea2e6372df7116b30fe8cb0b65a3b95fe SHA512 a6b2c7e0a7b954e961f2d904a4cd6f701617ad70a7ea13230ee157c473c903803dd64596baa0fabd075e995cd3d013e10681c8d712977341ea2b6f97dd48d596
 DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
 DIST ipnet-2.3.0.crate 25031 BLAKE2B 064888a6e37ec67f70baa4d571708a9173cc788921260511d8092a0e32982a0de4cabfbd28e17da812e1a50249e2106e82f95981163a0bbe71158b1bbca4158b SHA512 ff77e4ca8ae0fe1a8e9969e8e131081a092b258f64a7211d550d3338ece61dbbed499786b5e97a8515c33797e8cf41b4e38d7832e0d1b18584b0e5231c75a22c
 DIST ipnet-2.3.1.crate 24932 BLAKE2B 26be72376dd7f62d3d01cb9d3287f9aa19e7f52e01f3b47ba8dca1734f959683f17506d4ce071072b8f288e7c494b3daba9054770b9f5f9959e9a450b82a0baf SHA512 db74ad4850e61b20b5280d0637a33a0a1dc2e3388bda38efbbdc221c04dfe04d304d57c3704fa68a824e65e8a3bdea2e743b2d0c2d06b1a8710c192cec1b6100
@@ -142,6 +165,7 @@ DIST lexical-core-0.7.5.crate 492761 BLAKE2B 1a1e1d455ed054b2f5daebf1b6c4572b3ff
 DIST lexical-core-0.7.6.crate 494385 BLAKE2B 417644e5e33a70aa4165cba77bad45c540aaf7bb2037a5461c691b646a5470c7ad68a60029ac50f1cf25de3b6928b3f491e9b7ef5cf5a7d3281d83fd33a173f2 SHA512 fcd7e4e073e6440183284f20a6305bbe4aafb5513a20b8ed793439e4b5a5519532a0605f31e42539f3e6236003254812b459a9b9c47b3c449f5c582dd62c3172
 DIST libc-0.2.93.crate 510944 BLAKE2B 93ca2d32f5c1a1cb00ac75601dc3550de058e6d66c14309eed4c98a56be97aab6512d6b8b7574fdbf5a453f1400c9120eeb12e4f90970819f5c19ee544a975f5 SHA512 e82bd56c282b7473de50ec730646ae64384661e533f78b19bdd737d7a637cc93ca6f4e0b576d901576413a48d274635b917ec4b0c5144b5196155b04015ca94e
 DIST libc-0.2.97.crate 517712 BLAKE2B ad769579a8e89e9e0ea6a08b8fd82b69a3a299721d63b63efcb436b333021c097933565e86f4b66ffcce6a589718bed2aacb36b80a936dd3dda763b9c0c240d7 SHA512 9b94a43d7da1e419900f7a016d5eb958bc42a006e1bb621ab8e2be2167e91f05cee81144c25e81a85c1b1ea2a26ff88980a4cc292fd42db8b09c5c49bf5531ed
+DIST libc-0.2.98.crate 522087 BLAKE2B 950686d7cde31322e1cdf82ae189192091b8543d14d0da0dcf3892910f4216e8e46bb1d5e7e8fcb1693a372577c57a6eb6538a0fef997c1c1a0466c3a1f7acb8 SHA512 2e730b8d46c42608c7da5ff4c5475667171b552b485c2684d3821310ac0f55c1a7a12d9a2cf68a05608cdd2a0928da5e290275c70a519a379d0ed25350689689
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST libsqlite3-sys-0.20.1.crate 2306064 BLAKE2B 9e0276c36311a7aab2613735c13b91f8dcd77c02f98bf38bce5f84852f1139d9c8dcd077bbc6ab55560fca69b27e08d4d1a0a7ed17152465267cf1cb4477d5ef SHA512 8ba1e7c7a6a5dc11ee4a2c817879478c7e3d349b237b418edf72489a232d39904537abfa2274553b06ae2dc909f4f9e2b3d8ae91a4c75768a3215ebeb5c057d1
 DIST libsqlite3-sys-0.22.2.crate 2345859 BLAKE2B 284b9195b7bf48f138970dea782985cca3d105112430400ac76189eb0d44174a063751693fb2978db1503387eb4865634caebc7d7d0800cf34fcfd8a4ff4b5e5 SHA512 c87c19f7b4f2043de57da0bcf52fe0cf170bc9b894599a2c4ebd1dd489dffd40bf4f30ad78c2b1613e79fa7ccc39bf87d90d8f708d22bf278a8c682626cfd28c
@@ -159,6 +183,7 @@ DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
 DIST mini-redis-0.4.0.crate 41799 BLAKE2B 376755bca60b4354a66e8b31a71daf30a7389ee336421d29ec5f7ba2173ec72e6d138ef4cf945ed2b30d7623bd09d15f8c16498e0c6ac85d542f4fc92509f7db SHA512 19040b8550e48f37fadb99c9f5d3b0615def4050e426e7ca9f4d7c03b18fae8a81df10e99da93def71f78ce2189adc1ed4ae05efe6760dc1d301488edd431acb
+DIST mini-redis-0.4.1.crate 41814 BLAKE2B fcfc31a27cfbd7a1a7188642ac5c477dc1dbe8b91069e5fa9698005004ca6f39ee3e74fdb9a276b6615ada5f105fc543d91fd945d3e524c77403a39040968d5e SHA512 7891cc7a67a1460f411da4a87c277cee21535212a39a8aa19a9fcac509ac1d5d3f864df2e4e7ce0e91e1a5f384fee34fbc6fd15aa57eda6cceeeb252decf1515
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST mio-0.7.11.crate 86660 BLAKE2B c55020ecb53cfbff143314d0adfce7e5124f66004711df9dd5f95d18d89b994a13e61b4a12b19a482cc0232393690ac87fc7d56d7d431d85e6826c2f5822b56d SHA512 abcb2d29868ba749ffbf2f4eadd5c24ea80bdc7d62aa09fa0a70d9963e73fd5f603fb9b73410db5f72a051a153e0ef5526992aaaf1b212ff0e961bc31d107c63
 DIST mio-0.7.13.crate 87027 BLAKE2B fa1b8287981c3a96c0b6f29de221241d12bbda1c19a95e315f5e026e130e2bff6199774524d5c178718bba47710cc50dc632e942a590f5d5af598e4d59fad269 SHA512 3f9adb95db494dd39041ec1abda0d476b308296024347f28bfaf5883d7896ee052edda026c25a9ccea9a31cbc5431d95c0e13948e90fc8ca7b1a91a19748a45c
@@ -166,9 +191,11 @@ DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422
 DIST multipart-0.17.1.crate 64638 BLAKE2B 6edf8fa8648ff7f754cd68e23a54a165d4f6d153697fcd7d92570b9ee34b97b5d2dbcdd1963f9f6c70b07695724f7b4efdfd6a97ca7281f4ad8cfcab6fa91b89 SHA512 6a902662c22523271a54000f47a689c7fc560bdb49aa5653a5ac539a1a4f0ba1c408a51a556a6720ec57fc49c2a3059e95684a45884917e3022cfd5f350bef5c
 DIST nextcloud-config-parser-0.2.0.crate 17828 BLAKE2B c305eb1fe43a1029e087f5db63c9566d8e93df2ad1f4fa1fe3b693115090ce2c0c8237d4c2f4cf83502ab24e14646e15c40f07edd4a12ceb7e2a1c49aab7e632 SHA512 d0877a8275b780a21c35a9ae7526242391d5eb53245569b396e4ebd34738cd321bd8b8750d6fab28d3a2b1eed7758f6b63fd05468d014babae9c1f8e309bc301
 DIST nextcloud-config-parser-0.2.2.crate 17866 BLAKE2B d749da4fe1f1e2b2faf0d09cefccf6a4e773396f90fb1f85058f91ba46e8476bfe6ccfbba83f5260456283d8f33e8190fbb03460872e39c9ffbb0bbe9e12b788 SHA512 997bb2eebb7c90d192d83d902f6bd6da0e18651fd0d75aa93f8a49950c22a4d2d9011b57eb960fdc1a0e0366a033448eb26abcbb7645630f9b6115e8beb72ce9
+DIST nextcloud-config-parser-0.4.0.crate 18855 BLAKE2B 3ec13e8f63140ad911158cbb6518d730a43db51930deb344bac2e46202a12d30e0b6725b2de4b319fcd04656af64d8c6aeafb7d0357168fe98b49b3d38a87a40 SHA512 0bcbcf526d8757991d637a8dddffb68762afe2e0cee1625141337b1cc0f86a35b22a45915c797421588ce4fcaa2a2f27f03dc0677116bf577cf5ab4e1e3bebd9
 DIST nextcloud-notify_push-0.1.7.tar.gz 83939 BLAKE2B 7365cf94fa17c1e0af8b88995e0763cc23b831ed94d43448973a2cacca260e06067b60981e2f078e0941087a1a6850ddcd224b2bc44193806c688154b29b81e8 SHA512 f0aa285db50e054ebd76bd90d9dc0f3f1e8e4455e253c87e8698479dac9fd2b68751861da02eaa6ff207b89e5dfd3ecfa1b6d00fe8a8a2ad9445a4540a5a9ee7
 DIST nextcloud-notify_push-0.2.0.tar.gz 81439 BLAKE2B 9ecf16aae1ab94454f0d91a6c85bc9d7c2fb729cbce04e5e0893c0d394f0a2e73eaba21265e4b98a81a6114c02413e5d7b89fa3447cac121c92eba729dd97d99 SHA512 714562a6f3f22673e7aaee05d61eb1940a91a70ce8f48f67c72ed0b5040f2cd1eff0ac7e424ef7c745e437d22e0dc6c42daf3c50c8396138555b2ca2dd5499ed
 DIST nextcloud-notify_push-0.2.1.tar.gz 81521 BLAKE2B ebc6f1480e4e4c51ec9c0d48735b56dfa8643831f58f711e90edce98f4cf8c9bb88347461ec1793e92b7312c0c050ad65b97668bc732885c6d29700fd43c84a5 SHA512 26b0fc611a83fb29c4df8acaf4299ba1a2b85420c9708e5bf2d07d334f3b57bceed8b7ad90982312b7031e4f3cb725254ddde18fb2b6bdb791070f65ae2a81b1
+DIST nextcloud-notify_push-0.2.2.tar.gz 83166 BLAKE2B 9cb6bd1915e6e96e2418b97a1e2b4e12a6689e371840f4ceeae41647295ec2af7a39935f6c7411a440fdbe2b631fa16d4287f2fa38b7d34315eb43041f2131ac SHA512 716d1e53da408e243e7cae7813ac3ffc3b66a1088b64c36b00ad821ab526787e9fe3cb379b2d70959b596a94d9913b9328e5d0da4d58e4f0565bb2227df80712
 DIST nextcloud_appinfo-0.6.0.crate 15344 BLAKE2B ce1b16bf6de31346f51a6e507a091689c410e118b5d44520ba184f998e38d217a93ffc27910db5de3bcbdf2a82c7929f17184fe4792a10bf454ddfff61109684 SHA512 36c28a0f2932d0abd6e7a4aed65943c09d2741bb315d3e0375f38918e5ef604cdaa17855026cf93e9cfb6cdf03018f75d363d58cb47e7189f309c45fb5140867
 DIST nom-6.1.2.crate 147539 BLAKE2B fbee4797e91662a8c255ff80598fd50f62fbdacb3b734ef6a54ea115e6411ca73002c2766deb88ac8ccb698c481763594472204871e7096613137582afc9740e SHA512 f9a12a6c523c1c3202f3c45a514d02c40c600c835b83a1f94fd8e51ab462fdb89de3b32ad11630813d8e3cf4c8bc76acc620781568dbf2eb12469dcd9d3d0b19
 DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
@@ -184,16 +211,20 @@ DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a7783
 DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
 DIST object-0.23.0.crate 203889 BLAKE2B 41dd20ad5b43b026d032b50360bcb1efff7aab471342da1ab787d820722f4374fef8df48eae722016893618f0e1af3014e42c56a57ea8792594b5fee676a4d6b SHA512 6352624a9071bef53e4b7209b3f8cd5168d54174962565d76f8eb9201dc84dc3b26f08c81ac954bc9d4c55032a022abb35d160817bb434ef27f76949290bc7ef
 DIST object-0.25.3.crate 230711 BLAKE2B aee91423c1e5da1c2221c6fc2048b1764fcced2853e7e2f3d9ce4b86b13fceb4f5f909ffb03981c1131b79fadc1bc7fc5756c7ebecfd4a9af0b4b4442446e378 SHA512 33e6394962a7b566554e4aeb71826e344646a41601ef9e28875582d4fd5b64ac6eb6a99944273dda0d5d2e1401c3ed4be299b3bc7e446cec2638cbd82535dd01
+DIST object-0.26.0.crate 237724 BLAKE2B ef550309ed83a55325778d13d84bae1d75fed882b840cbae9780a941a0c3596b58693365933cfeb757a1cdf585d394566cf92e0c9d43418555c30bcc9fd36ba8 SHA512 a050755beb401e56538c7f1acc264b0526b7052fb6325824cba64b7708e5bbeb882651d2f41b44ea589deb8e21c374b39428280c44deac91da83d7834b8fc345
 DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
 DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
+DIST openssl-probe-0.1.4.crate 7066 BLAKE2B 656434ec1d34466e903e5c69289a277d14623aa7bd8a7c19bea974c7de57fcec9b2b4ed212f37d7f7b90fbf02a486a8ac7f7c318cfb3b3930e54e276103154b9 SHA512 c5d4ffcc6faf009b38dc715ec85fd75b3e3b0c0293041ea26071bb6d19d8d018a43ec166bf79ef1c7a126cf783bd4a7121d5dfcbed36db5ebf0fe4decb198f17
 DIST owo-colors-1.3.0.crate 19173 BLAKE2B 5124273cf2f7ae66191fb44890f5f7b2c6562ddf7d3db61599c0a746a86895239d65259b348c6f3b2af4ad205f73bcd3fed2f83f99c4ff8ab3166f58a34ca404 SHA512 26dc9063eea829d13e9222170ca81d4cb5003582845c55d5ec106b48bd355cb629cfa9743c7103cbd3793f2d321927ce4264ca2210fe4a3d16671dfa30d6b911
 DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
 DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d53566005775a3c440c6a2890efb189a4edfe8e99f6499cac36038846628a915ac988c15e1ebab1b3a3ffb53a64631dc19 SHA512 1dba5a7e68ee007918fb210ff308f7382ed1c54d2fe6db36a8246453434246b71e6795db107c83ca39c2bddf5e4a27da7978a464b53d41e150e744d81e75b341
 DIST parse-display-0.4.1.crate 4718 BLAKE2B a39bd113e2dd77e30cb3d11fb8bd1ff455f7a724a8e848a0958ec2007b80f20883c99ef8bb3e739e0ac7ac7b8b93f756f63b03f8f97ac4cb35fc8d707d853877 SHA512 d18e7ce7e21867e889c99a6cd81fab8d7abd42af62a1d6efeaeb10820e7c640eab3c069a0644e285c4bf5c73695627822dbb532c50b40ebcc3d93df58f45cce4
 DIST parse-display-0.5.0.crate 4828 BLAKE2B c673284e8fc9538b42cbe7b4a332451876bfa3acf977125752026e823f432fa00edb0ff6357d891c05f3b80aae4a0ad39dab816fca6cb47b8d25c823e5350599 SHA512 8ea2942e7b091110e9fad6513114d9feb2e0b1194898546e62fb6a0a2fa24a22f7a29a24789b3c90300d21a2cc83ff2d74486a785a1af500fcf52ce4c2e4542a
+DIST parse-display-0.5.1.crate 4833 BLAKE2B 6f3de1639b3cfd7e6333b9edf5bcbe69c5f5c650b5febd34c451b9593382c9cfea7db0fb8768e03e6a70888bb0b9671b7c8785e41c36e80a78df53f491d773a9 SHA512 b802223a104b9c2b60acb125288b971381b76d103f1ea49f99aee47de3be10ebd484117b670c0301724e2cdd62ad040fda6fbf43b388a26937a5f48ac610a757
 DIST parse-display-derive-0.4.1.crate 15394 BLAKE2B 66f2fae5751296f38ae08c30546bb5eb83b2bf1dd5a35ad32c3223a8c4d238900de43d59c163bd0e2fbe466e7264215e6f3fdcbb8755c3994cc87ed4876c7fb7 SHA512 863832ffff653279fdfd03d918ab7d3410713aad69b5eafa6a130905b17fac9c14275a1f95b41ca0fee24d40162938d8215a1c7262437e226a32b9115c04752f
 DIST parse-display-derive-0.5.0.crate 14731 BLAKE2B d8f4d7a28b0fbdc5fc6fa725f03643a6a8077c5b5c0ee68ddd72b81fe651a3c9e8e1f0c221c6d419e8fc94a5d42b8fb28ea9b4dd5fb3e7c5cfba74f99781f46d SHA512 4d34579811e1adf0d9316cd1ebc64b2adf4fc3f2a3553bb0b8385c19b50693b2e12568d22b288beca3947e74a3d17775e325be700d29338be88ba7b55ba3236a
+DIST parse-display-derive-0.5.1.crate 14792 BLAKE2B 0b5d5c021dc6020a3ee723018c426690f1cd337ad120c170016cf4310b4c7a0271bfac539c80af475c238fbafe88734131418a5304093f4a58f27221afc6d970 SHA512 57a7e03a3fe66f4851c0351604ef265ad9291da560fece4a863d0871335449ec1476176269932a97e1085d3a5e8b9079ecc51d4930e9e6b288aecf5fb79568a4
 DIST pem-0.8.3.crate 9395 BLAKE2B 7d4cf8a8b3e55ca8fe39bc65c6616c5ea0f91bda666493688d98e06ea9fc3c83d0b0a1a10b4c5deff685efe2f9858f63fab765b82a1c79d1d5412a5e6a706dc1 SHA512 30421492b14ca94ad8bf7e3d80315f2cbc129fac18655f33e2866e4de20201f9b3e9109c273c5bcd7b45ecc0ccdb8f7e6d8ead07278890d1a043688752f572cb
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST peresil-0.3.0.crate 13573 BLAKE2B 6a5af428257c66db670a78bebf22b667b68633fd17e883ba288e089663a80c594dfe3e4b55043af3070deda8d1643e724743f5e840f7c7b7d0fa26409e00d589 SHA512 874580a62add05677f2573b7668612caee7e1653ae6263652fd495e5c871b8e71c66e20938a12348cb63450b3c88fbbe49d67b71868a8f970d82d94bd4425961
@@ -201,9 +232,12 @@ DIST php-literal-parser-0.2.10.crate 16905 BLAKE2B 1e7ceecddaf8b2e058347e2013960
 DIST php-literal-parser-0.2.8.crate 16897 BLAKE2B 525f5d911fe7b1f7865883f3a07eb6f9fe4f6079422ece1bedc18c9533e10967ebe2c410c92f02b530c8450c3db588f611597577a332579cd31cd969179d907a SHA512 50ffd31858b936fb47b53e4220cf77df27f1c474ca5b0a5ab8cb3f17244c18653d8c156b92704bfe3afe6e28d34858e9235a4409dee2f1cc5162484eeefd5f06
 DIST pin-project-1.0.6.crate 53802 BLAKE2B 035ebb53abe0106994b7044973a2473c62a0d80693c47ba0d9d2f34d698ddfc838e52408093691d17070ad049a20c64c0828c53d7125b411514f1c48820b1b9d SHA512 3fc5d85e1c48d4b4df305e5f93266881a8f16835dab135e298ae9d0203fd2de0fb4cdce1c9df29243ed9e03fdc62eae8e553aacabb324a19237039093f9939a8
 DIST pin-project-1.0.7.crate 54847 BLAKE2B d902d2bd9008ffb0f254adbf0fff3c55614abec67db5a5814707f00ce50690e47890c2ab89ac488e12661c59db7692502eb7003cffafb4a57a66959a01f139b4 SHA512 e3903b508abb9a1412d8fe31f04d01c2bf634c770b1d6f697da1ec4eaee023ed95d5488e1fb4f3aca62afe145b52730c40781eb6d52deb55d5f9820503a92f86
+DIST pin-project-1.0.8.crate 54991 BLAKE2B 27ee86530b313e3514950e5f072367875fff4961e0f3ff635acaa3be08e0cf1b60aa96ff782651e25d1aee9abb4351262fad02ce5f90972a5188ca1b8ba30fe8 SHA512 7a838ad361025b22cfd6ef0ae600b100e673b537d499ce8cde9728520eaec11a68edc8c65e3a1532ffe8cc1efad1d7aac7d8e9f82372cc5a18a3deaeea189dbe
 DIST pin-project-internal-1.0.6.crate 27304 BLAKE2B e89393f4c23f91e070ac984ae7e19d44451f39cd34a6d2550cc7c5bd42b04db6189eed9b6b10fd1f21311aa922e5a1b312b44922368753ee656b8ea8c6edc7d5 SHA512 754216e5151742c6f957bc8171128af70ac6fca5f2a5fff2b0c3e2f7171113c19fe12740f9f711b83e012687df575e9924dc68e2979cef844597fd7cdb71807d
 DIST pin-project-internal-1.0.7.crate 27884 BLAKE2B 52ef94e6c2fb44ee36d7d5bcda09fe65dc69386f6df6e4573674c6e796ce506ba672c1421603ca7501a7b3747f7277cd8f4e9c121e4068d5e857232de08cb1be SHA512 14d96d6cc73c7b86151f206383d24e1c7d79d70f586ff59f1bc47fccf271bef4a0561eecf86f7b03cd14520040f80ec00c266df79b2eeb04506582d80cd2ef97
+DIST pin-project-internal-1.0.8.crate 27941 BLAKE2B 74992114d7d582282a92334d2b88f6c50083dcefc1bd62f5cfc588d5255ecbbdd8a2764a4d877051af0258ff9ae37d503e021d27f2a35ca497bfc11a12317ae4 SHA512 9bd11fbb60e3cb99d81eee590b4672d2c2616825e5aa99e01c6b310e5c6651b9e7f6097db0975542746ddf4c455f090f450ec7a588dad4031bb5d09dd91d11cd
 DIST pin-project-lite-0.2.6.crate 25494 BLAKE2B 851a8388c3837d8516d98b561a3ae95b584e7b0e56cb04a300b45e5a97b4c81bde991a9625f42a596244f3f8638c26d6ddf46cdc7697aa24c823e991d0c107db SHA512 21b298896a10c2b21e481f5769a9ce557ec376819681599699f0881769d2dd378bd0bfdf7c43cc16eb521c48c67207e63373622fff84ff26da88703a57461461
+DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
@@ -213,6 +247,7 @@ DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffc
 DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
 DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
 DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
+DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST radium-0.5.3.crate 7588 BLAKE2B ce39c4472bfa731745a0b78179e00b83116d729326d7a25dc629278949095ecc24a1eb13d4d39981e95536cad3f3fe2ac77ef9da27b8d462ed720bfc7624fbc5 SHA512 f4af86cddec991b11d86b1d976e212bb19da8d7e5ae1d40ee812391c21d3fc855bdb2770395baf7efcfdb5b2029a99c9038702a28f8c9e925e1b23f03c0e717a
@@ -231,6 +266,7 @@ DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350
 DIST redis-0.20.0.crate 127312 BLAKE2B 232d44e7aea6f519c235daadb3c14222f295997ad177fad33a3f2f7a162ac32e399cc6decad110278c9b23ecc8932f8d645454b203c4866e601127a84adacc2a SHA512 4a9c482807ea4b9fcb27aa2140691a56bff4ea19b1086c5216b8c83a92867c4d08eaacf01ecf8a873db9627495965bcf1930daf9a87c7cd4c1733e424cc7bda7
 DIST redis-0.20.1.crate 127662 BLAKE2B 9ecec782226469806c78ebc2f0d8457658a375e4d4bf78837ed69e6549cff53eacc7dcf18ebc2aeaea5ddf7f1465658a3b400bad716e4a206768bc6eb3a3175d SHA512 f88e6b4fc13218889f26dc9cb852a2b3a900574be422135f25ddfaf1de7c0381769c8e608dc1a382ab71aa18d449bc4a0178497e4ca829c4a5e79cea46892ebc
 DIST redis-0.20.2.crate 128100 BLAKE2B 6ea1a748881a7741596f507601aa5e0b0b990a2a174f188b7172d12681c5f9f2cbb3119177949947586c3f61a6454edce9589ef344e1033e3d6addcf26919e28 SHA512 8e0f949c97aecf7341ef32cef95ee355e1455724a2159cc1706ef2838e3e1e0dcd485c6935de4ffad877d52fffaf664b1aee8727837e3bff8fbb7f627fc0267f
+DIST redis-0.21.0.crate 129225 BLAKE2B 7d6dc367a0e97979ef1c0b851a73b706f1d5571010d4b30a81f84ed64986271a5cf0ff70c9f11cd6da48c4813f2c8a1553c348d5aecc36593ac86e5f963cf62d SHA512 99121a22a0053eda197bc26042bfc157c0ea3551a58854a915772890b0d6f4e5a85689bfbb4dc8abe312c279a76d809e0674f9a8e1cfe2f3a9e789de46d88ce2
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
 DIST redox_syscall-0.2.8.crate 23697 BLAKE2B 5a084a48e06ab0dc69f64b05058b78d994040da6c42f04c8b615b1977fa3e813cd5a531ab33402402914362301670709679aaaa321e8904424c38d35c284b7ec SHA512 250556a7683254c9daf22887b39abb010eb9d4fe08b944e52bc6595ef6d8acfed76e5f43931fe20c84bdb3743772fb62a0be154ecfb6e66c2facb4c73546eacf
 DIST redox_syscall-0.2.9.crate 23533 BLAKE2B edff38a41e57f40f9285d43deaacea32d518f5d87382d535b0349f123569613d50e7b45a70e4013f35632485951967a5157146593811102f3c0a7d9177f07fed SHA512 4f3c9dcb925c57253fa27f6355482d4f984fe31c4f562f2cd22e953c6f1f475e0687003e495167f400f77d2594ffb9a69548454db8086da5913c00643ecd337f
@@ -250,16 +286,21 @@ DIST rfc7239-0.1.0.crate 3636 BLAKE2B 9699ddd7546892d819ea3c4076d209951ed3d1f123
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
 DIST rsa-0.3.0.crate 40124 BLAKE2B 679de1ee93ce654c5ab442f1d8c12f91ecdfe3ee5e39ee2e31980acd333ef47f32feed30ab8dd1acadc1d88d9bcb24a6da872144394873be718201939d90fc48 SHA512 04c58f7d07babf108b7c30df94de359c413c26d1e9f044aa4782e58e4278fa2b448dd659820235f857f68e7ad428fa4fc90d69f549105b56ffa71d924b6b6a01
 DIST rsa-0.4.0.crate 44231 BLAKE2B b363e6758ecf4711fbaf72af296455af7c21c1a75b7358d9ddd07b7b9760b28b778f595261b17ed213933a2b5a6c3564e3e7af15b1d085d5ddde79984345f74a SHA512 c5640485011f1c77cee127c5123d402b6948cb000b30c9138e9e6faf7d9d372341fd255f42a53f6546585e2e40a1ff4f73fb09e6b85248ea064bff726ca1adca
+DIST rsa-0.4.1.crate 45830 BLAKE2B 2dc876f67ca2cdb16e1b83c0b1cdc3816d32637b4f71fbdc8ec1817130a2120886e4a7784fca5b0bcb0c9fccd4d5c34b5c1331ae7b0a062ec7461318240eb834 SHA512 c16c0ddc64698d32990757fe5986116e1857d18b447a7618d8324427f606b2add667476bb64a2d4183ddb1d97635bdac96d0b0c0385b331eaaf2be7229ee05fc
 DIST rustc-demangle-0.1.18.crate 19913 BLAKE2B fd0b955e9f552d5a3759dec05bf5f971d151efdb8098b0b3fba0ac80f0034c4891c575ba1247b04d1271fbfc8a1585f4a65200ff3836946aecae1cd653c7a1e3 SHA512 93ebaf7630c99b6c83712452aca26a42d9a173aad8ba7e85954f65e7867486519013aae1afb0006a0507fc3d6a4688df783ca091779bc0f316c5b8c4be95b793
 DIST rustc-demangle-0.1.19.crate 20667 BLAKE2B 060b68f4d9f66badc33cae692a5ac3e76f9d8605dd9d729eedee1882026465ddb42f88e3770bfacf644176fa2e02eb3450f9f987cb4fe7db6607266a9db46afb SHA512 ac43c87f4ef0015923114160be64649f07ab82eb6b63538e7e6307ed35681c3232d05f75e37ffc6db9de7d5ea56e7ff3be3685533f2a8848f2a1336f8d7a55b7
 DIST rustc-demangle-0.1.20.crate 23298 BLAKE2B 74479b2724130d67a934176be4b667b9db38603bc093ac547ddcaa9263dedd6e52a5ee690349d75519c173e74a098a20dee234c8fbe14b003cc77109a0efa16b SHA512 edb31174340fc3956eb225c2175a9e8868a8b70f30991531bdbdde77e5924e7a778a7a5ef44ebaca776def262c9045d82c046a83e0ba407431744e1259add001
 DIST rustls-0.19.0.crate 208339 BLAKE2B 55f627e2cd497d8fec205c3e5419804db23eea1b216aac606a136d4a53dd81fbcba8eb00a28c52f785cadcc3fe61dff839eb306828d0a924e3580c10d536515e SHA512 4c06462a67c5f6e5593fb1e747bdb2e35222e3b5512996051ee933e0cbfd3c376e30cc4bc692330b8678e286042240d096f9ec60fc484194c8fbeb9b48a8d886
 DIST rustls-0.19.1.crate 208143 BLAKE2B 2ec02f40bac911d85db013cd99fc859fc4815f98114abe7041cee61bc106e83334378711d0acda916d9cb72a78f8d1a7237bd5d0a51ceb928d98bbe75cab93f6 SHA512 c86b0809f7cb2b31cf9c87d7744334ea3a0c743e26303026ab48194435289b1face6a7009aa4971f719cf31d7f84bb0e56e923cfd326ce0bc4ed990b8c9aeab9
+DIST rustls-native-certs-0.5.0.crate 18482 BLAKE2B 3bb991c7608afd7f06cc1ca2fb3a2f76b0f29224ef85557050f465eebd0cac90e286cea068208f8ea69692f8e803e89e9cda7b51bd23cb3da2287cdad215f3b7 SHA512 55ec5d034a4ca3fbff5255fdffd79c0abbcc9f767dffa18d48fd667c262f60dd67cd48c8aa8f1738e580a07e9a6bcb3375479b072d1e18ce6aaf8da32071ee41
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
+DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
 DIST scoped-tls-1.0.0.crate 9146 BLAKE2B e6cecc543760a293b9ba4e71bf0d12f3360782795bc9d0f0bb054614a1c393f081b6178e98708b896037f5b8edcf371b727e7eb80f62bca24fe09a1903456729 SHA512 f09dd404bb45349ef444e7274a2aabfeaeda7c3c9f964bf5c52c39984c137f63bdf9fb3e33df8e312e52872f7721de25951a7f3b8333a670626c51afd36d314c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST sct-0.6.1.crate 26825 BLAKE2B 162c72a8e370237f846125de358f773560d94acae2675bfbd07719ed761c112cde04e2f59e13378fce33b725becb094775c76bc04baea2abc34dc25493e86d7c SHA512 78d17cc8af85c386fc37fa24e71ce7744ef214cb77516633098466da0ed02df67402c981a4cfc2808f4a51224f82e2600afe4449446e3d483cae240f703423f2
+DIST security-framework-2.3.1.crate 61581 BLAKE2B cd6baf84a2d93261050e6f4d292fa32b9c1a9f4b397e209f03277dfa9186e031fd641091406f65acad1046a57bc34b66d95f2021456c7dc6321292087b776728 SHA512 732a575f36d1bccefa71ad051e07b636e683a53fc4e78517cf6c7a60cc819492e8a430893b592cffd5383f6cdbdee496722cd5fe274cc7726d668ed1a8d36238
+DIST security-framework-sys-2.3.0.crate 12561 BLAKE2B 32e385f88bd467795649b68edc18fe498f607095c46831bbbbacf9838daf3b92d773cbd4ca851d269d1afe5e22671a0900234835a679edb013e5afd6b6197022 SHA512 1d7271bf6332acad5e6db7f48047f40133e9923a471ca9236102809dd50efd5a525eba49ed4f0792c0c7e33c3fecb3ee49d79f90bdc6ee889bd7828140755c6d
 DIST semver-0.10.0.crate 20503 BLAKE2B b27e780828e383a0baa0edf99d36952a847b10ffe174c22d2680ecf5f723354e0ff5253974b07981a6266cd74d373d1993eeb145ce795201bd8e43dd0e15299b SHA512 75e39076a551cd1f4e7c011e79ac762258b7995bb021298cf2fbc7b3bc9e6715ca3c5165429834738f1cfb5ea9fa3daf173ebe1e9e0f04135845c89675c89ad4
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
@@ -267,9 +308,11 @@ DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a4
 DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
 DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
 DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
+DIST serde_json-1.0.66.crate 115121 BLAKE2B c46c65339ff79138649df206f2ec759945c31ac11bac4807a8d1e76095c1937211b0b4ebf88c69d2d22cbd90ba25643a74cafeb291e815ddeb5c5ca208eec9e6 SHA512 8cbb64a24781a94e9448dd39f9429830fff6fe61be3772c1ca825f7d489ac3c06b189c42730129e281d8f43f7128b3b9cd2308727e625763588bbaf61b54d1d1
 DIST serde_urlencoded-0.7.0.crate 12489 BLAKE2B ef64d92d79b80521ffe90f18534d0a0f20834e692c708e3126d3486b1585aa228e3140be81984256f0adc71c764d5c2bb66b755b9475eebefcff67c952d42372 SHA512 2e49d1113a863a45235e4c5df3de1221398091c33b9eb5a806ea496902090f82d6dcf4f478f897ea54eea44f553fc20aeb2c1c124b81806b0704dd33d5650a13
 DIST sha-1-0.9.4.crate 13724 BLAKE2B 5b573e563832269c2962a7188df7e6b52916535bee2ac51ea60ca7b54966a43b32740cd4611dce94cae177e464cecc0acca5652ec68cf0f0ee27d148ffeff751 SHA512 f815f6a8f046cd51b33c0d91c7fe36997490e9ebf6e0c1fdf58efec18560d3aec665b4edaa9d2b702b2aab4667ac17891c620d17d24f8e26657d825ddef24ff4
 DIST sha-1-0.9.6.crate 13758 BLAKE2B 8199c2cbdab2954edd44aae6bee8fdbaa883f27993722845179aa2117849c5ea86df08ef58da514d0bb78612381977f9d101928a764a62b8b14ac04e86e83d6b SHA512 10a37e30b0c65cdb64a49e14185faf7d0bb776910f87c5dff128674762b4375aa1f9f2bf90b38ef37c521ad365d3a2f02c0e33157593fac15fecf9b33a5fa9fc
+DIST sha-1-0.9.7.crate 13999 BLAKE2B 4fe76727ecb3edc5a177e2ab10269f03d39dad76c073f34d647ca33ef0c4b3c5d458db6145f41c7224ae1fbc81e0e33696c5af5103908b76dbf697517415f63a SHA512 d592f7ffa58dbc5aba3a5d6ac96aa27be01e0d54ae63ffb339bb17689f0023819044713b7cf386396fe71555a3da603a4419b36b6594629bd7e43f70d92a67f5
 DIST sha1-0.6.0.crate 9244 BLAKE2B d992f1803fc17f8f8081ccbafd07ebb9d78056a705444b45dd51b2f57cbdaaf071685b8e6ad9f4fa21e032cc78b4305c8101b079594c7bf6e67894bb798b16b3 SHA512 32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c
 DIST sha2-0.9.3.crate 19649 BLAKE2B b4a778aa9b5f2e66d5f72679f25c8d270d101229b1d815af4923ea6598e395edcea9ee3c14746eda83e5edd1e790bdde672cee7e1fe57537856948b87a4063a4 SHA512 95c6c30b73bd3ee712b29be6ebb66f6fdf5256f37a6345e9412db74bc294260d6edf2ff0c21ac768e7cf0fb100f45f23489138e8ec1d4ca6f695028ac42806a5
 DIST sha2-0.9.5.crate 19912 BLAKE2B f2afa14bce588a73477672f439a397be38445932f921edfb35934b15bac634a1ccb5da49597fa22361d09ab3968f79cb53f747ea155f382036bc78ce650fc52f SHA512 c4149abf96d9ba5bf18a29c45dbc0e7d44bb5eadbed26fe2915a7e3b9f253381d090d880a96e9d79eb6399bfdd9d27550961ae07a96d1cf8070ad77d09a1fe52
@@ -278,11 +321,13 @@ DIST signal-hook-registry-1.3.0.crate 17786 BLAKE2B fbd4284bc1020145b92557a99628
 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
 DIST simple_asn1-0.4.1.crate 15752 BLAKE2B 99694bf4598b2039b69058a4fed0d790e4e22ec0ca82920d202bdd1405eca0d6cef6ab660ee0d48c68466f4583c3926ba20171b8c34012df52a041df2a1630af SHA512 37211608915e6ab2408ea91fa937f93962b621bb89c1eada6a06485fbe83cfc930a116464729878f42610ad4d9d21bb1494916f71290257ddc88441317bd0ffe
 DIST simple_asn1-0.5.3.crate 15662 BLAKE2B 9431d340bc4fa5ca8caaae0e690c836a6b149e40208955691fe5730021d82aef553377ecf10a50b4601a9abe9228e81b63dad518f57422643fed4fc7d97d9ce8 SHA512 bd2486a8e85f5def5aaf726c7ecb7fee69b3ec57f23fd032645763be6af27e08f05abcc75cc931e4f70b80c0478aa55fddb0e82897687c422aee9c9e892190aa
+DIST simple_asn1-0.5.4.crate 15679 BLAKE2B f6327d37d2975b2b622b53278d287b037f4e3cb075083cac0c6e3a00364903b619c1bfed82bb6450e473c3219425111d4cb916513aacb6d13260480ac6d2c5a7 SHA512 877ae5e2c2d501f2169e353bc59b85e5709613079c4a9a54a288b8617d75123b03306352631c8d04f72d3d2d23f3fc5db3de01a086f57646a243efa6dcfe37ef
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST slab-0.4.3.crate 15681 BLAKE2B d7e3eb0374de081d1870d2b46c9137e5ec75950a8fec217e3b120e455fe847e9245884990fbff4d01d512ea297c2012cb1a64f9b169264168081f5f7d6b20b39 SHA512 8649f32f26c1354b3281534fa0e062a145b62813c46f9ff5989ae688154221b00ed1b8c044c67a4b78c00a2e3478a8eb9c1c96fb424c24cd6cefd4df875fbb15
 DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
 DIST socket2-0.3.19.crate 33782 BLAKE2B 1ab3c61a439c1594e19c4a14958d0a85b54666532d16eaa9a1e40e586b7707b1c7b5a751fb373f16bcc26510abc25e0321808e721c0b33b7b04416b9f6cbc5bb SHA512 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
 DIST socket2-0.4.0.crate 37949 BLAKE2B 10cad25fc39a2141913c82eb1d33c14cc7cf54ef7323c0031558aac89b1045f7433a81a8bba83f21523a3ed0ec793189d6333ed19ad06cfc1b70c28d730aa9a6 SHA512 7731bf377bc2f6f06b95d563452bdf1405aafebabc9211f4bd3a13847cc154ae9cff0951130e630fad9f7a53eadd30dfb92b918ae239d7cdec57c327f2cc464d
+DIST socket2-0.4.1.crate 41364 BLAKE2B 6b1ab3dc342a30467a9579a2dea338e3f5e2a73745f68cd65ee4f34cec390ad67794d2e32d21b01675ed6ce2136c8faa07ea7b8e262a5848cc9b1320e1e53a2b SHA512 71eb3e8d15cf4e88f801d740230710b5b52ff1434526c0e61e950168979ee715dd8acec217d1a5d6f50fa49536558ef94115902f936302d81737eb163db4b8c4
 DIST source-span-2.2.0.crate 109700 BLAKE2B 0c4f68e0143caa2eb68e8085cdca7ded5efbe14876f8ef3d10ebe72efae804e7998414d3fdfb709ac244283182d9dc4b51042dc787a89b67cad51071933fd9ca SHA512 e0717a6d7c6bd05b8c7eb751da69fc429b6258b502fb9ec974f4c3485c890d233c4b88e45f2164afd8951296608c8fca631f863c581cbf1799bc95777c93aa98
 DIST source-span-2.2.1.crate 107624 BLAKE2B d740bdbafb1de0f8e09fec18ac91ff4c8bd2c2d249c8da49f3671ebf51ba4ae497d640c9a673f819ac0dd6f9b87224bfae186af9ad8e7b3ad225d5a7f686a521 SHA512 279032eeac106d72d01a77c5e73fde2ec61da535e60b8b44bc94397ab90287c721c52b7f600f4c383997a4b09827f704427e12cdeb7190dae234557d259e0873
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
@@ -301,35 +346,47 @@ DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d
 DIST structmeta-0.1.3.crate 8727 BLAKE2B 3c958b96ddfc4b38546038ca639952ea79091043ddeced9109c391f375da61a6172beaa16f30899dc3341d079027758205ae7f19a69ecc8c82b29e871dbfb754 SHA512 96e8fe90ae225d544ae330f478fb66b4a524b330ffbdd9dc7b51efc47f089a53e4b74b06abf83f772c70139b58bd58e754ae8ae5d585e3190d8fdb059a014830
 DIST structmeta-derive-0.1.3.crate 11349 BLAKE2B 6459889983d10a4741faf681f1743a4f339bcd5acc07b3ac56efb874e264a6abaf03bb297b9c52bd9fb11b64fdd3c2f204c761526b060d40622f1ab3e4731d74 SHA512 ac60249f22292379dacb70b5e870690ba97de78a14e4089e4af555cdc6ea25f52ef49bbe14d1f54cbf42dc5d3190cc4a66def590d4d9d9b0300ffcc5aedaeae0
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
+DIST structopt-0.3.22.crate 51665 BLAKE2B 310597cd82596b8a63501d122b20d845d5f9bdef0f3babcc53e9e6f93f9cc11f2aa4702bf2c20cb0b2105b4cda4ca0dcaf79c67454261424c3e5d90da4261a48 SHA512 fcd37107dc6cff85e30345c816ec6ef9bca57f05e9b67d8dce196a94fa18d79d33e953036b394521e76534fd5cc9e4fbbe14588d7cd4ccb01076f4c8ae8f5739
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
+DIST structopt-derive-0.4.15.crate 20861 BLAKE2B 3c97e31f8f3c549af548a3c75eef06b50039e513171251162af08eb7a70d900e0fc533d5bc711fed489252e5102e5245d343197eb03161c2d03e4464c6319fed SHA512 a241cd02ee91195548759e6143f4c08eac70466d6e13fc5af59a09c15dec27816cfb766c7f2024d4a678a1a1fc8fe5d78b858b3ac0f53fda914ec9ec1d8abc8d
 DIST subtle-2.4.0.crate 12411 BLAKE2B 32968997d71c6eab4bf2736090469afdb1adab3d2064afd1ab34a2711294bed1f00a715c2c748b25412ef9732c96bd132e20384019ca6bcc0a01ab602ec24117 SHA512 ffa173d6678879c382d9165ed8ac4480bfda2f03a451ff120767d90b2fa17ecaf234af15c2d153be0d96c8363de82f0be1fffb7770f3bd417e2567d146b61c86
+DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
 DIST sxd-document-0.3.2.crate 42711 BLAKE2B a02dee2c0c7fd41410fbf329dca47b85efbd605372245e18172192840626317229718e790b084cc87f9abfe124835abc6f48a1f1945e451d83130b0ddcf4c94a SHA512 8c2c70e978bbb5ac77c11f0c8a21259bb41aeba40f76ec31772a173b5a898092eebf951c855b8f068516c8caeeb2ebd5b6d4799b0cb3ede10d8001f36631936c
 DIST sxd-xpath-0.4.2.crate 45058 BLAKE2B 93890044d12b545ba3a76ff4bcbeb20bbb56b3627efa4d127e955c1e2c6b2654820d6151b3b94f4369fe87dbe46003766b95f438cc650575a6496fefa97efdef SHA512 81ff0329b6a3057cbd4db3234c12e91c8aded671588588b6a8e9897801a591877e7663d40414c0e61519fffa83f39e4fe8c1a2c5408fe6dae1a841a48dd462ab
 DIST syn-1.0.69.crate 231954 BLAKE2B 1dde7e78cdbf5c5b93d0196e008dd4e92e4367f8e88395d6157b92a58cd9317dbb6e47caf2d570a5a9fb6b4fdd4fdea5e414eb9b04e054ec4e4dde8bb9f36a96 SHA512 6934423e48f8d6b1e403fe5e4bb2e180f472f125f4337b7d9889788c16cf11d79d1673ed06178604279e0b8a04bd80f7efba187cc8fa44c535457eb1b4f51c20
 DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
+DIST syn-1.0.74.crate 232974 BLAKE2B fc17dc2645fbe2d1ee409f895732b86cb77dc14837d35d7773e7f9f055e0b56f70be86203f13c549f0b43e1e4e1e777cc5bee2f08a733fe447f907dfaa443da7 SHA512 5aae03a68a4a8c1234d4e9a69cd37b9f6c698e2b635f10a030c0fac22cf00414c2a5e7523e0efe43181bc29c17abe6abc0eab103391259c97ce566713e3349f6
 DIST synstructure-0.12.4.crate 18105 BLAKE2B 8e7efdfa8681da8473903aa22e8cc55abcede012b29a91d65076042c89a21048b44b774ca5c3f788222dd32fa634ac20f58ce241eff610498cac19f659280d29 SHA512 ab3024644719c4afc9c06a4d3c499fd4934c104409d38197a46d62c9ce30414f88b3e7bcdd7f245cfd207489fb54ba41e5cfc1db94b0dd12fb01e9c00c861c47
+DIST synstructure-0.12.5.crate 18020 BLAKE2B a3ed7e10e13e096df7b624f567de3406b043db4ee7bad6f25d8aa093af4e9f3bbb39e22bb46fb1b5c7c5c31cb65218c79d959eddec8ba32959ee66f422732a1e SHA512 62d5669459a444ff91bcd630ff58fbbbb70cf1a2240c7caf1c4020c1aa8f9010d952172470e41daed75fb3cfe154761ac56675b9ca7a754bc9aa484c3152560b
 DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST termion-1.5.6.crate 22677 BLAKE2B b918dc82bfa370bb9662bace34211bc7afa03a042dbd25f4456a7e3859521d4f32ab755780e58070f29eb7903f3b4f8129eb9447cda953b9190f9df3b7eb3aea SHA512 228b6fa7e2f280d6bfc7cef77e7a1d0d8f597178e66af0bde1b1fb6553857b511ba8a6786165815aac6d8a082fd37191f4ea35a47f1e1182f7f2c6086eb34a8c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
 DIST thiserror-1.0.25.crate 16690 BLAKE2B a03107d70186d46870050ef86cb1f49aa99d91e509bd9ab22ee6cbac28d37176b2bafbadedc237a25d233abf7816cb3d85d88c140f172ede40d309ddaa1223dc SHA512 f408c2722060c6f707b9afcc1d9f3cb175bcf955263c4e643ef7ee935fd68299af835f4ad489ace814a7bcad6dc428eec5df2858453834d0b6154d22a38ba1da
+DIST thiserror-1.0.26.crate 16711 BLAKE2B 4524c3ef351eaa1266cbbbafec6082695d5c1485cec7bcfdffd64719fd57efb4e40f119435eae5c6f574a80f59a68bd8c868e2493ddf36f4882e7de65fd4bf93 SHA512 bfe93a14006a3d9e0e996b310718223f8442802a384a1b999c15dd1a25f642c5cb2db7a50a69cbb097ec50ee3b0129b509f19225ca714a5c459d4dfc8255d84b
 DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
 DIST thiserror-impl-1.0.25.crate 13364 BLAKE2B 9b0eb7a6fd5f290d7a666de6065edc210ab9ef35960c424258d5039f24433baef7d1228ac2e962e8ef9dcb673979c9d3c09ef3f3d20533fe2ad1500bfcb20015 SHA512 a2d2f39d3c1e5a722d7020672f63fc312dd9f8ed73863971814f1fd12faac4ea5d8546e06b26838d8224b1f91161011f51dda476848b2555153203ee9f7ee3ca
+DIST thiserror-impl-1.0.26.crate 13431 BLAKE2B dc753a4cc1e7b8b3eb44bd9462b6b19ee983fefbfe1f60a974195a536fdbc68395942a229a1d2ec7a8594669a439a6efd3cd22573a647a7fb7a371e793fba645 SHA512 43eea818b72469bc4d5c28e449c2e284c1e11b2674b9e67b1788af7ab66bd64afabfd8f5861938a7f9547a9c13387e0ce400419c6283bbe1e899d18d998cd921
 DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
+DIST tinyvec-1.3.1.crate 42386 BLAKE2B 9fa7dc7c4967bc3ba3f7e5fbef54a7b6fca46f6520aed2482d355b1f6434ac702e073df19034908f214e5c0ffaaa3bdb41c7d394d9f828dbeaa177158ee99ad2 SHA512 ad07998e9bacccf8ce2bcb01fea8008c6514ad73c15c6426453cfdbb432dac7d588d05551b179c83ca062ea02f0853e97e2b9712da0b8dc20ddab4c0efd5afd2
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST tokio-1.4.0.crate 439130 BLAKE2B 78b9c6e3551c378c1603d8fc8eb2725d73c47ca37f118b77cb38de555a0b18c41e7ad0c627f9199c214c412ec3f20ac40a88e10b1874efae28a022f03ac11439 SHA512 5a5016482ac681c7bea248372eb013b2cd863530aba28065df0b9c3f604aa6b5f71230c39484feb2cf15207dd8a99d41ef81fd31f1286fa0b973aee9226fa923
 DIST tokio-1.7.0.crate 475601 BLAKE2B 4c13f99f360d7be15bf744088614665261bc051aea8aa5f8e83b6133391c8ba86a23a9c9d9e74d33c586366eab2fa329610f736efe7ed2440bb9d56672b89f5d SHA512 7dbc17b4ebf0a9b3e1d9c65ab9d1d77ab3939dcd3e816d8d04c672b1d455004443aed965d2546aed318110f2df095a2095ec8390949975f1274c3df286090718
 DIST tokio-1.7.1.crate 476257 BLAKE2B 0f23c19d552cc761040c53845ed51e153fad1b6eb8baf5dcada867135ba864ed6eee2c99c08fd4e3fefeb1ad0da03ff40956b460cd7881e0a8b93270fa846f98 SHA512 3d27470f5a8f93ff4de4804ac9da69063bc946e8b8321a12726ece1bba25bd56ce605a4d824015ee2fd7f41b979d82e996725168b1c0972596647671226831d1
+DIST tokio-1.9.0.crate 499709 BLAKE2B 8c6421cfb8ab00610c7b7cddc23e172e719aaa8a0a2696fc33aa4c81e7a8140e9310140aded8f9266f6ad7343aa8a9f8bc3f24f7e1c656ba82b85d9efe3b3863 SHA512 41c22b0774bcc86535f43d440585395268c8b8f6e7191541e437126182d6d7bb889de8baa6aed105902f8d4a20127016c770c2b001192e19fac055c748fe416e
 DIST tokio-macros-1.1.0.crate 7400 BLAKE2B fa10c1c2a060d29b2a4bdf52f7aa78118207bc3574aa9c9081ebc600f38b55d654fabb0abc3e82a1e54933c2235fa6f35dd411cfb594716839d56e52948d9aa3 SHA512 636a5b78715985687a9ddea9f5cbc8836a3242e65d5724825ae80ffa52ada99687e94ff9fe500d4cf1f96f9175fb61b91080ab0dc8c3767b19c4f785bf9e93fe
 DIST tokio-macros-1.2.0.crate 7800 BLAKE2B cb150d33019318a941ec079f726e23a80b0723f6e4b3925b26d2702d92ef82c265d5d095fa37d86ce38d8aed4704c23595799b6e7fd1a82f8b10bbc9aa9b9cae SHA512 b0acda1e4179abdb117f161492bf93f489e3bffb165f20cfbe9af75bd9c4dc3a0a89d7e4b03dfcb436b15d9a6dd99fdd6cfb41c06dd6e9f5cb6091ebce171557
+DIST tokio-macros-1.3.0.crate 7876 BLAKE2B 8541e18365182f65034f1ef7096c77186744edf5a171a2806f60c291d8475fa3722430f37936a28fb9e1d525a31e7fdfaff460d1d967e5b4ee875541f4e7581b SHA512 1ec1bc27236b76a9652595d2874d587e724207c1bbce777beeb41edcef5282cb740af28a99aee187127ec9cf824aa34a0a3983098bb355c73d7b4afd18eef1f9
 DIST tokio-rustls-0.22.0.crate 22706 BLAKE2B 9ef76b96aaa10f49692581f7b4f04063729baaf3998b7e0a3d5700cd7613822efdc7fec334ec9d3718c700fbcbf572ee974e96bc3f79eabc774a801501b08ef8 SHA512 cac6c5ebbdb751721f881f6e4c21e1b34ff8aea84256e25f92cecbeb30b6db3a6b2d78b7eeca253179b78a94c9226aff23492b0311d81ce27470ce939e675d0a
 DIST tokio-stream-0.1.5.crate 29637 BLAKE2B bfddc58f8cb41e81f0c88eefe41e301a718d71df949aa6e31084dac713c04c5a53a5598d1bb40c893d5a113500d1c9072454ce9a3341bab9ead35fb9a1390ce4 SHA512 3f37774d607f77ce0cab1761fa4560458d0957915cad47488536c5dd106f13dd126546729d1fbdf51defe20cadc836e900c1ccf81251f73e74c95be5c6b914b1
 DIST tokio-stream-0.1.6.crate 29841 BLAKE2B 764196a04b6c7c93123d75cf9ef476bf7f47862e0115f6798288575d52f25ff54ee3a5319e7fe064a05c22e44ea7741765f24ccf46251f349d9da55750084f9d SHA512 255c5a0cb5e37aee856476cc630dec6e589ac93898a633e336ae0f80c373b30cc8f5772530751b959968a59c41ddce119930d3902cfa66e36d9b03f8ddbf1183
+DIST tokio-stream-0.1.7.crate 30323 BLAKE2B 53980ab6bc37662de285b4d8d7bccaea93a56f0a343f673254cdd8a32024292ccec59196e515a454b401f97e892a657ddc4d4731d2d86b87781b705f2009a2b2 SHA512 1c9a7922f7cd9bf9d9694d708aaced4c8d4deea584dd77422976f83f1935c440a9bb63152584e48142d732bdd97674ffa8ce41cfeb905ff0784b47e2670898d5
 DIST tokio-tungstenite-0.13.0.crate 30189 BLAKE2B 58069c327de8ed663425bd6b9655ff03a631a78e32196ea204ece32d6efa2b71f03d6328640d41e5355c4981ad4374491dd1610905dde226773a5b3167947dec SHA512 2f96950bb4fa474b945e3f29bdf482b4f56f898ae384428c272fc4c1bb5bd522ec0cb3691af46ffb334aa900b57ed0fd527092c81195b80fad69ab74ef33a21c
 DIST tokio-tungstenite-0.14.0.crate 32486 BLAKE2B 510b723ea265898d440b207e31ed6b837b4bb71717ae8cc4ed74b2cee38c12fa42ceeff566b6219703aef886aaa33e574821a2ec7541f3f834c1c9aa1505c42d SHA512 4c59a682f42fa4add85a7a07a5650d2fe4b7f73414d22dd11e464bff782b025596465f2711dff7c7d937297b20e532db29fa4b1bfc6dcb1cf701166237d82755
+DIST tokio-tungstenite-0.15.0.crate 28347 BLAKE2B 303b0e20d8a526749967e3f6aed7155b0b65b4e060c7b21c63e6d913b6163e36d44734cc5116f12b565757dc8394c95f84059fc5c5836d5dbb8b6ca3df688c87 SHA512 f2b3ae0a01c4dbd811b639e81dd36414357e791c8921796fc60bcfc615489ed2c240027473c50919ef680c8af77e66c684bdee0fcf604136e48136bd0634ae85
 DIST tokio-util-0.6.5.crate 71019 BLAKE2B c34c4d53754dd590e3b98000a12eaec1929e9c8cab05dc0f25dc449284f0f27ea661b39f94e25b6fa9918c27d4a528a70d4a952ae319fbae8ef64d4a1602bb7f SHA512 e31e295b2c92fec616ea3a2b61de9d85026cf4ead75cd193aff4ca037425238b4e11cf8cb3955353f63e9f03130ad3690c951fdd7bc1769b6e2efde75516c8d7
 DIST tokio-util-0.6.7.crate 73201 BLAKE2B 4bed0bdc343b9fce03c12c0ab442cd7eaf3681232090547a0269bef5f362e1d96d2a10cf78708c6775234e23e8e2e00697333dc861df56136a29583d7a2401d2 SHA512 f6d81191a1caffd2cf78175bf0de3432bec684c739378072cf23daa1280b54d1781cf43d663a49b0cb34662043c1747073c97291414cf0407581325cb091b263
 DIST tower-service-0.3.1.crate 6299 BLAKE2B f56562faebe3a933f39f8e2093af65378bd307c59f9695408510ea9ca2230c68228c6726a0a2c7c42943002837dd9d86ce0a1d4b7849ba5c61df28df7632d909 SHA512 d23f9db2d6632f561970b55eaeaac22a20c8b9af18931cd564db193688eb2a2973127b440e175cfd7358f3d0ead53f7a759e34b7b86c293751079af9c2181ba7
@@ -344,9 +401,11 @@ DIST tracing-log-0.1.2.crate 14915 BLAKE2B 72967c7262a8fb2b1b9c693ae19d84424a037
 DIST tracing-serde-0.1.2.crate 6362 BLAKE2B 81eaa1f5fd51de57a2e2d7c78c1441513e1df1afd434ec6bcd955c933fecf165a690429d62fd919960250eb931989a0a9681d6b17253208cb7b297418c5e0680 SHA512 1f9c1690ab9f94588169454fa7d9e9e164aea5827073e4f5c29f1aba80cddfc11cf9e60b05dbb7951024c2fd0b0b46d278867f85d4df69d85631d39d63b5cf96
 DIST tracing-subscriber-0.2.17.crate 97609 BLAKE2B 13b3a42aabceadca13f2fcbb8b4ba69da8b3aa220ac6b90f3e35328ceff9c0b4bbb0a29392b6b6f1d55be99aaa587f142dc66b608aa3f956a0006ed80d172b97 SHA512 5fb1e5121e10e129fb72f9ad78e0cbe715520e18064441570e0f91a649cbe3bbddc652421257e98113b23a6297e3cbb8d6d761203a4b367239190d1ff0214a38
 DIST tracing-subscriber-0.2.18.crate 98663 BLAKE2B c8060e07b0f970598f9727bfd18d1983ab8f94e020452d9662619f6a305d5d04a756b56566ee73d6f1baf7794d31a1971bb553f0b5ca28ab689e615fd438fab9 SHA512 ebf3df27253ba8d86bc2925c5cff5e7a0f2dc4e8b9c630d492e0f060c73be374c0b6685efdbdba9040e269a0488668bfcc3dc9a6e98558d39b1e124757a1cfbd
+DIST tracing-subscriber-0.2.19.crate 107759 BLAKE2B f48adfc02eb2e048d227493abecccd77bf9c32df990b7dd35f481e998391f04d469d66111bca2d33458501f890f6f0bc5247fca940ece0cb20592067a4c55fe2 SHA512 9e3a09f0355dffbf8ea7d35e9c5fd689613a39cb4a457f6ef5d83e4d6a0c314315a14fd1eeca3efd99b4cb8d61d8d1f2f305d8943b87ca6b16fa6c6657157a62
 DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
 DIST tungstenite-0.12.0.crate 54287 BLAKE2B 211a39484af5a12262fc95eeacb0f68a1076956aa3e2df0f06d6a2839ceb4e096ef3919df60a2bf4ebd74eeff85a21a9242330cd1e892bff04fd3588b04da810 SHA512 d6d93b143a4e1ab6a610954f9621518f1b50e0b8d1ca019d106027bc1a9f4698bf455f3948afed1cf7c626b04f426075d9b0393922f16b8ace50aa1ccfea0474
 DIST tungstenite-0.13.0.crate 57945 BLAKE2B a4b8aaadebd58965b1bb7fe27c1f674020f0368178e2d8f79fc19a0b5ff48eb657b5184a33c23943bd5fb8f69a3ba1ecce9f17dce8196cf9b06d0319ea0b498e SHA512 857c7115fafa64fc9b3357864501846817d5ec716139a9b396528bf5526c85f70a72074f30d6466fb1cd4e07805d955cf3c2566fa2fc8004fa6f390541d4ce0a
+DIST tungstenite-0.14.0.crate 57702 BLAKE2B 552379d5f6d097eaa869266a1c2c01c02d90dad5fc9d4c0c1ce8d89891eaf1801873196f6257a02bfcc323275808a85fd923a7114bd2720d1b4d57f8a330842c SHA512 2abcfe0d7b9f6179b3afc33a016c97c7b7f2ac25dc83c7933c13bdb9499dd16a714c97526c0661714ab07281a6b7f51b3afcb5a513373cb734948f9b7c2a3de7
 DIST twoway-0.1.8.crate 31774 BLAKE2B 68402b15e61212c986c06322851985201e4a24dd3f06eae607c2581940670c476b330d61d48cc5edb54c7622590f2e75139f0d4460873262d8efd958dd21e5d4 SHA512 326a7954891ef399b85e4e7bf1a0afda0cc9057883e7a19c4590492921ef3570916fb50929071b2e3825e57282482525f4adf2f6b49ee12dc0adf8186ffa4629
 DIST typed-arena-1.7.0.crate 9927 BLAKE2B ff8fd0f87e69634d53b87b070499d3d119d9f153e0f06e27afbd3f96da6918136a83162f4e9374061ddd215845f75844251e3fb079d57266ea8502cf321eaf9e SHA512 506a90a11576e5a4135b46c5c4705db461a8ec1bba980c9ea65e8c4399bcc85898b7f81312acf4bc0b24a29d1b940d8dfe0352ad59985153743948616da5ed8e
 DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
@@ -356,6 +415,7 @@ DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700
 DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
+DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
@@ -409,4 +469,5 @@ DIST zeroize_derive-1.1.0.crate 8037 BLAKE2B 4981046fd80d2be8163d6da8df161378ea5
 EBUILD nextcloud-notify_push-0.1.7.ebuild 5760 BLAKE2B 9417510443f02ed5809a73274542706e5cd601ed394cad688418ec9f5e3b1db73b8f48f8e5f57d15044efe3fa460541e1d4fe616e50f390c3902acc98cc736ed SHA512 964713e08a39074830f8231366c4258674db41fde0eecf0e2e5d211ef1096c0cfcb73e46949b7d963dff9535c9a9998aac6130e89f0db748cff217563a98fe80
 EBUILD nextcloud-notify_push-0.2.0.ebuild 5870 BLAKE2B 515737f6f101010baf0eca8aa6e27e94947754190b7f69da07a8eac68fd5e7a26033a8af2d4496eab6b294f46f98fadd712863ae4d706157dff8ffc7eafe37bd SHA512 c2f64c88c60e84c65026bf91213af4a2c39f66a19a8d5b811b36d1ae7988d5c32ed0d073d0c9a5ec04ba8ac3c2bd233519e9281a902f17b8c7b1ec137e5172c9
 EBUILD nextcloud-notify_push-0.2.1.ebuild 5870 BLAKE2B ed3fc061f7dbae8c36f8ae266ac7c46dbc21238ac745ffaf25c6efe9f886b615690ea5fad121eff4dd75b434f49769da27af56adaa0220bb67c2c3486ce418c3 SHA512 fea12ace825118b240c74318b908303eae9f81c908d7cfeaf4960c7780016d70e2548238509d029ad76f28d46bcaf83cae4e7a6e09197e6f4fba98a812833799
+EBUILD nextcloud-notify_push-0.2.2.ebuild 6020 BLAKE2B 3ea673cab002654c4362ceb58e62b4026157c1fafb32c41bff33d2b6dac33d1e1fb2875c0d6cb20bca6850fa238bff07a786fa57ff89be9e489fb8d4ef579b85 SHA512 afa02e030f42e59d7d6ecb11230633bacf835da1091f8569d77aa075900270b006003cbe0ba3d18ab319023dd21470c56f4cdbdb46be45f599eaf460638b467b
 MISC metadata.xml 406 BLAKE2B 0869a2f6007c7f832ee75e925f31b220712104d1391a2531d1e80b66c13ac635d876db047b2ac167440fded687cdf6bbaf7ec3816a4620f7a5158c68d6cf7d55 SHA512 bd6c0a2fa16e89527e1203dc3eb3f4bbcc5614404f8bc6f041513ab8383fd372f78d7ceef4002a2b02a072bd432479425011fa93880a288f7dcfef84370d9a08
diff --git a/www-apps/nextcloud-notify_push/nextcloud-notify_push-0.2.2.ebuild b/www-apps/nextcloud-notify_push/nextcloud-notify_push-0.2.2.ebuild
new file mode 100644
index 000000000000..a0d12bba83c9
--- /dev/null
+++ b/www-apps/nextcloud-notify_push/nextcloud-notify_push-0.2.2.ebuild
@@ -0,0 +1,334 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+CRATES="
+addr2line-0.16.0
+adler-1.0.2
+ahash-0.7.4
+aho-corasick-0.7.18
+ansi_term-0.11.0
+ansi_term-0.12.1
+arrayvec-0.5.2
+async-stream-0.3.2
+async-stream-impl-0.3.2
+async-trait-0.1.51
+atoi-0.3.3
+atoi-0.4.0
+atty-0.2.14
+autocfg-0.1.7
+autocfg-1.0.1
+backtrace-0.3.61
+base64-0.12.3
+base64-0.13.0
+beef-0.5.1
+bitflags-1.2.1
+bitvec-0.19.5
+block-buffer-0.9.0
+buf_redux-0.8.4
+build_const-0.2.2
+bumpalo-3.7.0
+byteorder-1.4.3
+bytes-1.0.1
+cc-1.0.69
+cfg-if-1.0.0
+chrono-0.4.19
+chunked_transfer-1.4.0
+clap-2.33.3
+color-eyre-0.5.11
+color-spantrace-0.1.6
+combine-4.6.0
+core-foundation-0.9.1
+core-foundation-sys-0.8.2
+cpufeatures-0.1.5
+crc-1.8.1
+crc16-0.4.0
+crossbeam-channel-0.5.1
+crossbeam-queue-0.3.2
+crossbeam-utils-0.8.5
+crypto-mac-0.10.1
+dashmap-4.0.2
+derivative-2.2.0
+digest-0.9.0
+dirs-3.0.2
+dirs-sys-0.3.6
+dotenv-0.15.0
+dtoa-0.4.8
+either-1.6.1
+encoding_rs-0.8.28
+eyre-0.6.5
+flexi_logger-0.18.0
+fnv-1.0.7
+form_urlencoded-1.0.1
+funty-1.1.0
+futures-0.3.16
+futures-channel-0.3.16
+futures-core-0.3.16
+futures-executor-0.3.16
+futures-io-0.3.16
+futures-macro-0.3.16
+futures-sink-0.3.16
+futures-task-0.3.16
+futures-util-0.3.16
+generic-array-0.14.4
+getrandom-0.1.16
+getrandom-0.2.3
+gimli-0.25.0
+glob-0.3.0
+h2-0.3.3
+hashbrown-0.11.2
+hashlink-0.7.0
+headers-0.3.4
+headers-core-0.2.0
+heck-0.3.3
+hermit-abi-0.1.19
+hex-0.4.3
+hmac-0.10.1
+http-0.2.4
+http-auth-basic-0.2.2
+http-body-0.4.2
+httparse-1.4.1
+httpdate-1.0.1
+hyper-0.14.11
+hyper-rustls-0.22.1
+idna-0.2.3
+indenter-0.3.3
+indexmap-1.7.0
+input_buffer-0.4.0
+instant-0.1.10
+ipnet-2.3.1
+itoa-0.4.7
+js-sys-0.3.51
+lazy_static-1.4.0
+lexical-core-0.7.6
+libc-0.2.98
+libm-0.2.1
+libsqlite3-sys-0.22.2
+lock_api-0.4.4
+log-0.4.14
+logos-0.12.0
+logos-derive-0.12.0
+maplit-1.0.2
+matchers-0.0.1
+matches-0.1.8
+md-5-0.9.1
+memchr-2.4.0
+mime-0.3.16
+mime_guess-2.0.3
+mini-redis-0.4.1
+miniz_oxide-0.4.4
+mio-0.7.13
+miow-0.3.7
+multipart-0.17.1
+nextcloud-config-parser-0.4.0
+nextcloud_appinfo-0.6.0
+nom-6.1.2
+ntapi-0.3.6
+num-bigint-0.3.2
+num-bigint-0.4.0
+num-bigint-dig-0.7.0
+num-integer-0.1.44
+num-iter-0.1.42
+num-traits-0.2.14
+num_cpus-1.13.0
+numtoa-0.1.0
+object-0.26.0
+once_cell-1.8.0
+opaque-debug-0.3.0
+openssl-probe-0.1.4
+owo-colors-1.3.0
+parking_lot-0.11.1
+parking_lot_core-0.8.3
+parse-display-0.5.1
+parse-display-derive-0.5.1
+pem-0.8.3
+percent-encoding-2.1.0
+peresil-0.3.0
+php-literal-parser-0.2.10
+pin-project-1.0.8
+pin-project-internal-1.0.8
+pin-project-lite-0.2.7
+pin-utils-0.1.0
+pkg-config-0.3.19
+ppv-lite86-0.2.10
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro-hack-0.5.19
+proc-macro-nested-0.1.7
+proc-macro2-1.0.28
+quick-error-1.2.3
+quote-1.0.9
+radium-0.5.3
+rand-0.7.3
+rand-0.8.4
+rand_chacha-0.2.2
+rand_chacha-0.3.1
+rand_core-0.5.1
+rand_core-0.6.3
+rand_hc-0.2.0
+rand_hc-0.3.1
+redis-0.21.0
+redox_syscall-0.2.9
+redox_termios-0.1.2
+redox_users-0.4.0
+regex-1.5.4
+regex-automata-0.1.10
+regex-syntax-0.6.25
+remove_dir_all-0.5.3
+reqwest-0.11.4
+rfc7239-0.1.0
+ring-0.16.20
+rsa-0.4.1
+rustc-demangle-0.1.20
+rustls-0.19.1
+rustls-native-certs-0.5.0
+ryu-1.0.5
+safemem-0.3.3
+schannel-0.1.19
+scoped-tls-1.0.0
+scopeguard-1.1.0
+sct-0.6.1
+security-framework-2.3.1
+security-framework-sys-2.3.0
+semver-0.10.0
+semver-parser-0.7.0
+serde-1.0.126
+serde_derive-1.0.126
+serde_json-1.0.66
+serde_urlencoded-0.7.0
+sha-1-0.9.7
+sha1-0.6.0
+sha2-0.9.5
+sharded-slab-0.1.1
+signal-hook-registry-1.4.0
+simple_asn1-0.5.4
+slab-0.4.3
+smallvec-1.6.1
+socket2-0.4.1
+source-span-2.2.1
+spin-0.5.2
+sqlformat-0.1.6
+sqlx-0.5.5
+sqlx-core-0.5.5
+sqlx-macros-0.5.5
+sqlx-rt-0.5.5
+static_assertions-1.1.0
+stringprep-0.1.2
+strsim-0.8.0
+structmeta-0.1.3
+structmeta-derive-0.1.3
+structopt-0.3.22
+structopt-derive-0.4.15
+subtle-2.4.1
+sxd-document-0.3.2
+sxd-xpath-0.4.2
+syn-1.0.74
+synstructure-0.12.5
+tap-1.0.1
+tempfile-3.2.0
+termion-1.5.6
+textwrap-0.11.0
+thiserror-1.0.26
+thiserror-impl-1.0.26
+thread_local-1.1.3
+time-0.1.43
+tinyvec-1.3.1
+tinyvec_macros-0.1.0
+tokio-1.9.0
+tokio-macros-1.3.0
+tokio-rustls-0.22.0
+tokio-stream-0.1.7
+tokio-tungstenite-0.13.0
+tokio-tungstenite-0.15.0
+tokio-util-0.6.7
+tower-service-0.3.1
+tracing-0.1.26
+tracing-attributes-0.1.15
+tracing-core-0.1.18
+tracing-error-0.1.2
+tracing-futures-0.2.5
+tracing-log-0.1.2
+tracing-serde-0.1.2
+tracing-subscriber-0.2.19
+try-lock-0.2.3
+tungstenite-0.12.0
+tungstenite-0.14.0
+twoway-0.1.8
+typed-arena-1.7.0
+typenum-1.13.0
+uncased-0.9.6
+unicase-2.6.0
+unicode-bidi-0.3.5
+unicode-normalization-0.1.19
+unicode-segmentation-1.8.0
+unicode-width-0.1.8
+unicode-xid-0.2.2
+unicode_categories-0.1.1
+untrusted-0.7.1
+ureq-2.1.1
+url-2.2.2
+utf-8-0.7.6
+utf8-ranges-1.0.4
+vcpkg-0.2.15
+vec_map-0.8.2
+version_check-0.9.3
+want-0.3.0
+warp-0.3.1
+warp-real-ip-0.2.0
+wasi-0.10.2+wasi-snapshot-preview1
+wasi-0.9.0+wasi-snapshot-preview1
+wasm-bindgen-0.2.74
+wasm-bindgen-backend-0.2.74
+wasm-bindgen-futures-0.4.24
+wasm-bindgen-macro-0.2.74
+wasm-bindgen-macro-support-0.2.74
+wasm-bindgen-shared-0.2.74
+web-sys-0.3.51
+webpki-0.21.4
+webpki-roots-0.21.1
+whoami-1.1.2
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+winreg-0.7.0
+wyz-0.2.0
+xpath_reader-0.5.3
+yansi-0.5.0
+zeroize-1.3.0
+zeroize_derive-1.1.0
+"
+
+inherit cargo systemd
+
+DESCRIPTION="Push daemon for Nextcloud clients"
+HOMEPAGE="https://github.com/nextcloud/notify_push"
+SRC_URI="https://github.com/nextcloud/notify_push/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+LICENSE="MIT Apache-2.0 BSD GPL-3 ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="acct-group/nobody
+	acct-user/nobody"
+
+S="${WORKDIR}/notify_push-${PV}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+
+	# default name is too generic
+	mv "${ED}/usr/bin/notify_push" "${ED}/usr/bin/${PN}" || die
+
+	newconfd "${FILESDIR}"/${PN}-r1.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-r1.init ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+
+	# restrict access because conf.d entry could contain
+	# database credentials
+	fperms 0640 /etc/conf.d/${PN}
+}
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index fee0754515a2..f7a1cb6773ec 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,8 +1,14 @@
 AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce7426729e75471f017e15bb45b50cc885609e54817077e36d9feb4484bcff5b40c4f669ad80d4d5a643da8bc SHA512 076bbbfb9305a2608b60fb7f9802a5a455c5d049d39c8f209eadac1a306ba2015d11a30b4544d8cdf43025077a3c3087f3e9922cd9b530a08c089a7818590115
 DIST nextcloud-20.0.11.tar.bz2 123339332 BLAKE2B f89dd1c81a9fcac46bb270a646df89d43064bac73e96209e379a5a60b204bdc44ade6b265c870138bc35a0a3aa2a52f4797166c03c1d156ac49336e48c1372d7 SHA512 4863a7819a564655db0a7b49a7ca9be642ab5383cdeada5c3ce6fc4529fda522a4427eb4b3ba5e00e4719232fed6c1f9e606e11f38c35f8838f82247359f335b
+DIST nextcloud-20.0.12.tar.bz2 123184555 BLAKE2B cf1493215a9efc5a6a7e90b3ed92510b629ff3109dc8e7b4a802bc45190604ee42700350c6f76b78823e95c5dee5bcaf3a95d12ed14b64365eee882ac3b8b622 SHA512 423c09256c31bf9530f97eb0961471cd87c23a0d46de9d4eb9a63270a67ea7c861ca77c83fa203426b5f3cae717202dbd44ccdd6b432ae06570c0a0cf6d4dc5e
 DIST nextcloud-21.0.3.tar.bz2 129433656 BLAKE2B 75df0e3363e606fb4406aca7e37ab0a373d390f50966405c59e620b683979855c05f16548bb14e9ac7b4ffa756562679e5d6f1a8e4cd1d46aeda0756f235facd SHA512 e618dc400659a2aca37857c446d31296e64d7671a66bf077969b3194ae35242c6de11eabd1547791067c0edc43e93149fadf102bd4022cffb92802ad9d7e4ef7
+DIST nextcloud-21.0.4.tar.bz2 140200496 BLAKE2B 9dd54a10dda30fdd1107266c8acc7f0161596107c04546336f29ac523275c93be8fd1877558c1b7e469769f5e30f3eb2179896c8bb26db4c20bf6a44f8bc3df7 SHA512 7fef1aa4bc4b9c158a3c50bdff87054b97cfeed8d066076676f00189380c115d318a657492dc2a0f138b85f15fd7dc807c0137775b76f37dbc7b052514614390
 DIST nextcloud-22.0.0.tar.bz2 144386509 BLAKE2B 5d41337a7577d33f4be2ce5900b97df5582542bf4b51a4de4eff2f62726bcf014d99456ebc775feb16fd625582760e31ee434a23874451a1072822dcd21d5cd6 SHA512 ced81296d1080cb224ac96df501721c1a16a8a83f9784ab281d97202ec6611173d60a6a87279e7f36b735a92dd010ed81b0c7561fc7dadde00df10f9b7711cec
+DIST nextcloud-22.1.0.tar.bz2 145079324 BLAKE2B f28a4805ea87532b99a6c47c50ecaa6cb25e0a332af92b8bee201a978aad85edc940d3fc7e27e7ffe84187a94894a76951ce07dda19785e9bb1b3841331de79b SHA512 f591959c35a47d1e88e2aa1694968a36e4673ca55b5d5a9cf0ce6d1ee76002a6445a33ff040a061db0cb753321f59853f723b8dc7106ffda09eed468e5fb7dd3
 EBUILD nextcloud-20.0.11.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
+EBUILD nextcloud-20.0.12.ebuild 1083 BLAKE2B 0e18f62655dfa0bdf7a81f5280be99c34c876a8c57e66e206e1c7e43e0cf93745cda3247f05da592fc5882e872e8249dac9391f22648940fe95e8cd2bc158422 SHA512 e0d8a192c51901913a40521b5259c7276356b8c15246c5df193c4a4a5b0652034148dd971c5014a72f378d4449b778e5867030f9ec3d8ad9bf42efa955ce63c5
 EBUILD nextcloud-21.0.3.ebuild 1081 BLAKE2B 89d3edc2aa3f41b8bfc2a1a1d59d886d71c77b41c4681e1abff33471e5a336c4b800872d2f3369325ee15c7b9eafeec51d65e6de113017345753ce416f9e732c SHA512 c5fcae9887cdc570c820c94314319b9c597418be7ad378fa78d7c6a16481fadb850a3d6fb6ba8b0973c46c159fee3f56da9c5e6409ab435258aaab0a824893bc
+EBUILD nextcloud-21.0.4.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
 EBUILD nextcloud-22.0.0.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
+EBUILD nextcloud-22.1.0.ebuild 1083 BLAKE2B e6abe80192e7a00277126f901c655f1eab03544572da0071c0734ece0a4a5574d2fcbd7f06f935ccf61a91640a8ca549c3bc359c68103f7f46632fef89d62322 SHA512 9fe6b70447bd9e4d3678eaaca5174586a1a96c0e4763ccd30f9749410892b78c59087c06c0fe42372e6126bf5c7fb5973ed0ead0c664c2040abffd5e7951dfe6
 MISC metadata.xml 644 BLAKE2B 893952d31b289d07befd82be0d9998df95149363a0bfcfbb64626d8679b67048017a520fe65e5eb14224432a98efbb726e866c95562de23f2dc650df90df5371 SHA512 ec4bcd3ea472df2201830ac14e6dbc01a8317fc8ad8eadd5231014c49a07151ed7647b6d87c22a62df9a2f67d8c2911d44b504a612c9f446228f9a227e6bed7b
diff --git a/www-apps/nextcloud/nextcloud-20.0.12.ebuild b/www-apps/nextcloud/nextcloud-20.0.12.ebuild
new file mode 100644
index 000000000000..2aebb2320d5d
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-20.0.12.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="https://nextcloud.com/"
+SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="<dev-lang/php-8[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-21.0.4.ebuild b/www-apps/nextcloud/nextcloud-21.0.4.ebuild
new file mode 100644
index 000000000000..ab3ba8e01bc4
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-21.0.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="https://nextcloud.com/"
+SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-22.1.0.ebuild b/www-apps/nextcloud/nextcloud-22.1.0.ebuild
new file mode 100644
index 000000000000..ab3ba8e01bc4
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-22.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="https://nextcloud.com/"
+SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
+
+	webapp_src_install
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 3e7305c1f1be..64d7281e0683 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 4273b1f18eca..30165c96463b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,6 @@
 AUX chromium-92-EnumTable-crash.patch 2712 BLAKE2B adf5bd0ca388395245ebe4b17d31fa75b636f036860888fa7036e3a57fe4064669f11da2623b15bba90879146f583668b3ca0af56f88c99d2f7f0b98601b012f SHA512 8cfc83fd02f505acc531dece5b06c4f32bee5c6d5a3fa467d7607adbf8705f78dfb7550c69ac10e788f3aa9acc5bb361b894ec36ddd043222f9ca6e07d8a23a4
 AUX chromium-92-GetUsableSize-nullptr.patch 2029 BLAKE2B a2a5631b575afe5721a84b15cb3b0da6cf77b07e76f5168d3c732b67a55a91ff427d0efa4772dd7a1b979cc8c0062800582586705e19463420f7364a940b48db SHA512 4ef092792134ee441c73ff95c5f005f96e525de2acab409121d28eeba0ac5adc3cc9824d6da7b1789964b771c24c65cb0ceac1d09d33e2d915f2ab3cfd12e27c
+AUX chromium-92-crashpad-consent.patch 1890 BLAKE2B 0d49566e83aa02c60ef8a226b326e37549ff850c2db82ade09c90e001b2c8df7288526a954ad32fd977045eda9c70f2a127cebf09c5c0e50ec5f75b75dd5fffe SHA512 0dc47f6a9a499d9fdd5e63c51f0c736266321a0fc7f5c0df9311b8b67cb08b1b6b3d0ac7e8adee18f99b4b3f6893394d9bdb2ac176ef17da254acaf36d368212
 AUX chromium-93-EnumTable-crash.patch 2863 BLAKE2B 72025b6fb1b8a2c3bb6d54ca9063c0cca8b8dda1344813abf55d361d197b28ccfffcc9d0bab7ef685752a8f9a4848f13b1de61e676b1d4386ea59b5cc137b68c SHA512 8a56fefbf99f9bb0262251685fa47166b27786f283ee3b84664a3b054da160647d7e359bbd051b6516c92472e5b19e55b1ff23b0021877712a78c8fc2d81963e
 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
@@ -11,10 +12,15 @@ DIST chromium-92-glibc-2.33-patch.tar.xz 12636 BLAKE2B 0621d2135c1a0864374010c36
 DIST chromium-92-patchset-7.tar.xz 4004 BLAKE2B 8587663a072eb08abacbc2e54924855f29efefdbec46acf5cb8b0cc40b816b96ba7694c4ab1abe997572a6dbecf94ea27f368a7337263adfff44f2b4b042d862 SHA512 65c8267ab0921719c71d4b03a4315bbb1ceec35ce4794de9dcc6099b2c349baf4782b67316ebb8c9db233630b7fc89fa0baf719f9f0f41eb39972cdeb437e612
 DIST chromium-92-ppc64le-1.tar.xz 30416 BLAKE2B e953e3ba1ac0ff4bae437328eb1c52fb3863007ff92db91c6858c8c5f7b4c5c39fb8bf6898c3385c7faa82666f1a18aae7fcb5379b9199e58c5c0526fbd9dbee SHA512 b5a20076a34705c53c56d7763189ebfd860a456ca544a7f0c9ce30c877be92270ea724f1bebb9b597b301def27dde0a672b0c30e16e6abbf958cecfd60b07ec5
 DIST chromium-92.0.4515.107.tar.xz 957809240 BLAKE2B 61f34c6de424dbc0bed4a3f6ede42c936389e3280ffccc6db8750674fc512257120fad4006bf5e31701cfebf9cd12df96bb2936296293312317dee85748bf773 SHA512 8814a3371e38836cee02178fa06bee612d00efe561791278351ef5312f5225742d416043fe6e25e9e353ae3d82dbd5ef57c9b1f115423da6537288e9aece779a
+DIST chromium-92.0.4515.131.tar.xz 958012564 BLAKE2B 3f2db5d2293b0c0dad61815ad527c401f6d48756bf7fc9d36e2c7ed87d466747ffe326db7bad2a3ddf039619c37ae0b1bf1cc20ad95ff10f2326a48faf42306a SHA512 5f3bf1288567499455fc8d4e5c04b85a8547d16165746bc4777b2bc48b53e082cfea0d39def4f513fb7f640232bc2e77129ba07e4a21d1c31d9c2bd4d4ee5b68
 DIST chromium-93-patchset-6.tar.xz 6796 BLAKE2B 2688c68becac1187668b459f9827ffca79de6c7ee64299dff20f91cb774af676ec3d95d809b4fc5f7bd663c3b8c904a46ac9cd3ec70a5ce248456dcd48834932 SHA512 eaf0d2bc29c53c7021ccded9c14463bbde2887926c069154c0126ee1bf513bf41a38eeb3dc21023a2e9637ce3e1e541a3b2a79a990bb8becae0da0a04e57c76a
-DIST chromium-93.0.4577.18.tar.xz 1041809024 BLAKE2B 4f67353559143985dd94c862279c16120e35e03e77997140edc236bdc03ca308131acc434741c1585a3ef3e92458a0d4ec97eb5a1006076b09eab5b17e472041 SHA512 939a8692a9432d9c1b9a1bf117bf59e301299e73c465023ca5318948399e6d5522f5f0eacea93b56d745a8d3b223e425c8862f3db312f450f43f0362fce0294d
+DIST chromium-93.0.4577.25.tar.xz 1038605580 BLAKE2B 51c0c4a914bc64c58835bfad3fe20e626d30fb01e12a11e1283b9d12a836d01e009b54f7baa74fc2cc8d4b9886e9c617c52c465e8b10da417addb5723cf2617e SHA512 0a425f06a2634d52726c2193dc91cc175437fe65e75a3dfc8097f2d3126897f094cc59cb77c52b8c1862372a474e929d8d1888263b028b761f6035cf4b577308
+DIST chromium-94-patchset-1.tar.xz 6384 BLAKE2B 579bb0e6e52f91107333be58b4337248fc0d2463f820028f088792f60e87ca1efafea8f6b2b21da84320a46988670041646af9265f4949dc723e668384b11b88 SHA512 958d9825e33b167ef99260476deb55d442760273747b95d72d97d53662fe761fa7f54daca74bbc2e6cbe220985c665f41c48522d3126bfc87a08bfa54cb7a5f0
+DIST chromium-94.0.4595.0.tar.xz 1049510460 BLAKE2B 55e1894e7f4a0f2acf0ba642cc4ff93ce90e37d8fe36c968e7fc7846db5cd600cc76ed8bad6e2af8370237b7f23b21962255402984bf7744576ec653e3dc4be1 SHA512 df97864455270160c0d0bdc2ba56995142c29dc3d965ce5485b4508ed0a3951f1420fa996a3ae493bf61f46637390375441320605c234f37d06d2099d63ea05d
 DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-92.0.4515.107.ebuild 30606 BLAKE2B d5dfc50b5ae57fe99e59f3e110e72bca5af88610e5f37d8e81fbd7d35cb328cf60d44a461819bb2a76780cbd7a4a7d2b0dcbbd5d9d3a6b7848d482220d29458b SHA512 5b322b95205cd0e174d9fc865cea4ce92d873b678bdd6d31172769d15c3a604dc38a2706e511d07512567b489d6f88cb83d51ff39bf31d15ba4ca2f8369212c0
-EBUILD chromium-93.0.4577.18.ebuild 29762 BLAKE2B 3b6ebfac90c4d271c0e59cad01bd62ff630e61a13d8084283e0b09e5c6f153cd327f53a177dfd7e26755847137c04389fb1d6c3b2fb8adde40638d2afe3f6f6a SHA512 b856d59a1b4e06d8ebd38ee9998b8417e7b6f58b8100c5769930efececae95859ae87afc180677b746c0bcf9d792236bbb4491cb86df7f47b56d5d8804042dcf
+EBUILD chromium-92.0.4515.131.ebuild 30603 BLAKE2B fccfc32625559d0bac8b9eb6a535bcef9244c93a82afb2ec17d87fab07b6d4d3f409742d2a3619e58f4862090adcb09a2801f83c23748bc6f6fe722c5149b197 SHA512 0974d1fd95036015f698258fd9e369ed51615c7f6f7e3e8c4d4301b2888e4f21f0482715302c08f5f09e80cc8bc2d52af1cbbac43e8fca3b7c488cf5789859b3
+EBUILD chromium-93.0.4577.25.ebuild 29765 BLAKE2B 2ca8313cb2b741b83407cbba49b8088d86ad74345fbf3d515d8a16475b9c027a50bb809219f0812415a0a61a7bdeb7c1113f17f12f06ca87b93cb20513bc2e62 SHA512 30e1d3273a5e1a754eeb8fffd4e5f0ee5c36ba2a24410f64430037db9948475a49f9ade1e4778ec92951c9273feb8b543c9db59af1fa45e46d8bc42b64a7e3bf
+EBUILD chromium-94.0.4595.0.ebuild 29625 BLAKE2B 8abdde7c381b1158c6777dcef6925a96cb00fed795ed8e6a0253db974636286bd4bb7a8386ef307b6e8fcb3adfad566de9f34afb0d5a09116d0d11f0c371385e SHA512 996b1737212db560a13959e70830a00113b04a0633f3afedee4c1ecd85a10b156bcf8faa9996ea80b18b70e48f54449726c4c5b6dc08b68bb23efca13a998adf
 MISC metadata.xml 1519 BLAKE2B e4364e8141099703f087f1733b2d28aa688930f5e9cf4659fc3561af30d4490c611b76728b2bf2d745eb07b1482f59923166ca340740d48a0321fffc908ef4ed SHA512 b6a1e1f04b7e1b92ea2172c4aa89ce67186a6c8abe6dc6502db7b0588a9b3be2d0fa8d43c797f83b95f7d1c7a20381c26ee534082c4b81b17d4105b63aad06e4
diff --git a/www-client/chromium/chromium-92.0.4515.131.ebuild b/www-client/chromium/chromium-92.0.4515.131.ebuild
new file mode 100644
index 000000000000..63504fa0cd28
--- /dev/null
+++ b/www-client/chromium/chromium-92.0.4515.131.ebuild
@@ -0,0 +1,956 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="xml"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic 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}"
+PPC64LE_PATCHSET="92-ppc64le-1"
+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
+	https://dev.gentoo.org/~sultan/distfiles/www-client/${PN}/${PN}-92-glibc-2.33-patch.tar.xz
+	arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
+	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-${PPC64LE_PATCHSET}.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid )
+	screencast? ( wayland )
+"
+
+COMMON_X_DEPEND="
+	media-libs/mesa:=[gbm]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxcb:=
+	x11-libs/libxshmfence:=
+	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
+"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libxkbcommon:=
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	!headless? (
+		${COMMON_X_DEPEND}
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		x11-libs/gtk+:3[X]
+		wayland? (
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:0/0.3 )
+			x11-libs/gtk+:3[wayland,X]
+			x11-libs/libdrm:=
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	app-arch/unzip
+	dev-lang/perl
+	dev-lang/python:2.7[xml]
+	>=dev-util/gn-0.1807
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-12"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-12"
+	DEPEND+=" >=sys-libs/libcxx-12"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-69.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			CPP="${CHOST}-clang++ -E"
+			if ! ver_test "$(clang-major-version)" -ge 12; then
+				die "At least clang 12 is required"
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="8G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+		"${WORKDIR}/sandbox-patches/chromium-syscall_broker.patch"
+		"${WORKDIR}/sandbox-patches/chromium-fstatat-crash.patch"
+		"${FILESDIR}/chromium-92-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-92-crashpad-consent.patch"
+		"${FILESDIR}/chromium-freetype-2.11.patch"
+		"${FILESDIR}/chromium-shim_headers.patch"
+	)
+
+	if use ppc64; then
+		eapply "${WORKDIR}/${PN}-ppc64le/xxx-ppc64le-libvpx.patch"
+		eapply "${WORKDIR}/${PN}-ppc64le/xxx-ppc64le-support.patch"
+		eapply "${WORKDIR}/${PN}-ppc64le/xxx-ppc64le-swiftshader.patch"
+	fi
+
+	default
+
+	# this patch needs to be applied after gentoo sandbox patchset
+	use ppc64 && eapply "${WORKDIR}/${PN}-ppc64le/xxx-ppc64le-sandbox_kernel_stat.patch"
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# adjust python interpreter versions
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+	sed -i -e "s|python2|python2\.7|g" buildtools/linux64/clang-format || die
+
+	# bundled highway library does not support arm64 with GCC
+	if use arm64; then
+		rm -r third_party/highway/src || die
+		ln -s "${WORKDIR}/highway-0.12.1" third_party/highway/src || die
+	fi
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/src/third_party/volk
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/khronos
+		third_party/dawn/third_party/tint
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fdlibm
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/fusejs
+		third_party/highway
+		third_party/libgifcodec
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/harfbuzz-ng/utils
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libjxl
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/tcmalloc
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/tflite-support
+		third_party/ruy
+		third_party/ukey2
+		third_party/unrar
+		third_party/usrsctp
+		third_party/utf
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		tools/grit/third_party/six
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	if use js-type-check; then
+		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
+	fi
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\""
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# highway/libjxl relies on this with arm64
+	if use arm64 && tc-is-gcc; then
+		append-cxxflags -flax-vector-conversions
+	fi
+
+	# highway/libjxl fail on ppc64 without extra patches, disable for now.
+	use ppc64 && myconf_gn+=" enable_jxl_decoder=false"
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use wayland || use headless; then
+		if use headless; then
+			myconf_gn+=" ozone_platform=\"headless\""
+			myconf_gn+=" use_x11=false"
+		else
+			myconf_gn+=" ozone_platform_wayland=true"
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" use_system_minigbm=true"
+			myconf_gn+=" use_xkbcommon=true"
+			myconf_gn+=" ozone_platform=\"wayland\""
+		fi
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=false"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# https://bugs.gentoo.org/717456
+	# don't inherit PYTHONPATH from environment, bug #789021
+	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0"
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+	doexe out/Release/crashpad_handler
+
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
+			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if use vaapi; then
+		elog "VA-API is disabled by default at runtime. You have to enable it"
+		elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+		elog "in /etc/chromium/default."
+	fi
+	if use screencast; then
+		elog "Screencast is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+}
diff --git a/www-client/chromium/chromium-93.0.4577.18.ebuild b/www-client/chromium/chromium-93.0.4577.18.ebuild
deleted file mode 100644
index 524c45ad4972..000000000000
--- a/www-client/chromium/chromium-93.0.4577.18.ebuild
+++ /dev/null
@@ -1,942 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="xml"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="6"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
-	https://dev.gentoo.org/~sultan/distfiles/www-client/${PN}/${PN}-92-glibc-2.33-patch.tar.xz
-	arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )"
-
-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 vaapi wayland widevine"
-REQUIRED_USE="
-	component-build? ( !suid )
-	screencast? ( wayland )
-"
-
-COMMON_X_DEPEND="
-	media-libs/mesa:=[gbm]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxcb:=
-	x11-libs/libxshmfence:=
-	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
-"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0:=
-	>=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:=
-	)
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libxkbcommon:=
-	x11-libs/pango:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-	!headless? (
-		${COMMON_X_DEPEND}
-		>=app-accessibility/at-spi2-atk-2.26:2
-		>=app-accessibility/at-spi2-core-2.26:2
-		>=dev-libs/atk-2.26
-		x11-libs/gtk+:3[X]
-		wayland? (
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:0/0.3 )
-			x11-libs/gtk+:3[wayland,X]
-			x11-libs/libdrm:=
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	dev-vcs/git
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[inspector]
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-: ${CHROMIUM_FORCE_LIBCXX=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-12"
-fi
-
-if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-	RDEPEND+=" >=sys-libs/libcxx-12"
-	DEPEND+=" >=sys-libs/libcxx-12"
-else
-	COMMON_DEPEND="
-		app-arch/snappy:=
-		dev-libs/libxslt:=
-		>=dev-libs/re2-0.2019.08.01:=
-		>=media-libs/openh264-1.6.0:=
-		system-icu? ( >=dev-libs/icu-69.1:= )
-	"
-	RDEPEND+="${COMMON_DEPEND}"
-	DEPEND+="${COMMON_DEPEND}"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-			die "At least gcc 9.2 is required"
-		fi
-		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
-			CPP="${CHOST}-clang++ -E"
-			if ! ver_test "$(clang-major-version)" -ge 12; then
-				die "At least clang 12 is required"
-			fi
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="8G"
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local PATCHES=(
-		"${WORKDIR}/patches"
-		"${WORKDIR}/sandbox-patches/chromium-syscall_broker.patch"
-		"${WORKDIR}/sandbox-patches/chromium-fstatat-crash.patch"
-		"${FILESDIR}/chromium-93-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-93-InkDropHost-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
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	# bundled highway library does not support arm64 with GCC
-	if use arm64; then
-		rm -r third_party/highway/src || die
-		ln -s "${WORKDIR}/highway-0.12.1" third_party/highway/src || die
-	fi
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/src/third_party/volk
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/khronos
-		third_party/dawn/third_party/tint
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit-html
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/third_party
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fdlibm
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/freetype
-		third_party/fusejs
-		third_party/highway
-		third_party/libgifcodec
-		third_party/liburlpattern
-		third_party/libzip
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/harfbuzz-ng/utils
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libjxl
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/opencv
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
-		third_party/tcmalloc
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/tflite-support
-		third_party/ruy
-		third_party/six
-		third_party/ukey2
-		third_party/unrar
-		third_party/usrsctp
-		third_party/utf
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if use wayland && ! use headless ; then
-		keeplibs+=( third_party/wayland )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		keeplibs+=( third_party/libxml )
-		keeplibs+=( third_party/libxslt )
-		keeplibs+=( third_party/openh264 )
-		keeplibs+=( third_party/re2 )
-		keeplibs+=( third_party/snappy )
-		if use system-icu; then
-			keeplibs+=( third_party/icu )
-		fi
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	if use js-type-check; then
-		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
-	fi
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
-		# Force clang since gcc is pretty broken at the moment.
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-			die "Compiling with sys-libs/libcxx requires clang."
-		fi
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
-		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
-		gn_system_libraries+=( libxml )
-		gn_system_libraries+=( libxslt )
-		gn_system_libraries+=( openh264 )
-		gn_system_libraries+=( re2 )
-		gn_system_libraries+=( snappy )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=true"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\""
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
-		fi
-	fi
-
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		append-flags -stdlib=libc++
-		append-ldflags -stdlib=libc++
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
-	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
-	# highway/libjxl relies on this with arm64
-	if use arm64 && tc-is-gcc; then
-		append-cxxflags -flax-vector-conversions
-	fi
-
-	# Disable unknown warning message from clang.
-	tc-is-clang && append-flags -Wno-unknown-warning-option
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use wayland || use headless; then
-		if use headless; then
-			myconf_gn+=" ozone_platform=\"headless\""
-			myconf_gn+=" use_x11=false"
-		else
-			myconf_gn+=" ozone_platform_wayland=true"
-			myconf_gn+=" use_system_libdrm=true"
-			myconf_gn+=" use_system_minigbm=true"
-			myconf_gn+=" use_xkbcommon=true"
-			myconf_gn+=" ozone_platform=\"wayland\""
-		fi
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	myconf_gn+=" use_thin_lto=false"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-		# Disable PGO, because profile data is only compatible with >=clang-11
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-	doexe out/Release/crashpad_handler
-
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
-			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if use vaapi; then
-		elog "VA-API is disabled by default at runtime. You have to enable it"
-		elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-		elog "in /etc/chromium/default."
-	fi
-	if use screencast; then
-		elog "Screencast is disabled by default at runtime. Either enable it"
-		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
-		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-	fi
-}
diff --git a/www-client/chromium/chromium-93.0.4577.25.ebuild b/www-client/chromium/chromium-93.0.4577.25.ebuild
new file mode 100644
index 000000000000..6fa93f8f78bb
--- /dev/null
+++ b/www-client/chromium/chromium-93.0.4577.25.ebuild
@@ -0,0 +1,942 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="xml"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET="6"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
+	https://dev.gentoo.org/~sultan/distfiles/www-client/${PN}/${PN}-92-glibc-2.33-patch.tar.xz
+	arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )"
+
+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 vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid )
+	screencast? ( wayland )
+"
+
+COMMON_X_DEPEND="
+	media-libs/mesa:=[gbm(+)]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxcb:=
+	x11-libs/libxshmfence:=
+	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
+"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0:=
+	>=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:=
+	)
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libxkbcommon:=
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	!headless? (
+		${COMMON_X_DEPEND}
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		x11-libs/gtk+:3[X]
+		wayland? (
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:0/0.3 )
+			x11-libs/gtk+:3[wayland,X]
+			x11-libs/libdrm:=
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-12"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-12"
+	DEPEND+=" >=sys-libs/libcxx-12"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-69.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			CPP="${CHOST}-clang++ -E"
+			if ! ver_test "$(clang-major-version)" -ge 12; then
+				die "At least clang 12 is required"
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="8G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+		"${WORKDIR}/sandbox-patches/chromium-syscall_broker.patch"
+		"${WORKDIR}/sandbox-patches/chromium-fstatat-crash.patch"
+		"${FILESDIR}/chromium-93-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-93-InkDropHost-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
+
+	# adjust python interpreter version
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+
+	# bundled highway library does not support arm64 with GCC
+	if use arm64; then
+		rm -r third_party/highway/src || die
+		ln -s "${WORKDIR}/highway-0.12.1" third_party/highway/src || die
+	fi
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/src/third_party/volk
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/khronos
+		third_party/dawn/third_party/tint
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fdlibm
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/fusejs
+		third_party/highway
+		third_party/libgifcodec
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/harfbuzz-ng/utils
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libjxl
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/tcmalloc
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/tflite-support
+		third_party/ruy
+		third_party/six
+		third_party/ukey2
+		third_party/unrar
+		third_party/usrsctp
+		third_party/utf
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	if use js-type-check; then
+		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
+	fi
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\""
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# highway/libjxl relies on this with arm64
+	if use arm64 && tc-is-gcc; then
+		append-cxxflags -flax-vector-conversions
+	fi
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use wayland || use headless; then
+		if use headless; then
+			myconf_gn+=" ozone_platform=\"headless\""
+			myconf_gn+=" use_x11=false"
+		else
+			myconf_gn+=" ozone_platform_wayland=true"
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" use_system_minigbm=true"
+			myconf_gn+=" use_xkbcommon=true"
+			myconf_gn+=" ozone_platform=\"wayland\""
+		fi
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=false"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+	doexe out/Release/crashpad_handler
+
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
+			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if use vaapi; then
+		elog "VA-API is disabled by default at runtime. You have to enable it"
+		elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+		elog "in /etc/chromium/default."
+	fi
+	if use screencast; then
+		elog "Screencast is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+}
diff --git a/www-client/chromium/chromium-94.0.4595.0.ebuild b/www-client/chromium/chromium-94.0.4595.0.ebuild
new file mode 100644
index 000000000000..e74922587b5f
--- /dev/null
+++ b/www-client/chromium/chromium-94.0.4595.0.ebuild
@@ -0,0 +1,940 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="xml"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic 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="1"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
+	arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )"
+
+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 vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid )
+	screencast? ( wayland )
+"
+
+COMMON_X_DEPEND="
+	media-libs/mesa:=[gbm(+)]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxcb:=
+	x11-libs/libxshmfence:=
+	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
+"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0:=
+	>=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:=
+	)
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libxkbcommon:=
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	!headless? (
+		${COMMON_X_DEPEND}
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		x11-libs/gtk+:3[X]
+		wayland? (
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:0/0.3 )
+			x11-libs/gtk+:3[wayland,X]
+			x11-libs/libdrm:=
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-12"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-12"
+	DEPEND+=" >=sys-libs/libcxx-12"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-69.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			CPP="${CHOST}-clang++ -E"
+			if ! ver_test "$(clang-major-version)" -ge 12; then
+				die "At least clang 12 is required"
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="8G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+		"${FILESDIR}/chromium-93-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-93-InkDropHost-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
+
+	# adjust python interpreter version
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+
+	# bundled highway library does not support arm64 with GCC
+	if use arm64; then
+		rm -r third_party/highway/src || die
+		ln -s "${WORKDIR}/highway-0.12.1" third_party/highway/src || die
+	fi
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/src/third_party/volk
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/khronos
+		third_party/dawn/third_party/tint
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fdlibm
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/fusejs
+		third_party/highway
+		third_party/libgifcodec
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/harfbuzz-ng/utils
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libjxl
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/tcmalloc
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/tflite-support
+		third_party/ruy
+		third_party/six
+		third_party/ukey2
+		third_party/unrar
+		third_party/usrsctp
+		third_party/utf
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	if use js-type-check; then
+		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
+	fi
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\""
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" disable_fieldtrial_testing_config=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# highway/libjxl relies on this with arm64
+	if use arm64 && tc-is-gcc; then
+		append-cxxflags -flax-vector-conversions
+	fi
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use wayland || use headless; then
+		if use headless; then
+			myconf_gn+=" ozone_platform=\"headless\""
+			myconf_gn+=" use_x11=false"
+		else
+			myconf_gn+=" ozone_platform_wayland=true"
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" use_system_minigbm=true"
+			myconf_gn+=" use_xkbcommon=true"
+			myconf_gn+=" ozone_platform=\"wayland\""
+		fi
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=false"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+	doexe out/Release/crashpad_handler
+
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
+			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if use vaapi; then
+		elog "VA-API is disabled by default at runtime. You have to enable it"
+		elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+		elog "in /etc/chromium/default."
+	fi
+	if use screencast; then
+		elog "Screencast is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+}
diff --git a/www-client/chromium/files/chromium-92-crashpad-consent.patch b/www-client/chromium/files/chromium-92-crashpad-consent.patch
new file mode 100644
index 000000000000..956d19eee234
--- /dev/null
+++ b/www-client/chromium/files/chromium-92-crashpad-consent.patch
@@ -0,0 +1,46 @@
+From dad7c5dc4504aa66c39f2a38b3c563d18dd1395a Mon Sep 17 00:00:00 2001
+From: Andrey Lushnikov <lushnikov@chromium.org>
+Date: Mon, 12 Jul 2021 18:47:01 +0000
+Subject: [PATCH] Respect stat collection consent for crashpad user metrics collection
+
+With this patch, crashpad will no longer collect metrics if there is no
+user consent for stats collections.
+
+This is a follow-up to the discussion in https://crrev.com/c/2923889
+
+BUG=1210598
+
+Change-Id: I1eceaa10f9d09f95b74cb4a2d2eac03008ec5b40
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2999433
+Reviewed-by: Mark Mentovai <mark@chromium.org>
+Reviewed-by: Greg Thompson <grt@chromium.org>
+Commit-Queue: Andrey Lushnikov <lushnikov@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#900573}
+---
+
+diff --git a/chrome/app/chrome_crash_reporter_client.cc b/chrome/app/chrome_crash_reporter_client.cc
+index cd9a053..b34ad0d 100644
+--- a/chrome/app/chrome_crash_reporter_client.cc
++++ b/chrome/app/chrome_crash_reporter_client.cc
+@@ -144,6 +144,8 @@
+ #if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+ bool ChromeCrashReporterClient::GetCrashMetricsLocation(
+     base::FilePath* metrics_dir) {
++  if (!GetCollectStatsConsent())
++    return false;
+   return base::PathService::Get(chrome::DIR_USER_DATA, metrics_dir);
+ }
+ #endif  // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+diff --git a/chrome/app/chrome_crash_reporter_client_win.cc b/chrome/app/chrome_crash_reporter_client_win.cc
+index 474bf8e..2a66a3aa 100644
+--- a/chrome/app/chrome_crash_reporter_client_win.cc
++++ b/chrome/app/chrome_crash_reporter_client_win.cc
+@@ -160,6 +160,8 @@
+ 
+ bool ChromeCrashReporterClient::GetCrashMetricsLocation(
+     std::wstring* metrics_dir) {
++  if (!GetCollectStatsConsent())
++    return false;
+   install_static::GetUserDataDirectory(metrics_dir, nullptr);
+   return !metrics_dir->empty();
+ }
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index be0e57c4994d..6fb602e31f09 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -5,6 +5,6 @@ DIST dillo-3.0.5.tar.bz2 734472 BLAKE2B c8a7ac3a875740d2d64269b0d368e6f9395c89a5
 DIST dillo-3.1_pre20181005.tar.xz 907752 BLAKE2B a894583e2c50baf2c2ff615dadfbe79e7652154cc0f7b80a4253d27dbe2e5463fa9c7a44622a6cfdcc60822cee0e1c38c31231b5bc5ee9c7b22bb16a15cc8c90 SHA512 f1916c6261bfcae9264037eaee37497660e43e46641c42fbcc9c2592fa41602a83fc91ddce6aeabc0122c575bcff72339d181210f3039e5d4c5a7c25f88aa642
 DIST dillo.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7ec67018b17044a417209954d67f22e2000b0871d315a25388bacffab9599230fc9615877a2f08 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833
 EBUILD dillo-3.0.5-r3.ebuild 1241 BLAKE2B f304a6f6e61613f97fae92370271a09a43bfa195f913f8d5694e14136adf87129e29616a1a463eee49989a45cbbbf3885653e190dd8394ca83feb51d4553a685 SHA512 956089c7456747bf4f12da512233853d2c9180897aacd5b262089fc86a7aa9e7b6aa16621f7d5c094a13b4081521258a85904b19873a166b4f18df37685b6e4a
-EBUILD dillo-3.1_pre20181005.ebuild 1206 BLAKE2B 6ee03439127d10f70e4dfece3858ebd688d4a58af83b2e935a54f031c254c5e2716c2044cc1325cc38b431d6df56e7851d1ed8cc00c8d79868d8b04b20b24e0e SHA512 59b926338f5335d13bc72322216fd5169a7dd9a912470c70159188aabff5fb42cde86fa23047b69c1b1596a529fda3a480309f2b33b658663e47bec6df2d5c08
+EBUILD dillo-3.1_pre20181005.ebuild 1213 BLAKE2B c0c66dc90845a8ff72bf4144c95af6f32a3cc52e6d8fcfa757458e5f2bec0c04a0625ebc470c8020bff2c04d2ee87f23fa4106748c47eab5d7dd6d3806c2f88f SHA512 5b9473eac50c90cc3080de16b2d4f7e10026e807e356dc45f54ed7228341aaad71cfbccdadc382ef388c1b0165a8ea2d4136132ad9379850144f2e724171d5f2
 EBUILD dillo-9999.ebuild 1153 BLAKE2B 8c859ca6a5d600ef275efcf30cc36352ef7b761d6971dea299cd45e19c209ccde9402e41652a6f79b7913952d8bd88b9d8b3df49e40277c46d45299be4f90468 SHA512 695e0cac6fb25b75055d8c19a77e14d5c4c6dada6af22ab0904fe43d93b96bf1c1550c170385a0a2c1243b40d0e57ea68088069025bf9d60ebc2780eb5acfbfe
 MISC metadata.xml 233 BLAKE2B 3de3c3de175ca28e084160db38aa341bf4645b81b566c8fd2a4a7c7fe590f42b1621cabd3022e8ee05be6e7d05eb0d9c76557bc437aa06095480302cd9619e18 SHA512 fa4712f2016e6d008a8a4c7e47cae45d66a28e7c64ba7e67515c548e6048233aa0c55d2ff591a8dae5d3f861c0a758844b0c35e6a905db1c5d3a6b525cfc1271
diff --git a/www-client/dillo/dillo-3.1_pre20181005.ebuild b/www-client/dillo/dillo-3.1_pre20181005.ebuild
index a1bf0879c638..92580c3355db 100644
--- a/www-client/dillo/dillo-3.1_pre20181005.ebuild
+++ b/www-client/dillo/dillo-3.1_pre20181005.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-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc +gif ipv6 +jpeg +png ssl +xembed"
 
 RDEPEND="
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 8e9384ebad2a..6a3fecca8b4b 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_93.0.4577.18-1_amd64.deb 81258624 BLAKE2B 97372492b2fbf057232094e9567e816b30828a75fccb2438bf10974d4b522e1924ad4cb784cb11b8b7cbfaee18f25b0a0d06f4fd9fbeee2f438e9e57590a8192 SHA512 67e57bae0eaa5e4d6b98bb93c87928109ab616c0792ee95ac3719333efcf61cbbfca03514821571cf8248185a83408dd48d057cb3de4b05175e44377dc9a2631
-EBUILD google-chrome-beta-93.0.4577.18.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
+DIST google-chrome-beta_93.0.4577.25-1_amd64.deb 86859336 BLAKE2B b14f44b3c1a56c031dbece468ec2c3a596bc39d2d7dd7f146c5124ed8c5612ab6f7b3ad187cca1eccb4b7cf88fcffab839c966184ce0102fe0a644f28271f3af SHA512 b4543f46d39533cbf2571528c8d2a60271f72e56111b9de0dea7861a8027317975416e5309efcf5035a9fb22b5bb0d8e07eb2d80bbc03a2cccbe954b870f10b6
+EBUILD google-chrome-beta-93.0.4577.25.ebuild 2715 BLAKE2B 7cd9a213c86f2d1f04ac87edca4b98effb216351022c23057e92eec7645506e828826f683475cec58b91931cffd3a653fac81a131034145c8132482d62d163e6 SHA512 dfa73944174bb17d911ed8746d22b86aa2785ba3b5f9d85f1016f98f7b001da41859a66569946f3f6b6e3552ffe1b350db45e500be01bc4efb2488fa94dc654b
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-93.0.4577.18.ebuild b/www-client/google-chrome-beta/google-chrome-beta-93.0.4577.18.ebuild
deleted file mode 100644
index 823e4a8ef49e..000000000000
--- a/www-client/google-chrome-beta/google-chrome-beta-93.0.4577.18.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 desktop pax-utils unpacker xdg
-
-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"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	>=x11-libs/libX11-1.5.0
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-	selinux? ( sec-policy/selinux-chromium )
-"
-
-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"
-}
diff --git a/www-client/google-chrome-beta/google-chrome-beta-93.0.4577.25.ebuild b/www-client/google-chrome-beta/google-chrome-beta-93.0.4577.25.ebuild
new file mode 100644
index 000000000000..c92f2d8d73a3
--- /dev/null
+++ b/www-client/google-chrome-beta/google-chrome-beta-93.0.4577.25.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 desktop pax-utils unpacker xdg
+
+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"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+	selinux? ( sec-policy/selinux-chromium )
+"
+
+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"
+}
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 9c34f4319325..0bfd5d308265 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_93.0.4577.18-1_amd64.deb 81246220 BLAKE2B d20840b798b880f7f8758fb50e7744c3c5e2bb6765e75756ab9f828f09687ecf5a7481192ea732283c0bc3059a1e6ac17f483380d8c9190b76ea37168146ceef SHA512 0d2c36806e44c8fc83ba35b755c75373a4166834f61ef2c70c0aac6868a991697e4f0dbf47854adb894330e39e6e9a7d3651c542a97d78bb592bd3874b38abaf
-EBUILD google-chrome-unstable-93.0.4577.18.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
+DIST google-chrome-unstable_94.0.4595.0-1_amd64.deb 82492744 BLAKE2B c4db11c81b5eaea8098666cde06eb70c2c26721e5ac964911b504442b1c67614e23c2e831547e74241ffaa2ba48c68b5c52f92ff30b926a28dc6390e52213610 SHA512 2670927978603cdfcd89a9b1aaa1d537a58459844a77b4f8eddd1e75d01d31a951d6025bf18ad4414169e70fd1d204f70104323b0e6fd0e8f5253a7ec82b104d
+EBUILD google-chrome-unstable-94.0.4595.0.ebuild 2715 BLAKE2B 7cd9a213c86f2d1f04ac87edca4b98effb216351022c23057e92eec7645506e828826f683475cec58b91931cffd3a653fac81a131034145c8132482d62d163e6 SHA512 dfa73944174bb17d911ed8746d22b86aa2785ba3b5f9d85f1016f98f7b001da41859a66569946f3f6b6e3552ffe1b350db45e500be01bc4efb2488fa94dc654b
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4577.18.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4577.18.ebuild
deleted file mode 100644
index 823e4a8ef49e..000000000000
--- a/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4577.18.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 desktop pax-utils unpacker xdg
-
-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"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	>=x11-libs/libX11-1.5.0
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-	selinux? ( sec-policy/selinux-chromium )
-"
-
-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"
-}
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-94.0.4595.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-94.0.4595.0.ebuild
new file mode 100644
index 000000000000..c92f2d8d73a3
--- /dev/null
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-94.0.4595.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 desktop pax-utils unpacker xdg
+
+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"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+	selinux? ( sec-policy/selinux-chromium )
+"
+
+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"
+}
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 3b1ba063632e..e3bf375a9429 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_92.0.4515.107-1_amd64.deb 86193152 BLAKE2B 3b1bcdb5b117b24546ca5476706c786881c0a68d7eb720362f7128d1ea9cad298ea4d5f0bfb708848264fc51d0265ba67c9f206bc6a89ea4e8d1b0bdc9ce0ff9 SHA512 c842e423e8d6dd42bace4d5bb835f7dbf44f46bce0723317d41f4bf56c6250321351b68bdc3d4b46336a6cfbfb78b621eac1df0b530b345bbd2997612e0561cc
-EBUILD google-chrome-92.0.4515.107.ebuild 2711 BLAKE2B 0e222b8062c222ef468bf0c359495bc03a7ad587fa2a4e9c6868252c1dea481841c65d26910c9d3795288e241181b61b9b07544bff7fd6236a12b009e3c0cec9 SHA512 3c0ab6db4ac6b352765aa6c37cc2e62ba7ffa237a3b72865dca0b61c879c6b5dbbd620284fec368548ee0ac8cce31a0435a020359e8523d2d8248ceeb0f60567
+DIST google-chrome-stable_92.0.4515.131-1_amd64.deb 80213604 BLAKE2B c92d46b302e4a9e713f0b47f676aeb768441b334de14b95f72708f1b38145b46cf8c5c0558c9c39e839dd197a5b5ef42403045b1fb5c298fe013e5518f9c9487 SHA512 4ae47aa54f81538fee35065ba46c27e33fe73a33fa50edb50f4c08af3f8ae388f7ad596caaaf2823a1f758eec380a6830fd1f802c64f05485bee04a138b80e7e
+EBUILD google-chrome-92.0.4515.131.ebuild 2711 BLAKE2B 0e222b8062c222ef468bf0c359495bc03a7ad587fa2a4e9c6868252c1dea481841c65d26910c9d3795288e241181b61b9b07544bff7fd6236a12b009e3c0cec9 SHA512 3c0ab6db4ac6b352765aa6c37cc2e62ba7ffa237a3b72865dca0b61c879c6b5dbbd620284fec368548ee0ac8cce31a0435a020359e8523d2d8248ceeb0f60567
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-92.0.4515.107.ebuild b/www-client/google-chrome/google-chrome-92.0.4515.131.ebuild
index 5378595af7f2..5378595af7f2 100644
--- a/www-client/google-chrome/google-chrome-92.0.4515.107.ebuild
+++ b/www-client/google-chrome/google-chrome-92.0.4515.131.ebuild
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 7c1abcb8fee3..74caae22e2c5 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -2,4 +2,4 @@ AUX lynx-2.8.6-mint.patch 1001 BLAKE2B 960b2401c262d2b3cb46a443eaa1bf0e8f890745a
 AUX lynx-2.8.9_p1-parallel.patch 2127 BLAKE2B f78dd62fdf81dfa3403ad358286dc2e27d76b2bb7a65d877317a22635931499687ac75fea6d02866295a65851cfcd7c5ebf5474e1120104d998119eed132e82b SHA512 fe5ea8caab053c0d4240d34c63ee7cfb81254851eaad7e206e2b840b963ad160982566ba5cbee5fa98c732b3ddd3ff8ed88e3b2b8e6328aaa9d8b5350e2d97bc
 DIST lynx2.9.0dev.6.tar.bz2 2730690 BLAKE2B 2b176db49ac053e6c057b366b625883f0877f0bbf9bc2fbc0dfe6a13af48e0c9d5a64de52e794a4e771d7f6b160c74589a9275543f2657cb678bba149cdba38c SHA512 0c15e00a8e36e43671a093182c69593d50bc5c51a4acd92faa59416055bf4a1fd9ecde903a0209963f1f55d1fd85136e8448ca7867e198100ff749c53e1e1531
 EBUILD lynx-2.9.0_pre6-r2.ebuild 2536 BLAKE2B 2e56c0a17e40ccba0f78199c3ff7bef7362b8b42d5ef42c1ed7792aa0e1fde92d20c70fdebe9e835083770f155bd0a84cc2ba9d40c1e270196aac8b38bc73247 SHA512 2d9aaa442037c25d0ea67bbd2acbc80361dbba7ebe6f27ed2525f74f6aff594b490bffe3aac9a1791d5470f832cc062151b022e193579b187af9935d25061a89
-MISC metadata.xml 537 BLAKE2B bfecef317392ccba874d2291fd60140313675be5a4e503f2ac9bec1c20e817582d98800570188082de4ec23bc5a15b5b4785dddc79c907da2c553eec0022026e SHA512 068e36de4d5883757a52b05efc3180230521f58f7b3e9686a09f0841339c9f4c54104e558015aaddc0b9be74602b76fe667d995ff7b4bfef810124d21f6ae6dc
+MISC metadata.xml 453 BLAKE2B a8d91c957ca10093d67ae03289b2f4f117efba84e60ef9f57000302c3672ecd17775e5a826ce345a31d65ce7f1afceeaf37f462cfba2bbdf9d8d0d9f91cbeff6 SHA512 85580db82a1b30c8b57cc7330397774e2628f1d0b708ed68df8ef5380140721bbc85b9faa68ac97cf255a50e84ad9e1bd3f619abc19de8079e9de9e0925f18c7
diff --git a/www-client/lynx/metadata.xml b/www-client/lynx/metadata.xml
index 30958195d7e8..cc5b0dd4d824 100644
--- a/www-client/lynx/metadata.xml
+++ b/www-client/lynx/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="ssl">Enable HTTPS support.</flag>
 		<flag name="gnutls">Use gnutls library for HTTPS support (openssl is the default library for HTTPS support).</flag>
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 44f5204ad49c..796172898905 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_92.0.902.49-1_amd64.deb 101813676 BLAKE2B 45cf8c9a3bca228639914c63ecfd70f29611361b8e3a0194e1a60baa3d044f5e8a0b976cf72dddc940679fe0a3929e8378a36534d37572ccea988618960b4759 SHA512 f33b024576d6263a4f27488858ddfbec2fd4d160cab67c679d9f68423334dae47a68e69610cd9bba8d9cb55f067167ddd676cc64af3792824924d2f4618f61e3
 DIST microsoft-edge-beta_92.0.902.55-1_amd64.deb 101830296 BLAKE2B b5194d43b28e73f2764e0b27b42fba737d2b1b12c03d7b7f9066ef9bfe41895b39acc160d27174fee214b157d17216613dc6960c0c868a037799368ee3476829 SHA512 4bf960e814576f72232bb40a0abfad634cc6fae1101b053cf831c12e04806feead2b6886acfb1a70dfd0eb812214cc2dbae3f0aba98293c1f3a6c898864aa59f
 DIST microsoft-edge-beta_92.0.902.62-1_amd64.deb 101311562 BLAKE2B f116c5d13307f9f8c2a4ba2dba24b846cfad3dd315cef725ac6244b1824b027f9808efaa79b5fb6b134f7b4576225ce2f7f9732e556a68e485fa1f68ecae16f7 SHA512 61e087e3b88a6cb68f35280acd0dfde9faed9b57bbffb5273748d1dedf0cee2a0145a95d5038a6384cfb0da10564d059cdfbc791a3f495ae805f65b0ab70a983
-EBUILD microsoft-edge-beta-92.0.902.49.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+DIST microsoft-edge-beta_93.0.961.11-1_amd64.deb 104332608 BLAKE2B 6d77f2d7d3c7b3eb1dcef56999646648e7815dd699953d2b04bdfbf7569fcf4470db9aae3980d0f791a1d74ce9f97a9db1c414fd609302f1843c199a42c5ddf0 SHA512 e0323ba918c723709be761c96f79539ab99dfc751cb9755e921b389070f6dec343d4a02ee5f86705b0af1d358dd0031642e801bc2ca8d59068b3710f14aa5e70
 EBUILD microsoft-edge-beta-92.0.902.55.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
 EBUILD microsoft-edge-beta-92.0.902.62.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+EBUILD microsoft-edge-beta-93.0.961.11.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.49.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-93.0.961.11.ebuild
index 6887ef49a3a3..6887ef49a3a3 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-92.0.902.49.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-93.0.961.11.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 7bc06b200578..59761bc50aaf 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_93.0.946.1-1_amd64.deb 105576242 BLAKE2B 2f7d21dcb74435d3dd1d45d1c813dc3cbbb67a20f651e0f93e5d4f26480e0399c540c28951a4167dec270bc137eec8ef4751cbf81101b4a70014c214290e6875 SHA512 e13da0ed4ac97ecd47977bcd319b30b7211fd86bfb9f78e9df14a24e139bc30021820ff96bf1ed765bd5ffd41fbf04c3fbc24f0a0a796147fd03ae01f2d07723
-DIST microsoft-edge-dev_93.0.957.0-1_amd64.deb 105580462 BLAKE2B f613e641658cbe6dd08a99e955f8d77b51b1af59e296a95a5bbcb4555a476bb20fd2dcf5794e07729cdb53ce6b5b0ef4869c87a48aad95f573563a8bedd17f31 SHA512 21c541674e6ff4445cf9dcf474b1a1596e3f9064b35657fa915cdf6b6c234e6779e17a0bcb4055548a1b8226232a6b5f4be8cbe8ce2b42125d3598ffc9b45e7c
+DIST microsoft-edge-dev_93.0.961.10-1_amd64.deb 104328860 BLAKE2B e9cd395741622902b13c485f68746bb6575eaad8489645f54b4c36d840667e73a11259a218e5a936cafc3cc2d30e72a611e8127e0a0a4322665fcb03ab617be9 SHA512 bea7b972487b4fb97979cfa602aa86f3b6e9c1321b93dc05b8bac5cc0a34be30579e840217eb3fc61819a12c517f7b0fbb3ab690a12a32673722664a2c00a2be
 DIST microsoft-edge-dev_93.0.961.2-1_amd64.deb 105570166 BLAKE2B 9721d430bd77ce3baa67051a4eff92e6467ef4ff93c6364427f384fde422c44d1f55a6cd98439e784411a8b19390463382c9fa8ec1955b4e343823b68b552b31 SHA512 9a826b0125bb29b104ad5cf9ed4e5c87bd0ad2327b09e61370366d5b6af24abb85c433c37c0b3773d511586c9604c30f116173f0a2cc3627a3e8f966f5124fbb
-EBUILD microsoft-edge-dev-93.0.946.1.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
-EBUILD microsoft-edge-dev-93.0.957.0.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+DIST microsoft-edge-dev_94.0.972.2-1_amd64.deb 105652232 BLAKE2B 35853c109e23a5dc160fce2da402772a947f153ed81c3f5bdc4f6bd76d61b48688f59390a90c8b874f5cc8ca9c67b1232fd78d2c349f8d0350b4eda9fecd75da SHA512 f4ccbc3c8ea11b7d969e779c119bfa31f0203fc3c8d834bb649184ee1d27d0cb110c455e9904f08150096104f44d992997f4df92d9079390e34ada6a414f0b35
+EBUILD microsoft-edge-dev-93.0.961.10.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
 EBUILD microsoft-edge-dev-93.0.961.2.ebuild 2218 BLAKE2B 41fa8d4a915f60c38966b54f6d862697026c786abb080fd67f16c1e4731fd7ef1032edfc2325c7ac90265792ccb3ae2d94e0a0d215dc927b2375d5a2da63076f SHA512 73c46347a6dffc6191d2a96fa41acfc347947a2c26665379ad442a560d3c482af2e1685873a8d9f45cf75b6897101887d0b3b5eada6c0f90bba01b4591289013
+EBUILD microsoft-edge-dev-94.0.972.2.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
 MISC metadata.xml 437 BLAKE2B 2598bcc8023b9cb612219216e6873e77072ce2b452aef80a08ee43be81d25f8c8e84cb063952d1a15681fe7fe7970ef2941e949f07c57cc7728be6e25f980a73 SHA512 9ee343225c6105150638346cdeedaa70c24ff1be6263b9134572737c8a06e7f63dac39e733aad87e2b2cf5cbaf647ba1f8577bb14d160e68db36cc328878efcc
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.957.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.957.0.ebuild
deleted file mode 100644
index 6887ef49a3a3..000000000000
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.957.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/en-us/edge"
-
-if [[ ${PN} == microsoft-edge ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-KEYWORDS="-* ~amd64"
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="microsoft-edge"
-SLOT="0"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-misc/curl[ssl]
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-S=${WORKDIR}
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm _gpgorigin || die
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-
-	local suffix=
-	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${EDGE_HOME}/msedge"
-}
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.946.1.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.961.10.ebuild
index 6887ef49a3a3..6887ef49a3a3 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.946.1.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-93.0.961.10.ebuild
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-94.0.972.2.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-94.0.972.2.ebuild
new file mode 100644
index 000000000000..3b1abf5f25da
--- /dev/null
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-94.0.972.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/en-us/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl[ssl]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 7e076910683a..18671871521d 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,9 +1,10 @@
-DIST opera-developer_79.0.4100.0_amd64.deb 76878004 BLAKE2B 285aa5b687280a0d76e06ce40d7ae3b20e172e3b8a1d8da7b66b4f029dc203581cca7e4b336373bb3d78a5cb66ca50ae38a535770225f75197cf4ebdf4248ea5 SHA512 346ad075121e114d3efd96e8b4dca5f5e502c71dc9bd25ed6c5699e5b8a2d100e74b6bfad3d2bc7ba482025856c155f88c85f5a0ec6ad50dcdecde6d6238d1f5
 DIST opera-developer_79.0.4105.0_amd64.deb 78242532 BLAKE2B 8034f10c0eb04d50367bd929bcb1d7ef8ef432ac15f3f8ce5c03a1c456814d0db89b2411e1d92703951d2a545f454329d7121a9b52d10931e4115e9fac9fa2e7 SHA512 9852c04e6659f63f6602a34b466fa4af1fc9ef11f654f3f3db348c27d9964387eb550cdbf40f718452e741e57beba76ca7511f0f36c45f0e8c6fc81b3719690d
 DIST opera-developer_79.0.4114.0_amd64.deb 78296160 BLAKE2B 459d37a4c08654f2e3ec1b7ac8b61384ad263b5cde08d8a6fee50c57fc8534db3167d6a6e1791f53fabaca59fbecb99accada01126b53294b55309fc8bd3ba93 SHA512 8f66ad70df8ef978cec906ee2f4bcc811a5b23bff9769ba27450aaedfca3e30be7ece88e33d07b4404624fe8a49c0d73883aa0c48cffe1c9896e7960494ebe9d
+DIST opera-developer_79.0.4135.0_amd64.deb 77553464 BLAKE2B 05d9831150e57660e2980b5bc32c96fbb93f2c0515c292a39fc2c04df063ad222aa5ae4e5643dd7adfa83c7e42ce80721dec59fc967b4bec96dbb703b1dd605d SHA512 a3be1314490a1e654e7baf8c62c88345942773fd33d3f1761f77a78e8192fe97f7bd6008a87bf399f8a94be5bcbf1178cd66368c22781b45c45562d950413279
 DIST opera-ffmpeg-codecs-92.0.4515.20.tar.xz 1382256 BLAKE2B 1e00bb4ee655573ac7b6c2f04ae2ae9a073f839ff6deeba3e3c4c2c58a10b1152068f0549fb3c6de758628317ad7c568cf5d3031294208800b470e3ed00c938b SHA512 6aeec66a9fcea1fcf5ecfd23b56589598f5e612e788b4e417037250470b83f91e461e3b0c20caf7853677d314053ca9d489983736708f15d21a82d68d2cdd5c2
 DIST opera-ffmpeg-codecs-93.0.4549.4.tar.xz 1389084 BLAKE2B b7895bca319f9626c4ffe582732c3c28bd188e0c4704b349114f988eec0dc9ef46805ef07c49155eb7b6b9ec2fa0a675c3b4e156cbf0bf5fccfc927c5502be9b SHA512 b9b8cc78e9fce5dddf32e7b2ab937b0f94fa2a7c6ca528c6274820e649609427a389bcf829f4c4e5db155e361d27454071b235df5978feb2a683012dc3b92dfe
-EBUILD opera-developer-79.0.4100.0.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
+DIST opera-ffmpeg-codecs-93.0.4573.0.tar.xz 1389664 BLAKE2B 4efc7341655bed294d4c6237dd9e7d005a815c495a45bec6f0b7fcbec40345e22ad5199ec1db3c822c123663d3ce95e6b87af18b1ac6cad31793ae7fdb440918 SHA512 f7c62c6860d1440e91344c41d6c9b3fbef4745cb95262538dcb3af9147406b3b0c71e72605042c423cbdd618a53f902791bcb6b7fcc8a4cae92ebf3cb38e8407
 EBUILD opera-developer-79.0.4105.0.ebuild 3042 BLAKE2B 1671906aea6b2e37e255be734db04ffe3e4ed61415cb86b1db75ecbc6601d277b5b2b9238310b8be332fa61616c7eb457cfa68b648ec84d11712b2e8c74657c3 SHA512 75362c483fd4ce329cdaeea6277d302647c00f8aa5b8a5b0031200f5d0f751ca35bf1dbb0d8a3678b9af5cd64861dd55251a33ddc48e5c61863ecbf5126ee0d1
 EBUILD opera-developer-79.0.4114.0.ebuild 3041 BLAKE2B 4469ab77ae37a2490c4ed9d397c197c3e2c2503847f5f0a82b0ef8af0c563bf314a2a69ed8ece5ae0693c58647983ad4c5fa3e6e1c5b537186e59d1346e29509 SHA512 82bfbde1ffad4f436b0750703455ab7a7e7405667cbaf6d303688e2afbfedbc563e9a7f55c5b3d2eeb2f5a212417eae7942d82e3afd3ab868cc86cd715a24b78
+EBUILD opera-developer-79.0.4135.0.ebuild 3041 BLAKE2B 32064f91caae240abe16c35676047d2b60f2b34339fff8e5683854412141880622eaa5e536e8f7ce23b79e02956334a320b76a96bc5e04aba7bdb4761597b873 SHA512 0bf49ee79ba73339260a38b8dbfc8687716ce9268ec6e041abd0680fd38735daf499c74fd4a033bdcec6937df9a920f02eb90aa0b6a2283d7bfc3b9b7b2b79ac
 MISC metadata.xml 379 BLAKE2B 1945bc4341ba4a9e75097fec82275f5fd31fca881a432a31ee0cb5ebfb51ebea4cd707731673a5de3cee8797cb532a3e929db9f9f144b84fd54af545b4444118 SHA512 19c3f7dc99f1c71bf9e6b1ed440b660c2712000d543f40f454a2fdd43f4eb3ed2ea4907880859d4084ea8ac1591b03463a8f19ae56b2396eee442c4224fc60be
diff --git a/www-client/opera-developer/opera-developer-79.0.4100.0.ebuild b/www-client/opera-developer/opera-developer-79.0.4100.0.ebuild
deleted file mode 100644
index 5f5790fcf46c..000000000000
--- a/www-client/opera-developer/opera-developer-79.0.4100.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib pax-utils unpacker xdg
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2018"
-SLOT="0"
-
-SRC_URI_BASE=(
-	"https://download1.operacdn.com/pub/${PN}"
-	"https://download2.operacdn.com/pub/${PN}"
-	"https://download3.operacdn.com/pub/${PN}"
-	"https://download4.operacdn.com/pub/${PN}"
-)
-
-if [[ ${PN} == opera ]]; then
-	MY_PN=${PN}-stable
-	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
-else
-	MY_PN=${PN}
-fi
-
-KEYWORDS="-* ~amd64"
-
-FFMPEG_VERSION="92.0.4515.20"
-
-SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
-	proprietary-codecs? (
-		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
-	)"
-
-IUSE="+proprietary-codecs suid"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gsettings-desktop-schemas
-	media-libs/alsa-lib
-	media-libs/mesa[gbm]
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="opt/opera${PN#opera}"
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "opera only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	# move to /opt, bug #573052
-	mkdir -p "${OPERA_HOME%${PN}}"
-	mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
-	rm -r "usr/lib" || die
-
-	# disable auto update
-	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
-
-	rm -r "usr/share/lintian" || die
-
-	# fix docs
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-
-	# fix desktop file
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-
-	# remove unused language packs
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# setup opera symlink
-	rm "usr/bin/${PN}" || die
-	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
-
-	# install proprietary codecs
-	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
-	if use proprietary-codecs; then
-		mv lib_extra "${OPERA_HOME}"
-	fi
-
-	# pax mark opera, bug #562038
-	pax-mark m "${OPERA_HOME}/opera"
-	# enable suid sandbox if requested
-	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
-}
diff --git a/www-client/opera-developer/opera-developer-79.0.4135.0.ebuild b/www-client/opera-developer/opera-developer-79.0.4135.0.ebuild
new file mode 100644
index 000000000000..7d03478f7a99
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-79.0.4135.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib pax-utils unpacker xdg
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2018"
+SLOT="0"
+
+SRC_URI_BASE=(
+	"https://download1.operacdn.com/pub/${PN}"
+	"https://download2.operacdn.com/pub/${PN}"
+	"https://download3.operacdn.com/pub/${PN}"
+	"https://download4.operacdn.com/pub/${PN}"
+)
+
+if [[ ${PN} == opera ]]; then
+	MY_PN=${PN}-stable
+	SRC_URI_BASE=( "${SRC_URI_BASE[@]/%//desktop}" )
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+FFMPEG_VERSION="93.0.4573.0"
+
+SRC_URI="${SRC_URI_BASE[@]/%//${PV}/linux/${MY_PN}_${PV}_amd64.deb}
+	proprietary-codecs? (
+		https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-${FFMPEG_VERSION}.tar.xz
+	)"
+
+IUSE="+proprietary-codecs suid"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gsettings-desktop-schemas
+	media-libs/alsa-lib
+	media-libs/mesa[gbm]
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/pango
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="opt/opera${PN#opera}"
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "opera only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	# move to /opt, bug #573052
+	mkdir -p "${OPERA_HOME%${PN}}"
+	mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die
+	rm -r "usr/lib" || die
+
+	# disable auto update
+	rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die
+
+	rm -r "usr/share/lintian" || die
+
+	# fix docs
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+
+	# fix desktop file
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+
+	# remove unused language packs
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# setup opera symlink
+	rm "usr/bin/${PN}" || die
+	dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}"
+
+	# install proprietary codecs
+	rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die
+	if use proprietary-codecs; then
+		mv lib_extra "${OPERA_HOME}"
+	fi
+
+	# pax mark opera, bug #562038
+	pax-mark m "${OPERA_HOME}/opera"
+	# enable suid sandbox if requested
+	use suid && fperms 4711 "${OPERA_HOME}/opera_sandbox"
+}
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index f08ea7ee5706..2ce2196727a0 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/wsmake/Manifest b/www-misc/wsmake/Manifest
index 16c891c6ac9a..5be982f66685 100644
--- a/www-misc/wsmake/Manifest
+++ b/www-misc/wsmake/Manifest
@@ -1,7 +1,5 @@
-AUX wsmake-0.6.4-bv.diff 257 BLAKE2B bc346eb93541ab6e5a66b9fa69abbd3614492e23f2b1b6001ba9a5ba5d7494be8130f3e8c7b65e42ec0fe57b9951d72984b99cd7aab7515d93dc87d68be73ac4 SHA512 8f0e154960fd0d12507007e1482f641f1ab39efc9b3614e55c6e56fab78b6895b8dbdb6684ce55ddc117304a1ba9b88ca6866ea50131ee2aadcd947fede69303
 AUX wsmake-0.6.4-fix-const-va_list.patch 781 BLAKE2B e73ff7c6c7fb2edd44c0d174ac3a738fe4aab3e15622eec5e6e3c3d7eb68a700b733548ab0c1e06f5304c092ba0813915b4ad2836c6b18c63418934b581f05ec SHA512 ceae38c3fc09f8e88d4ba9eb64467df5266b8332b365fe217354bf362343fa074e1e4407303d93de7f82b444a02f79d719dc0173156254501eba9144975f6867
 AUX wsmake-0.6.4-gcc43.patch 771 BLAKE2B 0eb6b683f2a50a3f7e65175fa4de9100109733e924d9a846fdeaaa0f80f8bb50f48f2750f798aa1160db8e0e8f1b188e83f6f214c5419930d62712de52d17817 SHA512 d155fd9b7bfe27bff396c2adaad39b9bcaa876d5a5b7dc77d0bb6932e548a65b088f79c36570036c7a06b1f1ae3d433716e696f57cea1bb74ac4fdb48fb9bee8
 DIST wsmake-0.6.4.tar.bz2 351688 BLAKE2B 4e810b1b5f697bc8a7bbb27a4023ff50f90fbcab5f9bf7890277ebb95d5fbf90cfaad51f181c4a76bd532f802fd4eaf07dbab6757a15ee242f80dbef19ce0b08 SHA512 0f5d125053222c624f9c19f4147f0d97311acb11050e09112ae7b13175ea64d0ba75942c5772e2ffe12d2913cea370ed663d7cb649eef67e0f8379775a3459c4
 EBUILD wsmake-0.6.4-r1.ebuild 833 BLAKE2B 10a8a21cc6c6f4f2f6c78754bb1c5cf2861c971c74b2f7f7486849a96b65c206ed1d597275ae1b8002b7b7d98266f8d2b8644f1c07090365a306424ffe7260c8 SHA512 07e3969de508bda2d687d05ebd12cdd164eaef1c4a45be09d3f7c4a34bfbdc6e60aa09b545ac96cb3b240be05ed15aec9b53fc41d50ab0ca54b77fbcae80473d
-EBUILD wsmake-0.6.4.ebuild 756 BLAKE2B 2496884ecab4c2ead35415e30da6e539d069d58d27917c38be6d33aaf7be55a8c9f2f926f7f7c4ee86616b6a02f29a2d463e2cd6574849bb4b85222964f1dbfc SHA512 8490fb98588e666d3c33a7f061f9bd7b4f529165b157d02b4b51a23ec3d6f6581234625b58f0b6c16aa93db3b0178793c370309b7e9345f570a690439a176dd4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-misc/wsmake/files/wsmake-0.6.4-bv.diff b/www-misc/wsmake/files/wsmake-0.6.4-bv.diff
deleted file mode 100644
index 15cdf05f5d25..000000000000
--- a/www-misc/wsmake/files/wsmake-0.6.4-bv.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/libwsmake/wsUtil.cpp
-+++ b/libwsmake/wsUtil.cpp
-@@ -714,7 +714,8 @@
-   if(__wsmake_quiet) return;
- 
-   vfprintf(out,output,*ap);
--  va_end((void*&)*ap);
-+  //BV: this does not compile:  va_end((void*&)*ap);
-+  va_end((char*&)*ap);
- }
- 
- #ifdef DEBUG
-
diff --git a/www-misc/wsmake/wsmake-0.6.4.ebuild b/www-misc/wsmake/wsmake-0.6.4.ebuild
deleted file mode 100644
index 42834c03580f..000000000000
--- a/www-misc/wsmake/wsmake-0.6.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Website pre-processor features tag substitution and page ordering"
-HOMEPAGE="https://sourceforge.net/projects/wsmake/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ Artistic"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="examples"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-bv.diff
-	"${FILESDIR}"/${P}-gcc43.patch	# 251745
-	"${FILESDIR}"/${P}-fix-const-va_list.patch
-)
-
-src_unpack() {
-	default
-
-	cd "${S}"/doc || die
-	tar -cf examples.tar examples || die
-}
-
-src_install() {
-	default
-	dodoc doc/manual.txt
-
-	if use examples; then
-		rm -r doc/examples/CVS || die
-		dodoc -r doc/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 12609e5b3a77..86341ddf9455 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 f0f307d7bff3..b3406da7989d 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_93.0.4577.18-1_amd64.deb 81258624 BLAKE2B 97372492b2fbf057232094e9567e816b30828a75fccb2438bf10974d4b522e1924ad4cb784cb11b8b7cbfaee18f25b0a0d06f4fd9fbeee2f438e9e57590a8192 SHA512 67e57bae0eaa5e4d6b98bb93c87928109ab616c0792ee95ac3719333efcf61cbbfca03514821571cf8248185a83408dd48d057cb3de4b05175e44377dc9a2631
-DIST google-chrome-stable_92.0.4515.107-1_amd64.deb 86193152 BLAKE2B 3b1bcdb5b117b24546ca5476706c786881c0a68d7eb720362f7128d1ea9cad298ea4d5f0bfb708848264fc51d0265ba67c9f206bc6a89ea4e8d1b0bdc9ce0ff9 SHA512 c842e423e8d6dd42bace4d5bb835f7dbf44f46bce0723317d41f4bf56c6250321351b68bdc3d4b46336a6cfbfb78b621eac1df0b530b345bbd2997612e0561cc
-DIST google-chrome-unstable_93.0.4577.18-1_amd64.deb 81246220 BLAKE2B d20840b798b880f7f8758fb50e7744c3c5e2bb6765e75756ab9f828f09687ecf5a7481192ea732283c0bc3059a1e6ac17f483380d8c9190b76ea37168146ceef SHA512 0d2c36806e44c8fc83ba35b755c75373a4166834f61ef2c70c0aac6868a991697e4f0dbf47854adb894330e39e6e9a7d3651c542a97d78bb592bd3874b38abaf
-EBUILD chrome-binary-plugins-92.0.4515.107.ebuild 1171 BLAKE2B e81b97fb2023b7dca16db3eb99b30a844f31546669b0e95a972777acbd37aa8765c3a5a40123d8c7f93dd2ec627d1417100c4cdcac6f013e9402c2ff392f13eb SHA512 7fbadae792a71fd25142c1fea11f26af0508be8d29b3e59c349a0e3d02d3c5f9898f9ad2914bc7b4d8bfe0ac53544ae87fd7367cf1b008774fbd3490169c1900
-EBUILD chrome-binary-plugins-93.0.4577.18_alpha.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
-EBUILD chrome-binary-plugins-93.0.4577.18_beta.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
+DIST google-chrome-beta_93.0.4577.25-1_amd64.deb 86859336 BLAKE2B b14f44b3c1a56c031dbece468ec2c3a596bc39d2d7dd7f146c5124ed8c5612ab6f7b3ad187cca1eccb4b7cf88fcffab839c966184ce0102fe0a644f28271f3af SHA512 b4543f46d39533cbf2571528c8d2a60271f72e56111b9de0dea7861a8027317975416e5309efcf5035a9fb22b5bb0d8e07eb2d80bbc03a2cccbe954b870f10b6
+DIST google-chrome-stable_92.0.4515.131-1_amd64.deb 80213604 BLAKE2B c92d46b302e4a9e713f0b47f676aeb768441b334de14b95f72708f1b38145b46cf8c5c0558c9c39e839dd197a5b5ef42403045b1fb5c298fe013e5518f9c9487 SHA512 4ae47aa54f81538fee35065ba46c27e33fe73a33fa50edb50f4c08af3f8ae388f7ad596caaaf2823a1f758eec380a6830fd1f802c64f05485bee04a138b80e7e
+DIST google-chrome-unstable_94.0.4595.0-1_amd64.deb 82492744 BLAKE2B c4db11c81b5eaea8098666cde06eb70c2c26721e5ac964911b504442b1c67614e23c2e831547e74241ffaa2ba48c68b5c52f92ff30b926a28dc6390e52213610 SHA512 2670927978603cdfcd89a9b1aaa1d537a58459844a77b4f8eddd1e75d01d31a951d6025bf18ad4414169e70fd1d204f70104323b0e6fd0e8f5253a7ec82b104d
+EBUILD chrome-binary-plugins-92.0.4515.131.ebuild 1171 BLAKE2B e81b97fb2023b7dca16db3eb99b30a844f31546669b0e95a972777acbd37aa8765c3a5a40123d8c7f93dd2ec627d1417100c4cdcac6f013e9402c2ff392f13eb SHA512 7fbadae792a71fd25142c1fea11f26af0508be8d29b3e59c349a0e3d02d3c5f9898f9ad2914bc7b4d8bfe0ac53544ae87fd7367cf1b008774fbd3490169c1900
+EBUILD chrome-binary-plugins-93.0.4577.25_beta.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
+EBUILD chrome-binary-plugins-94.0.4595.0_alpha.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
 MISC metadata.xml 262 BLAKE2B 6958ab33a832169dbd6b7077bfeae3f398c5d825430d3d85f7f37d732951fa0585a75d28766111d82e5103fa4078cfb3e3d16b98a4520b268d4fd6b670ce811e SHA512 b440c405c25f905f11aeaab1ee3721846ac26502b1e02656f773a3b3be4bc636e85af6185c043c8e94205a3297476d3d2230d6c519d477b5c7d42268916e1128
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.107.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.131.ebuild
index 575d76b0e179..575d76b0e179 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.107.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.131.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.18_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.25_beta.ebuild
index 969dd2f57c6a..969dd2f57c6a 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.18_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.25_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.18_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-94.0.4595.0_alpha.ebuild
index 969dd2f57c6a..969dd2f57c6a 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4577.18_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-94.0.4595.0_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index d9b0754406ea..28fca949a2a5 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 19a6ea3fdedf..356a093fc486 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -37,7 +37,7 @@ DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST njs-0.6.0.tar.gz 528419 BLAKE2B 7b3c9dd4be8182298cc283e8b19eb4efeef66416d26332ae73dde66b5b67ad980c3e07f12fe0006dfb9710f3df449ac2598bfd1803f6c86d721f48697d975087 SHA512 fa569623fd594e859c535c75041be443ef6329a4ee33d9e0f29eeb56e69ae2f3c44264ccba736b4a97ab0b33700f381acb65a884889d6f644f3fbce7c1bc586e
 DIST njs-0.6.1.tar.gz 529124 BLAKE2B a24b6542dcef6599d18b86d38dbaeb554beeddb5c100f5bfb97c87c81bd66842afc6f77f23ef2c542ba32da96d5c2f999d3c869fa8d76d919a4f964020d19e30 SHA512 996cdc11d65af5e3d5b3a8f28087868c40409a062e6e1ed3eac8e516cb60b13f88a945c86bea5dde1bc089fe5f96f3ba351d87dbfd513f7140ea4ce98119959f
-EBUILD nginx-1.20.1-r2.ebuild 40244 BLAKE2B 0e325b379b27a89daad78d3b5267d166cc011e7436525170f816718806fe04fe008665f97cc6863100a2a4e3c0b024ccb67277bd324b77a6f2d365d885dfdee0 SHA512 3ce05cf4102b39f1dc02313063dba64011ca8dc4b78550d7492abbabfbd241691c044f57e12d906bbed67b23eb2cfbde1a82192902de62e9b7c58e1d83dc94b4
+EBUILD nginx-1.20.1-r2.ebuild 40243 BLAKE2B cbf3725815a2f941c0e276a415363d80ea873570f335c3a7013e11e4d4aaf40041ae3bc51360373f84f4a7e29a20df1bfa8c1fe226fe49e64a92c7b15f8d35ad SHA512 1d2b89c0242db11cdf3d3c402f47f0b4b7ed77e250a3fd10a9c2f021962b2b00d27dc5131d83f44d37481af5bbe1f0f54745f6ad52eb8fc33ac65c771643cb48
 EBUILD nginx-1.21.0-r2.ebuild 40247 BLAKE2B 030d4299eb71c2c15c128d6999de8e37a82b231c2944cacd2d43b86c7b192f2abe43bd87aec89d28b343e9f915947850efc2a05eae9d77083c84de9915c8107f SHA512 39e598591c3ecf5d0b28558375a04c53188b6dfaf44b301ea55a5fe5354bc0e2bf800f0d3167414713369c57627beaa9d7a92242e59eacb30ca3c3d36b586377
 EBUILD nginx-1.21.1.ebuild 40254 BLAKE2B 39d149c942a6e7b4b80f9a9f4e34901218f7c58b040deecd7e1a63624125ac9579bb8df2afed47654bf4884fa8494e61953c7842aefc79f9f8685257cffc65d3 SHA512 4f241d292ef1a255c1938fc3c241800247d0fd2250debf40a33c476a0ed3b36945d245827b24cf31e8df60e6c39dec9dbf7d29c9b612d588fa43502c49e1fca8
 MISC metadata.xml 1045 BLAKE2B e439ddfd1104b92548cc094a890152297ff81e1c4c3d04e58df8c2f1ebef01daadf317d3d22047c22c1c907fdfb3ed844d279a4692b837d8afb1149da4205538 SHA512 33b75c84396551de2559a56efb9922284991e5ebaa9a18c9d7088b49290f4225a08302c917090dafd6805bb717aa8bd24cdab8fa6d2a0b12050d43f7cb936847
diff --git a/www-servers/nginx/nginx-1.20.1-r2.ebuild b/www-servers/nginx/nginx-1.20.1-r2.ebuild
index dab635dce9c2..544d72b4fb06 100644
--- a/www-servers/nginx/nginx-1.20.1-r2.ebuild
+++ b/www-servers/nginx/nginx-1.20.1-r2.ebuild
@@ -203,7 +203,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
 RESTRICT="test"
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index b75fb4838ab9..88e24efb8576 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -1,5 +1,5 @@
 DIST tornado-6.0.4.tar.gz 496204 BLAKE2B 6c092214d03baf5cf7615b780043e2fa40a4ed623b7ca59a2528cc3625ba904b21ef93c528278adedaf83e3b6e5a6311d867833dfe9826637e97918dee6fa334 SHA512 d29d69cf40f8b34fb2c55d81b6ecd9bc7c6fdf644eb4ff35452829510c0d5ec185da0a6067fec3e8afb2bedf9f5f08b06adb0ad53dcab04cb791a75abc304d6e
 DIST tornado-6.1.tar.gz 497359 BLAKE2B ed5981dec5cca962f907f97b7f906c1eef40d2b2b6d6cc16a21bd0a0a91ee58a60bea84b7ceeeff30b3462d707c56a5062c71d4ac8f25ca6a306ded6c6f072c5 SHA512 0ec1db1fad911182bda547c177a18b107b906cf66576443069e2b986cf041b3d4ebe08e5a168aa5cd3b56547f32f8b384bacaf74db89f582951d7b610b7494e8
 EBUILD tornado-6.0.4.ebuild 1378 BLAKE2B c6f2df1b4d99b49aee5ff67fbe2e231d20ff77162fbb7e1561ec8364eb4e8311cec852b1ed419f3b16057b0df0008ba6f096a94c7b1a6072652f70aef9e2d379 SHA512 4d9aa908a512a4f59e09008d301fcd6b4efaa5c3498d190c7e55e694f9740d2ebb1d3056ee73c7f973f4f1c35ad30e63eeea5d7a78d5126a0e4025e486472e4f
-EBUILD tornado-6.1.ebuild 1432 BLAKE2B 3d4c844f22c6e50e0c7bd54ca9425c4587fa9e626393064daa0c765f81fe4c27e2fe4ccae3637082ad14ed51a808224ba0f6a180770cdc1749995276ba03aa7b SHA512 c503cc6aee3296228b84ee2ebe527fc731528718856f6727408e8f70d95e487872e6b7c76c2950035a85998893f8415e1faf20461449ece5f7e8ac75cbb95b1f
+EBUILD tornado-6.1.ebuild 1427 BLAKE2B 87c7990d336f2728df0154a78264f22748d961eabb1a33df8cd270039c5823cfb304e523ab243d5a09056f0e4686a7bc0883ad299182f3e3bdf99b2e877904ff SHA512 4443367672dfdbf70ca3373f2a2849c2be1c40c7a8edac17c245f24d80374beb870d2c53ee8db30f37c0b910d9fdb3fe4a47e4f74c7dc45be89e96b6843aa33c
 MISC metadata.xml 380 BLAKE2B 16a28ca707ba911df09dfad39b269bd888734c1f5e54fdc57d84f62b541e284f248137a01c13055f5e9fa1e1da0a2c9e1382006119cc11ec19302516262b7dc1 SHA512 e790429d61042b60a9011710e96df0044c64cc5ac941ab6268386138d3a66e46d40ed1098ec8bc164d9f4341040946ec7231e8f28dda11790ecc482b06978771
diff --git a/www-servers/tornado/tornado-6.1.ebuild b/www-servers/tornado/tornado-6.1.ebuild
index 4fbcd193a31d..a379441dae81 100644
--- a/www-servers/tornado/tornado-6.1.ebuild
+++ b/www-servers/tornado/tornado-6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 87498ec46731..376d4a8baff2 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xeyes/Manifest b/x11-apps/xeyes/Manifest
index 746d57187ca1..490e6062680a 100644
--- a/x11-apps/xeyes/Manifest
+++ b/x11-apps/xeyes/Manifest
@@ -1,3 +1,5 @@
 DIST xeyes-1.1.2.tar.bz2 133160 BLAKE2B c3f31a2df7988517e4f8903fce6b0cbfbaad01e84d89c7b9f7755eccebba95fbb8b75377644ae97f090e9f4a3a245698966e78f738275f7513f5927193b5dd19 SHA512 008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0
+DIST xeyes-1.2.0.tar.bz2 139218 BLAKE2B 0869cff711a58e937ebaf0ca5095654657f0782e7acac3553ef48469cd780c0fd1707df3aa60ed047cae44009b524cbb86eea1836c08fbbc4a1cc31fb99cbda7 SHA512 2d1614614b3ba3d1ebaa0e9801a2e159389b94aaacafb962d326b7e6dc712c1eb2c12a50ceb10b3135cf0eee6ae86bbf84e73098deb08e73792f14a60616b4d8
 EBUILD xeyes-1.1.2.ebuild 458 BLAKE2B 1da942e5c3fd0d300826043cb13ec2763672b8c8eb50fc2b13fc2c4e4cff888c6cdd0d51cabf8c8400a84a2851bb3a4edbff284ab27a2c8771e92c9d5bbd978b SHA512 c18c7606a4e7ed92e7cfd0af9533f49dec1690cf598a5d18b1a890939f5767c4e18692020a4655c2ec93ddb824af4407fe79c9b33e390f7c5d2d13810099f189
+EBUILD xeyes-1.2.0.ebuild 540 BLAKE2B 8733863c32e0573d05a466e86ea80297f3a2e38a7bc15ca71a8ff1a0617f082bdfcd97d0fcdd83cecb49d289eec118728a32219a00977fea7bb5efe6d39852fc SHA512 c85094cdea26838a49983de2c8ff2e081a0deb1a2f129f7cf7049818fae9031a96ebe2f31912e8d3e7222ff76434a3cf882e9001d95f1edfdc16c59fc4c39c51
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xeyes/xeyes-1.2.0.ebuild b/x11-apps/xeyes/xeyes-1.2.0.ebuild
new file mode 100644
index 000000000000..4590c68e716d
--- /dev/null
+++ b/x11-apps/xeyes/xeyes-1.2.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 xorg-3
+
+DESCRIPTION="X.Org xeyes application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
+
+RDEPEND="
+	>=x11-libs/libXi-1.7
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libxcb"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+XORG_CONFIGURE_OPTIONS=( --with-xrender --with-present )
diff --git a/x11-apps/xrestop/Manifest b/x11-apps/xrestop/Manifest
new file mode 100644
index 000000000000..c0f2652575da
--- /dev/null
+++ b/x11-apps/xrestop/Manifest
@@ -0,0 +1,6 @@
+AUX xrestop-0.4-tinfo.patch 291 BLAKE2B b96d892c87a8133987baa94e5cb4917bc5d743c24ec11a2ec67afafc7206654b88c17f54377f2d1bf0c9fb92df8de16c99e4d0f9a15ff80a9417da2de31bc6fa SHA512 21993ada033d4ec744b55faa71afd736a99423f12071a64e1445958de979631ce42a908e14ef194e819de98766c92a2c2470b2c88d172879ec5fc4c20212566f
+DIST xrestop-0.4.tar.gz 92308 BLAKE2B 5bfe6e9ccd49038e7884be8379e79f3de2bc960588dc21fbbe40d2acb89c6505efd78a9415e0ba8feb24986f11f066ce641b9c933f241776bbc1b3e59fd520f0 SHA512 eb7bf2f3ab7b73708c96d56fd466cb362d711242dd46992fa3e693af2d26995e9baa91075eb445ef227e1342deec5e0e22b37139e80399e4051c9f5cad8fd9b6
+DIST xrestop-0.5.tar.bz2 135537 BLAKE2B cbb58870ff16148a34468231478c723fc41932c1e17156304a1885b52c17d870339c88bc4acde16d28cdd22cb227c2190b6b33bd472b047a82261924e681c889 SHA512 f50e1fcba2fdb6167f93b9edae721556bc411232a9d7cc1df853e588cd92608c9ca652bee1aaf5cfe3750d6c60db6c6cd1c6797e282841cc535051e78b2c4c1d
+EBUILD xrestop-0.4.ebuild 675 BLAKE2B aebbfd7d106196078ef2a4538e519ed5a34ea1e6653a64ffbe4e81a46dae9c1b73b192e49996bfc962819bcf2f4c6e649967325f4ee5c7ba22703743da146a81 SHA512 db62ccd4b3af85a582f3b6c9851ee2fb762a5ed5a6f74feac39e42a8638ceb4f5a057161aff96757e95af00dec57b049450f769bea54c436755084a426a63319
+EBUILD xrestop-0.5.ebuild 597 BLAKE2B 9064368e3198c56e0974be8c6dcf4e646ce38f5c5a9442789922b73a80d2ca7187ffe16fcda0740424254630494c05f778a055ac28d83d7f3a1ba44d3663b8a0 SHA512 8ec926f673ebf1803f25c9a5a9b872ab29c460dd55aebb5e45512eb074b666a30fa6ad271e98b0f11d96667d7141e92b5d6693bff62c2885cf6206b1342858e7
+MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xrestop/files/xrestop-0.4-tinfo.patch b/x11-apps/xrestop/files/xrestop-0.4-tinfo.patch
index ef2de121e839..ef2de121e839 100644
--- a/x11-misc/xrestop/files/xrestop-0.4-tinfo.patch
+++ b/x11-apps/xrestop/files/xrestop-0.4-tinfo.patch
diff --git a/x11-apps/xrestop/metadata.xml b/x11-apps/xrestop/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xrestop/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>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/xrestop/xrestop-0.4.ebuild b/x11-apps/xrestop/xrestop-0.4.ebuild
index 42d0def453a2..42d0def453a2 100644
--- a/x11-misc/xrestop/xrestop-0.4.ebuild
+++ b/x11-apps/xrestop/xrestop-0.4.ebuild
diff --git a/x11-apps/xrestop/xrestop-0.5.ebuild b/x11-apps/xrestop/xrestop-0.5.ebuild
new file mode 100644
index 000000000000..abe5d2814919
--- /dev/null
+++ b/x11-apps/xrestop/xrestop-0.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_EAUTORECONF=yes
+inherit xorg-3
+
+DESCRIPTION="'Top' like statistics of X11 client's server side resource usage"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/xrestop"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	sys-libs/ncurses:=
+	x11-libs/libX11
+	x11-libs/libXres
+	x11-libs/libXt
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ChangeLog )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4-tinfo.patch
+)
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index 1462b64cc3af..518936b6e9e9 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,3 +1,5 @@
 DIST xwd-1.0.7.tar.bz2 148026 BLAKE2B 9088105a07db38418352cccafaee4ecc084940e031416358291e6b5a6f47b2c8972928f0eb3479db4ff93b3a54a24ea4231f4d8196464f14ac4d7a1b5bb7ecce SHA512 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e
+DIST xwd-1.0.8.tar.bz2 151153 BLAKE2B 9db972c3f484abde7f6925da6b9e567548e9ceab8f3484ca8f5649e1505ef72652d03f738b2e2edd3179a9561b9dca76bf13d26b025523d22f9f2d98ebf1b8c7 SHA512 d2aaf42c60d20c4b09f4947d3702058dbfad4633b2c5c8ea62e8897fc9ced1ab3417ce99255a223286d21a731f543019470737e3074f1bc68033b4eb47bc773e
 EBUILD xwd-1.0.7-r1.ebuild 356 BLAKE2B b446baf4809f0923da62d9f09aa04713f93255df57d9c64ff3977d0ab9da2b1666f31956aa42c44b9f6a36df1744a6a06790162aef014ad5e483daa2b8cead88 SHA512 26a1a196451d1d24f2c73794e6b8ee47727256a663c1cb832f27a5811f5c8ca3d460a2216591865ee3dcc11da6104c78b3d4667b30c92f84dbb4d1443684059c
+EBUILD xwd-1.0.8.ebuild 363 BLAKE2B 6004748bac88f0e0e7a7b3ba0c2cf562d090016721ef2337bfed728deb3b8f5d2eabc35dc41b30d10d68cdcbabe22e7809d835af3a386e5b0aa1a76d10322448 SHA512 f88cb986f7d81447918b405a4898980af05b7538bd66cad813d8150a35f4e070f283512670fe6d7340b4f8d46ec69c67541fca3e01cabae7ab5edf0a5cdc32be
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwd/xwd-1.0.8.ebuild b/x11-apps/xwd/xwd-1.0.8.ebuild
new file mode 100644
index 000000000000..116dcac06fb2
--- /dev/null
+++ b/x11-apps/xwd/xwd-1.0.8.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-base/Manifest.gz b/x11-base/Manifest.gz
index 85f4270ff438..6ec728645aa6 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 6b27ddcd1d70..643cfbfdde96 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -4,5 +4,6 @@ DIST xwayland-21.1.1.tar.xz 1257776 BLAKE2B 181aca3d3fad3759eb726c6f6141912d588a
 DIST xwayland-21.1.2.tar.xz 1258732 BLAKE2B 1a797e4dedee4f47ada968d4a06c89da2fac64bbfa587e84f01d5b0aa7da23402b70369a274a672470e6d8df0645fd117d129d1f2049b25394d825a9eed3e451 SHA512 3bd595a563cbc44b49a00c85adabdbcddf02fd55c6500ed2711557c156f10cd273af93f7b232865141ad27392a85583e40268bcedad183ad9eeefba457cef6c6
 EBUILD xwayland-21.1.1-r2.ebuild 1794 BLAKE2B 3558e27b1006cba4b301645dc203cfc7e2f69b884b714d47eccb613e01cdd51c3e3570dcd0f9ca1de11116b507442f701a9ead1c7f694f508a3686d17e044102 SHA512 8bef4a535c5257c6be77706b7a809701adfc6b0a604efa7a1dbcc4fb333a1be20a41dbcd7a20a6f6613b400b725c96627890cb6b86287ebfaa912d57b4ac63c1
 EBUILD xwayland-21.1.1.901.ebuild 1808 BLAKE2B 05ff3178a7e0327e31f566c1822d3014028eb17db924a078f26d689d376ce684b4b65571075057331dd600d29dcc4c95a3a681a78dd818766e5fd302e5a03fe4 SHA512 75e1a6dac3d1486bcb3680c6e414ac11abdd59b0c4be57ecbe6f93e572192726c8f3f25258ff2d76157532a345b7e7a6679b6eaa2bb83aac939592b73e70eca0
+EBUILD xwayland-21.1.2-r2.ebuild 1932 BLAKE2B bb8b9efbb4757f95a5cc0328c128f4eb8859fe5778e7b2c4c8525ff0c5101f0e76f8d3963a292f6fa9dbf98c2ad6bbc6f21f6de72e61788d5b679e62c1567f36 SHA512 c287cf0c3b2120ae24db847c98b6a395ce62416c25b541db0d0451732070745f7e69dec73f5d3ad3cae3f426bbeca7978f954cc3887b8d9e684821e6d28c3502
 EBUILD xwayland-21.1.2.ebuild 1918 BLAKE2B 55c67dbdb3a7221f4694bd4b9b5a0c574640067ec15b14eb8a2bf6e2dfdc8601ff1db3fab6fb1aa03a0bfbaafccdbbf22d567df849b771d345bb25da1ce86768 SHA512 bf8c1c16d346227c0a54e116faae4824cad188dab8c9caea0018835edb447c8beb1df15dc7f54ec0ded4bf70250c2ba22824e5e9020142e2777ad618efeb073d
 MISC metadata.xml 492 BLAKE2B df9bce6c0bf8fc88dc1386143ceffe54b16e9e024281d6839496827ba1e645b01126ed2937e152b9cd06ee232c8149c5a789bc4ce6d380b5b6cec722b7c65c13 SHA512 987198d7347e1849f7974873d8140d9dfa921b3afff3a6864c47b59baa29de92bdc90a83b03f3765c7a4e15553f2afaa1ae164aac2d9e3b52d9839444bee6255
diff --git a/x11-base/xwayland/xwayland-21.1.2-r2.ebuild b/x11-base/xwayland/xwayland-21.1.2-r2.ebuild
new file mode 100644
index 000000000000..0684acd6117a
--- /dev/null
+++ b/x11-base/xwayland/xwayland-21.1.2-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Standalone X server running under Wayland"
+HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
+SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
+
+IUSE="rpc unwind ipv6 xcsecurity selinux video_cards_nvidia"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=x11-libs/pixman-0.27.2
+	dev-libs/libbsd
+	>=x11-libs/libXfont2-2.0.1
+	dev-libs/openssl:=
+	dev-libs/wayland
+	video_cards_nvidia? ( gui-libs/egl-wayland )
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libdrm-2.4.89
+	>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
+	>=x11-libs/libxshmfence-1.1
+	rpc? ( net-libs/libtirpc )
+	>=x11-libs/libXau-1.0.4
+	media-libs/libglvnd[X]
+	unwind? ( sys-libs/libunwind )
+	>=dev-libs/wayland-protocols-1.18
+	media-fonts/font-util
+	x11-libs/libxkbfile
+	>=x11-libs/xtrans-1.3.5
+	x11-base/xorg-proto
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+"
+
+RDEPEND="
+	${DEPEND}
+	x11-apps/xkbcomp
+	!<=x11-base/xorg-server-1.20.11
+	selinux? ( sec-policy/selinux-xserver )
+"
+BDEPEND="
+	sys-devel/flex
+	dev-util/wayland-scanner
+"
+
+PATCHES=(
+	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use rpc secure-rpc)
+		$(meson_use unwind libunwind)
+		$(meson_use ipv6)
+		$(meson_use xcsecurity)
+		$(meson_use selinux xselinux)
+		$(meson_use video_cards_nvidia xwayland_eglstream)
+		-Dsha1=libcrypto
+		-Ddpms=true
+		-Ddri3=true
+		-Dglamor=true
+		-Dglx=true
+		-Dscreensaver=true
+		-Dxace=true
+		-Dxdmcp=true
+		-Dxinerama=true
+		-Dxv=true
+		-Dxvfb=true
+		-Dxwayland-path="${EPREFIX}"/usr/bin
+		-Ddtrace=false
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	dosym ../bin/Xwayland /usr/libexec/Xwayland
+
+	meson_src_install
+}
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 10cb86950215..5d62dd68561e 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 5dfda9faf5fe..4b7db6de5534 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -6,52 +6,28 @@ AUX nvidia-modprobe-390.141-uvm-perms.patch 563 BLAKE2B 9befd708ad2193e507583e06
 AUX nvidia-persistenced.confd 213 BLAKE2B dd57e63944a97a77e83a8373dd34ef2f56824dcfadcfbbb54cdf6eeac17066d78753bd1b21a9bad8f0437c279c95492319205c15b84b7f96e0515415dfddbc26 SHA512 a311b73bb47448538e5261ba658d42e923890c909c335eeac3cc90ad0ffd3fd5fb983df8e91077f3098eaa13b07f27b23dc24a4579b1df411ae272976ef089b3
 AUX nvidia-persistenced.initd 404 BLAKE2B 2115075a9b0c9d0eeee55e2b3c531da82ae6aea5bf25bcedc618b108aeddab95c0ac852d6d9b96bd9bf6dba62a13db487d7c3627b244ef29c047bb7a137f2413 SHA512 34143639ca5456cacfbfcb2bc30e51dce02d9af4784791a84ba93a26f2f7f31f2dc75685bbed52138c35df310cca1c19072a5fab2b067f854550f5ee4d96aa9c
 AUX nvidia-settings-390.141-fno-common.patch 478 BLAKE2B 2b222b26049aeb6692350618bd1e4dff3c4f25452c1e18c5789fd3e85ffb3edba4c54c4cdf02aec95f65c7eafb2c01e39a76b888a4f0691de6279d2981ab4f5f SHA512 a6574bc7be6299ab6f7aa3b7872506cc135ffda5591f6d385f6828ca5691e964852b4461fde771130a17b315798f986c2af6e1108e9d2298dcdf3f786e665a93
-DIST NVIDIA-Linux-aarch64-460.67.run 112551235 BLAKE2B cc1166454f6e8771c7fe97010906919e9f2afd74ac86321006628f90f4d8dee033c3e09b2d9cac9063fe3fd313c0b529b347bcf38c051588ca7a972617c45026 SHA512 6ba17844dd215967f2f55a6620535464f244075a13f4b2b6d0ffaeeb6d97397fae0ba0de032d971847556d7b78ac8a1010ecec5127f45eb7ec73db87b1507ca1
-DIST NVIDIA-Linux-aarch64-460.84.run 112602151 BLAKE2B 7c8fee69c61f94d461286b2e96577b20da7e3ecfbb32fa9791e14006797bcc02d3123cb2101e718998fbc04d081f35c5802ddc52c71bc5eb51aefc27f45b8233 SHA512 76516a880fa5f28020ff7cb7a92d216f79ef9d510e0a1e696b614c1eb01702381f04bb1456588d43ff0a6c2824710f8b11f2e9788219207bd8b61821401306de
 DIST NVIDIA-Linux-aarch64-460.91.03.run 111886330 BLAKE2B 24ab316e216caa61f7edb4dbcb34541709d3229d495e6ead95e99db7403cddee03467ee28d007f0fa3c4f2fa267e1994533c90a7a67885e9e76d501ab0f8aaa5 SHA512 edcfd3b11afe625c8996cda488a8de2e0e40eb4b95c8cf0ead9e1226d7cee8140a83c247d745ceefe997a39cfcf3e3f9bde575d97aa39090f97f88817d89cb28
 DIST NVIDIA-Linux-aarch64-470.57.02.run 184167283 BLAKE2B 8c321b60874ddc5497226515dd778e402227ff391e63ad7fd735cd23eb7e1f61550c96d5578534b06104da64f221c1db9cf2ed595be6fc11ce826efee0fbab89 SHA512 2af613184a9d2e6ebd65807beb8007dbfd69d1c08cc75bc5da404ab7eda9217c68be44a6bf61f666be2adb9b74f791007aa5b2bdd5066cb8b50977ff8882c2f7
-DIST NVIDIA-Linux-x86-390.143.run 49327068 BLAKE2B c6e0600885bfd834be6dca18346259a58e05640afe4b1ea394d5795e4c8a4b0fa9fdf5c4a331a128843708ece9e95df2ff7e0b3cf2ac5875b5d731c73423c112 SHA512 17bbcc2f5e9dde3f131b7924ea1e99a591b5e18b835dd324c528d17f74eded94e087c6a9a2b364189851e9972ad27bcd47e901c9ec14eedc568b99890f1e0a4f
 DIST NVIDIA-Linux-x86-390.144.run 49210937 BLAKE2B b7e6edb55af88be74e4322ff1d270388a60a9d9809314c3a0502f86ed97edb99dfcdd3c81c5f51e681c8fcc47ecbfecd124b4d733141d23726226a3965b4c1f1 SHA512 d962c7e7b4b9c4635a887767d34a49c401a89e5975a5e57fa83366ca824ab70d5b8a81f3dce2e05e0528afddc72d70b2fcd69a216bd16d75e7b88ec704390546
-DIST NVIDIA-Linux-x86_64-390.143.run 85686808 BLAKE2B 0ad3ec661565cc52553c0b4f73256665fd3b505e39bffbfbffb3d148193369471b5160d59717dbecbd5f00bd28d9d17c9c7b5284e493f57f84ce19e310e477dc SHA512 79b61bd274964ed2e6a7ce99f0066d616d65b5a074de2ed84cdebb9ec6e8a608f71e511105e9a03e0c6e6d259f0111fed5772638ea72b08951eb2712c80505d0
 DIST NVIDIA-Linux-x86_64-390.144.run 85000417 BLAKE2B 8ecfa768fb8fe92170ff5b82698a7fb22da8bc557ab2036464bf5650b6fffc7028e25a68e1f5638f6bc171eb45a4aba459465490c7a99aacd36dc769994062e8 SHA512 9503ebf41037a14deba995288a364768cb03fb682de8653a4b0c05955b23603443c41c4216c93eac7d7efc301734416012864ede728324ab47b93ff167d93da4
-DIST NVIDIA-Linux-x86_64-460.67.run 177691692 BLAKE2B 25a7d87cc128933a98100d7c5ef37f93c3a870c096eea3228a28ef79d712ce104608f9422221cc1eadc21dccbbc8bc41ab1832795cfee75e217600ed0d76489e SHA512 80fdc023a8ce80e3a103896f28a5564bb43903af6bfc719f755c48eb225e79ec6abf219ab20eb80ada5808ef932ef5fa0fe710c6e0a07dd8a248daff2ba3b898
-DIST NVIDIA-Linux-x86_64-460.84.run 177840337 BLAKE2B fbaa295c59f1af79c59c28845b79924812ac1386cf2e42aa762120a618253686f1249d777cc6c8df88b52afa34b96131663962bf0b6621dea6dcbc1bad7f9e22 SHA512 2483a4d251da63334363f4ba9f7b5d2cbf310afdf16fbcfecf1269f65beaed0325f825472feea26ddca2455ed44f284f57a73662600a3b4a270167baeb33e4fb
 DIST NVIDIA-Linux-x86_64-460.91.03.run 178201292 BLAKE2B 4d407b7bb3a99ab71c62c3cd18dc3549c98a24e7af28276e6e6a21dd33efcab017fed3f782f6dfb060c4437cd718f19c2f9900de367cc47bf19fa2718a18ad55 SHA512 4ac11130fe5a8f1c26f459e9c19660b3ff6f23011e9f77b09ca948fc42609e523ecea70d3bf6def50a75b4a3079ab280018753fb6e53875d9bb8093a033e3b70
 DIST NVIDIA-Linux-x86_64-470.57.02.run 273219658 BLAKE2B 4e9b6d0f08226f38e76157a64923a4b4bb07b46e1b37879da353a4ff39bcf6a3aa0689a04e16ebcb2ff19f453d9b265c53546f101f34cca998a5da4dba5c2826 SHA512 7123ee05aa0cc94c4cf1f0717daf85b116f0200b8f78f9322ea847db70e56386a065e0085959f27cbf0a8f9befe6fc7a0145d1bf2a28616df9bc8b5effd812f8
-DIST nvidia-installer-390.143.tar.gz 205320 BLAKE2B 5c27dd769ec5a2effc56ea86474ee45b86362c26844d2f902d7bb2ab8e58b2763f4f761341ce4051e85cfd8189eab9d441744f1b9946a6dc46105888dc5ba58a SHA512 a45cbae70e8d9f1108d5e2c04b4beee350b8469df987ff80793dda7fc4e6efe3a787db0d47e7dfe22b88b29647b99cc24ab418666d1ef2fc038143f574faba36
 DIST nvidia-installer-390.144.tar.bz2 150017 BLAKE2B 1a633594ecb9b54ee5a1e3620263a95db30c1ddebf547ecc7f267e1f0b799bcdb44cc3ddd6c96eda085d9be5c8f691e92556296f250495d80eec0c2f155f5bd5 SHA512 e4c624afc18bd1d61264f93bdcbc72afe42687baadf31683a6dd11a45c6257f6a5185b91f4b3d4c0316b8eb03ed79511f9ad260ee9e6f299fc136f5dc2178e42
-DIST nvidia-installer-460.67.tar.gz 198484 BLAKE2B 0eaf3e3eccd6749e4fe89394905dded58e739f42cbc33c8a91575f4505030a216670fc8c0fd4d1d42659acf301c9ba59d4052a80c6eba6c5db84ed022acb2620 SHA512 8fff0fa13a82cb7eaf2fd1d05be509e9124e67bb05810f8937fb1f16c4a2362a5c1a50bc9a5155cfc90a9bbcee38a54fb5ae0ae164e205900a49f6d21779d54f
-DIST nvidia-installer-460.84.tar.bz2 144516 BLAKE2B 1da114e13d675198d1c011d4f32cc5da350b0d10ffaa49634c06d91d520d40bd24be60d032fd0988e7be54691dbe9755e3b7297596bd4ab88c72c0fb831aa894 SHA512 afab294eddfea19a0d70b7193d40438c209ede757d614e96a6028b2569797a24cc26c4eafb41a4f35fff4496bfa7529f276ae054c9060b714f43ac0e9d3cf301
 DIST nvidia-installer-460.91.03.tar.bz2 144463 BLAKE2B b8c381158f614331fbfd04dcfdd7227fcb3eb16cbe4e3cbcbb34ba6af2370b05ebd72dc46375b2099b950817e6a0565c418e62b6364f1d7269f78c1dce5f5535 SHA512 10c873597202a1d8aa0dc4629b1e64f8c1f65a68c91f6babe312cf9fabbb9257b77d03a3917c0f4f5d6994e90cf58c6c7d9a802a675ea3ef60b571c9b7abc391
 DIST nvidia-installer-470.57.02.tar.bz2 145923 BLAKE2B c0350e143ca3d4bd1f18c2f137df363c57f6c4bf87f1f3dd92e2dd62d1e79de5efba850fcd3638b2b25ab5c07f3b5f8484863350a35a358a764ef27cf96817e2 SHA512 8a72ae9643acaa566b05bbc400cae02dcfbad00da9084ea441ec65f3895efdb224e16075a5f4e373eac048e91b7c8fcdd877425bf76e573b4bff0233dfd5519d
-DIST nvidia-modprobe-390.143.tar.gz 39968 BLAKE2B 09f043521f195327630c0ca575473da42e051e2d34def22dcfb54295a94ca85e95ff41ee9564765567df19b88f90aba3d8cfffd489054779f2ce7d29f6e64b76 SHA512 066aaf031907fe2ba424e3b92e677ae78b4a938308bea82b7aa20cf0ba5c3678f93b6c9bf8a41fcd4fadcdcc870674a2be777ddcc2a5018974bd56b09a9ef271
 DIST nvidia-modprobe-390.144.tar.bz2 35308 BLAKE2B 1930c315aeb0e296c0d4795170d44a275da5ff8838fd8230559227852001b679fbca2830142ca7abcfa9c84626c9d9f222f7ab0cb3984d8d517f5ce431e5a9ea SHA512 d542c1a7634a8c5ff803ca79f2fc02b17b129185177226ad60625a4d246bbaf740719ff024dbde0f5aa8273949446561261d700a27cf88217c2572e69882142c
-DIST nvidia-modprobe-460.67.tar.gz 43140 BLAKE2B 8243d355f9d51495c9d09f25ccbcb39c0a6ef472cbfaded98f10818fae655e1cf62ff2edcf40baea72b8cca9eebc947742b2516bb057410239193201bb843538 SHA512 16c8239b54988622196e0eea113173e44ff8b60cdcdf585bf859e6440aff2c6699bb107962776e69056dd7d5e3bbd6289ea628a2255ac27e22ef79521e9baad3
-DIST nvidia-modprobe-460.84.tar.bz2 38114 BLAKE2B 5e08860d3fa1a3025b413ccc9e5c24f64deab475852ca725104eea76f1e919f70a76f99809fe3d92d024f9aecb8fb9622ddced926bc51bebe663422959d358ba SHA512 4bf971b7fa3b155a25123c8a0c0305c53da1d2d3bb509f31698d1db2b821517836bdd111faccca5fb1d998dc13771568e3cee5c56f73ff497ca36fc55ade4a00
 DIST nvidia-modprobe-460.91.03.tar.bz2 38144 BLAKE2B 660b381f8757fe8862f7c4a971e44d3124afa3783d52af29543b8ed67486ba03b76c0b5d8dfadc5da8fdcc2c8799ec5f9c3016fd58e9c209fcc3ae897fb0436b SHA512 aa47a9c0744b8e11e87d2c0f300b13fee435cd5225444be7fb0b6bea49af33811dfa723a9ccfe904c7de2b5a8da36b707c1024eb495e3f0b587e3231a4bc4f39
 DIST nvidia-modprobe-470.57.02.tar.bz2 38363 BLAKE2B a718d9ac5c34ee66136e7471f7ede65d268183935088d85b9fd69a0a3a5109e10ef2d2da2f8d07896aee219ca17647bbe38831cf81457f5d4f33e6bf74d4c08d SHA512 be4ade3425dd9557d4759889b1376e20c158c34136386c87b944ba24776fb056792be9bf449f04075e4e5ccc150fd065321fcc0e7c1af2d2b0be4d0a1bba7e4c
-DIST nvidia-persistenced-390.143.tar.gz 55994 BLAKE2B 1cfa469b84ecc9abdf0423d624244e7023a63225dfb16ac93223c462230b50099e4b59493be2d10cd6f2717e31c02655c76797e3222947d561f02ff72a52dd46 SHA512 37c3eb0bcce83e9b9ac5bdefa736e26e94b82de379a0f5c29e1611631c79103a797e58f5d1dea34221dd3a3f1a521b6db556eed48b1f38465481da2509d2f21a
 DIST nvidia-persistenced-390.144.tar.bz2 48672 BLAKE2B 82a92a33eb40971e56b772ffab121214f5675d0a8c618e356e7b55bc38ff9605fd2701d740d00a1e26c158c9df0ab38d0ba10891a3850f8e8cbee8fb231ba52d SHA512 4432f2dd18c7c91fd0d59e4f2bdf7254f58ed2a6b652d319c4f7ce674522da1797a68dd6939c38e71710dcd3b754ae7cc8c6e7acb47a76e13d2091e8a8ee99c8
-DIST nvidia-persistenced-460.67.tar.gz 53334 BLAKE2B 1354ec98fd2b95d264fd7df6219f639cf5d73173e6f0843a0880e6b18953904412cb756bd2c60432f6ae4c253d047515a9e32a128210fd94386ae6bc9a341b5c SHA512 0b4f7d8aa781c3536f6cd020225d2a3bab4b83498090419198488a2bec811534e61ba90461ae846bd09f4530f19984d77ca41edf0a851b1b700d1c0e053d537f
-DIST nvidia-persistenced-460.84.tar.bz2 46048 BLAKE2B e3dc6168458d5da3517167cca43373b815104894f8e01785baa3c654717f4eb4841db014a7f8c73d4c24a1e849b86ffee51c33e457fcb4804cae856cd630100c SHA512 43fbc5caa13f1e47d59054ddb4ff6129cd464dd558f8166b1103a9238b42205695e78c75aa89af89921d928bf9be07d2a9593306ce53d29a5bfaf90699917b13
 DIST nvidia-persistenced-460.91.03.tar.bz2 46160 BLAKE2B f7f34cc12de2a4d69184c60caf7a8e8025b58005ade0a3e9a1a0e95856055f7211a710a1145d674d8a2e97cf70a43175cbc5c9a5dabc49ce378623be1720c6ea SHA512 c3ff5875353c264cb224b3f512ff8308bf1b0b95282e34500d88da2574719c3c514581e5900841b089c2e6f0fe29198fa06a11668de8e21c59f9f96244a74757
 DIST nvidia-persistenced-470.57.02.tar.bz2 46533 BLAKE2B 8a9660b1838dd4096237200974cc8d21f9f12864b346abbb52671c84a3f4612af550905643324699d6dc6ba068e7d7b373079e8493646b58051bb85e21f386fa SHA512 774fea16044838480d809423ca498f517d95d1225b455a6e1a1a95254c7761eaab33e33fb19d407e3ed80cabaeb7de2d150de60360761b5e61f01fc27c6556a5
-DIST nvidia-settings-390.143.tar.gz 1297258 BLAKE2B d63b48c03069d4d2ae7f7034b4bc13ff3a1004bd64ce54ee553e614cb88cb081842b6c1428fd556e031ce69361927074822c5c620d2cde8d37a5887051ff56de SHA512 7bbef03e77e73bb1e05585cfaf6823913e2446b1df8353044ae01f80693bb884fdcc1b38fa51b171756edaa234479cda027d6569d025b120b7b64f226f8eedce
 DIST nvidia-settings-390.144.tar.bz2 1109104 BLAKE2B 6724f49c7e469f580206fc17308190bd346b6167348a8b8b3886209f58aca61b65eff30658484c1fee40af8c0d89fb62f73329b05a6ac45178ea4a6870e5aa85 SHA512 90afe201361d492c3152057d3ec46d68c0cd722fe0ea0587aa1156718017d59fb5f26f3db89d91d4680b2390617867dbe93bd14e1fb3dc70402527bfacf0ae5c
-DIST nvidia-settings-460.67.tar.gz 1233189 BLAKE2B 33ffceefea4e184cb1873cdce97db26637e87cd20c82bcabcbfe88bcb084ac3d833ac5688cafa33a5a89383040d5c1c5d46de9c3f9a8ba6174574aa57aea2e46 SHA512 d1828379aa477394747ae3e5d3505e864d38a349dd159a04cb263613380afea9aea2081300b0d2b8ae205b800bfe6e8ba504e612989da394d757f00e4399b617
-DIST nvidia-settings-460.84.tar.bz2 1061100 BLAKE2B 9098116b29dcb3124dfa2e8ae6e6e62e865ece37c4307843570753ecef1541feece3a945e0b2671da9273ec53fd97b75d6b07ed5db01a1ebb9e65a08b06f1fab SHA512 9cb7dbe97bd15e722d151cd6131c56e23eafbd8b491b774b7940165cefb446253c50d8794fcec5809d1e6c82cdf4236bc06b25059a28bdfa0dc17ce77eaf6476
 DIST nvidia-settings-460.91.03.tar.bz2 1061093 BLAKE2B 13f1da07eda3a0e7e96ac69091e4a34fcd75a8f459a4db3840c64272dd54080694c4df3b7c326884ff032eb1b8708b5e19107b112afee2c80eed242281292b02 SHA512 172ea3366065aa30e71a5a47b31366d076477b8801a8a37e0d76972406e69c8872daa80011ee020960bc5e00163c4e9e5f63aa4f0dc726065671d76851b4ad71
 DIST nvidia-settings-470.57.02.tar.bz2 1062237 BLAKE2B aace056c25027ba9f139fc2a5c7714fe8207eb32e6cfbdc9ee7d64b49277ab588249fb87a1d8049c24e8d46b77e4f5ba198a7b4519078ce094f5712b486e29d3 SHA512 91e03cf7e1ed974204425e7223587987101934ddbcce52717990de244840d89b37b7f84b0222e96e85844c9ac4f3812771303ec285a32d0339f519bf38813be0
-DIST nvidia-xconfig-390.143.tar.gz 140282 BLAKE2B 3de0fe4bc0a049381e4504002bbe94887334310ca7b17d83add1237d7c15b7783e4f418acba3e261da564b1c00ca244f4ad02f3d2cbca0f0f68ee2900098fb36 SHA512 0c82dda4dd6db0c21cd9a2b88e4a77129bc4a0be8a17b398497328f4f1cb5c319f0428d7fbc3b0177d69246d55f96b03dd740d3480d67bb03049cd0cbe190132
 DIST nvidia-xconfig-390.144.tar.bz2 107147 BLAKE2B 1b6ea6dfbe33474cd3e9409a7559a38716c4ce8d2583354232225a2a7ec10c7dbc2163f07c6849f4929e16c2fad179d583daad8a67d9cba950a62209b8ebebfa SHA512 09bb3558be178deda4b26031560ebad4e98e68b6186e247d4638cbcb4bb5dc05937c6baeaf1cd4db5a7b7433af97c3150c526ed972ff51b6e1c7552235ec6b51
-DIST nvidia-xconfig-460.67.tar.gz 142323 BLAKE2B 09c7281de09a2c2968b5f4a48eca63110e6db988429c844b55f8efc28fbcd9d44c79ad47149c25f657c2a98ae7576c01b2c9b7f643b8321fe1393adc571ebcaa SHA512 0e65c81ec40d3eaeec036fbd8f46a3052a75ff0ad200c58438ff6c782a5764e62e51d03b4a2080770c32522894641288ac495f62bc39c3d5658b1ff87c9f6cdd
-DIST nvidia-xconfig-460.84.tar.bz2 108471 BLAKE2B cc3f100902778b66088bca3ff74df19f9ec47f45b4137a60c702f6c6742f011af890d67cbee685f1d3e27d337e3dbf9c23b0ba0b46e5bd341c4c679e7ff54584 SHA512 0c1060d7107a9557e90291829dd0f8728b0c7d6315a898ea17485c8932db528439aa84cb769f5c14d3c70f57942ca6e4cc4248807ffd43c961f3c145752aa5a3
 DIST nvidia-xconfig-460.91.03.tar.bz2 108477 BLAKE2B d95505e508ca16d8ebe8c22c445a1b686c32a626c379b1b48e2a8101969fc03b90446953cc30e945da9388237fa1b9e5f83417aba1fb062d58866a523c256769 SHA512 4bb8f7fc42e7fa5e3897884bd7e722c4fe8ab1e4a87cad4136e1764cdd91d4795f817dcee63a20279315b4839d92fe5244d073ea2310c704f8aacd38bacb28a4
 DIST nvidia-xconfig-470.57.02.tar.bz2 109072 BLAKE2B e3a8f98cb31ec323ae0055252611193669a26ff43184b42433b3089899f88b6baeb13d18ee9dd09807710601558ea1e4c6be54326bc59cbff448ec6dd30f425e SHA512 da4d5de04aadb4941837062ba28592135ee2e2344132c6f5561288e22448a40bb2467d39bd09e0bf838caaa178ccc36a0c2fdbdf80006f3769161aa15550e350
-EBUILD nvidia-drivers-390.143-r1.ebuild 11738 BLAKE2B 7812ee0aea4f6e80aa67a088c03f8f5192883e360d867a0c637f228663dc368ac5e1d4706ad8c02fbd2b3f4d3e0312785bf79c38aace63bc1e42aaef9e1717f3 SHA512 f895e434a013b444925876f90374f1ab254d7ae43b91e389ac60938eb904ce5c34be6b9754ceee5f686399c66f8b0ea2fbf55296ea9288c1f65193872cd88367
 EBUILD nvidia-drivers-390.144.ebuild 11603 BLAKE2B 688f91af5e40040f653348a6f1006509cb55e3fbbccf4786326b291260cd193dbd4e910d13bd9389c41155fc245016209d18b7a962960fa1b45e0c50d2b71989 SHA512 2e9d5ce910e7f17c4370c4bc8c350c975bdd91a8a14100a15602a2c9299827efa3242db417dddb6ae176044eb74f86a49701f87f494620934c4e1b44d285e6c8
-EBUILD nvidia-drivers-460.67.ebuild 11237 BLAKE2B 0084f35297377161c1a96e11c2981641f21dedca2fa1eea6d04adc31558107cc1546def9b286e81d1a912993e9b29362c27479084cd5b1a3a3c6050488406a8a SHA512 5e294a7d73c9d5b49b9e8c9c7a98dc93f5cd38f27404ab0a22b4ee1d55f215c963b2edbb942aa6cef5fc856c3e44b5a13c55f4c5027308feb49e0c2e782b8188
-EBUILD nvidia-drivers-460.84.ebuild 11769 BLAKE2B 386291ff10db832ccc664d9b8b211eb7ef8d88ab1ceb349e47ce386aefeb0a960d100672655d23b5c26259e88653c360c54f62e27505b1d82f4a42f94d3890ac SHA512 d5aaceb43c0d25ea69123d8b613840550a92cf83e407a0ee4cf38e2e9b5ff9338effe8053d6caf3aab0e19e818c9a8fe993d9443e3ec37aef27a6319243fa8c5
 EBUILD nvidia-drivers-460.91.03.ebuild 11774 BLAKE2B f1dbd1b2edfab144149437a7e7c33728da2a39829834926c80f297afdc075c8e15348079c068f423ceeac3d4ff24fc3d32e142d86297b1c1b0b0b59730ce0e17 SHA512 d9d79a51cdbfa1ce7af1478c05824e062885e98d01deab08b26baa9933d89536e30c2edb7109da1499277fe751091e9c792692572dabb28ff28db17baa9f44c7
 EBUILD nvidia-drivers-470.57.02.ebuild 13851 BLAKE2B d153b8b866985b9016c5d78c819a353657be298d242981410b3daae3d5912583774597854af74a0dae866bd20fa4a37f0f7e22624dc50574b59831a8dff2ce04 SHA512 98d03bc7641c4f9262e27de543020f9f7158359d4fcd851082e27585739366a6ca411b8ce34d2fec747a4580537837fd59e9532703b5774205a5f6e89e94d8bd
 MISC metadata.xml 901 BLAKE2B 00dda86ba59983764dd3c77d326ae6c33280ed6623d0cb1e6bc6bca03638763e067c2390669a4656b0f714d6b773b685c5f18f08bc9ce66ee13d7d212106e230 SHA512 bacdfaf46613050270b31874ec794953a8e988aca8c2d9f9cf5addad409dc619d95a0f0fc243a9f4c3e6e7c08307588c94de63a74b8a958d15af5ad30cb526b8
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild
deleted file mode 100644
index d90fd0158f56..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild
+++ /dev/null
@@ -1,406 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop linux-info linux-mod multilib-build \
-	readme.gentoo-r1 systemd toolchain-funcs unpacker
-
-NV_KERNEL_MAX="5.12"
-NV_BIN_URI="https://download.nvidia.com/XFree86/Linux-"
-NV_GIT_URI="https://github.com/NVIDIA/nvidia-"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-SRC_URI="
-	amd64? ( ${NV_BIN_URI}x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	x86? ( ${NV_BIN_URI}x86/${PV}/NVIDIA-Linux-x86-${PV}.run )
-	${NV_GIT_URI}installer/archive/${PV}.tar.gz -> nvidia-installer-${PV}.tar.gz
-	${NV_GIT_URI}modprobe/archive/${PV}.tar.gz -> nvidia-modprobe-${PV}.tar.gz
-	${NV_GIT_URI}persistenced/archive/${PV}.tar.gz -> nvidia-persistenced-${PV}.tar.gz
-	${NV_GIT_URI}settings/archive/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz
-	${NV_GIT_URI}xconfig/archive/${PV}.tar.gz -> nvidia-xconfig-${PV}.tar.gz"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="GPL-2 MIT NVIDIA-r2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* amd64 x86"
-IUSE="+X +driver static-libs +tools"
-
-COMMON_DEPEND="
-	acct-group/video
-	acct-user/nvpd
-	net-libs/libtirpc
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? (
-		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)"
-BDEPEND="
-	app-misc/pax-utils
-	virtual/pkgconfig"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-PATCHES=(
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-	"${FILESDIR}"/nvidia-settings-390.141-fno-common.patch
-)
-
-DOCS=(
-	README.txt NVIDIA_Changelog
-	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-)
-HTML_DOCS=( html/. )
-
-pkg_setup() {
-	use driver || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
-		~!LOCKDEP
-		!DEBUG_MUTEXES"
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and optional nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead.
-	390.xx branch: also used by a GLX workaround needed for OpenGL."
-
-	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
-	use x86 && BUILD_PARAMS+=' ARCH=i386' # needed for recognition
-	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
-	MODULE_NAMES="
-		nvidia(video:kernel)
-		nvidia-drm(video:kernel)
-		nvidia-modeset(video:kernel)"
-	use amd64 && MODULE_NAMES+=" nvidia-uvm(video:kernel)" # no x86 support
-
-	linux-mod_pkg_setup
-
-	if [[ ${MERGE_TYPE} != binary ]] && kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
-		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
-		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
-		ewarn
-		ewarn "Do _not_ file a bug report if run into issues."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# make user patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-
-	default
-
-	# alternate tls library needed for 390's libglx.so (bug #785289)
-	mv tls/libnvidia-tls.so.${PV} . || die
-	if [[ -d 32 ]]; then
-		mv 32/tls/libnvidia-tls.so.${PV} 32 || die
-	fi
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
-		-i kernel/conftest.sh || die
-
-	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
-		-e '/Categories=/s/_.*/System;Settings;/' \
-		-i nvidia-settings/doc/nvidia-settings.desktop || die
-
-	# remove gtk2 support (bug #592730)
-	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
-		-i nvidia-settings/src/Makefile || die
-
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> nvidia-persistenced.service || die
-
-	sed 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' \
-		nvidia_icd.json.template > nvidia_icd.json || die
-
-	sed "s|@LIBDIR@|${EPREFIX}/usr/$(get_libdir)|" \
-		"${FILESDIR}"/nvidia-drm-outputclass-390.conf > nvidia-drm-outputclass.conf || die
-
-	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
-}
-
-src_compile() {
-	nvidia-drivers_make() {
-		emake -C nvidia-${1} ${2} \
-			PREFIX="${EPREFIX}/usr" \
-			HOST_CC="$(tc-getBUILD_CC)" \
-			HOST_LD="$(tc-getBUILD_LD)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
-	}
-
-	tc-export AR CC LD OBJCOPY
-
-	# may no longer be relevant but kept as a safety
-	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
-
-	use driver && linux-mod_src_compile
-
-	# 390.xx persistenced doesn't auto-detect libtirpc
-	LIBS=$($(tc-getPKG_CONFIG) --libs libtirpc) \
-		common_cflags=$($(tc-getPKG_CONFIG) --cflags libtirpc) \
-		nvidia-drivers_make persistenced
-
-	nvidia-drivers_make modprobe
-	use X && nvidia-drivers_make xconfig
-
-	if use tools; then
-		nvidia-drivers_make settings
-	elif use static-libs; then
-		nvidia-drivers_make settings/src build-xnvctrl
-	fi
-}
-
-src_install() {
-	nvidia-drivers_make_install() {
-		emake -C nvidia-${1} install \
-			DESTDIR="${D}" \
-			PREFIX="${EPREFIX}/usr" \
-			LIBDIR="${ED}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-	}
-
-	nvidia-drivers_libs_install() {
-		local libs=(
-			EGL_nvidia
-			GLESv1_CM_nvidia
-			GLESv2_nvidia
-			cuda
-			nvcuvid
-			nvidia-compiler
-			nvidia-eglcore
-			nvidia-encode
-			nvidia-fatbinaryloader
-			nvidia-glcore
-			nvidia-glsi
-			nvidia-ml
-			nvidia-opencl
-			nvidia-ptxjitcompiler
-			nvidia-tls
-		)
-
-		if use X; then
-			libs+=(
-				GLX_nvidia
-				nvidia-fbc
-				nvidia-ifr
-				vdpau_nvidia
-			)
-		fi
-
-		local libdir=.
-		if [[ -d 32 && ${ABI} == x86 ]]; then
-			libdir+=/32
-		else
-			libs+=(
-				nvidia-cfg
-				nvidia-wfb
-			)
-		fi
-
-		local lib soname
-		for lib in "${libs[@]}"; do
-			lib=lib${lib}.so.${PV}
-
-			# auto-detect soname and create appropriate symlinks
-			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
-			if [[ ${soname} && ${soname} != ${lib} ]]; then
-				ln -s ${lib} ${libdir}/${soname} || die
-			fi
-			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
-
-			dolib.so ${libdir}/${lib%.so*}*
-		done
-	}
-
-	if use driver; then
-		linux-mod_src_install
-
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-390.conf nvidia.conf
-	fi
-
-	if use X; then
-		exeinto /usr/$(get_libdir)/xorg/modules/drivers
-		doexe nvidia_drv.so
-
-		# 390 has legacy glx needing a modified .conf (bug #713546)
-		exeinto /usr/$(get_libdir)/extensions/nvidia
-		newexe libglx.so{.${PV},}
-		insinto /usr/share/X11/xorg.conf.d
-		newins {,50-}nvidia-drm-outputclass.conf
-
-		# vulkan icd uses libGLX_nvidia.so and so requires X
-		insinto /usr/share/vulkan/icd.d
-		doins nvidia_icd.json
-	fi
-
-	insinto /usr/share/glvnd/egl_vendor.d
-	doins 10_nvidia.json
-
-	insinto /etc/OpenCL/vendors
-	doins nvidia.icd
-
-	insinto /etc/nvidia
-	newins nvidia-application-profiles{-${PV},}-rc
-
-	# install built helpers
-	nvidia-drivers_make_install modprobe
-	# allow video group to load mods and create devs (bug #505092)
-	fowners root:video /usr/bin/nvidia-modprobe
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	nvidia-drivers_make_install persistenced
-	newconfd "${FILESDIR}/nvidia-persistenced.confd" nvidia-persistenced
-	newinitd "${FILESDIR}/nvidia-persistenced.initd" nvidia-persistenced
-	systemd_dounit nvidia-persistenced.service
-
-	use X && nvidia-drivers_make_install xconfig
-
-	if use tools; then
-		nvidia-drivers_make_install settings
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		insinto /usr/share/nvidia
-		newins nvidia-application-profiles{-${PV},}-key-documentation
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/libXNVCtrl/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	# install prebuilt-only helpers
-	exeinto /opt/bin
-
-	doexe nvidia-cuda-mps-control
-	doman nvidia-cuda-mps-control.1
-	doexe nvidia-cuda-mps-server
-
-	doexe nvidia-debugdump
-	dobin nvidia-bug-report.sh
-
-	doexe nvidia-smi
-	doman nvidia-smi.1
-
-	# install prebuilt-only libraries
-	multilib_foreach_abi nvidia-drivers_libs_install
-
-	# create README.gentoo
-	local DISABLE_AUTOFORMATTING="yes"
-	local DOC_CONTENTS=\
-"Trusted users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.
-
-For general information on using nvidia-drivers, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-	readme.gentoo_create_doc
-
-	einstalldocs
-}
-
-pkg_preinst() {
-	has_version "x11-drivers/nvidia-drivers[wayland]" && NV_HAD_WAYLAND=1
-
-	use driver || return
-	linux-mod_pkg_preinst
-
-	# set video group id based on live system (bug #491414)
-	local g=$(getent group video | cut -d: -f3)
-	[[ ${g} ]] || die "Failed to determine video group id"
-	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
-}
-
-pkg_postinst() {
-	use driver && linux-mod_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and will lead to GPU-using application issues."
-		use driver && ewarn "The easiest way to fix this is usually to reboot."
-	fi
-
-	if use x86 && [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Note that NVIDIA is no longer offering support for the unified memory"
-		elog "module (nvidia-uvm) on x86 (32bit), as such the module was not built."
-		elog "This means OpenCL/CUDA (and related, like nvenc) cannot be used."
-		elog "Other functions, like OpenGL, will continue to work."
-	fi
-
-	if [[ ${NV_HAD_WAYLAND} ]]; then
-		elog "Support for EGLStream (egl-wayland) is no longer offered with legacy"
-		elog "nvidia-drivers. It is recommended to use nouveau drivers for wayland."
-	fi
-
-	# Try to show this message only to users that may really need it
-	# given the workaround is discouraged and usage isn't widespread.
-	if use X && [[ ${REPLACING_VERSIONS} ]] &&
-		ver_test ${REPLACING_VERSIONS} -lt 390.143 &&
-		grep -qr Coolbits "${EROOT}"/etc/X11/{xorg.conf,xorg.conf.d/*.conf} 2>/dev/null; then
-		elog
-		elog "Coolbits support with ${PN} has been restricted to require Xorg"
-		elog "with root privilege by NVIDIA (being in video group is not sufficient)."
-		elog "e.g. attempting to change fan speed with nvidia-settings would fail."
-		elog
-		elog "Depending on your display manager (e.g. sddm starts X as root, gdm doesn't)"
-		elog "or if using startx, it may be necessary to emerge x11-base/xorg-server with"
-		elog 'USE="suid -elogind -systemd" if wish to keep using this feature.'
-		elog "Bug: https://bugs.gentoo.org/784248"
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
deleted file mode 100644
index 44fb2c8fbf5e..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
+++ /dev/null
@@ -1,410 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop linux-info linux-mod multilib-build optfeature \
-	readme.gentoo-r1 systemd toolchain-funcs unpacker
-
-NV_KERNEL_MAX="5.12"
-NV_BIN_URI="https://download.nvidia.com/XFree86/Linux-"
-NV_GIT_URI="https://github.com/NVIDIA/nvidia-"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-SRC_URI="
-	amd64? ( ${NV_BIN_URI}x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	arm64? ( ${NV_BIN_URI}aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
-	${NV_GIT_URI}installer/archive/${PV}.tar.gz -> nvidia-installer-${PV}.tar.gz
-	${NV_GIT_URI}modprobe/archive/${PV}.tar.gz -> nvidia-modprobe-${PV}.tar.gz
-	${NV_GIT_URI}persistenced/archive/${PV}.tar.gz -> nvidia-persistenced-${PV}.tar.gz
-	${NV_GIT_URI}settings/archive/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz
-	${NV_GIT_URI}xconfig/archive/${PV}.tar.gz -> nvidia-xconfig-${PV}.tar.gz"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="GPL-2 MIT NVIDIA-r2 ZLIB"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* amd64"
-IUSE="+X +driver static-libs +tools"
-
-COMMON_DEPEND="
-	acct-group/video
-	acct-user/nvpd
-	net-libs/libtirpc
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? (
-		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)"
-BDEPEND="
-	app-misc/pax-utils
-	virtual/pkgconfig"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-PATCHES=(
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-)
-
-DOCS=(
-	README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-)
-HTML_DOCS=( html/. )
-
-pkg_setup() {
-	use driver || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		!DEBUG_MUTEXES"
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and optional nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead."
-
-	if kernel_is -lt 5 10; then
-		CONFIG_CHECK+=" PM" # needed since 460.67 (bug #778920)
-		local ERROR_PM="CONFIG_PM: is not set but needed with kernel version <5.10"
-	fi
-
-	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
-	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
-	MODULE_NAMES="
-		nvidia(video:kernel)
-		nvidia-drm(video:kernel)
-		nvidia-modeset(video:kernel)
-		nvidia-uvm(video:kernel)"
-
-	linux-mod_pkg_setup
-
-	if [[ ${MERGE_TYPE} != binary ]] && kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
-		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
-		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
-		ewarn
-		ewarn "Do _not_ file a bug report if run into issues."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# make user patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-
-	default
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
-		-i kernel/conftest.sh || die
-
-	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
-		-e '/Categories=/s/_.*/System;Settings;/' \
-		-i nvidia-settings/doc/nvidia-settings.desktop || die
-
-	# remove gtk2 support (bug #592730)
-	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
-		-i nvidia-settings/src/Makefile || die
-
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> nvidia-persistenced.service || die
-
-	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
-}
-
-src_compile() {
-	nvidia-drivers_make() {
-		emake -C nvidia-${1} ${2} \
-			PREFIX="${EPREFIX}/usr" \
-			HOST_CC="$(tc-getBUILD_CC)" \
-			HOST_LD="$(tc-getBUILD_LD)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
-	}
-
-	tc-export AR CC LD OBJCOPY
-
-	# may no longer be relevant but kept as a safety
-	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
-
-	use driver && linux-mod_src_compile
-
-	nvidia-drivers_make modprobe
-	nvidia-drivers_make persistenced
-	use X && nvidia-drivers_make xconfig
-
-	if use tools; then
-		nvidia-drivers_make settings
-	elif use static-libs; then
-		nvidia-drivers_make settings/src out/libXNVCtrl.a
-	fi
-}
-
-src_install() {
-	nvidia-drivers_make_install() {
-		emake -C nvidia-${1} install \
-			DESTDIR="${D}" \
-			PREFIX="${EPREFIX}/usr" \
-			LIBDIR="${ED}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-	}
-
-	nvidia-drivers_libs_install() {
-		local libs=(
-			EGL_nvidia
-			GLESv1_CM_nvidia
-			GLESv2_nvidia
-			cuda
-			nvcuvid
-			nvidia-allocator
-			nvidia-eglcore
-			nvidia-encode
-			nvidia-glcore
-			nvidia-glsi
-			nvidia-glvkspirv
-			nvidia-ml
-			nvidia-opencl
-			nvidia-opticalflow
-			nvidia-ptxjitcompiler
-			nvidia-tls
-		)
-		use amd64 && libs+=( nvidia-compiler )
-
-		if use X; then
-			libs+=(
-				GLX_nvidia
-				vdpau_nvidia
-			)
-			if use amd64; then
-				libs+=(
-					nvidia-fbc
-					nvidia-ifr
-				)
-			fi
-		fi
-
-		local libdir=.
-		if [[ ${ABI} == x86 ]]; then
-			libdir+=/32
-		else
-			libs+=(
-				nvidia-cbl
-				nvidia-cfg
-				nvidia-rtcore
-				nvoptix
-			)
-			use amd64 && libs+=( nvidia-ngx )
-		fi
-
-		local lib soname
-		for lib in "${libs[@]}"; do
-			lib=lib${lib}.so.${PV}
-
-			# auto-detect soname and create appropriate symlinks
-			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
-			if [[ ${soname} && ${soname} != ${lib} ]]; then
-				ln -s ${lib} ${libdir}/${soname} || die
-			fi
-			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
-
-			dolib.so ${libdir}/${lib%.so*}*
-		done
-	}
-
-	if use driver; then
-		linux-mod_src_install
-
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-470.conf nvidia.conf
-
-		# used for gpu verification with binpkgs (not kept)
-		insinto /usr/share/nvidia
-		doins supported-gpus/supported-gpus.json
-	fi
-
-	if use X; then
-		exeinto /usr/$(get_libdir)/xorg/modules/drivers
-		doexe nvidia_drv.so
-
-		exeinto /usr/$(get_libdir)/xorg/modules/extensions
-		newexe libglxserver_nvidia.so{.${PV},}
-
-		insinto /usr/share/X11/xorg.conf.d
-		newins {,50-}nvidia-drm-outputclass.conf
-
-		# vulkan icd uses libGLX_nvidia.so and so requires X
-		insinto /usr/share/vulkan/icd.d
-		doins nvidia_icd.json
-		insinto /usr/share/vulkan/implicit_layer.d
-		doins nvidia_layers.json
-	fi
-
-	insinto /usr/share/glvnd/egl_vendor.d
-	doins 10_nvidia.json
-
-	insinto /etc/OpenCL/vendors
-	doins nvidia.icd
-
-	insinto /etc/nvidia
-	newins nvidia-application-profiles{-${PV},}-rc
-
-	# install built helpers
-	nvidia-drivers_make_install modprobe
-	# allow video group to load mods and create devs (bug #505092)
-	fowners root:video /usr/bin/nvidia-modprobe
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	nvidia-drivers_make_install persistenced
-	newconfd "${FILESDIR}/nvidia-persistenced.confd" nvidia-persistenced
-	newinitd "${FILESDIR}/nvidia-persistenced.initd" nvidia-persistenced
-	systemd_dounit nvidia-persistenced.service
-
-	use X && nvidia-drivers_make_install xconfig
-
-	if use tools; then
-		nvidia-drivers_make_install settings
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		insinto /usr/share/nvidia
-		newins nvidia-application-profiles{-${PV},}-key-documentation
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	# install prebuilt-only helpers
-	exeinto /opt/bin
-
-	doexe nvidia-cuda-mps-control
-	doman nvidia-cuda-mps-control.1
-	doexe nvidia-cuda-mps-server
-
-	doexe nvidia-debugdump
-	dobin nvidia-bug-report.sh
-
-	doexe nvidia-smi
-	doman nvidia-smi.1
-
-	# install prebuilt-only libraries
-	multilib_foreach_abi nvidia-drivers_libs_install
-
-	# install systemd sleep services
-	exeinto /lib/systemd/system-sleep
-	doexe nvidia
-	dobin nvidia-sleep.sh
-	systemd_dounit nvidia-{hibernate,resume,suspend}.service
-
-	# create README.gentoo
-	local DISABLE_AUTOFORMATTING="yes"
-	local DOC_CONTENTS=\
-"Trusted users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.
-
-For general information on using nvidia-drivers, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-	readme.gentoo_create_doc
-
-	einstalldocs
-}
-
-pkg_preinst() {
-	use driver || return
-	linux-mod_pkg_preinst
-
-	# set video group id based on live system (bug #491414)
-	local g=$(getent group video | cut -d: -f3)
-	[[ ${g} ]] || die "Failed to determine video group id"
-	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-	# try to find driver mismatches using temporary supported-gpus.json
-	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
-		if [[ ${g} ]]; then
-			g=$((${g##*\"}+1))
-			if ver_test -ge ${g}; then
-				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-				break
-			fi
-		fi
-	done
-	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-	use driver && linux-mod_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	optfeature "wayland EGLStream with nvidia-drm.modeset=1" gui-libs/egl-wayland
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and will lead to GPU-using application issues."
-		use driver && ewarn "The easiest way to fix this is usually to reboot."
-	fi
-
-	if [[ ${NV_LEGACY_MASK} ]]; then
-		ewarn "You are installing a version of nvidia-drivers known not to work"
-		ewarn "with a GPU of the current system. If unwanted, add the mask:"
-		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
-		else
-			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
-		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.84.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.84.ebuild
deleted file mode 100644
index 8931c3443b48..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.84.ebuild
+++ /dev/null
@@ -1,420 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop linux-info linux-mod multilib-build optfeature \
-	readme.gentoo-r1 systemd toolchain-funcs unpacker
-
-NV_KERNEL_MAX="5.13"
-NV_URI="https://download.nvidia.com/XFree86/"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-SRC_URI="
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
-	${NV_URI}nvidia-installer/nvidia-installer-${PV}.tar.bz2
-	${NV_URI}nvidia-modprobe/nvidia-modprobe-${PV}.tar.bz2
-	${NV_URI}nvidia-persistenced/nvidia-persistenced-${PV}.tar.bz2
-	${NV_URI}nvidia-settings/nvidia-settings-${PV}.tar.bz2
-	${NV_URI}nvidia-xconfig/nvidia-xconfig-${PV}.tar.bz2"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="GPL-2 MIT NVIDIA-r2 ZLIB"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* amd64"
-IUSE="+X +driver static-libs +tools"
-
-COMMON_DEPEND="
-	acct-group/video
-	acct-user/nvpd
-	net-libs/libtirpc
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? (
-		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)"
-BDEPEND="
-	app-misc/pax-utils
-	virtual/pkgconfig"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-PATCHES=(
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-)
-
-DOCS=(
-	README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-)
-HTML_DOCS=( html/. )
-
-pkg_setup() {
-	use driver || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		!DEBUG_MUTEXES"
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and optional nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, so enable
-	options such as CONFIG_DRM_FBDEV_EMULATION instead."
-
-	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
-	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
-	MODULE_NAMES="
-		nvidia(video:kernel)
-		nvidia-drm(video:kernel)
-		nvidia-modeset(video:kernel)
-		nvidia-uvm(video:kernel)"
-
-	linux-mod_pkg_setup
-
-	if [[ ${MERGE_TYPE} != binary ]] && kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
-		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
-		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
-		ewarn
-		ewarn "Do _not_ file a bug report if run into issues."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# make user patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-
-	default
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
-		-i kernel/conftest.sh || die
-
-	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
-		-e '/Categories=/s/_.*/System;Settings;/' \
-		-i nvidia-settings/doc/nvidia-settings.desktop || die
-
-	# remove gtk2 support (bug #592730)
-	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
-		-i nvidia-settings/src/Makefile || die
-
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> nvidia-persistenced.service || die
-
-	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
-}
-
-src_compile() {
-	nvidia-drivers_make() {
-		emake -C nvidia-${1} ${2} \
-			PREFIX="${EPREFIX}/usr" \
-			HOST_CC="$(tc-getBUILD_CC)" \
-			HOST_LD="$(tc-getBUILD_LD)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
-	}
-
-	tc-export AR CC LD OBJCOPY
-
-	# may no longer be relevant but kept as a safety
-	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
-
-	use driver && linux-mod_src_compile
-
-	nvidia-drivers_make modprobe
-	nvidia-drivers_make persistenced
-	use X && nvidia-drivers_make xconfig
-
-	if use tools; then
-		nvidia-drivers_make settings
-	elif use static-libs; then
-		nvidia-drivers_make settings/src out/libXNVCtrl.a
-	fi
-}
-
-src_install() {
-	nvidia-drivers_make_install() {
-		emake -C nvidia-${1} install \
-			DESTDIR="${D}" \
-			PREFIX="${EPREFIX}/usr" \
-			LIBDIR="${ED}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-	}
-
-	nvidia-drivers_libs_install() {
-		local libs=(
-			EGL_nvidia
-			GLESv1_CM_nvidia
-			GLESv2_nvidia
-			cuda
-			nvcuvid
-			nvidia-allocator
-			nvidia-eglcore
-			nvidia-encode
-			nvidia-glcore
-			nvidia-glsi
-			nvidia-glvkspirv
-			nvidia-ml
-			nvidia-opencl
-			nvidia-opticalflow
-			nvidia-ptxjitcompiler
-			nvidia-tls
-		)
-		use amd64 && libs+=( nvidia-compiler )
-
-		if use X; then
-			libs+=(
-				GLX_nvidia
-				vdpau_nvidia
-			)
-			if use amd64; then
-				libs+=(
-					nvidia-fbc
-					nvidia-ifr
-				)
-			fi
-		fi
-
-		local libdir=.
-		if [[ ${ABI} == x86 ]]; then
-			libdir+=/32
-		else
-			libs+=(
-				nvidia-cbl
-				nvidia-cfg
-				nvidia-rtcore
-				nvoptix
-			)
-			use amd64 && libs+=( nvidia-ngx )
-		fi
-
-		local lib soname
-		for lib in "${libs[@]}"; do
-			lib=lib${lib}.so.${PV}
-
-			# auto-detect soname and create appropriate symlinks
-			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
-			if [[ ${soname} && ${soname} != ${lib} ]]; then
-				ln -s ${lib} ${libdir}/${soname} || die
-			fi
-			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
-
-			dolib.so ${libdir}/${lib%.so*}*
-		done
-	}
-
-	if use driver; then
-		linux-mod_src_install
-
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-470.conf nvidia.conf
-
-		# used for gpu verification with binpkgs (not kept)
-		insinto /usr/share/nvidia
-		doins supported-gpus/supported-gpus.json
-	fi
-
-	if use X; then
-		exeinto /usr/$(get_libdir)/xorg/modules/drivers
-		doexe nvidia_drv.so
-
-		exeinto /usr/$(get_libdir)/xorg/modules/extensions
-		newexe libglxserver_nvidia.so{.${PV},}
-
-		insinto /usr/share/X11/xorg.conf.d
-		newins {,50-}nvidia-drm-outputclass.conf
-
-		# vulkan icd uses libGLX_nvidia.so and so requires X
-		insinto /usr/share/vulkan/icd.d
-		doins nvidia_icd.json
-		insinto /usr/share/vulkan/implicit_layer.d
-		doins nvidia_layers.json
-	fi
-
-	insinto /usr/share/glvnd/egl_vendor.d
-	doins 10_nvidia.json
-
-	insinto /etc/OpenCL/vendors
-	doins nvidia.icd
-
-	insinto /etc/nvidia
-	newins nvidia-application-profiles{-${PV},}-rc
-
-	# install built helpers
-	nvidia-drivers_make_install modprobe
-	# allow video group to load mods and create devs (bug #505092)
-	fowners root:video /usr/bin/nvidia-modprobe
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	nvidia-drivers_make_install persistenced
-	newconfd "${FILESDIR}/nvidia-persistenced.confd" nvidia-persistenced
-	newinitd "${FILESDIR}/nvidia-persistenced.initd" nvidia-persistenced
-	systemd_dounit nvidia-persistenced.service
-
-	use X && nvidia-drivers_make_install xconfig
-
-	if use tools; then
-		nvidia-drivers_make_install settings
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		insinto /usr/share/nvidia
-		newins nvidia-application-profiles{-${PV},}-key-documentation
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	# install prebuilt-only helpers
-	exeinto /opt/bin
-
-	doexe nvidia-cuda-mps-control
-	doman nvidia-cuda-mps-control.1
-	doexe nvidia-cuda-mps-server
-
-	doexe nvidia-debugdump
-	dobin nvidia-bug-report.sh
-
-	doexe nvidia-smi
-	doman nvidia-smi.1
-
-	# install prebuilt-only libraries
-	multilib_foreach_abi nvidia-drivers_libs_install
-
-	# install systemd sleep services
-	exeinto /lib/systemd/system-sleep
-	doexe nvidia
-	dobin nvidia-sleep.sh
-	systemd_dounit nvidia-{hibernate,resume,suspend}.service
-
-	# create README.gentoo
-	local DISABLE_AUTOFORMATTING="yes"
-	local DOC_CONTENTS=\
-"Trusted users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.
-
-For general information on using nvidia-drivers, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-	readme.gentoo_create_doc
-
-	einstalldocs
-}
-
-pkg_preinst() {
-	use driver || return
-	linux-mod_pkg_preinst
-
-	# set video group id based on live system (bug #491414)
-	local g=$(getent group video | cut -d: -f3)
-	[[ ${g} ]] || die "Failed to determine video group id"
-	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-	# try to find driver mismatches using temporary supported-gpus.json
-	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
-		if [[ ${g} ]]; then
-			g=$((${g##*\"}+1))
-			if ver_test -ge ${g}; then
-				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-				break
-			fi
-		fi
-	done
-	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-	use driver && linux-mod_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	optfeature "wayland EGLStream with nvidia-drm.modeset=1" gui-libs/egl-wayland
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and will lead to GPU-using application issues."
-		use driver && ewarn "The easiest way to fix this is usually to reboot."
-	fi
-
-	if [[ ${NV_LEGACY_MASK} ]]; then
-		ewarn "You are installing a version of nvidia-drivers known not to work"
-		ewarn "with a GPU of the current system. If unwanted, add the mask:"
-		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
-		else
-			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
-		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
-	fi
-
-	# Try to show this message only to users that may really need it
-	# given the workaround is discouraged and usage isn't widespread.
-	if use X && [[ ${REPLACING_VERSIONS} ]] &&
-		ver_test ${REPLACING_VERSIONS} -lt 460.73.01 &&
-		grep -qr Coolbits "${EROOT}"/etc/X11/{xorg.conf,xorg.conf.d/*.conf} 2>/dev/null; then
-		elog
-		elog "Coolbits support with ${PN} has been restricted to require Xorg"
-		elog "with root privilege by NVIDIA (being in video group is not sufficient)."
-		elog "e.g. attempting to change fan speed with nvidia-settings would fail."
-		elog
-		elog "Depending on your display manager (e.g. sddm starts X as root, gdm doesn't)"
-		elog "or if using startx, it may be necessary to emerge x11-base/xorg-server with"
-		elog 'USE="suid -elogind -systemd" if wish to keep using this feature.'
-		elog "Bug: https://bugs.gentoo.org/784248"
-	fi
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 06926fd6b86f..4e8153c75a1d 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 18c06826f9c9..5a9a11162b5c 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,4 +1,6 @@
 DIST libXfont2-2.0.4.tar.bz2 513167 BLAKE2B 924cf8462a8fc593755080866b63d6cca6e58b5d875f1d25b95271a56d883e983445f72f8950adf1964e0bf10ca5b8bb2ddfe0c56d4395086e460952a5933bd7 SHA512 7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106
+DIST libXfont2-2.0.5.tar.bz2 524868 BLAKE2B 0b26d4c93452bcb3f5c740ac8984b9873a8241405d270e2d3fa5f440be820db417c9eff59c7a1a8c175513e40df70ada9c037d45c3a9ae2ccf62eb12f81c1d8f SHA512 64d0635d14676bb645d61932afb177eb3808a46525b26e7ee31abc975eca75207743e85523fdd82b08010ce124eb4802338b508ee7b126875d2a3c12f8ac4faa
 EBUILD libXfont2-2.0.4.ebuild 818 BLAKE2B 4b7c1b96ccb56b853f6c8b83030418d509877975e2e2f584feb56c76ac5dae5da12394db6dab5f4024d0a2fa0944fcca5ea306154c8139b980f8d4382a2d2f78 SHA512 d79ca038b5d3bb8b2e72fb77536ca385175d26df67696eee83a058137f9fb0b51084ca4b74bbe2a51911a00615f2d2183bea3654e6dd3ea2bb0468e25bdfce93
-EBUILD libXfont2-9999.ebuild 658 BLAKE2B a0848ecd2fb9bda9e10b931a9210d1fb43d900dbe2ed2922f261170db9febdae3ce5bd3bc59b148994b89408108c0eefe956def6e8abb5d2e283188f6541a452 SHA512 77acd92aaea7c2030895df7246feb87a0fa4d8b250a86102871cddd581c6241034aa7aff7ef153369713a4b6aa7d6cd89c5b600f7156b462be41b41b2c83d0a7
+EBUILD libXfont2-2.0.5.ebuild 821 BLAKE2B 1f6e213a80c45daf5e3155edd782430a472b447172156fd054aab6fe821f012a01aa43029c4e38eacc4f95a05fb8d15082fb1ce4fd04c1457aa70debee8edc7c SHA512 ad5dbc09f3995fffc0fb459cab4122b9761a238b821dbca59deba1cb4068667f73b609192560c9266fdfc0ae711df04334846d73753482dd130c70aa1cc3724a
+EBUILD libXfont2-9999.ebuild 654 BLAKE2B 43386d911c54d98561381f3cf0bcee12b1616b076bec49e5cd15559256f8077ae3b1421064b6843bcdaf7bed96056b675122809e4fb4b22b8c33624835214336 SHA512 3c82e744ddf582a40841f57344ef5620f3034fbda44d3b4259f87e8b6eb6e5a24de7d88c44c5154a98c1133af380960ed9140cd512418838bf39244b07781b07
 MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont2/libXfont2-2.0.5.ebuild b/x11-libs/libXfont2/libXfont2-2.0.5.ebuild
new file mode 100644
index 000000000000..a07d98ab5832
--- /dev/null
+++ b/x11-libs/libXfont2/libXfont2-2.0.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_PACKAGE_NAME=libxfont
+XORG_DOC=doc
+inherit xorg-3
+
+DESCRIPTION="X.Org Xfont library"
+
+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="bzip2 ipv6 truetype"
+
+RDEPEND="sys-libs/zlib
+	dev-libs/libbsd
+	x11-libs/libfontenc
+	bzip2? ( app-arch/bzip2 )
+	truetype? ( >=media-libs/freetype-2 )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xtrans"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc devel-docs)
+		$(use_with doc xmlto)
+		$(use_with bzip2)
+		$(use_enable truetype freetype)
+		--without-fop
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-libs/libXfont2/libXfont2-9999.ebuild b/x11-libs/libXfont2/libXfont2-9999.ebuild
index cc2376f181c1..1b342b777742 100644
--- a/x11-libs/libXfont2/libXfont2-9999.ebuild
+++ b/x11-libs/libXfont2/libXfont2-9999.ebuild
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE="bzip2 ipv6 truetype"
 
 RDEPEND="sys-libs/zlib
-	x11-base/xorg-proto
+	dev-libs/libbsd
 	x11-libs/libfontenc
 	bzip2? ( app-arch/bzip2 )
 	truetype? ( >=media-libs/freetype-2 )"
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 81d7a4f32f67..61c18c23a231 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,3 +1,5 @@
 DIST libXft-2.3.3.tar.bz2 353465 BLAKE2B 05a91225d09b5e1800a8272c72f7220d9987e3828591bf73d8307a9c4fca1ce7c4c62b36805f44e385c3a4269ebaafdaed70d3b2006208e860f8e982b53c975f SHA512 28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8
+DIST libXft-2.3.4.tar.bz2 359088 BLAKE2B 37f8522ad744e99ae8372f4292017eed1f2c2a84169497441c3c12696cbb7b3cf33e04864b50433e46f8723cc6c6006226c743a0d491a3784baf3f21ea062399 SHA512 5bb019750982ed4643880efd7368bc226ad49cfa8c0c8c6d4614dfeed74f588c65e1ba69adcc12284ec07d841e5b58fc1c27f3fddf83fe1a2837b29dd9ecec51
 EBUILD libXft-2.3.3.ebuild 705 BLAKE2B ad8c0dd550a1936c798cc84cbd4fff1a1a0f39a711adf5cfdd1050ea1753077ad11dba2802c68fd106865642694534eda0aa9a6820f414d65ab5e42a3320d478 SHA512 16af99878c9e63030753500da2d21dda6413a4a8b2cf1bd430df2c09f66063c13eac923626ffe3fb4d6f1c7e767536507edd10bb446211a91396a89c16b9208d
+EBUILD libXft-2.3.4.ebuild 712 BLAKE2B 16c02d95ffb7e9b9394118603dfd2072d257196d1286a7dae029696a1ab0d5259a81119fbd23ede97660f82baeb44ddd45cfc6ac3fc230fbd8481c07e755b85f SHA512 10e9180d80c7efea618a96e00cb1eda48c0bb05d49ada4a1e1d5d2eb5484439518813368b422aba563aef7d9873f8749a9e6bc3d2fad26fd8059ac491f63bd47
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXft/libXft-2.3.4.ebuild b/x11-libs/libXft/libXft-2.3.4.ebuild
new file mode 100644
index 000000000000..19c704e2da02
--- /dev/null
+++ b/x11-libs/libXft/libXft-2.3.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xft library"
+
+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 ~x86-winnt"
+IUSE="doc"
+
+RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
+	virtual/ttf-fonts
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index e66049649516..0c3ec4564b97 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,3 +1,3 @@
 DIST neXtaw-0.15.1.tar.gz 577459 BLAKE2B c38e8fe482bf0f51a2f387ab76d62666778d569982e153dbe32988d557dad91876122cfe4d0e8940e5c1d8ca7a8a3af09c09631b8ed656bd6a11db21d16ae331 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1
-EBUILD neXtaw-0.15.1-r3.ebuild 725 BLAKE2B 7756182433942f0c24aebfaa4a630fdc2822c7bc40e7b16d3d944feb0fae2857f76a24854ac3e1673183b32bfd0acafba64999ffd564eccde292e0b8b3da3add SHA512 3cc14989eed5e220d8f9953dfe9bc3d292bbe7929d638d436be507526b2487d09b7fb5cc3883b8c880d13fc172835b0fdbc0d50923337b766ce7ba32916c886f
+EBUILD neXtaw-0.15.1-r3.ebuild 732 BLAKE2B c796b85364a2a333512e60bbe054b4e86cd7b466f4b39055e75ba62eefe0ec9c86ac6de1f11a88da3d03c349797f91af35e6115d512b118a130bffabd7a753f1 SHA512 8730d3b5b85d4b1b3ef8c5efd2556a225af6bbd65eec07bbafe1ced96d3b5c3fefb3f86f5eccac3c1b3215f6836ce826311f6b58d3571dbc82cb06734b45809e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
index 9669ec610174..f89f61178319 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-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
@@ -9,7 +9,7 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="
 	x11-base/xorg-proto
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 56180b9e0b2d..c6541447d891 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,7 +1,5 @@
-DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586 SHA512 c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1
-EBUILD qscintilla-2.11.5.ebuild 1959 BLAKE2B 66709df30efbbee01900254c1fbe9026155fc6a063b2bbc2dee69278c6600a258ba351155519db19588d6a032080be7bdbb2dc0ecad7dcacdd4eb017f2e5b542 SHA512 f786290e1496a6d1ff12f9c235269e5d72d4e5898fd5b57a787df74d84f33359b6eeff3530d96fb9037804e26be126abcd3cf84c9242f4c24238ea94898646b5
-EBUILD qscintilla-2.11.6.ebuild 1960 BLAKE2B a61443c1d296896aba43182508ab745467fbd44276f118bb5ed40d5064541bb27a5d8edaefa4aa584540f2ee1d572dae2bece400377c5e12c363599769e30f41 SHA512 fa113212d1f891c908edec7d0a1279dd7df8e2e6e8eebe8b836afc1206e6c70e676d00a78d6743b11fc353b5e6026699b80687623cc597d0cca501b4f73b0c54
+EBUILD qscintilla-2.11.6.ebuild 1959 BLAKE2B 5609b01ac7f134c828f00689ddfb3f63816b0098b028199edde287211a969cbdbfa4eeb1c3442fca58d8021d205bd9fb82cd736bb0c5e617cc85d362ea39cd3e SHA512 b8365aa48d71e5d2c6421dd45132601e58857f35569397f7d157b710af5c4210bffcf9c88ef6800fe1ce96c909e21cf6cf5cd71346ec5f35f5b38ebe1048290e
 EBUILD qscintilla-2.13.0.ebuild 1896 BLAKE2B 848a3f5f88a75733433a4dde205043d200d1983301c09696f2b93156b300128cc92a554c3653853d2f53e712fb4c74288b0a618fd0db7b061094bf3912546afe SHA512 cb5c43d8dc3651755928ee1ce640089374862ecb316affdcde06b4a79ae773a6c0b5212470b9079e025066fc941b84700c92e604733b0113a5e2146d25cba0e0
 MISC metadata.xml 604 BLAKE2B d353a492de987b1b7898a206a1d29fff43dc25ec7809d95fe8ddd816507c24b7fea26de43ce16cb0b939e31d663d280231202b787fcff2f6b79d4716c9a00713 SHA512 ff45db818793a808f2fee2a85fbf9d3a069bcf406f8d18c5a49f527d332002cad64295ae9b31f5297203610a4497db12e5aace0861069e55f127c736a4065580
diff --git a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild b/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
deleted file mode 100644
index 301812495e56..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.11.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils
-
-DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-
-MY_PN=QScintilla
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/15"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
-IUSE="designer doc"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	default
-
-	# Sub-slot sanity check
-	local subslot=${SLOT#*/}
-	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro || die)
-	local major=${version%%.*}
-	if [[ ${subslot} != ${major} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-}
-
-qsci_run_in() {
-	pushd "$1" >/dev/null || die
-	shift || die
-	"$@" || die
-	popd >/dev/null || die
-}
-
-src_configure() {
-	if use designer; then
-		# prevent building against system version (bug 466120)
-		append-cxxflags -I../Qt4Qt5
-		append-ldflags -L../Qt4Qt5
-	fi
-
-	qsci_run_in Qt4Qt5 eqmake5
-	use designer && qsci_run_in designer-Qt4Qt5 eqmake5
-}
-
-src_compile() {
-	qsci_run_in Qt4Qt5 emake
-	use designer && qsci_run_in designer-Qt4Qt5 emake
-}
-
-src_install() {
-	qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
-	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
-
-	DOCS=( ChangeLog NEWS )
-	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
-	einstalldocs
-}
diff --git a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
index bc6d19a21706..dbdee4023339 100644
--- a/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.11.6.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 IUSE="designer doc"
 
 RDEPEND="
diff --git a/x11-libs/snorenotify/Manifest b/x11-libs/snorenotify/Manifest
index fe4e38f0eb60..87f462626c4e 100644
--- a/x11-libs/snorenotify/Manifest
+++ b/x11-libs/snorenotify/Manifest
@@ -1,5 +1,5 @@
 AUX snorenotify-0.7.0-desktop.patch 1517 BLAKE2B fc126c421ca7feae0f64e913ac9ff9d19fb47bf2ac8743d70756b04b2d17bcee8736c16377208bbf81c61281797effe783e3ed6b9a827529eb1046b2f4ffe189 SHA512 be7663b95e7884f9b77891bf175ae87bae33d2aeec1076538428785aa496b60a7dbe5f48aae8ab443100cba4cd90f4638545df80184df9d98f2c0222775da072
 AUX snorenotify-0.7.0-include.patch 561 BLAKE2B e6d75957732b6cef79ca9c043efdcb2d860cbb6de90ad231edc8d5364a6544e466ff296ad1ffcbfb89671e9173fd7936dee81dc76c9f4fd2a6272e1ddcfa7b2c SHA512 5f644739f76aafea122e30ce0978371fecab5ab2c4a13ae11cae69fbfa23be0ea1f7075d296f181d9568e84a54a683f13b0a1cb1a83d47ba7d3c7febb2de391e
 DIST snorenotify-0.7.0.tar.xz 200032 BLAKE2B 4eb4f7a57bfde7a780b868a8c57c5d1e262809fd2b591597d69c3e98b712b926e287009b453a5e00ba5f805728d986441824eb226bd73c94375d11129be03d4d SHA512 2030a7b6bc69d3803e83e1a6d26efa5bfdd3facf53dcaade6059b85cea3db879ea49b9e02dbce3b043b4ddded21509a6d5859a4002cfd57a870a0e39cd11011a
-EBUILD snorenotify-0.7.0-r1.ebuild 1053 BLAKE2B 189311ac53b0524836ec2797647d76c3b685ca4596858e5ff075d5ee922e70bea8ed62449c5ea3e6355aa80673813776c738097a4dbc29d97e90496f3e03207d SHA512 66e30c70b2e82f689280d09bd99fe556e7f877a33b3276a93a1b492fbb83e0fbb9fd41751fdf5dbdbb2529df98d28dc9069cd811e38f36fd49459dd76e7b5ce3
+EBUILD snorenotify-0.7.0-r1.ebuild 1052 BLAKE2B b971038f29e3cd8356da2515b52dd8382fde5132a929b2d46666967de6c1abd7b45a874685aa817ffe084e72fddb74bc33b454053b894ee9fc9917fccd4ccd1b SHA512 42d2bc1d21a3d5e8e0b7b910e697baf6acff1e3aafef026f35620851548266c69245a28ed5aaf2337497c2827010e0c992dfcfd03b6516495f07aa829a1fdbbd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
index c165073fda3d..4d88523fddf5 100644
--- a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
+++ b/x11-libs/snorenotify/snorenotify-0.7.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 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="sound test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 73aeb94bfaf0..84da914209e6 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest
index 82baf4b15426..c87efb9e3585 100644
--- a/x11-misc/appmenu-gtk-module/Manifest
+++ b/x11-misc/appmenu-gtk-module/Manifest
@@ -1,4 +1,4 @@
 AUX appmenu-gtk-module 239 BLAKE2B c5f055154136c6ba862ce9f74edf898fd9baa5b699fe149fd29b125bd42cee94174e7f8f8bf7a40ee63e880f38a161a652e45c171dae399e8cd2b76e4a94e2f5 SHA512 daf70376ebcd1b67eec093c8b905b6d085d4206958573ce7aa8709c053928a78a7b8d06b6fdba9a221731d89e3fe6720394d1e8cee208adfaaf298825a9cc04e
 DIST appmenu-gtk-module-0.7.3.tar.xz 48460 BLAKE2B b7008aa618e643a95445aad25bc19eed5b887810891318a891f088284f8f128e6392671226742a8b0c70699a9455739ee61ed56aec32129532ba53dc69809913 SHA512 d7df7e3cea3ccb66d013b23ae8796b8cbb0e0787f37f54078715c4863797c28d44ff38d7ac965b6eb0fd5cb327c1a4b891c74c66ba95b9b9a06e2c06ba5b2ad8
-EBUILD appmenu-gtk-module-0.7.3-r1.ebuild 1043 BLAKE2B fe8d629751725a3929310aba61c3dad4fb1a925f69b4d3201ffd9e4f67337d966cc9abd0ed78228399185199578c6dc53e3f8c4c77ac632eb06a043f577014da SHA512 8b951c23fe2e59d35ca2b4f3169a70f3989209ab25c1c08daac23b6f6af7aaf0431a15060c050ba114966fc70200306eadf9f288d19214db5a89a6ff45fb9fa6
+EBUILD appmenu-gtk-module-0.7.3-r2.ebuild 1060 BLAKE2B 98fed252308c577b83df521c54e1b32cd10e548e681e8790d40c971e4037ae0958f7861630ff51cdcbf38238275c5a5379b949aea97f03fb06754e2f8c9a129f SHA512 d39a153326dd1c4f80f05eefbff4eba85021bd6ddf98478275af09ad404bc238f0a3ce33adaf54cc231c67916a10dd6e38f7c56a40462afaedb1df5309af5223
 MISC metadata.xml 330 BLAKE2B 0b8f27cf4be7ed52be5e6656a64497815cbac57febe612b3755ca2cfa9ce97f34d5807318ac39bc184b7e61b3086cecfa4e5b2e19066adfb32caead8e8833a89 SHA512 834c1c90c8297497e13de12121a39f113807228ede6ec87ad774096e870840f1f1ddc73301c63375f2600b035be12f88c77c978a8fec2e089b0624df16444959
diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild
deleted file mode 100644
index 78cead766566..000000000000
--- a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-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 cmake gnome2-utils systemd
-
-DESCRIPTION="Application menu module for GTK"
-HOMEPAGE="https://gitlab.com/vala-panel-project/vala-panel-appmenu"
-SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d1a65e77d42cb19e5972d0d1b84/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib[dbus]
-	>=x11-libs/gtk+-2.24.0:2
-	>=x11-libs/gtk+-3.22.0:3
-"
-DEPEND="${RDEPEND}
-	dev-libs/wayland
-"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i -e "/^pkg_check_modules(SYSTEMD/d" data/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGSETTINGS_COMPILE=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_VCM=ON
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/${PN} 85-${PN}
-
-	systemd_dounit "${BUILD_DIR}"/data/appmenu-gtk-module.service
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r2.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r2.ebuild
new file mode 100644
index 000000000000..e6fa0c0a95b0
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake gnome2-utils systemd
+
+DESCRIPTION="Application menu module for GTK"
+HOMEPAGE="https://gitlab.com/vala-panel-project/vala-panel-appmenu"
+SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d1a65e77d42cb19e5972d0d1b84/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+IUSE="wayland"
+
+RDEPEND="
+	dev-libs/glib[dbus]
+	>=x11-libs/gtk+-2.24.0:2
+	>=x11-libs/gtk+-3.22.0:3[wayland=]
+"
+DEPEND="${RDEPEND}
+	dev-libs/wayland
+"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i -e "/^pkg_check_modules(SYSTEMD/d" data/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSETTINGS_COMPILE=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_VCM=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	exeinto /etc/X11/xinit/xinitrc.d
+	newexe "${FILESDIR}"/${PN} 85-${PN}
+
+	systemd_dounit "${BUILD_DIR}"/data/appmenu-gtk-module.service
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 41af0be5d21a..8276921d37ea 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -3,5 +3,5 @@ AUX 1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch 1768 BLAKE2B b8
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
 DIST colord-1.4.5.tar.xz 1869084 BLAKE2B 34c886bade6f71b0b81bbed216695d839873fba46423f6422b80ef2f62e88a403edd1686bb705ef78bcaeb352477e0581d784ccd388961cd42d880661b4b31ab SHA512 b6cc8087ceff4a99b7d764087208cc72e1219d9f6bb52bd3e3eb13bb62e3c1e99aefef36237dceff46925ab7680c76795f59057b7a4d1c8a123de6270708e03c
 EBUILD colord-1.3.5.ebuild 5020 BLAKE2B 0bf726b3dceb24289e27ff1db60e5bf02fa350b52e271539a101cb422d2beaa4a4014e2421c8842755d65991e4c26651234ecb0e15ffe3d0659fe51d9f436e85 SHA512 7d2050a8f9bd884498770ace429edc8c3fffa556f9bcd3861e17531988112b6e461a6b76cd0a1eb2d3ad95f1e01d493416ead82faa2aefcfd3a92ce6833a2805
-EBUILD colord-1.4.5-r1.ebuild 3387 BLAKE2B ef98fae5639f7cd664aa89c871a206655d3baf243a46e647cebc301374cee84bb22d84d122fbfd3410e6d014baf3b9960a7064af69a97bf944aad330ef522795 SHA512 f6b19a52fe55567fee8bc4b9d128652202d4739ef787e425088e59f3cdda8543f80139ad3d2cf74e7fa2bdcd509551fbf0930fd5db92aa96a755995af95f22a0
+EBUILD colord-1.4.5-r1.ebuild 3394 BLAKE2B 2451b89697acd082ef64ec3d498db52ffd8d4a28d858ee4cbd3a9a4f838f740ada79dab128f7301833a2fb65a96e51237ba8fc41c4e5f49e96b4e7f33c16e854 SHA512 e1dd6213e879fb3ae2cebc0370a07ef4ff9783d0cc4f4844a1f612672a4248c364c111ece5a544a59e7ac4cbd975030c34387877c9c3f53c3963bcc227799a6a
 MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.4.5-r1.ebuild b/x11-misc/colord/colord-1.4.5-r1.ebuild
index 6431f775af63..c4774663d9e0 100644
--- a/x11-misc/colord/colord-1.4.5-r1.ebuild
+++ b/x11-misc/colord/colord-1.4.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner systemd test +udev vala"
 RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index cce9337fd195..cc86dab7aff1 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -7,4 +7,4 @@ AUX 0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch 636 BLAKE2B 0aa1c55b
 AUX 0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch 3810 BLAKE2B b6e08d130fd4ba4ecd3c851edb01acfbf976f8a8134a5116115330b6ead2ae04c53fafba82ce2b006203221737a494276f82dde5140113fabec70cd0aee6b4a1 SHA512 c89341483ae97d43e58ea66324b0f8691bfe3cf849ebb3dfa4c76d4456c3bc1f2239692f2a3fa3b0cef5980ffa807e9c0c9809b16af2755b7cb71c39869a8e83
 DIST i3status-2.13.tar.bz2 201409 BLAKE2B e087d69e2df3ae9348cb55739023b2164dfa3543551d173b138c72e574714069d8397716b95e92c4315aa538ea31b33aa73532d6d0f75bbc38d7db54e1f665bc SHA512 6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2
 EBUILD i3status-2.13-r1.ebuild 1589 BLAKE2B 2d41ef01ba4d5cebe12dc40dad94b6ca8285ac37e3f2e16553fe7a916387e52512e20e94a02119fa95ed935853b91234b37b504b389c0ac2fa40e4123c9f0d47 SHA512 efbe456e810b7ffee5fb39b771ceed63c85d70b66f8a7d889da97417fc2976c7fa23631abb178ab66780ceb3414eb384266e1e08bff2abc39cf00c6adca3b77b
-MISC metadata.xml 898 BLAKE2B 26948920cf32c22b1f80e57bae048dbbe6675d2b3e3593bcaa8e5d5790f34647f81b666dc2b8ef25345755bbcfee1bf71e44da76f508223ce432ddc71e8520d2 SHA512 70981067b9c47528a73fee30a5200b274613d69ed31622ec22de2ba59c5e1138dadeeecac5c5703750ecab7e08629a7a8456a1de208fe404a242929ddc2c88e6
+MISC metadata.xml 894 BLAKE2B 118fd3bfd5255da6484beaf2903fe5e2caf79494b9d7f070b17d0ebc3391851b3200e16d355acb07d32a6311287b18db27f75f366d9cb946582e3d36f78796e5 SHA512 c890176a410208f42097a8e439cc7ec307ec7adbadee6d751a260379aee523141a757e42a1fc176f863ff22fd77f9fb0c87187e0b6d93ab5e8af3b7462e0b80b
diff --git a/x11-misc/i3status/metadata.xml b/x11-misc/i3status/metadata.xml
index ac73075b7acf..f46ee7d432fb 100644
--- a/x11-misc/i3status/metadata.xml
+++ b/x11-misc/i3status/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
+		<email>ultrabug@gentoo.org</email>
+		<name>Alexys Jacob</name>
 	</maintainer>
 	<longdescription>
 		i3status is a small program (about 1500 SLOC) for generating a status bar for
diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index 7652f7562672..f81eb84d5511 100644
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -1,6 +1,3 @@
-AUX idesk-0.7.5-glibc-2.12.patch 544 BLAKE2B 460044772e452f1b583513c8926e99d1021e80a3906cdcde918f7177da415ac9d898d2097088d37a223b424444d25d3e0fadac489549a85ac1b1a812525fb16e SHA512 f21f419d7facc62990a35b67e57bec2f9b46c76a6026a267348edfbd0207c14682cf1a3b8ca0ab4d508668a0c4dc9cc8ad06921b3218f077225bafc3f1ae9fc6
-DIST idesk-0.7.5.tar.bz2 185858 BLAKE2B b1cc2e423ff7f9f9db12fcfd46c0d9b03e29ad6b4b44f79ab6fca76b356b7df798532261364e30991dfacef9d377b69bf3dc9b5f44baf817b44629eb3805f3e6 SHA512 42c15cecc6e2cf6546420542fc4480902fd33c26c19ffc32e65eb04d09116d3b80f5539cde4ca86d4bec30ce96417752bfe7416ec83c531235d9064d06ec0475
 DIST idesk-v1.tar.gz 195147 BLAKE2B 2b2b0dacbfb1d8fb950c88d990e3674bf8b4cf82d9022ed2f7be1f32082c46ae32d8200957e2e19d0d21ea1e4d59ec092f4cba90e712f79700a04f05c3a3aa14 SHA512 3190fca7a5c9fb36b66159107d22b5f6e50b4573afa21a3a4d8b8e3e5953dabda077c924e45d2607b849ee5fea141eb80f5b89ce5288ebc2490679f319edf768
-EBUILD idesk-0.7.5-r3.ebuild 770 BLAKE2B 4e21319d663f3ac90702593679d7108f00bc04304874bd97f66883cea485316203ec05c22c8e68e9b375e00dbfa09e30456020bd63bba98722e54e8238ff6959 SHA512 37135af52eeedbc2e60a979d0a53b9f9ff966cb8a5310f8acfe1f03c6f7ffa2f470154b564de2e20f9543b6c1be399be18d24c09890a5738ce26f24e10ca3171
 EBUILD idesk-1.ebuild 792 BLAKE2B dc2ac6e6aa9e7044aff7c0e941e3f93ff92cd53a874f997a89cfc27763d4e16d4dee3b042cff9e0ec0ffbd4832a5d7f0278c6a27eb1b1ec3253c5c6f2f6008ee SHA512 ecfd30726a6f93f5428d1d240cb4651ad1becd9f9a76824c357bd39696bbec3590ed578da7323f6317d6add56d071090872bee8612536159f23851b26c051852
 MISC metadata.xml 255 BLAKE2B ac7b0caab1c9941dd352d459085d56533edda0de037713a793249233f73ca3413d23fb202dfcb27befdeb5652a3c0c3797eb2d0c320d64c60fa25bee5b1d8a7e SHA512 c3a74b8ed09f82b34aba7d40b892a5db84ecb72b5ab655b792d1f9f2d3667fb6fc043b641c38b2635bc10843bb696f72d84a241156fe647ec138adace10565a4
diff --git a/x11-misc/idesk/files/idesk-0.7.5-glibc-2.12.patch b/x11-misc/idesk/files/idesk-0.7.5-glibc-2.12.patch
deleted file mode 100644
index c4ac03e206e9..000000000000
--- a/x11-misc/idesk/files/idesk-0.7.5-glibc-2.12.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixes build with glibc-2.12
-
-http://bugs.gentoo.org/333515
-https://bugs.launchpad.net/ubuntu/+source/idesk/+bug/592602
-
-Patch written by Bhavani Shankar <bhavi@ubuntu.com>
---- idesk-0.7.5/src/DesktopConfig.cpp
-+++ idesk-0.7.5/src/DesktopConfig.cpp
-@@ -24,6 +24,8 @@
- 
- #include "DesktopConfig.h"
- #include "Util.h"
-+#include <sys/types.h>    // For stat()
-+#include <sys/stat.h>     // For stat()
- 
- //the initilizer list just sets the program defaults for non-necessary options
- DesktopConfig::DesktopConfig(Database db, string ideskrcFile) :
diff --git a/x11-misc/idesk/idesk-0.7.5-r3.ebuild b/x11-misc/idesk/idesk-0.7.5-r3.ebuild
deleted file mode 100644
index 3a6373426c22..000000000000
--- a/x11-misc/idesk/idesk-0.7.5-r3.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
-
-DESCRIPTION="Utility to place icons on the root window"
-HOMEPAGE="http://idesk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-libs/freetype
-	>=media-libs/imlib2-1.4[X]
-	media-libs/libart_lgpl
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/startup-notification"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	# bug 333515
-	"${FILESDIR}"/${P}-glibc-2.12.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's,/usr/local/,/usr/,' \
-		examples/default.lnk || die
-}
-
-src_configure() {
-	econf --enable-libsn
-}
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 9d51305baf39..23412c90ca9a 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,5 +1,5 @@
 DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
 DIST mozo-1.24.1.tar.xz 231032 BLAKE2B 27938aca9810943d19074cc5761ac58bb1dc2c1918b2fefea983f7a1b8788cb555311555515bb4387944c7b48a309de4a80da9003d212ca68ea257fa9ab06c8d SHA512 04b7e93e7302b46a3959f78655de4a6f8b17896be2c506c0e8a9041a9a2d5247e8c2ac00b5c8f86616f6c39a533584923feacfe4b81ae58d41080632af2a24bd
-EBUILD mozo-1.24.0-r1.ebuild 1306 BLAKE2B 7a74f935c11b69f25805582fa9ecbce944a2dde952edf57e400fc428172e397a6502dbd28b2f9d7ef39350e174b59bdb99cbbe0e50768534714ef6d9ccfe45c3 SHA512 e88938967f3cb8a244b36d83d7c0ddc1d719a01c23d04d447a2d388a267ee23652093a5aaa5f85fac0f8c79bfe7d0845acce4085ef2cde0c11e6fda0e6a41196
-EBUILD mozo-1.24.1.ebuild 1313 BLAKE2B 5f8716e7d773671aa998e01fa03af887a74823ae585b3af22094d8e3122b2b78c94cd1391e6abd235e6ecdecd64fdd0bfb225ff7fac11baaa1264883243a5919 SHA512 134f5a1dc40635b89b9fd0dc8b8b74fb3d6f2a04e1f8e7b90e99c7d22a4d315be1b5e05bad83a0d74ab6a0a41aca6bd7198cfb97d5c36f870145053293e09957
+EBUILD mozo-1.24.0-r1.ebuild 1307 BLAKE2B acf75c22dbb51658cd2b55181fa06fc06fd8f036c07fab1cf650493421bc75ec38a8c0a4a3b012550e930fd60852767fa082b6606a5404ce986bcecfe32c9295 SHA512 8fdf294cf0e25176495868fec89c4d4b97a0cea9ee8d87281563c6e83aae51cc98c261f31b8c2381cff560b9d7de002a5eb011fca1192b863790d6b977d2f9bc
+EBUILD mozo-1.24.1.ebuild 1322 BLAKE2B 7a49f97986b26c51816501033e6fb1661543e8f18a33156722f2ce81a6009dd4979a91b26572c998720932081e975fabd1e5d05f1cadc953817ac5b487d2ccf9 SHA512 2027cd169ca2bf6d13b6f203625fa2e61ae9f639321d54492946a04edde712bdb793b4b73b2fb2047c43d17b5dc35d7d6817522083ebe279fc511224dca002f1
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.24.0-r1.ebuild b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
index b47cd465c038..35f56168a3af 100644
--- a/x11-misc/mozo/mozo-1.24.0-r1.ebuild
+++ b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 
 inherit mate python-r1
diff --git a/x11-misc/mozo/mozo-1.24.1.ebuild b/x11-misc/mozo/mozo-1.24.1.ebuild
index 2b73ccc26492..e7a5de89ae82 100644
--- a/x11-misc/mozo/mozo-1.24.1.ebuild
+++ b/x11-misc/mozo/mozo-1.24.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9,3_10} )
 PYTHON_REQ_USE="xml"
 
 inherit mate python-r1
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 10250245f496..069bb75144ae 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,4 +1,6 @@
 AUX qt5ct-1.2-cmake.patch 833 BLAKE2B 6866f26696477cd9de56851569e4f9116557b13a999eb8fcfadb5e78514961a8c0ab4beba625f770a72f9df62ac0923d8b5f882d09dc7e35ce8b2c6c0b388e27 SHA512 8b6173169b904dbf5c5d12bcae82e92cfac5847eb95b3c228fc818b1293c6b1417d3f941219ab458220d5095bb5053c12da372f022263f728182f375208cb257
 DIST qt5ct-1.2.tar.bz2 76052 BLAKE2B bff9dcd6176f856f262f908101f51be5bc5fa56cbf221fb6e1b66cf49867d721f4c1d5707bcd71cb20b1d27d53f5352bcaaa32ed7298f9fe349ac8a90b4a4e23 SHA512 044582440fc3ed8424970a30d7e1562396f9a1651f2c50adbdcb6ec73b35fb8dd23de419df29b92d21a45fea9af4e562b1294f5bfc329419f831775954f8ed6f
+DIST qt5ct-1.3.tar.bz2 80506 BLAKE2B eda2d69fcddf80553358d3c9e9bd0ef33355919c5b62912d8e79a84a36ee5a25d1dab553b6413d78e16ce69435861a01b298ae97202a77f1f50ed805f14445dd SHA512 9f4397d5cfc3dec14330759f213ae99b02ae36d3ea48dfdb3015c3b7d3fe12cde619af855d7320566ca32120e8689e4b39f78e4fdf9886e2472aef570beb75bd
 EBUILD qt5ct-1.2-r1.ebuild 1021 BLAKE2B 86950b3bb7ee8255fccc3f0901b34c9276a790cde1ea3f5aac948dab1bda30d5831b9dd66c7867e1a5e6d0cfa47163cb350f567b68daa86cbf03504d20bef797 SHA512 cfe5f11156a562738f3da050009f1f5d67bdfa72fe72ff04636fcbd5127744cd0f86215cc36c4bbdad2239204532140da0e82154e3fe99985e1a95e911b6361c
+EBUILD qt5ct-1.3.ebuild 985 BLAKE2B efa98c48e71be1df50acbfe7cad6b6461939ec34abb7eaaad521e4e347abebea92af8141bd6fa1327d07570abaae77b48747d2e5294febc7267615f14a8c8788 SHA512 fb10de755ede1717f39ef2963e22392ced10bf1f7a4a08c450dfa70bfcc6281d439371e76454bc5e8e020f0e36ac0cb58d72bfab45bed0e9c52c6a16d3be096c
 MISC metadata.xml 566 BLAKE2B dbb30222ccd1079489ce54e50d5d4ce9a3b9e9acf38d4cc30a402f81418685a3cf86f1adae23d85a409f9866ca11ec1321e543e14bd37ed13a45d02a32accc15 SHA512 d40c24dd0cc2d0b2c79251cf1fb2540dbec484653817469198f4ad7e41164a8c518442c5d11764f0c8aa53bd7ae9758629acc7ba4a4c9f2a374af13cbdaf67c1
diff --git a/x11-misc/qt5ct/qt5ct-1.3.ebuild b/x11-misc/qt5ct/qt5ct-1.3.ebuild
new file mode 100644
index 000000000000..726b25b8dd9f
--- /dev/null
+++ b/x11-misc/qt5ct/qt5ct-1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4"
+HOMEPAGE="https://sourceforge.net/projects/qt5ct/"
+SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="+dbus"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5[dbus]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	dev-qt/qtpaths:5
+"
+
+src_install() {
+	cmake_src_install
+
+	newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct'
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "qt5ct configuration won't be applied to the currently running sessions."
+		ewarn "Please relogin."
+	fi
+	if ! has_version 'dev-qt/qtsvg:5'; then
+		elog
+		elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'."
+		elog
+	fi
+}
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index 3736b2a03c6c..7592a9534f99 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,3 +1,7 @@
+AUX xdotool-3.20210804.2-no_hardcoded_pkg-config.patch 1073 BLAKE2B 570221beabbad51f324bded0398afd68e9d3d4f30216b7a643dc9f8c76163721bd32778137fd322faffc2edafbc63d10cc036ec5311496b24410c737735f6482 SHA512 cb206c2b708835d8f3c656778edb07f08faafe3f9c1b407526e45321dc44b59981617b0c7b96865d6c1b968c855d40c0302ce888e8a1f57719b87ee9e774449e
+AUX xdotool-3.20210804.2-no_ldconfig.patch 493 BLAKE2B 044f6896b2f1279795a4263107309886518698125a818522a771374f3a1f2242f00446e87eaaff3b5eead3840459fc249405d49d47e7cd6568f5c923e096fb34 SHA512 7b3d4fe4a532e81358d81ebe9fd6e212bcceb08700df37d7d4c7fc16d95177c8f39ec8ef5a986eb6a08e7c6d209efaa8426483732dcedec39617b203de2faac5
 DIST xdotool-3.20160805.1.tar.gz 105388 BLAKE2B b836bd9c408bc4f7de562a1dd1fe18142155dc486b01912462b6d1cebc5f3f4094a407556c9f50cafb4ca3a17149e6f69303706730aabdaf94abc6d4b817d351 SHA512 e27b1029ee954ea17643ed489a00a1856e5687b03772c0f10a8e50cde3c3c957b57a3ba9890005474a744a228ef4827a83770d6890479c37a1f98f4fd7b1ff6c
+DIST xdotool-3.20210804.2.tar.gz 114644 BLAKE2B 7002f87061bae21968ba5bd37e0974ca0f2000d6d54c400da491ecdf37110e0990fc7eb6d2500a3838b5bb969c7ea2394b2f65194bc64ece32f8fb65feead257 SHA512 45eaa0a2bdff0bdbd8bbe1374e72d58beccdc908581d40867dbacb4209a6273b040b332a6b95ddc8e7fa8d018734c016c1687f1d6963395da3f100799ffa079d
 EBUILD xdotool-3.20160805.1.ebuild 1329 BLAKE2B 53992c6c31b1ee1c710b53e4a0119e47c3ffed95621ad6fe68073321ad880ee5f3d190c33825b27d8422ea096d8c1ad67eb3ad63a85861554041e5eac5d83126 SHA512 ce2fe778428e897074ed7cf69d3fe68d08492fc67224c1a8e88ed3365adefe87ce037ed732c30256dd516976a660012f62b090d2a30685cfe6eea8620cfe0e6d
+EBUILD xdotool-3.20210804.2.ebuild 1413 BLAKE2B 2bbdba603db2fad15f8357c8ed6f12b8d6db37059e0880c707a4cfb75801b566f20da0c1adbd9306c3a2f66a50972df8ebb6f5faab5488a67c46b208f779b8bb SHA512 68e60ae90b640a7446632a0deb04773aa3ad4dafa05bd39f499373e1d7bf8d4792eeab9cd9fc9048e17455d3808182329ebb6c04a5c55726c3a8c7ce29340b3e
 MISC metadata.xml 559 BLAKE2B 799ca899f19315166729afb319949ac00dc89ffa5e71b1180a762f0f584f0c5369279c22f4df59cd8e034ceba100d19d4addc0f3f08a3879ec991d2e9c775559 SHA512 c3868963a90c77f0df833cafb4a9adfbe16a7a161f89863874f76b2c1e0a31652256a252acee1580135ecf48d431253f853512afe778b89e400b7c1a14a0f44e
diff --git a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch
new file mode 100644
index 000000000000..d43784deaa3d
--- /dev/null
+++ b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch
@@ -0,0 +1,16 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile	2021-08-04 17:14:19.000000000 +0100
++++ b/Makefile	2021-08-05 22:13:20.509655072 +0100
+@@ -35,9 +35,9 @@
+ DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama -lxkbcommon
+ DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include
+ 
+-XDOTOOL_LIBS=$(shell pkg-config --libs x11 2> /dev/null || echo "$(DEFAULT_LIBS)")  $(shell sh platform.sh extralibs)
+-LIBXDO_LIBS=$(shell pkg-config --libs xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)")
+-INC=$(shell pkg-config --cflags xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_INC)")
++XDOTOOL_LIBS=$(shell $(PKG_CONFIG) --libs x11 2> /dev/null || echo "$(DEFAULT_LIBS)")  $(shell sh platform.sh extralibs)
++LIBXDO_LIBS=$(shell $(PKG_CONFIG) --libs xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)")
++INC=$(shell $(PKG_CONFIG) --cflags xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_INC)")
+ CFLAGS+=-std=c99 $(INC)
+ 
+ CMDOBJS= cmd_click.o cmd_mousemove.o cmd_mousemove_relative.o cmd_mousedown.o \
diff --git a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch
new file mode 100644
index 000000000000..42051da88a38
--- /dev/null
+++ b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch
@@ -0,0 +1,12 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile	2021-08-04 17:14:19.000000000 +0100
++++ b/Makefile	2021-08-05 22:10:47.713611624 +0100
+@@ -71,7 +71,7 @@
+ 	$(CC) -o xdotool.static xdotool.o xdo.o xdo_search.o $(CMDOBJS) $(LDFLAGS)  -lm $(XDOTOOL_LIBS) $(LIBXDO_LIBS)
+ 
+ .PHONY: install
+-install: pre-install installlib installprog installman installheader installpc post-install
++install: pre-install installlib installprog installman installheader installpc
+ 
+ .PHONY: pre-install
+ pre-install:
diff --git a/x11-misc/xdotool/xdotool-3.20210804.2.ebuild b/x11-misc/xdotool/xdotool-3.20210804.2.ebuild
new file mode 100644
index 000000000000..63cc8018aa42
--- /dev/null
+++ b/x11-misc/xdotool/xdotool-3.20210804.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows"
+HOMEPAGE="https://www.semicomplete.com/projects/xdotool/"
+SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+# Many the tests want to manually start Xvfb regardless of whether there
+# is an X server running or not (i.e. does not play nicely with virtualx),
+# some tests require x11-wm/openbox, some try to run a complete Gnome
+# session. All of them require a Ruby interpreter with dev-ruby/minitest
+# installed. In short, supporting tests here will need MUCH work.
+RESTRICT="test"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXtst
+	x11-libs/libxkbcommon"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.20210804.2-no_hardcoded_pkg-config.patch
+	"${FILESDIR}"/${PN}-3.20210804.2-no_ldconfig.patch
+)
+
+DOCS=( CHANGELIST README.md )
+
+src_compile() {
+	tc-export CC LD PKG_CONFIG
+	emake PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" INSTALLMAN="${ED}/usr/share/man" INSTALLLIB="${ED}/usr/$(get_libdir)" install
+
+	use examples && DOCS+=( examples )
+	einstalldocs
+}
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index da9eaa7e7166..c804b73c5d3d 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,5 +1,7 @@
 AUX xorg-cf-files-1.0.6-no-ar-l.patch 495 BLAKE2B fe86e089f8bf374c9fa17b2608aa4b9e84201aa55065f0a7d9bbcf2ee921e85d2694ec31cb6f570fbb4bd37d15d2bb49c930528640416b0e7434b8eb037dbbc8 SHA512 6227ded01e55325946160131c6742fd8b13d145ac9f64b69d08db44dd809063e8886ab8fa97c52bbf34ff536f3b17c988d49d2bc6d1837770c13ba4d8242a9b1
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
+DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531 SHA512 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
 EBUILD xorg-cf-files-1.0.6-r2.ebuild 2123 BLAKE2B 8a5f9dede53e80a256f151ebd12b88b97ce43eb4a4dccb6343fa8cb93afee17eac50a53ad02e756ab1fa9ac27802f9fa184d45893a333f5f9ed4cfa7b15c1f12 SHA512 b87c68d66f7cd591a90bfe178e3bb84fdb273b2e54f64ff5ed2d5ff993dba5ff6b94803cf01795e9cc25e87d2d46b22576aa442e8aa473f0a706c1d834c3062f
+EBUILD xorg-cf-files-1.0.7.ebuild 1959 BLAKE2B d9c578e1f82a7915b43028e2371efb9d6d3c761057e6b157bb7a6c5e89e00c8df24d69f41666de474f7b73921fdcbbeb9aea1668d85cea0bc3d2ec4a60ca4f0e SHA512 2e91c5dcfc1ab511fcd747920b5f52b4afc7774847804e1fa59670f2bac70c7bc93c173d1e4c5ec8cbb72eb29a11e3fba8513e7d867e2cd74a26a0aef768bdcc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild
new file mode 100644
index 000000000000..e4264f2a2f4f
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Old Imake-related build files"
+HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf"
+SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
+	https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	virtual/pkgconfig
+	app-arch/bzip2
+"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
+)
+
+src_install() {
+	default
+	echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \
+		"${ED}"/usr/$(get_libdir)/X11/config/host.def || die
+	sed -i -e "s|LibDirName *lib$|LibDirName $(get_libdir)|" \
+		"${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
+	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" \
+		"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
+	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" \
+		"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
+	sed -i -e "/#  define Solaris64bitSubdir/d" \
+		"${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
+	sed -i -e 's/-DNOSTDHDRS//g' \
+		"${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
+
+	sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" \
+		"${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir /usr/$(get_libdir)|" \
+		"${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir /usr/$(get_libdir)|" \
+		"${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+}
diff --git a/x11-misc/xrestop/Manifest b/x11-misc/xrestop/Manifest
deleted file mode 100644
index fe0aa1c1984a..000000000000
--- a/x11-misc/xrestop/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xrestop-0.4-tinfo.patch 291 BLAKE2B b96d892c87a8133987baa94e5cb4917bc5d743c24ec11a2ec67afafc7206654b88c17f54377f2d1bf0c9fb92df8de16c99e4d0f9a15ff80a9417da2de31bc6fa SHA512 21993ada033d4ec744b55faa71afd736a99423f12071a64e1445958de979631ce42a908e14ef194e819de98766c92a2c2470b2c88d172879ec5fc4c20212566f
-DIST xrestop-0.4.tar.gz 92308 BLAKE2B 5bfe6e9ccd49038e7884be8379e79f3de2bc960588dc21fbbe40d2acb89c6505efd78a9415e0ba8feb24986f11f066ce641b9c933f241776bbc1b3e59fd520f0 SHA512 eb7bf2f3ab7b73708c96d56fd466cb362d711242dd46992fa3e693af2d26995e9baa91075eb445ef227e1342deec5e0e22b37139e80399e4051c9f5cad8fd9b6
-EBUILD xrestop-0.4.ebuild 675 BLAKE2B aebbfd7d106196078ef2a4538e519ed5a34ea1e6653a64ffbe4e81a46dae9c1b73b192e49996bfc962819bcf2f4c6e649967325f4ee5c7ba22703743da146a81 SHA512 db62ccd4b3af85a582f3b6c9851ee2fb762a5ed5a6f74feac39e42a8638ceb4f5a057161aff96757e95af00dec57b049450f769bea54c436755084a426a63319
-MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xrestop/metadata.xml b/x11-misc/xrestop/metadata.xml
deleted file mode 100644
index 66187a0f4213..000000000000
--- a/x11-misc/xrestop/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>desktop-misc@gentoo.org</email>
-                <name>Gentoo Desktop Miscellaneous Project</name>
-        </maintainer>
-</pkgmetadata>
diff --git a/x11-misc/xsri/Manifest b/x11-misc/xsri/Manifest
index ab843eadf073..c88d009b6743 100644
--- a/x11-misc/xsri/Manifest
+++ b/x11-misc/xsri/Manifest
@@ -1,4 +1,4 @@
 AUX xsri-2.1.0-configure.patch 594 BLAKE2B 54f196a42d0c65abc6cb97726b2051716f9e2a39ebb124b27858bb0e021ed128402658dd92d70920fed05d18a9e9b485bc7702bc39f7233170e92e788fd08977 SHA512 2a6c86a1420cf05c123906412ee15b0ff6785578a162522df744f226612188f87b77294cc0792d170a0337f91a81e1c7130a24a8eb34ca534bfd4309f6297ec3
 DIST xsri-2.1.0-17.fc12.src.rpm 79266 BLAKE2B 56f269aae035961bb84637ed2fa282f91b3596f66b9e9aaee59ef1ef1b88da22f763a47815676e1e14c3812c410eadf145206f89facb4596db42a3948e7d6ebe SHA512 1e0948b4f03eef797fdef63732f592ebaa3aeff7010941c2df9ae0a3656a9c477adad48c72cf59531227f2427330cca13ae09c5c60739ec66411dcce10f44ee9
 EBUILD xsri-2.1.0_p17_p12.ebuild 809 BLAKE2B 6c3cdd9d09ad6279e21a0f483084d605ec587c8513f13d145d4b7f400cafaf083a8f1b710415122a1591ffef47ef03d6d332b775391d5f07658cf3b124acd9db SHA512 b26fa1fe25f555b785fcad02b780076bf31dbc225cb890ade3a231ca3c9e4ce8878d50a892e364658408471cd09930165bf59097c0b3907b65bc9590f657494c
-MISC metadata.xml 380 BLAKE2B f3b5ac60750d5c17573f08a144e12ed04890b6f9da7a0abfe982a37ace5a2fb6d8f1de5aa6e4cfd12f99b32aab421489d0fa3877cfa47db89a2b3740416dc9cc SHA512 ef95981a5ee3e4f7583c7f8b90b05e91b0e95e389746242d66ed354a26ba8471a35f3b8587543fa0201d6fcfdaac8c58fefc70aeac3f703e4f98a0e68e5a17b5
+MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/xsri/metadata.xml b/x11-misc/xsri/metadata.xml
index 67e71a385fe7..49c86a887b6a 100644
--- a/x11-misc/xsri/metadata.xml
+++ b/x11-misc/xsri/metadata.xml
@@ -5,8 +5,4 @@
 	<email>desktop-misc@gentoo.org</email>
 	<name>Gentoo Desktop Miscellaneous Project</name>
 </maintainer>
-<maintainer type="person">
-	<email>slyfox@gentoo.org</email>
-	<name>Sergei Trofimovich</name>
-</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 19e2407b174b..6f1627d5c040 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index e29cf6f742cf..29bd712e4aac 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,5 +1,5 @@
 DIST pidgin-sipe-1.23.3.tar.gz 1298459 BLAKE2B e15ad7658771fc0d7f5320f6b145e67a6f33603dfe49dd83edbf42fd2e57f117f4cdac53c6b6dba401266ae6c2593bb6078a604c164aa365aa94aa64eb94f1c7 SHA512 3c7481e02f9541818a980df31d135c3eefd8f1e921dcb6cfe3d1ce194b1591531db2c23364b545a912eb3818af207ffc0a19d3310d495db503de954f0547ea31
 DIST pidgin-sipe-1.25.0.tar.gz 1395316 BLAKE2B 854832768a5c6605c28fcc02abd2444cd15b58be3be89009ce08aad390664a09235ca4fc6c6288c0e0f8677ba920a30b7e3a418312308dcb229a08817bbf4a3c SHA512 e9f1f38bb27cfd8e464f2f03aea3153b7d9a1ff7c45876ff06fc8b391e5d69506b793edda5cef0f4b5f281ddd0281ad0f97c82457e1bcc977965805a323d6f0c
 EBUILD pidgin-sipe-1.23.3.ebuild 1339 BLAKE2B 6de8452d55f045ed0340663915734c83b010b965533d644c14305fc26471dfe005555d24881203692ff920eedaccfd0e841ed90c2e58a7ebbbbc21739568fc7b SHA512 d93ec9a9b02fbe093d0f3e607627eec09944cd6a7bc8528403c493bf71d1cbb6f5f57e4635d1f206f78a05f743fc79da8d4303b983bfe84245f7135ec839a816
-EBUILD pidgin-sipe-1.25.0-r1.ebuild 1366 BLAKE2B 0167ab57a1fb8e372b1db35f6e3b4a6d42653457dd93c057b82b7b6f8080276b95c94208d0ea54a9f464bf9c4367e5ad71edc60b3979035215c39c5f3809bf58 SHA512 d204faf98046a446260bec28df6986af207377ec4bcfdac7d0def55b4dea8366e6335d998fb346b679e232e91b7dfb2b8350aa81c85bce0ed1790ce8014696b1
+EBUILD pidgin-sipe-1.25.0-r1.ebuild 1365 BLAKE2B b02343bb14a30ecd1d1abc4b2e9d8704aa1c46ee0480cebf428c7be9ed75d72a4e3501985859d9e50ed47674dc249280182e098336908e425881e644a02228d4 SHA512 b7e502cd5805bc62b8dde5ea48a29efbae3a8c15b59d2869c27eb8cf88c86dbd4825ac0ee93b5b2516acfba9cc0a60eeea3feb4e9c8572945b832516f9ff7e0f
 MISC metadata.xml 778 BLAKE2B 8128c3886d6f8ab54d3636954904e30fe4da25bf4bd7268fad499842cadd4a2c5104617b32fedcaaceb93c3a44691bb0815cf8d451e0c26a3380b5a4a2953b54 SHA512 e0d5228e0585c317f635838a2905a0354ecc3af1311e817fbdd0ba1703a13e9d4070a9f9db31891bcb819ac03dc93b2764e2f73bacdffb8318c599612b0cb21f
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
index 6d8c1c1b9068..4b73a6e3e9c1 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.25.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="dbus debug kerberos ocs2005-message-hack openssl telepathy voice"
 
diff --git a/x11-plugins/pidgin-skypeweb/Manifest b/x11-plugins/pidgin-skypeweb/Manifest
index 650c6010e861..50f6e8fd69c0 100644
--- a/x11-plugins/pidgin-skypeweb/Manifest
+++ b/x11-plugins/pidgin-skypeweb/Manifest
@@ -1,4 +1,3 @@
 DIST pidgin-skypeweb-1.7.tar.gz 297565 BLAKE2B 94d4fe7b6408fe054bdb79729493929551aabce03c9157992c7cab283c360adfa20c0b9775d82ec7017d762e208259fbf365e6311df566eda033f5a8c71ce20a SHA512 0981aefe23a7bce423fbc447ae22f79077742ac5cc1fd235611acc34175b4a6d9fd4a4af38f7fc3aa7ff7442be71a70c68ca8c271adbe39c085d6ae599cb0871
 EBUILD pidgin-skypeweb-1.7.ebuild 667 BLAKE2B 99582ccea996c734104be87d4ae604288edf1590266538dec9eee721893d79cec8213b9cef244af8bcffad9edff862c9971fccd134e2efb2b99a0b186ead27ea SHA512 a92e21392bed475a432f7e80438947f866dae146a7ea18d03df229957c55dc5617c98f649dbedad154aaf6ff09856bc9a6d56f2f5c5385c3a2ec623cb49e7248
-EBUILD pidgin-skypeweb-9999.ebuild 408 BLAKE2B c50234601349c4107d201a14625b51c407201c4cee9bab54d8ca965d97eaa3ed5c871ea23dcc15b30ba66e96b8a218c98adf84716dc94c72c5e7297c27ab1bba SHA512 f9cafbad41529d2c308da61cbae62c9e38cb4cd42895d142c443ece9daf4bf47d471e0b7a1f017d45cd88b6414de02542ef8244b1856ae1135344a1fd1ae8398
 MISC metadata.xml 474 BLAKE2B 05aefac276394efa2739064dd4d97db4cca210c8cf8dc6032516f8a0d8596b8fe872004e5dfd50c24b2e695cc50f67da54718e1d03fcc6301f758cfd255864d3 SHA512 9e69489e9875db0978a1ba735b8a653f94f9345e62eddce5930081fcf8b9bfee80c5c555dfa8ce85371e508841cdd0193c2221a5bfdd3cf830ef7a53a3836eac
diff --git a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-9999.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-9999.ebuild
deleted file mode 100644
index 667cb2b00445..000000000000
--- a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-9999.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit git-r3
-
-DESCRIPTION="SkypeWeb Plugin for Pidgin"
-HOMEPAGE="https://github.com/EionRobb/skype4pidgin"
-EGIT_REPO_URI="https://github.com/EionRobb/skype4pidgin"
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="net-im/pidgin
-	dev-libs/json-glib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="$S/skypeweb"
diff --git a/x11-plugins/pidgin-window_merge/Manifest b/x11-plugins/pidgin-window_merge/Manifest
index 01fd28dd5e39..b76e6fd32cd3 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-r1.ebuild 774 BLAKE2B d9dadf3a1574d3fff4a4aa31e02f1a23b2bb9a61578acd93092a1bae48cdd496cd8fb20b6508f40c23fb6ce7fa18a41a9d94e6b50e500b66d00ca9677cd05f8a SHA512 5f12a0ac477e1032f40a0ddfd4f24e548c31016d22d4565ccbe86d42a3af32ff4e0193dce771a480ab570b99d01577e3595ae0058105fc8a8d1dbb7d60a13ac1
-MISC metadata.xml 333 BLAKE2B 254ce7c009bb5e0034835e975d04ff077bbe0e24e6d226c0381a91a087ce16fcd815cd411db181a8b34463f903fc4afd624a7531c340c083ffe1982c20b6cd33 SHA512 9865a245036486f3b8a82077de63f67f7c37d73fc13c3b385103166610bd45e1d284d96b0358ca1fb84d7aaf15b111e12a59e6fdf3984ae9d0fb145b5e89871c
+MISC metadata.xml 249 BLAKE2B 94d5431cd82044b604295ac9e438c8c5ede013e4bed633193ab92dddd898d04be5478e5a753e3fe80cd758c8856a3ed319d2abb0ad3b0a6218f79a614a83f4c3 SHA512 f4d5fa086ce26ff784f5a2d50f5763e582e2d6bb391ee80184069dc9544e2824ac37ad5efb88d95b46926ebea3d3329912adccae98c93b4183fcb1edccfbbb2a
diff --git a/x11-plugins/pidgin-window_merge/metadata.xml b/x11-plugins/pidgin-window_merge/metadata.xml
index 62c054355ebc..b8624a921df9 100644
--- a/x11-plugins/pidgin-window_merge/metadata.xml
+++ b/x11-plugins/pidgin-window_merge/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">dm0-/window_merge</remote-id>
 	</upstream>
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 94c7a1bc7d6c..8a6cd76036dd 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index f70e3144131f..52f414287205 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -1,24 +1,19 @@
 DIST ab_glyph_rasterizer-0.1.4.crate 6641 BLAKE2B fc70a45030d969f8af31d1bc3f83069acc014b33cde31817063ab1d40f8caebe12f3896b6a249620a8f2a2d0adc149fcc402f2af25b31ebe223ad0779028d843 SHA512 a942a3b0848386677ed5c651034b001c0e24c7bd101be6a25bfed815310f3a530c8cb9e67e96ea3c36f4d7f09731552f734d5e73f705e3e8f2bf40d5151a7a91
 DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3
-DIST alacritty-0.7.2.tar.gz 1412164 BLAKE2B 64c85c71fdde41be67337f4ea230ddfb3544592ba71c0c0c9c0032fa37eb28a5e669da6777590c3e1f84a6a5d13583b2b7e339c277c60307bcd43458879da8a4 SHA512 6f5d9037038d0ebb7fdaa958bbddc4c68036ee8fbb2b89ff2d49637d46805983f47d1900a11a865c821553bfffde55caef4e0308f176724c3107457c04a6161c
 DIST alacritty-0.8.0.tar.gz 1415318 BLAKE2B c73bd76c534b096eeb9e2958bcd3fd96f3dc934afdaa5a5c719635c78ec68dcd4af9d566968466580108e780bdba540cef39ef2c91224946eb3c5cb8436fcd59 SHA512 723addc3f1e91043c75bb2fb631cafb73b0ce14916d40240fdc14b9f5a5284e5caa74a59dcbe0ff572de35079db068c0e20932f769b1e4382c5a0eb48f70d2f7
+DIST alacritty-0.9.0.tar.gz 1422571 BLAKE2B 0b9531b92e57e36f86ae2a855c9dca4d3789e21b2ade9df2d22d32b9cf0967748df2acd1c79a1defba4d9eac21b2477550b799e5ffc4f9cb1444793ae9ca36e4 SHA512 17b53a1f98e8435a3ab120e39040c591d96a05d793b78030732f5624e2b717ab6a06c8de67fb25c6a502f3f3064f08a2a3c64cf7a1b7f3f7fda699e7fd95f931
 DIST andrew-0.3.1.crate 14030 BLAKE2B 5224eb5a5ad5ba7dd07259a98b8dc04f92154dcc7b5a53c89b4f7fd3c1a12d834093350ce9f7cd69a935d70cff50c0fbc68305eea9f918b334ec1a6e9e979ae2 SHA512 c4fc8903d4c2542c91e7f099d5d9d2b9179ade3f4c3e83ccd8027b06cb582ef700777cf440a07c2478311c1b7c2f7ca64d53fb390f9f5753dcb32491003db8d3
 DIST android_glue-0.2.3.crate 1572 BLAKE2B 8404cc69af7d1c9e851e67a69b5b18195388b50924b6a8afc7203bc5101babe9ae007724e552a929947fa9c639eb8ae13cdae0aedbc2d54b0b8d48373f15b7a3 SHA512 16ff1f0e1f50cd120dfbe57d45ebac1725fa75447c964a5b05a1a0565b13b0bc3b6c153edb4a50083ef5d802a889c9f9007e2e21a58dc408f9fb12e9437bd01b
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
-DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
 DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
-DIST byteorder-1.4.2.crate 22148 BLAKE2B 4fd246d80ec9e0abf41a0779668d8b383098206eacbf7e16ab94a4aac39858471742934df41e20084f976a738154a97f642bebe51cb871afb2a50ff2cbdbf943 SHA512 f6d2bdc3fb456b3f7a99358a987bb593be027b47b06b896938a30a88d36459ec4d28be166ff8fea9b1ea468d95ad387488cc6aa8f07d0723d6a2a7d43e3617e8
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST calloop-0.6.5.crate 25180 BLAKE2B 8a660962efdd929ec7b3a815a427f39e00a8c48c9bd34f4c0660bb7d2d08bed598a518926486454bd0304a433a1b513090f06a08bbe8a3e009d47aaf2162bef9 SHA512 e96cf64c54faea423a2b3428e4cb909c4b8791f2a92705518754f6c1c98b5e96a265b74b4fc51f8c282e4a5b506525940dcb0185dd0e32ccab226b436b590a2f
-DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
 DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
+DIST cc-1.0.69.crate 56044 BLAKE2B adcd10bf4faf6835ae8feb79ce5e7a4895700d9714fc4322dd52e37bdd8db66b849d5e59aceba6ef0edcf9a5c7c0e2bc616de4acd98b71999bd63592c1c69dda SHA512 ba2b84fb61b4097a96f9013f9925b1985263ccd75274186f5d37589444e390ae8d5d1f88c210822a9e9dac2db551c24aee2b12bb61801aef8b31a72b2ac77437
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cgl-0.3.2.crate 7557 BLAKE2B 6c61b46f4157a3a400f75e81be8ec456759a0c3efaec2fd134a81d8070d47c478f7392a2e63e13b7b09fc0b620b27ec6831b9829927ae6685dcfcaedfc8bbb19 SHA512 230301b0f0ee7828bf0152b01ff97464609da32dc78edf2fc8518f2341cc48ef39bba946965e93069fa9e4fcda0d165195dbc6c1d594afcf1155707933b3dc73
@@ -28,7 +23,6 @@ DIST cmake-0.1.45.crate 14375 BLAKE2B aaeb4b910087bcc735f2cef65fb46184de3c3181ad
 DIST cocoa-0.23.0.crate 39052 BLAKE2B 91c2d572f41d767b77ebdad3521ec5af6927703bab36fb9b7b38846fa017210aeede3a3647915fe080092827b3a89b002119c32869f1da4a15653acb1986d1a1 SHA512 2c7a90a4d3bb1cf813e99cc51227d7e55f20cff4b67d4c67eed5193c1b4d726016cefc14f15da315ba669e521da71d702d7c7fdaf0d4f3db615291235e5b1ac4
 DIST cocoa-0.24.0.crate 39235 BLAKE2B 01078c3d96e88e0cac773f238d3d3144324594fd75cda87d18bc98d73f0a1acab4cd795471f4789d38b017e6cc90c0713bb33b0fdbdff36abcdc1cbae767da86 SHA512 accae0f676caa23c8d3fbc2e49365118a366c50a698ee9dce4ef194f1d391b3633cb789d65d5c2d1e43afdea5d7a82161f7e7042a9dab32747ecac29d1b1b20c
 DIST cocoa-foundation-0.1.0.crate 10645 BLAKE2B 8ea7db02939a5cf1785b2770743d609e28da415fdf49b881b620e0ae289976a5a737056976afa7e616fc49c15ce535304d70ce91e79bd61c39ed024078012e61 SHA512 cf0e8188bd4d0310716aad9f1e2cc77e4098e85306bd2098bdcfd9720782bc558f503033074e0f076748074a9067a4dfea263ee5356074207739d81c4a052ba6
-DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST copypasta-0.7.1.crate 12882 BLAKE2B 2deb0b5bd6401ef3a39dcfbc2760338019458b56a812447c2a0d12f62de0f69aae9d8e36d13d2c9d97e9663b091cdee53b1db50b1d00720960345bf082871f2c SHA512 e31b0b8b6ba0f5ab425aa0ec44db05b27b50a6eef7b8a2f05495441ec83f90859ec48c097a64b38e846dca6f56bcc8f2bc01f2cc299a80138e24e0c4c9e7c474
 DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
 DIST core-foundation-0.9.1.crate 25985 BLAKE2B 22e70b7b1cd1f39c4ac287f406dabc549e3ba750ecf17955f129ff83afe67bb4bdee7e7907287eac0c28597df971de27dae77619f44d0368864c08798def1ae2 SHA512 d6dae760082ef9dcfc37d18acfa9a6ad8ee491335d17ee17447c5bccad623564f1e8bdc54460fb260aebe9276ce5ea4d8a389a83b5c7d17193614906c3d2bea9
@@ -37,30 +31,25 @@ DIST core-foundation-sys-0.8.2.crate 17461 BLAKE2B bafa6f6af67f55b34c20e50093a54
 DIST core-graphics-0.19.2.crate 28995 BLAKE2B 3efd61b69ff4a7dd6bfffe7836840d33f5101d169c20b2a73a529184a362c517032614956f37a4d170ff0073582996c5249eb8b24605d122ed5cc2e55acdfe9a SHA512 c9cace380466c26f2bb87aceaf9852ca0f29c4bdc0de11e132181939c5db0614b2cf7e882a2ef0603ead6145e05565f22d59cb7f69a501f350f6f9ce1aa9cf9b
 DIST core-graphics-0.22.2.crate 28263 BLAKE2B 76d7e627103a4149889795d0b82eb9f6718e00ea31f2ac1be84c27510b5d4abb86cd02916ee8ba09ee48e73e4b42d200e1c61139b35bc230174ccb3b668f5faf SHA512 3e436364fb2f20f0087d1e686a101e14a855c35e7f18d47cf8a3bfeb40ac0edf5e36bce077a6482adc6c61ec73bc2e6092fa4b33879734b23e73a70680353488
 DIST core-graphics-types-0.1.1.crate 2530 BLAKE2B 2340e9e0147a904e5b439b3e9db53937347420d901f17677e952779680f5294955f4578273989237adbf374b13dc24d6f6efa293575ac1a449bae2bb6ce37a7d SHA512 bacfd01ad05b21851c0cf84cdf9516f63c542d51c2ee8fe2692c557a474ac0859c4ff6f0c35df68956c0389c5974ce09647a744632fcdb2faa13fc7d13cdb52a
-DIST core-text-19.1.0.crate 17167 BLAKE2B 988ef2ce548a699b2d9194ff79577a2190fbebfb7b2c01be20e96a5d44f2e057326e7d8c0136c87dcbcd2d6203d180bb772f9bc1c8ca812ed09c95ef82e0f9de SHA512 41c45f46d4b2ec0ca1afb5bb6b8054a781ba99e64629d751a72c273e6923a9209df1e8b382d09fd1cebb9c12e10a68271ef9acfd08dd8c66fcfa5ad43c3532ed
 DIST core-text-19.2.0.crate 18446 BLAKE2B ea2d6e2adca87a9b7febd66230dbb49ef0775869bd25c4f9dadb756197e70286068f202b3f39010a0b33afa1f610871e241532b32db766e887caeba9b76c1645 SHA512 37bfa0c75849ada37fca77793a5791dce7dadfb9fd20b353e6761c12d0a7d06df3ffbd99efd8b6885356dad00e827e7fefffcbcfc49ccd0c5dda50717986f4cc
 DIST core-video-sys-0.1.4.crate 10568 BLAKE2B aef062d1b1047d50d02e932413c7d24cf316d5b1d6947895ec2face253d26adc75811c4fb60535a35c2a0c87af6d3bb7b9e62dfe5421ee218356126a2a6c3bb7 SHA512 a6d3b0f78aebe7b64276f3accffb5d5b2ff23a19b9cb3dcf69a47b310098de8c85255c579cff8a7a711304c1f19b9fb1d8259c5eb511b617faac0da53e417bf2
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
-DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
-DIST crossfont-0.2.0.crate 30609 BLAKE2B 334f52878e915add59f7d6b2868fc716e801fed671454659cfe3ff04ecef42ba530f6eb500ebc3b376e8d8517df4a96d705d87dd6091b98d9152372049ce7803 SHA512 90eb0a249958ea5111b628a17ebaabfccf8960c3e6a8eabc98e88cc25c166be72f36b82803b96eebe4cc7d35cf3a5435800d783ddbf4cbfaf2a940b2fc470cab
 DIST crossfont-0.3.0.crate 30648 BLAKE2B 7e2ea704267cf9ef1e74b19463a19422de29b449c88f47688b56204fcdc43dd335199268371d233db8823775d927985f98cdba21bdf39ce67a5f28197efb9e80 SHA512 abb2a860130eb1399185863b67c0ea24fbd94a0ea6f68a2f381020923691d49e68732455546a62bec50fd9f33fb265d4a113e0863865f6a7deb83e98187c9863
+DIST crossfont-0.3.1.crate 31085 BLAKE2B 361b56fa175699de1c265864987e05b21ffe46a2c2b6dd3cc78334cdad24626999e0b0b7f9a964bfc9b3c5efe3957b3972c2fe1b0b88cf8123dcf14251a793bb SHA512 e18013f74d4381d3b7f256df4ef864d7c7a397e9a1acbfba69aeeba5675446a3b7f7b37c0ba220c2da8f8f2475d6960221de21e7be0d7b587824edc5cff266a4
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
 DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
 DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152
 DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
-DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
 DIST dirs-3.0.2.crate 12184 BLAKE2B 414fa4734fd9e108dbc887210e71c8be9834c1764ca35af66781a8108af9fc704f4e7d420ffbb2adeb2a14ca5658e53cb5da4b486e093b3de010c542f7ce7c7a SHA512 97dc343d580ecda68aebe87bcbe8c13a00078943771e3f1dc3101d8d450d2ccdd0d74283870eac1d88255a99e887166d42533ba8e70d15b9cdaddb57e3a27c55
-DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
 DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
 DIST dispatch-0.2.0.crate 10229 BLAKE2B 3a3f011bbd994f6620619d5bd26d95eda7ba21f1a4874b69e3a654e04611ec7af7257300a669ee95ae04ce35a91e033dddddb4a14da48036a5d19c4bad721386 SHA512 cf2b4c624f92808e43a0a4828ee1085e115540d5df5a0ad6a3593c9e5109951b26e8afbabcfb0a1fde41207d5c060566bf9260bf4c2a95907e3a822d84364b3d
 DIST dlib-0.4.2.crate 3853 BLAKE2B 807e1c83b289135357effbbc62ea4e0f328c6389e9d085653bea47e4e1c7f08349b5331aed3707e03e9b8e2d67a2fed18b46165e5852a12be94fddde825558c1 SHA512 45dbdab9cd4b633f8217e26ef47fcef8f992f7856c7cde413afa95c90dd565a1c09677888dfef8b96a3373b4988bbf7fba91dca2e820baa9f41f96f8ba2eff6d
 DIST dlib-0.5.0.crate 5788 BLAKE2B 0c1bafa05ace4a51fa7f5d8db9cc46773c1da9948e6a3f7e531c60953e554798d562546b50ddbfdbc266da8cbb988c59d57a95e7c3ad6e6d84f9b4888180f264 SHA512 1f828bc845570d8d6a6fb6c4f9bacd7d4f50bf800a68fbce2e0b8f8bf1eeee7e7260fc95fc49a14a3f7e2a4264368c80d8328d408b2a6544f4f796c48a4fbf76
 DIST downcast-rs-1.2.0.crate 11670 BLAKE2B 7d44d708c1ac068a02ea5d72dd3caa8a7f6d18b7ee653d520600acc9c52365824f5b8d3c68143d1d13aa438a18b16ff9975e15131cac7ec48b2d995184673d37 SHA512 b80b72f30b42c5e6b2bd33287f2dd22be5673b2fa5c1a8c75c5de224fc7eca46a55f2fce63c02d225dfbc94ac3462b4b2fec53d63331c70da6307ebcdcc6cb14
-DIST dtoa-0.4.7.crate 15910 BLAKE2B e6b4ad0c4a81d73557f93675671735eca3c5c31426319e746c73b65a34847085ee82f50a4f561036dae31a4fedf24a307e6edcd756cc1e6d46f2f20fc29bf456 SHA512 df090a5ea273265ae2f05aac2ae364cd0b606872a392411359548b9e780b2bc8dcb999254186ccc2da0a7353a4e0f1b0f513b2cd83d7e4f1290dcb1f466847f7
 DIST dtoa-0.4.8.crate 16175 BLAKE2B 5fff15e66c2edeb9eb9da89c66389b3a9bbb891d75afc3bb7da4dcbe9cad9e50af318cc8cc01cc7e56730763e8ea8ceb33b9447d1a7fa52a8d0f0d2060a97522 SHA512 fe1701ba2c40988b92f5f4ef78a8c81718b140ff8ca2d04023b09a89440e6ddb53ef36d1ebd9dd3e948428b361ed6611bd24ec1a31b5010c220c555e1f0bf6b8
 DIST dwrote-0.11.0.crate 21715 BLAKE2B 8ef802f393939f95ba750e941fb5b6f908a2cdca41d3eba5a405214ab56b2fdba148106c0537034316d1d594fcd86a13774de1853c2dad2f27d0ef87ba21bf86 SHA512 b319820cffacbd55f27d74d4d8e7ae3f15d758f718611c354551ba526614f5221357269734840706170e26446efb8d504035859f47c68eb0a7a89444d08ffecc
-DIST embed-resource-1.5.1.crate 12240 BLAKE2B a16f3e43468d4eca9821fbc2b11be91b1c01b181976c6e97a68230e71ed631bd6d6ae5398759f40d6fc3cc162f6f7924482bd4e57abe0d5dc0d31bbf38a80e17 SHA512 94ae0c6d74d6a4d6c9171ff896d4c924d8f8031350da0d73b33cedc561755f72719c6fbc99070c99d4155dcedc7b627af6bc41b72bce22fc1cebde8c77895875
 DIST embed-resource-1.6.2.crate 12401 BLAKE2B 6dd36525acac8f69146914d1d8788589a07589775d88db8df3fd14875c4946cacbe78be48e74e442d992d278a69262af131a9ec9ca546bcf711ae93cdbdc9bfd SHA512 4bfb51208acfd469e3eb2ac21a266d7041e62838fc7c505f1853cd5766c2ab00fd0c7aeac01dffbca05e28842d20120d19984ab6d2c7a023dad61a1d2ff30c6b
+DIST embed-resource-1.6.3.crate 12401 BLAKE2B d63ada84c4a2ad11bf08ac0d14aa1c460d52332809df54d72bb6138eed0d5a03d8da60f6cbff6e6623d4f8954e4b0d031b3236a113986b142653e87cdb1b099f SHA512 a9b3e1fb3259abad0e60c580dfe0869ff5ef26b88b9fccc0cea1828d1ac6e2d4a37967ddf8f9d7208a05b78d39a60cd86ee36bbaf305bf08b2fa298850098095
 DIST expat-sys-2.1.6.crate 518887 BLAKE2B 12e06f38859124c8da67aaf41477e0c94e9b2421a17c93666f019fd17de3579d52c66403ff95c6fdf27ec1e4db0652bc611e2b426705a177e615b5064d15adc1 SHA512 35d0c405a164e685972ea11df718e50a32a90b730332c3ccad74055544e750423ce2cd76edfd5de2810167cdc8ab6103db82bc4e2710a8e298ac0dd9e81648f8
 DIST filetime-0.2.14.crate 14358 BLAKE2B 7d50e71b5a556bc24a6bcf737ec07f185c6d6a2ba2717d91aaba71ec15d1981c47dd6010e5a4278f8996e05bd49d04f3481f0b9e3156a8ad1da1cf39a84796d6 SHA512 f2e6e41b8b705c510e1f1932451ab8a0acc6a4f84a7a21880c7e69639a6aace7c5ed4f694ebf47d04ae6ff227f8d6c6733f2c4bcb953088531dd91b37262e45b
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
@@ -75,8 +64,8 @@ DIST fsevent-0.4.0.crate 7292 BLAKE2B e55fa22bca32165c17ab1cf623311de85d1c1cd78f
 DIST fsevent-sys-2.0.1.crate 3984 BLAKE2B abcecda1e75e47b735f8cf638c958bcf0862d121b046b7b70b4ab6bd1913398967a1019422a0796398fc4f759cc2d326f656c003d9f2f47b63c884650d8513bd SHA512 4c7f96586c4564f804390c3ad22388456a138bef1902a5985463515ca9b56976fc14c993f08ac188897c449b2d2843890c2357398eb3ef5eb064326881e7167d
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
+DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST gl_generator-0.14.0.crate 22330 BLAKE2B d2e84bf81e7c4e2869c3e23872bd86466ede80d6fdbdadaddafb1ae9ab45672613cfda319b15720c35fc26ab103ba106a997ea6f5d4654bc9db19fb86f20d765 SHA512 98779d525a042b47ac373340c6fd2e019a670a5bce643128ae2cde2021c0bc8b2253064819c2b0ff444e62bfb3679dc70f11f268c660050cc891063ed6b45fd0
 DIST glutin-0.26.0.crate 57841 BLAKE2B 3cc82fc58982539e06ec2bd88063485ef5c3e928abb16ea9f833fd9f742a051154cff38751e97fe2cbbdb1ba94ac4e54f11744f3c7d3a133b9469e9bbd11b478 SHA512 7a4233f44c4e5aad58a558a435abe1624294f3616ce9591760289addafd20801120810f61d00438f9dd1ce93e83182274cb20519250551adf9e0873abc452e6a
 DIST glutin_egl_sys-0.1.5.crate 5890 BLAKE2B 99c1a35fc3c6fcc6bd09351fbfd9242ac3e8eb3c652586a52b50e5635168dd96274216d9cfccaf77b06659264664f3d6d8e71012cb03ac2504673a5f9a848857 SHA512 ba8cd65013b4c15b27513a51c04723c4bcebe4668b0df62d364cbdba5c9705c54d5048dc86be3d03b03d00e9df1971985fd6242dadcdbe339c7bda14c72cc841
@@ -85,9 +74,11 @@ DIST glutin_gles2_sys-0.1.5.crate 6023 BLAKE2B 8e7d5059d9bc8c1224a41680b958696b0
 DIST glutin_glx_sys-0.1.7.crate 5644 BLAKE2B 99d80523f882fdad3fb8d6429ee4ded4b43b66027ad37a286cc9d6d605a6315025e8f781addc6a842e5c0da7930e17d508982f11b5d0233b14ecbc66ea21d912 SHA512 4b9348e7a2bdf93b8abcd5ad6dc8d8edc061e0b959999ee38e7dbc0e0191d69b3e8f5d769078101171484097bbb8002fdf38bc3804564dfa86bf4a0385a30b1f
 DIST glutin_wgl_sys-0.1.5.crate 5487 BLAKE2B a457d1a413d0969d9ca23b17ec913c7de857c239c33b46ef9f1ec5f573997aa1c767179d83a8faa6e618ee8f0daa89c83f159466a6ef0dcbed82fc945599e38a SHA512 3bfc10817c0356a3ffe5edc92ffe26d1071d305cb38e2f209b3873ce7ec765b729313bfe4d43e8d5d8d27ae32290d145b57b2c24117c7aefacc455ecd52e9749
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST inotify-0.7.1.crate 24637 BLAKE2B 7089e15c76ab1585850cc17d1c7d5094f6c229d2009dd90648df78d08a5b82567ccfbc116547e4d78df5b4821f4d3fdd7b46b22e0d1b8cd1569cf22c4877b4da SHA512 e98e041efbfaa932f0eb2e21f1831776280ec3873ecba8815dc3af716a37ec19c863a909d9f10a49347e964eae0aba33290a892dc0f0e178f6ccc0a4fdcf2c6f
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
+DIST instant-0.1.10.crate 5218 BLAKE2B 1e4203d235006ca922134c715781a5bda5a932f6740b7e22505db21d3b675758bce10dbb370e96694574c40c43a1d71ea2e6372df7116b30fe8cb0b65a3b95fe SHA512 a6b2c7e0a7b954e961f2d904a4cd6f701617ad70a7ea13230ee157c473c903803dd64596baa0fabd075e995cd3d013e10681c8d712977341ea2b6f97dd48d596
 DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
@@ -97,12 +88,11 @@ DIST khronos_api-3.1.0.crate 599718 BLAKE2B 945600455c85874c37c7c395162a3e56531b
 DIST lazy-bytes-cast-5.0.1.crate 4354 BLAKE2B 38c5ee1edafe88f434e942d4024ffa0231c3876960ef0d4fdd57f3f56e9ce1f8a9178466286938e55cda4254849debef9926b8ee04707c9fa9f3955f604735c0 SHA512 d660f66f6ebf588a50121c425d8fdb9769bbf4df3a2e1e3253a2bbbaf6c73950505a60787951a1e5056a73f769894bd9a510c56ef4208dceb07882d6d5bd5c7a
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.86.crate 522986 BLAKE2B 2643f7e71952c3c806ba02d3d9160963433115ce53fbb22189c6368813380a0403c7fb51ede36b4781ad0a609e02c57f2622062bdd536725a5c65a6f7aac5fd0 SHA512 b5a0c94b3717a620cb47b27d2f3bbfe04fce475c3e2feaab8bc4b14c8aaee190d47a61f0dabf26ed9e525e96e6aa611f4dd29b16e13b678898f88352d86c1b74
 DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
+DIST libc-0.2.98.crate 522087 BLAKE2B 950686d7cde31322e1cdf82ae189192091b8543d14d0da0dcf3892910f4216e8e46bb1d5e7e8fcb1693a372577c57a6eb6538a0fef997c1c1a0466c3a1f7acb8 SHA512 2e730b8d46c42608c7da5ff4c5475667171b552b485c2684d3821310ac0f55c1a7a12d9a2cf68a05608cdd2a0928da5e290275c70a519a379d0ed25350689689
 DIST libloading-0.6.7.crate 25037 BLAKE2B 108f5b10c60986ea89f4c754bd3c6d4b73f70a7352042dc1a177ae40a98f716171d242c9f52d81ec47972e55457cf2421ce0578995c644de1da3e15fe8a6d234 SHA512 4f4f37c5a04c20860c38407e8c7aa81386dfeb091773e480dfe87b5fb2a462dc195ec0c39a1add59cad7620373a671772e8f032f4efc624580c6227ae902e10e
 DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28
 DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
-DIST lock_api-0.4.2.crate 20375 BLAKE2B 0b24bdf98aaee9870f558971f437e728c8e52a853cc886a0de30cb9a84c2733175e6152a2d7ff1f28a83df5443091b16ac5410cb67d05ce464e01db64ba98cb0 SHA512 815de5198ba4a952490fbc7e08e899ce855588d794c22890839ad55caa81642745fa6bf81a2a2fc8f6713575f0d1b801a2f2107ed7c405101011927b6b40be31
 DIST lock_api-0.4.4.crate 20356 BLAKE2B 1b4a648467eba49232df5c595d7c5a0444018269a67db1768c7711d9d1a903a1dd00f99d8654c30186a470c035abdcec9994c8b1a347fc559c684b1792ec7f49 SHA512 655c8a1503b6e7f833b4c62109e1c5005727054847bff81e17d4159f91c02ac97512da0673ab227d17bc9ed0342fe3476247daf74cbc9a0b470e68c648ba706e
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
@@ -110,12 +100,14 @@ DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d624
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST memmap2-0.1.0.crate 17685 BLAKE2B d63c967500009029090140372567cb57db93647c3fb7a2469eea4dccd0e7239d88d98cc102ff5f244a95985facee4966c40237792a86bb7a691290a917a4a24f SHA512 5db391d7a4208e141aba27462687ffe9ab7bcd633ac66a28f0e19a985aa2cbf5f903b46a08fa9f1d1f136e9d55cd4cf8a98b312bcf744578f9311b0d0a4c8c69
+DIST memmap2-0.2.3.crate 17669 BLAKE2B 7b34c460eca434e13010af93ca942b12ba136994883c0e07aeb7a8834dda5c500860420d644ff936f3755c2fb08d98a5101fa0c71a6c94dac50042eefbca325d SHA512 1f7869918606e90de2798497d20f7f6c36162d439278de22835478a1f21121558aea3804f3e07de0aef48e1ddb0a514ef24096185af76df9566c0f377b18df3a
+DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
 DIST miniz_oxide-0.3.7.crate 44996 BLAKE2B 0e89ec4131e7abdadaa9feb6019b31853976a34434216e0f89ddab519559d0e1feaf2228fbc09906e51fb0242a18abe1a67a5362e080c19fc7cd00c2f95f08ae SHA512 d4eff239f8d6e947b94619e80fe03ed32aabd1a6393f63145d70ed7f08c51c45c7261d8157bf61c78d1637ea1f71ef15f9813ec733efd8afe6aa14810888718e
 DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
 DIST mio-anonymous-pipes-0.1.0.crate 3771 BLAKE2B e422c489cb104223a17cc91f75684feca55aca9ab3d21d509cc9ec51e960081cc199f52bb9d86250fb64b734630d9acfe59041aec5ce1a343f577064ec0f1dd6 SHA512 01f0ce2be343b201671c730b984f612b0eab43462a606bd95939f54422cf27706cdfacb724834b6d7bc216179910f121ed58eff20c6fa77560a6dacc4488f38c
+DIST mio-anonymous-pipes-0.2.0.crate 3763 BLAKE2B 04be37d2a58b3372eafcd587ec4dadab9d9ebcb7f25714ae9a1f23898b5cf839cc4eb9ca25327c3e5d42977795c55ace009af5209fc3ea246fb74384f3f2ac24 SHA512 230439e3da4c9b7fdb39f45ee369e577ed26a8cad555eb5032eefd36c51311f2934e4766e1dc1239a2c7348706cd56bb271da0a1fc91daad65d53a08bb91a10a
 DIST mio-extras-2.0.6.crate 16292 BLAKE2B 08b9fc0d594e8ac8a04c70be88e34e390a24d90b9640907ac7900c26bfc1f982502e70c19172d57a0b697ed4701493ebc03ae4959284b74babedb8059e9faf10 SHA512 2d92e5afb34ef4c7d00c78d6ed15d4e786aaa9b57ea6e2743b996b8377389c9ae058a6aa227c5c66c39a2f86a7bb0b22a13c73a3e35c4b7c65b7b01fcf7fa232
 DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba
-DIST miow-0.3.6.crate 24533 BLAKE2B 232aac1d3449f2542c8fc21c9796932f478a4317a93e505de2113c6d980bba2c03a06f74d00a3abac79b689cbfbb06b5a4fa0b6778c9866bb67053111ee16d8c SHA512 13ef93e0965a2c5e561e7252407a0db03dd0811d076f20a6174a5c2ee28c49f1c340688d0ccb913736a1cab1c764cc719b61fa670f9b707f619b70797cb81ebe
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST ndk-0.2.1.crate 38584 BLAKE2B b110d4680c36160755097e2d9c5ee134c0c0735d386a64c6f6cdf2e5f7ea7a33123b19d52229adff7687e4f8c30df690d1330aa976e0da2d199833917471265a SHA512 36a287ae0e5eb4f616d4dbafa8002310f2c72edf8b1d340a583891239ffbfdebe0d9cd9abbe1a3636bed7682fa4dbfd2fc63445b73771cfe8bd863ac3c86664a
 DIST ndk-glue-0.2.1.crate 3684 BLAKE2B 5fab22dfa0782c682e020bfa2a2c8fa48266d5366baa9f3c7ac3a033d6badc6826fd28bb5712abe2b472bca5a93660bcbe38dfe3e51d3f09eee618d656fcfec3 SHA512 25adebb161d33c2674c89c21c5f04f599aba79828503e50715cbc94459d4f8f31710a008dcaa3fdff11068858fe8546de302c16fefb8f2e892262030ff37e6d1
@@ -124,17 +116,18 @@ DIST ndk-sys-0.2.1.crate 273674 BLAKE2B 40a25da1f8179f6a680d5c85ab9a6b80308f75d0
 DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
 DIST nix-0.18.0.crate 209962 BLAKE2B 3ff822e3d49a6c477d5da3702fc88bbe270202acb4f7c449a78969ada9b8fc8855a90ee194bd2943dd27c28286b88e1b22a6003e08260e19f7c8ed6036bc2891 SHA512 b86660bfa2533fdfb945a3ef840c692b5d96108e3e73b76d6489b65039cde87ae04935d2f10878cab1ea38f039083aebf4ec9b2bb6ba66ee204be700e3e96581
 DIST nix-0.20.0.crate 216983 BLAKE2B cb7dc3a6b61abb66645613f16a22b5f127fef38bff5ad40fa99ef50019bc40da7f40457af9dac08af5dd67644c2a102ee6ca99425077ac7e2024c89387587752 SHA512 4efb0a6147870aca6b5612428216f36cd826320b75f4f12fb0c75140d47561834695db7745908a23d08ac7114d69848cdafcf87830718da1f03aa6f2c664c5d5
-DIST nom-6.1.0.crate 147341 BLAKE2B 85e30a738bb0089ea752d832f65bd4598f57793676daeb23800a96dad64b7fbcdfcd6b4db393dc0cb230ccff151152ae5974a97eb45c642cd1a6fcf261a7566b SHA512 51e287074d6c44ddac3bcee6a4c8f56a18d594dc6e6996e22692472b080bba54140f4ec29fbaaa633f30c0875f1c538e2f0bde6a0bfa0867b70fed613f7590a4
+DIST nix-0.22.0.crate 227091 BLAKE2B 5fa629e0d2509bb2e19e889d6fa405b7ca1f085e6c347258701e2712e0f46278d9f81416ba25dd417b24c3991dd394e8681811b57f612021edff7e7ec32a1e82 SHA512 73e18e87814dc98bb77f99705c45537afeadb04790c3db54a55688b3e925d3df5e7911282e997244316e310d5286ac10880b00487f706f9c7babde9225a4a14f
 DIST nom-6.1.2.crate 147539 BLAKE2B fbee4797e91662a8c255ff80598fd50f62fbdacb3b734ef6a54ea115e6411ca73002c2766deb88ac8ccb698c481763594472204871e7096613137582afc9740e SHA512 f9a12a6c523c1c3202f3c45a514d02c40c600c835b83a1f94fd8e51ab462fdb89de3b32ad11630813d8e3cf4c8bc76acc620781568dbf2eb12469dcd9d3d0b19
-DIST notify-4.0.15.crate 54853 BLAKE2B 28eea05ff77e8790ce6e3acff74deafa95f119b5ee2af0a7e48d10ff04fb6bc1be9495925cea0fbaca3391a22b51e1800a730a0208f8a4a2b82ce5ed2a49fec3 SHA512 f1712718d00168fccea41aa5e79dd2c3551dd530781f4c589fa787237e6206b738e331dc9100e00d39dbe139230fdbe97b9bc73b076effbdf91f2815a1615398
+DIST nom-6.2.1.crate 148362 BLAKE2B 00adbcb3bba48c0be30511c8d88223d9ca7521418a2d4fbcc3ff71e6faab7a391f7c12f3fe025822e5784ec53d22c2a739e6e1412dacdac2cb9b962415687228 SHA512 d881cb1162b5e5752931ea40b7806c628e08733960d20d739c7527785de507f76c4a0b041d1072c4f2c137083a2da982cf9f371fa822896d6092a1a5bda34f46
 DIST notify-4.0.16.crate 53902 BLAKE2B 4155fc7986f6a5d617f5dc3e5a41c4b03ffb9df1aa1a4d948ea1cbe42f23d5348710bff55f6a70bffc171985568a6d4fe697bbf92226947153e9e959786c64bf SHA512 7c8ceda432db562d2d261ebf1b18a8ac323bb05d1a7df1caafdc5a0c409edd3a04d84da1761fea8ceb41e4717600c3572ac9257458af0a19b17004ec0496376f
+DIST notify-4.0.17.crate 54419 BLAKE2B 826315718f1135bf49daac9d0eaa87f2c49bd34f83fb8e3b7970ca954b7942d20466d2c90a1c90c899f9c5683066fa341e38b0cd83a1942ccf387652a712aabe SHA512 78fffa1da9fafef40ac92190dfaa71e22b8999bb8bd9425e4d8e9054d234ca0fbaf7726c023987756a3900b00aa9e713b093ba7643374f2ffb20416ce19bd193
 DIST num_enum-0.4.3.crate 4840 BLAKE2B 7efd0d0913649fa34506223426459843a8056392ef5f971bd62aa47b0696ce93ab696fe433a90a36a264af35b658ad64c668e650d8a91174950af9fd9bf42d03 SHA512 393240fe92d58413e3b73fce96efc0649d96866299c99a9edf3ffdce63ac5e0bab64a21898608f9c7a078c6802b312d1691003f854bcb62542c3ebd491bae499
 DIST num_enum_derive-0.4.3.crate 4552 BLAKE2B 06b972069c62552422c0ff24d53c3d3f3c8e64fe2c50633291c6860f4ab6cfb83fc5bfd455b7b1803a90c98e222cc646d7c1270062fe12b99b620bdd37e7cf0a SHA512 865c3c070d62a865137d0b539a8a4e5ad8b3d3c74a41ccb2861516e63f7ccefe37f9df9b33f5fcc24ec33f6775cbdf3354ac604b62b8e3d8fea34399ae4684f3
 DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988
 DIST objc-foundation-0.1.1.crate 9063 BLAKE2B 876dd217b612278a522f2d08434537d468f8b0fd1efb0e58d0b58216e20f7f9fc80a5ff034ea25d9216d4d53b2d65552684ae5d5212f18d758c7937c91742a84 SHA512 976dcab4e62ad1c387a81723d70b969fb7d332e1f7dbeb2ea9a26c62fa999d91ff6d8f737ac5725a7611334862df16fa8b15765c036d7acfc3e42a745d051f34
 DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
-DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
 DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
+DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST osmesa-sys-0.1.2.crate 1322 BLAKE2B f0768f55e02534829d47cf91e839010a394d379ac0cdb06afb7e7b4993878026be62671f68e91d7d292919ccb336e59b7bd13790985cc1afce90957096bade11 SHA512 3ab87b968f685da1a3e79ac6a56eb167b8ff76f52cbbf57e19b765cc2ca16f5ba79d7264f0da36664d0ade9fc72c5d757e1e3e430fd41224f202399663fc98c0
 DIST owned_ttf_parser-0.6.0.crate 20574 BLAKE2B 6bfd6b3e0ded1b23a8d3037137e5408aae9454f853c1b871166cab16629c7d342b6ab8f9528a175e5102cce25587303570b76f8086804b98b2bf4cd739d95f78 SHA512 cf1540beda15ec1535b03edfcc661a11ffa471d741c2f754318b5a0e4808e335d88ab7d18c3b45bf93cec88cad8d2d8bfd7c5edda177b1a1b5dccb6a9b34ec66
 DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
@@ -143,89 +136,78 @@ DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST png-0.16.8.crate 52598 BLAKE2B 03f706591182a89b0566f8a793163372a4db3e7a742f3aadf06fda93068c42a4351722796ddbbb013fdc1be5a88dc02debae50ab1cc3ac81d72d07a814b456ce SHA512 df96f8580d8cc11df54788ff64ab3269b14369a467d7c29964a5b19add5e7a82258e6bfda40eedf135bffa98a2a86afbb725cd085cf37f6c433abf9a7485edee
 DIST proc-macro-crate-0.1.5.crate 8096 BLAKE2B 0a992f7aecf05335008731adc40e8ce6c4ef5e114228b51ea856112f850a24e995e4682c8d2ffbc703b9b5cfddad68342cc9d0f7d13b13a96961287bdc22c4a0 SHA512 b2922ea8beb762f42f7646398eff9d03a5fe3d942f1d0cce564eff8af41ed14f175986d07ac5bab75e7634f964b8ad24a6f05f597c90b83761bb4c1d2b2fed59
-DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
+DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST raw-window-handle-0.3.3.crate 5798 BLAKE2B d6fa979aa6eb23478abb3bc85f46633ef2807208c96de9fc327eeeb53e46944a8d2cb68dd25345f2a6f4b5c4274058a01e13d1eaef4be858dab11a8d3727c1fd SHA512 1939150cbf471a33654aeb953bf2dfe48e2fa7789d4a7a43fe449585737741cf03c4f13b2d3d3855f110f2cb8b91c15cca17e7f8ce1f6b63fc8d2e32ed3fefb4
-DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-DIST redox_syscall-0.2.4.crate 23234 BLAKE2B 2190c072fcc0d5be9823353427e5ebb3277a9452dd9c2320f7b46168a3d764f8a2e9215f333a72e272b6d021de7141c76d25e65210e70a6b0da6a7cc987a281c SHA512 622f38ed962f7647299bcd4a742dd137c63450d5eb85d74adfa4b72951144b9920eb04d4af87e9c679c4bd47a985c528a8e56bdc31b15f4c8cd85e6b1bbddfe3
 DIST redox_syscall-0.2.8.crate 23697 BLAKE2B 5a084a48e06ab0dc69f64b05058b78d994040da6c42f04c8b615b1977fa3e813cd5a531ab33402402914362301670709679aaaa321e8904424c38d35c284b7ec SHA512 250556a7683254c9daf22887b39abb010eb9d4fe08b944e52bc6595ef6d8acfed76e5f43931fe20c84bdb3743772fb62a0be154ecfb6e66c2facb4c73546eacf
-DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
+DIST redox_syscall-0.2.9.crate 23533 BLAKE2B edff38a41e57f40f9285d43deaacea32d518f5d87382d535b0349f123569613d50e7b45a70e4013f35632485951967a5157146593811102f3c0a7d9177f07fed SHA512 4f3c9dcb925c57253fa27f6355482d4f984fe31c4f562f2cd22e953c6f1f475e0687003e495167f400f77d2594ffb9a69548454db8086da5913c00643ecd337f
 DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
+DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
-DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
-DIST rust-argon2-0.8.3.crate 28313 BLAKE2B 2d3468c7b5dc027fbbf6ceb264d77f4ae9b03526e0634c645ffd32a4c87532f5a84c224c6c39a15c9e267d268b187ec65210a2edf7df8294913e4958fbc83352 SHA512 f336dd3f90e1a49be107b641f9e9d513b6f8098dbdd1ab8aa2bd1fae329ce6840ad11a902b599922bef45d96ffb556d52b57d61218271bdccb7c85f9fe1da033
 DIST rusttype-0.9.2.crate 31314 BLAKE2B 5c4910c91c584410bbdfc34f15c079feedd9c08fb96c41b4a0b6b93ceda385f2cb5a2079fae2f83faf33fd6476367fbd658df72943d8c1e1c05626e8f88743a0 SHA512 99fa1b6446c339f4c0c233622146bc18cf7e9f767db4bd1f1c40c334c7376e33b5fabfbfdfa7d47a4f88027323b0786bb6fe98bdd77ab6df3b898b78b11e7b2d
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scoped-tls-1.0.0.crate 9146 BLAKE2B e6cecc543760a293b9ba4e71bf0d12f3360782795bc9d0f0bb054614a1c393f081b6178e98708b896037f5b8edcf371b727e7eb80f62bca24fe09a1903456729 SHA512 f09dd404bb45349ef444e7274a2aabfeaeda7c3c9f964bf5c52c39984c137f63bdf9fb3e33df8e312e52872f7721de25951a7f3b8333a670626c51afd36d314c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST serde-1.0.123.crate 74379 BLAKE2B c6d1a0d833b50d1ec65f7c2439388eac08db6231e5f8d719582d545948b5f36f2a429338e12e33e4bdbaf439cdf25840e37f37470d993f6e80d8e5746e5c7564 SHA512 73d584193f1885561063d15c0124f0611f59ba60b14eb5df3fdfe9545e9e31a1a2afdb22b2a7dd4176ea0856a24352ca6d822e0bc779f0fbcfc41e545e27e823
 DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
-DIST serde_derive-1.0.123.crate 54122 BLAKE2B 9663f89cc23966d338ed1f952629276b4dd6a4c7edb8a3d9cc888e135752a7d5b748d55428566ce5ef98c11593dd45116f7aae0278bebd41b5e818928a414579 SHA512 ec80de18fcee0c50a4297272fddb54e111b580012ec79b7827ad8a4b9c02a621b07aa02070480cf89d6eafc1ed7a577d763c2657938f14c5b546d98e0df83227
+DIST serde-1.0.127.crate 75162 BLAKE2B 7472c9328b4398bb25bd71febe9483e6255b309d98d2655babe5d16933c5b92a71cb75df8aec3abaff84082bffdc44a549673d30a3cb68888d17157e58b32be0 SHA512 dc2b9c0a71028853bc05b4bdb3db1e9e753dfc588ebcff5dccc42d05252fe250b797e10b4d574f161fe11747c9740e93a47a2eba2b4ffd6ecf1992dfadbdd2ef
 DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
-DIST serde_json-1.0.62.crate 114960 BLAKE2B 834ab58df2c57ea408d8407a57f6cbaa432ed9ba71decdd91241ed9531af7c00a8e95ef5f94ea5ea2fab1401fac3e2bd8b38d5c39aa2319f8b7a03845ab2a724 SHA512 eda305317c219fcb39a4e8ea0ddf3b24e5b86a26ab2f854ffba288a1d08439173dfe1a9fa649a159691e3d4b95e38589b0045ab7ad3033c294014a60063a4684
+DIST serde_derive-1.0.127.crate 54201 BLAKE2B 207c20d2e276a173a1ae0326be307f3d77937442838a7890db923fea434d6e134a9591a07139f8eabb9981aee74dd092d6e2c0a98f17aa67f069faa3dccec6c8 SHA512 2c346d45bb96867ea5b4a0ca24aa9b0584d83f26578f5a1ec8a51c514d0158d98c7b76408a0ea64e5718567afb6a0cfc5922d3c5588a89b7e19035b13b1a0416
 DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
+DIST serde_json-1.0.66.crate 115121 BLAKE2B c46c65339ff79138649df206f2ec759945c31ac11bac4807a8d1e76095c1937211b0b4ebf88c69d2d22cbd90ba25643a74cafeb291e815ddeb5c5ca208eec9e6 SHA512 8cbb64a24781a94e9448dd39f9429830fff6fe61be3772c1ca825f7d489ac3c06b189c42730129e281d8f43f7128b3b9cd2308727e625763588bbaf61b54d1d1
 DIST serde_yaml-0.8.17.crate 40805 BLAKE2B 8f70ed3efa5afa1f8f45b2c107463799269d745705ac2b90e8ce69c090f4f52721d49723dc48967bdbab30efe853c661631063fe16bc3ceaed4d0158f90ffbcb SHA512 3e7a4baa156ca1d9655a76fbaccd2d87b6929165972f6390316c9d4d55fc9815827e3c4bbb8a1c594f048dcc9c3fd6f4c55370df27f6257dbc28e2066274a7c1
 DIST servo-fontconfig-0.5.1.crate 9738 BLAKE2B 427324bb5c44a5d254000b86e21b2a52ccc41eb40f0492b54cda09c02f4e66da2242d2af662adff1c55098dc46b776d92fd3259aa34cea1d76beb18fe62d2c0a SHA512 7b76733b15e083d2edf2c90b56ada7442898508f992bd91e94f751c21cd42168fc28ad70743e03ea01d99b0f79b2608f126b5241c864c25a21eacb820d9c2de3
 DIST servo-fontconfig-sys-5.1.0.crate 1790708 BLAKE2B 558927804da2698ea6538ace2732912da54216634f4b6f2578d64c4b7da78dd62339a771ed56a57bc66ec48d6f194916057d6753bd25f1d9d93bdf398d365f43 SHA512 7c73c1c3b6fe3bac24d373998e14ac875990434395e543a241f53287297ebcab4b90e0e2a32ddc6a24e1eafcc095cc5cef91f0370959249d08c6994e1c4933c7
 DIST shared_library-0.1.9.crate 10566 BLAKE2B be5497dd6ed880d33f7b4d3721d3747794e29715fae352fdcc5d153cc9512da2c2f4b21804ce68077654eb3ce989dbd1fb688120516783dd78db7f48afc8ea0e SHA512 8696f5d9ae976b04ac3f559ff1c4945c5554fc741bd9e62207a475a331f8c90fa8c2d583ac9cf96dd18fd543b65fc469aa76dad2f526c00c68182130d4396462
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
 DIST signal-hook-registry-1.3.0.crate 17786 BLAKE2B fbd4284bc1020145b92557a99628b985860bd5020cc870ceb6067933c8e58be11d7bdb3c1f715231ca2f0ec2930487ceb88a82d9b9d1c0a31bfcf4a581a002f4 SHA512 2576d474c490deb6cbd759985f55340bb4e4ae0abac3ee02055bc30fa4008fc96ebf4d96f0a85c634b4f04d57b00243625194b333cf330f59fc82286bbeb30a9
-DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
+DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
 DIST slab-0.4.3.crate 15681 BLAKE2B d7e3eb0374de081d1870d2b46c9137e5ec75950a8fec217e3b120e455fe847e9245884990fbff4d01d512ea297c2012cb1a64f9b169264168081f5f7d6b20b39 SHA512 8649f32f26c1354b3281534fa0e062a145b62813c46f9ff5989ae688154221b00ed1b8c044c67a4b78c00a2e3478a8eb9c1c96fb424c24cd6cefd4df875fbb15
 DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
-DIST smithay-client-toolkit-0.12.2.crate 128716 BLAKE2B a9dc9533b70ea8206dd8610c676b98e07ad5ea106da8e585b22baaa9dc570cef1de0d08b8fa594ff338b832d7a164c9c1d113090d7e4d1025ccee4d722060162 SHA512 64ec342d81414fe601439456d4ef77951ac9b2f2105d25637d522f0ddccbb368b7cddb1ab66d4cee0799650d9350cc6b2a94a568cf32309fa15ae5755612445c
 DIST smithay-client-toolkit-0.12.3.crate 128701 BLAKE2B 56097ed156cd672cecd905e780d5f7b269f1e582e9ba5660c379d26c331a3c94d4ad6c0d01a780ba2324ac715841d5ad1a186ba296726feb1789681aa9971384 SHA512 745841b8d291ef0357185e601db5ab5b1254c44c8cc69a21825c3c590cd0031d95048ad0dc6cf46acc2b191aad59e56f94e2431f0a30ee6ad9606a752a826084
+DIST smithay-client-toolkit-0.14.0.crate 127701 BLAKE2B 925f1753f159260885bcd5f3fabe114ec36eabc7f139c193e3ee42e86de223a1f30b3ed23cf1050af8d6661204e39031f4e93ce90de7f4f6cf43de296ee474ae SHA512 0eb6cf6b065fab88e1662f8d118f278820f73339105e3e98c59f0c112d180324ee7099fa75c71ae4d1b99c8e1e61f9265626439924d5db96e630876c104e5136
 DIST smithay-clipboard-0.6.3.crate 16866 BLAKE2B 37d5e581fb935e80bc6a5a9b23c95f6651ff5591e39e72f7e5f9cecf2f725af4ab0c93c6555770303efae4cc299ba69295f24584d6ed44885dbe26fb9075b46d SHA512 ee846a07c9106c2988f44af74c3e9eb1c4eb5bce694de5d17068fe89ab26fad09945972f7a2cab15db489f2ca423db0e741895626706f309d56e77365d2d6887
-DIST socket2-0.3.19.crate 33782 BLAKE2B 1ab3c61a439c1594e19c4a14958d0a85b54666532d16eaa9a1e40e586b7707b1c7b5a751fb373f16bcc26510abc25e0321808e721c0b33b7b04416b9f6cbc5bb SHA512 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
+DIST smithay-clipboard-0.6.4.crate 16234 BLAKE2B 0d17e7ae53d2d6870070e068878a15c3b3392623df80e5dc81aaf6ed741e5096ac8d2d67483ab5f4243a96e7355dca062b4a71d3033c18833d1e071b701cbc0b SHA512 26a135be56a5a817e5270f3496e31f03f92b3028cf8242bffcd18109e688b04446892e3cfdaa0bde894af279b19e5e28d7b6357c4f86842ea7dc67941f4b2870
 DIST spsc-buffer-0.1.1.crate 3176 BLAKE2B d0f3aa4876df5baa1097dcc17f2d717ba57778f44c085bb29afe59d3c23ea6b7c965ca2dedfba1e8e123e36af379e282edfa783c1ffa16f7f792e3e60d0742a5 SHA512 c77619a2dac332f5ec359c559c408e25836b4130f6d078488ffa48cf2ea173acf74ec6bf3488d17e3e51ef756b33c3c27050587aef2e1b0525c2900906cc15b4
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
-DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24
 DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9
+DIST syn-1.0.74.crate 232974 BLAKE2B fc17dc2645fbe2d1ee409f895732b86cb77dc14837d35d7773e7f9f055e0b56f70be86203f13c549f0b43e1e4e1e777cc5bee2f08a733fe447f907dfaa443da7 SHA512 5aae03a68a4a8c1234d4e9a69cd37b9f6c698e2b635f10a030c0fac22cf00414c2a5e7523e0efe43181bc29c17abe6abc0eab103391259c97ce566713e3349f6
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thiserror-1.0.23.crate 16423 BLAKE2B fd257d34da829c8d0fd2cdce9910e0b5e797ec233af3a6b3be6b47a4fa3f39bc0170edd08cde3fb546d8f3c7be63049ddd94400b602dc73262fba2c323229650 SHA512 e6b6ab7a4a23f3c50e765a16071b65007441ad3f1eb5566e91bc19755cd019fb8efb358cea5663bf7c83cb3be63fae9ee0d019cffb3fddae58233c84b93aea9c
 DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
-DIST thiserror-impl-1.0.23.crate 13269 BLAKE2B 7b570c1a0d122a11fcbb7784e6c0620bee0e4644e6e8e988de6936ba23901ef6549585d1e14afa8240b199e3c92a6471af3e4b63fac902292f46ab7ff0a7a6f5 SHA512 72098ef63a73986c8d6a0f3fff6d5b23e29da0dc8eb4eddb410b7bdfcedb303e73418b2a3518d9315772b0c2c1b9c3d86d6a67bc7cdebd45f4488c13a5b62162
+DIST thiserror-1.0.26.crate 16711 BLAKE2B 4524c3ef351eaa1266cbbbafec6082695d5c1485cec7bcfdffd64719fd57efb4e40f119435eae5c6f574a80f59a68bd8c868e2493ddf36f4882e7de65fd4bf93 SHA512 bfe93a14006a3d9e0e996b310718223f8442802a384a1b999c15dd1a25f642c5cb2db7a50a69cbb097ec50ee3b0129b509f19225ca714a5c459d4dfc8255d84b
 DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
+DIST thiserror-impl-1.0.26.crate 13431 BLAKE2B dc753a4cc1e7b8b3eb44bd9462b6b19ee983fefbfe1f60a974195a536fdbc68395942a229a1d2ec7a8594669a439a6efd3cd22573a647a7fb7a371e793fba645 SHA512 43eea818b72469bc4d5c28e449c2e284c1e11b2674b9e67b1788af7ab66bd64afabfd8f5861938a7f9547a9c13387e0ce400419c6283bbe1e899d18d998cd921
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
-DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST ttf-parser-0.6.2.crate 106052 BLAKE2B 8065c460b59de5d792048642c538bf7475691b0c83cbd236c20236083d5ee7109f1caf056a3e56eeac2faf722fca4f1fcfb6ea8eec4d93c389baf856ad3e3af7 SHA512 93bdb9b43761a62d43ade6d74596927b0718732d7c0b3d3660544ff4a9a76579852b94db3d26639df6f8044ef81a3bf52253f4a9f30d7299959fbfa984129df9
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
-DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
-DIST urlocator-0.1.4.crate 9605 BLAKE2B 086c4e344d0d6ceafeb7e60a301bd1086f7ea09103e83ad13c8ac259e0f92a24449c7f77e58d11ff81e0c4898e1a7f8241589aa5bce36f158b01a6649a20a989 SHA512 bb03054d41e373666ea1115c701433deb0595c3733dbcc66724a4c41c8867d6fa981285e5e74e9698601268d1e5188fce151f1914bd84b4afb2e69c7ad5b9e2e
 DIST utf8parse-0.2.0.crate 13392 BLAKE2B 05296f48fe429a871f42e729e3540ec3a974a69892c6bc9da95e23c0aee2163c9b115a9614eb1943363076793e17ac4c89e28066a9816cab30c451524a5832c0 SHA512 1f6a2eca32e42c8e4b53d28c4fea54c426ed66fc01447b3cf8fc0fd75694453eadbe3ba000ac8ee0347d16dbfec47681254117949109081798eab5370886827c
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST vswhom-0.1.0.crate 9420 BLAKE2B ad748822fa9650d011c5f240f5e52ae1e27380fc1b22db2ceaaece4fbc814ac2f2792cf6772079199202efe88fb968618a13d91609e5245639f25b32640fad44 SHA512 0ac192e6a1d296904246d89a08021b55384b48959f26f1f0dca893f8fa1e71a012a0d731d1e48e41ca8e4427da84e50fa43ced621e435b010cbcda4f19c45a58
 DIST vswhom-sys-0.1.0.crate 15589 BLAKE2B ee13d0c15323c32d1fba2a952860042f4500c5809a62d27b33d4cfdd7be8099cd04041267bbb61c61bb84fea0892dd6e81b5ee7ec69b19334f31048d8b8c4989 SHA512 f4c4c080c25638c7ea5e96ac42d71bd92752e1fed92234f194d6b597b0f451dc19c44ae28f436aa93e5cff94bf2102e49dbec600d64d3c00c9bf03f98d3ad30e
-DIST vte-0.10.0.crate 24923 BLAKE2B f5a19e93ccf3eb29cd3cec5964309247cc7de951f92d6ef255e429fa05cd82ffc312c094cf9c6d17c9cbdf125f195bb6706d2b0fccf145b970abce2c2154a8c4 SHA512 39cc8addb09a1f3e50c7548a1be00f020e972f6f9aea3f7a091f3ab645948b7b1c96aec5332cb4f0c9bdb20fec0ae2ca2e82c63bba7680aaeed468a48097254f
 DIST vte-0.10.1.crate 24947 BLAKE2B c7e94b7bba2423d14e5aa85f94dba856a6c984261551f204f029c55ef923c0012b259e5b229974b54b4eb5da1e85bae3c8cdb680372b5f9dc6caf51d1075b0ba SHA512 0c8fed2cfca5ad07d2a146e1e26979d390347a409cdc2b960246fc2fadd85019b9febf2dfd618f7a144493084b55f285c58ef5204e613bd9013af26faa9f2033
 DIST vte_generate_state_changes-0.1.1.crate 2422 BLAKE2B 6e8fb4ce0ca0fd6b9a4dcccdfb02445babbc13d47de5fae9bbb81e8c67ada8a40e8dc5e57c120c36876293b111ccc71e1069ea3fdabade6f9ba5ea2d44ff4632 SHA512 ba09352e037cbd279cbf5641c9783a24f76e54f1f09e13f0ab1ca99c9646c1e3c958e8e302d7cc88431073bad2e2d5619410f2f93f96f1db25f0f0ded0236f7e
-DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
-DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
-DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST wayland-client-0.28.3.crate 68924 BLAKE2B 085912e24b98da07aca2ac0bcb9c22e975a9c6006fbf9443f1dd8fcdd2e14f28105db94e7e2760ea092b22e9428ac1292329df3cfe460e70b4df494db8ca25a0 SHA512 05817be16b4592400906b2de357d50fe924cdaaad28893e18ab2d76afe399bfa14f192cb1234a54bce7aa1fae59ad90b012d7119822f3bdc181a5c1a1a438fff
 DIST wayland-client-0.28.5.crate 69086 BLAKE2B 6c98645ef78a6778c6c1d6a9335f95fe23a1cf06f7ecf9aa4e3bbd9eeee19c9c16f15a4a37b057cad404f6a123349ab0aad0c6e50e326f1f4b0df334263c06f7 SHA512 11ee93b2168cf7b92bb359bf413a38d3aa56321215bc7362380c8f4d1d57aa3e4deefa3d6ebd121b2dcaf4f5c81893743a0cec7a3a8e75327650dfca3c76fda9
-DIST wayland-commons-0.28.3.crate 20324 BLAKE2B 26e744cc16c294fb2b0f27ab776d478060d355069871ef1cff9f0bd3f016bc8e6b829a97fa8e625800126f8bcff5238d9f497cd4ee78402a7ca95afb0b5711b0 SHA512 2200e1aee052cb5961e4b9e14c581fe4eed9f145aba9c0c96cdf5bd951d53140f1ff6c455e86c8136d13c9eda5651b133b3154e75d05649a1beae767ee0366b2
+DIST wayland-client-0.28.6.crate 69347 BLAKE2B 1aa6c1d3efa73658eca21988756f0412ece4e99e2286469017e18a72e30a379fe23da489d830b8d0b79bde9e31427e44b68ccc2b53a78125d09602b01c50b6bd SHA512 10396b70f1f303c35974035ea050fbb234719018fea1b9f55470e3c21b07df757fb739b173a4c1426f813a1f6ae56ac49755e7d632cff2cf9287f438fc6303ea
 DIST wayland-commons-0.28.5.crate 20349 BLAKE2B 656effcf4550058725a99273d32a92f4e20baf6db9841dfaa549fa479d7ac3acb8c6bdb7683381da22aa07f9004d330833ee4d16d0aced56aa7545934632d69b SHA512 795d75a55c104f0be7e9040b2c2a1bc179b08da5268704e339d78ef638591f96535c94675bea9b81fa69ca8c3d2a77e9b5f283882c57d9d70b676aeac5cceb57
-DIST wayland-cursor-0.28.3.crate 6284 BLAKE2B 106089f515988682d992fc90cb44a131a2f916e50b8971aaa8de86cff7482449ae52e84ba51239e7228ae2efbde132f5ce5464eeec8e1d5c73493077e8227878 SHA512 6fc86b411065eabd9b828cebe1eeb0c70547f013138ea6670f140b5b81d437eb7e8302136bc4f28d0530288fe5b3e8ac9c87e7a38e8cf24464858ef2676660bb
+DIST wayland-commons-0.28.6.crate 20581 BLAKE2B 3847c049ee7225677ebedb00e69f86d6c8d1726ae7110d565cdc0016bcc7304eba4bd79f54eb2cf19dda0c13cf6ae7a497d9bb40e80674209d5d5941bbb469da SHA512 b636ac6b168945eac37e5bfca1b68f32f4dda78cd3bd07e38dca9df7ac5bbeea988f1b5d29f52062b07c210f5129af0f50d6d72192cc457be4e37e00354de7fc
 DIST wayland-cursor-0.28.5.crate 6176 BLAKE2B b71373d189eff17a7bd38bba340a0681a734516de8a60c7b754d2d47c6cb02ae64d87ac6f509de0a65e8fcb32cab16241655ce5bb0f6a8c4b9982249b07dd222 SHA512 c5c4e0f53bf110df49b9883f7a47e59b036ba532fdf1fd8e5a06ffdf8e33e88b1df27c1bf5ba982e82fa8bbb551b940f2c8a87a4801c2d7774d71c3e3c10171c
-DIST wayland-egl-0.28.3.crate 3096 BLAKE2B 17122f256cc5ff4c86f712f8f3870fe473ad2e81a0e4566ab671e5ac9ca1b5df53994fdecaef1333cd9383b53191f29a9a61f6a6fbf286376446fc28982e05a0 SHA512 b9ab3d8d895716905ca5f98cfd481fb06404dd5f28427424322439ee9835531ca79111c0edb038c689035d068a08090d4c4d3ed54b0c5b1f03b23843040aa4de
+DIST wayland-cursor-0.28.6.crate 6176 BLAKE2B e433f9949c4614f54ff6ea788f961abbbe1fbfc5da6edd9c0085c321393e25e20380bb1c2e38dd8d060841a3331c96295fcc969da2cfa7743c5f076c9d19b129 SHA512 3fda8ae53f69fe2911a12a0f2f91920915d72a43e8103db848e8a29bf951b262a00909c72a5f94af8b6576c9c9df93b804fef088da14bf41e797b7a74afb293f
 DIST wayland-egl-0.28.5.crate 3068 BLAKE2B de20885bb27392b89fd1bf29b734bd68f923d69b26981519416563857054a4f756550ba35d7ee241a7a4097e91a9055fa3c12cf4ea64b0d541187a2598ea924d SHA512 c7b8cc9466d8473005aa9cd09639acd07a8ffa21a63f4b65ef317a35ab5686c80bc241f3807e0e9964045de195746f9032c67211f9d8ba1c188f9e2e82bcbcdb
-DIST wayland-protocols-0.28.3.crate 125377 BLAKE2B 812d89f4784b48c751781005b0e7b01c4c5f0d12712ac95f3e7e6f7336c24f28a6720b3e045fc3007ae0e772706630de09d6a9004ecc7b6bcc4882249b8e27db SHA512 1b9847661668947db7166ec32c5e6c65e7633b232e8b65fc5aa9e9f89501bfaa19a7bf76db4e0a468594f540c93fd08402caee2ac364e9f492acc6fd9121bb79
+DIST wayland-egl-0.28.6.crate 3066 BLAKE2B 33192656ee55c621ef804bbc8f29c4f3049d452f6a240a51503814215bc74d17c73527ada2bee856538d2f4c3882f410c10bcf48262d6ffd8bd4d666b125fae8 SHA512 d30ee2de404ee72ed819e13f41eca38c857d56bf0c83b0910ed14408c417f8897d8dc5b3fb83899bd4f1fe666027af453d7f3ca8c10dfb587ec39037ef89b21a
 DIST wayland-protocols-0.28.5.crate 125112 BLAKE2B 916ffa3e2e80c04bbcd054b2665f62ad483bd8cc8e65876378926efd230a3267f3b22ea8ac8b46089646b0f835af55da9aec21fd6cdf43757c5c6cca8cebb896 SHA512 d7247bd73702a1345fefaea0ef18b89654b770532540b0c8a61341d86604098319562e7bbc7b23c7ed6f936459487228f88fd510aac00c1955920e8bf6684457
-DIST wayland-scanner-0.28.3.crate 17314 BLAKE2B cbee9ccd176ac83112a450a6d4d54b15b84da48fe6499b9bedb99c39c1407dffb462c896ab0ceafbb64295cf99f1a36bc9e0e4096cfeccb8bc19b59d21ca4360 SHA512 9b6a779968eeab129321ce433238ca6fa1a8427c237e09163e8239b453b4e1babe32a0742d291c80bccba523139eef30601b5b59114ab7b954d5f1b0783a1bba
+DIST wayland-protocols-0.28.6.crate 125975 BLAKE2B 75a6d42a3e3e417eb04fdcf2d88b3876635356f65b15011c68c59116523ca5acafb65367c5e1000b97f24b3208c04648d82aae8024ea1a544a15d9965555f85b SHA512 57b06ac0fb9ef28c5294163f1ba0f83d98c653406cc726f96106beef89b924168ade2cf7407982538ebb1b3a6132831806092329336f23f724201e2f55ba3fd6
 DIST wayland-scanner-0.28.5.crate 17228 BLAKE2B d8085ee1a219374a57f70cf4b26e95ce14b346144b588c92f6a7c672d4538ea1a435af02c0099e4c94e857fdfb9fb5b1027fe1b3848665d59b40b89e8ebc6cbd SHA512 e2271ed492e98e3da86177eef3fdcbc5260afe175a74b4c052492bffccf17ada7f5b62dd01a5c70e9264cbae63bbf6a804d47012c910599f17873ecb8b07e6c6
-DIST wayland-sys-0.28.3.crate 8033 BLAKE2B 07f40bfb09148bc6611b791c517f961ec5e88c5b615034cac7a9a59dc153ac5ad71a04372f1b03296b4aa59e62cdbe7743fe9d6c59e53f2c3b4122f6badd9187 SHA512 2136f60d98bbbf231d861b54bc473c9d1ed2205a6a2482708350a0544c86541d837663193f57a3437aa990ef3349cd63a6a7ff69aa3cb78638fd770b31ddb185
+DIST wayland-scanner-0.28.6.crate 17226 BLAKE2B efec1c3b1d6c268f2d0d0b7a43ae74e22ed3b5a987e4027a8f03c7739ca7558497793cc7d0cf723f92e36014c9123ad8f918dd1a70d4f647f4337e45269fc18d SHA512 bbffeb2e16626cb97064c35c4c8537d7704cc559034ddb2d2ea285542ba317cbf0aa1dbabe57c1453b6e080b051ba7f6707f7877da1119d4c678ddd51ecf25f0
 DIST wayland-sys-0.28.5.crate 7968 BLAKE2B ff5d5d4d53d4c35a005abf55caa255ea2f9cd679f6e241efab6a784d95e48f98c03771ba0e737dfbef1c2b64d1e40e7134d5c3cd14dbb7fe5bcf2a48e5a0ec17 SHA512 97178f3660f1cdb9fd3bada2a8480f0499b9928a6c068645d1f5542a341d64341a1874f916dc3623f41c1f47ec2c99efddb5eddd0cca85916f95a0c0ffd2c601
+DIST wayland-sys-0.28.6.crate 7937 BLAKE2B 9dece71e50ef98d3846f9d50157dcc98d91a97df4b84bbc103517b394ea02e35e75ac8ab87abb05c656a1aa478b5cdb7ba391d4ac6ecff71c958dbe94eb98019 SHA512 b7e6554be552e0b5a7b2d83cbbd48ded35fe766050ece8a47d1fe33cd4550a923b314956f94395194db33c12ab5e5676f05db1f6bcd5fe2d0f89f841b350b03f
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
@@ -234,16 +216,19 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST winit-0.24.0.crate 330256 BLAKE2B ac43b5bf97201c63cf1ceeb099d29880420205dd10801bd99ca61eab968828594cf28cce107c2181b1082c6c6fc53920836a83c0c880e5137a940d7ea7549de6 SHA512 9959fa68897e95580cae8d56cdf7920d4f9f8d717ed3a07851090c897c7f2627686a9fa294acbff536ff3ae9371ecf955cf397bb150813e6d9b6a8ebd2f09130
 DIST winreg-0.8.0.crate 22220 BLAKE2B a544159252d4f89acda97182419c472bba8b2b08bdfbc3c33c709645a7406e695ea2fad43a83685c64f85b55d98e4c670001ceadb2dbe9a2e850382cb7f8f430 SHA512 86a5f89917a1fe12ab149de098000cb07c94bbf8b0bf0172a64d0c31549a5133c2cbec269365aa655b7abd1d72a20715676de08c8757c8e00f31882a14d570a1
+DIST winreg-0.9.0.crate 23127 BLAKE2B d14f23300fb5623043acf66c414d7c9a849c6c31a06e81a8d4277a540400096453c42a2d59178300953004f030ec1f82fbc4c54209f6a5acd18a9cb80c9ab03d SHA512 369b9e58f76f4268063d01496ccab8fd80076d71ae7a6ad178b392463f1ade2413a02ec661738d1eceb586f9c1945676a35dc3eed3a318e3661c5c6f76d9d812
 DIST wio-0.2.2.crate 11214 BLAKE2B 7356229f90aa50d6ac8a7651637967de3e06755a7a45eab2a144e13c876058553c22129abffb07717b1715233f6cfc1efe90ff60c1877f4291fabaa4b5ea283d SHA512 13838de6e01b20de8996c7aa9efbaca5bcd9e4551614cfc10bee45ecca4bcc70b953b2c59fe460d1a054b3ecac13445b020aa244ea70686fd19be8d65c539b0e
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 DIST x11-clipboard-0.5.1.crate 7502 BLAKE2B 4d78e6d2ebe928deaf6816d2644b580c1dad76601e99b698e5c8011ef4be261a906917002af3f8767d1b2a2ddacee97e8da6fcb4a2e721e37a2173ee9c57162e SHA512 c2e78266da89921767da0c3cdd946964483b5def5ce1bc8af3c988367ff8db92f4537e216d6a9bb6ff5772d9fd831ea02c179be2d0c6598c3e0790c926bd0c3a
+DIST x11-clipboard-0.5.2.crate 7634 BLAKE2B 03c8f76ac5da33559f90fe777b802f1c0429412d8c72e7dbc43f5d4d7359648e408da7d8c31a7bb61da8ffae71d2f302fe131fe11817005f23b7bd4f9d5975c7 SHA512 e3ab302b7b7b82e3d869d61e6349780ca67750713d51102d910b17ade033066187486743920a35b3e1c03e78b2e525f4cf5fd44b92ab0dd79e576727adf6333c
 DIST x11-dl-2.18.5.crate 62951 BLAKE2B d2bd0b9a3a41b353a1daa5e74c19e5626cd1b3474bf3d2386ec138a20c3005e9a80f4d29bc8dc17659fa27f8cb64a5258f037754685ba6b3daa45a6ffc610f62 SHA512 db0b2debc8b6e2ed736e846307340600b7b39aadced946e1040f5362e2a76d037dcacc17de9cecae1d4230b4ce6a4ce721a836fd0f13d5ca124c8594fff0a460
 DIST xcb-0.9.0.crate 129744 BLAKE2B 5854662e87fc75e07ea707263808c8a5c6fd53a65e4f5034413227e1150a9110075449b17318861828667f47fbee0f673920cf9c6197ef15fdf0dd592dd3b1c4 SHA512 183d59745daa048335e7081add8ca1ea6db3fa77903bffa8bf34de538efc4618755fda1344cd36bc1175600d3df341ac1bde45706d3809a266a25eaf7c253dac
 DIST xcursor-0.3.3.crate 6130 BLAKE2B 46245b672fca9840436d9c26695920848c70d860a1185914f1fe39313f61f100e7d011999253d0d01211486a90709cb371c4f294bc59e13019f87dfc783ac75d SHA512 09fd0b490a8fdbb81d74a2f586fa7e1c12445fdfdfd07c116798e2f8a5a2b4c5a95b9052e0c17cefa028fb1d46da3d63f2f32eb2e7ebd676a3428605f74e9d5c
 DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e394410778ed175e9f27246afadf3851dec21020c5e2ca81ef4db44a34e58d9229972b2475ff5f40d6c9 SHA512 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e
 DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
+DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD alacritty-0.7.2.ebuild 6141 BLAKE2B bfc5cec131c17925fcb3946ab46e0dd0e33ffe53a6eb850bb2396a333b604252db1570ee52e1532150aca2ec46e99a4c3424a1b214334d723f8309ee246ca56f SHA512 5d30ed7cc993696e460cb9b3146851824b15b231e2f8c7bce2c67961ec825c02405d9125657d5e4dc6783b760c7e06895b4f99f3a1a74d7940326be82694956e
-EBUILD alacritty-0.8.0.ebuild 5960 BLAKE2B d5b15a52349fb45db9ecc8153c802f5eacfe45633cdcd07028ef41c395617f35f1906d788a50a1ae250ae7a10a16ee86740d5ba2587eaca74eaaaaf8dc2e9250 SHA512 19da1c5657fcd83e0a683b749a2470a835a0761dafc7412f225ae4a5318744b3f603ec4a0583cc23045d5584de207178684e316c4aa0a92a7e5deca9dcdb2e02
+EBUILD alacritty-0.8.0.ebuild 5959 BLAKE2B ff1a354624294ffe23c3aca189a65d648b30ae9efaa5f91cb24a9946017c9b2e0bd6ea369b9127baf68faedb5966da9a854efc7e414a3c1ecb6e89e74af12cc7 SHA512 4dcb7225139cc8fd7bb60b69ab3c6d22cd736ca1496886f0da7f2c22fe948052c093208a81e2cfbbe3302ff6f5baeb8e62d24a8b010e3382f8fd4ce82b211827
+EBUILD alacritty-0.9.0.ebuild 6034 BLAKE2B faa6acfc45a6bea8eb56ecde2cbb451cb37a15109697587be979bf911bfdd6806295048746d8ae396a9f8b723c96b9e1d59b5a2424d018332b827d8dd6333be0 SHA512 f8a28cc41edc134619409759e6ab59d7354c2bd48d0e4a0adb9e2d8a987595a5c508c2fdd3e9a7e262bd987238f05084705824f52b3f3a48a2a06425bda0f978
 EBUILD alacritty-9999.ebuild 2653 BLAKE2B db02653e037110909d0a1f9ef2caa7b29801690d74e0fb779db9f5e5830dab14555a9afe39c9b3affbc6758df894bc898448d081622b069929c202a24456c8b3 SHA512 0b96484226be356d97ca160a3c74c1d4be7fff8b51ef530a78cb469d497f5d5256d7e99012e5b241a9dfdab4edbaf3dbfbc45b2cd7c93fab1a06e004b1c41cb3
 MISC metadata.xml 818 BLAKE2B c62fb819b5572cc2cfb89ed412cf4edd5c527180997b4cc0a288c413e2f5c04e16f23e72ae6c30ca216bcf33feb20b0b9a762aa4823412b0faa5f2cc7b9fbdbc SHA512 9073045732d5dc09b58766d3c546344216370ca161c9f25bf7f0679913e6fd3816d07de92773df4b5fe3a13b67522f02f2d3cda5b456ddb498e7ca902fe286d1
diff --git a/x11-terms/alacritty/alacritty-0.7.2.ebuild b/x11-terms/alacritty/alacritty-0.7.2.ebuild
deleted file mode 100644
index 3a0e7ba5b8f8..000000000000
--- a/x11-terms/alacritty/alacritty-0.7.2.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-ab_glyph_rasterizer-0.1.4
-adler32-1.2.0
-andrew-0.3.1
-android_glue-0.2.3
-ansi_term-0.11.0
-arrayref-0.3.6
-arrayvec-0.5.2
-atty-0.2.14
-autocfg-1.0.1
-base64-0.12.3
-base64-0.13.0
-bitflags-1.2.1
-blake2b_simd-0.5.11
-block-0.1.6
-byteorder-1.4.2
-calloop-0.6.5
-cc-1.0.66
-cfg-if-0.1.10
-cfg-if-1.0.0
-cgl-0.3.2
-clap-2.33.3
-clipboard-win-3.1.1
-cmake-0.1.45
-cocoa-0.23.0
-cocoa-0.24.0
-cocoa-foundation-0.1.0
-constant_time_eq-0.1.5
-copypasta-0.7.1
-core-foundation-0.7.0
-core-foundation-0.9.1
-core-foundation-sys-0.7.0
-core-foundation-sys-0.8.2
-core-graphics-0.19.2
-core-graphics-0.22.2
-core-graphics-types-0.1.1
-core-text-19.1.0
-core-video-sys-0.1.4
-crc32fast-1.2.1
-crossbeam-utils-0.8.1
-crossfont-0.2.0
-darling-0.10.2
-darling_core-0.10.2
-darling_macro-0.10.2
-derivative-2.2.0
-dirs-2.0.2
-dirs-sys-0.3.5
-dispatch-0.2.0
-dlib-0.4.2
-downcast-rs-1.2.0
-dtoa-0.4.7
-dwrote-0.11.0
-embed-resource-1.5.1
-expat-sys-2.1.6
-filetime-0.2.14
-fnv-1.0.7
-foreign-types-0.3.2
-foreign-types-0.5.0
-foreign-types-macros-0.2.1
-foreign-types-shared-0.1.1
-foreign-types-shared-0.3.0
-freetype-rs-0.26.0
-freetype-sys-0.13.1
-fsevent-0.4.0
-fsevent-sys-2.0.1
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-getrandom-0.1.16
-gl_generator-0.14.0
-glutin-0.26.0
-glutin_egl_sys-0.1.5
-glutin_emscripten_sys-0.1.1
-glutin_gles2_sys-0.1.5
-glutin_glx_sys-0.1.7
-glutin_wgl_sys-0.1.5
-hermit-abi-0.1.18
-ident_case-1.0.1
-inotify-0.7.1
-inotify-sys-0.1.5
-instant-0.1.9
-iovec-0.1.4
-itoa-0.4.7
-jni-sys-0.3.0
-kernel32-sys-0.2.2
-khronos_api-3.1.0
-lazy-bytes-cast-5.0.1
-lazycell-1.3.0
-lazy_static-1.4.0
-libc-0.2.86
-libloading-0.6.7
-linked-hash-map-0.5.4
-lock_api-0.4.2
-log-0.4.14
-malloc_buf-0.0.6
-maybe-uninit-2.0.0
-memchr-2.3.4
-memmap2-0.1.0
-miniz_oxide-0.3.7
-mio-0.6.23
-mio-anonymous-pipes-0.1.0
-mio-extras-2.0.6
-miow-0.2.2
-miow-0.3.6
-ndk-0.2.1
-ndk-glue-0.2.1
-ndk-macro-0.2.0
-ndk-sys-0.2.1
-net2-0.2.37
-nix-0.18.0
-nom-6.1.0
-notify-4.0.15
-num_enum-0.4.3
-num_enum_derive-0.4.3
-objc-0.2.7
-objc-foundation-0.1.1
-objc_id-0.1.1
-once_cell-1.5.2
-osmesa-sys-0.1.2
-owned_ttf_parser-0.6.0
-parking_lot-0.11.1
-parking_lot_core-0.8.3
-percent-encoding-2.1.0
-pkg-config-0.3.19
-png-0.16.8
-proc-macro2-1.0.24
-proc-macro-crate-0.1.5
-quote-1.0.9
-raw-window-handle-0.3.3
-redox_syscall-0.1.57
-redox_syscall-0.2.4
-redox_users-0.3.5
-regex-automata-0.1.9
-regex-syntax-0.6.22
-rust-argon2-0.8.3
-rusttype-0.9.2
-ryu-1.0.5
-same-file-1.0.6
-scoped-tls-1.0.0
-scopeguard-1.1.0
-serde-1.0.123
-serde_derive-1.0.123
-serde_json-1.0.62
-serde_yaml-0.8.17
-servo-fontconfig-0.5.1
-servo-fontconfig-sys-5.1.0
-shared_library-0.1.9
-signal-hook-0.1.17
-signal-hook-registry-1.3.0
-slab-0.4.2
-smallvec-1.6.1
-smithay-client-toolkit-0.12.2
-smithay-clipboard-0.6.3
-socket2-0.3.19
-spsc-buffer-0.1.1
-strsim-0.8.0
-strsim-0.9.3
-syn-1.0.60
-textwrap-0.11.0
-thiserror-1.0.23
-thiserror-impl-1.0.23
-time-0.1.44
-toml-0.5.8
-ttf-parser-0.6.2
-unicode-width-0.1.8
-unicode-xid-0.2.1
-urlocator-0.1.4
-utf8parse-0.2.0
-vec_map-0.8.2
-version_check-0.9.2
-vswhom-0.1.0
-vswhom-sys-0.1.0
-vte-0.10.0
-vte_generate_state_changes-0.1.1
-walkdir-2.3.1
-wasi-0.10.0+wasi-snapshot-preview1
-wasi-0.9.0+wasi-snapshot-preview1
-wayland-client-0.28.3
-wayland-commons-0.28.3
-wayland-cursor-0.28.3
-wayland-egl-0.28.3
-wayland-protocols-0.28.3
-wayland-scanner-0.28.3
-wayland-sys-0.28.3
-winapi-0.2.8
-winapi-0.3.9
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-winit-0.24.0
-winreg-0.8.0
-wio-0.2.2
-ws2_32-sys-0.2.1
-x11-clipboard-0.5.1
-x11-dl-2.18.5
-xcb-0.9.0
-xcursor-0.3.3
-xdg-2.2.0
-xml-rs-0.8.3
-yaml-rust-0.4.5
-"
-
-MY_PV="${PV//_rc/-rc}"
-# https://bugs.gentoo.org/725962
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit bash-completion-r1 cargo desktop python-any-r1
-
-DESCRIPTION="GPU-accelerated terminal emulator"
-HOMEPAGE="https://github.com/alacritty/alacritty"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/alacritty/alacritty"
-else
-	SRC_URI="https://github.com/alacritty/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="amd64 arm64 ppc64 x86"
-fi
-
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB"
-SLOT="0"
-IUSE="wayland +X"
-
-REQUIRED_USE="|| ( wayland X )"
-
-DEPEND="${PYTHON_DEPS}"
-
-COMMON_DEPEND="
-	media-libs/fontconfig:=
-	media-libs/freetype:2
-	X? ( x11-libs/libxcb:=[xkb] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	media-libs/mesa[X?,wayland?]
-	sys-libs/zlib
-	sys-libs/ncurses:0
-	wayland? ( dev-libs/wayland )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXi
-		x11-libs/libXrandr
-	)
-"
-
-BDEPEND="dev-util/cmake"
-
-QA_FLAGS_IGNORED="usr/bin/alacritty"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack() {
-	if [[ "${PV}" == *9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_configure() {
-	local myfeatures=(
-		$(usex X x11 '')
-		$(usev wayland)
-	)
-	cargo_src_configure --no-default-features
-}
-
-src_compile() {
-	cd alacritty || die
-	cargo_src_compile
-}
-
-src_install() {
-	cargo_src_install --path alacritty
-
-	newman extra/alacritty.man alacritty.1
-
-	newbashcomp extra/completions/alacritty.bash alacritty
-
-	insinto /usr/share/fish/vendor_completions.d/
-	doins extra/completions/alacritty.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins extra/completions/_alacritty
-
-	domenu extra/linux/Alacritty.desktop
-	newicon extra/logo/compat/alacritty-term.svg Alacritty.svg
-
-	newman extra/alacritty.man alacritty.1
-
-	insinto /usr/share/metainfo
-	doins extra/linux/io.alacritty.Alacritty.appdata.xml
-
-	insinto /usr/share/alacritty/scripts
-	doins -r scripts/*
-
-	local DOCS=(
-		alacritty.yml
-		CHANGELOG.md INSTALL.md README.md
-		docs/{ansicode.txt,escape_support.md,features.md}
-	)
-	einstalldocs
-}
-
-src_test() {
-	cd alacritty || die
-	cargo_src_test
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "Configuration files for ${CATEGORY}/${PN}"
-		einfo "in \$HOME may need to be updated after a version change"
-		einfo ""
-		einfo "An up-to-date sample configuration file can be found at"
-		einfo "${ROOT}/usr/share/doc/${PF}/alacritty.yml.bz2"
-	fi
-}
diff --git a/x11-terms/alacritty/alacritty-0.8.0.ebuild b/x11-terms/alacritty/alacritty-0.8.0.ebuild
index e103d182be9a..008d76b24f4e 100644
--- a/x11-terms/alacritty/alacritty-0.8.0.ebuild
+++ b/x11-terms/alacritty/alacritty-0.8.0.ebuild
@@ -211,7 +211,7 @@ if [ ${PV} == "9999" ] ; then
 else
 	SRC_URI="https://github.com/alacritty/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="amd64 ~arm64 ppc64 x86"
+	KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB"
diff --git a/x11-terms/alacritty/alacritty-0.9.0.ebuild b/x11-terms/alacritty/alacritty-0.9.0.ebuild
new file mode 100644
index 000000000000..c1094fd992f2
--- /dev/null
+++ b/x11-terms/alacritty/alacritty-0.9.0.ebuild
@@ -0,0 +1,320 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+ab_glyph_rasterizer-0.1.4
+adler32-1.2.0
+andrew-0.3.1
+android_glue-0.2.3
+ansi_term-0.11.0
+atty-0.2.14
+autocfg-1.0.1
+base64-0.13.0
+bitflags-1.2.1
+block-0.1.6
+calloop-0.6.5
+cc-1.0.69
+cfg-if-0.1.10
+cfg-if-1.0.0
+cgl-0.3.2
+clap-2.33.3
+clipboard-win-3.1.1
+cmake-0.1.45
+cocoa-0.23.0
+cocoa-0.24.0
+cocoa-foundation-0.1.0
+copypasta-0.7.1
+core-foundation-0.7.0
+core-foundation-0.9.1
+core-foundation-sys-0.7.0
+core-foundation-sys-0.8.2
+core-graphics-0.19.2
+core-graphics-0.22.2
+core-graphics-types-0.1.1
+core-text-19.2.0
+core-video-sys-0.1.4
+crc32fast-1.2.1
+crossfont-0.3.1
+darling-0.10.2
+darling_core-0.10.2
+darling_macro-0.10.2
+derivative-2.2.0
+dirs-3.0.2
+dirs-sys-0.3.6
+dispatch-0.2.0
+dlib-0.4.2
+dlib-0.5.0
+downcast-rs-1.2.0
+dtoa-0.4.8
+dwrote-0.11.0
+embed-resource-1.6.3
+expat-sys-2.1.6
+filetime-0.2.14
+fnv-1.0.7
+foreign-types-0.3.2
+foreign-types-0.5.0
+foreign-types-macros-0.2.1
+foreign-types-shared-0.1.1
+foreign-types-shared-0.3.0
+freetype-rs-0.26.0
+freetype-sys-0.13.1
+fsevent-0.4.0
+fsevent-sys-2.0.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+getrandom-0.2.3
+gl_generator-0.14.0
+glutin-0.26.0
+glutin_egl_sys-0.1.5
+glutin_emscripten_sys-0.1.1
+glutin_gles2_sys-0.1.5
+glutin_glx_sys-0.1.7
+glutin_wgl_sys-0.1.5
+hermit-abi-0.1.19
+ident_case-1.0.1
+inotify-0.7.1
+inotify-sys-0.1.5
+instant-0.1.10
+iovec-0.1.4
+itoa-0.4.7
+jni-sys-0.3.0
+kernel32-sys-0.2.2
+khronos_api-3.1.0
+lazy-bytes-cast-5.0.1
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.98
+libloading-0.6.7
+libloading-0.7.0
+linked-hash-map-0.5.4
+lock_api-0.4.4
+log-0.4.14
+malloc_buf-0.0.6
+maybe-uninit-2.0.0
+memchr-2.3.4
+memmap2-0.1.0
+memmap2-0.2.3
+memoffset-0.6.4
+miniz_oxide-0.3.7
+mio-0.6.23
+mio-anonymous-pipes-0.2.0
+mio-extras-2.0.6
+miow-0.2.2
+miow-0.3.7
+ndk-0.2.1
+ndk-glue-0.2.1
+ndk-macro-0.2.0
+ndk-sys-0.2.1
+net2-0.2.37
+nix-0.18.0
+nix-0.20.0
+nix-0.22.0
+nom-6.2.1
+notify-4.0.17
+num_enum-0.4.3
+num_enum_derive-0.4.3
+objc-0.2.7
+objc-foundation-0.1.1
+objc_id-0.1.1
+once_cell-1.8.0
+osmesa-sys-0.1.2
+owned_ttf_parser-0.6.0
+parking_lot-0.11.1
+parking_lot_core-0.8.3
+percent-encoding-2.1.0
+pkg-config-0.3.19
+png-0.16.8
+proc-macro2-1.0.28
+proc-macro-crate-0.1.5
+quote-1.0.9
+raw-window-handle-0.3.3
+redox_syscall-0.2.9
+redox_users-0.4.0
+regex-automata-0.1.10
+regex-syntax-0.6.25
+rusttype-0.9.2
+ryu-1.0.5
+same-file-1.0.6
+scoped-tls-1.0.0
+scopeguard-1.1.0
+serde-1.0.127
+serde_derive-1.0.127
+serde_json-1.0.66
+serde_yaml-0.8.17
+servo-fontconfig-0.5.1
+servo-fontconfig-sys-5.1.0
+shared_library-0.1.9
+signal-hook-0.1.17
+signal-hook-registry-1.4.0
+slab-0.4.3
+smallvec-1.6.1
+smithay-client-toolkit-0.12.3
+smithay-client-toolkit-0.14.0
+smithay-clipboard-0.6.4
+spsc-buffer-0.1.1
+strsim-0.8.0
+strsim-0.9.3
+syn-1.0.74
+textwrap-0.11.0
+thiserror-1.0.26
+thiserror-impl-1.0.26
+time-0.1.43
+toml-0.5.8
+ttf-parser-0.6.2
+unicode-width-0.1.8
+unicode-xid-0.2.2
+utf8parse-0.2.0
+vec_map-0.8.2
+version_check-0.9.3
+vswhom-0.1.0
+vswhom-sys-0.1.0
+vte-0.10.1
+vte_generate_state_changes-0.1.1
+walkdir-2.3.2
+wasi-0.10.2+wasi-snapshot-preview1
+wayland-client-0.28.6
+wayland-commons-0.28.6
+wayland-cursor-0.28.6
+wayland-egl-0.28.6
+wayland-protocols-0.28.6
+wayland-scanner-0.28.6
+wayland-sys-0.28.6
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+winit-0.24.0
+winreg-0.9.0
+wio-0.2.2
+ws2_32-sys-0.2.1
+x11-clipboard-0.5.2
+x11-dl-2.18.5
+xcb-0.9.0
+xcursor-0.3.3
+xdg-2.2.0
+xml-rs-0.8.4
+yaml-rust-0.4.5
+"
+
+MY_PV="${PV//_rc/-rc}"
+# https://bugs.gentoo.org/725962
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit bash-completion-r1 cargo desktop python-any-r1
+
+DESCRIPTION="GPU-accelerated terminal emulator"
+HOMEPAGE="https://github.com/alacritty/alacritty"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/alacritty/alacritty"
+else
+	SRC_URI="https://github.com/alacritty/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB"
+SLOT="0"
+IUSE="wayland +X"
+
+REQUIRED_USE="|| ( wayland X )"
+
+DEPEND="${PYTHON_DEPS}"
+
+COMMON_DEPEND="
+	media-libs/fontconfig:=
+	media-libs/freetype:2
+	X? ( x11-libs/libxcb:=[xkb] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	media-libs/mesa[X?,wayland?]
+	sys-libs/zlib
+	sys-libs/ncurses:0
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXi
+		x11-libs/libXrandr
+	)
+"
+
+BDEPEND="dev-util/cmake"
+
+QA_FLAGS_IGNORED="usr/bin/alacritty"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usex X x11 '')
+		$(usev wayland)
+	)
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	cd alacritty || die
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install --path alacritty
+
+	newman extra/alacritty.man alacritty.1
+
+	newbashcomp extra/completions/alacritty.bash alacritty
+
+	insinto /usr/share/fish/vendor_completions.d/
+	doins extra/completions/alacritty.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins extra/completions/_alacritty
+
+	domenu extra/linux/Alacritty.desktop
+	newicon extra/logo/compat/alacritty-term.svg Alacritty.svg
+
+	newman extra/alacritty.man alacritty.1
+
+	insinto /usr/share/metainfo
+	doins extra/linux/io.alacritty.Alacritty.appdata.xml
+
+	insinto /usr/share/alacritty/scripts
+	doins -r scripts/*
+
+	local DOCS=(
+		alacritty.yml
+		CHANGELOG.md INSTALL.md README.md
+		docs/{ansicode.txt,escape_support.md,features.md}
+	)
+	einstalldocs
+}
+
+src_test() {
+	cd alacritty || die
+	cargo_src_test
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo "Configuration files for ${CATEGORY}/${PN}"
+		einfo "in \$HOME often need to be updated after a version change"
+		einfo ""
+		einfo "An up-to-date sample configuration file always can be found at"
+		einfo "${ROOT}/usr/share/doc/${PF}/alacritty.yml.*"
+	fi
+}
diff --git a/x11-terms/cool-retro-term/Manifest b/x11-terms/cool-retro-term/Manifest
index 1ebb9dde14c5..49c4144fa98b 100644
--- a/x11-terms/cool-retro-term/Manifest
+++ b/x11-terms/cool-retro-term/Manifest
@@ -2,4 +2,4 @@ AUX qmltermwidget-0.2.0-gcc-10.patch 1398 BLAKE2B a06fd644c64fd0b5cf549b410c2847
 DIST cool-retro-term-1.1.1.tar.gz 1975853 BLAKE2B 54c9e5adb0879380215c390659da59266c323f12a046dafa2981d9c5e5ccbc6369e553427014e0347afcb6a1a64e188fb51f202d7c870a544fd2ecd5980f4c0c SHA512 59da4b5d18ad64b917caebbc63ea9e3d562ed2a2dc9eae00f36cf434df44d17adca084b448f860f24a74ee6b59cd083d6a81e2217df1fb5e9f2731eaf1752148
 DIST qmltermwidget-0.2.0.tar.gz 219516 BLAKE2B 452fe72f01773d3307d5f4dca4ef38ea8e35b6ee4e3255d660e94baafc83949fca943807fd4ea76e0b985032952c387b5911a65891488b399d0cb41e6be06d87 SHA512 544d57296de6999b86bf2b921d1d93ac5d7eddd02eea436df4ecea0966c82389e716310fd7e4d13dd918bc1b3fd2d02f953c713dc5b4abcfc56d3f3f617adf43
 EBUILD cool-retro-term-1.1.1-r2.ebuild 1322 BLAKE2B ae84eac46711396499980104c02099b746fba41846bf3dbb805966aa81d067e89a5ea59df8cc66bb099a994f1272f6137fa53c40d4bf0a7e4aff7606c537ba0a SHA512 d95a30e5c37ad0199c379960ed981d3d05f352da2dbe16152f67f2f0df1e0e1c033d78e2a4dc485da1b29f350da3efadaf2e097acf7cde38bcad3a3318135015
-MISC metadata.xml 343 BLAKE2B 4c576b8928fb82994206d310506a0b790c14108c235e9815750cddd3f9becc747fdec7f2bab7aae92c2d52b648f25b9b82dfdccea77953b6f694514977efd7a5 SHA512 5e102d64e39f274ce62e25739adc52ae998b830a38e7f292b33ccceccd5b262aa62fcf04a4372561aed54760ef9624e1f7335e4198cadb582b152f128be60466
+MISC metadata.xml 259 BLAKE2B a94fa28c911109bd45ab69163391674612f39d06e6366e9b1871cc711620678655ecf1201ffadfe316819a1951b4664c69d4937cb64c336ec352f63fa7d6898c SHA512 b2b0e594a3cd62f32f586f544e1a7fa42aebc1ee98add1d2286b7583296235348a261bed169430edd22c1f3d9689793c7ee04f470d69baa825e8506a3db500cf
diff --git a/x11-terms/cool-retro-term/metadata.xml b/x11-terms/cool-retro-term/metadata.xml
index d4c7cb581814..daad65bc09d0 100644
--- a/x11-terms/cool-retro-term/metadata.xml
+++ b/x11-terms/cool-retro-term/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">Swordfish90/cool-retro-term</remote-id>
 	</upstream>
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index cba03d8bfd7a..e61eb25b8250 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/comix-xcursors/Manifest b/x11-themes/comix-xcursors/Manifest
index 897dca5bae96..4db277f54fce 100644
--- a/x11-themes/comix-xcursors/Manifest
+++ b/x11-themes/comix-xcursors/Manifest
@@ -1,11 +1,6 @@
-DIST ComixCursors-0.8.2.tar.bz2 2190951 BLAKE2B ebbee6e1668d622a89a63dbdc7d6011456be7ce70efdd57aa4f0581064fc45ae687cb1ffd8e5194bcf0111eb808ed80bddd60256d71e12caf0dbbcd4e7f56172 SHA512 2061207f4a646903774151b17fdfa0749bd613cae12674c4ccaf5f277f7f5ee2d5ab82ae5dcda0a3d22df57e66a6576764b26b9ba004c639301bd6ca18aa9ee1
 DIST ComixCursors-0.9.2.tar.bz2 1994280 BLAKE2B 1d3ab9d77e6a458157489cc24fc7cea0bd536a93135f0b1b257bc5b5b0dcdeb9446ce5d313c9b56a9de4806ed26c2e28be4e176b764a87bb905911a310adcccd SHA512 f88a9a32089c6b55b8a836d46a1ffb6a97174b23cd646e419d662305029d22ef4be63e9ac2afea930230959988bc585ef7bb5db5c121b59d7df39d0cf12ca626
-DIST ComixCursors-LH-0.8.2.tar.bz2 2194027 BLAKE2B 83fb3a7cf7f9281dbd1db379d9d7b90bb7e981637b8b9d4f48728a9c91e51f7bd511654cdc2546533f062df5741fa6652152b842e6682ecb322b6972aad62dfe SHA512 35b843f0cede89e4599b52bb2e5bc7180691767b5125ab7bb7b8fc1cf28a68a60ab1464e1cb7561484235b9ea8b58604ce35ff6e1ffc055d8c399ab484986eb4
 DIST ComixCursors-LH-0.9.2.tar.bz2 2001522 BLAKE2B 1655bbe87ff687693394ecfda3987aeae330128407e0fa45f8c4e6cfea865d96fb1844215b150ac533d07ea03b33de8c3c5caa58b5a9c79969252877b14838cf SHA512 da48306c917a7c2093cc54ce3718eaef041f180161caacd098d527316f39c4c0e8b37e2bfd62bee58b7d8a0c585ca4dc54312761b5b29d7935dd407feb04d626
-DIST ComixCursors-LH-Opaque-0.8.2.tar.bz2 1915132 BLAKE2B b43374b7e6d706038a1ee3899ffa08d519186ad4c892c56922a678d1e97bd2f5014de0eb8de8e04fe958a6430f3d5fadd6dea822c9a0d2cf4487b1aa49f79ae7 SHA512 86a11adc280b732bd1d813b2e43ab3256bdadba7054f818a4134b44fc5891477377d01c23f2c4cb50ccc68c65c57f5022fbd15fdf215e556eaa6c2888410f78a
 DIST ComixCursors-LH-Opaque-0.9.2.tar.bz2 1800872 BLAKE2B d4f4b79ab67c0a6c5beae59afa1e3357538d8e9fd6a4bdfff64c4a14b921854a874aeb697f83c1fef74efb08b9389fbfb96ac187e436fa96cf879eeb86ef0e93 SHA512 06f4536aab0c39ef542fa3fa80d5e7913e7234f14d5bf7ad21f2f9c1dbb7cef413a440bc5272a02eacf0286eaf8a94871ca0e3fb5ee979f1cb4fc23b663e7009
-DIST ComixCursors-Opaque-0.8.2.tar.bz2 1910390 BLAKE2B 51f3a0c7e7ae697d3278074e1820a1341edd3f198a2dd117ed5eb5f6641f19f99fcad072146171b25d4882b478afa643004fd915dcf4c98e81fd064a464cbc96 SHA512 07c59aca614283af36c01b1c7b0f485f1d9a116dd596c86aa2cd4ddce6317d0bd08b96898e6655b7ef19082f16a1042bdc166e92fda801c0e95b6516d0ad1b14
 DIST ComixCursors-Opaque-0.9.2.tar.bz2 1792080 BLAKE2B c25817e265c8aad9ea0dcb8651ae0a77459774fc0f43541ef9f7c512476fe62220e7f13eb471e9b7cd740f7784f1ef9c81cf5f17d8260f9ba0552b0b760990b6 SHA512 1717e8a5b81ac71857dcd51e69bba7b02ea29734af41e407915ef72cc613085a3bab98da4566dec441ec70e144f95801adbf20aa941062c1f06aa9b5f64ba65c
-EBUILD comix-xcursors-0.8.2.ebuild 821 BLAKE2B f9fef8cf854fb50ba09379ed4b660ec3469dceeda4acdcb0fa1f7c68dccbfebc689ea7d78428bc5473fdd89d97fd05dd2e001008551b1c5cadcc202c3fcacbe5 SHA512 2723837e115c28546c0bab54141e41526a2ac80198fee578d26ad3375b3d75a2789fe5c4a4144e6c49e311da00ad65811767bf71ae9b7f73de21ab72c2b9e0d6
 EBUILD comix-xcursors-0.9.2.ebuild 880 BLAKE2B e7a739593c267eb183478bad552c78a7042d27b80cf9dec4e651e061c76c72afe67ae24a886b864430aba544162d58c96279b0b4662e88d09df5170e4f3bdefd SHA512 2df782fbe43949aae465a7d2ffd7df8f1cf268c7c8358b425630dd7bbebb7ac13fcded41eb967cf4c6569d55be298dccc1222f1617c7f6c5361e3cabc7499d5e
 MISC metadata.xml 488 BLAKE2B 0506dd184629decc5c47ca9c4c688e48694cbd454faa03b84271fcc789eb67a2e703136b28527cc3c669701642e44ee17948e247f69a03844f23221e4af07f66 SHA512 430cd50ad76a73150055f25635780868882450ea026816ddbfff359d2ec501dedc5c1d5f8b3259c8d16d45a99927835349c55aa1bf12ecc3130a5c75d89123fb
diff --git a/x11-themes/comix-xcursors/comix-xcursors-0.8.2.ebuild b/x11-themes/comix-xcursors/comix-xcursors-0.8.2.ebuild
deleted file mode 100644
index a828656e492a..000000000000
--- a/x11-themes/comix-xcursors/comix-xcursors-0.8.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="ComixCursors"
-
-DESCRIPTION="X11 mouse theme with a comics feeling"
-HOMEPAGE="http://kde-look.org/content/show.php/ComixCursors?content=32627"
-SRC_URI="http://www.limitland.de/comixcursors/${MY_PN}-${PV}.tar.bz2
-	lefthanded? ( http://www.limitland.de/comixcursors/${MY_PN}-LH-${PV}.tar.bz2 )
-	opaque? ( http://www.limitland.de/comixcursors/${MY_PN}-Opaque-${PV}.tar.bz2 )
-	lefthanded? ( opaque? ( http://www.limitland.de/comixcursors/${MY_PN}-LH-Opaque-${PV}.tar.bz2 ) )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="lefthanded opaque"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXcursor"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto "/usr/share/cursors/xorg-x11"
-	doins -r "${S}"/*
-}
diff --git a/x11-themes/e-gtk-theme/Manifest b/x11-themes/e-gtk-theme/Manifest
index a06041323ff9..e42bdacd7cdb 100644
--- a/x11-themes/e-gtk-theme/Manifest
+++ b/x11-themes/e-gtk-theme/Manifest
@@ -1,3 +1,3 @@
 DIST e-gtk-theme-0.19.3.tar.gz 488203 BLAKE2B a6f19d1da6aeb78030f71face4239bc63c8a550c7ba3ab6cad2b06827ec5ae0da3f14372c1e552454f74f7b18a3aa0c007ca4f7f8040993fc366d5bd25da36cb SHA512 6a833a3c0c38388d56370ae3fe2a3477423fc56133469ddfe482ce0c82e0f4cf39c773448a554227946c8787d588ee637a8f9d2a341f175c1b9ebc1db4f9d990
-EBUILD e-gtk-theme-0.19.3.ebuild 580 BLAKE2B bebbba11c23d31ea3459ad124f6460eea42f37d6a1e4baf92b17b9b8115a01deaea17b19a34adef60594f6c6ad2a8e2fc56620e4792b0086a4d321bdd65fe67d SHA512 779f88a2b3b12edce3dbda7f807476d02d96e08f8b33c7b0420d03af3125e37f94b70edb7632653cb8e378d9da0039db8088189d675b03eea85e088eac937958
+EBUILD e-gtk-theme-0.19.3.ebuild 587 BLAKE2B f8ebed3967d39acc7d05f7d26a30c675fe9bdff473b477f7bebdc8aae2e84cdbda6263c2f90d96a7f06ffa1b5d91b9de221208f86aae1b78c03d9873d8504025 SHA512 0885facb82a6f0243a0a8f4e612b2dfe0a7f683c68ef4d3e3d65bf27cee71e51f80ab4b06d7c206b0b071c241b428035e448199c7b1f4c05754782c59fbe0b08
 MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/x11-themes/e-gtk-theme/e-gtk-theme-0.19.3.ebuild b/x11-themes/e-gtk-theme/e-gtk-theme-0.19.3.ebuild
index bbfc2de7fbc9..ff9b2c5dbab4 100644
--- a/x11-themes/e-gtk-theme/e-gtk-theme-0.19.3.ebuild
+++ b/x11-themes/e-gtk-theme/e-gtk-theme-0.19.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://gitlab.com/tokiclover/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 src_prepare() {
 	default
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 582e6e04210e..42f5e505e99a 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index d84854edc2e3..063f85754b6a 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,5 +1,3 @@
-DIST ctwm-4.0.2.tar.xz 672608 BLAKE2B b4dc26b9d6ba5aba0a5f1f71363c25065aec0d4d4be7b9772f51117460062f5d7ea17d338e1ad9a89cf1213ca2125a1d203417bdc3f6c95a9b9969477b443a40 SHA512 445151f12084acd44bcf8a7d895e29363411a1a663b93e098fa9db5b96ae5cb43921eaf0695026aff2196117b810b96712a60570f57d6dabbee7fba34d5bd57f
 DIST ctwm-4.0.3.tar.xz 683684 BLAKE2B d16a47a5cd91ab5305da3c02f874d5ad1c71e2c8a3664cd33d5fa0781f4fdc2613407f5b43b4da16bcf89e323eb34b0888c5dbd02598746195991e7870aba0ef SHA512 f9bb2f8f28a050cce0fc2f1f4e00e79acd7c54055016d8483e045d8f5fa9829f8f5d92bb53f0c1d9500f97d6f52cd827ddd15515c84451ea03551025a8ab831d
-EBUILD ctwm-4.0.2.ebuild 866 BLAKE2B 9f99f0b22eb8ed4b850539a4c68acb7f0dde58751d5966999a50f4c24e1286106e2c8101160481bbc50dc622e3069eeff6012de263608a930b2ec370e0223552 SHA512 8912b11b2c0e233e295ff59127e40d6fcedad4f0fc94cacf2753cc7fa7beb4c98d37d7cf5185f433d21ad88399af7c024faef03360ef02ba1a39777be3b02422
 EBUILD ctwm-4.0.3.ebuild 1269 BLAKE2B 1b0ee37a15447f558fe13aaa9650a115dca35780499d38837c0a51afc20278d3df41cea7725762b9f6e9e285975e2757854f1e56084cc5aba28216c8ab1f8546 SHA512 e16eb3d03d9e9f9e3ab6441d960aec582447762212ae723a7f5e13ed2268c4a5d2f490fd1e1f71eebbe6309c5e4600de5ccf81688d2b749a36124a3d7df58b2b
 MISC metadata.xml 856 BLAKE2B 426cfc4d6e71b0e227ae36597f0a80bc69c20a423952287cb8013b7444aaa699efd5782a6a7ec05703cad50a2c1f19520b6211cd60c896af06382e84a01ca258 SHA512 53fcd34f01714d98356b63928c76c5f115cb2ee5002c80e38ce103377ea15029b2b92ab157bb58de98047b650206a3468bcd891038c7067c40d48646140750ec
diff --git a/x11-wm/ctwm/ctwm-4.0.2.ebuild b/x11-wm/ctwm/ctwm-4.0.2.ebuild
deleted file mode 100644
index 47c1a4e0d2f3..000000000000
--- a/x11-wm/ctwm/ctwm-4.0.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A clean, light window manager"
-HOMEPAGE="http://ctwm.org/"
-SRC_URI="http://ctwm.org/dist/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	app-text/rman
-	virtual/jpeg
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# implicit 'isspace'
-	sed -i parse.c -e "/<stdio.h>/ a#include <ctype.h>" || die
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
-	mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die
-}